3218 files changed, 32362 insertions, 368985 deletions

diff --git a/mcs/Makefile b/mcs/Makefile
index 99ce95ef399..732936c04b9 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -31,7 +31,7 @@ default_centum_tests :=		\
 	class/System.XML	\
 	class/System.Data
 
-net_2_0_centum_tests := $(centum_tests) #class/Mono.C5
+net_2_0_centum_tests := $(centum_tests) class/Mono.C5
 
 ifdef ONLY_CENTUM_TESTS
 TEST_SUBDIRS := $($(PROFILE)_centum_tests)
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 4cbf05c7e5d..9bc90bae32d 100644
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,14 +1,3 @@
-2006-01-19  Raja R Harinath  <rharinath@novell.com>
-
-	* library.make (test_lib): Don't allow to be overridden.
-	(test_against, test_dep): Remove.
-
-2006-01-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* executable.make: allow installing a different .config file for
-	executables such as nunit-console.exe that should use a different one
-	depending on the profile.
-
 2006-01-05  Raja R Harinath  <rharinath@novell.com>
 
 	* library.make (run-test-lib, run-test-ondotnet-lib): Workaround a
diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 726ac000f86..7ad29cd9eeb 100644
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -4,10 +4,7 @@
 
 base_prog = $(shell basename $(PROGRAM))
 sourcefile = $(base_prog).sources
-base_prog_config := $(wildcard $(base_prog).config.$(PROFILE))
-ifndef base_prog_config
 base_prog_config := $(wildcard $(base_prog).config)
-endif
 ifdef base_prog_config
 PROGRAM_config := $(PROGRAM).config
 endif
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 30e8804cb4c..e195149c7f5 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -63,20 +63,33 @@ test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%)
 test_nunit_ref = $(test_nunit_dep:%=-r:%)
 library_CLEAN_FILES += TestResult*.xml
 
+ifndef test_against
+test_against = $(the_lib)
+test_dep = $(the_lib)
+endif
+
+ifndef test_lib
 test_lib = $(LIBRARY:.dll=_test_$(PROFILE).dll)
 test_sourcefile = $(LIBRARY:.dll=_test.dll.sources)
+else
+test_sourcefile = $(test_lib).sources
+endif
 test_pdb = $(test_lib:.dll=.pdb)
 test_response = $(depsdir)/$(test_lib).response
 test_makefrag = $(depsdir)/$(test_lib).makefrag
-test_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MCS_FLAGS)
+test_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
 library_CLEAN_FILES += $(LIBRARY:.dll=_test*.dll) $(LIBRARY:.dll=_test*.pdb) $(test_response) $(test_makefrag)
 
+ifndef btest_lib
 btest_lib = $(LIBRARY:.dll=_btest_$(PROFILE).dll)
 btest_sourcefile = $(LIBRARY:.dll=_btest.dll.sources)
+else
+btest_sourcefile = $(btest_lib).sources
+endif
 btest_pdb = $(btest_lib:.dll=.pdb)
 btest_response = $(depsdir)/$(btest_lib).response
 btest_makefrag = $(depsdir)/$(btest_lib).makefrag
-btest_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
+btest_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
 library_CLEAN_FILES += $(LIBRARY:.dll=_btest*.dll) $(LIBRARY:.dll=_btest*.pdb) $(btest_response) $(btest_makefrag)
 
 ifndef HAVE_CS_TESTS
@@ -306,7 +319,7 @@ endif
 
 ifdef HAVE_CS_TESTS
 
-$(test_lib): $(the_lib) $(test_response) $(test_nunit_dep)
+$(test_lib): $(test_dep) $(test_response) $(test_nunit_dep)
 	$(TEST_COMPILE) -target:library -out:$@ $(test_flags) @$(test_response)
 
 $(test_response): $(test_sourcefile)
@@ -323,7 +336,7 @@ endif
 
 ifdef HAVE_VB_TESTS
 
-$(btest_lib): $(the_lib) $(btest_response) $(test_nunit_dep)
+$(btest_lib): $(test_dep) $(btest_response) $(test_nunit_dep)
 	$(BTEST_COMPILE) -target:library -out:$@ $(btest_flags) @$(btest_response)
 
 $(btest_response): $(btest_sourcefile)
diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index 6967e5a33fa..0aa92d0ecf6 100644
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-18  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile (common_dirs): add System.Web again after
-	System.Web.Services.
-
 2006-01-05  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile: Build FirebirdSql.Data.Firebird only in the "default"
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
index 25244344f27..0151392b16a 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
@@ -1,51 +1,6 @@
-2006-02-02  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpPatterns.cs : After profiling in depth, finally I found the
-	  source of the worst perf. problem in the code - return x for 
-	  (choice x x).
-	  It now validates 5MB of OpenDocument specification content.xml,
-	  which only Jing could do.
-
-2006-01-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpObjects.cs : fixed warnings.
-
-2006-01-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpPatterns.cs : RdpOneOrMore.EmptyTextDeriv() should be "override".
-	  RdpList.EmptyTextDeriv() (which was also virtual incorrectly) was 
-	  removed since the code was in wrong assumption.
-	* Util.cs : debug string now contains data and dataExcept info.
-
-2006-01-15  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpPatterns.cs : lazy evaluate Group branches. If left hand is
-	  notAllowed, the returned value is always NotAllowed, no need to
-	  compute another branch.
-
-2006-01-13  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpObjects.cs, RdpPatterns.cs : introduced "IsContextDependent"
-	  optimization; when a pattern is (namespace) context independent
-	  (almost all cases except for QName validation), new TextDeriv()
-	  overload that takes MemoizationStore memoizes TextDeriv results.
-
-2006-01-12  Atsushi Enomoto <atsushi@ximian.com>
+2005-01-05  Atsushi Enomoto <atsushi@ximian.com>
 
 	* RdpPattern.cs :
-	  Introduced EmptyTextDeriv() so that the results could be memoized.
-
-2006-01-10  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpPatterns.cs :
-	  - Added StartAttDeriv(), EndAttDeriv() and IsTextValueDependent.
-	    (See corresponding changes in RelaxngValidatingReader.cs).
-	  - Added a bunch of derivative method overloads to receive 
-	    MemoizationStore and memoize results efficiently.
-
-2006-01-05  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RdpPatterns.cs :
 	  - Fixed RdpPattern.TextDeriv() and MixedTextDeriv() to not allow 
 	    whitespaces incorrectly.
 	  - Fixed MixedTextDeriv() to not require string argument.
@@ -60,7 +15,7 @@
 	    derivative algorithm (it incorrectly extended to return false
 	    for RELAX NG predefined datatypes).
 
-2006-01-04  Atsushi Enomoto <atsushi@ximian.com>
+2005-01-04  Atsushi Enomoto <atsushi@ximian.com>
 
 	* RdpPattern.cs :
 	  - Implemented textOnlyDeriv and mixedTextDeriv of "memoization".
@@ -73,12 +28,12 @@
 	  - Avoid extra pattern creation with related to empty and notAllowed
 	    as one hand of binary branches.
 
-2006-01-03  Atsushi Enomoto <atsushi@ximian.com>
+2005-01-03  Atsushi Enomoto <atsushi@ximian.com>
 
 	* RdpPattern.cs : reduced RdpFlip instantiation. Share patternPool
 	  only when it does not exist.
 
-2006-01-03  Atsushi Enomoto <atsushi@ximian.com>
+2005-01-03  Atsushi Enomoto <atsushi@ximian.com>
 
 	* Util.cs, RdpPatterns.cs : optimization. Removed extraneous
 	  delegate instantiation. Avoid using enum for HashTable keys.
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpObjects.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpObjects.cs
index 27727056a82..794b383c210 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpObjects.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpObjects.cs
@@ -69,7 +69,7 @@ namespace Commons.Xml.Relaxng.Derivative
 
 	public class RdpDatatype
 	{
-		//RelaxngDatatypeProvider provider;
+		RelaxngDatatypeProvider provider;
 		string localName;
 		string ns;
 		RelaxngDatatype datatype;
@@ -78,7 +78,7 @@ namespace Commons.Xml.Relaxng.Derivative
 		{
 			this.ns = ns;
 			this.localName = localName;
-			//this.provider = provider;
+			this.provider = provider;
 			if (provider == null)
 				provider = RelaxngMergedProvider.DefaultProvider;
 			datatype = provider.GetDatatype (localName, ns, parameters);
@@ -95,15 +95,13 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return localName; }
 		}
 
-		public bool IsContextDependent {
-			get { return datatype.IsContextDependent; }
-		}
-
 		public virtual bool IsAllowed (string value, XmlReader reader)
 		{
 			return datatype.IsValid (value, reader);
 		}
 
+		static char [] wsChars = new char [] {' ', '\n', '\r', '\t'};
+
 		public virtual bool IsTypeEqual (string s1, string s2, XmlReader reader)
 		{
 			return datatype.CompareString (s1, s2, reader);
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
index a729b8db56b..afd3fbc8e8d 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
@@ -125,8 +125,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				return p2;
 			if (p2.PatternType == RelaxngPatternType.NotAllowed)
 				return p1;
-			if (p1 == p2)
-				return p1;
 			// choice-leaves support
 			if (p1.PatternType == RelaxngPatternType.Empty)
 				return MakeChoiceLeaf (p2);
@@ -292,14 +290,6 @@ namespace Commons.Xml.Relaxng.Derivative
 
 		public abstract bool Nullable { get; }
 
-		internal virtual bool IsTextValueDependent {
-			get { return false; }
-		}
-
-		internal virtual bool IsContextDependent {
-			get { return false; }
-		}
-
 		// fills QName collection
 		public void GetLabels (LabelList elements, LabelList attributes)
 		{
@@ -332,36 +322,16 @@ namespace Commons.Xml.Relaxng.Derivative
 			return RdpNotAllowed.Instance;
 		}
 
-		internal virtual RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
-		{
-			return TextDeriv (s, reader);
-		}
-
-		internal virtual RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			return TextDeriv (String.Empty, null, memo);
-		}
-
 		internal virtual RdpPattern TextOnlyDeriv ()
 		{
 			return this;
 		}
 
-		internal virtual RdpPattern TextOnlyDeriv (MemoizationStore store)
-		{
-			return this;
-		}
-
 		internal virtual RdpPattern MixedTextDeriv ()
 		{
 			return RdpNotAllowed.Instance;
 		}
 
-		internal virtual RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			return RdpNotAllowed.Instance;
-		}
-
 		public RdpPattern ListDeriv (string [] list, int index, XmlReader reader)
 		{
 			return listDerivInternal (list, 0, reader);
@@ -437,11 +407,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			return RdpNotAllowed.Instance;
 		}
 
-		internal virtual RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			return StartTagOpenDeriv (name, ns);
-		}
-
 		// attDeriv(ctx, this, att)
 		// attDeriv _ _ _ = NotAllowed
 		public virtual RdpPattern AttDeriv (string name, string ns, string value, XmlReader reader)
@@ -449,26 +414,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			return RdpNotAllowed.Instance;
 		}
 
-		public virtual RdpPattern StartAttDeriv (string name, string ns)
-		{
-			return RdpNotAllowed.Instance;
-		}
-
-		internal virtual RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			return StartAttDeriv (name, ns);
-		}
-
-		public virtual RdpPattern EndAttDeriv ()
-		{
-			return RdpNotAllowed.Instance;
-		}
-
-		internal virtual RdpPattern EndAttDeriv (MemoizationStore memo)
-		{
-			return EndAttDeriv ();
-		}
-
 		public bool ValueMatch (string s, XmlReader reader)
 		{
 			return Nullable && Util.IsWhitespace (s) ||
@@ -480,11 +425,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			return this;
 		}
 
-		internal virtual RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			return StartTagCloseDeriv ();
-		}
-
 		public RdpPattern OneOrMore ()
 		{
 			if (PatternType == RelaxngPatternType.NotAllowed)
@@ -497,11 +437,6 @@ namespace Commons.Xml.Relaxng.Derivative
 		{
 			return RdpNotAllowed.Instance;
 		}
-
-		internal virtual RdpPattern EndTagDeriv (MemoizationStore memo)
-		{
-			return EndTagDeriv ();
-		}
 		#endregion
 	}
 
@@ -518,14 +453,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return true; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return false; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		static RdpEmpty instance;
 		public static RdpEmpty Instance {
 			get { return instance; }
@@ -579,14 +506,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return false; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		public override RdpPattern ApplyAfter (RdpApplyAfterHandler h)
 		{
 			return RdpNotAllowed.Instance;
@@ -639,14 +558,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return true; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return false; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Text; }
 		}
@@ -660,21 +571,11 @@ namespace Commons.Xml.Relaxng.Derivative
 			return this;
 		}
 
-		internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			return this;
-		}
-
 		internal override RdpPattern MixedTextDeriv ()
 		{
 			return this;
 		}
 
-		internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			return this;
-		}
-
 		internal override void MarkReachableDefs () 
 		{
 			// do nothing
@@ -811,32 +712,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			}
 		}
 
-		bool isTextValueDependentComputed;
-		bool isTextValueDependent;
-
-		internal override bool IsTextValueDependent {
-			get {
-				if (!isTextValueDependentComputed) {
-					isTextValueDependent = LValue.IsTextValueDependent || RValue.IsTextValueDependent;
-					isTextValueDependentComputed = true;
-				}
-				return isTextValueDependent;
-			}
-		}
-
-		bool isContextDependentComputed;
-		bool isContextDependent;
-
-		internal override bool IsContextDependent {
-			get {
-				if (!isContextDependentComputed) {
-					isContextDependent = LValue.IsContextDependent || RValue.IsContextDependent;
-					isContextDependentComputed = true;
-				}
-				return isContextDependent;
-			}
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Choice; }
 		}
@@ -899,41 +774,18 @@ namespace Commons.Xml.Relaxng.Derivative
 			return LValue.TextDeriv (s, reader).Choice (RValue.TextDeriv (s, reader));
 		}
 
-		internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
-		{
-			return memo.TextDeriv (LValue, s, reader).Choice (memo.TextDeriv (RValue, s, reader));
-		}
-
-		internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			return memo.EmptyTextDeriv (LValue)
-				.Choice (memo.EmptyTextDeriv (RValue));
-		}
-
 		internal override RdpPattern TextOnlyDeriv ()
 		{
 			return LValue.TextOnlyDeriv ().Choice (
 				RValue.TextOnlyDeriv ());
 		}
 
-		internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
-		{
-			return memo.TextOnlyDeriv (LValue).Choice (
-				memo.TextOnlyDeriv (RValue));
-		}
-
 		internal override RdpPattern MixedTextDeriv ()
 		{
 			return LValue.MixedTextDeriv ().Choice (
 				RValue.MixedTextDeriv ());
 		}
 
-		internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			return memo.MixedTextDeriv (LValue).Choice (
-				memo.MixedTextDeriv (RValue));
-		}
-
 		public override RdpPattern ApplyAfter (RdpApplyAfterHandler handler)
 		{
 //			return handler (LValue).Choice (handler (RValue));
@@ -952,12 +804,6 @@ namespace Commons.Xml.Relaxng.Derivative
 #endif
 		}
 
-		internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern lDeriv = memo.StartTagOpenDeriv (LValue, name, ns);
-			return lDeriv.Choice (memo.StartTagOpenDeriv (RValue, name, ns));
-		}
-
 		// attDeriv cx (Choice p1 p2) att =
 		//  choice (attDeriv cx p1 att) (attDeriv cx p2 att)
 		public override RdpPattern AttDeriv (string name, string ns, string value, XmlReader reader)
@@ -966,28 +812,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				.Choice (RValue.AttDeriv (name, ns, value, reader));
 		}
 
-		public override RdpPattern StartAttDeriv (string name, string ns)
-		{
-			RdpPattern lDeriv = LValue.StartAttDeriv (name, ns);
-			return lDeriv.Choice (RValue.StartAttDeriv (name, ns));
-		}
-
-		internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			return memo.StartAttDeriv (LValue, name, ns)
-				.Choice (memo.StartAttDeriv (RValue, name, ns));
-		}
-
-		public override RdpPattern EndAttDeriv ()
-		{
-			return LValue.EndAttDeriv ().Choice (RValue.EndAttDeriv ());
-		}
-
-		internal override RdpPattern EndAttDeriv (MemoizationStore memo)
-		{
-			return memo.EndAttDeriv (LValue).Choice (memo.EndAttDeriv (RValue));
-		}
-
 		// startTagCloseDeriv (Choice p1 p2) =
 		//  choice (startTagCloseDeriv p1) (startTagCloseDeriv p2)
 		public override RdpPattern StartTagCloseDeriv ()
@@ -996,22 +820,11 @@ namespace Commons.Xml.Relaxng.Derivative
 				.Choice (RValue.StartTagCloseDeriv ());
 		}
 
-		internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			return memo.StartTagCloseDeriv (LValue)
-				.Choice (memo.StartTagCloseDeriv (RValue));
-		}
-
 		public override RdpPattern EndTagDeriv ()
 		{
 			return LValue.EndTagDeriv ().Choice (RValue.EndTagDeriv ());
 		}
 
-		internal override RdpPattern EndTagDeriv (MemoizationStore memo)
-		{
-			return memo.EndTagDeriv (LValue).Choice (memo.EndTagDeriv (RValue));
-		}
-
 		internal override void CheckConstraints (bool attribute, bool oneOrMore, bool oneOrMoreGroup, bool oneOrMoreInterleave, bool list, bool dataExcept)
 		{
 			LValue.CheckConstraints (attribute, oneOrMore, oneOrMoreGroup, oneOrMoreInterleave, list, dataExcept);
@@ -1037,14 +850,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			}
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return LValue.IsTextValueDependent || RValue.IsTextValueDependent; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return LValue.IsContextDependent || RValue.IsContextDependent; }
-		}
-
 		public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
 		{
 			LValue.GetLabels (elements, attributes, collectNameClass);
@@ -1074,40 +879,16 @@ namespace Commons.Xml.Relaxng.Derivative
 				.Choice (LValue.Interleave (RValue.TextDeriv (s, reader)));
 		}
 
-		internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
-		{
-			return memo.TextDeriv (LValue, s, reader).Interleave (RValue)
-				.Choice (LValue.Interleave (memo.TextDeriv (RValue, s, reader)));
-		}
-
-		internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			return memo.EmptyTextDeriv (LValue).Interleave (RValue)
-				.Choice (LValue.Interleave (memo.EmptyTextDeriv (RValue)));
-		}
-
 		internal override RdpPattern TextOnlyDeriv ()
 		{
 			return LValue.TextOnlyDeriv ().Interleave (
 				RValue.TextOnlyDeriv ());
 		}
 
-		internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
-		{
-			return memo.TextOnlyDeriv (LValue).Interleave (
-				memo.TextOnlyDeriv (RValue));
-		}
-
 		internal override RdpPattern MixedTextDeriv ()
 		{
-			return LValue.MixedTextDeriv ().Interleave (RValue).Choice (
-				LValue.Interleave (RValue.MixedTextDeriv ()));
-		}
-
-		internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			return memo.MixedTextDeriv (LValue).Interleave (RValue).Choice (
-				LValue.Interleave (memo.MixedTextDeriv (RValue)));
+			return MakeInterleave (LValue.MixedTextDeriv (), RValue).Choice (
+				MakeInterleave (LValue, RValue.MixedTextDeriv ()));
 		}
 
 		// => choice (applyAfter (flip interleave p2) (startTagOpenDeriv p1 qn)) (applyAfter (interleave p1) (startTagOpenDeriv p2 qn)
@@ -1122,16 +903,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			return choiceL.Choice (choiceR);
 		}
 
-		internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern handledL = memo.StartTagOpenDeriv (LValue, name, ns);
-			RdpPattern handledR = memo.StartTagOpenDeriv (RValue, name, ns);
-			RdpFlip flipL = MakeFlip (RdpUtil.InterleaveFunction, RValue);
-			RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
-			RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Interleave));
-			return choiceL.Choice (choiceR);
-		}
-
 		// attDeriv cx (Interleave p1 p2) att =
 		//  choice (interleave (attDeriv cx p1 att) p2)
 		//         (interleave p1 (attDeriv cx p2 att))
@@ -1143,26 +914,6 @@ namespace Commons.Xml.Relaxng.Derivative
 					RValue.AttDeriv (name, ns, value, reader)));
 		}
 
-		public override RdpPattern StartAttDeriv (string name, string ns)
-		{
-			RdpPattern handledL = LValue.StartAttDeriv (name, ns);
-			RdpPattern handledR = RValue.StartAttDeriv (name, ns);
-			RdpFlip flipL = MakeFlip (RdpUtil.InterleaveFunction, RValue);
-			RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
-			RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Interleave));
-			return choiceL.Choice (choiceR);
-		}
-
-		internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern handledL = memo.StartAttDeriv (LValue, name, ns);
-			RdpPattern handledR = memo.StartAttDeriv (RValue, name, ns);
-			RdpFlip flipL = MakeFlip (RdpUtil.InterleaveFunction, RValue);
-			RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
-			RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Interleave));
-			return choiceL.Choice (choiceR);
-		}
-
 		// startTagCloseDeriv (Interleave p1 p2) =
 		//  interleave (startTagCloseDeriv p1) (startTagCloseDeriv p2)
 		public override RdpPattern StartTagCloseDeriv ()
@@ -1171,12 +922,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				.Interleave (RValue.StartTagCloseDeriv ());
 		}
 
-		internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			return memo.StartTagCloseDeriv (LValue)
-				.Interleave (memo.StartTagCloseDeriv (RValue));
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Interleave; }
 		}
@@ -1219,14 +964,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			}
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return LValue.IsTextValueDependent || (LValue.Nullable ? RValue.IsTextValueDependent : false); }
-		}
-
-		internal override bool IsContextDependent {
-			get { return LValue.IsContextDependent || (LValue.Nullable ? RValue.IsContextDependent : false); }
-		}
-
 		public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
 		{
 			LValue.GetLabels (elements, attributes, collectNameClass);
@@ -1238,43 +975,15 @@ namespace Commons.Xml.Relaxng.Derivative
 
 		public override RdpPattern TextDeriv (string s, XmlReader reader)
 		{
-			RdpPattern p = LValue.TextDeriv (s, reader);
-			p = (p.PatternType == RelaxngPatternType.NotAllowed) ?
-				p : p.Group (RValue);
+			RdpPattern p = LValue.TextDeriv (s, reader).Group (RValue);
 			return LValue.Nullable ?
 				p.Choice (RValue.TextDeriv (s, reader)) : p;
 		}
 
-		internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
-		{
-			RdpPattern p = memo.TextDeriv (LValue, s, reader);
-			p = (p.PatternType == RelaxngPatternType.NotAllowed) ?
-				p : p.Group (RValue);
-			return LValue.Nullable ?
-				p.Choice (memo.TextDeriv (RValue, s, reader)) : p;
-		}
-
-		internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			RdpPattern p = memo.EmptyTextDeriv (LValue);
-			p = p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (RValue);
-			return LValue.Nullable ?
-				p.Choice (memo.EmptyTextDeriv (RValue)) : p;
-		}
-
 		internal override RdpPattern TextOnlyDeriv ()
 		{
-			RdpPattern p = LValue.TextOnlyDeriv ();
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (RValue.TextOnlyDeriv ());
-		}
-
-		internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
-		{
-			RdpPattern p = memo.TextOnlyDeriv (LValue);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (memo.TextOnlyDeriv (RValue));
+			return LValue.TextOnlyDeriv ().Group (
+				RValue.TextOnlyDeriv ());
 		}
 
 		internal override RdpPattern MixedTextDeriv ()
@@ -1284,13 +993,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				p.Choice (RValue.MixedTextDeriv ()) : p;
 		}
 
-		internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			RdpPattern p = memo.MixedTextDeriv (LValue).Group (RValue);
-			return LValue.Nullable ?
-				p.Choice (memo.MixedTextDeriv (RValue)) : p;
-		}
-
 		// startTagOpenDeriv (Group p1 p2) qn =
 		//  let x = applyAfter (flip group p2) (startTagOpenDeriv p1 qn)
 		//  in if nullable p1 then
@@ -1308,17 +1010,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				return x;
 		}
 
-		internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern handled = memo.StartTagOpenDeriv (LValue, name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.GroupFunction, RValue);
-			RdpPattern x = handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
-			if (LValue.Nullable)
-				return x.Choice (memo.StartTagOpenDeriv (RValue, name, ns));
-			else
-				return x;
-		}
-
 		// attDeriv cx (Group p1 p2) att =
 		//  choice (group (attDeriv cx p1 att) p2)
 		//         (group p1 (attDeriv cx p2 att))
@@ -1329,41 +1020,12 @@ namespace Commons.Xml.Relaxng.Derivative
 					RValue.AttDeriv (name, ns, value, reader)));
 		}
 
-		// startAttDeriv (group p1 p2) == startAttDeriv (interleave p1 p2)
-		public override RdpPattern StartAttDeriv (string name, string ns)
-		{
-			RdpPattern handledL = LValue.StartAttDeriv (name, ns);
-			RdpPattern handledR = RValue.StartAttDeriv (name, ns);
-			RdpFlip flipL = MakeFlip (RdpUtil.GroupFunction, RValue);
-			RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
-			RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Group));
-			return choiceL.Choice (choiceR);
-		}
-
-		internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern handledL = memo.StartAttDeriv (LValue, name, ns);
-			RdpPattern handledR = memo.StartAttDeriv (RValue, name, ns);
-			RdpFlip flipL = MakeFlip (RdpUtil.GroupFunction, RValue);
-			RdpPattern choiceL = handledL.ApplyAfter (new RdpApplyAfterHandler (flipL.Apply));
-			RdpPattern choiceR = handledR.ApplyAfter (new RdpApplyAfterHandler (LValue.Group));
-			return choiceL.Choice (choiceR);
-		}
-
 		// startTagCloseDeriv (Group p1 p2) =
 		//  group (startTagCloseDeriv p1) (startTagCloseDeriv p2)
 		public override RdpPattern StartTagCloseDeriv ()
 		{
-			RdpPattern p = LValue.StartTagCloseDeriv ();
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (RValue.StartTagCloseDeriv ());
-		}
-
-		internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			RdpPattern p = memo.StartTagCloseDeriv (LValue);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (memo.StartTagCloseDeriv (RValue));
+			return LValue.StartTagCloseDeriv ()
+				.Group (RValue.StartTagCloseDeriv ());
 		}
 
 		public override RelaxngPatternType PatternType {
@@ -1439,14 +1101,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return Child.Nullable; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return Child.IsTextValueDependent; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return Child.IsContextDependent; }
-		}
-
 		public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
 		{
 			Child.GetLabels (elements, attributes, collectNameClass);
@@ -1471,23 +1125,7 @@ namespace Commons.Xml.Relaxng.Derivative
 
 		public override RdpPattern TextDeriv (string s, XmlReader reader)
 		{
-			RdpPattern p = Child.TextDeriv (s, reader);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (this.Choice (RdpEmpty.Instance));
-		}
-
-		internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
-		{
-			RdpPattern p = memo.TextDeriv (Child, s, reader);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (this.Choice (RdpEmpty.Instance));
-		}
-
-		internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			RdpPattern p = memo.EmptyTextDeriv (Child);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (this.Choice (RdpEmpty.Instance));
+			return Child.TextDeriv (s, reader).Group (this.Choice (RdpEmpty.Instance));
 		}
 
 		internal override RdpPattern TextOnlyDeriv ()
@@ -1495,32 +1133,24 @@ namespace Commons.Xml.Relaxng.Derivative
 			return Child.TextOnlyDeriv ().OneOrMore ();
 		}
 
-		internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
-		{
-			return memo.TextOnlyDeriv (Child).OneOrMore ();
-		}
-
 		internal override RdpPattern MixedTextDeriv ()
 		{
-			RdpPattern p = Child.MixedTextDeriv ();
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (this.Choice (RdpEmpty.Instance));
-		}
-
-		internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			RdpPattern p = memo.MixedTextDeriv (Child);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (this.Choice (RdpEmpty.Instance));
+			return Child.MixedTextDeriv ().Group (
+				this.Choice (RdpEmpty.Instance));
 		}
 
 		// attDeriv cx (OneOrMore p) att =
 		//  group (attDeriv cx p att) (choice (OneOrMore p) Empty)
 		public override RdpPattern AttDeriv (string name, string ns, string value, XmlReader reader)
 		{
-			RdpPattern p = Child.AttDeriv (name, ns, value, reader);
-			return p.PatternType == RelaxngPatternType.NotAllowed ?
-				p : p.Group (Choice (RdpEmpty.Instance));
+#if UseStatic
+			return RdpUtil.Group (
+				RdpUtil.AttDeriv (ctx, children, att),
+				RdpUtil.Choice (RdpUtil.OneOrMore (children), RdpEmpty.Instance));
+#else
+			return Child.AttDeriv (name, ns, value, reader)
+				.Group (Choice (RdpEmpty.Instance));
+#endif
 		}
 
 		// startTagOpenDeriv (OneOrMore p) qn =
@@ -1534,30 +1164,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
 		}
 
-		internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern rest = RdpEmpty.Instance.Choice (Child.OneOrMore ());
-			RdpPattern handled = memo.StartTagOpenDeriv (Child, name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.GroupFunction, rest);
-			return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
-		}
-
-		public override RdpPattern StartAttDeriv (string name, string ns)
-		{
-			RdpPattern rest = RdpEmpty.Instance.Choice (Child.OneOrMore ());
-			RdpPattern handled = Child.StartAttDeriv (name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.GroupFunction, rest);
-			return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
-		}
-
-		internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern rest = RdpEmpty.Instance.Choice (Child.OneOrMore ());
-			RdpPattern handled = memo.StartAttDeriv (Child, name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.GroupFunction, rest);
-			return handled.ApplyAfter (new RdpApplyAfterHandler (f.Apply));
-		}
-
 		// startTagCloseDeriv (OneOrMore p) =
 		//  oneOrMore (startTagCloseDeriv p)
 		public override RdpPattern StartTagCloseDeriv ()
@@ -1570,11 +1176,6 @@ namespace Commons.Xml.Relaxng.Derivative
 #endif
 		}
 
-		internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			return memo.StartTagCloseDeriv (Child).OneOrMore ();
-		}
-
 		internal override void CheckConstraints (bool attribute, bool oneOrMore, bool oneOrMoreGroup, bool oneOrMoreInterleave, bool list, bool dataExcept)
 		{
 			if (dataExcept)
@@ -1609,14 +1210,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return true; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return Child.IsContextDependent; }
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.List; }
 		}
@@ -1668,14 +1261,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return true; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return dt.IsContextDependent; }
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Data; }
 		}
@@ -1796,14 +1381,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return true; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return dt.IsContextDependent; }
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Value; }
 		}
@@ -1817,20 +1394,8 @@ namespace Commons.Xml.Relaxng.Derivative
 			// do nothing
 		}
 
-		string cachedValue;
-		RdpPattern cachedPattern;
-
 		public override RdpPattern TextDeriv (string s, XmlReader reader)
 		{
-			if (s == cachedValue && !IsContextDependent)
-				return cachedPattern;
-			cachedPattern = TextDerivCore (s, reader);
-			cachedValue = s;
-			return cachedPattern;
-		}
-
-		RdpPattern TextDerivCore (string s, XmlReader reader)
-		{
 			if (dt.IsTypeEqual (value, s, reader))
 				return RdpEmpty.Instance;
 			else
@@ -1877,14 +1442,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return false; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Attribute; }
 		}
@@ -1948,29 +1505,12 @@ namespace Commons.Xml.Relaxng.Derivative
 #endif
 		}
 
-		public override RdpPattern StartAttDeriv (string name, string ns)
-		{
-			return nameClass.Contains (name, ns) ?
-				children.After (RdpEmpty.Instance) : RdpNotAllowed.Instance;
-		}
-
-		internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			return nameClass.Contains (name, ns) ?
-				children.After (RdpEmpty.Instance) : RdpNotAllowed.Instance;
-		}
-
 		// startTagCloseDeriv (Attribute _ _) = NotAllowed
 		public override RdpPattern StartTagCloseDeriv ()
 		{
 			return RdpNotAllowed.Instance;
 		}
 
-		internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			return RdpNotAllowed.Instance;
-		}
-
 		internal override void MarkReachableDefs () 
 		{
 			children.MarkReachableDefs ();
@@ -2021,14 +1561,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return false; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		public override RelaxngPatternType PatternType {
 			get { return RelaxngPatternType.Element; }
 		}
@@ -2086,11 +1618,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			return RdpNotAllowed.Instance;
 		}
 
-		internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
-		{
-			return RdpNotAllowed.Instance;
-		}
-
 		public override RdpPattern StartTagOpenDeriv (string name, string ns)
 		{
 #if UseStatic
@@ -2105,13 +1632,6 @@ namespace Commons.Xml.Relaxng.Derivative
 #endif
 		}
 
-		internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			return nameClass.Contains (name, ns) ?
-				children.After (RdpEmpty.Instance) :
-				RdpNotAllowed.Instance;
-		}
-
 		internal override void MarkReachableDefs () 
 		{
 			children.MarkReachableDefs ();
@@ -2145,14 +1665,6 @@ namespace Commons.Xml.Relaxng.Derivative
 			get { return false; }
 		}
 
-		internal override bool IsTextValueDependent {
-			get { return LValue.IsTextValueDependent; }
-		}
-
-		internal override bool IsContextDependent {
-			get { return LValue.IsContextDependent; }
-		}
-
 		public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
 		{
 			LValue.GetLabels (elements, attributes, collectNameClass);
@@ -2163,36 +1675,16 @@ namespace Commons.Xml.Relaxng.Derivative
 			return LValue.TextDeriv (s, reader).After (RValue);
 		}
 
-		internal override RdpPattern TextDeriv (string s, XmlReader reader, MemoizationStore memo)
-		{
-			return memo.TextDeriv (LValue, s, reader).After (RValue);
-		}
-
-		internal override RdpPattern EmptyTextDeriv (MemoizationStore memo)
-		{
-			return memo.EmptyTextDeriv (LValue).After (RValue);
-		}
-
 		internal override RdpPattern TextOnlyDeriv ()
 		{
 			return LValue.TextOnlyDeriv ().After (RValue);
 		}
 
-		internal override RdpPattern TextOnlyDeriv (MemoizationStore memo)
-		{
-			return memo.TextOnlyDeriv (LValue).After (RValue);
-		}
-
 		internal override RdpPattern MixedTextDeriv ()
 		{
 			return LValue.MixedTextDeriv ().After (RValue);
 		}
 
-		internal override RdpPattern MixedTextDeriv (MemoizationStore memo)
-		{
-			return memo.MixedTextDeriv (LValue).After (RValue);
-		}
-
 		// startTagOpenDeriv (After p1 p2) qn =
 		//   applyAfter (flip after p2) (startTagOpenDeriv p1 qn)
 		public override RdpPattern StartTagOpenDeriv (string name, string ns)
@@ -2203,14 +1695,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				f.Apply));
 		}
 
-		internal override RdpPattern StartTagOpenDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern handled = memo.StartTagOpenDeriv (LValue, name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.AfterFunction, RValue);
-			return handled.ApplyAfter (new RdpApplyAfterHandler (
-				f.Apply));
-		}
-
 		public override RdpPattern ApplyAfter (RdpApplyAfterHandler handler)
 		{
 			return LValue.After (handler (RValue));
@@ -2223,37 +1707,11 @@ namespace Commons.Xml.Relaxng.Derivative
 			return LValue.AttDeriv (name, ns, value, reader).After (RValue);
 		}
 
-		public override RdpPattern StartAttDeriv (string name, string ns)
-		{
-			RdpPattern handled = LValue.StartAttDeriv (name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.AfterFunction, RValue);
-			return handled.ApplyAfter (new RdpApplyAfterHandler (
-				f.Apply));
-		}
-
-		internal override RdpPattern StartAttDeriv (string name, string ns, MemoizationStore memo)
-		{
-			RdpPattern handled = memo.StartAttDeriv (LValue, name, ns);
-			RdpFlip f = MakeFlip (RdpUtil.AfterFunction, RValue);
-			return handled.ApplyAfter (new RdpApplyAfterHandler (
-				f.Apply));
-		}
-
-		public override RdpPattern EndAttDeriv ()
-		{
-			return LValue.Nullable ? RValue : RdpNotAllowed.Instance;
-		}
-
 		public override RdpPattern StartTagCloseDeriv ()
 		{
 			return LValue.StartTagCloseDeriv ().After (RValue);
 		}
 
-		internal override RdpPattern StartTagCloseDeriv (MemoizationStore memo)
-		{
-			return memo.StartTagCloseDeriv (LValue).After (RValue);
-		}
-
 		public override RdpPattern EndTagDeriv ()
 		{
 			return LValue.Nullable ? RValue : RdpNotAllowed.Instance;
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/Util.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/Util.cs
index b1274648aab..c8b878d190a 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/Util.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/Util.cs
@@ -91,22 +91,6 @@ namespace Commons.Xml.Relaxng.Derivative
 				intl = DebugRdpPattern (b.LValue, visitedPattern) +
 					DebugRdpPattern (b.RValue, visitedPattern);
 
-			RdpData data = p as RdpData;
-			if (data != null)
-				intl = String.Format ("name={0},ns={1},type={2} {3}",
-					data.Datatype.LocalName,
-					data.Datatype.NamespaceURI,
-					data.Datatype.GetType (),
-					data is RdpDataExcept ? DebugRdpPattern (((RdpDataExcept) data).Except, visitedPattern) : String.Empty);
-
-			RdpValue value = p as RdpValue;
-			if (value != null)
-				intl = String.Format ("name={0},ns={1},value={2} type={3}",
-					value.Datatype.LocalName,
-					value.Datatype.NamespaceURI,
-					value.Value,
-					value.Datatype.GetType ());
-
 			RdpElement el = p as RdpElement;
 			if (el != null)
 				intl = DebugNameClass (el.NameClass) +
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
index 66012174b12..16632d4a8ca 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
@@ -1,58 +1,3 @@
-2006-02-02  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngValidatingReader.cs : removed extra tables.
-
-2006-01-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngValidatingReader.cs : fixed warning.
-
-2006-01-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngValidatingReader.cs : just keep previous TextDeriv() result
-	  for each pattern; they are mostly not reused. It makes validator
-	  about 30% faster in certain validation and reduces memory use.
-
-2006-01-13  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngValidatingReader.cs : actually using Hashtable of Hashtable
-	  (instead of ArrayList of custom MemoizationStart class) is much
-	  better for performance. It makes StartTagOpenDeriv and
-	  StartAttDeriv more than 10x faster than before.
-
-2006-01-13  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngDatatype.cs, RelaxngDefaultDatatypes.cs,
-	  XsdDatatypeProvider.cs, RelaxngValidatingReader.cs :
-	  Memoize TextDeriv() results for context independent inputs.
-
-	  Due to the API freeze they are kept as internal virtual for now.
-
-2006-01-12  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngValidatingReader.cs : Use RdpPattern.EmptyTextDeriv(). It
-	  significantly improves performance wrt empty text nodes.
-
-2006-01-10  Atsushi Enomoto <atsushi@ximian.com>
-
-	* RelaxngValidatingReader.cs :
-	  - Split memoization support things into MemoizationStore class.
-	  - Split single memo ArrayList into a couple of Hashtables and 
-	    ArrayLists which memoize each kind of derivative results.
-	  - Introduced StartAttDeriv() and EndAttDeriv() to replace AttDeriv()
-	    and memoize results efficiently. It is textually written in the
-	    "derivative algorithm", but not formally specified.
-	  - Introduced IsTextValueDependent and EmptyTextDeriv() to 
-	    differentiate those patterns which results differ depending on
-	    the text value and those which doesn't.
-	    Those EmptyTextDeriv results are memoized.
-
-2006-01-10  Atsushi Enomoto <atsushi@ximian.com>
-
-	* Misc.cs : NormalizeWhitespace() was creating extraneous char[] and
-	  it could be heavily called depending on patterns.
-	* RelaxngDefaultDatatypes.cs : avoid extraneous call to
-	  NormalizeWhitespace().
-
 2006-01-05  Atsushi Enomoto <atsushi@ximian.com>
 
 	* RelaxngValidatingReader.cs :
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/Misc.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/Misc.cs
index bc51d78bf96..f8e16f71b18 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/Misc.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/Misc.cs
@@ -33,7 +33,6 @@
 using System;
 using System.Collections;
 using System.IO;
-using System.Text;
 using System.Xml;
 using Commons.Xml.Relaxng.Derivative;
 
@@ -46,42 +45,28 @@ namespace Commons.Xml.Relaxng
 			if (s.Length == 0)
 				return s;
 
-			StringBuilder sb = null;
-			int noSpaceIndex = 0;
-			bool inSpace = false;
-
-			for (int i = 0; i < s.Length; i++) {
-				switch (s [i]) {
+			char [] ca = s.ToCharArray ();
+			int j = 0;
+			for (int i = 0; i < ca.Length; i++) {
+				switch (ca [i]) {
 				case ' ':
 				case '\r':
 				case '\t':
 				case '\n':
-					if (inSpace)
-						continue;
-					if (sb == null)
-						sb = new StringBuilder (s.Length);
-					if (noSpaceIndex < i) {
-						if (sb.Length > 0)
-							sb.Append (' ');
-						sb.Append (s, noSpaceIndex, i - noSpaceIndex);
-					}
-					inSpace = true;
+					if (j == 0)
+						break;
+					if (ca [j - 1] != ' ')
+						ca [j++] = ' ';
 					break;
 				default:
-					if (inSpace) {
-						noSpaceIndex = i;
-						inSpace = false;
-					}
+					ca [j++] = ca [i];
 					break;
 				}
 			}
-			if (sb == null)
-				return s;
-			if (!inSpace && noSpaceIndex < s.Length) {
-				sb.Append (' ');
-				sb.Append (s, noSpaceIndex, s.Length - noSpaceIndex);
-			}
-			return sb.ToString ();
+			if (j == 0)
+				return String.Empty;
+			string r = new string (ca, 0, (ca [j - 1] != ' ') ? j : j - 1);
+			return r;
 		}
 
 		public static bool IsWhitespace (string s)
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDatatype.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDatatype.cs
index 5f57702eab6..b59a8635456 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDatatype.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDatatype.cs
@@ -38,11 +38,6 @@ namespace Commons.Xml.Relaxng
 		public abstract string Name { get; }
 		public abstract string NamespaceURI { get; }
 
-		internal virtual bool IsContextDependent {
-			// safe default value
-			get { return true; }
-		}
-
 		public abstract object Parse (string text, XmlReader reader);
 
 		public virtual bool Compare (object o1, object o2)
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDefaultDatatypes.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDefaultDatatypes.cs
index 4d31c481235..04adc51ee4b 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDefaultDatatypes.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngDefaultDatatypes.cs
@@ -48,10 +48,6 @@ namespace Commons.Xml.Relaxng
 		public override string Name { get { return "string"; } }
 		public override string NamespaceURI { get { return String.Empty; } }
 
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		public override bool IsValid (string text, XmlReader reader)
 		{
 			return true;
@@ -83,10 +79,6 @@ namespace Commons.Xml.Relaxng
 		public override string Name { get { return "token"; } }
 		public override string NamespaceURI { get { return String.Empty; } }
 
-		internal override bool IsContextDependent {
-			get { return false; }
-		}
-
 		public override bool IsValid (string text, XmlReader reader)
 		{
 			return true;
@@ -97,55 +89,10 @@ namespace Commons.Xml.Relaxng
 			return Util.NormalizeWhitespace (text);
 		}
 
-		int SkipWhitespaces (string s, int i)
-		{
-			while (i < s.Length) {
-				switch (s [i]) {
-				case '\n': case '\r': case ' ': case '\t':
-					i++;
-					continue;
-				}
-				break;
-			}
-			return i;
-		}
-
 		public override bool Compare (object o1, object o2)
 		{
-			string s1 = o1 as string;
-			string s2 = o2 as string;
-
-			int i1 = 0;
-			int i2 = 0;
-
-			while (i1 < s1.Length && i2 < s2.Length) {
-				i1 = SkipWhitespaces (s1, i1);
-				i2 = SkipWhitespaces (s2, i2);
-				while (i1 < s1.Length && i2 < s2.Length) {
-					if (s1 [i1] != s2 [i2])
-						return false;
-					i1++;
-					i2++;
-					if (i1 == s1.Length || i2 == s2.Length)
-						break;
-					if (XmlChar.IsWhitespace (s1 [i1])) {
-						if (!XmlChar.IsWhitespace (s2 [i2]))
-							return false;
-						else
-							break;
-					}
-					else if (XmlChar.IsWhitespace (s2 [i2]))
-						return false;
-				}
-			}
-			i1 = SkipWhitespaces (s1, i1);
-			i2 = SkipWhitespaces (s2, i2);
-			return i1 == s1.Length && i2 == s2.Length;
-		}
-
-		public override bool CompareString (string s1, string s2, XmlReader reader)
-		{
-			return Compare (s1, s2);
+			return Util.NormalizeWhitespace ((string) o1) == 
+				Util.NormalizeWhitespace ((string) o2);
 		}
 	}
 }
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngValidatingReader.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngValidatingReader.cs
index d639a8c1094..56a23466e17 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngValidatingReader.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngValidatingReader.cs
@@ -68,6 +68,11 @@ namespace Commons.Xml.Relaxng
 		RelaxngPattern pattern;
 		RdpPattern vState;
 		RdpPattern prevState;	// Mainly for debugging.
+		ArrayList PredefinedAttributes = new ArrayList ();
+		bool labelsComputed;
+		Hashtable elementLabels = new Hashtable ();
+		Hashtable attributeLabels = new Hashtable ();
+		bool isEmptiable;
 		bool roughLabelCheck;
 		ArrayList strictCheckCache;
 		bool reportDetails;
@@ -363,6 +368,10 @@ namespace Commons.Xml.Relaxng
 		{
 			PrepareState ();
 
+			labelsComputed = false;
+			elementLabels.Clear ();
+			attributeLabels.Clear ();
+
 			bool ret = reader.Read ();
 
 			// Process pending text node validation if required.
@@ -378,7 +387,7 @@ namespace Commons.Xml.Relaxng
 				inContent = true;
 				// StartTagOpenDeriv
 				prevState = vState;
-				vState = memo.StartTagOpenDeriv (vState,
+				vState = StartTagOpenDeriv (vState,
 					reader.LocalName, reader.NamespaceURI);
 				if (vState.PatternType == RelaxngPatternType.NotAllowed)
 					throw CreateValidationError (String.Format ("Invalid start tag found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), true);
@@ -392,36 +401,16 @@ namespace Commons.Xml.Relaxng
 
 						prevState = vState;
 						string attrNS = reader.NamespaceURI;
-
-#if false // old code
-
 						vState = vState.AttDeriv (reader.LocalName, attrNS, reader.GetAttribute (reader.LocalName, attrNS), this);
-						if (vState == RdpNotAllowed.Instance)
-							throw CreateValidationError (String.Format ("Invalid attribute found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), false);
-
-#else
-
-						prevState = vState;
-						vState = memo.StartAttDeriv (vState, reader.LocalName, attrNS);
-						if (vState == RdpNotAllowed.Instance)
+						if (vState.PatternType == RelaxngPatternType.NotAllowed)
 							throw CreateValidationError (String.Format ("Invalid attribute found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), false);
-						prevState = vState;
-						vState = memo.TextOnlyDeriv (vState);
-						vState = TextDeriv (vState, reader.Value, reader);
-						if (Util.IsWhitespace (reader.Value))
-							vState = vState.Choice (prevState);
-						vState = memo.EndAttDeriv (vState);
-						if (vState == RdpNotAllowed.Instance)
-							throw CreateValidationError (String.Format ("Invalid attribute value is found. Value = '{0}'", reader.Value), false);
-
-#endif
 					} while (reader.MoveToNextAttribute ());
 					MoveToElement ();
 				}
 
 				// StarTagCloseDeriv
 				prevState = vState;
-				vState = memo.StartTagCloseDeriv (vState);
+				vState = StartTagCloseDeriv (vState);
 				if (vState.PatternType == RelaxngPatternType.NotAllowed)
 					throw CreateValidationError (String.Format ("Invalid start tag closing found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), false);
 
@@ -436,7 +425,7 @@ namespace Commons.Xml.Relaxng
 					inContent = false;
 				// EndTagDeriv
 				prevState = vState;
-				vState = memo.EndTagDeriv (vState);
+				vState = EndTagDeriv (vState);
 				if (vState.PatternType == RelaxngPatternType.NotAllowed)
 					throw CreateValidationError (String.Format ("Invalid end tag found. LocalName = {0}, NS = {1}.", reader.LocalName, reader.NamespaceURI), true);
 				break;
@@ -461,14 +450,6 @@ namespace Commons.Xml.Relaxng
 			return ret;
 		}
 
-		RdpPattern TextDeriv (RdpPattern p, string value, XmlReader context)
-		{
-			if (value.Length > 0 && p.IsTextValueDependent)
-				return memo.TextDeriv (p, value, context);
-			else
-				return memo.EmptyTextDeriv (p);
-		}
-
 		void ValidateText (bool remain)
 		{
 			RdpPattern ts = vState;
@@ -481,8 +462,8 @@ namespace Commons.Xml.Relaxng
 			case XmlNodeType.Element:
 				startElementDepth = -1;
 				if (!Util.IsWhitespace (cachedValue)) {
-					ts = memo.MixedTextDeriv (ts);
-					ts = TextDeriv (ts, cachedValue, reader);
+					ts = MixedTextDeriv (ts);
+					ts = ts.TextDeriv (cachedValue, reader);
 				}
 				break;
 			default:
@@ -518,167 +499,125 @@ namespace Commons.Xml.Relaxng
 
 		RdpPattern ValidateTextOnlyCore ()
 		{
-			RdpPattern ts = memo.TextOnlyDeriv (vState);
-			ts = TextDeriv (ts, cachedValue, reader);
+			RdpPattern ts = TextOnlyDeriv (vState);
+			ts = ts.TextDeriv (cachedValue, reader);
 			if (Util.IsWhitespace (cachedValue))
-				ts = vState.Choice (ts);
+				ts = vState.MakeChoice (ts, vState);
 			return ts;
 		}
 
-		MemoizationStore memo = new MemoizationStore ();
-	}
+		#region Memoization support
 
-	#region Memoization support
-	internal class MemoizationStore
-	{
-		Hashtable startOpen = new Hashtable ();
-		Hashtable startClose = new Hashtable ();
-		Hashtable startAtt = new Hashtable ();
-		Hashtable endTag = new Hashtable ();
-		Hashtable endAtt = new Hashtable ();
-		Hashtable textOnly = new Hashtable ();
-		Hashtable mixedText = new Hashtable ();
-		Hashtable emptyText = new Hashtable ();
-		Hashtable text = new Hashtable ();
-		Hashtable text_value = new Hashtable ();
-		Hashtable qnames = new Hashtable ();
+		ArrayList memo = new ArrayList ();
 
 		enum DerivativeType {
 			StartTagOpen,
-			StartAtt,
 			StartTagClose,
 			EndTag,
-			EndAtt,
 			Mixed,
 			TextOnly
 		}
 
-		XmlQualifiedName GetQName (string local, string ns)
+		class Memoization
 		{
-			Hashtable nst = qnames [ns] as Hashtable;
-			if (nst == null) {
-				nst = new Hashtable ();
-				qnames [ns] = nst;
-			}
-			XmlQualifiedName qn = nst [local] as XmlQualifiedName;
-			if (qn == null) {
-				qn = new XmlQualifiedName (local, ns);
-				nst [local] = qn;
+			public Memoization (DerivativeType type, RdpPattern input, RdpPattern output)
+			{
+				Type = type;
+				Input = input;
+				Output = output;
 			}
-			return qn;
-		}
 
-		public RdpPattern StartTagOpenDeriv (RdpPattern p, string local, string ns)
-		{
-			Hashtable h = startOpen [p] as Hashtable;
-			if (h == null) {
-				h = new Hashtable ();
-				startOpen [p] = h;
-			}
-			XmlQualifiedName qn = GetQName (local, ns);
-			RdpPattern m = h [qn] as RdpPattern;
-			if (m == null) {
-				m = p.StartTagOpenDeriv (local, ns, this);
-				h [qn] = m;
-			}
-			return m;
+			public readonly DerivativeType Type;
+			public readonly RdpPattern Input;
+			public readonly RdpPattern Output;
 		}
 
-		public RdpPattern StartAttDeriv (RdpPattern p, string local, string ns)
+		class MemoizationStartTagOpen : Memoization
 		{
-			Hashtable h = startAtt [p] as Hashtable;
-			if (h == null) {
-				h = new Hashtable ();
-				startAtt [p] = h;
-			}
-			XmlQualifiedName qn = GetQName (local, ns);
-			RdpPattern m = h [qn] as RdpPattern;
-			if (m == null) {
-				m = p.StartAttDeriv (local, ns, this);
-				h [qn] = m;
+			public MemoizationStartTagOpen (string name, string ns, RdpPattern input, RdpPattern output)
+				: base (DerivativeType.StartTagOpen, input, output)
+			{
+				Name = name;
+				NS = ns;
 			}
-			return m;
-		}
-
-		public RdpPattern StartTagCloseDeriv (RdpPattern p)
-		{
-			RdpPattern m = startClose [p] as RdpPattern;
-			if (m != null)
-				return m;
 
-			m = p.StartTagCloseDeriv (this);
-			startClose [p] = m;
-			return m;
+			public readonly string Name;
+			public readonly string NS;
 		}
 
-		public RdpPattern EndTagDeriv (RdpPattern p)
+		RdpPattern StartTagOpenDeriv (RdpPattern p, string local, string ns)
 		{
-			RdpPattern m = endTag [p] as RdpPattern;
-			if (m != null)
-				return m;
+			for (int i = 0; i < memo.Count; i++) {
+				Memoization tag = (Memoization) memo [i];
+				if (tag.Type != DerivativeType.StartTagOpen)
+					continue;
+				MemoizationStartTagOpen sto =
+					tag as MemoizationStartTagOpen;
+				if (sto.Input == p &&
+				    object.ReferenceEquals (sto.Name, local) &&
+				    object.ReferenceEquals (sto.NS, ns))
+					return tag.Output;
+			}
 
-			m = p.EndTagDeriv (this);
-			endTag [p] = m;
+			RdpPattern m = p.StartTagOpenDeriv (local, ns);
+			memo.Add (new MemoizationStartTagOpen (local, ns, p, m));
 			return m;
 		}
 
-		public RdpPattern EndAttDeriv (RdpPattern p)
+		RdpPattern StartTagCloseDeriv (RdpPattern p)
 		{
-			RdpPattern m = endAtt [p] as RdpPattern;
-			if (m != null)
-				return m;
+			for (int i = 0; i < memo.Count; i++) {
+				Memoization tag = (Memoization) memo [i];
+				if (tag.Type == DerivativeType.StartTagClose && tag.Input == p)
+					return tag.Output;
+			}
 
-			m = p.EndAttDeriv (this);
-			endAtt [p] = m;
+			RdpPattern m = p.StartTagCloseDeriv ();
+			memo.Add (new Memoization (
+					DerivativeType.StartTagClose, p, m));
 			return m;
 		}
 
-		public RdpPattern MixedTextDeriv (RdpPattern p)
+		RdpPattern EndTagDeriv (RdpPattern p)
 		{
-			RdpPattern m = mixedText [p] as RdpPattern;
-			if (m != null)
-				return m;
+			for (int i = 0; i < memo.Count; i++) {
+				Memoization tag = (Memoization) memo [i];
+				if (tag.Type == DerivativeType.EndTag && tag.Input == p)
+					return tag.Output;
+			}
 
-			m = p.MixedTextDeriv (this);
-			mixedText [p] = m;
+			RdpPattern m = p.EndTagDeriv ();
+			memo.Add (new Memoization (DerivativeType.EndTag, p, m));
 			return m;
 		}
 
-		public RdpPattern TextOnlyDeriv (RdpPattern p)
+		RdpPattern MixedTextDeriv (RdpPattern p)
 		{
-			RdpPattern m = textOnly [p] as RdpPattern;
-			if (m != null)
-				return m;
+			for (int i = 0; i < memo.Count; i++) {
+				Memoization tag = (Memoization) memo [i];
+				if (tag.Type == DerivativeType.Mixed && tag.Input == p)
+					return tag.Output;
+			}
 
-			m = p.TextOnlyDeriv (this);
-			textOnly [p] = m;
+			RdpPattern m = p.MixedTextDeriv ();
+			memo.Add (new Memoization (DerivativeType.Mixed, p, m));
 			return m;
 		}
 
-		public RdpPattern TextDeriv (RdpPattern p, string value, XmlReader context)
+		RdpPattern TextOnlyDeriv (RdpPattern p)
 		{
-			if (p.IsContextDependent)
-				return p.TextDeriv (value, context);
+			for (int i = 0; i < memo.Count; i++) {
+				Memoization tag = (Memoization) memo [i];
+				if (tag.Type == DerivativeType.TextOnly && tag.Input == p)
+					return tag.Output;
+			}
 
-			if (Object.ReferenceEquals (text_value [p], value))
-				return text [p] as RdpPattern;
-			RdpPattern m = p.TextDeriv (value, context, this);
-			text_value [p] = value;
-			text [p] = m;
+			RdpPattern m = p.TextOnlyDeriv ();
+			memo.Add (new Memoization (DerivativeType.TextOnly, p, m));
 			return m;
 		}
 
-		public RdpPattern EmptyTextDeriv (RdpPattern p)
-		{
-			RdpPattern m = emptyText [p] as RdpPattern;
-			if (m != null)
-				return m;
-
-			m = p.EmptyTextDeriv (this);
-			emptyText [p] = m;
-			return m;
-		}
+		#endregion
 	}
-	#endregion
 }
 
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/XsdDatatypeProvider.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/XsdDatatypeProvider.cs
index 7e736cf4515..cfb8fa81e18 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/XsdDatatypeProvider.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/XsdDatatypeProvider.cs
@@ -197,10 +197,6 @@ namespace Commons.Xml.Relaxng.XmlSchema
 			get { return type.QualifiedName.Namespace; }
 		}
 
-		internal override bool IsContextDependent {
-			get { return type.Datatype != null && type.Datatype.TokenizedType == XmlTokenizedType.QName; }
-		}
-
 		public override object Parse (string value, XmlReader reader)
 		{
 			// Now we create XmlValidatingReader to handle
@@ -233,10 +229,6 @@ namespace Commons.Xml.Relaxng.XmlSchema
 			dt = xstype;
 		}
 
-		internal override bool IsContextDependent {
-			get { return dt.TokenizedType == XmlTokenizedType.QName; }
-		}
-
 		public override string Name {
 			get { return name; }
 		}
@@ -268,10 +260,6 @@ namespace Commons.Xml.Relaxng.XmlSchema
 			get { return "http://www.w3.org/2001/XMLSchema-datatypes"; }
 		}
 
-		internal override bool IsContextDependent {
-			get { return true; }
-		}
-
 		public override object Parse (string s, XmlReader reader) 
 		{
 			int colonAt = s.IndexOf (':');
diff --git a/mcs/class/I18N/CJK/Big5Convert.cs b/mcs/class/I18N/CJK/Big5Convert.cs
new file mode 100644
index 00000000000..5db8d5300c6
--- /dev/null
+++ b/mcs/class/I18N/CJK/Big5Convert.cs
@@ -0,0 +1,29 @@
+//
+// I18N.CJK.Big5Convert
+//
+// Author:
+//   Alan Tam Siu Lung (Tam@SiuLung.com)
+//
+
+using System;
+
+namespace I18N.CJK
+{
+	internal sealed class Big5Convert : DbcsConvert
+	{
+		// Dummy constructor, no one is aupposed to call it
+		private Big5Convert() : base("big5.table") {}
+		
+		// The one and only Big5 conversion object in the system.
+		private static DbcsConvert convert;
+		
+		// Get the primary Big5 conversion object.
+		public static DbcsConvert Convert
+		{
+			get {
+				if (convert == null) convert = new DbcsConvert("big5.table");
+				return convert;
+			}
+		}
+	}
+}
diff --git a/mcs/class/I18N/CJK/CP51932.cs b/mcs/class/I18N/CJK/CP51932.cs
index bffb15ba77b..fcf9e828006 100644
--- a/mcs/class/I18N/CJK/CP51932.cs
+++ b/mcs/class/I18N/CJK/CP51932.cs
@@ -65,7 +65,7 @@ public class CP51932 : MonoEncoding
 	private const int EUC_JP_CODE_PAGE = 51932;
 
 	// Constructor.
-	public CP51932 () : base (EUC_JP_CODE_PAGE, 932)
+	public CP51932 () : base (EUC_JP_CODE_PAGE)
 	{
 	}
 
@@ -75,11 +75,6 @@ public class CP51932 : MonoEncoding
 		return new CP51932Encoder (this).GetByteCount (chars, index, length, true);
 	}
 
-	public unsafe override int GetByteCountImpl (char* chars, int count)
-	{
-		return new CP51932Encoder (this).GetByteCountImpl (chars, count, true);
-	}
-
 	public unsafe override int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount)
 	{
 		return new CP51932Encoder (this).GetBytesImpl (chars, charCount, bytes, byteCount, true);
@@ -186,10 +181,15 @@ public class CP51932 : MonoEncoding
 	public override String WebName {
 		get { return "euc-jp"; }
 	}
+
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage {
+		get { return EUC_JP_CODE_PAGE; }
+	}
 } // CP51932
 #endif // !ECMA_COMPAT
 
-public class CP51932Encoder : MonoEncoder
+public class CP51932Encoder : MonoEncoding.MonoEncoder
 {
 	public CP51932Encoder (MonoEncoding encoding)
 		: base (encoding)
@@ -197,11 +197,22 @@ public class CP51932Encoder : MonoEncoder
 	}
 
 	// Get the number of bytes needed to encode a character buffer.
-	public unsafe override int GetByteCountImpl (
-		char* chars, int count, bool refresh)
+	public override int GetByteCount (
+		char [] chars, int index, int count, bool refresh)
 	{
+		// Validate the parameters.
+		if (chars == null)
+			throw new ArgumentNullException("chars");
+
+		if (index < 0 || index > chars.Length)
+			throw new ArgumentOutOfRangeException
+				("index", Strings.GetString ("ArgRange_Array"));
+
+		if (count < 0 || count > (chars.Length - index))
+			throw new ArgumentOutOfRangeException
+				("count", Strings.GetString ("ArgRange_Array"));
+
 		// Determine the length of the final output.
-		int index = 0;
 		int length = 0;
 		int ch, value;
 		byte [] cjkToJis = JISConvert.Convert.cjkToJis;
@@ -255,6 +266,9 @@ public class CP51932Encoder : MonoEncoder
 	{
 		int charIndex = 0;
 		int byteIndex = 0;
+#if NET_2_0
+		EncoderFallbackBuffer buffer = null;
+#endif
 
 		// Convert the characters into their byte form.
 		int posn = byteIndex;
@@ -331,13 +345,8 @@ public class CP51932Encoder : MonoEncoder
 	}
 } // CP51932Encoder
 
-internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
+public class CP51932Decoder : Decoder
 {
-	public CP51932Decoder ()
-		: base (null)
-	{
-	}
-
 	int last_count, last_bytes;
 
 	// Get the number of characters needed to decode a byte buffer.
@@ -353,7 +362,19 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
 #endif
 	int GetCharCount (byte [] bytes, int index, int count, bool refresh)
 	{
-		CheckRange (bytes, index, count);
+		// Validate the parameters.
+		if (bytes == null)
+			throw new ArgumentNullException ("bytes");
+
+		if (index < 0 || index > bytes.Length)
+			throw new ArgumentOutOfRangeException
+				("index", Strings.GetString("ArgRange_Array"));
+
+		if (count < 0 || count > (bytes.Length - index))
+			throw new ArgumentOutOfRangeException
+				("count", Strings.GetString("ArgRange_Array"));
+
+
 
 		// Determine the total length of the converted string.
 		int value = 0;
@@ -463,7 +484,30 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
 						 int byteCount, char[] chars,
 						 int charIndex, bool refresh)
 	{
-		CheckRange (bytes, byteIndex, byteCount, chars, charIndex);
+		// Validate the parameters.
+		if(bytes == null)
+		{
+			throw new ArgumentNullException("bytes");
+		}
+		if(chars == null)
+		{
+			throw new ArgumentNullException("chars");
+		}
+		if(byteIndex < 0 || byteIndex > bytes.Length)
+		{
+			throw new ArgumentOutOfRangeException
+				("byteIndex", Strings.GetString("ArgRange_Array"));
+		}
+		if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+		{
+			throw new ArgumentOutOfRangeException
+				("byteCount", Strings.GetString("ArgRange_Array"));
+		}
+		if(charIndex < 0 || charIndex > chars.Length)
+		{
+			throw new ArgumentOutOfRangeException
+				("charIndex", Strings.GetString("ArgRange_Array"));
+		}
 
 		// Decode the bytes in the buffer.
 		int posn = charIndex;
diff --git a/mcs/class/I18N/CJK/CP932.cs b/mcs/class/I18N/CJK/CP932.cs
index e5f81aa7ca8..0e85296279a 100644
--- a/mcs/class/I18N/CJK/CP932.cs
+++ b/mcs/class/I18N/CJK/CP932.cs
@@ -29,423 +29,471 @@
 namespace I18N.CJK
 {
 
-	using System;
-	using System.Text;
-	using I18N.Common;
+using System;
+using System.Text;
+using I18N.Common;
 
-	[Serializable]
-	public unsafe class CP932 : MonoEncoding
-	{
-		// Magic number used by Windows for the Shift-JIS code page.
-		private const int SHIFTJIS_CODE_PAGE = 932;
-
-		// Constructor.
-		public CP932() : base(SHIFTJIS_CODE_PAGE)
-		{
-		}
+[Serializable]
+public unsafe class CP932 : MonoEncoding
+{
+	// Magic number used by Windows for the Shift-JIS code page.
+	private const int SHIFTJIS_CODE_PAGE = 932;
 
-		// Get the number of bytes needed to encode a character buffer.
-		public unsafe override int GetByteCountImpl (char* chars, int count)
-		{
-			int index = 0;
+	// Constructor.
+	public CP932() : base(SHIFTJIS_CODE_PAGE)
+	{
+	}
 
-			// Determine the length of the final output.
-			int length = 0;
-			int ch, value;
-#if __PNET__
-			byte *cjkToJis = JISConvert.Convert.cjkToJis;
-			byte *extraToJis = JISConvert.Convert.extraToJis;
-#else
-			byte[] cjkToJis = JISConvert.Convert.cjkToJis;
-			byte[] extraToJis = JISConvert.Convert.extraToJis;
-#endif
-			while(count > 0)
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
 			{
-				ch = chars[index++];
-				--count;
-				++length;
-				if(ch < 0x0080)
+				// Validate the parameters.
+				if(chars == null)
 				{
-					// Character maps to itself.
-					continue;
+					throw new ArgumentNullException("chars");
 				}
-				else if(ch < 0x0100)
+				if(index < 0 || index > chars.Length)
 				{
-					// Check for special Latin 1 characters that
-					// can be mapped to double-byte code points.
-					if(ch == 0x00A2 || ch == 0x00A3 || ch == 0x00A7 ||
-					   ch == 0x00A8 || ch == 0x00AC || ch == 0x00B0 ||
-					   ch == 0x00B1 || ch == 0x00B4 || ch == 0x00B6 ||
-					   ch == 0x00D7 || ch == 0x00F7)
-					{
-						++length;
-					}
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
 				}
-				else if(ch >= 0x0391 && ch <= 0x0451)
+				if(count < 0 || count > (chars.Length - index))
 				{
-					// Greek subset characters.
-					++length;
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
 				}
-				else if(ch >= 0x2010 && ch <= 0x9FA5)
+
+				// Determine the length of the final output.
+				int length = 0;
+				int ch, value;
+#if __PNET__
+				byte *cjkToJis = JISConvert.Convert.cjkToJis;
+				byte *extraToJis = JISConvert.Convert.extraToJis;
+#else
+				byte[] cjkToJis = JISConvert.Convert.cjkToJis;
+				byte[] extraToJis = JISConvert.Convert.extraToJis;
+#endif
+				while(count > 0)
 				{
-					// This range contains the bulk of the CJK set.
-					value = (ch - 0x2010) * 2;
-					value = ((int)(cjkToJis[value])) |
-							(((int)(cjkToJis[value + 1])) << 8);
-					if(value >= 0x0100)
+					ch = chars[index++];
+					--count;
+					++length;
+					if(ch < 0x0080)
+					{
+						// Character maps to itself.
+						continue;
+					}
+					else if(ch < 0x0100)
+					{
+						// Check for special Latin 1 characters that
+						// can be mapped to double-byte code points.
+						if(ch == 0x00A2 || ch == 0x00A3 || ch == 0x00A7 ||
+						   ch == 0x00A8 || ch == 0x00AC || ch == 0x00B0 ||
+						   ch == 0x00B1 || ch == 0x00B4 || ch == 0x00B6 ||
+						   ch == 0x00D7 || ch == 0x00F7)
+						{
+							++length;
+						}
+					}
+					else if(ch >= 0x0391 && ch <= 0x0451)
 					{
+						// Greek subset characters.
 						++length;
 					}
-				}
-				else if(ch >= 0xE000 && ch <= 0xE757)
-					// PrivateUse
-					++length;
-				else if(ch >= 0xFF01 && ch <= 0xFFEF)
-				{
-					// This range contains extra characters,
-					// including half-width katakana.
-					value = (ch - 0xFF01) * 2;
-					value = ((int)(extraToJis[value])) |
-							(((int)(extraToJis[value + 1])) << 8);
-					if(value >= 0x0100)
+					else if(ch >= 0x2010 && ch <= 0x9FA5)
 					{
+						// This range contains the bulk of the CJK set.
+						value = (ch - 0x2010) * 2;
+						value = ((int)(cjkToJis[value])) |
+								(((int)(cjkToJis[value + 1])) << 8);
+						if(value >= 0x0100)
+						{
+							++length;
+						}
+					}
+					else if(ch >= 0xE000 && ch <= 0xE757)
+						// PrivateUse
 						++length;
+					else if(ch >= 0xFF01 && ch <= 0xFFEF)
+					{
+						// This range contains extra characters,
+						// including half-width katakana.
+						value = (ch - 0xFF01) * 2;
+						value = ((int)(extraToJis[value])) |
+								(((int)(extraToJis[value + 1])) << 8);
+						if(value >= 0x0100)
+						{
+							++length;
+						}
 					}
 				}
-			}
 
-			// Return the length to the caller.
-			return length;
-		}
+				// Return the length to the caller.
+				return length;
+			}
 
-		// Get the bytes that result from encoding a character buffer.
-		public unsafe override int GetBytesImpl (
-			char* chars, int charCount, byte* bytes, int byteCount)
-		{
-			int charIndex = 0;
-			int byteIndex = 0;
+	// Get the bytes that result from encoding a character buffer.
+	public unsafe override int GetBytesImpl (
+		char* chars, int charCount, byte* bytes, int byteCount)
+			{
+				int charIndex = 0;
+				int byteIndex = 0;
 #if NET_2_0
-			EncoderFallbackBuffer buffer = null;
+				EncoderFallbackBuffer buffer = null;
 #endif
 
-			// Convert the characters into their byte form.
-			int posn = byteIndex;
-			int byteLength = byteCount;
-			int ch, value;
+				// Convert the characters into their byte form.
+				int posn = byteIndex;
+				int byteLength = byteCount;
+				int ch, value;
 #if __PNET__
-			byte *cjkToJis = JISConvert.Convert.cjkToJis;
-			byte *greekToJis = JISConvert.Convert.greekToJis;
-			byte *extraToJis = JISConvert.Convert.extraToJis;
+				byte *cjkToJis = JISConvert.Convert.cjkToJis;
+				byte *greekToJis = JISConvert.Convert.greekToJis;
+				byte *extraToJis = JISConvert.Convert.extraToJis;
 #else
-			byte[] cjkToJis = JISConvert.Convert.cjkToJis;
-			byte[] greekToJis = JISConvert.Convert.greekToJis;
-			byte[] extraToJis = JISConvert.Convert.extraToJis;
+				byte[] cjkToJis = JISConvert.Convert.cjkToJis;
+				byte[] greekToJis = JISConvert.Convert.greekToJis;
+				byte[] extraToJis = JISConvert.Convert.extraToJis;
 #endif
-			while(charCount > 0)
-			{
-				ch = chars[charIndex++];
-				--charCount;
-				if(posn >= byteLength)
-				{
-					throw new ArgumentException
-						(Strings.GetString("Arg_InsufficientSpace"),
-						 "bytes");
-				}
-				if(ch < 0x0080)
-				{
-					// Character maps to itself.
-					bytes[posn++] = (byte)ch;
-					continue;
-				}
-				else if(ch < 0x0100)
+				while(charCount > 0)
 				{
-					// Check for special Latin 1 characters that
-					// can be mapped to double-byte code points.
-					if(ch == 0x00A2 || ch == 0x00A3 || ch == 0x00A7 ||
-					   ch == 0x00A8 || ch == 0x00AC || ch == 0x00B0 ||
-					   ch == 0x00B1 || ch == 0x00B4 || ch == 0x00B6 ||
-					   ch == 0x00D7 || ch == 0x00F7)
+					ch = chars[charIndex++];
+					--charCount;
+					if(posn >= byteLength)
+					{
+						throw new ArgumentException
+							(Strings.GetString("Arg_InsufficientSpace"),
+							 "bytes");
+					}
+					if(ch < 0x0080)
+					{
+						// Character maps to itself.
+						bytes[posn++] = (byte)ch;
+						continue;
+					}
+					else if(ch < 0x0100)
 					{
-						if((posn + 1) >= byteLength)
+						// Check for special Latin 1 characters that
+						// can be mapped to double-byte code points.
+						if(ch == 0x00A2 || ch == 0x00A3 || ch == 0x00A7 ||
+						   ch == 0x00A8 || ch == 0x00AC || ch == 0x00B0 ||
+						   ch == 0x00B1 || ch == 0x00B4 || ch == 0x00B6 ||
+						   ch == 0x00D7 || ch == 0x00F7)
+						{
+							if((posn + 1) >= byteLength)
+							{
+								throw new ArgumentException
+									(Strings.GetString
+										("Arg_InsufficientSpace"), "bytes");
+							}
+							switch(ch)
+							{
+							case 0x00A2:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x91;
+								break;
+
+							case 0x00A3:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x92;
+								break;
+
+							case 0x00A7:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x98;
+								break;
+
+							case 0x00A8:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x4E;
+								break;
+
+							case 0x00AC:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0xCA;
+								break;
+
+							case 0x00B0:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x8B;
+								break;
+
+							case 0x00B1:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x7D;
+								break;
+
+							case 0x00B4:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x4C;
+								break;
+
+							case 0x00B6:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0xF7;
+								break;
+
+							case 0x00D7:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x7E;
+								break;
+
+							case 0x00F7:
+								bytes[posn++] = (byte)0x81;
+								bytes[posn++] = (byte)0x80;
+								break;
+							}
+						}
+						else if(ch == 0x00A5)
 						{
-							throw new ArgumentException
-								(Strings.GetString
-									("Arg_InsufficientSpace"), "bytes");
+							// Yen sign.
+							bytes[posn++] = (byte)0x5C;
 						}
-						switch(ch)
+						else
 						{
-						case 0x00A2:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x91;
-							break;
-
-						case 0x00A3:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x92;
-							break;
-
-						case 0x00A7:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x98;
-							break;
-
-						case 0x00A8:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x4E;
-							break;
-
-						case 0x00AC:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0xCA;
-							break;
-
-						case 0x00B0:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x8B;
-							break;
-
-						case 0x00B1:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x7D;
-							break;
-
-						case 0x00B4:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x4C;
-							break;
-
-						case 0x00B6:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0xF7;
-							break;
-
-						case 0x00D7:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x7E;
-							break;
-
-						case 0x00F7:
-							bytes[posn++] = (byte)0x81;
-							bytes[posn++] = (byte)0x80;
-							break;
+#if NET_2_0
+							HandleFallback (ref buffer,
+								chars, ref charIndex, ref charCount,
+								bytes, ref posn, ref byteCount);
+#else
+							// Invalid character.
+							bytes[posn++] = (byte)'?';
+#endif
 						}
+						continue;
+					}
+					else if(ch >= 0x0391 && ch <= 0x0451)
+					{
+						// Greek subset characters.
+						value = (ch - 0x0391) * 2;
+						value = ((int)(greekToJis[value])) |
+								(((int)(greekToJis[value + 1])) << 8);
+					}
+					else if(ch >= 0x2010 && ch <= 0x9FA5)
+					{
+						// This range contains the bulk of the CJK set.
+						value = (ch - 0x2010) * 2;
+						value = ((int)(cjkToJis[value])) |
+								(((int)(cjkToJis[value + 1])) << 8);
 					}
-					else if(ch == 0x00A5)
+					else if(ch >= 0xE000 && ch <= 0xE757)
 					{
-						// Yen sign.
-						bytes[posn++] = (byte)0x5C;
+						// PrivateUse
+						int diff = ch - 0xE000;
+						value = ((int) (diff / 0xBC) << 8)
+							+ (diff % 0xBC)
+							+ 0xF040;
+						if (value % 0x100 >= 0x7F)
+							value++;
+					}
+					else if(ch >= 0xFF01 && ch <= 0xFF60)
+					{
+						value = (ch - 0xFF01) * 2;
+						value = ((int)(extraToJis[value])) |
+								(((int)(extraToJis[value + 1])) << 8);
+					}
+					else if(ch >= 0xFF60 && ch <= 0xFFA0)
+					{
+						value = ch - 0xFF60 + 0xA0;
 					}
 					else
 					{
+						// Invalid character.
+						value = 0;
+					}
+					if(value == 0)
+					{
 #if NET_2_0
 						HandleFallback (ref buffer,
 							chars, ref charIndex, ref charCount,
 							bytes, ref posn, ref byteCount);
 #else
-						// Invalid character.
 						bytes[posn++] = (byte)'?';
 #endif
 					}
-					continue;
-				}
-				else if(ch >= 0x0391 && ch <= 0x0451)
-				{
-					// Greek subset characters.
-					value = (ch - 0x0391) * 2;
-					value = ((int)(greekToJis[value])) |
-							(((int)(greekToJis[value + 1])) << 8);
-				}
-				else if(ch >= 0x2010 && ch <= 0x9FA5)
-				{
-					// This range contains the bulk of the CJK set.
-					value = (ch - 0x2010) * 2;
-					value = ((int)(cjkToJis[value])) |
-							(((int)(cjkToJis[value + 1])) << 8);
-				}
-				else if(ch >= 0xE000 && ch <= 0xE757)
-				{
-					// PrivateUse
-					int diff = ch - 0xE000;
-					value = ((int) (diff / 0xBC) << 8)
-						+ (diff % 0xBC)
-						+ 0xF040;
-					if (value % 0x100 >= 0x7F)
-						value++;
-				}
-				else if(ch >= 0xFF01 && ch <= 0xFF60)
-				{
-					value = (ch - 0xFF01) * 2;
-					value = ((int)(extraToJis[value])) |
-							(((int)(extraToJis[value + 1])) << 8);
-				}
-				else if(ch >= 0xFF60 && ch <= 0xFFA0)
-				{
-					value = ch - 0xFF60 + 0xA0;
-				}
-				else
-				{
-					// Invalid character.
-					value = 0;
-				}
-				if(value == 0)
-				{
-#if NET_2_0
-					HandleFallback (ref buffer,
-						chars, ref charIndex, ref charCount,
-						bytes, ref posn, ref byteCount);
-#else
-					bytes[posn++] = (byte)'?';
-#endif
-				}
-				else if(value < 0x0100)
-				{
-					bytes[posn++] = (byte)value;
-				}
-				else if((posn + 1) >= byteLength)
-				{
-					throw new ArgumentException
-						(Strings.GetString("Arg_InsufficientSpace"),
-						 "bytes");
-				}
-				else if(value < 0x8000)
-				{
-					// JIS X 0208 character.
-					value -= 0x0100;
-					ch = (value / 0xBC);
-					value = (value % 0xBC) + 0x40;
-					if(value >= 0x7F)
+					else if(value < 0x0100)
 					{
-						++value;
+						bytes[posn++] = (byte)value;
 					}
-					if(ch < (0x9F - 0x80))
+					else if((posn + 1) >= byteLength)
 					{
-						bytes[posn++] = (byte)(ch + 0x81);
+						throw new ArgumentException
+							(Strings.GetString("Arg_InsufficientSpace"),
+							 "bytes");
+					}
+					else if(value < 0x8000)
+					{
+						// JIS X 0208 character.
+						value -= 0x0100;
+						ch = (value / 0xBC);
+						value = (value % 0xBC) + 0x40;
+						if(value >= 0x7F)
+						{
+							++value;
+						}
+						if(ch < (0x9F - 0x80))
+						{
+							bytes[posn++] = (byte)(ch + 0x81);
+						}
+						else
+						{
+							bytes[posn++] = (byte)(ch - (0x9F - 0x80) + 0xE0);
+						}
+						bytes[posn++] = (byte)value;
+					}
+					else if (value >= 0xF040 && value <= 0xF9FC)
+					{
+						// PrivateUse
+						bytes[posn++] = (byte) (value / 0x100);
+						bytes[posn++] = (byte) (value % 0x100);
 					}
 					else
 					{
-						bytes[posn++] = (byte)(ch - (0x9F - 0x80) + 0xE0);
+						// JIS X 0212 character, which Shift-JIS doesn't
+						// support, but we've already allocated two slots.
+						bytes[posn++] = (byte)'?';
+						bytes[posn++] = (byte)'?';
 					}
-					bytes[posn++] = (byte)value;
-				}
-				else if (value >= 0xF040 && value <= 0xF9FC)
-				{
-					// PrivateUse
-					bytes[posn++] = (byte) (value / 0x100);
-					bytes[posn++] = (byte) (value % 0x100);
 				}
-				else
-				{
-					// JIS X 0212 character, which Shift-JIS doesn't
-					// support, but we've already allocated two slots.
-					bytes[posn++] = (byte)'?';
-					bytes[posn++] = (byte)'?';
-				}
-			}
 
-			// Return the final length to the caller.
-			return posn - byteIndex;
-		}
+				// Return the final length to the caller.
+				return posn - byteIndex;
+			}
 
-		public override int GetCharCount (byte [] bytes, int index, int count)
-		{
-			return new CP932Decoder (JISConvert.Convert).GetCharCount (
-				bytes, index, count, true);
-		}
+	public override int GetCharCount (byte [] bytes, int index, int count)
+			{
+				return new CP932Decoder (JISConvert.Convert).GetCharCount (
+					bytes, index, count, true);
+			}
 
-		public override int GetChars (
-			byte [] bytes, int byteIndex, int byteCount,
-			char [] chars, int charIndex)
-		{
-			return new CP932Decoder (JISConvert.Convert).GetChars (bytes,
-				byteIndex, byteCount, chars, charIndex,
-				true);
-		}
+	public override int GetChars (
+		byte [] bytes, int byteIndex, int byteCount,
+		char [] chars, int charIndex)
+			{
+				return new CP932Decoder (JISConvert.Convert).GetChars (bytes,
+					byteIndex, byteCount, chars, charIndex,
+					true);
+			}
 
-		// Get the maximum number of bytes needed to encode a
-		// specified number of characters.
-		public override int GetMaxByteCount(int charCount)
-		{
-			if(charCount < 0)
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
 			{
-				throw new ArgumentOutOfRangeException
-					("charCount",
-					 Strings.GetString("ArgRange_NonNegative"));
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return charCount * 2;
 			}
-			return charCount * 2;
-		}
 
-		// Get the maximum number of characters needed to decode a
-		// specified number of bytes.
-		public override int GetMaxCharCount(int byteCount)
-		{
-			if(byteCount < 0)
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
 			{
-				throw new ArgumentOutOfRangeException
-					("byteCount",
-					 Strings.GetString("ArgRange_NonNegative"));
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return byteCount;
 			}
-			return byteCount;
-		}
 
-		// Get a decoder that handles a rolling Shift-JIS state.
-		public override Decoder GetDecoder()
-		{
-			return new CP932Decoder(JISConvert.Convert);
-		}
+	// Get a decoder that handles a rolling Shift-JIS state.
+	public override Decoder GetDecoder()
+			{
+				return new CP932Decoder(JISConvert.Convert);
+			}
 
 #if !ECMA_COMPAT
 
-		// Get the mail body name for this encoding.
-		public override String BodyName {
-			get { return "iso-2022-jp"; }
-		}
-
-		// Get the human-readable name for this encoding.
-		public override String EncodingName {
-			get { return "Japanese (Shift-JIS)"; }
-		}
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return "iso-2022-jp";
+				}
+			}
 
-		// Get the mail agent header name for this encoding.
-		public override String HeaderName {
-			get { return "iso-2022-jp"; }
-		}
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return "Japanese (Shift-JIS)";
+				}
+			}
 
-		// Determine if this encoding can be displayed in a Web browser.
-		public override bool IsBrowserDisplay {
-			get { return true; }
-		}
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return "iso-2022-jp";
+				}
+			}
 
-		// Determine if this encoding can be saved from a Web browser.
-		public override bool IsBrowserSave {
-			get { return true; }
-		}
+	// Determine if this encoding can be displayed in a Web browser.
+	public override bool IsBrowserDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
 
-		// Determine if this encoding can be displayed in a mail/news agent.
-		public override bool IsMailNewsDisplay {
-			get { return true; }
-		}
+	// Determine if this encoding can be saved from a Web browser.
+	public override bool IsBrowserSave
+			{
+				get
+				{
+					return true;
+				}
+			}
 
-		// Determine if this encoding can be saved from a mail/news agent.
-		public override bool IsMailNewsSave {
-			get { return true; }
-		}
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
 
-		// Get the IANA-preferred Web name for this encoding.
-		public override String WebName {
-			get { return "shift_jis"; }
-		}
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return true;
+				}
+			}
 
-		// Get the Windows code page represented by this object.
-		public override int WindowsCodePage {
-			get { return SHIFTJIS_CODE_PAGE; }
-		}
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return "shift_jis";
+				}
+			}
 
-	}; // class CP932
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage
+			{
+				get
+				{
+					return SHIFTJIS_CODE_PAGE;
+				}
+			}
 
 #endif // !ECMA_COMPAT
 
 	// Decoder that handles a rolling Shift-JIS state.
-	sealed class CP932Decoder : DbcsEncoding.DbcsDecoder
+	private sealed class CP932Decoder : Decoder
 	{
 		private JISConvert convert;
 		private int last_byte_count;
@@ -453,10 +501,9 @@ namespace I18N.CJK
 
 		// Constructor.
 		public CP932Decoder(JISConvert convert)
-			: base (null)
-		{
-			this.convert = convert;
-		}
+				{
+					this.convert = convert;
+				}
 
 		// Override inherited methods.
 
@@ -471,44 +518,58 @@ namespace I18N.CJK
 		override
 #endif
 		int GetCharCount (byte [] bytes, int index, int count, bool refresh)
-		{
-			CheckRange (bytes, index, count);
-
-			// Determine the total length of the converted string.
-			int length = 0;
-			int byteval;
-			int last = last_byte_count;
-			while(count > 0)
-			{
-				byteval = bytes[index++];
-				--count;
-				if(last == 0)
 				{
-					if((byteval >= 0x81 && byteval <= 0x9F) ||
-					   (byteval >= 0xE0 && byteval <= 0xEF))
+					// Validate the parameters.
+					if(bytes == null)
 					{
-						// First byte in a double-byte sequence.
-						last = byteval;
+						throw new ArgumentNullException("bytes");
+					}
+					if(index < 0 || index > bytes.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("index", Strings.GetString("ArgRange_Array"));
+					}
+					if(count < 0 || count > (bytes.Length - index))
+					{
+						throw new ArgumentOutOfRangeException
+							("count", Strings.GetString("ArgRange_Array"));
 					}
-					++length;
-				}
-				else
-				{
-					// Second byte in a double-byte sequence.
-					last = 0;
-				}
-			}
-			if (refresh) {
-				if (last != 0)
-					length++;
-				last_byte_count = '\0';
-			}
-			else
-				last_byte_count = last;
 
-			// Return the total length.
-			return length;
-		}
+					// Determine the total length of the converted string.
+					int length = 0;
+					int byteval;
+					int last = last_byte_count;
+					while(count > 0)
+					{
+						byteval = bytes[index++];
+						--count;
+						if(last == 0)
+						{
+							if((byteval >= 0x81 && byteval <= 0x9F) ||
+							   (byteval >= 0xE0 && byteval <= 0xEF))
+							{
+								// First byte in a double-byte sequence.
+								last = byteval;
+							}
+							++length;
+						}
+						else
+						{
+							// Second byte in a double-byte sequence.
+							last = 0;
+						}
+					}
+					if (refresh) {
+						if (last != 0)
+							length++;
+						last_byte_count = '\0';
+					}
+					else
+						last_byte_count = last;
+	
+					// Return the total length.
+					return length;
+				}
 
 		public override int GetChars (
 			byte [] bytes, int byteIndex, int byteCount,
@@ -525,119 +586,143 @@ namespace I18N.CJK
 		int GetChars (
 			byte [] bytes, int byteIndex, int byteCount,
 			char [] chars, int charIndex, bool refresh)
-		{
-			CheckRange (bytes, byteIndex, byteCount,
-				chars, charIndex);
-
-			// Decode the bytes in the buffer.
-			int posn = charIndex;
-			int charLength = chars.Length;
-			int byteval, value;
-			int last = last_byte_chars;
-#if __PNET__
-			byte *table = convert.jisx0208ToUnicode;
-#else
-			byte[] table = convert.jisx0208ToUnicode;
-#endif
-			while(byteCount > 0)
-			{
-				byteval = bytes[byteIndex++];
-				--byteCount;
-				if(last == 0)
 				{
-					if(posn >= charLength)
-					{
-						throw new ArgumentException
-							(Strings.GetString
-								("Arg_InsufficientSpace"), "chars");
-					}
-					if((byteval >= 0x81 && byteval <= 0x9F) ||
-					   (byteval >= 0xE0 && byteval <= 0xEF))
+					// Validate the parameters.
+					if(bytes == null)
 					{
-						// First byte in a double-byte sequence.
-						last = byteval;
+						throw new ArgumentNullException("bytes");
 					}
-					else if(byteval < 0x80)
+					if(chars == null)
 					{
-						// Ordinary ASCII/Latin1 character.
-						chars[posn++] = (char)byteval;
+						throw new ArgumentNullException("chars");
 					}
-					else if(byteval >= 0xA1 && byteval <= 0xDF)
+					if(byteIndex < 0 || byteIndex > bytes.Length)
 					{
-						// Half-width katakana character.
-						chars[posn++] = (char)(byteval - 0xA1 + 0xFF61);
+						throw new ArgumentOutOfRangeException
+							("byteIndex", Strings.GetString("ArgRange_Array"));
 					}
-					else
+					if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
 					{
-						// Invalid first byte.
-						chars[posn++] = '?';
+						throw new ArgumentOutOfRangeException
+							("byteCount", Strings.GetString("ArgRange_Array"));
 					}
-				}
-				else
-				{
-					// Second byte in a double-byte sequence.
-					if(last >= 0x81 && last <= 0x9F)
+					if(charIndex < 0 || charIndex > chars.Length)
 					{
-						value = (last - 0x81) * 0xBC;
+						throw new ArgumentOutOfRangeException
+							("charIndex", Strings.GetString("ArgRange_Array"));
 					}
-					else if (last >= 0xF0 && last <= 0xFC && byteval <= 0xFC)
-					{
-						// PrivateUse
-						value = 0xE000 + (last - 0xF0) * 0xBC + byteval;
-						if (byteval > 0x7F)
-							value--;
-					}
-					else
-					{
-						value = (last - 0xE0 + (0xA0 - 0x81)) * 0xBC;
-					}
-					last = 0;
-					if(byteval >= 0x40 && byteval <= 0x7E)
-					{
-						value += (byteval - 0x40);
-					}
-					else if(byteval >= 0x80 && byteval <= 0xFC)
-					{
-						value += (byteval - 0x80 + 0x3F);
-					}
-					else
+
+					// Decode the bytes in the buffer.
+					int posn = charIndex;
+					int charLength = chars.Length;
+					int byteval, value;
+					int last = last_byte_chars;
+#if __PNET__
+					byte *table = convert.jisx0208ToUnicode;
+#else
+					byte[] table = convert.jisx0208ToUnicode;
+#endif
+					while(byteCount > 0)
 					{
-						// Invalid second byte.
-						chars[posn++] = '?';
-						continue;
+						byteval = bytes[byteIndex++];
+						--byteCount;
+						if(last == 0)
+						{
+							if(posn >= charLength)
+							{
+								throw new ArgumentException
+									(Strings.GetString
+										("Arg_InsufficientSpace"), "chars");
+							}
+							if((byteval >= 0x81 && byteval <= 0x9F) ||
+							   (byteval >= 0xE0 && byteval <= 0xEF))
+							{
+								// First byte in a double-byte sequence.
+								last = byteval;
+							}
+							else if(byteval < 0x80)
+							{
+								// Ordinary ASCII/Latin1 character.
+								chars[posn++] = (char)byteval;
+							}
+							else if(byteval >= 0xA1 && byteval <= 0xDF)
+							{
+								// Half-width katakana character.
+								chars[posn++] = (char)(byteval - 0xA1 + 0xFF61);
+							}
+							else
+							{
+								// Invalid first byte.
+								chars[posn++] = '?';
+							}
+						}
+						else
+						{
+							// Second byte in a double-byte sequence.
+							if(last >= 0x81 && last <= 0x9F)
+							{
+								value = (last - 0x81) * 0xBC;
+							}
+							else if (last >= 0xF0 && last <= 0xFC && byteval <= 0xFC)
+							{
+								// PrivateUse
+								value = 0xE000 + (last - 0xF0) * 0xBC + byteval;
+								if (byteval > 0x7F)
+									value--;
+							}
+							else
+							{
+								value = (last - 0xE0 + (0xA0 - 0x81)) * 0xBC;
+							}
+							last = 0;
+							if(byteval >= 0x40 && byteval <= 0x7E)
+							{
+								value += (byteval - 0x40);
+							}
+							else if(byteval >= 0x80 && byteval <= 0xFC)
+							{
+								value += (byteval - 0x80 + 0x3F);
+							}
+							else
+							{
+								// Invalid second byte.
+								chars[posn++] = '?';
+								continue;
+							}
+							value *= 2;
+							value = ((int)(table[value])) |
+									(((int)(table[value + 1])) << 8);
+							if(value != 0)
+							{
+								chars[posn++] = (char)value;
+							}
+							else
+							{
+								chars[posn++] = '?';
+							}
+						}
 					}
-					value *= 2;
-					value = ((int)(table[value])) |
-							(((int)(table[value + 1])) << 8);
-					if(value != 0)
-					{
-						chars[posn++] = (char)value;
+					if (refresh) {
+						if (last != 0)
+							chars[posn++] = '\u30FB';
+						last_byte_chars = '\0';
 					}
 					else
-					{
-						chars[posn++] = '?';
-					}
-				}
-			}
-			if (refresh) {
-				if (last != 0)
-					chars[posn++] = '\u30FB';
-				last_byte_chars = '\0';
-			}
-			else
-				last_byte_chars = last;
+						last_byte_chars = last;
 
-			// Return the final length to the caller.
-			return posn - charIndex;
-		}
+					// Return the final length to the caller.
+					return posn - charIndex;
+				}
 
 	} // class CP932Decoder
 
-	[Serializable]
-	public class ENCshift_jis : CP932
-	{
-		public ENCshift_jis() : base() {}
+}; // class CP932
+
+[Serializable]
+public class ENCshift_jis : CP932
+{
+	public ENCshift_jis() : base() {}
 
-	}; // class ENCshift_jis
+}; // class ENCshift_jis
 
 }; // namespace I18N.CJK
diff --git a/mcs/class/I18N/CJK/CP936.cs b/mcs/class/I18N/CJK/CP936.cs
index 2c754393627..454e1b5c3f2 100644
--- a/mcs/class/I18N/CJK/CP936.cs
+++ b/mcs/class/I18N/CJK/CP936.cs
@@ -29,37 +29,6 @@ namespace I18N.CJK
 		}
 
 		// Get the bytes that result from encoding a character buffer.
-		public unsafe override int GetByteCountImpl (
-			char* chars, int count)
-		{
-			DbcsConvert gb2312 = GetConvert ();
-			int index = 0;
-#if NET_2_0
-			EncoderFallbackBuffer buffer = null;
-#endif
-			int length = 0;
-			while (count-- > 0) {
-				char c = chars[index++];
-				if (c <= 0x80 || c == 0xFF) { // ASCII
-					length++;
-					continue;
-				}
-				byte b1 = gb2312.u2n[((int)c) * 2 + 1];
-				byte b2 = gb2312.u2n[((int)c) * 2];
-				if (b1 == 0 && b2 == 0) {
-#if NET_2_0
-					// FIXME: handle fallback for GetByteCount().
-#else
-					length++;
-#endif
-				}
-				else
-					length += 2;
-			}
-			return length;
-		}
-
-		// Get the bytes that result from encoding a character buffer.
 		public unsafe override int GetBytesImpl (char* chars, int charCount,
 					     byte* bytes, int byteCount)
 		{
@@ -98,15 +67,68 @@ namespace I18N.CJK
 		// Get the characters that result from decoding a byte buffer.
 		public override int GetCharCount (byte [] bytes, int index, int count)
 		{
-			return GetDecoder ().GetCharCount (bytes, index, count);
+			if (bytes == null)
+				throw new ArgumentNullException("bytes");
+			if (index < 0 || index > bytes.Length)
+				throw new ArgumentOutOfRangeException("index", Strings.GetString("ArgRange_Array"));
+			if (count < 0 || index + count > bytes.Length)
+				throw new ArgumentOutOfRangeException("count", Strings.GetString("ArgRange_Array"));
+
+			int lastByte = 0;
+			int length = 0;
+			while (count-- > 0) {
+				int b = bytes [index++];
+				if (lastByte == 0) {
+					if (b <= 0x80 || b == 0xFF) { // ASCII
+						length++;
+						continue;
+					} else {
+						lastByte = b;
+						continue;
+					}
+				}
+				length++;
+				lastByte = 0;
+			}
+
+#if NET_2_0
+			if (lastByte != 0)
+				length++;
+#endif
+
+			return length;
 		}
 
 		// Get the characters that result from decoding a byte buffer.
 		public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
 					     char[] chars, int charIndex)
 		{
-			return GetDecoder ().GetChars (
-				bytes, byteIndex, byteCount, chars, charIndex);
+			DbcsConvert gb2312 = GetConvert ();
+			// A1 40 - FA FF
+			base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
+			int origIndex = charIndex;
+			int lastByte = 0;
+			while (byteCount-- > 0) {
+				int b = bytes[byteIndex++];
+				if (lastByte == 0) {
+					if (b <= 0x80 || b == 0xFF) { // ASCII
+						chars[charIndex++] = (char)b;
+						continue;
+					} else {
+						lastByte = b;
+						continue;
+					}
+				}
+				int ord = ((lastByte - 0x81) * 191 + b - 0x40) * 2;
+				char c1 = (ord < 0 || ord + 1 >= gb2312.n2u.Length) ?
+					'\0' : (char)(gb2312.n2u[ord] + gb2312.n2u[ord + 1] * 256);
+				if (c1 == 0)
+					chars[charIndex++] = '?';
+				else
+					chars[charIndex++] = c1;
+				lastByte = 0;
+			}
+			return charIndex - origIndex;
 		}
 		
 		// Get a decoder that handles a rolling Gb2312 state.
@@ -162,113 +184,42 @@ namespace I18N.CJK
 		{
 			get { return("gb2312"); }
 		}
-	}
-
-	// Decoder that handles a rolling Gb2312 state.
-	sealed class CP936Decoder : DbcsEncoding.DbcsDecoder
-	{
-		// Constructor.
-		public CP936Decoder (DbcsConvert convert)
-			: base (convert)
-		{
-		}
-
-		int last_byte_count, last_byte_bytes;
-
-		// Get the characters that result from decoding a byte buffer.
-		public override int GetCharCount (byte [] bytes, int index, int count)
-		{
-			return GetCharCount (bytes, index, count, false);
-		}
-
-#if NET_2_0
-		public override
-#endif
-		int GetCharCount (byte [] bytes, int index, int count, bool refresh)
-		{
-			CheckRange (bytes, index, count);
-
-			int lastByte = last_byte_count;
-			last_byte_count = 0;
-			int length = 0;
-			while (count-- > 0) {
-				int b = bytes [index++];
-				if (lastByte == 0) {
-					if (b <= 0x80 || b == 0xFF) { // ASCII
-						length++;
-						continue;
-					} else {
-						lastByte = b;
-						continue;
+		
+		// Decoder that handles a rolling Gb2312 state.
+		private sealed class CP936Decoder : DbcsDecoder
+		{
+			// Constructor.
+			public CP936Decoder(DbcsConvert convert) : base(convert) {}
+			
+			public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+						     char[] chars, int charIndex)
+			{
+				base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
+				int origIndex = charIndex;
+				while (byteCount-- > 0) {
+					int b = bytes[byteIndex++];
+					if (lastByte == 0) {
+						if (b <= 0x80 || b == 0xFF) { // ASCII
+							chars[charIndex++] = (char)b;
+							continue;
+						} else if (b < 0x81 || b >= 0xFF) {
+							continue;
+						} else {
+							lastByte = b;
+							continue;
+						}
 					}
-				}
-				length++;
-				lastByte = 0;
-			}
-
-			if (lastByte != 0) {
-				if (refresh) {
-					length++;
-					last_byte_count = 0;
-				}
-				else
-					last_byte_count = lastByte;
-			}
-
-			return length;
-		}
-
-		public override int GetChars (byte[] bytes, int byteIndex, int byteCount,
-					     char[] chars, int charIndex)
-		{
-			return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
-		}
-
-#if NET_2_0
-		public override
-#endif
-		int GetChars (byte [] bytes, int byteIndex, int byteCount,
-			      char [] chars, int charIndex, bool refresh)
-		{
-			CheckRange (bytes, byteIndex, byteCount, chars, charIndex);
-
-			int origIndex = charIndex;
-			int lastByte = last_byte_bytes;
-			last_byte_bytes = 0;
-			while (byteCount-- > 0) {
-				int b = bytes[byteIndex++];
-				if (lastByte == 0) {
-					if (b <= 0x80 || b == 0xFF) { // ASCII
-						chars[charIndex++] = (char)b;
-						continue;
-					} else if (b < 0x81 || b >= 0xFF) {
-						continue;
+					int ord = ((lastByte - 0x81) * 191 + b - 0x40) * 2;
+					char c1 = (char)(convert.n2u[ord] + convert.n2u[ord + 1] * 256);
+					if (c1 == 0) {
+						chars[charIndex++] = '?';
 					} else {
-						lastByte = b;
-						continue;
+						chars[charIndex++] = c1;
 					}
+					lastByte = 0;
 				}
-				int ord = ((lastByte - 0x81) * 191 + b - 0x40) * 2;
-				char c1 = ord < 0 || ord >= convert.n2u.Length ?
-					'\0' : (char) (convert.n2u[ord] + convert.n2u[ord + 1] * 256);
-				if (c1 == 0)
-					chars[charIndex++] = '?';
-				else
-					chars[charIndex++] = c1;
-				lastByte = 0;
-			}
-
-			if (lastByte != 0) {
-				if (refresh) {
-					// FIXME: handle fallback
-					chars [charIndex++] = '?';
-					last_byte_bytes = 0;
-				}
-				else
-					last_byte_bytes = lastByte;
+				return charIndex - origIndex;
 			}
-
-			return charIndex - origIndex;
 		}
 	}
 	
diff --git a/mcs/class/I18N/CJK/CP949.cs b/mcs/class/I18N/CJK/CP949.cs
index de4628c77fe..4bba03c1012 100644
--- a/mcs/class/I18N/CJK/CP949.cs
+++ b/mcs/class/I18N/CJK/CP949.cs
@@ -3,7 +3,6 @@
 //
 // Author:
 //   Hye-Shik Chang (perky@FreeBSD.org)
-//   Atsushi Enomoto  <atsushi@ximian.com>
 //
 
 using System;
@@ -105,52 +104,18 @@ namespace I18N.CJK
     internal class KoreanEncoding : DbcsEncoding
     {
         // Constructor.
-        public KoreanEncoding (int codepage, bool useUHC)
-            : base (codepage, 949) {
+        public KoreanEncoding (int codepage, bool useUHC) : base (codepage) {
             this.useUHC = useUHC;
         }
 
         internal override DbcsConvert GetConvert ()
         {
-                return DbcsConvert.KS;
+                return KSConvert.Convert;
         }
 
         bool useUHC;
 
         // Get the bytes that result from encoding a character buffer.
-        public unsafe override int GetByteCountImpl (char* chars, int count)
-        {
-            int index = 0;
-            int length = 0;
-            DbcsConvert convert = GetConvert ();
-#if NET_2_0
-            EncoderFallbackBuffer buffer = null;
-#endif
-
-            // 00 00 - FF FF
-            while (count-- > 0) {
-                char c = chars[index++];
-                if (c <= 0x80 || c == 0xFF) { // ASCII
-                    length++;
-                    continue;
-                }
-                byte b1 = convert.u2n[((int)c) * 2];
-                byte b2 = convert.u2n[((int)c) * 2 + 1];
-                if (b1 == 0 && b2 == 0) {
-#if NET_2_0
-                    // FIXME: handle fallback for GetByteCountImpl().
-                    length++;
-#else
-                    length++;
-#endif
-                }
-                else
-                    length += 2;
-            }
-            return length;
-        }
-
-        // Get the bytes that result from encoding a character buffer.
         public unsafe override int GetBytesImpl (char* chars, int charCount,
                          byte* bytes, int byteCount)
         {
@@ -187,16 +152,77 @@ namespace I18N.CJK
         }
 
         // Get the characters that result from decoding a byte buffer.
-        public override int GetCharCount (byte[] bytes, int index, int count)
-        {
-            return GetDecoder ().GetCharCount (bytes, index, count);
-        }
-
-        // Get the characters that result from decoding a byte buffer.
         public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
                          char[] chars, int charIndex)
         {
-            return GetDecoder ().GetChars (bytes, byteIndex, byteCount, chars, charIndex);
+            DbcsConvert convert = GetConvert ();
+            base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
+            int origIndex = charIndex;
+            int lastByte = 0;
+
+            while (byteCount-- > 0) {
+                int b = bytes[byteIndex++];
+                if (lastByte == 0) {
+                    if (b <= 0x80 || b == 0xFF) { // ASCII
+                        chars[charIndex++] = (char)b;
+                        continue;
+                    } else {
+                        lastByte = b;
+                        continue;
+                    }
+                }
+
+                char c1;
+                if (useUHC && lastByte < 0xa1) { // UHC Level 1
+                    int ord = 8836 + (lastByte - 0x81) * 178;
+
+                    if (b >= 0x41 && b <= 0x5A)
+                        ord += b - 0x41;
+                    else if (b >= 0x61 && b <= 0x7A)
+                        ord += b - 0x61 + 26;
+                    else if (b >= 0x81 && b <= 0xFE)
+                        ord += b - 0x81 + 52;
+                    else
+                        ord = -1;
+
+                      if (ord >= 0 && ord * 2 <= convert.n2u.Length)
+                        c1 = (char)(convert.n2u[ord*2] +
+                                    convert.n2u[ord*2 + 1] * 256);
+                    else
+                        c1 = (char)0;
+                } else if (useUHC && lastByte <= 0xC6 && b < 0xa1) { // UHC Level 2
+                    int ord = 14532 + (lastByte - 0xA1) * 84;
+
+                    if (b >= 0x41 && b <= 0x5A)
+                        ord += b - 0x41;
+                    else if (b >= 0x61 && b <= 0x7A)
+                        ord += b - 0x61 + 26;
+                    else if (b >= 0x81 && b <= 0xA0)
+                        ord += b - 0x81 + 52;
+                    else
+                        ord = -1;
+
+                    if (ord >= 0 && ord * 2 < convert.n2u.Length)
+                        c1 = (char)(convert.n2u[ord*2] +
+                                    convert.n2u[ord*2 + 1] * 256);
+                    else
+                        c1 = (char)0;
+                } else if (b >= 0xA1 && b <= 0xFE) { // KS X 1001
+                    int ord = ((lastByte - 0xA1) * 94 + b - 0xA1) * 2;
+
+                    c1 = ord < 0 || ord >= convert.n2u.Length ?
+                        '\0' : (char)(convert.n2u[ord] +
+                                convert.n2u[ord + 1] * 256);
+                } else
+                    c1 = (char)0;
+
+                if (c1 == 0)
+                    chars[charIndex++] = '?';
+                else
+                    chars[charIndex++] = c1;
+                lastByte = 0;
+            }
+            return charIndex - origIndex;
         }
 
         // Get a decoder that handles a rolling UHC state.
@@ -215,115 +241,12 @@ namespace I18N.CJK
                 this.useUHC = useUHC;
             }
             bool useUHC;
-            int last_byte_count, last_byte_conv;
-
-            public override int GetCharCount (byte[] bytes, int index, int count)
-            {
-                return GetCharCount (bytes, index, count, false);
-            }
-
-#if NET_2_0
-            public override
-#endif
-            int GetCharCount (byte [] bytes, int index, int count, bool refresh)
-            {
-                CheckRange (bytes, index, count);
-
-                int lastByte = last_byte_count;
-                last_byte_count = 0;
-                int length = 0;
-                while (count-- > 0) {
-                    int b = bytes[index++];
-                    if (lastByte == 0) {
-                        if (b <= 0x80 || b == 0xFF) { // ASCII
-                            length++;
-                            continue;
-                        } else {
-                            lastByte = b;
-                            continue;
-                        }
-                    }
-
-                    char c1;
-                    if (useUHC && lastByte < 0xa1) { // UHC Level 1
-                        int ord = 8836 + (lastByte - 0x81) * 178;
-
-                        if (b >= 0x41 && b <= 0x5A)
-                            ord += b - 0x41;
-                        else if (b >= 0x61 && b <= 0x7A)
-                            ord += b - 0x61 + 26;
-                        else if (b >= 0x81 && b <= 0xFE)
-                            ord += b - 0x81 + 52;
-                        else
-                            ord = -1;
-
-                        if (ord >= 0 && ord * 2 <= convert.n2u.Length)
-                            c1 = (char)(convert.n2u[ord*2] +
-                                        convert.n2u[ord*2 + 1] * 256);
-                        else
-                            c1 = (char)0;
-                    } else if (useUHC && lastByte <= 0xC6 && b < 0xA1) { // UHC Level 2
-                        int ord = 14532 + (lastByte - 0xA1) * 84;
-
-                        if (b >= 0x41 && b <= 0x5A)
-                            ord += b - 0x41;
-                        else if (b >= 0x61 && b <= 0x7A)
-                            ord += b - 0x61 + 26;
-                        else if (b >= 0x81 && b <= 0xA0)
-                            ord += b - 0x81 + 52;
-                        else
-                            ord = -1;
-
-                        if (ord >= 0 && ord * 2 <= convert.n2u.Length)
-                            c1 = (char)(convert.n2u[ord*2] +
-                                        convert.n2u[ord*2 + 1] * 256);
-                        else
-                            c1 = (char)0;
-                    } else if (b >= 0xA1 && b <= 0xFE) { // KS X 1001
-                        int ord = ((lastByte - 0xA1) * 94 + b - 0xA1) * 2;
-
-                        c1 = ord < 0 || ord >= convert.n2u.Length ?
-                            '\0' : (char)(convert.n2u[ord] +
-                                    convert.n2u[ord + 1] * 256);
-                    } else
-                        c1 = (char)0;
-
-                    if (c1 == 0)
-                        // FIXME: fallback
-                        length++;
-                    else
-                        length++;
-                    lastByte = 0;
-                }
-
-                if (lastByte != 0) {
-                    if (refresh) {
-                        // FIXME: fallback
-                        length++;
-                        last_byte_count = 0;
-                    }
-                    else
-                        last_byte_count = lastByte;
-                }
-                return length;
-            }
 
             public override int GetChars(byte[] bytes, int byteIndex,
                                 int byteCount, char[] chars, int charIndex)
             {
-                return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
-            }
-
-#if NET_2_0
-            public override
-#endif
-            int GetChars(byte[] bytes, int byteIndex,
-                                int byteCount, char[] chars, int charIndex, bool refresh)
-            {
-                CheckRange (bytes, byteIndex, byteCount, chars, charIndex);
+                base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
                 int origIndex = charIndex;
-                int lastByte = last_byte_conv;
-                last_byte_conv = 0;
                 while (byteCount-- > 0) {
                     int b = bytes[byteIndex++];
                     if (lastByte == 0) {
@@ -386,15 +309,6 @@ namespace I18N.CJK
                         chars[charIndex++] = c1;
                     lastByte = 0;
                 }
-
-                if (lastByte != 0) {
-                    if (refresh) {
-                        chars[charIndex++] = '?';
-                        last_byte_conv = 0;
-                    }
-                    else
-                        last_byte_conv = lastByte;
-                }
                 return charIndex - origIndex;
             }
         }
diff --git a/mcs/class/I18N/CJK/CP950.cs b/mcs/class/I18N/CJK/CP950.cs
index 72722728afc..96852340e1b 100644
--- a/mcs/class/I18N/CJK/CP950.cs
+++ b/mcs/class/I18N/CJK/CP950.cs
@@ -3,7 +3,6 @@
 //
 // Author:
 //   Alan Tam Siu Lung (Tam@SiuLung.com)
-//   Atsushi Enomoto  <atsushi@ximian.com>
 //
 
 using System;
@@ -24,39 +23,7 @@ namespace I18N.CJK
 
 		internal override DbcsConvert GetConvert ()
 		{
-			return DbcsConvert.Big5;
-		}
-
-		// Get the bytes that result from encoding a character buffer.
-		public unsafe override int GetByteCountImpl (char* chars, int count)
-		{
-			DbcsConvert convert = GetConvert ();
-			int index = 0;
-			int length = 0;
-#if NET_2_0
-			EncoderFallbackBuffer buffer = null;
-#endif
-
-			while (count-- > 0) {
-				char c = chars[index++];
-				if (c <= 0x80 || c == 0xFF) { // ASCII
-					length++;
-					continue;
-				}
-				byte b1 = convert.u2n[((int)c) * 2 + 1];
-				byte b2 = convert.u2n[((int)c) * 2];
-				if (b1 == 0 && b2 == 0) {
-#if NET_2_0
-					// FIXME: handle fallback for GetByteCountImpl().
-					length++;
-#else
-					length++;
-#endif
-				}
-				else
-					length += 2;
-			}
-			return length;
+			return Big5Convert.Convert;
 		}
 
 		// Get the bytes that result from encoding a character buffer.
@@ -99,7 +66,6 @@ namespace I18N.CJK
 		public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
 					     char[] chars, int charIndex)
 		{
-			/*
 			DbcsConvert convert = GetConvert ();
 			// A1 40 - FA FF
 			base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
@@ -133,9 +99,6 @@ namespace I18N.CJK
 				chars[charIndex++] = '?';
 
 			return charIndex - origIndex;
-			*/
-
-			return GetDecoder ().GetChars (bytes, byteIndex, byteCount, chars, charIndex);
 		}
 		
 		// Get a decoder that handles a rolling Big5 state.
@@ -181,107 +144,34 @@ namespace I18N.CJK
 		{
 			// Constructor.
 			public CP950Decoder(DbcsConvert convert) : base(convert) {}
-			int last_byte_count, last_byte_conv;
-
-			public override int GetCharCount (byte[] bytes, int index, int count)
-			{
-				return GetCharCount (bytes, index, count, false);
-			}
-
-#if NET_2_0
-			public override
-#endif
-			int GetCharCount (byte[] bytes, int index, int count, bool refresh)
-			{
-				CheckRange (bytes, index, count);
-
-				int lastByte = last_byte_count;
-				last_byte_count = 0;
-				int length = 0;
-				while (count-- > 0) {
-					int b = bytes[index++];
-					if (lastByte == 0) {
-						if (b <= 0x80 || b == 0xFF) { // ASCII
-							length++;
-						} else if (b < 0xA1 || b >= 0xFA) {
-							// incorrect first byte.
-							length++;
-							count--; // cut one more byte.
-						} else {
-							lastByte = b;
-						}
-						continue;
-					}
-					int ord = ((lastByte - 0xA1) * 191 + b - 0x40) * 2;
-					char c1 = ord < 0 || ord > convert.n2u.Length ?
-						'\0' :
-						(char)(convert.n2u[ord] + convert.n2u[ord + 1] * 256);
-					if (c1 == 0)
-						// FIXME: fallback
-						length++;
-					else
-						length++;
-					lastByte = 0;
-				}
-
-				if (lastByte != 0) {
-					if (refresh)
-						// FIXME: fallback
-						length++;
-					else
-						last_byte_count = lastByte;
-				}
-				return length;
-			}
-
+			
 			public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
 						     char[] chars, int charIndex)
 			{
-				return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
-			}
-
-#if NET_2_0
-			public override
-#endif
-			int GetChars(byte[] bytes, int byteIndex, int byteCount,
-						     char[] chars, int charIndex, bool refresh)
-			{
-				CheckRange (bytes, byteIndex, byteCount, chars, charIndex);
-
+				base.GetChars(bytes, byteIndex, byteCount, chars, charIndex);
 				int origIndex = charIndex;
-				int lastByte = last_byte_conv;
-				last_byte_conv = 0;
 				while (byteCount-- > 0) {
 					int b = bytes[byteIndex++];
 					if (lastByte == 0) {
 						if (b <= 0x80 || b == 0xFF) { // ASCII
 							chars[charIndex++] = (char)b;
+							continue;
 						} else if (b < 0xA1 || b >= 0xFA) {
-							// incorrect first byte.
-							chars[charIndex++] = '?';
-							byteCount--; // cut one more byte.
+							continue;
 						} else {
 							lastByte = b;
+							continue;
 						}
-						continue;
 					}
 					int ord = ((lastByte - 0xA1) * 191 + b - 0x40) * 2;
-					char c1 = ord < 0 || ord > convert.n2u.Length ?
-						'\0' :
-						(char)(convert.n2u[ord] + convert.n2u[ord + 1] * 256);
-					if (c1 == 0)
+					char c1 = (char)(convert.n2u[ord] + convert.n2u[ord + 1] * 256);
+					if (c1 == 0) {
 						chars[charIndex++] = '?';
-					else
+					} else {
 						chars[charIndex++] = c1;
+					}
 					lastByte = 0;
 				}
-
-				if (lastByte != 0) {
-					if (refresh)
-						chars [charIndex++] = '?';
-					else
-						last_byte_conv = lastByte;
-				}
 				return charIndex - origIndex;
 			}
 		}
diff --git a/mcs/class/I18N/CJK/ChangeLog b/mcs/class/I18N/CJK/ChangeLog
index 27aeb25529e..4f807367511 100644
--- a/mcs/class/I18N/CJK/ChangeLog
+++ b/mcs/class/I18N/CJK/ChangeLog
@@ -1,60 +1,3 @@
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* DbcsEncoding.cs ISO2022JP.cs GB18030Encoding.cs CP51932.cs
-	  CP949.cs : Fixed windows code page and some minor properties.
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* DbcsConvert.cs ISO2022JP.cs CP950.cs CP932.cs: author lines.
-	  Monoized CP932.cs which is too deeply indented to read (and
-	  anyways no one other than myself is taking care of it).
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* KSConvert.cs Big5Convert.cs Gb2312Convert.cs: removed. They could
-	  just be DbcsConvert instances.
-	* I18N.CJK.dll.sources : removed above.
-	* DbcsConvert.cs : added static fields: Big5 and KS.
-	* CP949.cs CP950.cs : use DbcsConvert class directly.
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* CP936.cs, CP949.cs, CP950.cs :
-	  Added GetByteCountImpl() (there weren't GetByteCount() override
-	  in those classes, so they also save extra byte[] allocation).
-	* CP932.cs, CP51932.cs, GB18030Encoding.cs, ISO2022JP.cs :
-	  GetByteCount() -> GetByteCountImpl().
-	  Fixed ISO2022JPEncoder/Decoder to hold different "shifted_in" flags
-	  for GetByteCountImpl() and GetBytesImpl().
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ISO2022JP.cs GB18030Encoding.cs CP936.cs CP51932.cs:
-	  fix warnings.
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* CP950.cs :
-	  This was the last one encoding which needed incomplete byte
-	  handling.
-	* DbcsEncoding.cs, GB18030Encoding.cs, CP950.cs, CP932.cs,
-	  CP936.cs, CP51932.cs, CP949.cs (all):
-	  Made GetCharCount() and GetChars() in DbcsDecoder as different
-	  internal CheckRange() methods (it is bad design to have those
-	  methods as base methods). Use CheckRange() everywhere.
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* CP949.cs :
-	  handle incomplete byte (thus conversion implementation went into
-	  CP949Decoder like other DBCS encodings).
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* CP936.cs :
-	  handle incomplete byte (thus conversion implementation went into
-	  CP936Decoder like other DBCS encodings).
-
 2006-01-20  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* CP51932.cs :
diff --git a/mcs/class/I18N/CJK/DbcsConvert.cs b/mcs/class/I18N/CJK/DbcsConvert.cs
index 277f45c8b6d..d76a2f4b65d 100644
--- a/mcs/class/I18N/CJK/DbcsConvert.cs
+++ b/mcs/class/I18N/CJK/DbcsConvert.cs
@@ -3,7 +3,6 @@
 //
 // Author:
 //   Alan Tam Siu Lung (Tam@SiuLung.com)
-//   Atsushi Enomoto  <atsushi@ximian.com>
 //
 
 using System;
@@ -28,11 +27,6 @@ namespace I18N.CJK
 			}
 		}
 
-		internal static readonly DbcsConvert Gb2312 =
-			new DbcsConvert ("gb2312.table");
-		internal static readonly DbcsConvert Big5 =
-			new DbcsConvert ("big5.table");
-		internal static readonly DbcsConvert KS =
-			new DbcsConvert ("ks.table");
+		internal static DbcsConvert Gb2312 = new DbcsConvert ("gb2312.table");
 	}
 }
diff --git a/mcs/class/I18N/CJK/DbcsEncoding.cs b/mcs/class/I18N/CJK/DbcsEncoding.cs
index 5768ee43171..3e73a86b816 100644
--- a/mcs/class/I18N/CJK/DbcsEncoding.cs
+++ b/mcs/class/I18N/CJK/DbcsEncoding.cs
@@ -14,14 +14,7 @@ namespace I18N.CJK
 	[Serializable]
 	internal abstract class DbcsEncoding : MonoEncoding
 	{
-		public DbcsEncoding (int codePage) : this (codePage, 0)
-		{
-		}
-
-		public DbcsEncoding (int codePage, int windowsCodePage)
-			: base (codePage, windowsCodePage)
-		{
-		}
+		public DbcsEncoding(int codePage) : base(codePage) {}
 
 		internal abstract DbcsConvert GetConvert ();
 
@@ -106,6 +99,12 @@ namespace I18N.CJK
 			return byteCount;
 		}
 		
+		// Get a decoder that handles a rolling state.
+		public override Decoder GetDecoder()
+		{
+			return new DbcsDecoder(GetConvert ());
+		}
+		
 		// Determine if this encoding can be displayed in a Web browser.
 		public override bool IsBrowserDisplay
 		{
@@ -131,17 +130,20 @@ namespace I18N.CJK
 		}
 		
 		// Decoder that handles a rolling state.
-		internal abstract class DbcsDecoder : Decoder
+		internal class DbcsDecoder : Decoder
 		{
 			protected DbcsConvert convert;
+			protected int lastByte;
 			
 			// Constructor.
 			public DbcsDecoder(DbcsConvert convert)
 			{
 				this.convert = convert;
+				this.lastByte = 0;
 			}
 			
-			internal void CheckRange (byte[] bytes, int index, int count)
+			// Override inherited methods.
+			public override int GetCharCount(byte[] bytes, int index, int count)
 			{
 				if (bytes == null)
 					throw new ArgumentNullException("bytes");
@@ -149,9 +151,11 @@ namespace I18N.CJK
 					throw new ArgumentOutOfRangeException("index", Strings.GetString("ArgRange_Array"));
 				if (count < 0 || count > (bytes.Length - index))
 					throw new ArgumentOutOfRangeException("count", Strings.GetString("ArgRange_Array"));
+				char[] buffer = new char[count * 2];
+				return GetChars(bytes, index, count, buffer, 0);
 			}
-
-			internal void CheckRange (byte[] bytes, int byteIndex, int byteCount,
+			
+			public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
 						     char[] chars, int charIndex)
 			{
 				if (bytes == null)
@@ -164,6 +168,7 @@ namespace I18N.CJK
 					throw new ArgumentOutOfRangeException("byteCount", Strings.GetString("ArgRange_Array"));
 				if (charIndex < 0 || charIndex > chars.Length)
 					throw new ArgumentOutOfRangeException("charIndex", Strings.GetString("ArgRange_Array"));
+				return 0; // For subclasses to implement
 			}
 		}
 	}
diff --git a/mcs/class/I18N/CJK/GB18030Encoding.cs b/mcs/class/I18N/CJK/GB18030Encoding.cs
index 2cb1ff12152..fa761afeea5 100644
--- a/mcs/class/I18N/CJK/GB18030Encoding.cs
+++ b/mcs/class/I18N/CJK/GB18030Encoding.cs
@@ -25,7 +25,7 @@ namespace I18N.CJK
 	{
 		// Constructor.
 		public GB18030Encoding ()
-			: base (54936, 936)
+			: base (54936)
 		{
 		}
 
@@ -33,34 +33,10 @@ namespace I18N.CJK
 			get { return "Chinese Simplified (GB18030)"; }
 		}
 
-		public override string HeaderName {
-			get { return "GB18030"; }
-		}
-
-		public override string BodyName {
-			get { return "GB18030"; }
-		}
-
 		public override string WebName {
 			get { return "GB18030"; }
 		}
 
-		public override bool IsMailNewsDisplay {
-			get { return true; }
-		}
-
-		public override bool IsMailNewsSave {
-			get { return true; }
-		}
-
-		public override bool IsBrowserDisplay {
-			get { return true; }
-		}
-
-		public override bool IsBrowserSave {
-			get { return true; }
-		}
-
 		public override int GetMaxByteCount (int len)
 		{
 			// non-GB2312 characters in \u0080 - \uFFFF
@@ -77,11 +53,6 @@ namespace I18N.CJK
 			return new GB18030Encoder (this).GetByteCount (chars, index, length, true);
 		}
 
-		public unsafe override int GetByteCountImpl (char* chars, int count)
-		{
-			return new GB18030Encoder (this).GetByteCountImpl (chars, count, true);
-		}
-
 		public unsafe override int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount)
 		{
 			return new GB18030Encoder (this).GetBytesImpl (chars, charCount, bytes, byteCount, true);
@@ -108,20 +79,20 @@ namespace I18N.CJK
 		}
 	}
 
-	class GB18030Decoder : DbcsEncoding.DbcsDecoder
+	class GB18030Decoder : Decoder
 	{
 		static DbcsConvert gb2312 = DbcsConvert.Gb2312;
 		// for now incomplete block is not supported - should we?
 		// int incomplete1 = -1, incomplete2 = -1, incomplete3 = -1;
 
-		public GB18030Decoder ()
-			: base (null)
-		{
-		}
-
 		public override int GetCharCount (byte [] bytes, int start, int len)
 		{
-			CheckRange (bytes, start, len);
+			if (bytes == null)
+				throw new ArgumentNullException ("bytes");
+			if (start < 0 || start > bytes.Length)
+				throw new ArgumentOutOfRangeException ("start");
+			if (len < 0 || start + len > bytes.Length)
+				throw new ArgumentOutOfRangeException ("len");
 
 			int end = start + len;
 			int ret = 0;
@@ -195,7 +166,16 @@ namespace I18N.CJK
 
 		public override int GetChars (byte [] bytes, int byteIndex, int byteCount, char [] chars, int charIndex)
 		{
-			CheckRange (bytes, byteIndex, byteCount, chars, charIndex);
+			if (bytes == null)
+				throw new ArgumentNullException ("bytes");
+			if (chars == null)
+				throw new ArgumentNullException ("chars");
+			if (byteIndex < 0 || byteIndex > bytes.Length)
+				throw new ArgumentOutOfRangeException ("byteIndex");
+			if (byteCount < 0 || byteIndex + byteCount > bytes.Length)
+				throw new ArgumentOutOfRangeException ("byteCount");
+			if (charIndex < 0 || charIndex > chars.Length)
+				throw new ArgumentOutOfRangeException ("charIndex");
 
 			int byteEnd = byteIndex + byteCount;
 			int charStart = charIndex;
@@ -274,7 +254,7 @@ namespace I18N.CJK
 		}
 	}
 
-	class GB18030Encoder : MonoEncoder
+	class GB18030Encoder : MonoEncoding.MonoEncoder
 	{
 		static DbcsConvert gb2312 = DbcsConvert.Gb2312;
 
@@ -286,10 +266,16 @@ namespace I18N.CJK
 		char incomplete_byte_count;
 		char incomplete_bytes;
 
-		public unsafe override int GetByteCountImpl (char* chars, int count, bool refresh)
+		public override int GetByteCount (char [] chars, int start, int len, bool refresh)
 		{
-			int start = 0;
-			int end = count;
+			if (chars == null)
+				throw new ArgumentNullException ("chars");
+			if (start < 0 || start > chars.Length)
+				throw new ArgumentOutOfRangeException ("index");
+			if (len < 0 || start + len > chars.Length)
+				throw new ArgumentOutOfRangeException ("count");
+
+			int end = start + len;
 			int ret = 0;
 			while (start < end) {
 				char ch = chars [start];
@@ -347,6 +333,9 @@ namespace I18N.CJK
 		{
 			int charIndex = 0;
 			int byteIndex = 0;
+#if NET_2_0
+			EncoderFallbackBuffer buffer = null;
+#endif
 
 			int charEnd = charIndex + charCount;
 			int byteStart = byteIndex;
diff --git a/mcs/class/I18N/CJK/Gb2312Convert.cs b/mcs/class/I18N/CJK/Gb2312Convert.cs
new file mode 100644
index 00000000000..97030b4e7ff
--- /dev/null
+++ b/mcs/class/I18N/CJK/Gb2312Convert.cs
@@ -0,0 +1,299 @@
+//
+// I18N.CJK.Gb2312Convert
+//
+// Author:
+//   Alan Tam Siu Lung (Tam@SiuLung.com)
+//   Dick Porter (dick@ximian.com)
+//
+
+using System;
+
+namespace I18N.CJK
+{
+	internal sealed class Gb2312Convert
+	{
+		public byte[] gb2312_to_unicode;
+		public byte[] gb2312_from_unicode1;
+		public byte[] gb2312_from_unicode2;
+		public byte[] gb2312_from_unicode3;
+		public byte[] gb2312_from_unicode4;
+		public byte[] gb2312_from_unicode5;
+		public byte[] gb2312_from_unicode6;
+		public byte[] gb2312_from_unicode7;
+		public byte[] gb2312_from_unicode8;
+		public byte[] gb2312_from_unicode9;
+		
+		private Gb2312Convert() 
+		{
+			using (CodeTable table = new CodeTable ("gb2312.table")) {
+				gb2312_to_unicode = table.GetSection (1);
+
+				gb2312_from_unicode1 = table.GetSection (2);
+				gb2312_from_unicode2 = table.GetSection (3);
+				gb2312_from_unicode3 = table.GetSection (4);
+				gb2312_from_unicode4 = table.GetSection (5);
+				gb2312_from_unicode5 = table.GetSection (6);
+				gb2312_from_unicode6 = table.GetSection (7);
+				gb2312_from_unicode7 = table.GetSection (8);
+				gb2312_from_unicode8 = table.GetSection (9);
+				gb2312_from_unicode9 = table.GetSection (10);
+			}
+		}
+		
+		
+		// The one and only GB2312 conversion object in the system.
+		private static Gb2312Convert convert;
+		static readonly object lockobj = new object ();
+		// Get the primary GB2312 conversion object.
+		public static Gb2312Convert Convert
+		{
+			get {
+				lock (lockobj) {
+					if (convert == null) {
+						convert = new Gb2312Convert ();
+					}
+					return(convert);
+				}
+			}
+		}
+
+		public char BytePairToChar (ref int lastByte, int b)
+		{
+			if (lastByte == 0) {
+				if (b < 0x80) {
+					// ASCII
+					return (char) b;
+				} else if ((b <= 0xa0 &&
+					    b != 0x8e &&
+					    b != 0x8f) ||
+					   b > 0xfe) {
+					// Invalid first byte
+					return char.MinValue;
+				} else {
+					// First byte in a
+					// double-byte sequence
+					lastByte = b;
+					return char.MaxValue;
+				}
+			}
+
+			try {
+				// Second byte in a
+				// double-byte sequence
+				if (lastByte < 0x80 ||
+				    (lastByte - 0x80) <= 0x20 ||
+				    (lastByte - 0x80) > 0x77 ||
+				    (b - 0x80) <= 0x20 ||
+				    (b - 0x80) >= 0x7f) {
+					// Invalid second byte
+					return char.MinValue;
+				} else {
+					int value;
+					int idx = (((lastByte - 0xa1) * 94 + (b - 0xa1)) * 2);
+
+					if (idx > 0x3fe2) {
+						value = 0;
+					} else {
+						value = (int)(gb2312_to_unicode[idx] | (gb2312_to_unicode[idx + 1] << 8));
+					}
+
+					if (value != 0) {
+						return (char)value;
+					} else {
+						return char.MinValue;
+					}
+				}
+			} finally {
+				lastByte = 0;
+			}
+		}
+
+		public int UcsToGbk (int ch)
+		{
+			byte byte1 = 0, byte2 = 0;
+			int tablepos;
+
+			if (ch >= 0xa4 && ch <= 0x101) {
+				tablepos = (ch - 0xa4) * 2;
+				byte1 = gb2312_from_unicode1 [tablepos];
+				byte2 = gb2312_from_unicode1 [tablepos + 1];
+			} else if (ch >= 0x113 && ch <= 0x2c9) {
+				switch(ch) {
+				case 0x113:
+					byte1 = 0x28;
+					byte2 = 0x25;
+					break;
+				case 0x11b:
+					byte1 = 0x28;
+					byte2 = 0x27;
+					break;
+				case 0x12b:
+					byte1 = 0x28;
+					byte2 = 0x29;
+					break;
+				case 0x14d:
+					byte1 = 0x28;
+					byte2 = 0x2d;
+					break;
+				case 0x16b:
+					byte1 = 0x28;
+					byte2 = 0x31;
+					break;
+				case 0x1ce:
+					byte1 = 0x28;
+					byte2 = 0x23;
+					break;
+				case 0x1d0:
+					byte1 = 0x28;
+					byte2 = 0x2b;
+					break;
+				case 0x1d2:
+					byte1 = 0x28;
+					byte2 = 0x2f;
+					break;
+				case 0x1d4:
+					byte1 = 0x28;
+					byte2 = 0x33;
+					break;
+				case 0x1d6:
+					byte1 = 0x28;
+					byte2 = 0x35;
+					break;
+				case 0x1d8:
+					byte1 = 0x28;
+					byte2 = 0x36;
+					break;
+				case 0x1da:
+					byte1 = 0x28;
+					byte2 = 0x37;
+					break;
+				case 0x1dc:
+					byte1 = 0x28;
+					byte2 = 0x38;
+					break;
+				case 0x2c7:
+					byte1 = 0x21;
+					byte2 = 0x26;
+					break;
+				case 0x2c9:
+					byte1 = 0x21;
+					byte2 = 0x25;
+					break;
+				}
+			} else if (ch >= 0x391 && ch <= 0x3c9) {
+				tablepos = (ch - 0x391) * 2;
+				byte1 = gb2312_from_unicode2 [tablepos];
+				byte2 = gb2312_from_unicode2 [tablepos + 1];
+			} else if (ch >= 0x401 && ch <= 0x451) {
+				tablepos = (ch - 0x401) * 2;
+				byte1 = gb2312_from_unicode3 [tablepos];
+				byte2 = gb2312_from_unicode3 [tablepos + 1];
+			} else if (ch >= 0x2015 && ch <= 0x203b) {
+				tablepos = (ch - 0x2015) * 2;
+				byte1 = gb2312_from_unicode4 [tablepos];
+				byte2 = gb2312_from_unicode4 [tablepos + 1];
+			} else if (ch >= 0x2103 && ch <= 0x22a5) {
+				tablepos = (ch - 0x2103) * 2;
+				byte1 = gb2312_from_unicode5 [tablepos];
+				byte2 = gb2312_from_unicode5 [tablepos + 1];
+			} else if (ch == 0x2312) {
+				byte1 = 0x21;
+				byte2 = 0x50;
+			} else if (ch >= 0x2460 && ch <= 0x249b) {
+				tablepos = (ch - 0x2460) * 2;
+				byte1 = gb2312_from_unicode6 [tablepos];
+				byte2 = gb2312_from_unicode6 [tablepos + 1];
+			} else if (ch >= 0x2500 && ch <= 0x254b) {
+				byte1 = 0x29;
+				byte2 = (byte) (0x24 + (ch % 0x100));
+			} else if (ch >= 0x25a0 && ch <= 0x2642) {
+				switch(ch) {
+				case 0x25a0:
+					byte1 = 0x21;
+					byte2 = 0x76;
+					break;
+				case 0x25a1:
+					byte1 = 0x21;
+					byte2 = 0x75;
+					break;
+				case 0x25b2:
+					byte1 = 0x21;
+					byte2 = 0x78;
+					break;
+				case 0x25b3:
+					byte1 = 0x21;
+					byte2 = 0x77;
+					break;
+				case 0x25c6:
+					byte1 = 0x21;
+					byte2 = 0x74;
+					break;
+				case 0x25c7:
+					byte1 = 0x21;
+					byte2 = 0x73;
+					break;
+				case 0x25cb:
+					byte1 = 0x21;
+					byte2 = 0x70;
+					break;
+				case 0x25ce:
+					byte1 = 0x21;
+					byte2 = 0x72;
+					break;
+				case 0x25cf:
+					byte1 = 0x21;
+					byte2 = 0x71;
+					break;
+				case 0x2605:
+					byte1 = 0x21;
+					byte2 = 0x6f;
+					break;
+				case 0x2606:
+					byte1 = 0x21;
+					byte2 = 0x6e;
+					break;
+				case 0x2640:
+					byte1 = 0x21;
+					byte2 = 0x62;
+					break;
+				case 0x2642:
+					byte1 = 0x21;
+					byte2 = 0x61;
+					break;
+				}
+			} else if (ch >= 0x3000 && ch <= 0x3129) {
+				tablepos = (ch - 0x3000) * 2;
+				byte1 = gb2312_from_unicode7 [tablepos];
+				byte2 = gb2312_from_unicode7 [tablepos + 1];
+			} else if (ch >= 0x3220 && ch <= 0x3229) {
+				byte1 = 0x22;
+				byte2 = (byte) (0x65 + (ch - 0x3220));
+			} else if (ch >= 0x4e00 && ch <= 0x9fa0) {
+				tablepos = (ch - 0x4e00) * 2;
+				byte1 = gb2312_from_unicode8 [tablepos];
+				byte2 = gb2312_from_unicode8 [tablepos + 1];
+			} else if (ch >= 0xff01 && ch <= 0xff5e) {
+				tablepos = (ch - 0xff01) * 2;
+				byte1 = gb2312_from_unicode9 [tablepos];
+				byte2 = gb2312_from_unicode9 [tablepos + 1];
+			} else if (ch == 0xffe0) {
+				byte1 = 0x21;
+				byte2 = 0x69;
+			} else if (ch == 0xffe1) {
+				byte1 = 0x21;
+				byte2 = 0x6a;
+			} else if (ch == 0xffe3) {
+				byte1 = 0x21;
+				byte2 = 0x7e;
+			} else if (ch == 0xffe5) {
+				byte1 = 0x21;
+				byte2 = 0x24;
+			}
+
+			if (byte1 == 0 || byte2 == 0)
+				return -1; // invalid
+			else
+				return ((byte1 + 0x80) << 8) + byte2 + 0x80;
+		}
+	}
+}
diff --git a/mcs/class/I18N/CJK/I18N.CJK.dll.sources b/mcs/class/I18N/CJK/I18N.CJK.dll.sources
index 1df1c069967..15de42a170b 100755
--- a/mcs/class/I18N/CJK/I18N.CJK.dll.sources
+++ b/mcs/class/I18N/CJK/I18N.CJK.dll.sources
@@ -1,5 +1,6 @@
 ../Assembly/AssemblyInfo.cs
 ../../../build/common/Consts.cs
+Big5Convert.cs
 CP932.cs
 ISO2022JP.cs
 CP51932.cs
@@ -9,6 +10,8 @@ CP950.cs
 CodeTable.cs
 DbcsEncoding.cs
 DbcsConvert.cs
+Gb2312Convert.cs
 GB18030Encoding.cs
 GB18030Source.cs
 JISConvert.cs
+KSConvert.cs
diff --git a/mcs/class/I18N/CJK/ISO2022JP.cs b/mcs/class/I18N/CJK/ISO2022JP.cs
index 4447a796399..fea787bfb90 100644
--- a/mcs/class/I18N/CJK/ISO2022JP.cs
+++ b/mcs/class/I18N/CJK/ISO2022JP.cs
@@ -1,15 +1,12 @@
-//
-// ISO2022JP.cs
-//
-// Author:
-//	Atsushi Enomoto  <atsushi@ximian.com>
-//
 using System;
 using System.Text;
 using I18N.Common;
 
 namespace I18N.CJK
 {
+	// FIXME:
+	// find out what is the difference between 50220, 50221 and 50222.
+
 	[Serializable]
 	public class CP50220 : ISO2022JPEncoding
 	{
@@ -52,8 +49,10 @@ namespace I18N.CJK
 	[Serializable]
 	public class ISO2022JPEncoding : MonoEncoding
 	{
+		static JISConvert convert = JISConvert.Convert;
+
 		public ISO2022JPEncoding (int codePage, bool allow1ByteKana, bool allowShiftIO)
-			: base (codePage, 932)
+			: base (codePage)
 		{
 			this.allow_1byte_kana = allow1ByteKana;
 			this.allow_shift_io = allowShiftIO;
@@ -90,11 +89,6 @@ namespace I18N.CJK
 			return new ISO2022JPEncoder (this, allow_1byte_kana, allow_shift_io).GetByteCount (chars, charIndex, charCount, true);
 		}
 
-		public unsafe override int GetByteCountImpl (char* chars, int count)
-		{
-			return new ISO2022JPEncoder (this, allow_1byte_kana, allow_shift_io).GetByteCountImpl (chars, count, true);
-		}
-
 		public unsafe override int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount)
 		{
 			return new ISO2022JPEncoder (this, allow_1byte_kana, allow_shift_io).GetBytesImpl (chars, charCount, bytes, byteCount, true);
@@ -117,14 +111,14 @@ namespace I18N.CJK
 		JISX0201
 	}
 
-	internal class ISO2022JPEncoder : MonoEncoder
+	internal class ISO2022JPEncoder : MonoEncoding.MonoEncoder
 	{
 		static JISConvert convert = JISConvert.Convert;
 
 		readonly bool allow_1byte_kana, allow_shift_io;
 
 		ISO2022JPMode m = ISO2022JPMode.ASCII;
-		bool shifted_in_count, shifted_in_conv;
+		bool shifted_in;
 
 		public ISO2022JPEncoder (MonoEncoding owner, bool allow1ByteKana, bool allowShiftIO)
 			: base (owner)
@@ -133,10 +127,9 @@ namespace I18N.CJK
 			this.allow_shift_io = allowShiftIO;
 		}
 
-		public unsafe override int GetByteCountImpl (char* chars, int charCount, bool flush)
+		public override int GetByteCount (char [] chars, int charIndex, int charCount, bool flush)
 		{
-			int charIndex = 0;
-			int end = charCount;
+			int end = charIndex + charCount;
 			int value;
 			int byteCount = 0;
 
@@ -151,8 +144,8 @@ namespace I18N.CJK
 
 				if (ch >= 0x2010 && ch <= 0x9FA5)
 				{
-					if (shifted_in_count) {
-						shifted_in_count = false;
+					if (shifted_in) {
+						shifted_in = false;
 						byteCount++; // shift_out
 					}
 					if (m != ISO2022JPMode.JISX0208)
@@ -163,8 +156,8 @@ namespace I18N.CJK
 					value = ((int)(convert.cjkToJis[value])) |
 							(((int)(convert.cjkToJis[value + 1])) << 8);
 				} else if (ch >= 0xFF01 && ch <= 0xFF60) {
-					if (shifted_in_count) {
-						shifted_in_count = false;
+					if (shifted_in) {
+						shifted_in = false;
 						byteCount++;
 					}
 					if (m != ISO2022JPMode.JISX0208)
@@ -177,9 +170,9 @@ namespace I18N.CJK
 							(((int)(convert.extraToJis[value + 1])) << 8);
 				} else if(ch >= 0xFF60 && ch <= 0xFFA0) {
 					if (allow_shift_io) {
-						if (!shifted_in_count) {
+						if (!shifted_in) {
 							byteCount++;
-							shifted_in_count = true;
+							shifted_in = true;
 						}
 					}
 					else if (m != ISO2022JPMode.JISX0201) {
@@ -188,8 +181,8 @@ namespace I18N.CJK
 					}
 					value = ch - 0xFF60 + 0xA0;
 				} else if (ch < 128) {
-					if (shifted_in_count) {
-						shifted_in_count = false;
+					if (shifted_in) {
+						shifted_in = false;
 						byteCount++;
 					}
 					if (m != ISO2022JPMode.ASCII)
@@ -207,8 +200,8 @@ namespace I18N.CJK
 			}
 			// must end in ASCII mode
 			if (flush) {
-				if (shifted_in_count) {
-					shifted_in_count = false;
+				if (shifted_in) {
+					shifted_in = false;
 					byteCount++;
 				}
 				if (m != ISO2022JPMode.ASCII)
@@ -253,6 +246,9 @@ namespace I18N.CJK
 		{
 			int charIndex = 0;
 			int byteIndex = 0;
+#if NET_2_0
+			EncoderFallbackBuffer buffer = null;
+#endif
 
 			int start = byteIndex;
 			int end = charIndex + charCount;
@@ -270,9 +266,9 @@ namespace I18N.CJK
 
 				if (ch >= 0x2010 && ch <= 0x9FA5)
 				{
-					if (shifted_in_conv) {
+					if (shifted_in) {
 						bytes [byteIndex++] = 0x0F;
-						shifted_in_conv = false;
+						shifted_in = false;
 						byteCount--;
 					}
 					switch (m) {
@@ -287,9 +283,9 @@ namespace I18N.CJK
 					value = ((int)(convert.cjkToJis[value])) |
 							(((int)(convert.cjkToJis[value + 1])) << 8);
 				} else if (ch >= 0xFF01 && ch <= 0xFF60) {
-					if (shifted_in_conv) {
+					if (shifted_in) {
 						bytes [byteIndex++] = 0x0F;
-						shifted_in_conv = false;
+						shifted_in = false;
 						byteCount--;
 					}
 					switch (m) {
@@ -310,9 +306,9 @@ namespace I18N.CJK
 					// so here we don't have to consider it.
 
 					if (allow_shift_io) {
-						if (!shifted_in_conv) {
+						if (!shifted_in) {
 							bytes [byteIndex++] = 0x0E;
-							shifted_in_conv = true;
+							shifted_in = true;
 							byteCount--;
 						}
 					} else {
@@ -326,9 +322,9 @@ namespace I18N.CJK
 					}
 					value = ch - 0xFF40;
 				} else if (ch < 128) {
-					if (shifted_in_conv) {
+					if (shifted_in) {
 						bytes [byteIndex++] = 0x0F;
-						shifted_in_conv = false;
+						shifted_in = false;
 						byteCount--;
 					}
 					SwitchMode (bytes, ref byteIndex, ref byteCount, ref m, ISO2022JPMode.ASCII);
@@ -357,9 +353,9 @@ namespace I18N.CJK
 			}
 			if (flush) {
 				// must end in ASCII mode
-				if (shifted_in_conv) {
+				if (shifted_in) {
 					bytes [byteIndex++] = 0x0F;
-					shifted_in_conv = false;
+					shifted_in = false;
 					byteCount--;
 				}
 				if (m != ISO2022JPMode.ASCII)
@@ -372,7 +368,7 @@ namespace I18N.CJK
 		public override void Reset ()
 		{
 			m = ISO2022JPMode.ASCII;
-			shifted_in_conv = shifted_in_count = false;
+			shifted_in = false;
 		}
 #endif
 	}
@@ -383,7 +379,7 @@ namespace I18N.CJK
 
 		readonly bool allow_shift_io;
 		ISO2022JPMode m = ISO2022JPMode.ASCII;
-		bool shifted_in_conv, shifted_in_count;
+		bool shifted_in;
 
 		public ISO2022JPDecoder (bool allow1ByteKana, bool allowShiftIO)
 		{
@@ -400,15 +396,15 @@ namespace I18N.CJK
 				if (allow_shift_io) {
 					switch (bytes [i]) {
 					case 0x0F:
-						shifted_in_count = false;
+						shifted_in = false;
 						continue;
 					case 0x0E:
-						shifted_in_count = true;
+						shifted_in = true;
 						continue;
 					}
 				}
 				if (bytes [i] != 0x1B) {
-					if (!shifted_in_count && m == ISO2022JPMode.JISX0208) {
+					if (!shifted_in && m == ISO2022JPMode.JISX0208) {
 						if (i + 1 == end)
 							break; // incomplete head of wide char
 						else
@@ -457,16 +453,16 @@ namespace I18N.CJK
 				if (allow_shift_io) {
 					switch (bytes [i]) {
 					case 0x0F:
-						shifted_in_conv = false;
+						shifted_in = false;
 						continue;
 					case 0x0E:
-						shifted_in_conv = true;
+						shifted_in = true;
 						continue;
 					}
 				}
 
 				if (bytes [i] != 0x1B) {
-					if (shifted_in_conv || m == ISO2022JPMode.JISX0201) {
+					if (shifted_in || m == ISO2022JPMode.JISX0201) {
 						// half-kana
 						if (bytes [i] < 0x60)
 							chars [charIndex++] = (char) (bytes [i] + 0xFF40);
@@ -528,7 +524,7 @@ namespace I18N.CJK
 		public override void Reset ()
 		{
 			m = ISO2022JPMode.ASCII;
-			shifted_in_count = shifted_in_conv = false;
+			shifted_in = false;
 		}
 #endif
 	}
diff --git a/mcs/class/I18N/CJK/KSConvert.cs b/mcs/class/I18N/CJK/KSConvert.cs
new file mode 100644
index 00000000000..5b0198538d0
--- /dev/null
+++ b/mcs/class/I18N/CJK/KSConvert.cs
@@ -0,0 +1,31 @@
+//
+// I18N.CJK.KSConvert
+//
+// Author:
+//   Hye-Shik Chang <perky@FreeBSD.org>
+//
+
+using System;
+
+namespace I18N.CJK
+{
+    internal sealed class KSConvert : DbcsConvert
+    {
+        // Dummy constructor, no one is aupposed to call it
+        private KSConvert() : base("ks.table") {}
+        
+        // The one and only KS conversion object in the system.
+        private static DbcsConvert convert;
+        
+        // Get the primary KS conversion object.
+        public static DbcsConvert Convert
+        {
+            get {
+                if (convert == null) convert = new DbcsConvert("ks.table");
+                return convert;
+            }
+        }
+    }
+}
+
+// ex: ts=8 sts=4 et
diff --git a/mcs/class/I18N/CJK/Test/ChangeLog b/mcs/class/I18N/CJK/Test/ChangeLog
index 52672d2bede..b1eae8eb10e 100755
--- a/mcs/class/I18N/CJK/Test/ChangeLog
+++ b/mcs/class/I18N/CJK/Test/ChangeLog
@@ -1,18 +1,3 @@
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* I18N.CJK.Test.cs :
-	  added Decoder950Refresh() and Decoder950NoRefresh().
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* I18N.CJK.Test.cs :
-	  added Decoder949Refresh() and Decoder949NoRefresh().
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* I18N.CJK.Test.cs :
-	  added Decoder936Refresh() and Decoder936NoRefresh().
-
 2006-01-20  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* I18N.CJK.Test.cs :
diff --git a/mcs/class/I18N/CJK/Test/I18N.CJK.Test.cs b/mcs/class/I18N/CJK/Test/I18N.CJK.Test.cs
index dc093c8b0f0..71061d83e4b 100755
--- a/mcs/class/I18N/CJK/Test/I18N.CJK.Test.cs
+++ b/mcs/class/I18N/CJK/Test/I18N.CJK.Test.cs
@@ -337,75 +337,6 @@ namespace MonoTests.I18N.CJK
 			Assert.AreEqual (1, d.GetChars (new byte [] {0xA1}, 0, 1, chars, 0, true), "#5");
 			Assert.AreEqual (new char [] {'\u30FB'}, chars, "#6");
 		}
-
-		[Test]
-		public void Decoder936Refresh ()
-		{
-			Encoding e = Encoding.GetEncoding (936);
-			Decoder d = e.GetDecoder ();
-			char [] chars;
-
-			// incomplete
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0xB0}, 0, 1, chars, 0, false), "#1");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#2");
-
-			// became complete
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0xA1}, 0, 1, chars, 0, false), "#3");
-			Assert.AreEqual (new char [] {'\u554A'}, chars, "#4");
-
-			// incomplete but refreshed
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0xB0}, 0, 1, chars, 0, true), "#5");
-			Assert.AreEqual (new char [] {'?'}, chars, "#6");
-		}
-
-		[Test]
-		public void Decoder949Refresh ()
-		{
-			Encoding e = Encoding.GetEncoding (949);
-			Decoder d = e.GetDecoder ();
-			char [] chars;
-
-			// incomplete
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0x81}, 0, 1, chars, 0, false), "#1");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#2");
-
-			// became complete
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0x41}, 0, 1, chars, 0, false), "#3");
-			Assert.AreEqual (new char [] {'\uAC02'}, chars, "#4");
-
-			// incomplete but refreshed
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0x81}, 0, 1, chars, 0, true), "#5");
-			Assert.AreEqual (new char [] {'?'}, chars, "#6");
-		}
-
-		[Test]
-		public void Decoder950Refresh ()
-		{
-			Encoding e = Encoding.GetEncoding (950);
-			Decoder d = e.GetDecoder ();
-			char [] chars;
-
-			// incomplete
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0xF9}, 0, 1, chars, 0, false), "#1");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#2");
-
-			// became complete
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0x40}, 0, 1, chars, 0, false), "#3");
-			Assert.AreEqual (new char [] {'\u7E98'}, chars, "#4");
-
-			// incomplete but refreshed
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0xF9}, 0, 1, chars, 0, true), "#5");
-			Assert.AreEqual (new char [] {'?'}, chars, "#6");
-		}
 #endif
 
 
@@ -431,75 +362,6 @@ namespace MonoTests.I18N.CJK
 			Assert.AreEqual (0, d.GetChars (new byte [] {0xA1}, 0, 1, chars, 0), "#5");
 			Assert.AreEqual (new char [] {'\0'}, chars, "#6");
 		}
-
-		[Test]
-		public void Decoder936NoRefresh ()
-		{
-			Encoding e = Encoding.GetEncoding (936);
-			Decoder d = e.GetDecoder ();
-			char [] chars;
-
-			// incomplete
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0xB0}, 0, 1, chars, 0), "#1");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#2");
-
-			// became complete
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0xA1}, 0, 1, chars, 0), "#3");
-			Assert.AreEqual (new char [] {'\u554A'}, chars, "#4");
-
-			// incomplete but refreshed
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0xB0}, 0, 1, chars, 0), "#5");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#6");
-		}
-
-		[Test]
-		public void Decoder949NoRefresh ()
-		{
-			Encoding e = Encoding.GetEncoding (949);
-			Decoder d = e.GetDecoder ();
-			char [] chars;
-
-			// incomplete
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0x81}, 0, 1, chars, 0), "#1");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#2");
-
-			// became complete
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0x41}, 0, 1, chars, 0), "#3");
-			Assert.AreEqual (new char [] {'\uAC02'}, chars, "#4");
-
-			// incomplete but refreshed
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0x81}, 0, 1, chars, 0), "#5");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#6");
-		}
-
-		[Test]
-		public void Decoder950NoRefresh ()
-		{
-			Encoding e = Encoding.GetEncoding (950);
-			Decoder d = e.GetDecoder ();
-			char [] chars;
-
-			// incomplete
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0xF9}, 0, 1, chars, 0), "#1");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#2");
-
-			// became complete
-			chars = new char [1];
-			Assert.AreEqual (1, d.GetChars (new byte [] {0x40}, 0, 1, chars, 0), "#3");
-			Assert.AreEqual (new char [] {'\u7E98'}, chars, "#4");
-
-			// incomplete but refreshed
-			chars = new char [1];
-			Assert.AreEqual (0, d.GetChars (new byte [] {0xF9}, 0, 1, chars, 0), "#5");
-			Assert.AreEqual (new char [] {'\0'}, chars, "#6");
-		}
 		#endregion
 
 		#region Korean
diff --git a/mcs/class/I18N/Common/ByteEncoding.cs b/mcs/class/I18N/Common/ByteEncoding.cs
index 463e30b1132..52fe6a9bf4e 100644
--- a/mcs/class/I18N/Common/ByteEncoding.cs
+++ b/mcs/class/I18N/Common/ByteEncoding.cs
@@ -76,6 +76,27 @@ public abstract class ByteEncoding : MonoEncoding
 	}
 #endif
 
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Convenience wrappers for "GetByteCount".
 	public override int GetByteCount(String s)
 			{
 				if(s == null)
@@ -85,12 +106,6 @@ public abstract class ByteEncoding : MonoEncoding
 				return s.Length;
 			}
 
-	// Get the number of bytes needed to encode a character buffer.
-	public unsafe override int GetByteCountImpl (char* chars, int count)
-			{
-				return count;
-			}
-
 	// Convert an array of characters into a byte buffer,
 	// once the parameters have been validated.
 	protected unsafe abstract void ToBytes (
diff --git a/mcs/class/I18N/Common/ChangeLog b/mcs/class/I18N/Common/ChangeLog
index 19eff79914d..3f5f4f37101 100644
--- a/mcs/class/I18N/Common/ChangeLog
+++ b/mcs/class/I18N/Common/ChangeLog
@@ -1,16 +1,3 @@
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* MonoEncoding.cs :
-	  Added another overload that takes windows code page.
-
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* MonoEncoding.cs :
-	  Added abstract GetByteCountImpl() in MonoEncoding and MonoEncoder.
-	  GetByteCount() is now based on the method above.
-	* ByteEncoding.cs : so GetByteCount() became GetByteCountImpl() and
-	  is based on char*.
-
 2006-01-17  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* MonoEncoding.cs, ByteEncoding.cs :
diff --git a/mcs/class/I18N/Common/MonoEncoding.cs b/mcs/class/I18N/Common/MonoEncoding.cs
index f36f71f8677..85e709f2f88 100644
--- a/mcs/class/I18N/Common/MonoEncoding.cs
+++ b/mcs/class/I18N/Common/MonoEncoding.cs
@@ -15,21 +15,9 @@ namespace I18N.Common
 	[Serializable]
 	public abstract class MonoEncoding : Encoding
 	{
-		readonly int win_code_page;
-
 		public MonoEncoding (int codePage)
-			: this (codePage, 0)
-		{
-		}
-
-		public MonoEncoding (int codePage, int windowsCodePage)
 			: base (codePage)
 		{
-			win_code_page = windowsCodePage;
-		}
-
-		public override int WindowsCodePage {
-			get { return win_code_page != 0 ? win_code_page : base.WindowsCodePage; }
 		}
 
 #if NET_2_0
@@ -59,30 +47,6 @@ namespace I18N.Common
 #endif
 
 		// Get the bytes that result from encoding a character buffer.
-		public override int GetByteCount (
-			char [] chars, int index, int count)
-		{
-			if (chars == null)
-				throw new ArgumentNullException ("chars");
-			if (index < 0 || index > chars.Length)
-				throw new ArgumentOutOfRangeException
-					("index", Strings.GetString ("ArgRange_Array"));
-			if (count < 0 || count > (chars.Length - index))
-				throw new ArgumentOutOfRangeException
-					("count", Strings.GetString ("ArgRange_Array"));
-
-			if (count == 0)
-				return 0;
-
-			unsafe {
-				fixed (char* cptr = chars) {
-					return GetByteCountImpl (
-						cptr + index, count);
-				}
-			}
-		}
-
-		// Get the bytes that result from encoding a character buffer.
 		public override int GetBytes (
 			char [] chars, int charIndex, int charCount,
 			byte [] bytes, int byteIndex)
@@ -160,12 +124,6 @@ namespace I18N.Common
 		}
 
 #if NET_2_0
-		public unsafe override int GetByteCount (char* chars, int count)
-
-		{
-			return GetByteCountImpl (chars, count);
-		}
-
 		public unsafe override int GetBytes (char* chars, int charCount,
 			byte* bytes, int byteCount)
 
@@ -175,12 +133,8 @@ namespace I18N.Common
 #endif
 
 		[CLSCompliant (false)]
-		public unsafe abstract int GetByteCountImpl (char* chars, int charCount);
-
-		[CLSCompliant (false)]
 		public unsafe abstract int GetBytesImpl (char* chars, int charCount,
 			byte* bytes, int byteCount);
-	}
 
 		public abstract class MonoEncoder : Encoder
 		{
@@ -191,47 +145,8 @@ namespace I18N.Common
 				this.encoding = encoding;
 			}
 
-			public override int GetByteCount (
-				char [] chars, int index, int count, bool refresh)
-			{
-				if (chars == null)
-					throw new ArgumentNullException ("chars");
-				if (index < 0 || index > chars.Length)
-					throw new ArgumentOutOfRangeException
-						("index", Strings.GetString ("ArgRange_Array"));
-				if (count < 0 || count > (chars.Length - index))
-					throw new ArgumentOutOfRangeException
-						("count", Strings.GetString ("ArgRange_Array"));
-
-				if (count == 0)
-					return 0;
-
-				unsafe {
-					fixed (char* cptr = chars) {
-						return GetByteCountImpl (
-							cptr + index, count, refresh);
-					}
-				}
-			}
-
 			public override int GetBytes (char [] chars, int charIndex, int charCount, byte [] bytes, int byteIndex, bool flush)
 			{
-				if (chars == null)
-					throw new ArgumentNullException ("chars");
-				if (bytes == null)
-					throw new ArgumentNullException ("bytes");
-				if (charIndex < 0 || charIndex > chars.Length)
-					throw new ArgumentOutOfRangeException
-						("charIndex", Strings.GetString ("ArgRange_Array"));
-				if (charCount < 0 || charCount > (chars.Length - charIndex))
-					throw new ArgumentOutOfRangeException
-						("charCount", Strings.GetString ("ArgRange_Array"));
-				if (byteIndex < 0 || byteIndex > bytes.Length)
-					throw new ArgumentOutOfRangeException
-						("byteIndex", Strings.GetString ("ArgRange_Array"));
-				if (bytes.Length - byteIndex < charCount)
-					throw new ArgumentException (Strings.GetString ("Arg_InsufficientSpace"), "bytes");
-
 				if (charCount == 0)
 					return 0;
 				unsafe {
@@ -247,9 +162,7 @@ namespace I18N.Common
 				}
 			}
 
-			public unsafe abstract int GetByteCountImpl (char* chars, int charCount, bool refresh);
-
-			public unsafe abstract int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount, bool refresh);
+			public unsafe abstract int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount, bool flush);
 
 		#if NET_2_0
 			public unsafe override int GetBytes (char* chars, int charCount, byte* bytes, int byteCount, bool flush)
@@ -269,4 +182,5 @@ namespace I18N.Common
 			}
 		#endif
 		}
+	}
 }
diff --git a/mcs/class/I18N/MidEast/CP28596.cs b/mcs/class/I18N/MidEast/CP28596.cs
index 888075109f0..fc7710141b7 100644
--- a/mcs/class/I18N/MidEast/CP28596.cs
+++ b/mcs/class/I18N/MidEast/CP28596.cs
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-// Generated from "windows-28596-2000.ucm".
+// Generated from "ibm-1089.ucm".
 
 namespace I18N.MidEast
 {
@@ -67,23 +67,23 @@ public class CP28596 : ByteEncoding
 		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
 		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
 		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
-		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\uF7C8', 
-		'\uF7C9', '\uF7CA', '\u00A4', '\uF7CB', '\uF7CC', '\uF7CD', 
-		'\uF7CE', '\uF7CF', '\uF7D0', '\uF7D1', '\u060C', '\u00AD', 
-		'\uF7D2', '\uF7D3', '\uF7D4', '\uF7D5', '\uF7D6', '\uF7D7', 
-		'\uF7D8', '\uF7D9', '\uF7DA', '\uF7DB', '\uF7DC', '\uF7DD', 
-		'\uF7DE', '\u061B', '\uF7DF', '\uF7E0', '\uF7E1', '\u061F', 
-		'\uF7E2', '\u0621', '\u0622', '\u0623', '\u0624', '\u0625', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u003F', 
+		'\u003F', '\u003F', '\u00A4', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u060C', '\u00AD', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u061B', '\u003F', '\u003F', '\u003F', '\u061F', 
+		'\u003F', '\u0621', '\u0622', '\u0623', '\u0624', '\u0625', 
 		'\u0626', '\u0627', '\u0628', '\u0629', '\u062A', '\u062B', 
 		'\u062C', '\u062D', '\u062E', '\u062F', '\u0630', '\u0631', 
 		'\u0632', '\u0633', '\u0634', '\u0635', '\u0636', '\u0637', 
-		'\u0638', '\u0639', '\u063A', '\uF7E3', '\uF7E4', '\uF7E5', 
-		'\uF7E6', '\uF7E7', '\u0640', '\u0641', '\u0642', '\u0643', 
+		'\u0638', '\u0639', '\u063A', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u0640', '\u0641', '\u0642', '\u0643', 
 		'\u0644', '\u0645', '\u0646', '\u0647', '\u0648', '\u0649', 
 		'\u064A', '\u064B', '\u064C', '\u064D', '\u064E', '\u064F', 
-		'\u0650', '\u0651', '\u0652', '\uF7E8', '\uF7E9', '\uF7EA', 
-		'\uF7EB', '\uF7EC', '\uF7ED', '\uF7EE', '\uF7EF', '\uF7F0', 
-		'\uF7F1', '\uF7F2', '\uF7F3', '\uF7F4', 
+		'\u0650', '\u0651', '\u0652', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', 
 	};
 
 	protected unsafe override void ToBytes(char* chars, int charCount,
@@ -103,257 +103,6 @@ public class CP28596 : ByteEncoding
 				case 0x00A4:
 				case 0x00AD:
 					break;
-				case 0x00A1: ch = 0x21; break;
-				case 0x00A2: ch = 0x63; break;
-				case 0x00A5: ch = 0x59; break;
-				case 0x00A6: ch = 0x7C; break;
-				case 0x00A9: ch = 0x43; break;
-				case 0x00AA: ch = 0x61; break;
-				case 0x00AB: ch = 0x3C; break;
-				case 0x00AE: ch = 0x52; break;
-				case 0x00B2: ch = 0x32; break;
-				case 0x00B3: ch = 0x33; break;
-				case 0x00B7: ch = 0x2E; break;
-				case 0x00B8: ch = 0x2C; break;
-				case 0x00B9: ch = 0x31; break;
-				case 0x00BA: ch = 0x6F; break;
-				case 0x00BB: ch = 0x3E; break;
-				case 0x00C0: ch = 0x41; break;
-				case 0x00C1: ch = 0x41; break;
-				case 0x00C2: ch = 0x41; break;
-				case 0x00C3: ch = 0x41; break;
-				case 0x00C4: ch = 0x41; break;
-				case 0x00C5: ch = 0x41; break;
-				case 0x00C6: ch = 0x41; break;
-				case 0x00C7: ch = 0x43; break;
-				case 0x00C8: ch = 0x45; break;
-				case 0x00C9: ch = 0x45; break;
-				case 0x00CA: ch = 0x45; break;
-				case 0x00CB: ch = 0x45; break;
-				case 0x00CC: ch = 0x49; break;
-				case 0x00CD: ch = 0x49; break;
-				case 0x00CE: ch = 0x49; break;
-				case 0x00CF: ch = 0x49; break;
-				case 0x00D0: ch = 0x44; break;
-				case 0x00D1: ch = 0x4E; break;
-				case 0x00D2: ch = 0x4F; break;
-				case 0x00D3: ch = 0x4F; break;
-				case 0x00D4: ch = 0x4F; break;
-				case 0x00D5: ch = 0x4F; break;
-				case 0x00D6: ch = 0x4F; break;
-				case 0x00D8: ch = 0x4F; break;
-				case 0x00D9: ch = 0x55; break;
-				case 0x00DA: ch = 0x55; break;
-				case 0x00DB: ch = 0x55; break;
-				case 0x00DC: ch = 0x55; break;
-				case 0x00DD: ch = 0x59; break;
-				case 0x00E0: ch = 0x61; break;
-				case 0x00E1: ch = 0x61; break;
-				case 0x00E2: ch = 0x61; break;
-				case 0x00E3: ch = 0x61; break;
-				case 0x00E4: ch = 0x61; break;
-				case 0x00E5: ch = 0x61; break;
-				case 0x00E6: ch = 0x61; break;
-				case 0x00E7: ch = 0x63; break;
-				case 0x00E8: ch = 0x65; break;
-				case 0x00E9: ch = 0x65; break;
-				case 0x00EA: ch = 0x65; break;
-				case 0x00EB: ch = 0x65; break;
-				case 0x00EC: ch = 0x69; break;
-				case 0x00ED: ch = 0x69; break;
-				case 0x00EE: ch = 0x69; break;
-				case 0x00EF: ch = 0x69; break;
-				case 0x00F1: ch = 0x6E; break;
-				case 0x00F2: ch = 0x6F; break;
-				case 0x00F3: ch = 0x6F; break;
-				case 0x00F4: ch = 0x6F; break;
-				case 0x00F5: ch = 0x6F; break;
-				case 0x00F6: ch = 0x6F; break;
-				case 0x00F8: ch = 0x6F; break;
-				case 0x00F9: ch = 0x75; break;
-				case 0x00FA: ch = 0x75; break;
-				case 0x00FB: ch = 0x75; break;
-				case 0x00FC: ch = 0x75; break;
-				case 0x00FD: ch = 0x79; break;
-				case 0x00FF: ch = 0x79; break;
-				case 0x0100: ch = 0x41; break;
-				case 0x0101: ch = 0x61; break;
-				case 0x0102: ch = 0x41; break;
-				case 0x0103: ch = 0x61; break;
-				case 0x0104: ch = 0x41; break;
-				case 0x0105: ch = 0x61; break;
-				case 0x0106: ch = 0x43; break;
-				case 0x0107: ch = 0x63; break;
-				case 0x0108: ch = 0x43; break;
-				case 0x0109: ch = 0x63; break;
-				case 0x010A: ch = 0x43; break;
-				case 0x010B: ch = 0x63; break;
-				case 0x010C: ch = 0x43; break;
-				case 0x010D: ch = 0x63; break;
-				case 0x010E: ch = 0x44; break;
-				case 0x010F: ch = 0x64; break;
-				case 0x0110: ch = 0x44; break;
-				case 0x0111: ch = 0x64; break;
-				case 0x0112: ch = 0x45; break;
-				case 0x0113: ch = 0x65; break;
-				case 0x0114: ch = 0x45; break;
-				case 0x0115: ch = 0x65; break;
-				case 0x0116: ch = 0x45; break;
-				case 0x0117: ch = 0x65; break;
-				case 0x0118: ch = 0x45; break;
-				case 0x0119: ch = 0x65; break;
-				case 0x011A: ch = 0x45; break;
-				case 0x011B: ch = 0x65; break;
-				case 0x011C: ch = 0x47; break;
-				case 0x011D: ch = 0x67; break;
-				case 0x011E: ch = 0x47; break;
-				case 0x011F: ch = 0x67; break;
-				case 0x0120: ch = 0x47; break;
-				case 0x0121: ch = 0x67; break;
-				case 0x0122: ch = 0x47; break;
-				case 0x0123: ch = 0x67; break;
-				case 0x0124: ch = 0x48; break;
-				case 0x0125: ch = 0x68; break;
-				case 0x0126: ch = 0x48; break;
-				case 0x0127: ch = 0x68; break;
-				case 0x0128: ch = 0x49; break;
-				case 0x0129: ch = 0x69; break;
-				case 0x012A: ch = 0x49; break;
-				case 0x012B: ch = 0x69; break;
-				case 0x012C: ch = 0x49; break;
-				case 0x012D: ch = 0x69; break;
-				case 0x012E: ch = 0x49; break;
-				case 0x012F: ch = 0x69; break;
-				case 0x0130: ch = 0x49; break;
-				case 0x0131: ch = 0x69; break;
-				case 0x0134: ch = 0x4A; break;
-				case 0x0135: ch = 0x6A; break;
-				case 0x0136: ch = 0x4B; break;
-				case 0x0137: ch = 0x6B; break;
-				case 0x0139: ch = 0x4C; break;
-				case 0x013A: ch = 0x6C; break;
-				case 0x013B: ch = 0x4C; break;
-				case 0x013C: ch = 0x6C; break;
-				case 0x013D: ch = 0x4C; break;
-				case 0x013E: ch = 0x6C; break;
-				case 0x0141: ch = 0x4C; break;
-				case 0x0142: ch = 0x6C; break;
-				case 0x0143: ch = 0x4E; break;
-				case 0x0144: ch = 0x6E; break;
-				case 0x0145: ch = 0x4E; break;
-				case 0x0146: ch = 0x6E; break;
-				case 0x0147: ch = 0x4E; break;
-				case 0x0148: ch = 0x6E; break;
-				case 0x014C: ch = 0x4F; break;
-				case 0x014D: ch = 0x6F; break;
-				case 0x014E: ch = 0x4F; break;
-				case 0x014F: ch = 0x6F; break;
-				case 0x0150: ch = 0x4F; break;
-				case 0x0151: ch = 0x6F; break;
-				case 0x0152: ch = 0x4F; break;
-				case 0x0153: ch = 0x6F; break;
-				case 0x0154: ch = 0x52; break;
-				case 0x0155: ch = 0x72; break;
-				case 0x0156: ch = 0x52; break;
-				case 0x0157: ch = 0x72; break;
-				case 0x0158: ch = 0x52; break;
-				case 0x0159: ch = 0x72; break;
-				case 0x015A: ch = 0x53; break;
-				case 0x015B: ch = 0x73; break;
-				case 0x015C: ch = 0x53; break;
-				case 0x015D: ch = 0x73; break;
-				case 0x015E: ch = 0x53; break;
-				case 0x015F: ch = 0x73; break;
-				case 0x0160: ch = 0x53; break;
-				case 0x0161: ch = 0x73; break;
-				case 0x0162: ch = 0x54; break;
-				case 0x0163: ch = 0x74; break;
-				case 0x0164: ch = 0x54; break;
-				case 0x0165: ch = 0x74; break;
-				case 0x0166: ch = 0x54; break;
-				case 0x0167: ch = 0x74; break;
-				case 0x0168: ch = 0x55; break;
-				case 0x0169: ch = 0x75; break;
-				case 0x016A: ch = 0x55; break;
-				case 0x016B: ch = 0x75; break;
-				case 0x016C: ch = 0x55; break;
-				case 0x016D: ch = 0x75; break;
-				case 0x016E: ch = 0x55; break;
-				case 0x016F: ch = 0x75; break;
-				case 0x0170: ch = 0x55; break;
-				case 0x0171: ch = 0x75; break;
-				case 0x0172: ch = 0x55; break;
-				case 0x0173: ch = 0x75; break;
-				case 0x0174: ch = 0x57; break;
-				case 0x0175: ch = 0x77; break;
-				case 0x0176: ch = 0x59; break;
-				case 0x0177: ch = 0x79; break;
-				case 0x0178: ch = 0x59; break;
-				case 0x0179: ch = 0x5A; break;
-				case 0x017A: ch = 0x7A; break;
-				case 0x017B: ch = 0x5A; break;
-				case 0x017C: ch = 0x7A; break;
-				case 0x017D: ch = 0x5A; break;
-				case 0x017E: ch = 0x7A; break;
-				case 0x0180: ch = 0x62; break;
-				case 0x0189: ch = 0x44; break;
-				case 0x0191: ch = 0x46; break;
-				case 0x0192: ch = 0x66; break;
-				case 0x0197: ch = 0x49; break;
-				case 0x019A: ch = 0x6C; break;
-				case 0x019F: ch = 0x4F; break;
-				case 0x01A0: ch = 0x4F; break;
-				case 0x01A1: ch = 0x6F; break;
-				case 0x01AB: ch = 0x74; break;
-				case 0x01AE: ch = 0x54; break;
-				case 0x01AF: ch = 0x55; break;
-				case 0x01B0: ch = 0x75; break;
-				case 0x01B6: ch = 0x7A; break;
-				case 0x01CD: ch = 0x41; break;
-				case 0x01CE: ch = 0x61; break;
-				case 0x01CF: ch = 0x49; break;
-				case 0x01D0: ch = 0x69; break;
-				case 0x01D1: ch = 0x4F; break;
-				case 0x01D2: ch = 0x6F; break;
-				case 0x01D3: ch = 0x55; break;
-				case 0x01D4: ch = 0x75; break;
-				case 0x01D5: ch = 0x55; break;
-				case 0x01D6: ch = 0x75; break;
-				case 0x01D7: ch = 0x55; break;
-				case 0x01D8: ch = 0x75; break;
-				case 0x01D9: ch = 0x55; break;
-				case 0x01DA: ch = 0x75; break;
-				case 0x01DB: ch = 0x55; break;
-				case 0x01DC: ch = 0x75; break;
-				case 0x01DE: ch = 0x41; break;
-				case 0x01DF: ch = 0x61; break;
-				case 0x01E4: ch = 0x47; break;
-				case 0x01E5: ch = 0x67; break;
-				case 0x01E6: ch = 0x47; break;
-				case 0x01E7: ch = 0x67; break;
-				case 0x01E8: ch = 0x4B; break;
-				case 0x01E9: ch = 0x6B; break;
-				case 0x01EA: ch = 0x4F; break;
-				case 0x01EB: ch = 0x6F; break;
-				case 0x01EC: ch = 0x4F; break;
-				case 0x01ED: ch = 0x6F; break;
-				case 0x01F0: ch = 0x6A; break;
-				case 0x0261: ch = 0x67; break;
-				case 0x02B9: ch = 0x27; break;
-				case 0x02BA: ch = 0x22; break;
-				case 0x02BC: ch = 0x27; break;
-				case 0x02C4: ch = 0x5E; break;
-				case 0x02C6: ch = 0x5E; break;
-				case 0x02C8: ch = 0x27; break;
-				case 0x02CB: ch = 0x60; break;
-				case 0x02CD: ch = 0x5F; break;
-				case 0x02DC: ch = 0x7E; break;
-				case 0x0300: ch = 0x60; break;
-				case 0x0302: ch = 0x5E; break;
-				case 0x0303: ch = 0x7E; break;
-				case 0x030E: ch = 0x22; break;
-				case 0x0331: ch = 0x5F; break;
-				case 0x0332: ch = 0x5F; break;
 				case 0x060C: ch = 0xAC; break;
 				case 0x061B: ch = 0xBB; break;
 				case 0x061F: ch = 0xBF; break;
@@ -406,186 +155,164 @@ public class CP28596 : ByteEncoding
 				case 0x0652:
 					ch -= 0x0560;
 					break;
-				case 0x2000: ch = 0x20; break;
-				case 0x2001: ch = 0x20; break;
-				case 0x2002: ch = 0x20; break;
-				case 0x2003: ch = 0x20; break;
-				case 0x2004: ch = 0x20; break;
-				case 0x2005: ch = 0x20; break;
-				case 0x2006: ch = 0x20; break;
-				case 0x2010: ch = 0x2D; break;
-				case 0x2011: ch = 0x2D; break;
-				case 0x2013: ch = 0x2D; break;
-				case 0x2014: ch = 0x2D; break;
-				case 0x2018: ch = 0x27; break;
-				case 0x2019: ch = 0x27; break;
-				case 0x201A: ch = 0x2C; break;
-				case 0x201C: ch = 0x22; break;
-				case 0x201D: ch = 0x22; break;
-				case 0x201E: ch = 0x22; break;
-				case 0x2022: ch = 0x2E; break;
-				case 0x2026: ch = 0x2E; break;
-				case 0x2032: ch = 0x27; break;
-				case 0x2035: ch = 0x60; break;
-				case 0x2039: ch = 0x3C; break;
-				case 0x203A: ch = 0x3E; break;
-				case 0x2122: ch = 0x54; break;
-				case 0xF7C8: ch = 0xA1; break;
-				case 0xF7C9: ch = 0xA2; break;
-				case 0xF7CA: ch = 0xA3; break;
-				case 0xF7CB:
-				case 0xF7CC:
-				case 0xF7CD:
-				case 0xF7CE:
-				case 0xF7CF:
-				case 0xF7D0:
-				case 0xF7D1:
-					ch -= 0xF726;
-					break;
-				case 0xF7D2:
-				case 0xF7D3:
-				case 0xF7D4:
-				case 0xF7D5:
-				case 0xF7D6:
-				case 0xF7D7:
-				case 0xF7D8:
-				case 0xF7D9:
-				case 0xF7DA:
-				case 0xF7DB:
-				case 0xF7DC:
-				case 0xF7DD:
-				case 0xF7DE:
-					ch -= 0xF724;
-					break;
-				case 0xF7DF: ch = 0xBC; break;
-				case 0xF7E0: ch = 0xBD; break;
-				case 0xF7E1: ch = 0xBE; break;
-				case 0xF7E2: ch = 0xC0; break;
-				case 0xF7E3:
-				case 0xF7E4:
-				case 0xF7E5:
-				case 0xF7E6:
-				case 0xF7E7:
-					ch -= 0xF708;
-					break;
-				case 0xF7E8:
-				case 0xF7E9:
-				case 0xF7EA:
-				case 0xF7EB:
-				case 0xF7EC:
-				case 0xF7ED:
-				case 0xF7EE:
-				case 0xF7EF:
-				case 0xF7F0:
-				case 0xF7F1:
-				case 0xF7F2:
-				case 0xF7F3:
-				case 0xF7F4:
-					ch -= 0xF6F5;
-					break;
-				case 0xFF01:
-				case 0xFF02:
-				case 0xFF03:
-				case 0xFF04:
-				case 0xFF05:
-				case 0xFF06:
-				case 0xFF07:
-				case 0xFF08:
-				case 0xFF09:
-				case 0xFF0A:
-				case 0xFF0B:
-				case 0xFF0C:
-				case 0xFF0D:
-				case 0xFF0E:
-				case 0xFF0F:
-				case 0xFF10:
-				case 0xFF11:
-				case 0xFF12:
-				case 0xFF13:
-				case 0xFF14:
-				case 0xFF15:
-				case 0xFF16:
-				case 0xFF17:
-				case 0xFF18:
-				case 0xFF19:
-				case 0xFF1A:
-				case 0xFF1B:
-				case 0xFF1C:
-				case 0xFF1D:
-				case 0xFF1E:
-					ch -= 0xFEE0;
-					break;
-				case 0xFF20:
-				case 0xFF21:
-				case 0xFF22:
-				case 0xFF23:
-				case 0xFF24:
-				case 0xFF25:
-				case 0xFF26:
-				case 0xFF27:
-				case 0xFF28:
-				case 0xFF29:
-				case 0xFF2A:
-				case 0xFF2B:
-				case 0xFF2C:
-				case 0xFF2D:
-				case 0xFF2E:
-				case 0xFF2F:
-				case 0xFF30:
-				case 0xFF31:
-				case 0xFF32:
-				case 0xFF33:
-				case 0xFF34:
-				case 0xFF35:
-				case 0xFF36:
-				case 0xFF37:
-				case 0xFF38:
-				case 0xFF39:
-				case 0xFF3A:
-				case 0xFF3B:
-				case 0xFF3C:
-				case 0xFF3D:
-				case 0xFF3E:
-				case 0xFF3F:
-				case 0xFF40:
-				case 0xFF41:
-				case 0xFF42:
-				case 0xFF43:
-				case 0xFF44:
-				case 0xFF45:
-				case 0xFF46:
-				case 0xFF47:
-				case 0xFF48:
-				case 0xFF49:
-				case 0xFF4A:
-				case 0xFF4B:
-				case 0xFF4C:
-				case 0xFF4D:
-				case 0xFF4E:
-				case 0xFF4F:
-				case 0xFF50:
-				case 0xFF51:
-				case 0xFF52:
-				case 0xFF53:
-				case 0xFF54:
-				case 0xFF55:
-				case 0xFF56:
-				case 0xFF57:
-				case 0xFF58:
-				case 0xFF59:
-				case 0xFF5A:
-				case 0xFF5B:
-				case 0xFF5C:
-				case 0xFF5D:
-				case 0xFF5E:
-					ch -= 0xFEE0;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
 					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0xFE70: ch = 0xEB; break;
+				case 0xFE71: ch = 0xEB; break;
+				case 0xFE72: ch = 0xEC; break;
+				case 0xFE74: ch = 0xED; break;
+				case 0xFE76: ch = 0xEE; break;
+				case 0xFE77: ch = 0xEE; break;
+				case 0xFE78: ch = 0xEF; break;
+				case 0xFE79: ch = 0xEF; break;
+				case 0xFE7A: ch = 0xF0; break;
+				case 0xFE7B: ch = 0xF0; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF1; break;
+				case 0xFE7E: ch = 0xF2; break;
+				case 0xFE7F: ch = 0xF2; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xD9; break;
+				case 0xFECA: ch = 0xD9; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xD9; break;
+				case 0xFECD: ch = 0xDA; break;
+				case 0xFECE: ch = 0xDA; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xDA; break;
+				case 0xFED1: ch = 0xE1; break;
+				case 0xFED2: ch = 0xE1; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xE2; break;
+				case 0xFED6: ch = 0xE2; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xE3; break;
+				case 0xFEDA: ch = 0xE3; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xE4; break;
+				case 0xFEDE: ch = 0xE4; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xE5; break;
+				case 0xFEE2: ch = 0xE5; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xE6; break;
+				case 0xFEE6: ch = 0xE6; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xE7; break;
+				case 0xFEEA: ch = 0xE7; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xE7; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xE9; break;
+				case 0xFEF1: ch = 0xEA; break;
+				case 0xFEF2: ch = 0xEA; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
 				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
 #if NET_2_0
 					HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
 #else
-					ch = 0x3F;
+						ch = 0x3F;
 #endif
+				}
 				break;
 			}
 			bytes[byteIndex++] = (byte)ch;
@@ -607,257 +334,6 @@ public class CP28596 : ByteEncoding
 				case 0x00A4:
 				case 0x00AD:
 					break;
-				case 0x00A1: ch = 0x21; break;
-				case 0x00A2: ch = 0x63; break;
-				case 0x00A5: ch = 0x59; break;
-				case 0x00A6: ch = 0x7C; break;
-				case 0x00A9: ch = 0x43; break;
-				case 0x00AA: ch = 0x61; break;
-				case 0x00AB: ch = 0x3C; break;
-				case 0x00AE: ch = 0x52; break;
-				case 0x00B2: ch = 0x32; break;
-				case 0x00B3: ch = 0x33; break;
-				case 0x00B7: ch = 0x2E; break;
-				case 0x00B8: ch = 0x2C; break;
-				case 0x00B9: ch = 0x31; break;
-				case 0x00BA: ch = 0x6F; break;
-				case 0x00BB: ch = 0x3E; break;
-				case 0x00C0: ch = 0x41; break;
-				case 0x00C1: ch = 0x41; break;
-				case 0x00C2: ch = 0x41; break;
-				case 0x00C3: ch = 0x41; break;
-				case 0x00C4: ch = 0x41; break;
-				case 0x00C5: ch = 0x41; break;
-				case 0x00C6: ch = 0x41; break;
-				case 0x00C7: ch = 0x43; break;
-				case 0x00C8: ch = 0x45; break;
-				case 0x00C9: ch = 0x45; break;
-				case 0x00CA: ch = 0x45; break;
-				case 0x00CB: ch = 0x45; break;
-				case 0x00CC: ch = 0x49; break;
-				case 0x00CD: ch = 0x49; break;
-				case 0x00CE: ch = 0x49; break;
-				case 0x00CF: ch = 0x49; break;
-				case 0x00D0: ch = 0x44; break;
-				case 0x00D1: ch = 0x4E; break;
-				case 0x00D2: ch = 0x4F; break;
-				case 0x00D3: ch = 0x4F; break;
-				case 0x00D4: ch = 0x4F; break;
-				case 0x00D5: ch = 0x4F; break;
-				case 0x00D6: ch = 0x4F; break;
-				case 0x00D8: ch = 0x4F; break;
-				case 0x00D9: ch = 0x55; break;
-				case 0x00DA: ch = 0x55; break;
-				case 0x00DB: ch = 0x55; break;
-				case 0x00DC: ch = 0x55; break;
-				case 0x00DD: ch = 0x59; break;
-				case 0x00E0: ch = 0x61; break;
-				case 0x00E1: ch = 0x61; break;
-				case 0x00E2: ch = 0x61; break;
-				case 0x00E3: ch = 0x61; break;
-				case 0x00E4: ch = 0x61; break;
-				case 0x00E5: ch = 0x61; break;
-				case 0x00E6: ch = 0x61; break;
-				case 0x00E7: ch = 0x63; break;
-				case 0x00E8: ch = 0x65; break;
-				case 0x00E9: ch = 0x65; break;
-				case 0x00EA: ch = 0x65; break;
-				case 0x00EB: ch = 0x65; break;
-				case 0x00EC: ch = 0x69; break;
-				case 0x00ED: ch = 0x69; break;
-				case 0x00EE: ch = 0x69; break;
-				case 0x00EF: ch = 0x69; break;
-				case 0x00F1: ch = 0x6E; break;
-				case 0x00F2: ch = 0x6F; break;
-				case 0x00F3: ch = 0x6F; break;
-				case 0x00F4: ch = 0x6F; break;
-				case 0x00F5: ch = 0x6F; break;
-				case 0x00F6: ch = 0x6F; break;
-				case 0x00F8: ch = 0x6F; break;
-				case 0x00F9: ch = 0x75; break;
-				case 0x00FA: ch = 0x75; break;
-				case 0x00FB: ch = 0x75; break;
-				case 0x00FC: ch = 0x75; break;
-				case 0x00FD: ch = 0x79; break;
-				case 0x00FF: ch = 0x79; break;
-				case 0x0100: ch = 0x41; break;
-				case 0x0101: ch = 0x61; break;
-				case 0x0102: ch = 0x41; break;
-				case 0x0103: ch = 0x61; break;
-				case 0x0104: ch = 0x41; break;
-				case 0x0105: ch = 0x61; break;
-				case 0x0106: ch = 0x43; break;
-				case 0x0107: ch = 0x63; break;
-				case 0x0108: ch = 0x43; break;
-				case 0x0109: ch = 0x63; break;
-				case 0x010A: ch = 0x43; break;
-				case 0x010B: ch = 0x63; break;
-				case 0x010C: ch = 0x43; break;
-				case 0x010D: ch = 0x63; break;
-				case 0x010E: ch = 0x44; break;
-				case 0x010F: ch = 0x64; break;
-				case 0x0110: ch = 0x44; break;
-				case 0x0111: ch = 0x64; break;
-				case 0x0112: ch = 0x45; break;
-				case 0x0113: ch = 0x65; break;
-				case 0x0114: ch = 0x45; break;
-				case 0x0115: ch = 0x65; break;
-				case 0x0116: ch = 0x45; break;
-				case 0x0117: ch = 0x65; break;
-				case 0x0118: ch = 0x45; break;
-				case 0x0119: ch = 0x65; break;
-				case 0x011A: ch = 0x45; break;
-				case 0x011B: ch = 0x65; break;
-				case 0x011C: ch = 0x47; break;
-				case 0x011D: ch = 0x67; break;
-				case 0x011E: ch = 0x47; break;
-				case 0x011F: ch = 0x67; break;
-				case 0x0120: ch = 0x47; break;
-				case 0x0121: ch = 0x67; break;
-				case 0x0122: ch = 0x47; break;
-				case 0x0123: ch = 0x67; break;
-				case 0x0124: ch = 0x48; break;
-				case 0x0125: ch = 0x68; break;
-				case 0x0126: ch = 0x48; break;
-				case 0x0127: ch = 0x68; break;
-				case 0x0128: ch = 0x49; break;
-				case 0x0129: ch = 0x69; break;
-				case 0x012A: ch = 0x49; break;
-				case 0x012B: ch = 0x69; break;
-				case 0x012C: ch = 0x49; break;
-				case 0x012D: ch = 0x69; break;
-				case 0x012E: ch = 0x49; break;
-				case 0x012F: ch = 0x69; break;
-				case 0x0130: ch = 0x49; break;
-				case 0x0131: ch = 0x69; break;
-				case 0x0134: ch = 0x4A; break;
-				case 0x0135: ch = 0x6A; break;
-				case 0x0136: ch = 0x4B; break;
-				case 0x0137: ch = 0x6B; break;
-				case 0x0139: ch = 0x4C; break;
-				case 0x013A: ch = 0x6C; break;
-				case 0x013B: ch = 0x4C; break;
-				case 0x013C: ch = 0x6C; break;
-				case 0x013D: ch = 0x4C; break;
-				case 0x013E: ch = 0x6C; break;
-				case 0x0141: ch = 0x4C; break;
-				case 0x0142: ch = 0x6C; break;
-				case 0x0143: ch = 0x4E; break;
-				case 0x0144: ch = 0x6E; break;
-				case 0x0145: ch = 0x4E; break;
-				case 0x0146: ch = 0x6E; break;
-				case 0x0147: ch = 0x4E; break;
-				case 0x0148: ch = 0x6E; break;
-				case 0x014C: ch = 0x4F; break;
-				case 0x014D: ch = 0x6F; break;
-				case 0x014E: ch = 0x4F; break;
-				case 0x014F: ch = 0x6F; break;
-				case 0x0150: ch = 0x4F; break;
-				case 0x0151: ch = 0x6F; break;
-				case 0x0152: ch = 0x4F; break;
-				case 0x0153: ch = 0x6F; break;
-				case 0x0154: ch = 0x52; break;
-				case 0x0155: ch = 0x72; break;
-				case 0x0156: ch = 0x52; break;
-				case 0x0157: ch = 0x72; break;
-				case 0x0158: ch = 0x52; break;
-				case 0x0159: ch = 0x72; break;
-				case 0x015A: ch = 0x53; break;
-				case 0x015B: ch = 0x73; break;
-				case 0x015C: ch = 0x53; break;
-				case 0x015D: ch = 0x73; break;
-				case 0x015E: ch = 0x53; break;
-				case 0x015F: ch = 0x73; break;
-				case 0x0160: ch = 0x53; break;
-				case 0x0161: ch = 0x73; break;
-				case 0x0162: ch = 0x54; break;
-				case 0x0163: ch = 0x74; break;
-				case 0x0164: ch = 0x54; break;
-				case 0x0165: ch = 0x74; break;
-				case 0x0166: ch = 0x54; break;
-				case 0x0167: ch = 0x74; break;
-				case 0x0168: ch = 0x55; break;
-				case 0x0169: ch = 0x75; break;
-				case 0x016A: ch = 0x55; break;
-				case 0x016B: ch = 0x75; break;
-				case 0x016C: ch = 0x55; break;
-				case 0x016D: ch = 0x75; break;
-				case 0x016E: ch = 0x55; break;
-				case 0x016F: ch = 0x75; break;
-				case 0x0170: ch = 0x55; break;
-				case 0x0171: ch = 0x75; break;
-				case 0x0172: ch = 0x55; break;
-				case 0x0173: ch = 0x75; break;
-				case 0x0174: ch = 0x57; break;
-				case 0x0175: ch = 0x77; break;
-				case 0x0176: ch = 0x59; break;
-				case 0x0177: ch = 0x79; break;
-				case 0x0178: ch = 0x59; break;
-				case 0x0179: ch = 0x5A; break;
-				case 0x017A: ch = 0x7A; break;
-				case 0x017B: ch = 0x5A; break;
-				case 0x017C: ch = 0x7A; break;
-				case 0x017D: ch = 0x5A; break;
-				case 0x017E: ch = 0x7A; break;
-				case 0x0180: ch = 0x62; break;
-				case 0x0189: ch = 0x44; break;
-				case 0x0191: ch = 0x46; break;
-				case 0x0192: ch = 0x66; break;
-				case 0x0197: ch = 0x49; break;
-				case 0x019A: ch = 0x6C; break;
-				case 0x019F: ch = 0x4F; break;
-				case 0x01A0: ch = 0x4F; break;
-				case 0x01A1: ch = 0x6F; break;
-				case 0x01AB: ch = 0x74; break;
-				case 0x01AE: ch = 0x54; break;
-				case 0x01AF: ch = 0x55; break;
-				case 0x01B0: ch = 0x75; break;
-				case 0x01B6: ch = 0x7A; break;
-				case 0x01CD: ch = 0x41; break;
-				case 0x01CE: ch = 0x61; break;
-				case 0x01CF: ch = 0x49; break;
-				case 0x01D0: ch = 0x69; break;
-				case 0x01D1: ch = 0x4F; break;
-				case 0x01D2: ch = 0x6F; break;
-				case 0x01D3: ch = 0x55; break;
-				case 0x01D4: ch = 0x75; break;
-				case 0x01D5: ch = 0x55; break;
-				case 0x01D6: ch = 0x75; break;
-				case 0x01D7: ch = 0x55; break;
-				case 0x01D8: ch = 0x75; break;
-				case 0x01D9: ch = 0x55; break;
-				case 0x01DA: ch = 0x75; break;
-				case 0x01DB: ch = 0x55; break;
-				case 0x01DC: ch = 0x75; break;
-				case 0x01DE: ch = 0x41; break;
-				case 0x01DF: ch = 0x61; break;
-				case 0x01E4: ch = 0x47; break;
-				case 0x01E5: ch = 0x67; break;
-				case 0x01E6: ch = 0x47; break;
-				case 0x01E7: ch = 0x67; break;
-				case 0x01E8: ch = 0x4B; break;
-				case 0x01E9: ch = 0x6B; break;
-				case 0x01EA: ch = 0x4F; break;
-				case 0x01EB: ch = 0x6F; break;
-				case 0x01EC: ch = 0x4F; break;
-				case 0x01ED: ch = 0x6F; break;
-				case 0x01F0: ch = 0x6A; break;
-				case 0x0261: ch = 0x67; break;
-				case 0x02B9: ch = 0x27; break;
-				case 0x02BA: ch = 0x22; break;
-				case 0x02BC: ch = 0x27; break;
-				case 0x02C4: ch = 0x5E; break;
-				case 0x02C6: ch = 0x5E; break;
-				case 0x02C8: ch = 0x27; break;
-				case 0x02CB: ch = 0x60; break;
-				case 0x02CD: ch = 0x5F; break;
-				case 0x02DC: ch = 0x7E; break;
-				case 0x0300: ch = 0x60; break;
-				case 0x0302: ch = 0x5E; break;
-				case 0x0303: ch = 0x7E; break;
-				case 0x030E: ch = 0x22; break;
-				case 0x0331: ch = 0x5F; break;
-				case 0x0332: ch = 0x5F; break;
 				case 0x060C: ch = 0xAC; break;
 				case 0x061B: ch = 0xBB; break;
 				case 0x061F: ch = 0xBF; break;
@@ -910,181 +386,161 @@ public class CP28596 : ByteEncoding
 				case 0x0652:
 					ch -= 0x0560;
 					break;
-				case 0x2000: ch = 0x20; break;
-				case 0x2001: ch = 0x20; break;
-				case 0x2002: ch = 0x20; break;
-				case 0x2003: ch = 0x20; break;
-				case 0x2004: ch = 0x20; break;
-				case 0x2005: ch = 0x20; break;
-				case 0x2006: ch = 0x20; break;
-				case 0x2010: ch = 0x2D; break;
-				case 0x2011: ch = 0x2D; break;
-				case 0x2013: ch = 0x2D; break;
-				case 0x2014: ch = 0x2D; break;
-				case 0x2018: ch = 0x27; break;
-				case 0x2019: ch = 0x27; break;
-				case 0x201A: ch = 0x2C; break;
-				case 0x201C: ch = 0x22; break;
-				case 0x201D: ch = 0x22; break;
-				case 0x201E: ch = 0x22; break;
-				case 0x2022: ch = 0x2E; break;
-				case 0x2026: ch = 0x2E; break;
-				case 0x2032: ch = 0x27; break;
-				case 0x2035: ch = 0x60; break;
-				case 0x2039: ch = 0x3C; break;
-				case 0x203A: ch = 0x3E; break;
-				case 0x2122: ch = 0x54; break;
-				case 0xF7C8: ch = 0xA1; break;
-				case 0xF7C9: ch = 0xA2; break;
-				case 0xF7CA: ch = 0xA3; break;
-				case 0xF7CB:
-				case 0xF7CC:
-				case 0xF7CD:
-				case 0xF7CE:
-				case 0xF7CF:
-				case 0xF7D0:
-				case 0xF7D1:
-					ch -= 0xF726;
-					break;
-				case 0xF7D2:
-				case 0xF7D3:
-				case 0xF7D4:
-				case 0xF7D5:
-				case 0xF7D6:
-				case 0xF7D7:
-				case 0xF7D8:
-				case 0xF7D9:
-				case 0xF7DA:
-				case 0xF7DB:
-				case 0xF7DC:
-				case 0xF7DD:
-				case 0xF7DE:
-					ch -= 0xF724;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
 					break;
-				case 0xF7DF: ch = 0xBC; break;
-				case 0xF7E0: ch = 0xBD; break;
-				case 0xF7E1: ch = 0xBE; break;
-				case 0xF7E2: ch = 0xC0; break;
-				case 0xF7E3:
-				case 0xF7E4:
-				case 0xF7E5:
-				case 0xF7E6:
-				case 0xF7E7:
-					ch -= 0xF708;
-					break;
-				case 0xF7E8:
-				case 0xF7E9:
-				case 0xF7EA:
-				case 0xF7EB:
-				case 0xF7EC:
-				case 0xF7ED:
-				case 0xF7EE:
-				case 0xF7EF:
-				case 0xF7F0:
-				case 0xF7F1:
-				case 0xF7F2:
-				case 0xF7F3:
-				case 0xF7F4:
-					ch -= 0xF6F5;
-					break;
-				case 0xFF01:
-				case 0xFF02:
-				case 0xFF03:
-				case 0xFF04:
-				case 0xFF05:
-				case 0xFF06:
-				case 0xFF07:
-				case 0xFF08:
-				case 0xFF09:
-				case 0xFF0A:
-				case 0xFF0B:
-				case 0xFF0C:
-				case 0xFF0D:
-				case 0xFF0E:
-				case 0xFF0F:
-				case 0xFF10:
-				case 0xFF11:
-				case 0xFF12:
-				case 0xFF13:
-				case 0xFF14:
-				case 0xFF15:
-				case 0xFF16:
-				case 0xFF17:
-				case 0xFF18:
-				case 0xFF19:
-				case 0xFF1A:
-				case 0xFF1B:
-				case 0xFF1C:
-				case 0xFF1D:
-				case 0xFF1E:
-					ch -= 0xFEE0;
-					break;
-				case 0xFF20:
-				case 0xFF21:
-				case 0xFF22:
-				case 0xFF23:
-				case 0xFF24:
-				case 0xFF25:
-				case 0xFF26:
-				case 0xFF27:
-				case 0xFF28:
-				case 0xFF29:
-				case 0xFF2A:
-				case 0xFF2B:
-				case 0xFF2C:
-				case 0xFF2D:
-				case 0xFF2E:
-				case 0xFF2F:
-				case 0xFF30:
-				case 0xFF31:
-				case 0xFF32:
-				case 0xFF33:
-				case 0xFF34:
-				case 0xFF35:
-				case 0xFF36:
-				case 0xFF37:
-				case 0xFF38:
-				case 0xFF39:
-				case 0xFF3A:
-				case 0xFF3B:
-				case 0xFF3C:
-				case 0xFF3D:
-				case 0xFF3E:
-				case 0xFF3F:
-				case 0xFF40:
-				case 0xFF41:
-				case 0xFF42:
-				case 0xFF43:
-				case 0xFF44:
-				case 0xFF45:
-				case 0xFF46:
-				case 0xFF47:
-				case 0xFF48:
-				case 0xFF49:
-				case 0xFF4A:
-				case 0xFF4B:
-				case 0xFF4C:
-				case 0xFF4D:
-				case 0xFF4E:
-				case 0xFF4F:
-				case 0xFF50:
-				case 0xFF51:
-				case 0xFF52:
-				case 0xFF53:
-				case 0xFF54:
-				case 0xFF55:
-				case 0xFF56:
-				case 0xFF57:
-				case 0xFF58:
-				case 0xFF59:
-				case 0xFF5A:
-				case 0xFF5B:
-				case 0xFF5C:
-				case 0xFF5D:
-				case 0xFF5E:
-					ch -= 0xFEE0;
-					break;
-				default: ch = 0x3F; break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0xFE70: ch = 0xEB; break;
+				case 0xFE71: ch = 0xEB; break;
+				case 0xFE72: ch = 0xEC; break;
+				case 0xFE74: ch = 0xED; break;
+				case 0xFE76: ch = 0xEE; break;
+				case 0xFE77: ch = 0xEE; break;
+				case 0xFE78: ch = 0xEF; break;
+				case 0xFE79: ch = 0xEF; break;
+				case 0xFE7A: ch = 0xF0; break;
+				case 0xFE7B: ch = 0xF0; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF1; break;
+				case 0xFE7E: ch = 0xF2; break;
+				case 0xFE7F: ch = 0xF2; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xD9; break;
+				case 0xFECA: ch = 0xD9; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xD9; break;
+				case 0xFECD: ch = 0xDA; break;
+				case 0xFECE: ch = 0xDA; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xDA; break;
+				case 0xFED1: ch = 0xE1; break;
+				case 0xFED2: ch = 0xE1; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xE2; break;
+				case 0xFED6: ch = 0xE2; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xE3; break;
+				case 0xFEDA: ch = 0xE3; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xE4; break;
+				case 0xFEDE: ch = 0xE4; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xE5; break;
+				case 0xFEE2: ch = 0xE5; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xE6; break;
+				case 0xFEE6: ch = 0xE6; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xE7; break;
+				case 0xFEEA: ch = 0xE7; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xE7; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xE9; break;
+				case 0xFEF1: ch = 0xEA; break;
+				case 0xFEF2: ch = 0xEA; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
 			}
 			bytes[byteIndex++] = (byte)ch;
 			--charCount;
diff --git a/mcs/class/I18N/MidEast/ChangeLog b/mcs/class/I18N/MidEast/ChangeLog
index 984d47179a8..5c7c405616f 100644
--- a/mcs/class/I18N/MidEast/ChangeLog
+++ b/mcs/class/I18N/MidEast/ChangeLog
@@ -1,11 +1,3 @@
-2006-01-24  Atsushi Enomoto  <atsushi@ximian.com>
-
-	Fixed bug #77325.
-	* windows-28596-2000.ucm : new file. Copied IBM ICU data from
-	  http://dev.icu-project.org/cgi-bin/viewcvs.cgi/charset/data/ucm/windows-28596-2000.ucm (revision 1.2)
-	* CP28596.cs : regenerated source file (and made some manual
-	  changes) to replace mapping source from old ibm-1089.ucm to above.
-
 2006-01-17  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* CP1254.cs CP1255.cs CP28596.cs CP1256.cs CP28598.cs CP38598.cs
diff --git a/mcs/class/I18N/MidEast/windows-28596-2000.ucm b/mcs/class/I18N/MidEast/windows-28596-2000.ucm
deleted file mode 100644
index 33da2704371..00000000000
--- a/mcs/class/I18N/MidEast/windows-28596-2000.ucm
+++ /dev/null
@@ -1,666 +0,0 @@
-# ***************************************************************************
-# *
-# *   Copyright (C) 2001-2002, International Business Machines
-# *   Corporation and others.  All Rights Reserved.
-# *
-# ***************************************************************************
-#
-# File created on Dec 03 13:48 Pacific Standard Time 2002
-#
-# File created by genmucm tool.
-# from windows 2000 using IMultiLanguage 5.50.4522.1800
-#
-# Table Version : 1.0
-# The 1st column is the Unicode scalar value.
-# The 2nd column is the codepage byte sequence.
-# The 3rd column is the fallback indicator.
-# The fallback indicator can have one of the following values:
-#   |0 for exact 1-1 roundtrip mapping
-#   |1 for the best fallback codepage byte sequence.
-#   |2 for the substitution character
-#   |3 for the best reverse fallback Unicode scaler value
-#
-# Encoding description: Arabic (ISO)
-# Encoding name: iso-8859-6
-#
-<code_set_name>               "windows-28596-2000"
-<mb_cur_max>                  1
-<mb_cur_min>                  1
-<uconv_class>                 "SBCS"
-<subchar>                     \x3F
-<icu:charsetFamily>           "ASCII"
-# Suggested ICU specific alias information
-#<icu:alias>                  "windows-28596_VPUA"
-
-#
-CHARMAP
-#
-#UNICODE 28596
-#_______ _________
-<U0000> \x00 |0
-<U0001> \x01 |0
-<U0002> \x02 |0
-<U0003> \x03 |0
-<U0004> \x04 |0
-<U0005> \x05 |0
-<U0006> \x06 |0
-<U0007> \x07 |0
-<U0008> \x08 |0
-<U0009> \x09 |0
-<U000A> \x0A |0
-<U000B> \x0B |0
-<U000C> \x0C |0
-<U000D> \x0D |0
-<U000E> \x0E |0
-<U000F> \x0F |0
-<U0010> \x10 |0
-<U0011> \x11 |0
-<U0012> \x12 |0
-<U0013> \x13 |0
-<U0014> \x14 |0
-<U0015> \x15 |0
-<U0016> \x16 |0
-<U0017> \x17 |0
-<U0018> \x18 |0
-<U0019> \x19 |0
-<U001A> \x1A |0
-<U001B> \x1B |0
-<U001C> \x1C |0
-<U001D> \x1D |0
-<U001E> \x1E |0
-<U001F> \x1F |0
-<U0020> \x20 |0
-<U0021> \x21 |0
-<U0022> \x22 |0
-<U0023> \x23 |0
-<U0024> \x24 |0
-<U0025> \x25 |0
-<U0026> \x26 |0
-<U0027> \x27 |0
-<U0028> \x28 |0
-<U0029> \x29 |0
-<U002A> \x2A |0
-<U002B> \x2B |0
-<U002C> \x2C |0
-<U002D> \x2D |0
-<U002E> \x2E |0
-<U002F> \x2F |0
-<U0030> \x30 |0
-<U0031> \x31 |0
-<U0032> \x32 |0
-<U0033> \x33 |0
-<U0034> \x34 |0
-<U0035> \x35 |0
-<U0036> \x36 |0
-<U0037> \x37 |0
-<U0038> \x38 |0
-<U0039> \x39 |0
-<U003A> \x3A |0
-<U003B> \x3B |0
-<U003C> \x3C |0
-<U003D> \x3D |0
-<U003E> \x3E |0
-<U003F> \x3F |0
-<U0040> \x40 |0
-<U0041> \x41 |0
-<U0042> \x42 |0
-<U0043> \x43 |0
-<U0044> \x44 |0
-<U0045> \x45 |0
-<U0046> \x46 |0
-<U0047> \x47 |0
-<U0048> \x48 |0
-<U0049> \x49 |0
-<U004A> \x4A |0
-<U004B> \x4B |0
-<U004C> \x4C |0
-<U004D> \x4D |0
-<U004E> \x4E |0
-<U004F> \x4F |0
-<U0050> \x50 |0
-<U0051> \x51 |0
-<U0052> \x52 |0
-<U0053> \x53 |0
-<U0054> \x54 |0
-<U0055> \x55 |0
-<U0056> \x56 |0
-<U0057> \x57 |0
-<U0058> \x58 |0
-<U0059> \x59 |0
-<U005A> \x5A |0
-<U005B> \x5B |0
-<U005C> \x5C |0
-<U005D> \x5D |0
-<U005E> \x5E |0
-<U005F> \x5F |0
-<U0060> \x60 |0
-<U0061> \x61 |0
-<U0062> \x62 |0
-<U0063> \x63 |0
-<U0064> \x64 |0
-<U0065> \x65 |0
-<U0066> \x66 |0
-<U0067> \x67 |0
-<U0068> \x68 |0
-<U0069> \x69 |0
-<U006A> \x6A |0
-<U006B> \x6B |0
-<U006C> \x6C |0
-<U006D> \x6D |0
-<U006E> \x6E |0
-<U006F> \x6F |0
-<U0070> \x70 |0
-<U0071> \x71 |0
-<U0072> \x72 |0
-<U0073> \x73 |0
-<U0074> \x74 |0
-<U0075> \x75 |0
-<U0076> \x76 |0
-<U0077> \x77 |0
-<U0078> \x78 |0
-<U0079> \x79 |0
-<U007A> \x7A |0
-<U007B> \x7B |0
-<U007C> \x7C |0
-<U007D> \x7D |0
-<U007E> \x7E |0
-<U007F> \x7F |0
-<U0080> \x80 |0
-<U0081> \x81 |0
-<U0082> \x82 |0
-<U0083> \x83 |0
-<U0084> \x84 |0
-<U0085> \x85 |0
-<U0086> \x86 |0
-<U0087> \x87 |0
-<U0088> \x88 |0
-<U0089> \x89 |0
-<U008A> \x8A |0
-<U008B> \x8B |0
-<U008C> \x8C |0
-<U008D> \x8D |0
-<U008E> \x8E |0
-<U008F> \x8F |0
-<U0090> \x90 |0
-<U0091> \x91 |0
-<U0092> \x92 |0
-<U0093> \x93 |0
-<U0094> \x94 |0
-<U0095> \x95 |0
-<U0096> \x96 |0
-<U0097> \x97 |0
-<U0098> \x98 |0
-<U0099> \x99 |0
-<U009A> \x9A |0
-<U009B> \x9B |0
-<U009C> \x9C |0
-<U009D> \x9D |0
-<U009E> \x9E |0
-<U009F> \x9F |0
-<U00A0> \xA0 |0
-<U00A1> \x21 |1
-<U00A2> \x63 |1
-<U00A4> \xA4 |0
-<U00A5> \x59 |1
-<U00A6> \x7C |1
-<U00A9> \x43 |1
-<U00AA> \x61 |1
-<U00AB> \x3C |1
-<U00AD> \xAD |0
-<U00AE> \x52 |1
-<U00B2> \x32 |1
-<U00B3> \x33 |1
-<U00B7> \x2E |1
-<U00B8> \x2C |1
-<U00B9> \x31 |1
-<U00BA> \x6F |1
-<U00BB> \x3E |1
-<U00C0> \x41 |1
-<U00C1> \x41 |1
-<U00C2> \x41 |1
-<U00C3> \x41 |1
-<U00C4> \x41 |1
-<U00C5> \x41 |1
-<U00C6> \x41 |1
-<U00C7> \x43 |1
-<U00C8> \x45 |1
-<U00C9> \x45 |1
-<U00CA> \x45 |1
-<U00CB> \x45 |1
-<U00CC> \x49 |1
-<U00CD> \x49 |1
-<U00CE> \x49 |1
-<U00CF> \x49 |1
-<U00D0> \x44 |1
-<U00D1> \x4E |1
-<U00D2> \x4F |1
-<U00D3> \x4F |1
-<U00D4> \x4F |1
-<U00D5> \x4F |1
-<U00D6> \x4F |1
-<U00D8> \x4F |1
-<U00D9> \x55 |1
-<U00DA> \x55 |1
-<U00DB> \x55 |1
-<U00DC> \x55 |1
-<U00DD> \x59 |1
-<U00E0> \x61 |1
-<U00E1> \x61 |1
-<U00E2> \x61 |1
-<U00E3> \x61 |1
-<U00E4> \x61 |1
-<U00E5> \x61 |1
-<U00E6> \x61 |1
-<U00E7> \x63 |1
-<U00E8> \x65 |1
-<U00E9> \x65 |1
-<U00EA> \x65 |1
-<U00EB> \x65 |1
-<U00EC> \x69 |1
-<U00ED> \x69 |1
-<U00EE> \x69 |1
-<U00EF> \x69 |1
-<U00F1> \x6E |1
-<U00F2> \x6F |1
-<U00F3> \x6F |1
-<U00F4> \x6F |1
-<U00F5> \x6F |1
-<U00F6> \x6F |1
-<U00F8> \x6F |1
-<U00F9> \x75 |1
-<U00FA> \x75 |1
-<U00FB> \x75 |1
-<U00FC> \x75 |1
-<U00FD> \x79 |1
-<U00FF> \x79 |1
-<U0100> \x41 |1
-<U0101> \x61 |1
-<U0102> \x41 |1
-<U0103> \x61 |1
-<U0104> \x41 |1
-<U0105> \x61 |1
-<U0106> \x43 |1
-<U0107> \x63 |1
-<U0108> \x43 |1
-<U0109> \x63 |1
-<U010A> \x43 |1
-<U010B> \x63 |1
-<U010C> \x43 |1
-<U010D> \x63 |1
-<U010E> \x44 |1
-<U010F> \x64 |1
-<U0110> \x44 |1
-<U0111> \x64 |1
-<U0112> \x45 |1
-<U0113> \x65 |1
-<U0114> \x45 |1
-<U0115> \x65 |1
-<U0116> \x45 |1
-<U0117> \x65 |1
-<U0118> \x45 |1
-<U0119> \x65 |1
-<U011A> \x45 |1
-<U011B> \x65 |1
-<U011C> \x47 |1
-<U011D> \x67 |1
-<U011E> \x47 |1
-<U011F> \x67 |1
-<U0120> \x47 |1
-<U0121> \x67 |1
-<U0122> \x47 |1
-<U0123> \x67 |1
-<U0124> \x48 |1
-<U0125> \x68 |1
-<U0126> \x48 |1
-<U0127> \x68 |1
-<U0128> \x49 |1
-<U0129> \x69 |1
-<U012A> \x49 |1
-<U012B> \x69 |1
-<U012C> \x49 |1
-<U012D> \x69 |1
-<U012E> \x49 |1
-<U012F> \x69 |1
-<U0130> \x49 |1
-<U0131> \x69 |1
-<U0134> \x4A |1
-<U0135> \x6A |1
-<U0136> \x4B |1
-<U0137> \x6B |1
-<U0139> \x4C |1
-<U013A> \x6C |1
-<U013B> \x4C |1
-<U013C> \x6C |1
-<U013D> \x4C |1
-<U013E> \x6C |1
-<U0141> \x4C |1
-<U0142> \x6C |1
-<U0143> \x4E |1
-<U0144> \x6E |1
-<U0145> \x4E |1
-<U0146> \x6E |1
-<U0147> \x4E |1
-<U0148> \x6E |1
-<U014C> \x4F |1
-<U014D> \x6F |1
-<U014E> \x4F |1
-<U014F> \x6F |1
-<U0150> \x4F |1
-<U0151> \x6F |1
-<U0152> \x4F |1
-<U0153> \x6F |1
-<U0154> \x52 |1
-<U0155> \x72 |1
-<U0156> \x52 |1
-<U0157> \x72 |1
-<U0158> \x52 |1
-<U0159> \x72 |1
-<U015A> \x53 |1
-<U015B> \x73 |1
-<U015C> \x53 |1
-<U015D> \x73 |1
-<U015E> \x53 |1
-<U015F> \x73 |1
-<U0160> \x53 |1
-<U0161> \x73 |1
-<U0162> \x54 |1
-<U0163> \x74 |1
-<U0164> \x54 |1
-<U0165> \x74 |1
-<U0166> \x54 |1
-<U0167> \x74 |1
-<U0168> \x55 |1
-<U0169> \x75 |1
-<U016A> \x55 |1
-<U016B> \x75 |1
-<U016C> \x55 |1
-<U016D> \x75 |1
-<U016E> \x55 |1
-<U016F> \x75 |1
-<U0170> \x55 |1
-<U0171> \x75 |1
-<U0172> \x55 |1
-<U0173> \x75 |1
-<U0174> \x57 |1
-<U0175> \x77 |1
-<U0176> \x59 |1
-<U0177> \x79 |1
-<U0178> \x59 |1
-<U0179> \x5A |1
-<U017A> \x7A |1
-<U017B> \x5A |1
-<U017C> \x7A |1
-<U017D> \x5A |1
-<U017E> \x7A |1
-<U0180> \x62 |1
-<U0189> \x44 |1
-<U0191> \x46 |1
-<U0192> \x66 |1
-<U0197> \x49 |1
-<U019A> \x6C |1
-<U019F> \x4F |1
-<U01A0> \x4F |1
-<U01A1> \x6F |1
-<U01AB> \x74 |1
-<U01AE> \x54 |1
-<U01AF> \x55 |1
-<U01B0> \x75 |1
-<U01B6> \x7A |1
-<U01CD> \x41 |1
-<U01CE> \x61 |1
-<U01CF> \x49 |1
-<U01D0> \x69 |1
-<U01D1> \x4F |1
-<U01D2> \x6F |1
-<U01D3> \x55 |1
-<U01D4> \x75 |1
-<U01D5> \x55 |1
-<U01D6> \x75 |1
-<U01D7> \x55 |1
-<U01D8> \x75 |1
-<U01D9> \x55 |1
-<U01DA> \x75 |1
-<U01DB> \x55 |1
-<U01DC> \x75 |1
-<U01DE> \x41 |1
-<U01DF> \x61 |1
-<U01E4> \x47 |1
-<U01E5> \x67 |1
-<U01E6> \x47 |1
-<U01E7> \x67 |1
-<U01E8> \x4B |1
-<U01E9> \x6B |1
-<U01EA> \x4F |1
-<U01EB> \x6F |1
-<U01EC> \x4F |1
-<U01ED> \x6F |1
-<U01F0> \x6A |1
-<U0261> \x67 |1
-<U02B9> \x27 |1
-<U02BA> \x22 |1
-<U02BC> \x27 |1
-<U02C4> \x5E |1
-<U02C6> \x5E |1
-<U02C8> \x27 |1
-<U02CB> \x60 |1
-<U02CD> \x5F |1
-<U02DC> \x7E |1
-<U0300> \x60 |1
-<U0302> \x5E |1
-<U0303> \x7E |1
-<U030E> \x22 |1
-<U0331> \x5F |1
-<U0332> \x5F |1
-<U060C> \xAC |0
-<U061B> \xBB |0
-<U061F> \xBF |0
-<U0621> \xC1 |0
-<U0622> \xC2 |0
-<U0623> \xC3 |0
-<U0624> \xC4 |0
-<U0625> \xC5 |0
-<U0626> \xC6 |0
-<U0627> \xC7 |0
-<U0628> \xC8 |0
-<U0629> \xC9 |0
-<U062A> \xCA |0
-<U062B> \xCB |0
-<U062C> \xCC |0
-<U062D> \xCD |0
-<U062E> \xCE |0
-<U062F> \xCF |0
-<U0630> \xD0 |0
-<U0631> \xD1 |0
-<U0632> \xD2 |0
-<U0633> \xD3 |0
-<U0634> \xD4 |0
-<U0635> \xD5 |0
-<U0636> \xD6 |0
-<U0637> \xD7 |0
-<U0638> \xD8 |0
-<U0639> \xD9 |0
-<U063A> \xDA |0
-<U0640> \xE0 |0
-<U0641> \xE1 |0
-<U0642> \xE2 |0
-<U0643> \xE3 |0
-<U0644> \xE4 |0
-<U0645> \xE5 |0
-<U0646> \xE6 |0
-<U0647> \xE7 |0
-<U0648> \xE8 |0
-<U0649> \xE9 |0
-<U064A> \xEA |0
-<U064B> \xEB |0
-<U064C> \xEC |0
-<U064D> \xED |0
-<U064E> \xEE |0
-<U064F> \xEF |0
-<U0650> \xF0 |0
-<U0651> \xF1 |0
-<U0652> \xF2 |0
-<U2000> \x20 |1
-<U2001> \x20 |1
-<U2002> \x20 |1
-<U2003> \x20 |1
-<U2004> \x20 |1
-<U2005> \x20 |1
-<U2006> \x20 |1
-<U2010> \x2D |1
-<U2011> \x2D |1
-<U2013> \x2D |1
-<U2014> \x2D |1
-<U2018> \x27 |1
-<U2019> \x27 |1
-<U201A> \x2C |1
-<U201C> \x22 |1
-<U201D> \x22 |1
-<U201E> \x22 |1
-<U2022> \x2E |1
-<U2026> \x2E |1
-<U2032> \x27 |1
-<U2035> \x60 |1
-<U2039> \x3C |1
-<U203A> \x3E |1
-<U2122> \x54 |1
-<UF7C8> \xA1 |0
-<UF7C9> \xA2 |0
-<UF7CA> \xA3 |0
-<UF7CB> \xA5 |0
-<UF7CC> \xA6 |0
-<UF7CD> \xA7 |0
-<UF7CE> \xA8 |0
-<UF7CF> \xA9 |0
-<UF7D0> \xAA |0
-<UF7D1> \xAB |0
-<UF7D2> \xAE |0
-<UF7D3> \xAF |0
-<UF7D4> \xB0 |0
-<UF7D5> \xB1 |0
-<UF7D6> \xB2 |0
-<UF7D7> \xB3 |0
-<UF7D8> \xB4 |0
-<UF7D9> \xB5 |0
-<UF7DA> \xB6 |0
-<UF7DB> \xB7 |0
-<UF7DC> \xB8 |0
-<UF7DD> \xB9 |0
-<UF7DE> \xBA |0
-<UF7DF> \xBC |0
-<UF7E0> \xBD |0
-<UF7E1> \xBE |0
-<UF7E2> \xC0 |0
-<UF7E3> \xDB |0
-<UF7E4> \xDC |0
-<UF7E5> \xDD |0
-<UF7E6> \xDE |0
-<UF7E7> \xDF |0
-<UF7E8> \xF3 |0
-<UF7E9> \xF4 |0
-<UF7EA> \xF5 |0
-<UF7EB> \xF6 |0
-<UF7EC> \xF7 |0
-<UF7ED> \xF8 |0
-<UF7EE> \xF9 |0
-<UF7EF> \xFA |0
-<UF7F0> \xFB |0
-<UF7F1> \xFC |0
-<UF7F2> \xFD |0
-<UF7F3> \xFE |0
-<UF7F4> \xFF |0
-<UFF01> \x21 |1
-<UFF02> \x22 |1
-<UFF03> \x23 |1
-<UFF04> \x24 |1
-<UFF05> \x25 |1
-<UFF06> \x26 |1
-<UFF07> \x27 |1
-<UFF08> \x28 |1
-<UFF09> \x29 |1
-<UFF0A> \x2A |1
-<UFF0B> \x2B |1
-<UFF0C> \x2C |1
-<UFF0D> \x2D |1
-<UFF0E> \x2E |1
-<UFF0F> \x2F |1
-<UFF10> \x30 |1
-<UFF11> \x31 |1
-<UFF12> \x32 |1
-<UFF13> \x33 |1
-<UFF14> \x34 |1
-<UFF15> \x35 |1
-<UFF16> \x36 |1
-<UFF17> \x37 |1
-<UFF18> \x38 |1
-<UFF19> \x39 |1
-<UFF1A> \x3A |1
-<UFF1B> \x3B |1
-<UFF1C> \x3C |1
-<UFF1D> \x3D |1
-<UFF1E> \x3E |1
-<UFF20> \x40 |1
-<UFF21> \x41 |1
-<UFF22> \x42 |1
-<UFF23> \x43 |1
-<UFF24> \x44 |1
-<UFF25> \x45 |1
-<UFF26> \x46 |1
-<UFF27> \x47 |1
-<UFF28> \x48 |1
-<UFF29> \x49 |1
-<UFF2A> \x4A |1
-<UFF2B> \x4B |1
-<UFF2C> \x4C |1
-<UFF2D> \x4D |1
-<UFF2E> \x4E |1
-<UFF2F> \x4F |1
-<UFF30> \x50 |1
-<UFF31> \x51 |1
-<UFF32> \x52 |1
-<UFF33> \x53 |1
-<UFF34> \x54 |1
-<UFF35> \x55 |1
-<UFF36> \x56 |1
-<UFF37> \x57 |1
-<UFF38> \x58 |1
-<UFF39> \x59 |1
-<UFF3A> \x5A |1
-<UFF3B> \x5B |1
-<UFF3C> \x5C |1
-<UFF3D> \x5D |1
-<UFF3E> \x5E |1
-<UFF3F> \x5F |1
-<UFF40> \x60 |1
-<UFF41> \x61 |1
-<UFF42> \x62 |1
-<UFF43> \x63 |1
-<UFF44> \x64 |1
-<UFF45> \x65 |1
-<UFF46> \x66 |1
-<UFF47> \x67 |1
-<UFF48> \x68 |1
-<UFF49> \x69 |1
-<UFF4A> \x6A |1
-<UFF4B> \x6B |1
-<UFF4C> \x6C |1
-<UFF4D> \x6D |1
-<UFF4E> \x6E |1
-<UFF4F> \x6F |1
-<UFF50> \x70 |1
-<UFF51> \x71 |1
-<UFF52> \x72 |1
-<UFF53> \x73 |1
-<UFF54> \x74 |1
-<UFF55> \x75 |1
-<UFF56> \x76 |1
-<UFF57> \x77 |1
-<UFF58> \x78 |1
-<UFF59> \x79 |1
-<UFF5A> \x7A |1
-<UFF5B> \x7B |1
-<UFF5C> \x7C |1
-<UFF5D> \x7D |1
-<UFF5E> \x7E |1
-#
-END CHARMAP
-#
diff --git a/mcs/class/I18N/Other/CP57002.cs b/mcs/class/I18N/Other/CP57002.cs
index 09779d5ae98..a4e8830685d 100644
--- a/mcs/class/I18N/Other/CP57002.cs
+++ b/mcs/class/I18N/Other/CP57002.cs
@@ -43,9 +43,9 @@ using I18N.Common;
 public abstract class ISCIIEncoding : MonoEncoding
 {
 	// Internal state.
-	int shift;
-	string encodingName;
-	string webName;
+	protected int shift;
+	protected String encodingName;
+	protected String webName;
 
 	// Constructor.
 	protected ISCIIEncoding(int codePage, int shift,
@@ -87,51 +87,6 @@ public abstract class ISCIIEncoding : MonoEncoding
 				return s.Length;
 			}
 
-	public unsafe override int GetByteCountImpl (char* chars, int count)
-			{
-#if NET_2_0
-				EncoderFallbackBuffer buffer = null;
-				int index = 0;
-				int charIndex = 0;
-				int byteIndex = 0;
-
-				int length = 0;
-				char ch;
-				char first = (char)shift;
-				char last = (char)(shift + 0x7F);
-				while(count-- > 0)
-				{
-					ch = chars[index++];
-					if(ch < (char)0x0080)
-					{
-						// Regular ASCII subset.
-						length++;
-					}
-					else if(ch >= first && ch <= last)
-					{
-						// ISCII range that we need to shift.
-						length++;
-					}
-					else if(ch >= '\uFF01' && ch <= '\uFF5E')
-					{
-						// ASCII full-width characters.
-						length++;
-					}
-					else
-					{
-						// FIXME: implement fallback support for GetByteCountImpl().
-						length++;
-					}
-					count--;
-				}
-
-				// Return the final length of the output.
-				return length;
-#else
-				return count;
-#endif
-			}
-
 	public unsafe override int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount)
 			{
 #if NET_2_0
diff --git a/mcs/class/I18N/Other/ChangeLog b/mcs/class/I18N/Other/ChangeLog
index a25e6511574..669caa523d9 100644
--- a/mcs/class/I18N/Other/ChangeLog
+++ b/mcs/class/I18N/Other/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* CP57002.cs : Added GetByteCountImpl().
-
 2006-01-17  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* CP1251.cs CP28594.cs CP28595.cs CP1257.cs CP1258.cs CP57002.cs
diff --git a/mcs/class/I18N/tools/ChangeLog b/mcs/class/I18N/tools/ChangeLog
deleted file mode 100644
index 50a6e5a7b66..00000000000
--- a/mcs/class/I18N/tools/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2006-01-24  Atsushi Enomoto <atsushi@ximian.com>
-
-	* table.sh, table_from.cs, table_to.cs : imported a set of useful
-	  tool from bug #77325 (thanks to Bruno Haible).
diff --git a/mcs/class/I18N/tools/table.sh b/mcs/class/I18N/tools/table.sh
deleted file mode 100644
index 27b86380e7b..00000000000
--- a/mcs/class/I18N/tools/table.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-charset=$1
-echo Extracting $charset
-mono table_from.exe $charset > $charset.TXT
-mono table_to.exe $charset | sort > $charset.INVERSE.TXT
diff --git a/mcs/class/I18N/tools/table_from.cs b/mcs/class/I18N/tools/table_from.cs
deleted file mode 100644
index 9f7ac765a14..00000000000
--- a/mcs/class/I18N/tools/table_from.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Create a table from CHARSET to Unicode.
- *
- * @author Bruno Haible
- */
-
-using System; /* String, Console */
-using System.Text; /* Encoding */
-
-public class table_from {
-  static String toHexString1 (int i) {
-    return new String(new char[] { "0123456789ABCDEF".get_Chars(i) });
-  }
-  static String toHexString2 (int i) {
-    return  toHexString1((i>>4)&0x0f)
-           +toHexString1(i&0x0f);
-  }
-  static String toHexString4 (int i) {
-    return  toHexString1((i>>12)&0x0f)
-           +toHexString1((i>>8)&0x0f)
-           +toHexString1((i>>4)&0x0f)
-           +toHexString1(i&0x0f);
-  }
-  static void printOutput(char[] outp) {
-    Console.Out.Write("0x");
-    for (int j = 0; j < outp.Length; j++) {
-      if (j > 0)
-        Console.Out.Write(" 0x");
-      if (j+1 < outp.Length
-          && outp[j] >= 0xd800 && outp[j] < 0xdc00
-          && outp[j+1] >= 0xdc00 && outp[j+1] < 0xe000) {
-        int c = 0x10000 + ((outp[j] - 0xd800) << 10) + (outp[j+1] - 0xdc00);
-        Console.Out.Write(((Int32)c).ToString("X"));
-        j++;
-      } else
-        Console.Out.Write(toHexString4(outp[j]));
-    }
-  }
-  public static int Main (String[] args) {
-    try {
-      if (args.Length != 1) {
-        Console.Error.WriteLine("Usage: mono table_from charset");
-        return 1;
-      }
-      String charset = args[0];
-      Encoding encoding;
-      try {
-        encoding = Encoding.GetEncoding(charset);
-      } catch (NotSupportedException e) {
-        Console.Error.WriteLine("no converter for "+charset);
-        return 1;
-      }
-      byte[] qmark = encoding.GetBytes(new char[] { (char)0x003f });
-      for (int i0 = 0; i0 < 0x100; i0++) {
-        char[] outp = encoding.GetChars(new byte[] { (byte)i0 });
-        if (outp.Length > 0
-            && !(outp.Length >= 1 && outp[0] == 0x003f
-                 && !(qmark.Length == 1 && i0 == qmark[0]))) {
-          Console.Out.Write("0x"+toHexString2(i0)+"\t");
-          printOutput(outp);
-          Console.Out.WriteLine();
-        } else if (outp.Length <= 1) {
-          for (int i1 = 0; i1 < 0x100; i1++) {
-            outp = encoding.GetChars(new byte[] { (byte)i0, (byte)i1 });
-            if (outp.Length > 0
-                && !(outp.Length >= 1 && outp[0] == 0x003f
-                     && !(qmark.Length == 2 && i0 == qmark[0] && i1 == qmark[1]))) {
-              Console.Out.Write("0x"+toHexString2(i0)+toHexString2(i1)+"\t");
-              printOutput(outp);
-              Console.Out.WriteLine();
-            } else if (outp.Length <= 1) {
-              for (int i2 = 0; i2 < 0x100; i2++) {
-                outp = encoding.GetChars(new byte[] { (byte)i0, (byte)i1, (byte)i2 });
-                if (outp.Length > 0
-                    && !(outp.Length >= 1 && outp[0] == 0x003f
-                         && !(qmark.Length == 3
-                              && i0 == qmark[0] && i1 == qmark[1] && i2 == qmark[2]))) {
-                  Console.Out.Write("0x"+toHexString2(i0)+toHexString2(i1)+toHexString2(i2)+"\t");
-                  printOutput(outp);
-                  Console.Out.WriteLine();
-                } else if (outp.Length <= 1) {
-                  for (int i3 = 0; i3 < 0x100; i3++) {
-                    outp = encoding.GetChars(new byte[] { (byte)i0, (byte)i1, (byte)i2, (byte)i3 });
-                    if (outp.Length > 0
-                        && !(outp.Length >= 1 && outp[0] == 0x003f
-                             && !(qmark.Length == 4
-                                  && i0 == qmark[0] && i1 == qmark[1] && i2 == qmark[2] && i3 == qmark[3]))) {
-                      Console.Out.Write("0x"+toHexString2(i0)+toHexString2(i1)+toHexString2(i2)+toHexString2(i3)+"\t");
-                      printOutput(outp);
-                      Console.Out.WriteLine();
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    } catch (Exception e) {
-      Console.Error.WriteLine(e);
-      Console.Error.WriteLine(e.StackTrace);
-      return 1;
-    }
-    return 0;
-  }
-}
diff --git a/mcs/class/I18N/tools/table_to.cs b/mcs/class/I18N/tools/table_to.cs
deleted file mode 100644
index 399b19a55b6..00000000000
--- a/mcs/class/I18N/tools/table_to.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Create a table from Unicode to CHARSET.
- *
- * @author Bruno Haible
- */
-
-using System; /* String, Console */
-using System.Text; /* Encoding */
-
-public class table_to {
-  static String toHexString1 (int i) {
-    return new String(new char[] { "0123456789ABCDEF".get_Chars(i) });
-  }
-  static String toHexString2 (int i) {
-    return  toHexString1((i>>4)&0x0f)
-           +toHexString1(i&0x0f);
-  }
-  static String toHexString4 (int i) {
-    return  toHexString1((i>>12)&0x0f)
-           +toHexString1((i>>8)&0x0f)
-           +toHexString1((i>>4)&0x0f)
-           +toHexString1(i&0x0f);
-  }
-  public static int Main (String[] args) {
-    try {
-      if (args.Length != 1) {
-        Console.Error.WriteLine("Usage: mono table_to charset");
-        return 1;
-      }
-      String charset = args[0];
-      Encoding encoding;
-      try {
-        encoding = Encoding.GetEncoding(charset);
-      } catch (NotSupportedException e) {
-        Console.Error.WriteLine("no converter for "+charset);
-        return 1;
-      }
-      byte[] qmark = encoding.GetBytes(new char[] { (char)0x003f });
-      for (int i = 0; i < 0x110000; i++) {
-        char[] inp =
-          (i < 0x10000
-           ? new char[] { (char)i }
-           : new char[] { (char)(0xd800 + ((i - 0x10000) >> 10)),
-                          (char)(0xdc00 + ((i - 0x10000) & 0x3ff)) });
-        byte[] outp = encoding.GetBytes(inp);
-        if (!(((outp.Length >= qmark.Length
-                && outp[0] == qmark[0]
-                && (qmark.Length < 2 || outp[1] == qmark[1])
-                && (qmark.Length < 3 || outp[2] == qmark[2])
-                && (qmark.Length < 4 || outp[3] == qmark[3]))
-               || (outp.Length >= 1 && outp[0] == 0x3f))
-              && !(i == 0x003f))) {
-          Console.Out.Write("0x");
-          for (int j = 0; j < outp.Length; j++)
-            Console.Out.Write(toHexString2(outp[j]));
-          Console.Out.WriteLine("\t0x" + (i<0x10000 ? toHexString4(i) : ((Int32)i).ToString("X")));
-        }
-      }
-    } catch (Exception e) {
-      Console.Error.WriteLine(e);
-      Console.Error.WriteLine(e.StackTrace);
-      return 1;
-    }
-    return 0;
-  }
-}
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index c5f600df757..bc13daab450 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -41,13 +41,13 @@ common_dirs := \
 	I18N				\
 	System.Drawing			\
 	System.EnterpriseServices	\
+	Mono.C5				\
 	Mono.Data.Tds			\
 	System.Data			\
 	Mono.Data			\
 	Mono.GetOptions			\
 	System.Web			\
 	System.Web.Services		\
-	System.Web			\
 	System.Runtime.Serialization.Formatters.Soap \
 	System.Runtime.Remoting		\
 	System.Configuration.Install 	\
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
index 7af5791988a..cda565e7c40 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
@@ -37,7 +37,7 @@ using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace Microsoft.Build.BuildEngine {
-	public class BuildItem {
+	public class BuildItem : IBuildItem {
 
 		BuildItemGroup	childs;
 		XmlAttribute	condition;
@@ -113,7 +113,7 @@ namespace Microsoft.Build.BuildEngine {
 			this.unevaluatedMetadata = (Hashtable) item.CloneCustomMetadata ();
 		}
 		
-		public void CopyCustomMetadataTo (BuildItem destinationItem)
+		public void CopyCustomMetadataTo (IBuildItem destinationItem)
 		{
 			foreach (DictionaryEntry de in unevaluatedMetadata)
 				destinationItem.SetMetadata ((string) de.Key, (string) de.Value);
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
index 525c4fc3c64..2379e498ca3 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
@@ -35,7 +35,7 @@ using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace Microsoft.Build.BuildEngine {
-	public class BuildItemGroup : IEnumerable {
+	public class BuildItemGroup : ItemPropertyGroupingBase,	IBuildItemGroup, IEnumerable {
 	
 		XmlAttribute		condition;
 		bool			isImported;
@@ -96,7 +96,7 @@ namespace Microsoft.Build.BuildEngine {
 			return big;
 		}
 
-		internal void Evaluate (BuildPropertyGroup parentPropertyBag,
+		public override void Evaluate (BuildPropertyGroup parentPropertyBag,
 					       bool ignoreCondition,
 					       bool honorCondition,
 					       Hashtable conditionedPropertiesTable,
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroupCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroupCollection.cs
index 12662010332..b0a450d7026 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroupCollection.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroupCollection.cs
@@ -31,16 +31,16 @@ using System;
 using System.Collections;
 
 namespace Microsoft.Build.BuildEngine {
-	public class BuildItemGroupCollection :	ICollection, IEnumerable {
+	public class BuildItemGroupCollection :	IBuildItemGroupCollection, ICollection, IEnumerable {
 			
 		GroupingCollection	groupingCollection;
 		
-		private BuildItemGroupCollection ()
+		public BuildItemGroupCollection ()
 		{
 			groupingCollection = new GroupingCollection ();
 		}
 
-		internal BuildItemGroupCollection (GroupingCollection groupingCollection)
+		public BuildItemGroupCollection (GroupingCollection groupingCollection)
 		{
 			this.groupingCollection = groupingCollection;
 		}
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
index ddf5cb6b6f7..2a3491d32af 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
@@ -32,7 +32,7 @@ using System.Text;
 using System.Xml;
 
 namespace Microsoft.Build.BuildEngine {
-	public class BuildProperty {
+	public class BuildProperty : IBuildProperty {
 	
 		XmlElement	propertyElement;
 		XmlAttribute	condition;
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
index 8075d2484e6..69a80556945 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
@@ -35,7 +35,7 @@ using System.Text;
 using System.Xml;
 
 namespace Microsoft.Build.BuildEngine {
-	public class BuildPropertyGroup : IEnumerable {
+	public class BuildPropertyGroup : ItemPropertyGroupingBase, IBuildPropertyGroup, IEnumerable {
 	
 		XmlElement		propertyGroup;
 		XmlAttribute		condition;
@@ -122,7 +122,7 @@ namespace Microsoft.Build.BuildEngine {
 		}
 
 		// FIXME: what it is doing?
-		internal void Evaluate (BuildPropertyGroup evaluatedPropertyBag,
+		public override void Evaluate (BuildPropertyGroup evaluatedPropertyBag,
 					       bool ignoreCondition,
 					       bool honorCondition,
 					       Hashtable conditionedPropertiesTable,
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroupCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroupCollection.cs
index abbea0bf1d5..6c3c3987e04 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroupCollection.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroupCollection.cs
@@ -31,16 +31,16 @@ using System;
 using System.Collections;
 
 namespace Microsoft.Build.BuildEngine {
-	public class BuildPropertyGroupCollection : ICollection, IEnumerable {
+	public class BuildPropertyGroupCollection : IBuildPropertyGroupCollection, ICollection, IEnumerable {
 
 		GroupingCollection	groupingCollection;
 	
-		private BuildPropertyGroupCollection ()
+		public BuildPropertyGroupCollection ()
 		{
 			groupingCollection = new GroupingCollection ();
 		}
 
-		internal BuildPropertyGroupCollection (GroupingCollection groupingCollection)
+		public BuildPropertyGroupCollection (GroupingCollection groupingCollection)
 		{
 			this.groupingCollection = groupingCollection;
 		}
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index 344049c8ac3..69962621636 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,46 +1,3 @@
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* IBuildProperty.cs, ICultureStringUtilities.cs, IProject.cs,
-	IGlobalEngineAccessor.cs, ITaskElement.cs, IBuildPropertyGroup.cs,
-	ITargetCollection.cs, IEngine.cs, IBuildItemGroupCollection.cs,
-	IHostLogger.cs, IBuildItem.cs, IHostFeedback.cs,
-	ILangSecurityLevelChecker.cs, ITarget.cs, IBuildItemGroup.cs,
-	IBuildPropertyGroupCollection.cs: Removed.
-
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com> 
-
-	* BuildItem.cs: Removed IBuildItem references.
-	* BuildItemGroup.cs: Removed ItemPropertyGroupingBase and
-	IBuildItemGroup references. Changed Evaluate to internal.
-	* BuildItemGroupCollection.cs. Removed IBuildItemGroupCollection
-	reference and hidden constructors.
-	* BuildProperty.cs: Removed IBuildProperty reference.
-	* BuildPropertyGroup.cs: Removed ItemPropertyGroupingBase and
-	IBuildPropertyGroup references. Changed Evaluate to internal.
-	* BuildPropertyGroupCollection.cs: Removed IBuildPropertyGroupCollection
-	reference and hidden constructors.
-	* ConsoleLogger.cs: Updated names of event handlers.
-	* Engine.cs: Removed IEngine reference. Removed ClearAllProjects and
-	Escape. Added UnloadAllProjects () and UnloadProject ().
-	* FileLogger.cs: Removed ApplyParameter ().
-	* GroupingCollection.cs: Hidden.
-	* InvalidProjectFileException.cs: Removed HasBeenLogged property.
-	* ItemPropertyGroupingBase.cs: Commented.
-	* ProcessingPass.cs: Hidden.
-	* Project.cs: Removed IProject reference. Changed CurrentEncoding to
-	Encoding.
-	* Target.cs: Removed ITarget reference.
-	* TargetCollection.cs: Removed ITargetCollection reference.
-	* TaskElement.cs: Removed ITaskElement reference.
-	* TaskEngineAssemblyResolver.cs: Hidden.
-	* Utilities.cs: Made static class, removed CheckPath (),
-	ValidateCulture (), GetSupportedCultures () and added Escape ().
-
-2006-02-24  Marek Sieradzki <marek.sieradzki@gmail.com> 
-
-	* ConsoleLogger.cs, Engine.cs: Quick hacks to make it compile with new
-	API.
-
 2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* Project.cs: Added MonoTODO attributes.
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
index 4a88643dae4..da9c296d14e 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
@@ -71,28 +71,28 @@ namespace Microsoft.Build.BuildEngine {
 
 		public virtual void Initialize (IEventSource eventSource)
 		{
-                        eventSource.BuildStarted +=  new BuildStartedEventHandler (BuildStartedHandler);
-                        eventSource.BuildFinished += new BuildFinishedEventHandler (BuildFinishedHandler);
-                        eventSource.ProjectStarted += new ProjectStartedEventHandler (ProjectStartedHandler);
-                        eventSource.ProjectFinished += new ProjectFinishedEventHandler (ProjectFinishedHandler);
-                        eventSource.TargetStarted += new TargetStartedEventHandler (TargetStartedHandler);
-                        eventSource.TargetFinished += new TargetFinishedEventHandler (TargetFinishedHandler);
-                        eventSource.TaskStarted += new TaskStartedEventHandler (TaskStartedHandler);
-                        eventSource.TaskFinished += new TaskFinishedEventHandler (TaskFinishedHandler);
-                        eventSource.MessageRaised += new BuildMessageEventHandler (MessageHandler);
-                        eventSource.WarningRaised += new BuildWarningEventHandler (WarningHandler);
-                        eventSource.ErrorRaised += new BuildErrorEventHandler (ErrorHandler);
+                        eventSource.BuildStarted +=  new BuildStartedEventHandler (BuildStarted);
+                        eventSource.BuildFinished += new BuildFinishedEventHandler (BuildFinished);
+                        eventSource.ProjectStarted += new ProjectStartedEventHandler (ProjectStarted);
+                        eventSource.ProjectFinished += new ProjectFinishedEventHandler (ProjectFinished);
+                        eventSource.TargetStarted += new TargetStartedEventHandler (TargetStarted);
+                        eventSource.TargetFinished += new TargetFinishedEventHandler (TargetFinished);
+                        eventSource.TaskStarted += new TaskStartedEventHandler (TaskStarted);
+                        eventSource.TaskFinished += new TaskFinishedEventHandler (TaskFinished);
+                        eventSource.MessageRaised += new BuildMessageEventHandler (MessageRaised);
+                        eventSource.WarningRaised += new BuildWarningEventHandler (WarningRaised);
+                        eventSource.ErrorRaised += new BuildErrorEventHandler (ErrorRaised);
 		}
 		
-		public void BuildStartedHandler (object sender, BuildStartedEventArgs args)
+		public void BuildStarted (object sender, BuildStartedEventArgs args)
 		{
 			WriteLine ("");
-			WriteLine (String.Format ("Build started {0}.", args.Timestamp));
+			WriteLine (String.Format ("Build started {0}.", args.TimeStamp));
 			WriteLine ("__________________________________________________");
-			buildStart = args.Timestamp;
+			buildStart = args.TimeStamp;
 		}
 		
-		public void BuildFinishedHandler (object sender, BuildFinishedEventArgs args)
+		public void BuildFinished (object sender, BuildFinishedEventArgs args)
 		{
 			if (args.Succeeded == true) {
 				WriteLine ("Build succeeded.");
@@ -102,7 +102,7 @@ namespace Microsoft.Build.BuildEngine {
 			if (performanceSummary == true)
 				;
 			if (summary == true){
-				TimeSpan timeElapsed = args.Timestamp - buildStart;
+				TimeSpan timeElapsed = args.TimeStamp - buildStart;
 				WriteLine (String.Format ("\t {0} Warning(s)", warningCount));
 				WriteLine (String.Format ("\t {0} Error(s)", errorCount));
 				WriteLine ("");
@@ -110,13 +110,13 @@ namespace Microsoft.Build.BuildEngine {
 			} 
 		}
 
-		public void ProjectStartedHandler (object sender, ProjectStartedEventArgs args)
+		public void ProjectStarted (object sender, ProjectStartedEventArgs args)
 		{
 			WriteLine (String.Format ("Project \"{0}\" ({1} target(s)):", args.ProjectFile, args.TargetNames));
 			WriteLine ("");
 		}
 		
-		public void ProjectFinishedHandler (object sender, ProjectFinishedEventArgs args)
+		public void ProjectFinished (object sender, ProjectFinishedEventArgs args)
 		{
 			if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Diagnostic)) {
 				WriteLine (String.Format ("Done building project \"{0}\".", args.ProjectFile));
@@ -124,13 +124,13 @@ namespace Microsoft.Build.BuildEngine {
 			}
 		}
 		
-		public void TargetStartedHandler (object sender, TargetStartedEventArgs args)
+		public void TargetStarted (object sender, TargetStartedEventArgs args)
 		{
 			WriteLine (String.Format ("Target {0}:",args.TargetName));
 			indent++;
 		}
 		
-		public void TargetFinishedHandler (object sender, TargetFinishedEventArgs args)
+		public void TargetFinished (object sender, TargetFinishedEventArgs args)
 		{
 			indent--;
 			if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Diagnostic))
@@ -139,35 +139,35 @@ namespace Microsoft.Build.BuildEngine {
 			WriteLine ("");
 		}
 		
-		public void TaskStartedHandler (object sender, TaskStartedEventArgs args)
+		public void TaskStarted (object sender, TaskStartedEventArgs args)
 		{
 			if (this.verbosity == LoggerVerbosity.Diagnostic)
 				WriteLine (String.Format ("Task \"{0}\"",args.TaskName));
 			indent++;
 		}
 		
-		public void TaskFinishedHandler (object sender, TaskFinishedEventArgs args)
+		public void TaskFinished (object sender, TaskFinishedEventArgs args)
 		{
 			indent--;
 			if (this.verbosity == LoggerVerbosity.Diagnostic)
 				WriteLine (String.Format ("Done executing task \"{0}\"",args.TaskName));
 		}
 		
-		public void MessageHandler (object sender, BuildMessageEventArgs args)
+		public void MessageRaised (object sender, BuildMessageEventArgs args)
 		{
 			if (IsMessageOk (args)) {
 				WriteLine (args.Message);
 			}
 		}
 		
-		public void WarningHandler (object sender, BuildWarningEventArgs args)
+		public void WarningRaised (object sender, BuildWarningEventArgs args)
 		{
 			if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal)) 
 				WriteLineWithoutIndent (FormatWarningEvent (args));
 			warningCount++;
 		}
 		
-		public void ErrorHandler (object sender, BuildErrorEventArgs args)
+		public void ErrorRaised (object sender, BuildErrorEventArgs args)
 		{
 			if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Minimal)) 
 				WriteLineWithoutIndent (FormatErrorEvent (args));
@@ -305,4 +305,4 @@ namespace Microsoft.Build.BuildEngine {
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
index cd045494e1f..3593134bd90 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
@@ -32,10 +32,11 @@ using System.Collections;
 using Microsoft.Build.Framework;
 
 namespace Microsoft.Build.BuildEngine {
-	public class Engine {
+	public class Engine : IEngine {
 		
 		string			binPath;
 		bool			buildEnabled;
+		const string		engineVersion = "0.1";
 		BuildPropertyGroup	environmentProperties;
 		EventSource		eventSource;
 		bool			buildStarted;
@@ -48,12 +49,7 @@ namespace Microsoft.Build.BuildEngine {
 
 		// FIXME: GlobalEngine static property uses this but what about GlobalEngineAccessor?
 		static Engine		globalEngine;
-		static Version		version;
 
-		static Engine ()
-		{
-			version = new Version("0.1");
-		}
 		
 		public Engine ()
 			: this (null)
@@ -110,6 +106,11 @@ namespace Microsoft.Build.BuildEngine {
 			return result;
 		}
 
+		public void ClearAllProjects ()
+		{
+			projects.Clear ();
+		}
+
 		public Project CreateNewProject ()
 		{
 			if (buildStarted == false) {
@@ -128,6 +129,12 @@ namespace Microsoft.Build.BuildEngine {
 			return p;
 		}
 
+		public string Escape (string input)
+		{
+			// FIXME: test it, probably returns XML escaped string
+			return null;
+		}
+
 		public Project GetLoadedProject (string projectFullFileName)
 		{
 			return (Project) projects [projectFullFileName];
@@ -140,16 +147,6 @@ namespace Microsoft.Build.BuildEngine {
 			logger.Initialize (eventSource);
 			loggers.Add (logger);
 		}
-		
-		[MonoTODO]
-		public void UnloadAllProjects ()
-		{
-		}
-		
-		[MonoTODO]
-		public void UnloadProject (Project project)
-		{
-		}
 
 		public void UnregisterAllLoggers ()
 		{
@@ -176,12 +173,12 @@ namespace Microsoft.Build.BuildEngine {
 			if (targetNames.Length == 0) {
 				if (project.DefaultTargets != String.Empty)
 					psea = new ProjectStartedEventArgs ("Project started.", null, project.FullFileName,
-						project.DefaultTargets, null, null);
+						project.DefaultTargets);
 				else
-					psea = new ProjectStartedEventArgs ("Project started.", null, project.FullFileName, "default", null, null);
+					psea = new ProjectStartedEventArgs ("Project started.", null, project.FullFileName, "default");
 			} else
 			psea = new ProjectStartedEventArgs ("Project started.", null, project.FullFileName, String.Join (";",
-				targetNames), null, null);
+				targetNames));
 			eventSource.FireProjectStarted (this, psea);
 		}
 		
@@ -216,8 +213,8 @@ namespace Microsoft.Build.BuildEngine {
 			set { buildEnabled = value; }
 		}
 
-		public static Version Version {
-			get { return version; }
+		public static string EngineVersion {
+			get { return engineVersion; }
 		}
 
 		public static Engine GlobalEngine {
@@ -240,4 +237,4 @@ namespace Microsoft.Build.BuildEngine {
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/FileLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/FileLogger.cs
index 865a2b52ec8..d755ffb5cd8 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/FileLogger.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/FileLogger.cs
@@ -34,6 +34,11 @@ namespace Microsoft.Build.BuildEngine {
 		public FileLogger ()
 		{
 		}
+		
+		public override void ApplyParameter (string parameterName,
+						     string parameterValue)
+		{
+		}
 
 		// FIXME: add our handlers to the events
 		public override void Initialize (IEventSource eventSource)
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/GroupingCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/GroupingCollection.cs
index 283562aae81..2628244d19c 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/GroupingCollection.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/GroupingCollection.cs
@@ -31,7 +31,7 @@
 using System.Collections;
 
 namespace Microsoft.Build.BuildEngine {
-	internal class GroupingCollection : IEnumerable {
+	public class GroupingCollection : IEnumerable {
 		
 		IList	allGroups;
 		int	itemGroups;
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItem.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItem.cs
new file mode 100644
index 00000000000..d3c1b0e129d
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItem.cs
@@ -0,0 +1,74 @@
+//
+// IBuildItem.cs: Interface for build items
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IBuildItem {
+		void CopyCustomMetadataTo (IBuildItem destinationItem);
+
+		string GetEvaluatedMetadata (string metadataName);
+
+		string GetMetadata (string metadataName);
+
+		bool HasMetadata (string metadataName);
+
+		void RemoveMetadata (string metadataName);
+
+		void SetMetadata (string metadataName, string metadataValue);
+
+		string Condition {
+			get;
+			set;
+		}
+
+		string Exclude {
+			get;
+			set;
+		}
+
+		string FinalItemSpec {
+			get;
+		}
+
+		string Include {
+			get;
+			set;
+		}
+
+		bool IsImported {
+			get;
+		}
+
+		string Name {
+			get;
+			set;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItemGroup.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItemGroup.cs
new file mode 100644
index 00000000000..f9ca1b77fd9
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItemGroup.cs
@@ -0,0 +1,67 @@
+//
+// IBuildItemGroup.cs: Interface for group of build items.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System.Collections;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IBuildItemGroup {
+		BuildItem AddNewItem (string itemName, string itemInclude);
+
+		void Clear ();
+
+		BuildItemGroup Clone (bool deepClone);
+
+		IEnumerator GetEnumerator ();
+
+		void RemoveItem (BuildItem itemToRemove);
+
+		void RemoveItemAt (int index);
+
+		BuildItem[] ToArray ();
+
+		string Condition {
+			get;
+			set;
+		}
+
+		int Count {
+			get;
+		}
+
+		bool IsImported {
+			get;
+		}
+
+		BuildItem this[int index] {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItemGroupCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItemGroupCollection.cs
new file mode 100644
index 00000000000..9521f17ad12
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildItemGroupCollection.cs
@@ -0,0 +1,56 @@
+//
+// IBuildItemCollection.cs: Interface for collection holding build items.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IBuildItemGroupCollection {
+		void CopyTo (Array array, int index);
+
+		void CopyToStronglyTypedArray (BuildItemGroup[] array,
+					       int index);
+
+		IEnumerator GetEnumerator ();
+
+		int Count {
+			get;
+		}
+
+		bool IsSynchronized {
+			get;
+		}
+
+		object SyncRoot {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildProperty.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildProperty.cs
new file mode 100644
index 00000000000..5322803f05c
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildProperty.cs
@@ -0,0 +1,56 @@
+//
+// IBuildProperty.cs: Interface for build property.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IBuildProperty {
+		BuildProperty Clone (bool deepClone);
+
+		string ToString ();
+
+		string Condition {
+			get;
+			set;
+		}
+
+		string FinalValue {
+			get;
+		}
+
+		string Name {
+			get;
+		}
+
+		string Value {
+			get;
+			set;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildPropertyGroup.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildPropertyGroup.cs
new file mode 100644
index 00000000000..5b4b6506d84
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildPropertyGroup.cs
@@ -0,0 +1,73 @@
+//
+// IBuildPropertyGroup.cs: Interface for group of build properties.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System.Collections;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IBuildPropertyGroup {
+		BuildProperty AddNewProperty (string propertyName,
+					      string propertyValue);
+
+		void Clear ();
+
+		BuildPropertyGroup Clone (bool deepClone);
+
+		IEnumerator GetEnumerator ();
+
+		void GetStringArraysForAllProperties (out string[] propertyNames,
+						      out string[] propertyValues,
+						      out string[] propertyFinalValues);
+
+		void RemoveProperty (BuildProperty propertyToRemove);
+
+		void RemovePropertyByName (string propertyNameToRemove);
+
+		void SetProperty (string propertyName, string propertyValue);
+
+		string Condition {
+			get;
+			set;
+		}
+
+		int Count {
+			get;
+		}
+
+		bool IsImported {
+			get;
+		}
+
+		BuildProperty this[string propertyName] {
+			get;
+			set;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildPropertyGroupCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildPropertyGroupCollection.cs
new file mode 100644
index 00000000000..8b42772e422
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IBuildPropertyGroupCollection.cs
@@ -0,0 +1,56 @@
+//
+// IBuildPropertyGroupCollection.cs: Holds group of build properties.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System;
+using System.Collections;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IBuildPropertyGroupCollection {
+		void CopyTo (Array array, int index);
+
+		void CopyToStronglyTypedArray (BuildPropertyGroup[] array,
+					       int index);
+
+		IEnumerator GetEnumerator ();
+
+		int Count {
+			get;
+		}
+
+		bool IsSynchronized {
+			get;
+		}
+
+		object SyncRoot {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ICultureStringUtilities.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ICultureStringUtilities.cs
new file mode 100644
index 00000000000..9da6508dc61
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ICultureStringUtilities.cs
@@ -0,0 +1,38 @@
+//
+// ICultureStringUtilities.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface ICultureStringUtilities {
+		string[] GetSupportedCultures ();
+
+		bool ValidateCulture (string culture);
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IEngine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IEngine.cs
new file mode 100644
index 00000000000..b8f26a32a18
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IEngine.cs
@@ -0,0 +1,77 @@
+//
+// IEngine.cs: Interface for build engine
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System.Collections;
+using Microsoft.Build.Framework;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IEngine {
+		bool BuildProject (Project project, string[] targetNames,
+				   IDictionary targetOutputs);
+
+		bool BuildProjectFile (string projectFileName,
+				       string[] targetNames,
+				       BuildPropertyGroup globalProperties,
+				       IDictionary targetOutputs);
+
+		void ClearAllProjects ();
+		
+		Project CreateNewProject ();
+		
+		string Escape (string input);
+		
+		Project GetLoadedProject (string projectFullFileName);
+
+		void RegisterLogger (ILogger logger);
+
+		void UnregisterAllLoggers ();
+
+		string BinPath {
+			get;
+			set;
+		}
+
+		bool BuildEnabled {
+			get;
+			set;
+		}
+
+		BuildPropertyGroup GlobalProperties {
+			get;
+			set;
+		}
+
+		bool OnlyLogCriticalEvents {
+			get;
+			set;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IGlobalEngineAccessor.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IGlobalEngineAccessor.cs
new file mode 100644
index 00000000000..0704821120b
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IGlobalEngineAccessor.cs
@@ -0,0 +1,38 @@
+//
+// IGlobalEngineAccessor.cs: Interface for accessor to global engine
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IGlobalEngineAccessor {
+		Engine GlobalEngine {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IHostFeedback.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IHostFeedback.cs
new file mode 100644
index 00000000000..ef6a66fde3d
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IHostFeedback.cs
@@ -0,0 +1,48 @@
+//
+// IHostFeedback.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IHostFeedback {
+		void BeginLogging ();
+
+		void LogFormattedError (string message, string errorCode,
+					string helpKeyword, int line,
+					int column, int endingLine,
+					int endingColumn, string file,
+					object additionalInfo);
+		void LogFormattedWarning (string message, string warningCode,
+					  string helpKeyword, int line,
+					  int column, int endingLine,
+					  int endingColumn, string file,
+					  object additionalInfo);
+		void LogTextMessage (string message);
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IHostLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IHostLogger.cs
new file mode 100644
index 00000000000..2a929455a7a
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IHostLogger.cs
@@ -0,0 +1,39 @@
+//
+// IHostLogger.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IHostLogger {
+		IHostFeedback HostFeedbackObject {
+			get;
+			set;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ILangSecurityLevelChecker.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ILangSecurityLevelChecker.cs
new file mode 100644
index 00000000000..a2c9ee55139
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ILangSecurityLevelChecker.cs
@@ -0,0 +1,36 @@
+//
+// ILangSecurityLevelChecker.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+namespace Microsoft.Build.BuildEngine {
+	public interface ILangSecurityLevelChecker {
+		bool CheckPath (string path, int zone);
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IProject.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IProject.cs
new file mode 100644
index 00000000000..ca3b40f660c
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/IProject.cs
@@ -0,0 +1,186 @@
+//
+// IProject.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Xml;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface IProject {
+		void AddNewImport (string importLocation,
+				   string importCondition);
+
+		BuildItem AddNewItem (string itemName, string itemInclude);
+
+		BuildItemGroup AddNewItemGroup ();
+
+		BuildPropertyGroup AddNewPropertyGroup (bool insertAtEndOfProject);
+
+		bool Build (string[] targetNamesToBuild,
+			    IDictionary targetOutputs);
+
+		bool BuildTarget (string targetName,
+				  IDictionary targetOutputs);
+
+		bool BuildTargetWithFlags (string targetName,
+					   IDictionary targetOutputs,
+					   BuildSettings buildFlags);
+
+		string[] GetConditionedPropertyValues (string propertyName);
+
+		string[] GetDirectlyImportedProjects ();
+
+		BuildItemGroup GetEvaluatedItemsByName (string itemName);
+
+		BuildItemGroup GetEvaluatedItemsByNameIgnoringCondition (string itemName);
+
+		string GetEvaluatedProperty (string propertyName);
+
+		string[] GetNonImportedItemNames ();
+
+		string[] GetNonImportedPropertyNames ();
+
+		string[] GetNonImportedTargetNames ();
+
+		string[] GetNonImportedUsingTasks ();
+
+		string GetProjectExtensions (string id);
+
+		void LoadFromFile (string projectFileName);
+
+		void LoadFromXml (XmlDocument projectXml);
+
+		void MarkProjectAsDirty ();
+
+		void RemoveAllItemGroups ();
+
+		void RemoveAllItemsGroupsByCondition (string condition);
+
+		void RemoveAllPropertyGroups ();
+
+		void RemoveAllPropertyGroupsByCondition (string condition);
+
+		void RemoveItem (BuildItem itemToRemove);
+
+		void RemoveItemGroup (BuildItemGroup itemGroupToRemove);
+
+		void RemoveItemsByName (string itemName);
+
+		void RemovePropertyGroup (BuildPropertyGroup propertyGroupToRemove);
+
+		void ResetBuildStatus ();
+
+		void SaveToFile (string projectFileName);
+
+		void SaveToFile (string projectFileName,
+				ProjectFileEncoding encoding);
+
+		void SaveToTextWriter (TextWriter outTextWriter);
+
+		void SetImportedProperty (string propertyName,
+					  string propertyValue,
+					  string condition,
+					  Project importedProject);
+
+		void SetImportedPropertyAt (string propertyName,
+					    string propertyValue,
+					    string condition,
+					    Project importedProject,
+					    PropertyPosition position);
+
+		void SetProjectExtensions (string id, string xmlText);
+
+		void SetProperty (string propertyName, string propertyValue,
+				  string condition);
+
+		void SetPropertyAt (string propertyName, string propertyValue,
+				    string condition,
+				    PropertyPosition postition);
+
+		void Unload ();
+
+		bool BuildEnabled {
+			get;
+			set;
+		}
+
+		ProjectFileEncoding CurrentProjectFileEncoding {
+			get;
+		}
+
+		string DefaultTargets {
+			get;
+			set;
+		}
+
+		BuildItemGroup EvaluatedItems {
+			get;
+		}
+
+		BuildItemGroup EvaluatedItemsIgnoringCondition {
+			get;
+		}
+
+		BuildPropertyGroup EvaluatedProperties {
+			get;
+		}
+
+		string FullFileName {
+			get;
+		}
+
+		BuildPropertyGroup GlobalProperties {
+			get;
+			set;
+		}
+
+		bool IsDirty {
+			get;
+		}
+
+		BuildItemGroupCollection ItemGroups {
+			get;
+		}
+
+		Engine ParentEngine {
+			get;
+		}
+
+		BuildPropertyGroupCollection PropertyGroups {
+			get;
+		}
+
+		DateTime TimeOfLastDirty {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITarget.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITarget.cs
new file mode 100644
index 00000000000..ac662a834d5
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITarget.cs
@@ -0,0 +1,52 @@
+//
+// ITarget.cs: Interface for target.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System.Collections;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface ITarget {
+		IEnumerator GetEnumerator ();
+
+		string Condition {
+			get;
+			set;
+		}
+
+		string DependsOnTargets {
+			get;
+			set;
+		}
+
+		string Name {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITargetCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITargetCollection.cs
new file mode 100644
index 00000000000..609f168d494
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITargetCollection.cs
@@ -0,0 +1,62 @@
+//
+// ITargetCollection.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface ITargetCollection {
+		void CopyTo (Array array, int index);
+
+		void CopyToStronglyTypedArray (Target[] array, int index);
+
+		bool Exists (string targetName);
+
+		IEnumerator GetEnumerator ();
+
+		int Count {
+			get;
+		}
+
+		bool IsSynchronized {
+			get;
+		}
+
+		object SyncRoot {
+			get;
+		}
+
+		Target this[string index] {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITaskElement.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITaskElement.cs
new file mode 100644
index 00000000000..517ddde90af
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ITaskElement.cs
@@ -0,0 +1,68 @@
+//
+// ITaskElement.cs: Interface for element of a task.
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+// 
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#if NET_2_0
+
+using System;
+
+namespace Microsoft.Build.BuildEngine {
+	public interface ITaskElement {
+		bool Execute ();
+
+		string[] GetParameterNames ();
+
+		string GetParameterValue (string attributeName);
+
+		void SetParameterValue (string parameterName,
+					string parameterValue);
+
+		string Condition {
+			get;
+			set;
+		}
+
+		bool ContinueOnError {
+			get;
+			set;
+		}
+
+		object HostObject {
+			get;
+			set;
+		}
+
+		string Name {
+			get;
+		}
+
+		Type Type {
+			get;
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/InvalidProjectFileException.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/InvalidProjectFileException.cs
index 96277a75f10..7ccfc5473e5 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/InvalidProjectFileException.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/InvalidProjectFileException.cs
@@ -40,6 +40,7 @@ namespace Microsoft.Build.BuildEngine {
 		int	endColumnNumber;
 		string	errorCode;
 		string	errorSubcategory;
+		bool	hasBeenLogged;
 		string	helpKeyword;
 		int	lineNumber;
 		int	endLineNumber;
@@ -108,6 +109,7 @@ namespace Microsoft.Build.BuildEngine {
 			info.AddValue ("EndColumnNumber", endColumnNumber);
 			info.AddValue ("ErrorCode", errorCode);
 			info.AddValue ("ErrorSubcategory", errorSubcategory);
+			info.AddValue ("HasBeenLogged", hasBeenLogged);
 			info.AddValue ("HelpKeyword", helpKeyword);
 			info.AddValue ("LineNumber", lineNumber);
 			info.AddValue ("EndLineNumber", endLineNumber);
@@ -150,6 +152,15 @@ namespace Microsoft.Build.BuildEngine {
 			}
 		}
 
+		public bool HasBeenLogged {
+			get {
+				return hasBeenLogged;
+			}
+			set {
+				hasBeenLogged = value;
+			}
+		}
+
 		public string HelpKeyword {
 			get {
 				return helpKeyword;
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemPropertyGroupingBase.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemPropertyGroupingBase.cs
index e81b1ac568b..22b565a9ae2 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemPropertyGroupingBase.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ItemPropertyGroupingBase.cs
@@ -30,7 +30,7 @@
 using System.Collections;
 
 namespace Microsoft.Build.BuildEngine {
-/*	public abstract class ItemPropertyGroupingBase {
+	public abstract class ItemPropertyGroupingBase {
 
 		protected ItemPropertyGroupingBase ()
 		{
@@ -46,7 +46,7 @@ namespace Microsoft.Build.BuildEngine {
 			PropertyGroup,
 			ItemGroup
 		}
-	}*/
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ProcessingPass.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ProcessingPass.cs
index 0bea4eb96a8..42eaeea89f5 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ProcessingPass.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ProcessingPass.cs
@@ -28,7 +28,7 @@
 #if NET_2_0
 
 namespace Microsoft.Build.BuildEngine {
-	internal enum ProcessingPass {
+	public enum ProcessingPass {
 		Pass1,
 		Pass2
 	}
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index f2544d2bc95..e0bf1872dab 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@ -38,14 +38,14 @@ using Microsoft.Build.Framework;
 using Mono.XBuild.Framework;
 
 namespace Microsoft.Build.BuildEngine {
-	public class Project {
+	public class Project : IProject {
 		static string separator = ";";
 	
 		bool				buildEnabled;
 		IDictionary			conditionedProperties;
+		Encoding				currentEncoding;
 		string[]			defaultTargets;
 		IList				directlyImportedProjects;
-		Encoding			encoding;
 		BuildPropertyGroup		environmentProperties;
 		BuildItemGroup			evaluatedItems;
 		BuildItemGroup			evaluatedItemsIgnoringCondition;
@@ -351,7 +351,7 @@ namespace Microsoft.Build.BuildEngine {
 		}
 
 		public void SaveToFile (string projectFileName,
-					Encoding encoding)
+					ProjectFileEncoding encoding)
 		{
 			SaveToFile (projectFileName);
 		}
@@ -577,8 +577,16 @@ namespace Microsoft.Build.BuildEngine {
 			}
 		}
 
-		public Encoding Encoding {
-			get { return encoding; }
+		public ProjectFileEncoding CurrentProjectFileEncoding {
+			get {
+				if (currentEncoding == Encoding.UTF8)
+					return ProjectFileEncoding.Utf8;
+				if (currentEncoding == Encoding.Unicode)
+					return ProjectFileEncoding.Unicode;
+				if (currentEncoding == Encoding.GetEncoding ("ANSI"))
+					return ProjectFileEncoding.Ansi;
+				throw new Exception ();
+			}
 		}
 
 		public string DefaultTargets {
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
index daa33c039ed..f3043ecc9f8 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
@@ -33,7 +33,7 @@ using System.Xml;
 using Microsoft.Build.Framework;
 
 namespace Microsoft.Build.BuildEngine {
-	public class Target : IEnumerable {
+	public class Target : ITarget, IEnumerable {
 	
 		BatchingImpl	batchingImpl;
 		BuildState	buildState;
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetCollection.cs
index 138cbe99f7e..8446284510a 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetCollection.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TargetCollection.cs
@@ -32,7 +32,7 @@ using System.Collections;
 using System.Reflection;
 
 namespace Microsoft.Build.BuildEngine {
-	public class TargetCollection : ICollection, IEnumerable {
+	public class TargetCollection : ITargetCollection, ICollection, IEnumerable {
 		
 		IDictionary	targetsByName;
 		Project		parentProject;
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskElement.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskElement.cs
index 0cdb3ad6780..56d434ce5e0 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskElement.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskElement.cs
@@ -36,7 +36,7 @@ using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace Microsoft.Build.BuildEngine {
-	public class TaskElement {
+	public class TaskElement : ITaskElement {
 	
 		XmlAttribute	condition;
 		XmlAttribute	continueOnError;
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngineAssemblyResolver.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngineAssemblyResolver.cs
index 39216b28bac..8dbccf99f87 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngineAssemblyResolver.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngineAssemblyResolver.cs
@@ -30,7 +30,7 @@
 using System;
 
 namespace Microsoft.Build.BuildEngine {
-	internal class TaskEngineAssemblyResolver : MarshalByRefObject {
+	public class TaskEngineAssemblyResolver : MarshalByRefObject {
 		public TaskEngineAssemblyResolver ()
 		{
 		}
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Utilities.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Utilities.cs
index 23ef4645171..ca3fb4a6dd5 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Utilities.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Utilities.cs
@@ -27,16 +27,27 @@
 
 #if NET_2_0
 
-using System;
-
 namespace Microsoft.Build.BuildEngine {
-	public static class Utilities {
-		[MonoTODO]
-		public static string Escape (string unescapedExpression)
+	public class Utilities : ILangSecurityLevelChecker, ICultureStringUtilities {
+		public Utilities ()
+		{
+		}
+
+		public bool CheckPath (string path, int zone)
+		{
+			return true;
+		}
+
+		public string[] GetSupportedCultures ()
 		{
 			return null;
 		}
+
+		public bool ValidateCulture (string culture)
+		{
+			return true;
+		}
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.dll.sources b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.dll.sources
index a85738162ef..48e58b634c4 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.dll.sources
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.dll.sources
@@ -20,17 +20,37 @@ Microsoft.Build.BuildEngine/Engine.cs
 Microsoft.Build.BuildEngine/EventSource.cs
 Microsoft.Build.BuildEngine/Expression.cs
 Microsoft.Build.BuildEngine/FileLogger.cs
+Microsoft.Build.BuildEngine/GlobalEngineAccessor.cs
 Microsoft.Build.BuildEngine/GroupingCollection.cs
+Microsoft.Build.BuildEngine/HostLogger.cs
+Microsoft.Build.BuildEngine/IBuildItem.cs
+Microsoft.Build.BuildEngine/IBuildItemGroupCollection.cs
+Microsoft.Build.BuildEngine/IBuildItemGroup.cs
+Microsoft.Build.BuildEngine/IBuildProperty.cs
+Microsoft.Build.BuildEngine/IBuildPropertyGroupCollection.cs
+Microsoft.Build.BuildEngine/IBuildPropertyGroup.cs
+Microsoft.Build.BuildEngine/ICultureStringUtilities.cs
+Microsoft.Build.BuildEngine/IEngine.cs
+Microsoft.Build.BuildEngine/IGlobalEngineAccessor.cs
+Microsoft.Build.BuildEngine/IHostFeedback.cs
+Microsoft.Build.BuildEngine/IHostLogger.cs
+Microsoft.Build.BuildEngine/ILangSecurityLevelChecker.cs
 Microsoft.Build.BuildEngine/ImportedProject.cs
 Microsoft.Build.BuildEngine/InternalLoggerException.cs
 Microsoft.Build.BuildEngine/InvalidProjectFileException.cs
+Microsoft.Build.BuildEngine/IProject.cs
+Microsoft.Build.BuildEngine/ITargetCollection.cs
+Microsoft.Build.BuildEngine/ITarget.cs
+Microsoft.Build.BuildEngine/ITaskElement.cs
 Microsoft.Build.BuildEngine/ItemPropertyGroupingBase.cs
 Microsoft.Build.BuildEngine/ItemReference.cs
 Microsoft.Build.BuildEngine/MetadataReference.cs
 Microsoft.Build.BuildEngine/ProcessingPass.cs
 Microsoft.Build.BuildEngine/Project.cs
+Microsoft.Build.BuildEngine/ProjectFileEncoding.cs
 Microsoft.Build.BuildEngine/PropertyPosition.cs
 Microsoft.Build.BuildEngine/PropertyReference.cs
+Microsoft.Build.BuildEngine/SolutionParser.cs
 Microsoft.Build.BuildEngine/TargetCollection.cs
 Microsoft.Build.BuildEngine/Target.cs
 Microsoft.Build.BuildEngine/TaskDatabase.cs
diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
index 57f13cadf79..2153c5047e4 100644
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-27  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* Engine.cs, Project.cs: Removed references to IEngine and IProject.
-
 2005-09-03  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* ProjectTest.cs, EngineTest.cs: Added next simple tests.
diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
index 1f0e4209392..9ab95dfca5c 100644
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/EngineTest.cs
@@ -34,7 +34,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 		[Test]
 		public void AssignmentTest ()
 		{
-			Engine engine;
+			IEngine engine;
 			string binPath = "binPath";
 			
 			engine = new Engine (binPath);
diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
index 328cf5c37f3..c9c867603da 100644
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
@@ -36,8 +36,8 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 		[Test]
 		public void AssignmentTest ()
 		{
-			Engine engine;
-			Project project;
+			IEngine engine;
+			IProject project;
 			string binPath = "binPath";
 			XmlDocument xd;
 			string documentString =
@@ -52,4 +52,4 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			Assert.AreEqual (String.Empty, project.FullFileName, "FullFileName");
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.dll.sources b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.dll.sources
index 5be4904c10f..e9770a3a038 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.dll.sources
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.dll.sources
@@ -17,13 +17,10 @@ Microsoft.Build.Framework/BuildWarningEventArgs.cs
 Microsoft.Build.Framework/BuildWarningEventHandler.cs
 Microsoft.Build.Framework/CustomBuildEventArgs.cs
 Microsoft.Build.Framework/CustomBuildEventHandler.cs
-Microsoft.Build.Framework/ExternalProjectFinishedEventArgs.cs
-Microsoft.Build.Framework/ExternalProjectStartedEventArgs.cs
 Microsoft.Build.Framework/IBuildEngine.cs
 Microsoft.Build.Framework/IEventSource.cs
 Microsoft.Build.Framework/ILogger.cs
 Microsoft.Build.Framework/ITask.cs
-Microsoft.Build.Framework/ITaskHost.cs
 Microsoft.Build.Framework/ITaskItem.cs
 Microsoft.Build.Framework/LoadInSeparateAppDomainAttribute.cs
 Microsoft.Build.Framework/LoggerException.cs
@@ -39,7 +36,6 @@ Microsoft.Build.Framework/TargetFinishedEventArgs.cs
 Microsoft.Build.Framework/TargetFinishedEventHandler.cs
 Microsoft.Build.Framework/TargetStartedEventArgs.cs
 Microsoft.Build.Framework/TargetStartedEventHandler.cs
-Microsoft.Build.Framework/TaskCommandLineEventArgs.cs
 Microsoft.Build.Framework/TaskFinishedEventArgs.cs
 Microsoft.Build.Framework/TaskFinishedEventHandler.cs
 Microsoft.Build.Framework/TaskStartedEventArgs.cs
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs
index 60be917bf46..74fed594852 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/BuildEventArgs.cs
@@ -40,7 +40,7 @@ namespace Microsoft.Build.Framework
 		string	message;
 		string	senderName;
 		int	threadId;
-		DateTime	timestamp;
+		DateTime	timeStamp;
 		
 		protected BuildEventArgs ()
 			: this (null, null, null)
@@ -54,7 +54,7 @@ namespace Microsoft.Build.Framework
 			this.helpKeyword = helpKeyword;
 			this.senderName = senderName;
 			this.threadId = Thread.CurrentThread.GetHashCode ();
-			this.timestamp = DateTime.Now;
+			this.timeStamp = DateTime.Now;
 		}
 
 		public string HelpKeyword {
@@ -82,9 +82,9 @@ namespace Microsoft.Build.Framework
 			}
 		}
 		// Time when event was fired
-		public DateTime Timestamp {
+		public DateTime TimeStamp {
 			get {
-				return timestamp;
+				return timeStamp;
 			}
 		}
 	}
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ChangeLog b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ChangeLog
index 7df84e11a97..4edec875f90 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ChangeLog
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ChangeLog
@@ -1,23 +1,3 @@
-2006-02-26  Marek Sieradzki <marek.sieradzki@gmail.com> 
-
-	* ITask.cs, ITaskHost.cs: Moved attributes to ITaskHost.cs.
-
-2006-02-25  Marek Sieradzki <marek.sieradzki@gmail.com> 
-
-	* ITask.cs, LoggerVerbosity.cs: Added COM attributes.
-
-2006-02-24  Marek Sieradzki <marek.sieradzki@gmail.com> 
-
-	* BuildEventArgs.cs: Changed TimeStamp to Timestamp.
-	* CustomBuildEventArgs.cs: Made ctor protected.
-	* ITask.cs: Changed object to ITaskHost.
-	* MessageImportance.cs: Added Serializable attribute.
-	* OutputAttribute.cs, RequiredAttribute.cs: Changed AttributeUsage.
-	* ProjectStartedEventArgs.cs: Added Properties and Items and removed
-	Succeeded.
-	* ExternProjectFinishedEventArgs.cs, ExternalProjectStartedEventArgs.cs,
-	ITaskHost.cs, TaskCommandLineEventArgs.cs: Added.
-
 2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* TargetStartedEventHandler.cs, TargetFinishedEventArgs.cs,
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/CustomBuildEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/CustomBuildEventArgs.cs
index 1067ac2beba..702fd816e83 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/CustomBuildEventArgs.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/CustomBuildEventArgs.cs
@@ -32,15 +32,15 @@ using System;
 
 namespace Microsoft.Build.Framework {
 	[Serializable]
-	public abstract class CustomBuildEventArgs : BuildEventArgs {
+	public class CustomBuildEventArgs : BuildEventArgs {
 	
 		protected CustomBuildEventArgs ()
 		{
 		}
-		
-		protected CustomBuildEventArgs (string message,
-						string helpKeyword,
-						string senderName)
+
+		public CustomBuildEventArgs (string message,
+					     string helpKeyword,
+					     string senderName)
 			: base (message, helpKeyword, senderName)
 		{
 		}
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ExternalProjectFinishedEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ExternalProjectFinishedEventArgs.cs
deleted file mode 100644
index ba4c0bfc837..00000000000
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ExternalProjectFinishedEventArgs.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// ExternalProjectFinishedEventArgs.cs: Provides data for the CustomEventRaised event.
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2005 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#if NET_2_0
-
-using System;
-
-namespace Microsoft.Build.Framework {
-	[Serializable]
-	public class ExternalProjectFinishedEventArgs : CustomBuildEventArgs {
-	
-		string	projectFile;
-		bool	succeeded;
-	
-		protected ExternalProjectFinishedEventArgs ()
-		{
-		}
-		
-		public ExternalProjectFinishedEventArgs (string message,
-							 string helpKeyword,
-							 string senderName,
-							 string projectFile,
-							 bool succeeded)
-			: base (message, helpKeyword, senderName)
-		{
-			this.projectFile = projectFile;
-			this.succeeded = succeeded;
-		}
-		public string ProjectFile {
-			get { return projectFile; }
-		}
-		
-		public bool Succeeded {
-			get { return succeeded; }
-		}
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ExternalProjectStartedEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ExternalProjectStartedEventArgs.cs
deleted file mode 100644
index 89b0e5ada58..00000000000
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ExternalProjectStartedEventArgs.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// ExternalProjectStartedEventArgs.cs: Provides data for the CustomEventRaised event.
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2005 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#if NET_2_0
-
-using System;
-
-namespace Microsoft.Build.Framework {
-	[Serializable]
-	public class ExternalProjectStartedEventArgs : CustomBuildEventArgs {
-	
-		string	projectFile;
-		string	targetNames;
-	
-		protected ExternalProjectStartedEventArgs ()
-		{
-		}
-		
-		public ExternalProjectStartedEventArgs (string message,
-							string helpKeyword,
-							string senderName,
-							string projectFile,
-							string targetNames)
-			: base (message, helpKeyword, senderName)
-		{
-			this.projectFile = projectFile;
-			this.targetNames = targetNames;
-		}
-		
-		public string ProjectFile {
-			get { return projectFile; }
-		}
-		
-		public string TargetNames {
-			get { return targetNames; }
-		}
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITask.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITask.cs
index 765aa7236cd..3e08a673b47 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITask.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITask.cs
@@ -41,7 +41,7 @@ namespace Microsoft.Build.Framework
 			set;
 		}
 
-		ITaskHost HostObject {
+		object HostObject {
 			get;
 			set;
 		}
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITaskHost.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITaskHost.cs
deleted file mode 100644
index ebd421b1f20..00000000000
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ITaskHost.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// ITaskHost.cs
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-// 
-// (C) 2006 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#if NET_2_0
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Build.Framework
-{
-	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-	[Guid ("9049A481-D0E9-414f-8F92-D4F67A0359A6")]
-	[ComVisible (true)]
-	public interface ITaskHost {
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LoggerVerbosity.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LoggerVerbosity.cs
index fd7180064d4..97547bd3a73 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LoggerVerbosity.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/LoggerVerbosity.cs
@@ -28,11 +28,8 @@
 
 #if NET_2_0
 
-using System.Runtime.InteropServices;
-
 namespace Microsoft.Build.Framework
 {
-	[ComVisible (true)]
 	public enum LoggerVerbosity
 	{
 		// Quiet verbosity, which displays a build summary.
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/MessageImportance.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/MessageImportance.cs
index f3044612ae5..55a82b627f3 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/MessageImportance.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/MessageImportance.cs
@@ -28,10 +28,7 @@
 
 #if NET_2_0
 
-using System;
-
 namespace Microsoft.Build.Framework {
-	[Serializable]
 	public enum MessageImportance {
 		High,
 		Normal,
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/OutputAttribute.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/OutputAttribute.cs
index 2fcffa07624..f31f5c0b29b 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/OutputAttribute.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/OutputAttribute.cs
@@ -32,7 +32,7 @@ using System;
 
 namespace Microsoft.Build.Framework
 {
-	[AttributeUsage(AttributeTargets.Property, AllowMultiple=false, Inherited=false)]
+	[AttributeUsage(AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
 	public sealed class OutputAttribute : Attribute
 	{
 		public OutputAttribute ()
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ProjectStartedEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ProjectStartedEventArgs.cs
index 26c9bdd8c1b..baacb391d24 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ProjectStartedEventArgs.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/ProjectStartedEventArgs.cs
@@ -29,7 +29,6 @@
 #if NET_2_0
 
 using System;
-using System.Collections;
 
 namespace Microsoft.Build.Framework {
 	[Serializable]
@@ -37,8 +36,7 @@ namespace Microsoft.Build.Framework {
 	
 		string	projectFile;
 		string	targetNames;
-		IEnumerable properties;
-		IEnumerable items;
+		bool	succeeded;	
 	
 		protected ProjectStartedEventArgs ()
 		{
@@ -47,15 +45,11 @@ namespace Microsoft.Build.Framework {
 		public ProjectStartedEventArgs (string message,
 						string helpKeyword,
 						string projectFile,
-						string targetNames,
-						IEnumerable properties,
-						IEnumerable items)
+						string targetNames)
 			: base (message, helpKeyword, null)
 		{
 			this.projectFile = projectFile;
 			this.targetNames = targetNames;
-			this.properties = properties;
-			this.items = items;
 		}
 
 		public string ProjectFile {
@@ -63,18 +57,16 @@ namespace Microsoft.Build.Framework {
 				return projectFile;
 			}
 		}
+
+		public bool Succeeded {
+			get {
+				return succeeded;
+			}
+		}
 		
 		public string TargetNames {
 			get { return targetNames; }
 		}
-		
-		public IEnumerable Properties {
-			get { return properties; }
-		}
-		
-		public IEnumerable Items {
-			get { return items; }
-		}
 	}
 }
 
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/RequiredAttribute.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/RequiredAttribute.cs
index 36142b29722..ffaae8e74bc 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/RequiredAttribute.cs
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/RequiredAttribute.cs
@@ -32,7 +32,7 @@ using System;
 
 namespace Microsoft.Build.Framework
 {
-	[AttributeUsage(AttributeTargets.Property, AllowMultiple=false, Inherited=false)]
+	[AttributeUsage(AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
 	public sealed class RequiredAttribute : Attribute
 	{
 		// It should stop build process if property is of non-array type
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/TaskCommandLineEventArgs.cs b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/TaskCommandLineEventArgs.cs
deleted file mode 100644
index fce7636a03b..00000000000
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework/TaskCommandLineEventArgs.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// TaskCommandLineEventArgs.cs: Provides data for the MessageRaised event.
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2006 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#if NET_2_0
-
-using System;
-
-namespace Microsoft.Build.Framework {
-	[Serializable]
-	public class TaskCommandLineEventArgs : BuildMessageEventArgs {
-	
-		string	commandLine;
-		string	taskName;
-	
-		protected TaskCommandLineEventArgs ()
-		{
-		}
-		
-		public TaskCommandLineEventArgs (string commandLine,
-						 string taskName,
-						 MessageImportance importance)
-			: base (null, null, null, importance)
-		{
-			this.taskName = taskName;
-			this.commandLine = commandLine;
-		}
-		
-		public string CommandLine {
-			get { return commandLine; }
-		}
-		
-		public string TaskName {
-			get { return taskName; }
-		}
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework_test.dll.sources b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework_test.dll.sources
index e063f5b888c..c36824f00a7 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework_test.dll.sources
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework_test.dll.sources
@@ -3,8 +3,7 @@ Microsoft.Build.Framework/BuildFinishedEventArgsTest.cs
 Microsoft.Build.Framework/BuildMessageEventArgsTest.cs
 Microsoft.Build.Framework/BuildStartedEventArgsTest.cs
 Microsoft.Build.Framework/BuildWarningEventArgsTest.cs
-Microsoft.Build.Framework/ExternalProjectFinishedEventArgsTest.cs
-Microsoft.Build.Framework/ExternalProjectStartedEventArgsTest.cs
+Microsoft.Build.Framework/CustomBuildEventArgsTest.cs
 Microsoft.Build.Framework/LoggerExceptionTest.cs
 Microsoft.Build.Framework/ProjectFinishedEventArgsTest.cs
 Microsoft.Build.Framework/ProjectStartedEventArgsTest.cs
diff --git a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework.Test.mdp b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework.Test.mdp
index f051e09b654..e41d3bd1d85 100644
--- a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework.Test.mdp
+++ b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework.Test.mdp
@@ -22,6 +22,7 @@
     <File name="./Microsoft.Build.Framework/BuildMessageEventArgsTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/BuildStartedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/BuildWarningEventArgsTest.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Microsoft.Build.Framework/CustomBuildEventArgsTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/LoggerExceptionTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/ProjectFinishedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/ProjectStartedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
@@ -29,10 +30,9 @@
     <File name="./Microsoft.Build.Framework/TaskStartedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/TargetStartedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./Microsoft.Build.Framework/TargetFinishedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./Microsoft.Build.Framework/ExternalProjectFinishedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./Microsoft.Build.Framework/ExternalProjectStartedEventArgsTest.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
+    <ProjectReference type="Project" localcopy="True" refto="Microsoft.Build.Framework" />
     <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
   </References>
 </Project>
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ChangeLog b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ChangeLog
index c7787a17df9..3792662c4d3 100644
--- a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ChangeLog
+++ b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ChangeLog
@@ -1,10 +1,3 @@
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* ProjectStartedEventArgsTest.cs: Updated.
-	* CustomBuildEventArgsTest.cs: Removed.
-	* ExternalProjectStartedEventArgs.cs,
-	ExternalProjectFinishedEventArgs.cs: Added.
-
 2005-08-30  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* TaskFinishedEventArgsTest.cs, TargetStartedEventArgsTest.cs,
diff --git a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/CustomBuildEventArgsTest.cs b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/CustomBuildEventArgsTest.cs
new file mode 100644
index 00000000000..9fd98a0a639
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/CustomBuildEventArgsTest.cs
@@ -0,0 +1,49 @@
+//
+// CustomBuildEventArgsTest.cs:
+//
+// Author:
+//   Marek Sieradzki (marek.sieradzki@gmail.com)
+//
+// (C) 2005 Marek Sieradzki
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Build.Framework;
+using NUnit.Framework;
+
+namespace MonoTests.Microsoft.Build.Framework {
+	[TestFixture]
+	public class CustomBuildEventArgsTest {
+		[Test]
+		public void AssignmentTest ()
+		{
+			CustomBuildEventArgs cbea;
+			string message = "message";
+			string helpKeyword = "helpKeyword";
+			string senderName = "senderName";
+			
+			cbea = new CustomBuildEventArgs (message, helpKeyword, senderName);
+			
+			Assert.AreEqual (message, cbea.Message, "Message");
+			Assert.AreEqual (helpKeyword, cbea.HelpKeyword, "HelpKeyword");
+			Assert.AreEqual (senderName, cbea.SenderName, "SenderName");
+		}
+	}
+}
diff --git a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ExternalProjectFinishedEventArgsTest.cs b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ExternalProjectFinishedEventArgsTest.cs
deleted file mode 100644
index b5e4598ae9d..00000000000
--- a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ExternalProjectFinishedEventArgsTest.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// ExternalProjectFinishedEventArgsTest.cs
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2005 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Build.Framework;
-using NUnit.Framework;
-
-namespace MonoTests.Microsoft.Build.Framework {
-	[TestFixture]
-	public class ExternalProjectFinishedEventArgsTest {
-		[Test]
-		public void AssignmentTest ()
-		{
-			ExternalProjectFinishedEventArgs epfea;
-			string message = "message";
-			string helpKeyword = "helpKeyword";
-			string senderName = "senderName";
-			string projectFile = "projectFile";
-			bool succeeded = true;
-			
-			epfea = new ExternalProjectFinishedEventArgs (message, helpKeyword, senderName, projectFile, succeeded);
-			
-			Assert.AreEqual (message, epfea.Message, "Message");
-			Assert.AreEqual (helpKeyword, epfea.HelpKeyword, "HelpKeyword");
-			Assert.AreEqual (senderName, epfea.SenderName, "SenderName");
-			Assert.AreEqual (projectFile, epfea.ProjectFile, "ProjectFile");
-			Assert.AreEqual (succeeded, epfea.Succeeded, "Succeeded");
-		}
-	}
-}
diff --git a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ExternalProjectStartedEventArgsTest.cs b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ExternalProjectStartedEventArgsTest.cs
deleted file mode 100644
index 8123cbad630..00000000000
--- a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ExternalProjectStartedEventArgsTest.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// ExternalProjectStartedEventArgsTest.cs
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2005 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Build.Framework;
-using NUnit.Framework;
-
-namespace MonoTests.Microsoft.Build.Framework {
-	[TestFixture]
-	public class ExternalProjectStartedEventArgsTest {
-		[Test]
-		public void AssignmentTest ()
-		{
-			ExternalProjectStartedEventArgs epsea;
-			string message = "message";
-			string helpKeyword = "helpKeyword";
-			string senderName = "senderName";
-			string projectFile = "projectFile";
-			string targetNames = "a;b;c";
-			
-			epsea = new ExternalProjectStartedEventArgs (message, helpKeyword, senderName, projectFile, targetNames);
-			
-			Assert.AreEqual (message, epsea.Message, "Message");
-			Assert.AreEqual (helpKeyword, epsea.HelpKeyword, "HelpKeyword");
-			Assert.AreEqual (senderName, epsea.SenderName, "SenderName");
-			Assert.AreEqual (projectFile, epsea.ProjectFile, "ProjectFile");
-			Assert.AreEqual (targetNames, epsea.TargetNames, "TargetNames");
-		}
-	}
-}
diff --git a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ProjectStartedEventArgsTest.cs b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ProjectStartedEventArgsTest.cs
index 797db465f4e..dc3bc81a6b8 100644
--- a/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ProjectStartedEventArgsTest.cs
+++ b/mcs/class/Microsoft.Build.Framework/Test/Microsoft.Build.Framework/ProjectStartedEventArgsTest.cs
@@ -40,8 +40,7 @@ namespace MonoTests.Microsoft.Build.Framework {
 			string projectFile = "projectFile";
 			string targetNames = "targetNames";
 			
-			// FIXME: check Properties and Items
-			psea = new ProjectStartedEventArgs (message, helpKeyword, projectFile, targetNames, null, null);
+			psea = new ProjectStartedEventArgs (message, helpKeyword, projectFile, targetNames);
 			
 			Assert.AreEqual (message, psea.Message, "Message");
 			Assert.AreEqual (helpKeyword, psea.HelpKeyword, "HelpKeyword");
@@ -49,4 +48,4 @@ namespace MonoTests.Microsoft.Build.Framework {
 			Assert.AreEqual (targetNames, psea.TargetNames, "TargetNames");
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ChangeLog
index 7aaba3e57ea..f528d3c8024 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com> 
-
-	* ICscHostObject.cs, IVbcHostObject.cs: Updated for the new API.
-
 2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* ICscHostObject.cs, IVbcHostObject.cs: Added #if NET_2_0.
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ICscHostObject.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ICscHostObject.cs
index 51a16e020de..df9e2746233 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ICscHostObject.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/ICscHostObject.cs
@@ -32,11 +32,7 @@ using System.Runtime.InteropServices;
 using Microsoft.Build.Framework;
 
 namespace Microsoft.Build.Tasks.Hosting {
-	
-	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-	[Guid ("8520CC4D-64DC-4855-BE3F-4C28CCE048EE")]
-	[ComVisible (true)]
-	public interface ICscHostObject : ITaskHost {
+	public interface ICscHostObject {
 	
 		void BeginInitialization ();
 		
@@ -98,8 +94,6 @@ namespace Microsoft.Build.Tasks.Hosting {
 		
 		bool SetOutputAssembly (string outputAssembly);
 		
-		bool SetPdbFile (string pdbFile);
-		
 		bool SetPlatform (string platform);
 		
 		bool SetReferences (ITaskItem[] references);
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/IVbcHostObject.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/IVbcHostObject.cs
index 56a24bf2a65..1208cba77e6 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/IVbcHostObject.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Hosting/IVbcHostObject.cs
@@ -32,11 +32,7 @@ using System;
 using System.Runtime.InteropServices;
 
 namespace Microsoft.Build.Tasks.Hosting {
-
-	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-	[Guid ("7D7AC3BE-253A-40e8-A3FF-357D0DA7C47A")]
-	[ComVisible (true)]
-	public interface IVbcHostObject : ITaskHost {
+	public interface IVbcHostObject {
 		void BeginInitialization ();
 		
 		bool Compile ();
@@ -95,8 +91,6 @@ namespace Microsoft.Build.Tasks.Hosting {
 		
 		bool SetOptionStrict (bool optionStrict);
 		
-		bool SetOptionStrictType (string optionStrictType);
-		
 		bool SetOutputAssembly (string outputAssembly);
 		
 		bool SetPlatform (string platform);
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources
index ecb1d4b28bd..65108c6a3c0 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources
@@ -3,7 +3,6 @@
 Assembly/AssemblyInfo.cs
 Microsoft.Build.Tasks/AL.cs
 Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs
-Microsoft.Build.Tasks/CombinePath.cs
 Microsoft.Build.Tasks/CommandLineBuilderExtension.cs
 Microsoft.Build.Tasks/Copy.cs
 Microsoft.Build.Tasks/CreateItem.cs
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
index dad99232833..bfda2c7c902 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
@@ -192,7 +192,6 @@ namespace Microsoft.Build.Tasks {
 		}
 
 		[Required]
-		[Output]
 		public ITaskItem OutputAssembly {
 			get { return (ITaskItem) Bag ["OutputAssembly"]; }
 			set { Bag ["OutputAssembly"] = value; }
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs
index 14c82fcaba7..75fdff1ba6c 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs
@@ -28,11 +28,9 @@
 
 #if NET_2_0
 
-using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace Microsoft.Build.Tasks {
-	[LoadInSeparateAppDomain]
 	public abstract class AppDomainIsolatedTaskExtension : AppDomainIsolatedTask {
 		public new TaskLoggingHelper Log {
 			get {
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
index 0def06b9e87..055b21a81f5 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
@@ -1,33 +1,3 @@
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* CombinePath.cs: Added.
-
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* AL.cs: Added Output attribute to OutputAssembly.
-	* AppDomainIsolatedTaskExtension.cs: Added LoadInSeparateAppDomain
-	attribute.
-	* Copy.cs: Added Output attribute to DestinationFiles and Required to
-	SourceFiles.
-	* CreateItem.cs, CreateProperty.cs: Changed string to string[].
-	* Csc.cs: Added PdbFile property.
-	* Error.cs: Added Code and HelpKeyword properties.
-	* Exec.cs: Changed TaskExtension to ToolTaskExtension.
-	* GenerateResource.cs: Added NeverLockType and PublicClass properties.
-	* GenerateTrustInfo.cs: Added Required to TargetZone and Output to
-	TrustInfoFile.
-	* GetFrameworkPath.cs, GetFrameworkSdkPath: Added Output to Path.
-	* MSBuild.cs: Changed string to string[].
-	* ReadLinesFromFile.cs: Added Required to File.
-	* RegiserAssembly.cs: Added AssemblyListFile and CreateCodeBase
-	properties.
-	* UnregisterAssembly.cs: Added AssemblyListFile property.
-	* WriteLinesToFile.cs: Added Required to Lines.
-
-2006-02-25  Marek Sieradzki <marek.sieradzki@gmail.com> 
-
-	* Csc.cs, ManagedCompiler.cs: Changes required by the new API.
-
 2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* MakeDir.cs, AppDomainIsolatedTaskExtension.cs, Touch.cs, Exec.cs,
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CombinePath.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CombinePath.cs
deleted file mode 100644
index a0f2111f7e6..00000000000
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CombinePath.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// CombinePath.cs:
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2005 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#if NET_2_0
-
-using System;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.Build.Tasks {
-	[MonoTODO]
-	public class CombinePath : TaskExtension {
-	
-		string		basePath;
-		ITaskItem[]	combinedPaths;
-		ITaskItem[]	paths;
-		
-		public CombinePath ()
-		{
-		}
-		
-		public override bool Execute ()
-		{
-			return true;
-		}
-		
-		public string BasePath {
-			get { return basePath; }
-			set { basePath = value; }
-		}
-		
-		public ITaskItem[] CombinedPaths {
-			get { return combinedPaths; }
-			set { combinedPaths = value; }
-		}
-		
-		public ITaskItem[] Paths {
-			get { return paths; }
-			set { paths = value; }
-		}
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs
index 45ccfddb570..95ff042fac5 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs
@@ -128,7 +128,6 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		[Output]
 		public ITaskItem[] DestinationFiles {
 			get {
 				return destinationFiles;
@@ -156,7 +155,6 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		[Required]
 		public ITaskItem[] SourceFiles {
 			get {
 				return sourceFiles;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
index 81d5dcbded7..f99fd73a680 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateItem.cs
@@ -32,7 +32,7 @@ using Microsoft.Build.Framework;
 namespace Microsoft.Build.Tasks {
 	public class CreateItem : TaskExtension {
 	
-		string[]		additionalMetadata;
+		string		additionalMetadata;
 		ITaskItem[]	exclude;
 		ITaskItem[]	include;
 	
@@ -45,7 +45,7 @@ namespace Microsoft.Build.Tasks {
 			return true;
 		}
 
-		public string[] AdditionalMetadata {
+		public string AdditionalMetadata {
 			get { return additionalMetadata; }
 			set { additionalMetadata = value; }
 		}
@@ -55,7 +55,6 @@ namespace Microsoft.Build.Tasks {
 			set { exclude = value; }
 		}
 
-		[Output]
 		public ITaskItem[] Include {
 			get { return include; }
 			set { include = value; }
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
index 537742e550a..e619634b4d7 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
@@ -32,8 +32,8 @@ using Microsoft.Build.Framework;
 namespace Microsoft.Build.Tasks {
 	public class CreateProperty : TaskExtension {
 	
-		string[] value;
-		string[] valueSetByTask;
+		string value;
+		string valueSetByTask;
 	
 		public CreateProperty ()
 		{
@@ -44,13 +44,13 @@ namespace Microsoft.Build.Tasks {
 			return true;
 		}
 
-		public string[] Value {
+		public string Value {
 			get { return this.@value; }
 			set { this.@value = value; }
 		}
 
 		// FIXME: is this value after evaluation?
-		public string[] ValueSetByTask {
+		public string ValueSetByTask {
 			get { return valueSetByTask; }
 		}
 	}
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
index dbf383f446d..61ffd44f9f1 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
@@ -71,9 +71,12 @@ namespace Microsoft.Build.Tasks {
 			return Path.Combine (ToolPath, ToolName);
 		}
 
-		protected override HostObjectInitializationStatus InitializeHostObject ()
+		protected override bool InitializeHostObject (out bool appropriateHostObjectExists,
+							      out bool continueBuild)
 		{
-			return HostObjectInitializationStatus.NoActionReturnSuccess;
+			appropriateHostObjectExists = true;
+			continueBuild = true;
+			return true;
 		}
 
 		public bool AllowUnsafeBlocks {
@@ -86,9 +89,9 @@ namespace Microsoft.Build.Tasks {
 			set { Bag ["BaseAddress"] = value; }
 		}
 
-		public bool CheckForOverflowUnderflow {
-			get { return GetBoolParameterWithDefault ("CheckForOverflowUnderflow", false); }
-			set { Bag ["CheckForOverflowUnderflow"] = value; }
+		public bool CheckForOverflowUnderFlow {
+			get { return GetBoolParameterWithDefault ("CheckForOverflowUnderFlow", false); }
+			set { Bag ["CheckForOverflowUnderFlow"] = value; }
 		}
 
 		public string DisabledWarnings {
@@ -125,11 +128,6 @@ namespace Microsoft.Build.Tasks {
 			get { return GetBoolParameterWithDefault ("NoStandardLib", false); }
 			set { Bag ["NoStandardLib"] = value; }
 		}
-		
-		public string PdbFile {
-			get { return (string) Bag ["PdbFile"]; }
-			set { Bag ["PdbFile"] = value; }
-		}
 
 		public string Platform {
 			get { return (string) Bag ["Platform"]; }
@@ -162,4 +160,4 @@ namespace Microsoft.Build.Tasks {
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
index cedf511ad4a..10ac6588052 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
@@ -29,10 +29,7 @@
 
 namespace Microsoft.Build.Tasks {
 	public sealed class Error : TaskExtension {
-	
-		string	code;
-		string	helpKeyword;
-		string	text;
+		private string text;
 		
 		public Error ()
 		{
@@ -47,19 +44,13 @@ namespace Microsoft.Build.Tasks {
 			return true;
 		}
 
-		public string Code {
-			get { return code; }
-			set { code = value; }
-		}
-		
-		public string HelpKeyword {
-			get { return helpKeyword; }
-			set { helpKeyword = value; }
-		}
-		
 		public string Text {
-			get { return text; }
-			set { text = value; }
+			get {
+				return text;
+			}
+			set {
+				text = value;
+			}
 		}
 	}
 }
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs
index 886bb9bec47..9488cca1f07 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs
@@ -38,13 +38,13 @@ using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace Microsoft.Build.Tasks {
-	public class Exec : ToolTaskExtension {
+	public class Exec : TaskExtension {
 	
 		string		command;
+		int		exitCode;
 		bool		ignoreExitCode;
 		ITaskItem[]	outputs;
-		string		stdErrEncoding;
-		string		stdOutEncoding;
+		int		timeout;
 		string		workingDirectory;
 		
 		Process		process;
@@ -53,7 +53,7 @@ namespace Microsoft.Build.Tasks {
 		public Exec ()
 		{
 			process = new Process ();
-			//timeout = Int32.MaxValue;
+			timeout = Int32.MaxValue;
 			ignoreExitCode = false;
 			executionTime = 0;
 		}
@@ -80,7 +80,7 @@ namespace Microsoft.Build.Tasks {
 				process.Start ();
 				process.WaitForExit ();
 
-				//exitCode = process.ExitCode;
+				exitCode = process.ExitCode;
 				while ((line = process.StandardOutput.ReadLine ()) != null)
 					temporaryOutputs.Add (line);
 				outputs = new ITaskItem [temporaryOutputs.Count];
@@ -93,24 +93,23 @@ namespace Microsoft.Build.Tasks {
 				return false;
 			}
 			
-			/*if (exitCode != 0 && ignoreExitCode == false)
+			if (exitCode != 0 && ignoreExitCode == false)
 				return false;
-			else*/
+			else
 				return true;
 		}
 		
-		[MonoTODO]
-		protected override string GenerateFullPathToTool ()
-		{
-			return null;
-		}
-		
 		[Required]
 		public string Command {
 			get { return command; }
 			set { command = value; }
 		}
 
+		[Output]
+		public int ExitCode {
+			get { return exitCode; }
+		}
+
 		public bool IgnoreExitCode {
 			get { return ignoreExitCode; }
 			set { ignoreExitCode = value; }
@@ -122,37 +121,19 @@ namespace Microsoft.Build.Tasks {
 			set { outputs = value; }
 		}
 
-		protected override Encoding StandardErrorEncoding {
+		public Encoding StandardErrorEncoding {
 			get { return Console.Error.Encoding; }
-		}
-		
-		protected override MessageImportance StandardErrorLoggingImportance {
-			get { return base.StandardErrorLoggingImportance; }
+			set { Console.SetError (new StreamWriter(Console.OpenStandardError (), value)); }
 		}
 
-		protected override Encoding StandardOutputEncoding {
+		public Encoding StandardOutputEncoding {
 			get { return Console.Out.Encoding; }
+			set { Console.SetOut (new StreamWriter (Console.OpenStandardOutput (), value)); }
 		}
-		
-		protected override MessageImportance StandardOutputLoggingImportance {
-			get { return base.StandardOutputLoggingImportance; }
-		}
-		
-		//FIXME: what's this?
-		public string StdOutEncoding {
-			get { return stdOutEncoding; }
-			set { stdOutEncoding = value; }
-		}
-		
-		//FIXME: what's this?
-		public string StdErrEncoding {
-			get { return stdErrEncoding; }
-			set { stdErrEncoding = value; }
-		}
-		
-		// FIXME: crashes the compiler when replaced with return base.ToolName
-		protected override string ToolName {
-			get { return String.Empty; }
+
+		public int Timeout {
+			get { return timeout; }
+			set { timeout = value; }
 		}
 
 		public string WorkingDirectory {
@@ -162,4 +143,4 @@ namespace Microsoft.Build.Tasks {
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
index 8167c3e5030..5987cac9830 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
@@ -41,9 +41,8 @@ namespace Microsoft.Build.Tasks {
 	public sealed class GenerateResource : TaskExtension {
 	
 		ITaskItem[]	filesWritten;
-		bool		neverLockTypeAssemblies;
+		//bool		neverLockTypeAssemblies;
 		ITaskItem[]	outputResources;
-		bool		publicClass;
 		ITaskItem[]	references;
 		ITaskItem[]	sources;
 		ITaskItem	stateFile;
@@ -178,15 +177,14 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		[MonoTODO]
-		public bool NeverLockTypeAssemblies {
+		/*public bool NeverLockTypeAssemblies {
 			get {
 				return neverLockTypeAssemblies;
 			}
 			set {
 				neverLockTypeAssemblies = value;
 			}
-		}
+		}*/
 
 		[Output]
 		public ITaskItem[] OutputResources {
@@ -197,11 +195,6 @@ namespace Microsoft.Build.Tasks {
 				outputResources = value;
 			}
 		}
-		
-		public bool PublicClass {
-			get { return publicClass; }
-			set { publicClass = value; }
-		}
 
 		public ITaskItem[] References {
 			get {
@@ -231,7 +224,6 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		[Output]
 		public string StronglyTypedClassName {
 			get {
 				return stronglyTypedClassName;
@@ -241,7 +233,7 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		public string StronglyTypedFileName {
+		public string StronglyTypedFilename {
 			get {
 				return stronglyTypedFilename;
 			}
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
index 8990397e8b8..7218744d071 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateTrustInfo.cs
@@ -64,6 +64,7 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
+		[Required]
 		public string TargetZone {
 			get {
 				return targetZone;
@@ -74,7 +75,6 @@ namespace Microsoft.Build.Tasks {
 		}
 
 		[Required]
-		[Output]
 		public ITaskItem TrustInfoFile {
 			get {
 				return trustInfoFile;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
index f35ac557e4c..d8d1f18f1a4 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkPath.cs
@@ -27,7 +27,7 @@
 
 #if NET_2_0
 
-using Microsoft.Build.Framework;
+using Microsoft.Build.Tasks;
 
 namespace Microsoft.Build.Tasks {
 	public class GetFrameworkPath : TaskExtension {
@@ -44,7 +44,6 @@ namespace Microsoft.Build.Tasks {
 			return true;
 		}
 
-		[Output]
 		public string Path {
 			get {
 				return path;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
index bf6a1129979..03f0548eb38 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetFrameworkSdkPath.cs
@@ -27,7 +27,7 @@
 
 #if NET_2_0
 
-using Microsoft.Build.Framework;
+using Microsoft.Build.Tasks;
 
 namespace Microsoft.Build.Tasks {
 	public class GetFrameworkSdkPath : TaskExtension {
@@ -44,7 +44,6 @@ namespace Microsoft.Build.Tasks {
 			return true;
 		}
 
-		[Output]
 		public string Path {
 			get {
 				return path;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
index 6d02ec97406..8d7fcf2232d 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
@@ -36,7 +36,7 @@ namespace Microsoft.Build.Tasks {
 	public class MSBuild : TaskExtension {
 	
 		ITaskItem[]	projects;
-		string[]		properties;
+		string		properties;
 		bool		rebaseOutputs;
 		bool		runEachTargetSeparately;
 		bool		stopOnFirstFailure;
@@ -72,7 +72,7 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		public string[] Properties {
+		public string Properties {
 			get {
 				return properties;
 			}
@@ -108,7 +108,6 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		[Output]
 		public ITaskItem[] TargetOutputs {
 			get {
 				return targetOutputs;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
index 414509089ff..e71ac142df5 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
@@ -111,7 +111,8 @@ namespace Microsoft.Build.Tasks {
 		{
 		}
 		
-		protected override bool HandleTaskExecutionErrors ()
+		protected override bool HandleTaskExecutionErrors (int exitCode,
+								   bool taskLoggedErrors)
 		{
 			return true;
 		}
@@ -257,4 +258,4 @@ namespace Microsoft.Build.Tasks {
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ReadLinesFromFile.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ReadLinesFromFile.cs
index f809137d6b7..cf216c73705 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ReadLinesFromFile.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ReadLinesFromFile.cs
@@ -73,7 +73,6 @@ namespace Microsoft.Build.Tasks {
 			
 		}
 
-		[Required]
 		public ITaskItem File {
 			get {
 				return file;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
index 7b8ab22f67b..238af3dc2cf 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
@@ -36,8 +36,8 @@ namespace Microsoft.Build.Tasks {
 	public class RegisterAssembly : AppDomainIsolatedTaskExtension, ITypeLibExporterNotifySink {
 	
 		ITaskItem[]	assemblies;
-		ITaskItem 	assemblyListFile;
 		bool		createCodeBase;
+		ITaskItem 	stateFile;
 		ITaskItem[]	typeLibFiles;
 	
 		public RegisterAssembly ()
@@ -70,25 +70,24 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		public ITaskItem AssemblyListFile {
+		public bool CreateCodeBase  {
 			get {
-				return assemblyListFile;
+				return createCodeBase;
 			}
 			set {
-				assemblyListFile = value;
+				createCodeBase = value;
 			}
 		}
 
-		public bool CreateCodeBase  {
+		public ITaskItem StateFile {
 			get {
-				return createCodeBase;
+				return stateFile;
 			}
 			set {
-				createCodeBase = value;
+				stateFile = value;
 			}
 		}
 
-		[Output]
 		public ITaskItem[] TypeLibFiles {
 			get {
 				return typeLibFiles;
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
index 6c3917403e8..f2c72fe9dee 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/UnregisterAssembly.cs
@@ -31,10 +31,9 @@ using Microsoft.Build.Framework;
 
 namespace Microsoft.Build.Tasks {
 	public class UnregisterAssembly : AppDomainIsolatedTaskExtension {
-	
-		ITaskItem[]	assemblies;
-		ITaskItem	assemblyListFile;
-		ITaskItem[]	typeLibFiles;
+		private ITaskItem[] assemblies;
+		private ITaskItem stateFile;
+		private ITaskItem[] typeLibFiles;
 	
 		public UnregisterAssembly ()
 		{
@@ -55,12 +54,12 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
-		public ITaskItem AssemblyListFile {
+		public ITaskItem StateFile {
 			get {
-				return assemblyListFile;
+				return stateFile;
 			}
 			set {
-				assemblyListFile = value;
+				stateFile = value;
 			}
 		}
 
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/WriteLinesToFile.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/WriteLinesToFile.cs
index 474436da4b1..87026c043db 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/WriteLinesToFile.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/WriteLinesToFile.cs
@@ -79,6 +79,7 @@ namespace Microsoft.Build.Tasks {
 			}
 		}
 
+		[Required]
 		public ITaskItem[] Lines {
 			get {
 				return lines;
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.dll.sources b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.dll.sources
index 19407b9c10a..5a3ab497a1b 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.dll.sources
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.dll.sources
@@ -3,7 +3,7 @@
 Assembly/AssemblyInfo.cs
 Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
 Microsoft.Build.Utilities/CommandLineBuilder.cs
-Microsoft.Build.Utilities/HostObjectInitializationStatus.cs
+Microsoft.Build.Utilities/ConcurrentLoggingHelper.cs
 Microsoft.Build.Utilities/Logger.cs
 Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
 Microsoft.Build.Utilities/Task.cs
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
index 7bb702f0c1a..7e842535c6f 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
@@ -38,7 +38,7 @@ namespace Microsoft.Build.Utilities
 	{
 		IBuildEngine		buildEngine;
 		string			helpKeywordPrefix;
-		ITaskHost		hostObject;
+		object			hostObject;
 		TaskLoggingHelper	log;
 		ResourceManager		taskResources;
 		
@@ -84,7 +84,7 @@ namespace Microsoft.Build.Utilities
 			}
 		}
 
-		public ITaskHost HostObject {
+		public object HostObject {
 			get {
 				return hostObject;
 			}
@@ -110,4 +110,4 @@ namespace Microsoft.Build.Utilities
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
index 1477dda6e04..2e38c07332f 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
@@ -1,23 +1,3 @@
-2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* CommandLineBuilder.cs: Fixed a typo.
-	* HostObjectInitializationStatus.cs: Fixed order.
-	* ToolTask.cs: Updated for new API.
-
-2006-02-25  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* HostObjectInitializationStatus.cs: Added.
-
-2006-02-25  Marek Sieradzki  <marek.sieradzki@gmail.com> 
-
-	* CommandLineBuilder.cs, Logger.cs, TaskLoggingHelper.cs, ToolTask.cs
-	: Updated API.
-
-2006-02-24  Marek Sieradzki  <marek.sieradzki@gmail.com> 
-
-	* AppDomainIsolatedTask.cs, Task.cs: Quick hacks to make it compile with
-	new API.
-
 2005-09-22  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
 	* CommandLineBuilder.cs, Logger.cs, AppDomainIsolatedTask.cs,
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs
index 4b42f4d4a6b..75104c0fac4 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/CommandLineBuilder.cs
@@ -98,7 +98,7 @@ namespace Microsoft.Build.Utilities
 			}
 		}
 		
-		protected void AppendFileNameWithQuoting (string fileName)
+		protected void AppendFileNamesWithQuoting (string fileName)
 		{
 			if (IsQuotingRequired (fileName))
 				commandLine.AppendFormat ("\"{0}\"",fileName);
@@ -270,12 +270,6 @@ namespace Microsoft.Build.Utilities
 			return false;
 		}
 		
-		[MonoTODO]
-		protected virtual void VerifyThrowNoEmbeddedDoubleQuotes (string switchName,
-									 string parameter)
-		{
-		}
-		
 		public override string ToString ()
 		{
 			return commandLine.ToString ();
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/HostObjectInitializationStatus.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/HostObjectInitializationStatus.cs
deleted file mode 100644
index ec8aa6df381..00000000000
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/HostObjectInitializationStatus.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// HostObjectInitializationStatus.cs: Defines the next action for ToolTask
-// after an attempt to initialize the host object.
-//
-// Author:
-//   Marek Sieradzki (marek.sieradzki@gmail.com)
-//
-// (C) 2005 Marek Sieradzki
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#if NET_2_0
-
-namespace Microsoft.Build.Utilities
-{
-	public enum HostObjectInitializationStatus {
-		UseHostObjectToExecute,
-		UseAlternateToolToExecute,
-		NoActionReturnSuccess,
-		NoActionReturnFailure
-	}
-}
-
-#endif
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs
index 5d6a311e002..ab534c01817 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs
@@ -41,7 +41,7 @@ namespace Microsoft.Build.Utilities
 		{
 		}
 
-		public virtual string Parameters {
+		public string Parameters {
 			get {
 				return parameters;
 			}
@@ -50,7 +50,7 @@ namespace Microsoft.Build.Utilities
 			}
 		}
 
-		public virtual LoggerVerbosity Verbosity {
+		public LoggerVerbosity Verbosity {
 			get {
 				return verbosity;
 			}
@@ -78,12 +78,6 @@ namespace Microsoft.Build.Utilities
 		public virtual void Shutdown ()
 		{
 		}
-		
-		[MonoTODO]
-		public bool IsVerbosityAtLeast (LoggerVerbosity verbosity)
-		{
-			return (this.verbosity >= verbosity) ? true : false;
-		}
 	}
 }
 
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
index 62276342051..781d5fe4095 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Task.cs
@@ -37,7 +37,7 @@ namespace Microsoft.Build.Utilities
 	{
 		IBuildEngine		buildEngine;
 		string			helpKeywordPrefix;
-		ITaskHost		hostObject;
+		object			hostObject;
 		TaskLoggingHelper	log;
 		ResourceManager		taskResources;
 		
@@ -79,7 +79,7 @@ namespace Microsoft.Build.Utilities
 			}
 		}
 
-		public ITaskHost HostObject {
+		public object HostObject {
 			get {
 				return hostObject;
 			}
@@ -105,4 +105,4 @@ namespace Microsoft.Build.Utilities
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs
index 49e6a60aa1d..8f22b30945e 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs
@@ -69,17 +69,6 @@ namespace Microsoft.Build.Utilities
 		{
 			return "";
 		}
-		
-		[MonoTODO]
-		public void LogCommandLine (string commandLine)
-		{
-		}
-		
-		[MonoTODO]
-		public void LogCommandLine (MessageImportance importance,
-					    string commandLine)
-		{
-		}
 
 		public void LogError (string message,
 				     params object[] messageArgs)
@@ -234,7 +223,9 @@ namespace Microsoft.Build.Utilities
 		}
 
 		public bool LogMessagesFromStream (TextReader stream,
-						   MessageImportance messageImportance)
+						   MessageImportance messageImportance,
+						   bool synchronize)
+		// FIXME: what about synchronize
 		{
 			try {
 				LogMessage (messageImportance, stream.ReadToEnd (), null);
@@ -248,15 +239,6 @@ namespace Microsoft.Build.Utilities
 				stream.Close ();
 			}
 		}
-		
-		[MonoTODO]
-		public bool LogMessageFromText (string lineOfText,
-						MessageImportance importance)
-		{
-			if (lineOfText == null)
-				throw new ArgumentNullException ("lineOfText");
-			return true;
-		}
 
 		public void LogWarning (string message,
 				       params object[] messageArgs)
@@ -344,22 +326,6 @@ namespace Microsoft.Build.Utilities
 				endColumnNumber, messageResourceName,
 				messageArgs);
 		}
-		
-		[MonoTODO]
-		public void LogExternalProjectFinished (string message,
-							string helpKeyword,
-							string projectFile,
-							bool succeeded)
-		{
-		}
-		
-		[MonoTODO]
-		public void LogExternalProjectStarted (string message,
-						       string helpKeyword,
-						       string projectFile,
-						       string targetNames)
-		{
-		}
 
 		protected IBuildEngine BuildEngine {
 			get {
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
index ed0cefbde19..397ee5ec1cd 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
@@ -42,20 +42,15 @@ namespace Microsoft.Build.Utilities
 	public abstract class ToolTask : Task
 	{
 		StringDictionary	environmentOverride;
-		int			exitCode;
 		int			timeout;
 		string			toolPath;
 		Process			process;
-		MessageImportance	standardErrorLoggingImportance;
-		MessageImportance	standardOutputLoggingImportance;
 		
 		static Regex		regex;
 		
 		protected ToolTask ()
 			: this (null, null)
 		{
-			this.standardErrorLoggingImportance = MessageImportance.High;
-			this.standardOutputLoggingImportance = MessageImportance.Normal;
 		}
 
 		protected ToolTask (ResourceManager taskResources)
@@ -89,39 +84,13 @@ namespace Microsoft.Build.Utilities
 			return true;
 		}
 
-		protected virtual int ExecuteTool (string pathToTool,
-						   string responseFileCommands,
-						   string commandLineCommands)
-		{
-			string arguments;
-			bool success;
-			
-			arguments = String.Concat (commandLineCommands, " ", responseFileCommands);
-			
-			success  = RealExecute (pathToTool, arguments);
-			
-			if (success)
-				return 0;
-			else
-				return -1;
-		}
-		
 		public override bool Execute ()
 		{
-			int result;
+			string arguments, toolFilename;
 			
-			result = ExecuteTool (GenerateFullPathToTool (), GenerateResponseFileCommands (),
-				GenerateCommandLineCommands ());
-			
-			if (result == 0)
-				return true;
-			else
-				return false;
-		}
-		
-		protected virtual string GetWorkingDirectory ()
-		{
-			return null;
+			arguments = String.Concat (GenerateCommandLineCommands (), " ", GenerateResponseFileCommands ());
+			toolFilename = GenerateFullPathToTool (); 
+			return RealExecute (toolFilename, arguments);
 		}
 		
 		private bool RealExecute (string filename, string arguments)
@@ -148,7 +117,7 @@ namespace Microsoft.Build.Utilities
 			process.WaitForExit ();
 			
 			while ((line = process.StandardError.ReadLine ()) != null) {
-				LogEventsFromTextOutput (line, MessageImportance.Normal);
+				HandleError (line);
 			}
 			
 			Log.LogMessage (MessageImportance.Low, String.Format ("Tool {0} execution finished.", filename));
@@ -156,16 +125,12 @@ namespace Microsoft.Build.Utilities
 			return !Log.HasLoggedErrors;
 		}
 		
-		
-		// FIXME: use importance
-		[MonoTODO]
-		protected virtual void LogEventsFromTextOutput (string singleLine,
-								MessageImportance importance)
+		private void HandleError (string line)
 		{
 			string filename, origin, category, code, subcategory, text;
 			int lineNumber, columnNumber, endLineNumber, endColumnNumber;
 		
-			Match m = regex.Match (singleLine);
+			Match m = regex.Match (line);
 			origin = m.Groups [regex.GroupNumberFromName ("ORIGIN")].Value;
 			category = m.Groups [regex.GroupNumberFromName ("CATEGORY")].Value;
 			code = m.Groups [regex.GroupNumberFromName ("CODE")].Value;
@@ -254,27 +219,23 @@ namespace Microsoft.Build.Utilities
 			return String.Format ("@{0}", responseFilePath);
 		}
 
-		[MonoTODO]
-		protected virtual bool HandleTaskExecutionErrors ()
+		protected virtual bool HandleTaskExecutionErrors (int exitCode,
+								 bool hasTaskLoggedErrors)
 		{
 			return true;
 		}
 
-		protected virtual HostObjectInitializationStatus InitializeHostObject ()
+		protected virtual bool InitializeHostObject (out bool appropriateHostObjectExists,
+							    out bool continueBuild)
 		{
-			return HostObjectInitializationStatus.NoActionReturnSuccess;
+			appropriateHostObjectExists = (HostObject != null) ? true : false;
+			continueBuild = true;
+			return true;
 		}
 
-		[MonoTODO]
 		protected virtual void LogToolCommand (string message)
 		{
 		}
-		
-		[MonoTODO]
-		protected virtual void LogPathToTool (string toolName,
-						      string pathToTool)
-		{
-		}
 
 		protected virtual bool SkipTaskExecution()
 		{
@@ -290,12 +251,6 @@ namespace Microsoft.Build.Utilities
 		{
 			get { return environmentOverride; }
 		}
-		
-		[MonoTODO]
-		[Output]
-		public int ExitCode {
-			get { return exitCode; }
-		}
 
 		protected virtual Encoding ResponseFileEncoding
 		{
@@ -307,20 +262,12 @@ namespace Microsoft.Build.Utilities
 			get { return Console.Error.Encoding; }
 		}
 
-		protected virtual MessageImportance StandardErrorLoggingImportance {
-			get { return standardErrorLoggingImportance; }
-		}
-
 		protected virtual Encoding StandardOutputEncoding
 		{
 			get { return Console.Out.Encoding; }
 		}
 
-		protected virtual MessageImportance StandardOutputLoggingImportance {
-			get { return standardOutputLoggingImportance; }
-		}
-
-		public virtual int Timeout
+		public int Timeout
 		{
 			get { return timeout; }
 			set { timeout = value; }
@@ -339,4 +286,4 @@ namespace Microsoft.Build.Utilities
 	}
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/Microsoft.JScript/ChangeLog b/mcs/class/Microsoft.JScript/ChangeLog
index 9fd4d137888..046befe5782 100644
--- a/mcs/class/Microsoft.JScript/ChangeLog
+++ b/mcs/class/Microsoft.JScript/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-08  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* Makefile: No longer reference the C# compiler for namespace
-	lookup.
-
 2005-10-21  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
 	* SemanticAnalizer.cs, Import.cs: Update calls to the
diff --git a/mcs/class/Microsoft.JScript/Makefile b/mcs/class/Microsoft.JScript/Makefile
index 0a06ce38c1d..ca418d7dfeb 100644
--- a/mcs/class/Microsoft.JScript/Makefile
+++ b/mcs/class/Microsoft.JScript/Makefile
@@ -3,7 +3,14 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = Microsoft.JScript.dll
-LIB_MCS_FLAGS = -r:System.dll -r:Microsoft.Vsa.dll -debug+
+
+ifeq (net_2_0, $(PROFILE))
+COMPILER = gmcs.exe
+else
+COMPILER = mcs.exe
+endif
+
+LIB_MCS_FLAGS = -r:System.dll -r:Microsoft.Vsa.dll -r:$(topdir)/class/lib/$(PROFILE)/$(COMPILER) -debug+
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
 
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/ChangeLog b/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/ChangeLog
index 296d1f49e03..df2592b0a3d 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/ChangeLog
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-11 Evan Briones  <evan@evanbriones.com>
-	
-	* VsaEngine.cs: Fixed out compiler flag
-
 2005-10-11  Cesar Lopez Nataren  <cnataren@novell.com>
 
 	* VsaEngine.cs: Parse all the files.
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/VsaEngine.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/VsaEngine.cs
index 1ff28c9361d..2e3db77b058 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/VsaEngine.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript.Vsa/VsaEngine.cs
@@ -79,13 +79,7 @@ namespace Microsoft.JScript.Vsa {
 			ScriptBlock [] blocks = parser.ParseAll ();
 			if (blocks != null) {
 				SemanticAnalyser.Run (blocks, (Assembly []) GetOption ("assemblies"));
-				object outfile = GetOption ("out");
-
-				if (outfile == null)
-					CodeGenerator.Run ((string) GetOption ("first_source"), blocks);
-				else
-					CodeGenerator.Run ((string) outfile, blocks);
-
+				CodeGenerator.Run ((string) GetOption ("first_source"), blocks);
 				Console.WriteLine ("Compilation succeeded");
 			}
 			return false;
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog b/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog
index 0ee4155359a..fb274d6277d 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog
@@ -1,67 +1,3 @@
-2006-01-25  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* FunctionExpression.cs: Set the prefix at resolve time not at
-	constructor time. Solves a bug related to the use of nested
-	FunctionExpression's.
-
-2006-01-24  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* ast.cs (Function.set_prefix): use InFunction and
-	GetContainerFunction for retrieving the container function.
-
-	* Statement.cs (Return): Implement ICanModifyContext as can return
-	a FunctionExpression.
-
-	* FunctionDeclaration.cs: Erase unused method Init.
-
-2006-01-18 Evan Briones <evan@evanbriones.com>
-
-	* GlobalObject.cs: parsefloat in ms.net version returns NaN for text strings.
-	  If a match is found the regular expression returns its value. Otherwise the
-	  value of the object is retained. Previously it would return an empty string if 
-	  nothing matched making. Double.TryParse would then return 0.
-	  Example of this returning NaN : var isnan = 'hello'; print (parseFloat(e));
-	  Example of it returning 0 : var iszero = 'string'; print (parseFloat (iszero));
-	  We behave like Rhino.
-
-2006-01-17  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* Parser.cs: Propagate the proper parent.  Fixes #75166.
-
-	* ast.cs: Added virtual method PropagateParent for recovering a
-	lost parent or set it up properly if previously set to null.
-
-	* Statement.cs (If,Jump,Break.PropagateParent): recover
-	the proper parent.
-
-	* expression.cs (Binary.emit_access): Emit late binding code for
-	member's access that maps to MemberTypes (like Math.pow). Fixes
-	#72440.
-
-2006-01-13  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* ForIn.cs: implement for (x in obj) logic.
-
-2006-01-11  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* Parser.cs (StatementHelper): Avoid null reference exception
-	using the new EmptyAST node in case we have an empty stm (Token.SEMI).
-
-2006-01-10  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* Empty.cs: Add internal type EmptyAST.
-
-	* Parser.cs: Avoid creating a ForIn object when we only have empty
-	condition, test or increment expressions in the loop.
-
-2006-01-08  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* SemanticAnalizer.cs, Import.cs: No longer use the Mono.CSharp
-	stuff; we lookup for the namespaces in our code (stolen from mcs
-	source code though :)
-	
-	* Namespace.cs: Handle the namespace lookup here.
-
 2005-12-15  Cesar Lopez Nataren  <cnataren@novell.com>
 
 	* Parser.cs: Use the new assign ctr and Init method.
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/Empty.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/Empty.cs
index f5d1ebc3d4f..86dd83e5d09 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/Empty.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/Empty.cs
@@ -4,7 +4,6 @@
 // Author: Cesar Octavio Lopez Nataren
 //
 // (C) 2003, Cesar Octavio Lopez Nataren, <cesar@ciencias.unam.mx>
-// Copyright (C) 2006 Novell Inc (http://novell.com)
 //
 
 //
@@ -34,21 +33,4 @@ namespace Microsoft.JScript {
 
 		public static readonly Empty Value = null;
 	}
-
-	internal class EmptyAST : AST {
-
-		internal EmptyAST ()
-			: base (null, null)
-		{
-		}
-
-		internal override bool Resolve (Environment env)
-		{
-			return true;
-		}
-
-		internal override void Emit (EmitContext ec)
-		{
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/ForIn.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/ForIn.cs
index 4c765872234..e51aa4bd9c5 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/ForIn.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/ForIn.cs
@@ -91,68 +91,57 @@ namespace Microsoft.JScript {
 
 		internal override void Emit (EmitContext ec)
 		{
-			ILGenerator ig = ec.ig;
-			bool varStm = lhs is VariableStatement;
-			object var = null;
-
-			if (varStm) {
+			ILGenerator ig;
+			
+			if (lhs is VariableStatement) {
 				VariableStatement stm = (VariableStatement) lhs;
+				ig = ec.ig;
 				ig.Emit (OpCodes.Ldnull);
-				var = TypeManager.Get (((VariableDeclaration) stm.var_decls [0]).id);
+				object var = TypeManager.Get (((VariableDeclaration) stm.var_decls [0]).id);
 				set_builder (ig, var);
-			}
-			if (obj != null)
-				obj.Emit (ec);
 
-			CodeGenerator.load_engine (InFunction, ig);
+				if (obj != null)
+					obj.Emit (ec);
 
+				CodeGenerator.load_engine (InFunction, ig);
 
-			Type convert = typeof (Convert);
-			ig.Emit (OpCodes.Call, convert.GetMethod ("ToForInObject"));
-			ig.Emit (OpCodes.Call, typeof (ForIn).GetMethod ("JScriptGetEnumerator"));
-			Type ienumerator = typeof (IEnumerator);
-			LocalBuilder iter = ig.DeclareLocal (ienumerator);
-			LocalBuilder current = ig.DeclareLocal (typeof (object));
+				Type convert = typeof (Convert);
+				ig.Emit (OpCodes.Call, convert.GetMethod ("ToForInObject"));
+				ig.Emit (OpCodes.Call, typeof (ForIn).GetMethod ("JScriptGetEnumerator"));
+				Type ienumerator = typeof (IEnumerator);
+				LocalBuilder iter = ig.DeclareLocal (ienumerator);
+				LocalBuilder current = ig.DeclareLocal (typeof (object));
 
-			ig.Emit (OpCodes.Stloc, iter);
+				ig.Emit (OpCodes.Stloc, iter);
 				
-			Label init_loop = ig.DefineLabel ();
-			Label move_next = ig.DefineLabel ();
-			Label exit = ig.DefineLabel ();
+				Label init_loop = ig.DefineLabel ();
+				Label move_next = ig.DefineLabel ();
+				Label exit = ig.DefineLabel ();
 								
-			ig.Emit (OpCodes.Br, move_next);
-			ig.MarkLabel (init_loop);
+				ig.Emit (OpCodes.Br, move_next);
+				ig.MarkLabel (init_loop);
 
-			if (body != null)
-				body.Emit (ec);
+				if (body != null)
+					body.Emit (ec);
 
-			ig.MarkLabel (move_next);
+				ig.MarkLabel (move_next);
 
-			ig.Emit (OpCodes.Ldloc, iter);
-			ig.Emit (OpCodes.Callvirt, ienumerator.GetMethod ("MoveNext"));
+				ig.Emit (OpCodes.Ldloc, iter);
+				ig.Emit (OpCodes.Callvirt, ienumerator.GetMethod ("MoveNext"));
 				
-			ig.Emit (OpCodes.Brfalse, exit);
+				ig.Emit (OpCodes.Brfalse, exit);
 
-			ig.Emit (OpCodes.Ldloc, iter);
-			ig.Emit (OpCodes.Callvirt, ienumerator.GetProperty ("Current").GetGetMethod ());
-			ig.Emit (OpCodes.Stloc, current);
-			ig.Emit (OpCodes.Ldloc, current);
+				ig.Emit (OpCodes.Ldloc, iter);
+				ig.Emit (OpCodes.Callvirt, ienumerator.GetProperty ("Current").GetGetMethod ());
+				ig.Emit (OpCodes.Stloc, current);
+				ig.Emit (OpCodes.Ldloc, current);
 
-			if (varStm)
 				set_builder (ig, var);
-			else {
-				if (lhs is Expression) {
-					AST ast = ((Expression) lhs).Last;
-					if (ast is Identifier)
-						((Identifier) ast).EmitStore (ec);
-					else 
-						throw new NotImplementedException ();
-				} else
- 					throw new NotImplementedException ();
-			}
-
-			ig.Emit (OpCodes.Br, init_loop);
-			ig.MarkLabel (exit);
+
+				ig.Emit (OpCodes.Br, init_loop);
+				ig.MarkLabel (exit);
+			} else
+				throw new NotImplementedException ();
 		}
 
 		void set_builder (ILGenerator ig, object builder)
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs
index 8d71fd6307b..7a15d0c7f3b 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionDeclaration.cs
@@ -51,6 +51,13 @@ namespace Microsoft.JScript {
 			: this (parent, name, null, String.Empty, null, location)
 		{
 		}
+
+		internal void Init (AST parent, string name, FormalParameterList p, string return_type, Block body)
+		{
+			this.parent = parent;
+			set_prefix ();
+			func_obj = new FunctionObject (name, p, return_type, body, location);
+		}
 		
 		internal FunctionDeclaration (AST parent, string name, 
 					      FormalParameterList p,
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionExpression.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionExpression.cs
index bdf0aff2a00..e6c95ab6b53 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionExpression.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/FunctionExpression.cs
@@ -51,6 +51,7 @@ namespace Microsoft.JScript {
 					     string return_type, Block body, Location location)
 			: base (parent, location)
 		{
+			set_prefix ();
 			func_obj = new FunctionObject (name, p, return_type, body, location);
 		}
 						
@@ -99,7 +100,6 @@ namespace Microsoft.JScript {
 		
 		internal override bool Resolve (Environment env)
 		{
-			set_prefix ();
 			set_function_type ();
 
 			if (func_obj.name != null && func_obj.name != String.Empty)
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs
index a0662db34bb..7deb17ee696 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/GlobalObject.cs
@@ -455,9 +455,7 @@ namespace Microsoft.JScript {
 
 			if (string_obj.Trim () == "")
 				return 0;
-			// Would return an empty string if regular expression match returned 0.
-			object o = float_re.Match (string_obj).Value;
-			string_obj = (o == "") ? string_obj : (string) o;
+			string_obj = float_re.Match (string_obj).Value;
 
 			double result;
 			if (Double.TryParse (string_obj, NumberStyles.Float, CultureInfo.InvariantCulture, out result))
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/Import.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/Import.cs
index 5fe4da208b5..536143253d2 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/Import.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/Import.cs
@@ -55,7 +55,7 @@ namespace Microsoft.JScript {
 				"error JS1229: The import statement is not valid in this context";
 				throw new Exception (err);
 			}
-			return Namespace.IsNamespace (name);
+			return Mono.CSharp.RootNamespace.Global.IsNamespace (name);
 		}
 
 		internal override void Emit (EmitContext ec)
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/Namespace.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/Namespace.cs
index 58f6fc1a6a7..421e5c3cc17 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/Namespace.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/Namespace.cs
@@ -29,59 +29,15 @@
 //
 
 using System;
-using System.Reflection;
 using Microsoft.JScript.Vsa;
-using System.Collections;
 
 namespace Microsoft.JScript {
 
-	public sealed class Namespace {
-
-		static Hashtable namespaces;
-		static string fullname;
-
-		public Namespace (string name)
-		{
-			fullname = name;
-		}
-
-		static Namespace ()
-		{
-			namespaces = new Hashtable ();
-		}
-
-		internal static void GetNamespace (string name, bool create)
-		{
-			int pos = name.IndexOf ('.');
-
-			Namespace ns;
-			string first;
-			if (pos >= 0)
-				first = name.Substring (0, pos);
-			else
-				first = name;
-
-			ns = (Namespace) namespaces [first];
-			if (ns == null) {
-				if (!create)
-					throw new Exception ("unknown case");
-
-				ns = new Namespace (first);
-				namespaces.Add (first, ns);
-			}
-
-			if (pos >= 0)
-				Namespace.GetNamespace (name.Substring (pos + 1), create);
-		}
-
+	public sealed class Namespace 
+	{
 		public static Namespace GetNamespace (string name, VsaEngine engine)
 		{
 			throw new NotImplementedException ();
 		}
-
-		internal static bool IsNamespace (string name)
-		{
-			return namespaces.Contains (name);
-		}
 	}
 }
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
index a39eb20ce96..0c4ae3ce610 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
@@ -597,7 +597,7 @@ namespace Microsoft.JScript {
 				tt = ts.PeekToken ();
 
 				if (tt == Token.SEMI)
-					init = new EmptyAST ();
+					init = null;
 				else {
 					if (tt == Token.VAR) {
 						// set init to a var list or initial
@@ -616,7 +616,7 @@ namespace Microsoft.JScript {
 					decompiler.AddToken (Token.SEMI);
 					
 					if (ts.PeekToken () == Token.SEMI)
-						cond = new EmptyAST (); // no loop condition
+						cond = null; // no loop condition
 					else
 						cond = Expr (parent, false);
 
@@ -624,7 +624,7 @@ namespace Microsoft.JScript {
 					decompiler.AddToken (Token.SEMI);
 
 					if (ts.PeekToken () == Token.RP)
-						incr = new EmptyAST ();
+						incr = null;
 					else
 						incr = Expr (parent, false);
 				}
@@ -639,7 +639,7 @@ namespace Microsoft.JScript {
 					pn = new ForIn (parent, init, cond, body, new Location (ts.SourceName, ts.LineNumber));
 				else
 					pn = new For (parent, init, cond, incr, body, new Location (ts.SourceName, ts.LineNumber));
-				body.PropagateParent (pn);
+				body.parent = pn;
 			} else if (tt == Token.TRY) {
 				int line_number = ts.LineNumber;
 				AST try_block;
@@ -770,7 +770,8 @@ namespace Microsoft.JScript {
 				pn = Statements (parent);
 				MustMatchToken (Token.RC, "msg.no.brace.block");
 			} else if (tt == Token.ERROR || tt == Token.EOL || tt == Token.SEMI) {
- 				pn = new EmptyAST ();
+				// FIXME:
+				pn = null;
 				skip_semi = true;
 			} else if (tt == Token.FUNCTION) {
 				pn = Function (parent, FunctionType.ExpressionStatement);
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
index 7c936da0ace..97e3f28b0a6 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/SemanticAnalizer.cs
@@ -142,10 +142,7 @@ namespace Microsoft.JScript {
 		internal static bool Run (ScriptBlock [] blocks, Assembly [] ref_items)
 		{
 			assemblies = ref_items;
-
-			if (assemblies != null && assemblies.Length > 0)
-				ComputeNamespaces ();
-
+			ComputeNamespaces ();
 			env = new Environment (blocks);
 			bool r = true;
 
@@ -404,7 +401,7 @@ namespace Microsoft.JScript {
 					foreach (string ns in namespaces){
 						if (ns == "")
 							continue;
-						Namespace.GetNamespace (ns, true);
+						Mono.CSharp.RootNamespace.Global.GetNamespace (ns, true);
 					}
 				}
 			} else {
@@ -415,7 +412,7 @@ namespace Microsoft.JScript {
 						string ns = t.Namespace;
 						if (ns == null || cache.Contains (ns))
 							continue;
-						Namespace.GetNamespace (ns, true);
+						Mono.CSharp.RootNamespace.Global.GetNamespace (ns, true);
 						cache.Add (ns, null);
 					}
 				}
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
index efc2d52b459..a7db3481fa8 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/Statement.cs
@@ -126,13 +126,6 @@ namespace Microsoft.JScript {
 				false_stm.Emit (ec);			
 			ig.MarkLabel (merge_lbl);
 		}
-
-		internal override void PropagateParent (AST parent)
-		{
-			base.PropagateParent (parent);
-			true_stm.PropagateParent (this);
-			false_stm.PropagateParent (this);
-		}
  	}
 
 	abstract class Jump : AST {
@@ -156,11 +149,6 @@ namespace Microsoft.JScript {
 				throw new Exception ("error JS1026: Label not found");
                         return true;
 		}
-
-		internal override void PropagateParent (AST parent)
-		{
-			base.PropagateParent (parent);
-		}
 	}
 
 	internal class Continue : Jump {
@@ -214,11 +202,6 @@ namespace Microsoft.JScript {
 			}
 			ec.ig.Emit (OpCodes.Br, (binding as Labelled).EndAddrs);
 		}
-
-		internal override void PropagateParent (AST parent)
-		{
-			base.PropagateParent (parent);
-		}
 	}
 
 	internal class NotVoidReturnEventArgs : EventArgs {
@@ -226,7 +209,7 @@ namespace Microsoft.JScript {
 		
 	internal delegate void NotVoidReturnEventHandler (object sender, NotVoidReturnEventArgs args);
 	
-	internal class Return : AST, ICanModifyContext {
+	internal class Return : AST {
 
 		internal AST expression;
 		private bool exp_returns_void = false;
@@ -259,18 +242,6 @@ namespace Microsoft.JScript {
 				return String.Empty;
 		}
 
-		void ICanModifyContext.PopulateContext (Environment env, string ns)
-		{
-			if (expression is ICanModifyContext)
-				((ICanModifyContext) expression).PopulateContext (env, ns);
-		}
-
-		void ICanModifyContext.EmitDecls (EmitContext ec)
-		{
-			if (expression is ICanModifyContext)
-				((ICanModifyContext) expression).EmitDecls (ec);
-		}
-
 		internal override bool Resolve (Environment env)
 		{
 			if (!InFunction)
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/ast.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/ast.cs
index bd202ccc190..81c891e570b 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/ast.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/ast.cs
@@ -104,11 +104,6 @@ namespace Microsoft.JScript {
 				
 			}
 		}
-
-		internal virtual void PropagateParent (AST parent)
-		{
-			this.parent = parent;
-		}
 	}
 
 	public abstract class Function : AST 
@@ -168,15 +163,15 @@ namespace Microsoft.JScript {
 
 		internal void set_prefix ()
 		{
-			if (parent != null && InFunction) {
+			if (parent != null && parent is Function) {
 				Function tmp;
-				tmp = GetContainerFunction;
+				tmp = (Function) parent;
 				if (tmp.prefix != String.Empty)
 					prefix = tmp.prefix + "." + tmp.func_obj.name;
 				else
 					prefix = tmp.func_obj.name;
 			} else
-				prefix = String.Empty;
+				prefix = String.Empty;			
 		}
 
 		internal void set_function_type ()
diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/expression.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/expression.cs
index 19da2e9c590..8313bbe426a 100644
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/expression.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/expression.cs
@@ -381,24 +381,7 @@ namespace Microsoft.JScript {
 				ig.Emit (OpCodes.Call, decl_type.GetProperty (property.Name).GetGetMethod ());
 				break;
 			default:
-				Type lb_type = typeof (LateBinding);
-				LocalBuilder lateBinder = ig.DeclareLocal (lb_type);
-				Identifier prop = (Identifier) prop_name;
-
-				ig.Emit (OpCodes.Ldstr, prop.name.Value);
-				ig.Emit (OpCodes.Newobj, lb_type.GetConstructor (new Type [] { typeof (string)} ));
-				ig.Emit (OpCodes.Stloc, lateBinder);
-				ig.Emit (OpCodes.Ldloc, lateBinder);
-				ig.Emit (OpCodes.Dup);
-
-				Identifier obj_name = (Identifier) obj;
-
-				ig.Emit (OpCodes.Call, typeof (GlobalObject).GetProperty (obj_name.name.Value).GetGetMethod ());
-				ig.Emit (OpCodes.Stfld, lb_type.GetField ("obj"));
-				ig.Emit (OpCodes.Call, lb_type.GetMethod ("GetNonMissingValue"));
-
-				break;
-
+				throw new NotImplementedException ();
 			}
 			emit_box (ig, minfo);
 		}			
diff --git a/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog b/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog
index 13c5d363b81..0d4fd9102a8 100644
--- a/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog
+++ b/mcs/class/Microsoft.JScript/Test/Mozilla/ChangeLog
@@ -1,16 +1,3 @@
-2006-01-13  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* mjs-most.tests: Enable ecma/FunctionObjects/15.3.3.1-2.js,
-	ecma/Math/15.8.1.js, ecma/Number/15.7.3.1-3.js,
-	ecma/Number/15.7.3.2-4.js, ecma/Number/15.7.3.3-4.js,
-	ecma/Number/15.7.3.4-4.js, ecma/Number/15.7.3.5-4.js,
-	ecma/Number/15.7.3.6-4.js, ecma/Statements/12.6.3-1.js,
-	ecma/Statements/12.6.3-11.js, ecma/String/15.5.3.1-1.js,
-	ecma/String/15.5.4.8-3.js and js1_2/regress/regress-7703.js.
-
-	* mjs-most.fail: Delete ecma/Statements/12.6.3-10.js and
-	ecma/Statements/12.6.3-19.js as they no longer fail.
-
 2005-12-21  Cesar Lopez Nataren  <cnataren@novell.com>
 
 	* mjs-most.tests: Enable js1_2/Array/tostring_1.js,
diff --git a/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.fail b/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.fail
index 7f6e310f8c4..58c52a5afdd 100644
--- a/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.fail
+++ b/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.fail
@@ -48,6 +48,10 @@ js1_2/function/definition-1.js
 js1_3/Script/script-001.js
 js1_4/Functions/function-001.js
 
+# System.NotImplementedException: The requested feature is not implemented. (ForIn:Emit)
+ecma/Statements/12.6.3-10.js
+ecma/Statements/12.6.3-19.js
+
 # System.NotImplementedException: The requested feature is not implemented. (Convert:ToForInObject)
 ecma/String/15.5.5.1.js
 
diff --git a/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.tests b/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.tests
index 633c2f5f902..c92f34140c6 100644
--- a/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.tests
+++ b/mcs/class/Microsoft.JScript/Test/Mozilla/mjs-most.tests
@@ -57,7 +57,7 @@ ecma/Array/15.4.4.js
 # Eval::JScriptEvaluate throws NotImplementedException
 #ecma/Array/15.4.5.1-1.js
 ecma/Array/15.4.5.1-2.js
-# Needs eval
+# Needs ToForInObject
 #ecma/Array/15.4.5.2-1.js
 # Eval::JScriptEvaluate throws NotImplementedException
 #ecma/Array/15.4.5.2-2.js
@@ -376,7 +376,8 @@ ecma/Expressions/11.6.3.js
 # syntax error
 #ecma/FunctionObjects/15.3.2.1-3.js
 ecma/FunctionObjects/15.3.3.1-1.js
-ecma/FunctionObjects/15.3.3.1-2.js
+# Needs for in
+#ecma/FunctionObjects/15.3.3.1-2.js
 ecma/FunctionObjects/15.3.3.1-3.js
 # invalid IL
 #ecma/FunctionObjects/15.3.3.1-4.js
@@ -522,7 +523,8 @@ ecma/Math/15.8-2-n.js
 #ecma/Math/15.8.1.8-1.js
 #ecma/Math/15.8.1.8-2.js
 ecma/Math/15.8.1.8-3.js
-ecma/Math/15.8.1.js
+# Needs for in
+#ecma/Math/15.8.1.js
 # NotImplementedException from Binary:emit_access
 #ecma/Math/15.8.2.1.js
 #ecma/Math/15.8.2.10.js
@@ -554,30 +556,36 @@ ecma/Number/15.7.2.js
 # Invalid IL
 #ecma/Number/15.7.3.1-1.js
 #ecma/Number/15.7.3.1-2.js
-ecma/Number/15.7.3.1-3.js
+# Needs for in
+#ecma/Number/15.7.3.1-3.js
 ecma/Number/15.7.3.2-1.js
 # Invalid IL
 #ecma/Number/15.7.3.2-2.js
 #ecma/Number/15.7.3.2-3.js
-ecma/Number/15.7.3.2-4.js
+# Needs for in
+#ecma/Number/15.7.3.2-4.js
 ecma/Number/15.7.3.3-1.js
 ecma/Number/15.7.3.3-2.js
 #ecma/Number/15.7.3.3-3.js
-ecma/Number/15.7.3.3-4.js
+# Needs for in
+#ecma/Number/15.7.3.3-4.js
 ecma/Number/15.7.3.4-1.js
 # Invalid IL
 #ecma/Number/15.7.3.4-2.js
 #ecma/Number/15.7.3.4-3.js
-ecma/Number/15.7.3.4-4.js
+# Needs for in
+#ecma/Number/15.7.3.4-4.js
 ecma/Number/15.7.3.5-1.js
 ecma/Number/15.7.3.5-2.js
 #ecma/Number/15.7.3.5-3.js
-ecma/Number/15.7.3.5-4.js
+# Needs for in
+#ecma/Number/15.7.3.5-4.js
 ecma/Number/15.7.3.6-1.js
 # Invalid IL
 #ecma/Number/15.7.3.6-2.js
 #ecma/Number/15.7.3.6-3.js
-ecma/Number/15.7.3.6-4.js
+# Needs for in
+#ecma/Number/15.7.3.6-4.js
 ecma/Number/15.7.3.js
 ecma/Number/15.7.4-1.js
 ecma/Number/15.7.4.1.js
@@ -621,7 +629,7 @@ ecma/Statements/12.2-1.js
 ecma/Statements/12.5-2.js
 # Invalid IL
 #ecma/Statements/12.6.1-1.js
-# invalid IL, PostOrPrefixExpression.Emit error
+# Needs ForIn
 #ecma/Statements/12.6.2-1.js
 # NullReferenceException from For:Resolve
 #ecma/Statements/12.6.2-2.js
@@ -635,9 +643,11 @@ ecma/Statements/12.5-2.js
 ecma/Statements/12.6.2-8.js
 # syntax error
 #ecma/Statements/12.6.2-9-n.js
-ecma/Statements/12.6.3-1.js
+# Needs for in
+#ecma/Statements/12.6.3-1.js
 ecma/Statements/12.6.3-10.js
-ecma/Statements/12.6.3-11.js
+# Needs for in
+#ecma/Statements/12.6.3-11.js
 #ecma/Statements/12.6.3-12.js
 ecma/Statements/12.6.3-19.js
 # syntax error
@@ -659,7 +669,8 @@ ecma/Statements/12.6.3-19.js
 #ecma/Statements/12.9-1-n.js
 ecma/String/15.5.1.js
 ecma/String/15.5.2.js
-ecma/String/15.5.3.1-1.js
+# Needs for in
+#ecma/String/15.5.3.1-1.js
 # Invalid IL
 #ecma/String/15.5.3.1-2.js
 ecma/String/15.5.3.1-3.js
@@ -722,7 +733,8 @@ ecma/String/15.5.4.7-3.js
 # Invalid IL
 #ecma/String/15.5.4.8-1.js
 ecma/String/15.5.4.8-2.js
-ecma/String/15.5.4.8-3.js
+# Needs for in
+#ecma/String/15.5.4.8-3.js
 # Invalid IL
 #ecma/String/15.5.4.9-1.js
 ecma/String/15.5.4.js
@@ -1036,7 +1048,8 @@ js1_2/regexp/toString.js
 js1_2/regexp/vertical_bar.js
 js1_2/regexp/whitespace.js
 js1_2/regexp/word_boundary.js
-js1_2/regress/regress-7703.js
+# Need for in
+#js1_2/regress/regress-7703.js
 js1_2/statements/break.js
 # infinite loop caused by bad generated IL.
 #js1_2/statements/continue.js
diff --git a/mcs/class/Mono.C5/C5.old/AssemblyInfo.cs b/mcs/class/Mono.C5/AssemblyInfo.cs
index b4de16b5484..b4de16b5484 100644
--- a/mcs/class/Mono.C5/C5.old/AssemblyInfo.cs
+++ b/mcs/class/Mono.C5/AssemblyInfo.cs
diff --git a/mcs/class/Mono.C5/C5.old/Builder.cs b/mcs/class/Mono.C5/Builder.cs
index feb2981baed..feb2981baed 100644
--- a/mcs/class/Mono.C5/C5.old/Builder.cs
+++ b/mcs/class/Mono.C5/Builder.cs
diff --git a/mcs/class/Mono.C5/C5.old/C5.csproj b/mcs/class/Mono.C5/C5.csproj
index 2142ae87db4..2142ae87db4 100644
--- a/mcs/class/Mono.C5/C5.old/C5.csproj
+++ b/mcs/class/Mono.C5/C5.csproj
diff --git a/mcs/class/Mono.C5/C5.old/C5.csproj.user b/mcs/class/Mono.C5/C5.csproj.user
index 57bad3e8cf3..57bad3e8cf3 100644
--- a/mcs/class/Mono.C5/C5.old/C5.csproj.user
+++ b/mcs/class/Mono.C5/C5.csproj.user
diff --git a/mcs/class/Mono.C5/C5.sln b/mcs/class/Mono.C5/C5.sln
deleted file mode 100644
index 53c169d1750..00000000000
--- a/mcs/class/Mono.C5/C5.sln
+++ /dev/null
@@ -1,77 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C5", "C5\C5.csproj", "{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}"

-	ProjectSection(ProjectDependencies) = postProject

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F} = {6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit", "nunit\nunit.csproj", "{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docNet", "docNet\docNet.csproj", "{42811A81-6A99-4C7A-A6DA-DF104C767B72}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserGuideExamples", "UserGuideExamples\UserGuideExamples.csproj", "{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PreProcess", "PreProcess\PreProcess.csproj", "{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Any CPU = Debug|Any CPU

-		Debug|Mixed platforms = Debug|Mixed platforms

-		Debug|Win32 = Debug|Win32

-		Release|Any CPU = Release|Any CPU

-		Release|Mixed platforms = Release|Mixed platforms

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Mixed platforms.Build.0 = Debug|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Any CPU.Build.0 = Release|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Mixed platforms.ActiveCfg = Release|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Mixed platforms.Build.0 = Release|Any CPU

-		{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}.Release|Win32.ActiveCfg = Release|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Mixed platforms.ActiveCfg = Release|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Mixed platforms.Build.0 = Release|Any CPU

-		{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}.Release|Win32.ActiveCfg = Release|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Mixed platforms.Build.0 = Debug|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Mixed platforms.ActiveCfg = Release|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Mixed platforms.Build.0 = Release|Any CPU

-		{42811A81-6A99-4C7A-A6DA-DF104C767B72}.Release|Win32.ActiveCfg = Release|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Mixed platforms.Build.0 = Debug|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Any CPU.Build.0 = Release|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Mixed platforms.ActiveCfg = Release|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Mixed platforms.Build.0 = Release|Any CPU

-		{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}.Release|Win32.ActiveCfg = Release|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Mixed platforms.ActiveCfg = Debug|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Mixed platforms.Build.0 = Debug|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Any CPU.Build.0 = Release|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Mixed platforms.ActiveCfg = Release|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Mixed platforms.Build.0 = Release|Any CPU

-		{6222CA51-7D1A-4D42-B6A7-B5CE9608C18F}.Release|Win32.ActiveCfg = Release|Any CPU

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/mcs/class/Mono.C5/C5/AssemblyInfo.cs b/mcs/class/Mono.C5/C5/AssemblyInfo.cs
deleted file mode 100644
index d5af25f3546..00000000000
--- a/mcs/class/Mono.C5/C5/AssemblyInfo.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-

-//

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-//

-[assembly: AssemblyTitle("C5: Copenhagen Comprehensive Collection Classes for CLI")]

-[assembly: AssemblyDescription("This is a debug build of release 1.0.0")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("")]

-[assembly: AssemblyCopyright("(c) 2003-2006 Niels Kokholm and Peter Sestoft")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-//

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-

-[assembly: AssemblyVersion("1.0.0")]

-

-//

-// In order to sign your assembly you must specify a key to use. Refer to the 

-// Microsoft .NET Framework documentation for more information on assembly signing.

-//

-// Use the attributes below to control which key is used for signing. 

-//

-// Notes: 

-//   (*) If no key is specified, the assembly is not signed.

-//   (*) KeyName refers to a key that has been installed in the Crypto Service

-//       Provider (CSP) on your machine. KeyFile refers to a file which contains

-//       a key.

-//   (*) If the KeyFile and the KeyName values are both specified, the 

-//       following processing occurs:

-//       (1) If the KeyName can be found in the CSP, that key is used.

-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

-//           in the KeyFile is installed into the CSP and used.

-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

-//       When specifying the KeyFile, the location of the KeyFile should be

-//       relative to the project output directory which is

-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

-//       located in the project directory, you would specify the AssemblyKeyFile 

-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

-//       documentation for more information on this.

-//

-//[assembly: AssemblyDelaySign(false)]

-//[assembly: AssemblyKeyFile("..\\..\\..\\c5.snk")]

-//[assembly: AssemblyKeyName("")]

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/Attributes.cs b/mcs/class/Mono.C5/C5/Attributes.cs
deleted file mode 100644
index aa1ce008502..00000000000
--- a/mcs/class/Mono.C5/C5/Attributes.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A custom attribute to mark methods and properties as being tested 

-  /// sufficiently in the regression test suite.

-  /// </summary>

-  [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]

-  public class TestedAttribute : Attribute

-  {

-

-    /// <summary>

-    /// Optional reference to test case

-    /// </summary>

-    [Tested]

-    public string via;

-

-

-    /// <summary>

-    /// Pretty print attribute value

-    /// </summary>

-    /// <returns>"Tested via " + via</returns>

-    [Tested]

-    public override string ToString() { return "Tested via " + via; }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Builtin.cs b/mcs/class/Mono.C5/C5/Builtin.cs
deleted file mode 100644
index f2f19168872..00000000000
--- a/mcs/class/Mono.C5/C5/Builtin.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  #region int stuff

-  [Serializable]

-  class IntComparer : SCG.IComparer<int>

-  {

-    [Tested]

-    public int Compare(int a, int b) { return a > b ? 1 : a < b ? -1 : 0; }

-  }

-

-  /// <summary>

-  /// An equalityComparer for System.Int32 integers. 

-  /// <para>This class is a singleton and the instance can be accessed

-  /// via the static <see cref="P:C5.IntEqualityComparer.Default"/> property</para>

-  /// </summary>

-  [Serializable]

-  public class IntEqualityComparer : SCG.IEqualityComparer<int>

-  {

-    static IntEqualityComparer cached;

-    IntEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    [Tested]

-    public static IntEqualityComparer Default { get { return cached ?? (cached = new IntEqualityComparer()); } }

-    /// <summary>

-    /// Get the hash code of this integer, that is, itself

-    /// </summary>

-    /// <param name="item">The integer</param>

-    /// <returns>The same</returns>

-    [Tested]

-    public int GetHashCode(int item) { return item; }

-

-

-    /// <summary>

-    /// Determine whether two integers are equal

-    /// </summary>

-    /// <param name="int1">first integer</param>

-    /// <param name="int2">second integer</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public bool Equals(int int1, int int2) { return int1 == int2; }

-  }

-

-  #endregion

-

-  #region double stuff

-  class DoubleComparer : SCG.IComparer<double>

-  {

-    public int Compare(double a, double b) { return a > b ? 1 : a < b ? -1 : 0; }

-  }

-

-  /// <summary>

-  /// An equalityComparer for double. 

-  /// <para>This class is a singleton and the instance can be accessed

-  /// via the static <see cref="P:C5.DoubleEqualityComparer.Default"/> property</para>

-  /// </summary>

-  public class DoubleEqualityComparer : SCG.IEqualityComparer<double>

-  {

-    static DoubleEqualityComparer cached;

-    DoubleEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    [Tested]

-    public static DoubleEqualityComparer Default { get { return cached ?? (cached = new DoubleEqualityComparer()); } }

-    /// <summary>

-    /// Get the hash code of this double,

-    /// </summary>

-    /// <param name="item">The double</param>

-    /// <returns>The same</returns>

-    [Tested]

-    public int GetHashCode(double item) { return item.GetHashCode(); }

-

-

-    /// <summary>

-    /// Check if two doubles are equal

-    /// </summary>

-    /// <param name="item1">first double</param>

-    /// <param name="item2">second double</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public bool Equals(double item1, double item2) { return item1 == item2; }

-  }

-  #endregion

-

-  #region byte stuff

-  class ByteComparer : SCG.IComparer<byte>

-  {

-    public int Compare(byte a, byte b) { return a > b ? 1 : a < b ? -1 : 0; }

-  }

-

-  /// <summary>

-  /// An equalityComparer for byte

-  /// <para>This class is a singleton and the instance can be accessed

-  /// via the <see cref="P:C5.ByteEqualityComparer.Default"/> property</para>

-  /// </summary>

-  public class ByteEqualityComparer : SCG.IEqualityComparer<byte>

-  {

-    static ByteEqualityComparer cached = new ByteEqualityComparer();

-    ByteEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static ByteEqualityComparer Default { get { return cached ?? (cached = new ByteEqualityComparer()); } }

-    /// <summary>

-    /// Get the hash code of this byte, i.e. itself

-    /// </summary>

-    /// <param name="item">The byte</param>

-    /// <returns>The same</returns>

-    public int GetHashCode(byte item) { return item; }

-

-    /// <summary>

-    /// Check if two bytes are equal

-    /// </summary>

-    /// <param name="item1">first byte</param>

-    /// <param name="item2">second byte</param>

-    /// <returns>True if equal</returns>

-    public bool Equals(byte item1, byte item2) { return item1 == item2; }

-  }

-  #endregion

-

-  #region char stuff

-  class CharComparer : SCG.IComparer<char>

-  {

-    public int Compare(char a, char b) { return a > b ? 1 : a < b ? -1 : 0; }

-  }

-

-  /// <summary>

-  /// An equalityComparer for char.

-  /// </summary>

-  public class CharEqualityComparer : SCG.IEqualityComparer<char>

-  {

-    static CharEqualityComparer cached = new CharEqualityComparer();

-    CharEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static CharEqualityComparer Default { get { return cached ?? (cached = new CharEqualityComparer()); } }

-

-    /// <summary>

-    /// Get the hash code of this char

-    /// </summary>

-    /// <param name="item">The char</param>

-    /// <returns>The same</returns>

-    public int GetHashCode(char item) { return item.GetHashCode(); }

-

-

-    /// <summary>

-    /// Check if two chars are equal

-    /// </summary>

-    /// <param name="item1">first char</param>

-    /// <param name="item2">second char</param>

-    /// <returns>True if equal</returns>

-    public bool Equals(char item1, char item2) { return item1 == item2; }

-  }

-  #endregion

-

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/C5.csproj b/mcs/class/Mono.C5/C5/C5.csproj
deleted file mode 100644
index eb0c5b0ebdc..00000000000
--- a/mcs/class/Mono.C5/C5/C5.csproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <ProductVersion>8.0.40607</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <StartupObject>

-    </StartupObject>

-    <RootNamespace>C5</RootNamespace>

-    <NoStandardLibraries>false</NoStandardLibraries>

-    <AssemblyName>C5</AssemblyName>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <OutputPath>.\bin\Debug\</OutputPath>

-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

-    <DefineConstants>DEBUG</DefineConstants>

-    <WarningLevel>4</WarningLevel>

-    <IncrementalBuild>false</IncrementalBuild>

-    <DocumentationFile>c5.xml</DocumentationFile>

-    <FxCopRules>+ComRules.dll;+DesignRules.dll|AbstractTypesShouldNotHaveConstructors;+DesignRules.dll|AddAndSubtractOverrideShouldHaveOperatorEqualsOverride;-DesignRules.dll|AssembliesAreMarkedClsCompliant;-DesignRules.dll|AssembliesHaveStrongNames;+DesignRules.dll|AssembliesHaveVersionNumbers;-DesignRules.dll|AssembliesShouldBeComVisibleAttributed;+DesignRules.dll|AttributesAreAttributeUsageAttributed;+DesignRules.dll|AttributesShouldHaveAccessorsForAllArguments;+DesignRules.dll|AvoidNamespacesWithFewMembers;-DesignRules.dll|AvoidOutParameters;+DesignRules.dll|AvoidValueTypesPassedAsByRefParameters;+DesignRules.dll|ConsiderHavingOnlyOneDimensionForIndexer;+DesignRules.dll|ConsiderPassingBaseTypesAsParameters;+DesignRules.dll|ConsiderReplacingMethodsWithProperties;+DesignRules.dll|ConsiderReplacingRepetitiveArgsWithParameterArray;+DesignRules.dll|DefaultParametersAreNotUsed;+DesignRules.dll|EnumerationsShouldBeFlagsAttributed;+DesignRules.dll|EnumerationsShouldBeInt32;+DesignRules.dll|EnumerationsShouldBeIntegralType;+DesignRules.dll|EventFirstParametersAreTypeObject;+DesignRules.dll|EventHandlersReturnVoid;+DesignRules.dll|EventSecondParametersAreEventArgsType;+DesignRules.dll|EventsHaveTwoParameters;+DesignRules.dll|EventsShouldBeUsed;+DesignRules.dll|ExceptionAndSystemExceptionTypesAreNotCaught;+DesignRules.dll|ExceptionsRequireMultipleConstructors;-DesignRules.dll|ExplicitMethodImplementationsInUnsealedClassesHaveVisibleAlternates;+DesignRules.dll|ExternallyVisibleNestedTypesShouldNotBeUsed;+DesignRules.dll|ICollectionImplementationsHaveStronglyTypedMembers;+DesignRules.dll|IComparableImplementationsOverrideEquals;+DesignRules.dll|IComparableImplementationsOverrideOperators;+DesignRules.dll|IEnumeratorImplementationsHaveStronglyTypedMembers;+DesignRules.dll|IListImplementationsHaveStronglyTypedMembers;+DesignRules.dll|InterfacesShouldNotBeEmpty;+DesignRules.dll|ISerializableTypesAreMarkedSerializable;+DesignRules.dll|ObsoleteAttributeOnMemberShouldProvideMessage;+DesignRules.dll|ObsoleteAttributeOnTypeShouldProvideMessage;-DesignRules.dll|OnlyIntegralValuesOrStringsShouldBeUsedForIndexers;+DesignRules.dll|PropertiesShouldNotBeWriteOnly;+DesignRules.dll|ReferenceTypesAreNotPassedAsByRefParameters;+DesignRules.dll|ReferenceTypesShouldNotOverrideOperatorEquals;+DesignRules.dll|SealedTypesDoNotDeclareProtectedMembers;+DesignRules.dll|SealedTypesDoNotDeclareVirtualMembers;+DesignRules.dll|TypesAllocatingUnmanagedResourcesImplementIDisposable;+DesignRules.dll|TypesBelongToNamespaces;+DesignRules.dll|TypesDoNotHavePublicInstanceFields;+DesignRules.dll|TypesHavingOnlyStaticMembersShouldBeSealed;+DesignRules.dll|TypesHavingOnlyStaticMembersShouldNotHaveConstructors;+DesignRules.dll|UriParametersShouldNotBeStrings;+DesignRules.dll|UriPropertiesShouldNotBeStrings;+DesignRules.dll|UriReturnValuesShouldNotBeStrings;+GlobalizationRules.dll;+MaintainabilityRules.dll;+NamingRules.dll;+PerformanceRules.dll;+ReliabilityRules.dll;+SecurityRules.dll;+UsageRules.dll</FxCopRules>

-    <RunFxCop>false</RunFxCop>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <OutputPath>.\bin\Release\</OutputPath>

-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

-    <DefineConstants>TRACE</DefineConstants>

-    <WarningLevel>4</WarningLevel>

-    <IncrementalBuild>false</IncrementalBuild>

-    <DocumentationFile>

-    </DocumentationFile>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System">

-      <HintPath>..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.2.30703\System.dll</HintPath>

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="arrays\CircularQueue.cs" />

-    <Compile Include="arrays\HashedArrayList.cs" />

-    <Compile Include="AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Attributes.cs" />

-    <Compile Include="Builtin.cs" />

-    <Compile Include="Comparer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Delegates.cs" />

-    <Compile Include="Enums.cs" />

-    <Compile Include="Exceptions.cs" />

-    <Compile Include="Formatting.cs" />

-    <Compile Include="Hashers.cs" />

-    <Compile Include="Events.cs" />

-    <Compile Include="Collections.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Dictionaries.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Interfaces.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="linkedlists\HashedLinkedList.cs" />

-    <Compile Include="Random.cs" />

-    <Compile Include="Records.cs" />

-    <Compile Include="Sorting.cs" />

-    <Compile Include="ViewSupport.cs" />

-    <Compile Include="MappedEnumerators.cs" />

-    <Compile Include="WrappedArray.cs" />

-    <Compile Include="Wrappers.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="arrays\ArrayList.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="arrays\SortedArray.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="hashing\HashBag.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="hashing\HashDictionary.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="hashing\HashTable.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="heaps\IntervalHeap.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="linkedlists\LinkedList.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="trees\RedBlackTreeSet.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="trees\RedBlackTreeBag.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="trees\RedBlackTreeDictionary.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <AppDesigner Include="Properties\" />

-  </ItemGroup>

-  <ItemGroup>

-    <Folder Include="Properties\" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>"$(SolutionDir)PreProcess\$(OutDir)PreProcess.exe"</PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-  <ProjectExtensions>

-    <VisualStudio>

-    </VisualStudio>

-  </ProjectExtensions>

-</Project>
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/C5/ClsdiagWork.png b/mcs/class/Mono.C5/C5/ClsdiagWork.png
deleted file mode 100644
index 9a1866653a8..00000000000
--- a/mcs/class/Mono.C5/C5/ClsdiagWork.png
+++ /dev/null
diff --git a/mcs/class/Mono.C5/C5/Collections.cs b/mcs/class/Mono.C5/C5/Collections.cs
deleted file mode 100644
index e735b50cf57..00000000000
--- a/mcs/class/Mono.C5/C5/Collections.cs
+++ /dev/null
@@ -1,1523 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define IMPROVED_COLLECTION_HASHFUNCTION

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A base class for implementing an IEnumerable&lt;T&gt;

-  /// </summary>

-  [Serializable]

-  public abstract class EnumerableBase<T> : SCG.IEnumerable<T>

-  {

-    /// <summary>

-    /// Create an enumerator for this collection.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    public abstract SCG.IEnumerator<T> GetEnumerator();

-

-    /// <summary>

-    /// Count the number of items in an enumerable by enumeration

-    /// </summary>

-    /// <param name="items">The enumerable to count</param>

-    /// <returns>The size of the enumerable</returns>

-    [Tested]

-    protected static int countItems(SCG.IEnumerable<T> items)

-    {

-      ICollectionValue<T> jtems = items as ICollectionValue<T>;

-

-      if (jtems != null)

-        return jtems.Count;

-

-      int count = 0;

-

-      using (SCG.IEnumerator<T> e = items.GetEnumerator())

-        while (e.MoveNext()) count++;

-

-      return count;

-    }

-

-    #region IEnumerable Members

-

-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-    {

-      return GetEnumerator();

-    }

-

-    #endregion

-  }

-

-

-  /// <summary>

-  /// Base class for classes implementing ICollectionValue[T]

-  /// </summary>

-  [Serializable]

-  public abstract class CollectionValueBase<T> : EnumerableBase<T>, ICollectionValue<T>, IShowable

-  {

-    #region Event handling

-    EventBlock<T> eventBlock;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual EventTypeEnum ListenableEvents { get { return 0; } }

-

-    /// <summary>

-    /// A flag bitmap of the events currently subscribed to by this collection.

-    /// </summary>

-    /// <value></value>

-    public virtual EventTypeEnum ActiveEvents { get { return eventBlock == null ? 0 : eventBlock.events; } }

-

-    private void checkWillListen(EventTypeEnum eventType)

-    {

-      if ((ListenableEvents & eventType) == 0)

-        throw new UnlistenableEventException();

-    }

-

-    /// <summary>

-    /// The change event. Will be raised for every change operation on the collection.

-    /// </summary>

-    public virtual event CollectionChangedHandler<T> CollectionChanged

-    {

-      add { checkWillListen(EventTypeEnum.Changed); (eventBlock ?? (eventBlock = new EventBlock<T>())).CollectionChanged += value; }

-      remove

-      {

-        checkWillListen(EventTypeEnum.Changed);

-        if (eventBlock != null)

-        {

-          eventBlock.CollectionChanged -= value;

-          if (eventBlock.events == 0) eventBlock = null;

-        }

-      }

-    }

-    /// <summary>

-    /// Fire the CollectionChanged event

-    /// </summary>

-    protected virtual void raiseCollectionChanged()

-    { if (eventBlock != null) eventBlock.raiseCollectionChanged(this); }

-

-    /// <summary>

-    /// The clear event. Will be raised for every Clear operation on the collection.

-    /// </summary>

-    public virtual event CollectionClearedHandler<T> CollectionCleared

-    {

-      add { checkWillListen(EventTypeEnum.Cleared); (eventBlock ?? (eventBlock = new EventBlock<T>())).CollectionCleared += value; }

-      remove

-      {

-        checkWillListen(EventTypeEnum.Cleared);

-        if (eventBlock != null)

-        {

-          eventBlock.CollectionCleared -= value;

-          if (eventBlock.events == 0) eventBlock = null;

-        }

-      }

-    }

-    /// <summary>

-    /// Fire the CollectionCleared event

-    /// </summary>

-    protected virtual void raiseCollectionCleared(bool full, int count)

-    { if (eventBlock != null) eventBlock.raiseCollectionCleared(this, full, count); }

-

-    /// <summary>

-    /// Fire the CollectionCleared event

-    /// </summary>

-    protected virtual void raiseCollectionCleared(bool full, int count, int? offset)

-    { if (eventBlock != null) eventBlock.raiseCollectionCleared(this, full, count, offset); }

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual addition to the collection.

-    /// </summary>

-    public virtual event ItemsAddedHandler<T> ItemsAdded

-    {

-      add { checkWillListen(EventTypeEnum.Added); (eventBlock ?? (eventBlock = new EventBlock<T>())).ItemsAdded += value; }

-      remove

-      {

-        checkWillListen(EventTypeEnum.Added);

-        if (eventBlock != null)

-        {

-          eventBlock.ItemsAdded -= value;

-          if (eventBlock.events == 0) eventBlock = null;

-        }

-      }

-    }

-    /// <summary>

-    /// Fire the ItemsAdded event

-    /// </summary>

-    /// <param name="item">The item that was added</param>

-    /// <param name="count"></param>

-    protected virtual void raiseItemsAdded(T item, int count)

-    { if (eventBlock != null) eventBlock.raiseItemsAdded(this, item, count); }

-

-    /// <summary>

-    /// The item removed event. Will be raised for every individual removal from the collection.

-    /// </summary>

-    public virtual event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add { checkWillListen(EventTypeEnum.Removed); (eventBlock ?? (eventBlock = new EventBlock<T>())).ItemsRemoved += value; }

-      remove

-      {

-        checkWillListen(EventTypeEnum.Removed);

-        if (eventBlock != null)

-        {

-          eventBlock.ItemsRemoved -= value;

-          if (eventBlock.events == 0) eventBlock = null;

-        }

-      }

-    }

-    /// <summary>

-    /// Fire the ItemsRemoved event

-    /// </summary>

-    /// <param name="item">The item that was removed</param>

-    /// <param name="count"></param>

-    protected virtual void raiseItemsRemoved(T item, int count)

-    { if (eventBlock != null) eventBlock.raiseItemsRemoved(this, item, count); }

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual addition to the collection.

-    /// </summary>

-    public virtual event ItemInsertedHandler<T> ItemInserted

-    {

-      add { checkWillListen(EventTypeEnum.Inserted); (eventBlock ?? (eventBlock = new EventBlock<T>())).ItemInserted += value; }

-      remove

-      {

-        checkWillListen(EventTypeEnum.Inserted);

-        if (eventBlock != null)

-        {

-          eventBlock.ItemInserted -= value;

-          if (eventBlock.events == 0) eventBlock = null;

-        }

-      }

-    }

-    /// <summary>

-    /// Fire the ItemInserted event

-    /// </summary>

-    /// <param name="item">The item that was added</param>

-    /// <param name="index"></param>

-    protected virtual void raiseItemInserted(T item, int index)

-    { if (eventBlock != null) eventBlock.raiseItemInserted(this, item, index); }

-

-    /// <summary>

-    /// The item removed event. Will be raised for every individual removal from the collection.

-    /// </summary>

-    public virtual event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add { checkWillListen(EventTypeEnum.RemovedAt); (eventBlock ?? (eventBlock = new EventBlock<T>())).ItemRemovedAt += value; }

-      remove

-      {

-        checkWillListen(EventTypeEnum.RemovedAt);

-        if (eventBlock != null)

-        {

-          eventBlock.ItemRemovedAt -= value;

-          if (eventBlock.events == 0) eventBlock = null;

-        }

-      }

-    }

-    /// <summary> 

-    /// Fire the ItemRemovedAt event

-    /// </summary>

-    /// <param name="item">The item that was removed</param>

-    /// <param name="index"></param>

-    protected virtual void raiseItemRemovedAt(T item, int index)

-    { if (eventBlock != null) eventBlock.raiseItemRemovedAt(this, item, index); }

-

-    #region Event support for IList

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="index"></param>

-    /// <param name="value"></param>

-    /// <param name="item"></param>

-    protected virtual void raiseForSetThis(int index, T value, T item)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(item, 1);

-        raiseItemRemovedAt(item, index);

-        raiseItemsAdded(value, 1);

-        raiseItemInserted(value, index);

-        raiseCollectionChanged();

-      }

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="i"></param>

-    /// <param name="item"></param>

-    protected virtual void raiseForInsert(int i, T item)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemInserted(item, i);

-        raiseItemsAdded(item, 1);

-        raiseCollectionChanged();

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    protected void raiseForRemove(T item)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(item, 1);

-        raiseCollectionChanged();

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="count"></param>

-    protected void raiseForRemove(T item, int count)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(item, count);

-        raiseCollectionChanged();

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="index"></param>

-    /// <param name="item"></param>

-    protected void raiseForRemoveAt(int index, T item)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemRemovedAt(item, index);

-        raiseItemsRemoved(item, 1);

-        raiseCollectionChanged();

-      }

-    }

-

-    #endregion

-

-    #region Event  Support for ICollection

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="newitem"></param>

-    /// <param name="olditem"></param>

-    protected virtual void raiseForUpdate(T newitem, T olditem)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(olditem, 1);

-        raiseItemsAdded(newitem, 1);

-        raiseCollectionChanged();

-      }

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="newitem"></param>

-    /// <param name="olditem"></param>

-    /// <param name="count"></param>

-    protected virtual void raiseForUpdate(T newitem, T olditem, int count)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(olditem, count);

-        raiseItemsAdded(newitem, count);

-        raiseCollectionChanged();

-      }

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    protected virtual void raiseForAdd(T item)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseItemsAdded(item, 1);

-        raiseCollectionChanged();

-      }

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="wasRemoved"></param>

-    protected virtual void raiseForRemoveAll(ICollectionValue<T> wasRemoved)

-    {

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-        foreach (T item in wasRemoved)

-          raiseItemsRemoved(item, 1);

-      if (wasRemoved != null && wasRemoved.Count > 0)

-        raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    protected class RaiseForRemoveAllHandler

-    {

-      CollectionValueBase<T> collection;

-      CircularQueue<T> wasRemoved;

-      bool wasChanged = false;

-

-      /// <summary>

-      /// 

-      /// </summary>

-      /// <param name="collection"></param>

-      public RaiseForRemoveAllHandler(CollectionValueBase<T> collection)

-      {

-        this.collection = collection;

-        mustFireRemoved = (collection.ActiveEvents & EventTypeEnum.Removed) != 0;

-        MustFire = (collection.ActiveEvents & (EventTypeEnum.Removed | EventTypeEnum.Changed)) != 0;

-      }

-

-      bool mustFireRemoved;

-      /// <summary>

-      /// 

-      /// </summary>

-      public readonly bool MustFire;

-

-      /// <summary>

-      /// 

-      /// </summary>

-      /// <param name="item"></param>

-      public void Remove(T item)

-      {

-        if (mustFireRemoved)

-        {

-          if (wasRemoved == null)

-            wasRemoved = new CircularQueue<T>();

-          wasRemoved.Enqueue(item);

-        }

-        if (!wasChanged)

-          wasChanged = true;

-      }

-

-      /// <summary>

-      /// 

-      /// </summary>

-      public void Raise()

-      {

-        if (wasRemoved != null)

-          foreach (T item in wasRemoved)

-            collection.raiseItemsRemoved(item, 1);

-        if (wasChanged)

-          collection.raiseCollectionChanged();

-      }

-    }

-    #endregion

-

-    #endregion

-

-    /// <summary>

-    /// Check if collection is empty.

-    /// </summary>

-    /// <value>True if empty</value>

-    public abstract bool IsEmpty { get;}

-

-    /// <summary>

-    /// The number of items in this collection.

-    /// </summary>

-    /// <value></value>

-    public abstract int Count { get;}

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>A characterization of the speed of the 

-    /// <code>Count</code> property in this collection.</value>

-    public abstract Speed CountSpeed { get; }

-

-    /// <summary>

-    /// Copy the items of this collection to part of an array.

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if <code>index</code> 

-    /// is not a valid index

-    /// into the array (i.e. negative or not less than the size of the array)

-    /// or the array does not have room for the items.</exception>

-    /// <param name="array">The array to copy to.</param>

-    /// <param name="index">The starting index.</param>

-    [Tested]

-    public virtual void CopyTo(T[] array, int index)

-    {

-#warning This code does not fit the doc comment and unit tests

-      if (index < 0 || index + Count > array.Length)

-        throw new ArgumentOutOfRangeException();

-

-      foreach (T item in this) array[index++] = item;

-    }

-

-    /// <summary>

-    /// Create an array with the items of this collection (in the same order as an

-    /// enumerator would output them).

-    /// </summary>

-    /// <returns>The array</returns>

-    //[Tested]

-    public virtual T[] ToArray()

-    {

-      T[] res = new T[Count];

-      int i = 0;

-

-      foreach (T item in this) res[i++] = item;

-

-      return res;

-    }

-

-    /// <summary>

-    /// Apply an single argument action, <see cref="T:C5.Act`1"/> to this enumerable

-    /// </summary>

-    /// <param name="action">The action delegate</param>

-    [Tested]

-    public virtual void Apply(Act<T> action)

-    {

-      foreach (T item in this)

-        action(item);

-    }

-

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R = bool</code>) 

-    /// defining the predicate</param>

-    /// <returns>True if such an item exists</returns>

-    [Tested]

-    public virtual bool Exists(Fun<T, bool> predicate)

-    {

-      foreach (T item in this)

-        if (predicate(item))

-          return true;

-

-      return false;

-    }

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the first one in enumeration order.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <param name="item"></param>

-    /// <returns>True is such an item exists</returns>

-    public virtual bool Find(Fun<T, bool> predicate, out T item)

-    {

-      foreach (T jtem in this)

-        if (predicate(jtem))

-        {

-          item = jtem;

-          return true;

-        }

-      item = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Check if all items in this collection satisfies a specific predicate.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R = bool</code>) 

-    /// defining the predicate</param>

-    /// <returns>True if all items satisfies the predicate</returns>

-    [Tested]

-    public virtual bool All(Fun<T, bool> predicate)

-    {

-      foreach (T item in this)

-        if (!predicate(item))

-          return false;

-

-      return true;

-    }

-

-    /// <summary>

-    /// Create an enumerable, enumerating the items of this collection that satisfies 

-    /// a certain condition.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R = bool</code>) 

-    /// defining the predicate</param>

-    /// <returns>The filtered enumerable</returns>

-    public virtual SCG.IEnumerable<T> Filter(Fun<T, bool> predicate)

-    {

-      foreach (T item in this)

-        if (predicate(item))

-          yield return item;

-    }

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    public abstract T Choose();

-

-

-    /// <summary>

-    /// Create an enumerator for this collection.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    public override abstract SCG.IEnumerator<T> GetEnumerator();

-

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public virtual bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      return Showing.ShowCollectionValue<T>(this, stringbuilder, ref rest, formatProvider);

-    }

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public virtual string ToString(string format, IFormatProvider formatProvider)

-    {

-      return Showing.ShowString(this, format, formatProvider);

-    }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return ToString(null, null);

-    }

-

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public abstract class DirectedCollectionValueBase<T> : CollectionValueBase<T>, IDirectedCollectionValue<T>

-  {

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    public virtual EnumerationDirection Direction { [Tested]get { return EnumerationDirection.Forwards; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public abstract IDirectedCollectionValue<T> Backwards();

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return this.Backwards(); }

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the first one in enumeration order.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <param name="item"></param>

-    /// <returns>True is such an item exists</returns>

-    public virtual bool FindLast(Fun<T, bool> predicate, out T item)

-    {

-      foreach (T jtem in Backwards())

-        if (predicate(jtem))

-        {

-          item = jtem;

-          return true;

-        }

-      item = default(T);

-      return false;

-    }

-  }

-

-  /// <summary>

-  /// Base class (abstract) for ICollection implementations.

-  /// </summary>

-  [Serializable]

-  public abstract class CollectionBase<T> : CollectionValueBase<T>

-  {

-    #region Fields

-

-    object syncroot = new object();

-

-    /// <summary>

-    /// The underlying field of the ReadOnly property

-    /// </summary>

-    protected bool isReadOnly = false;

-

-    /// <summary>

-    /// The current stamp value

-    /// </summary>

-    protected int stamp;

-

-    /// <summary>

-    /// The number of items in the collection

-    /// </summary>

-    protected int size;

-

-    /// <summary>

-    /// The item equalityComparer of the collection

-    /// </summary>

-    protected readonly SCG.IEqualityComparer<T> itemequalityComparer;

-

-    int iUnSequencedHashCode, iUnSequencedHashCodeStamp = -1;

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="itemequalityComparer"></param>

-    public CollectionBase(SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      if (itemequalityComparer == null)

-        throw new NullReferenceException("Item EqualityComparer cannot be null.");

-      this.itemequalityComparer = itemequalityComparer;

-    }

-

-    #region Util

-

-    /// <summary>

-    /// Utility method for range checking.

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if the start or count is negative or

-    ///  if the range does not fit within collection size.</exception>

-    /// <param name="start">start of range</param>

-    /// <param name="count">size of range</param>

-    [Tested]

-    protected void checkRange(int start, int count)

-    {

-      if (start < 0 || count < 0 || start + count > size)

-        throw new ArgumentOutOfRangeException();

-    }

-

-

-    /// <summary>

-    /// Compute the unsequenced hash code of a collection

-    /// </summary>

-    /// <param name="items">The collection to compute hash code for</param>

-    /// <param name="itemequalityComparer">The item equalityComparer</param>

-    /// <returns>The hash code</returns>

-    [Tested]

-    public static int ComputeHashCode(ICollectionValue<T> items, SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      int h = 0;

-

-#if IMPROVED_COLLECTION_HASHFUNCTION

-      //But still heuristic: 

-      //Note: the three odd factors should really be random, 

-      //but there will be a problem with serialization/deserialization!

-      //Two products is too few

-      foreach (T item in items)

-      {

-        uint h1 = (uint)itemequalityComparer.GetHashCode(item);

-

-        h += (int)((h1 * 1529784657 + 1) ^ (h1 * 2912831877) ^ (h1 * 1118771817 + 2));

-      }

-

-      return h;

-      /*

-            The pairs (-1657792980, -1570288808) and (1862883298, -272461342) gives the same

-            unsequenced hashcode with this hashfunction. The pair was found with code like

-

-            HashDictionary<int, int[]> set = new HashDictionary<int, int[]>();

-            Random rnd = new C5Random(12345);

-            while (true)

-            {

-                int[] a = new int[2];

-                a[0] = rnd.Next(); a[1] = rnd.Next();

-                int h = unsequencedhashcode(a);

-                int[] b = a;

-                if (set.FindOrAdd(h, ref b))

-                {

-                    Console.WriteLine("Code {5}, Pair ({1},{2}) number {0} matched other pair ({3},{4})", set.Count, a[0], a[1], b[0], b[1], h);

-                }

-            }

-            */

-#else

-            foreach (T item in items)

-				h ^= itemequalityComparer.GetHashCode(item);

-

-			return (items.Count << 16) + h;

-#endif

-    }

-

-    static Type isortedtype = typeof(ISorted<T>);

-

-    /// <summary>

-    /// Examine if tit and tat are equal as unsequenced collections

-    /// using the specified item equalityComparer (assumed compatible with the two collections).

-    /// </summary>

-    /// <param name="collection1">The first collection</param>

-    /// <param name="collection2">The second collection</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use for comparison</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public static bool StaticEquals(ICollection<T> collection1, ICollection<T> collection2, SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      if (object.ReferenceEquals(collection1, collection2))

-        return true;

-

-      if (collection1.Count != collection2.Count)

-        return false;

-

-      //This way we might run through both enumerations twice, but

-      //probably not (if the hash codes are good)

-      //TODO: cehck equal equalityComparers, at least here!

-      if (collection1.GetUnsequencedHashCode() != collection2.GetUnsequencedHashCode())

-        return false;

-

-      //TODO: move this to the sorted implementation classes? 

-      //Really depends on speed of IntanceOfType: we could save a cast

-      {

-        ISorted<T> stit, stat;

-        if ((stit = collection1 as ISorted<T>) != null && (stat = collection2 as ISorted<T>) != null && stit.Comparer == stat.Comparer)

-        {

-          using (SCG.IEnumerator<T> dat = collection2.GetEnumerator(), dit = collection1.GetEnumerator())

-          {

-            while (dit.MoveNext())

-            {

-              dat.MoveNext();

-              if (!itemequalityComparer.Equals(dit.Current, dat.Current))

-                return false;

-            }

-            return true;

-          }

-        }

-      }

-

-      if (!collection1.AllowsDuplicates && (collection2.AllowsDuplicates || collection2.ContainsSpeed >= collection1.ContainsSpeed))

-      {

-        foreach (T x in collection1) if (!collection2.Contains(x)) return false;

-      }

-      else if (!collection2.AllowsDuplicates)

-      {

-        foreach (T x in collection2) if (!collection1.Contains(x)) return false;

-      }

-      // Now tit.AllowsDuplicates && tat.AllowsDuplicates

-      else if (collection1.DuplicatesByCounting && collection2.DuplicatesByCounting)

-      {

-        foreach (T item in collection2) if (collection1.ContainsCount(item) != collection2.ContainsCount(item)) return false;

-      }

-      else

-      {

-        //To avoid an O(n^2) algorithm, we make an aux hashtable to hold the count of items

-        HashDictionary<T, int> dict = new HashDictionary<T, int>();

-        foreach (T item in collection2)

-        {

-          int count = 1;

-          if (dict.FindOrAdd(item, ref count))

-            dict[item] = count + 1;

-        }

-        foreach (T item in collection1)

-        {

-          int count;

-          if (dict.Find(item, out count) && count > 0)

-            dict[item] = count - 1;

-          else

-            return false;

-        }

-        return true;

-      }

-

-      return true;

-    }

-

-

-    /// <summary>

-    /// Get the unsequenced collection hash code of this collection: from the cached 

-    /// value if present and up to date, else (re)compute.

-    /// </summary>

-    /// <returns>The hash code</returns>

-    public virtual int GetUnsequencedHashCode()

-    {

-      if (iUnSequencedHashCodeStamp == stamp)

-        return iUnSequencedHashCode;

-

-      iUnSequencedHashCode = ComputeHashCode(this, itemequalityComparer);

-      iUnSequencedHashCodeStamp = stamp;

-      return iUnSequencedHashCode;

-    }

-

-

-    /// <summary>

-    /// Check if the contents of that is equal to the contents of this

-    /// in the unsequenced sense. Using the item equalityComparer of this collection. 

-    /// Assuming that the item EqualityComparer is compatible with otherCollection!

-    /// </summary>

-    /// <param name="otherCollection">The collection to compare to.</param>

-    /// <returns>True if  equal</returns>

-    public virtual bool UnsequencedEquals(ICollection<T> otherCollection)

-    {

-      return otherCollection != null && StaticEquals((ICollection<T>)this, otherCollection, itemequalityComparer);

-    }

-

-

-    /// <summary>

-    /// Check if the collection has been modified since a specified time, expressed as a stamp value.

-    /// </summary>

-    /// <exception cref="CollectionModifiedException"> if this collection has been updated 

-    /// since a target time</exception>

-    /// <param name="thestamp">The stamp identifying the target time</param>

-    protected virtual void modifycheck(int thestamp)

-    {

-      if (this.stamp != thestamp)

-        throw new CollectionModifiedException();

-    }

-

-

-    /// <summary>

-    /// Check if it is valid to perform update operations, and if so increment stamp.

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException">If colection is read-only</exception>

-    protected virtual void updatecheck()

-    {

-      if (isReadOnly)

-        throw new ReadOnlyCollectionException();

-

-      stamp++;

-    }

-

-    #endregion

-

-    #region ICollection<T> members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if this collection is read only</value>

-    [Tested]

-    public virtual bool IsReadOnly { [Tested]get { return isReadOnly; } }

-

-    #endregion

-

-    #region ICollectionValue<T> members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The size of this collection</value>

-    [Tested]

-    public override int Count { [Tested]get { return size; } }

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>A characterization of the speed of the 

-    /// <code>Count</code> property in this collection.</value>

-    public override Speed CountSpeed { get { return Speed.Constant; } }

-

-

-    #endregion

-

-    #region IExtensible<T> members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual SCG.IEqualityComparer<T> EqualityComparer { get { return itemequalityComparer; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>A distinguished object to use for locking to synchronize multithreaded access</value>

-    [Tested]

-    public virtual object SyncRoot { get { return syncroot; } }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if this collection is empty</value>

-    [Tested]

-    public override bool IsEmpty { [Tested]get { return size == 0; } }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-    /// <summary>

-    /// Create an enumerator for this collection.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    public override abstract SCG.IEnumerator<T> GetEnumerator();

-    #endregion

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  [Serializable]

-  public abstract class DirectedCollectionBase<T> : CollectionBase<T>, IDirectedCollectionValue<T>

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="itemequalityComparer"></param>

-    public DirectedCollectionBase(SCG.IEqualityComparer<T> itemequalityComparer) : base(itemequalityComparer) { }

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    public virtual EnumerationDirection Direction { [Tested]get { return EnumerationDirection.Forwards; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public abstract IDirectedCollectionValue<T> Backwards();

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return this.Backwards(); }

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the first one in enumeration order.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <param name="item"></param>

-    /// <returns>True is such an item exists</returns>

-    public virtual bool FindLast(Fun<T, bool> predicate, out T item)

-    {

-      foreach (T jtem in Backwards())

-        if (predicate(jtem))

-        {

-          item = jtem;

-          return true;

-        }

-      item = default(T);

-      return false;

-    }

-  }

-

-  /// <summary>

-  /// Base class (abstract) for sequenced collection implementations.

-  /// </summary>

-  [Serializable]

-  public abstract class SequencedBase<T> : DirectedCollectionBase<T>, IDirectedCollectionValue<T>

-  {

-    #region Fields

-

-    int iSequencedHashCode, iSequencedHashCodeStamp = -1;

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="itemequalityComparer"></param>

-    public SequencedBase(SCG.IEqualityComparer<T> itemequalityComparer) : base(itemequalityComparer) { }

-

-    #region Util

-

-    //TODO: make random for release

-    const int HASHFACTOR = 31;

-

-    /// <summary>

-    /// Compute the unsequenced hash code of a collection

-    /// </summary>

-    /// <param name="items">The collection to compute hash code for</param>

-    /// <param name="itemequalityComparer">The item equalityComparer</param>

-    /// <returns>The hash code</returns>

-    [Tested]

-    public static int ComputeHashCode(ISequenced<T> items, SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      //NOTE: It must be possible to devise a much stronger combined hashcode, 

-      //but unfortunately, it has to be universal. OR we could use a (strong)

-      //family and initialise its parameter randomly at load time of this class!

-      //(We would not want to have yet a flag to check for invalidation?!)

-      //NBNBNB: the current hashcode has the very bad property that items with hashcode 0

-      // is ignored.

-      int iIndexedHashCode = 0;

-

-      foreach (T item in items)

-        iIndexedHashCode = iIndexedHashCode * HASHFACTOR + itemequalityComparer.GetHashCode(item);

-

-      return iIndexedHashCode;

-    }

-

-

-    /// <summary>

-    /// Examine if tit and tat are equal as sequenced collections

-    /// using the specified item equalityComparer (assumed compatible with the two collections).

-    /// </summary>

-    /// <param name="collection1">The first collection</param>

-    /// <param name="collection2">The second collection</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use for comparison</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public static bool StaticEquals(ISequenced<T> collection1, ISequenced<T> collection2, SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      if (object.ReferenceEquals(collection1, collection2))

-        return true;

-

-      if (collection1.Count != collection2.Count)

-        return false;

-

-      //This way we might run through both enumerations twice, but

-      //probably not (if the hash codes are good)

-      if (collection1.GetSequencedHashCode() != collection2.GetSequencedHashCode())

-        return false;

-

-      using (SCG.IEnumerator<T> dat = collection2.GetEnumerator(), dit = collection1.GetEnumerator())

-      {

-        while (dit.MoveNext())

-        {

-          dat.MoveNext();

-          if (!itemequalityComparer.Equals(dit.Current, dat.Current))

-            return false;

-        }

-      }

-

-      return true;

-    }

-

-

-    /// <summary>

-    /// Get the sequenced collection hash code of this collection: from the cached 

-    /// value if present and up to date, else (re)compute.

-    /// </summary>

-    /// <returns>The hash code</returns>

-    public virtual int GetSequencedHashCode()

-    {

-      if (iSequencedHashCodeStamp == stamp)

-        return iSequencedHashCode;

-

-      iSequencedHashCode = ComputeHashCode((ISequenced<T>)this, itemequalityComparer);

-      iSequencedHashCodeStamp = stamp;

-      return iSequencedHashCode;

-    }

-

-

-    /// <summary>

-    /// Check if the contents of that is equal to the contents of this

-    /// in the sequenced sense. Using the item equalityComparer of this collection.

-    /// </summary>

-    /// <param name="otherCollection">The collection to compare to.</param>

-    /// <returns>True if  equal</returns>

-    public virtual bool SequencedEquals(ISequenced<T> otherCollection)

-    {

-      return StaticEquals((ISequenced<T>)this, otherCollection, itemequalityComparer);

-    }

-

-

-    #endregion

-

-    /// <summary>

-    /// Create an enumerator for this collection.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    public override abstract SCG.IEnumerator<T> GetEnumerator();

-

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    [Tested]

-    public override EnumerationDirection Direction { [Tested]get { return EnumerationDirection.Forwards; } }

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the index of the first one.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>the index, if found, a negative value else</returns>

-    public int FindIndex(Fun<T, bool> predicate)

-    {

-      int index = 0;

-      foreach (T item in this)

-      {

-        if (predicate(item))

-          return index;

-        index++;

-      }

-      return -1;

-    }

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the index of the last one.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>the index, if found, a negative value else</returns>

-    public int FindLastIndex(Fun<T, bool> predicate)

-    {

-      int index = Count - 1;

-      foreach (T item in Backwards())

-      {

-        if (predicate(item))

-          return index;

-        index--;

-      }

-      return -1;

-    }

-

-  }

-

-

-  /// <summary>

-  /// Base class for collection classes of dynamic array type implementations.

-  /// </summary>

-  [Serializable]

-  public abstract class ArrayBase<T> : SequencedBase<T>

-  {

-    #region Fields

-    /// <summary>

-    /// The actual internal array container. Will be extended on demand.

-    /// </summary>

-    protected T[] array;

-

-    /// <summary>

-    /// The offset into the internal array container of the first item. The offset is 0 for a 

-    /// base dynamic array and may be positive for an updatable view into a base dynamic array.

-    /// </summary>

-    protected int offset;

-    #endregion

-

-    #region Util

-    /// <summary>

-    /// Double the size of the internal array.

-    /// </summary>

-    protected virtual void expand()

-    {

-      expand(2 * array.Length, size);

-    }

-

-

-    /// <summary>

-    /// Expand the internal array container.

-    /// </summary>

-    /// <param name="newcapacity">The new size of the internal array - 

-    /// will be rounded upwards to a power of 2.</param>

-    /// <param name="newsize">The (new) size of the (base) collection.</param>

-    protected virtual void expand(int newcapacity, int newsize)

-    {

-      Debug.Assert(newcapacity >= newsize);

-

-      int newlength = array.Length;

-

-      while (newlength < newcapacity) newlength *= 2;

-

-      T[] newarray = new T[newlength];

-

-      Array.Copy(array, newarray, newsize);

-      array = newarray;

-    }

-

-

-    /// <summary>

-    /// Insert an item at a specific index, moving items to the right

-    /// upwards and expanding the array if necessary.

-    /// </summary>

-    /// <param name="i">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-    protected virtual void insert(int i, T item)

-    {

-      if (size == array.Length)

-        expand();

-

-      if (i < size)

-        Array.Copy(array, i, array, i + 1, size - i);

-

-      array[i] = item;

-      size++;

-    }

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// Create an empty ArrayBase object.

-    /// </summary>

-    /// <param name="capacity">The initial capacity of the internal array container.

-    /// Will be rounded upwards to the nearest power of 2 greater than or equal to 8.</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use, primarily for item equality</param>

-    public ArrayBase(int capacity, SCG.IEqualityComparer<T> itemequalityComparer)

-      : base(itemequalityComparer)

-    {

-      int newlength = 8;

-      while (newlength < capacity) newlength *= 2;

-      array = new T[newlength];

-    }

-

-    #endregion

-

-    #region IIndexed members

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException">If the arguments does not describe a 

-    /// valid range in the indexed collection, cf. <see cref="M:C5.CollectionBase`1.checkRange(System.Int32,System.Int32)"/>.</exception>

-    /// <value>The directed collection of items in a specific index interval.</value>

-    /// <param name="start">The low index of the interval (inclusive).</param>

-    /// <param name="count">The size of the range.</param>

-    [Tested]

-    public virtual IDirectedCollectionValue<T> this[int start, int count]

-    {

-      [Tested]

-      get

-      {

-        checkRange(start, count);

-        return new Range(this, start, count, true);

-      }

-    }

-

-    #endregion

-

-    #region IEditableCollection members

-    /// <summary>

-    /// Remove all items and reset size of internal array container.

-    /// </summary>

-    [Tested]

-    public virtual void Clear()

-    {

-      updatecheck();

-      array = new T[8];

-      size = 0;

-    }

-

-

-    /// <summary>

-    /// Create an array containing (copies) of the items of this collection in enumeration order.

-    /// </summary>

-    /// <returns>The new array</returns>

-    [Tested]

-    public override T[] ToArray()

-    {

-      T[] res = new T[size];

-

-      Array.Copy(array, offset, res, 0, size);

-      return res;

-    }

-

-

-    /// <summary>

-    /// Perform an internal consistency (invariant) test on the array base.

-    /// </summary>

-    /// <returns>True if test succeeds.</returns>

-    [Tested]

-    public virtual bool Check()

-    {

-      bool retval = true;

-

-      if (size > array.Length)

-      {

-        Console.WriteLine("Bad size ({0}) > array.Length ({1})", size, array.Length);

-        return false;

-      }

-

-      for (int i = 0; i < size; i++)

-      {

-        if ((object)(array[i]) == null)

-        {

-          Console.WriteLine("Bad element: null at index {0}", i);

-          return false;

-        }

-      }

-

-      return retval;

-    }

-

-    #endregion

-

-    #region IDirectedCollection<T> Members

-

-    /// <summary>

-    /// Create a directed collection with the same contents as this one, but 

-    /// opposite enumeration sequence.

-    /// </summary>

-    /// <returns>The mirrored collection.</returns>

-    [Tested]

-    public override IDirectedCollectionValue<T> Backwards() { return this[0, size].Backwards(); }

-

-    #endregion

-

-    /// <summary>

-    /// Choose some item of this collection. The result is the last item in the internal array,

-    /// making it efficient to remove.

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    public override T Choose() { if (size > 0) return array[size - 1]; throw new NoSuchItemException(); }

-

-    #region IEnumerable<T> Members

-    /// <summary>

-    /// Create an enumerator for this array based collection.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      int thestamp = stamp, theend = size + offset, thestart = offset;

-

-      for (int i = thestart; i < theend; i++)

-      {

-        modifycheck(thestamp);

-        yield return array[i];

-      }

-    }

-    #endregion

-

-    #region Range nested class

-    /// <summary>

-    /// A helper class for defining results of interval queries on array based collections.

-    /// </summary>

-    protected class Range : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      int start, count, delta, stamp;

-

-      ArrayBase<T> thebase;

-

-

-      internal Range(ArrayBase<T> thebase, int start, int count, bool forwards)

-      {

-        this.thebase = thebase; stamp = thebase.stamp;

-        delta = forwards ? 1 : -1;

-        this.start = start + thebase.offset; this.count = count;

-      }

-

-      /// <summary>

-      /// 

-      /// </summary>

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <value>True if this collection is empty.</value>

-      public override bool IsEmpty { get { thebase.modifycheck(stamp); return count == 0; } }

-

-

-      /// <summary>

-      /// 

-      /// </summary>

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <value>The number of items in the range</value>

-      [Tested]

-      public override int Count { [Tested]get { thebase.modifycheck(stamp); return count; } }

-

-      /// <summary>

-      /// The value is symbolic indicating the type of asymptotic complexity

-      /// in terms of the size of this collection (worst-case or amortized as

-      /// relevant).

-      /// </summary>

-      /// <value>A characterization of the speed of the 

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <code>Count</code> property in this collection.</value>

-      public override Speed CountSpeed { get { thebase.modifycheck(stamp); return Speed.Constant; } }

-

-      /// <summary>

-      /// Choose some item of this collection. 

-      /// </summary>

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <exception cref="NoSuchItemException">if range is empty.</exception>

-      /// <returns></returns>

-      public override T Choose()

-      {

-        thebase.modifycheck(stamp);

-        if (count == 0)

-          throw new NoSuchItemException();

-        return thebase.array[start];

-      }

-

-

-      /// <summary>

-      /// Create an enumerator for this range of an array based collection.

-      /// </summary>

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <returns>The enumerator</returns>

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator()

-      {

-        for (int i = 0; i < count; i++)

-        {

-          thebase.modifycheck(stamp);

-          yield return thebase.array[start + delta * i];

-        }

-      }

-

-

-      /// <summary>

-      /// Create a araay collection range with the same contents as this one, but 

-      /// opposite enumeration sequence.

-      /// </summary>

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <returns>The mirrored collection.</returns>

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      {

-        thebase.modifycheck(stamp);

-

-        Range res = (Range)MemberwiseClone();

-

-        res.delta = -delta;

-        res.start = start + (count - 1) * delta;

-        return res;

-      }

-

-

-      IDirectedEnumerable<T> C5.IDirectedEnumerable<T>.Backwards()

-      {

-        return Backwards();

-      }

-

-

-      /// <summary>

-      /// <code>Forwards</code> if same, else <code>Backwards</code>

-      /// </summary>

-      /// <exception cref="CollectionModifiedException">if underlying collection has been modified.</exception>

-      /// <value>The enumeration direction relative to the original collection.</value>

-      [Tested]

-      public override EnumerationDirection Direction

-      {

-        [Tested]

-        get

-        {

-          thebase.modifycheck(stamp);

-          return delta > 0 ? EnumerationDirection.Forwards : EnumerationDirection.Backwards;

-        }

-      }

-    }

-    #endregion

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/Comparer.cs b/mcs/class/Mono.C5/C5/Comparer.cs
deleted file mode 100644
index 7d760131d9f..00000000000
--- a/mcs/class/Mono.C5/C5/Comparer.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using C5;

-using System;

-using System.Reflection;

-using System.Reflection.Emit;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{ 

-/// <summary>

-/// A default item comparer for an item type that is either generic (IComparable&lt;T&gt;)

-/// or ordinarily (System.IComparable) comparable.

-/// </summary>

-  public static class Comparer<T>

-  {

-    readonly static Type naturalComparerO = typeof(NaturalComparerO<>);

-

-    readonly static Type naturalComparer = typeof(NaturalComparer<>);

-

-    static SCG.IComparer<T> cachedComparer = null;

-

-    /// <summary>

-    /// Create a default comparer. 

-    /// <para>The IComparer[T] object is constructed when this class is initialised, i.e. 

-    /// its static constructors called. Thus, the property will be the same object 

-    /// for the duration of an invocation of the runtime, but a value serialized in 

-    /// another invocation and deserialized here will not be the same object.</para>

-    /// </summary>

-    /// <exception cref="NotComparableException">If T is not comparable</exception>

-    /// <value>The comparer</value>

-    [Tested]

-    public static SCG.IComparer<T> Default

-    {

-      get

-      {

-        if (cachedComparer != null)

-          return cachedComparer;

-

-        Type t = typeof(T);

-

-        if (t.IsValueType)

-        {

-          if (t.Equals(typeof(int)))

-            return cachedComparer = (SCG.IComparer<T>)(new IntComparer());

-

-          if (t.Equals(typeof(double)))

-            return cachedComparer = (SCG.IComparer<T>)(new DoubleComparer());

-

-          if (t.Equals(typeof(byte)))

-            return cachedComparer = (SCG.IComparer<T>)(new ByteComparer());

-        }

-

-        if (typeof(IComparable<T>).IsAssignableFrom(t))

-        {

-          Type c = naturalComparer.MakeGenericType(new Type[] { t });

-

-          return cachedComparer = (SCG.IComparer<T>)(c.GetConstructor(System.Type.EmptyTypes).Invoke(null));

-        }

-

-        if (t.GetInterface("System.IComparable") != null)

-        {

-          Type c = naturalComparerO.MakeGenericType(new Type[] { t });

-

-          return cachedComparer = (SCG.IComparer<T>)(c.GetConstructor(System.Type.EmptyTypes).Invoke(null));

-        }

-

-        throw new NotComparableException(String.Format("Cannot make comparer for type {0}", t));

-      }

-    }

-  }

-

-  /// <summary>

-  /// A natural generic IComparer for an IComparable&lt;T&gt; item type

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class NaturalComparer<T> : SCG.IComparer<T>

-      where T : IComparable<T>

-  {

-    /// <summary>

-    /// Compare two items

-    /// </summary>

-    /// <param name="item1">First item</param>

-    /// <param name="item2">Second item</param>

-    /// <returns>item1 &lt;=&gt; item2</returns>

-    [Tested]

-    public int Compare(T item1, T item2) { return item1 != null ? item1.CompareTo(item2) : item2 != null ? -1 : 0; }

-  }

-

-  /// <summary>

-  /// A natural generic IComparer for a System.IComparable item type

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class NaturalComparerO<T> : SCG.IComparer<T>

-      where T : System.IComparable

-  {

-    /// <summary>

-    /// Compare two items

-    /// </summary>

-    /// <param name="item1">First item</param>

-    /// <param name="item2">Second item</param>

-    /// <returns>item1 &lt;=&gt; item2</returns>

-    [Tested]

-    public int Compare(T item1, T item2) { return item1 != null ? item1.CompareTo(item2) : item2 != null ? -1 : 0; }

-  }

-

-  /// <summary>

-  /// A generic comparer for type T based on a Comparison[T] delegate

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class DelegateComparer<T> : SCG.IComparer<T>

-  {

-    readonly Comparison<T> cmp;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="comparison"></param>

-    public DelegateComparer(Comparison<T> comparison)

-    {

-      if (comparison == null)

-        throw new NullReferenceException("Comparison cannot be null");

-      this.cmp = comparison;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item1">First item</param>

-    /// <param name="item2">Second item</param>

-    /// <returns>item1 &lt;=&gt; item2</returns>

-    public int Compare(T item1, T item2) { return cmp(item1, item2); }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Delegates.cs b/mcs/class/Mono.C5/C5/Delegates.cs
deleted file mode 100644
index 1fd03a26852..00000000000
--- a/mcs/class/Mono.C5/C5/Delegates.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using C5;

-using System;

-using System.Reflection;

-using System.Reflection.Emit;

-using System.Diagnostics;

-

-#pragma warning disable 1711

-namespace C5

-{

-  /// <summary>

-  /// 

-  /// </summary>

-  public delegate void Act();

-  /// <summary>

-  /// <para>

-  /// The type Act[T] corresponds to System.Action[T] in the .Net

-  /// Framework class library.

-  ///</para>

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <param name="x1"></param>

-  public delegate void Act<A1>(A1 x1);

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="A2"></typeparam>

-  /// <param name="x1"></param>

-  /// <param name="x2"></param>

-  public delegate void Act<A1, A2>(A1 x1, A2 x2);

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="A2"></typeparam>

-  /// <typeparam name="A3"></typeparam>

-  /// <param name="x1"></param>

-  /// <param name="x2"></param>

-  /// <param name="x3"></param>

-  public delegate void Act<A1, A2, A3>(A1 x1, A2 x2, A3 x3);

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="A2"></typeparam>

-  /// <typeparam name="A3"></typeparam>

-  /// <typeparam name="A4"></typeparam>

-  /// <param name="x1"></param>

-  /// <param name="x2"></param>

-  /// <param name="x3"></param>

-  /// <param name="x4"></param>

-  public delegate void Act<A1, A2, A3, A4>(A1 x1, A2 x2, A3 x3, A4 x4);

-

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="R"></typeparam>

-  /// <returns></returns>

-  public delegate R Fun<R>();

-  /// <summary>

-  /// Delegate type Fun[A1,R] is the type of functions (methods) from A1

-  /// to R, used to compute some transformation for a given collection

-  /// item. 

-  /// <para>

-  /// The type Fun[T,U] corresponds to System.Converter[T,U] in the .Net

-  /// Framework class library, and the type Fun[T,bool] corresponds

-  /// System.Predicate[T] in the .Net Framework class library.</para>

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="R"></typeparam>

-  /// <param name="x1"></param>

-  /// <returns></returns>

-  public delegate R Fun<A1, R>(A1 x1);

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="A2"></typeparam>

-  /// <typeparam name="R"></typeparam>

-  /// <param name="x1"></param>

-  /// <param name="x2"></param>

-  /// <returns></returns>

-  public delegate R Fun<A1, A2, R>(A1 x1, A2 x2);

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="A2"></typeparam>

-  /// <typeparam name="A3"></typeparam>

-  /// <typeparam name="R"></typeparam>

-  /// <param name="x1"></param>

-  /// <param name="x2"></param>

-  /// <param name="x3"></param>

-  /// <returns></returns>

-  public delegate R Fun<A1, A2, A3, R>(A1 x1, A2 x2, A3 x3);

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="A1"></typeparam>

-  /// <typeparam name="A2"></typeparam>

-  /// <typeparam name="A3"></typeparam>

-  /// <typeparam name="A4"></typeparam>

-  /// <typeparam name="R"></typeparam>

-  /// <param name="x1"></param>

-  /// <param name="x2"></param>

-  /// <param name="x3"></param>

-  /// <param name="x4"></param>

-  /// <returns></returns>

-  public delegate R Fun<A1, A2, A3, A4, R>(A1 x1, A2 x2, A3 x3, A4 x4);

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/Dictionaries.cs b/mcs/class/Mono.C5/C5/Dictionaries.cs
deleted file mode 100644
index fcf84c2eb71..00000000000
--- a/mcs/class/Mono.C5/C5/Dictionaries.cs
+++ /dev/null
@@ -1,1297 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// An entry in a dictionary from K to V.

-  /// </summary>

-  [Serializable]

-  public struct KeyValuePair<K, V> : IEquatable<KeyValuePair<K, V>>, IShowable

-  {

-    /// <summary>

-    /// The key field of the entry

-    /// </summary>

-    public K Key;

-

-    /// <summary>

-    /// The value field of the entry

-    /// </summary>

-    public V Value;

-

-    /// <summary>

-    /// Create an entry with specified key and value

-    /// </summary>

-    /// <param name="key">The key</param>

-    /// <param name="value">The value</param>

-    public KeyValuePair(K key, V value) { Key = key; Value = value; }

-

-

-    /// <summary>

-    /// Create an entry with a specified key. The value will be the default value of type <code>V</code>.

-    /// </summary>

-    /// <param name="key">The key</param>

-    public KeyValuePair(K key) { Key = key; Value = default(V); }

-

-

-    /// <summary>

-    /// Pretty print an entry

-    /// </summary>

-    /// <returns>(key, value)</returns>

-    [Tested]

-    public override string ToString() { return "(" + Key + ", " + Value + ")"; }

-

-

-    /// <summary>

-    /// Check equality of entries. 

-    /// </summary>

-    /// <param name="obj">The other object</param>

-    /// <returns>True if obj is an entry of the same type and has the same key and value</returns>

-    [Tested]

-    public override bool Equals(object obj)

-    {

-      if (!(obj is KeyValuePair<K, V>))

-        return false;

-      KeyValuePair<K, V> other = (KeyValuePair<K, V>)obj;

-      return Equals(other);

-    }

-

-

-    /// <summary>

-    /// Get the hash code of the pair.

-    /// </summary>

-    /// <returns>The hash code</returns>

-    [Tested]

-    public override int GetHashCode() { return EqualityComparer<K>.Default.GetHashCode(Key) + 13984681 * EqualityComparer<V>.Default.GetHashCode(Value); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="other"></param>

-    /// <returns></returns>

-    public bool Equals(KeyValuePair<K, V> other)

-    {

-      return EqualityComparer<K>.Default.Equals(Key, other.Key) && EqualityComparer<V>.Default.Equals(Value, other.Value);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="pair1"></param>

-    /// <param name="pair2"></param>

-    /// <returns></returns>

-    public static bool operator ==(KeyValuePair<K, V> pair1, KeyValuePair<K, V> pair2) { return pair1.Equals(pair2); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="pair1"></param>

-    /// <param name="pair2"></param>

-    /// <returns></returns>

-    public static bool operator !=(KeyValuePair<K, V> pair1, KeyValuePair<K, V> pair2) { return !pair1.Equals(pair2); }

-

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="formatProvider"></param>

-    /// <param name="rest"></param>

-    /// <returns></returns>

-    public bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      if (rest < 0)

-        return false;

-      if (!Showing.Show(Key, stringbuilder, ref rest, formatProvider))

-        return false;

-      stringbuilder.Append(" => ");

-      rest -= 4;

-      if (!Showing.Show(Value, stringbuilder, ref rest, formatProvider))

-        return false;

-      return rest >= 0;

-    }

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public string ToString(string format, IFormatProvider formatProvider)

-    {

-      return Showing.ShowString(this, format, formatProvider);

-    }

-

-    #endregion

-  }

-

-

-

-  /// <summary>

-  /// Default comparer for dictionary entries in a sorted dictionary.

-  /// Entry comparisons only look at keys and uses an externally defined comparer for that.

-  /// </summary>

-  [Serializable]

-  public class KeyValuePairComparer<K, V> : SCG.IComparer<KeyValuePair<K, V>>

-  {

-    SCG.IComparer<K> comparer;

-

-

-    /// <summary>

-    /// Create an entry comparer for a item comparer of the keys

-    /// </summary>

-    /// <param name="comparer">Comparer of keys</param>

-    public KeyValuePairComparer(SCG.IComparer<K> comparer)

-    {

-      if (comparer == null)

-        throw new NullReferenceException();

-      this.comparer = comparer;

-    }

-

-

-    /// <summary>

-    /// Compare two entries

-    /// </summary>

-    /// <param name="entry1">First entry</param>

-    /// <param name="entry2">Second entry</param>

-    /// <returns>The result of comparing the keys</returns>

-    [Tested]

-    public int Compare(KeyValuePair<K, V> entry1, KeyValuePair<K, V> entry2)

-    { return comparer.Compare(entry1.Key, entry2.Key); }

-  }

-

-

-

-  /// <summary>

-  /// Default equalityComparer for dictionary entries.

-  /// Operations only look at keys and uses an externaly defined equalityComparer for that.

-  /// </summary>

-  [Serializable]

-  public sealed class KeyValuePairEqualityComparer<K, V> : SCG.IEqualityComparer<KeyValuePair<K, V>>

-  {

-    SCG.IEqualityComparer<K> keyequalityComparer;

-

-

-    /// <summary>

-    /// Create an entry equalityComparer using the default equalityComparer for keys

-    /// </summary>

-    public KeyValuePairEqualityComparer() { keyequalityComparer = EqualityComparer<K>.Default; }

-

-

-    /// <summary>

-    /// Create an entry equalityComparer from a specified item equalityComparer for the keys

-    /// </summary>

-    /// <param name="keyequalityComparer">The key equalityComparer</param>

-    public KeyValuePairEqualityComparer(SCG.IEqualityComparer<K> keyequalityComparer)

-    {

-      if (keyequalityComparer == null)

-        throw new NullReferenceException("Key equality comparer cannot be null");

-      this.keyequalityComparer = keyequalityComparer;

-    }

-

-

-    /// <summary>

-    /// Get the hash code of the entry

-    /// </summary>

-    /// <param name="entry">The entry</param>

-    /// <returns>The hash code of the key</returns>

-    [Tested]

-    public int GetHashCode(KeyValuePair<K, V> entry) { return keyequalityComparer.GetHashCode(entry.Key); }

-

-

-    /// <summary>

-    /// Test two entries for equality

-    /// </summary>

-    /// <param name="entry1">First entry</param>

-    /// <param name="entry2">Second entry</param>

-    /// <returns>True if keys are equal</returns>

-    [Tested]

-    public bool Equals(KeyValuePair<K, V> entry1, KeyValuePair<K, V> entry2)

-    { return keyequalityComparer.Equals(entry1.Key, entry2.Key); }

-  }

-

-

-

-  /// <summary>

-  /// A base class for implementing a dictionary based on a set collection implementation.

-  /// <i>See the source code for <see cref="T:C5.HashDictionary`2"/> for an example</i>

-  /// 

-  /// </summary>

-  [Serializable]

-  public abstract class DictionaryBase<K, V> : CollectionValueBase<KeyValuePair<K, V>>, IDictionary<K, V>

-  {

-    /// <summary>

-    /// The set collection of entries underlying this dictionary implementation

-    /// </summary>

-    protected ICollection<KeyValuePair<K, V>> pairs;

-

-    SCG.IEqualityComparer<K> keyequalityComparer;

-

-    #region Events

-    ProxyEventBlock<KeyValuePair<K, V>> eventBlock;

-

-    /// <summary>

-    /// The change event. Will be raised for every change operation on the collection.

-    /// </summary>

-    public override event CollectionChangedHandler<KeyValuePair<K, V>> CollectionChanged

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<KeyValuePair<K, V>>(this, pairs))).CollectionChanged += value; }

-      remove { if (eventBlock != null) eventBlock.CollectionChanged -= value; }

-    }

-

-    /// <summary>

-    /// The change event. Will be raised for every change operation on the collection.

-    /// </summary>

-    public override event CollectionClearedHandler<KeyValuePair<K, V>> CollectionCleared

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<KeyValuePair<K, V>>(this, pairs))).CollectionCleared += value; }

-      remove { if (eventBlock != null) eventBlock.CollectionCleared -= value; }

-    }

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual addition to the collection.

-    /// </summary>

-    public override event ItemsAddedHandler<KeyValuePair<K, V>> ItemsAdded

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<KeyValuePair<K, V>>(this, pairs))).ItemsAdded += value; }

-      remove { if (eventBlock != null) eventBlock.ItemsAdded -= value; }

-    }

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual removal from the collection.

-    /// </summary>

-    public override event ItemsRemovedHandler<KeyValuePair<K, V>> ItemsRemoved

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<KeyValuePair<K, V>>(this, pairs))).ItemsRemoved += value; }

-      remove { if (eventBlock != null) eventBlock.ItemsRemoved -= value; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public override EventTypeEnum ListenableEvents

-    {

-      get

-      {

-        return EventTypeEnum.Basic;

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public override EventTypeEnum ActiveEvents

-    {

-      get

-      {

-        return pairs.ActiveEvents;

-      }

-    }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="keyequalityComparer"></param>

-    public DictionaryBase(SCG.IEqualityComparer<K> keyequalityComparer) {

-      if (keyequalityComparer == null)

-        throw new NullReferenceException("Key equality comparer cannot be null");

-      this.keyequalityComparer = keyequalityComparer; }

-

-    #region IDictionary<K,V> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual SCG.IEqualityComparer<K> EqualityComparer { get { return keyequalityComparer; } }

-

-

-    /// <summary>

-    /// Add a new (key, value) pair (a mapping) to the dictionary.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException"> if there already is an entry with the same key. </exception>

-    /// <param name="key">Key to add</param>

-    /// <param name="value">Value to add</param>

-    [Tested]

-    public virtual void Add(K key, V value)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key, value);

-

-      if (!pairs.Add(p))

-        throw new DuplicateNotAllowedException("Key being added: '" + key + "'");

-    }

-

-    /// <summary>

-    /// Add the entries from a collection of <see cref="T:C5.KeyValuePair`2"/> pairs to this dictionary.

-    /// <para><b>TODO: add restrictions L:K and W:V when the .Net SDK allows it </b></para>

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException"> 

-    /// If the input contains duplicate keys or a key already present in this dictionary.</exception>

-    /// <param name="entries"></param>

-    public virtual void AddAll<L,W>(SCG.IEnumerable<KeyValuePair<L, W>> entries)

-        where L : K

-        where W : V

-    {

-      foreach (KeyValuePair<L, W> pair in entries)

-      {

-        KeyValuePair<K, V> p = new KeyValuePair<K, V>(pair.Key, pair.Value);

-        if (!pairs.Add(p))

-          throw new DuplicateNotAllowedException("Key being added: '" + pair.Key + "'");

-      }

-    }

-

-    /// <summary>

-    /// Remove an entry with a given key from the dictionary

-    /// </summary>

-    /// <param name="key">The key of the entry to remove</param>

-    /// <returns>True if an entry was found (and removed)</returns>

-    [Tested]

-    public virtual bool Remove(K key)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      return pairs.Remove(p);

-    }

-

-

-    /// <summary>

-    /// Remove an entry with a given key from the dictionary and report its value.

-    /// </summary>

-    /// <param name="key">The key of the entry to remove</param>

-    /// <param name="value">On exit, the value of the removed entry</param>

-    /// <returns>True if an entry was found (and removed)</returns>

-    [Tested]

-    public virtual bool Remove(K key, out V value)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      if (pairs.Remove(p, out p))

-      {

-        value = p.Value;

-        return true;

-      }

-      else

-      {

-        value = default(V);

-        return false;

-      }

-    }

-

-

-    /// <summary>

-    /// Remove all entries from the dictionary

-    /// </summary>

-    [Tested]

-    public virtual void Clear() { pairs.Clear(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed ContainsSpeed { get { return pairs.ContainsSpeed; } }

-

-    /// <summary>

-    /// Check if there is an entry with a specified key

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <returns>True if key was found</returns>

-    [Tested]

-    public virtual bool Contains(K key)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      return pairs.Contains(p);

-    }

-

-      class LiftedEnumerable<H> : SCG.IEnumerable<KeyValuePair<K, V>> where H : K

-      {

-          SCG.IEnumerable<H> keys;

-          public LiftedEnumerable(SCG.IEnumerable<H> keys) { this.keys = keys; }

-          public SCG.IEnumerator<KeyValuePair<K, V>> GetEnumerator() { foreach (H key in keys) yield return new KeyValuePair<K, V>(key); }

-

-          #region IEnumerable Members

-

-          System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-          {

-              throw new Exception("The method or operation is not implemented.");

-          }

-

-          #endregion

-      }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="keys"></param>

-    /// <returns></returns>

-      public virtual bool ContainsAll<H>(SCG.IEnumerable<H> keys) where H : K

-      {

-          return pairs.ContainsAll(new LiftedEnumerable<H>(keys));

-      }

-

-    /// <summary>

-    /// Check if there is an entry with a specified key and report the corresponding

-    /// value if found. This can be seen as a safe form of "val = this[key]".

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="value">On exit, the value of the entry</param>

-    /// <returns>True if key was found</returns>

-    [Tested]

-    public virtual bool Find(K key, out V value)

-    {

-      return Find(ref key, out value);

-    }

-    /// <summary>

-    /// Check if there is an entry with a specified key and report the corresponding

-    /// value if found. This can be seen as a safe form of "val = this[key]".

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="value">On exit, the value of the entry</param>

-    /// <returns>True if key was found</returns>

-    public virtual bool Find(ref K key, out V value)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      if (pairs.Find(ref p))

-      {

-        key = p.Key;

-        value = p.Value;

-        return true;

-      }

-      else

-      {

-        value = default(V);

-        return false;

-      }

-    }

-

-

-    /// <summary>

-    /// Look for a specific key in the dictionary and if found replace the value with a new one.

-    /// This can be seen as a non-adding version of "this[key] = val".

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="value">The new value</param>

-    /// <returns>True if key was found</returns>

-    [Tested]

-    public virtual bool Update(K key, V value)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key, value);

-

-      return pairs.Update(p);

-    }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="key"></param>

-    /// <param name="value"></param>

-    /// <param name="oldvalue"></param>

-    /// <returns></returns>

-    public virtual bool Update(K key, V value, out V oldvalue)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key, value);

-

-      bool retval = pairs.Update(p, out p);

-      oldvalue = p.Value;

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Look for a specific key in the dictionary. If found, report the corresponding value,

-    /// else add an entry with the key and the supplied value.

-    /// </summary>

-    /// <param name="key">On entry the key to look for</param>

-    /// <param name="value">On entry the value to add if the key is not found.

-    /// On exit the value found if any.</param>

-    /// <returns>True if key was found</returns>

-    [Tested]

-    public virtual bool FindOrAdd(K key, ref V value)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key, value);

-

-      if (!pairs.FindOrAdd(ref p))

-        return false;

-      else

-      {

-        value = p.Value;

-        //key = p.key;

-        return true;

-      }

-    }

-

-

-    /// <summary>

-    /// Update value in dictionary corresponding to key if found, else add new entry.

-    /// More general than "this[key] = val;" by reporting if key was found.

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="value">The value to add or replace with.</param>

-    /// <returns>True if entry was updated.</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(K key, V value)

-    {

-      return pairs.UpdateOrAdd(new KeyValuePair<K, V>(key, value));

-    }

-

-

-    /// <summary>

-    /// Update value in dictionary corresponding to key if found, else add new entry.

-    /// More general than "this[key] = val;" by reporting if key was found and the old value if any.

-    /// </summary>

-    /// <param name="key"></param>

-    /// <param name="value"></param>

-    /// <param name="oldvalue"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(K key, V value, out V oldvalue)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key, value);

-      bool retval = pairs.UpdateOrAdd(p, out p);

-      oldvalue = p.Value;

-      return retval;

-    }

-

-

-

-    #region Keys,Values support classes

-

-    internal class ValuesCollection : CollectionValueBase<V>, ICollectionValue<V>

-    {

-      ICollection<KeyValuePair<K, V>> pairs;

-

-

-      internal ValuesCollection(ICollection<KeyValuePair<K, V>> pairs)

-      { this.pairs = pairs; }

-

-

-      public override V Choose() { return pairs.Choose().Value; }

-

-      [Tested]

-      public override SCG.IEnumerator<V> GetEnumerator()

-      {

-        //Updatecheck is performed by the pairs enumerator

-        foreach (KeyValuePair<K, V> p in pairs)

-          yield return p.Value;

-      }

-

-      public override bool IsEmpty { get { return pairs.IsEmpty; } }

-

-      [Tested]

-      public override int Count { [Tested]get { return pairs.Count; } }

-

-      public override Speed CountSpeed { get { return Speed.Constant; } }

-    }

-

-

-

-    internal class KeysCollection : CollectionValueBase<K>, ICollectionValue<K>

-    {

-      ICollection<KeyValuePair<K, V>> pairs;

-

-

-      internal KeysCollection(ICollection<KeyValuePair<K, V>> pairs)

-      { this.pairs = pairs; }

-

-      public override K Choose() { return pairs.Choose().Key; }

-

-      [Tested]

-      public override SCG.IEnumerator<K> GetEnumerator()

-      {

-        foreach (KeyValuePair<K, V> p in pairs)

-          yield return p.Key;

-      }

-

-      public override bool IsEmpty { get { return pairs.IsEmpty; } }

-

-      [Tested]

-      public override int Count { [Tested]get { return pairs.Count; } }

-

-      public override Speed CountSpeed { get { return pairs.CountSpeed; } }

-    }

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>A collection containg the all the keys of the dictionary</value>

-    [Tested]

-    public virtual ICollectionValue<K> Keys { [Tested]get { return new KeysCollection(pairs); } }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>A collection containing all the values of the dictionary</value>

-    [Tested]

-    public virtual ICollectionValue<V> Values { [Tested]get { return new ValuesCollection(pairs); } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual Fun<K, V> Fun { get { return delegate(K k) { return this[k]; }; } }

-

-    /// <summary>

-    /// Indexer by key for dictionary. 

-    /// <para>The get method will throw an exception if no entry is found. </para>

-    /// <para>The set method behaves like <see cref="M:C5.DictionaryBase`2.UpdateOrAdd(`0,`1)"/>.</para>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> On get if no entry is found. </exception>

-    /// <value>The value corresponding to the key</value>

-    [Tested]

-    public virtual V this[K key]

-    {

-      [Tested]

-      get

-      {

-        KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-        if (pairs.Find(ref p))

-          return p.Value;

-        else

-          throw new NoSuchItemException("Key '" + key.ToString() + "' not present in Dictionary");

-      }

-      [Tested]

-      set

-      { pairs.UpdateOrAdd(new KeyValuePair<K, V>(key, value)); }

-    }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if dictionary is read  only</value>

-    [Tested]

-    public virtual bool IsReadOnly { [Tested]get { return pairs.IsReadOnly; } }

-

-

-    /// <summary>

-    /// Check the integrity of the internal data structures of this dictionary.

-    /// </summary>

-    /// <returns>True if check does not fail.</returns>

-    [Tested]

-    public virtual bool Check() { return pairs.Check(); }

-

-    #endregion

-

-    #region ICollectionValue<KeyValuePair<K,V>> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if this collection is empty.</value>

-    public override bool IsEmpty { get { return pairs.IsEmpty; } }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of entrues in the dictionary</value>

-    [Tested]

-    public override int Count { [Tested]get { return pairs.Count; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of entrues in the dictionary</value>

-    [Tested]

-    public override Speed CountSpeed { [Tested]get { return pairs.CountSpeed; } }

-

-    /// <summary>

-    /// Choose some entry in this Dictionary. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    public override KeyValuePair<K, V> Choose() { return pairs.Choose(); }

-

-    /// <summary>

-    /// Create an enumerator for the collection of entries of the dictionary

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<KeyValuePair<K, V>> GetEnumerator()

-    {

-      return pairs.GetEnumerator(); ;

-    }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public override bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      return Showing.ShowDictionary<K, V>(this, stringbuilder, ref rest, formatProvider);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public abstract object Clone();

-

-  }

-

-  /// <summary>

-  /// A base class for implementing a sorted dictionary based on a sorted set collection implementation.

-  /// <i>See the source code for <see cref="T:C5.TreeDictionary`2"/> for an example</i>

-  /// 

-  /// </summary>

-  public abstract class SortedDictionaryBase<K, V> : DictionaryBase<K, V>, ISortedDictionary<K, V>

-  {

-    #region Fields

-

-    /// <summary>

-    /// 

-    /// </summary>

-    protected ISorted<KeyValuePair<K, V>> sortedpairs;

-    SCG.IComparer<K> keycomparer;

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="keycomparer"></param>

-    /// <param name="keyequalityComparer"></param>

-    public SortedDictionaryBase(SCG.IComparer<K> keycomparer, SCG.IEqualityComparer<K> keyequalityComparer) : base(keyequalityComparer) { this.keycomparer = keycomparer; }

-

-    #endregion

-

-    #region ISortedDictionary<K,V> Members

-

-    /// <summary>

-    /// The key comparer used by this dictionary.

-    /// </summary>

-    /// <value></value>

-    public SCG.IComparer<K> Comparer { get { return keycomparer; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public new ISorted<K> Keys { get { return new SortedKeysCollection(this, sortedpairs, keycomparer, EqualityComparer); } }

-

-    /// <summary>

-    /// Get the entry in the dictionary whose key is the

-    /// predecessor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"></exception>

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    [Tested]

-    public KeyValuePair<K, V> Predecessor(K key)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      return sortedpairs.Predecessor(p);

-    }

-

-

-    /// <summary>

-    /// Get the entry in the dictionary whose key is the

-    /// weak predecessor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"></exception>

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    [Tested]

-    public KeyValuePair<K, V> WeakPredecessor(K key)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      return sortedpairs.WeakPredecessor(p);

-    }

-

-

-    /// <summary>

-    /// Get the entry in the dictionary whose key is the

-    /// successor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"></exception>

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    [Tested]

-    public KeyValuePair<K, V> Successor(K key)

-    {

-      KeyValuePair<K, V> p = new KeyValuePair<K, V>(key);

-

-      return sortedpairs.Successor(p);

-    }

-

-

-    /// <summary>

-    /// Get the entry in the dictionary whose key is the

-    /// weak successor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"></exception>

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    [Tested]

-    public KeyValuePair<K, V> WeakSuccessor(K key)

-    {

-      return sortedpairs.WeakSuccessor(new KeyValuePair<K, V>(key));

-    }

-

-    #endregion

-

-    #region ISortedDictionary<K,V> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public KeyValuePair<K, V> FindMin()

-    {

-      return sortedpairs.FindMin();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public KeyValuePair<K, V> DeleteMin()

-    {

-      return sortedpairs.DeleteMin();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public KeyValuePair<K, V> FindMax()

-    {

-      return sortedpairs.FindMax();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public KeyValuePair<K, V> DeleteMax()

-    {

-      return sortedpairs.DeleteMax();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="cutter"></param>

-    /// <param name="lowEntry"></param>

-    /// <param name="lowIsValid"></param>

-    /// <param name="highEntry"></param>

-    /// <param name="highIsValid"></param>

-    /// <returns></returns>

-    public bool Cut(IComparable<K> cutter, out KeyValuePair<K, V> lowEntry, out bool lowIsValid, out KeyValuePair<K, V> highEntry, out bool highIsValid)

-    {

-      return sortedpairs.Cut(new KeyValuePairComparable(cutter), out lowEntry, out lowIsValid, out highEntry, out highIsValid);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<KeyValuePair<K, V>> RangeFrom(K bot)

-    {

-      return sortedpairs.RangeFrom(new KeyValuePair<K, V>(bot));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<KeyValuePair<K, V>> RangeFromTo(K bot, K top)

-    {

-      return sortedpairs.RangeFromTo(new KeyValuePair<K, V>(bot), new KeyValuePair<K, V>(top));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<KeyValuePair<K, V>> RangeTo(K top)

-    {

-      return sortedpairs.RangeTo(new KeyValuePair<K, V>(top));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public IDirectedCollectionValue<KeyValuePair<K, V>> RangeAll()

-    {

-      return sortedpairs.RangeAll();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="items"></param>

-    public void AddSorted(SCG.IEnumerable<KeyValuePair<K, V>> items)

-    {

-      sortedpairs.AddSorted(items);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="lowKey"></param>

-    public void RemoveRangeFrom(K lowKey)

-    {

-      sortedpairs.RemoveRangeFrom(new KeyValuePair<K, V>(lowKey));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="lowKey"></param>

-    /// <param name="highKey"></param>

-    public void RemoveRangeFromTo(K lowKey, K highKey)

-    {

-      sortedpairs.RemoveRangeFromTo(new KeyValuePair<K, V>(lowKey), new KeyValuePair<K, V>(highKey));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="highKey"></param>

-    public void RemoveRangeTo(K highKey)

-    {

-      sortedpairs.RemoveRangeTo(new KeyValuePair<K, V>(highKey));

-    }

-

-    #endregion

-

-    class KeyValuePairComparable : IComparable<KeyValuePair<K, V>>

-    {

-      IComparable<K> cutter;

-

-      internal KeyValuePairComparable(IComparable<K> cutter) { this.cutter = cutter; }

-

-      public int CompareTo(KeyValuePair<K, V> other) { return cutter.CompareTo(other.Key); }

-

-      public bool Equals(KeyValuePair<K, V> other) { return cutter.Equals(other.Key); }

-    }

-

-    class ProjectedDirectedEnumerable : MappedDirectedEnumerable<KeyValuePair<K, V>, K>

-    {

-      public ProjectedDirectedEnumerable(IDirectedEnumerable<KeyValuePair<K, V>> directedpairs) : base(directedpairs) { }

-

-      public override K Map(KeyValuePair<K, V> pair) { return pair.Key; }

-

-    }

-

-    class ProjectedDirectedCollectionValue : MappedDirectedCollectionValue<KeyValuePair<K, V>, K>

-    {

-      public ProjectedDirectedCollectionValue(IDirectedCollectionValue<KeyValuePair<K, V>> directedpairs) : base(directedpairs) { }

-

-      public override K Map(KeyValuePair<K, V> pair) { return pair.Key; }

-

-    }

-

-    class SortedKeysCollection : SequencedBase<K>, ISorted<K>

-    {

-      ISortedDictionary<K, V> sorteddict;

-      //TODO: eliminate this. Only problem is the Find method because we lack method on dictionary that also 

-      //      returns the actual key.

-      ISorted<KeyValuePair<K, V>> sortedpairs;

-      SCG.IComparer<K> comparer;

-

-      internal SortedKeysCollection(ISortedDictionary<K, V> sorteddict, ISorted<KeyValuePair<K, V>> sortedpairs, SCG.IComparer<K> comparer, SCG.IEqualityComparer<K> itemequalityComparer) 

-        :base(itemequalityComparer)

-      {

-        this.sorteddict = sorteddict;

-        this.sortedpairs = sortedpairs;

-        this.comparer = comparer;

-      }

-

-      public override K Choose() { return sorteddict.Choose().Key; }

-

-      public override SCG.IEnumerator<K> GetEnumerator()

-      {

-        foreach (KeyValuePair<K, V> p in sorteddict)

-          yield return p.Key;

-      }

-

-      public override bool IsEmpty { get { return sorteddict.IsEmpty; } }

-

-      public override int Count { [Tested]get { return sorteddict.Count; } }

-

-      public override Speed CountSpeed { get { return sorteddict.CountSpeed; } }

-

-      #region ISorted<K> Members

-

-      public K FindMin() { return sorteddict.FindMin().Key; }

-

-      public K DeleteMin() { throw new ReadOnlyCollectionException(); }

-

-      public K FindMax() { return sorteddict.FindMax().Key; }

-

-      public K DeleteMax() { throw new ReadOnlyCollectionException(); }

-

-      public SCG.IComparer<K> Comparer { get { return comparer; } }

-

-      public K Predecessor(K item) { return sorteddict.Predecessor(item).Key; }

-

-      public K Successor(K item) { return sorteddict.Successor(item).Key; }

-

-      public K WeakPredecessor(K item) { return sorteddict.WeakPredecessor(item).Key; }

-

-      public K WeakSuccessor(K item) { return sorteddict.WeakSuccessor(item).Key; }

-

-      public bool Cut(IComparable<K> c, out K low, out bool lowIsValid, out K high, out bool highIsValid)

-      {

-        KeyValuePair<K, V> lowpair, highpair;

-        bool retval = sorteddict.Cut(c, out lowpair, out lowIsValid, out highpair, out highIsValid);

-        low = lowpair.Key;

-        high = highpair.Key;

-        return retval;

-      }

-

-      public IDirectedEnumerable<K> RangeFrom(K bot)

-      {

-        return new ProjectedDirectedEnumerable(sorteddict.RangeFrom(bot));

-      }

-

-      public IDirectedEnumerable<K> RangeFromTo(K bot, K top)

-      {

-        return new ProjectedDirectedEnumerable(sorteddict.RangeFromTo(bot, top));

-      }

-

-      public IDirectedEnumerable<K> RangeTo(K top)

-      {

-        return new ProjectedDirectedEnumerable(sorteddict.RangeTo(top));

-      }

-

-      public IDirectedCollectionValue<K> RangeAll()

-      {

-        return new ProjectedDirectedCollectionValue(sorteddict.RangeAll());

-      }

-

-      public void AddSorted<U>(SCG.IEnumerable<U> items) where U : K { throw new ReadOnlyCollectionException(); }

-

-      public void RemoveRangeFrom(K low) { throw new ReadOnlyCollectionException(); }

-

-      public void RemoveRangeFromTo(K low, K hi) { throw new ReadOnlyCollectionException(); }

-

-      public void RemoveRangeTo(K hi) { throw new ReadOnlyCollectionException(); }

-      #endregion

-

-      #region ICollection<K> Members

-      public Speed ContainsSpeed { get { return sorteddict.ContainsSpeed; } }

-

-      public bool Contains(K key) { return sorteddict.Contains(key); ;      }

-

-      public int ContainsCount(K item) { return sorteddict.Contains(item) ? 1 : 0; }

-

-      /// <summary>

-      /// 

-      /// </summary>

-      /// <returns></returns>

-      public virtual ICollectionValue<K> UniqueItems()

-      {

-        return this;

-      }

-

-      /// <summary>

-      /// 

-      /// </summary>

-      /// <returns></returns>

-      public virtual ICollectionValue<KeyValuePair<K, int>> ItemMultiplicities()

-      {

-        return new MultiplicityOne<K>(this);

-      }

-

-

-      public bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : K

-      {

-        //TODO: optimize?

-        foreach (K item in items)

-          if (!sorteddict.Contains(item))

-            return false;

-        return true;

-      }

-

-      public bool Find(ref K item)

-      {

-        KeyValuePair<K, V> p = new KeyValuePair<K, V>(item);

-        bool retval = sortedpairs.Find(ref p);

-        item = p.Key;

-        return retval;

-      }

-

-      public bool FindOrAdd(ref K item) { throw new ReadOnlyCollectionException(); }

-

-      public bool Update(K item) { throw new ReadOnlyCollectionException(); }

-

-      public bool Update(K item, out K olditem) { throw new ReadOnlyCollectionException(); }

-

-      public bool UpdateOrAdd(K item) { throw new ReadOnlyCollectionException(); }

-

-      public bool UpdateOrAdd(K item, out K olditem) { throw new ReadOnlyCollectionException(); }

-

-      public bool Remove(K item) { throw new ReadOnlyCollectionException(); }

-

-      public bool Remove(K item, out K removeditem) { throw new ReadOnlyCollectionException(); }

-

-      public void RemoveAllCopies(K item) { throw new ReadOnlyCollectionException(); }

-

-      public void RemoveAll<U> (SCG.IEnumerable<U> items)  where U : K { throw new ReadOnlyCollectionException(); }

-

-      public void Clear() { throw new ReadOnlyCollectionException(); }

-

-      public void RetainAll<U>(SCG.IEnumerable<U> items) where U : K { throw new ReadOnlyCollectionException(); }

-

-      #endregion

-

-      #region IExtensible<K> Members

-      public override bool IsReadOnly { get { return true; } }

-

-      public bool AllowsDuplicates { get { return false; } }

-

-      public bool DuplicatesByCounting { get { return true; } }

-

-      public bool Add(K item) { throw new ReadOnlyCollectionException(); }

-

-      public void AddAll(System.Collections.Generic.IEnumerable<K> items) { throw new ReadOnlyCollectionException(); }

-

-      public void AddAll<U>(System.Collections.Generic.IEnumerable<U> items) where U : K { throw new ReadOnlyCollectionException(); }

-

-      public bool Check() { return sorteddict.Check(); }

-

-      #endregion

-

-      #region IDirectedCollectionValue<K> Members

-

-      public override IDirectedCollectionValue<K> Backwards()

-      {

-        return RangeAll().Backwards();

-      }

-

-      #endregion

-

-      #region IDirectedEnumerable<K> Members

-

-      IDirectedEnumerable<K> IDirectedEnumerable<K>.Backwards() { return Backwards(); }

-      #endregion

-

-      #region ICloneable Members

-

-      //TODO: test

-      /// <summary>

-      /// Make a shallow copy of this SortedKeysCollection.

-      /// </summary>

-      /// <returns></returns>

-      public virtual object Clone()

-      {

-        //

-        SortedArrayDictionary<K, V> dictclone = new SortedArrayDictionary<K, V>(sortedpairs.Count, comparer, EqualityComparer);

-        SortedArray<KeyValuePair<K, V>> sortedpairsclone = (SortedArray<KeyValuePair<K, V>>)(dictclone.sortedpairs);

-        foreach (K key in sorteddict.Keys)

-        {

-          sortedpairsclone.Add(new KeyValuePair<K, V>(key, default(V)));

-        }

-        return new SortedKeysCollection(dictclone, sortedpairsclone, comparer, EqualityComparer);

-      }

-

-      #endregion

-

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public override bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      return Showing.ShowDictionary<K, V>(this, stringbuilder, ref rest, formatProvider);

-    }

-

-  }

-

-  class SortedArrayDictionary<K, V> : SortedDictionaryBase<K, V>, IDictionary<K, V>, ISortedDictionary<K, V>

-  {

-    #region Constructors

-

-    public SortedArrayDictionary() : this(Comparer<K>.Default, EqualityComparer<K>.Default) { }

-

-    /// <summary>

-    /// Create a red-black tree dictionary using an external comparer for keys.

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    public SortedArrayDictionary(SCG.IComparer<K> comparer) : this(comparer, new ComparerZeroHashCodeEqualityComparer<K>(comparer)) { }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="comparer"></param>

-    /// <param name="equalityComparer"></param>

-    public SortedArrayDictionary(SCG.IComparer<K> comparer, SCG.IEqualityComparer<K> equalityComparer) : base(comparer,equalityComparer)

-    {

-      pairs = sortedpairs = new SortedArray<KeyValuePair<K, V>>(new KeyValuePairComparer<K, V>(comparer));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="comparer"></param>

-    /// <param name="equalityComparer"></param>

-    /// <param name="capacity"></param>

-    public SortedArrayDictionary(int capacity, SCG.IComparer<K> comparer, SCG.IEqualityComparer<K> equalityComparer) : base(comparer,equalityComparer)

-    {

-      pairs = sortedpairs = new SortedArray<KeyValuePair<K, V>>(capacity, new KeyValuePairComparer<K, V>(comparer));

-    }

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      SortedArrayDictionary<K, V> clone = new SortedArrayDictionary<K, V>(Comparer, EqualityComparer);

-      clone.sortedpairs.AddSorted(sortedpairs);

-      return clone;

-    }

-

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Enums.cs b/mcs/class/Mono.C5/C5/Enums.cs
deleted file mode 100644
index 5dcd85971c1..00000000000
--- a/mcs/class/Mono.C5/C5/Enums.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-

-  /// <summary>

-  /// The symbolic characterization of the speed of lookups for a collection.

-  /// The values may refer to worst-case, amortized and/or expected asymtotic 

-  /// complexity wrt. the collection size.

-  /// </summary>

-  public enum Speed : short

-  {

-    /// <summary>

-    /// Counting the collection with the <code>Count property</code> may not return

-    /// (for a synthetic and potentially infinite collection).

-    /// </summary>

-    PotentiallyInfinite = 1,

-    /// <summary>

-    /// Lookup operations like <code>Contains(T item)</code> or the <code>Count</code>

-    /// property may take time O(n),

-    /// where n is the size of the collection.

-    /// </summary>

-    Linear = 2,

-    /// <summary>

-    /// Lookup operations like <code>Contains(T item)</code> or the <code>Count</code>

-    /// property  takes time O(log n),

-    /// where n is the size of the collection.

-    /// </summary>

-    Log = 3,

-    /// <summary>

-    /// Lookup operations like <code>Contains(T item)</code> or the <code>Count</code>

-    /// property  takes time O(1),

-    /// where n is the size of the collection.

-    /// </summary>

-    Constant = 4

-  }

-  /*

-  /// <summary>

-  /// 

-  /// </summary>

-  public enum ItemEqualityTypeEnum

-  {

-    /// <summary>

-    /// Only an Equals(T,T)

-    /// </summary>

-    Equator, 

-    /// <summary>

-    /// Equals(T,T) and GetHashCode(T)

-    /// </summary>

-    HashingEqualityComparer, 

-    /// <summary>

-    /// Compare(T,T)

-    /// </summary>

-    Comparer, 

-    /// <summary>

-    /// Compatible Compare(T,T) and GetHashCode(T)

-    /// </summary>

-    Both

-  }

-*/

-

-  /// <summary>

-  /// Direction of enumeration order relative to original collection.

-  /// </summary>

-  public enum EnumerationDirection

-  {

-    /// <summary>

-    /// Same direction

-    /// </summary>

-    Forwards,

-    /// <summary>

-    /// Opposite direction

-    /// </summary>

-    Backwards

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Events.cs b/mcs/class/Mono.C5/C5/Events.cs
deleted file mode 100644
index ebcf5a1bbcf..00000000000
--- a/mcs/class/Mono.C5/C5/Events.cs
+++ /dev/null
@@ -1,534 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// 

-  /// </summary>

-  [Flags]

-  public enum EventTypeEnum

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    None = 0x00000000,

-    /// <summary>

-    /// 

-    /// </summary>

-    Changed = 0x00000001,

-    /// <summary>

-    /// 

-    /// </summary>

-    Cleared = 0x00000002,

-    /// <summary>

-    /// 

-    /// </summary>

-    Added = 0x00000004,

-    /// <summary>

-    /// 

-    /// </summary>

-    Removed = 0x00000008,

-    /// <summary>

-    /// 

-    /// </summary>

-    Basic = 0x0000000f,

-    /// <summary>

-    /// 

-    /// </summary>

-    Inserted = 0x00000010,

-    /// <summary>

-    /// 

-    /// </summary>

-    RemovedAt = 0x00000020,

-    /// <summary>

-    /// 

-    /// </summary>

-    All = 0x0000003f

-  }

-

-  /// <summary>

-  /// Holds the real events for a collection

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  [Serializable]

-  internal sealed class EventBlock<T>

-  {

-    internal EventTypeEnum events;

-

-    event CollectionChangedHandler<T> collectionChanged;

-    internal event CollectionChangedHandler<T> CollectionChanged

-    {

-      add

-      {

-        collectionChanged += value;

-        events |= EventTypeEnum.Changed;

-      }

-      remove

-      {

-        collectionChanged -= value;

-        if (collectionChanged == null)

-          events &= ~EventTypeEnum.Changed;

-      }

-    }

-    internal void raiseCollectionChanged(object sender)

-    { if (collectionChanged != null) collectionChanged(sender); }

-

-    event CollectionClearedHandler<T> collectionCleared;

-    internal event CollectionClearedHandler<T> CollectionCleared

-    {

-      add

-      {

-        collectionCleared += value;

-        events |= EventTypeEnum.Cleared;

-      }

-      remove

-      {

-        collectionCleared -= value;

-        if (collectionCleared == null)

-          events &= ~EventTypeEnum.Cleared;

-      }

-    }

-    internal void raiseCollectionCleared(object sender, bool full, int count)

-    { if (collectionCleared != null) collectionCleared(sender, new ClearedEventArgs(full, count)); }

-    internal void raiseCollectionCleared(object sender, bool full, int count, int? start)

-    { if (collectionCleared != null) collectionCleared(sender, new ClearedRangeEventArgs(full, count, start)); }

-

-    event ItemsAddedHandler<T> itemsAdded;

-    internal event ItemsAddedHandler<T> ItemsAdded

-    {

-      add

-      {

-        itemsAdded += value;

-        events |= EventTypeEnum.Added;

-      }

-      remove

-      {

-        itemsAdded -= value;

-        if (itemsAdded == null)

-          events &= ~EventTypeEnum.Added;

-      }

-    }

-    internal void raiseItemsAdded(object sender, T item, int count)

-    { if (itemsAdded != null) itemsAdded(sender, new ItemCountEventArgs<T>(item, count)); }

-

-    event ItemsRemovedHandler<T> itemsRemoved;

-    internal event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add

-      {

-        itemsRemoved += value;

-        events |= EventTypeEnum.Removed;

-      }

-      remove

-      {

-        itemsRemoved -= value;

-        if (itemsRemoved == null)

-          events &= ~EventTypeEnum.Removed;

-      }

-    }

-    internal void raiseItemsRemoved(object sender, T item, int count)

-    { if (itemsRemoved != null) itemsRemoved(sender, new ItemCountEventArgs<T>(item, count)); }

-

-    event ItemInsertedHandler<T> itemInserted;

-    internal event ItemInsertedHandler<T> ItemInserted

-    {

-      add

-      {

-        itemInserted += value;

-        events |= EventTypeEnum.Inserted;

-      }

-      remove

-      {

-        itemInserted -= value;

-        if (itemInserted == null)

-          events &= ~EventTypeEnum.Inserted;

-      }

-    }

-    internal void raiseItemInserted(object sender, T item, int index)

-    { if (itemInserted != null) itemInserted(sender, new ItemAtEventArgs<T>(item, index)); }

-

-    event ItemRemovedAtHandler<T> itemRemovedAt;

-    internal event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add

-      {

-        itemRemovedAt += value;

-        events |= EventTypeEnum.RemovedAt;

-      }

-      remove

-      {

-        itemRemovedAt -= value;

-        if (itemRemovedAt == null)

-          events &= ~EventTypeEnum.RemovedAt;

-      }

-    }

-    internal void raiseItemRemovedAt(object sender, T item, int index)

-    { if (itemRemovedAt != null) itemRemovedAt(sender, new ItemAtEventArgs<T>(item, index)); }

-  }

-

-  /// <summary>

-  /// Tentative, to conserve memory in GuardedCollectionValueBase

-  /// This should really be nested in Guarded collection value, only have a guardereal field

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  [Serializable]

-  internal sealed class ProxyEventBlock<T>

-  {

-    ICollectionValue<T> proxy, real;

-

-    internal ProxyEventBlock(ICollectionValue<T> proxy, ICollectionValue<T> real)

-    { this.proxy = proxy; this.real = real; }

-

-    event CollectionChangedHandler<T> collectionChanged;

-    CollectionChangedHandler<T> collectionChangedProxy;

-    internal event CollectionChangedHandler<T> CollectionChanged

-    {

-      add

-      {

-        if (collectionChanged == null)

-        {

-          if (collectionChangedProxy == null)

-            collectionChangedProxy = delegate(object sender) { collectionChanged(proxy); };

-          real.CollectionChanged += collectionChangedProxy;

-        }

-        collectionChanged += value;

-      }

-      remove

-      {

-        collectionChanged -= value;

-        if (collectionChanged == null)

-          real.CollectionChanged -= collectionChangedProxy;

-      }

-    }

-

-    event CollectionClearedHandler<T> collectionCleared;

-    CollectionClearedHandler<T> collectionClearedProxy;

-    internal event CollectionClearedHandler<T> CollectionCleared

-    {

-      add

-      {

-        if (collectionCleared == null)

-        {

-          if (collectionClearedProxy == null)

-            collectionClearedProxy = delegate(object sender, ClearedEventArgs e) { collectionCleared(proxy, e); };

-          real.CollectionCleared += collectionClearedProxy;

-        }

-        collectionCleared += value;

-      }

-      remove

-      {

-        collectionCleared -= value;

-        if (collectionCleared == null)

-          real.CollectionCleared -= collectionClearedProxy;

-      }

-    }

-

-    event ItemsAddedHandler<T> itemsAdded;

-    ItemsAddedHandler<T> itemsAddedProxy;

-    internal event ItemsAddedHandler<T> ItemsAdded

-    {

-      add

-      {

-        if (itemsAdded == null)

-        {

-          if (itemsAddedProxy == null)

-            itemsAddedProxy = delegate(object sender, ItemCountEventArgs<T> e) { itemsAdded(proxy, e); };

-          real.ItemsAdded += itemsAddedProxy;

-        }

-        itemsAdded += value;

-      }

-      remove

-      {

-        itemsAdded -= value;

-        if (itemsAdded == null)

-          real.ItemsAdded -= itemsAddedProxy;

-      }

-    }

-

-    event ItemInsertedHandler<T> itemInserted;

-    ItemInsertedHandler<T> itemInsertedProxy;

-    internal event ItemInsertedHandler<T> ItemInserted

-    {

-      add

-      {

-        if (itemInserted == null)

-        {

-          if (itemInsertedProxy == null)

-            itemInsertedProxy = delegate(object sender, ItemAtEventArgs<T> e) { itemInserted(proxy, e); };

-          real.ItemInserted += itemInsertedProxy;

-        }

-        itemInserted += value;

-      }

-      remove

-      {

-        itemInserted -= value;

-        if (itemInserted == null)

-          real.ItemInserted -= itemInsertedProxy;

-      }

-    }

-

-    event ItemsRemovedHandler<T> itemsRemoved;

-    ItemsRemovedHandler<T> itemsRemovedProxy;

-    internal event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add

-      {

-        if (itemsRemoved == null)

-        {

-          if (itemsRemovedProxy == null)

-            itemsRemovedProxy = delegate(object sender, ItemCountEventArgs<T> e) { itemsRemoved(proxy, e); };

-          real.ItemsRemoved += itemsRemovedProxy;

-        }

-        itemsRemoved += value;

-      }

-      remove

-      {

-        itemsRemoved -= value;

-        if (itemsRemoved == null)

-          real.ItemsRemoved -= itemsRemovedProxy;

-      }

-    }

-

-    event ItemRemovedAtHandler<T> itemRemovedAt;

-    ItemRemovedAtHandler<T> itemRemovedAtProxy;

-    internal event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add

-      {

-        if (itemRemovedAt == null)

-        {

-          if (itemRemovedAtProxy == null)

-            itemRemovedAtProxy = delegate(object sender, ItemAtEventArgs<T> e) { itemRemovedAt(proxy, e); };

-          real.ItemRemovedAt += itemRemovedAtProxy;

-        }

-        itemRemovedAt += value;

-      }

-      remove

-      {

-        itemRemovedAt -= value;

-        if (itemRemovedAt == null)

-          real.ItemRemovedAt -= itemRemovedAtProxy;

-      }

-    }

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class ItemAtEventArgs<T> : EventArgs

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T Item;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly int Index;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="index"></param>

-    public ItemAtEventArgs(T item, int index) { Item = item; Index = index; }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("(ItemAtEventArgs {0} '{1}')", Index, Item);

-    }

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class ItemCountEventArgs<T> : EventArgs

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T Item;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly int Count;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="count"></param>

-    /// <param name="item"></param>

-    public ItemCountEventArgs(T item, int count) { Item = item; Count = count; }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("(ItemCountEventArgs {0} '{1}')", Count, Item);

-    }

-  }

-

-

-

-  /// <summary>

-  /// 

-  /// </summary>

-  public class ClearedEventArgs : EventArgs

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly bool Full;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly int Count;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// 

-    /// <param name="full">True if the operation cleared all of the collection</param>

-    /// <param name="count">The number of items removed by the clear.</param>

-    public ClearedEventArgs(bool full, int count) { Full = full; Count = count; }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("(ClearedEventArgs {0} {1})", Count, Full);

-    }

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  public class ClearedRangeEventArgs : ClearedEventArgs

-  {

-    //WE could let this be of type int? to  allow 

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly int? Start;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="full"></param>

-    /// <param name="count"></param>

-    /// <param name="start"></param>

-    public ClearedRangeEventArgs(bool full, int count, int? start) : base(full,count) { Start = start; }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("(ClearedRangeEventArgs {0} {1} {2})", Count, Full, Start);

-    }

-  }

-

-  /// <summary>

-  /// The type of event raised after an operation on a collection has changed its contents.

-  /// Normally, a multioperation like AddAll, 

-  /// <see cref="M:C5.IExtensible`1.AddAll(System.Collections.Generic.IEnumerable{`0})"/> 

-  /// will only fire one CollectionChanged event. Any operation that changes the collection

-  /// must fire CollectionChanged as its last event.

-  /// </summary>

-  public delegate void CollectionChangedHandler<T>(object sender);

-

-  /// <summary>

-  /// The type of event raised after the Clear() operation on a collection.

-  /// <para/>

-  /// Note: The Clear() operation will not fire ItemsRemoved events. 

-  /// </summary>

-  /// <param name="sender"></param>

-  /// <param name="eventArgs"></param>

-  public delegate void CollectionClearedHandler<T>(object sender, ClearedEventArgs eventArgs);

-

-  /// <summary>

-  /// The type of event raised after an item has been added to a collection.

-  /// The event will be raised at a point of time, where the collection object is 

-  /// in an internally consistent state and before the corresponding CollectionChanged 

-  /// event is raised.

-  /// <para/>

-  /// Note: an Update operation will fire an ItemsRemoved and an ItemsAdded event.

-  /// <para/>

-  /// Note: When an item is inserted into a list (<see cref="T:C5.IList`1"/>), both

-  /// ItemInserted and ItemsAdded events will be fired.

-  /// </summary>

-  /// <param name="sender"></param>

-  /// <param name="eventArgs">An object with the item that was added</param>

-  public delegate void ItemsAddedHandler<T>(object sender, ItemCountEventArgs<T> eventArgs);

-

-  /// <summary>

-  /// The type of event raised after an item has been removed from a collection.

-  /// The event will be raised at a point of time, where the collection object is 

-  /// in an internally consistent state and before the corresponding CollectionChanged 

-  /// event is raised.

-  /// <para/>

-  /// Note: The Clear() operation will not fire ItemsRemoved events. 

-  /// <para/>

-  /// Note: an Update operation will fire an ItemsRemoved and an ItemsAdded event.

-  /// <para/>

-  /// Note: When an item is removed from a list by the RemoveAt operation, both an 

-  /// ItemsRemoved and an ItemRemovedAt event will be fired.

-  /// </summary>

-  /// <param name="sender"></param>

-  /// <param name="eventArgs">An object with the item that was removed</param>

-  public delegate void ItemsRemovedHandler<T>(object sender, ItemCountEventArgs<T> eventArgs);

-

-  /// <summary>

-  /// The type of event raised after an item has been inserted into a list by an Insert, 

-  /// InsertFirst or InsertLast operation.

-  /// The event will be raised at a point of time, where the collection object is 

-  /// in an internally consistent state and before the corresponding CollectionChanged 

-  /// event is raised.

-  /// <para/>

-  /// Note: an ItemsAdded event will also be fired.

-  /// </summary>

-  /// <param name="sender"></param>

-  /// <param name="eventArgs"></param>

-  public delegate void ItemInsertedHandler<T>(object sender, ItemAtEventArgs<T> eventArgs);

-

-  /// <summary>

-  /// The type of event raised after an item has been removed from a list by a RemoveAt(int i)

-  /// operation (or RemoveFirst(), RemoveLast(), Remove() operation).

-  /// The event will be raised at a point of time, where the collection object is 

-  /// in an internally consistent state and before the corresponding CollectionChanged 

-  /// event is raised.

-  /// <para/>

-  /// Note: an ItemRemoved event will also be fired.

-  /// </summary>

-  /// <param name="sender"></param>

-  /// <param name="eventArgs"></param>

-  public delegate void ItemRemovedAtHandler<T>(object sender, ItemAtEventArgs<T> eventArgs);

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Exceptions.cs b/mcs/class/Mono.C5/C5/Exceptions.cs
deleted file mode 100644
index ccf6c8e9988..00000000000
--- a/mcs/class/Mono.C5/C5/Exceptions.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// An exception to throw from library code when an internal inconsistency is encountered.

-  /// </summary>

-  public class InternalException : Exception

-  {

-    internal InternalException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown by an update operation on a Read-Only collection or dictionary.

-  /// <para>This exception will be thrown unconditionally when an update operation 

-  /// (method or set property) is called. No check is made to see if the update operation, 

-  /// if allowed, would actually change the collection. </para>

-  /// </summary>

-  [Serializable]

-  public class ReadOnlyCollectionException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public ReadOnlyCollectionException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public ReadOnlyCollectionException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  [Serializable]

-  public class FixedSizeCollectionException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public FixedSizeCollectionException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public FixedSizeCollectionException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  [Serializable]

-  public class UnlistenableEventException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public UnlistenableEventException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public UnlistenableEventException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown by enumerators, range views etc. when accessed after 

-  /// the underlying collection has been modified.

-  /// </summary>

-  [Serializable]

-  public class CollectionModifiedException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public CollectionModifiedException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public CollectionModifiedException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An excption thrown when trying to access a view (a list view on a <see cref="T:C5.IList`1"/> or 

-  /// a snapshot on a <see cref="T:C5.IPersistentSorted`1"/>)

-  /// that has been invalidated by some earlier operation.

-  /// <para>

-  /// The typical scenario is a view on a list that hash been invalidated by a call to 

-  /// Sort, Reverse or Shuffle on some other, overlapping view or the whole list.

-  /// </para>

-  /// </summary>

-  [Serializable]

-  public class ViewDisposedException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public ViewDisposedException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public ViewDisposedException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown by a lookup or lookup with update operation that does not 

-  /// find the lookup item and has no other means to communicate failure.

-  /// <para>The typical scenario is a lookup by key in a dictionary with an indexer,

-  /// see e.g. <see cref="P:C5.IDictionary`2.Item(`0)"/></para>

-  /// </summary>

-  [Serializable]

-  public class NoSuchItemException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public NoSuchItemException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public NoSuchItemException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown by an operation on a list (<see cref="T:C5.IList`1"/>)

-  /// that only makes sense for a view, not for an underlying list.

-  /// </summary>

-  [Serializable]

-  public class NotAViewException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public NotAViewException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public NotAViewException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown when an operation attempts to create a duplicate in a collection with set semantics 

-  /// (<see cref="P:C5.IExtensible`1.AllowsDuplicates"/> is false) or attempts to create a duplicate key in a dictionary.

-  /// <para>With collections this can only happen with Insert operations on lists, since the Add operations will

-  /// not try to create duplictes and either ignore the failure or report it in a bool return value.

-  /// </para>

-  /// <para>With dictionaries this can happen with the <see cref="M:C5.IDictionary`2.Add(`0,`1)"/> metod.</para>

-  /// </summary>

-  [Serializable]

-  public class DuplicateNotAllowedException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public DuplicateNotAllowedException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public DuplicateNotAllowedException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  [Serializable]

-  public class InvalidPriorityQueueHandleException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public InvalidPriorityQueueHandleException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public InvalidPriorityQueueHandleException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown by an operation that need to construct a natural

-  /// comparer for a type.

-  /// </summary>

-  [Serializable]

-  public class NotComparableException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public NotComparableException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public NotComparableException(string message) : base(message) { }

-  }

-

-  /// <summary>

-  /// An exception thrown by operations on a list that expects an argument

-  /// that is a view on the same underlying list.

-  /// </summary>

-  [Serializable]

-  public class IncompatibleViewException : Exception

-  {

-    /// <summary>

-    /// Create a simple exception with no further explanation.

-    /// </summary>

-    public IncompatibleViewException() : base() { }

-    /// <summary>

-    /// Create the exception with an explanation of the reason.

-    /// </summary>

-    /// <param name="message"></param>

-    public IncompatibleViewException(string message) : base(message) { }

-  }

-

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Formatting.cs b/mcs/class/Mono.C5/C5/Formatting.cs
deleted file mode 100644
index bc2433bd3e2..00000000000
--- a/mcs/class/Mono.C5/C5/Formatting.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using C5;

-using System;

-using System.Reflection;

-using System.Reflection.Emit;

-using System.Diagnostics;

-using System.Text;

-

-namespace C5

-{

-  /// <summary>

-  /// <i>(Describe usage of "L:300" format string.)</i>

-  /// </summary>

-  public interface IShowable : IFormattable

-  {

-    //TODO: wonder if we should use TextWriters instead of StringBuilders?

-    /// <summary>

-    /// Format <code>this</code> using at most approximately <code>rest</code> chars and 

-    /// append the result, possibly truncated, to stringbuilder.

-    /// Subtract the actual number of used chars from <code>rest</code>.

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns>True if the appended formatted string was complete (not truncated).</returns>

-    bool Show(StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider);

-  }

-  // ------------------------------------------------------------

-

-  // Static helper methods for Showing collections 

-

-  /// <summary>

-  /// 

-  /// </summary>

-  public static class Showing

-  {

-    /// <summary>

-    /// Show  <code>Object obj</code> by appending it to <code>stringbuilder</code>

-    /// </summary>

-    /// <param name="obj"></param>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns>True if <code>obj</code> was shown completely.</returns>

-    public static bool Show(Object obj, StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      if (rest <= 0)

-        return false;

-      else if (obj is IShowable)

-        return ((IShowable)obj).Show(stringbuilder, ref rest, formatProvider);

-      int oldLength = stringbuilder.Length;

-      stringbuilder.AppendFormat(formatProvider, "{0}", obj);

-      rest -= (stringbuilder.Length - oldLength);

-      return true;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="showable"></param>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public static String ShowString(IShowable showable, String format, IFormatProvider formatProvider)

-    {

-      int rest = maxLength(format);

-      StringBuilder sb = new StringBuilder();

-      showable.Show(sb, ref rest, formatProvider);

-      return sb.ToString();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <returns></returns>

-    static int maxLength(String format)

-    {

-      //TODO: validate format string

-      if (format == null)

-        return 80;

-      if (format.Length > 1 && format.StartsWith("L"))

-      {

-        return int.Parse(format.Substring(1));

-      }

-      else

-        return int.MaxValue;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="T"></typeparam>

-    /// <param name="items"></param>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns>True if collection was shown completely</returns>

-    public static bool ShowCollectionValue<T>(ICollectionValue<T> items, StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      string startdelim = "{ ", enddelim = " }";

-      bool showIndexes = false;

-      bool showMultiplicities = false;

-      //TODO: do not test here at run time, but select code at compile time

-      //      perhaps by delivering the print type to this metod

-      if (items is IList<T>)

-      {

-        startdelim = "[ ";

-        enddelim = " ]";

-        //TODO: should have been (items as IIndexed<T>).IndexingSpeed

-        showIndexes = (items as IList<T>).IndexingSpeed == Speed.Constant;

-      }

-      else if (items is ICollection<T>)

-      {

-        ICollection<T> coll = items as ICollection<T>;

-        if (coll.AllowsDuplicates)

-        {

-          startdelim = "{{ ";

-          enddelim = " }}";

-          if (coll.DuplicatesByCounting)

-            showMultiplicities = true;

-        }

-      }

-

-      stringbuilder.Append(startdelim);

-      rest -= 2 * startdelim.Length;

-      bool first = true;

-      bool complete = true;

-      int index = 0;

-

-      if (showMultiplicities)

-      {

-        foreach (KeyValuePair<T, int> p in (items as ICollection<T>).ItemMultiplicities())

-        {

-          complete = false;

-          if (rest <= 0)

-            break;

-          if (first)

-            first = false;

-          else

-          {

-            stringbuilder.Append(", ");

-            rest -= 2;

-          }

-          if (complete = Showing.Show(p.Key, stringbuilder, ref rest, formatProvider))

-          {

-            string multiplicityString = string.Format("(*{0})", p.Value);

-            stringbuilder.Append(multiplicityString);

-            rest -= multiplicityString.Length;

-          }

-        }

-      }

-      else

-      {

-        foreach (T x in items)

-        {

-          complete = false;

-          if (rest <= 0)

-            break;

-          if (first)

-            first = false;

-          else

-          {

-            stringbuilder.Append(", ");

-            rest -= 2;

-          }

-          if (showIndexes)

-          {

-            string indexString = string.Format("{0}:", index++);

-            stringbuilder.Append(indexString);

-            rest -= indexString.Length;

-          }

-          complete = Showing.Show(x, stringbuilder, ref rest, formatProvider);

-        }

-      }

-      if (!complete)

-      {

-        stringbuilder.Append("...");

-        rest -= 3;

-      }

-      stringbuilder.Append(enddelim);

-      return complete;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="K"></typeparam>

-    /// <typeparam name="V"></typeparam>

-    /// 

-    /// <param name="dictionary"></param>

-    /// <param name="stringbuilder"></param>

-    /// <param name="formatProvider"></param>

-    /// <param name="rest"></param>

-    /// <returns></returns>

-    public static bool ShowDictionary<K, V>(IDictionary<K, V> dictionary, StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      bool sorted = dictionary is ISortedDictionary<K, V>;

-      stringbuilder.Append(sorted ? "[ " : "{ ");

-      rest -= 4;				   // Account for "( " and " )"

-      bool first = true;

-      bool complete = true;

-

-      foreach (KeyValuePair<K, V> p in dictionary)

-      {

-        complete = false;

-        if (rest <= 0)

-          break;

-        if (first)

-          first = false;

-        else

-        {

-          stringbuilder.Append(", ");

-          rest -= 2;

-        }

-        complete = Showing.Show(p, stringbuilder, ref rest, formatProvider);

-      }

-      if (!complete)

-      {

-        stringbuilder.Append("...");

-        rest -= 3;

-      }

-      stringbuilder.Append(sorted ? " ]" : " }");

-      return complete;

-    }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Hashers.cs b/mcs/class/Mono.C5/C5/Hashers.cs
deleted file mode 100644
index d759c15a9f9..00000000000
--- a/mcs/class/Mono.C5/C5/Hashers.cs
+++ /dev/null
@@ -1,492 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using C5;

-using System;

-using System.Reflection;

-using System.Reflection.Emit;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// Utility class for building default generic equalityComparers.

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public static class EqualityComparer<T>

-  {

-    readonly static Type isequenced = typeof(ISequenced<>);

-

-    readonly static Type icollection = typeof(ICollection<>);

-

-    readonly static Type orderedcollectionequalityComparer = typeof(SequencedCollectionEqualityComparer<,>);

-

-    readonly static Type unorderedcollectionequalityComparer = typeof(UnsequencedCollectionEqualityComparer<,>);

-

-    readonly static Type equalityequalityComparer = typeof(EquatableEqualityComparer<>);

-

-    readonly static Type iequalitytype = typeof(IEquatable<T>);

-

-    static SCG.IEqualityComparer<T> cachedDefault = null;

-

-    //TODO: find the right word for initialized+invocation 

-    /// <summary>

-    /// A default generic equalityComparer for type T. The procedure is as follows:

-    /// <list>

-    /// <item>If T is int, double, byte or char, 

-    /// the equalityComparer will be a standard equalityComparer for that type</item>

-    /// <item>If the actual generic argument T implements the generic interface

-    /// <see cref="T:C5.ISequenced`1"/> for some value W of its generic parameter T,

-    /// the equalityComparer will be <see cref="T:C5.SequencedCollectionEqualityComparer`2"/></item>

-    /// <item>If the actual generic argument T implements 

-    /// <see cref="T:C5.ICollectionValue`1"/> for some value W of its generic parameter T,

-    /// the equalityComparer will be <see cref="T:C5.UnsequencedCollectionEqualityComparer`2"/></item>

-    /// <item>If T is a type implementing <see cref="T:C5.IEquatable`1"/>, the equalityComparer

-    /// will be <see cref="T:C5.EquatableEqualityComparer`1"/></item>

-    /// <item>If T is a type not implementing <see cref="T:C5.IEquatable`1"/>, the equalityComparer

-    /// will be <see cref="T:C5.NaturalEqualityComparer`1"/> </item>

-    /// </list>   

-    /// The <see cref="T:C5.IEqualityComparer`1"/> object is constructed when this class is initialised, i.e. 

-    /// its static constructors called. Thus, the property will be the same object 

-    /// for the duration of an invocation of the runtime, but a value serialized in 

-    /// another invocation and deserialized here will not be the same object.

-    /// </summary>

-    /// <value></value>

-    public static SCG.IEqualityComparer<T> Default

-    {

-      get

-      {

-        if (cachedDefault != null)

-          return cachedDefault;

-

-        Type t = typeof(T);

-

-        if (t.IsValueType)

-        {

-          if (t.Equals(typeof(int)))

-            return cachedDefault = (SCG.IEqualityComparer<T>)(IntEqualityComparer.Default);

-          else if (t.Equals(typeof(double)))

-            return cachedDefault = (SCG.IEqualityComparer<T>)(DoubleEqualityComparer.Default);

-          else if (t.Equals(typeof(byte)))

-            return cachedDefault = (SCG.IEqualityComparer<T>)(ByteEqualityComparer.Default);

-          else if (t.Equals(typeof(char)))

-            return cachedDefault = (SCG.IEqualityComparer<T>)(CharEqualityComparer.Default);

-        }

-        Type[] interfaces = t.GetInterfaces();

-        if (t.IsGenericType && t.GetGenericTypeDefinition().Equals(isequenced))

-          return createAndCache(orderedcollectionequalityComparer.MakeGenericType(new Type[] { t, t.GetGenericArguments()[0] }));

-        foreach (Type ty in interfaces)

-        {

-          if (ty.IsGenericType && ty.GetGenericTypeDefinition().Equals(isequenced))

-            return createAndCache(orderedcollectionequalityComparer.MakeGenericType(new Type[] { t, ty.GetGenericArguments()[0] }));

-        }

-        if (t.IsGenericType && t.GetGenericTypeDefinition().Equals(icollection))

-          return createAndCache(unorderedcollectionequalityComparer.MakeGenericType(new Type[] { t, t.GetGenericArguments()[0] }));

-        foreach (Type ty in interfaces)

-        {

-          if (ty.IsGenericType && ty.GetGenericTypeDefinition().Equals(icollection))

-            return createAndCache(unorderedcollectionequalityComparer.MakeGenericType(new Type[] { t, ty.GetGenericArguments()[0] }));

-        }

-        if (iequalitytype.IsAssignableFrom(t))

-          return createAndCache(equalityequalityComparer.MakeGenericType(new Type[] { t }));

-        else

-          return cachedDefault = NaturalEqualityComparer<T>.Default;

-      }

-    }

-    static SCG.IEqualityComparer<T> createAndCache(Type equalityComparertype)

-    {

-      return cachedDefault = (SCG.IEqualityComparer<T>)(equalityComparertype.GetProperty("Default", BindingFlags.Static | BindingFlags.Public).GetValue(null, null));

-    }

-  }

-

-  /// <summary>

-  /// A default item equalityComparer calling through to

-  /// the GetHashCode and Equals methods inherited from System.Object.

-  /// </summary>

-  public sealed class NaturalEqualityComparer<T> : SCG.IEqualityComparer<T>

-  {

-    static NaturalEqualityComparer<T> cached;

-    NaturalEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static NaturalEqualityComparer<T> Default { get { return cached ?? (cached = new NaturalEqualityComparer<T>()); } }

-    //TODO: check if null check is reasonable

-    //Answer: if we have struct C<T> { T t; int i;} and implement GetHashCode as

-    //the sum of hashcodes, and T may be any type, we cannot make the null check 

-    //inside the definition of C<T> in a reasonable way.

-    /// <summary>

-    /// Get the hash code with respect to this item equalityComparer

-    /// </summary>

-    /// <param name="item">The item</param>

-    /// <returns>The hash code</returns>

-    [Tested]

-    public int GetHashCode(T item) { return item == null ? 0 : item.GetHashCode(); }

-

-

-    /// <summary>

-    /// Check if two items are equal with respect to this item equalityComparer

-    /// </summary>

-    /// <param name="item1">first item</param>

-    /// <param name="item2">second item</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public bool Equals(T item1, T item2)

-    {

-      return item1 == null ? item2 == null : item1.Equals(item2);

-    }

-  }

-

-  /// <summary>

-  /// A default equalityComparer for a type, T, implementing <see cref="T:C5.IEquatable`1"/>. 

-  /// 

-  /// The equalityComparer forwards calls to GetHashCode and Equals to the methods 

-  /// on T. The point is that it is Equals(T) and not Equals(object)

-  /// that is called. This will save a boxing/unboxing pair if T is a value type

-  /// and in general a runtime type check.

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class EquatableEqualityComparer<T> : SCG.IEqualityComparer<T> where T : IEquatable<T>

-  {

-    static EquatableEqualityComparer<T> cached = new EquatableEqualityComparer<T>();

-    EquatableEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static EquatableEqualityComparer<T> Default { get { return cached ?? (cached = new EquatableEqualityComparer<T>()); } }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int GetHashCode(T item) { return item == null ? 0 : item.GetHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item1"></param>

-    /// <param name="item2"></param>

-    /// <returns></returns>

-    public bool Equals(T item1, T item2) { return item1 == null ? item2 == null : item1.Equals(item2); }

-  }

-

-  /// <summary>

-  /// A equalityComparer for a reference type that uses reference equality for equality and the hash code from object as hash code.

-  /// </summary>

-  /// <typeparam name="T">The item type. Must be a reference type.</typeparam>

-  public class ReferenceEqualityComparer<T> : SCG.IEqualityComparer<T> where T : class

-  {

-    static ReferenceEqualityComparer<T> cached;

-    ReferenceEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static ReferenceEqualityComparer<T> Default { get { return cached ?? (cached = new ReferenceEqualityComparer<T>()); } }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int GetHashCode(T item)

-    {

-      return System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(item);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="i1"></param>

-    /// <param name="i2"></param>

-    /// <returns></returns>

-    public bool Equals(T i1, T i2)

-    {

-      return object.ReferenceEquals(i1, i2);

-    }

-  }

-

-  /// <summary>

-  /// An equalityComparer compatible with a given comparer. All hash codes are 0, 

-  /// meaning that anything based on hash codes will be quite inefficient.

-  /// <para><b>Note: this will give a new EqualityComparer each time created!</b></para>

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class ComparerZeroHashCodeEqualityComparer<T> : SCG.IEqualityComparer<T>

-  {

-    SCG.IComparer<T> comparer;

-    /// <summary>

-    /// Create a trivial <see cref="T:C5.IEqualityComparer`1"/> compatible with the 

-    /// <see cref="T:C5.IComparer`1"/> <code>comparer</code>

-    /// </summary>

-    /// <param name="comparer"></param>

-    public ComparerZeroHashCodeEqualityComparer(SCG.IComparer<T> comparer)

-    {

-      if (comparer == null)

-        throw new NullReferenceException("Compaer cannot be null");

-      this.comparer = comparer;

-    }

-    /// <summary>

-    /// A trivial, inefficient hash fuction. Compatible with any equality relation.

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns>0</returns>

-    public int GetHashCode(T item) { return 0; }

-    /// <summary>

-    /// Equality of two items as defined by the comparer.

-    /// </summary>

-    /// <param name="item1"></param>

-    /// <param name="item2"></param>

-    /// <returns></returns>

-    public bool Equals(T item1, T item2) { return comparer.Compare(item1, item2) == 0; }

-  }

-

-  /// <summary>

-  /// Prototype for an sequenced equalityComparer for something (T) that implements ISequenced[W]

-  /// This will use ISequenced[W] specific implementations of the equalityComparer operations

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  /// <typeparam name="W"></typeparam>

-  public class SequencedCollectionEqualityComparer<T, W> : SCG.IEqualityComparer<T>

-      where T : ISequenced<W>

-  {

-    static SequencedCollectionEqualityComparer<T, W> cached;

-    SequencedCollectionEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static SequencedCollectionEqualityComparer<T, W> Default { get { return cached ?? (cached = new SequencedCollectionEqualityComparer<T, W>()); } }

-    /// <summary>

-    /// Get the hash code with respect to this sequenced equalityComparer

-    /// </summary>

-    /// <param name="collection">The collection</param>

-    /// <returns>The hash code</returns>

-    [Tested]

-    public int GetHashCode(T collection) { return collection.GetSequencedHashCode(); }

-

-

-    /// <summary>

-    /// Check if two items are equal with respect to this sequenced equalityComparer

-    /// </summary>

-    /// <param name="collection1">first collection</param>

-    /// <param name="collection2">second collection</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public bool Equals(T collection1, T collection2) { return collection1 == null ? collection2 == null : collection1.SequencedEquals(collection2); }

-  }

-

-  /// <summary>

-  /// Prototype for an unsequenced equalityComparer for something (T) that implements ICollection[W]

-  /// This will use ICollection[W] specific implementations of the equalityComparer operations

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  /// <typeparam name="W"></typeparam>

-  public class UnsequencedCollectionEqualityComparer<T, W> : SCG.IEqualityComparer<T>

-      where T : ICollection<W>

-  {

-    static UnsequencedCollectionEqualityComparer<T, W> cached;

-    UnsequencedCollectionEqualityComparer() { }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public static UnsequencedCollectionEqualityComparer<T, W> Default { get { return cached ?? (cached = new UnsequencedCollectionEqualityComparer<T, W>()); } }

-    /// <summary>

-    /// Get the hash code with respect to this unsequenced equalityComparer

-    /// </summary>

-    /// <param name="collection">The collection</param>

-    /// <returns>The hash code</returns>

-    [Tested]

-    public int GetHashCode(T collection) { return collection.GetUnsequencedHashCode(); }

-

-

-    /// <summary>

-    /// Check if two collections are equal with respect to this unsequenced equalityComparer

-    /// </summary>

-    /// <param name="collection1">first collection</param>

-    /// <param name="collection2">second collection</param>

-    /// <returns>True if equal</returns>

-    [Tested]

-    public bool Equals(T collection1, T collection2) { return collection1 == null ? collection2 == null : collection1.UnsequencedEquals(collection2); }

-  }

-

-}

-

-

-

-

-

-#if EXPERIMENTAL

-namespace C5.EqualityComparerBuilder

-{

-

-  /// <summary>

-  /// IEqualityComparer factory class: examines at instatiation time if T is an

-  /// interface implementing "int GetHashCode()" and "bool Equals(T)".

-  /// If those are not present, MakeEqualityComparer will return a default equalityComparer,

-  /// else this class will implement IequalityComparer[T] via Invoke() on the

-  /// reflected method infos.

-  /// </summary>

-  public class ByInvoke<T> : SCG.IEqualityComparer<T>

-  {

-    internal static readonly System.Reflection.MethodInfo hinfo, einfo;

-

-

-    static ByInvoke()

-    {

-      Type t = typeof(T);

-

-      if (!t.IsInterface) return;

-

-      BindingFlags f = BindingFlags.Public | BindingFlags.Instance;

-

-      hinfo = t.GetMethod("GetHashCode", f, null, new Type[0], null);

-      einfo = t.GetMethod("Equals", f, null, new Type[1] { t }, null);

-    }

-

-

-    private ByInvoke() { }

-

-/// <summary>

-/// 

-/// </summary>

-/// <returns></returns>

-    public static SCG.IEqualityComparer<T> MakeEqualityComparer()

-    {

-      if (hinfo != null && einfo != null)

-        return new ByInvoke<T>();

-      else

-        return NaturalEqualityComparer<T>.Default;

-    }

-

-/// <summary>

-/// 

-/// </summary>

-/// <param name="item"></param>

-/// <returns></returns>

-    public int GetHashCode(T item)

-    {

-      return (int)(hinfo.Invoke(item, null));

-    }

-

-/// <summary>

-/// 

-/// </summary>

-/// <param name="i1"></param>

-/// <param name="i2"></param>

-/// <returns></returns>

-    public bool Equals(T i1, T i2)

-    {

-      return (bool)(einfo.Invoke(i1, new object[1] { i2 }));

-    }

-  }

-

-

-

-  /// <summary>

-  /// Like ByInvoke, but tries to build a equalityComparer by RTCG to

-  /// avoid the Invoke() overhead. 

-  /// </summary>

-  public class ByRTCG

-  {

-    private static ModuleBuilder moduleBuilder;

-

-    private static AssemblyBuilder assemblyBuilder;

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="hinfo"></param>

-    /// <param name="einfo"></param>

-    /// <returns></returns>

-    public static SCG.IEqualityComparer<T> CreateEqualityComparer<T>(MethodInfo hinfo, MethodInfo einfo)

-    {

-      if (moduleBuilder == null)

-      {

-        string assmname = "LeFake";

-        string filename = assmname + ".dll";

-        AssemblyName assemblyName = new AssemblyName("LeFake");

-        AppDomain appdomain = AppDomain.CurrentDomain;

-        AssemblyBuilderAccess acc = AssemblyBuilderAccess.RunAndSave;

-

-        assemblyBuilder = appdomain.DefineDynamicAssembly(assemblyName, acc);

-        moduleBuilder = assemblyBuilder.DefineDynamicModule(assmname, filename);

-      }

-

-      Type t = typeof(T);

-      Type o_t = typeof(object);

-      Type h_t = typeof(SCG.IEqualityComparer<T>);

-      Type i_t = typeof(int);

-      //TODO: protect uid for thread safety!

-      string name = "C5.Dynamic.EqualityComparer_" + Guid.NewGuid().ToString();

-      TypeAttributes tatt = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed;

-      TypeBuilder tb = moduleBuilder.DefineType(name, tatt, o_t, new Type[1] { h_t });

-      MethodAttributes matt = MethodAttributes.Public | MethodAttributes.Virtual;

-      MethodBuilder mb = tb.DefineMethod("GetHashCode", matt, i_t, new Type[1] { t });

-      ILGenerator ilg = mb.GetILGenerator();

-

-      ilg.Emit(OpCodes.Ldarg_1);

-      ilg.Emit(OpCodes.Callvirt, hinfo);

-      ilg.Emit(OpCodes.Ret);

-      mb = tb.DefineMethod("Equals", matt, typeof(bool), new Type[2] { t, t });

-      ilg = mb.GetILGenerator();

-      ilg.Emit(OpCodes.Ldarg_1);

-      ilg.Emit(OpCodes.Ldarg_2);

-      ilg.Emit(OpCodes.Callvirt, einfo);

-      ilg.Emit(OpCodes.Ret);

-

-      Type equalityComparer_t = tb.CreateType();

-      object equalityComparer = equalityComparer_t.GetConstructor(new Type[0]).Invoke(null);

-

-      return (SCG.IEqualityComparer<T>)equalityComparer;

-    }

-

-/// <summary>

-/// 

-/// </summary>

-/// <typeparam name="T"></typeparam>

-/// <returns></returns>

-    public static SCG.IEqualityComparer<T> build<T>()

-    {

-      MethodInfo hinfo = ByInvoke<T>.hinfo, einfo = ByInvoke<T>.einfo;

-

-      if (hinfo != null && einfo != null)

-        return CreateEqualityComparer<T>(hinfo, einfo);

-      else

-        return EqualityComparer<T>.Default;

-    }

-

-/// <summary>

-/// 

-/// </summary>

-    public void dump()

-    {

-      assemblyBuilder.Save("LeFake.dll");

-    }

-  }

-}

-#endif

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/Interfaces.cs b/mcs/class/Mono.C5/C5/Interfaces.cs
deleted file mode 100644
index 46fb2e8ede0..00000000000
--- a/mcs/class/Mono.C5/C5/Interfaces.cs
+++ /dev/null
@@ -1,1887 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A generic collection, that can be enumerated backwards.

-  /// </summary>

-  public interface IDirectedEnumerable<T> : SCG.IEnumerable<T>

-  {

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typically used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    IDirectedEnumerable<T> Backwards();

-

-

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    EnumerationDirection Direction { get;}

-  }

-

-  /// <summary>

-  /// A generic collection that may be enumerated and can answer

-  /// efficiently how many items it contains. Like <code>IEnumerable&lt;T&gt;</code>,

-  /// this interface does not prescribe any operations to initialize or update the 

-  /// collection. The main usage for this interface is to be the return type of 

-  /// query operations on generic collection.

-  /// </summary>

-  public interface ICollectionValue<T> : SCG.IEnumerable<T>, IShowable

-  {

-    /// <summary>

-    /// A flag bitmap of the events subscribable to by this collection.

-    /// </summary>

-    /// <value></value>

-    EventTypeEnum ListenableEvents { get;}

-

-    /// <summary>

-    /// A flag bitmap of the events currently subscribed to by this collection.

-    /// </summary>

-    /// <value></value>

-    EventTypeEnum ActiveEvents { get;}

-

-    /// <summary>

-    /// The change event. Will be raised for every change operation on the collection.

-    /// </summary>

-    event CollectionChangedHandler<T> CollectionChanged;

-

-    /// <summary>

-    /// The change event. Will be raised for every clear operation on the collection.

-    /// </summary>

-    event CollectionClearedHandler<T> CollectionCleared;

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual addition to the collection.

-    /// </summary>

-    event ItemsAddedHandler<T> ItemsAdded;

-

-    /// <summary>

-    /// The item inserted  event. Will be raised for every individual insertion to the collection.

-    /// </summary>

-    event ItemInsertedHandler<T> ItemInserted;

-

-    /// <summary>

-    /// The item removed event. Will be raised for every individual removal from the collection.

-    /// </summary>

-    event ItemsRemovedHandler<T> ItemsRemoved;

-

-    /// <summary>

-    /// The item removed at event. Will be raised for every individual removal at from the collection.

-    /// </summary>

-    event ItemRemovedAtHandler<T> ItemRemovedAt;

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if this collection is empty.</value>

-    bool IsEmpty { get;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of items in this collection</value>

-    int Count { get;}

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>A characterization of the speed of the 

-    /// <code>Count</code> property in this collection.</value>

-    Speed CountSpeed { get;}

-

-    /// <summary>

-    /// Copy the items of this collection to a contiguous part of an array.

-    /// </summary>

-    /// <param name="array">The array to copy to</param>

-    /// <param name="index">The index at which to copy the first item</param>

-    void CopyTo(T[] array, int index);

-

-    /// <summary>

-    /// Create an array with the items of this collection (in the same order as an

-    /// enumerator would output them).

-    /// </summary>

-    /// <returns>The array</returns>

-    T[] ToArray();

-

-    /// <summary>

-    /// Apply a delegate to all items of this collection.

-    /// </summary>

-    /// <param name="action">The delegate to apply</param>

-    void Apply(Act<T> action);

-

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection.

-    /// </summary>

-    /// <param name="predicate">A  delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>True is such an item exists</returns>

-    bool Exists(Fun<T, bool> predicate);

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the first one in enumeration order.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <param name="item"></param>

-    /// <returns>True is such an item exists</returns>

-    bool Find(Fun<T, bool> predicate, out T item);

-

-

-    /// <summary>

-    /// Check if all items in this collection satisfies a specific predicate.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>True if all items satisfies the predicate</returns>

-    bool All(Fun<T, bool> predicate);

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// <para>Implementations must assure that the item 

-    /// returned may be efficiently removed.</para>

-    /// <para>Implementors may decide to implement this method in a way such that repeated

-    /// calls do not necessarily give the same result, i.e. so that the result of the following 

-    /// test is undetermined:

-    /// <code>coll.Choose() == coll.Choose()</code></para>

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    T Choose();

-

-    /// <summary>

-    /// Create an enumerable, enumerating the items of this collection that satisfies 

-    /// a certain condition.

-    /// </summary>

-    /// <param name="filter">The T->bool filter delegate defining the condition</param>

-    /// <returns>The filtered enumerable</returns>

-    SCG.IEnumerable<T> Filter(Fun<T, bool> filter);

-  }

-

-

-

-  /// <summary>

-  /// A sized generic collection, that can be enumerated backwards.

-  /// </summary>

-  public interface IDirectedCollectionValue<T> : ICollectionValue<T>, IDirectedEnumerable<T>

-  {

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typically used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    new IDirectedCollectionValue<T> Backwards();

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the first one in enumeration order.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <param name="item"></param>

-    /// <returns>True is such an item exists</returns>

-    bool FindLast(Fun<T, bool> predicate, out T item);

-  }

-

-

-  /// <summary>

-  /// A generic collection to which one may add items. This is just the intersection

-  /// of the main stream generic collection interfaces and the priority queue interface,

-  /// <see cref="T:C5.ICollection`1"/> and <see cref="T:C5.IPriorityQueue`1"/>.

-  /// </summary>

-  public interface IExtensible<T> : ICollectionValue<T>, ICloneable

-  {

-    /// <summary>

-    /// If true any call of an updating operation will throw an

-    /// <code>ReadOnlyCollectionException</code>

-    /// </summary>

-    /// <value>True if this collection is read-only.</value>

-    bool IsReadOnly { get;}

-

-    //TODO: wonder where the right position of this is

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>False if this collection has set semantics, true if bag semantics.</value>

-    bool AllowsDuplicates { get;}

-

-    //TODO: wonder where the right position of this is. And the semantics.

-    /// <summary>

-    /// (Here should be a discussion of the role of equalityComparers. Any ). 

-    /// </summary>

-    /// <value>The equalityComparer used by this collection to check equality of items. 

-    /// Or null (????) if collection does not check equality at all or uses a comparer.</value>

-    SCG.IEqualityComparer<T> EqualityComparer { get;}

-

-    //ItemEqualityTypeEnum ItemEqualityType {get ;}

-

-    //TODO: find a good name

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    bool DuplicatesByCounting { get;}

-

-    /// <summary>

-    /// Add an item to this collection if possible. If this collection has set

-    /// semantics, the item will be added if not already in the collection. If

-    /// bag semantics, the item will always be added.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True if item was added.</returns>

-    bool Add(T item);

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. If this

-    /// collection has set semantics, only items not already in the collection

-    /// will be added.

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    void AddAll<U>(SCG.IEnumerable<U> items) where U : T;

-

-    //void Clear(); // for priority queue

-    //int Count why not?

-    /// <summary>

-    /// Check the integrity of the internal data structures of this collection.

-    /// <i>This is only relevant for developers of the library</i>

-    /// </summary>

-    /// <returns>True if check was passed.</returns>

-    bool Check();

-  }

-

-  /// <summary>

-  /// The simplest interface of a main stream generic collection

-  /// with lookup, insertion and removal operations. 

-  /// </summary>

-  public interface ICollection<T> : IExtensible<T>

-  {

-    //This is somewhat similar to the RandomAccess marker itf in java

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant). 

-    /// <para>See <see cref="T:C5.Speed"/> for the set of symbols.</para>

-    /// </summary>

-    /// <value>A characterization of the speed of lookup operations

-    /// (<code>Contains()</code> etc.) of the implementation of this collection.</value>

-    Speed ContainsSpeed { get;}

-

-    /// <summary>

-    /// The unordered collection hashcode is defined as the sum of 

-    /// <code>h(hashcode(item))</code> over the items

-    /// of the collection, where the function <code>h</code> is a function from 

-    /// int to int of the form <code> t -> (a0*t+b0)^(a1*t+b1)^(a2*t+b2)</code>, where 

-    /// the ax and bx are the same for all collection classes. 

-    /// <para>The current implementation uses fixed values for the ax and bx, 

-    /// specified as constants in the code.</para>

-    /// </summary>

-    /// <returns>The unordered hashcode of this collection.</returns>

-    int GetUnsequencedHashCode();

-

-

-    /// <summary>

-    /// Compare the contents of this collection to another one without regards to

-    /// the sequence order. The comparison will use this collection's itemequalityComparer

-    /// to compare individual items.

-    /// </summary>

-    /// <param name="otherCollection">The collection to compare to.</param>

-    /// <returns>True if this collection and that contains the same items.</returns>

-    bool UnsequencedEquals(ICollection<T> otherCollection);

-

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    bool Contains(T item);

-

-

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    int ContainsCount(T item);

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    ICollectionValue<T> UniqueItems();

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities();

-

-    /// <summary>

-    /// Check whether this collection contains all the values in another collection.

-    /// If this collection has bag semantics (<code>AllowsDuplicates==true</code>)

-    /// the check is made with respect to multiplicities, else multiplicities

-    /// are not taken into account.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T;

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    bool Find(ref T item);

-

-

-    //This should probably just be bool Add(ref T item); !!!

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found. Else, add the item to the collection.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the item was found (hence not added).</returns>

-    bool FindOrAdd(ref T item);

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// with a (binary copy of) the supplied value. If the collection has bag semantics,

-    /// it depends on the value of DuplicatesByCounting if this updates all equivalent copies in

-    /// the collection or just one.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    bool Update(T item);

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// with a (binary copy of) the supplied value. If the collection has bag semantics,

-    /// it depends on the value of DuplicatesByCounting if this updates all equivalent copies in

-    /// the collection or just one.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <param name="olditem">On output the olditem, if found.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    bool Update(T item, out T olditem);

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value; else add the value to the collection. 

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    bool UpdateOrAdd(T item);

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value; else add the value to the collection. 

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <param name="olditem">On output the olditem, if found.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    bool UpdateOrAdd(T item, out T olditem);

-

-    /// <summary>

-    /// Remove a particular item from this collection. If the collection has bag

-    /// semantics only one copy equivalent to the supplied item is removed. 

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    bool Remove(T item);

-

-

-    /// <summary>

-    /// Remove a particular item from this collection if found. If the collection

-    /// has bag semantics only one copy equivalent to the supplied item is removed,

-    /// which one is implementation dependent. 

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The value removed if any.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    bool Remove(T item, out T removeditem);

-

-

-    /// <summary>

-    /// Remove all items equivalent to a given value.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    void RemoveAllCopies(T item);

-

-

-    /// <summary>

-    /// Remove all items in another collection from this one. If this collection

-    /// has bag semantics, take multiplicities into account.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T;

-

-    //void RemoveAll(Fun<T, bool> predicate);

-

-    /// <summary>

-    /// Remove all items from this collection.

-    /// </summary>

-    void Clear();

-

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one. If this collection

-    /// has bag semantics, take multiplicities into account.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    void RetainAll<U>(SCG.IEnumerable<U> items) where U : T;

-

-    //void RetainAll(Fun<T, bool> predicate);

-    //IDictionary<T> UniqueItems()

-  }

-

-

-

-  /// <summary>

-  /// An editable collection maintaining a definite sequence order of the items.

-  ///

-  /// <i>Implementations of this interface must compute the hash code and 

-  /// equality exactly as prescribed in the method definitions in order to

-  /// be consistent with other collection classes implementing this interface.</i>

-  /// <i>This interface is usually implemented by explicit interface implementation,

-  /// not as ordinary virtual methods.</i>

-  /// </summary>

-  public interface ISequenced<T> : ICollection<T>, IDirectedCollectionValue<T>

-  {

-    /// <summary>

-    /// The hashcode is defined as <code>h(...h(h(h(x1),x2),x3),...,xn)</code> for

-    /// <code>h(a,b)=CONSTANT*a+b</code> and the x's the hash codes of the items of 

-    /// this collection.

-    /// </summary>

-    /// <returns>The sequence order hashcode of this collection.</returns>

-    int GetSequencedHashCode();

-

-

-    /// <summary>

-    /// Compare this sequenced collection to another one in sequence order.

-    /// </summary>

-    /// <param name="otherCollection">The sequenced collection to compare to.</param>

-    /// <returns>True if this collection and that contains equal (according to

-    /// this collection's itemequalityComparer) in the same sequence order.</returns>

-    bool SequencedEquals(ISequenced<T> otherCollection);

-  }

-

-

-

-  /// <summary>

-  /// A sequenced collection, where indices of items in the order are maintained

-  /// </summary>

-  public interface IIndexed<T> : ISequenced<T>

-  {

-    /// <summary>

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if <code>index</code> is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <value>The <code>index</code>'th item of this list.</value>

-    /// <param name="index">the index to lookup</param>

-    T this[int index] { get;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    Speed IndexingSpeed { get;}

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"></exception>

-    /// <value>The directed collection of items in a specific index interval.</value>

-    /// <param name="start">The low index of the interval (inclusive).</param>

-    /// <param name="count">The size of the range.</param>

-    IDirectedCollectionValue<T> this[int start, int count] { get;}

-

-

-    /// <summary>

-    /// Searches for an item in the list going forwards from the start. 

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from start. A negative number if item not found, 

-    /// namely the two-complement of the index at which the Add operation would put the item.</returns>

-    int IndexOf(T item);

-

-

-    /// <summary>

-    /// Searches for an item in the list going backwards from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of of item from the end. A negative number if item not found, 

-    /// namely the two-complement of the index at which the Add operation would put the item.</returns>

-    int LastIndexOf(T item);

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the index of the first one.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>the index, if found, a negative value else</returns>

-    int FindIndex(Fun<T, bool> predicate);

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the index of the last one.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>the index, if found, a negative value else</returns>

-    int FindLastIndex(Fun<T, bool> predicate);

-

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if <code>index</code> is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <param name="index">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    T RemoveAt(int index);

-

-

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if start or count 

-    /// is negative or start+count &gt; the size of the collection.</exception>

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    void RemoveInterval(int start, int count);

-  }

-

-  //TODO: decide if this should extend ICollection

-  /// <summary>

-  /// The interface describing the operations of a LIFO stack data structure.

-  /// </summary>

-  /// <typeparam name="T">The item type</typeparam>

-  public interface IStack<T> : IDirectedCollectionValue<T>

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    bool AllowsDuplicates { get;}

-    /// <summary>

-    /// Get the <code>index</code>'th element of the stack.  The bottom of the stack has index 0.

-    /// </summary>

-    /// <param name="index"></param>

-    /// <returns></returns>

-    T this[int index] { get;}

-    /// <summary>

-    /// Push an item to the top of the stack.

-    /// </summary>

-    /// <param name="item">The item</param>

-    void Push(T item);

-    /// <summary>

-    /// Pop the item at the top of the stack from the stack.

-    /// </summary>

-    /// <returns>The popped item.</returns>

-    T Pop();

-  }

-

-  /// <summary>

-  /// The interface describing the operations of a FIFO queue data structure.

-  /// </summary>

-  /// <typeparam name="T">The item type</typeparam>

-  public interface IQueue<T> : IDirectedCollectionValue<T>

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    bool AllowsDuplicates { get;}

-    /// <summary>

-    /// Get the <code>index</code>'th element of the queue.  The front of the queue has index 0.

-    /// </summary>

-    /// <param name="index"></param>

-    /// <returns></returns>

-    T this[int index] { get;}

-    /// <summary>

-    /// Enqueue an item at the back of the queue. 

-    /// </summary>

-    /// <param name="item">The item</param>

-    void Enqueue(T item);

-    /// <summary>

-    /// Dequeue an item from the front of the queue.

-    /// </summary>

-    /// <returns>The item</returns>

-    T Dequeue();

-  }

-

-

-  /// <summary>

-  /// This is an indexed collection, where the item order is chosen by 

-  /// the user at insertion time.

-  ///

-  /// NBNBNB: we need a description of the view functionality here!

-  /// </summary>

-  public interface IList<T> : IIndexed<T>, IDisposable

-  {

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The first item in this list.</value>

-    T First { get;}

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The last item in this list.</value>

-    T Last { get;}

-

-    /// <summary>

-    /// Since <code>Add(T item)</code> always add at the end of the list,

-    /// this describes if list has FIFO or LIFO semantics.

-    /// </summary>

-    /// <value>True if the <code>Remove()</code> operation removes from the

-    /// start of the list, false if it removes from the end.</value>

-    bool FIFO { get; set;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    bool IsFixedSize { get; }

-

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <value>The index'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-    new T this[int index] { get; set;}

-

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if <code>index</code> is negative or

-    /// &gt; the size of the collection.</exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.</exception>

-    /// <param name="index">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-    void Insert(int index, T item);

-

-    /// <summary>

-    /// Insert an item at the end of a compatible view, used as a pointer.

-    /// <para>The <code>pointer</code> must be a view on the same list as

-    /// <code>this</code> and the endpoitn of <code>pointer</code> must be

-    /// a valid insertion point of <code>this</code></para>

-    /// </summary>

-    /// <exception cref="IncompatibleViewException">If <code>pointer</code> 

-    /// is not a view on the same list as <code>this</code></exception>

-    /// <exception cref="IndexOutOfRangeException"><b>??????</b> if the endpoint of 

-    ///  <code>pointer</code> is not inside <code>this</code></exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.</exception>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    void Insert(IList<T> pointer, T item);

-

-    /// <summary>

-    /// Insert an item at the front of this list.

-    /// <exception cref="DuplicateNotAllowedException"/> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-    void InsertFirst(T item);

-

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// <exception cref="DuplicateNotAllowedException"/> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-    void InsertLast(T item);

-

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if <code>index</code> is negative or

-    /// &gt; the size of the collection.</exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has 

-    /// <code>AllowsDuplicates==false</code> and one of the items to insert is

-    /// already in the list.</exception>

-    /// <param name="index">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-    /// <typeparam name="U"></typeparam>

-    void InsertAll<U>(int index, SCG.IEnumerable<U> items) where U : T;

-

-    /// <summary>

-    /// Create a new list consisting of the items of this list satisfying a 

-    /// certain predicate.

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new list.</returns>

-    IList<T> FindAll(Fun<T, bool> filter);

-

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use the default equalityComparer for the item type V.

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <returns>The new list.</returns>

-    IList<V> Map<V>(Fun<T, V> mapper);

-

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified equalityComparer for the item type.

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="equalityComparer">The equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-    IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> equalityComparer);

-

-    /// <summary>

-    /// Remove one item from the list: from the front if <code>FIFO</code>

-    /// is true, else from the back.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    T Remove();

-

-    /// <summary>

-    /// Remove one item from the front of the list.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    T RemoveFirst();

-

-    /// <summary>

-    /// Remove one item from the back of the list.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    T RemoveLast();

-

-    /// <summary>

-    /// Create a list view on this list. 

-    /// <exception cref="ArgumentOutOfRangeException"/> if the view would not fit into

-    /// this list.

-    /// </summary>

-    /// <param name="start">The index in this list of the start of the view.</param>

-    /// <param name="count">The size of the view.</param>

-    /// <returns>The new list view.</returns>

-    IList<T> View(int start, int count);

-

-    /// <summary>

-    /// Create a list view on this list containing the (first) occurrence of a particular item. 

-    /// <exception cref="NoSuchItemException"/> if the item is not in this list.

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    IList<T> ViewOf(T item);

-

-    /// <summary>

-    /// Create a list view on this list containing the last occurrence of a particular item. 

-    /// <exception cref="NoSuchItemException"/> if the item is not in this list.

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    IList<T> LastViewOf(T item);

-

-    /// <summary>

-    /// Null if this list is not a view.

-    /// </summary>

-    /// <value>Underlying list for view.</value>

-    IList<T> Underlying { get;}

-

-    /// <summary>

-    /// </summary>

-    /// <value>Offset for this list view or 0 for an underlying list.</value>

-    int Offset { get;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    bool IsValid { get;}

-

-    /// <summary>

-    /// Slide this list view along the underlying list.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    IList<T> Slide(int offset);

-

-    /// <summary>

-    /// Slide this list view along the underlying list, changing its size.

-    /// 

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    /// <param name="size">The new size of the view.</param>

-    IList<T> Slide(int offset, int size);

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    bool TrySlide(int offset);

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    bool TrySlide(int offset, int size);

-

-    /// <summary>

-    /// 

-    /// <para>Returns null if <code>otherView</code> is strictly to the left of this view</para>

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <exception cref="IncompatibleViewException">If otherView does not have the same underlying list as this</exception>

-    /// <exception cref="ArgumentOutOfRangeException">If <code>otherView</code> is strictly to the left of this view</exception>

-    /// <returns></returns>

-    IList<T> Span(IList<T> otherView);

-

-    /// <summary>

-    /// Reverse the list so the items are in the opposite sequence order.

-    /// </summary>

-    void Reverse();

-

-    /// <summary>

-    /// Check if this list is sorted according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    /// <returns>True if the list is sorted, else false.</returns>

-    bool IsSorted();

-

-    /// <summary>

-    /// Check if this list is sorted according to a specific sorting order.

-    /// </summary>

-    /// <param name="comparer">The comparer defining the sorting order.</param>

-    /// <returns>True if the list is sorted, else false.</returns>

-    bool IsSorted(SCG.IComparer<T> comparer);

-

-    /// <summary>

-    /// Sort the items of the list according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    void Sort();

-

-    /// <summary>

-    /// Sort the items of the list according to a specified sorting order.

-    /// <para>The sorting does not perform duplicate elimination or identify items

-    /// according to the comparer or itemequalityComparer. I.e. the list as an 

-    /// unsequenced collection with binary equality, will not change.

-    /// </para>

-    /// </summary>

-    /// <param name="comparer">The comparer defining the sorting order.</param>

-    void Sort(SCG.IComparer<T> comparer);

-

-

-    /// <summary>

-    /// Randomly shuffle the items of this list. 

-    /// </summary>

-    void Shuffle();

-

-

-    /// <summary>

-    /// Shuffle the items of this list according to a specific random source.

-    /// </summary>

-    /// <param name="rnd">The random source.</param>

-    void Shuffle(Random rnd);

-  }

-

-

-  /// <summary>

-  /// The base type of a priority queue handle

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public interface IPriorityQueueHandle<T>

-  {

-    //TODO: make abstract and prepare for double dispatch:

-    //public virtual bool Delete(IPriorityQueue<T> q) { throw new InvalidFooException();}

-    //bool Replace(T item);

-  }

-

-

-  /// <summary>

-  /// A generic collection of items prioritized by a comparison (order) relation.

-  /// Supports adding items and reporting or removing extremal elements. 

-  /// <para>

-  /// 

-  /// </para>

-  /// When adding an item, the user may choose to have a handle allocated for this item in the queue. 

-  /// The resulting handle may be used for deleting the item even if not extremal, and for replacing the item.

-  /// A priority queue typically only holds numeric priorities associated with some objects

-  /// maintained separately in other collection objects.

-  /// </summary>

-  public interface IPriorityQueue<T> : IExtensible<T>

-  {

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// </summary>

-    /// <returns>The least item.</returns>

-    T FindMin();

-

-

-    /// <summary>

-    /// Remove the least item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    T DeleteMin();

-

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// </summary>

-    /// <returns>The largest item.</returns>

-    T FindMax();

-

-

-    /// <summary>

-    /// Remove the largest item from this priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    T DeleteMax();

-

-    /// <summary>

-    /// The comparer object supplied at creation time for this collection

-    /// </summary>

-    /// <value>The comparer</value>

-    SCG.IComparer<T> Comparer { get;}

-    /// <summary>

-    /// Get or set the item corresponding to a handle. Throws exceptions on 

-    /// invalid handles.

-    /// </summary>

-    /// <param name="handle"></param>

-    /// <returns></returns>

-    T this[IPriorityQueueHandle<T> handle] { get; set;}

-

-    /// <summary>

-    /// Check if the entry corresponding to a handle is in the priority queue.

-    /// </summary>

-    /// <param name="handle"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    bool Find(IPriorityQueueHandle<T> handle, out T item);

-

-    /// <summary>

-    /// Add an item to the priority queue, receiving a 

-    /// handle for the item in the queue, 

-    /// or reusing an existing unused handle.

-    /// </summary>

-    /// <param name="handle">On output: a handle for the added item. 

-    /// On input: null for allocating a new handle, or a currently unused handle for reuse. 

-    /// A handle for reuse must be compatible with this priority queue, 

-    /// by being created by a priority queue of the same runtime type, but not 

-    /// necessarily the same priority queue object.</param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    bool Add(ref IPriorityQueueHandle<T> handle, T item);

-

-    /// <summary>

-    /// Delete an item with a handle from a priority queue

-    /// </summary>

-    /// <param name="handle">The handle for the item. The handle will be invalidated, but reusable.</param>

-    /// <returns>The deleted item</returns>

-    T Delete(IPriorityQueueHandle<T> handle);

-

-    /// <summary>

-    /// Replace an item with a handle in a priority queue with a new item. 

-    /// Typically used for changing the priority of some queued object.

-    /// </summary>

-    /// <param name="handle">The handle for the old item</param>

-    /// <param name="item">The new item</param>

-    /// <returns>The old item</returns>

-    T Replace(IPriorityQueueHandle<T> handle, T item);

-

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the item.</param>

-    /// <returns>The least item.</returns>

-    T FindMin(out IPriorityQueueHandle<T> handle);

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the item.</param>

-    /// <returns>The largest item.</returns>

-

-    T FindMax(out IPriorityQueueHandle<T> handle);

-

-    /// <summary>

-    /// Remove the least item from this  priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the removed item.</param>

-    /// <returns>The removed item.</returns>

-

-    T DeleteMin(out IPriorityQueueHandle<T> handle);

-

-    /// <summary>

-    /// Remove the largest item from this  priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the removed item.</param>

-    /// <returns>The removed item.</returns>

-    T DeleteMax(out IPriorityQueueHandle<T> handle);

-  }

-

-

-

-  /// <summary>

-  /// A sorted collection, i.e. a collection where items are maintained and can be searched for in sorted order.

-  /// Thus the sequence order is given as a sorting order.

-  /// 

-  /// <para>The sorting order is defined by a comparer, an object of type IComparer&lt;T&gt; 

-  /// (<see cref="T:C5.IComparer`1"/>). Implementors of this interface will normally let the user 

-  /// define the comparer as an argument to a constructor. 

-  /// Usually there will also be constructors without a comparer argument, in which case the 

-  /// comparer should be the defalt comparer for the item type, <see cref="P:C5.Comparer`1.Default"/>.</para>

-  /// 

-  /// <para>The comparer of the sorted collection is available as the <code>Comparer</code> property 

-  /// (<see cref="P:C5.ISorted`1.Comparer"/>).</para>

-  /// 

-  /// <para>The methods are grouped according to

-  /// <list>

-  /// <item>Extrema: report or report and delete an extremal item. This is reminiscent of simplified priority queues.</item>

-  /// <item>Nearest neighbor: report predecessor or successor in the collection of an item. Cut belongs to this group.</item>

-  /// <item>Range: report a view of a range of elements or remove all elements in a range.</item>

-  /// <item>AddSorted: add a collection of items known to be sorted in the same order (should be faster) (to be removed?)</item>

-  /// </list>

-  /// </para>

-  /// 

-  /// <para>Since this interface extends ISequenced&lt;T&gt;, sorted collections will also have an 

-  /// item equalityComparer (<see cref="P:C5.IExtensible`1.EqualityComparer"/>). This equalityComparer will not be used in connection with 

-  /// the inner workings of the sorted collection, but will be used if the sorted collection is used as 

-  /// an item in a collection of unsequenced or sequenced collections, 

-  /// (<see cref="T:C5.ICollection`1"/> and <see cref="T:C5.ISequenced`1"/>)</para>

-  /// 

-  /// <para>Note that code may check if two sorted collections has the same sorting order 

-  /// by checking if the Comparer properties are equal. This is done a few places in this library

-  /// for optimization purposes.</para>

-  /// </summary>

-  public interface ISorted<T> : ISequenced<T>

-  {

-    /// <summary>

-    /// Find the current least item of this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The least item.</returns>

-    T FindMin();

-

-

-    /// <summary>

-    /// Remove the least item from this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The removed item.</returns>

-    T DeleteMin();

-

-

-    /// <summary>

-    /// Find the current largest item of this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The largest item.</returns>

-    T FindMax();

-

-

-    /// <summary>

-    /// Remove the largest item from this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The removed item.</returns>

-    T DeleteMax();

-

-    /// <summary>

-    /// The comparer object supplied at creation time for this sorted collection.

-    /// </summary>

-    /// <value>The comparer</value>

-    SCG.IComparer<T> Comparer { get;}

-

-    /// <summary>

-    /// Find the strict predecessor in the sorted collection of a particular value,

-    /// that is, the largest item in the collection less than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than or equal to the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the predecessor for.</param>

-    /// <returns>The predecessor.</returns>

-    T Predecessor(T item);

-

-

-    /// <summary>

-    /// Find the strict successor in the sorted collection of a particular value,

-    /// that is, the least item in the collection greater than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than or equal to the maximum of this collection.)</exception>

-    /// <param name="item">The item to find the successor for.</param>

-    /// <returns>The successor.</returns>

-    T Successor(T item);

-

-

-    /// <summary>

-    /// Find the weak predecessor in the sorted collection of a particular value,

-    /// that is, the largest item in the collection less than or equal to the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the weak predecessor for.</param>

-    /// <returns>The weak predecessor.</returns>

-    T WeakPredecessor(T item);

-

-

-    /// <summary>

-    /// Find the weak successor in the sorted collection of a particular value,

-    /// that is, the least item in the collection greater than or equal to the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than the maximum of this collection.)</exception>

-    ///<param name="item">The item to find the weak successor for.</param>

-    /// <returns>The weak successor.</returns>

-    T WeakSuccessor(T item);

-

-

-    /// <summary>

-    /// Given a "cut" function from the items of the sorted collection to <code>int</code>

-    /// whose only sign changes when going through items in increasing order

-    /// can be 

-    /// <list>

-    /// <item>from positive to zero</item>

-    /// <item>from positive to negative</item>

-    /// <item>from zero to negative</item>

-    /// </list>

-    /// The "cut" function is supplied as the <code>CompareTo</code> method 

-    /// of an object <code>c</code> implementing 

-    /// <code>IComparable&lt;T&gt;</code>. 

-    /// A typical example is the case where <code>T</code> is comparable and 

-    /// <code>cutFunction</code> is itself of type <code>T</code>.

-    /// <para>This method performs a search in the sorted collection for the ranges in which the

-    /// "cut" function is negative, zero respectively positive. If <code>T</code> is comparable

-    /// and <code>c</code> is of type <code>T</code>, this is a safe way (no exceptions thrown) 

-    /// to find predecessor and successor of <code>c</code>.

-    /// </para>

-    /// <para> If the supplied cut function does not satisfy the sign-change condition, 

-    /// the result of this call is undefined.

-    /// </para>

-    /// 

-    /// </summary>

-    /// <param name="cutFunction">The cut function <code>T</code> to <code>int</code>, given

-    /// by the <code>CompareTo</code> method of an object implementing 

-    /// <code>IComparable&lt;T&gt;</code>.</param>

-    /// <param name="low">Returns the largest item in the collection, where the

-    /// cut function is positive (if any).</param>

-    /// <param name="lowIsValid">Returns true if the cut function is positive somewhere

-    /// on this collection.</param>

-    /// <param name="high">Returns the least item in the collection, where the

-    /// cut function is negative (if any).</param>

-    /// <param name="highIsValid">Returns true if the cut function is negative somewhere

-    /// on this collection.</param>

-    /// <returns>True if the cut function is zero somewhere

-    /// on this collection.</returns>

-    bool Cut(IComparable<T> cutFunction, out T low, out bool lowIsValid, out T high, out bool highIsValid);

-

-

-    /// <summary>

-    /// Query this sorted collection for items greater than or equal to a supplied value.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    IDirectedEnumerable<T> RangeFrom(T bot);

-

-

-    /// <summary>

-    /// Query this sorted collection for items between two supplied values.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    IDirectedEnumerable<T> RangeFromTo(T bot, T top);

-

-

-    /// <summary>

-    /// Query this sorted collection for items less than a supplied value.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    IDirectedEnumerable<T> RangeTo(T top);

-

-

-    /// <summary>

-    /// Create a directed collection with the same items as this collection.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <returns>The result directed collection.</returns>

-    IDirectedCollectionValue<T> RangeAll();

-

-

-    //TODO: remove now that we assume that we can check the sorting order?

-    /// <summary>

-    /// Add all the items from another collection with an enumeration order that 

-    /// is increasing in the items.

-    /// </summary>

-    /// <exception cref="ArgumentException"> if the enumerated items turns out

-    /// not to be in increasing order.</exception>

-    /// <param name="items">The collection to add.</param>

-    /// <typeparam name="U"></typeparam>

-    void AddSorted<U>(SCG.IEnumerable<U> items) where U : T;

-

-

-    /// <summary>

-    /// Remove all items of this collection above or at a supplied threshold.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    void RemoveRangeFrom(T low);

-

-

-    /// <summary>

-    /// Remove all items of this collection between two supplied thresholds.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    void RemoveRangeFromTo(T low, T hi);

-

-

-    /// <summary>

-    /// Remove all items of this collection below a supplied threshold.

-    /// </summary>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    void RemoveRangeTo(T hi);

-  }

-

-

-

-  /// <summary>

-  /// A collection where items are maintained in sorted order together

-  /// with their indexes in that order.

-  /// </summary>

-  public interface IIndexedSorted<T> : ISorted<T>, IIndexed<T>

-  {

-    /// <summary>

-    /// Determine the number of items at or above a supplied threshold.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    int CountFrom(T bot);

-

-

-    /// <summary>

-    /// Determine the number of items between two supplied thresholds.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    int CountFromTo(T bot, T top);

-

-

-    /// <summary>

-    /// Determine the number of items below a supplied threshold.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    int CountTo(T top);

-

-

-    /// <summary>

-    /// Query this sorted collection for items greater than or equal to a supplied value.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    new IDirectedCollectionValue<T> RangeFrom(T bot);

-

-

-    /// <summary>

-    /// Query this sorted collection for items between two supplied values.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    new IDirectedCollectionValue<T> RangeFromTo(T bot, T top);

-

-

-    /// <summary>

-    /// Query this sorted collection for items less than a supplied value.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    new IDirectedCollectionValue<T> RangeTo(T top);

-

-

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the items of this

-    /// indexed sorted collection satisfying a certain predicate.

-    /// </summary>

-    /// <param name="predicate">The filter delegate defining the predicate.</param>

-    /// <returns>The new indexed sorted collection.</returns>

-    IIndexedSorted<T> FindAll(Fun<T, bool> predicate);

-

-

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the results of

-    /// mapping all items of this list.

-    /// <exception cref="ArgumentException"/> if the map is not increasing over 

-    /// the items of this collection (with respect to the two given comparison 

-    /// relations).

-    /// </summary>

-    /// <param name="mapper">The delegate definging the map.</param>

-    /// <param name="comparer">The comparion relation to use for the result.</param>

-    /// <returns>The new sorted collection.</returns>

-    IIndexedSorted<V> Map<V>(Fun<T, V> mapper, SCG.IComparer<V> comparer);

-  }

-

-

-

-  /// <summary>

-  /// The type of a sorted collection with persistence

-  /// </summary>

-  public interface IPersistentSorted<T> : ISorted<T>, IDisposable

-  {

-    /// <summary>

-    /// Make a (read-only) snap shot of this collection.

-    /// </summary>

-    /// <returns>The snap shot.</returns>

-    ISorted<T> Snapshot();

-  }

-

-

-

-  /*************************************************************************/

-  /// <summary>

-  /// A dictionary with keys of type K and values of type V. Equivalent to a

-  /// finite partial map from K to V.

-  /// </summary>

-  public interface IDictionary<K, V> : ICollectionValue<KeyValuePair<K, V>>, ICloneable

-  {

-    /// <summary>

-    /// The key equalityComparer.

-    /// </summary>

-    /// <value></value>

-    SCG.IEqualityComparer<K> EqualityComparer { get;}

-

-    /// <summary>

-    /// Indexer for dictionary.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no entry is found. </exception>

-    /// <value>The value corresponding to the key</value>

-    V this[K key] { get; set;}

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if dictionary is read-only</value>

-    bool IsReadOnly { get;}

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>A collection containg the all the keys of the dictionary</value>

-    ICollectionValue<K> Keys { get;}

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>A collection containing all the values of the dictionary</value>

-    ICollectionValue<V> Values { get;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>A delegate of type <see cref="T:C5.Fun`2"/> defining the partial function from K to V give by the dictionary.</value>

-    Fun<K, V> Fun { get; }

-

-

-    //TODO: resolve inconsistency: Add thows exception if key already there, AddAll ignores keys already There?

-    /// <summary>

-    /// Add a new (key, value) pair (a mapping) to the dictionary.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException"> if there already is an entry with the same key. </exception>>

-    /// <param name="key">Key to add</param>

-    /// <param name="val">Value to add</param>

-    void Add(K key, V val);

-

-    /// <summary>

-    /// Add the entries from a collection of <see cref="T:C5.KeyValuePair`2"/> pairs to this dictionary.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException"> 

-    /// If the input contains duplicate keys or a key already present in this dictionary.</exception>

-    /// <param name="entries"></param>

-    void AddAll<U, W>(SCG.IEnumerable<KeyValuePair<U, W>> entries)

-        where U : K

-        where W : V

-      ;

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant). 

-    /// <para>See <see cref="T:C5.Speed"/> for the set of symbols.</para>

-    /// </summary>

-    /// <value>A characterization of the speed of lookup operations

-    /// (<code>Contains()</code> etc.) of the implementation of this dictionary.</value>

-    Speed ContainsSpeed { get;}

-

-    /// <summary>

-    /// Check whether this collection contains all the values in another collection.

-    /// If this collection has bag semantics (<code>AllowsDuplicates==true</code>)

-    /// the check is made with respect to multiplicities, else multiplicities

-    /// are not taken into account.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-      bool ContainsAll<H>(SCG.IEnumerable<H> items) where H : K;

-

-    /// <summary>

-    /// Remove an entry with a given key from the dictionary

-    /// </summary>

-    /// <param name="key">The key of the entry to remove</param>

-    /// <returns>True if an entry was found (and removed)</returns>

-    bool Remove(K key);

-

-

-    /// <summary>

-    /// Remove an entry with a given key from the dictionary and report its value.

-    /// </summary>

-    /// <param name="key">The key of the entry to remove</param>

-    /// <param name="val">On exit, the value of the removed entry</param>

-    /// <returns>True if an entry was found (and removed)</returns>

-    bool Remove(K key, out V val);

-

-

-    /// <summary>

-    /// Remove all entries from the dictionary

-    /// </summary>

-    void Clear();

-

-

-    /// <summary>

-    /// Check if there is an entry with a specified key

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <returns>True if key was found</returns>

-    bool Contains(K key);

-

-

-    /// <summary>

-    /// Check if there is an entry with a specified key and report the corresponding

-    /// value if found. This can be seen as a safe form of "val = this[key]".

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">On exit, the value of the entry</param>

-    /// <returns>True if key was found</returns>

-    bool Find(K key, out V val);

-

-    /// <summary>

-    /// Check if there is an entry with a specified key and report the corresponding

-    /// value if found. This can be seen as a safe form of "val = this[key]".

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">On exit, the value of the entry</param>

-    /// <returns>True if key was found</returns>

-    bool Find(ref K key, out V val);

-

-

-    /// <summary>

-    /// Look for a specific key in the dictionary and if found replace the value with a new one.

-    /// This can be seen as a non-adding version of "this[key] = val".

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">The new value</param>

-    /// <returns>True if key was found</returns>

-    bool Update(K key, V val);          //no-adding				    	

-

-

-    /// <summary>

-    /// Look for a specific key in the dictionary and if found replace the value with a new one.

-    /// This can be seen as a non-adding version of "this[key] = val" reporting the old value.

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">The new value</param>

-    /// <param name="oldval">The old value if any</param>

-    /// <returns>True if key was found</returns>

-    bool Update(K key, V val, out V oldval);          //no-adding				    	

-

-    /// <summary>

-    /// Look for a specific key in the dictionary. If found, report the corresponding value,

-    /// else add an entry with the key and the supplied value.

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">On entry the value to add if the key is not found.

-    /// On exit the value found if any.</param>

-    /// <returns>True if key was found</returns>

-    bool FindOrAdd(K key, ref V val);   //mixture

-

-

-    /// <summary>

-    /// Update value in dictionary corresponding to key if found, else add new entry.

-    /// More general than "this[key] = val;" by reporting if key was found.

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">The value to add or replace with.</param>

-    /// <returns>True if key was found and value updated.</returns>

-    bool UpdateOrAdd(K key, V val);

-

-

-    /// <summary>

-    /// Update value in dictionary corresponding to key if found, else add new entry.

-    /// More general than "this[key] = val;" by reporting if key was found.

-    /// </summary>

-    /// <param name="key">The key to look for</param>

-    /// <param name="val">The value to add or replace with.</param>

-    /// <param name="oldval">The old value if any</param>

-    /// <returns>True if key was found and value updated.</returns>

-    bool UpdateOrAdd(K key, V val, out V oldval);

-

-

-    /// <summary>

-    /// Check the integrity of the internal data structures of this dictionary.

-    /// Only avaliable in DEBUG builds???

-    /// </summary>

-    /// <returns>True if check does not fail.</returns>

-    bool Check();

-  }

-

-

-

-  /// <summary>

-  /// A dictionary with sorted keys.

-  /// </summary>

-  public interface ISortedDictionary<K, V> : IDictionary<K, V>

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    new ISorted<K> Keys { get;}

-

-    /// <summary>

-    /// Find the current least item of this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The least item.</returns>

-    KeyValuePair<K, V> FindMin();

-

-

-    /// <summary>

-    /// Remove the least item from this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The removed item.</returns>

-    KeyValuePair<K, V> DeleteMin();

-

-

-    /// <summary>

-    /// Find the current largest item of this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The largest item.</returns>

-    KeyValuePair<K, V> FindMax();

-

-

-    /// <summary>

-    /// Remove the largest item from this sorted collection.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if the collection is empty.</exception>

-    /// <returns>The removed item.</returns>

-    KeyValuePair<K, V> DeleteMax();

-

-    /// <summary>

-    /// The key comparer used by this dictionary.

-    /// </summary>

-    /// <value></value>

-    SCG.IComparer<K> Comparer { get;}

-

-    /// <summary>

-    /// Find the entry with the largest key less than a given key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if there is no such entry. </exception>

-    /// <param name="key">The key to compare to</param>

-    /// <returns>The entry</returns>

-    KeyValuePair<K, V> Predecessor(K key);

-

-

-    /// <summary>

-    /// Find the entry with the least key greater than a given key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if there is no such entry. </exception>

-    /// <param name="key">The key to compare to</param>

-    /// <returns>The entry</returns>

-    KeyValuePair<K, V> Successor(K key);

-

-

-    /// <summary>

-    /// Find the entry with the largest key less than or equal to a given key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if there is no such entry. </exception>

-    /// <param name="key">The key to compare to</param>

-    /// <returns>The entry</returns>

-    KeyValuePair<K, V> WeakPredecessor(K key);

-

-

-    /// <summary>

-    /// Find the entry with the least key greater than or equal to a given key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if there is no such entry. </exception>

-    /// <param name="key">The key to compare to</param>

-    /// <returns>The entry</returns>

-    KeyValuePair<K, V> WeakSuccessor(K key);

-

-    /// <summary>

-    /// Given a "cut" function from the items of the sorted collection to <code>int</code>

-    /// whose only sign changes when going through items in increasing order

-    /// can be 

-    /// <list>

-    /// <item>from positive to zero</item>

-    /// <item>from positive to negative</item>

-    /// <item>from zero to negative</item>

-    /// </list>

-    /// The "cut" function is supplied as the <code>CompareTo</code> method 

-    /// of an object <code>c</code> implementing 

-    /// <code>IComparable&lt;K&gt;</code>. 

-    /// A typical example is the case where <code>K</code> is comparable and 

-    /// <code>c</code> is itself of type <code>K</code>.

-    /// <para>This method performs a search in the sorted collection for the ranges in which the

-    /// "cut" function is negative, zero respectively positive. If <code>K</code> is comparable

-    /// and <code>c</code> is of type <code>K</code>, this is a safe way (no exceptions thrown) 

-    /// to find predecessor and successor of <code>c</code>.

-    /// </para>

-    /// <para> If the supplied cut function does not satisfy the sign-change condition, 

-    /// the result of this call is undefined.

-    /// </para>

-    /// 

-    /// </summary>

-    /// <param name="cutFunction">The cut function <code>K</code> to <code>int</code>, given

-    /// by the <code>CompareTo</code> method of an object implementing 

-    /// <code>IComparable&lt;K&gt;</code>.</param>

-    /// <param name="lowEntry">Returns the largest item in the collection, where the

-    /// cut function is positive (if any).</param>

-    /// <param name="lowIsValid">Returns true if the cut function is positive somewhere

-    /// on this collection.</param>

-    /// <param name="highEntry">Returns the least item in the collection, where the

-    /// cut function is negative (if any).</param>

-    /// <param name="highIsValid">Returns true if the cut function is negative somewhere

-    /// on this collection.</param>

-    /// <returns>True if the cut function is zero somewhere

-    /// on this collection.</returns>

-    bool Cut(IComparable<K> cutFunction, out KeyValuePair<K, V> lowEntry, out bool lowIsValid, out KeyValuePair<K, V> highEntry, out bool highIsValid);

-

-    /// <summary>

-    /// Query this sorted collection for items greater than or equal to a supplied value.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    IDirectedEnumerable<KeyValuePair<K, V>> RangeFrom(K bot);

-

-

-    /// <summary>

-    /// Query this sorted collection for items between two supplied values.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <param name="lowerBound">The lower bound (inclusive).</param>

-    /// <param name="upperBound">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    IDirectedEnumerable<KeyValuePair<K, V>> RangeFromTo(K lowerBound, K upperBound);

-

-

-    /// <summary>

-    /// Query this sorted collection for items less than a supplied value.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    IDirectedEnumerable<KeyValuePair<K, V>> RangeTo(K top);

-

-

-    /// <summary>

-    /// Create a directed collection with the same items as this collection.

-    /// <para>The returned collection is not a copy but a view into the collection.</para>

-    /// <para>The view is fragile in the sense that changes to the underlying collection will 

-    /// invalidate the view so that further operations on the view throws InvalidView exceptions.</para>

-    /// </summary>

-    /// <returns>The result directed collection.</returns>

-    IDirectedCollectionValue<KeyValuePair<K, V>> RangeAll();

-

-

-    //TODO: remove now that we assume that we can check the sorting order?

-    /// <summary>

-    /// Add all the items from another collection with an enumeration order that 

-    /// is increasing in the items.

-    /// </summary>

-    /// <exception cref="ArgumentException"> if the enumerated items turns out

-    /// not to be in increasing order.</exception>

-    /// <param name="items">The collection to add.</param>

-    void AddSorted(SCG.IEnumerable<KeyValuePair<K, V>> items);

-

-

-    /// <summary>

-    /// Remove all items of this collection above or at a supplied threshold.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    void RemoveRangeFrom(K low);

-

-

-    /// <summary>

-    /// Remove all items of this collection between two supplied thresholds.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    void RemoveRangeFromTo(K low, K hi);

-

-

-    /// <summary>

-    /// Remove all items of this collection below a supplied threshold.

-    /// </summary>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    void RemoveRangeTo(K hi);

-  }

-

-

-

-  /*******************************************************************/

-  /*/// <summary>

-  /// The type of an item comparer

-  /// <i>Implementations of this interface must asure that the method is self-consistent

-  /// and defines a sorting order on items, or state precise conditions under which this is true.</i>

-  /// <i>Implementations <b>must</b> assure that repeated calls of

-  /// the method to the same (in reference or binary identity sense) arguments 

-  /// will return values with the same sign (-1, 0 or +1), or state precise conditions

-  /// under which the user 

-  /// can be assured repeated calls will return the same sign.</i>

-  /// <i>Implementations of this interface must always return values from the method

-  /// and never throw exceptions.</i>

-  /// <i>This interface is identical to System.Collections.Generic.IComparer&lt;T&gt;</i>

-  /// </summary>

-  public interface IComparer<T>

-  {

-    /// <summary>

-    /// Compare two items with respect to this item comparer

-    /// </summary>

-    /// <param name="item1">First item</param>

-    /// <param name="item2">Second item</param>

-    /// <returns>Positive if item1 is greater than item2, 0 if they are equal, negative if item1 is less than item2</returns>

-    int Compare(T item1, T item2);

-  }

-

-  /// <summary>

-  /// The type of an item equalityComparer. 

-  /// <i>Implementations of this interface <b>must</b> assure that the methods are 

-  /// consistent, that is, that whenever two items i1 and i2 satisfies that Equals(i1,i2)

-  /// returns true, then GetHashCode returns the same value for i1 and i2.</i>

-  /// <i>Implementations of this interface <b>must</b> assure that repeated calls of

-  /// the methods to the same (in reference or binary identity sense) arguments 

-  /// will return the same values, or state precise conditions under which the user 

-  /// can be assured repeated calls will return the same values.</i>

-  /// <i>Implementations of this interface must always return values from the methods

-  /// and never throw exceptions.</i>

-  /// <i>This interface is similar in function to System.IKeyComparer&lt;T&gt;</i>

-  /// </summary>

-  public interface SCG.IEqualityComparer<T>

-  {

-    /// <summary>

-    /// Get the hash code with respect to this item equalityComparer

-    /// </summary>

-    /// <param name="item">The item</param>

-    /// <returns>The hash code</returns>

-    int GetHashCode(T item);

-

-

-    /// <summary>

-    /// Check if two items are equal with respect to this item equalityComparer

-    /// </summary>

-    /// <param name="item1">first item</param>

-    /// <param name="item2">second item</param>

-    /// <returns>True if equal</returns>

-    bool Equals(T item1, T item2);

-  }*/

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/MappedEnumerators.cs b/mcs/class/Mono.C5/C5/MappedEnumerators.cs
deleted file mode 100644
index 6511a6da2d1..00000000000
--- a/mcs/class/Mono.C5/C5/MappedEnumerators.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  abstract class MappedDirectedCollectionValue<T, V> : DirectedCollectionValueBase<V>, IDirectedCollectionValue<V>

-  {

-    IDirectedCollectionValue<T> directedcollectionvalue;

-

-    abstract public V Map(T item);

-

-    public MappedDirectedCollectionValue(IDirectedCollectionValue<T> directedcollectionvalue)

-    {

-      this.directedcollectionvalue = directedcollectionvalue;

-    }

-

-    public override V Choose() { return Map(directedcollectionvalue.Choose()); }

-

-    public override bool IsEmpty { get { return directedcollectionvalue.IsEmpty; } }

-

-    public override int Count { get { return directedcollectionvalue.Count; } }

-

-    public override Speed CountSpeed { get { return directedcollectionvalue.CountSpeed; } }

-

-    public override IDirectedCollectionValue<V> Backwards()

-    {

-      MappedDirectedCollectionValue<T, V> retval = (MappedDirectedCollectionValue<T, V>)MemberwiseClone();

-      retval.directedcollectionvalue = directedcollectionvalue.Backwards();

-      return retval;

-      //If we made this classs non-abstract we could do

-      //return new MappedDirectedCollectionValue<T,V>(directedcollectionvalue.Backwards());;

-    }

-

-

-    public override SCG.IEnumerator<V> GetEnumerator()

-    {

-      foreach (T item in directedcollectionvalue)

-        yield return Map(item);

-    }

-

-    public override EnumerationDirection Direction

-    {

-      get { return directedcollectionvalue.Direction; }

-    }

-

-    IDirectedEnumerable<V> IDirectedEnumerable<V>.Backwards()

-    {

-      return Backwards();

-    }

-

-

-  }

-

-  abstract class MappedCollectionValue<T, V> : CollectionValueBase<V>, ICollectionValue<V>

-  {

-    ICollectionValue<T> collectionvalue;

-

-    abstract public V Map(T item);

-

-    public MappedCollectionValue(ICollectionValue<T> collectionvalue)

-    {

-      this.collectionvalue = collectionvalue;

-    }

-

-    public override V Choose() { return Map(collectionvalue.Choose()); }

-

-    public override bool IsEmpty { get { return collectionvalue.IsEmpty; } }

-

-    public override int Count { get { return collectionvalue.Count; } }

-

-    public override Speed CountSpeed { get { return collectionvalue.CountSpeed; } }

-

-    public override SCG.IEnumerator<V> GetEnumerator()

-    {

-      foreach (T item in collectionvalue)

-        yield return Map(item);

-    }

-  }

-  

-  class MultiplicityOne<K> : MappedCollectionValue<K, KeyValuePair<K, int>>

-  {

-    public MultiplicityOne(ICollectionValue<K> coll):base(coll) { }

-    public override KeyValuePair<K, int> Map(K k) { return new KeyValuePair<K, int>(k, 1); }

-  }

-

-  class DropMultiplicity<K> : MappedCollectionValue<KeyValuePair<K, int>, K>

-  {

-    public DropMultiplicity(ICollectionValue<KeyValuePair<K, int>> coll):base(coll) { }

-    public override K Map(KeyValuePair<K, int> kvp) { return kvp.Key; }

-  }

-  

-  abstract class MappedDirectedEnumerable<T, V> : EnumerableBase<V>, IDirectedEnumerable<V>

-  {

-    IDirectedEnumerable<T> directedenumerable;

-

-    abstract public V Map(T item);

-

-    public MappedDirectedEnumerable(IDirectedEnumerable<T> directedenumerable)

-    {

-      this.directedenumerable = directedenumerable;

-    }

-

-    public IDirectedEnumerable<V> Backwards()

-    {

-      MappedDirectedEnumerable<T, V> retval = (MappedDirectedEnumerable<T, V>)MemberwiseClone();

-      retval.directedenumerable = directedenumerable.Backwards();

-      return retval;

-      //If we made this classs non-abstract we could do

-      //return new MappedDirectedCollectionValue<T,V>(directedcollectionvalue.Backwards());;

-    }

-

-

-    public override SCG.IEnumerator<V> GetEnumerator()

-    {

-      foreach (T item in directedenumerable)

-        yield return Map(item);

-    }

-

-    public EnumerationDirection Direction

-    {

-      get { return directedenumerable.Direction; }

-    }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Random.cs b/mcs/class/Mono.C5/C5/Random.cs
deleted file mode 100644
index 89a8d720a5d..00000000000
--- a/mcs/class/Mono.C5/C5/Random.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A modern random number generator based on G. Marsaglia: 

-  /// Seeds for Random Number Generators, Communications of the

-  /// ACM 46, 5 (May 2003) 90-93; and a posting by Marsaglia to 

-  /// comp.lang.c on 2003-04-03.

-  /// </summary>

-  public class C5Random : Random

-  {

-    private uint[] Q = new uint[16];

-

-    private uint c = 362436, i = 15;

-

-

-    private uint Cmwc()

-    {

-      ulong t, a = 487198574UL;

-      uint x, r = 0xfffffffe;

-

-      i = (i + 1) & 15;

-      t = a * Q[i] + c;

-      c = (uint)(t >> 32);

-      x = (uint)(t + c);

-      if (x < c)

-      {

-        x++;

-        c++;

-      }

-

-      return Q[i] = r - x;

-    }

-

-

-    /// <summary>

-    /// Get a new random System.Double value

-    /// </summary>

-    /// <returns>The random double</returns>

-    public override double NextDouble()

-    {

-      return Cmwc() / 4294967296.0;

-    }

-

-

-    /// <summary>

-    /// Get a new random System.Double value

-    /// </summary>

-    /// <returns>The random double</returns>

-    protected override double Sample()

-    {

-      return NextDouble();

-    }

-

-

-    /// <summary>

-    /// Get a new random System.Int32 value

-    /// </summary>

-    /// <returns>The random int</returns>

-    public override int Next()

-    {

-      return (int)Cmwc();

-    }

-

-

-    /// <summary>

-    /// Get a random non-negative integer less than a given upper bound

-    /// </summary>

-    /// <exception cref="ArgumentException">If max is negative</exception>

-    /// <param name="max">The upper bound (exclusive)</param>

-    /// <returns></returns>

-    public override int Next(int max)

-    {

-      if (max < 0)

-        throw new ArgumentException("max must be non-negative");

-

-      return (int)(Cmwc() / 4294967296.0 * max);

-    }

-

-

-    /// <summary>

-    /// Get a random integer between two given bounds

-    /// </summary>

-    /// <exception cref="ArgumentException">If max is less than min</exception>

-    /// <param name="min">The lower bound (inclusive)</param>

-    /// <param name="max">The upper bound (exclusive)</param>

-    /// <returns></returns>

-    public override int Next(int min, int max)

-    {

-      if (min > max)

-        throw new ArgumentException("min must be less than or equal to max");

-

-      return min + (int)(Cmwc() / 4294967296.0 * (max - min));

-    }

-

-    /// <summary>

-    /// Fill a array of byte with random bytes

-    /// </summary>

-    /// <param name="buffer">The array to fill</param>

-    public override void NextBytes(byte[] buffer)

-    {

-      for (int i = 0, length = buffer.Length; i < length; i++)

-        buffer[i] = (byte)Cmwc();

-    }

-

-

-    /// <summary>

-    /// Create a random number generator seed by system time.

-    /// </summary>

-    public C5Random() : this(DateTime.Now.Ticks)

-    {

-    }

-

-

-    /// <summary>

-    /// Create a random number generator with a given seed

-    /// </summary>

-    /// <exception cref="ArgumentException">If seed is zero</exception>

-    /// <param name="seed">The seed</param>

-    public C5Random(long seed)

-    {

-      if (seed == 0)

-        throw new ArgumentException("Seed must be non-zero");

-

-      uint j = (uint)(seed & 0xFFFFFFFF);

-

-      for (int i = 0; i < 16; i++)

-      {

-        j ^= j << 13;

-        j ^= j >> 17;

-        j ^= j << 5;

-        Q[i] = j;

-      }

-

-      Q[15] = (uint)(seed ^ (seed >> 32));

-    }

-

-    /// <summary>

-    /// Create a random number generator with a specified internal start state.

-    /// </summary>

-    /// <exception cref="ArgumentException">If Q is not of length exactly 16</exception>

-    /// <param name="Q">The start state. Must be a collection of random bits given by an array of exactly 16 uints.</param>

-    public C5Random(uint[] Q)

-    {

-      if (Q.Length != 16)

-        throw new ArgumentException("Q must have length 16, was " + Q.Length);

-      Array.Copy(Q, this.Q, 16);

-    }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Records.cs b/mcs/class/Mono.C5/C5/Records.cs
deleted file mode 100644
index 5eb0df18b98..00000000000
--- a/mcs/class/Mono.C5/C5/Records.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using C5;

-using System;

-using System.Reflection;

-using System.Reflection.Emit;

-using System.Diagnostics;

-

-namespace C5

-{

-  struct RecConst

-  {

-    public const int HASHFACTOR = 387281;

-  }

-  /// <summary>

-  /// A generic record type with two fields. 

-  /// <para>

-  /// Equality is defined field by field, using the <code>Equals</code> method 

-  /// inherited from <code>System.Object</code> (i.e. using <see cref="T:C5.NaturalEqualityComparer`1"/>).

-  /// </para>

-  /// <para>

-  /// This type is similar to <see cref="T:C5.KeyValuePair`2"/>, but the latter

-  /// uses <see cref="P:C5.EqualityComparer`1.Default"/> to define field equality instead of <see cref="T:C5.NaturalEqualityComparer`1"/>.

-  /// </para>

-  /// </summary>

-  /// <typeparam name="T1"></typeparam>

-  /// <typeparam name="T2"></typeparam>

-  public struct Rec<T1, T2> : IEquatable<Rec<T1, T2>>, IShowable

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T1 X1;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T2 X2;

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="x1"></param>

-    /// <param name="x2"></param>

-    [Tested]

-    public Rec(T1 x1, T2 x2)

-    {

-      this.X1 = x1; this.X2 = x2;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="other"></param>

-    /// <returns></returns>

-    [Tested]

-    public bool Equals(Rec<T1, T2> other)

-    {

-      return

-        (X1 == null ? other.X1 == null : X1.Equals(other.X1)) &&

-        (X2 == null ? other.X2 == null : X2.Equals(other.X2))

-        ;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="obj"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool Equals(object obj)

-    {

-      return obj is Rec<T1, T2> ? Equals((Rec<T1, T2>)obj) : false;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="record1"></param>

-    /// <param name="record2"></param>

-    /// <returns></returns>

-    [Tested]

-    public static bool operator ==(Rec<T1, T2> record1, Rec<T1, T2> record2)

-    {

-      return record1.Equals(record2);

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="record1"></param>

-    /// <param name="record2"></param>

-    /// <returns></returns>

-    [Tested]

-    public static bool operator !=(Rec<T1, T2> record1, Rec<T1, T2> record2)

-    {

-      return !record1.Equals(record2);

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetHashCode()

-    {

-      //TODO: don't use 0 as hashcode for null, but something else!

-      int hashcode = X1 == null ? 0 : X1.GetHashCode();

-      hashcode = hashcode * RecConst.HASHFACTOR + (X2 == null ? 0 : X2.GetHashCode());

-      return hashcode;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("({0}, {1})", X1, X2);

-    }

-

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      bool incomplete = true;

-      stringbuilder.Append("(");

-      rest -= 2;

-      try

-      {

-        if (incomplete = !Showing.Show(X1, stringbuilder, ref rest, formatProvider))

-          return false;

-        stringbuilder.Append(", ");

-        rest -= 2;

-        if (incomplete = !Showing.Show(X2, stringbuilder, ref rest, formatProvider))

-          return false;

-      }

-      finally

-      {

-        if (incomplete)

-        {

-          stringbuilder.Append("...");

-          rest -= 3;

-        }

-        stringbuilder.Append(")");

-      }

-      return true;

-    }

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public string ToString(string format, IFormatProvider formatProvider)

-    {

-      return Showing.ShowString(this, format, formatProvider);

-    }

-

-    #endregion

-  }

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T1"></typeparam>

-  /// <typeparam name="T2"></typeparam>

-  /// <typeparam name="T3"></typeparam>

-  public struct Rec<T1, T2, T3> : IEquatable<Rec<T1, T2, T3>>, IShowable

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T1 X1;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T2 X2;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T3 X3;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="x1"></param>

-    /// <param name="x2"></param>

-    /// <param name="x3"></param>

-    [Tested]

-    public Rec(T1 x1, T2 x2, T3 x3)

-    {

-      this.X1 = x1; this.X2 = x2; this.X3 = x3;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="other"></param>

-    /// <returns></returns>

-    [Tested]

-    public bool Equals(Rec<T1, T2, T3> other)

-    {

-      return

-        (X1 == null ? other.X1 == null : X1.Equals(other.X1)) &&

-        (X2 == null ? other.X2 == null : X2.Equals(other.X2)) &&

-        (X3 == null ? other.X3 == null : X3.Equals(other.X3))

-        ;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="obj"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool Equals(object obj)

-    {

-      return obj is Rec<T1, T2, T3> ? Equals((Rec<T1, T2, T3>)obj) : false;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="record1"></param>

-    /// <param name="record2"></param>

-    /// <returns></returns>

-    [Tested]

-    public static bool operator ==(Rec<T1, T2, T3> record1, Rec<T1, T2, T3> record2)

-    {

-      return record1.Equals(record2);

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="record1"></param>

-    /// <param name="record2"></param>

-    /// <returns></returns>

-    [Tested]

-    public static bool operator !=(Rec<T1, T2, T3> record1, Rec<T1, T2, T3> record2)

-    {

-      return !record1.Equals(record2);

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetHashCode()

-    {

-      //TODO: don't use 0 as hashcode for null, but something else!

-      int hashcode = X1 == null ? 0 : X1.GetHashCode();

-      hashcode = hashcode * RecConst.HASHFACTOR + (X2 == null ? 0 : X2.GetHashCode());

-      hashcode = hashcode * RecConst.HASHFACTOR + (X3 == null ? 0 : X3.GetHashCode());

-      return hashcode;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("({0}, {1}, {2})", X1, X2, X3);

-    }

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      bool incomplete = true;

-      stringbuilder.Append("(");

-      rest -= 2;

-      try

-      {

-        if (incomplete = !Showing.Show(X1, stringbuilder, ref rest, formatProvider))

-          return false;

-        stringbuilder.Append(", ");

-        rest -= 2;

-        if (incomplete = !Showing.Show(X2, stringbuilder, ref rest, formatProvider))

-          return false;

-        stringbuilder.Append(", ");

-        rest -= 2;

-        if (incomplete = !Showing.Show(X3, stringbuilder, ref rest, formatProvider))

-          return false;

-      }

-      finally

-      {

-        if (incomplete)

-        {

-          stringbuilder.Append("...");

-          rest -= 3;

-        }

-        stringbuilder.Append(")");

-      }

-      return true;

-    }

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public string ToString(string format, IFormatProvider formatProvider)

-    {

-      return Showing.ShowString(this, format, formatProvider);

-    }

-

-    #endregion

-  }

-

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T1"></typeparam>

-  /// <typeparam name="T2"></typeparam>

-  /// <typeparam name="T3"></typeparam>

-  /// <typeparam name="T4"></typeparam>

-  public struct Rec<T1, T2, T3, T4> : IEquatable<Rec<T1, T2, T3, T4>>, IShowable

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T1 X1;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T2 X2;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T3 X3;

-    /// <summary>

-    /// 

-    /// </summary>

-    public readonly T4 X4;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="x1"></param>

-    /// <param name="x2"></param>

-    /// <param name="x3"></param>

-    /// <param name="x4"></param>

-    [Tested]

-    public Rec(T1 x1, T2 x2, T3 x3, T4 x4)

-    {

-      this.X1 = x1; this.X2 = x2; this.X3 = x3; this.X4 = x4;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="other"></param>

-    /// <returns></returns>

-    [Tested]

-    public bool Equals(Rec<T1, T2, T3, T4> other)

-    {

-      return

-        (X1 == null ? other.X1 == null : X1.Equals(other.X1)) &&

-        (X2 == null ? other.X2 == null : X2.Equals(other.X2)) &&

-        (X3 == null ? other.X3 == null : X3.Equals(other.X3)) &&

-        (X4 == null ? other.X4 == null : X4.Equals(other.X4))

-        ;

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="obj"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool Equals(object obj)

-    {

-      return obj is Rec<T1, T2, T3, T4> ? Equals((Rec<T1, T2, T3, T4>)obj) : false;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="record1"></param>

-    /// <param name="record2"></param>

-    /// <returns></returns>

-    [Tested]

-    public static bool operator ==(Rec<T1, T2, T3, T4> record1, Rec<T1, T2, T3, T4> record2)

-    {

-      return record1.Equals(record2);

-    }

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="record1"></param>

-    /// <param name="record2"></param>

-    /// <returns></returns>

-    [Tested]

-    public static bool operator !=(Rec<T1, T2, T3, T4> record1, Rec<T1, T2, T3, T4> record2)

-    {

-      return !record1.Equals(record2);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetHashCode()

-    {

-      //TODO: don't use 0 as hashcode for null, but something else!

-      int hashcode = X1 == null ? 0 : X1.GetHashCode();

-      hashcode = hashcode * RecConst.HASHFACTOR + (X2 == null ? 0 : X2.GetHashCode());

-      hashcode = hashcode * RecConst.HASHFACTOR + (X3 == null ? 0 : X3.GetHashCode());

-      hashcode = hashcode * RecConst.HASHFACTOR + (X4 == null ? 0 : X4.GetHashCode());

-      return hashcode;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString()

-    {

-      return String.Format("({0}, {1}, {2}, {3})", X1, X2, X3, X4);

-    }

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      bool incomplete = true;

-      stringbuilder.Append("(");

-      rest -= 2;

-      try

-      {

-        if (incomplete = !Showing.Show(X1, stringbuilder, ref rest, formatProvider))

-          return false;

-        stringbuilder.Append(", ");

-        rest -= 2;

-        if (incomplete = !Showing.Show(X2, stringbuilder, ref rest, formatProvider))

-          return false;

-        stringbuilder.Append(", ");

-        rest -= 2;

-        if (incomplete = !Showing.Show(X3, stringbuilder, ref rest, formatProvider))

-          return false;

-        stringbuilder.Append(", ");

-        rest -= 2;

-        if (incomplete = !Showing.Show(X4, stringbuilder, ref rest, formatProvider))

-          return false;

-      }

-      finally

-      {

-        if (incomplete)

-        {

-          stringbuilder.Append("...");

-          rest -= 3;

-        }

-        stringbuilder.Append(")");

-      }

-      return true;

-    }

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public string ToString(string format, IFormatProvider formatProvider)

-    {

-      return Showing.ShowString(this, format, formatProvider);

-    }

-

-    #endregion

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/Sorting.cs b/mcs/class/Mono.C5/C5/Sorting.cs
deleted file mode 100644
index c30b8a7b488..00000000000
--- a/mcs/class/Mono.C5/C5/Sorting.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A utility class with functions for sorting arrays with respect to an IComparer&lt;T&gt;

-  /// </summary>

-  public class Sorting

-  {

-    Sorting() { }

-

-    /// <summary>

-    /// Sort part of array in place using IntroSort

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException">If the <code>start</code>

-    /// and <code>count</code> arguments does not describe a valid range.</exception>

-    /// <param name="array">Array to sort</param>

-    /// <param name="start">Index of first position to sort</param>

-    /// <param name="count">Number of elements to sort</param>

-    /// <param name="comparer">IComparer&lt;T&gt; to sort by</param>

-    [Tested]

-    public static void IntroSort<T>(T[] array, int start, int count, SCG.IComparer<T> comparer)

-    {

-      if (start < 0 || count < 0 || start + count > array.Length)

-        throw new ArgumentOutOfRangeException();

-      new Sorter<T>(array, comparer).IntroSort(start, start + count);

-    }

-

-    /// <summary>

-    /// Sort an array in place using IntroSort and default comparer

-    /// </summary>

-    /// <exception cref="NotComparableException">If T is not comparable</exception>

-    /// <param name="array">Array to sort</param>

-    [Tested]

-    public static void IntroSort<T>(T[] array)

-    {

-      new Sorter<T>(array, Comparer<T>.Default).IntroSort(0, array.Length);

-    }

-

-

-    /// <summary>

-    /// Sort part of array in place using Insertion Sort

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException">If the <code>start</code>

-    /// and <code>count</code> arguments does not describe a valid range.</exception>

-    /// <param name="array">Array to sort</param>

-    /// <param name="start">Index of first position to sort</param>

-    /// <param name="count">Number of elements to sort</param>

-    /// <param name="comparer">IComparer&lt;T&gt; to sort by</param>

-    [Tested]

-    public static void InsertionSort<T>(T[] array, int start, int count, SCG.IComparer<T> comparer)

-    {

-      if (start < 0 || count < 0 || start + count > array.Length)

-        throw new ArgumentOutOfRangeException();

-      new Sorter<T>(array, comparer).InsertionSort(start, start + count);

-    }

-

-

-    /// <summary>

-    /// Sort part of array in place using Heap Sort

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException">If the <code>start</code>

-    /// and <code>count</code> arguments does not describe a valid range.</exception>

-    /// <param name="array">Array to sort</param>

-    /// <param name="start">Index of first position to sort</param>

-    /// <param name="count">Number of elements to sort</param>

-    /// <param name="comparer">IComparer&lt;T&gt; to sort by</param>

-    [Tested]

-    public static void HeapSort<T>(T[] array, int start, int count, SCG.IComparer<T> comparer)

-    {

-      if (start < 0 || count < 0 || start + count > array.Length)

-        throw new ArgumentOutOfRangeException();

-      new Sorter<T>(array, comparer).HeapSort(start, start + count);

-    }

-

-

-    class Sorter<T>

-    {

-      T[] a;

-

-      SCG.IComparer<T> c;

-

-

-      internal Sorter(T[] a, SCG.IComparer<T> c) { this.a = a; this.c = c; }

-

-

-      internal void IntroSort(int f, int b)

-      {

-        if (b - f > 31)

-        {

-          int depth_limit = (int)Math.Floor(2.5 * Math.Log(b - f, 2));

-

-          introSort(f, b, depth_limit);

-        }

-        else

-          InsertionSort(f, b);

-      }

-

-

-      private void introSort(int f, int b, int depth_limit)

-      {

-        const int size_threshold = 14;//24;

-

-        if (depth_limit-- == 0)

-          HeapSort(f, b);

-        else if (b - f <= size_threshold)

-          InsertionSort(f, b);

-        else

-        {

-          int p = partition(f, b);

-

-          introSort(f, p, depth_limit);

-          introSort(p, b, depth_limit);

-        }

-      }

-

-

-      private int compare(T i1, T i2) { return c.Compare(i1, i2); }

-

-

-      private int partition(int f, int b)

-      {

-        int bot = f, mid = (b + f) / 2, top = b - 1;

-        T abot = a[bot], amid = a[mid], atop = a[top];

-

-        if (compare(abot, amid) < 0)

-        {

-          if (compare(atop, abot) < 0)//atop<abot<amid

-          { a[top] = amid; amid = a[mid] = abot; a[bot] = atop; }

-          else if (compare(atop, amid) < 0) //abot<=atop<amid

-          { a[top] = amid; amid = a[mid] = atop; }

-          //else abot<amid<=atop

-        }

-        else

-        {

-          if (compare(amid, atop) > 0) //atop<amid<=abot

-          { a[bot] = atop; a[top] = abot; }

-          else if (compare(abot, atop) > 0) //amid<=atop<abot

-          { a[bot] = amid; amid = a[mid] = atop; a[top] = abot; }

-          else //amid<=abot<=atop

-          { a[bot] = amid; amid = a[mid] = abot; }

-        }

-

-        int i = bot, j = top;

-

-        while (true)

-        {

-          while (compare(a[++i], amid) < 0) ;

-

-          while (compare(amid, a[--j]) < 0) ;

-

-          if (i < j)

-          {

-            T tmp = a[i]; a[i] = a[j]; a[j] = tmp;

-          }

-          else

-            return i;

-        }

-      }

-

-

-      internal void InsertionSort(int f, int b)

-      {

-        for (int j = f + 1; j < b; j++)

-        {

-          T key = a[j], other;

-          int i = j - 1;

-

-          if (c.Compare(other = a[i], key) > 0)

-          {

-            a[j] = other;

-            while (i > f && c.Compare(other = a[i - 1], key) > 0) { a[i--] = other; }

-

-            a[i] = key;

-          }

-        }

-      }

-

-

-      internal void HeapSort(int f, int b)

-      {

-        for (int i = (b + f) / 2; i >= f; i--) heapify(f, b, i);

-

-        for (int i = b - 1; i > f; i--)

-        {

-          T tmp = a[f]; a[f] = a[i]; a[i] = tmp;

-          heapify(f, i, f);

-        }

-      }

-

-

-      private void heapify(int f, int b, int i)

-      {

-        T pv = a[i], lv, rv, max = pv;

-        int j = i, maxpt = j;

-

-        while (true)

-        {

-          int l = 2 * j - f + 1, r = l + 1;

-

-          if (l < b && compare(lv = a[l], max) > 0) { maxpt = l; max = lv; }

-

-          if (r < b && compare(rv = a[r], max) > 0) { maxpt = r; max = rv; }

-

-          if (maxpt == j)

-            break;

-

-          a[j] = max;

-          max = pv;

-          j = maxpt;

-        }

-

-        if (j > i)

-          a[j] = pv;

-      }

-    }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/ViewSupport.cs b/mcs/class/Mono.C5/C5/ViewSupport.cs
deleted file mode 100644
index b013a36c107..00000000000
--- a/mcs/class/Mono.C5/C5/ViewSupport.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// Characterize the mutual position of some view B (other) relative to view A (this)

-  /// </summary>

-  enum MutualViewPosition

-  {

-    /// <summary>

-    /// B contains A(this)

-    /// </summary>

-    Contains,

-    /// <summary>

-    /// B is containd in A(this), but not vice versa

-    /// </summary>

-    ContainedIn,

-    /// <summary>

-    /// A and B does not overlap

-    /// </summary>

-    NonOverlapping,

-    /// <summary>

-    /// A and B overlap, but neither is contained in the other

-    /// </summary>

-    Overlapping

-  }

-

-  #region View List Nested class

-  /// <summary>

-  /// This class is shared between the linked list and array list implementations.

-  /// </summary>

-  /// <typeparam name="V"></typeparam>

-  [Serializable]

-  class WeakViewList<V> where V : class

-  {

-    Node start;

-    [Serializable]

-    internal class Node

-    {

-      internal WeakReference weakview; internal Node prev, next;

-      internal Node(V view) { weakview = new WeakReference(view); }

-    }

-    internal Node Add(V view)

-    {

-      Node newNode = new Node(view);

-      if (start != null) { start.prev = newNode; newNode.next = start; }

-      start = newNode;

-      return newNode;

-    }

-    internal void Remove(Node n)

-    {

-      if (n == start) { start = start.next; if (start != null) start.prev = null; }

-      else { n.prev.next = n.next; if (n.next != null) n.next.prev = n.prev; }

-    }

-    /// <summary>

-    /// Note that it is safe to call views.Remove(view.myWeakReference) if view

-    /// is the currently yielded object

-    /// </summary>

-    /// <returns></returns>

-    public SCG.IEnumerator<V> GetEnumerator()

-    {

-      Node n = start;

-      while (n != null)

-      {

-        //V view = n.weakview.Target as V; //This provokes a bug in the beta1 verifyer

-        object o = n.weakview.Target;

-        V view = o is V ? (V)o : null;

-        if (view == null)

-          Remove(n);

-        else

-          yield return view;

-        n = n.next;

-      }

-    }

-  }

-

-  #endregion

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/WrappedArray.cs b/mcs/class/Mono.C5/C5/WrappedArray.cs
deleted file mode 100644
index cfdf6f72add..00000000000
--- a/mcs/class/Mono.C5/C5/WrappedArray.cs
+++ /dev/null
@@ -1,873 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Text;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// An advanced interface to operations on an array. The array is viewed as an 

-  /// <see cref="T:C5.IList`1"/> of fixed size, and so all operations that would change the

-  /// size of the array will be invalid (and throw <see cref="T:C5.FixedSizeCollectionException"/>

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class WrappedArray<T> : IList<T>

-  {

-    class InnerList : ArrayList<T>

-    {

-      internal InnerList(T[] array) { this.array = array; size = array.Length; }

-    }

-    ArrayList<T> innerlist;

-    //TODO: remember a ref to the wrapped array in WrappedArray to save a little on indexing?

-    WrappedArray<T> underlying;

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="wrappedarray"></param>

-    public WrappedArray(T[] wrappedarray) { innerlist = new InnerList(wrappedarray); }

-

-    //for views

-    WrappedArray(ArrayList<T> arraylist, WrappedArray<T> underlying) { innerlist = arraylist; this.underlying = underlying; }

-

-    #region IList<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public T First { get { return innerlist.First; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public T Last { get { return innerlist.Last; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="index"></param>

-    /// <returns></returns>

-    public T this[int index]

-    {

-      get { return innerlist[index]; }

-      set { innerlist[index] = value; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="filter"></param>

-    /// <returns></returns>

-    public IList<T> FindAll(Fun<T, bool> filter) { return innerlist.FindAll(filter); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="V"></typeparam>

-    /// <param name="mapper"></param>

-    /// <returns></returns>

-    public IList<V> Map<V>(Fun<T, V> mapper) { return innerlist.Map<V>(mapper); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="V"></typeparam>

-    /// <param name="mapper"></param>

-    /// <param name="equalityComparer"></param>

-    /// <returns></returns>

-    public IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> equalityComparer) { return innerlist.Map<V>(mapper, equalityComparer); }

-

-    /// <summary>

-    /// ???? should we throw NotRelevantException

-    /// </summary>

-    /// <value></value>

-    public bool FIFO

-    {

-      get { throw new FixedSizeCollectionException(); }

-      set { throw new FixedSizeCollectionException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual bool IsFixedSize

-    {

-      get { return true; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="index"></param>

-    /// <param name="item"></param>

-    public void Insert(int index, T item)

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    public void Insert(IList<T> pointer, T item)

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    public void InsertFirst(T item)

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    public void InsertLast(T item)

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="i"></param>

-    /// <param name="items"></param>

-    public void InsertAll<U>(int i, System.Collections.Generic.IEnumerable<U> items) where U : T

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public T Remove()

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public T RemoveFirst()

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public T RemoveLast()

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    /// <returns></returns>

-    public IList<T> View(int start, int count)

-    {

-      return new WrappedArray<T>((ArrayList<T>)innerlist.View(start, count), underlying ?? this);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public IList<T> ViewOf(T item)

-    {

-      return new WrappedArray<T>((ArrayList<T>)innerlist.ViewOf(item), underlying ?? this);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public IList<T> LastViewOf(T item)

-    {

-      return new WrappedArray<T>((ArrayList<T>)innerlist.LastViewOf(item), underlying ?? this);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public IList<T> Underlying { get { return underlying; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public int Offset { get { return innerlist.Offset; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public bool IsValid { get { return innerlist.IsValid; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    public IList<T> Slide(int offset) { return innerlist.Slide(offset); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    public IList<T> Slide(int offset, int size) { return innerlist.Slide(offset, size); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    public bool TrySlide(int offset) { return innerlist.TrySlide(offset); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    public bool TrySlide(int offset, int size) { return innerlist.TrySlide(offset, size); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <returns></returns>

-    public IList<T> Span(IList<T> otherView) { return innerlist.Span(((WrappedArray<T>)otherView).innerlist); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public void Reverse() { innerlist.Reverse(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public bool IsSorted() { return innerlist.IsSorted(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="comparer"></param>

-    /// <returns></returns>

-    public bool IsSorted(SCG.IComparer<T> comparer) { return innerlist.IsSorted(comparer); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public void Sort() { innerlist.Sort(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="comparer"></param>

-    public void Sort(SCG.IComparer<T> comparer) { innerlist.Sort(comparer); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public void Shuffle() { innerlist.Shuffle(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="rnd"></param>

-    public void Shuffle(Random rnd) { innerlist.Shuffle(rnd); }

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public Speed IndexingSpeed { get { return Speed.Constant; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    /// <returns></returns>

-    public IDirectedCollectionValue<T> this[int start, int count] { get { return innerlist[start, count]; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int IndexOf(T item) { return innerlist.IndexOf(item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int LastIndexOf(T item) { return innerlist.LastIndexOf(item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <returns></returns>

-    public int FindIndex(Fun<T, bool> predicate) { return innerlist.FindIndex(predicate); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <returns></returns>

-    public int FindLastIndex(Fun<T, bool> predicate) { return innerlist.FindLastIndex(predicate); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="i"></param>

-    /// <returns></returns>

-    public T RemoveAt(int i) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    public void RemoveInterval(int start, int count) { throw new FixedSizeCollectionException(); }

-

-    #endregion

-

-    #region ISequenced<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public int GetSequencedHashCode() { return innerlist.GetSequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    public bool SequencedEquals(ISequenced<T> that) { return innerlist.SequencedEquals(that); }

-

-    #endregion

-

-    #region ICollection<T> Members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public Speed ContainsSpeed { get { return Speed.Linear; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public int GetUnsequencedHashCode() { return innerlist.GetUnsequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    public bool UnsequencedEquals(ICollection<T> that) { return innerlist.UnsequencedEquals(that); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool Contains(T item) { return innerlist.Contains(item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int ContainsCount(T item) { return innerlist.ContainsCount(item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public ICollectionValue<T> UniqueItems() { return innerlist.UniqueItems(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities() { return innerlist.ItemMultiplicities(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    /// <returns></returns>

-    public bool ContainsAll<U>(System.Collections.Generic.IEnumerable<U> items) where U : T

-    { return innerlist.ContainsAll(items); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool Find(ref T item) { return innerlist.Find(ref item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool FindOrAdd(ref T item) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool Update(T item) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool Update(T item, out T olditem) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(T item) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(T item, out T olditem) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool Remove(T item) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="removeditem"></param>

-    /// <returns></returns>

-    public bool Remove(T item, out T removeditem) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    public void RemoveAllCopies(T item) { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    public void RemoveAll<U>(System.Collections.Generic.IEnumerable<U> items) where U : T { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public void Clear() { throw new FixedSizeCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    public void RetainAll<U>(System.Collections.Generic.IEnumerable<U> items) where U : T { throw new FixedSizeCollectionException(); }

-

-    #endregion

-

-    #region IExtensible<T> Members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public object SyncRoot { get { return innerlist.SyncRoot; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public bool IsReadOnly { get { return true; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public bool AllowsDuplicates

-    {

-      get { return true; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public SCG.IEqualityComparer<T> EqualityComparer { get { return innerlist.EqualityComparer; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public bool DuplicatesByCounting

-    {

-      get { return false; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool Add(T item)

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    public void AddAll<U>(System.Collections.Generic.IEnumerable<U> items) where U : T

-    {

-      throw new FixedSizeCollectionException();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public bool Check()

-    {

-      return innerlist.Check() && (underlying == null || underlying.innerlist == innerlist.Underlying);

-    }

-

-    #endregion

-

-    #region ICollectionValue<T> Members

-    /// <summary>

-    /// No listeners may be installed

-    /// </summary>

-    /// <value>0</value>

-    public virtual EventTypeEnum ListenableEvents { get { return 0; } }

-

-    /// <summary>

-    /// No listeners ever installed

-    /// </summary>

-    /// <value>0</value>

-    public virtual EventTypeEnum ActiveEvents { get { return 0; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public event CollectionChangedHandler<T> CollectionChanged

-    {

-      add { throw new UnlistenableEventException(); }

-      remove { throw new UnlistenableEventException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public event CollectionClearedHandler<T> CollectionCleared

-    {

-      add { throw new UnlistenableEventException(); }

-      remove { throw new UnlistenableEventException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public event ItemsAddedHandler<T> ItemsAdded

-    {

-      add { throw new UnlistenableEventException(); }

-      remove { throw new UnlistenableEventException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public event ItemInsertedHandler<T> ItemInserted

-    {

-      add { throw new UnlistenableEventException(); }

-      remove { throw new UnlistenableEventException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add { throw new UnlistenableEventException(); }

-      remove { throw new UnlistenableEventException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add { throw new UnlistenableEventException(); }

-      remove { throw new UnlistenableEventException(); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public bool IsEmpty { get { return innerlist.IsEmpty; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public int Count { get { return innerlist.Count; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public Speed CountSpeed { get { return innerlist.CountSpeed; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="array"></param>

-    /// <param name="index"></param>

-    public void CopyTo(T[] array, int index) { innerlist.CopyTo(array, index); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public T[] ToArray() { return innerlist.ToArray(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="action"></param>

-    public void Apply(Act<T> action) { innerlist.Apply(action); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <returns></returns>

-    public bool Exists(Fun<T, bool> predicate) { return innerlist.Exists(predicate); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool Find(Fun<T, bool> predicate, out T item) { return innerlist.Find(predicate, out item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <returns></returns>

-    public bool All(Fun<T, bool> predicate) { return innerlist.All(predicate); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public T Choose() { return innerlist.Choose(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="filter"></param>

-    /// <returns></returns>

-    public SCG.IEnumerable<T> Filter(Fun<T, bool> filter) { return innerlist.Filter(filter); }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public SCG.IEnumerator<T> GetEnumerator() { return innerlist.GetEnumerator(); }

-    #endregion

-

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="rest"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public bool Show(StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    { return innerlist.Show(stringbuilder, ref  rest, formatProvider); }

-

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override string ToString() { return innerlist.ToString(); }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public virtual string ToString(string format, IFormatProvider formatProvider) { return innerlist.ToString(format, formatProvider); }

-

-    #endregion

-

-    #region IDirectedCollectionValue<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public IDirectedCollectionValue<T> Backwards() { return innerlist.Backwards(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public bool FindLast(Fun<T, bool> predicate, out T item) { return innerlist.FindLast(predicate, out item); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public EnumerationDirection Direction { get { return EnumerationDirection.Forwards; } }

-

-    #endregion

-

-    #region IDisposable Members

-

-    /// <summary>

-    /// Dispose this if a view else operation is illegal 

-    /// </summary>

-    /// <exception cref="FixedSizeCollectionException">If not a view</exception>

-    public void Dispose()

-    {

-      if (underlying == null)

-        throw new FixedSizeCollectionException();

-      else

-        innerlist.Dispose();

-    }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this WrappedArray.

-    /// 

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      return new WrappedArray<T>(innerlist.ToArray());

-    }

-

-    #endregion

-

-

-

-    #region IEnumerable Members

-

-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-    {

-      throw new Exception("The method or operation is not implemented.");

-    }

-

-    #endregion

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/Wrappers.cs b/mcs/class/Mono.C5/C5/Wrappers.cs
deleted file mode 100644
index ceb71882c9a..00000000000
--- a/mcs/class/Mono.C5/C5/Wrappers.cs
+++ /dev/null
@@ -1,2235 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A read-only wrapper class for a generic enumerator

-  /// </summary>

-  public class GuardedEnumerator<T> : SCG.IEnumerator<T>

-  {

-    #region Fields

-

-    SCG.IEnumerator<T> enumerator;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Create a wrapper around a generic enumerator

-    /// </summary>

-    /// <param name="enumerator">The enumerator to wrap</param>

-    public GuardedEnumerator(SCG.IEnumerator<T> enumerator)

-    { this.enumerator = enumerator; }

-

-    #endregion

-

-    #region IEnumerator<T> Members

-

-    /// <summary>

-    /// Move wrapped enumerator to next item, or the first item if

-    /// this is the first call to MoveNext. 

-    /// </summary>

-    /// <returns>True if enumerator is valid now</returns>

-    public bool MoveNext() { return enumerator.MoveNext(); }

-

-

-    /// <summary>

-    /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-    /// </summary>

-    /// <value>The current item of the wrapped enumerator.</value>

-    public T Current { get { return enumerator.Current; } }

-

-    #endregion

-

-    #region IDisposable Members

-

-    //TODO: consider possible danger of calling through to Dispose. 

-    /// <summary>

-    /// Dispose wrapped enumerator.

-    /// </summary>

-    public void Dispose() { enumerator.Dispose(); }

-

-    #endregion

-

-

-    #region IEnumerator Members

-

-    object System.Collections.IEnumerator.Current

-    {

-      get { return enumerator.Current; }

-    }

-

-    void System.Collections.IEnumerator.Reset()

-    {

-      enumerator.Reset();

-    }

-

-    #endregion

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper class for a generic enumerable

-  ///

-  /// <i>This is mainly interesting as a base of other guard classes</i>

-  /// </summary>

-  public class GuardedEnumerable<T> : SCG.IEnumerable<T>

-  {

-    #region Fields

-

-    SCG.IEnumerable<T> enumerable;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap an enumerable in a read-only wrapper

-    /// </summary>

-    /// <param name="enumerable">The enumerable to wrap</param>

-    public GuardedEnumerable(SCG.IEnumerable<T> enumerable)

-    { this.enumerable = enumerable; }

-

-    #endregion

-

-    #region SCG.IEnumerable<T> Members

-

-    /// <summary>

-    /// Get an enumerator from the wrapped enumerable

-    /// </summary>

-    /// <returns>The enumerator (itself wrapped)</returns>

-    public SCG.IEnumerator<T> GetEnumerator()

-    { return new GuardedEnumerator<T>(enumerable.GetEnumerator()); }

-

-    #endregion

-

-    #region IEnumerable Members

-

-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-    {

-      return GetEnumerator();

-    }

-

-    #endregion

-

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper for a generic directed enumerable

-  ///

-  /// <i>This is mainly interesting as a base of other guard classes</i>

-  /// </summary>

-  public class GuardedDirectedEnumerable<T> : GuardedEnumerable<T>, IDirectedEnumerable<T>

-  {

-    #region Fields

-

-    IDirectedEnumerable<T> directedenumerable;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a directed enumerable in a read-only wrapper

-    /// </summary>

-    /// <param name="directedenumerable">the collection to wrap</param>

-    public GuardedDirectedEnumerable(IDirectedEnumerable<T> directedenumerable)

-      : base(directedenumerable)

-    { this.directedenumerable = directedenumerable; }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    /// <summary>

-    /// Get a enumerable that enumerates the wrapped collection in the opposite direction

-    /// </summary>

-    /// <returns>The mirrored enumerable</returns>

-    public IDirectedEnumerable<T> Backwards()

-    { return new GuardedDirectedEnumerable<T>(directedenumerable.Backwards()); }

-

-

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    public EnumerationDirection Direction

-    { get { return directedenumerable.Direction; } }

-

-    #endregion

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper for an ICollectionValue&lt;T&gt;

-  ///

-  /// <i>This is mainly interesting as a base of other guard classes</i>

-  /// </summary>

-  public class GuardedCollectionValue<T> : GuardedEnumerable<T>, ICollectionValue<T>

-  {

-    #region Events

-    /// <summary>

-    /// The ListenableEvents value of the wrapped collection

-    /// </summary>

-    /// <value></value>

-    public virtual EventTypeEnum ListenableEvents { get { return collectionvalue.ListenableEvents; } }

-

-    /// <summary>

-    /// The ActiveEvents value of the wrapped collection

-    /// </summary>

-    /// <value></value>

-    public virtual EventTypeEnum ActiveEvents { get { return collectionvalue.ActiveEvents; } }

-

-    ProxyEventBlock<T> eventBlock;

-    /// <summary>

-    /// The change event. Will be raised for every change operation on the collection.

-    /// </summary>

-    public event CollectionChangedHandler<T> CollectionChanged

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<T>(this, collectionvalue))).CollectionChanged += value; }

-      remove { if (eventBlock != null) eventBlock.CollectionChanged -= value; }

-    }

-

-    /// <summary>

-    /// The change event. Will be raised for every change operation on the collection.

-    /// </summary>

-    public event CollectionClearedHandler<T> CollectionCleared

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<T>(this, collectionvalue))).CollectionCleared += value; }

-      remove { if (eventBlock != null) eventBlock.CollectionCleared -= value; }

-    }

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual addition to the collection.

-    /// </summary>

-    public event ItemsAddedHandler<T> ItemsAdded

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<T>(this, collectionvalue))).ItemsAdded += value; }

-      remove { if (eventBlock != null) eventBlock.ItemsAdded -= value; }

-    }

-

-    /// <summary>

-    /// The item added  event. Will be raised for every individual addition to the collection.

-    /// </summary>

-    public event ItemInsertedHandler<T> ItemInserted

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<T>(this, collectionvalue))).ItemInserted += value; }

-      remove { if (eventBlock != null) eventBlock.ItemInserted -= value; }

-    }

-

-    /// <summary>

-    /// The item removed event. Will be raised for every individual removal from the collection.

-    /// </summary>

-    public event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<T>(this, collectionvalue))).ItemsRemoved += value; }

-      remove { if (eventBlock != null) eventBlock.ItemsRemoved -= value; }

-    }

-

-    /// <summary>

-    /// The item removed event. Will be raised for every individual removal from the collection.

-    /// </summary>

-    public event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add { (eventBlock ?? (eventBlock = new ProxyEventBlock<T>(this, collectionvalue))).ItemRemovedAt += value; }

-      remove { if (eventBlock != null) eventBlock.ItemRemovedAt -= value; }

-    }

-    #endregion

-

-    #region Fields

-

-    ICollectionValue<T> collectionvalue;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a ICollectionValue&lt;T&gt; in a read-only wrapper

-    /// </summary>

-    /// <param name="collectionvalue">the collection to wrap</param>

-    public GuardedCollectionValue(ICollectionValue<T> collectionvalue)

-      : base(collectionvalue)

-    { this.collectionvalue = collectionvalue; }

-

-    #endregion

-

-    #region ICollection<T> Members

-

-    /// <summary>

-    /// Get the size of the wrapped collection

-    /// </summary>

-    /// <value>The size</value>

-    public virtual bool IsEmpty { get { return collectionvalue.IsEmpty; } }

-

-    /// <summary>

-    /// Get the size of the wrapped collection

-    /// </summary>

-    /// <value>The size</value>

-    public virtual int Count { get { return collectionvalue.Count; } }

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>A characterization of the speed of the 

-    /// <code>Count</code> property in this collection.</value>

-    public virtual Speed CountSpeed { get { return collectionvalue.CountSpeed; } }

-

-    /// <summary>

-    /// Copy the items of the wrapped collection to an array

-    /// </summary>

-    /// <param name="a">The array</param>

-    /// <param name="i">Starting offset</param>

-    public virtual void CopyTo(T[] a, int i) { collectionvalue.CopyTo(a, i); }

-

-    /// <summary>

-    /// Create an array from the items of the wrapped collection

-    /// </summary>

-    /// <returns>The array</returns>

-    public virtual T[] ToArray() { return collectionvalue.ToArray(); }

-

-    /// <summary>

-    /// Apply a delegate to all items of the wrapped enumerable.

-    /// </summary>

-    /// <param name="a">The delegate to apply</param>

-    //TODO: change this to throw an exception?

-    public virtual void Apply(Act<T> a) { collectionvalue.Apply(a); }

-

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in the wrapped enumerable.

-    /// </summary>

-    /// <param name="filter">A filter delegate 

-    /// (<see cref="T:C5.Filter`1"/>) defining the predicate</param>

-    /// <returns>True is such an item exists</returns>

-    public virtual bool Exists(Fun<T, bool> filter) { return collectionvalue.Exists(filter); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="filter"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool Find(Fun<T, bool> filter, out T item) { return collectionvalue.Find(filter, out item); }

-

-    /// <summary>

-    /// Check if all items in the wrapped enumerable satisfies a specific predicate.

-    /// </summary>

-    /// <param name="filter">A filter delegate 

-    /// (<see cref="T:C5.Filter`1"/>) defining the predicate</param>

-    /// <returns>True if all items satisfies the predicate</returns>

-    public virtual bool All(Fun<T, bool> filter) { return collectionvalue.All(filter); }

-

-    /// <summary>

-    /// Create an enumerable, enumerating the items of this collection that satisfies 

-    /// a certain condition.

-    /// </summary>

-    /// <param name="filter">The T->bool filter delegate defining the condition</param>

-    /// <returns>The filtered enumerable</returns>

-    public virtual SCG.IEnumerable<T> Filter(Fun<T, bool> filter) { return collectionvalue.Filter(filter); }

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    public virtual T Choose() { return collectionvalue.Choose(); }

-

-    #endregion

-

-    #region IShowable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="stringbuilder"></param>

-    /// <param name="formatProvider"></param>

-    /// <param name="rest"></param>

-    /// <returns></returns>

-    public bool Show(System.Text.StringBuilder stringbuilder, ref int rest, IFormatProvider formatProvider)

-    {

-      return collectionvalue.Show(stringbuilder, ref rest, formatProvider);

-    }

-    #endregion

-

-    #region IFormattable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="format"></param>

-    /// <param name="formatProvider"></param>

-    /// <returns></returns>

-    public string ToString(string format, IFormatProvider formatProvider)

-    {

-      return collectionvalue.ToString(format, formatProvider);

-    }

-

-    #endregion

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper for a directed collection

-  ///

-  /// <i>This is mainly interesting as a base of other guard classes</i>

-  /// </summary>

-  public class GuardedDirectedCollectionValue<T> : GuardedCollectionValue<T>, IDirectedCollectionValue<T>

-  {

-    #region Fields

-

-    IDirectedCollectionValue<T> directedcollection;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a directed collection in a read-only wrapper

-    /// </summary>

-    /// <param name="directedcollection">the collection to wrap</param>

-    public GuardedDirectedCollectionValue(IDirectedCollectionValue<T> directedcollection)

-      :

-      base(directedcollection)

-    { this.directedcollection = directedcollection; }

-

-    #endregion

-

-    #region IDirectedCollection<T> Members

-

-    /// <summary>

-    /// Get a collection that enumerates the wrapped collection in the opposite direction

-    /// </summary>

-    /// <returns>The mirrored collection</returns>

-    public virtual IDirectedCollectionValue<T> Backwards()

-    { return new GuardedDirectedCollectionValue<T>(directedcollection.Backwards()); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool FindLast(Fun<T, bool> predicate, out T item) { return directedcollection.FindLast(predicate, out item); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    { return Backwards(); }

-

-

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    public EnumerationDirection Direction

-    { get { return directedcollection.Direction; } }

-

-    #endregion

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper for an <see cref="T:C5.ICollection`1"/>,

-  /// <para>

-  /// <i>Suitable for wrapping hash tables, <see cref="T:C5.HashSet`1"/>

-  /// and <see cref="T:C5.HashBag`1"/>  </i></para>

-  /// </summary>

-  public class GuardedCollection<T> : GuardedCollectionValue<T>, ICollection<T>

-  {

-    #region Fields

-

-    ICollection<T> collection;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap an ICollection&lt;T&gt; in a read-only wrapper

-    /// </summary>

-    /// <param name="collection">the collection to wrap</param>

-    public GuardedCollection(ICollection<T> collection)

-      : base(collection)

-    {

-      this.collection = collection;

-    }

-

-    #endregion

-

-    #region ICollection<T> Members

-

-    /// <summary>

-    /// (This is a read-only wrapper)

-    /// </summary>

-    /// <value>True</value>

-    public virtual bool IsReadOnly { get { return true; } }

-

-

-    /// <summary> </summary>

-    /// <value>Speed of wrapped collection</value>

-    public virtual Speed ContainsSpeed { get { return collection.ContainsSpeed; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual int GetUnsequencedHashCode()

-    { return collection.GetUnsequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    public virtual bool UnsequencedEquals(ICollection<T> that)

-    { return collection.UnsequencedEquals(that); }

-

-

-    /// <summary>

-    /// Check if an item is in the wrapped collection

-    /// </summary>

-    /// <param name="item">The item</param>

-    /// <returns>True if found</returns>

-    public virtual bool Contains(T item) { return collection.Contains(item); }

-

-

-    /// <summary>

-    /// Count the number of times an item appears in the wrapped collection

-    /// </summary>

-    /// <param name="item">The item</param>

-    /// <returns>The number of copies</returns>

-    public virtual int ContainsCount(T item) { return collection.ContainsCount(item); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems() { return new GuardedCollectionValue<T>(collection.UniqueItems()); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities() { return new GuardedCollectionValue<KeyValuePair<T, int>>(collection.ItemMultiplicities()); }

-

-    /// <summary>

-    /// Check if all items in the argument is in the wrapped collection

-    /// </summary>

-    /// <param name="items">The items</param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if so</returns>

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T { return collection.ContainsAll(items); }

-

-    /// <summary> 

-    /// Search for an item in the wrapped collection

-    /// </summary>

-    /// <param name="item">On entry the item to look for, on exit the equivalent item found (if any)</param>

-    /// <returns></returns>

-    public virtual bool Find(ref T item) { return collection.Find(ref item); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool FindOrAdd(ref T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item, out T olditem)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool Remove(T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns></returns>

-    public virtual bool Remove(T item, out T removeditem)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    public virtual void RemoveAllCopies(T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    public virtual void Clear()

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// Check  wrapped collection for internal consistency

-    /// </summary>

-    /// <returns>True if check passed</returns>

-    public virtual bool Check() { return collection.Check(); }

-

-    #endregion

-

-    #region IExtensible<T> Members

-

-    /// <summary> </summary>

-    /// <value>False if wrapped collection has set semantics</value>

-    public virtual bool AllowsDuplicates { get { return collection.AllowsDuplicates; } }

-

-    //TODO: the equalityComparer should be guarded

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual SCG.IEqualityComparer<T> EqualityComparer { get { return collection.EqualityComparer; } }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return collection.DuplicatesByCounting; } }

-

-

-    /// <summary> </summary>

-    /// <value>True if wrapped collection is empty</value>

-    public override bool IsEmpty { get { return collection.IsEmpty; } }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool Add(T item)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    { throw new ReadOnlyCollectionException(); }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      return new GuardedCollection<T>((ICollection<T>)(collection.Clone()));

-    }

-

-    #endregion

-

-  }

-

-

-  /// <summary>

-  /// A read-only wrapper for a sequenced collection

-  ///

-  /// <i>This is mainly interesting as a base of other guard classes</i>

-  /// </summary>

-  public class GuardedSequenced<T> : GuardedCollection<T>, ISequenced<T>

-  {

-    #region Fields

-

-    ISequenced<T> sequenced;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a sequenced collection in a read-only wrapper

-    /// </summary>

-    /// <param name="sorted"></param>

-    public GuardedSequenced(ISequenced<T> sorted) : base(sorted) { this.sequenced = sorted; }

-

-    #endregion

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the index of the first one.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>the index, if found, a negative value else</returns>

-    public int FindIndex(Fun<T, bool> predicate)

-    {

-      IIndexed<T> indexed = sequenced as IIndexed<T>;

-      if (indexed != null)

-        return indexed.FindIndex(predicate);

-      int index = 0;

-      foreach (T item in this)

-      {

-        if (predicate(item))

-          return index;

-        index++;

-      }

-      return -1;

-    }

-

-    /// <summary>

-    /// Check if there exists an item  that satisfies a

-    /// specific predicate in this collection and return the index of the last one.

-    /// </summary>

-    /// <param name="predicate">A delegate 

-    /// (<see cref="T:C5.Fun`2"/> with <code>R == bool</code>) defining the predicate</param>

-    /// <returns>the index, if found, a negative value else</returns>

-    public int FindLastIndex(Fun<T, bool> predicate)

-    {

-      IIndexed<T> indexed = sequenced as IIndexed<T>;

-      if (indexed != null)

-        return indexed.FindLastIndex(predicate);

-      int index = Count - 1;

-      foreach (T item in Backwards())

-      {

-        if (predicate(item))

-          return index;

-        index--;

-      }

-      return -1;

-    }

-

-

-

-    #region ISequenced<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public int GetSequencedHashCode()

-    { return sequenced.GetSequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    public bool SequencedEquals(ISequenced<T> that)

-    { return sequenced.SequencedEquals(that); }

-

-    #endregion

-

-    #region IDirectedCollection<T> Members

-

-    /// <summary>

-    /// Get a collection that enumerates the wrapped collection in the opposite direction

-    /// </summary>

-    /// <returns>The mirrored collection</returns>

-    public virtual IDirectedCollectionValue<T> Backwards()

-    { return new GuardedDirectedCollectionValue<T>(sequenced.Backwards()); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public virtual bool FindLast(Fun<T, bool> predicate, out T item) { return sequenced.FindLast(predicate, out item); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    { return Backwards(); }

-

-

-

-    /// <summary>

-    /// <code>Forwards</code> if same, else <code>Backwards</code>

-    /// </summary>

-    /// <value>The enumeration direction relative to the original collection.</value>

-    public EnumerationDirection Direction

-    { get { return EnumerationDirection.Forwards; } }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      return new GuardedCollection<T>((ISequenced<T>)(sequenced.Clone()));

-    }

-

-    #endregion

-

-  }

-

-

-  /// <summary>

-  /// A read-only wrapper for a sorted collection

-  ///

-  /// <i>This is mainly interesting as a base of other guard classes</i>

-  /// </summary>

-  public class GuardedSorted<T> : GuardedSequenced<T>, ISorted<T>

-  {

-    #region Fields

-

-    ISorted<T> sorted;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a sorted collection in a read-only wrapper

-    /// </summary>

-    /// <param name="sorted"></param>

-    public GuardedSorted(ISorted<T> sorted) : base(sorted) { this.sorted = sorted; }

-

-    #endregion

-

-    #region ISorted<T> Members

-

-    /// <summary>

-    /// Find the predecessor of the item in the wrapped sorted collection

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists </exception>    

-    /// <param name="item">The item</param>

-    /// <returns>The predecessor</returns>

-    public T Predecessor(T item) { return sorted.Predecessor(item); }

-

-

-    /// <summary>

-    /// Find the Successor of the item in the wrapped sorted collection

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists </exception>    

-    /// <param name="item">The item</param>

-    /// <returns>The Successor</returns>

-    public T Successor(T item) { return sorted.Successor(item); }

-

-

-    /// <summary>

-    /// Find the weak predecessor of the item in the wrapped sorted collection

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists </exception>    

-    /// <param name="item">The item</param>

-    /// <returns>The weak predecessor</returns>

-    public T WeakPredecessor(T item) { return sorted.WeakPredecessor(item); }

-

-

-    /// <summary>

-    /// Find the weak Successor of the item in the wrapped sorted collection

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists </exception>    

-    /// <param name="item">The item</param>

-    /// <returns>The weak Successor</returns>

-    public T WeakSuccessor(T item) { return sorted.WeakSuccessor(item); }

-

-

-    /// <summary>

-    /// Run Cut on the wrapped sorted collection

-    /// </summary>

-    /// <param name="c"></param>

-    /// <param name="low"></param>

-    /// <param name="lval"></param>

-    /// <param name="high"></param>

-    /// <param name="hval"></param>

-    /// <returns></returns>

-    public bool Cut(IComparable<T> c, out T low, out bool lval, out T high, out bool hval)

-    { return sorted.Cut(c, out low, out lval, out high, out hval); }

-

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<T> RangeFrom(T bot) { return sorted.RangeFrom(bot); }

-

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<T> RangeFromTo(T bot, T top)

-    { return sorted.RangeFromTo(bot, top); }

-

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<T> RangeTo(T top) { return sorted.RangeTo(top); }

-

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <returns></returns>

-    public IDirectedCollectionValue<T> RangeAll() { return sorted.RangeAll(); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="items"></param>

-    /// <typeparam name="U"></typeparam>

-    public void AddSorted<U>(SCG.IEnumerable<U> items) where U : T

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="low"></param>

-    public void RemoveRangeFrom(T low)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="low"></param>

-    /// <param name="hi"></param>

-    public void RemoveRangeFromTo(T low, T hi)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="hi"></param>

-    public void RemoveRangeTo(T hi)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    #endregion

-

-    #region IPriorityQueue<T> Members

-

-    /// <summary>

-    /// Find the minimum of the wrapped collection

-    /// </summary>

-    /// <returns>The minimum</returns>

-    public T FindMin() { return sorted.FindMin(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public T DeleteMin()

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// Find the maximum of the wrapped collection

-    /// </summary>

-    /// <returns>The maximum</returns>

-    public T FindMax() { return sorted.FindMax(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public T DeleteMax()

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    //TODO: we should guard the comparer!

-    /// <summary>

-    /// The comparer object supplied at creation time for the underlying collection

-    /// </summary>

-    /// <value>The comparer</value>

-    public SCG.IComparer<T> Comparer { get { return sorted.Comparer; } }

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    { return Backwards(); }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      return new GuardedSorted<T>((ISorted<T>)(sorted.Clone()));

-    }

-

-  }

-

-

-

-  /// <summary>

-  /// Read-only wrapper for indexed sorted collections

-  ///

-  /// <i>Suitable for wrapping TreeSet, TreeBag and SortedArray</i>

-  /// </summary>

-  public class GuardedIndexedSorted<T> : GuardedSorted<T>, IIndexedSorted<T>

-  {

-    #region Fields

-

-    IIndexedSorted<T> indexedsorted;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap an indexed sorted collection in a read-only wrapper

-    /// </summary>

-    /// <param name="list">the indexed sorted collection</param>

-    public GuardedIndexedSorted(IIndexedSorted<T> list)

-      : base(list)

-    { this.indexedsorted = list; }

-

-    #endregion

-

-    #region IIndexedSorted<T> Members

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <returns></returns>

-    public new IDirectedCollectionValue<T> RangeFrom(T bot)

-    { return indexedsorted.RangeFrom(bot); }

-

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public new IDirectedCollectionValue<T> RangeFromTo(T bot, T top)

-    { return indexedsorted.RangeFromTo(bot, top); }

-

-

-    /// <summary>

-    /// Get the specified range from the wrapped collection. 

-    /// (The current implementation erroneously does not wrap the result.)

-    /// </summary>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public new IDirectedCollectionValue<T> RangeTo(T top)

-    { return indexedsorted.RangeTo(top); }

-

-

-    /// <summary>

-    /// Report the number of items in the specified range of the wrapped collection

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <returns></returns>

-    public int CountFrom(T bot) { return indexedsorted.CountFrom(bot); }

-

-

-    /// <summary>

-    /// Report the number of items in the specified range of the wrapped collection

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public int CountFromTo(T bot, T top) { return indexedsorted.CountFromTo(bot, top); }

-

-

-    /// <summary>

-    /// Report the number of items in the specified range of the wrapped collection

-    /// </summary>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public int CountTo(T top) { return indexedsorted.CountTo(top); }

-

-

-    /// <summary>

-    /// Run FindAll on the wrapped collection with the indicated filter.

-    /// The result will <b>not</b> be read-only.

-    /// </summary>

-    /// <param name="f"></param>

-    /// <returns></returns>

-    public IIndexedSorted<T> FindAll(Fun<T, bool> f)

-    { return indexedsorted.FindAll(f); }

-

-

-    /// <summary>

-    /// Run Map on the wrapped collection with the indicated mapper.

-    /// The result will <b>not</b> be read-only.

-    /// </summary>

-    /// <param name="m"></param>

-    /// <param name="c">The comparer to use in the result</param>

-    /// <returns></returns>

-    public IIndexedSorted<V> Map<V>(Fun<T, V> m, SCG.IComparer<V> c)

-    { return indexedsorted.Map(m, c); }

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The i'th item of the wrapped sorted collection</value>

-    public T this[int i] { get { return indexedsorted[i]; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return indexedsorted.IndexingSpeed; } }

-

-    /// <summary> </summary>

-    /// <value>A directed collection of the items in the indicated interval of the wrapped collection</value>

-    public IDirectedCollectionValue<T> this[int start, int end]

-    { get { return new GuardedDirectedCollectionValue<T>(indexedsorted[start, end]); } }

-

-

-    /// <summary>

-    /// Find the (first) index of an item in the wrapped collection

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int IndexOf(T item) { return indexedsorted.IndexOf(item); }

-

-

-    /// <summary>

-    /// Find the last index of an item in the wrapped collection

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int LastIndexOf(T item) { return indexedsorted.LastIndexOf(item); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="i"></param>

-    /// <returns></returns>

-    public T RemoveAt(int i)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    public void RemoveInterval(int start, int count)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    { return Backwards(); }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      return new GuardedIndexedSorted<T>((IIndexedSorted<T>)(indexedsorted.Clone()));

-    }

-

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper for a generic list collection

-  /// <i>Suitable as a wrapper for LinkedList, HashedLinkedList, ArrayList and HashedArray.

-  /// <see cref="T:C5.LinkedList`1"/>, 

-  /// <see cref="T:C5.HashedLinkedList`1"/>, 

-  /// <see cref="T:C5.ArrayList`1"/> or

-  /// <see cref="T:C5.HashedArray`1"/>.

-  /// </i>

-  /// </summary>

-  public class GuardedList<T> : GuardedSequenced<T>, IList<T>

-  {

-    #region Fields

-

-    IList<T> innerlist;

-    GuardedList<T> underlying;

-    bool slidableView = false;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a list in a read-only wrapper

-    /// </summary>

-    /// <param name="list">The list</param>

-    public GuardedList(IList<T> list)

-      : base(list)

-    {

-      this.innerlist = list;

-      if (list.Underlying != null)

-        underlying = new GuardedList<T>(list.Underlying, null, false);

-    }

-

-    GuardedList(IList<T> list, GuardedList<T> underlying, bool slidableView)

-      : base(list)

-    {

-      this.innerlist = list; this.underlying = underlying; this.slidableView = slidableView;

-    }

-    #endregion

-

-    #region IList<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The first item of the wrapped list</value>

-    public T First { get { return innerlist.First; } }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The last item of the wrapped list</value>

-    public T Last { get { return innerlist.Last; } }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> if used as setter</exception>

-    /// <value>True if wrapped list has FIFO semantics for the Add(T item) and Remove() methods</value>

-    public bool FIFO

-    {

-      get { return innerlist.FIFO; }

-      set { throw new ReadOnlyCollectionException("List is read only"); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual bool IsFixedSize

-    {

-      get { return true; }

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> if used as setter</exception>

-    /// <value>The i'th item of the wrapped list</value>

-    public T this[int i]

-    {

-      get { return innerlist[i]; }

-      set { throw new ReadOnlyCollectionException("List is read only"); }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return innerlist.IndexingSpeed; } }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="i"></param>

-    /// <param name="item"></param>

-    public void Insert(int i, T item)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    public void Insert(IList<T> pointer, T item)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    public void InsertFirst(T item)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    public void InsertLast(T item)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <param name="target"></param>

-    public void InsertBefore(T item, T target)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="item"></param>

-    /// <param name="target"></param>

-    public void InsertAfter(T item, T target)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="i"></param>

-    /// <param name="items"></param>

-    public void InsertAll<U>(int i, SCG.IEnumerable<U> items) where U : T

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// Perform FindAll on the wrapped list. The result is <b>not</b> necessarily read-only.

-    /// </summary>

-    /// <param name="filter">The filter to use</param>

-    /// <returns></returns>

-    public IList<T> FindAll(Fun<T, bool> filter) { return innerlist.FindAll(filter); }

-

-

-    /// <summary>

-    /// Perform Map on the wrapped list. The result is <b>not</b> necessarily read-only.

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The mapper to use.</param>

-    /// <returns>The mapped list</returns>

-    public IList<V> Map<V>(Fun<T, V> mapper) { return innerlist.Map(mapper); }

-

-    /// <summary>

-    /// Perform Map on the wrapped list. The result is <b>not</b> necessarily read-only.

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="itemequalityComparer">The itemequalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-    public IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> itemequalityComparer) { return innerlist.Map(mapper, itemequalityComparer); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public T Remove() { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public T RemoveFirst() { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public T RemoveLast() { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// Create the indicated view on the wrapped list and wrap it read-only.

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    /// <returns></returns>

-    public IList<T> View(int start, int count)

-    {

-      IList<T> view = innerlist.View(start, count);

-      return view == null ? null : new GuardedList<T>(view, underlying ?? this, true);

-    }

-

-    /// <summary>

-    /// Create the indicated view on the wrapped list and wrap it read-only.

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public IList<T> ViewOf(T item)

-    {

-      IList<T> view = innerlist.ViewOf(item);

-      return view == null ? null : new GuardedList<T>(view, underlying ?? this, true);

-    }

-

-    /// <summary>

-    /// Create the indicated view on the wrapped list and wrap it read-only.

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public IList<T> LastViewOf(T item)

-    {

-      IList<T> view = innerlist.LastViewOf(item);

-      return view == null ? null : new GuardedList<T>(view, underlying ?? this, true);

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <value>The wrapped underlying list of the wrapped view </value>

-    public IList<T> Underlying { get { return underlying; } }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The offset of the wrapped list as a view.</value>

-    public int Offset { get { return innerlist.Offset; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual bool IsValid { get { return innerlist.IsValid; } }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> if this is a wrapped view and not a view that was made on a wrapper</exception>

-    /// <param name="offset"></param>

-    public IList<T> Slide(int offset)

-    {

-      if (slidableView)

-      {

-        innerlist.Slide(offset);

-        return this;

-      }

-      else

-        throw new ReadOnlyCollectionException("List is read only");

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    public IList<T> Slide(int offset, int size)

-    {

-      if (slidableView)

-      {

-        innerlist.Slide(offset, size);

-        return this;

-      }

-      else

-        throw new ReadOnlyCollectionException("List is read only");

-    }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    public bool TrySlide(int offset)

-    {

-      if (slidableView)

-        return innerlist.TrySlide(offset);

-      else

-        throw new ReadOnlyCollectionException("List is read only");

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    public bool TrySlide(int offset, int size)

-    {

-      if (slidableView)

-        return innerlist.TrySlide(offset, size);

-      else

-        throw new ReadOnlyCollectionException("List is read only");

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <returns></returns>

-    public IList<T> Span(IList<T> otherView)

-    {

-      GuardedList<T> otherGuardedList = otherView as GuardedList<T>;

-      if (otherGuardedList == null)

-        throw new IncompatibleViewException();

-      IList<T> span = innerlist.Span(otherGuardedList.innerlist);

-      if (span == null)

-        return null;

-      return new GuardedList<T>(span, underlying ?? otherGuardedList.underlying ?? this, true);

-    }

-

-    /// <summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// </summary>

-    public void Reverse() { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    public void Reverse(int start, int count)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// Check if wrapped list is sorted according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    /// <returns>True if the list is sorted, else false.</returns>

-    public bool IsSorted() { return innerlist.IsSorted(Comparer<T>.Default); }

-

-    /// <summary>

-    /// Check if wrapped list is sorted

-    /// </summary>

-    /// <param name="c">The sorting order to use</param>

-    /// <returns>True if sorted</returns>

-    public bool IsSorted(SCG.IComparer<T> c) { return innerlist.IsSorted(c); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    public void Sort()

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="c"></param>

-    public void Sort(SCG.IComparer<T> c)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    public void Shuffle()

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="rnd"></param>

-    public void Shuffle(Random rnd)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary> </summary>

-    /// <value>A directed collection of the items in the indicated interval of the wrapped collection</value>

-    public IDirectedCollectionValue<T> this[int start, int end]

-    { get { return new GuardedDirectedCollectionValue<T>(innerlist[start, end]); } }

-

-

-    /// <summary>

-    /// Find the (first) index of an item in the wrapped collection

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int IndexOf(T item) { return innerlist.IndexOf(item); }

-

-

-    /// <summary>

-    /// Find the last index of an item in the wrapped collection

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    public int LastIndexOf(T item) { return innerlist.LastIndexOf(item); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="i"></param>

-    /// <returns></returns>

-    public T RemoveAt(int i)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="start"></param>

-    /// <param name="count"></param>

-    public void RemoveInterval(int start, int count)

-    { throw new ReadOnlyCollectionException("List is read only"); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    { return Backwards(); }

-

-    #endregion

-

-    #region IStack<T> Members

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns>-</returns>

-    public void Push(T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns>-</returns>

-    public T Pop()

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    #endregion

-

-    #region IQueue<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns>-</returns>

-    public void Enqueue(T item)

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns>-</returns>

-    public T Dequeue()

-    { throw new ReadOnlyCollectionException("Collection cannot be modified through this guard object"); }

-

-    #endregion

-

-    #region IDisposable Members

-

-    /// <summary>

-    /// Ignore: this may be called by a foreach or using statement.

-    /// </summary>

-    public void Dispose() { }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      return new GuardedList<T>((IList<T>)(innerlist.Clone()));

-    }

-

-  }

-

-  /// <summary>

-  /// A read-only wrapper for a generic indexable queue (allows indexing).

-  /// 

-  /// <para>Suitable for wrapping a <see cref="T:C5.CircularQueue`1"/></para>

-  /// </summary>

-  /// <typeparam name="T">The item type.</typeparam>

-  public class GuardedQueue<T> : GuardedDirectedCollectionValue<T>, IQueue<T>

-  {

-    #region Fields

-

-    IQueue<T> queue;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a queue in a read-only wrapper

-    /// </summary>

-    /// <param name="queue">The queue</param>

-    public GuardedQueue(IQueue<T> queue) : base(queue) { this.queue = queue; }

-

-    #endregion

-

-    #region IQueue<T> Members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public bool AllowsDuplicates { get { return queue.AllowsDuplicates; } }

-

-    /// <summary>

-    /// Index into the wrapped queue

-    /// </summary>

-    /// <param name="i"></param>

-    /// <returns></returns>

-    public T this[int i] { get { return queue[i]; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns>-</returns>

-    public void Enqueue(T item)

-    { throw new ReadOnlyCollectionException("Queue cannot be modified through this guard object"); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns>-</returns>

-    public T Dequeue()

-    { throw new ReadOnlyCollectionException("Queue cannot be modified through this guard object"); }

-

-    #endregion

-  }

-

-  /// <summary>

-  /// A read-only wrapper for a dictionary.

-  ///

-  /// <i>Suitable for wrapping a HashDictionary. <see cref="T:C5.HashDictionary`2"/></i>

-  /// </summary>

-  public class GuardedDictionary<K, V> : GuardedCollectionValue<KeyValuePair<K, V>>, IDictionary<K, V>

-  {

-    #region Fields

-

-    IDictionary<K, V> dict;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a dictionary in a read-only wrapper

-    /// </summary>

-    /// <param name="dict">the dictionary</param>

-    public GuardedDictionary(IDictionary<K, V> dict) : base(dict) { this.dict = dict; }

-

-    #endregion

-

-    #region IDictionary<K,V> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public SCG.IEqualityComparer<K> EqualityComparer { get { return dict.EqualityComparer; } }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a

-    /// read-only wrappper if used as a setter</exception>

-    /// <value>Get the value corresponding to a key in the wrapped dictionary</value>

-    public V this[K key]

-    {

-      get { return dict[key]; }

-      set { throw new ReadOnlyCollectionException(); }

-    }

-

-    /// <summary>

-    /// (This is a read-only wrapper)

-    /// </summary>

-    /// <value>True</value>

-    public bool IsReadOnly { get { return true; } }

-

-

-    //TODO: guard with a read-only wrapper? Probably so!

-    /// <summary> </summary>

-    /// <value>The collection of keys of the wrapped dictionary</value>

-    public ICollectionValue<K> Keys

-    { get { return dict.Keys; } }

-

-

-    /// <summary> </summary>

-    /// <value>The collection of values of the wrapped dictionary</value>

-    public ICollectionValue<V> Values { get { return dict.Values; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual Fun<K, V> Fun { get { return delegate(K k) { return this[k]; }; } }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    public void Add(K key, V val)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="items"></param>

-    public void AddAll<L, W>(SCG.IEnumerable<KeyValuePair<L, W>> items)

-      where L : K

-      where W : V

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <returns></returns>

-    public bool Remove(K key)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    /// <returns></returns>

-    public bool Remove(K key, out V val)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    public void Clear()

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public Speed ContainsSpeed { get { return dict.ContainsSpeed; } }

-

-    /// <summary>

-    /// Check if the wrapped dictionary contains a specific key

-    /// </summary>

-    /// <param name="key">The key</param>

-    /// <returns>True if it does</returns>

-    public bool Contains(K key) { return dict.Contains(key); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="keys"></param>

-    /// <returns></returns>

-    public bool ContainsAll<H>(SCG.IEnumerable<H> keys) where H : K { return dict.ContainsAll(keys); }

-

-    /// <summary>

-    /// Search for a key in the wrapped dictionary, reporting the value if found

-    /// </summary>

-    /// <param name="key">The key</param>

-    /// <param name="val">On exit: the value if found</param>

-    /// <returns>True if found</returns>

-    public bool Find(K key, out V val) { return dict.Find(key, out val); }

-

-    /// <summary>

-    /// Search for a key in the wrapped dictionary, reporting the value if found

-    /// </summary>

-    /// <param name="key">The key</param>

-    /// <param name="val">On exit: the value if found</param>

-    /// <returns>True if found</returns>

-    public bool Find(ref K key, out V val) { return dict.Find(ref key, out val); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    /// <returns></returns>

-    public bool Update(K key, V val)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    /// <param name="oldval"></param>

-    /// <returns></returns>

-    public bool Update(K key, V val, out V oldval)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    /// <returns></returns>

-    public bool FindOrAdd(K key, ref V val)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(K key, V val)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="key"></param>

-    /// <param name="val"></param>

-    /// <param name="oldval"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(K key, V val, out V oldval)

-    { throw new ReadOnlyCollectionException(); }

-

-

-    /// <summary>

-    /// Check the internal consistency of the wrapped dictionary

-    /// </summary>

-    /// <returns>True if check passed</returns>

-    public bool Check() { return dict.Check(); }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      return new GuardedDictionary<K, V>((IDictionary<K, V>)(dict.Clone()));

-    }

-  }

-

-

-

-  /// <summary>

-  /// A read-only wrapper for a sorted dictionary.

-  ///

-  /// <i>Suitable for wrapping a Dictionary. <see cref="T:C5.Dictionary`2"/></i>

-  /// </summary>

-  public class GuardedSortedDictionary<K, V> : GuardedDictionary<K, V>, ISortedDictionary<K, V>

-  {

-    #region Fields

-

-    ISortedDictionary<K, V> sorteddict;

-

-    #endregion

-

-    #region Constructor

-

-    /// <summary>

-    /// Wrap a sorted dictionary in a read-only wrapper

-    /// </summary>

-    /// <param name="sorteddict">the dictionary</param>

-    public GuardedSortedDictionary(ISortedDictionary<K, V> sorteddict)

-      : base(sorteddict)

-    { this.sorteddict = sorteddict; }

-

-    #endregion

-

-    #region ISortedDictionary<K,V> Members

-

-    /// <summary>

-    /// The key comparer used by this dictionary.

-    /// </summary>

-    /// <value></value>

-    public SCG.IComparer<K> Comparer { get { return sorteddict.Comparer; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public new ISorted<K> Keys { get { return null; } }

-

-    /// <summary>

-    /// Get the entry in the wrapped dictionary whose key is the

-    /// predecessor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such entry exists </exception>    

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    public KeyValuePair<K, V> Predecessor(K key)

-    { return sorteddict.Predecessor(key); }

-

-

-    /// <summary>

-    /// Get the entry in the wrapped dictionary whose key is the

-    /// successor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such entry exists </exception>    

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    public KeyValuePair<K, V> Successor(K key)

-    { return sorteddict.Successor(key); }

-

-

-    /// <summary>

-    /// Get the entry in the wrapped dictionary whose key is the

-    /// weak predecessor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such entry exists </exception>    

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    public KeyValuePair<K, V> WeakPredecessor(K key)

-    { return sorteddict.WeakPredecessor(key); }

-

-

-    /// <summary>

-    /// Get the entry in the wrapped dictionary whose key is the

-    /// weak successor of a specified key.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such entry exists </exception>    

-    /// <param name="key">The key</param>

-    /// <returns>The entry</returns>

-    public KeyValuePair<K, V> WeakSuccessor(K key)

-    { return sorteddict.WeakSuccessor(key); }

-

-    #endregion

-

-    #region ISortedDictionary<K,V> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public KeyValuePair<K, V> FindMin()

-    {

-      return sorteddict.FindMin();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public KeyValuePair<K, V> DeleteMin()

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public KeyValuePair<K, V> FindMax()

-    {

-      return sorteddict.FindMax();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <returns></returns>

-    public KeyValuePair<K, V> DeleteMax()

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="c"></param>

-    /// <param name="lowEntry"></param>

-    /// <param name="lowIsValid"></param>

-    /// <param name="highEntry"></param>

-    /// <param name="highIsValid"></param>

-    /// <returns></returns>

-    public bool Cut(IComparable<K> c, out KeyValuePair<K, V> lowEntry, out bool lowIsValid, out KeyValuePair<K, V> highEntry, out bool highIsValid)

-    {

-      return sorteddict.Cut(c, out lowEntry, out lowIsValid, out highEntry, out highIsValid); ;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<KeyValuePair<K, V>> RangeFrom(K bot)

-    {

-      return new GuardedDirectedEnumerable<KeyValuePair<K, V>>(sorteddict.RangeFrom(bot));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="bot"></param>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<KeyValuePair<K, V>> RangeFromTo(K bot, K top)

-    {

-      return new GuardedDirectedEnumerable<KeyValuePair<K, V>>(sorteddict.RangeFromTo(bot, top));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="top"></param>

-    /// <returns></returns>

-    public IDirectedEnumerable<KeyValuePair<K, V>> RangeTo(K top)

-    {

-      return new GuardedDirectedEnumerable<KeyValuePair<K, V>>(sorteddict.RangeTo(top));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public IDirectedCollectionValue<KeyValuePair<K, V>> RangeAll()

-    {

-      return new GuardedDirectedCollectionValue<KeyValuePair<K, V>>(sorteddict.RangeAll());

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="items"></param>

-    public void AddSorted(System.Collections.Generic.IEnumerable<KeyValuePair<K, V>> items)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="low"></param>

-    public void RemoveRangeFrom(K low)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="low"></param>

-    /// <param name="hi"></param>

-    public void RemoveRangeFromTo(K low, K hi)

-    { throw new ReadOnlyCollectionException(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="ReadOnlyCollectionException"> since this is a read-only wrappper</exception>

-    /// <param name="hi"></param>

-    public void RemoveRangeTo(K hi)

-    { throw new ReadOnlyCollectionException(); }

-

-    #endregion

-  }

-

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/arrays/ArrayList.cs b/mcs/class/Mono.C5/C5/arrays/ArrayList.cs
deleted file mode 100644
index 64e4a4f1a48..00000000000
--- a/mcs/class/Mono.C5/C5/arrays/ArrayList.cs
+++ /dev/null
@@ -1,2539 +0,0 @@
-#if NET_2_0
-

-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define HASHINDEXnot

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A list collection based on a plain dynamic array data structure.

-  /// Expansion of the internal array is performed by doubling on demand. 

-  /// The internal array is only shrinked by the Clear method. 

-  ///

-  /// <i>When the FIFO property is set to false this class works fine as a stack of T.

-  /// When the FIFO property is set to true the class will function as a (FIFO) queue

-  /// but very inefficiently, use a LinkedList (<see cref="T:C5.LinkedList`1"/>) instead.</i>

-  /// </summary>

-  [Serializable]

-  public class ArrayList<T> : ArrayBase<T>, IList<T> //, System.Runtime.Serialization.ISerializable

-#if HASHINDEX

-#else

-, IStack<T>, IQueue<T>

-#endif

-  {

-    #region Fields

-

-    /// <summary>

-    /// Has this list or view not been invalidated by some operation (by someone calling Dispose())

-    /// </summary>

-    bool isValid = true;

-

-    //TODO: wonder if we should save some memory on none-view situations by 

-    //      putting these three fields into a single ref field?

-    /// <summary>

-    /// The underlying list if we are a view, null else.

-    /// </summary>

-    ArrayList<T> underlying;

-    WeakViewList<ArrayList<T>> views;

-    WeakViewList<ArrayList<T>>.Node myWeakReference;

-

-    /// <summary>

-    /// The size of the underlying list.

-    /// </summary>

-    int underlyingsize { get { return (underlying ?? this).size; } }

-

-    /// <summary>

-    /// The underlying field of the FIFO property

-    /// </summary>

-    bool fIFO = false;

-

-#if HASHINDEX

-    HashSet<KeyValuePair<T, int>> itemIndex;

-#endif

-    #endregion

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return underlying == null ? EventTypeEnum.All : EventTypeEnum.None; } }

-

-/*

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event CollectionChangedHandler<T> CollectionChanged

-    {

-      add

-      {

-        if (underlying == null)

-          base.CollectionChanged += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.CollectionChanged -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event CollectionClearedHandler<T> CollectionCleared

-    {

-      add

-      {

-        if (underlying == null)

-          base.CollectionCleared += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.CollectionCleared -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemsAddedHandler<T> ItemsAdded

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemsAdded += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemsAdded -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemInsertedHandler<T> ItemInserted

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemInserted += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemInserted -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemsRemoved += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemsRemoved -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemRemovedAt += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemRemovedAt -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-      */

-

-    #endregion

-    #region Util

-

-    bool equals(T i1, T i2) { return itemequalityComparer.Equals(i1, i2); }

-

-    /// <summary>

-    /// Increment or decrement the private size fields

-    /// </summary>

-    /// <param name="delta">Increment (with sign)</param>

-    void addtosize(int delta)

-    {

-      size += delta;

-      if (underlying != null)

-        underlying.size += delta;

-    }

-

-    #region Array handling

-    /// <summary>

-    /// Double the size of the internal array.

-    /// </summary>

-    protected override void expand()

-    { expand(2 * array.Length, underlyingsize); }

-

-

-    /// <summary>

-    /// Expand the internal array, resetting the index of the first unused element.

-    /// </summary>

-    /// <param name="newcapacity">The new capacity (will be rouded upwards to a power of 2).</param>

-    /// <param name="newsize">The new count of </param>

-    protected override void expand(int newcapacity, int newsize)

-    {

-      base.expand(newcapacity, newsize);

-      if (underlying != null)

-        underlying.array = array;

-    }

-

-    #endregion

-

-    #region Checks

-    /// <summary>

-    /// Check if it is valid to perform updates and increment stamp if so.

-    /// </summary>

-    /// <exception cref="ViewDisposedException"> If check fails by this list being a disposed view.</exception>

-    /// <exception cref="ReadOnlyCollectionException"> If check fails by this being a read only list.</exception>

-    protected override void updatecheck()

-    {

-      validitycheck();

-      base.updatecheck();

-      if (underlying != null)

-        underlying.stamp++;

-    }

-

-

-    /// <summary>

-    /// Check if we are a view that the underlying list has only been updated through us.

-    /// <para>This method should be called from enumerators etc to guard against 

-    /// modification of the base collection.</para>

-    /// </summary>

-    /// <exception cref="ViewDisposedException"> if check fails.</exception>

-    void validitycheck()

-    {

-      if (!isValid)

-        throw new ViewDisposedException();

-    }

-

-

-    /// <summary>

-    /// Check that the list has not been updated since a particular time.

-    /// <para>To be used by enumerators and range </para>

-    /// </summary>

-    /// <exception cref="ViewDisposedException"> If check fails by this list being a disposed view.</exception>

-    /// <exception cref="CollectionModifiedException">If the list *has* beeen updated since that  time..</exception>

-    /// <param name="stamp">The stamp indicating the time.</param>

-    protected override void modifycheck(int stamp)

-    {

-      validitycheck();

-      if (this.stamp != stamp)

-        throw new CollectionModifiedException();

-    }

-

-    #endregion

-

-    #region Searching

-

-    /// <summary>

-    /// Internal version of IndexOf without modification checks.

-    /// </summary>

-    /// <param name="item">Item to look for</param>

-    /// <returns>The index of first occurrence</returns>

-    int indexOf(T item)

-    {

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item);

-      if (itemIndex.Find(ref p) && p.Value >= offset && p.Value < offset + size)

-        return p.Value - offset;

-#else

-      for (int i = 0; i < size; i++)

-        if (equals(item, array[offset + i]))

-          return i;

-#endif

-      return ~size;

-    }

-

-    /// <summary>

-    /// Internal version of LastIndexOf without modification checks.

-    /// </summary>

-    /// <param name="item">Item to look for</param>

-    /// <returns>The index of last occurrence</returns>

-    int lastIndexOf(T item)

-    {

-#if HASHINDEX

-      return indexOf(item);

-#else

-      for (int i = size - 1; i >= 0; i--)

-        if (equals(item, array[offset + i]))

-          return i;

-      return ~size;

-#endif

-    }

-    #endregion

-

-    #region Inserting

-

-#if HASHINDEX

-    /// <summary>

-    /// Internal version of Insert with no modification checks.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException"> if item already in list.</exception>

-    /// <param name="i">Index to insert at</param>

-    /// <param name="item">Item to insert</param>

-#else

-    /// <summary>

-    /// Internal version of Insert with no modification checks.

-    /// </summary>

-    /// <param name="i">Index to insert at</param>

-    /// <param name="item">Item to insert</param>

-#endif

-    protected override void insert(int i, T item)

-    {

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, offset + i);

-      if (itemIndex.FindOrAdd(ref p))

-        throw new DuplicateNotAllowedException("Item already in indexed list: " + item);

-#endif

-      baseinsert(i, item);

-#if HASHINDEX

-      reindex(i + offset + 1);

-#endif

-    }

-

-    private void baseinsert(int i, T item)

-    {

-      if (underlyingsize == array.Length)

-        expand();

-      i += offset;

-      if (i < underlyingsize)

-        Array.Copy(array, i, array, i + 1, underlyingsize - i);

-      array[i] = item;

-      addtosize(1);

-      fixViewsAfterInsert(1, i);

-    }

-    #endregion

-

-    #region Removing

-

-    /// <summary>

-    /// Internal version of RemoveAt with no modification checks.

-    /// </summary>

-    /// <param name="i">Index to remove at</param>

-    /// <returns>The removed item</returns>

-    T removeAt(int i)

-    {

-      i += offset;

-      fixViewsBeforeSingleRemove(i);

-      T retval = array[i];

-      addtosize(-1);

-      if (underlyingsize > i)

-        Array.Copy(array, i + 1, array, i, underlyingsize - i);

-      array[underlyingsize] = default(T);

-#if HASHINDEX

-      itemIndex.Remove(new KeyValuePair<T, int>(retval));

-      reindex(i);

-#endif

-      return retval;

-    }

-    #endregion

-

-    #region Indexing

-

-#if HASHINDEX

-    private void reindex(int start) { reindex(start, underlyingsize); }

-

-    private void reindex(int start, int end)

-    {

-      for (int j = start; j < end; j++)

-        itemIndex.UpdateOrAdd(new KeyValuePair<T, int>(array[j], j));

-    }

-#endif

-    #endregion

-

-    #region fixView utilities

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="added">The actual number of inserted nodes</param>

-    /// <param name="realInsertionIndex"></param>

-    void fixViewsAfterInsert(int added, int realInsertionIndex)

-    {

-      if (views != null)

-        foreach (ArrayList<T> view in views)

-        {

-          if (view != this)

-          {

-            if (view.offset < realInsertionIndex && view.offset + view.size > realInsertionIndex)

-              view.size += added;

-            if (view.offset > realInsertionIndex || (view.offset == realInsertionIndex && view.size > 0))

-              view.offset += added;

-          }

-        }

-    }

-

-    void fixViewsBeforeSingleRemove(int realRemovalIndex)

-    {

-      if (views != null)

-        foreach (ArrayList<T> view in views)

-        {

-          if (view != this)

-          {

-            if (view.offset <= realRemovalIndex && view.offset + view.size > realRemovalIndex)

-              view.size--;

-            if (view.offset > realRemovalIndex)

-              view.offset--;

-          }

-        }

-    }

-

-    /// <summary>

-    /// Fix offsets and sizes of other views before removing an interval from this 

-    /// </summary>

-    /// <param name="start">the start of the interval relative to the array/underlying</param>

-    /// <param name="count"></param>

-    void fixViewsBeforeRemove(int start, int count)

-    {

-      int clearend = start + count - 1;

-      if (views != null)

-        foreach (ArrayList<T> view in views)

-        {

-          if (view == this)

-            continue;

-          int viewoffset = view.offset, viewend = viewoffset + view.size - 1;

-          if (start < viewoffset)

-          {

-            if (clearend < viewoffset)

-              view.offset = viewoffset - count;

-            else

-            {

-              view.offset = start;

-              view.size = clearend < viewend ? viewend - clearend : 0;

-            }

-          }

-          else if (start <= viewend)

-            view.size = clearend <= viewend ? view.size - count : start - viewoffset;

-        }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="otherOffset"></param>

-    /// <param name="otherSize"></param>

-    /// <returns>The position of View(otherOffset, otherSize) wrt. this view</returns>

-    MutualViewPosition viewPosition(int otherOffset, int otherSize)

-    {

-      int end = offset + size, otherEnd = otherOffset + otherSize;

-      if (otherOffset >= end || otherEnd <= offset)

-        return MutualViewPosition.NonOverlapping;

-      if (size == 0 || (otherOffset <= offset && end <= otherEnd))

-        return MutualViewPosition.Contains;

-      if (otherSize == 0 || (offset <= otherOffset && otherEnd <= end))

-        return MutualViewPosition.ContainedIn;

-      return MutualViewPosition.Overlapping;

-    }

-

-    //TODO: make version that fits the new, more forgiving rules for disposing

-    void disposeOverlappingViews(bool reverse)

-    {

-      if (views != null)

-        foreach (ArrayList<T> view in views)

-        {

-          if (view != this)

-          {

-            switch (viewPosition(view.offset, view.size))

-            {

-              case MutualViewPosition.ContainedIn:

-                if (reverse)

-                  view.offset = 2 * offset + size - view.size - view.offset;

-                else

-                  view.Dispose();

-                break;

-              case MutualViewPosition.Overlapping:

-                view.Dispose();

-                break;

-              case MutualViewPosition.Contains:

-              case MutualViewPosition.NonOverlapping:

-                break;

-            }

-          }

-        }

-    }

-    #endregion

-

-    #endregion

-

-    #region Position, PositionComparer and ViewHandler nested types

-    class PositionComparer : SCG.IComparer<Position>

-    {

-      public int Compare(Position a, Position b)

-      {

-        return a.index.CompareTo(b.index);

-      }

-    }

-    /// <summary>

-    /// During RemoveAll, we need to cache the original endpoint indices of views (??? also for ArrayList?)

-    /// </summary>

-    struct Position

-    {

-      public readonly ArrayList<T> view;

-      public readonly int index;

-      public Position(ArrayList<T> view, bool left)

-      {

-        this.view = view;

-        index = left ? view.offset : view.offset + view.size - 1;

-      }

-      public Position(int index) { this.index = index; view = null; }

-    }

-

-    /// <summary>

-    /// Handle the update of (other) views during a multi-remove operation.

-    /// </summary>

-    struct ViewHandler

-    {

-      ArrayList<Position> leftEnds;

-      ArrayList<Position> rightEnds;

-      int leftEndIndex, rightEndIndex;

-      internal readonly int viewCount;

-      internal ViewHandler(ArrayList<T> list)

-      {

-        leftEndIndex = rightEndIndex = viewCount = 0;

-        leftEnds = rightEnds = null;

-        if (list.views != null)

-          foreach (ArrayList<T> v in list.views)

-            if (v != list)

-            {

-              if (leftEnds == null)

-              {

-                leftEnds = new ArrayList<Position>();

-                rightEnds = new ArrayList<Position>();

-              }

-              leftEnds.Add(new Position(v, true));

-              rightEnds.Add(new Position(v, false));

-            }

-        if (leftEnds == null)

-          return;

-        viewCount = leftEnds.Count;

-        leftEnds.Sort(new PositionComparer());

-        rightEnds.Sort(new PositionComparer());

-      }

-      /// <summary>

-      /// This is to be called with realindex pointing to the first node to be removed after a (stretch of) node that was not removed

-      /// </summary>

-      /// <param name="removed"></param>

-      /// <param name="realindex"></param>

-      internal void skipEndpoints(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).index <= realindex)

-          {

-            ArrayList<T> view = endpoint.view;

-            view.offset = view.offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).index < realindex)

-          {

-            endpoint.view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-      internal void updateViewSizesAndCounts(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).index <= realindex)

-          {

-            ArrayList<T> view = endpoint.view;

-            view.offset = view.Offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).index < realindex)

-          {

-            endpoint.view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-    }

-    #endregion

-

-    #region Constructors

-    /// <summary>

-    /// Create an array list with default item equalityComparer and initial capacity 8 items.

-    /// </summary>

-    public ArrayList() : this(8) { }

-

-

-    /// <summary>

-    /// Create an array list with external item equalityComparer and initial capacity 8 items.

-    /// </summary>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public ArrayList(SCG.IEqualityComparer<T> itemequalityComparer) : this(8,itemequalityComparer) { }

-

-

-    /// <summary>

-    /// Create an array list with default item equalityComparer and prescribed initial capacity.

-    /// </summary>

-    /// <param name="capacity">The prescribed capacity</param>

-    public ArrayList(int capacity) : this(capacity,EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create an array list with external item equalityComparer and prescribed initial capacity.

-    /// </summary>

-    /// <param name="capacity">The prescribed capacity</param>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public ArrayList(int capacity, SCG.IEqualityComparer<T> itemequalityComparer) : base(capacity,itemequalityComparer)

-    {

-#if HASHINDEX

-      itemIndex = new HashSet<KeyValuePair<T, int>>(new KeyValuePairEqualityComparer<T, int>(itemequalityComparer));

-#endif

-    }

-

-    #endregion

-

-    #region IList<T> Members

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The first item in this list.</value>

-    [Tested]

-    public virtual T First

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-

-        return array[offset];

-      }

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The last item in this list.</value>

-    [Tested]

-    public virtual T Last

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-

-        return array[offset + size - 1];

-      }

-    }

-

-

-    /// <summary>

-    /// Since <code>Add(T item)</code> always add at the end of the list,

-    /// this describes if list has FIFO or LIFO semantics.

-    /// </summary>

-    /// <value>True if the <code>Remove()</code> operation removes from the

-    /// start of the list, false if it removes from the end. The default for a new array list is false.</value>

-    [Tested]

-    public virtual bool FIFO

-    {

-      [Tested]

-      get { validitycheck(); return fIFO; }

-      [Tested]

-      set { updatecheck(); fIFO = value; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual bool IsFixedSize

-    {

-      get { validitycheck(); return false; }

-    }

-

-

-#if HASHINDEX

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <exception cref="DuplicateNotAllowedException"> By the get operation

-    /// if the item already is present somewhere else in the list.</exception>

-    /// <value>The index'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-#else

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <value>The index'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-#endif

-    [Tested]

-    public virtual T this[int index]

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (index < 0 || index >= size)

-          throw new IndexOutOfRangeException();

-

-        return array[offset + index];

-      }

-      [Tested]

-      set

-      {

-        updatecheck();

-        if (index < 0 || index >= size)

-          throw new IndexOutOfRangeException();

-        index += offset;

-        T item = array[index];

-#if HASHINDEX

-        KeyValuePair<T, int> p = new KeyValuePair<T, int>(value, index);

-        if (itemequalityComparer.Equals(value, item))

-        {

-          array[index] = value;

-          itemIndex.Update(p);

-        }

-        else if (!itemIndex.FindOrAdd(ref p))

-        {

-          itemIndex.Remove(new KeyValuePair<T, int>(item));

-          array[index] = value;

-        }

-        else

-          throw new DuplicateNotAllowedException("Item already in indexed list");

-#else

-        array[index] = value;

-#endif

-        (underlying ?? this).raiseForSetThis(index, value, item);

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Constant; } }

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    ///</summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt; the size of the collection. </exception>

-    /// <exception cref="DuplicateNotAllowedException"> 

-    /// If the item is already present in the list.</exception>

-    /// <param name="index">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-#else

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    ///</summary>

-    /// <exception cref="IndexOutOfRangeException"> if i is negative or

-    /// &gt; the size of the collection. </exception>

-    /// <param name="index">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-#endif

-    [Tested]

-    public virtual void Insert(int index, T item)

-    {

-      updatecheck();

-      if (index < 0 || index > size)

-        throw new IndexOutOfRangeException();

-

-      insert(index, item);

-      (underlying ?? this).raiseForInsert(index + offset, item);

-    }

-

-    /// <summary>

-    /// Insert an item at the end of a compatible view, used as a pointer.

-    /// <para>The <code>pointer</code> must be a view on the same list as

-    /// <code>this</code> and the endpoitn of <code>pointer</code> must be

-    /// a valid insertion point of <code>this</code></para>

-    /// </summary>

-    /// <exception cref="IncompatibleViewException">If <code>pointer</code> 

-    /// is not a view on or the same list as <code>this</code></exception>

-    /// <exception cref="IndexOutOfRangeException"><b>??????</b> if the endpoint of 

-    ///  <code>pointer</code> is not inside <code>this</code></exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.</exception>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    public void Insert(IList<T> pointer, T item)

-    {

-      if ((pointer == null) || ((pointer.Underlying ?? pointer) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-      Insert(pointer.Offset + pointer.Count - Offset, item);

-    }

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt; the size of the collection.</exception>

-    /// <exception cref="DuplicateNotAllowedException"> If <code>items</code> 

-    /// contains duplicates or some item already  present in the list.</exception>

-    /// <param name="index">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-#else

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt; the size of the collection.</exception>

-    /// <param name="index">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-    /// <typeparam name="U"></typeparam>

-#endif

-    [Tested]

-    public virtual void InsertAll<U>(int index, SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (index < 0 || index > size)

-        throw new IndexOutOfRangeException();

-      index += offset;

-      int toadd = EnumerableBase<U>.countItems(items);

-      if (toadd == 0)

-        return;

-      if (toadd + underlyingsize > array.Length)

-        expand(toadd + underlyingsize, underlyingsize);

-      if (underlyingsize > index)

-        Array.Copy(array, index, array, index + toadd, underlyingsize - index);

-      int i = index;

-      try

-      {

-

-        foreach (T item in items)

-        {

-#if HASHINDEX

-          KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, i);

-          if (itemIndex.FindOrAdd(ref p))

-            throw new DuplicateNotAllowedException("Item already in indexed list");

-#endif

-          array[i++] = item;

-        }

-      }

-      finally

-      {

-        int added = i - index;

-        if (added < toadd)

-        {

-          Array.Copy(array, index + toadd, array, i, underlyingsize - index);

-          Array.Clear(array, underlyingsize + added, toadd - added);

-        }

-        if (added > 0)

-        {

-          addtosize(added);

-#if HASHINDEX

-          reindex(i);

-#endif

-          fixViewsAfterInsert(added, index);

-          (underlying ?? this).raiseForInsertAll(index, added);

-        }

-      }

-    }

-    private void raiseForInsertAll(int index, int added)

-    {

-      if (ActiveEvents != 0)

-      {

-        if ((ActiveEvents & (EventTypeEnum.Added | EventTypeEnum.Inserted)) != 0)

-          for (int j = index; j < index + added; j++)

-          {

-            raiseItemInserted(array[j], j);

-            raiseItemsAdded(array[j], 1);

-          }

-        raiseCollectionChanged();

-      }

-    }

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert an item at the front of this list;

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If the item is already in the list</exception>

-    /// <param name="item">The item to insert.</param>

-#else

-    /// <summary>

-    /// Insert an item at the front of this list;

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-#endif

-    [Tested]

-    public virtual void InsertFirst(T item)

-    {

-      updatecheck();

-      insert(0, item);

-      (underlying ?? this).raiseForInsert(offset, item);

-    }

-

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If the item is already in the list</exception>

-    /// <param name="item">The item to insert.</param>

-#else

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-#endif

-    [Tested]

-    public virtual void InsertLast(T item)

-    {

-      updatecheck();

-      insert(size, item);

-      (underlying ?? this).raiseForInsert(size - 1 + offset, item);

-    }

-

-

-    //NOTE: if the filter throws an exception, no result will be returned.

-    /// <summary>

-    /// Create a new list consisting of the items of this list satisfying a 

-    /// certain predicate.

-    /// <para>The new list will be of type ArrayList</para>

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new list.</returns>

-    [Tested]

-    public virtual IList<T> FindAll(Fun<T, bool> filter)

-    {

-      validitycheck();

-      int stamp = this.stamp;

-      ArrayList<T> res = new ArrayList<T>(itemequalityComparer);

-      int j = 0, rescap = res.array.Length;

-      for (int i = 0; i < size; i++)

-      {

-        T a = array[offset + i];

-        bool found = filter(a);

-        modifycheck(stamp);

-        if (found)

-        {

-          if (j == rescap) res.expand(rescap = 2 * rescap, j);

-          res.array[j++] = a;

-        }

-      }

-      res.size = j;

-#if HASHINDEX

-      res.reindex(0);

-#endif

-      return res;

-    }

-

-

-#if HASHINDEX

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use the default item equalityComparer for the item type V.

-    /// <para>The new list will be of type ArrayList</para>

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If <code>mapper</code>

-    /// creates duplicates</exception>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <returns>The new list.</returns>

-#else

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use the default item equalityComparer for the item type V.

-    /// <para>The new list will be of type ArrayList</para>

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <returns>The new list.</returns>

-#endif

-    [Tested]

-    public virtual IList<V> Map<V>(Fun<T, V> mapper)

-    {

-      validitycheck();

-

-      ArrayList<V> res = new ArrayList<V>(size);

-

-      return map<V>(mapper, res);

-    }

-

-#if HASHINDEX

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified item equalityComparer for the item type.

-    /// <para>The new list will be of type ArrayList</para>

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If <code>mapper</code>

-    /// creates duplicates</exception>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-#else

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified item equalityComparer for the item type.

-    /// <para>The new list will be of type ArrayList</para>

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-#endif

-    public virtual IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> itemequalityComparer)

-    {

-      validitycheck();

-

-      ArrayList<V> res = new ArrayList<V>(size, itemequalityComparer);

-

-      return map<V>(mapper, res);

-    }

-

-    private IList<V> map<V>(Fun<T, V> mapper, ArrayList<V> res)

-    {

-      int stamp = this.stamp;

-      if (size > 0)

-        for (int i = 0; i < size; i++)

-        {

-          V mappeditem = mapper(array[offset + i]);

-          modifycheck(stamp);

-#if HASHINDEX

-          KeyValuePair<V, int> p = new KeyValuePair<V, int>(mappeditem, i);

-          if (res.itemIndex.FindOrAdd(ref p))

-            throw new ArgumentException("Mapped item already in indexed list");

-#endif

-          res.array[i] = mappeditem;

-        }

-      res.size = size;

-      return res;

-    }

-

-    /// <summary>

-    /// Remove one item from the list: from the front if <code>FIFO</code>

-    /// is true, else from the back.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T Remove()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = removeAt(fIFO ? 0 : size - 1);

-      (underlying ?? this).raiseForRemove(item);

-      return item;

-    }

-

-    /// <summary>

-    /// Remove one item from the fromnt of the list.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveFirst()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = removeAt(0);

-      (underlying ?? this).raiseForRemoveAt(offset, item);

-      return item;

-    }

-

-

-    /// <summary>

-    /// Remove one item from the back of the list.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveLast()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = removeAt(size - 1);

-      (underlying ?? this).raiseForRemoveAt(size + offset, item);

-      return item;

-    }

-

-    /// <summary>

-    /// Create a list view on this list. 

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if the start or count is negative

-    /// or the range does not fit within list.</exception>

-    /// <param name="start">The index in this list of the start of the view.</param>

-    /// <param name="count">The size of the view.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> View(int start, int count)

-    {

-      validitycheck();

-      checkRange(start, count);

-      if (views == null)

-        views = new WeakViewList<ArrayList<T>>();

-      ArrayList<T> retval = (ArrayList<T>)MemberwiseClone();

-

-

-      retval.underlying = underlying != null ? underlying : this;

-      retval.offset = start + offset;

-      retval.size = count;

-      retval.myWeakReference = views.Add(retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// Create a list view on this list containing the (first) occurrence of a particular item.

-    /// <para>Returns <code>null</code> if the item is not in this list.</para>

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> ViewOf(T item)

-    {

-      int index = indexOf(item);

-      if (index < 0)

-        return null;

-      return View(index, 1);

-    }

-

-

-    /// <summary>

-    /// Create a list view on this list containing the last occurrence of a particular item. 

-    /// <para>Returns <code>null</code> if the item is not in this list.</para>

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> LastViewOf(T item)

-    {

-      int index = lastIndexOf(item);

-      if (index < 0)

-        return null;

-      return View(index, 1);

-    }

-

-    /// <summary>

-    /// Null if this list is not a view.

-    /// </summary>

-    /// <value>Underlying list for view.</value>

-    [Tested]

-    public virtual IList<T> Underlying { [Tested]get { return underlying; } }

-

-

-    /// <summary>

-    /// </summary>

-    /// <value>Offset for this list view or 0 for an underlying list.</value>

-    [Tested]

-    public virtual int Offset { [Tested]get { return offset; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual bool IsValid { get { return isValid; } }

-

-    /// <summary>

-    /// Slide this list view along the underlying list.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    [Tested]

-    public virtual IList<T> Slide(int offset)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-

-    /// <summary>

-    /// Slide this list view along the underlying list, changing its size.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    /// <param name="size">The new size of the view.</param>

-    [Tested]

-    public virtual IList<T> Slide(int offset, int size)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    [Tested]

-    public virtual bool TrySlide(int offset)

-    {

-      return TrySlide(offset, size);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    [Tested]

-    public virtual bool TrySlide(int offset, int size)

-    {

-      updatecheck();

-      if (underlying == null)

-        throw new NotAViewException("Not a view");

-

-      int newoffset = this.offset + offset;

-      int newsize = size;

-

-      if (newoffset < 0 || newsize < 0 || newoffset + newsize > underlyingsize)

-        return false;

-

-      this.offset = newoffset;

-      this.size = newsize;

-      return true;

-    }

-

-    /// <summary>

-    /// 

-    /// <para>Returns null if <code>otherView</code> is strictly to the left of this view</para>

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <exception cref="IncompatibleViewException">If otherView does not have the same underlying list as this</exception>

-    /// <returns></returns>

-    public virtual IList<T> Span(IList<T> otherView)

-    {

-      if ((otherView == null) || ((otherView.Underlying ?? otherView) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-      if (otherView.Offset + otherView.Count - Offset < 0)

-        return null;

-      return (underlying ?? this).View(Offset, otherView.Offset + otherView.Count - Offset);

-    }

-

-    /// <summary>

-    /// Reverst the list so the items are in the opposite sequence order.

-    /// </summary>

-    [Tested]

-    public virtual void Reverse()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      for (int i = 0, length = size / 2, end = offset + size - 1; i < length; i++)

-      {

-        T swap = array[offset + i];

-

-        array[offset + i] = array[end - i];

-        array[end - i] = swap;

-      }

-#if HASHINDEX

-      reindex(offset, offset + size);

-#endif

-      //TODO: be more forgiving wrt. disposing

-      disposeOverlappingViews(true);

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// Check if this list is sorted according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    /// <returns>True if the list is sorted, else false.</returns>

-    [Tested]

-    public bool IsSorted() { return IsSorted(Comparer<T>.Default); }

-

-    /// <summary>

-    /// Check if this list is sorted according to a specific sorting order.

-    /// </summary>

-    /// <param name="c">The comparer defining the sorting order.</param>

-    /// <returns>True if the list is sorted, else false.</returns>

-    [Tested]

-    public virtual bool IsSorted(SCG.IComparer<T> c)

-    {

-      validitycheck();

-      for (int i = offset + 1, end = offset + size; i < end; i++)

-        if (c.Compare(array[i - 1], array[i]) > 0)

-          return false;

-

-      return true;

-    }

-

-    /// <summary>

-    /// Sort the items of the list according to the default sorting order

-    /// for the item type T, as defined by the Comparer[T] class 

-    /// (<see cref="T:C5.Comparer`1"/>).

-    /// </summary>

-    /// <exception cref="InvalidOperationException">if T is not comparable</exception>

-    public virtual void Sort()

-    {

-      Sort(Comparer<T>.Default);

-    }

-

-

-    /// <summary>

-    /// Sort the items of the list according to a specific sorting order.

-    /// </summary>

-    /// <param name="comparer">The comparer defining the sorting order.</param>

-    [Tested]

-    public virtual void Sort(SCG.IComparer<T> comparer)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      Sorting.IntroSort<T>(array, offset, size, comparer);

-      disposeOverlappingViews(false);

-#if HASHINDEX

-      reindex(offset, offset + size);

-#endif

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Randomly shuffle the items of this list. 

-    /// </summary>

-    public virtual void Shuffle() { Shuffle(new C5Random()); }

-

-

-    /// <summary>

-    /// Shuffle the items of this list according to a specific random source.

-    /// </summary>

-    /// <param name="rnd">The random source.</param>

-    public virtual void Shuffle(Random rnd)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      for (int i = offset, top = offset + size, end = top - 1; i < end; i++)

-      {

-        int j = rnd.Next(i, top);

-        if (j != i)

-        {

-          T tmp = array[i];

-          array[i] = array[j];

-          array[j] = tmp;

-        }

-      }

-      disposeOverlappingViews(false);

-#if HASHINDEX

-      reindex(offset, offset + size);

-#endif

-      (underlying ?? this).raiseCollectionChanged();

-    }

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// Search for an item in the list going forwrds from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from start.</returns>

-    [Tested]

-    public virtual int IndexOf(T item) { validitycheck(); return indexOf(item); }

-

-

-    /// <summary>

-    /// Search for an item in the list going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from the end.</returns>

-    [Tested]

-    public virtual int LastIndexOf(T item) { validitycheck(); return lastIndexOf(item); }

-

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <param name="index">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveAt(int index)

-    {

-      updatecheck();

-      if (index < 0 || index >= size)

-        throw new IndexOutOfRangeException("Index out of range for sequenced collection");

-

-      T item = removeAt(index);

-      (underlying ?? this).raiseForRemoveAt(offset + index, item);

-      return item;

-    }

-

-

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException">If <code>start</code>

-    /// and <code>count</code> does not describe a valid interval in the list</exception> 

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public virtual void RemoveInterval(int start, int count)

-    {

-      updatecheck();

-      if (count == 0)

-        return;

-      checkRange(start, count);

-      start += offset;

-      fixViewsBeforeRemove(start, count);

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-      for (int i = start, end = start + count; i < end; i++)

-      {

-        p.Key = array[i];

-        itemIndex.Remove(p);

-      }

-#endif

-      Array.Copy(array, start + count, array, start, underlyingsize - start - count);

-      addtosize(-count);

-      Array.Clear(array, underlyingsize, count);

-#if HASHINDEX

-      reindex(start);

-#endif

-      (underlying ?? this).raiseForRemoveInterval(start, count);

-    }

-    void raiseForRemoveInterval(int start, int count)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseCollectionCleared(size == 0, count, start);

-        raiseCollectionChanged();

-      }

-    }

-#endregion

-

-    #region ICollection<T> Members

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>Speed.Linear</value>

-    [Tested]

-    public virtual Speed ContainsSpeed

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return Speed.Constant;

-#else

-        return Speed.Linear;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetUnsequencedHashCode()

-    { validitycheck(); return base.GetUnsequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool UnsequencedEquals(ICollection<T> that)

-    { validitycheck(); return base.UnsequencedEquals(that); }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Contains(T item)

-    { validitycheck(); return indexOf(item) >= 0; }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Find(ref T item)

-    {

-      validitycheck();

-

-      int i;

-

-      if ((i = indexOf(item)) >= 0)

-      {

-        item = array[offset + i];

-        return true;

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. This will only update the first 

-    /// mathching item.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public virtual bool Update(T item)

-    {

-      T olditem;

-      return Update(item, out olditem);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item, out T olditem)

-    {

-      updatecheck();

-      int i;

-

-      if ((i = indexOf(item)) >= 0)

-      {

-        olditem = array[offset + i];

-        array[offset + i] = item;

-#if HASHINDEX

-        itemIndex.Update(new KeyValuePair<T, int>(item, offset + i));

-#endif

-        (underlying ?? this).raiseForUpdate(item, olditem);

-        return true;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found. Else, add the item to the collection.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the item was found (hence not added).</returns>

-    [Tested]

-    public virtual bool FindOrAdd(ref T item)

-    {

-      updatecheck();

-      if (Find(ref item))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. This will only update the first 

-    /// mathching item.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(T item)

-    {

-      updatecheck();

-      if (Update(item))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    {

-      updatecheck();

-      if (Update(item, out olditem))

-        return true;

-

-      Add(item);

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this list. The item will be searched 

-    /// for from the end of the list if <code>FIFO == false</code> (the default), 

-    /// else from the start.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item)

-    {

-      updatecheck();

-

-      int i = fIFO ? indexOf(item) : lastIndexOf(item);

-

-      if (i < 0)

-        return false;

-

-      T removeditem = removeAt(i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-

-    /// <summary>

-    /// Remove the first copy of a particular item from this collection if found.

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument. The item will be searched 

-    /// for from the end of the list if <code>FIFO == false</code> (the default), 

-    /// else from the start.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item, out T removeditem)

-    {

-      updatecheck();

-

-      int i = fIFO ? indexOf(item) : lastIndexOf(item);

-

-      if (i < 0)

-      {

-        removeditem = default(T);

-        return false;

-      }

-

-      removeditem = removeAt(i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-

-    //TODO: remove from end or according to FIFO?

-    /// <summary>

-    /// Remove all items in another collection from this one, taking multiplicities into account.

-    /// Matching items will be removed from the front. Current implementation is not optimal.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      //TODO: reactivate the old code for small sizes

-      HashBag<T> toremove = new HashBag<T>(itemequalityComparer);

-      toremove.AddAll(items);

-      if (toremove.Count == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && !toremove.Contains(item = array[i]))

-        {

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && toremove.Remove(item = array[i]))

-        {

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      if (mustFire)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RemoveAll(Fun<T,bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && !predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-        updatecheck();

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      if (mustFire)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items from this collection, resetting internal array size.

-    /// </summary>

-    [Tested]

-    public override void Clear()

-    {

-      if (underlying == null)

-      {

-        updatecheck();

-        if (size == 0)

-          return;

-        int oldsize = size;

-        fixViewsBeforeRemove(0, size);

-#if HASHINDEX

-        itemIndex.Clear();

-#endif

-        array = new T[8];

-        size = 0;

-        (underlying ?? this).raiseForRemoveInterval(offset, oldsize);

-      }

-      else

-        RemoveInterval(0, size);

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one, taking multiplicities into account.

-    /// Items are retained front first.  

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      HashBag<T> toretain = new HashBag<T>(itemequalityComparer);

-      toretain.AddAll(items);

-      if (toretain.Count == 0)

-      {

-        Clear();

-        return;

-      }

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && toretain.Remove(item = array[i]))

-        {

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && !toretain.Contains(item = array[i]))

-        {

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RetainAll(Fun<T, bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && !predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-        updatecheck();

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      raiseHandler.Raise();

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection,

-    /// taking multiplicities into account.

-    /// Current implementation is not optimal.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      validitycheck();

-#if HASHINDEX

-      foreach (T item in items)

-        if (indexOf(item) < 0)

-          return false;

-

-      return true;

-#else

-      //TODO: use aux hash bag to obtain linear time procedure

-      HashBag<T> tomatch = new HashBag<T>(itemequalityComparer);

-      tomatch.AddAll(items);

-      if (tomatch.Count == 0)

-        return true;

-      for (int i = offset, end = offset + size; i < end; i++)

-      {

-        tomatch.Remove(array[i]);

-        if (tomatch.Count == 0)

-          return true;

-      }

-      return false;

-#endif

-    }

-

-

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    [Tested]

-    public virtual int ContainsCount(T item)

-    {

-      validitycheck();

-#if HASHINDEX

-      return indexOf(item) >= 0 ? 1 : 0;

-#else

-      int count = 0;

-      for (int i = 0; i < size; i++)

-        if (equals(item, array[offset + i]))

-          count++;

-      return count;

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems()

-    {

-#if HASHINDEX

-      return this;

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.UniqueItems();

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-#if HASHINDEX

-      return new MultiplicityOne<T>(this);

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.ItemMultiplicities();

-#endif

-    }

-

-

-

-

-

-    /// <summary>

-    /// Remove all items equal to a given one.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public virtual void RemoveAllCopies(T item)

-    {

-#if HASHINDEX

-      Remove(item);

-#else

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-      while (i < end)

-      {

-        //pass by a stretch of nodes

-        while (i < end && !equals(item, array[i]))

-          array[j++] = array[i++];

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && equals(item, array[i]))

-        {

-          if (mustFire)

-            raiseHandler.Remove(array[i]);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-      raiseHandler.Raise();

-#endif

-    }

-

-

-    //TODO: check views

-    /// <summary>

-    /// Check the integrity of the internal data structures of this array list.

-    /// </summary>

-    /// <returns>True if check does not fail.</returns>

-    [Tested]

-    public override bool Check()

-    {

-      bool retval = true;

-

-      if (underlyingsize > array.Length)

-      {

-        Console.WriteLine("underlyingsize ({0}) > array.Length ({1})", size, array.Length);

-        return false;

-      }

-

-      if (offset + size > underlyingsize)

-      {

-        Console.WriteLine("offset({0})+size({1}) > underlyingsize ({2})", offset, size, underlyingsize);

-        return false;

-      }

-

-      if (offset < 0)

-      {

-        Console.WriteLine("offset({0}) < 0", offset);

-        return false;

-      }

-

-      for (int i = 0; i < underlyingsize; i++)

-      {

-        if ((object)(array[i]) == null)

-        {

-          Console.WriteLine("Bad element: null at (base)index {0}", i);

-          retval = false;

-        }

-      }

-

-      for (int i = underlyingsize, length = array.Length; i < length; i++)

-      {

-        if (!equals(array[i], default(T)))

-        {

-          Console.WriteLine("Bad element: != default(T) at (base)index {0}", i);

-          retval = false;

-        }

-      }

-

-#if HASHINDEX

-      if (underlyingsize != itemIndex.Count)

-      {

-        Console.WriteLine("size ({0})!= index.Count ({1})", size, itemIndex.Count);

-        retval = false;

-      }

-

-      for (int i = 0; i < underlyingsize; i++)

-      {

-        KeyValuePair<T, int> p = new KeyValuePair<T, int>(array[i]);

-

-        if (!itemIndex.Find(ref p))

-        {

-          Console.WriteLine("Item {1} at {0} not in hashindex", i, array[i]);

-          retval = false;

-        }

-

-        if (p.Value != i)

-        {

-          Console.WriteLine("Item {1} at {0} has hashindex {2}", i, array[i], p.Value);

-          retval = false;

-        }

-      }

-#endif

-      return retval;

-    }

-

-    #endregion

-

-    #region IExtensible<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True, indicating array list has bag semantics.</value>

-    [Tested]

-    public virtual bool AllowsDuplicates

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return false;

-#else

-        return true;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting

-    {

-      get

-      {

-#if HASHINDEX

-        return true;

-#else

-        return false;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// Add an item to end of this list.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True</returns>

-    [Tested]

-    public virtual bool Add(T item)

-    {

-      updatecheck();

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, size + offset);

-      if (itemIndex.FindOrAdd(ref p))

-        return false;

-#endif

-      baseinsert(size, item);

-#if HASHINDEX

-      reindex(size + offset);

-#endif

-      (underlying ?? this).raiseForAdd(item);

-      return true;

-    }

-    

-

-    /// <summary>

-    /// Add the elements from another collection to this collection.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    [Tested]

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      int toadd = EnumerableBase<U>.countItems(items);

-      if (toadd == 0)

-        return;

-

-      if (toadd + underlyingsize > array.Length)

-        expand(toadd + underlyingsize, underlyingsize);

-

-      int i = size + offset;

-      if (underlyingsize > i)

-        Array.Copy(array, i, array, i + toadd, underlyingsize - i);

-      try

-      {

-        foreach (T item in items)

-        {

-#if HASHINDEX

-          KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, i);

-          if (itemIndex.FindOrAdd(ref p))

-            continue;

-#endif

-          array[i++] = item;

-        }

-      }

-      finally

-      {

-        int added = i - size - offset;

-        if (added < toadd)

-        {

-          Array.Copy(array, size + offset + toadd, array, i, underlyingsize - size - offset);

-          Array.Clear(array, underlyingsize + added, toadd - added);

-        }

-        if (added > 0)

-        {

-          addtosize(added);

-#if HASHINDEX

-          reindex(i);

-#endif

-          fixViewsAfterInsert(added, i - added);

-          (underlying ?? this).raiseForAddAll(i - added, added);

-        }

-      }

-    }

-    private void raiseForAddAll(int start, int added)

-    {

-      if ((ActiveEvents & EventTypeEnum.Added) != 0)

-        for (int i = start, end = start + added; i < end; i++)

-          raiseItemsAdded(array[i], 1);

-      raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    #endregion

-

-    #region ICollectionValue<T> Members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of items in this collection</value>

-    [Tested]

-    public override int Count { [Tested]get { validitycheck(); return size; } }

-    #endregion

-

-    #region IEnumerable<T> Members

-    //TODO: make tests of all calls on a disposed view throws the right exception! (Which should be C5.InvalidListViewException)

-    /// <summary>

-    /// Create an enumerator for the collection

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      validitycheck();

-      return base.GetEnumerator();

-    }

-    #endregion

-

-#if HASHINDEX

-#else

-    #region IStack<T> Members

-

-    /// <summary>

-    /// Push an item to the top of the stack.

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public virtual void Push(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Pop the item at the top of the stack from the stack.

-    /// </summary>

-    /// <returns>The popped item.</returns>

-    [Tested]

-    public virtual T Pop()

-    {

-      return RemoveLast();

-    }

-

-    #endregion

-

-    #region IQueue<T> Members

-

-    /// <summary>

-    /// Enqueue an item at the back of the queue. 

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public virtual void Enqueue(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Dequeue an item from the front of the queue.

-    /// </summary>

-    /// <returns>The item</returns>

-    [Tested]

-    public virtual T Dequeue()

-    {

-      return RemoveFirst();

-    }

-

-    #endregion

-#endif

-    #region IDisposable Members

-

-    /// <summary>

-    /// Invalidate this list. If a view, just invalidate the view. 

-    /// If not a view, invalidate the list and all views on it.

-    /// </summary>

-    public virtual void Dispose()

-    {

-      Dispose(false);

-    }

-

-    void Dispose(bool disposingUnderlying)

-    {

-      if (isValid)

-      {

-        if (underlying != null)

-        {

-          isValid = false;

-          if (!disposingUnderlying)

-            views.Remove(myWeakReference);

-          underlying = null;

-          views = null;

-          myWeakReference = null;

-        }

-        else

-        {

-          //isValid = false;

-          foreach (ArrayList<T> view in views)

-            view.Dispose(true);

-          Clear();

-        }

-      }

-    }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this ArrayList.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      ArrayList<T> clone = new ArrayList<T>(size, itemequalityComparer);

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-    #region ISerializable Members

-/*

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="info"></param>

-    /// <param name="context"></param>

-    public ArrayList(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) :

-      this(info.GetInt32("sz"),(SCG.IEqualityComparer<T>)(info.GetValue("eq",typeof(SCG.IEqualityComparer<T>))))

-    {

-      size = info.GetInt32("sz");

-      for (int i = 0; i < size; i++)

-      {

-        array[i] = (T)(info.GetValue("elem" + i,typeof(T)));

-      }

-#if HASHINDEX

-      reindex(0);

-#endif      

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="info"></param>

-    /// <param name="context"></param>

-    public void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)

-    {

-      info.AddValue("sz", size);

-      info.AddValue("eq", EqualityComparer);

-      for (int i = 0; i < size; i++)

-			{

-        info.AddValue("elem" + i, array[i + offset]);

-      }

-    }

-*/

-#endregion

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/arrays/CircularQueue.cs b/mcs/class/Mono.C5/C5/arrays/CircularQueue.cs
deleted file mode 100644
index b33b5d7077d..00000000000
--- a/mcs/class/Mono.C5/C5/arrays/CircularQueue.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// 

-  /// </summary>

-  /// <typeparam name="T"></typeparam>

-  public class CircularQueue<T> : SequencedBase<T>, IQueue<T>, IStack<T>

-  {

-    #region Fields

-    /*

-        Invariant: the itemes in the queue ar the elements from front upwards, 

-        possibly wrapping around at the end of array, to back.

-

-        if front<=back then size = back - front + 1;

-        else size = array.Length + back - front + 1;

-

-        */

-    int front, back;

-    /// <summary>

-    /// The internal container array is doubled when necessary, but never shrinked.

-    /// </summary>

-    T[] array;

-    bool forwards = true, original = true;

-    #endregion

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return EventTypeEnum.Basic; } }

-

-    #endregion

-

-    #region Util

-    void expand()

-    {

-      int newlength = 2 * array.Length;

-      T[] newarray = new T[newlength];

-

-      if (front <= back)

-        Array.Copy(array, front, newarray, 0, size);

-      else

-      {

-        int half = array.Length - front;

-        Array.Copy(array, front, newarray, 0, half);

-        Array.Copy(array, 0, newarray, half, size - half);

-      }

-

-      front = 0;

-      back = size;

-      array = newarray;

-    }

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public CircularQueue() : this(8) { }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="capacity"></param>

-    public CircularQueue(int capacity)

-      : base(EqualityComparer<T>.Default)

-    {

-      int newlength = 8;

-      while (newlength < capacity) newlength *= 2;

-      array = new T[newlength];

-    }

-

-    #endregion

-

-    #region IQueue<T> Members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual bool AllowsDuplicates { get { return true; } }

-

-    /// <summary>

-    /// Get the i'th item in the queue. The front of the queue is at index 0.

-    /// </summary>

-    /// <param name="i"></param>

-    /// <returns></returns>

-    public virtual T this[int i]

-    {

-      get

-      {

-        if (i < 0 || i >= size)

-          throw new IndexOutOfRangeException();

-        i = i + front;

-        return array[i >= size ? i - size : i];

-      }

-    }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    [Tested]

-    public virtual void Enqueue(T item)

-    {

-      if (!original)

-        throw new ReadOnlyCollectionException();

-      stamp++;

-      if (size == array.Length - 1) expand();

-      size++;

-      int oldback = back++;

-      if (back == array.Length) back = 0;

-      array[oldback] = item;

-      if (ActiveEvents != 0)

-        raiseForAdd(item);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public virtual T Dequeue()

-    {

-      if (!original)

-        throw new ReadOnlyCollectionException("Object is a non-updatable clone");

-      stamp++;

-      if (size == 0)

-        throw new NoSuchItemException();

-      size--;

-      int oldfront = front++;

-      if (front == array.Length) front = 0;

-      T retval = array[oldfront];

-      array[oldfront] = default(T);

-      if (ActiveEvents != 0)

-        raiseForRemove(retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    public void Push(T item) //== Enqueue

-    {

-      if (!original)

-        throw new ReadOnlyCollectionException();

-      stamp++;

-      if (size == array.Length - 1) expand();

-      size++;

-      int oldback = back++;

-      if (back == array.Length) back = 0;

-      array[oldback] = item;

-      if (ActiveEvents != 0)

-        raiseForAdd(item);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public T Pop()

-    {

-      if (!original)

-        throw new ReadOnlyCollectionException("Object is a non-updatable clone");

-      stamp++;

-      if (size == 0)

-        throw new NoSuchItemException();

-      size--;

-      back--;

-      if (back == -1) back = array.Length - 1;

-      T retval = array[back];

-      array[back] = default(T);

-      if (ActiveEvents != 0)

-        raiseForRemove(retval);

-      return retval;

-    }

-    #endregion

-

-    #region ICollectionValue<T> Members

-

-    //TODO: implement these with Array.Copy instead of relying on XxxBase:

-    /*

-        public void CopyTo(T[] a, int i)

-        {

-        }

-

-        public T[] ToArray()

-        {

-        }*/

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override T Choose()

-    {

-      if (size == 0)

-        throw new NoSuchItemException();

-      return array[front];

-    }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      int stamp = this.stamp;

-      if (forwards)

-      {

-        int position = front;

-        int end = front <= back ? back : array.Length;

-        while (position < end)

-        {

-          if (stamp != this.stamp)

-            throw new CollectionModifiedException();

-          yield return array[position++];

-        }

-        if (front > back)

-        {

-          position = 0;

-          while (position < back)

-          {

-            if (stamp != this.stamp)

-              throw new CollectionModifiedException();

-            yield return array[position++];

-          }

-        }

-      }

-      else

-      {

-        int position = back - 1;

-        int end = front <= back ? front : 0;

-        while (position >= end)

-        {

-          if (stamp != this.stamp)

-            throw new CollectionModifiedException();

-          yield return array[position--];

-        }

-        if (front > back)

-        {

-          position = array.Length - 1;

-          while (position >= front)

-          {

-            if (stamp != this.stamp)

-              throw new CollectionModifiedException();

-            yield return array[position--];

-          }

-        }

-      }

-    }

-

-    #endregion

-

-    #region IDirectedCollectionValue<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override IDirectedCollectionValue<T> Backwards()

-    {

-      CircularQueue<T> retval = (CircularQueue<T>)MemberwiseClone();

-      retval.original = false;

-      retval.forwards = !forwards;

-      return retval;

-    }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    {

-      return Backwards();

-    }

-

-    #endregion

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual bool Check()

-    {

-      if (front < 0 || front >= array.Length || back < 0 || back >= array.Length ||

-          (front <= back && size != back - front) || (front > back && size != array.Length + back - front))

-      {

-        Console.WriteLine("Bad combination of (front,back,size,array.Length): ({0},{1},{2},{3})",

-            front, back, size, array.Length);

-        return false;

-      }

-      return true;

-    }

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/arrays/HashedArrayList.cs b/mcs/class/Mono.C5/C5/arrays/HashedArrayList.cs
deleted file mode 100755
index 544cf9b5789..00000000000
--- a/mcs/class/Mono.C5/C5/arrays/HashedArrayList.cs
+++ /dev/null
@@ -1,2539 +0,0 @@
-#if NET_2_0
-

-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define HASHINDEX

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A list collection based on a plain dynamic array data structure.

-  /// Expansion of the internal array is performed by doubling on demand. 

-  /// The internal array is only shrinked by the Clear method. 

-  ///

-  /// <i>When the FIFO property is set to false this class works fine as a stack of T.

-  /// When the FIFO property is set to true the class will function as a (FIFO) queue

-  /// but very inefficiently, use a LinkedList (<see cref="T:C5.LinkedList`1"/>) instead.</i>

-  /// </summary>

-  [Serializable]

-  public class HashedArrayList<T> : ArrayBase<T>, IList<T> //, System.Runtime.Serialization.ISerializable

-#if HASHINDEX

-#else

-, IStack<T>, IQueue<T>

-#endif

-  {

-    #region Fields

-

-    /// <summary>

-    /// Has this list or view not been invalidated by some operation (by someone calling Dispose())

-    /// </summary>

-    bool isValid = true;

-

-    //TODO: wonder if we should save some memory on none-view situations by 

-    //      putting these three fields into a single ref field?

-    /// <summary>

-    /// The underlying list if we are a view, null else.

-    /// </summary>

-    HashedArrayList<T> underlying;

-    WeakViewList<HashedArrayList<T>> views;

-    WeakViewList<HashedArrayList<T>>.Node myWeakReference;

-

-    /// <summary>

-    /// The size of the underlying list.

-    /// </summary>

-    int underlyingsize { get { return (underlying ?? this).size; } }

-

-    /// <summary>

-    /// The underlying field of the FIFO property

-    /// </summary>

-    bool fIFO = false;

-

-#if HASHINDEX

-    HashSet<KeyValuePair<T, int>> itemIndex;

-#endif

-    #endregion

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return underlying == null ? EventTypeEnum.All : EventTypeEnum.None; } }

-

-/*

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event CollectionChangedHandler<T> CollectionChanged

-    {

-      add

-      {

-        if (underlying == null)

-          base.CollectionChanged += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.CollectionChanged -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event CollectionClearedHandler<T> CollectionCleared

-    {

-      add

-      {

-        if (underlying == null)

-          base.CollectionCleared += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.CollectionCleared -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemsAddedHandler<T> ItemsAdded

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemsAdded += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemsAdded -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemInsertedHandler<T> ItemInserted

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemInserted += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemInserted -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemsRemovedHandler<T> ItemsRemoved

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemsRemoved += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemsRemoved -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override event ItemRemovedAtHandler<T> ItemRemovedAt

-    {

-      add

-      {

-        if (underlying == null)

-          base.ItemRemovedAt += value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-      remove

-      {

-        if (underlying == null)

-          base.ItemRemovedAt -= value;

-        else

-          throw new UnlistenableEventException("Can't listen to a view");

-      }

-    }

-

-      */

-

-    #endregion

-    #region Util

-

-    bool equals(T i1, T i2) { return itemequalityComparer.Equals(i1, i2); }

-

-    /// <summary>

-    /// Increment or decrement the private size fields

-    /// </summary>

-    /// <param name="delta">Increment (with sign)</param>

-    void addtosize(int delta)

-    {

-      size += delta;

-      if (underlying != null)

-        underlying.size += delta;

-    }

-

-    #region Array handling

-    /// <summary>

-    /// Double the size of the internal array.

-    /// </summary>

-    protected override void expand()

-    { expand(2 * array.Length, underlyingsize); }

-

-

-    /// <summary>

-    /// Expand the internal array, resetting the index of the first unused element.

-    /// </summary>

-    /// <param name="newcapacity">The new capacity (will be rouded upwards to a power of 2).</param>

-    /// <param name="newsize">The new count of </param>

-    protected override void expand(int newcapacity, int newsize)

-    {

-      base.expand(newcapacity, newsize);

-      if (underlying != null)

-        underlying.array = array;

-    }

-

-    #endregion

-

-    #region Checks

-    /// <summary>

-    /// Check if it is valid to perform updates and increment stamp if so.

-    /// </summary>

-    /// <exception cref="ViewDisposedException"> If check fails by this list being a disposed view.</exception>

-    /// <exception cref="ReadOnlyCollectionException"> If check fails by this being a read only list.</exception>

-    protected override void updatecheck()

-    {

-      validitycheck();

-      base.updatecheck();

-      if (underlying != null)

-        underlying.stamp++;

-    }

-

-

-    /// <summary>

-    /// Check if we are a view that the underlying list has only been updated through us.

-    /// <para>This method should be called from enumerators etc to guard against 

-    /// modification of the base collection.</para>

-    /// </summary>

-    /// <exception cref="ViewDisposedException"> if check fails.</exception>

-    void validitycheck()

-    {

-      if (!isValid)

-        throw new ViewDisposedException();

-    }

-

-

-    /// <summary>

-    /// Check that the list has not been updated since a particular time.

-    /// <para>To be used by enumerators and range </para>

-    /// </summary>

-    /// <exception cref="ViewDisposedException"> If check fails by this list being a disposed view.</exception>

-    /// <exception cref="CollectionModifiedException">If the list *has* beeen updated since that  time..</exception>

-    /// <param name="stamp">The stamp indicating the time.</param>

-    protected override void modifycheck(int stamp)

-    {

-      validitycheck();

-      if (this.stamp != stamp)

-        throw new CollectionModifiedException();

-    }

-

-    #endregion

-

-    #region Searching

-

-    /// <summary>

-    /// Internal version of IndexOf without modification checks.

-    /// </summary>

-    /// <param name="item">Item to look for</param>

-    /// <returns>The index of first occurrence</returns>

-    int indexOf(T item)

-    {

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item);

-      if (itemIndex.Find(ref p) && p.Value >= offset && p.Value < offset + size)

-        return p.Value - offset;

-#else

-      for (int i = 0; i < size; i++)

-        if (equals(item, array[offset + i]))

-          return i;

-#endif

-      return ~size;

-    }

-

-    /// <summary>

-    /// Internal version of LastIndexOf without modification checks.

-    /// </summary>

-    /// <param name="item">Item to look for</param>

-    /// <returns>The index of last occurrence</returns>

-    int lastIndexOf(T item)

-    {

-#if HASHINDEX

-      return indexOf(item);

-#else

-      for (int i = size - 1; i >= 0; i--)

-        if (equals(item, array[offset + i]))

-          return i;

-      return ~size;

-#endif

-    }

-    #endregion

-

-    #region Inserting

-

-#if HASHINDEX

-    /// <summary>

-    /// Internal version of Insert with no modification checks.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException"> if item already in list.</exception>

-    /// <param name="i">Index to insert at</param>

-    /// <param name="item">Item to insert</param>

-#else

-    /// <summary>

-    /// Internal version of Insert with no modification checks.

-    /// </summary>

-    /// <param name="i">Index to insert at</param>

-    /// <param name="item">Item to insert</param>

-#endif

-    protected override void insert(int i, T item)

-    {

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, offset + i);

-      if (itemIndex.FindOrAdd(ref p))

-        throw new DuplicateNotAllowedException("Item already in indexed list: " + item);

-#endif

-      baseinsert(i, item);

-#if HASHINDEX

-      reindex(i + offset + 1);

-#endif

-    }

-

-    private void baseinsert(int i, T item)

-    {

-      if (underlyingsize == array.Length)

-        expand();

-      i += offset;

-      if (i < underlyingsize)

-        Array.Copy(array, i, array, i + 1, underlyingsize - i);

-      array[i] = item;

-      addtosize(1);

-      fixViewsAfterInsert(1, i);

-    }

-    #endregion

-

-    #region Removing

-

-    /// <summary>

-    /// Internal version of RemoveAt with no modification checks.

-    /// </summary>

-    /// <param name="i">Index to remove at</param>

-    /// <returns>The removed item</returns>

-    T removeAt(int i)

-    {

-      i += offset;

-      fixViewsBeforeSingleRemove(i);

-      T retval = array[i];

-      addtosize(-1);

-      if (underlyingsize > i)

-        Array.Copy(array, i + 1, array, i, underlyingsize - i);

-      array[underlyingsize] = default(T);

-#if HASHINDEX

-      itemIndex.Remove(new KeyValuePair<T, int>(retval));

-      reindex(i);

-#endif

-      return retval;

-    }

-    #endregion

-

-    #region Indexing

-

-#if HASHINDEX

-    private void reindex(int start) { reindex(start, underlyingsize); }

-

-    private void reindex(int start, int end)

-    {

-      for (int j = start; j < end; j++)

-        itemIndex.UpdateOrAdd(new KeyValuePair<T, int>(array[j], j));

-    }

-#endif

-    #endregion

-

-    #region fixView utilities

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="added">The actual number of inserted nodes</param>

-    /// <param name="realInsertionIndex"></param>

-    void fixViewsAfterInsert(int added, int realInsertionIndex)

-    {

-      if (views != null)

-        foreach (HashedArrayList<T> view in views)

-        {

-          if (view != this)

-          {

-            if (view.offset < realInsertionIndex && view.offset + view.size > realInsertionIndex)

-              view.size += added;

-            if (view.offset > realInsertionIndex || (view.offset == realInsertionIndex && view.size > 0))

-              view.offset += added;

-          }

-        }

-    }

-

-    void fixViewsBeforeSingleRemove(int realRemovalIndex)

-    {

-      if (views != null)

-        foreach (HashedArrayList<T> view in views)

-        {

-          if (view != this)

-          {

-            if (view.offset <= realRemovalIndex && view.offset + view.size > realRemovalIndex)

-              view.size--;

-            if (view.offset > realRemovalIndex)

-              view.offset--;

-          }

-        }

-    }

-

-    /// <summary>

-    /// Fix offsets and sizes of other views before removing an interval from this 

-    /// </summary>

-    /// <param name="start">the start of the interval relative to the array/underlying</param>

-    /// <param name="count"></param>

-    void fixViewsBeforeRemove(int start, int count)

-    {

-      int clearend = start + count - 1;

-      if (views != null)

-        foreach (HashedArrayList<T> view in views)

-        {

-          if (view == this)

-            continue;

-          int viewoffset = view.offset, viewend = viewoffset + view.size - 1;

-          if (start < viewoffset)

-          {

-            if (clearend < viewoffset)

-              view.offset = viewoffset - count;

-            else

-            {

-              view.offset = start;

-              view.size = clearend < viewend ? viewend - clearend : 0;

-            }

-          }

-          else if (start <= viewend)

-            view.size = clearend <= viewend ? view.size - count : start - viewoffset;

-        }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="otherOffset"></param>

-    /// <param name="otherSize"></param>

-    /// <returns>The position of View(otherOffset, otherSize) wrt. this view</returns>

-    MutualViewPosition viewPosition(int otherOffset, int otherSize)

-    {

-      int end = offset + size, otherEnd = otherOffset + otherSize;

-      if (otherOffset >= end || otherEnd <= offset)

-        return MutualViewPosition.NonOverlapping;

-      if (size == 0 || (otherOffset <= offset && end <= otherEnd))

-        return MutualViewPosition.Contains;

-      if (otherSize == 0 || (offset <= otherOffset && otherEnd <= end))

-        return MutualViewPosition.ContainedIn;

-      return MutualViewPosition.Overlapping;

-    }

-

-    //TODO: make version that fits the new, more forgiving rules for disposing

-    void disposeOverlappingViews(bool reverse)

-    {

-      if (views != null)

-        foreach (HashedArrayList<T> view in views)

-        {

-          if (view != this)

-          {

-            switch (viewPosition(view.offset, view.size))

-            {

-              case MutualViewPosition.ContainedIn:

-                if (reverse)

-                  view.offset = 2 * offset + size - view.size - view.offset;

-                else

-                  view.Dispose();

-                break;

-              case MutualViewPosition.Overlapping:

-                view.Dispose();

-                break;

-              case MutualViewPosition.Contains:

-              case MutualViewPosition.NonOverlapping:

-                break;

-            }

-          }

-        }

-    }

-    #endregion

-

-    #endregion

-

-    #region Position, PositionComparer and ViewHandler nested types

-    class PositionComparer : SCG.IComparer<Position>

-    {

-      public int Compare(Position a, Position b)

-      {

-        return a.index.CompareTo(b.index);

-      }

-    }

-    /// <summary>

-    /// During RemoveAll, we need to cache the original endpoint indices of views (??? also for HashedArrayList?)

-    /// </summary>

-    struct Position

-    {

-      public readonly HashedArrayList<T> view;

-      public readonly int index;

-      public Position(HashedArrayList<T> view, bool left)

-      {

-        this.view = view;

-        index = left ? view.offset : view.offset + view.size - 1;

-      }

-      public Position(int index) { this.index = index; view = null; }

-    }

-

-    /// <summary>

-    /// Handle the update of (other) views during a multi-remove operation.

-    /// </summary>

-    struct ViewHandler

-    {

-      HashedArrayList<Position> leftEnds;

-      HashedArrayList<Position> rightEnds;

-      int leftEndIndex, rightEndIndex;

-      internal readonly int viewCount;

-      internal ViewHandler(HashedArrayList<T> list)

-      {

-        leftEndIndex = rightEndIndex = viewCount = 0;

-        leftEnds = rightEnds = null;

-        if (list.views != null)

-          foreach (HashedArrayList<T> v in list.views)

-            if (v != list)

-            {

-              if (leftEnds == null)

-              {

-                leftEnds = new HashedArrayList<Position>();

-                rightEnds = new HashedArrayList<Position>();

-              }

-              leftEnds.Add(new Position(v, true));

-              rightEnds.Add(new Position(v, false));

-            }

-        if (leftEnds == null)

-          return;

-        viewCount = leftEnds.Count;

-        leftEnds.Sort(new PositionComparer());

-        rightEnds.Sort(new PositionComparer());

-      }

-      /// <summary>

-      /// This is to be called with realindex pointing to the first node to be removed after a (stretch of) node that was not removed

-      /// </summary>

-      /// <param name="removed"></param>

-      /// <param name="realindex"></param>

-      internal void skipEndpoints(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).index <= realindex)

-          {

-            HashedArrayList<T> view = endpoint.view;

-            view.offset = view.offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).index < realindex)

-          {

-            endpoint.view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-      internal void updateViewSizesAndCounts(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).index <= realindex)

-          {

-            HashedArrayList<T> view = endpoint.view;

-            view.offset = view.Offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).index < realindex)

-          {

-            endpoint.view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-    }

-    #endregion

-

-    #region Constructors

-    /// <summary>

-    /// Create an array list with default item equalityComparer and initial capacity 8 items.

-    /// </summary>

-    public HashedArrayList() : this(8) { }

-

-

-    /// <summary>

-    /// Create an array list with external item equalityComparer and initial capacity 8 items.

-    /// </summary>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashedArrayList(SCG.IEqualityComparer<T> itemequalityComparer) : this(8,itemequalityComparer) { }

-

-

-    /// <summary>

-    /// Create an array list with default item equalityComparer and prescribed initial capacity.

-    /// </summary>

-    /// <param name="capacity">The prescribed capacity</param>

-    public HashedArrayList(int capacity) : this(capacity,EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create an array list with external item equalityComparer and prescribed initial capacity.

-    /// </summary>

-    /// <param name="capacity">The prescribed capacity</param>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashedArrayList(int capacity, SCG.IEqualityComparer<T> itemequalityComparer) : base(capacity,itemequalityComparer)

-    {

-#if HASHINDEX

-      itemIndex = new HashSet<KeyValuePair<T, int>>(new KeyValuePairEqualityComparer<T, int>(itemequalityComparer));

-#endif

-    }

-

-    #endregion

-

-    #region IList<T> Members

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The first item in this list.</value>

-    [Tested]

-    public virtual T First

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-

-        return array[offset];

-      }

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The last item in this list.</value>

-    [Tested]

-    public virtual T Last

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-

-        return array[offset + size - 1];

-      }

-    }

-

-

-    /// <summary>

-    /// Since <code>Add(T item)</code> always add at the end of the list,

-    /// this describes if list has FIFO or LIFO semantics.

-    /// </summary>

-    /// <value>True if the <code>Remove()</code> operation removes from the

-    /// start of the list, false if it removes from the end. The default for a new array list is false.</value>

-    [Tested]

-    public virtual bool FIFO

-    {

-      [Tested]

-      get { validitycheck(); return fIFO; }

-      [Tested]

-      set { updatecheck(); fIFO = value; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual bool IsFixedSize

-    {

-      get { validitycheck(); return false; }

-    }

-

-

-#if HASHINDEX

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <exception cref="DuplicateNotAllowedException"> By the get operation

-    /// if the item already is present somewhere else in the list.</exception>

-    /// <value>The index'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-#else

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <value>The index'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-#endif

-    [Tested]

-    public virtual T this[int index]

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (index < 0 || index >= size)

-          throw new IndexOutOfRangeException();

-

-        return array[offset + index];

-      }

-      [Tested]

-      set

-      {

-        updatecheck();

-        if (index < 0 || index >= size)

-          throw new IndexOutOfRangeException();

-        index += offset;

-        T item = array[index];

-#if HASHINDEX

-        KeyValuePair<T, int> p = new KeyValuePair<T, int>(value, index);

-        if (itemequalityComparer.Equals(value, item))

-        {

-          array[index] = value;

-          itemIndex.Update(p);

-        }

-        else if (!itemIndex.FindOrAdd(ref p))

-        {

-          itemIndex.Remove(new KeyValuePair<T, int>(item));

-          array[index] = value;

-        }

-        else

-          throw new DuplicateNotAllowedException("Item already in indexed list");

-#else

-        array[index] = value;

-#endif

-        (underlying ?? this).raiseForSetThis(index, value, item);

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Constant; } }

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    ///</summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt; the size of the collection. </exception>

-    /// <exception cref="DuplicateNotAllowedException"> 

-    /// If the item is already present in the list.</exception>

-    /// <param name="index">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-#else

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    ///</summary>

-    /// <exception cref="IndexOutOfRangeException"> if i is negative or

-    /// &gt; the size of the collection. </exception>

-    /// <param name="index">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-#endif

-    [Tested]

-    public virtual void Insert(int index, T item)

-    {

-      updatecheck();

-      if (index < 0 || index > size)

-        throw new IndexOutOfRangeException();

-

-      insert(index, item);

-      (underlying ?? this).raiseForInsert(index + offset, item);

-    }

-

-    /// <summary>

-    /// Insert an item at the end of a compatible view, used as a pointer.

-    /// <para>The <code>pointer</code> must be a view on the same list as

-    /// <code>this</code> and the endpoitn of <code>pointer</code> must be

-    /// a valid insertion point of <code>this</code></para>

-    /// </summary>

-    /// <exception cref="IncompatibleViewException">If <code>pointer</code> 

-    /// is not a view on or the same list as <code>this</code></exception>

-    /// <exception cref="IndexOutOfRangeException"><b>??????</b> if the endpoint of 

-    ///  <code>pointer</code> is not inside <code>this</code></exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.</exception>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    public void Insert(IList<T> pointer, T item)

-    {

-      if ((pointer == null) || ((pointer.Underlying ?? pointer) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-      Insert(pointer.Offset + pointer.Count - Offset, item);

-    }

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt; the size of the collection.</exception>

-    /// <exception cref="DuplicateNotAllowedException"> If <code>items</code> 

-    /// contains duplicates or some item already  present in the list.</exception>

-    /// <param name="index">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-#else

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt; the size of the collection.</exception>

-    /// <param name="index">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-    /// <typeparam name="U"></typeparam>

-#endif

-    [Tested]

-    public virtual void InsertAll<U>(int index, SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (index < 0 || index > size)

-        throw new IndexOutOfRangeException();

-      index += offset;

-      int toadd = EnumerableBase<U>.countItems(items);

-      if (toadd == 0)

-        return;

-      if (toadd + underlyingsize > array.Length)

-        expand(toadd + underlyingsize, underlyingsize);

-      if (underlyingsize > index)

-        Array.Copy(array, index, array, index + toadd, underlyingsize - index);

-      int i = index;

-      try

-      {

-

-        foreach (T item in items)

-        {

-#if HASHINDEX

-          KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, i);

-          if (itemIndex.FindOrAdd(ref p))

-            throw new DuplicateNotAllowedException("Item already in indexed list");

-#endif

-          array[i++] = item;

-        }

-      }

-      finally

-      {

-        int added = i - index;

-        if (added < toadd)

-        {

-          Array.Copy(array, index + toadd, array, i, underlyingsize - index);

-          Array.Clear(array, underlyingsize + added, toadd - added);

-        }

-        if (added > 0)

-        {

-          addtosize(added);

-#if HASHINDEX

-          reindex(i);

-#endif

-          fixViewsAfterInsert(added, index);

-          (underlying ?? this).raiseForInsertAll(index, added);

-        }

-      }

-    }

-    private void raiseForInsertAll(int index, int added)

-    {

-      if (ActiveEvents != 0)

-      {

-        if ((ActiveEvents & (EventTypeEnum.Added | EventTypeEnum.Inserted)) != 0)

-          for (int j = index; j < index + added; j++)

-          {

-            raiseItemInserted(array[j], j);

-            raiseItemsAdded(array[j], 1);

-          }

-        raiseCollectionChanged();

-      }

-    }

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert an item at the front of this list;

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If the item is already in the list</exception>

-    /// <param name="item">The item to insert.</param>

-#else

-    /// <summary>

-    /// Insert an item at the front of this list;

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-#endif

-    [Tested]

-    public virtual void InsertFirst(T item)

-    {

-      updatecheck();

-      insert(0, item);

-      (underlying ?? this).raiseForInsert(offset, item);

-    }

-

-

-#if HASHINDEX

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If the item is already in the list</exception>

-    /// <param name="item">The item to insert.</param>

-#else

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-#endif

-    [Tested]

-    public virtual void InsertLast(T item)

-    {

-      updatecheck();

-      insert(size, item);

-      (underlying ?? this).raiseForInsert(size - 1 + offset, item);

-    }

-

-

-    //NOTE: if the filter throws an exception, no result will be returned.

-    /// <summary>

-    /// Create a new list consisting of the items of this list satisfying a 

-    /// certain predicate.

-    /// <para>The new list will be of type HashedArrayList</para>

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new list.</returns>

-    [Tested]

-    public virtual IList<T> FindAll(Fun<T, bool> filter)

-    {

-      validitycheck();

-      int stamp = this.stamp;

-      HashedArrayList<T> res = new HashedArrayList<T>(itemequalityComparer);

-      int j = 0, rescap = res.array.Length;

-      for (int i = 0; i < size; i++)

-      {

-        T a = array[offset + i];

-        bool found = filter(a);

-        modifycheck(stamp);

-        if (found)

-        {

-          if (j == rescap) res.expand(rescap = 2 * rescap, j);

-          res.array[j++] = a;

-        }

-      }

-      res.size = j;

-#if HASHINDEX

-      res.reindex(0);

-#endif

-      return res;

-    }

-

-

-#if HASHINDEX

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use the default item equalityComparer for the item type V.

-    /// <para>The new list will be of type HashedArrayList</para>

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If <code>mapper</code>

-    /// creates duplicates</exception>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <returns>The new list.</returns>

-#else

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use the default item equalityComparer for the item type V.

-    /// <para>The new list will be of type HashedArrayList</para>

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <returns>The new list.</returns>

-#endif

-    [Tested]

-    public virtual IList<V> Map<V>(Fun<T, V> mapper)

-    {

-      validitycheck();

-

-      HashedArrayList<V> res = new HashedArrayList<V>(size);

-

-      return map<V>(mapper, res);

-    }

-

-#if HASHINDEX

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified item equalityComparer for the item type.

-    /// <para>The new list will be of type HashedArrayList</para>

-    /// </summary>

-    /// <exception cref="DuplicateNotAllowedException">If <code>mapper</code>

-    /// creates duplicates</exception>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-#else

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified item equalityComparer for the item type.

-    /// <para>The new list will be of type HashedArrayList</para>

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="itemequalityComparer">The item equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-#endif

-    public virtual IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> itemequalityComparer)

-    {

-      validitycheck();

-

-      HashedArrayList<V> res = new HashedArrayList<V>(size, itemequalityComparer);

-

-      return map<V>(mapper, res);

-    }

-

-    private IList<V> map<V>(Fun<T, V> mapper, HashedArrayList<V> res)

-    {

-      int stamp = this.stamp;

-      if (size > 0)

-        for (int i = 0; i < size; i++)

-        {

-          V mappeditem = mapper(array[offset + i]);

-          modifycheck(stamp);

-#if HASHINDEX

-          KeyValuePair<V, int> p = new KeyValuePair<V, int>(mappeditem, i);

-          if (res.itemIndex.FindOrAdd(ref p))

-            throw new ArgumentException("Mapped item already in indexed list");

-#endif

-          res.array[i] = mappeditem;

-        }

-      res.size = size;

-      return res;

-    }

-

-    /// <summary>

-    /// Remove one item from the list: from the front if <code>FIFO</code>

-    /// is true, else from the back.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T Remove()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = removeAt(fIFO ? 0 : size - 1);

-      (underlying ?? this).raiseForRemove(item);

-      return item;

-    }

-

-    /// <summary>

-    /// Remove one item from the fromnt of the list.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveFirst()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = removeAt(0);

-      (underlying ?? this).raiseForRemoveAt(offset, item);

-      return item;

-    }

-

-

-    /// <summary>

-    /// Remove one item from the back of the list.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveLast()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = removeAt(size - 1);

-      (underlying ?? this).raiseForRemoveAt(size + offset, item);

-      return item;

-    }

-

-    /// <summary>

-    /// Create a list view on this list. 

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if the start or count is negative

-    /// or the range does not fit within list.</exception>

-    /// <param name="start">The index in this list of the start of the view.</param>

-    /// <param name="count">The size of the view.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> View(int start, int count)

-    {

-      validitycheck();

-      checkRange(start, count);

-      if (views == null)

-        views = new WeakViewList<HashedArrayList<T>>();

-      HashedArrayList<T> retval = (HashedArrayList<T>)MemberwiseClone();

-

-

-      retval.underlying = underlying != null ? underlying : this;

-      retval.offset = start + offset;

-      retval.size = count;

-      retval.myWeakReference = views.Add(retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// Create a list view on this list containing the (first) occurrence of a particular item.

-    /// <para>Returns <code>null</code> if the item is not in this list.</para>

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> ViewOf(T item)

-    {

-      int index = indexOf(item);

-      if (index < 0)

-        return null;

-      return View(index, 1);

-    }

-

-

-    /// <summary>

-    /// Create a list view on this list containing the last occurrence of a particular item. 

-    /// <para>Returns <code>null</code> if the item is not in this list.</para>

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> LastViewOf(T item)

-    {

-      int index = lastIndexOf(item);

-      if (index < 0)

-        return null;

-      return View(index, 1);

-    }

-

-    /// <summary>

-    /// Null if this list is not a view.

-    /// </summary>

-    /// <value>Underlying list for view.</value>

-    [Tested]

-    public virtual IList<T> Underlying { [Tested]get { return underlying; } }

-

-

-    /// <summary>

-    /// </summary>

-    /// <value>Offset for this list view or 0 for an underlying list.</value>

-    [Tested]

-    public virtual int Offset { [Tested]get { return offset; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual bool IsValid { get { return isValid; } }

-

-    /// <summary>

-    /// Slide this list view along the underlying list.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    [Tested]

-    public virtual IList<T> Slide(int offset)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-

-    /// <summary>

-    /// Slide this list view along the underlying list, changing its size.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    /// <param name="size">The new size of the view.</param>

-    [Tested]

-    public virtual IList<T> Slide(int offset, int size)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    [Tested]

-    public virtual bool TrySlide(int offset)

-    {

-      return TrySlide(offset, size);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    [Tested]

-    public virtual bool TrySlide(int offset, int size)

-    {

-      updatecheck();

-      if (underlying == null)

-        throw new NotAViewException("Not a view");

-

-      int newoffset = this.offset + offset;

-      int newsize = size;

-

-      if (newoffset < 0 || newsize < 0 || newoffset + newsize > underlyingsize)

-        return false;

-

-      this.offset = newoffset;

-      this.size = newsize;

-      return true;

-    }

-

-    /// <summary>

-    /// 

-    /// <para>Returns null if <code>otherView</code> is strictly to the left of this view</para>

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <exception cref="IncompatibleViewException">If otherView does not have the same underlying list as this</exception>

-    /// <returns></returns>

-    public virtual IList<T> Span(IList<T> otherView)

-    {

-      if ((otherView == null) || ((otherView.Underlying ?? otherView) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-      if (otherView.Offset + otherView.Count - Offset < 0)

-        return null;

-      return (underlying ?? this).View(Offset, otherView.Offset + otherView.Count - Offset);

-    }

-

-    /// <summary>

-    /// Reverst the list so the items are in the opposite sequence order.

-    /// </summary>

-    [Tested]

-    public virtual void Reverse()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      for (int i = 0, length = size / 2, end = offset + size - 1; i < length; i++)

-      {

-        T swap = array[offset + i];

-

-        array[offset + i] = array[end - i];

-        array[end - i] = swap;

-      }

-#if HASHINDEX

-      reindex(offset, offset + size);

-#endif

-      //TODO: be more forgiving wrt. disposing

-      disposeOverlappingViews(true);

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// Check if this list is sorted according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    /// <returns>True if the list is sorted, else false.</returns>

-    [Tested]

-    public bool IsSorted() { return IsSorted(Comparer<T>.Default); }

-

-    /// <summary>

-    /// Check if this list is sorted according to a specific sorting order.

-    /// </summary>

-    /// <param name="c">The comparer defining the sorting order.</param>

-    /// <returns>True if the list is sorted, else false.</returns>

-    [Tested]

-    public virtual bool IsSorted(SCG.IComparer<T> c)

-    {

-      validitycheck();

-      for (int i = offset + 1, end = offset + size; i < end; i++)

-        if (c.Compare(array[i - 1], array[i]) > 0)

-          return false;

-

-      return true;

-    }

-

-    /// <summary>

-    /// Sort the items of the list according to the default sorting order

-    /// for the item type T, as defined by the Comparer[T] class 

-    /// (<see cref="T:C5.Comparer`1"/>).

-    /// </summary>

-    /// <exception cref="InvalidOperationException">if T is not comparable</exception>

-    public virtual void Sort()

-    {

-      Sort(Comparer<T>.Default);

-    }

-

-

-    /// <summary>

-    /// Sort the items of the list according to a specific sorting order.

-    /// </summary>

-    /// <param name="comparer">The comparer defining the sorting order.</param>

-    [Tested]

-    public virtual void Sort(SCG.IComparer<T> comparer)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      Sorting.IntroSort<T>(array, offset, size, comparer);

-      disposeOverlappingViews(false);

-#if HASHINDEX

-      reindex(offset, offset + size);

-#endif

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Randomly shuffle the items of this list. 

-    /// </summary>

-    public virtual void Shuffle() { Shuffle(new C5Random()); }

-

-

-    /// <summary>

-    /// Shuffle the items of this list according to a specific random source.

-    /// </summary>

-    /// <param name="rnd">The random source.</param>

-    public virtual void Shuffle(Random rnd)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      for (int i = offset, top = offset + size, end = top - 1; i < end; i++)

-      {

-        int j = rnd.Next(i, top);

-        if (j != i)

-        {

-          T tmp = array[i];

-          array[i] = array[j];

-          array[j] = tmp;

-        }

-      }

-      disposeOverlappingViews(false);

-#if HASHINDEX

-      reindex(offset, offset + size);

-#endif

-      (underlying ?? this).raiseCollectionChanged();

-    }

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// Search for an item in the list going forwrds from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from start.</returns>

-    [Tested]

-    public virtual int IndexOf(T item) { validitycheck(); return indexOf(item); }

-

-

-    /// <summary>

-    /// Search for an item in the list going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from the end.</returns>

-    [Tested]

-    public virtual int LastIndexOf(T item) { validitycheck(); return lastIndexOf(item); }

-

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// </summary>

-    /// <exception cref="IndexOutOfRangeException"> if index is negative or

-    /// &gt;= the size of the collection.</exception>

-    /// <param name="index">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveAt(int index)

-    {

-      updatecheck();

-      if (index < 0 || index >= size)

-        throw new IndexOutOfRangeException("Index out of range for sequenced collection");

-

-      T item = removeAt(index);

-      (underlying ?? this).raiseForRemoveAt(offset + index, item);

-      return item;

-    }

-

-

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException">If <code>start</code>

-    /// and <code>count</code> does not describe a valid interval in the list</exception> 

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public virtual void RemoveInterval(int start, int count)

-    {

-      updatecheck();

-      if (count == 0)

-        return;

-      checkRange(start, count);

-      start += offset;

-      fixViewsBeforeRemove(start, count);

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-      for (int i = start, end = start + count; i < end; i++)

-      {

-        p.Key = array[i];

-        itemIndex.Remove(p);

-      }

-#endif

-      Array.Copy(array, start + count, array, start, underlyingsize - start - count);

-      addtosize(-count);

-      Array.Clear(array, underlyingsize, count);

-#if HASHINDEX

-      reindex(start);

-#endif

-      (underlying ?? this).raiseForRemoveInterval(start, count);

-    }

-    void raiseForRemoveInterval(int start, int count)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseCollectionCleared(size == 0, count, start);

-        raiseCollectionChanged();

-      }

-    }

-#endregion

-

-    #region ICollection<T> Members

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>Speed.Linear</value>

-    [Tested]

-    public virtual Speed ContainsSpeed

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return Speed.Constant;

-#else

-        return Speed.Linear;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetUnsequencedHashCode()

-    { validitycheck(); return base.GetUnsequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool UnsequencedEquals(ICollection<T> that)

-    { validitycheck(); return base.UnsequencedEquals(that); }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Contains(T item)

-    { validitycheck(); return indexOf(item) >= 0; }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Find(ref T item)

-    {

-      validitycheck();

-

-      int i;

-

-      if ((i = indexOf(item)) >= 0)

-      {

-        item = array[offset + i];

-        return true;

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. This will only update the first 

-    /// mathching item.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public virtual bool Update(T item)

-    {

-      T olditem;

-      return Update(item, out olditem);

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item, out T olditem)

-    {

-      updatecheck();

-      int i;

-

-      if ((i = indexOf(item)) >= 0)

-      {

-        olditem = array[offset + i];

-        array[offset + i] = item;

-#if HASHINDEX

-        itemIndex.Update(new KeyValuePair<T, int>(item, offset + i));

-#endif

-        (underlying ?? this).raiseForUpdate(item, olditem);

-        return true;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found. Else, add the item to the collection.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the item was found (hence not added).</returns>

-    [Tested]

-    public virtual bool FindOrAdd(ref T item)

-    {

-      updatecheck();

-      if (Find(ref item))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. This will only update the first 

-    /// mathching item.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(T item)

-    {

-      updatecheck();

-      if (Update(item))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    {

-      updatecheck();

-      if (Update(item, out olditem))

-        return true;

-

-      Add(item);

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this list. The item will be searched 

-    /// for from the end of the list if <code>FIFO == false</code> (the default), 

-    /// else from the start.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item)

-    {

-      updatecheck();

-

-      int i = fIFO ? indexOf(item) : lastIndexOf(item);

-

-      if (i < 0)

-        return false;

-

-      T removeditem = removeAt(i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-

-    /// <summary>

-    /// Remove the first copy of a particular item from this collection if found.

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument. The item will be searched 

-    /// for from the end of the list if <code>FIFO == false</code> (the default), 

-    /// else from the start.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item, out T removeditem)

-    {

-      updatecheck();

-

-      int i = fIFO ? indexOf(item) : lastIndexOf(item);

-

-      if (i < 0)

-      {

-        removeditem = default(T);

-        return false;

-      }

-

-      removeditem = removeAt(i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-

-    //TODO: remove from end or according to FIFO?

-    /// <summary>

-    /// Remove all items in another collection from this one, taking multiplicities into account.

-    /// Matching items will be removed from the front. Current implementation is not optimal.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      //TODO: reactivate the old code for small sizes

-      HashBag<T> toremove = new HashBag<T>(itemequalityComparer);

-      toremove.AddAll(items);

-      if (toremove.Count == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && !toremove.Contains(item = array[i]))

-        {

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && toremove.Remove(item = array[i]))

-        {

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      if (mustFire)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RemoveAll(Fun<T,bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && !predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-        updatecheck();

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      if (mustFire)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items from this collection, resetting internal array size.

-    /// </summary>

-    [Tested]

-    public override void Clear()

-    {

-      if (underlying == null)

-      {

-        updatecheck();

-        if (size == 0)

-          return;

-        int oldsize = size;

-        fixViewsBeforeRemove(0, size);

-#if HASHINDEX

-        itemIndex.Clear();

-#endif

-        array = new T[8];

-        size = 0;

-        (underlying ?? this).raiseForRemoveInterval(offset, oldsize);

-      }

-      else

-        RemoveInterval(0, size);

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one, taking multiplicities into account.

-    /// Items are retained front first.  

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      HashBag<T> toretain = new HashBag<T>(itemequalityComparer);

-      toretain.AddAll(items);

-      if (toretain.Count == 0)

-      {

-        Clear();

-        return;

-      }

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && toretain.Remove(item = array[i]))

-        {

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && !toretain.Contains(item = array[i]))

-        {

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RetainAll(Fun<T, bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>();

-#endif

-      while (i < end)

-      {

-        T item;

-        //pass by a stretch of nodes

-        while (i < end && predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          if (j < i)

-          {

-            p.Key = item;

-            p.Value = j;

-            itemIndex.Update(p);

-          }

-#endif

-          //if (j<i)

-          array[j] = item;

-          i++; j++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && !predicate(item = array[i]))

-        {

-          updatecheck();

-#if HASHINDEX

-          p.Key = item;

-          itemIndex.Remove(p);

-#endif

-          if (mustFire)

-            raiseHandler.Remove(item);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-        updatecheck();

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-#if HASHINDEX

-      reindex(j);

-#endif

-      raiseHandler.Raise();

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection,

-    /// taking multiplicities into account.

-    /// Current implementation is not optimal.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      validitycheck();

-#if HASHINDEX

-      foreach (T item in items)

-        if (indexOf(item) < 0)

-          return false;

-

-      return true;

-#else

-      //TODO: use aux hash bag to obtain linear time procedure

-      HashBag<T> tomatch = new HashBag<T>(itemequalityComparer);

-      tomatch.AddAll(items);

-      if (tomatch.Count == 0)

-        return true;

-      for (int i = offset, end = offset + size; i < end; i++)

-      {

-        tomatch.Remove(array[i]);

-        if (tomatch.Count == 0)

-          return true;

-      }

-      return false;

-#endif

-    }

-

-

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    [Tested]

-    public virtual int ContainsCount(T item)

-    {

-      validitycheck();

-#if HASHINDEX

-      return indexOf(item) >= 0 ? 1 : 0;

-#else

-      int count = 0;

-      for (int i = 0; i < size; i++)

-        if (equals(item, array[offset + i]))

-          count++;

-      return count;

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems()

-    {

-#if HASHINDEX

-      return this;

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.UniqueItems();

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-#if HASHINDEX

-      return new MultiplicityOne<T>(this);

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.ItemMultiplicities();

-#endif

-    }

-

-

-

-

-

-    /// <summary>

-    /// Remove all items equal to a given one.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public virtual void RemoveAllCopies(T item)

-    {

-#if HASHINDEX

-      Remove(item);

-#else

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int j = offset;

-      int removed = 0;

-      int i = offset, end = offset + size;

-      while (i < end)

-      {

-        //pass by a stretch of nodes

-        while (i < end && !equals(item, array[i]))

-          array[j++] = array[i++];

-        viewHandler.skipEndpoints(removed, i);

-        //Remove a stretch of nodes

-        while (i < end && equals(item, array[i]))

-        {

-          if (mustFire)

-            raiseHandler.Remove(array[i]);

-          removed++;

-          i++;

-          viewHandler.updateViewSizesAndCounts(removed, i);

-        }

-      }

-      if (removed == 0)

-        return;

-      viewHandler.updateViewSizesAndCounts(removed, underlyingsize);

-      Array.Copy(array, offset + size, array, j, underlyingsize - offset - size);

-      addtosize(-removed);

-      Array.Clear(array, underlyingsize, removed);

-      raiseHandler.Raise();

-#endif

-    }

-

-

-    //TODO: check views

-    /// <summary>

-    /// Check the integrity of the internal data structures of this array list.

-    /// </summary>

-    /// <returns>True if check does not fail.</returns>

-    [Tested]

-    public override bool Check()

-    {

-      bool retval = true;

-

-      if (underlyingsize > array.Length)

-      {

-        Console.WriteLine("underlyingsize ({0}) > array.Length ({1})", size, array.Length);

-        return false;

-      }

-

-      if (offset + size > underlyingsize)

-      {

-        Console.WriteLine("offset({0})+size({1}) > underlyingsize ({2})", offset, size, underlyingsize);

-        return false;

-      }

-

-      if (offset < 0)

-      {

-        Console.WriteLine("offset({0}) < 0", offset);

-        return false;

-      }

-

-      for (int i = 0; i < underlyingsize; i++)

-      {

-        if ((object)(array[i]) == null)

-        {

-          Console.WriteLine("Bad element: null at (base)index {0}", i);

-          retval = false;

-        }

-      }

-

-      for (int i = underlyingsize, length = array.Length; i < length; i++)

-      {

-        if (!equals(array[i], default(T)))

-        {

-          Console.WriteLine("Bad element: != default(T) at (base)index {0}", i);

-          retval = false;

-        }

-      }

-

-#if HASHINDEX

-      if (underlyingsize != itemIndex.Count)

-      {

-        Console.WriteLine("size ({0})!= index.Count ({1})", size, itemIndex.Count);

-        retval = false;

-      }

-

-      for (int i = 0; i < underlyingsize; i++)

-      {

-        KeyValuePair<T, int> p = new KeyValuePair<T, int>(array[i]);

-

-        if (!itemIndex.Find(ref p))

-        {

-          Console.WriteLine("Item {1} at {0} not in hashindex", i, array[i]);

-          retval = false;

-        }

-

-        if (p.Value != i)

-        {

-          Console.WriteLine("Item {1} at {0} has hashindex {2}", i, array[i], p.Value);

-          retval = false;

-        }

-      }

-#endif

-      return retval;

-    }

-

-    #endregion

-

-    #region IExtensible<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True, indicating array list has bag semantics.</value>

-    [Tested]

-    public virtual bool AllowsDuplicates

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return false;

-#else

-        return true;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting

-    {

-      get

-      {

-#if HASHINDEX

-        return true;

-#else

-        return false;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// Add an item to end of this list.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True</returns>

-    [Tested]

-    public virtual bool Add(T item)

-    {

-      updatecheck();

-#if HASHINDEX

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, size + offset);

-      if (itemIndex.FindOrAdd(ref p))

-        return false;

-#endif

-      baseinsert(size, item);

-#if HASHINDEX

-      reindex(size + offset);

-#endif

-      (underlying ?? this).raiseForAdd(item);

-      return true;

-    }

-    

-

-    /// <summary>

-    /// Add the elements from another collection to this collection.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items"></param>

-    [Tested]

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      int toadd = EnumerableBase<U>.countItems(items);

-      if (toadd == 0)

-        return;

-

-      if (toadd + underlyingsize > array.Length)

-        expand(toadd + underlyingsize, underlyingsize);

-

-      int i = size + offset;

-      if (underlyingsize > i)

-        Array.Copy(array, i, array, i + toadd, underlyingsize - i);

-      try

-      {

-        foreach (T item in items)

-        {

-#if HASHINDEX

-          KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, i);

-          if (itemIndex.FindOrAdd(ref p))

-            continue;

-#endif

-          array[i++] = item;

-        }

-      }

-      finally

-      {

-        int added = i - size - offset;

-        if (added < toadd)

-        {

-          Array.Copy(array, size + offset + toadd, array, i, underlyingsize - size - offset);

-          Array.Clear(array, underlyingsize + added, toadd - added);

-        }

-        if (added > 0)

-        {

-          addtosize(added);

-#if HASHINDEX

-          reindex(i);

-#endif

-          fixViewsAfterInsert(added, i - added);

-          (underlying ?? this).raiseForAddAll(i - added, added);

-        }

-      }

-    }

-    private void raiseForAddAll(int start, int added)

-    {

-      if ((ActiveEvents & EventTypeEnum.Added) != 0)

-        for (int i = start, end = start + added; i < end; i++)

-          raiseItemsAdded(array[i], 1);

-      raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    #endregion

-

-    #region ICollectionValue<T> Members

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of items in this collection</value>

-    [Tested]

-    public override int Count { [Tested]get { validitycheck(); return size; } }

-    #endregion

-

-    #region IEnumerable<T> Members

-    //TODO: make tests of all calls on a disposed view throws the right exception! (Which should be C5.InvalidListViewException)

-    /// <summary>

-    /// Create an enumerator for the collection

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      validitycheck();

-      return base.GetEnumerator();

-    }

-    #endregion

-

-#if HASHINDEX

-#else

-    #region IStack<T> Members

-

-    /// <summary>

-    /// Push an item to the top of the stack.

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public virtual void Push(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Pop the item at the top of the stack from the stack.

-    /// </summary>

-    /// <returns>The popped item.</returns>

-    [Tested]

-    public virtual T Pop()

-    {

-      return RemoveLast();

-    }

-

-    #endregion

-

-    #region IQueue<T> Members

-

-    /// <summary>

-    /// Enqueue an item at the back of the queue. 

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public virtual void Enqueue(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Dequeue an item from the front of the queue.

-    /// </summary>

-    /// <returns>The item</returns>

-    [Tested]

-    public virtual T Dequeue()

-    {

-      return RemoveFirst();

-    }

-

-    #endregion

-#endif

-    #region IDisposable Members

-

-    /// <summary>

-    /// Invalidate this list. If a view, just invalidate the view. 

-    /// If not a view, invalidate the list and all views on it.

-    /// </summary>

-    public virtual void Dispose()

-    {

-      Dispose(false);

-    }

-

-    void Dispose(bool disposingUnderlying)

-    {

-      if (isValid)

-      {

-        if (underlying != null)

-        {

-          isValid = false;

-          if (!disposingUnderlying)

-            views.Remove(myWeakReference);

-          underlying = null;

-          views = null;

-          myWeakReference = null;

-        }

-        else

-        {

-          //isValid = false;

-          foreach (HashedArrayList<T> view in views)

-            view.Dispose(true);

-          Clear();

-        }

-      }

-    }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this HashedArrayList.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      HashedArrayList<T> clone = new HashedArrayList<T>(size, itemequalityComparer);

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-    #region ISerializable Members

-/*

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="info"></param>

-    /// <param name="context"></param>

-    public HashedArrayList(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) :

-      this(info.GetInt32("sz"),(SCG.IEqualityComparer<T>)(info.GetValue("eq",typeof(SCG.IEqualityComparer<T>))))

-    {

-      size = info.GetInt32("sz");

-      for (int i = 0; i < size; i++)

-      {

-        array[i] = (T)(info.GetValue("elem" + i,typeof(T)));

-      }

-#if HASHINDEX

-      reindex(0);

-#endif      

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="info"></param>

-    /// <param name="context"></param>

-    public void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)

-    {

-      info.AddValue("sz", size);

-      info.AddValue("eq", EqualityComparer);

-      for (int i = 0; i < size; i++)

-			{

-        info.AddValue("elem" + i, array[i + offset]);

-      }

-    }

-*/

-#endregion

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/arrays/SortedArray.cs b/mcs/class/Mono.C5/C5/arrays/SortedArray.cs
deleted file mode 100644
index 71df1fb67c5..00000000000
--- a/mcs/class/Mono.C5/C5/arrays/SortedArray.cs
+++ /dev/null
@@ -1,1268 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-namespace C5

-{

-  /// <summary>

-  /// A collection class implementing a sorted dynamic array data structure.

-  /// </summary>

-  [Serializable]

-  public class SortedArray<T> : ArrayBase<T>, IIndexedSorted<T>

-  {

-    #region Features

-    /// <summary>

-    /// A debugging artifact. To be removed.

-    /// </summary>

-    [Flags]

-    public enum Feature : short

-    {

-      /// <summary>

-      /// A debugging artifact. To be removed.

-      /// </summary>

-      Standard = 0

-    }

-

-

-    static Feature features = Feature.Standard;

-

-

-    /// <summary>

-    /// A debugging artifact. To be removed.

-    /// </summary>

-    /// <value></value>

-    public static Feature Features { get { return features; } }

-

-    #endregion

-

-    #region Fields

-

-    SCG.IComparer<T> comparer;

-

-    #endregion

-

-    #region Util

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item">The item to search for</param>

-    /// <param name="mid">The least index, mid, for which array[mid] >= item</param>

-    /// <returns>True if item found</returns>

-    private bool binarySearch(T item, out int mid)

-    {

-      int bot = 0, top = size;

-

-      mid = top / 2;

-      while (top > bot)

-      {

-        int c;

-

-        if ((c = comparer.Compare(array[mid], item)) == 0)

-          return true;

-

-        if (c > 0)

-        { top = mid; }

-        else

-        { bot = mid + 1; }

-

-        mid = (bot + top) / 2;

-      }

-

-      return false;

-    }

-

-    private int indexOf(T item)

-    {

-      int ind;

-

-      if (binarySearch(item, out ind))

-        return ind;

-

-      return ~ind;

-    }

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// Create a dynamic sorted array with a natural comparer

-    /// (and item equalityComparer,  assumed compatible)

-    /// </summary>

-    /// <exception cref="NotComparableException">If <code>T</code> is not comparable.

-    /// </exception>

-    public SortedArray() : this(8) { }

-

-

-    /// <summary>

-    /// Create a dynamic sorted array with a natural comparer 

-    /// (and item equalityComparer,  assumed compatible)

-    /// and prescribed initial capacity.

-    /// </summary>

-    /// <exception cref="NotComparableException">If <code>T</code> is not comparable.

-    /// </exception>

-    /// <param name="capacity">The capacity</param>

-    public SortedArray(int capacity)

-      : this(capacity, Comparer<T>.Default, EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create a dynamic sorted array with an external comparer.

-    /// <para>The itemequalityComparer will be compatible 

-    /// <see cref="T:C5.ComparerZeroHashCodeEqualityComparer`1"/> since the 

-    /// default equalityComparer for T (<see cref="P:C5.EqualityComparer`1.Default"/>)

-    /// is unlikely to be compatible with the external comparer. This makes the

-    /// array inadequate for use as item in a collection of unsequenced or sequenced sets or bags

-    /// (<see cref="T:C5.ICollection`1"/> and <see cref="T:C5.ISequenced`1"/>)

-    /// </para>

-    /// </summary>

-    /// <param name="comparer">The comparer</param>

-    public SortedArray(SCG.IComparer<T> comparer)

-      : this(8, comparer) { }

-

-    /// <summary>

-    /// Create a dynamic sorted array with an external comparer

-    /// and prescribed initial capacity.

-    /// <para>The itemequalityComparer will be a compatible 

-    /// <see cref="T:C5.ComparerZeroHashCodeEqualityComparer`1"/> since the 

-    /// default equalityComparer for T (<see cref="P:C5.EqualityComparer`1.Default"/>)

-    /// is unlikely to be compatible with the external comparer. This makes the

-    /// sorted array inadequate for use as item in a collection of unsequenced or sequenced sets or bags

-    /// (<see cref="T:C5.ICollection`1"/> and <see cref="T:C5.ISequenced`1"/>)

-    /// </para>

-    /// </summary>

-    /// <param name="capacity">The capacity</param>

-    /// <param name="comparer">The comparer</param>

-    public SortedArray(int capacity, SCG.IComparer<T> comparer)

-      : this(capacity, comparer, new ComparerZeroHashCodeEqualityComparer<T>(comparer)) { }

-

-    /// <summary>

-    /// Create a dynamic sorted array with an external comparer, an external item equalityComparer

-    /// and prescribed initial capacity. This is the constructor to use if the collection 

-    /// will be used as item in a hash table based collection.

-    /// </summary>

-    /// <param name="capacity">The capacity</param>

-    /// <param name="comparer">The item comparer</param>

-    /// <param name="equalityComparer">The item equalityComparer (assumed compatible)</param>

-    public SortedArray(int capacity, SCG.IComparer<T> comparer, SCG.IEqualityComparer<T> equalityComparer)

-      : base(capacity, equalityComparer)

-    {

-      if (comparer == null)

-        throw new NullReferenceException("Comparer cannot be null");

-      this.comparer = comparer;

-    }

-

-    #endregion

-

-    #region IIndexedSorted<T> Members

-

-    /// <summary>

-    /// Determine the number of items at or above a supplied threshold.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountFrom(T bot)

-    {

-      int lo;

-

-      binarySearch(bot, out lo);

-      return size - lo;

-    }

-

-

-    /// <summary>

-    /// Determine the number of items between two supplied thresholds.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountFromTo(T bot, T top)

-    {

-      int lo, hi;

-

-      binarySearch(bot, out lo);

-      binarySearch(top, out hi);

-      return hi > lo ? hi - lo : 0;

-    }

-

-

-    /// <summary>

-    /// Determine the number of items below a supplied threshold.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountTo(T top)

-    {

-      int hi;

-

-      binarySearch(top, out hi);

-      return hi;

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items greater than or equal to a supplied value.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeFrom(T bot)

-    {

-      int lo;

-

-      binarySearch(bot, out lo);

-      return new Range(this, lo, size - lo, true);

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items between two supplied values.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeFromTo(T bot, T top)

-    {

-      int lo, hi;

-

-      binarySearch(bot, out lo);

-      binarySearch(top, out hi);

-

-      int sz = hi - lo;

-

-      return new Range(this, lo, sz, true);

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items less than a supplied value.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeTo(T top)

-    {

-      int hi;

-

-      binarySearch(top, out hi);

-      return new Range(this, 0, hi, true);

-    }

-

-

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the items of this

-    /// indexed sorted collection satisfying a certain predicate.

-    /// </summary>

-    /// <param name="f">The filter delegate defining the predicate.</param>

-    /// <returns>The new indexed sorted collection.</returns>

-    [Tested]

-    public IIndexedSorted<T> FindAll(Fun<T, bool> f)

-    {

-      SortedArray<T> res = new SortedArray<T>(comparer);

-      int j = 0, rescap = res.array.Length;

-

-      for (int i = 0; i < size; i++)

-      {

-        T a = array[i];

-

-        if (f(a))

-        {

-          if (j == rescap) res.expand(rescap = 2 * rescap, j);

-

-          res.array[j++] = a;

-        }

-      }

-

-      res.size = j;

-      return res;

-    }

-

-

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the results of

-    /// mapping all items of this list.

-    /// <exception cref="ArgumentException"/> if the map is not increasing over 

-    /// the items of this collection (with respect to the two given comparison 

-    /// relations).

-    /// </summary>

-    /// <param name="m">The delegate definging the map.</param>

-    /// <param name="c">The comparion relation to use for the result.</param>

-    /// <returns>The new sorted collection.</returns>

-    [Tested]

-    public IIndexedSorted<V> Map<V>(Fun<T, V> m, SCG.IComparer<V> c)

-    {

-      SortedArray<V> res = new SortedArray<V>(size, c);

-

-      if (size > 0)

-      {

-        V oldv = res.array[0] = m(array[0]), newv;

-

-        for (int i = 1; i < size; i++)

-        {

-          if (c.Compare(oldv, newv = res.array[i] = m(array[i])) >= 0)

-            throw new ArgumentException("mapper not monotonic");

-

-          oldv = newv;

-        }

-      }

-

-      res.size = size;

-      return res;

-    }

-

-    #endregion

-

-    #region ISorted<T> Members

-

-    /// <summary>

-    /// Find the strict predecessor in the sorted collection of a particular value,

-    /// i.e. the largest item in the collection less than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than or equal to the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the predecessor for.</param>

-    /// <returns>The predecessor.</returns>

-    [Tested]

-    public T Predecessor(T item)

-    {

-      int lo;

-

-      binarySearch(item, out lo);

-      if (lo == 0)

-        throw new NoSuchItemException();

-

-      return array[lo - 1];

-    }

-

-

-    /// <summary>

-    /// Find the strict successor in the sorted collection of a particular value,

-    /// i.e. the least item in the collection greater than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than or equal to the maximum of this collection.)</exception>

-    /// <param name="item">The item to find the successor for.</param>

-    /// <returns>The successor.</returns>

-    [Tested]

-    public T Successor(T item)

-    {

-      int hi;

-

-      if (binarySearch(item, out hi)) hi++;

-

-      if (hi >= size)

-        throw new NoSuchItemException();

-

-      return array[hi];

-    }

-

-

-    /// <summary>

-    /// Find the weak predecessor in the sorted collection of a particular value,

-    /// i.e. the largest item in the collection less than or equal to the supplied value.

-    /// <exception cref="NoSuchItemException"/> if no such element exists (the

-    /// supplied  value is less than the minimum of this collection.)

-    /// </summary>

-    /// <param name="item">The item to find the weak predecessor for.</param>

-    /// <returns>The weak predecessor.</returns>

-    [Tested]

-    public T WeakPredecessor(T item)

-    {

-      int lo;

-

-      if (!binarySearch(item, out lo)) lo--;

-

-      if (lo < 0)

-        throw new NoSuchItemException();

-

-      return array[lo];

-    }

-

-

-    /// <summary>

-    /// Find the weak successor in the sorted collection of a particular value,

-    /// i.e. the least item in the collection greater than or equal to the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than the maximum of this collection.)</exception>

-    /// <param name="item">The item to find the weak successor for.</param>

-    /// <returns>The weak successor.</returns>

-    [Tested]

-    public T WeakSuccessor(T item)

-    {

-      int hi;

-

-      binarySearch(item, out hi);

-      if (hi >= size)

-        throw new NoSuchItemException();

-

-      return array[hi];

-    }

-

-

-    /// <summary>

-    /// Perform a search in the sorted collection for the ranges in which a

-    /// non-increasing (i.e. weakly decrerasing) function from the item type to 

-    /// <code>int</code> is

-    /// negative, zero respectively positive. If the supplied cut function is

-    /// not non-increasing, the result of this call is undefined.

-    /// </summary>

-    /// <param name="c">The cut function <code>T</code> to <code>int</code>, given

-    /// as an <code>IComparable&lt;T&gt;</code> object, where the cut function is

-    /// the <code>c.CompareTo(T that)</code> method.</param>

-    /// <param name="low">Returns the largest item in the collection, where the

-    /// cut function is positive (if any).</param>

-    /// <param name="lowIsValid">True if the cut function is positive somewhere

-    /// on this collection.</param>

-    /// <param name="high">Returns the least item in the collection, where the

-    /// cut function is negative (if any).</param>

-    /// <param name="highIsValid">True if the cut function is negative somewhere

-    /// on this collection.</param>

-    /// <returns></returns>

-    [Tested]

-    public bool Cut(IComparable<T> c, out T low, out bool lowIsValid, out T high, out bool highIsValid)

-    {

-      int lbest = -1, rbest = size;

-

-      low = default(T);

-      lowIsValid = false;

-      high = default(T);

-      highIsValid = false;

-

-      int bot = 0, top = size, mid, comp = -1, sol;

-

-      mid = top / 2;

-      while (top > bot)

-      {

-        if ((comp = c.CompareTo(array[mid])) == 0)

-          break;

-

-        if (comp < 0)

-        { rbest = top = mid; }

-        else

-        { lbest = mid; bot = mid + 1; }

-

-        mid = (bot + top) / 2;

-      }

-

-      if (comp != 0)

-      {

-        if (lbest >= 0) { lowIsValid = true; low = array[lbest]; }

-

-        if (rbest < size) { highIsValid = true; high = array[rbest]; }

-

-        return false;

-      }

-

-      sol = mid;

-      bot = sol - 1;

-

-      //Invariant: c.Compare(array[x]) < 0  when rbest <= x < size 

-      //           c.Compare(array[x]) >= 0 when x < bot)

-      //(Assuming c.Compare monotonic)

-      while (rbest > bot)

-      {

-        mid = (bot + rbest) / 2;

-        if (c.CompareTo(array[mid]) < 0)

-        { rbest = mid; }

-        else

-        { bot = mid + 1; }

-      }

-

-      if (rbest < size) { highIsValid = true; high = array[rbest]; }

-

-      top = sol + 1;

-

-      //Invariant: c.Compare(array[x]) > 0  when 0 <= x <= lbest

-      //           c.Compare(array[x]) <= 0 when x>top)

-      //(Assuming c.Compare monotonic)

-      while (top > lbest)

-      {

-        mid = (lbest + top + 1) / 2;

-        if (c.CompareTo(array[mid]) > 0)

-        { lbest = mid; }

-        else

-        { top = mid - 1; }

-      }

-

-      if (lbest >= 0) { lowIsValid = true; low = array[lbest]; }

-

-      return true;

-    }

-

-

-    IDirectedEnumerable<T> ISorted<T>.RangeFrom(T bot)

-    { return RangeFrom(bot); }

-

-

-    IDirectedEnumerable<T> ISorted<T>.RangeFromTo(T bot, T top)

-    { return RangeFromTo(bot, top); }

-

-

-    IDirectedEnumerable<T> ISorted<T>.RangeTo(T top)

-    { return RangeTo(top); }

-

-

-    /// <summary>

-    /// Create a directed collection with the same items as this collection.

-    /// </summary>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeAll()

-    { return new Range(this, 0, size, true); }

-

-

-    /// <summary>

-    /// Add all the items from another collection with an enumeration order that 

-    /// is increasing in the items.

-    /// <exception cref="ArgumentException"/> if the enumerated items turns out

-    /// not to be in increasing order.

-    /// </summary>

-    /// <param name="items">The collection to add.</param>

-    /// <typeparam name="U"></typeparam>

-    [Tested]

-    public void AddSorted<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      //Unless items have <=1 elements we would expect it to be

-      //too expensive to do repeated inserts, thus:

-      updatecheck();

-

-      int j = 0, i = 0, c = -1, itemcount = EnumerableBase<U>.countItems(items);

-      SortedArray<T> res = new SortedArray<T>(size + itemcount, comparer);

-      T lastitem = default(T);

-

-      foreach (T item in items)

-      {

-        while (i < size && (c = comparer.Compare(array[i], item)) <= 0)

-        {

-          lastitem = res.array[j++] = array[i++];

-          if (c == 0)

-            goto next;

-        }

-

-        if (j > 0 && comparer.Compare(lastitem, item) >= 0)

-          throw new ArgumentException("Argument not sorted");

-

-        lastitem = res.array[j++] = item;

-      next:

-        c = -1;

-      }

-

-      while (i < size) res.array[j++] = array[i++];

-

-      size = j;

-      array = res.array;

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection above or at a supplied threshold.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    [Tested]

-    public void RemoveRangeFrom(T low)

-    {

-      int lowind;

-

-      binarySearch(low, out lowind);

-      if (lowind == size)

-        return;

-

-      Array.Clear(array, lowind, size - lowind);

-      size = lowind;

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection between two supplied thresholds.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    [Tested]

-    public void RemoveRangeFromTo(T low, T hi)

-    {

-      int lowind, highind;

-

-      binarySearch(low, out lowind);

-      binarySearch(hi, out highind);

-      if (highind <= lowind)

-        return;

-

-      Array.Copy(array, highind, array, lowind, size - highind);

-      Array.Clear(array, size - highind + lowind, highind - lowind);

-      size -= highind - lowind;

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection below a supplied threshold.

-    /// </summary>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    [Tested]

-    public void RemoveRangeTo(T hi)

-    {

-      int highind;

-

-      binarySearch(hi, out highind);

-      if (highind == 0)

-        return;

-

-      Array.Copy(array, highind, array, 0, size - highind);

-      Array.Clear(array, size - highind, highind);

-      size = size - highind;

-    }

-

-    #endregion

-

-    #region ICollection<T> Members

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case).

-    /// </summary>

-    /// <value>Speed.Log</value>

-    [Tested]

-    public Speed ContainsSpeed { [Tested]get { return Speed.Log; } }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public bool Contains(T item)

-    {

-      int ind;

-

-      return binarySearch(item, out ind);

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public bool Find(ref T item)

-    {

-      int ind;

-

-      if (binarySearch(item, out ind))

-      {

-        item = array[ind];

-        return true;

-      }

-

-      return false;

-    }

-

-

-    //This should probably just be bool Add(ref T item); !!!

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found. Else, add the item to the collection.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the item was added (hence not found).</returns>

-    [Tested]

-    public bool FindOrAdd(ref T item)

-    {

-      updatecheck();

-

-      int ind;

-

-      if (binarySearch(item, out ind))

-      {

-        item = array[ind];

-        return true;

-      }

-

-      if (size == array.Length - 1) expand();

-

-      Array.Copy(array, ind, array, ind + 1, size - ind);

-      array[ind] = item;

-      size++;

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. If the collection has bag semantics,

-    /// it is implementation dependent if this updates all equivalent copies in

-    /// the collection or just one.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public bool Update(T item)

-    { T olditem; return Update(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool Update(T item, out T olditem)

-    {

-      updatecheck();

-

-      int ind;

-

-      if (binarySearch(item, out ind))

-      {

-        olditem = array[ind];

-        array[ind] = item;

-        return true;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value; else add the value to the collection. 

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    [Tested]

-    public bool UpdateOrAdd(T item)

-    { T olditem; return UpdateOrAdd(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(T item, out T olditem)

-    {

-      updatecheck();

-

-      int ind;

-

-      if (binarySearch(item, out ind))

-      {

-        olditem = array[ind];

-        array[ind] = item;

-        return true;

-      }

-

-      if (size == array.Length - 1) expand();

-

-      Array.Copy(array, ind, array, ind + 1, size - ind);

-      array[ind] = item;

-      size++;

-      olditem = default(T);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Remove a particular item from this collection. If the collection has bag

-    /// semantics only one copy equivalent to the supplied item is removed. 

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public bool Remove(T item)

-    {

-      int ind;

-

-      updatecheck();

-      if (binarySearch(item, out ind))

-      {

-        Array.Copy(array, ind + 1, array, ind, size - ind - 1);

-        array[--size] = default(T);

-        return true;

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Remove a particular item from this collection if found. If the collection

-    /// has bag semantics only one copy equivalent to the supplied item is removed,

-    /// which one is implementation dependent. 

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public bool Remove(T item, out T removeditem)

-    {

-      int ind;

-

-      updatecheck();

-      if (binarySearch(item, out ind))

-      {

-        removeditem = array[ind];

-        Array.Copy(array, ind + 1, array, ind, size - ind - 1);

-        array[--size] = default(T);

-        return true;

-      }

-

-      removeditem = default(T);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Remove all items in another collection from this one. 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      //This is O(m*logn) with n bits extra storage

-      //(Not better to collect the m items and sort them)

-      updatecheck();

-

-      int[] toremove = new int[(size >> 5) + 1];

-      int ind, j = 0;

-

-      foreach (T item in items)

-        if (binarySearch(item, out ind))

-          toremove[ind >> 5] |= 1 << (ind & 31);

-

-      for (int i = 0; i < size; i++)

-        if ((toremove[i >> 5] & (1 << (i & 31))) == 0)

-          array[j++] = array[i];

-

-      Array.Clear(array, j, size - j);

-      size = j;

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one. 

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      //This is O(m*logn) with n bits extra storage

-      //(Not better to collect the m items and sort them)

-      updatecheck();

-

-      int[] toretain = new int[(size >> 5) + 1];

-      int ind, j = 0;

-

-      foreach (T item in items)

-        if (binarySearch(item, out ind))

-          toretain[ind >> 5] |= 1 << (ind & 31);

-

-      for (int i = 0; i < size; i++)

-        if ((toretain[i >> 5] & (1 << (i & 31))) != 0)

-          array[j++] = array[i];

-

-      Array.Clear(array, j, size - j);

-      size = j;

-    }

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection.

-    /// Multiplicities are not taken into account.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      int tmp;

-

-      foreach (T item in items)

-        if (!binarySearch(item, out tmp))

-          return false;

-

-      return true;

-    }

-

-

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found (0 or 1).</returns>

-    [Tested]

-    public int ContainsCount(T item)

-    {

-      int tmp;

-

-      return binarySearch(item, out tmp) ? 1 : 0;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems() { return this; }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-      return new MultiplicityOne<T>(this);

-    }

-

-    /// <summary>

-    /// Remove all (0 or 1) items equivalent to a given value.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public void RemoveAllCopies(T item) { Remove(item); }

-

-

-    /// <summary>

-    /// Check the integrity of the internal data structures of this collection.

-    /// Only avaliable in DEBUG builds???

-    /// </summary>

-    /// <returns>True if check does not fail.</returns>

-    [Tested]

-    public override bool Check()

-    {

-      bool retval = true;

-

-      if (size > array.Length)

-      {

-        Console.WriteLine("Bad size ({0}) > array.Length ({1})", size, array.Length);

-        return false;

-      }

-

-      for (int i = 0; i < size; i++)

-      {

-        if ((object)(array[i]) == null)

-        {

-          Console.WriteLine("Bad element: null at index {0}", i);

-          return false;

-        }

-

-        if (i > 0 && comparer.Compare(array[i], array[i - 1]) <= 0)

-        {

-          Console.WriteLine("Inversion at index {0}", i);

-          retval = false;

-        }

-      }

-

-      return retval;

-    }

-

-    #endregion

-

-    #region IExtensible<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>False since this collection has set semantics</value>

-    [Tested]

-    public bool AllowsDuplicates { [Tested]get { return false; } }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return true; } }

-

-    /// <summary>

-    /// Add an item to this collection if possible. If this collection has set

-    /// semantics, the item will be added if not already in the collection. If

-    /// bag semantics, the item will always be added.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True if item was added.</returns>

-    [Tested]

-    public bool Add(T item)

-    {

-      updatecheck();

-

-      int ind;

-

-      if (binarySearch(item, out ind)) return false;

-

-      insert(ind, item);

-      return true;

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. Since this

-    /// collection has set semantics, only items not already in the collection

-    /// will be added.

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      int toadd = EnumerableBase<U>.countItems(items), newsize = array.Length;

-

-      while (newsize < size + toadd) { newsize *= 2; }

-

-      T[] newarr = new T[newsize];

-

-      toadd = 0;

-      foreach (T item in items) newarr[size + toadd++] = item;

-

-      Sorting.IntroSort<T>(newarr, size, toadd, comparer);

-

-      int j = 0, i = 0;

-      T lastitem = default(T);

-

-      //The following eliminates duplicates (including duplicates in input)

-      //while merging the old and new collection

-      for (int k = size, klimit = size + toadd; k < klimit; k++)

-      {

-        while (i < size && comparer.Compare(array[i], newarr[k]) <= 0)

-          lastitem = newarr[j++] = array[i++];

-

-        if (j == 0 || comparer.Compare(lastitem, newarr[k]) < 0)

-          lastitem = newarr[j++] = newarr[k];

-      }

-

-      while (i < size) newarr[j++] = array[i++];

-

-      Array.Clear(newarr, j, size + toadd - j);

-      size = j;

-      array = newarr;

-    }

-

-    #endregion

-

-    #region IPriorityQueue<T> Members

-

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// </summary>

-    /// <returns>The least item.</returns>

-    [Tested]

-    public T FindMin()

-    {

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      return array[0];

-    }

-

-    /// <summary>

-    /// Remove the least item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMin()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      T retval = array[0];

-

-      size--;

-      Array.Copy(array, 1, array, 0, size);

-      array[size] = default(T);

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// </summary>

-    /// <returns>The largest item.</returns>

-    [Tested]

-    public T FindMax()

-    {

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      return array[size - 1];

-    }

-

-

-    /// <summary>

-    /// Remove the largest item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMax()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      T retval = array[size - 1];

-

-      size--;

-      array[size] = default(T);

-      return retval;

-    }

-

-    /// <summary>

-    /// The comparer object supplied at creation time for this collection

-    /// </summary>

-    /// <value>The comparer</value>

-    public SCG.IComparer<T> Comparer { get { return comparer; } }

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <value>The i'th item of this list.</value>

-    /// <param name="i">the index to lookup</param>

-    [Tested]

-    public T this[int i]

-    {

-      [Tested]

-      get

-      {

-        if (i < 0 || i >= size)

-          throw new IndexOutOfRangeException();

-

-        return array[i];

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Constant; } }

-

-    /// <summary>

-    /// Searches for an item in the list going forwrds from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from start.</returns>

-    [Tested]

-    public int IndexOf(T item) { return indexOf(item); }

-

-

-    /// <summary>

-    /// Searches for an item in the list going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of of item from the end.</returns>

-    [Tested]

-    public int LastIndexOf(T item) { return indexOf(item); }

-

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <param name="i">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T RemoveAt(int i)

-    {

-      if (i < 0 || i >= size)

-        throw new IndexOutOfRangeException("Index out of range for sequenced collectionvalue");

-

-      updatecheck();

-

-      T retval = array[i];

-

-      size--;

-      Array.Copy(array, i + 1, array, i, size - i);

-      array[size] = default(T);

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// <exception cref="IndexOutOfRangeException"/>???. 

-    /// </summary>

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public void RemoveInterval(int start, int count)

-    {

-      updatecheck();

-      checkRange(start, count);

-      Array.Copy(array, start + count, array, start, size - start - count);

-      size -= count;

-      Array.Clear(array, size, count);

-    }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards()

-    { return Backwards(); }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this SortedArray.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      SortedArray<T> clone = new SortedArray<T>(size, comparer, itemequalityComparer);

-      clone.AddSorted(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/hashing/HashBag.cs b/mcs/class/Mono.C5/C5/hashing/HashBag.cs
deleted file mode 100644
index 5517b4b63b6..00000000000
--- a/mcs/class/Mono.C5/C5/hashing/HashBag.cs
+++ /dev/null
@@ -1,681 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A bag collection based on a hash table of (item,count) pairs. 

-  /// </summary>

-  [Serializable]

-  public class HashBag<T> : CollectionBase<T>, ICollection<T>

-  {

-    #region Fields

-    HashSet<KeyValuePair<T, int>> dict;

-    #endregion

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return EventTypeEnum.Basic; } }

-

-    #endregion

-

-    #region Constructors

-    /// <summary>

-    /// Create a hash bag with the deafult item equalityComparer.

-    /// </summary>

-    public HashBag() : this(EqualityComparer<T>.Default) { }

-

-    /// <summary>

-    /// Create a hash bag with an external item equalityComparer.

-    /// </summary>

-    /// <param name="itemequalityComparer">The external item equalityComparer.</param>

-    public HashBag(SCG.IEqualityComparer<T> itemequalityComparer)

-      : base(itemequalityComparer)

-    {

-      dict = new HashSet<KeyValuePair<T, int>>(new KeyValuePairEqualityComparer<T, int>(itemequalityComparer));

-    }

-

-    /// <summary>

-    /// Create a hash bag with external item equalityComparer, prescribed initial table size and default fill threshold (66%)

-    /// </summary>

-    /// <param name="capacity">Initial table size (rounded to power of 2, at least 16)</param>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashBag(int capacity, SCG.IEqualityComparer<T> itemequalityComparer)

-      : base(itemequalityComparer)

-    {

-      dict = new HashSet<KeyValuePair<T, int>>(capacity, new KeyValuePairEqualityComparer<T, int>(itemequalityComparer));

-    }

-

-

-    /// <summary>

-    /// Create a hash bag with external item equalityComparer, prescribed initial table size and fill threshold.

-    /// </summary>

-    /// <param name="capacity">Initial table size (rounded to power of 2, at least 16)</param>

-    /// <param name="fill">Fill threshold (valid range 10% to 90%)</param>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashBag(int capacity, double fill, SCG.IEqualityComparer<T> itemequalityComparer)

-      : base(itemequalityComparer)

-    {

-      dict = new HashSet<KeyValuePair<T, int>>(capacity, fill, new KeyValuePairEqualityComparer<T, int>(itemequalityComparer));

-    }

-

-    #endregion

-

-    #region IEditableCollection<T> Members

-

-    /// <summary>

-    /// The complexity of the Contains operation

-    /// </summary>

-    /// <value>Always returns Speed.Constant</value>

-    [Tested]

-    public virtual Speed ContainsSpeed { [Tested]get { return Speed.Constant; } }

-

-    /// <summary>

-    /// Check if an item is in the bag 

-    /// </summary>

-    /// <param name="item">The item to look for</param>

-    /// <returns>True if bag contains item</returns>

-    [Tested]

-    public virtual bool Contains(T item)

-    { return dict.Contains(new KeyValuePair<T, int>(item, 0)); }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the bag and

-    /// if so report the actual item object found.

-    /// </summary>

-    /// <param name="item">On entry, the item to look for.

-    /// On exit the item found, if any</param>

-    /// <returns>True if bag contains item</returns>

-    [Tested]

-    public virtual bool Find(ref T item)

-    {

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-

-      if (dict.Find(ref p))

-      {

-        item = p.Key;

-        return true;

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the bag and

-    /// if so replace the item object in the bag with the supplied one.

-    /// </summary>

-    /// <param name="item">The item object to update with</param>

-    /// <returns>True if item was found (and updated)</returns>

-    [Tested]

-    public virtual bool Update(T item)

-    { T olditem = default(T); return Update(item, out olditem); }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item, out T olditem)

-    {

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-

-      updatecheck();

-

-      //Note: we cannot just do dict.Update: we have to lookup the count before we 

-      //know what to update with. There is of course a way around if we use the 

-      //implementation of hashset -which we do not want to do.

-      //The hashbag is moreover mainly a proof of concept

-      if (dict.Find(ref p))

-      {

-        olditem = p.Key;

-        p.Key = item;

-        dict.Update(p);

-        if (ActiveEvents != 0)

-          raiseForUpdate(item, olditem, p.Value);

-        return true;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the bag.

-    /// If found, report the actual item object in the bag,

-    /// else add the supplied one.

-    /// </summary>

-    /// <param name="item">On entry, the item to look for or add.

-    /// On exit the actual object found, if any.</param>

-    /// <returns>True if item was found</returns>

-    [Tested]

-    public virtual bool FindOrAdd(ref T item)

-    {

-      updatecheck();

-      if (Find(ref item))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a supplied one) is in the bag and

-    /// if so replace the item object in the set with the supplied one; else

-    /// add the supplied one.

-    /// </summary>

-    /// <param name="item">The item to look for and update or add</param>

-    /// <returns>True if item was updated</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(T item)

-    {

-      updatecheck();

-      if (Update(item))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    {

-      updatecheck();

-      if (Update(item, out olditem))

-        return true;

-

-      Add(item);

-      return false;

-    }

-

-    /// <summary>

-    /// Remove one copy af an item from the bag

-    /// </summary>

-    /// <param name="item">The item to remove</param>

-    /// <returns>True if item was (found and) removed </returns>

-    [Tested]

-    public virtual bool Remove(T item)

-    {

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-

-      updatecheck();

-      if (dict.Find(ref p))

-      {

-        size--;

-        if (p.Value == 1)

-          dict.Remove(p);

-        else

-        {

-          p.Value--;

-          dict.Update(p);

-        }

-        if (ActiveEvents != 0)

-          raiseForRemove(p.Key);

-        return true;

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Remove one copy of an item from the bag, reporting the actual matching item object.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if item was found.</returns>

-    [Tested]

-    public virtual bool Remove(T item, out T removeditem)

-    {

-      updatecheck();

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-      if (dict.Find(ref p))

-      {

-        removeditem = p.Key;

-        size--;

-        if (p.Value == 1)

-          dict.Remove(p);

-        else

-        {

-          p.Value--;

-          dict.Update(p);

-        }

-        if (ActiveEvents != 0)

-          raiseForRemove(removeditem);

-

-        return true;

-      }

-

-      removeditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Remove all items in a supplied collection from this bag, counting multiplicities.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-#warning Improve if items is a counting bag

-      updatecheck();

-      bool mustRaise = (ActiveEvents & (EventTypeEnum.Changed | EventTypeEnum.Removed)) != 0;

-      RaiseForRemoveAllHandler raiseHandler = mustRaise ? new RaiseForRemoveAllHandler(this) : null;

-      foreach (U item in items)

-      {

-        KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-        if (dict.Find(ref p))

-        {

-          size--;

-          if (p.Value == 1)

-            dict.Remove(p);

-          else

-          {

-            p.Value--;

-            dict.Update(p);

-          }

-          if (mustRaise)

-            raiseHandler.Remove(p.Key);

-        }

-      }

-      if (mustRaise)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items from the bag, resetting internal table to initial size.

-    /// </summary>

-    [Tested]

-    public virtual void Clear()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      dict.Clear();

-      int oldsize = size;

-      size = 0;

-      if ((ActiveEvents & EventTypeEnum.Cleared) != 0)

-        raiseCollectionCleared(true, oldsize);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Remove all items *not* in a supplied collection from this bag,

-    /// counting multiplicities.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain</param>

-    [Tested]

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-

-      HashBag<T> res = new HashBag<T>(itemequalityComparer);

-

-      foreach (U item in items)

-      {

-        KeyValuePair<T, int> p = new KeyValuePair<T, int>(item);

-        if (dict.Find(ref p))

-        {

-          KeyValuePair<T, int> q = p;

-          if (res.dict.Find(ref q))

-          {

-            if (q.Value < p.Value)

-            {

-              q.Value++;

-              res.dict.Update(q);

-              res.size++;

-            }

-          }

-          else

-          {

-            q.Value = 1;

-            res.dict.Add(q);

-            res.size++;

-          }

-        }

-      }

-

-      if (size == res.size)

-        return;

-

-      CircularQueue<T> wasRemoved = null;

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-      {

-        wasRemoved = new CircularQueue<T>();

-        foreach (KeyValuePair<T, int> p in dict)

-        {

-          int removed = p.Value - res.ContainsCount(p.Key);

-          if (removed > 0)

-#warning We could send bag events here easily using a CircularQueue of (should?)

-            for (int i = 0; i < removed; i++)

-              wasRemoved.Enqueue(p.Key);

-        }

-      }

-      dict = res.dict;

-      size = res.size;

-

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// Check if all items in a supplied collection is in this bag

-    /// (counting multiplicities). 

-    /// </summary>

-    /// <param name="items">The items to look for.</param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all items are found.</returns>

-    [Tested]

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      HashBag<T> res = new HashBag<T>(itemequalityComparer);

-

-      foreach (T item in items)

-        if (res.ContainsCount(item) < ContainsCount(item))

-          res.Add(item);

-        else

-          return false;

-

-      return true;

-    }

-

-

-    /// <summary>

-    /// Create an array containing all items in this bag (in enumeration order).

-    /// </summary>

-    /// <returns>The array</returns>

-    [Tested]

-    public override T[] ToArray()

-    {

-      T[] res = new T[size];

-      int ind = 0;

-

-      foreach (KeyValuePair<T, int> p in dict)

-        for (int i = 0; i < p.Value; i++)

-          res[ind++] = p.Key;

-

-      return res;

-    }

-

-

-    /// <summary>

-    /// Count the number of times an item is in this set.

-    /// </summary>

-    /// <param name="item">The item to look for.</param>

-    /// <returns>The count</returns>

-    [Tested]

-    public virtual int ContainsCount(T item)

-    {

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-

-      if (dict.Find(ref p))

-        return p.Value;

-

-      return 0;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems() { return new DropMultiplicity<T>(dict); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-      return new GuardedCollectionValue<KeyValuePair<T, int>>(dict);

-    }

-

-    /// <summary>

-    /// Remove all copies of item from this set.

-    /// </summary>

-    /// <param name="item">The item to remove</param>

-    [Tested]

-    public virtual void RemoveAllCopies(T item)

-    {

-      updatecheck();

-

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 0);

-

-      if (dict.Find(ref p))

-      {

-        size -= p.Value;

-        dict.Remove(p);

-        if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-          raiseItemsRemoved(p.Key, p.Value);

-        if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-          raiseCollectionChanged();

-      }

-    }

-

-    #endregion

-

-    #region ICollection<T> Members

-

-

-    /// <summary>

-    /// Copy the items of this bag to part of an array.

-    /// <exception cref="ArgumentOutOfRangeException"/> if i is negative.

-    /// <exception cref="ArgumentException"/> if the array does not have room for the items.

-    /// </summary>

-    /// <param name="array">The array to copy to</param>

-    /// <param name="index">The starting index.</param>

-    [Tested]

-    public override void CopyTo(T[] array, int index)

-    {

-      if (index < 0 || index >= array.Length || index + Count > array.Length)

-        throw new ArgumentOutOfRangeException();

-

-      foreach (KeyValuePair<T, int> p in dict)

-        for (int j = 0; j < p.Value; j++)

-          array[index++] = p.Key;

-    }

-

-    #endregion

-

-    #region IExtensible<T> Members

-

-    /// <summary>

-    /// Report if this is a set collection.

-    /// </summary>

-    /// <value>Always true</value>

-    [Tested]

-    public virtual bool AllowsDuplicates { [Tested] get { return true; } }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return true; } }

-

-    /// <summary>

-    /// Add an item to this bag.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>Always true</returns>

-    [Tested]

-    public virtual bool Add(T item)

-    {

-      updatecheck();

-      add(ref item);

-      if (ActiveEvents != 0)

-        raiseForAdd(item);

-      return true;

-    }

-

-    private void add(ref T item)

-    {

-      KeyValuePair<T, int> p = new KeyValuePair<T, int>(item, 1);

-      if (dict.Find(ref p))

-      {

-        p.Value++;

-        dict.Update(p);

-        item = p.Key;

-      }

-      else

-        dict.Add(p);

-      size++;

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. 

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-#warning We could easily raise bag events

-      bool mustRaiseAdded = (ActiveEvents & EventTypeEnum.Added) != 0;

-      CircularQueue<T> wasAdded = mustRaiseAdded ? new CircularQueue<T>() : null;

-      bool wasChanged = false;

-      foreach (T item in items)

-      {

-        T jtem = item;

-        add(ref jtem);

-        wasChanged = true;

-        if (mustRaiseAdded)

-          wasAdded.Enqueue(jtem);

-      }

-      if (!wasChanged)

-        return;

-      if (mustRaiseAdded)

-        foreach (T item in wasAdded)

-          raiseItemsAdded(item, 1);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    public override T Choose()

-    {

-      return dict.Choose().Key;

-    }

-

-    /// <summary>

-    /// Create an enumerator for this bag.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      int left;

-      int mystamp = stamp;

-

-      foreach (KeyValuePair<T, int> p in dict)

-      {

-        left = p.Value;

-        while (left > 0)

-        {

-          if (mystamp != stamp)

-            throw new CollectionModifiedException();

-

-          left--;

-          yield return p.Key;

-        }

-      }

-    }

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this HashBag.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      //TODO: make sure this 

-      HashBag<T> clone = new HashBag<T>(dict.Count > 0 ? dict.Count : 1, itemequalityComparer);

-      //TODO: make sure this really adds in the counting bag way!

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-

-    #region Diagnostics

-    /// <summary>

-    /// Test internal structure of data (invariants)

-    /// </summary>

-    /// <returns>True if pass</returns>

-    [Tested]

-    public virtual bool Check()

-    {

-      bool retval = dict.Check();

-      int count = 0;

-

-      foreach (KeyValuePair<T, int> p in dict)

-        count += p.Value;

-

-      if (count != size)

-      {

-        Console.WriteLine("count({0}) != size({1})", count, size);

-        retval = false;

-      }

-

-      return retval;

-    }

-    #endregion

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/hashing/HashDictionary.cs b/mcs/class/Mono.C5/C5/hashing/HashDictionary.cs
deleted file mode 100644
index 4dbc7a62a35..00000000000
--- a/mcs/class/Mono.C5/C5/hashing/HashDictionary.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A generic dictionary class based on a hash set class <see cref="T:C5.HashSet`1"/>. 

-  /// </summary>

-  [Serializable]

-  public class HashDictionary<K, V> : DictionaryBase<K, V>, IDictionary<K, V>

-  {

-    /// <summary>

-    /// Create a hash dictionary using a default equalityComparer for the keys.

-    /// Initial capacity of internal table will be 16 entries and threshold for 

-    /// expansion is 66% fill.

-    /// </summary>

-    public HashDictionary() : this(EqualityComparer<K>.Default) { }

-

-    /// <summary>

-    /// Create a hash dictionary using a custom equalityComparer for the keys.

-    /// Initial capacity of internal table will be 16 entries and threshold for 

-    /// expansion is 66% fill.

-    /// </summary>

-    /// <param name="keyequalityComparer">The external key equalityComparer</param>

-    public HashDictionary(SCG.IEqualityComparer<K> keyequalityComparer) : base(keyequalityComparer)

-    {

-      pairs = new HashSet<KeyValuePair<K, V>>(new KeyValuePairEqualityComparer<K, V>(keyequalityComparer));

-    }

-

-    /// <summary>

-    /// Create a hash dictionary using a custom equalityComparer and prescribing the 

-    /// initial size of the dictionary and a non-default threshold for internal table expansion.

-    /// </summary>

-    /// <param name="capacity">The initial capacity. Will be rounded upwards to nearest

-    /// power of 2, at least 16.</param>

-    /// <param name="fill">The expansion threshold. Must be between 10% and 90%.</param>

-    /// <param name="keyequalityComparer">The external key equalityComparer</param>

-    public HashDictionary(int capacity, double fill, SCG.IEqualityComparer<K> keyequalityComparer): base(keyequalityComparer)

-    {

-      pairs = new HashSet<KeyValuePair<K, V>>(capacity, fill, new KeyValuePairEqualityComparer<K, V>(keyequalityComparer));

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      HashDictionary<K, V> clone = new HashDictionary<K, V>(EqualityComparer);

-      clone.pairs.AddAll(pairs);

-      return clone;

-    }

-

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/hashing/HashTable.cs b/mcs/class/Mono.C5/C5/hashing/HashTable.cs
deleted file mode 100644
index 2223e9d6307..00000000000
--- a/mcs/class/Mono.C5/C5/hashing/HashTable.cs
+++ /dev/null
@@ -1,1603 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define LINEARPROBINGnot

-#define REFBUCKET

-#define SHRINKnot

-#define INTERHASHINGnot

-#define RANDOMINTERHASHING

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A set collection class based on linear hashing

-  /// </summary>

-  [Serializable]

-  public class HashSet<T> : CollectionBase<T>, ICollection<T>

-  {

-    #region Feature

-    /// <summary>

-    /// Enum class to assist printing of compilation alternatives.

-    /// </summary>

-    [Flags]

-    public enum Feature : short

-    {

-      /// <summary>

-      /// Nothing

-      /// </summary>

-      Dummy = 0,

-      /// <summary>

-      /// Buckets are of reference type

-      /// </summary>

-      RefTypeBucket = 1,

-      /// <summary>

-      /// Primary buckets are of value type

-      /// </summary>

-      ValueTypeBucket = 2,

-      /// <summary>

-      /// Using linear probing to resolve index clashes

-      /// </summary>

-      LinearProbing = 4,

-      /// <summary>

-      /// Shrink table when very sparsely filled

-      /// </summary>

-      ShrinkTable = 8,

-      /// <summary>

-      /// Use chaining to resolve index clashes

-      /// </summary>

-      Chaining = 16,

-      /// <summary>

-      /// Use hash function on item hash code

-      /// </summary>

-      InterHashing = 32,

-      /// <summary>

-      /// Use a universal family of hash functions on item hash code

-      /// </summary>

-      RandomInterHashing = 64

-    }

-

-

-

-    static Feature features = Feature.Dummy

-#if REFBUCKET

- | Feature.RefTypeBucket

-#else

- | Feature.ValueTypeBucket

-#endif

-#if SHRINK

-		| Feature.ShrinkTable

-#endif

-#if LINEARPROBING

- | Feature.LinearProbing

-#else

- | Feature.Chaining

-#endif

-#if INTERHASHING

-		| Feature.InterHashing

-#elif RANDOMINTERHASHING

- | Feature.RandomInterHashing

-#endif

-;

-

-

-    /// <summary>

-    /// Show which implementation features was chosen at compilation time

-    /// </summary>

-    public static Feature Features { get { return features; } }

-

-    #endregion

-

-    #region Fields

-

-    int indexmask, bits, bitsc, origbits, lastchosen; //bitsc==32-bits; indexmask==(1<<bits)-1;

-

-    Bucket[] table;

-

-#if !REFBUCKET

-    bool defaultvalid = false;

-

-    T defaultitem;

-#endif

-    double fillfactor = 0.66;

-

-    int resizethreshhold;

-

-#if RANDOMINTERHASHING

-#if DEBUG

-    const uint randomhashfactor = 1529784659;

-#else

-    uint randomhashfactor = (2 * (uint)(new Random()).Next() + 1) * 1529784659;

-#endif

-#endif

-

-    #endregion

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return EventTypeEnum.Basic; } }

-

-    #endregion

-

-    #region Bucket nested class(es)

-#if REFBUCKET

-    [Serializable]

-    class Bucket

-    {

-      internal T item;

-

-      internal int hashval; //Cache!

-

-#if LINEARPROBING

-      internal Bucket(T item, int hashval)

-      {

-        this.item = item;

-        this.hashval = hashval;

-      }

-#else

-      internal Bucket overflow;

-

-      internal Bucket(T item, int hashval, Bucket overflow)

-      {

-        this.item = item;

-        this.hashval = hashval;

-        this.overflow = overflow;

-      }

-#endif

-    }

-#else

-    struct Bucket

-    {

-      internal T item;

-

-      internal int hashval; //Cache!

-

-#if LINEARPROBING

-      internal Bucket(T item, int hashval)

-      {

-        this.item = item;

-        this.hashval = hashval;

-      }

-#else

-			internal OverflowBucket overflow;

-

-

-			internal Bucket(T item, int hashval)

-			{

-				this.item = item;

-				this.hashval = hashval;

-				this.overflow = default(OverflowBucket);

-			}

-#endif

-    }

-

-

-#if !LINEARPROBING

-		class OverflowBucket

-		{

-			internal T item;

-

-			internal int hashval; //Cache!

-

-			internal OverflowBucket overflow;

-

-

-			internal OverflowBucket(T item, int hashval, OverflowBucket overflow)

-			{

-				this.item = item;

-				this.hashval = hashval;

-				this.overflow = overflow;

-			}

-		}

-#endif

-#endif

-

-    #endregion

-

-    #region Basic Util

-

-    bool equals(T i1, T i2) { return itemequalityComparer.Equals(i1, i2); }

-

-#if !REFBUCKET

-    bool isnull(T item) { return itemequalityComparer.Equals(item, default(T)); }

-#endif

-

-    int gethashcode(T item) { return itemequalityComparer.GetHashCode(item); }

-

-

-    int hv2i(int hashval)

-    {

-#if INTERHASHING

-			//Note: *inverse  mod 2^32 is -1503427877

-			return (int)(((uint)hashval * 1529784659) >>bitsc); 

-#elif RANDOMINTERHASHING

-      return (int)(((uint)hashval * randomhashfactor) >> bitsc);

-#else

-			return indexmask & hashval;

-#endif

-    }

-

-

-    void expand()

-    {

-      //Console.WriteLine(String.Format("Expand to {0} bits", bits+1));

-      resize(bits + 1);

-    }

-

-

-    void shrink()

-    {

-      if (bits > 3)

-      {

-        //Console.WriteLine(String.Format("Shrink to {0} bits", bits - 1));

-        resize(bits - 1);

-      }

-    }

-

-

-    void resize(int bits)

-    {

-      //Console.WriteLine(String.Format("Resize to {0} bits", bits));

-      this.bits = bits;

-      bitsc = 32 - bits;

-      indexmask = (1 << bits) - 1;

-

-      Bucket[] newtable = new Bucket[indexmask + 1];

-

-      for (int i = 0, s = table.Length; i < s; i++)

-      {

-        Bucket b = table[i];

-

-#if LINEARPROBING

-#if REFBUCKET

-        if (b != null)

-        {

-          int j = hv2i(b.hashval);

-

-          while (newtable[j] != null) { j = indexmask & (j + 1); }

-

-          newtable[j] = b;

-        }

-#else

-        if (!isnull(b.item))

-        {

-          int j = hv2i(b.hashval);

-

-          while (!isnull(newtable[j].item)) { j = indexmask & (j + 1); }

-

-          newtable[j] = b;

-        }

-#endif

-#else

-#if REFBUCKET

-        while (b != null)

-        {

-          int j = hv2i(b.hashval);

-

-          newtable[j] = new Bucket(b.item, b.hashval, newtable[j]);

-          b = b.overflow;

-        }

-#else

-				if (!isnull(b.item))

-				{

-					insert(b.item, b.hashval, newtable);

-

-					OverflowBucket ob = b.overflow;

-

-					while (ob != null)

-					{

-						insert(ob.item, ob.hashval, newtable);

-						ob = ob.overflow;

-					}

-				}

-#endif

-#endif

-      }

-

-      table = newtable;

-      resizethreshhold = (int)(table.Length * fillfactor);

-      //Console.WriteLine(String.Format("Resize to {0} bits done", bits));

-    }

-

-#if REFBUCKET

-#else

-#if LINEARPROBING

-#else

-		//Only for resize!!!

-		private void insert(T item, int hashval, Bucket[] t)

-		{

-			int i = hv2i(hashval);

-			Bucket b = t[i];

-

-			if (!isnull(b.item))

-			{

-				t[i].overflow = new OverflowBucket(item, hashval, b.overflow);

-			}

-			else

-				t[i] = new Bucket(item, hashval);

-		}

-#endif

-#endif

-

-    /// <summary>

-    /// Search for an item equal (according to itemequalityComparer) to the supplied item.  

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="add">If true, add item to table if not found.</param>

-    /// <param name="update">If true, update table entry if item found.</param>

-    /// <param name="raise">If true raise events</param>

-    /// <returns>True if found</returns>

-    private bool searchoradd(ref T item, bool add, bool update, bool raise)

-    {

-

-#if LINEARPROBING

-#if REFBUCKET

-      int hashval = gethashcode(item);

-      int i = hv2i(hashval);

-      Bucket b = table[i];

-

-      while (b != null)

-      {

-        T olditem = b.item;

-        if (equals(olditem, item))

-        {

-          if (update)

-            b.item = item;

-          else

-            item = olditem;

-

-          if (raise && update)

-            raiseForUpdate(item, olditem);

-          return true;

-        }

-

-        b = table[i = indexmask & (i + 1)];

-      }

-

-      if (!add) goto notfound;

-

-      table[i] = new Bucket(item, hashval);

-

-#else

-      if (isnull(item))

-      {

-        if (defaultvalid)

-        {

-          T olditem = defaultitem;

-          if (update)

-            defaultitem = item;

-          else

-            item = defaultitem;

-

-          if (raise && update)

-            raiseForUpdate(item, olditem);

-          return true;

-        }

-

-        if (!add) goto notfound;

-

-        defaultvalid = true;

-        defaultitem = item;

-      }

-      else

-      {

-        int hashval = gethashcode(item);

-        int i = hv2i(hashval);

-        T t = table[i].item;

-

-        while (!isnull(t))

-        {

-          if (equals(t, item))

-          {

-            if (update)

-              table[i].item = item;

-            else

-              item = t;

-

-            if (raise && update)

-              raiseForUpdate(item, t);

-            return true;

-          }

-

-          t = table[i = indexmask & (i + 1)].item;

-        }

-

-        if (!add) goto notfound;

-

-        table[i] = new Bucket(item, hashval);

-      }

-#endif

-#else

-#if REFBUCKET

-      int hashval = gethashcode(item);

-      int i = hv2i(hashval);

-      Bucket b = table[i], bold = null;

-

-      if (b != null)

-      {

-        while (b != null)

-        {

-          T olditem = b.item;

-          if (equals(olditem, item))

-          {

-            if (update)

-            {

-              b.item = item;

-            }

-            item = b.item;

-

-            if (raise && update)

-              raiseForUpdate(item, olditem);

-            return true;

-          }

-

-          bold = b;

-          b = b.overflow;

-        }

-

-        if (!add) goto notfound;

-

-        bold.overflow = new Bucket(item, hashval, null);

-      }

-      else

-      {

-        if (!add) goto notfound;

-

-        table[i] = new Bucket(item, hashval, null);

-      }

-#else

-			if (isnull(item))

-			{

-        if (defaultvalid)

-        {

-          T olditem = defaultitem;

-          if (update)

-            defaultitem = item;

-          else

-            item = defaultitem;

-

-          if (raise && update)

-            raiseForUpdate(item, olditem);

-          return true;

-        }

-

-				if (!add) goto notfound;

-

-				defaultvalid = true;

-				defaultitem = item;

-			}

-			else

-			{

-				int hashval = gethashcode(item);

-				int i = hv2i(hashval);

-				Bucket b = table[i];

-

-				if (!isnull(b.item))

-				{

-					if (equals(b.item, item))

-					{

-						if (update)

-							table[i].item = item;

-						else

-							item = b.item;

-

-            if (raise && update)

-              raiseForUpdate(item, b.item);

-            return true;

-					}

-

-					OverflowBucket ob = table[i].overflow;

-

-					if (ob == null)

-					{

-						if (!add) goto notfound;

-

-						table[i].overflow = new OverflowBucket(item, hashval, null);

-					}

-					else

-					{

-            T olditem = ob.item;

-						while (ob.overflow != null)

-						{

-              if (equals(item, olditem))

-              {

-                if (update)

-                  ob.item = item;

-                else

-                  item = olditem;

-

-                if (raise && update)

-                  raiseForUpdate(item, olditem);

-                return true;

-              }

-

-							ob = ob.overflow;

-              olditem = ob.item;

-						}

-

-            if (equals(item, olditem))

-            {

-              if (update)

-                ob.item = item;

-              else

-                item = olditem;

-

-              if (raise && update)

-                raiseForUpdate(item, olditem);

-              return true;

-            }

-

-						if (!add) goto notfound;

-

-						ob.overflow = new OverflowBucket(item, hashval, null);

-					}

-				}

-				else

-				{

-					if (!add) goto notfound;

-

-					table[i] = new Bucket(item, hashval);

-				}

-			}

-#endif

-#endif

-      size++;

-      if (size > resizethreshhold)

-        expand();

-    notfound:

-      if (raise && add)

-        raiseForAdd(item);

-      return false;

-    }

-

-

-    private bool remove(ref T item)

-    {

-

-      if (size == 0)

-        return false;

-#if LINEARPROBING

-#if REFBUCKET

-      int hashval = gethashcode(item);

-      int index = hv2i(hashval);

-      Bucket b = table[index];

-

-      while (b != null)

-      {

-        if (equals(item, b.item))

-        {

-          //ref

-          item = table[index].item;

-          table[index] = null;

-

-          //Algorithm R

-          int j = (index + 1) & indexmask;

-

-          b = table[j];

-          while (b != null)

-          {

-            int k = hv2i(b.hashval);

-

-            if ((k <= index && index < j) || (index < j && j < k) || (j < k && k <= index))

-            //if (index > j ? (j < k && k <= index): (k <= index || j < k) )

-            {

-              table[index] = b;

-              table[j] = null;

-              index = j;

-            }

-

-            j = (j + 1) & indexmask;

-            b = table[j];

-          }

-

-          goto found;

-        }

-

-        b = table[index = indexmask & (index + 1)];

-      }

-      return false;

-#else

-      if (isnull(item))

-      {

-        if (!defaultvalid)

-          return false;

-

-        //ref

-        item = defaultitem;

-        defaultvalid = false;

-        defaultitem = default(T); //No spaceleaks!

-      }

-      else

-      {

-        int hashval = gethashcode(item);

-        int index = hv2i(hashval);

-        T t = table[index].item;

-

-        while (!isnull(t))

-        {

-          if (equals(item, t))

-          {

-            //ref

-            item = table[index].item;

-            table[index].item = default(T);

-

-            //algorithm R

-            int j = (index + 1) & indexmask;

-            Bucket b = table[j];

-

-            while (!isnull(b.item))

-            {

-              int k = hv2i(b.hashval);

-

-              if ((k <= index && index < j) || (index < j && j < k) || (j < k && k <= index))

-              {

-                table[index] = b;

-                table[j].item = default(T);

-                index = j;

-              }

-

-              j = (j + 1) & indexmask;

-              b = table[j];

-            }

-

-            goto found;

-          }

-

-          t = table[index = indexmask & (index + 1)].item;

-        }

-

-        return false;

-      }

-#endif

-    found:

-#else

-#if REFBUCKET

-      int hashval = gethashcode(item);

-      int index = hv2i(hashval);

-      Bucket b = table[index], bold;

-

-      if (b == null)

-        return false;

-

-      if (equals(item, b.item))

-      {

-        //ref

-        item = b.item;

-        table[index] = b.overflow;

-      }

-      else

-      {

-        bold = b;

-        b = b.overflow;

-        while (b != null && !equals(item, b.item))

-        {

-          bold = b;

-          b = b.overflow;

-        }

-

-        if (b == null)

-          return false;

-

-        //ref

-        item = b.item;

-        bold.overflow = b.overflow;

-      }

-

-#else

-			if (isnull(item))

-			{

-				if (!defaultvalid)

-					return false;

-

-				//ref

-				item = defaultitem;

-				defaultvalid = false;

-				defaultitem = default(T); //No spaceleaks!

-			}

-			else

-			{

-				int hashval = gethashcode(item);

-				int index = hv2i(hashval);

-				Bucket b = table[index];

-				OverflowBucket ob = b.overflow;

-

-				if (equals(item, b.item))

-				{

-					//ref

-					item = b.item;

-					if (ob == null)

-					{

-						table[index] = new Bucket();

-					}

-					else

-					{

-						b = new Bucket(ob.item, ob.hashval);

-						b.overflow = ob.overflow;

-						table[index] = b;

-					}

-				}

-				else

-				{

-					if (ob == null)

-						return false;

-

-					if (equals(item, ob.item)) 

-					{

-						//ref

-						item=ob.item;

-						table[index].overflow = ob.overflow;

-					}

-					else

-					{

-						while (ob.overflow != null)

-							if (equals(item, ob.overflow.item))

-							{

-								//ref

-								item = ob.overflow.item;

-								break;

-							}

-							else

-								ob = ob.overflow;

-

-						if (ob.overflow == null)

-							return false;

-

-						ob.overflow = ob.overflow.overflow;

-					}

-				}

-			}

-#endif

-#endif

-      size--;

-

-      return true;

-    }

-

-

-    private void clear()

-    {

-      bits = origbits;

-      bitsc = 32 - bits;

-      indexmask = (1 << bits) - 1;

-      size = 0;

-      table = new Bucket[indexmask + 1];

-      resizethreshhold = (int)(table.Length * fillfactor);

-#if !REFBUCKET

-      defaultitem = default(T);

-      defaultvalid = false;

-#endif

-    }

-

-    #endregion

-

-    #region Constructors

-    /// <summary>

-    /// Create a hash set with natural item equalityComparer and default fill threshold (66%)

-    /// and initial table size (16).

-    /// </summary>

-    public HashSet() 

-			: this(EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create a hash set with external item equalityComparer and default fill threshold (66%)

-    /// and initial table size (16).

-    /// </summary>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashSet(SCG.IEqualityComparer<T> itemequalityComparer) 

-			: this(16, itemequalityComparer) { }

-

-

-    /// <summary>

-    /// Create a hash set with external item equalityComparer and default fill threshold (66%)

-    /// </summary>

-    /// <param name="capacity">Initial table size (rounded to power of 2, at least 16)</param>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashSet(int capacity, SCG.IEqualityComparer<T> itemequalityComparer) 

-			: this(capacity, 0.66, itemequalityComparer) { }

-

-

-    /// <summary>

-    /// Create a hash set with external item equalityComparer.

-    /// </summary>

-    /// <param name="capacity">Initial table size (rounded to power of 2, at least 16)</param>

-    /// <param name="fill">Fill threshold (in range 10% to 90%)</param>

-    /// <param name="itemequalityComparer">The external item equalityComparer</param>

-    public HashSet(int capacity, double fill, SCG.IEqualityComparer<T> itemequalityComparer) : base(itemequalityComparer)

-    {

-      if (fill < 0.1 || fill > 0.9)

-        throw new ArgumentException("Fill outside valid range [0.1, 0.9]");

-      if (capacity <= 0)

-        throw new ArgumentException("Capacity must be non-negative");

-      //this.itemequalityComparer = itemequalityComparer;

-      origbits = 4;

-      while (capacity - 1 >> origbits > 0) origbits++;

-      clear();

-    }

-

-

-

-    #endregion

-

-    #region IEditableCollection<T> Members

-

-    /// <summary>

-    /// The complexity of the Contains operation

-    /// </summary>

-    /// <value>Always returns Speed.Constant</value>

-    [Tested]

-    public virtual Speed ContainsSpeed { [Tested]get { return Speed.Constant; } }

-

-    /// <summary>

-    /// Check if an item is in the set 

-    /// </summary>

-    /// <param name="item">The item to look for</param>

-    /// <returns>True if set contains item</returns>

-    [Tested]

-    public virtual bool Contains(T item) { return searchoradd(ref item, false, false, false); }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the set and

-    /// if so report the actual item object found.

-    /// </summary>

-    /// <param name="item">On entry, the item to look for.

-    /// On exit the item found, if any</param>

-    /// <returns>True if set contains item</returns>

-    [Tested]

-    public virtual bool Find(ref T item) { return searchoradd(ref item, false, false, false); }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the set and

-    /// if so replace the item object in the set with the supplied one.

-    /// </summary>

-    /// <param name="item">The item object to update with</param>

-    /// <returns>True if item was found (and updated)</returns>

-    [Tested]

-    public virtual bool Update(T item)

-    { updatecheck(); return searchoradd(ref item, false, true, true); }

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the set and

-    /// if so replace the item object in the set with the supplied one.

-    /// </summary>

-    /// <param name="item">The item object to update with</param>

-    /// <param name="olditem"></param>

-    /// <returns>True if item was found (and updated)</returns>

-    public virtual bool Update(T item, out T olditem)

-    { updatecheck(); olditem = item; return searchoradd(ref olditem, false, true, true); }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a given one) is in the set.

-    /// If found, report the actual item object in the set,

-    /// else add the supplied one.

-    /// </summary>

-    /// <param name="item">On entry, the item to look for or add.

-    /// On exit the actual object found, if any.</param>

-    /// <returns>True if item was found</returns>

-    [Tested]

-    public virtual bool FindOrAdd(ref T item)

-    { updatecheck(); return searchoradd(ref item, true, false, true); }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a supplied one) is in the set and

-    /// if so replace the item object in the set with the supplied one; else

-    /// add the supplied one.

-    /// </summary>

-    /// <param name="item">The item to look for and update or add</param>

-    /// <returns>True if item was updated</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(T item)

-    { updatecheck(); return searchoradd(ref item, true, true, true); }

-

-

-    /// <summary>

-    /// Check if an item (collection equal to a supplied one) is in the set and

-    /// if so replace the item object in the set with the supplied one; else

-    /// add the supplied one.

-    /// </summary>

-    /// <param name="item">The item to look for and update or add</param>

-    /// <param name="olditem"></param>

-    /// <returns>True if item was updated</returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    { updatecheck(); olditem = item; return searchoradd(ref olditem, true, true, true); }

-

-

-    /// <summary>

-    /// Remove an item from the set

-    /// </summary>

-    /// <param name="item">The item to remove</param>

-    /// <returns>True if item was (found and) removed </returns>

-    [Tested]

-    public virtual bool Remove(T item)

-    {

-      updatecheck();

-      if (remove(ref item))

-      {

-#if SHRINK

-				if (size<resizethreshhold/2 && resizethreshhold>8)

-					shrink();

-#endif

-        raiseForRemove(item);

-        return true;

-      }

-      else

-        return false;

-    }

-

-

-    /// <summary>

-    /// Remove an item from the set, reporting the actual matching item object.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if item was found.</returns>

-    [Tested]

-    public virtual bool Remove(T item, out T removeditem)

-    {

-      updatecheck();

-      removeditem = item;

-      if (remove(ref removeditem))

-      {

-#if SHRINK

-				if (size<resizethreshhold/2 && resizethreshhold>8)

-					shrink();

-#endif

-        raiseForRemove(removeditem);

-        return true;

-      }

-      else

-        return false;

-    }

-

-

-    /// <summary>

-    /// Remove all items in a supplied collection from this set.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(this);

-      bool raise = raiseHandler.MustFire;

-      T jtem;

-      foreach (U item in items)

-      { jtem = item; if (remove(ref jtem) && raise) raiseHandler.Remove(jtem); }

-#if SHRINK

-			if (size < resizethreshhold / 2 && resizethreshhold > 16)

-			{

-				int newlength = table.Length;

-

-				while (newlength >= 32 && newlength * fillfactor / 2 > size)

-					newlength /= 2;

-

-				resize(newlength - 1);

-			}

-#endif

-      if (raise) raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items from the set, resetting internal table to initial size.

-    /// </summary>

-    [Tested]

-    public virtual void Clear()

-    {

-      updatecheck();

-      int oldsize = size;

-      clear();

-      if (ActiveEvents != 0 && oldsize > 0)

-      {

-        raiseCollectionCleared(true, oldsize);

-        raiseCollectionChanged();

-      }

-    }

-

-

-    /// <summary>

-    /// Remove all items *not* in a supplied collection from this set.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain</param>

-    [Tested]

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-

-      HashSet<T> aux = new HashSet<T>(EqualityComparer);

-

-      //This only works for sets:

-      foreach (U item in items)

-        if (Contains(item))

-        {

-          T jtem = item;

-

-          aux.searchoradd(ref jtem, true, false, false);

-        }

-

-      if (size == aux.size)

-        return;

-

-      CircularQueue<T> wasRemoved = null;

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-      {

-        wasRemoved = new CircularQueue<T>();

-        foreach (T item in this)

-          if (!aux.Contains(item))

-            wasRemoved.Enqueue(item);

-      }

-

-      table = aux.table;

-      size = aux.size;

-#if !REFBUCKET

-      defaultvalid = aux.defaultvalid;

-      defaultitem = aux.defaultitem;

-#endif

-      indexmask = aux.indexmask;

-      resizethreshhold = aux.resizethreshhold;

-

-

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// Check if all items in a supplied collection is in this set

-    /// (ignoring multiplicities). 

-    /// </summary>

-    /// <param name="items">The items to look for.</param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all items are found.</returns>

-    [Tested]

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      foreach (U item in items)

-        if (!Contains(item))

-          return false;

-      return true;

-    }

-

-

-    /// <summary>

-    /// Create an array containing all items in this set (in enumeration order).

-    /// </summary>

-    /// <returns>The array</returns>

-    [Tested]

-    public override T[] ToArray()

-    {

-      T[] res = new T[size];

-      int index = 0;

-

-#if !REFBUCKET

-      if (defaultvalid)

-        res[index++] = defaultitem;

-#endif

-      for (int i = 0; i < table.Length; i++)

-      {

-        Bucket b = table[i];

-#if LINEARPROBING

-#if REFBUCKET

-        if (b != null)

-          res[index++] = b.item;

-#else

-        if (!isnull(b.item))

-          res[index++] = b.item;

-#endif

-#else

-#if REFBUCKET

-        while (b != null)

-        {

-          res[index++] = b.item;

-          b = b.overflow;

-        }

-#else

-				if (!isnull(b.item))

-				{

-					res[index++] = b.item;

-

-					OverflowBucket ob = b.overflow;

-

-					while (ob != null)

-					{

-						res[index++] = ob.item;

-						ob = ob.overflow;

-					}

-				}

-#endif

-#endif

-      }

-

-      Debug.Assert(size == index);

-      return res;

-    }

-

-

-    /// <summary>

-    /// Count the number of times an item is in this set (either 0 or 1).

-    /// </summary>

-    /// <param name="item">The item to look for.</param>

-    /// <returns>1 if item is in set, 0 else</returns>

-    [Tested]

-    public virtual int ContainsCount(T item) { return Contains(item) ? 1 : 0; }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems() { return this; }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-      return new MultiplicityOne<T>(this);

-    }

-

-    /// <summary>

-    /// Remove all (at most 1) copies of item from this set.

-    /// </summary>

-    /// <param name="item">The item to remove</param>

-    [Tested]

-    public virtual void RemoveAllCopies(T item) { Remove(item); }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    [Tested]

-    public override T Choose()

-    {

-      int len = table.Length;

-      if (size == 0)

-        throw new NoSuchItemException();

-#if REFBUCKET

-      do { if (++lastchosen >= len) lastchosen = 0; } while (table[lastchosen] == null);

-#else

-      if (defaultvalid) return defaultitem;

-      do { if (++lastchosen >= len) lastchosen = 0; } while (isnull(table[lastchosen].item));

-#endif

-      return table[lastchosen].item;

-    }

-

-    /// <summary>

-    /// Create an enumerator for this set.

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      int index = -1;

-      int mystamp = stamp;

-      int len = table.Length;

-

-#if LINEARPROBING

-#if REFBUCKET

-      while (++index < len)

-      {

-        if (mystamp != stamp) throw new CollectionModifiedException();

-

-        if (table[index] != null) yield return table[index].item;

-      }

-#else

-      if (defaultvalid)

-        yield return defaultitem;

-

-      while (++index < len)

-      {

-        if (mystamp != stamp) throw new CollectionModifiedException();

-

-        T item = table[index].item;

-

-        if (!isnull(item)) yield return item;

-      }

-#endif

-#else

-#if REFBUCKET

-      Bucket b = null;

-#else

-			OverflowBucket ob = null;

-

-			if (defaultvalid)

-				yield return defaultitem;

-#endif

-      while (true)

-      {

-        if (mystamp != stamp)

-          throw new CollectionModifiedException();

-

-#if REFBUCKET

-        if (b == null || b.overflow == null)

-        {

-          do

-          {

-            if (++index >= len) yield break;

-          } while (table[index] == null);

-

-          b = table[index];

-          yield return b.item;

-        }

-        else

-        {

-          b = b.overflow;

-          yield return b.item;

-        }

-#else

-				if (ob != null && ob.overflow != null)

-				{

-					ob = ob.overflow;

-					yield return ob.item;

-				}

-				else if (index >= 0 && ob == null && (ob = table[index].overflow) != null)

-				{

-					yield return  ob.item;

-				}

-				else

-				{

-					do

-					{

-						if (++index >= len) yield break;

-					} while (isnull(table[index].item));

-

-          yield return table[index].item;

-          ob = null;

-				}

-#endif

-      }

-#endif

-    }

-

-    #endregion

-

-    #region ISink<T> Members

-    /// <summary>

-    /// Report if this is a set collection.

-    /// </summary>

-    /// <value>Always false</value>

-    [Tested]

-    public virtual bool AllowsDuplicates { [Tested]get { return false; } }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return true; } }

-

-    /// <summary>

-    /// Add an item to this set.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True if item was added (i.e. not found)</returns>

-    [Tested]

-    public virtual bool Add(T item)

-    {

-      updatecheck();

-      return !searchoradd(ref item, true, false, true);

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. Since this

-    /// collection has set semantics, only items not already in the collection

-    /// will be added.

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      bool wasChanged = false;

-      bool raiseAdded = (ActiveEvents & EventTypeEnum.Added) != 0;

-      CircularQueue<T> wasAdded = raiseAdded ? new CircularQueue<T>() : null;

-      foreach (T item in items)

-      {

-        T jtem = item;

-

-        if (!searchoradd(ref jtem, true, false, false))

-        {

-          wasChanged = true;

-          if (raiseAdded)

-            wasAdded.Enqueue(item);

-        }

-      }

-      //TODO: implement a RaiseForAddAll() method

-      if (raiseAdded & wasChanged)

-        foreach (T item in wasAdded)

-          raiseItemsAdded(item, 1);

-      if (((ActiveEvents & EventTypeEnum.Changed) != 0 && wasChanged))

-        raiseCollectionChanged();

-    }

-

-

-    #endregion

-

-    #region Diagnostics

-

-    /// <summary>

-    /// Test internal structure of data (invariants)

-    /// </summary>

-    /// <returns>True if pass</returns>

-    [Tested]

-    public virtual bool Check()

-    {

-      int count = 0;

-#if LINEARPROBING

-      int lasthole = table.Length - 1;

-

-#if REFBUCKET

-      while (lasthole >= 0 && table[lasthole] != null)

-#else

-      while (lasthole >= 0 && !isnull(table[lasthole].item))

-#endif

-      {

-        lasthole--;

-        count++;

-      }

-

-      if (lasthole < 0)

-      {

-        Console.WriteLine("Table is completely filled!");

-        return false;

-      }

-

-      for (int cellindex = lasthole + 1, s = table.Length; cellindex < s; cellindex++)

-      {

-        Bucket b = table[cellindex];

-        int hashindex = hv2i(b.hashval);

-

-        if (hashindex <= lasthole || hashindex > cellindex)

-        {

-          Console.WriteLine("Bad cell item={0}, hashval={1}, hashindex={2}, cellindex={3}, lasthole={4}", b.item, b.hashval, hashindex, cellindex, lasthole);

-          return false;

-        }

-      }

-

-      int latesthole = -1;

-

-      for (int cellindex = 0; cellindex < lasthole; cellindex++)

-      {

-        Bucket b = table[cellindex];

-

-#if REFBUCKET

-        if (b != null)

-#else

-        if (!isnull(b.item))

-#endif

-        {

-          count++;

-

-          int hashindex = hv2i(b.hashval);

-

-          if (cellindex < hashindex && hashindex <= lasthole)

-          {

-            Console.WriteLine("Bad cell item={0}, hashval={1}, hashindex={2}, cellindex={3}, latesthole={4}", b.item, b.hashval, hashindex, cellindex, latesthole);

-            return false;

-          }

-        }

-        else

-        {

-          latesthole = cellindex;

-          break;

-        }

-      }

-

-      for (int cellindex = latesthole + 1; cellindex < lasthole; cellindex++)

-      {

-        Bucket b = table[cellindex];

-

-#if REFBUCKET

-        if (b != null)

-#else

-        if (!isnull(b.item))

-#endif

-        {

-          count++;

-

-          int hashindex = hv2i(b.hashval);

-

-          if (hashindex <= latesthole || cellindex < hashindex)

-          {

-            Console.WriteLine("Bad cell item={0}, hashval={1}, hashindex={2}, cellindex={3}, latesthole={4}", b.item, b.hashval, hashindex, cellindex, latesthole);

-            return false;

-          }

-        }

-        else

-        {

-          latesthole = cellindex;

-        }

-      }

-

-      return true;

-#else

-      bool retval = true;

-      for (int i = 0, s = table.Length; i < s; i++)

-      {

-        int level = 0;

-        Bucket b = table[i];

-#if REFBUCKET

-        while (b != null)

-        {

-          if (i != hv2i(b.hashval))

-          {

-            Console.WriteLine("Bad cell item={0}, hashval={1}, index={2}, level={3}", b.item, b.hashval, i, level);

-            retval = false;

-          }

-

-          count++;

-          level++;

-          b = b.overflow;

-        }

-#else

-				if (!isnull(b.item))

-				{

-					count++;

-					if (i != hv2i(b.hashval))

-					{

-						Console.WriteLine("Bad cell item={0}, hashval={1}, index={2}, level={3}", b.item, b.hashval, i, level);

-						retval = false;

-					}

-

-					OverflowBucket ob = b.overflow;

-

-					while (ob != null)

-					{

-						level++;

-						count++;

-						if (i != hv2i(ob.hashval))

-						{

-							Console.WriteLine("Bad cell item={0}, hashval={1}, index={2}, level={3}", b.item, b.hashval, i, level);

-							retval = false;

-						}

-

-						ob = ob.overflow;

-					}

-				}

-#endif

-      }

-

-      if (count != size)

-      {

-        Console.WriteLine("size({0}) != count({1})", size, count);

-        retval = false;

-      }

-

-      return retval;

-#endif

-    }

-

-

-    /// <summary>

-    /// Produce statistics on distribution of bucket sizes. Current implementation is incomplete.

-    /// </summary>

-    /// <returns>Histogram data.</returns>

-    [Tested(via = "Manually")]

-    public ISortedDictionary<int, int> BucketCostDistribution()

-    {

-      TreeDictionary<int, int> res = new TreeDictionary<int, int>();

-#if LINEARPROBING

-      int count = 0;

-#if REFBUCKET

-      while (table[count] != null)

-#else

-      while (!isnull(table[count].item))

-#endif

-        count++;

-      for (int i = table.Length - 1; i >= 0; i--)

-      {

-#if REFBUCKET

-        if (table[i] != null)

-#else

-        if (!isnull(table[i].item))

-#endif

-          count++;

-        else

-          count = 0;

-        if (res.Contains(count))

-          res[count]++;

-        else

-          res[count] = 1;

-      }

-

-      return res;

-#else

-      for (int i = 0, s = table.Length; i < s; i++)

-      {

-        int count = 0;

-#if REFBUCKET

-        Bucket b = table[i];

-

-        while (b != null)

-        {

-          count++;

-          b = b.overflow;

-        }

-#else

-				Bucket b = table[i];

-

-				if (!isnull(b.item))

-				{

-					count = 1;

-

-					OverflowBucket ob = b.overflow;

-

-					while (ob != null)

-					{

-						count++;

-						ob = ob.overflow;

-					}

-				}

-#endif

-        if (res.Contains(count))

-          res[count]++;

-        else

-          res[count] = 1;

-      }

-

-      return res;

-#endif

-    }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this HashSet.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      HashSet<T> clone = new HashSet<T>(size > 0 ? size : 1, itemequalityComparer);

-      //TODO: make sure this really adds in the counting bag way!

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/heaps/IntervalHeap.cs b/mcs/class/Mono.C5/C5/heaps/IntervalHeap.cs
deleted file mode 100644
index db925daa2d4..00000000000
--- a/mcs/class/Mono.C5/C5/heaps/IntervalHeap.cs
+++ /dev/null
@@ -1,1103 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A priority queue class based on an interval heap data structure.

-  /// </summary>

-  /// <typeparam name="T">The item type</typeparam>

-  [Serializable]

-  public class IntervalHeap<T> : CollectionValueBase<T>, IPriorityQueue<T>

-  {

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return EventTypeEnum.Basic; } }

-

-    #endregion

-

-    #region Fields

-    [Serializable]

-    struct Interval

-    {

-      internal T first, last; internal Handle firsthandle, lasthandle;

-

-

-      public override string ToString() { return String.Format("[{0}; {1}]", first, last); }

-    }

-

-

-

-    object syncroot = new object();

-

-    int stamp;

-

-    SCG.IComparer<T> comparer;

-    SCG.IEqualityComparer<T> itemequalityComparer;

-

-    Interval[] heap;

-

-    int size;

-    #endregion

-

-    #region Util

-    bool heapifyMin(int i)

-    {

-      bool swappedroot = false;

-      int cell = i, currentmin = cell;

-      T currentitem = heap[cell].first;

-      Handle currenthandle = heap[cell].firsthandle;

-

-      if (i > 0)

-      {

-        T other = heap[cell].last;

-        if (2 * cell + 1 < size && comparer.Compare(currentitem, other) > 0)

-        {

-          swappedroot = true;

-          Handle otherhandle = heap[cell].lasthandle;

-          updateLast(cell, currentitem, currenthandle);

-          currentitem = other;

-          currenthandle = otherhandle;

-        }

-      }

-

-      T minitem = currentitem;

-      Handle minhandle = currenthandle;

-

-      while (true)

-      {

-        int l = 2 * cell + 1, r = l + 1;

-        T lv, rv;

-

-        if (2 * l < size && comparer.Compare(lv = heap[l].first, minitem) < 0)

-        { currentmin = l; minitem = lv; }

-

-        if (2 * r < size && comparer.Compare(rv = heap[r].first, minitem) < 0)

-        { currentmin = r; minitem = rv; }

-

-        if (currentmin == cell)

-          break;

-

-        minhandle = heap[currentmin].firsthandle;

-        updateFirst(cell, minitem, minhandle);

-        cell = currentmin;

-

-        //Maybe swap first and last

-        T other = heap[cell].last;

-        if (2 * currentmin + 1 < size && comparer.Compare(currentitem, other) > 0)

-        {

-          Handle otherhandle = heap[cell].lasthandle;

-          updateLast(cell, currentitem, currenthandle);

-          currentitem = other;

-          currenthandle = otherhandle;

-        }

-

-

-        minitem = currentitem;

-        minhandle = currenthandle;

-      }

-

-      if (cell != i || swappedroot)

-        updateFirst(cell, minitem, minhandle);

-      return swappedroot;

-    }

-

-

-    bool heapifyMax(int i)

-    {

-      bool swappedroot = false;

-      int cell = i, currentmax = cell;

-      T currentitem = heap[cell].last;

-      Handle currenthandle = heap[cell].lasthandle;

-

-      if (i > 0)

-      {

-        T other = heap[cell].first;

-        if (comparer.Compare(currentitem, other) < 0)

-        {

-          swappedroot = true;

-          Handle otherhandle = heap[cell].firsthandle;

-          updateFirst(cell, currentitem, currenthandle);

-          currentitem = other;

-          currenthandle = otherhandle;

-        }

-      }

-

-      T maxitem = currentitem;

-      Handle maxhandle = currenthandle;

-

-      while (true)

-      {

-        int l = 2 * cell + 1, r = l + 1;

-        T lv, rv;

-

-        if (2 * l + 1 < size && comparer.Compare(lv = heap[l].last, maxitem) > 0)

-        { currentmax = l; maxitem = lv; }

-

-        if (2 * r + 1 < size && comparer.Compare(rv = heap[r].last, maxitem) > 0)

-        { currentmax = r; maxitem = rv; }

-

-        if (currentmax == cell)

-          break;

-

-        maxhandle = heap[currentmax].lasthandle;

-        updateLast(cell, maxitem, maxhandle);

-        cell = currentmax;

-

-        //Maybe swap first and last

-        T other = heap[cell].first;

-        if (comparer.Compare(currentitem, other) < 0)

-        {

-          Handle otherhandle = heap[cell].firsthandle;

-          updateFirst(cell, currentitem, currenthandle);

-          currentitem = other;

-          currenthandle = otherhandle;

-        }

-

-        maxitem = currentitem;

-        maxhandle = currenthandle;

-      }

-

-      if (cell != i || swappedroot) //Check could be better?

-        updateLast(cell, maxitem, maxhandle);

-      return swappedroot;

-    }

-

-

-    void bubbleUpMin(int i)

-    {

-      if (i > 0)

-      {

-        T min = heap[i].first, iv = min;

-        Handle minhandle = heap[i].firsthandle;

-        int p = (i + 1) / 2 - 1;

-

-        while (i > 0)

-        {

-          if (comparer.Compare(iv, min = heap[p = (i + 1) / 2 - 1].first) < 0)

-          {

-            updateFirst(i, min, heap[p].firsthandle);

-            min = iv;

-            i = p;

-          }

-          else

-            break;

-        }

-

-        updateFirst(i, iv, minhandle);

-      }

-    }

-

-

-    void bubbleUpMax(int i)

-    {

-      if (i > 0)

-      {

-        T max = heap[i].last, iv = max;

-        Handle maxhandle = heap[i].lasthandle;

-        int p = (i + 1) / 2 - 1;

-

-        while (i > 0)

-        {

-          if (comparer.Compare(iv, max = heap[p = (i + 1) / 2 - 1].last) > 0)

-          {

-            updateLast(i, max, heap[p].lasthandle);

-            max = iv;

-            i = p;

-          }

-          else

-            break;

-        }

-

-        updateLast(i, iv, maxhandle);

-

-      }

-    }

-

-    #endregion

-

-    #region Constructors

-    /// <summary>

-    /// Create an interval heap with natural item comparer and default initial capacity (16)

-    /// </summary>

-    public IntervalHeap() : this(16) { }

-

-

-    /// <summary>

-    /// Create an interval heap with external item comparer and default initial capacity (16)

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    public IntervalHeap(SCG.IComparer<T> comparer) : this(16,comparer) { }

-

-

-    //TODO: maybe remove

-    /// <summary>

-    /// Create an interval heap with natural item comparer and prescribed initial capacity

-    /// </summary>

-    /// <param name="capacity">The initial capacity</param>

-    public IntervalHeap(int capacity) : this(capacity, Comparer<T>.Default, EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create an interval heap with external item comparer and prescribed initial capacity

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    /// <param name="capacity">The initial capacity</param>

-    public IntervalHeap(int capacity, SCG.IComparer<T> comparer) : this(capacity,comparer,new ComparerZeroHashCodeEqualityComparer<T>(comparer)) { }

-

-    IntervalHeap(int capacity, SCG.IComparer<T> comparer, SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      if (comparer == null)

-        throw new NullReferenceException("Item comparer cannot be null");

-      if (itemequalityComparer == null)

-        throw new NullReferenceException("Item equality comparer cannot be null");

-      this.comparer = comparer;

-      this.itemequalityComparer = itemequalityComparer;

-      int length = 1;

-      while (length < capacity) length <<= 1;

-      heap = new Interval[length];

-    }

-

-    #endregion

-

-    #region IPriorityQueue<T> Members

-

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// <exception cref="NoSuchItemException"/> if queue is empty

-    /// </summary>

-    /// <returns>The least item.</returns>

-    [Tested]

-    public T FindMin()

-    {

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      return heap[0].first;

-    }

-

-

-    /// <summary>

-    /// Remove the least item from this  priority queue.

-    /// <exception cref="NoSuchItemException"/> if queue is empty

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMin()

-    {

-      IPriorityQueueHandle<T> handle = null;

-      return DeleteMin(out handle);

-    }

-

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// <exception cref="NoSuchItemException"/> if queue is empty

-    /// </summary>

-    /// <returns>The largest item.</returns>

-    [Tested]

-    public T FindMax()

-    {

-      if (size == 0)

-        throw new NoSuchItemException("Heap is empty");

-      else if (size == 1)

-        return heap[0].first;

-      else

-        return heap[0].last;

-    }

-

-

-    /// <summary>

-    /// Remove the largest item from this  priority queue.

-    /// <exception cref="NoSuchItemException"/> if queue is empty

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMax()

-    {

-      IPriorityQueueHandle<T> handle = null;

-      return DeleteMax(out handle);

-    }

-

-

-    /// <summary>

-    /// The comparer object supplied at creation time for this collection

-    /// </summary>

-    /// <value>The comparer</value>

-    public SCG.IComparer<T> Comparer { get { return comparer; } }

-

-    #endregion

-

-    #region IExtensible<T> Members

-

-    /// <summary>

-    /// If true any call of an updating operation will throw an

-    /// <code>ReadOnlyCollectionException</code>

-    /// </summary>

-    /// <value>True if this collection is read-only.</value>

-    public bool IsReadOnly { get { return false; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True since this collection has bag semantics</value>

-    [Tested]

-    public bool AllowsDuplicates { [Tested]get { return true; } }

-

-    /// <summary>

-    /// Value is null since this collection has no equality concept for its items. 

-    /// </summary>

-    /// <value></value>

-    public virtual SCG.IEqualityComparer<T> EqualityComparer { get { return itemequalityComparer; } }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return false; } }

-

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The distinguished object to use for locking to synchronize multithreaded access</value>

-    [Tested]

-    public object SyncRoot { [Tested]get { return syncroot; } }

-

-

-    /// <summary>

-    /// Add an item to this priority queue.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True</returns>

-    [Tested]

-    public bool Add(T item)

-    {

-      stamp++;

-      if (add(null, item))

-      {

-        raiseItemsAdded(item, 1);

-        raiseCollectionChanged();

-        return true;

-      }

-      return false;

-    }

-

-    private bool add(Handle itemhandle, T item)

-    {

-      if (size == 0)

-      {

-        size = 1;

-        updateFirst(0, item, itemhandle);

-        return true;

-      }

-

-      if (size == 2 * heap.Length)

-      {

-        Interval[] newheap = new Interval[2 * heap.Length];

-

-        Array.Copy(heap, newheap, heap.Length);

-        heap = newheap;

-      }

-

-      if (size % 2 == 0)

-      {

-        int i = size / 2, p = (i + 1) / 2 - 1;

-        T tmp = heap[p].last;

-

-        if (comparer.Compare(item, tmp) > 0)

-        {

-          updateFirst(i, tmp, heap[p].lasthandle);

-          updateLast(p, item, itemhandle);

-          bubbleUpMax(p);

-        }

-        else

-        {

-          updateFirst(i, item, itemhandle);

-

-          if (comparer.Compare(item, heap[p].first) < 0)

-            bubbleUpMin(i);

-        }

-      }

-      else

-      {

-        int i = size / 2;

-        T other = heap[i].first;

-

-        if (comparer.Compare(item, other) < 0)

-        {

-          updateLast(i, other, heap[i].firsthandle);

-          updateFirst(i, item, itemhandle);

-          bubbleUpMin(i);

-        }

-        else

-        {

-          updateLast(i, item, itemhandle);

-          bubbleUpMax(i);

-        }

-      }

-      size++;

-

-      return true;

-    }

-

-    private void updateLast(int cell, T item, Handle handle)

-    {

-      heap[cell].last = item;

-      if (handle != null)

-        handle.index = 2 * cell + 1;

-      heap[cell].lasthandle = handle;

-    }

-

-    private void updateFirst(int cell, T item, Handle handle)

-    {

-      heap[cell].first = item;

-      if (handle != null)

-        handle.index = 2 * cell;

-      heap[cell].firsthandle = handle;

-    }

-

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. 

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      stamp++;

-      int oldsize = size;

-      foreach (T item in items)

-        add(null, item);

-      if (size != oldsize)

-      {

-        if ((ActiveEvents & EventTypeEnum.Added) != 0)

-          foreach (T item in items)

-            raiseItemsAdded(item, 1);

-        raiseCollectionChanged();

-      }

-    }

-

-    #endregion

-

-    #region ICollection<T> members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if this collection is empty.</value>

-    [Tested]

-    public override bool IsEmpty { [Tested]get { return size == 0; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The size of this collection</value>

-    [Tested]

-    public override int Count { [Tested]get { return size; } }

-

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>A characterization of the speed of the 

-    /// <code>Count</code> property in this collection.</value>

-    public override Speed CountSpeed { get { return Speed.Constant; } }

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    public override T Choose()

-    {

-      if (size == 0)

-        throw new NoSuchItemException("Collection is empty");

-      return heap[0].first;

-    }

-

-

-    /// <summary>

-    /// Create an enumerator for the collection

-    /// <para>Note: the enumerator does *not* enumerate the items in sorted order, 

-    /// but in the internal table order.</para>

-    /// </summary>

-    /// <returns>The enumerator(SIC)</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      int mystamp = stamp;

-      for (int i = 0; i < size; i++)

-      {

-        if (mystamp != stamp) throw new CollectionModifiedException();

-        yield return i % 2 == 0 ? heap[i >> 1].first : heap[i >> 1].last;

-      }

-      yield break;

-    }

-

-

-    #endregion

-

-    #region Diagnostics

-    private bool check(int i, T min, T max)

-    {

-      bool retval = true;

-      Interval interval = heap[i];

-      T first = interval.first, last = interval.last;

-

-      if (2 * i + 1 == size)

-      {

-        if (comparer.Compare(min, first) > 0)

-        {

-          Console.WriteLine("Cell {0}: parent.first({1}) > first({2})  [size={3}]", i, min, first, size);

-          retval = false;

-        }

-

-        if (comparer.Compare(first, max) > 0)

-        {

-          Console.WriteLine("Cell {0}: first({1}) > parent.last({2})  [size={3}]", i, first, max, size);

-          retval = false;

-        }

-        if (interval.firsthandle != null && interval.firsthandle.index != 2 * i)

-        {

-          Console.WriteLine("Cell {0}: firsthandle.index({1}) != 2*cell({2})  [size={3}]", i, interval.firsthandle.index, 2 * i, size);

-          retval = false;

-        }

-

-        return retval;

-      }

-      else

-      {

-        if (comparer.Compare(min, first) > 0)

-        {

-          Console.WriteLine("Cell {0}: parent.first({1}) > first({2})  [size={3}]", i, min, first, size);

-          retval = false;

-        }

-

-        if (comparer.Compare(first, last) > 0)

-        {

-          Console.WriteLine("Cell {0}: first({1}) > last({2})  [size={3}]", i, first, last, size);

-          retval = false;

-        }

-

-        if (comparer.Compare(last, max) > 0)

-        {

-          Console.WriteLine("Cell {0}: last({1}) > parent.last({2})  [size={3}]", i, last, max, size);

-          retval = false;

-        }

-        if (interval.firsthandle != null && interval.firsthandle.index != 2 * i)

-        {

-          Console.WriteLine("Cell {0}: firsthandle.index({1}) != 2*cell({2})  [size={3}]", i, interval.firsthandle.index, 2 * i, size);

-          retval = false;

-        }

-        if (interval.lasthandle != null && interval.lasthandle.index != 2 * i + 1)

-        {

-          Console.WriteLine("Cell {0}: lasthandle.index({1}) != 2*cell+1({2})  [size={3}]", i, interval.lasthandle.index, 2 * i + 1, size);

-          retval = false;

-        }

-

-        int l = 2 * i + 1, r = l + 1;

-

-        if (2 * l < size)

-          retval = retval && check(l, first, last);

-

-        if (2 * r < size)

-          retval = retval && check(r, first, last);

-      }

-

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Check the integrity of the internal data structures of this collection.

-    /// Only avaliable in DEBUG builds???

-    /// </summary>

-    /// <returns>True if check does not fail.</returns>

-    [Tested]

-    public bool Check()

-    {

-      if (size == 0)

-        return true;

-

-      if (size == 1)

-        return (object)(heap[0].first) != null;

-

-      return check(0, heap[0].first, heap[0].last);

-    }

-

-    #endregion

-

-    #region IPriorityQueue<T> Members

-

-    [Serializable]

-    class Handle : IPriorityQueueHandle<T>

-    {

-      /// <summary>

-      /// To save space, the index is 2*cell for heap[cell].first, and 2*cell+1 for heap[cell].last

-      /// </summary>

-      internal int index = -1;

-

-      public override string ToString()

-      {

-        return String.Format("[{0}]", index);

-      }

-

-    }

-

-    /// <summary>

-    /// Get or set the item corresponding to a handle. 

-    /// </summary>

-    /// <exception cref="InvalidPriorityQueueHandleException">if the handle is invalid for this queue</exception>

-    /// <param name="handle">The reference into the heap</param>

-    /// <returns></returns>

-    [Tested]

-    public T this[IPriorityQueueHandle<T> handle]

-    {

-      get

-      {

-        int cell;

-        bool isfirst;

-        Handle myhandle = checkHandle(handle, out cell, out isfirst);

-

-        return isfirst ? heap[cell].first : heap[cell].last;

-      }

-      set

-      {

-        Replace(handle, value);

-      }

-    }

-

-

-    /// <summary>

-    /// Check safely if a handle is valid for this queue and if so, report the corresponding queue item.

-    /// </summary>

-    /// <param name="handle">The handle to check</param>

-    /// <param name="item">If the handle is valid this will contain the corresponding item on output.</param>

-    /// <returns>True if the handle is valid.</returns>

-    public bool Find(IPriorityQueueHandle<T> handle, out T item)

-    {

-      Handle myhandle = handle as Handle;

-      if (myhandle == null)

-      {

-        item = default(T);

-        return false;

-      }

-      int toremove = myhandle.index;

-      int cell = toremove / 2;

-      bool isfirst = toremove % 2 == 0;

-      {

-        if (toremove == -1 || toremove >= size)

-        {

-          item = default(T);

-          return false;

-        }

-        Handle actualhandle = isfirst ? heap[cell].firsthandle : heap[cell].lasthandle;

-        if (actualhandle != myhandle)

-        {

-          item = default(T);

-          return false;

-        }

-      }

-      item = isfirst ? heap[cell].first : heap[cell].last;

-      return true;

-    }

-

-

-    /// <summary>

-    /// Add an item to the priority queue, receiving a 

-    /// handle for the item in the queue, 

-    /// or reusing an already existing handle.

-    /// </summary>

-    /// <param name="handle">On output: a handle for the added item. 

-    /// On input: null for allocating a new handle, an invalid handle for reuse. 

-    /// A handle for reuse must be compatible with this priority queue, 

-    /// by being created by a priority queue of the same runtime type, but not 

-    /// necessarily the same priority queue object.</param>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True since item will always be added unless the call throws an exception.</returns>

-    [Tested]

-    public bool Add(ref IPriorityQueueHandle<T> handle, T item)

-    {

-      stamp++;

-      Handle myhandle = (Handle)handle;

-      if (myhandle == null)

-        handle = myhandle = new Handle();

-      else

-          if (myhandle.index != -1)

-        throw new InvalidPriorityQueueHandleException("Handle not valid for reuse");

-      if (add(myhandle, item))

-      {

-        raiseItemsAdded(item, 1);

-        raiseCollectionChanged();

-        return true;

-      }

-      return false;

-    }

-

-    /// <summary>

-    /// Delete an item with a handle from a priority queue.

-    /// </summary>

-    /// <exception cref="InvalidPriorityQueueHandleException">if the handle is invalid</exception>

-    /// <param name="handle">The handle for the item. The handle will be invalidated, but reusable.</param>

-    /// <returns>The deleted item</returns>

-    [Tested]

-    public T Delete(IPriorityQueueHandle<T> handle)

-    {

-      stamp++;

-      int cell;

-      bool isfirst;

-      Handle myhandle = checkHandle(handle, out cell, out isfirst);

-

-      T retval;

-      myhandle.index = -1;

-      int lastcell = (size - 1) / 2;

-

-      if (cell == lastcell)

-      {

-        if (isfirst)

-        {

-          retval = heap[cell].first;

-          if (size % 2 == 0)

-          {

-            updateFirst(cell, heap[cell].last, heap[cell].lasthandle);

-            heap[cell].last = default(T);

-            heap[cell].lasthandle = null;

-          }

-          else

-          {

-            heap[cell].first = default(T);

-            heap[cell].firsthandle = null;

-          }

-        }

-        else

-        {

-          retval = heap[cell].last;

-          heap[cell].last = default(T);

-          heap[cell].lasthandle = null;

-        }

-        size--;

-      }

-      else if (isfirst)

-      {

-        retval = heap[cell].first;

-

-        if (size % 2 == 0)

-        {

-          updateFirst(cell, heap[lastcell].last, heap[lastcell].lasthandle);

-          heap[lastcell].last = default(T);

-          heap[lastcell].lasthandle = null;

-        }

-        else

-        {

-          updateFirst(cell, heap[lastcell].first, heap[lastcell].firsthandle);

-          heap[lastcell].first = default(T);

-          heap[lastcell].firsthandle = null;

-        }

-

-        size--;

-        if (heapifyMin(cell))

-          bubbleUpMax(cell);

-        else

-          bubbleUpMin(cell);

-      }

-      else

-      {

-        retval = heap[cell].last;

-

-        if (size % 2 == 0)

-        {

-          updateLast(cell, heap[lastcell].last, heap[lastcell].lasthandle);

-          heap[lastcell].last = default(T);

-          heap[lastcell].lasthandle = null;

-        }

-        else

-        {

-          updateLast(cell, heap[lastcell].first, heap[lastcell].firsthandle);

-          heap[lastcell].first = default(T);

-          heap[lastcell].firsthandle = null;

-        }

-

-        size--;

-        if (heapifyMax(cell))

-          bubbleUpMin(cell);

-        else

-          bubbleUpMax(cell);

-      }

-

-      raiseItemsRemoved(retval, 1);

-      raiseCollectionChanged();

-

-      return retval;

-    }

-

-    private Handle checkHandle(IPriorityQueueHandle<T> handle, out int cell, out bool isfirst)

-    {

-      Handle myhandle = (Handle)handle;

-      int toremove = myhandle.index;

-      cell = toremove / 2;

-      isfirst = toremove % 2 == 0;

-      {

-        if (toremove == -1 || toremove >= size)

-          throw new InvalidPriorityQueueHandleException("Invalid handle, index out of range");

-        Handle actualhandle = isfirst ? heap[cell].firsthandle : heap[cell].lasthandle;

-        if (actualhandle != myhandle)

-          throw new InvalidPriorityQueueHandleException("Invalid handle, doesn't match queue");

-      }

-      return myhandle;

-    }

-

-

-    /// <summary>

-    /// Replace an item with a handle in a priority queue with a new item. 

-    /// Typically used for changing the priority of some queued object.

-    /// </summary>

-    /// <param name="handle">The handle for the old item</param>

-    /// <param name="item">The new item</param>

-    /// <returns>The old item</returns>

-    [Tested]

-    public T Replace(IPriorityQueueHandle<T> handle, T item)

-    {

-      stamp++;

-      int cell;

-      bool isfirst;

-      checkHandle(handle, out cell, out isfirst);

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      T retval;

-

-      if (isfirst)

-      {

-        retval = heap[cell].first;

-        heap[cell].first = item;

-        if (size == 2 * cell + 1) // cell == lastcell

-        {

-          int p = (cell + 1) / 2 - 1;

-          if (comparer.Compare(item, heap[p].last) > 0)

-          {

-            Handle thehandle = heap[cell].firsthandle;

-            updateFirst(cell, heap[p].last, heap[p].lasthandle);

-            updateLast(p, item, thehandle);

-            bubbleUpMax(p);

-          }

-          else

-            bubbleUpMin(cell);

-        }

-        else if (heapifyMin(cell))

-          bubbleUpMax(cell);

-        else

-          bubbleUpMin(cell);

-      }

-      else

-      {

-        retval = heap[cell].last;

-        heap[cell].last = item;

-        if (heapifyMax(cell))

-          bubbleUpMin(cell);

-        else

-          bubbleUpMax(cell);

-      }

-

-      raiseItemsRemoved(retval, 1);

-      raiseItemsAdded(item, 1);

-      raiseCollectionChanged();

-

-      return retval;

-    }

-

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the item.</param>

-    /// <returns>The least item.</returns>

-    public T FindMin(out IPriorityQueueHandle<T> handle)

-    {

-      if (size == 0)

-        throw new NoSuchItemException();

-      handle = heap[0].firsthandle;

-

-      return heap[0].first;

-    }

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the item.</param>

-    /// <returns>The largest item.</returns>

-    public T FindMax(out IPriorityQueueHandle<T> handle)

-    {

-      if (size == 0)

-        throw new NoSuchItemException();

-      else if (size == 1)

-      {

-        handle = heap[0].firsthandle;

-        return heap[0].first;

-      }

-      else

-      {

-        handle = heap[0].lasthandle;

-        return heap[0].last;

-      }

-    }

-

-    /// <summary>

-    /// Remove the least item from this priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the removed item.</param>

-    /// <returns>The removed item.</returns>

-    public T DeleteMin(out IPriorityQueueHandle<T> handle)

-    {

-      stamp++;

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      T retval = heap[0].first;

-      Handle myhandle = heap[0].firsthandle;

-      handle = myhandle;

-      if (myhandle != null)

-        myhandle.index = -1;

-

-      if (size == 1)

-      {

-        size = 0;

-        heap[0].first = default(T);

-        heap[0].firsthandle = null;

-      }

-      else

-      {

-        int lastcell = (size - 1) / 2;

-

-        if (size % 2 == 0)

-        {

-          updateFirst(0, heap[lastcell].last, heap[lastcell].lasthandle);

-          heap[lastcell].last = default(T);

-          heap[lastcell].lasthandle = null;

-        }

-        else

-        {

-          updateFirst(0, heap[lastcell].first, heap[lastcell].firsthandle);

-          heap[lastcell].first = default(T);

-          heap[lastcell].firsthandle = null;

-        }

-

-        size--;

-        heapifyMin(0);

-      }

-

-      raiseItemsRemoved(retval, 1);

-      raiseCollectionChanged();

-      return retval;

-

-    }

-

-    /// <summary>

-    /// Remove the largest item from this priority queue.

-    /// </summary>

-    /// <param name="handle">On return: the handle of the removed item.</param>

-    /// <returns>The removed item.</returns>

-    public T DeleteMax(out IPriorityQueueHandle<T> handle)

-    {

-      stamp++;

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      T retval;

-      Handle myhandle;

-

-      if (size == 1)

-      {

-        size = 0;

-        retval = heap[0].first;

-        myhandle = heap[0].firsthandle;

-        if (myhandle != null)

-          myhandle.index = -1;

-        heap[0].first = default(T);

-        heap[0].firsthandle = null;

-      }

-      else

-      {

-        retval = heap[0].last;

-        myhandle = heap[0].lasthandle;

-        if (myhandle != null)

-          myhandle.index = -1;

-

-        int lastcell = (size - 1) / 2;

-

-        if (size % 2 == 0)

-        {

-          updateLast(0, heap[lastcell].last, heap[lastcell].lasthandle);

-          heap[lastcell].last = default(T);

-          heap[lastcell].lasthandle = null;

-        }

-        else

-        {

-          updateLast(0, heap[lastcell].first, heap[lastcell].firsthandle);

-          heap[lastcell].first = default(T);

-          heap[lastcell].firsthandle = null;

-        }

-

-        size--;

-        heapifyMax(0);

-      }

-      raiseItemsRemoved(retval, 1);

-      raiseCollectionChanged();

-      handle = myhandle;

-      return retval;

-    }

-

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this IntervalHeap.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      IntervalHeap<T> clone = new IntervalHeap<T>(size, comparer, itemequalityComparer);

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/linkedlists/HashedLinkedList.cs b/mcs/class/Mono.C5/C5/linkedlists/HashedLinkedList.cs
deleted file mode 100755
index c0750d536bc..00000000000
--- a/mcs/class/Mono.C5/C5/linkedlists/HashedLinkedList.cs
+++ /dev/null
@@ -1,3785 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define HASHINDEX

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A list collection class based on a doubly linked list data structure.

-  /// </summary>

-  [Serializable]

-  public class HashedLinkedList<T> : SequencedBase<T>, IList<T>

-#if HASHINDEX

-#else

-, IStack<T>, IQueue<T>

-#endif

-  {

-    #region Fields

-    /// <summary>

-    /// IExtensible.Add(T) always does AddLast(T), fIFO determines 

-    /// if T Remove() does RemoveFirst() or RemoveLast()

-    /// </summary>

-    bool fIFO = true;

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return underlying == null ? EventTypeEnum.All : EventTypeEnum.None; } }

-

-    #endregion

-

-    //Invariant:  startsentinel != null && endsentinel != null

-    //If size==0: startsentinel.next == endsentinel && endsentinel.prev == startsentinel

-    //Else:      startsentinel.next == First && endsentinel.prev == Last)

-    /// <summary>

-    /// Node to the left of first node 

-    /// </summary>

-    Node startsentinel;

-    /// <summary>

-    /// Node to the right of last node

-    /// </summary>

-    Node endsentinel;

-    /// <summary>

-    /// Offset of this view in underlying list

-    /// </summary>

-#if HASHINDEX

-    int? offset;

-#else

-    int offset;

-#endif

-

-    /// <summary>

-    /// underlying list of this view (or null for the underlying list)

-    /// </summary>

-    HashedLinkedList<T> underlying;

-

-    //Note: all views will have the same views list since all view objects are created by MemeberwiseClone()

-    WeakViewList<HashedLinkedList<T>> views;

-    WeakViewList<HashedLinkedList<T>>.Node myWeakReference;

-

-    /// <summary>

-    /// Has this list or view not been invalidated by some operation (by someone calling Dispose())

-    /// </summary>

-    bool isValid = true;

-

-

-#if HASHINDEX

-    HashDictionary<T, Node> dict;

-    /// <summary>

-    /// Number of taggroups

-    /// </summary>

-    int taggroups;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    int Taggroups

-    {

-      get { return underlying == null ? taggroups : underlying.taggroups; }

-      set { if (underlying == null) taggroups = value; else underlying.taggroups = value; }

-    }

-#endif

-

-    #endregion

-

-    #region Util

-

-    bool equals(T i1, T i2) { return itemequalityComparer.Equals(i1, i2); }

-

-    #region Check utilities

-    /// <summary>

-    /// Check if it is valid to perform updates and increment stamp of 

-    /// underlying if this is a view.

-    /// <para>This method should be called in every public modifying 

-    /// methods before any modifications are performed.

-    /// </para>

-    /// </summary>

-    /// <exception cref="InvalidOperationException"> if check fails.</exception>

-    protected override void updatecheck()

-    {

-      validitycheck();

-      base.updatecheck();

-      if (underlying != null)

-        underlying.stamp++;

-    }

-

-    /// <summary>

-    /// Check if we are a view that the underlyinglist has only been updated through us.

-    /// <br/>

-    /// This method should be called from enumerators etc to guard against 

-    /// modification of the base collection.

-    /// </summary>

-    /// <exception cref="InvalidOperationException"> if check fails.</exception>

-    void validitycheck()

-    {

-      if (!isValid)

-        throw new ViewDisposedException();

-    }

-

-    /// <summary>

-    /// Check that the list has not been updated since a particular time.

-    /// </summary>

-    /// <param name="stamp">The stamp indicating the time.</param>

-    /// <exception cref="CollectionModifiedException"> if check fails.</exception>

-    protected override void modifycheck(int stamp)

-    {

-      validitycheck();

-      if ((underlying != null ? underlying.stamp : this.stamp) != stamp)

-        throw new CollectionModifiedException();

-    }

-    #endregion

-

-    #region Searching

-    bool contains(T item, out Node node)

-    {

-#if HASHINDEX

-      if (dict.Find(item, out node))

-        return insideview(node);

-#else

-      //TODO: search from both ends? Or search from the end selected by FIFO?

-      node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        if (equals(item, node.item))

-          return true;

-        node = node.next;

-      }

-#endif

-      return false;

-    }

-

-    /// <summary>

-    /// Search forwards from a node for a node with a particular item.

-    /// </summary>

-    /// <param name="item">The item to look for</param>

-    /// <param name="node">On input, the node to start at. If item was found, the node found on output.</param>

-    /// <param name="index">If node was found, the value will be the number of links followed higher than 

-    /// the value on input. If item was not found, the value on output is undefined.</param>

-    /// <returns>True if node was found.</returns>

-    bool find(T item, ref Node node, ref int index)

-    {

-      while (node != endsentinel)

-      {

-        //if (item.Equals(node.item))

-        if (itemequalityComparer.Equals(item, node.item))

-          return true;

-

-        index++;

-        node = node.next;

-      }

-

-      return false;

-    }

-

-    bool dnif(T item, ref Node node, ref int index)

-    {

-      while (node != startsentinel)

-      {

-        //if (item.Equals(node.item))

-        if (itemequalityComparer.Equals(item, node.item))

-          return true;

-

-        index--;

-        node = node.prev;

-      }

-

-      return false;

-    }

-

-#if HASHINDEX

-    bool insideview(Node node)

-    {

-      if (underlying == null)

-        return true;

-      return (startsentinel.precedes(node) && node.precedes(endsentinel));

-    }

-#endif

-

-    #endregion

-

-    #region Indexing

-    /// <summary>

-    /// Return the node at position pos

-    /// </summary>

-    /// <param name="pos"></param>

-    /// <returns></returns>

-    Node get(int pos)

-    {

-      if (pos < 0 || pos >= size)

-        throw new IndexOutOfRangeException();

-      else if (pos < size / 2)

-      {              // Closer to front

-        Node node = startsentinel;

-

-        for (int i = 0; i <= pos; i++)

-          node = node.next;

-

-        return node;

-      }

-      else

-      {                            // Closer to end

-        Node node = endsentinel;

-

-        for (int i = size; i > pos; i--)

-          node = node.prev;

-

-        return node;

-      }

-    }

-

-    /// <summary>

-    /// Find the distance from pos to the set given by positions. Return the

-    /// signed distance as return value and as an out parameter, the

-    /// array index of the nearest position. This is used for up to length 5 of

-    /// positions, and we do not assume it is sorted. 

-    /// </summary>

-    /// <param name="pos"></param>

-    /// <param name="positions"></param>

-    /// <param name="nearest"></param>

-    /// <returns></returns>

-    int dist(int pos, out int nearest, int[] positions)

-    {

-      nearest = -1;

-      int bestdist = int.MaxValue;

-      int signeddist = bestdist;

-      for (int i = 0; i < positions.Length; i++)

-      {

-        int thisdist = positions[i] - pos;

-        if (thisdist >= 0 && thisdist < bestdist) { nearest = i; bestdist = thisdist; signeddist = thisdist; }

-        if (thisdist < 0 && -thisdist < bestdist) { nearest = i; bestdist = -thisdist; signeddist = thisdist; }

-      }

-      return signeddist;

-    }

-

-    /// <summary>

-    /// Find the node at position pos, given known positions of several nodes.

-    /// </summary>

-    /// <param name="pos"></param>

-    /// <param name="positions"></param>

-    /// <param name="nodes"></param>

-    /// <returns></returns>

-    Node get(int pos, int[] positions, Node[] nodes)

-    {

-      int nearest;

-      int delta = dist(pos, out nearest, positions);

-      Node node = nodes[nearest];

-      if (delta > 0)

-        for (int i = 0; i < delta; i++)

-          node = node.prev;

-      else

-        for (int i = 0; i > delta; i--)

-          node = node.next;

-      return node;

-    }

-

-    /// <summary>

-    /// Get nodes at positions p1 and p2, given nodes at several positions.

-    /// </summary>

-    /// <param name="p1"></param>

-    /// <param name="p2"></param>

-    /// <param name="n1"></param>

-    /// <param name="n2"></param>

-    /// <param name="positions"></param>

-    /// <param name="nodes"></param>

-    void getPair(int p1, int p2, out Node n1, out Node n2, int[] positions, Node[] nodes)

-    {

-      int nearest1, nearest2;

-      int delta1 = dist(p1, out nearest1, positions), d1 = delta1 < 0 ? -delta1 : delta1;

-      int delta2 = dist(p2, out nearest2, positions), d2 = delta2 < 0 ? -delta2 : delta2;

-

-      if (d1 < d2)

-      {

-        n1 = get(p1, positions, nodes);

-        n2 = get(p2, new int[] { positions[nearest2], p1 }, new Node[] { nodes[nearest2], n1 });

-      }

-      else

-      {

-        n2 = get(p2, positions, nodes);

-        n1 = get(p1, new int[] { positions[nearest1], p2 }, new Node[] { nodes[nearest1], n2 });

-      }

-    }

-    #endregion

-

-    #region Insertion

-#if HASHINDEX

-    void insert(int index, Node succ, T item)

-    {

-      Node newnode = new Node(item);

-      if (dict.FindOrAdd(item, ref newnode))

-        throw new DuplicateNotAllowedException("Item already in indexed list");

-      insertNode(true, succ, newnode);

-    }

-

-    /// <summary>

-    /// Insert a Node before another one. Unchecked version. 

-    /// </summary>

-    /// <param name="succ">The successor to be</param>

-    /// <param name="newnode">Node to insert</param>

-    /// <param name="updateViews">update overlapping view in this call</param>

-    void insertNode(bool updateViews, Node succ, Node newnode)

-    {

-      newnode.next = succ;

-      Node pred = newnode.prev = succ.prev;

-      succ.prev.next = newnode;

-      succ.prev = newnode;

-      size++;

-      if (underlying != null)

-        underlying.size++;

-      settag(newnode);

-      if (updateViews)

-        fixViewsAfterInsert(succ, pred, 1, 0);

-    }

-#else

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="index">The index in this view</param>

-    /// <param name="succ"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    Node insert(int index, Node succ, T item)

-    {

-      Node newnode = new Node(item, succ.prev, succ);

-      succ.prev.next = newnode;

-      succ.prev = newnode;

-      size++;

-      if (underlying != null)

-        underlying.size++;

-      fixViewsAfterInsert(succ, newnode.prev, 1, Offset + index);

-      return newnode;

-    }

-#endif

-    #endregion

-

-    #region Removal

-    T remove(Node node, int index)

-    {

-      fixViewsBeforeSingleRemove(node, Offset + index);

-      node.prev.next = node.next;

-      node.next.prev = node.prev;

-      size--;

-      if (underlying != null)

-        underlying.size--;

-#if HASHINDEX

-        removefromtaggroup(node);

-#endif

-      return node.item;

-    }

-

-#if HASHINDEX

-    private bool dictremove(T item, out Node node)

-    {

-      if (underlying == null)

-      {

-        if (!dict.Remove(item, out node))

-          return false;

-      }

-      else

-      {

-        //We cannot avoid calling dict twice - have to intersperse the listorder test!

-        if (!contains(item, out node))

-          return false;

-        dict.Remove(item);

-      }

-      return true;

-    }

-#endif

-    #endregion

-

-    #region fixView utilities

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="added">The actual number of inserted nodes</param>

-    /// <param name="pred">The predecessor of the inserted nodes</param>

-    /// <param name="succ">The successor of the added nodes</param>

-    /// <param name="realInsertionIndex"></param>

-    void fixViewsAfterInsert(Node succ, Node pred, int added, int realInsertionIndex)

-    {

-      if (views != null)

-        foreach (HashedLinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-#if HASHINDEX

-          if (pred.precedes(view.startsentinel) || (view.startsentinel == pred && view.size > 0))

-            view.offset += added;

-          if (view.startsentinel.precedes(pred) && succ.precedes(view.endsentinel))

-            view.size += added;

-          if (view.startsentinel == pred && view.size > 0)

-            view.startsentinel = succ.prev;

-          if (view.endsentinel == succ)

-            view.endsentinel = pred.next;

-#else

-            if (view.Offset == realInsertionIndex && view.size > 0)

-              view.startsentinel = succ.prev;

-            if (view.Offset + view.size == realInsertionIndex)

-              view.endsentinel = pred.next;

-            if (view.Offset < realInsertionIndex && view.Offset + view.size > realInsertionIndex)

-              view.size += added;

-            if (view.Offset > realInsertionIndex || (view.Offset == realInsertionIndex && view.size > 0))

-              view.offset += added;

-#endif

-          }

-        }

-    }

-

-    void fixViewsBeforeSingleRemove(Node node, int realRemovalIndex)

-    {

-      if (views != null)

-        foreach (HashedLinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-#if HASHINDEX

-          if (view.startsentinel.precedes(node) && node.precedes(view.endsentinel))

-            view.size--;

-          if (!view.startsentinel.precedes(node))

-            view.offset--;

-          if (view.startsentinel == node)

-            view.startsentinel = node.prev;

-          if (view.endsentinel == node)

-            view.endsentinel = node.next;

-#else

-            if (view.offset - 1 == realRemovalIndex)

-              view.startsentinel = node.prev;

-            if (view.offset + view.size == realRemovalIndex)

-              view.endsentinel = node.next;

-            if (view.offset <= realRemovalIndex && view.offset + view.size > realRemovalIndex)

-              view.size--;

-            if (view.offset > realRemovalIndex)

-              view.offset--;

-#endif

-          }

-        }

-    }

-

-#if HASHINDEX

-#else

-    void fixViewsBeforeRemove(int start, int count, Node first, Node last)

-    {

-      int clearend = start + count - 1;

-      if (views != null)

-        foreach (HashedLinkedList<T> view in views)

-        {

-          if (view == this)

-            continue;

-          int viewoffset = view.Offset, viewend = viewoffset + view.size - 1;

-          //sentinels

-          if (start < viewoffset && viewoffset - 1 <= clearend)

-            view.startsentinel = first.prev;

-          if (start <= viewend + 1 && viewend < clearend)

-            view.endsentinel = last.next;

-          //offsets and sizes

-          if (start < viewoffset)

-          {

-            if (clearend < viewoffset)

-              view.offset = viewoffset - count;

-            else

-            {

-              view.offset = start;

-              view.size = clearend < viewend ? viewend - clearend : 0;

-            }

-          }

-          else if (start <= viewend)

-            view.size = clearend <= viewend ? view.size - count : start - viewoffset;

-        }

-    }

-#endif

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <returns>The position of View(otherOffset, otherSize) wrt. this view</returns>

-    MutualViewPosition viewPosition(HashedLinkedList<T> otherView)

-    {

-#if HASHINDEX

-      Node otherstartsentinel = otherView.startsentinel, otherendsentinel = otherView.endsentinel,

-        first = startsentinel.next, last = endsentinel.prev,

-        otherfirst = otherstartsentinel.next, otherlast = otherendsentinel.prev;

-      if (last.precedes(otherfirst) || otherlast.precedes(first))

-        return MutualViewPosition.NonOverlapping;

-      if (size == 0 || (otherstartsentinel.precedes(first) && last.precedes(otherendsentinel)))

-        return MutualViewPosition.Contains;

-      if (otherView.size == 0 || (startsentinel.precedes(otherfirst) && otherlast.precedes(endsentinel)))

-        return MutualViewPosition.ContainedIn;

-      return MutualViewPosition.Overlapping;

-#else

-      int end = offset + size, otherOffset = otherView.offset, otherSize = otherView.size, otherEnd = otherOffset + otherSize;

-      if (otherOffset >= end || otherEnd <= offset)

-        return MutualViewPosition.NonOverlapping;

-      if (size == 0 || (otherOffset <= offset && end <= otherEnd))

-        return MutualViewPosition.Contains;

-      if (otherSize == 0 || (offset <= otherOffset && otherEnd <= end))

-        return MutualViewPosition.ContainedIn;

-      return MutualViewPosition.Overlapping;

-#endif

-    }

-

-    void disposeOverlappingViews(bool reverse)

-    {

-      if (views != null)

-      {

-        foreach (HashedLinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-            switch (viewPosition(view))

-            {

-              case MutualViewPosition.ContainedIn:

-                if (reverse)

-                { }

-                else

-                  view.Dispose();

-                break;

-              case MutualViewPosition.Overlapping:

-                view.Dispose();

-                break;

-              case MutualViewPosition.Contains:

-              case MutualViewPosition.NonOverlapping:

-                break;

-            }

-          }

-        }

-      }

-    }

-

-    #endregion

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// Create a linked list with en external item equalityComparer

-    /// </summary>

-    /// <param name="itemequalityComparer">The external equalityComparer</param>

-    public HashedLinkedList(SCG.IEqualityComparer<T> itemequalityComparer)

-      : base(itemequalityComparer)

-    {

-      offset = 0;

-      size = stamp = 0;

-      startsentinel = new Node(default(T));

-      endsentinel = new Node(default(T));

-      startsentinel.next = endsentinel;

-      endsentinel.prev = startsentinel;

-#if HASHINDEX

-      //It is important that the sentinels are different:

-      startsentinel.taggroup = new TagGroup();

-      startsentinel.taggroup.tag = int.MinValue;

-      startsentinel.taggroup.count = 0;

-      endsentinel.taggroup = new TagGroup();

-      endsentinel.taggroup.tag = int.MaxValue;

-      endsentinel.taggroup.count = 0;

-      dict = new HashDictionary<T, Node>(itemequalityComparer);

-#endif

-    }

-

-    /// <summary>

-    /// Create a linked list with the natural item equalityComparer

-    /// </summary>

-    public HashedLinkedList() : this(EqualityComparer<T>.Default) { }

-

-    #endregion

-

-    #region Node nested class

-

-    /// <summary>

-    /// An individual cell in the linked list

-    /// </summary>

-    [Serializable]

-    class Node

-    {

-      public Node prev;

-

-      public Node next;

-

-      public T item;

-

-      #region Tag support

-#if HASHINDEX

-      internal int tag;

-

-      internal TagGroup taggroup;

-

-      internal bool precedes(Node that)

-      {

-        //Debug.Assert(taggroup != null, "taggroup field null");

-        //Debug.Assert(that.taggroup != null, "that.taggroup field null");

-        int t1 = taggroup.tag;

-        int t2 = that.taggroup.tag;

-

-        return t1 < t2 ? true : t1 > t2 ? false : tag < that.tag;

-      }

-#endif

-      #endregion

-

-      [Tested]

-      internal Node(T item) { this.item = item; }

-

-      [Tested]

-      internal Node(T item, Node prev, Node next)

-      {

-        this.item = item; this.prev = prev; this.next = next;

-      }

-

-      public override string ToString()

-      {

-#if HASHINDEX

-        return String.Format("Node: (item={0}, tag={1})", item, tag);

-#else

-        return String.Format("Node(item={0})", item);

-#endif

-      }

-    }

-

-    #endregion

-

-    #region Taggroup nested class and tag maintenance utilities

-#if HASHINDEX

-    /// <summary>

-    /// A group of nodes with the same high tag. Purpose is to be

-    /// able to tell the sequence order of two nodes without having to scan through

-    /// the list.

-    /// </summary>

-    [Serializable]

-    class TagGroup

-    {

-      internal int tag, count;

-

-      internal Node first, last;

-

-      /// <summary>

-      /// Pretty print a tag group

-      /// </summary>

-      /// <returns>Formatted tag group</returns>

-      public override string ToString()

-      { return String.Format("TagGroup(tag={0}, cnt={1}, fst={2}, lst={3})", tag, count, first, last); }

-    }

-

-    //Constants for tag maintenance

-    const int wordsize = 32;

-

-    const int lobits = 3;

-

-    const int hibits = lobits + 1;

-

-    const int losize = 1 << lobits;

-

-    const int hisize = 1 << hibits;

-

-    const int logwordsize = 5;

-

-    TagGroup gettaggroup(Node pred, Node succ, out int lowbound, out int highbound)

-    {

-      TagGroup predgroup = pred.taggroup, succgroup = succ.taggroup;

-

-      if (predgroup == succgroup)

-      {

-        lowbound = pred.tag + 1;

-        highbound = succ.tag - 1;

-        return predgroup;

-      }

-      else if (predgroup.first != null)

-      {

-        lowbound = pred.tag + 1;

-        highbound = int.MaxValue;

-        return predgroup;

-      }

-      else if (succgroup.first != null)

-      {

-        lowbound = int.MinValue;

-        highbound = succ.tag - 1;

-        return succgroup;

-      }

-      else

-      {

-        lowbound = int.MinValue;

-        highbound = int.MaxValue;

-        return new TagGroup();

-      }

-    }

-

-

-    /// <summary>

-    /// Put a tag on a node (already inserted in the list). Split taggroups and renumber as 

-    /// necessary.

-    /// </summary>

-    /// <param name="node">The node to tag</param>

-    void settag(Node node)

-    {

-      Node pred = node.prev, succ = node.next;

-      TagGroup predgroup = pred.taggroup, succgroup = succ.taggroup;

-

-      if (predgroup == succgroup)

-      {

-        node.taggroup = predgroup;

-        predgroup.count++;

-        if (pred.tag + 1 == succ.tag)

-          splittaggroup(predgroup);

-        else

-          node.tag = (pred.tag + 1) / 2 + (succ.tag - 1) / 2;

-      }

-      else if (predgroup.first != null)

-      {

-        node.taggroup = predgroup;

-        predgroup.last = node;

-        predgroup.count++;

-        if (pred.tag == int.MaxValue)

-          splittaggroup(predgroup);

-        else

-          node.tag = pred.tag / 2 + int.MaxValue / 2 + 1;

-      }

-      else if (succgroup.first != null)

-      {

-        node.taggroup = succgroup;

-        succgroup.first = node;

-        succgroup.count++;

-        if (succ.tag == int.MinValue)

-          splittaggroup(node.taggroup);

-        else

-          node.tag = int.MinValue / 2 + (succ.tag - 1) / 2;

-      }

-      else

-      {

-        Debug.Assert(Taggroups == 0);

-

-        TagGroup newgroup = new TagGroup();

-

-        Taggroups = 1;

-        node.taggroup = newgroup;

-        newgroup.first = newgroup.last = node;

-        newgroup.count = 1;

-        return;

-      }

-    }

-

-

-    /// <summary>

-    /// Remove a node from its taggroup.

-    /// <br/> When this is called, node must already have been removed from the underlying list

-    /// </summary>

-    /// <param name="node">The node to remove</param>

-    void removefromtaggroup(Node node)

-    {

-      //

-      TagGroup taggroup = node.taggroup;

-

-      if (--taggroup.count == 0)

-      {

-        Taggroups--;

-        return;

-      }

-

-      if (node == taggroup.first)

-        taggroup.first = node.next;

-

-      if (node == taggroup.last)

-        taggroup.last = node.prev;

-

-      //node.taggroup = null;

-      if (taggroup.count != losize || Taggroups == 1)

-        return;

-

-      TagGroup otg;

-

-      if ((otg = taggroup.first.prev.taggroup).count <= losize)

-        taggroup.first = otg.first;

-      else if ((otg = taggroup.last.next.taggroup).count <= losize)

-        taggroup.last = otg.last;

-      else

-        return;

-

-      Node n = otg.first;

-

-      for (int i = 0, length = otg.count; i < length; i++)

-      {

-        n.taggroup = taggroup;

-        n = n.next;

-      }

-

-      taggroup.count += otg.count;

-      Taggroups--;

-      n = taggroup.first;

-

-      const int ofs = wordsize - hibits;

-

-      for (int i = 0, count = taggroup.count; i < count; i++)

-      {

-        n.tag = (i - losize) << ofs; //(i-8)<<28 

-        n = n.next;

-      }

-    }

-

-

-    /// <summary>

-    /// Split a tag group to make rom for more tags.

-    /// </summary>

-    /// <param name="taggroup">The tag group</param>

-    void splittaggroup(TagGroup taggroup)

-    {

-      Node n = taggroup.first;

-      int ptgt = taggroup.first.prev.taggroup.tag;

-      int ntgt = taggroup.last.next.taggroup.tag;

-

-      Debug.Assert(ptgt + 1 <= ntgt - 1);

-

-      int ofs = wordsize - hibits;

-#warning hack alert was there a -1 here?

-      int newtgs = taggroup.count / hisize;// - 1;

-      int tgtdelta = (int)((ntgt + 0.0 - ptgt) / (newtgs + 2)), tgtag = ptgt;

-

-      tgtdelta = tgtdelta == 0 ? 1 : tgtdelta;

-      for (int j = 0; j < newtgs; j++)

-      {

-        TagGroup newtaggroup = new TagGroup();

-

-        newtaggroup.tag = (tgtag = tgtag >= ntgt - tgtdelta ? ntgt : tgtag + tgtdelta);

-        newtaggroup.first = n;

-        newtaggroup.count = hisize;

-        for (int i = 0; i < hisize; i++)

-        {

-          n.taggroup = newtaggroup;

-          n.tag = (i - losize) << ofs; //(i-8)<<28 

-          n = n.next;

-        }

-

-        newtaggroup.last = n.prev;

-      }

-

-      int rest = taggroup.count - hisize * newtgs;

-

-      taggroup.first = n;

-      taggroup.count = rest;

-      taggroup.tag = (tgtag = tgtag >= ntgt - tgtdelta ? ntgt : tgtag + tgtdelta); ofs--;

-      for (int i = 0; i < rest; i++)

-      {

-        n.tag = (i - hisize) << ofs; //(i-16)<<27 

-        n = n.next;

-      }

-

-      taggroup.last = n.prev;

-      Taggroups += newtgs;

-      if (tgtag == ntgt)

-        redistributetaggroups(taggroup);

-    }

-

-

-    private void redistributetaggroups(TagGroup taggroup)

-    {

-      TagGroup pred = taggroup, succ = taggroup, tmp;

-      double limit = 1, bigt = Math.Pow(Taggroups, 1.0 / 30);//?????

-      int bits = 1, count = 1, lowmask = 0, himask = 0, target = 0;

-

-      do

-      {

-        bits++;

-        lowmask = (1 << bits) - 1;

-        himask = ~lowmask;

-        target = taggroup.tag & himask;

-        while ((tmp = pred.first.prev.taggroup).first != null && (tmp.tag & himask) == target)

-        { count++; pred = tmp; }

-

-        while ((tmp = succ.last.next.taggroup).last != null && (tmp.tag & himask) == target)

-        { count++; succ = tmp; }

-

-        limit *= bigt;

-      } while (count > limit);

-

-      //redistibute tags

-      int lob = pred.first.prev.taggroup.tag, upb = succ.last.next.taggroup.tag;

-      int delta = upb / (count + 1) - lob / (count + 1);

-

-      Debug.Assert(delta > 0);

-      for (int i = 0; i < count; i++)

-      {

-        pred.tag = lob + (i + 1) * delta;

-        pred = pred.last.next.taggroup;

-      }

-    }

-#endif

-

-    #endregion

-

-    #region Position, PositionComparer and ViewHandler nested types

-    class PositionComparer : SCG.IComparer<Position>

-    {

-      static PositionComparer _default;

-      PositionComparer() { }

-      public static PositionComparer Default { get { return _default ?? (_default = new PositionComparer()); } }

-      public int Compare(Position a, Position b)

-      {

-#if HASHINDEX

-        return a.Endpoint == b.Endpoint ? 0 : a.Endpoint.precedes(b.Endpoint) ? -1 : 1;

-#else

-        return a.Index.CompareTo(b.Index);

-#endif

-      }

-    }

-    /// <summary>

-    /// During RemoveAll, we need to cache the original endpoint indices of views

-    /// </summary>

-    struct Position

-    {

-      public readonly HashedLinkedList<T> View;

-      public bool Left;

-#if HASHINDEX

-      public readonly Node Endpoint;

-#else

-      public readonly int Index;

-#endif

-      public Position(HashedLinkedList<T> view, bool left)

-      {

-        View = view;

-        Left = left;

-#if HASHINDEX

-        Endpoint = left ? view.startsentinel.next : view.endsentinel.prev;

-#else

-        Index = left ? view.Offset : view.Offset + view.size - 1;

-#endif

-      }

-#if HASHINDEX

-      public Position(Node node, int foo) { this.Endpoint = node; View = null; Left = false;}

-#else

-      public Position(int index) { this.Index = index; View = null; Left = false; }

-#endif

-    }

-

-    //TODO: merge the two implementations using Position values as arguments

-    /// <summary>

-    /// Handle the update of (other) views during a multi-remove operation.

-    /// </summary>

-    struct ViewHandler

-    {

-      ArrayList<Position> leftEnds;

-      ArrayList<Position> rightEnds;

-      int leftEndIndex, rightEndIndex, leftEndIndex2, rightEndIndex2;

-      internal readonly int viewCount;

-      internal ViewHandler(HashedLinkedList<T> list)

-      {

-        leftEndIndex = rightEndIndex = leftEndIndex2 = rightEndIndex2 = viewCount = 0;

-        leftEnds = rightEnds = null;

-        if (list.views != null)

-          foreach (HashedLinkedList<T> v in list.views)

-            if (v != list)

-            {

-              if (leftEnds == null)

-              {

-                leftEnds = new ArrayList<Position>();

-                rightEnds = new ArrayList<Position>();

-              }

-              leftEnds.Add(new Position(v, true));

-              rightEnds.Add(new Position(v, false));

-            }

-        if (leftEnds == null)

-          return;

-        viewCount = leftEnds.Count;

-        leftEnds.Sort(PositionComparer.Default);

-        rightEnds.Sort(PositionComparer.Default);

-      }

-#if HASHINDEX

-      internal void skipEndpoints(int removed, Node n)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && ((endpoint = leftEnds[leftEndIndex]).Endpoint.prev.precedes(n)))

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.offset = view.offset - removed;//TODO: extract offset.Value?

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Endpoint.precedes(n))

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Endpoint.prev.precedes(n))

-            leftEndIndex2++;

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Endpoint.next.precedes(n))

-            rightEndIndex2++;

-        }

-      }

-      /// <summary>

-      /// To be called with n pointing to the right of each node to be removed in a stretch. 

-      /// And at the endsentinel. 

-      /// 

-      /// Update offset of a view whose left endpoint (has not already been handled and) is n or precedes n.

-      /// I.e. startsentinel precedes n.

-      /// Also update the size as a prelude to handling the right endpoint.

-      /// 

-      /// Update size of a view not already handled and whose right endpoint precedes n.

-      /// </summary>

-      /// <param name="removed">The number of nodes left of n to be removed</param>

-      /// <param name="n"></param>

-      internal void updateViewSizesAndCounts(int removed, Node n)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && ((endpoint = leftEnds[leftEndIndex]).Endpoint.prev.precedes(n)))

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.offset = view.offset - removed; //TODO: fix use of offset

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Endpoint.precedes(n))

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-      /// <summary>

-      /// To be called with n being the first not-to-be-removed node after a (stretch of) node(s) to be removed.

-      /// 

-      /// It will update the startsentinel of views (that have not been handled before and) 

-      /// whose startsentinel precedes n, i.e. is to be deleted.

-      /// 

-      /// It will update the endsentinel of views (...) whose endsentinel precedes n, i.e. is to be deleted.

-      /// 

-      /// PROBLEM: DOESNT WORK AS ORIGINALLY ADVERTISED. WE MUST DO THIS BEFORE WE ACTUALLY REMOVE THE NODES. WHEN THE 

-      /// NODES HAVE BEEN REMOVED, THE precedes METHOD WILL NOT WORK!

-      /// </summary>

-      /// <param name="n"></param>

-      /// <param name="newstart"></param>

-      /// <param name="newend"></param>

-      internal void updateSentinels(Node n, Node newstart, Node newend)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Endpoint.prev.precedes(n))

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.startsentinel = newstart;

-            leftEndIndex2++;

-          }

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Endpoint.next.precedes(n))

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.endsentinel = newend;

-            rightEndIndex2++;

-          }

-        }

-      }

-#else

-      /// <summary>

-      /// This is to be called with realindex pointing to the first node to be removed after a (stretch of) node that was not removed

-      /// </summary>

-      /// <param name="removed"></param>

-      /// <param name="realindex"></param>

-      internal void skipEndpoints(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).Index <= realindex)

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.offset = view.offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Index < realindex)

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Index <= realindex)

-            leftEndIndex2++;

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Index < realindex - 1)

-            rightEndIndex2++;

-        }

-      }

-      internal void updateViewSizesAndCounts(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).Index <= realindex)

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.offset = view.Offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Index < realindex)

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-      internal void updateSentinels(int realindex, Node newstart, Node newend)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Index <= realindex)

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.startsentinel = newstart;

-            leftEndIndex2++;

-          }

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Index < realindex - 1)

-          {

-            HashedLinkedList<T> view = endpoint.View;

-            view.endsentinel = newend;

-            rightEndIndex2++;

-          }

-        }

-      }

-#endif

-    }

-    #endregion

-

-    #region Range nested class

-

-    class Range : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      int start, count, rangestamp;

-      Node startnode, endnode;

-

-      HashedLinkedList<T> list;

-

-      bool forwards;

-

-

-      internal Range(HashedLinkedList<T> list, int start, int count, bool forwards)

-      {

-        this.list = list; this.rangestamp = list.underlying != null ? list.underlying.stamp : list.stamp;

-        this.start = start; this.count = count; this.forwards = forwards;

-        if (count > 0)

-        {

-          startnode = list.get(start);

-          endnode = list.get(start + count - 1);

-        }

-      }

-

-      public override bool IsEmpty { get { list.modifycheck(rangestamp); return count == 0; } }

-

-      [Tested]

-      public override int Count { [Tested]get { list.modifycheck(rangestamp); return count; } }

-

-

-      public override Speed CountSpeed { get { list.modifycheck(rangestamp); return Speed.Constant; } }

-

-

-      public override T Choose()

-      {

-        list.modifycheck(rangestamp);

-        if (count > 0) return startnode.item;

-        throw new NoSuchItemException();

-      }

-

-

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator()

-      {

-        int togo = count;

-

-        list.modifycheck(rangestamp);

-        if (togo == 0)

-          yield break;

-

-        Node cursor = forwards ? startnode : endnode;

-

-        yield return cursor.item;

-        while (--togo > 0)

-        {

-          cursor = forwards ? cursor.next : cursor.prev;

-          list.modifycheck(rangestamp);

-          yield return cursor.item;

-        }

-      }

-

-

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      {

-        list.modifycheck(rangestamp);

-

-        Range b = (Range)MemberwiseClone();

-

-        b.forwards = !forwards;

-        return b;

-      }

-

-

-      [Tested]

-      IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-

-      [Tested]

-      public override EnumerationDirection Direction

-      {

-        [Tested]

-        get

-        { return forwards ? EnumerationDirection.Forwards : EnumerationDirection.Backwards; }

-      }

-    }

-

-

-    #endregion

-

-    #region IDisposable Members

-

-    /// <summary>

-    /// Invalidate this list. If a view, just invalidate the view. 

-    /// If not a view, invalidate the list and all views on it.

-    /// </summary>

-    public virtual void Dispose()

-    {

-      Dispose(false);

-    }

-

-    void Dispose(bool disposingUnderlying)

-    {

-      if (isValid)

-      {

-        if (underlying != null)

-        {

-          isValid = false;

-          if (!disposingUnderlying)

-            views.Remove(myWeakReference);

-          endsentinel = null;

-          startsentinel = null;

-          underlying = null;

-          views = null;

-          myWeakReference = null;

-        }

-        else

-        {

-          //isValid = false;

-          //endsentinel = null;

-          //startsentinel = null;

-          foreach (HashedLinkedList<T> view in views)

-            view.Dispose(true);

-          //views = null;

-          Clear();

-        }

-      }

-    }

-

-    #endregion IDisposable stuff

-

-    #region IList<T> Members

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The first item in this list.</value>

-    [Tested]

-    public virtual T First

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-        return startsentinel.next.item;

-      }

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The last item in this list.</value>

-    [Tested]

-    public virtual T Last

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-        return endsentinel.prev.item;

-      }

-    }

-

-    /// <summary>

-    /// Since <code>Add(T item)</code> always add at the end of the list,

-    /// this describes if list has FIFO or LIFO semantics.

-    /// </summary>

-    /// <value>True if the <code>Remove()</code> operation removes from the

-    /// start of the list, false if it removes from the end. THe default for a new linked list is true.</value>

-    [Tested]

-    public virtual bool FIFO

-    {

-      [Tested]

-      get { validitycheck(); return fIFO; }

-      [Tested]

-      set { updatecheck(); fIFO = value; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual bool IsFixedSize

-    {

-      get { validitycheck(); return false; }

-    }

-

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <value>The i'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-    [Tested]

-    public virtual T this[int index]

-    {

-      [Tested]

-      get { validitycheck(); return get(index).item; }

-      [Tested]

-      set

-      {

-        updatecheck();

-        Node n = get(index);

-        //

-        T item = n.item;

-#if HASHINDEX

-

-        if (itemequalityComparer.Equals(value, item))

-        {

-          n.item = value;

-          dict.Update(value, n);

-        }

-        else if (!dict.FindOrAdd(value, ref n))

-        {

-          dict.Remove(item);

-          n.item = value;

-        }

-        else

-          throw new ArgumentException("Item already in indexed list");

-#else

-        n.item = value;

-#endif

-        (underlying ?? this).raiseForSetThis(index, value, item);

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Linear; } }

-

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt; the size of the collection.</summary>

-    /// <param name="i">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-    [Tested]

-    public virtual void Insert(int i, T item)

-    {

-      updatecheck();

-      insert(i, i == size ? endsentinel : get(i), item);

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForInsert(i + Offset, item);

-    }

-

-    /// <summary>

-    /// Insert an item at the end of a compatible view, used as a pointer.

-    /// <para>The <code>pointer</code> must be a view on the same list as

-    /// <code>this</code> and the endpoitn of <code>pointer</code> must be

-    /// a valid insertion point of <code>this</code></para>

-    /// </summary>

-    /// <exception cref="IncompatibleViewException">If <code>pointer</code> 

-    /// is not a view on the same list as <code>this</code></exception>

-    /// <exception cref="IndexOutOfRangeException"><b>??????</b> if the endpoint of 

-    ///  <code>pointer</code> is not inside <code>this</code></exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.</exception>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    public void Insert(IList<T> pointer, T item)

-    {

-      updatecheck();

-      if ((pointer == null) || ((pointer.Underlying ?? pointer) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-#warning INEFFICIENT

-      //TODO: make this efficient (the whole point of the method:

-      //Do NOT use Insert, but insert the node at pointer.endsentinel, checking

-      //via the ordering that this is a valid insertion point

-      Insert(pointer.Offset + pointer.Count - Offset, item);

-    }

-

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt; the size of the collection.

-    /// </summary>

-    /// <param name="i">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-    /// <typeparam name="U"></typeparam>

-    [Tested]

-    public virtual void InsertAll<U>(int i, SCG.IEnumerable<U> items) where U : T

-    {

-      insertAll(i, items, true);

-    }

-

-    void insertAll<U>(int i, SCG.IEnumerable<U> items, bool insertion) where U : T

-    {

-      updatecheck();

-      Node succ, node, pred;

-      int count = 0;

-      succ = i == size ? endsentinel : get(i);

-      pred = node = succ.prev;

-#if HASHINDEX

-      TagGroup taggroup = null;

-      int taglimit = 0, thetag = 0;

-      taggroup = gettaggroup(node, succ, out thetag, out taglimit);

-      try

-      {

-        foreach (T item in items)

-        {

-          Node tmp = new Node(item, node, null);

-          if (!dict.FindOrAdd(item, ref tmp))

-          {

-            tmp.tag = thetag < taglimit ? ++thetag : thetag;

-            tmp.taggroup = taggroup;

-            node.next = tmp;

-            count++;

-            node = tmp;

-          }

-          else

-            throw new DuplicateNotAllowedException("Item already in indexed list");

-        }

-      }

-      finally

-      {

-        taggroup.count += count;

-        taggroup.first = succ.prev;

-        taggroup.last = node;

-        succ.prev = node;

-        node.next = succ;

-        if (node.tag == node.prev.tag)

-          splittaggroup(taggroup);

-        size += count;

-        if (underlying != null)

-          underlying.size += count;

-        if (count > 0)

-        {

-          fixViewsAfterInsert(succ, pred, count, 0);

-          raiseForInsertAll(pred, i, count, insertion);

-        }

-      }

-#else

-      foreach (T item in items)

-      {

-        Node tmp = new Node(item, node, null);

-        node.next = tmp;

-        count++;

-        node = tmp;

-      }

-      if (count == 0)

-        return;

-      succ.prev = node;

-      node.next = succ;

-      size += count;

-      if (underlying != null)

-        underlying.size += count;

-      if (count > 0)

-      {

-        fixViewsAfterInsert(succ, pred, count, offset + i);

-        raiseForInsertAll(pred, i, count, insertion);

-      }

-#endif

-    }

-

-    private void raiseForInsertAll(Node node, int i, int added, bool insertion)

-    {

-      if (ActiveEvents != 0)

-      {

-        int index = Offset + i;

-        if ((ActiveEvents & (EventTypeEnum.Added | EventTypeEnum.Inserted)) != 0)

-          for (int j = index; j < index + added; j++)

-          {

-#warning must we check stamps here?

-            node = node.next;

-            T item = node.item;

-            if (insertion) raiseItemInserted(item, j);

-            raiseItemsAdded(item, 1);

-          }

-        raiseCollectionChanged();

-      }

-    }

-

-    /// <summary>

-    /// Insert an item at the front of this list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-    [Tested]

-    public virtual void InsertFirst(T item)

-    {

-      updatecheck();

-      insert(0, startsentinel.next, item);

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForInsert(0 + Offset, item);

-    }

-

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-    [Tested]

-    public virtual void InsertLast(T item)

-    {

-      updatecheck();

-      insert(size, endsentinel, item);

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForInsert(size - 1 + Offset, item);

-    }

-

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list.

-    /// </summary>

-    /// <param name="mapper">The delegate definging the map.</param>

-    /// <returns>The new list.</returns>

-    [Tested]

-    public IList<V> Map<V>(Fun<T, V> mapper)

-    {

-      validitycheck();

-

-      HashedLinkedList<V> retval = new HashedLinkedList<V>();

-      return map<V>(mapper, retval);

-    }

-

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified equalityComparer for the item type.

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="equalityComparer">The equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-    public IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> equalityComparer)

-    {

-      validitycheck();

-

-      HashedLinkedList<V> retval = new HashedLinkedList<V>(equalityComparer);

-      return map<V>(mapper, retval);

-    }

-

-    private IList<V> map<V>(Fun<T, V> mapper, HashedLinkedList<V> retval)

-    {

-      if (size == 0)

-        return retval;

-      int stamp = this.stamp;

-      Node cursor = startsentinel.next;

-      HashedLinkedList<V>.Node mcursor = retval.startsentinel;

-

-#if HASHINDEX

-      double tagdelta = int.MaxValue / (size + 1.0);

-      int count = 1;

-      HashedLinkedList<V>.TagGroup taggroup = null;

-      taggroup = new HashedLinkedList<V>.TagGroup();

-      retval.taggroups = 1;

-      taggroup.count = size;

-#endif

-      while (cursor != endsentinel)

-      {

-        V v = mapper(cursor.item);

-        modifycheck(stamp);

-        mcursor.next = new HashedLinkedList<V>.Node(v, mcursor, null);

-        cursor = cursor.next;

-        mcursor = mcursor.next;

-#if HASHINDEX

-        retval.dict.Add(v, mcursor);

-        mcursor.taggroup = taggroup;

-        mcursor.tag = (int)(tagdelta * count++);

-#endif

-      }

-

-      retval.endsentinel.prev = mcursor;

-      mcursor.next = retval.endsentinel;

-      retval.size = size;

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove one item from the list: from the front if <code>FIFO</code>

-    /// is true, else from the back.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T Remove()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-      T item = fIFO ? remove(startsentinel.next, 0) : remove(endsentinel.prev, size - 1);

-#if HASHINDEX

-      dict.Remove(item);

-#endif

-      (underlying ?? this).raiseForRemove(item);

-      return item;

-    }

-

-    /// <summary>

-    /// Remove one item from the front of the list.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveFirst()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = remove(startsentinel.next, 0);

-#if HASHINDEX

-      dict.Remove(item);

-#endif

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveAt(Offset, item);

-      return item;

-    }

-

-    /// <summary>

-    /// Remove one item from the back of the list.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveLast()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = remove(endsentinel.prev, size - 1);

-#if HASHINDEX

-      dict.Remove(item);

-#endif

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveAt(size + Offset, item);

-      return item;

-    }

-

-    /// <summary>

-    /// Create a list view on this list. 

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if the start or count is negative</exception>

-    /// <exception cref="ArgumentException"> if the range does not fit within list.</exception>

-    /// <param name="start">The index in this list of the start of the view.</param>

-    /// <param name="count">The size of the view.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> View(int start, int count)

-    {

-      checkRange(start, count);

-      validitycheck();

-      if (views == null)

-        views = new WeakViewList<HashedLinkedList<T>>();

-      HashedLinkedList<T> retval = (HashedLinkedList<T>)MemberwiseClone();

-      retval.underlying = underlying != null ? underlying : this;

-      retval.offset = offset + start;

-      retval.size = count;

-      getPair(start - 1, start + count, out retval.startsentinel, out retval.endsentinel,

-          new int[] { -1, size }, new Node[] { startsentinel, endsentinel });

-      //retval.startsentinel = start == 0 ? startsentinel : get(start - 1);

-      //retval.endsentinel = start + count == size ? endsentinel : get(start + count);

-

-      //TODO: for the purpose of Dispose, we need to retain a ref to the node

-      retval.myWeakReference = views.Add(retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// Create a list view on this list containing the (first) occurrence of a particular item. 

-    /// </summary>

-    /// <exception cref="ArgumentException"> if the item is not in this list.</exception>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    public virtual IList<T> ViewOf(T item)

-    {

-#if HASHINDEX

-      Node n;

-      validitycheck();

-      if (!contains(item, out n))

-        return null;

-      HashedLinkedList<T> retval = (HashedLinkedList<T>)MemberwiseClone();

-      retval.underlying = underlying != null ? underlying : this;

-      retval.offset = null;

-      retval.startsentinel = n.prev;

-      retval.endsentinel = n.next;

-      retval.size = 1;

-      return retval;

-#else

-      int index = 0;

-      Node n = startsentinel.next;

-      if (!find(item, ref n, ref index))

-        return null;

-      //TODO: optimize with getpair!

-      return View(index, 1);

-#endif

-    }

-

-    /// <summary>

-    /// Create a list view on this list containing the last occurrence of a particular item. 

-    /// <exception cref="ArgumentException"/> if the item is not in this list.

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    public virtual IList<T> LastViewOf(T item)

-    {

-#if HASHINDEX

-      return ViewOf(item);

-#else

-      int index = size - 1;

-      Node n = endsentinel.prev;

-      if (!dnif(item, ref n, ref index))

-        return null;

-      return View(index, 1);

-#endif

-    }

-

-    /// <summary>

-    /// Null if this list is not a view.

-    /// </summary>

-    /// <value>Underlying list for view.</value>

-    [Tested]

-    public virtual IList<T> Underlying { [Tested]get { validitycheck(); return underlying; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual bool IsValid { get { return isValid; } }

-

-    /// <summary>

-    /// </summary>

-    /// <value>Offset for this list view or 0 for a underlying list.</value>

-    [Tested]

-    public virtual int Offset

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-#if HASHINDEX

-        if (offset == null && underlying != null)

-        {

-          //TODO: search from both ends simultaneously!

-          Node n = underlying.startsentinel;

-          int i = 0;

-          while (n != startsentinel) { n = n.next; i++; }

-          offset = i;

-        }

-#endif

-        return (int)offset;

-      }

-    }

-

-    /// <summary>

-    /// Slide this list view along the underlying list.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    [Tested]

-    public IList<T> Slide(int offset)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-    //TODO: more test cases

-    /// <summary>

-    /// Slide this list view along the underlying list, perhaps changing its size.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    /// <param name="size">The new size of the view.</param>

-    public IList<T> Slide(int offset, int size)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    public virtual bool TrySlide(int offset) { return TrySlide(offset, size); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    public virtual bool TrySlide(int offset, int size)

-    {

-      updatecheck();

-      if (underlying == null)

-        throw new NotAViewException("List not a view");

-

-#pragma warning disable 472

-      if (this.offset == null) //Note: only possible with HASHINDEX

-#pragma warning restore 472

-      {

-#pragma warning disable 162

-        try

-        {

-          getPair(offset - 1, offset + size, out startsentinel, out endsentinel,

-              new int[] { -1, this.size }, new Node[] { startsentinel, endsentinel });

-          //TODO: maybe-update offset field

-        }

-        catch (NullReferenceException)

-        {

-          return false;

-        }

-#pragma warning restore 162

-      }

-      else

-      {

-        if (offset + this.offset < 0 || offset + this.offset + size > underlying.size)

-          return false;

-        int oldoffset = (int)(this.offset);

-        getPair(offset - 1, offset + size, out startsentinel, out endsentinel,

-            new int[] { -oldoffset - 1, -1, this.size, underlying.size - oldoffset },

-            new Node[] { underlying.startsentinel, startsentinel, endsentinel, underlying.endsentinel });

-      }

-      this.size = size;

-      this.offset += offset;

-      return true;

-    }

-

-

-    //TODO: improve the complexity of the implementation

-    /// <summary>

-    /// 

-    /// <para>Returns null if <code>otherView</code> is strictly to the left of this view</para>

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <exception cref="IncompatibleViewException">If otherView does not have the same underlying list as this</exception>

-    /// <returns></returns>

-    public virtual IList<T> Span(IList<T> otherView)

-    {

-      if ((otherView == null) || ((otherView.Underlying ?? otherView) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-      if (otherView.Offset + otherView.Count - Offset < 0)

-        return null;

-      return (underlying ?? this).View(Offset, otherView.Offset + otherView.Count - Offset);

-    }

-

-

-    //Question: should we swap items or move nodes around?

-    //The first seems much more efficient unless the items are value types 

-    //with a large memory footprint.

-    //(Swapping will do count*3/2 T assignments, linking around will do 

-    // 4*count ref assignments; note that ref assignments are more expensive 

-    //than copying non-ref bits)

-    /// <summary>

-    /// Reverse the list so the items are in the opposite sequence order.

-    /// </summary>

-    [Tested]

-    public virtual void Reverse()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-

-      Position[] positions = null;

-      int poslow = 0, poshigh = 0;

-      if (views != null)

-      {

-        CircularQueue<Position> _positions = null;

-        foreach (HashedLinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-            switch (viewPosition(view))

-            {

-              case MutualViewPosition.ContainedIn:

-                (_positions ?? (_positions = new CircularQueue<Position>())).Enqueue(new Position(view, true));

-                _positions.Enqueue(new Position(view, false));

-                break;

-              case MutualViewPosition.Overlapping:

-                view.Dispose();

-                break;

-              case MutualViewPosition.Contains:

-              case MutualViewPosition.NonOverlapping:

-                break;

-            }

-          }

-        }

-        if (_positions != null)

-        {

-          positions = _positions.ToArray();

-          Sorting.IntroSort<Position>(positions, 0, positions.Length, PositionComparer.Default);

-          poshigh = positions.Length - 1;

-        }

-      }

-

-      Node a = get(0), b = get(size - 1);

-      for (int i = 0; i < size / 2; i++)

-      {

-        T swap;

-        swap = a.item; a.item = b.item; b.item = swap;

-#if HASHINDEX

-        dict[a.item] = a; dict[b.item] = b;

-#endif

-        if (positions != null)

-          mirrorViewSentinelsForReverse(positions, ref poslow, ref poshigh, a, b, i);

-        a = a.next; b = b.prev;

-      }

-      if (positions != null && size % 2 != 0)

-        mirrorViewSentinelsForReverse(positions, ref poslow, ref poshigh, a, b, size / 2);

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    private void mirrorViewSentinelsForReverse(Position[] positions, ref int poslow, ref int poshigh, Node a, Node b, int i)

-    {

-#if HASHINDEX

-      int? aindex = offset + i, bindex = offset + size - 1 - i;

-#else

-      int aindex = offset + i, bindex = offset + size - 1 - i;

-#endif

-      Position pos;

-#if HASHINDEX

-      while (poslow <= poshigh && (pos = positions[poslow]).Endpoint == a)

-#else

-      while (poslow <= poshigh && (pos = positions[poslow]).Index == aindex)

-#endif

-      {

-        //TODO: Note: in the case og hashed linked list, if this.offset == null, but pos.View.offset!=null

-        //we may at this point compute this.offset and non-null values of aindex and bindex

-        if (pos.Left)

-          pos.View.endsentinel = b.next;

-        else

-        {

-          pos.View.startsentinel = b.prev;

-          pos.View.offset = bindex;

-        }

-        poslow++;

-      }

-#if HASHINDEX

-      while (poslow < poshigh && (pos = positions[poshigh]).Endpoint == b)

-#else

-      while (poslow < poshigh && (pos = positions[poshigh]).Index == bindex)

-#endif

-      {

-        if (pos.Left)

-          pos.View.endsentinel = a.next;

-        else

-        {

-          pos.View.startsentinel = a.prev;

-          pos.View.offset = aindex;

-        }

-        poshigh--;

-      }

-    }

-

-    /// <summary>

-    /// Check if this list is sorted according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    /// <returns>True if the list is sorted, else false.</returns>

-    public bool IsSorted() { return IsSorted(Comparer<T>.Default); }

-

-    /// <summary>

-    /// Check if this list is sorted according to a specific sorting order.

-    /// </summary>

-    /// <param name="c">The comparer defining the sorting order.</param>

-    /// <returns>True if the list is sorted, else false.</returns>

-    [Tested]

-    public virtual bool IsSorted(SCG.IComparer<T> c)

-    {

-      validitycheck();

-      if (size <= 1)

-        return true;

-

-      Node node = startsentinel.next;

-      T prevItem = node.item;

-

-      node = node.next;

-      while (node != endsentinel)

-      {

-        if (c.Compare(prevItem, node.item) > 0)

-          return false;

-        else

-        {

-          prevItem = node.item;

-          node = node.next;

-        }

-      }

-

-      return true;

-    }

-

-    /// <summary>

-    /// Sort the items of the list according to the default sorting order

-    /// for the item type T, as defined by the Comparer[T] class. 

-    /// (<see cref="T:C5.Comparer`1"/>).

-    /// The sorting is stable.

-    /// </summary>

-    /// <exception cref="InvalidOperationException">if T is not comparable</exception>

-    public virtual void Sort() { Sort(Comparer<T>.Default); }

-

-    // Sort the linked list using mergesort

-    /// <summary>

-    /// Sort the items of the list according to a specific sorting order.

-    /// The sorting is stable.

-    /// </summary>

-    /// <param name="c">The comparer defining the sorting order.</param>

-    [Tested]

-    public virtual void Sort(SCG.IComparer<T> c)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      disposeOverlappingViews(false);

-#if HASHINDEX

-      if (underlying != null)

-      {

-        Node cursor = startsentinel.next;

-        while (cursor != endsentinel)

-        {

-          cursor.taggroup.count--;

-          cursor = cursor.next;

-        }

-      }

-#endif

-      // Build a linked list of non-empty runs.

-      // The prev field in first node of a run points to next run's first node

-      Node runTail = startsentinel.next;

-      Node prevNode = startsentinel.next;

-

-      endsentinel.prev.next = null;

-      while (prevNode != null)

-      {

-        Node node = prevNode.next;

-

-        while (node != null && c.Compare(prevNode.item, node.item) <= 0)

-        {

-          prevNode = node;

-          node = prevNode.next;

-        }

-

-        // Completed a run; prevNode is the last node of that run

-        prevNode.next = null;	// Finish the run

-        runTail.prev = node;	// Link it into the chain of runs

-        runTail = node;

-        if (c.Compare(endsentinel.prev.item, prevNode.item) <= 0)

-          endsentinel.prev = prevNode;	// Update last pointer to point to largest

-

-        prevNode = node;		// Start a new run

-      }

-

-      // Repeatedly merge runs two and two, until only one run remains

-      while (startsentinel.next.prev != null)

-      {

-        Node run = startsentinel.next;

-        Node newRunTail = null;

-

-        while (run != null && run.prev != null)

-        { // At least two runs, merge

-          Node nextRun = run.prev.prev;

-          Node newrun = mergeRuns(run, run.prev, c);

-

-          if (newRunTail != null)

-            newRunTail.prev = newrun;

-          else

-            startsentinel.next = newrun;

-

-          newRunTail = newrun;

-          run = nextRun;

-        }

-

-        if (run != null) // Add the last run, if any

-          newRunTail.prev = run;

-      }

-

-      endsentinel.prev.next = endsentinel;

-      startsentinel.next.prev = startsentinel;

-

-      //assert invariant();

-      //assert isSorted();

-#if HASHINDEX

-      {

-        Node cursor = startsentinel.next, end = endsentinel;

-        int tag, taglimit;

-        TagGroup t = gettaggroup(startsentinel, endsentinel, out tag, out taglimit);

-        int tagdelta = taglimit / (size + 1) - tag / (size + 1);

-        tagdelta = tagdelta == 0 ? 1 : tagdelta;

-        if (underlying == null)

-          taggroups = 1;

-        while (cursor != end)

-        {

-          tag = tag + tagdelta > taglimit ? taglimit : tag + tagdelta;

-          cursor.tag = tag;

-          t.count++;

-          cursor = cursor.next;

-        }

-        if (tag == taglimit)

-          splittaggroup(t);

-      }

-#endif

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    private static Node mergeRuns(Node run1, Node run2, SCG.IComparer<T> c)

-    {

-      //assert run1 != null && run2 != null;

-      Node prev;

-      bool prev1;	// is prev from run1?

-

-      if (c.Compare(run1.item, run2.item) <= 0)

-      {

-        prev = run1;

-        prev1 = true;

-        run1 = run1.next;

-      }

-      else

-      {

-        prev = run2;

-        prev1 = false;

-        run2 = run2.next;

-      }

-

-      Node start = prev;

-

-      //assert start != null;

-      start.prev = null;

-      while (run1 != null && run2 != null)

-      {

-        if (prev1)

-        {

-          //assert prev.next == run1;

-          //Comparable run2item = (Comparable)run2.item;

-          while (run1 != null && c.Compare(run2.item, run1.item) >= 0)

-          {

-            prev = run1;

-            run1 = prev.next;

-          }

-

-          if (run1 != null)

-          { // prev.item <= run2.item < run1.item; insert run2

-            prev.next = run2;

-            run2.prev = prev;

-            prev = run2;

-            run2 = prev.next;

-            prev1 = false;

-          }

-        }

-        else

-        {

-          //assert prev.next == run2;

-          //Comparable run1item = (Comparable)run1.item;

-          while (run2 != null && c.Compare(run1.item, run2.item) > 0)

-          {

-            prev = run2;

-            run2 = prev.next;

-          }

-

-          if (run2 != null)

-          { // prev.item < run1.item <= run2.item; insert run1

-            prev.next = run1;

-            run1.prev = prev;

-            prev = run1;

-            run1 = prev.next;

-            prev1 = true;

-          }

-        }

-      }

-

-      //assert !(run1 != null && prev1) && !(run2 != null && !prev1);

-      if (run1 != null)

-      { // last run2 < all of run1; attach run1 at end

-        prev.next = run1;

-        run1.prev = prev;

-      }

-      else if (run2 != null)

-      { // last run1 

-        prev.next = run2;

-        run2.prev = prev;

-      }

-

-      return start;

-    }

-

-    /// <summary>

-    /// Randomly shuffle the items of this list. 

-    /// <para>Will invalidate overlapping views???</para>

-    /// </summary>

-    public virtual void Shuffle() { Shuffle(new C5Random()); }

-

-

-    /// <summary>

-    /// Shuffle the items of this list according to a specific random source.

-    /// <para>Will invalidate overlapping views???</para>

-    /// </summary>

-    /// <param name="rnd">The random source.</param>

-    public virtual void Shuffle(Random rnd)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      disposeOverlappingViews(false);

-      ArrayList<T> a = new ArrayList<T>();

-      a.AddAll(this);

-      a.Shuffle(rnd);

-      Node cursor = startsentinel.next;

-      int j = 0;

-      while (cursor != endsentinel)

-      {

-        cursor.item = a[j++];

-#if HASHINDEX

-        dict[cursor.item] = cursor;

-#endif

-        cursor = cursor.next;

-      }

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/>.

-    /// </summary>

-    /// <value>The directed collection of items in a specific index interval.</value>

-    /// <param name="start">The low index of the interval (inclusive).</param>

-    /// <param name="count">The size of the range.</param>

-    [Tested]

-    public IDirectedCollectionValue<T> this[int start, int count]

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        checkRange(start, count);

-        return new Range(this, start, count, true);

-      }

-    }

-

-    /// <summary>

-    /// Searches for an item in the list going forwrds from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from start.</returns>

-    [Tested]

-    public virtual int IndexOf(T item)

-    {

-      validitycheck();

-      Node node;

-#if HASHINDEX

-      if (!dict.Find(item, out node) || !insideview(node))

-        return ~size;

-#endif

-      node = startsentinel.next;

-      int index = 0;

-      if (find(item, ref node, ref index))

-        return index;

-      else

-        return ~size;

-    }

-

-    /// <summary>

-    /// Searches for an item in the list going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of of item from the end.</returns>

-    [Tested]

-    public virtual int LastIndexOf(T item)

-    {

-#if HASHINDEX

-      return IndexOf(item);

-#else

-      validitycheck();

-

-      Node node = endsentinel.prev;

-      int index = size - 1;

-

-      if (dnif(item, ref node, ref index))

-        return index;

-      else

-        return ~size;

-#endif

-    }

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <param name="i">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveAt(int i)

-    {

-      updatecheck();

-      T retval = remove(get(i), i);

-#if HASHINDEX

-      dict.Remove(retval);

-#endif

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveAt(Offset + i, retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// <exception cref="IndexOutOfRangeException"/>???. 

-    /// </summary>

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public virtual void RemoveInterval(int start, int count)

-    {

-#if HASHINDEX

-      updatecheck();

-      checkRange(start, count);

-      if (count == 0)

-        return;

-

-      View(start, count).Clear();

-#else

-      //Note: this is really almost equaivalent to Clear on a view

-      updatecheck();

-      checkRange(start, count);

-      if (count == 0)

-        return;

-

-      //for small count: optimize

-      //use an optimal get(int i, int j, ref Node ni, ref Node nj)?

-      Node a = get(start), b = get(start + count - 1);

-      fixViewsBeforeRemove(start, count, a, b);

-      a.prev.next = b.next;

-      b.next.prev = a.prev;

-      if (underlying != null)

-        underlying.size -= count;

-

-      size -= count;

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveInterval(start + Offset, count);

-#endif

-    }

-

-    void raiseForRemoveInterval(int start, int count)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseCollectionCleared(size == 0, count, start);

-        raiseCollectionChanged();

-      }

-    }

-    #endregion

-

-    #region ISequenced<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetSequencedHashCode() { validitycheck(); return base.GetSequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool SequencedEquals(ISequenced<T> that) { validitycheck(); return base.SequencedEquals(that); }

-

-    #endregion

-

-    #region IDirectedCollection<T> Members

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    public override IDirectedCollectionValue<T> Backwards()

-    { return this[0, size].Backwards(); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    #endregion

-

-    #region IEditableCollection<T> Members

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>Speed.Linear</value>

-    [Tested]

-    public virtual Speed ContainsSpeed

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return  Speed.Constant ;

-#else

-        return Speed.Linear;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// Performs a check for view validity before calling base.GetUnsequencedHashCode()

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetUnsequencedHashCode()

-    { validitycheck(); return base.GetUnsequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool UnsequencedEquals(ICollection<T> that)

-    { validitycheck(); return base.UnsequencedEquals(that); }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Contains(T item)

-    {

-      validitycheck();

-      Node node;

-      return contains(item, out node);

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Find(ref T item)

-    {

-      validitycheck();

-      Node node;

-      if (contains(item, out node)) { item = node.item; return true; }

-      return false;

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. Will update a single item.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public virtual bool Update(T item) { T olditem; return Update(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item, out T olditem)

-    {

-      updatecheck();

-      Node node;

-

-      if (contains(item, out node))

-      {

-        olditem = node.item;

-        node.item = item;

-#if HASHINDEX

-        //Avoid clinging onto a reference to olditem via dict!

-        dict.Update(item, node);

-#endif

-        (underlying ?? this).raiseForUpdate(item, olditem);

-        return true;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found. Else, add the item to the collection.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the item was found (hence not added).</returns>

-    [Tested]

-    public virtual bool FindOrAdd(ref T item)

-    {

-      updatecheck();

-#if HASHINDEX

-      //This is an extended myinsert:

-      Node node = new Node(item);

-      if (!dict.FindOrAdd(item, ref node))

-      {

-        insertNode(true, endsentinel, node);

-        (underlying ?? this).raiseForAdd(item);

-        return false; 

-      }

-      if (!insideview(node))

-        throw new ArgumentException("Item alredy in indexed list but outside view");

-      item = node.item;

-      return true;

-#else

-      if (Find(ref item))

-        return true;

-

-      Add(item);

-      return false;

-#endif

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value; else add the value to the collection. 

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(T item) { T olditem; return UpdateOrAdd(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    {

-      updatecheck();

-#if HASHINDEX

-      Node node = new Node(item);

-      //NOTE: it is hard to do this without double access to the dictionary

-      //in the update case

-      if (dict.FindOrAdd(item, ref node))

-      {

-        if (!insideview(node))

-          throw new ArgumentException("Item in indexed list but outside view");

-        olditem = node.item;

-        //Avoid clinging onto a reference to olditem via dict!

-        dict.Update(item, node);

-        node.item = item;

-        (underlying ?? this).raiseForUpdate(item, olditem);

-        return true;

-      }

-      insertNode(true, endsentinel, node);

-      (underlying ?? this).raiseForAdd(item);

-#else

-      if (Update(item, out olditem))

-        return true;

-      Add(item);

-#endif

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this collection. Since the collection has bag

-    /// semantics only one copy equivalent to the supplied item is removed. 

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item)

-    {

-      updatecheck();

-      int i = 0;

-      Node node;

-#if HASHINDEX

-      if (!dictremove(item, out node))

-#else

-      node = fIFO ? startsentinel.next : endsentinel.prev;

-      if (!(fIFO ? find(item, ref node, ref i) : dnif(item, ref node, ref i)))

-#endif

-        return false;

-      T removeditem = remove(node, i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this collection if found (only one copy). 

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument.

-    /// </summary>

-    /// <param name="item">The value to remove on input.</param>

-    /// <param name="removeditem">The value removed.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item, out T removeditem)

-    {

-      updatecheck();

-      int i = 0;

-      Node node;

-#if HASHINDEX

-      if (!dictremove(item, out node))

-#else

-      node = fIFO ? startsentinel.next : endsentinel.prev;

-      if (!(fIFO ? find(item, ref node, ref i) : dnif(item, ref node, ref i)))

-#endif

-      {

-        removeditem = default(T);

-        return false;

-      }

-      removeditem = node.item;

-      remove(node, i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-    /// <summary>

-    /// Remove all items in another collection from this one, taking multiplicities into account.

-    /// <para>Always removes from the front of the list.

-    /// </para>

-    /// <para>The asymptotic running time complexity of this method is <code>O(n+m+v*log(v))</code>, 

-    /// where <code>n</code> is the size of this list, <code>m</code> is the size of the

-    /// <code>items</code> collection and <code>v</code> is the number of views. 

-    /// The method will temporarily allocate memory of size <code>O(m+v)</code>.

-    /// </para>

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      Node node;

-      foreach (T item in items)

-        if (dictremove(item, out node))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          remove(node, 118);

-        }

-#else

-      HashBag<T> toremove = new HashBag<T>(itemequalityComparer);

-      toremove.AddAll(items);

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //pass by a stretch of nodes

-        while (node != endsentinel && !toremove.Contains(node.item))

-        {

-          node = node.next;

-          index++;

-        }

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && toremove.Remove(node.item))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RemoveAll(Fun<T, bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      {

-        Node n = startsentinel.next;

-

-        while (n != endsentinel)

-        {

-          bool removeIt = predicate(n.item);

-          updatecheck();

-          if (removeIt)

-          {

-            dict.Remove(n.item);

-            remove(n, 119);

-            if (mustFire)

-              raiseHandler.Remove(n.item);

-          }

-

-          n = n.next;

-        }

-      }

-#else

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //pass by a stretch of nodes

-        while (node != endsentinel && !predicate(node.item))

-        {

-          updatecheck();

-          node = node.next;

-          index++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && predicate(node.item))

-        {

-          updatecheck();

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        updatecheck();

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items from this collection.

-    /// </summary>

-    [Tested]

-    public virtual void Clear()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      int oldsize = size;

-#if HASHINDEX

-      if (underlying == null)

-        dict.Clear();

-      else

-        foreach (T item in this)

-          dict.Remove(item);

-#endif

-      clear();

-      (underlying ?? this).raiseForRemoveInterval(Offset, oldsize);

-    }

-

-    void clear()

-    {

-      if (size == 0)

-        return;

-#if HASHINDEX

-      //TODO: mix with tag maintenance to only run through list once?

-      ViewHandler viewHandler = new ViewHandler(this);

-      if (viewHandler.viewCount > 0)

-      {

-        int removed = 0;

-        Node n = startsentinel.next;

-        viewHandler.skipEndpoints(0, n);

-        while (n != endsentinel)

-        {

-          removed++;

-          n = n.next;

-          viewHandler.updateViewSizesAndCounts(removed, n);

-        }

-        viewHandler.updateSentinels(endsentinel, startsentinel, endsentinel);

-        if (underlying != null)

-          viewHandler.updateViewSizesAndCounts(removed, underlying.endsentinel);

-      }

-#else

-      fixViewsBeforeRemove(Offset, size, startsentinel.next, endsentinel.prev);

-#endif

-#if HASHINDEX

-      if (underlying != null)

-      {

-        Node n = startsentinel.next;

-

-        while (n != endsentinel)

-        {

-          n.next.prev = startsentinel;

-          startsentinel.next = n.next;

-          removefromtaggroup(n);

-          n = n.next;

-        }

-      }

-      else

-        taggroups = 0;

-#endif

-      endsentinel.prev = startsentinel;

-      startsentinel.next = endsentinel;

-      if (underlying != null)

-        underlying.size -= size;

-      size = 0;

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one, taking multiplicities into account.

-    /// <para>The asymptotic running time complexity of this method is <code>O(n+m+v*log(v))</code>, 

-    /// where <code>n</code> is the size of this collection, <code>m</code> is the size of the

-    /// <code>items</code> collection and <code>v</code> is the number of views. 

-    /// The method will temporarily allocate memory of size <code>O(m+v)</code>. The stated complexitiy 

-    /// holds under the assumption that the itemequalityComparer of this list is well-behaved.

-    /// </para>

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      /*if (underlying == null)

-      {

-        HashDictionary<T, Node> newdict = new HashDictionary<T, Node>(itemequalityComparer);

-        foreach (T item in items)

-        {

-          Node node;

-

-          if (dict.Remove(item, out node))

-            newdict.Add(item, node);

-        }

-        foreach (KeyValuePair<T, Node> pair in dict)

-        {

-          Node n = pair.Value;

-          fixViewsBeforeSingleRemove(n, 117);

-          Node p = n.prev, s = n.next; s.prev = p; p.next = s;

-          removefromtaggroup(n);

-        }

-        dict = newdict;

-        size = dict.Count;

-        //For a small number of items to retain it might be faster to 

-        //iterate through the list and splice out the chunks not needed

-      }

-      else*/

-      {

-        HashSet<T> toremove = new HashSet<T>(itemequalityComparer);

-

-        foreach (T item in this)

-          toremove.Add(item);

-

-        foreach (T item in items)

-          toremove.Remove(item);

-

-        Node n = startsentinel.next;

-

-        while (n != endsentinel && toremove.Count > 0)

-        {

-          if (toremove.Contains(n.item))

-          {

-            dict.Remove(n.item);

-            remove(n, 119);

-            if (mustFire)

-              raiseHandler.Remove(n.item);

-          }

-

-          n = n.next;

-        }

-      }

-#else

-      HashBag<T> toretain = new HashBag<T>(itemequalityComparer);

-      toretain.AddAll(items);

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //Skip a stretch of nodes

-        while (node != endsentinel && toretain.Remove(node.item))

-        {

-          node = node.next;

-          index++;

-        }

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && !toretain.Contains(node.item))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RetainAll(Fun<T,bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      {

-        Node n = startsentinel.next;

-

-        while (n != endsentinel)

-        {

-          bool removeIt = !predicate(n.item);

-          updatecheck();

-          if (removeIt)

-          {

-            dict.Remove(n.item);

-            remove(n, 119);

-            if (mustFire)

-              raiseHandler.Remove(n.item);

-          }

-

-          n = n.next;

-        }

-      }

-#else

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //Skip a stretch of nodes

-        while (node != endsentinel && predicate(node.item))

-        {

-          updatecheck();

-          node = node.next;

-          index++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && !predicate(node.item))

-        {

-          updatecheck();

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        updatecheck();

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection

-    /// with respect to multiplicities.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      validitycheck();

-#if HASHINDEX

-      Node node;

-      foreach (T item in items)

-        if (!contains(item, out node))

-          return false;

-      return true;

-#else

-      HashBag<T> tocheck = new HashBag<T>(itemequalityComparer);

-      tocheck.AddAll(items);

-      if (tocheck.Count > size)

-        return false;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        tocheck.Remove(node.item);

-        node = node.next;

-      }

-      return tocheck.IsEmpty;

-#endif

-    }

-

-

-    /// <summary>

-    /// Create a new list consisting of the items of this list satisfying a 

-    /// certain predicate.

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new list.</returns>

-    [Tested]

-    public IList<T> FindAll(Fun<T, bool> filter)

-    {

-      validitycheck();

-      int stamp = this.stamp;

-      HashedLinkedList<T> retval = new HashedLinkedList<T>();

-      Node cursor = startsentinel.next;

-      Node mcursor = retval.startsentinel;

-#if HASHINDEX

-      double tagdelta = int.MaxValue / (size + 1.0);

-      int count = 1;

-      TagGroup taggroup = new TagGroup();

-      retval.taggroups = 1;

-#endif

-      while (cursor != endsentinel)

-      {

-        bool found = filter(cursor.item);

-        modifycheck(stamp);

-        if (found)

-        {

-          mcursor.next = new Node(cursor.item, mcursor, null);

-          mcursor = mcursor.next;

-          retval.size++;

-#if HASHINDEX

-          retval.dict.Add(cursor.item, mcursor); 

-          mcursor.taggroup = taggroup;

-          mcursor.tag = (int)(tagdelta * count++);

-#endif

-        }

-        cursor = cursor.next;

-      }

-#if HASHINDEX

-      taggroup.count = retval.size;

-#endif

-      retval.endsentinel.prev = mcursor;

-      mcursor.next = retval.endsentinel;

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    [Tested]

-    public virtual int ContainsCount(T item)

-    {

-#if HASHINDEX

-      return Contains(item) ? 1 : 0;

-#else

-      validitycheck();

-      int retval = 0;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        if (itemequalityComparer.Equals(node.item, item))

-          retval++;

-        node = node.next;

-      }

-      return retval;

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems()

-    {

-#if HASHINDEX

-      return this;

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.UniqueItems();

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-#if HASHINDEX

-      return new MultiplicityOne<T>(this);

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.ItemMultiplicities();

-#endif

-    }

-

-    /// <summary>

-    /// Remove all items equivalent to a given value.

-    /// <para>The asymptotic complexity of this method is <code>O(n+v*log(v))</code>, 

-    /// where <code>n</code> is the size of the collection and <code>v</code> 

-    /// is the number of views.

-    /// </para>

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public virtual void RemoveAllCopies(T item)

-    {

-#if HASHINDEX

-      Remove(item);

-#else

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      //

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //pass by a stretch of nodes

-        while (node != endsentinel && !itemequalityComparer.Equals(node.item, item))

-        {

-          node = node.next;

-          index++;

-        }

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && itemequalityComparer.Equals(node.item, item))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-      raiseHandler.Raise();

-#endif

-    }

-

-    #endregion

-

-    #region ICollectionValue<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of items in this collection</value>

-    [Tested]

-    public override int Count { [Tested]get { validitycheck(); return size; } }

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    [Tested]

-    public override T Choose() { return First; }

-

-    /// <summary>

-    /// Create an enumerable, enumerating the items of this collection that satisfies 

-    /// a certain condition.

-    /// </summary>

-    /// <param name="filter">The T->bool filter delegate defining the condition</param>

-    /// <returns>The filtered enumerable</returns>

-    public override SCG.IEnumerable<T> Filter(Fun<T, bool> filter) { validitycheck(); return base.Filter(filter); }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-    /// <summary>

-    /// Create an enumerator for the collection

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      validitycheck();

-      Node cursor = startsentinel.next;

-      int enumeratorstamp = underlying != null ? underlying.stamp : this.stamp;

-

-      while (cursor != endsentinel)

-      {

-        modifycheck(enumeratorstamp);

-        yield return cursor.item;

-        cursor = cursor.next;

-      }

-    }

-

-    #endregion

-

-    #region IExtensible<T> Members

-    /// <summary>

-    /// Add an item to this collection if possible. 

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True.</returns>

-    [Tested]

-    public virtual bool Add(T item)

-    {

-      updatecheck();

-#if HASHINDEX

-      Node node = new Node(item);

-      if (!dict.FindOrAdd(item, ref node))

-      {

-        insertNode(true, endsentinel, node);

-        (underlying ?? this).raiseForAdd(item);

-        return true;

-      }

-      return false;

-#else

-      insert(size, endsentinel, item);

-      (underlying ?? this).raiseForAdd(item);

-      return true;

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True since this collection has bag semantics.</value>

-    [Tested]

-    public virtual bool AllowsDuplicates

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return false;

-#else

-        return true;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting

-    {

-      get

-      {

-#if HASHINDEX

-        return true;

-#else

-        return false;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. 

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-#if HASHINDEX

-      updatecheck();

-      int added = 0;

-      Node pred = endsentinel.prev;

-      foreach (U item in items)

-      {

-        Node node = new Node(item);

-        if (!dict.FindOrAdd(item, ref node))

-        {

-          insertNode(false, endsentinel, node);

-          added++;

-        }

-      }

-      if (added > 0)

-      {

-        fixViewsAfterInsert(endsentinel, pred, added, 0);

-        raiseForInsertAll(pred, size - added, added, false);

-      }

-#else

-      insertAll(size, items, false);

-#endif

-    }

-

-    #endregion

-

-#if HASHINDEX

-#else

-    #region IStack<T> Members

-

-    /// <summary>

-    /// Push an item to the top of the stack.

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public void Push(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Pop the item at the top of the stack from the stack.

-    /// </summary>

-    /// <returns>The popped item.</returns>

-    [Tested]

-    public T Pop()

-    {

-      return RemoveLast();

-    }

-

-    #endregion

-

-    #region IQueue<T> Members

-

-    /// <summary>

-    /// Enqueue an item at the back of the queue. 

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public virtual void Enqueue(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Dequeue an item from the front of the queue.

-    /// </summary>

-    /// <returns>The item</returns>

-    [Tested]

-    public virtual T Dequeue()

-    {

-      return RemoveFirst();

-    }

-    #endregion

-#endif

-

-    #region Diagnostic

-

-    private bool checkViews()

-    {

-      if (underlying != null)

-        throw new InternalException(System.Reflection.MethodInfo.GetCurrentMethod() + " called on a view");

-      if (views == null)

-        return true;

-      bool retval = true;

-

-      Node[] nodes = new Node[size + 2];

-      int i = 0;

-      Node n = startsentinel;

-      while (n != null)

-      {

-        nodes[i++] = n;

-        n = n.next;

-      }

-      //Console.WriteLine("###");

-      foreach (HashedLinkedList<T> view in views)

-      {

-        if (!view.isValid)

-        {

-          Console.WriteLine("Invalid view(hash {0}, offset {1}, size {2})",

-            view.GetHashCode(), view.offset, view.size);

-          retval = false;

-          continue;

-        }

-        if (view.Offset > size || view.Offset < 0)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), Offset > underlying.size ({2})",

-            view.GetHashCode(), view.offset, view.size, size);

-          retval = false;

-        }

-        else if (view.startsentinel != nodes[view.Offset])

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), startsentinel {3} should be {4}",

-            view.GetHashCode(), view.offset, view.size,

-            view.startsentinel + " " + view.startsentinel.GetHashCode(),

-            nodes[view.Offset] + " " + nodes[view.Offset].GetHashCode());

-          retval = false;

-        }

-        if (view.Offset + view.size > size || view.Offset + view.size < 0)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), end index > underlying.size ({3})",

-            view.GetHashCode(), view.offset, view.size, size);

-          retval = false;

-        }

-        else if (view.endsentinel != nodes[view.Offset + view.size + 1])

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), endsentinel {3} should be {4}",

-            view.GetHashCode(), view.offset, view.size,

-            view.endsentinel + " " + view.endsentinel.GetHashCode(),

-            nodes[view.Offset + view.size + 1] + " " + nodes[view.Offset + view.size + 1].GetHashCode());

-          retval = false;

-        }

-        if (view.views != views)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), wrong views list {3} <> {4}",

-            view.GetHashCode(), view.offset, view.size, view.views.GetHashCode(), views.GetHashCode());

-          retval = false;

-        }

-        if (view.underlying != this)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), wrong underlying {3} <> this {4}",

-            view.GetHashCode(), view.offset, view.size, view.underlying.GetHashCode(), GetHashCode());

-          retval = false;

-        }

-        if (view.stamp != stamp)

-        {

-          //Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), wrong stamp view:{2} underlying: {3}", view.GetHashCode(),view.offset, view.size, view.stamp, stamp);

-          //retval = false;

-        }

-      }

-      return retval;

-    }

-

-    /// <summary>

-    /// Check the sanity of this list

-    /// </summary>

-    /// <returns>true if sane</returns>

-    [Tested]

-    public virtual bool Check()

-    {

-      bool retval = true;

-

-      /*if (underlying != null && underlying.stamp != stamp)

-      {

-        Console.WriteLine("underlying != null && underlying.stamp({0}) != stamp({1})", underlying.stamp, stamp);

-        retval = false;

-      }*/

-

-      if (underlying != null)

-      {

-        //TODO: check that this view is included in viewsEndpoints tree

-        return underlying.Check();

-      }

-

-      if (startsentinel == null)

-      {

-        Console.WriteLine("startsentinel == null");

-        retval = false;

-      }

-

-      if (endsentinel == null)

-      {

-        Console.WriteLine("endsentinel == null");

-        retval = false;

-      }

-

-      if (size == 0)

-      {

-        if (startsentinel != null && startsentinel.next != endsentinel)

-        {

-          Console.WriteLine("size == 0 but startsentinel.next != endsentinel");

-          retval = false;

-        }

-

-        if (endsentinel != null && endsentinel.prev != startsentinel)

-        {

-          Console.WriteLine("size == 0 but endsentinel.prev != startsentinel");

-          retval = false;

-        }

-      }

-

-      if (startsentinel == null)

-      {

-        Console.WriteLine("NULL startsentinel");

-        return retval;

-      }

-

-      int count = 0;

-      Node node = startsentinel.next, prev = startsentinel;

-#if HASHINDEX

-      int taggroupsize = 0, oldtaggroupsize = losize + 1, seentaggroups = 0;

-      TagGroup oldtg = null;

-

-      if (underlying == null)

-      {

-        TagGroup tg = startsentinel.taggroup;

-

-        if (tg.count != 0 || tg.first != null || tg.last != null || tg.tag != int.MinValue)

-        {

-          Console.WriteLine("Bad startsentinel tag group: {0}", tg);

-          retval = false;

-        }

-

-        tg = endsentinel.taggroup;

-        if (tg.count != 0 || tg.first != null || tg.last != null || tg.tag != int.MaxValue)

-        {

-          Console.WriteLine("Bad endsentinel tag group: {0}", tg);

-          retval = false;

-        }

-      }

-#endif

-      while (node != endsentinel)

-      {

-        count++;

-        if (node.prev != prev)

-        {

-          Console.WriteLine("Bad backpointer at node {0}", count);

-          retval = false;

-        }

-#if HASHINDEX

-        if (underlying == null)

-        {

-          if (!node.prev.precedes(node))

-          {

-            Console.WriteLine("node.prev.tag ({0}, {1}) >= node.tag ({2}, {3}) at index={4} item={5} ", node.prev.taggroup.tag, node.prev.tag, node.taggroup.tag, node.tag, count, node.item);

-            retval = false;

-          }

-

-          if (node.taggroup != oldtg)

-          {

-            if (oldtg != null)

-            {

-              if (oldtg.count != taggroupsize)

-              {

-                Console.WriteLine("Bad taggroupsize: oldtg.count ({0}) != taggroupsize ({1}) at index={2} item={3}", oldtg.count, taggroupsize, count, node.item);

-                retval = false;

-              }

-

-              if (oldtaggroupsize <= losize && taggroupsize <= losize)

-              {

-                Console.WriteLine("Two small taggroups in a row: oldtaggroupsize ({0}), taggroupsize ({1}) at index={2} item={3}", oldtaggroupsize, taggroupsize, count, node.item);

-                retval = false;

-              }

-

-              oldtaggroupsize = taggroupsize;

-            }

-

-            seentaggroups++;

-            oldtg = node.taggroup;

-            taggroupsize = 1;

-          }

-          else

-          {

-            taggroupsize++;

-          }

-        }

-

-#endif

-        prev = node;

-        node = node.next;

-        if (node == null)

-        {

-          Console.WriteLine("Null next pointer at node {0}", count);

-          return false;

-        }

-      }

-

-#if HASHINDEX

-      if (underlying == null && size == 0 && taggroups != 0)

-      {

-        Console.WriteLine("Bad taggroups for empty list: size={0}   taggroups={1}", size, taggroups);

-        retval = false;

-      }

-      if (underlying == null && size > 0)

-      {

-        oldtg = node.prev.taggroup;

-        if (oldtg != null)

-        {

-          if (oldtg.count != taggroupsize)

-          {

-            Console.WriteLine("Bad taggroupsize: oldtg.count ({0}) != taggroupsize ({1}) at index={2} item={3}", oldtg.count, taggroupsize, count, node.item);

-            retval = false;

-          }

-

-          if (oldtaggroupsize <= losize && taggroupsize <= losize)

-          {

-            Console.WriteLine("Two small taggroups in a row: oldtaggroupsize ({0}), taggroupsize ({1}) at index={2} item={3}", oldtaggroupsize, taggroupsize, count, node.item);

-            retval = false;

-          }

-        }

-

-        if (seentaggroups != taggroups)

-        {

-          Console.WriteLine("seentaggroups ({0}) != taggroups ({1}) (at size {2})", seentaggroups, taggroups, size);

-          retval = false;

-        }

-      }

-#endif

-      if (count != size)

-      {

-        Console.WriteLine("size={0} but enumeration gives {1} nodes ", size, count);

-        retval = false;

-      }

-

-      retval = checkViews() && retval;

-

-#if HASHINDEX

-      if (!retval)

-        return false;

-      if (underlying == null)

-      {

-        if (size != dict.Count)

-        {

-          Console.WriteLine("list.size ({0}) != dict.Count ({1})", size, dict.Count);

-          retval = false;

-        }

-        Node n = startsentinel.next, n2;

-        while (n != endsentinel)

-        {

-          if (!dict.Find(n.item, out n2))

-          {

-            Console.WriteLine("Item in list but not dict: {0}", n.item);

-            retval = false;

-          }

-          else if (n != n2)

-          {

-            Console.WriteLine("Wrong node in dict for item: {0}", n.item);

-            retval = false;

-          }

-          n = n.next;

-        }

-      }

-#endif

-      return retval;

-    }

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this HashedLinkedList.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      HashedLinkedList<T> clone = new HashedLinkedList<T>(itemequalityComparer);

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/linkedlists/LinkedList.cs b/mcs/class/Mono.C5/C5/linkedlists/LinkedList.cs
deleted file mode 100644
index d49c73ba809..00000000000
--- a/mcs/class/Mono.C5/C5/linkedlists/LinkedList.cs
+++ /dev/null
@@ -1,3785 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define HASHINDEXnot

-

-using System;

-using System.Diagnostics;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A list collection class based on a doubly linked list data structure.

-  /// </summary>

-  [Serializable]

-  public class LinkedList<T> : SequencedBase<T>, IList<T>

-#if HASHINDEX

-#else

-, IStack<T>, IQueue<T>

-#endif

-  {

-    #region Fields

-    /// <summary>

-    /// IExtensible.Add(T) always does AddLast(T), fIFO determines 

-    /// if T Remove() does RemoveFirst() or RemoveLast()

-    /// </summary>

-    bool fIFO = true;

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return underlying == null ? EventTypeEnum.All : EventTypeEnum.None; } }

-

-    #endregion

-

-    //Invariant:  startsentinel != null && endsentinel != null

-    //If size==0: startsentinel.next == endsentinel && endsentinel.prev == startsentinel

-    //Else:      startsentinel.next == First && endsentinel.prev == Last)

-    /// <summary>

-    /// Node to the left of first node 

-    /// </summary>

-    Node startsentinel;

-    /// <summary>

-    /// Node to the right of last node

-    /// </summary>

-    Node endsentinel;

-    /// <summary>

-    /// Offset of this view in underlying list

-    /// </summary>

-#if HASHINDEX

-    int? offset;

-#else

-    int offset;

-#endif

-

-    /// <summary>

-    /// underlying list of this view (or null for the underlying list)

-    /// </summary>

-    LinkedList<T> underlying;

-

-    //Note: all views will have the same views list since all view objects are created by MemeberwiseClone()

-    WeakViewList<LinkedList<T>> views;

-    WeakViewList<LinkedList<T>>.Node myWeakReference;

-

-    /// <summary>

-    /// Has this list or view not been invalidated by some operation (by someone calling Dispose())

-    /// </summary>

-    bool isValid = true;

-

-

-#if HASHINDEX

-    HashDictionary<T, Node> dict;

-    /// <summary>

-    /// Number of taggroups

-    /// </summary>

-    int taggroups;

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    int Taggroups

-    {

-      get { return underlying == null ? taggroups : underlying.taggroups; }

-      set { if (underlying == null) taggroups = value; else underlying.taggroups = value; }

-    }

-#endif

-

-    #endregion

-

-    #region Util

-

-    bool equals(T i1, T i2) { return itemequalityComparer.Equals(i1, i2); }

-

-    #region Check utilities

-    /// <summary>

-    /// Check if it is valid to perform updates and increment stamp of 

-    /// underlying if this is a view.

-    /// <para>This method should be called in every public modifying 

-    /// methods before any modifications are performed.

-    /// </para>

-    /// </summary>

-    /// <exception cref="InvalidOperationException"> if check fails.</exception>

-    protected override void updatecheck()

-    {

-      validitycheck();

-      base.updatecheck();

-      if (underlying != null)

-        underlying.stamp++;

-    }

-

-    /// <summary>

-    /// Check if we are a view that the underlyinglist has only been updated through us.

-    /// <br/>

-    /// This method should be called from enumerators etc to guard against 

-    /// modification of the base collection.

-    /// </summary>

-    /// <exception cref="InvalidOperationException"> if check fails.</exception>

-    void validitycheck()

-    {

-      if (!isValid)

-        throw new ViewDisposedException();

-    }

-

-    /// <summary>

-    /// Check that the list has not been updated since a particular time.

-    /// </summary>

-    /// <param name="stamp">The stamp indicating the time.</param>

-    /// <exception cref="CollectionModifiedException"> if check fails.</exception>

-    protected override void modifycheck(int stamp)

-    {

-      validitycheck();

-      if ((underlying != null ? underlying.stamp : this.stamp) != stamp)

-        throw new CollectionModifiedException();

-    }

-    #endregion

-

-    #region Searching

-    bool contains(T item, out Node node)

-    {

-#if HASHINDEX

-      if (dict.Find(item, out node))

-        return insideview(node);

-#else

-      //TODO: search from both ends? Or search from the end selected by FIFO?

-      node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        if (equals(item, node.item))

-          return true;

-        node = node.next;

-      }

-#endif

-      return false;

-    }

-

-    /// <summary>

-    /// Search forwards from a node for a node with a particular item.

-    /// </summary>

-    /// <param name="item">The item to look for</param>

-    /// <param name="node">On input, the node to start at. If item was found, the node found on output.</param>

-    /// <param name="index">If node was found, the value will be the number of links followed higher than 

-    /// the value on input. If item was not found, the value on output is undefined.</param>

-    /// <returns>True if node was found.</returns>

-    bool find(T item, ref Node node, ref int index)

-    {

-      while (node != endsentinel)

-      {

-        //if (item.Equals(node.item))

-        if (itemequalityComparer.Equals(item, node.item))

-          return true;

-

-        index++;

-        node = node.next;

-      }

-

-      return false;

-    }

-

-    bool dnif(T item, ref Node node, ref int index)

-    {

-      while (node != startsentinel)

-      {

-        //if (item.Equals(node.item))

-        if (itemequalityComparer.Equals(item, node.item))

-          return true;

-

-        index--;

-        node = node.prev;

-      }

-

-      return false;

-    }

-

-#if HASHINDEX

-    bool insideview(Node node)

-    {

-      if (underlying == null)

-        return true;

-      return (startsentinel.precedes(node) && node.precedes(endsentinel));

-    }

-#endif

-

-    #endregion

-

-    #region Indexing

-    /// <summary>

-    /// Return the node at position pos

-    /// </summary>

-    /// <param name="pos"></param>

-    /// <returns></returns>

-    Node get(int pos)

-    {

-      if (pos < 0 || pos >= size)

-        throw new IndexOutOfRangeException();

-      else if (pos < size / 2)

-      {              // Closer to front

-        Node node = startsentinel;

-

-        for (int i = 0; i <= pos; i++)

-          node = node.next;

-

-        return node;

-      }

-      else

-      {                            // Closer to end

-        Node node = endsentinel;

-

-        for (int i = size; i > pos; i--)

-          node = node.prev;

-

-        return node;

-      }

-    }

-

-    /// <summary>

-    /// Find the distance from pos to the set given by positions. Return the

-    /// signed distance as return value and as an out parameter, the

-    /// array index of the nearest position. This is used for up to length 5 of

-    /// positions, and we do not assume it is sorted. 

-    /// </summary>

-    /// <param name="pos"></param>

-    /// <param name="positions"></param>

-    /// <param name="nearest"></param>

-    /// <returns></returns>

-    int dist(int pos, out int nearest, int[] positions)

-    {

-      nearest = -1;

-      int bestdist = int.MaxValue;

-      int signeddist = bestdist;

-      for (int i = 0; i < positions.Length; i++)

-      {

-        int thisdist = positions[i] - pos;

-        if (thisdist >= 0 && thisdist < bestdist) { nearest = i; bestdist = thisdist; signeddist = thisdist; }

-        if (thisdist < 0 && -thisdist < bestdist) { nearest = i; bestdist = -thisdist; signeddist = thisdist; }

-      }

-      return signeddist;

-    }

-

-    /// <summary>

-    /// Find the node at position pos, given known positions of several nodes.

-    /// </summary>

-    /// <param name="pos"></param>

-    /// <param name="positions"></param>

-    /// <param name="nodes"></param>

-    /// <returns></returns>

-    Node get(int pos, int[] positions, Node[] nodes)

-    {

-      int nearest;

-      int delta = dist(pos, out nearest, positions);

-      Node node = nodes[nearest];

-      if (delta > 0)

-        for (int i = 0; i < delta; i++)

-          node = node.prev;

-      else

-        for (int i = 0; i > delta; i--)

-          node = node.next;

-      return node;

-    }

-

-    /// <summary>

-    /// Get nodes at positions p1 and p2, given nodes at several positions.

-    /// </summary>

-    /// <param name="p1"></param>

-    /// <param name="p2"></param>

-    /// <param name="n1"></param>

-    /// <param name="n2"></param>

-    /// <param name="positions"></param>

-    /// <param name="nodes"></param>

-    void getPair(int p1, int p2, out Node n1, out Node n2, int[] positions, Node[] nodes)

-    {

-      int nearest1, nearest2;

-      int delta1 = dist(p1, out nearest1, positions), d1 = delta1 < 0 ? -delta1 : delta1;

-      int delta2 = dist(p2, out nearest2, positions), d2 = delta2 < 0 ? -delta2 : delta2;

-

-      if (d1 < d2)

-      {

-        n1 = get(p1, positions, nodes);

-        n2 = get(p2, new int[] { positions[nearest2], p1 }, new Node[] { nodes[nearest2], n1 });

-      }

-      else

-      {

-        n2 = get(p2, positions, nodes);

-        n1 = get(p1, new int[] { positions[nearest1], p2 }, new Node[] { nodes[nearest1], n2 });

-      }

-    }

-    #endregion

-

-    #region Insertion

-#if HASHINDEX

-    void insert(int index, Node succ, T item)

-    {

-      Node newnode = new Node(item);

-      if (dict.FindOrAdd(item, ref newnode))

-        throw new DuplicateNotAllowedException("Item already in indexed list");

-      insertNode(true, succ, newnode);

-    }

-

-    /// <summary>

-    /// Insert a Node before another one. Unchecked version. 

-    /// </summary>

-    /// <param name="succ">The successor to be</param>

-    /// <param name="newnode">Node to insert</param>

-    /// <param name="updateViews">update overlapping view in this call</param>

-    void insertNode(bool updateViews, Node succ, Node newnode)

-    {

-      newnode.next = succ;

-      Node pred = newnode.prev = succ.prev;

-      succ.prev.next = newnode;

-      succ.prev = newnode;

-      size++;

-      if (underlying != null)

-        underlying.size++;

-      settag(newnode);

-      if (updateViews)

-        fixViewsAfterInsert(succ, pred, 1, 0);

-    }

-#else

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="index">The index in this view</param>

-    /// <param name="succ"></param>

-    /// <param name="item"></param>

-    /// <returns></returns>

-    Node insert(int index, Node succ, T item)

-    {

-      Node newnode = new Node(item, succ.prev, succ);

-      succ.prev.next = newnode;

-      succ.prev = newnode;

-      size++;

-      if (underlying != null)

-        underlying.size++;

-      fixViewsAfterInsert(succ, newnode.prev, 1, Offset + index);

-      return newnode;

-    }

-#endif

-    #endregion

-

-    #region Removal

-    T remove(Node node, int index)

-    {

-      fixViewsBeforeSingleRemove(node, Offset + index);

-      node.prev.next = node.next;

-      node.next.prev = node.prev;

-      size--;

-      if (underlying != null)

-        underlying.size--;

-#if HASHINDEX

-        removefromtaggroup(node);

-#endif

-      return node.item;

-    }

-

-#if HASHINDEX

-    private bool dictremove(T item, out Node node)

-    {

-      if (underlying == null)

-      {

-        if (!dict.Remove(item, out node))

-          return false;

-      }

-      else

-      {

-        //We cannot avoid calling dict twice - have to intersperse the listorder test!

-        if (!contains(item, out node))

-          return false;

-        dict.Remove(item);

-      }

-      return true;

-    }

-#endif

-    #endregion

-

-    #region fixView utilities

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="added">The actual number of inserted nodes</param>

-    /// <param name="pred">The predecessor of the inserted nodes</param>

-    /// <param name="succ">The successor of the added nodes</param>

-    /// <param name="realInsertionIndex"></param>

-    void fixViewsAfterInsert(Node succ, Node pred, int added, int realInsertionIndex)

-    {

-      if (views != null)

-        foreach (LinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-#if HASHINDEX

-          if (pred.precedes(view.startsentinel) || (view.startsentinel == pred && view.size > 0))

-            view.offset += added;

-          if (view.startsentinel.precedes(pred) && succ.precedes(view.endsentinel))

-            view.size += added;

-          if (view.startsentinel == pred && view.size > 0)

-            view.startsentinel = succ.prev;

-          if (view.endsentinel == succ)

-            view.endsentinel = pred.next;

-#else

-            if (view.Offset == realInsertionIndex && view.size > 0)

-              view.startsentinel = succ.prev;

-            if (view.Offset + view.size == realInsertionIndex)

-              view.endsentinel = pred.next;

-            if (view.Offset < realInsertionIndex && view.Offset + view.size > realInsertionIndex)

-              view.size += added;

-            if (view.Offset > realInsertionIndex || (view.Offset == realInsertionIndex && view.size > 0))

-              view.offset += added;

-#endif

-          }

-        }

-    }

-

-    void fixViewsBeforeSingleRemove(Node node, int realRemovalIndex)

-    {

-      if (views != null)

-        foreach (LinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-#if HASHINDEX

-          if (view.startsentinel.precedes(node) && node.precedes(view.endsentinel))

-            view.size--;

-          if (!view.startsentinel.precedes(node))

-            view.offset--;

-          if (view.startsentinel == node)

-            view.startsentinel = node.prev;

-          if (view.endsentinel == node)

-            view.endsentinel = node.next;

-#else

-            if (view.offset - 1 == realRemovalIndex)

-              view.startsentinel = node.prev;

-            if (view.offset + view.size == realRemovalIndex)

-              view.endsentinel = node.next;

-            if (view.offset <= realRemovalIndex && view.offset + view.size > realRemovalIndex)

-              view.size--;

-            if (view.offset > realRemovalIndex)

-              view.offset--;

-#endif

-          }

-        }

-    }

-

-#if HASHINDEX

-#else

-    void fixViewsBeforeRemove(int start, int count, Node first, Node last)

-    {

-      int clearend = start + count - 1;

-      if (views != null)

-        foreach (LinkedList<T> view in views)

-        {

-          if (view == this)

-            continue;

-          int viewoffset = view.Offset, viewend = viewoffset + view.size - 1;

-          //sentinels

-          if (start < viewoffset && viewoffset - 1 <= clearend)

-            view.startsentinel = first.prev;

-          if (start <= viewend + 1 && viewend < clearend)

-            view.endsentinel = last.next;

-          //offsets and sizes

-          if (start < viewoffset)

-          {

-            if (clearend < viewoffset)

-              view.offset = viewoffset - count;

-            else

-            {

-              view.offset = start;

-              view.size = clearend < viewend ? viewend - clearend : 0;

-            }

-          }

-          else if (start <= viewend)

-            view.size = clearend <= viewend ? view.size - count : start - viewoffset;

-        }

-    }

-#endif

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <returns>The position of View(otherOffset, otherSize) wrt. this view</returns>

-    MutualViewPosition viewPosition(LinkedList<T> otherView)

-    {

-#if HASHINDEX

-      Node otherstartsentinel = otherView.startsentinel, otherendsentinel = otherView.endsentinel,

-        first = startsentinel.next, last = endsentinel.prev,

-        otherfirst = otherstartsentinel.next, otherlast = otherendsentinel.prev;

-      if (last.precedes(otherfirst) || otherlast.precedes(first))

-        return MutualViewPosition.NonOverlapping;

-      if (size == 0 || (otherstartsentinel.precedes(first) && last.precedes(otherendsentinel)))

-        return MutualViewPosition.Contains;

-      if (otherView.size == 0 || (startsentinel.precedes(otherfirst) && otherlast.precedes(endsentinel)))

-        return MutualViewPosition.ContainedIn;

-      return MutualViewPosition.Overlapping;

-#else

-      int end = offset + size, otherOffset = otherView.offset, otherSize = otherView.size, otherEnd = otherOffset + otherSize;

-      if (otherOffset >= end || otherEnd <= offset)

-        return MutualViewPosition.NonOverlapping;

-      if (size == 0 || (otherOffset <= offset && end <= otherEnd))

-        return MutualViewPosition.Contains;

-      if (otherSize == 0 || (offset <= otherOffset && otherEnd <= end))

-        return MutualViewPosition.ContainedIn;

-      return MutualViewPosition.Overlapping;

-#endif

-    }

-

-    void disposeOverlappingViews(bool reverse)

-    {

-      if (views != null)

-      {

-        foreach (LinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-            switch (viewPosition(view))

-            {

-              case MutualViewPosition.ContainedIn:

-                if (reverse)

-                { }

-                else

-                  view.Dispose();

-                break;

-              case MutualViewPosition.Overlapping:

-                view.Dispose();

-                break;

-              case MutualViewPosition.Contains:

-              case MutualViewPosition.NonOverlapping:

-                break;

-            }

-          }

-        }

-      }

-    }

-

-    #endregion

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// Create a linked list with en external item equalityComparer

-    /// </summary>

-    /// <param name="itemequalityComparer">The external equalityComparer</param>

-    public LinkedList(SCG.IEqualityComparer<T> itemequalityComparer)

-      : base(itemequalityComparer)

-    {

-      offset = 0;

-      size = stamp = 0;

-      startsentinel = new Node(default(T));

-      endsentinel = new Node(default(T));

-      startsentinel.next = endsentinel;

-      endsentinel.prev = startsentinel;

-#if HASHINDEX

-      //It is important that the sentinels are different:

-      startsentinel.taggroup = new TagGroup();

-      startsentinel.taggroup.tag = int.MinValue;

-      startsentinel.taggroup.count = 0;

-      endsentinel.taggroup = new TagGroup();

-      endsentinel.taggroup.tag = int.MaxValue;

-      endsentinel.taggroup.count = 0;

-      dict = new HashDictionary<T, Node>(itemequalityComparer);

-#endif

-    }

-

-    /// <summary>

-    /// Create a linked list with the natural item equalityComparer

-    /// </summary>

-    public LinkedList() : this(EqualityComparer<T>.Default) { }

-

-    #endregion

-

-    #region Node nested class

-

-    /// <summary>

-    /// An individual cell in the linked list

-    /// </summary>

-    [Serializable]

-    class Node

-    {

-      public Node prev;

-

-      public Node next;

-

-      public T item;

-

-      #region Tag support

-#if HASHINDEX

-      internal int tag;

-

-      internal TagGroup taggroup;

-

-      internal bool precedes(Node that)

-      {

-        //Debug.Assert(taggroup != null, "taggroup field null");

-        //Debug.Assert(that.taggroup != null, "that.taggroup field null");

-        int t1 = taggroup.tag;

-        int t2 = that.taggroup.tag;

-

-        return t1 < t2 ? true : t1 > t2 ? false : tag < that.tag;

-      }

-#endif

-      #endregion

-

-      [Tested]

-      internal Node(T item) { this.item = item; }

-

-      [Tested]

-      internal Node(T item, Node prev, Node next)

-      {

-        this.item = item; this.prev = prev; this.next = next;

-      }

-

-      public override string ToString()

-      {

-#if HASHINDEX

-        return String.Format("Node: (item={0}, tag={1})", item, tag);

-#else

-        return String.Format("Node(item={0})", item);

-#endif

-      }

-    }

-

-    #endregion

-

-    #region Taggroup nested class and tag maintenance utilities

-#if HASHINDEX

-    /// <summary>

-    /// A group of nodes with the same high tag. Purpose is to be

-    /// able to tell the sequence order of two nodes without having to scan through

-    /// the list.

-    /// </summary>

-    [Serializable]

-    class TagGroup

-    {

-      internal int tag, count;

-

-      internal Node first, last;

-

-      /// <summary>

-      /// Pretty print a tag group

-      /// </summary>

-      /// <returns>Formatted tag group</returns>

-      public override string ToString()

-      { return String.Format("TagGroup(tag={0}, cnt={1}, fst={2}, lst={3})", tag, count, first, last); }

-    }

-

-    //Constants for tag maintenance

-    const int wordsize = 32;

-

-    const int lobits = 3;

-

-    const int hibits = lobits + 1;

-

-    const int losize = 1 << lobits;

-

-    const int hisize = 1 << hibits;

-

-    const int logwordsize = 5;

-

-    TagGroup gettaggroup(Node pred, Node succ, out int lowbound, out int highbound)

-    {

-      TagGroup predgroup = pred.taggroup, succgroup = succ.taggroup;

-

-      if (predgroup == succgroup)

-      {

-        lowbound = pred.tag + 1;

-        highbound = succ.tag - 1;

-        return predgroup;

-      }

-      else if (predgroup.first != null)

-      {

-        lowbound = pred.tag + 1;

-        highbound = int.MaxValue;

-        return predgroup;

-      }

-      else if (succgroup.first != null)

-      {

-        lowbound = int.MinValue;

-        highbound = succ.tag - 1;

-        return succgroup;

-      }

-      else

-      {

-        lowbound = int.MinValue;

-        highbound = int.MaxValue;

-        return new TagGroup();

-      }

-    }

-

-

-    /// <summary>

-    /// Put a tag on a node (already inserted in the list). Split taggroups and renumber as 

-    /// necessary.

-    /// </summary>

-    /// <param name="node">The node to tag</param>

-    void settag(Node node)

-    {

-      Node pred = node.prev, succ = node.next;

-      TagGroup predgroup = pred.taggroup, succgroup = succ.taggroup;

-

-      if (predgroup == succgroup)

-      {

-        node.taggroup = predgroup;

-        predgroup.count++;

-        if (pred.tag + 1 == succ.tag)

-          splittaggroup(predgroup);

-        else

-          node.tag = (pred.tag + 1) / 2 + (succ.tag - 1) / 2;

-      }

-      else if (predgroup.first != null)

-      {

-        node.taggroup = predgroup;

-        predgroup.last = node;

-        predgroup.count++;

-        if (pred.tag == int.MaxValue)

-          splittaggroup(predgroup);

-        else

-          node.tag = pred.tag / 2 + int.MaxValue / 2 + 1;

-      }

-      else if (succgroup.first != null)

-      {

-        node.taggroup = succgroup;

-        succgroup.first = node;

-        succgroup.count++;

-        if (succ.tag == int.MinValue)

-          splittaggroup(node.taggroup);

-        else

-          node.tag = int.MinValue / 2 + (succ.tag - 1) / 2;

-      }

-      else

-      {

-        Debug.Assert(Taggroups == 0);

-

-        TagGroup newgroup = new TagGroup();

-

-        Taggroups = 1;

-        node.taggroup = newgroup;

-        newgroup.first = newgroup.last = node;

-        newgroup.count = 1;

-        return;

-      }

-    }

-

-

-    /// <summary>

-    /// Remove a node from its taggroup.

-    /// <br/> When this is called, node must already have been removed from the underlying list

-    /// </summary>

-    /// <param name="node">The node to remove</param>

-    void removefromtaggroup(Node node)

-    {

-      //

-      TagGroup taggroup = node.taggroup;

-

-      if (--taggroup.count == 0)

-      {

-        Taggroups--;

-        return;

-      }

-

-      if (node == taggroup.first)

-        taggroup.first = node.next;

-

-      if (node == taggroup.last)

-        taggroup.last = node.prev;

-

-      //node.taggroup = null;

-      if (taggroup.count != losize || Taggroups == 1)

-        return;

-

-      TagGroup otg;

-

-      if ((otg = taggroup.first.prev.taggroup).count <= losize)

-        taggroup.first = otg.first;

-      else if ((otg = taggroup.last.next.taggroup).count <= losize)

-        taggroup.last = otg.last;

-      else

-        return;

-

-      Node n = otg.first;

-

-      for (int i = 0, length = otg.count; i < length; i++)

-      {

-        n.taggroup = taggroup;

-        n = n.next;

-      }

-

-      taggroup.count += otg.count;

-      Taggroups--;

-      n = taggroup.first;

-

-      const int ofs = wordsize - hibits;

-

-      for (int i = 0, count = taggroup.count; i < count; i++)

-      {

-        n.tag = (i - losize) << ofs; //(i-8)<<28 

-        n = n.next;

-      }

-    }

-

-

-    /// <summary>

-    /// Split a tag group to make rom for more tags.

-    /// </summary>

-    /// <param name="taggroup">The tag group</param>

-    void splittaggroup(TagGroup taggroup)

-    {

-      Node n = taggroup.first;

-      int ptgt = taggroup.first.prev.taggroup.tag;

-      int ntgt = taggroup.last.next.taggroup.tag;

-

-      Debug.Assert(ptgt + 1 <= ntgt - 1);

-

-      int ofs = wordsize - hibits;

-#warning hack alert was there a -1 here?

-      int newtgs = taggroup.count / hisize;// - 1;

-      int tgtdelta = (int)((ntgt + 0.0 - ptgt) / (newtgs + 2)), tgtag = ptgt;

-

-      tgtdelta = tgtdelta == 0 ? 1 : tgtdelta;

-      for (int j = 0; j < newtgs; j++)

-      {

-        TagGroup newtaggroup = new TagGroup();

-

-        newtaggroup.tag = (tgtag = tgtag >= ntgt - tgtdelta ? ntgt : tgtag + tgtdelta);

-        newtaggroup.first = n;

-        newtaggroup.count = hisize;

-        for (int i = 0; i < hisize; i++)

-        {

-          n.taggroup = newtaggroup;

-          n.tag = (i - losize) << ofs; //(i-8)<<28 

-          n = n.next;

-        }

-

-        newtaggroup.last = n.prev;

-      }

-

-      int rest = taggroup.count - hisize * newtgs;

-

-      taggroup.first = n;

-      taggroup.count = rest;

-      taggroup.tag = (tgtag = tgtag >= ntgt - tgtdelta ? ntgt : tgtag + tgtdelta); ofs--;

-      for (int i = 0; i < rest; i++)

-      {

-        n.tag = (i - hisize) << ofs; //(i-16)<<27 

-        n = n.next;

-      }

-

-      taggroup.last = n.prev;

-      Taggroups += newtgs;

-      if (tgtag == ntgt)

-        redistributetaggroups(taggroup);

-    }

-

-

-    private void redistributetaggroups(TagGroup taggroup)

-    {

-      TagGroup pred = taggroup, succ = taggroup, tmp;

-      double limit = 1, bigt = Math.Pow(Taggroups, 1.0 / 30);//?????

-      int bits = 1, count = 1, lowmask = 0, himask = 0, target = 0;

-

-      do

-      {

-        bits++;

-        lowmask = (1 << bits) - 1;

-        himask = ~lowmask;

-        target = taggroup.tag & himask;

-        while ((tmp = pred.first.prev.taggroup).first != null && (tmp.tag & himask) == target)

-        { count++; pred = tmp; }

-

-        while ((tmp = succ.last.next.taggroup).last != null && (tmp.tag & himask) == target)

-        { count++; succ = tmp; }

-

-        limit *= bigt;

-      } while (count > limit);

-

-      //redistibute tags

-      int lob = pred.first.prev.taggroup.tag, upb = succ.last.next.taggroup.tag;

-      int delta = upb / (count + 1) - lob / (count + 1);

-

-      Debug.Assert(delta > 0);

-      for (int i = 0; i < count; i++)

-      {

-        pred.tag = lob + (i + 1) * delta;

-        pred = pred.last.next.taggroup;

-      }

-    }

-#endif

-

-    #endregion

-

-    #region Position, PositionComparer and ViewHandler nested types

-    class PositionComparer : SCG.IComparer<Position>

-    {

-      static PositionComparer _default;

-      PositionComparer() { }

-      public static PositionComparer Default { get { return _default ?? (_default = new PositionComparer()); } }

-      public int Compare(Position a, Position b)

-      {

-#if HASHINDEX

-        return a.Endpoint == b.Endpoint ? 0 : a.Endpoint.precedes(b.Endpoint) ? -1 : 1;

-#else

-        return a.Index.CompareTo(b.Index);

-#endif

-      }

-    }

-    /// <summary>

-    /// During RemoveAll, we need to cache the original endpoint indices of views

-    /// </summary>

-    struct Position

-    {

-      public readonly LinkedList<T> View;

-      public bool Left;

-#if HASHINDEX

-      public readonly Node Endpoint;

-#else

-      public readonly int Index;

-#endif

-      public Position(LinkedList<T> view, bool left)

-      {

-        View = view;

-        Left = left;

-#if HASHINDEX

-        Endpoint = left ? view.startsentinel.next : view.endsentinel.prev;

-#else

-        Index = left ? view.Offset : view.Offset + view.size - 1;

-#endif

-      }

-#if HASHINDEX

-      public Position(Node node, int foo) { this.Endpoint = node; View = null; Left = false;}

-#else

-      public Position(int index) { this.Index = index; View = null; Left = false; }

-#endif

-    }

-

-    //TODO: merge the two implementations using Position values as arguments

-    /// <summary>

-    /// Handle the update of (other) views during a multi-remove operation.

-    /// </summary>

-    struct ViewHandler

-    {

-      ArrayList<Position> leftEnds;

-      ArrayList<Position> rightEnds;

-      int leftEndIndex, rightEndIndex, leftEndIndex2, rightEndIndex2;

-      internal readonly int viewCount;

-      internal ViewHandler(LinkedList<T> list)

-      {

-        leftEndIndex = rightEndIndex = leftEndIndex2 = rightEndIndex2 = viewCount = 0;

-        leftEnds = rightEnds = null;

-        if (list.views != null)

-          foreach (LinkedList<T> v in list.views)

-            if (v != list)

-            {

-              if (leftEnds == null)

-              {

-                leftEnds = new ArrayList<Position>();

-                rightEnds = new ArrayList<Position>();

-              }

-              leftEnds.Add(new Position(v, true));

-              rightEnds.Add(new Position(v, false));

-            }

-        if (leftEnds == null)

-          return;

-        viewCount = leftEnds.Count;

-        leftEnds.Sort(PositionComparer.Default);

-        rightEnds.Sort(PositionComparer.Default);

-      }

-#if HASHINDEX

-      internal void skipEndpoints(int removed, Node n)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && ((endpoint = leftEnds[leftEndIndex]).Endpoint.prev.precedes(n)))

-          {

-            LinkedList<T> view = endpoint.View;

-            view.offset = view.offset - removed;//TODO: extract offset.Value?

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Endpoint.precedes(n))

-          {

-            LinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Endpoint.prev.precedes(n))

-            leftEndIndex2++;

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Endpoint.next.precedes(n))

-            rightEndIndex2++;

-        }

-      }

-      /// <summary>

-      /// To be called with n pointing to the right of each node to be removed in a stretch. 

-      /// And at the endsentinel. 

-      /// 

-      /// Update offset of a view whose left endpoint (has not already been handled and) is n or precedes n.

-      /// I.e. startsentinel precedes n.

-      /// Also update the size as a prelude to handling the right endpoint.

-      /// 

-      /// Update size of a view not already handled and whose right endpoint precedes n.

-      /// </summary>

-      /// <param name="removed">The number of nodes left of n to be removed</param>

-      /// <param name="n"></param>

-      internal void updateViewSizesAndCounts(int removed, Node n)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && ((endpoint = leftEnds[leftEndIndex]).Endpoint.prev.precedes(n)))

-          {

-            LinkedList<T> view = endpoint.View;

-            view.offset = view.offset - removed; //TODO: fix use of offset

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Endpoint.precedes(n))

-          {

-            LinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-      /// <summary>

-      /// To be called with n being the first not-to-be-removed node after a (stretch of) node(s) to be removed.

-      /// 

-      /// It will update the startsentinel of views (that have not been handled before and) 

-      /// whose startsentinel precedes n, i.e. is to be deleted.

-      /// 

-      /// It will update the endsentinel of views (...) whose endsentinel precedes n, i.e. is to be deleted.

-      /// 

-      /// PROBLEM: DOESNT WORK AS ORIGINALLY ADVERTISED. WE MUST DO THIS BEFORE WE ACTUALLY REMOVE THE NODES. WHEN THE 

-      /// NODES HAVE BEEN REMOVED, THE precedes METHOD WILL NOT WORK!

-      /// </summary>

-      /// <param name="n"></param>

-      /// <param name="newstart"></param>

-      /// <param name="newend"></param>

-      internal void updateSentinels(Node n, Node newstart, Node newend)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Endpoint.prev.precedes(n))

-          {

-            LinkedList<T> view = endpoint.View;

-            view.startsentinel = newstart;

-            leftEndIndex2++;

-          }

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Endpoint.next.precedes(n))

-          {

-            LinkedList<T> view = endpoint.View;

-            view.endsentinel = newend;

-            rightEndIndex2++;

-          }

-        }

-      }

-#else

-      /// <summary>

-      /// This is to be called with realindex pointing to the first node to be removed after a (stretch of) node that was not removed

-      /// </summary>

-      /// <param name="removed"></param>

-      /// <param name="realindex"></param>

-      internal void skipEndpoints(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).Index <= realindex)

-          {

-            LinkedList<T> view = endpoint.View;

-            view.offset = view.offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Index < realindex)

-          {

-            LinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Index <= realindex)

-            leftEndIndex2++;

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Index < realindex - 1)

-            rightEndIndex2++;

-        }

-      }

-      internal void updateViewSizesAndCounts(int removed, int realindex)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex < viewCount && (endpoint = leftEnds[leftEndIndex]).Index <= realindex)

-          {

-            LinkedList<T> view = endpoint.View;

-            view.offset = view.Offset - removed;

-            view.size += removed;

-            leftEndIndex++;

-          }

-          while (rightEndIndex < viewCount && (endpoint = rightEnds[rightEndIndex]).Index < realindex)

-          {

-            LinkedList<T> view = endpoint.View;

-            view.size -= removed;

-            rightEndIndex++;

-          }

-        }

-      }

-      internal void updateSentinels(int realindex, Node newstart, Node newend)

-      {

-        if (viewCount > 0)

-        {

-          Position endpoint;

-          while (leftEndIndex2 < viewCount && (endpoint = leftEnds[leftEndIndex2]).Index <= realindex)

-          {

-            LinkedList<T> view = endpoint.View;

-            view.startsentinel = newstart;

-            leftEndIndex2++;

-          }

-          while (rightEndIndex2 < viewCount && (endpoint = rightEnds[rightEndIndex2]).Index < realindex - 1)

-          {

-            LinkedList<T> view = endpoint.View;

-            view.endsentinel = newend;

-            rightEndIndex2++;

-          }

-        }

-      }

-#endif

-    }

-    #endregion

-

-    #region Range nested class

-

-    class Range : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      int start, count, rangestamp;

-      Node startnode, endnode;

-

-      LinkedList<T> list;

-

-      bool forwards;

-

-

-      internal Range(LinkedList<T> list, int start, int count, bool forwards)

-      {

-        this.list = list; this.rangestamp = list.underlying != null ? list.underlying.stamp : list.stamp;

-        this.start = start; this.count = count; this.forwards = forwards;

-        if (count > 0)

-        {

-          startnode = list.get(start);

-          endnode = list.get(start + count - 1);

-        }

-      }

-

-      public override bool IsEmpty { get { list.modifycheck(rangestamp); return count == 0; } }

-

-      [Tested]

-      public override int Count { [Tested]get { list.modifycheck(rangestamp); return count; } }

-

-

-      public override Speed CountSpeed { get { list.modifycheck(rangestamp); return Speed.Constant; } }

-

-

-      public override T Choose()

-      {

-        list.modifycheck(rangestamp);

-        if (count > 0) return startnode.item;

-        throw new NoSuchItemException();

-      }

-

-

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator()

-      {

-        int togo = count;

-

-        list.modifycheck(rangestamp);

-        if (togo == 0)

-          yield break;

-

-        Node cursor = forwards ? startnode : endnode;

-

-        yield return cursor.item;

-        while (--togo > 0)

-        {

-          cursor = forwards ? cursor.next : cursor.prev;

-          list.modifycheck(rangestamp);

-          yield return cursor.item;

-        }

-      }

-

-

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      {

-        list.modifycheck(rangestamp);

-

-        Range b = (Range)MemberwiseClone();

-

-        b.forwards = !forwards;

-        return b;

-      }

-

-

-      [Tested]

-      IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-

-      [Tested]

-      public override EnumerationDirection Direction

-      {

-        [Tested]

-        get

-        { return forwards ? EnumerationDirection.Forwards : EnumerationDirection.Backwards; }

-      }

-    }

-

-

-    #endregion

-

-    #region IDisposable Members

-

-    /// <summary>

-    /// Invalidate this list. If a view, just invalidate the view. 

-    /// If not a view, invalidate the list and all views on it.

-    /// </summary>

-    public virtual void Dispose()

-    {

-      Dispose(false);

-    }

-

-    void Dispose(bool disposingUnderlying)

-    {

-      if (isValid)

-      {

-        if (underlying != null)

-        {

-          isValid = false;

-          if (!disposingUnderlying)

-            views.Remove(myWeakReference);

-          endsentinel = null;

-          startsentinel = null;

-          underlying = null;

-          views = null;

-          myWeakReference = null;

-        }

-        else

-        {

-          //isValid = false;

-          //endsentinel = null;

-          //startsentinel = null;

-          foreach (LinkedList<T> view in views)

-            view.Dispose(true);

-          //views = null;

-          Clear();

-        }

-      }

-    }

-

-    #endregion IDisposable stuff

-

-    #region IList<T> Members

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The first item in this list.</value>

-    [Tested]

-    public virtual T First

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-        return startsentinel.next.item;

-      }

-    }

-

-

-    /// <summary>

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if this list is empty.</exception>

-    /// <value>The last item in this list.</value>

-    [Tested]

-    public virtual T Last

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        if (size == 0)

-          throw new NoSuchItemException();

-        return endsentinel.prev.item;

-      }

-    }

-

-    /// <summary>

-    /// Since <code>Add(T item)</code> always add at the end of the list,

-    /// this describes if list has FIFO or LIFO semantics.

-    /// </summary>

-    /// <value>True if the <code>Remove()</code> operation removes from the

-    /// start of the list, false if it removes from the end. THe default for a new linked list is true.</value>

-    [Tested]

-    public virtual bool FIFO

-    {

-      [Tested]

-      get { validitycheck(); return fIFO; }

-      [Tested]

-      set { updatecheck(); fIFO = value; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    public virtual bool IsFixedSize

-    {

-      get { validitycheck(); return false; }

-    }

-

-    /// <summary>

-    /// On this list, this indexer is read/write.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <value>The i'th item of this list.</value>

-    /// <param name="index">The index of the item to fetch or store.</param>

-    [Tested]

-    public virtual T this[int index]

-    {

-      [Tested]

-      get { validitycheck(); return get(index).item; }

-      [Tested]

-      set

-      {

-        updatecheck();

-        Node n = get(index);

-        //

-        T item = n.item;

-#if HASHINDEX

-

-        if (itemequalityComparer.Equals(value, item))

-        {

-          n.item = value;

-          dict.Update(value, n);

-        }

-        else if (!dict.FindOrAdd(value, ref n))

-        {

-          dict.Remove(item);

-          n.item = value;

-        }

-        else

-          throw new ArgumentException("Item already in indexed list");

-#else

-        n.item = value;

-#endif

-        (underlying ?? this).raiseForSetThis(index, value, item);

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Linear; } }

-

-    /// <summary>

-    /// Insert an item at a specific index location in this list. 

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt; the size of the collection.</summary>

-    /// <param name="i">The index at which to insert.</param>

-    /// <param name="item">The item to insert.</param>

-    [Tested]

-    public virtual void Insert(int i, T item)

-    {

-      updatecheck();

-      insert(i, i == size ? endsentinel : get(i), item);

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForInsert(i + Offset, item);

-    }

-

-    /// <summary>

-    /// Insert an item at the end of a compatible view, used as a pointer.

-    /// <para>The <code>pointer</code> must be a view on the same list as

-    /// <code>this</code> and the endpoitn of <code>pointer</code> must be

-    /// a valid insertion point of <code>this</code></para>

-    /// </summary>

-    /// <exception cref="IncompatibleViewException">If <code>pointer</code> 

-    /// is not a view on the same list as <code>this</code></exception>

-    /// <exception cref="IndexOutOfRangeException"><b>??????</b> if the endpoint of 

-    ///  <code>pointer</code> is not inside <code>this</code></exception>

-    /// <exception cref="DuplicateNotAllowedException"> if the list has

-    /// <code>AllowsDuplicates==false</code> and the item is 

-    /// already in the list.</exception>

-    /// <param name="pointer"></param>

-    /// <param name="item"></param>

-    public void Insert(IList<T> pointer, T item)

-    {

-      updatecheck();

-      if ((pointer == null) || ((pointer.Underlying ?? pointer) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-#warning INEFFICIENT

-      //TODO: make this efficient (the whole point of the method:

-      //Do NOT use Insert, but insert the node at pointer.endsentinel, checking

-      //via the ordering that this is a valid insertion point

-      Insert(pointer.Offset + pointer.Count - Offset, item);

-    }

-

-    /// <summary>

-    /// Insert into this list all items from an enumerable collection starting 

-    /// at a particular index.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt; the size of the collection.

-    /// </summary>

-    /// <param name="i">Index to start inserting at</param>

-    /// <param name="items">Items to insert</param>

-    /// <typeparam name="U"></typeparam>

-    [Tested]

-    public virtual void InsertAll<U>(int i, SCG.IEnumerable<U> items) where U : T

-    {

-      insertAll(i, items, true);

-    }

-

-    void insertAll<U>(int i, SCG.IEnumerable<U> items, bool insertion) where U : T

-    {

-      updatecheck();

-      Node succ, node, pred;

-      int count = 0;

-      succ = i == size ? endsentinel : get(i);

-      pred = node = succ.prev;

-#if HASHINDEX

-      TagGroup taggroup = null;

-      int taglimit = 0, thetag = 0;

-      taggroup = gettaggroup(node, succ, out thetag, out taglimit);

-      try

-      {

-        foreach (T item in items)

-        {

-          Node tmp = new Node(item, node, null);

-          if (!dict.FindOrAdd(item, ref tmp))

-          {

-            tmp.tag = thetag < taglimit ? ++thetag : thetag;

-            tmp.taggroup = taggroup;

-            node.next = tmp;

-            count++;

-            node = tmp;

-          }

-          else

-            throw new DuplicateNotAllowedException("Item already in indexed list");

-        }

-      }

-      finally

-      {

-        taggroup.count += count;

-        taggroup.first = succ.prev;

-        taggroup.last = node;

-        succ.prev = node;

-        node.next = succ;

-        if (node.tag == node.prev.tag)

-          splittaggroup(taggroup);

-        size += count;

-        if (underlying != null)

-          underlying.size += count;

-        if (count > 0)

-        {

-          fixViewsAfterInsert(succ, pred, count, 0);

-          raiseForInsertAll(pred, i, count, insertion);

-        }

-      }

-#else

-      foreach (T item in items)

-      {

-        Node tmp = new Node(item, node, null);

-        node.next = tmp;

-        count++;

-        node = tmp;

-      }

-      if (count == 0)

-        return;

-      succ.prev = node;

-      node.next = succ;

-      size += count;

-      if (underlying != null)

-        underlying.size += count;

-      if (count > 0)

-      {

-        fixViewsAfterInsert(succ, pred, count, offset + i);

-        raiseForInsertAll(pred, i, count, insertion);

-      }

-#endif

-    }

-

-    private void raiseForInsertAll(Node node, int i, int added, bool insertion)

-    {

-      if (ActiveEvents != 0)

-      {

-        int index = Offset + i;

-        if ((ActiveEvents & (EventTypeEnum.Added | EventTypeEnum.Inserted)) != 0)

-          for (int j = index; j < index + added; j++)

-          {

-#warning must we check stamps here?

-            node = node.next;

-            T item = node.item;

-            if (insertion) raiseItemInserted(item, j);

-            raiseItemsAdded(item, 1);

-          }

-        raiseCollectionChanged();

-      }

-    }

-

-    /// <summary>

-    /// Insert an item at the front of this list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-    [Tested]

-    public virtual void InsertFirst(T item)

-    {

-      updatecheck();

-      insert(0, startsentinel.next, item);

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForInsert(0 + Offset, item);

-    }

-

-    /// <summary>

-    /// Insert an item at the back of this list.

-    /// </summary>

-    /// <param name="item">The item to insert.</param>

-    [Tested]

-    public virtual void InsertLast(T item)

-    {

-      updatecheck();

-      insert(size, endsentinel, item);

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForInsert(size - 1 + Offset, item);

-    }

-

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list.

-    /// </summary>

-    /// <param name="mapper">The delegate definging the map.</param>

-    /// <returns>The new list.</returns>

-    [Tested]

-    public IList<V> Map<V>(Fun<T, V> mapper)

-    {

-      validitycheck();

-

-      LinkedList<V> retval = new LinkedList<V>();

-      return map<V>(mapper, retval);

-    }

-

-    /// <summary>

-    /// Create a new list consisting of the results of mapping all items of this

-    /// list. The new list will use a specified equalityComparer for the item type.

-    /// </summary>

-    /// <typeparam name="V">The type of items of the new list</typeparam>

-    /// <param name="mapper">The delegate defining the map.</param>

-    /// <param name="equalityComparer">The equalityComparer to use for the new list</param>

-    /// <returns>The new list.</returns>

-    public IList<V> Map<V>(Fun<T, V> mapper, SCG.IEqualityComparer<V> equalityComparer)

-    {

-      validitycheck();

-

-      LinkedList<V> retval = new LinkedList<V>(equalityComparer);

-      return map<V>(mapper, retval);

-    }

-

-    private IList<V> map<V>(Fun<T, V> mapper, LinkedList<V> retval)

-    {

-      if (size == 0)

-        return retval;

-      int stamp = this.stamp;

-      Node cursor = startsentinel.next;

-      LinkedList<V>.Node mcursor = retval.startsentinel;

-

-#if HASHINDEX

-      double tagdelta = int.MaxValue / (size + 1.0);

-      int count = 1;

-      LinkedList<V>.TagGroup taggroup = null;

-      taggroup = new LinkedList<V>.TagGroup();

-      retval.taggroups = 1;

-      taggroup.count = size;

-#endif

-      while (cursor != endsentinel)

-      {

-        V v = mapper(cursor.item);

-        modifycheck(stamp);

-        mcursor.next = new LinkedList<V>.Node(v, mcursor, null);

-        cursor = cursor.next;

-        mcursor = mcursor.next;

-#if HASHINDEX

-        retval.dict.Add(v, mcursor);

-        mcursor.taggroup = taggroup;

-        mcursor.tag = (int)(tagdelta * count++);

-#endif

-      }

-

-      retval.endsentinel.prev = mcursor;

-      mcursor.next = retval.endsentinel;

-      retval.size = size;

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove one item from the list: from the front if <code>FIFO</code>

-    /// is true, else from the back.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T Remove()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-      T item = fIFO ? remove(startsentinel.next, 0) : remove(endsentinel.prev, size - 1);

-#if HASHINDEX

-      dict.Remove(item);

-#endif

-      (underlying ?? this).raiseForRemove(item);

-      return item;

-    }

-

-    /// <summary>

-    /// Remove one item from the front of the list.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveFirst()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = remove(startsentinel.next, 0);

-#if HASHINDEX

-      dict.Remove(item);

-#endif

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveAt(Offset, item);

-      return item;

-    }

-

-    /// <summary>

-    /// Remove one item from the back of the list.

-    /// <exception cref="NoSuchItemException"/> if this list is empty.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveLast()

-    {

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException("List is empty");

-

-      T item = remove(endsentinel.prev, size - 1);

-#if HASHINDEX

-      dict.Remove(item);

-#endif

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveAt(size + Offset, item);

-      return item;

-    }

-

-    /// <summary>

-    /// Create a list view on this list. 

-    /// </summary>

-    /// <exception cref="ArgumentOutOfRangeException"> if the start or count is negative</exception>

-    /// <exception cref="ArgumentException"> if the range does not fit within list.</exception>

-    /// <param name="start">The index in this list of the start of the view.</param>

-    /// <param name="count">The size of the view.</param>

-    /// <returns>The new list view.</returns>

-    [Tested]

-    public virtual IList<T> View(int start, int count)

-    {

-      checkRange(start, count);

-      validitycheck();

-      if (views == null)

-        views = new WeakViewList<LinkedList<T>>();

-      LinkedList<T> retval = (LinkedList<T>)MemberwiseClone();

-      retval.underlying = underlying != null ? underlying : this;

-      retval.offset = offset + start;

-      retval.size = count;

-      getPair(start - 1, start + count, out retval.startsentinel, out retval.endsentinel,

-          new int[] { -1, size }, new Node[] { startsentinel, endsentinel });

-      //retval.startsentinel = start == 0 ? startsentinel : get(start - 1);

-      //retval.endsentinel = start + count == size ? endsentinel : get(start + count);

-

-      //TODO: for the purpose of Dispose, we need to retain a ref to the node

-      retval.myWeakReference = views.Add(retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// Create a list view on this list containing the (first) occurrence of a particular item. 

-    /// </summary>

-    /// <exception cref="ArgumentException"> if the item is not in this list.</exception>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    public virtual IList<T> ViewOf(T item)

-    {

-#if HASHINDEX

-      Node n;

-      validitycheck();

-      if (!contains(item, out n))

-        return null;

-      LinkedList<T> retval = (LinkedList<T>)MemberwiseClone();

-      retval.underlying = underlying != null ? underlying : this;

-      retval.offset = null;

-      retval.startsentinel = n.prev;

-      retval.endsentinel = n.next;

-      retval.size = 1;

-      return retval;

-#else

-      int index = 0;

-      Node n = startsentinel.next;

-      if (!find(item, ref n, ref index))

-        return null;

-      //TODO: optimize with getpair!

-      return View(index, 1);

-#endif

-    }

-

-    /// <summary>

-    /// Create a list view on this list containing the last occurrence of a particular item. 

-    /// <exception cref="ArgumentException"/> if the item is not in this list.

-    /// </summary>

-    /// <param name="item">The item to find.</param>

-    /// <returns>The new list view.</returns>

-    public virtual IList<T> LastViewOf(T item)

-    {

-#if HASHINDEX

-      return ViewOf(item);

-#else

-      int index = size - 1;

-      Node n = endsentinel.prev;

-      if (!dnif(item, ref n, ref index))

-        return null;

-      return View(index, 1);

-#endif

-    }

-

-    /// <summary>

-    /// Null if this list is not a view.

-    /// </summary>

-    /// <value>Underlying list for view.</value>

-    [Tested]

-    public virtual IList<T> Underlying { [Tested]get { validitycheck(); return underlying; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual bool IsValid { get { return isValid; } }

-

-    /// <summary>

-    /// </summary>

-    /// <value>Offset for this list view or 0 for a underlying list.</value>

-    [Tested]

-    public virtual int Offset

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-#if HASHINDEX

-        if (offset == null && underlying != null)

-        {

-          //TODO: search from both ends simultaneously!

-          Node n = underlying.startsentinel;

-          int i = 0;

-          while (n != startsentinel) { n = n.next; i++; }

-          offset = i;

-        }

-#endif

-        return (int)offset;

-      }

-    }

-

-    /// <summary>

-    /// Slide this list view along the underlying list.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    [Tested]

-    public IList<T> Slide(int offset)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-    //TODO: more test cases

-    /// <summary>

-    /// Slide this list view along the underlying list, perhaps changing its size.

-    /// </summary>

-    /// <exception cref="NotAViewException"> if this list is not a view.</exception>

-    /// <exception cref="ArgumentOutOfRangeException"> if the operation

-    /// would bring either end of the view outside the underlying list.</exception>

-    /// <param name="offset">The signed amount to slide: positive to slide

-    /// towards the end.</param>

-    /// <param name="size">The new size of the view.</param>

-    public IList<T> Slide(int offset, int size)

-    {

-      if (!TrySlide(offset, size))

-        throw new ArgumentOutOfRangeException();

-      return this;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <returns></returns>

-    public virtual bool TrySlide(int offset) { return TrySlide(offset, size); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="offset"></param>

-    /// <param name="size"></param>

-    /// <returns></returns>

-    public virtual bool TrySlide(int offset, int size)

-    {

-      updatecheck();

-      if (underlying == null)

-        throw new NotAViewException("List not a view");

-

-#pragma warning disable 472

-      if (this.offset == null) //Note: only possible with HASHINDEX

-#pragma warning restore 472

-      {

-#pragma warning disable 162

-        try

-        {

-          getPair(offset - 1, offset + size, out startsentinel, out endsentinel,

-              new int[] { -1, this.size }, new Node[] { startsentinel, endsentinel });

-          //TODO: maybe-update offset field

-        }

-        catch (NullReferenceException)

-        {

-          return false;

-        }

-#pragma warning restore 162

-      }

-      else

-      {

-        if (offset + this.offset < 0 || offset + this.offset + size > underlying.size)

-          return false;

-        int oldoffset = (int)(this.offset);

-        getPair(offset - 1, offset + size, out startsentinel, out endsentinel,

-            new int[] { -oldoffset - 1, -1, this.size, underlying.size - oldoffset },

-            new Node[] { underlying.startsentinel, startsentinel, endsentinel, underlying.endsentinel });

-      }

-      this.size = size;

-      this.offset += offset;

-      return true;

-    }

-

-

-    //TODO: improve the complexity of the implementation

-    /// <summary>

-    /// 

-    /// <para>Returns null if <code>otherView</code> is strictly to the left of this view</para>

-    /// </summary>

-    /// <param name="otherView"></param>

-    /// <exception cref="IncompatibleViewException">If otherView does not have the same underlying list as this</exception>

-    /// <returns></returns>

-    public virtual IList<T> Span(IList<T> otherView)

-    {

-      if ((otherView == null) || ((otherView.Underlying ?? otherView) != (underlying ?? this)))

-        throw new IncompatibleViewException();

-      if (otherView.Offset + otherView.Count - Offset < 0)

-        return null;

-      return (underlying ?? this).View(Offset, otherView.Offset + otherView.Count - Offset);

-    }

-

-

-    //Question: should we swap items or move nodes around?

-    //The first seems much more efficient unless the items are value types 

-    //with a large memory footprint.

-    //(Swapping will do count*3/2 T assignments, linking around will do 

-    // 4*count ref assignments; note that ref assignments are more expensive 

-    //than copying non-ref bits)

-    /// <summary>

-    /// Reverse the list so the items are in the opposite sequence order.

-    /// </summary>

-    [Tested]

-    public virtual void Reverse()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-

-      Position[] positions = null;

-      int poslow = 0, poshigh = 0;

-      if (views != null)

-      {

-        CircularQueue<Position> _positions = null;

-        foreach (LinkedList<T> view in views)

-        {

-          if (view != this)

-          {

-            switch (viewPosition(view))

-            {

-              case MutualViewPosition.ContainedIn:

-                (_positions ?? (_positions = new CircularQueue<Position>())).Enqueue(new Position(view, true));

-                _positions.Enqueue(new Position(view, false));

-                break;

-              case MutualViewPosition.Overlapping:

-                view.Dispose();

-                break;

-              case MutualViewPosition.Contains:

-              case MutualViewPosition.NonOverlapping:

-                break;

-            }

-          }

-        }

-        if (_positions != null)

-        {

-          positions = _positions.ToArray();

-          Sorting.IntroSort<Position>(positions, 0, positions.Length, PositionComparer.Default);

-          poshigh = positions.Length - 1;

-        }

-      }

-

-      Node a = get(0), b = get(size - 1);

-      for (int i = 0; i < size / 2; i++)

-      {

-        T swap;

-        swap = a.item; a.item = b.item; b.item = swap;

-#if HASHINDEX

-        dict[a.item] = a; dict[b.item] = b;

-#endif

-        if (positions != null)

-          mirrorViewSentinelsForReverse(positions, ref poslow, ref poshigh, a, b, i);

-        a = a.next; b = b.prev;

-      }

-      if (positions != null && size % 2 != 0)

-        mirrorViewSentinelsForReverse(positions, ref poslow, ref poshigh, a, b, size / 2);

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    private void mirrorViewSentinelsForReverse(Position[] positions, ref int poslow, ref int poshigh, Node a, Node b, int i)

-    {

-#if HASHINDEX

-      int? aindex = offset + i, bindex = offset + size - 1 - i;

-#else

-      int aindex = offset + i, bindex = offset + size - 1 - i;

-#endif

-      Position pos;

-#if HASHINDEX

-      while (poslow <= poshigh && (pos = positions[poslow]).Endpoint == a)

-#else

-      while (poslow <= poshigh && (pos = positions[poslow]).Index == aindex)

-#endif

-      {

-        //TODO: Note: in the case og hashed linked list, if this.offset == null, but pos.View.offset!=null

-        //we may at this point compute this.offset and non-null values of aindex and bindex

-        if (pos.Left)

-          pos.View.endsentinel = b.next;

-        else

-        {

-          pos.View.startsentinel = b.prev;

-          pos.View.offset = bindex;

-        }

-        poslow++;

-      }

-#if HASHINDEX

-      while (poslow < poshigh && (pos = positions[poshigh]).Endpoint == b)

-#else

-      while (poslow < poshigh && (pos = positions[poshigh]).Index == bindex)

-#endif

-      {

-        if (pos.Left)

-          pos.View.endsentinel = a.next;

-        else

-        {

-          pos.View.startsentinel = a.prev;

-          pos.View.offset = aindex;

-        }

-        poshigh--;

-      }

-    }

-

-    /// <summary>

-    /// Check if this list is sorted according to the default sorting order

-    /// for the item type T, as defined by the <see cref="T:C5.Comparer`1"/> class 

-    /// </summary>

-    /// <exception cref="NotComparableException">if T is not comparable</exception>

-    /// <returns>True if the list is sorted, else false.</returns>

-    public bool IsSorted() { return IsSorted(Comparer<T>.Default); }

-

-    /// <summary>

-    /// Check if this list is sorted according to a specific sorting order.

-    /// </summary>

-    /// <param name="c">The comparer defining the sorting order.</param>

-    /// <returns>True if the list is sorted, else false.</returns>

-    [Tested]

-    public virtual bool IsSorted(SCG.IComparer<T> c)

-    {

-      validitycheck();

-      if (size <= 1)

-        return true;

-

-      Node node = startsentinel.next;

-      T prevItem = node.item;

-

-      node = node.next;

-      while (node != endsentinel)

-      {

-        if (c.Compare(prevItem, node.item) > 0)

-          return false;

-        else

-        {

-          prevItem = node.item;

-          node = node.next;

-        }

-      }

-

-      return true;

-    }

-

-    /// <summary>

-    /// Sort the items of the list according to the default sorting order

-    /// for the item type T, as defined by the Comparer[T] class. 

-    /// (<see cref="T:C5.Comparer`1"/>).

-    /// The sorting is stable.

-    /// </summary>

-    /// <exception cref="InvalidOperationException">if T is not comparable</exception>

-    public virtual void Sort() { Sort(Comparer<T>.Default); }

-

-    // Sort the linked list using mergesort

-    /// <summary>

-    /// Sort the items of the list according to a specific sorting order.

-    /// The sorting is stable.

-    /// </summary>

-    /// <param name="c">The comparer defining the sorting order.</param>

-    [Tested]

-    public virtual void Sort(SCG.IComparer<T> c)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      disposeOverlappingViews(false);

-#if HASHINDEX

-      if (underlying != null)

-      {

-        Node cursor = startsentinel.next;

-        while (cursor != endsentinel)

-        {

-          cursor.taggroup.count--;

-          cursor = cursor.next;

-        }

-      }

-#endif

-      // Build a linked list of non-empty runs.

-      // The prev field in first node of a run points to next run's first node

-      Node runTail = startsentinel.next;

-      Node prevNode = startsentinel.next;

-

-      endsentinel.prev.next = null;

-      while (prevNode != null)

-      {

-        Node node = prevNode.next;

-

-        while (node != null && c.Compare(prevNode.item, node.item) <= 0)

-        {

-          prevNode = node;

-          node = prevNode.next;

-        }

-

-        // Completed a run; prevNode is the last node of that run

-        prevNode.next = null;	// Finish the run

-        runTail.prev = node;	// Link it into the chain of runs

-        runTail = node;

-        if (c.Compare(endsentinel.prev.item, prevNode.item) <= 0)

-          endsentinel.prev = prevNode;	// Update last pointer to point to largest

-

-        prevNode = node;		// Start a new run

-      }

-

-      // Repeatedly merge runs two and two, until only one run remains

-      while (startsentinel.next.prev != null)

-      {

-        Node run = startsentinel.next;

-        Node newRunTail = null;

-

-        while (run != null && run.prev != null)

-        { // At least two runs, merge

-          Node nextRun = run.prev.prev;

-          Node newrun = mergeRuns(run, run.prev, c);

-

-          if (newRunTail != null)

-            newRunTail.prev = newrun;

-          else

-            startsentinel.next = newrun;

-

-          newRunTail = newrun;

-          run = nextRun;

-        }

-

-        if (run != null) // Add the last run, if any

-          newRunTail.prev = run;

-      }

-

-      endsentinel.prev.next = endsentinel;

-      startsentinel.next.prev = startsentinel;

-

-      //assert invariant();

-      //assert isSorted();

-#if HASHINDEX

-      {

-        Node cursor = startsentinel.next, end = endsentinel;

-        int tag, taglimit;

-        TagGroup t = gettaggroup(startsentinel, endsentinel, out tag, out taglimit);

-        int tagdelta = taglimit / (size + 1) - tag / (size + 1);

-        tagdelta = tagdelta == 0 ? 1 : tagdelta;

-        if (underlying == null)

-          taggroups = 1;

-        while (cursor != end)

-        {

-          tag = tag + tagdelta > taglimit ? taglimit : tag + tagdelta;

-          cursor.tag = tag;

-          t.count++;

-          cursor = cursor.next;

-        }

-        if (tag == taglimit)

-          splittaggroup(t);

-      }

-#endif

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    private static Node mergeRuns(Node run1, Node run2, SCG.IComparer<T> c)

-    {

-      //assert run1 != null && run2 != null;

-      Node prev;

-      bool prev1;	// is prev from run1?

-

-      if (c.Compare(run1.item, run2.item) <= 0)

-      {

-        prev = run1;

-        prev1 = true;

-        run1 = run1.next;

-      }

-      else

-      {

-        prev = run2;

-        prev1 = false;

-        run2 = run2.next;

-      }

-

-      Node start = prev;

-

-      //assert start != null;

-      start.prev = null;

-      while (run1 != null && run2 != null)

-      {

-        if (prev1)

-        {

-          //assert prev.next == run1;

-          //Comparable run2item = (Comparable)run2.item;

-          while (run1 != null && c.Compare(run2.item, run1.item) >= 0)

-          {

-            prev = run1;

-            run1 = prev.next;

-          }

-

-          if (run1 != null)

-          { // prev.item <= run2.item < run1.item; insert run2

-            prev.next = run2;

-            run2.prev = prev;

-            prev = run2;

-            run2 = prev.next;

-            prev1 = false;

-          }

-        }

-        else

-        {

-          //assert prev.next == run2;

-          //Comparable run1item = (Comparable)run1.item;

-          while (run2 != null && c.Compare(run1.item, run2.item) > 0)

-          {

-            prev = run2;

-            run2 = prev.next;

-          }

-

-          if (run2 != null)

-          { // prev.item < run1.item <= run2.item; insert run1

-            prev.next = run1;

-            run1.prev = prev;

-            prev = run1;

-            run1 = prev.next;

-            prev1 = true;

-          }

-        }

-      }

-

-      //assert !(run1 != null && prev1) && !(run2 != null && !prev1);

-      if (run1 != null)

-      { // last run2 < all of run1; attach run1 at end

-        prev.next = run1;

-        run1.prev = prev;

-      }

-      else if (run2 != null)

-      { // last run1 

-        prev.next = run2;

-        run2.prev = prev;

-      }

-

-      return start;

-    }

-

-    /// <summary>

-    /// Randomly shuffle the items of this list. 

-    /// <para>Will invalidate overlapping views???</para>

-    /// </summary>

-    public virtual void Shuffle() { Shuffle(new C5Random()); }

-

-

-    /// <summary>

-    /// Shuffle the items of this list according to a specific random source.

-    /// <para>Will invalidate overlapping views???</para>

-    /// </summary>

-    /// <param name="rnd">The random source.</param>

-    public virtual void Shuffle(Random rnd)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      disposeOverlappingViews(false);

-      ArrayList<T> a = new ArrayList<T>();

-      a.AddAll(this);

-      a.Shuffle(rnd);

-      Node cursor = startsentinel.next;

-      int j = 0;

-      while (cursor != endsentinel)

-      {

-        cursor.item = a[j++];

-#if HASHINDEX

-        dict[cursor.item] = cursor;

-#endif

-        cursor = cursor.next;

-      }

-      (underlying ?? this).raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/>.

-    /// </summary>

-    /// <value>The directed collection of items in a specific index interval.</value>

-    /// <param name="start">The low index of the interval (inclusive).</param>

-    /// <param name="count">The size of the range.</param>

-    [Tested]

-    public IDirectedCollectionValue<T> this[int start, int count]

-    {

-      [Tested]

-      get

-      {

-        validitycheck();

-        checkRange(start, count);

-        return new Range(this, start, count, true);

-      }

-    }

-

-    /// <summary>

-    /// Searches for an item in the list going forwrds from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of item from start.</returns>

-    [Tested]

-    public virtual int IndexOf(T item)

-    {

-      validitycheck();

-      Node node;

-#if HASHINDEX

-      if (!dict.Find(item, out node) || !insideview(node))

-        return ~size;

-#endif

-      node = startsentinel.next;

-      int index = 0;

-      if (find(item, ref node, ref index))

-        return index;

-      else

-        return ~size;

-    }

-

-    /// <summary>

-    /// Searches for an item in the list going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of of item from the end.</returns>

-    [Tested]

-    public virtual int LastIndexOf(T item)

-    {

-#if HASHINDEX

-      return IndexOf(item);

-#else

-      validitycheck();

-

-      Node node = endsentinel.prev;

-      int index = size - 1;

-

-      if (dnif(item, ref node, ref index))

-        return index;

-      else

-        return ~size;

-#endif

-    }

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <param name="i">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public virtual T RemoveAt(int i)

-    {

-      updatecheck();

-      T retval = remove(get(i), i);

-#if HASHINDEX

-      dict.Remove(retval);

-#endif

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveAt(Offset + i, retval);

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// <exception cref="IndexOutOfRangeException"/>???. 

-    /// </summary>

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public virtual void RemoveInterval(int start, int count)

-    {

-#if HASHINDEX

-      updatecheck();

-      checkRange(start, count);

-      if (count == 0)

-        return;

-

-      View(start, count).Clear();

-#else

-      //Note: this is really almost equaivalent to Clear on a view

-      updatecheck();

-      checkRange(start, count);

-      if (count == 0)

-        return;

-

-      //for small count: optimize

-      //use an optimal get(int i, int j, ref Node ni, ref Node nj)?

-      Node a = get(start), b = get(start + count - 1);

-      fixViewsBeforeRemove(start, count, a, b);

-      a.prev.next = b.next;

-      b.next.prev = a.prev;

-      if (underlying != null)

-        underlying.size -= count;

-

-      size -= count;

-      if (ActiveEvents != EventTypeEnum.None)

-        (underlying ?? this).raiseForRemoveInterval(start + Offset, count);

-#endif

-    }

-

-    void raiseForRemoveInterval(int start, int count)

-    {

-      if (ActiveEvents != 0)

-      {

-        raiseCollectionCleared(size == 0, count, start);

-        raiseCollectionChanged();

-      }

-    }

-    #endregion

-

-    #region ISequenced<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetSequencedHashCode() { validitycheck(); return base.GetSequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool SequencedEquals(ISequenced<T> that) { validitycheck(); return base.SequencedEquals(that); }

-

-    #endregion

-

-    #region IDirectedCollection<T> Members

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    public override IDirectedCollectionValue<T> Backwards()

-    { return this[0, size].Backwards(); }

-

-    #endregion

-

-    #region IDirectedEnumerable<T> Members

-

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    #endregion

-

-    #region IEditableCollection<T> Members

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>Speed.Linear</value>

-    [Tested]

-    public virtual Speed ContainsSpeed

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return  Speed.Constant ;

-#else

-        return Speed.Linear;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// Performs a check for view validity before calling base.GetUnsequencedHashCode()

-    /// </summary>

-    /// <returns></returns>

-    [Tested]

-    public override int GetUnsequencedHashCode()

-    { validitycheck(); return base.GetUnsequencedHashCode(); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="that"></param>

-    /// <returns></returns>

-    [Tested]

-    public override bool UnsequencedEquals(ICollection<T> that)

-    { validitycheck(); return base.UnsequencedEquals(that); }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Contains(T item)

-    {

-      validitycheck();

-      Node node;

-      return contains(item, out node);

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public virtual bool Find(ref T item)

-    {

-      validitycheck();

-      Node node;

-      if (contains(item, out node)) { item = node.item; return true; }

-      return false;

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. Will update a single item.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public virtual bool Update(T item) { T olditem; return Update(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool Update(T item, out T olditem)

-    {

-      updatecheck();

-      Node node;

-

-      if (contains(item, out node))

-      {

-        olditem = node.item;

-        node.item = item;

-#if HASHINDEX

-        //Avoid clinging onto a reference to olditem via dict!

-        dict.Update(item, node);

-#endif

-        (underlying ?? this).raiseForUpdate(item, olditem);

-        return true;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found. Else, add the item to the collection.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the item was found (hence not added).</returns>

-    [Tested]

-    public virtual bool FindOrAdd(ref T item)

-    {

-      updatecheck();

-#if HASHINDEX

-      //This is an extended myinsert:

-      Node node = new Node(item);

-      if (!dict.FindOrAdd(item, ref node))

-      {

-        insertNode(true, endsentinel, node);

-        (underlying ?? this).raiseForAdd(item);

-        return false; 

-      }

-      if (!insideview(node))

-        throw new ArgumentException("Item alredy in indexed list but outside view");

-      item = node.item;

-      return true;

-#else

-      if (Find(ref item))

-        return true;

-

-      Add(item);

-      return false;

-#endif

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value; else add the value to the collection. 

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    [Tested]

-    public virtual bool UpdateOrAdd(T item) { T olditem; return UpdateOrAdd(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public virtual bool UpdateOrAdd(T item, out T olditem)

-    {

-      updatecheck();

-#if HASHINDEX

-      Node node = new Node(item);

-      //NOTE: it is hard to do this without double access to the dictionary

-      //in the update case

-      if (dict.FindOrAdd(item, ref node))

-      {

-        if (!insideview(node))

-          throw new ArgumentException("Item in indexed list but outside view");

-        olditem = node.item;

-        //Avoid clinging onto a reference to olditem via dict!

-        dict.Update(item, node);

-        node.item = item;

-        (underlying ?? this).raiseForUpdate(item, olditem);

-        return true;

-      }

-      insertNode(true, endsentinel, node);

-      (underlying ?? this).raiseForAdd(item);

-#else

-      if (Update(item, out olditem))

-        return true;

-      Add(item);

-#endif

-      olditem = default(T);

-      return false;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this collection. Since the collection has bag

-    /// semantics only one copy equivalent to the supplied item is removed. 

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item)

-    {

-      updatecheck();

-      int i = 0;

-      Node node;

-#if HASHINDEX

-      if (!dictremove(item, out node))

-#else

-      node = fIFO ? startsentinel.next : endsentinel.prev;

-      if (!(fIFO ? find(item, ref node, ref i) : dnif(item, ref node, ref i)))

-#endif

-        return false;

-      T removeditem = remove(node, i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this collection if found (only one copy). 

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument.

-    /// </summary>

-    /// <param name="item">The value to remove on input.</param>

-    /// <param name="removeditem">The value removed.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public virtual bool Remove(T item, out T removeditem)

-    {

-      updatecheck();

-      int i = 0;

-      Node node;

-#if HASHINDEX

-      if (!dictremove(item, out node))

-#else

-      node = fIFO ? startsentinel.next : endsentinel.prev;

-      if (!(fIFO ? find(item, ref node, ref i) : dnif(item, ref node, ref i)))

-#endif

-      {

-        removeditem = default(T);

-        return false;

-      }

-      removeditem = node.item;

-      remove(node, i);

-      (underlying ?? this).raiseForRemove(removeditem);

-      return true;

-    }

-

-    /// <summary>

-    /// Remove all items in another collection from this one, taking multiplicities into account.

-    /// <para>Always removes from the front of the list.

-    /// </para>

-    /// <para>The asymptotic running time complexity of this method is <code>O(n+m+v*log(v))</code>, 

-    /// where <code>n</code> is the size of this list, <code>m</code> is the size of the

-    /// <code>items</code> collection and <code>v</code> is the number of views. 

-    /// The method will temporarily allocate memory of size <code>O(m+v)</code>.

-    /// </para>

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public virtual void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      Node node;

-      foreach (T item in items)

-        if (dictremove(item, out node))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          remove(node, 118);

-        }

-#else

-      HashBag<T> toremove = new HashBag<T>(itemequalityComparer);

-      toremove.AddAll(items);

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //pass by a stretch of nodes

-        while (node != endsentinel && !toremove.Contains(node.item))

-        {

-          node = node.next;

-          index++;

-        }

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && toremove.Remove(node.item))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RemoveAll(Fun<T, bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      {

-        Node n = startsentinel.next;

-

-        while (n != endsentinel)

-        {

-          bool removeIt = predicate(n.item);

-          updatecheck();

-          if (removeIt)

-          {

-            dict.Remove(n.item);

-            remove(n, 119);

-            if (mustFire)

-              raiseHandler.Remove(n.item);

-          }

-

-          n = n.next;

-        }

-      }

-#else

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //pass by a stretch of nodes

-        while (node != endsentinel && !predicate(node.item))

-        {

-          updatecheck();

-          node = node.next;

-          index++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && predicate(node.item))

-        {

-          updatecheck();

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        updatecheck();

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items from this collection.

-    /// </summary>

-    [Tested]

-    public virtual void Clear()

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      int oldsize = size;

-#if HASHINDEX

-      if (underlying == null)

-        dict.Clear();

-      else

-        foreach (T item in this)

-          dict.Remove(item);

-#endif

-      clear();

-      (underlying ?? this).raiseForRemoveInterval(Offset, oldsize);

-    }

-

-    void clear()

-    {

-      if (size == 0)

-        return;

-#if HASHINDEX

-      //TODO: mix with tag maintenance to only run through list once?

-      ViewHandler viewHandler = new ViewHandler(this);

-      if (viewHandler.viewCount > 0)

-      {

-        int removed = 0;

-        Node n = startsentinel.next;

-        viewHandler.skipEndpoints(0, n);

-        while (n != endsentinel)

-        {

-          removed++;

-          n = n.next;

-          viewHandler.updateViewSizesAndCounts(removed, n);

-        }

-        viewHandler.updateSentinels(endsentinel, startsentinel, endsentinel);

-        if (underlying != null)

-          viewHandler.updateViewSizesAndCounts(removed, underlying.endsentinel);

-      }

-#else

-      fixViewsBeforeRemove(Offset, size, startsentinel.next, endsentinel.prev);

-#endif

-#if HASHINDEX

-      if (underlying != null)

-      {

-        Node n = startsentinel.next;

-

-        while (n != endsentinel)

-        {

-          n.next.prev = startsentinel;

-          startsentinel.next = n.next;

-          removefromtaggroup(n);

-          n = n.next;

-        }

-      }

-      else

-        taggroups = 0;

-#endif

-      endsentinel.prev = startsentinel;

-      startsentinel.next = endsentinel;

-      if (underlying != null)

-        underlying.size -= size;

-      size = 0;

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one, taking multiplicities into account.

-    /// <para>The asymptotic running time complexity of this method is <code>O(n+m+v*log(v))</code>, 

-    /// where <code>n</code> is the size of this collection, <code>m</code> is the size of the

-    /// <code>items</code> collection and <code>v</code> is the number of views. 

-    /// The method will temporarily allocate memory of size <code>O(m+v)</code>. The stated complexitiy 

-    /// holds under the assumption that the itemequalityComparer of this list is well-behaved.

-    /// </para>

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public virtual void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      /*if (underlying == null)

-      {

-        HashDictionary<T, Node> newdict = new HashDictionary<T, Node>(itemequalityComparer);

-        foreach (T item in items)

-        {

-          Node node;

-

-          if (dict.Remove(item, out node))

-            newdict.Add(item, node);

-        }

-        foreach (KeyValuePair<T, Node> pair in dict)

-        {

-          Node n = pair.Value;

-          fixViewsBeforeSingleRemove(n, 117);

-          Node p = n.prev, s = n.next; s.prev = p; p.next = s;

-          removefromtaggroup(n);

-        }

-        dict = newdict;

-        size = dict.Count;

-        //For a small number of items to retain it might be faster to 

-        //iterate through the list and splice out the chunks not needed

-      }

-      else*/

-      {

-        HashSet<T> toremove = new HashSet<T>(itemequalityComparer);

-

-        foreach (T item in this)

-          toremove.Add(item);

-

-        foreach (T item in items)

-          toremove.Remove(item);

-

-        Node n = startsentinel.next;

-

-        while (n != endsentinel && toremove.Count > 0)

-        {

-          if (toremove.Contains(n.item))

-          {

-            dict.Remove(n.item);

-            remove(n, 119);

-            if (mustFire)

-              raiseHandler.Remove(n.item);

-          }

-

-          n = n.next;

-        }

-      }

-#else

-      HashBag<T> toretain = new HashBag<T>(itemequalityComparer);

-      toretain.AddAll(items);

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //Skip a stretch of nodes

-        while (node != endsentinel && toretain.Remove(node.item))

-        {

-          node = node.next;

-          index++;

-        }

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && !toretain.Contains(node.item))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="predicate"></param>

-    void RetainAll(Fun<T,bool> predicate)

-    {

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-#if HASHINDEX

-      {

-        Node n = startsentinel.next;

-

-        while (n != endsentinel)

-        {

-          bool removeIt = !predicate(n.item);

-          updatecheck();

-          if (removeIt)

-          {

-            dict.Remove(n.item);

-            remove(n, 119);

-            if (mustFire)

-              raiseHandler.Remove(n.item);

-          }

-

-          n = n.next;

-        }

-      }

-#else

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //Skip a stretch of nodes

-        while (node != endsentinel && predicate(node.item))

-        {

-          updatecheck();

-          node = node.next;

-          index++;

-        }

-        updatecheck();

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && !predicate(node.item))

-        {

-          updatecheck();

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        updatecheck();

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-#endif

-      raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection

-    /// with respect to multiplicities.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public virtual bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      validitycheck();

-#if HASHINDEX

-      Node node;

-      foreach (T item in items)

-        if (!contains(item, out node))

-          return false;

-      return true;

-#else

-      HashBag<T> tocheck = new HashBag<T>(itemequalityComparer);

-      tocheck.AddAll(items);

-      if (tocheck.Count > size)

-        return false;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        tocheck.Remove(node.item);

-        node = node.next;

-      }

-      return tocheck.IsEmpty;

-#endif

-    }

-

-

-    /// <summary>

-    /// Create a new list consisting of the items of this list satisfying a 

-    /// certain predicate.

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new list.</returns>

-    [Tested]

-    public IList<T> FindAll(Fun<T, bool> filter)

-    {

-      validitycheck();

-      int stamp = this.stamp;

-      LinkedList<T> retval = new LinkedList<T>();

-      Node cursor = startsentinel.next;

-      Node mcursor = retval.startsentinel;

-#if HASHINDEX

-      double tagdelta = int.MaxValue / (size + 1.0);

-      int count = 1;

-      TagGroup taggroup = new TagGroup();

-      retval.taggroups = 1;

-#endif

-      while (cursor != endsentinel)

-      {

-        bool found = filter(cursor.item);

-        modifycheck(stamp);

-        if (found)

-        {

-          mcursor.next = new Node(cursor.item, mcursor, null);

-          mcursor = mcursor.next;

-          retval.size++;

-#if HASHINDEX

-          retval.dict.Add(cursor.item, mcursor); 

-          mcursor.taggroup = taggroup;

-          mcursor.tag = (int)(tagdelta * count++);

-#endif

-        }

-        cursor = cursor.next;

-      }

-#if HASHINDEX

-      taggroup.count = retval.size;

-#endif

-      retval.endsentinel.prev = mcursor;

-      mcursor.next = retval.endsentinel;

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    [Tested]

-    public virtual int ContainsCount(T item)

-    {

-#if HASHINDEX

-      return Contains(item) ? 1 : 0;

-#else

-      validitycheck();

-      int retval = 0;

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        if (itemequalityComparer.Equals(node.item, item))

-          retval++;

-        node = node.next;

-      }

-      return retval;

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems()

-    {

-#if HASHINDEX

-      return this;

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.UniqueItems();

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-#if HASHINDEX

-      return new MultiplicityOne<T>(this);

-#else

-      HashBag<T> hashbag = new HashBag<T>(itemequalityComparer);

-      hashbag.AddAll(this);

-      return hashbag.ItemMultiplicities();

-#endif

-    }

-

-    /// <summary>

-    /// Remove all items equivalent to a given value.

-    /// <para>The asymptotic complexity of this method is <code>O(n+v*log(v))</code>, 

-    /// where <code>n</code> is the size of the collection and <code>v</code> 

-    /// is the number of views.

-    /// </para>

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public virtual void RemoveAllCopies(T item)

-    {

-#if HASHINDEX

-      Remove(item);

-#else

-      updatecheck();

-      if (size == 0)

-        return;

-      RaiseForRemoveAllHandler raiseHandler = new RaiseForRemoveAllHandler(underlying ?? this);

-      bool mustFire = raiseHandler.MustFire;

-      ViewHandler viewHandler = new ViewHandler(this);

-      int index = 0, removed = 0, myoffset = Offset;

-      //

-      Node node = startsentinel.next;

-      while (node != endsentinel)

-      {

-        //pass by a stretch of nodes

-        while (node != endsentinel && !itemequalityComparer.Equals(node.item, item))

-        {

-          node = node.next;

-          index++;

-        }

-        viewHandler.skipEndpoints(removed, myoffset + index);

-        //Remove a stretch of nodes

-        Node localend = node.prev; //Latest node not to be removed

-        while (node != endsentinel && itemequalityComparer.Equals(node.item, item))

-        {

-          if (mustFire)

-            raiseHandler.Remove(node.item);

-          removed++;

-          node = node.next;

-          index++;

-          viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-        }

-        viewHandler.updateSentinels(myoffset + index, localend, node);

-        localend.next = node;

-        node.prev = localend;

-      }

-      index = underlying != null ? underlying.size + 1 - myoffset : size + 1 - myoffset;

-      viewHandler.updateViewSizesAndCounts(removed, myoffset + index);

-      size -= removed;

-      if (underlying != null)

-        underlying.size -= removed;

-      raiseHandler.Raise();

-#endif

-    }

-

-    #endregion

-

-    #region ICollectionValue<T> Members

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of items in this collection</value>

-    [Tested]

-    public override int Count { [Tested]get { validitycheck(); return size; } }

-

-    /// <summary>

-    /// Choose some item of this collection. 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">if collection is empty.</exception>

-    /// <returns></returns>

-    [Tested]

-    public override T Choose() { return First; }

-

-    /// <summary>

-    /// Create an enumerable, enumerating the items of this collection that satisfies 

-    /// a certain condition.

-    /// </summary>

-    /// <param name="filter">The T->bool filter delegate defining the condition</param>

-    /// <returns>The filtered enumerable</returns>

-    public override SCG.IEnumerable<T> Filter(Fun<T, bool> filter) { validitycheck(); return base.Filter(filter); }

-

-    #endregion

-

-    #region IEnumerable<T> Members

-    /// <summary>

-    /// Create an enumerator for the collection

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      validitycheck();

-      Node cursor = startsentinel.next;

-      int enumeratorstamp = underlying != null ? underlying.stamp : this.stamp;

-

-      while (cursor != endsentinel)

-      {

-        modifycheck(enumeratorstamp);

-        yield return cursor.item;

-        cursor = cursor.next;

-      }

-    }

-

-    #endregion

-

-    #region IExtensible<T> Members

-    /// <summary>

-    /// Add an item to this collection if possible. 

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True.</returns>

-    [Tested]

-    public virtual bool Add(T item)

-    {

-      updatecheck();

-#if HASHINDEX

-      Node node = new Node(item);

-      if (!dict.FindOrAdd(item, ref node))

-      {

-        insertNode(true, endsentinel, node);

-        (underlying ?? this).raiseForAdd(item);

-        return true;

-      }

-      return false;

-#else

-      insert(size, endsentinel, item);

-      (underlying ?? this).raiseForAdd(item);

-      return true;

-#endif

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True since this collection has bag semantics.</value>

-    [Tested]

-    public virtual bool AllowsDuplicates

-    {

-      [Tested]

-      get

-      {

-#if HASHINDEX

-        return false;

-#else

-        return true;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting

-    {

-      get

-      {

-#if HASHINDEX

-        return true;

-#else

-        return false;

-#endif

-      }

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. 

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public virtual void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-#if HASHINDEX

-      updatecheck();

-      int added = 0;

-      Node pred = endsentinel.prev;

-      foreach (U item in items)

-      {

-        Node node = new Node(item);

-        if (!dict.FindOrAdd(item, ref node))

-        {

-          insertNode(false, endsentinel, node);

-          added++;

-        }

-      }

-      if (added > 0)

-      {

-        fixViewsAfterInsert(endsentinel, pred, added, 0);

-        raiseForInsertAll(pred, size - added, added, false);

-      }

-#else

-      insertAll(size, items, false);

-#endif

-    }

-

-    #endregion

-

-#if HASHINDEX

-#else

-    #region IStack<T> Members

-

-    /// <summary>

-    /// Push an item to the top of the stack.

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public void Push(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Pop the item at the top of the stack from the stack.

-    /// </summary>

-    /// <returns>The popped item.</returns>

-    [Tested]

-    public T Pop()

-    {

-      return RemoveLast();

-    }

-

-    #endregion

-

-    #region IQueue<T> Members

-

-    /// <summary>

-    /// Enqueue an item at the back of the queue. 

-    /// </summary>

-    /// <param name="item">The item</param>

-    [Tested]

-    public virtual void Enqueue(T item)

-    {

-      InsertLast(item);

-    }

-

-    /// <summary>

-    /// Dequeue an item from the front of the queue.

-    /// </summary>

-    /// <returns>The item</returns>

-    [Tested]

-    public virtual T Dequeue()

-    {

-      return RemoveFirst();

-    }

-    #endregion

-#endif

-

-    #region Diagnostic

-

-    private bool checkViews()

-    {

-      if (underlying != null)

-        throw new InternalException(System.Reflection.MethodInfo.GetCurrentMethod() + " called on a view");

-      if (views == null)

-        return true;

-      bool retval = true;

-

-      Node[] nodes = new Node[size + 2];

-      int i = 0;

-      Node n = startsentinel;

-      while (n != null)

-      {

-        nodes[i++] = n;

-        n = n.next;

-      }

-      //Console.WriteLine("###");

-      foreach (LinkedList<T> view in views)

-      {

-        if (!view.isValid)

-        {

-          Console.WriteLine("Invalid view(hash {0}, offset {1}, size {2})",

-            view.GetHashCode(), view.offset, view.size);

-          retval = false;

-          continue;

-        }

-        if (view.Offset > size || view.Offset < 0)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), Offset > underlying.size ({2})",

-            view.GetHashCode(), view.offset, view.size, size);

-          retval = false;

-        }

-        else if (view.startsentinel != nodes[view.Offset])

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), startsentinel {3} should be {4}",

-            view.GetHashCode(), view.offset, view.size,

-            view.startsentinel + " " + view.startsentinel.GetHashCode(),

-            nodes[view.Offset] + " " + nodes[view.Offset].GetHashCode());

-          retval = false;

-        }

-        if (view.Offset + view.size > size || view.Offset + view.size < 0)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), end index > underlying.size ({3})",

-            view.GetHashCode(), view.offset, view.size, size);

-          retval = false;

-        }

-        else if (view.endsentinel != nodes[view.Offset + view.size + 1])

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), endsentinel {3} should be {4}",

-            view.GetHashCode(), view.offset, view.size,

-            view.endsentinel + " " + view.endsentinel.GetHashCode(),

-            nodes[view.Offset + view.size + 1] + " " + nodes[view.Offset + view.size + 1].GetHashCode());

-          retval = false;

-        }

-        if (view.views != views)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), wrong views list {3} <> {4}",

-            view.GetHashCode(), view.offset, view.size, view.views.GetHashCode(), views.GetHashCode());

-          retval = false;

-        }

-        if (view.underlying != this)

-        {

-          Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), wrong underlying {3} <> this {4}",

-            view.GetHashCode(), view.offset, view.size, view.underlying.GetHashCode(), GetHashCode());

-          retval = false;

-        }

-        if (view.stamp != stamp)

-        {

-          //Console.WriteLine("Bad view(hash {0}, offset {1}, size {2}), wrong stamp view:{2} underlying: {3}", view.GetHashCode(),view.offset, view.size, view.stamp, stamp);

-          //retval = false;

-        }

-      }

-      return retval;

-    }

-

-    /// <summary>

-    /// Check the sanity of this list

-    /// </summary>

-    /// <returns>true if sane</returns>

-    [Tested]

-    public virtual bool Check()

-    {

-      bool retval = true;

-

-      /*if (underlying != null && underlying.stamp != stamp)

-      {

-        Console.WriteLine("underlying != null && underlying.stamp({0}) != stamp({1})", underlying.stamp, stamp);

-        retval = false;

-      }*/

-

-      if (underlying != null)

-      {

-        //TODO: check that this view is included in viewsEndpoints tree

-        return underlying.Check();

-      }

-

-      if (startsentinel == null)

-      {

-        Console.WriteLine("startsentinel == null");

-        retval = false;

-      }

-

-      if (endsentinel == null)

-      {

-        Console.WriteLine("endsentinel == null");

-        retval = false;

-      }

-

-      if (size == 0)

-      {

-        if (startsentinel != null && startsentinel.next != endsentinel)

-        {

-          Console.WriteLine("size == 0 but startsentinel.next != endsentinel");

-          retval = false;

-        }

-

-        if (endsentinel != null && endsentinel.prev != startsentinel)

-        {

-          Console.WriteLine("size == 0 but endsentinel.prev != startsentinel");

-          retval = false;

-        }

-      }

-

-      if (startsentinel == null)

-      {

-        Console.WriteLine("NULL startsentinel");

-        return retval;

-      }

-

-      int count = 0;

-      Node node = startsentinel.next, prev = startsentinel;

-#if HASHINDEX

-      int taggroupsize = 0, oldtaggroupsize = losize + 1, seentaggroups = 0;

-      TagGroup oldtg = null;

-

-      if (underlying == null)

-      {

-        TagGroup tg = startsentinel.taggroup;

-

-        if (tg.count != 0 || tg.first != null || tg.last != null || tg.tag != int.MinValue)

-        {

-          Console.WriteLine("Bad startsentinel tag group: {0}", tg);

-          retval = false;

-        }

-

-        tg = endsentinel.taggroup;

-        if (tg.count != 0 || tg.first != null || tg.last != null || tg.tag != int.MaxValue)

-        {

-          Console.WriteLine("Bad endsentinel tag group: {0}", tg);

-          retval = false;

-        }

-      }

-#endif

-      while (node != endsentinel)

-      {

-        count++;

-        if (node.prev != prev)

-        {

-          Console.WriteLine("Bad backpointer at node {0}", count);

-          retval = false;

-        }

-#if HASHINDEX

-        if (underlying == null)

-        {

-          if (!node.prev.precedes(node))

-          {

-            Console.WriteLine("node.prev.tag ({0}, {1}) >= node.tag ({2}, {3}) at index={4} item={5} ", node.prev.taggroup.tag, node.prev.tag, node.taggroup.tag, node.tag, count, node.item);

-            retval = false;

-          }

-

-          if (node.taggroup != oldtg)

-          {

-            if (oldtg != null)

-            {

-              if (oldtg.count != taggroupsize)

-              {

-                Console.WriteLine("Bad taggroupsize: oldtg.count ({0}) != taggroupsize ({1}) at index={2} item={3}", oldtg.count, taggroupsize, count, node.item);

-                retval = false;

-              }

-

-              if (oldtaggroupsize <= losize && taggroupsize <= losize)

-              {

-                Console.WriteLine("Two small taggroups in a row: oldtaggroupsize ({0}), taggroupsize ({1}) at index={2} item={3}", oldtaggroupsize, taggroupsize, count, node.item);

-                retval = false;

-              }

-

-              oldtaggroupsize = taggroupsize;

-            }

-

-            seentaggroups++;

-            oldtg = node.taggroup;

-            taggroupsize = 1;

-          }

-          else

-          {

-            taggroupsize++;

-          }

-        }

-

-#endif

-        prev = node;

-        node = node.next;

-        if (node == null)

-        {

-          Console.WriteLine("Null next pointer at node {0}", count);

-          return false;

-        }

-      }

-

-#if HASHINDEX

-      if (underlying == null && size == 0 && taggroups != 0)

-      {

-        Console.WriteLine("Bad taggroups for empty list: size={0}   taggroups={1}", size, taggroups);

-        retval = false;

-      }

-      if (underlying == null && size > 0)

-      {

-        oldtg = node.prev.taggroup;

-        if (oldtg != null)

-        {

-          if (oldtg.count != taggroupsize)

-          {

-            Console.WriteLine("Bad taggroupsize: oldtg.count ({0}) != taggroupsize ({1}) at index={2} item={3}", oldtg.count, taggroupsize, count, node.item);

-            retval = false;

-          }

-

-          if (oldtaggroupsize <= losize && taggroupsize <= losize)

-          {

-            Console.WriteLine("Two small taggroups in a row: oldtaggroupsize ({0}), taggroupsize ({1}) at index={2} item={3}", oldtaggroupsize, taggroupsize, count, node.item);

-            retval = false;

-          }

-        }

-

-        if (seentaggroups != taggroups)

-        {

-          Console.WriteLine("seentaggroups ({0}) != taggroups ({1}) (at size {2})", seentaggroups, taggroups, size);

-          retval = false;

-        }

-      }

-#endif

-      if (count != size)

-      {

-        Console.WriteLine("size={0} but enumeration gives {1} nodes ", size, count);

-        retval = false;

-      }

-

-      retval = checkViews() && retval;

-

-#if HASHINDEX

-      if (!retval)

-        return false;

-      if (underlying == null)

-      {

-        if (size != dict.Count)

-        {

-          Console.WriteLine("list.size ({0}) != dict.Count ({1})", size, dict.Count);

-          retval = false;

-        }

-        Node n = startsentinel.next, n2;

-        while (n != endsentinel)

-        {

-          if (!dict.Find(n.item, out n2))

-          {

-            Console.WriteLine("Item in list but not dict: {0}", n.item);

-            retval = false;

-          }

-          else if (n != n2)

-          {

-            Console.WriteLine("Wrong node in dict for item: {0}", n.item);

-            retval = false;

-          }

-          n = n.next;

-        }

-      }

-#endif

-      return retval;

-    }

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this LinkedList.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      LinkedList<T> clone = new LinkedList<T>(itemequalityComparer);

-      clone.AddAll(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-}

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/trees/.cvsignore b/mcs/class/Mono.C5/C5/trees/.cvsignore
deleted file mode 100644
index 9577892f5d4..00000000000
--- a/mcs/class/Mono.C5/C5/trees/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-RedBlackTreeBag.cs
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/C5/trees/RedBlackTreeBag.cs b/mcs/class/Mono.C5/C5/trees/RedBlackTreeBag.cs
deleted file mode 100755
index 8f3d4e78ae1..00000000000
--- a/mcs/class/Mono.C5/C5/trees/RedBlackTreeBag.cs
+++ /dev/null
@@ -1,4493 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define MAINTAIN_SIZE

-#define BAG

-#define NCP

-

-#if BAG

-#if !MAINTAIN_SIZE

-#error  BAG defined without MAINTAIN_SIZE!

-#endif

-#endif

-

-

-using System;

-using SCG = System.Collections.Generic;

-

-// NOTE NOTE NOTE NOTE

-// This source file is used to produce both TreeBag<T> and TreeBag<T>

-// It should be copied to a file called TreeBag.cs in which all code mentions of 

-// TreeBag is changed to TreeBag and the preprocessor symbol BAG is defined.

-// NOTE: there may be problems with documentation comments.

-

-namespace C5

-{

-#if BAG

-  /// <summary>

-  /// An implementation of Red-Black trees as an indexed, sorted collection with bag semantics,

-  /// cf. <a href="litterature.htm#CLRS">CLRS</a>. (<see cref="T:C5.TreeBag`1"/> for an 

-  /// implementation with set semantics).

-  /// <br/>

-  /// The comparer (sorting order) may be either natural, because the item type is comparable 

-  /// (generic: <see cref="T:C5.IComparable`1"/> or non-generic: System.IComparable) or it can

-  /// be external and supplied by the user in the constructor.

-  /// <br/>

-  /// Each distinct item is only kept in one place in the tree - together with the number

-  /// of times it is a member of the bag. Thus, if two items that are equal according

-  /// </summary>

-#else

-  /// <summary>

-  /// An implementation of Red-Black trees as an indexed, sorted collection with set semantics,

-  /// cf. <a href="litterature.htm#CLRS">CLRS</a>. <see cref="T:C5.TreeBag`1"/> for a version 

-  /// with bag semantics. <see cref="T:C5.TreeDictionary`2"/> for a sorted dictionary 

-  /// based on this tree implementation.

-  /// <i>

-  /// The comparer (sorting order) may be either natural, because the item type is comparable 

-  /// (generic: <see cref="T:C5.IComparable`1"/> or non-generic: System.IComparable) or it can

-  /// be external and supplied by the user in the constructor.</i>

-  ///

-  /// <i>TODO: describe performance here</i>

-  /// <i>TODO: discuss persistence and its useful usage modes. Warn about the space

-  /// leak possible with other usage modes.</i>

-  /// </summary>

-#endif

-  [Serializable]

-  public class TreeBag<T> : SequencedBase<T>, IIndexedSorted<T>, IPersistentSorted<T>

-  {

-    #region Fields

-

-    SCG.IComparer<T> comparer;

-

-    Node root;

-

-    //TODO: wonder if we should remove that

-    int blackdepth = 0;

-

-    //We double these stacks for the iterative add and remove on demand

-    //TODO: refactor dirs[] into bool fields on Node (?)

-    private int[] dirs = new int[2];

-

-    private Node[] path = new Node[2];

-#if NCP

-    //TODO: refactor into separate class

-    bool isSnapShot = false;

-

-    int generation;

-

-    bool isValid = true;

-

-    SnapRef snapList;

-#endif

-    #endregion

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return EventTypeEnum.Basic; } }

-

-    #endregion

-    #region Util

-

-    /// <summary>

-    /// Fetch the left child of n taking node-copying persistence into

-    /// account if relevant. 

-    /// </summary>

-    /// <param name="n"></param>

-    /// <returns></returns>

-    private Node left(Node n)

-    {

-#if NCP

-      if (isSnapShot)

-      {

-#if SEPARATE_EXTRA

-				Node.Extra e = n.extra;

-

-				if (e != null && e.lastgeneration >= treegen && e.leftnode)

-					return e.oldref;

-#else

-        if (n.lastgeneration >= generation && n.leftnode)

-          return n.oldref;

-#endif

-      }

-#endif

-      return n.left;

-    }

-

-

-    private Node right(Node n)

-    {

-#if NCP

-      if (isSnapShot)

-      {

-#if SEPARATE_EXTRA

-				Node.Extra e = n.extra;

-

-				if (e != null && e.lastgeneration >= treegen && !e.leftnode)

-					return e.oldref;

-#else

-        if (n.lastgeneration >= generation && !n.leftnode)

-          return n.oldref;

-#endif

-      }

-#endif

-      return n.right;

-    }

-

-

-    //This method should be called by methods that use the internal 

-    //traversal stack, unless certain that there is room enough

-    private void stackcheck()

-    {

-      while (dirs.Length < 2 * blackdepth)

-      {

-        dirs = new int[2 * dirs.Length];

-        path = new Node[2 * dirs.Length];

-      }

-    }

-

-    #endregion

-

-    #region Node nested class

-

-

-    /// <summary>

-    /// The type of node in a Red-Black binary tree

-    /// </summary>

-    [Serializable]

-    class Node

-    {

-      public bool red = true;

-

-      public T item;

-

-      public Node left;

-

-      public Node right;

-

-#if MAINTAIN_SIZE

-      public int size = 1;

-#endif

-

-#if BAG

-      public int items = 1;

-#endif

-

-#if NCP

-      //TODO: move everything into (separate) Extra

-      public int generation;

-#if SEPARATE_EXTRA

-			internal class Extra

-			{

-				public int lastgeneration;

-

-				public Node oldref;

-

-				public bool leftnode;

-

-				//public Node next;

-			}

-

-			public Extra extra;

-

-#else

-      public int lastgeneration = -1;

-

-      public Node oldref;

-

-      public bool leftnode;

-#endif

-

-      /// <summary>

-      /// Update a child pointer

-      /// </summary>

-      /// <param name="cursor"></param>

-      /// <param name="leftnode"></param>

-      /// <param name="child"></param>

-      /// <param name="maxsnapid"></param>

-      /// <param name="generation"></param>

-      /// <returns>True if node was *copied*</returns>

-      internal static bool update(ref Node cursor, bool leftnode, Node child, int maxsnapid, int generation)

-      {

-        Node oldref = leftnode ? cursor.left : cursor.right;

-

-        if (child == oldref)

-          return false;

-

-        bool retval = false;

-

-        if (cursor.generation <= maxsnapid)

-        {

-#if SEPARATE_EXTRA

-					if (cursor.extra == null)

-					{

-						Extra extra = cursor.extra = new Extra();	

-

-						extra.leftnode = leftnode;

-						extra.lastgeneration = maxsnapid;

-						extra.oldref = oldref;

-					}

-					else if (cursor.extra.leftnode != leftnode || cursor.extra.lastgeneration < maxsnapid)

-#else

-          if (cursor.lastgeneration == -1)

-          {

-            cursor.leftnode = leftnode;

-            cursor.lastgeneration = maxsnapid;

-            cursor.oldref = oldref;

-          }

-          else if (cursor.leftnode != leftnode || cursor.lastgeneration < maxsnapid)

-#endif

-          {

-            CopyNode(ref cursor, maxsnapid, generation);

-            retval = true;

-          }

-        }

-

-        if (leftnode)

-          cursor.left = child;

-        else

-          cursor.right = child;

-

-        return retval;

-      }

-

-

-      //If cursor.extra.lastgeneration==maxsnapid, the extra pointer will 

-      //always be used in the old copy of cursor. Therefore, after 

-      //making the clone, we should update the old copy by restoring

-      //the child pointer and setting extra to null.

-      //OTOH then we cannot clean up unused Extra objects unless we link

-      //them together in a doubly linked list.

-      public static bool CopyNode(ref Node cursor, int maxsnapid, int generation)

-      {

-        if (cursor.generation <= maxsnapid)

-        {

-          cursor = (Node)(cursor.MemberwiseClone());

-          cursor.generation = generation;

-#if SEPARATE_EXTRA

-					cursor.extra = null;

-#else

-          cursor.lastgeneration = -1;

-#endif

-          return true;

-        }

-        else

-          return false;

-      }

-

-#endif

-    }

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// Create a red-black tree collection with natural comparer and item equalityComparer.

-    /// We assume that if <code>T</code> is comparable, its default equalityComparer 

-    /// will be compatible with the comparer.

-    /// </summary>

-    /// <exception cref="NotComparableException">If <code>T</code> is not comparable.

-    /// </exception>

-    public TreeBag() : this(Comparer<T>.Default, EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create a red-black tree collection with an external comparer. 

-    /// <para>The itemequalityComparer will be a compatible 

-    /// <see cref="T:C5.ComparerZeroHashCodeEqualityComparer`1"/> since the 

-    /// default equalityComparer for T (<see cref="P:C5.EqualityComparer`1.Default"/>)

-    /// is unlikely to be compatible with the external comparer. This makes the

-    /// tree inadequate for use as item in a collection of unsequenced or sequenced sets or bags

-    /// (<see cref="T:C5.ICollection`1"/> and <see cref="T:C5.ISequenced`1"/>)

-    /// </para>

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    public TreeBag(SCG.IComparer<T> comparer) : this(comparer, new ComparerZeroHashCodeEqualityComparer<T>(comparer)) { }

-

-    /// <summary>

-    /// Create a red-black tree collection with an external comparer and an external

-    /// item equalityComparer, assumed consistent.

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    /// <param name="equalityComparer">The external item equalityComparer</param>

-    public TreeBag(SCG.IComparer<T> comparer, SCG.IEqualityComparer<T> equalityComparer)

-      : base(equalityComparer)

-    {

-      if (comparer == null)

-        throw new NullReferenceException("Item comparer cannot be null");

-      this.comparer = comparer;

-    }

-

-    #endregion

-

-    #region TreeBag.Enumerator nested class

-

-    /// <summary>

-    /// An enumerator for a red-black tree collection. Based on an explicit stack

-    /// of subtrees waiting to be enumerated. Currently only used for the tree set 

-    /// enumerators (tree bag enumerators use an iterator block based enumerator).

-    /// </summary>

-    internal class Enumerator : SCG.IEnumerator<T>

-    {

-      #region Private Fields

-      TreeBag<T> tree;

-

-      bool valid = false;

-

-      int stamp;

-

-      T current;

-

-      Node cursor;

-

-      Node[] path; // stack of nodes

-

-      int level = 0;

-      #endregion

-      /// <summary>

-      /// Create a tree enumerator

-      /// </summary>

-      /// <param name="tree">The red-black tree to enumerate</param>

-      public Enumerator(TreeBag<T> tree)

-      {

-        this.tree = tree;

-        stamp = tree.stamp;

-        path = new Node[2 * tree.blackdepth];

-        cursor = new Node();

-        cursor.right = tree.root;

-      }

-

-

-      /// <summary>

-      /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-      /// </summary>

-      /// <value>The current item of the enumerator.</value>

-      [Tested]

-      public T Current

-      {

-        [Tested]

-        get

-        {

-          if (valid)

-            return current;

-          else

-            throw new InvalidOperationException();

-        }

-      }

-

-

-      //Maintain a stack of nodes that are roots of

-      //subtrees not completely exported yet. Invariant:

-      //The stack nodes together with their right subtrees

-      //consists of exactly the items we have not passed

-      //yet (the top of the stack holds current item).

-      /// <summary>

-      /// Move enumerator to next item in tree, or the first item if

-      /// this is the first call to MoveNext. 

-      /// <exception cref="CollectionModifiedException"/> if underlying tree was modified.

-      /// </summary>

-      /// <returns>True if enumerator is valid now</returns>

-      [Tested]

-      public bool MoveNext()

-      {

-        tree.modifycheck(stamp);

-        if (cursor.right != null)

-        {

-          path[level] = cursor = cursor.right;

-          while (cursor.left != null)

-            path[++level] = cursor = cursor.left;

-        }

-        else if (level == 0)

-          return valid = false;

-        else

-          cursor = path[--level];

-

-        current = cursor.item;

-        return valid = true;

-      }

-

-

-      #region IDisposable Members for Enumerator

-

-      bool disposed;

-

-

-      /// <summary>

-      /// Call Dispose(true) and then suppress finalization of this enumerator.

-      /// </summary>

-      [Tested]

-      public void Dispose()

-      {

-        Dispose(true);

-        GC.SuppressFinalize(this);

-      }

-

-

-      /// <summary>

-      /// Remove the internal data (notably the stack array).

-      /// </summary>

-      /// <param name="disposing">True if called from Dispose(),

-      /// false if called from the finalizer</param>

-      protected virtual void Dispose(bool disposing)

-      {

-        if (!disposed)

-        {

-          if (disposing)

-          {

-          }

-

-          current = default(T);

-          cursor = null;

-          path = null;

-          disposed = true;

-        }

-      }

-

-

-      /// <summary>

-      /// Finalizer for enumerator

-      /// </summary>

-      ~Enumerator()

-      {

-        Dispose(false);

-      }

-      #endregion

-

-

-      #region IEnumerator Members

-

-      object System.Collections.IEnumerator.Current

-      {

-        get { return Current; }

-      }

-

-      bool System.Collections.IEnumerator.MoveNext()

-      {

-        return MoveNext();

-      }

-

-      void System.Collections.IEnumerator.Reset()

-      {

-        throw new Exception("The method or operation is not implemented.");

-      }

-

-      #endregion

-    }

-#if NCP

-    /// <summary>

-    /// An enumerator for a snapshot of a node copy persistent red-black tree

-    /// collection.

-    /// </summary>

-    internal class SnapEnumerator : SCG.IEnumerator<T>

-    {

-      #region Private Fields

-      TreeBag<T> tree;

-

-      bool valid = false;

-

-      int stamp;

-#if BAG

-      int togo;

-#endif

-

-      T current;

-

-      Node cursor;

-

-      Node[] path; // stack of nodes

-

-      int level;

-      #endregion

-

-      /// <summary>

-      /// Creta an enumerator for a snapshot of a node copy persistent red-black tree

-      /// collection

-      /// </summary>

-      /// <param name="tree">The snapshot</param>

-      public SnapEnumerator(TreeBag<T> tree)

-      {

-        this.tree = tree;

-        stamp = tree.stamp;

-        path = new Node[2 * tree.blackdepth];

-        cursor = new Node();

-        cursor.right = tree.root;

-      }

-

-

-      #region SCG.IEnumerator<T> Members

-

-      /// <summary>

-      /// Move enumerator to next item in tree, or the first item if

-      /// this is the first call to MoveNext. 

-      /// <exception cref="CollectionModifiedException"/> if underlying tree was modified.

-      /// </summary>

-      /// <returns>True if enumerator is valid now</returns>

-      [Tested]

-      public bool MoveNext()

-      {

-        tree.modifycheck(stamp);//???

-

-#if BAG

-        if (--togo > 0)

-          return true;

-#endif

-        Node next = tree.right(cursor);

-

-        if (next != null)

-        {

-          path[level] = cursor = next;

-          next = tree.left(cursor);

-          while (next != null)

-          {

-            path[++level] = cursor = next;

-            next = tree.left(cursor);

-          }

-        }

-        else if (level == 0)

-          return valid = false;

-        else

-          cursor = path[--level];

-

-#if BAG

-        togo = cursor.items;

-#endif

-        current = cursor.item;

-        return valid = true;

-      }

-

-

-      /// <summary>

-      /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-      /// </summary>

-      /// <value>The current value of the enumerator.</value>

-      [Tested]

-      public T Current

-      {

-        [Tested]

-        get

-        {

-          if (valid)

-            return current;

-          else

-            throw new InvalidOperationException();

-        }

-      }

-

-      #endregion

-

-      #region IDisposable Members

-

-      [Tested]

-      void System.IDisposable.Dispose()

-      {

-        tree = null;

-        valid = false;

-        current = default(T);

-        cursor = null;

-        path = null;

-      }

-

-      #endregion

-

-      #region IEnumerator Members

-

-      object System.Collections.IEnumerator.Current

-      {

-        get { return Current; }

-      }

-

-      bool System.Collections.IEnumerator.MoveNext()

-      {

-        return MoveNext();

-      }

-

-      void System.Collections.IEnumerator.Reset()

-      {

-        throw new Exception("The method or operation is not implemented.");

-      }

-

-      #endregion

-    }

-#endif

-    #endregion

-

-    #region IEnumerable<T> Members

-

-    private SCG.IEnumerator<T> getEnumerator(Node node, int origstamp)

-    {

-      if (node == null)

-        yield break;

-

-      if (node.left != null)

-      {

-        SCG.IEnumerator<T> child = getEnumerator(node.left, origstamp);

-

-        while (child.MoveNext())

-        {

-          modifycheck(origstamp);

-          yield return child.Current;

-        }

-      }

-#if BAG

-      int togo = node.items;

-      while (togo-- > 0)

-      {

-        modifycheck(origstamp);

-        yield return node.item;

-      }

-#else

-      modifycheck(origstamp);

-      yield return node.item;

-#endif

-      if (node.right != null)

-      {

-        SCG.IEnumerator<T> child = getEnumerator(node.right, origstamp);

-

-        while (child.MoveNext())

-        {

-          modifycheck(origstamp);

-          yield return child.Current;

-        }

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">If tree is empty</exception>

-    /// <returns></returns>

-    [Tested]

-    public override T Choose()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-

-      if (size == 0)

-        throw new NoSuchItemException();

-      return root.item;

-    }

-

-

-    /// <summary>

-    /// Create an enumerator for this tree

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if NCP

-      if (isSnapShot)

-        return new SnapEnumerator(this);

-#endif

-#if BAG

-      return getEnumerator(root, stamp);

-#else

-      return new Enumerator(this);

-#endif

-    }

-

-    #endregion

-

-    #region ISink<T> Members

-

-    /// <summary>

-    /// Add item to tree. If already there, return the found item in the second argument.

-    /// </summary>

-    /// <param name="item">Item to add</param>

-    /// <param name="founditem">item found</param>

-    /// <param name="update">whether item in node should be updated</param>

-    /// <param name="wasfound">true if found in bag, false if not found or tre is a set</param>

-    /// <returns>True if item was added</returns>

-    bool addIterative(T item, ref T founditem, bool update, out bool wasfound)

-    {

-      wasfound = false;

-      if (root == null)

-      {

-        root = new Node();

-        root.red = false;

-        blackdepth = 1;

-        root.item = item;

-#if NCP

-        root.generation = generation;

-#endif

-        return true;

-      }

-

-      stackcheck();

-

-      int level = 0;

-      Node cursor = root;

-

-      while (true)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp == 0)

-        {

-          founditem = cursor.item;

-#if BAG

-          wasfound = true;

-          bool nodeWasUpdated = true;

-#if NCP

-          Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-          if (update)

-            cursor.item = item;

-          else

-          {

-            cursor.items++;

-            cursor.size++;

-          }

-#else

-          bool nodeWasUpdated = update;

-          if (update)

-          {

-#if NCP

-            Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-            cursor.item = item;

-          }

-#endif

-

-          while (level-- > 0)

-          {

-            if (nodeWasUpdated)

-            {

-              Node kid = cursor;

-

-              cursor = path[level];

-#if NCP

-              Node.update(ref cursor, dirs[level] > 0, kid, maxsnapid, generation);

-#endif

-#if BAG

-              if (!update)

-                cursor.size++;

-#endif

-            }

-

-            path[level] = null;

-          }

-#if BAG

-          return !update;

-#else

-          if (update)

-            root = cursor;

-

-          return false;

-#endif

-        }

-

-        //else

-        Node child = comp > 0 ? cursor.left : cursor.right;

-

-        if (child == null)

-        {

-          child = new Node();

-          child.item = item;

-#if NCP

-          child.generation = generation;

-          Node.update(ref cursor, comp > 0, child, maxsnapid, generation);

-#else

-					if (comp > 0) { cursor.left = child; }

-					else { cursor.right = child; }

-#endif

-#if MAINTAIN_SIZE

-          cursor.size++;

-#endif

-          dirs[level] = comp;

-          break;

-        }

-        else

-        {

-          dirs[level] = comp;

-          path[level++] = cursor;

-          cursor = child;

-        }

-      }

-

-      //We have just added the red node child to "cursor"

-      while (cursor.red)

-      {

-        //take one step up:

-        Node child = cursor;

-

-        cursor = path[--level];

-        path[level] = null;

-#if NCP

-        Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-#if MAINTAIN_SIZE

-        cursor.size++;

-#endif

-        int comp = dirs[level];

-        Node childsibling = comp > 0 ? cursor.right : cursor.left;

-

-        if (childsibling != null && childsibling.red)

-        {

-          //Promote

-          child.red = false;

-#if NCP

-          Node.update(ref cursor, comp < 0, childsibling, maxsnapid, generation);

-#endif

-          childsibling.red = false;

-

-          //color cursor red & take one step up the tree unless at root

-          if (level == 0)

-          {

-            root = cursor;

-            blackdepth++;

-            return true;

-          }

-          else

-          {

-            cursor.red = true;

-#if NCP

-            child = cursor;

-            cursor = path[--level];

-            Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-            path[level] = null;

-#if MAINTAIN_SIZE

-            cursor.size++;

-#endif

-          }

-        }

-        else

-        {

-          //ROTATE!!!

-          int childcomp = dirs[level + 1];

-

-          cursor.red = true;

-          if (comp > 0)

-          {

-            if (childcomp > 0)

-            {//zagzag

-#if NCP

-              Node.update(ref cursor, true, child.right, maxsnapid, generation);

-              Node.update(ref child, false, cursor, maxsnapid, generation);

-#else

-							cursor.left = child.right;

-							child.right = cursor;

-#endif

-              cursor = child;

-            }

-            else

-            {//zagzig

-              Node badgrandchild = child.right;

-#if NCP

-              Node.update(ref cursor, true, badgrandchild.right, maxsnapid, generation);

-              Node.update(ref child, false, badgrandchild.left, maxsnapid, generation);

-              Node.CopyNode(ref badgrandchild, maxsnapid, generation);

-#else

-							cursor.left = badgrandchild.right;

-							child.right = badgrandchild.left;

-#endif

-              badgrandchild.left = child;

-              badgrandchild.right = cursor;

-              cursor = badgrandchild;

-            }

-          }

-          else

-          {//comp < 0

-            if (childcomp < 0)

-            {//zigzig

-#if NCP

-              Node.update(ref cursor, false, child.left, maxsnapid, generation);

-              Node.update(ref child, true, cursor, maxsnapid, generation);

-#else

-							cursor.right = child.left;

-							child.left = cursor;

-#endif

-              cursor = child;

-            }

-            else

-            {//zigzag

-              Node badgrandchild = child.left;

-#if NCP

-              Node.update(ref cursor, false, badgrandchild.left, maxsnapid, generation);

-              Node.update(ref child, true, badgrandchild.right, maxsnapid, generation);

-              Node.CopyNode(ref badgrandchild, maxsnapid, generation);

-#else

-							cursor.right = badgrandchild.left;

-							child.left = badgrandchild.right;

-#endif

-              badgrandchild.right = child;

-              badgrandchild.left = cursor;

-              cursor = badgrandchild;

-            }

-          }

-

-          cursor.red = false;

-

-#if MAINTAIN_SIZE

-          Node n;

-

-#if BAG

-          n = cursor.right;

-          cursor.size = n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + n.items;

-          n = cursor.left;

-          n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + n.items;

-          cursor.size += n.size + cursor.items;

-#else

-          n = cursor.right;

-          cursor.size = n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + 1;

-          n = cursor.left;

-          n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + 1;

-          cursor.size += n.size + 1;

-#endif

-#endif

-          if (level == 0)

-          {

-            root = cursor;

-            return true;

-          }

-          else

-          {

-            child = cursor;

-            cursor = path[--level];

-            path[level] = null;

-#if NCP

-            Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#else

-						if (dirs[level] > 0)

-							cursor.left = child;

-						else

-							cursor.right = child;

-#endif

-#if MAINTAIN_SIZE

-            cursor.size++;

-#endif

-            break;

-          }

-        }

-      }

-#if NCP

-      bool stillmore = true;

-#endif

-      while (level > 0)

-      {

-        Node child = cursor;

-

-        cursor = path[--level];

-        path[level] = null;

-#if NCP

-        if (stillmore)

-          stillmore = Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-#if MAINTAIN_SIZE

-        cursor.size++;

-#endif

-      }

-

-      root = cursor;

-      return true;

-    }

-

-

-    /// <summary>

-    /// Add an item to this collection if possible. If this collection has set

-    /// semantics, the item will be added if not already in the collection. If

-    /// bag semantics, the item will always be added.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True if item was added.</returns>

-    [Tested]

-    public bool Add(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      //Note: blackdepth of the tree is set inside addIterative

-      T jtem = default(T);

-      if (!add(item, ref jtem))

-        return false;

-      if (ActiveEvents != 0)

-        raiseForAdd(jtem);

-      return true;

-    }

-

-    private bool add(T item, ref T j)

-    {

-      bool wasFound;

-

-      if (addIterative(item, ref j, false, out wasFound))

-      {

-        size++;

-        if (!wasFound)

-          j = item;

-        return true;

-      }

-      else

-        return false;

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. If this

-    /// collection has set semantics, only items not already in the collection

-    /// will be added.

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int c = 0;

-      T j = default(T);

-      bool tmp;

-

-      bool raiseAdded = (ActiveEvents & EventTypeEnum.Added) != 0;

-      CircularQueue<T> wasAdded = raiseAdded ? new CircularQueue<T>() : null;

-

-      foreach (T i in items)

-        if (addIterative(i, ref j, false, out tmp))

-        {

-          c++;

-          if (raiseAdded)

-            wasAdded.Enqueue(tmp ? j : i);

-        }

-      if (c == 0)

-        return;

-

-      size += c;

-      //TODO: implement a RaiseForAddAll() method

-      if (raiseAdded)

-        foreach (T item in wasAdded)

-          raiseItemsAdded(item, 1);

-      if (((ActiveEvents & EventTypeEnum.Changed) != 0))

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Add all the items from another collection with an enumeration order that 

-    /// is increasing in the items. <para>The idea is that the implementation may use

-    /// a faster algorithm to merge the two collections.</para>

-    /// <exception cref="ArgumentException"/> if the enumerated items turns out

-    /// not to be in increasing order.

-    /// </summary>

-    /// <param name="items">The collection to add.</param>

-    /// <typeparam name="U"></typeparam>

-    [Tested]

-    public void AddSorted<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (size > 0)

-        AddAll(items);

-      else

-      {

-        if (!isValid)

-          throw new ViewDisposedException("Snapshot has been disposed");

-        updatecheck();

-        addSorted(items, true, true);

-      }

-    }

-

-    #region add-sorted helpers

-

-    //Create a RB tree from x+2^h-1  (x < 2^h, h>=1) nodes taken from a

-    //singly linked list of red nodes using only the right child refs.

-    //The x nodes at depth h+1 will be red, the rest black.

-    //(h is the blackdepth of the resulting tree)

-    static Node maketreer(ref Node rest, int blackheight, int maxred, int red)

-    {

-      if (blackheight == 1)

-      {

-        Node top = rest;

-

-        rest = rest.right;

-        if (red > 0)

-        {

-          top.right = null;

-          rest.left = top;

-          top = rest;

-#if BAG

-          top.size += top.left.size;

-#elif MAINTAIN_SIZE

-          top.size = 1 + red;

-#endif

-          rest = rest.right;

-          red--;

-        }

-

-        if (red > 0)

-        {

-#if BAG

-          top.size += rest.size;

-#endif

-          top.right = rest;

-          rest = rest.right;

-          top.right.right = null;

-        }

-        else

-          top.right = null;

-

-        top.red = false;

-        return top;

-      }

-      else

-      {

-        maxred >>= 1;

-

-        int lred = red > maxred ? maxred : red;

-        Node left = maketreer(ref rest, blackheight - 1, maxred, lred);

-        Node top = rest;

-

-        rest = rest.right;

-        top.left = left;

-        top.red = false;

-        top.right = maketreer(ref rest, blackheight - 1, maxred, red - lred);

-#if BAG

-        top.size = top.items + top.left.size + top.right.size;

-#elif MAINTAIN_SIZE

-        top.size = (maxred << 1) - 1 + red;

-#endif

-        return top;

-      }

-    }

-

-

-    void addSorted<U>(SCG.IEnumerable<U> items, bool safe, bool raise) where U : T

-    {

-      SCG.IEnumerator<U> e = items.GetEnumerator(); ;

-      if (size > 0)

-        throw new InternalException("This can't happen");

-

-      if (!e.MoveNext())

-        return;

-

-      //To count theCollect 

-      Node head = new Node(), tail = head;

-      int z = 1;

-      T lastitem = tail.item = e.Current;

-#if BAG

-      int ec = 0;

-#endif

-

-      while (e.MoveNext())

-      {

-#if BAG

-        T thisitem = e.Current;

-        int comp = comparer.Compare(lastitem, thisitem);

-        if (comp > 0)

-          throw new ArgumentException("Argument not sorted");

-        if (comp == 0)

-        {

-          tail.items++;

-          ec++;

-        }

-        else

-        {

-          tail.size = tail.items;

-          z++;

-          tail.right = new Node();

-          tail = tail.right;

-          lastitem = tail.item = thisitem;

-#if NCP

-          tail.generation = generation;

-#endif

-        }

-#else

-        z++;

-        tail.right = new Node();

-        tail = tail.right;

-        tail.item = e.Current;

-        if (safe)

-        {

-          if (comparer.Compare(lastitem, tail.item) >= 0)

-            throw new ArgumentException("Argument not sorted");

-

-          lastitem = tail.item;

-        }

-#if NCP

-        tail.generation = generation;

-#endif

-#endif

-      }

-#if BAG

-      tail.size = tail.items;

-#endif

-      int blackheight = 0, red = z, maxred = 1;

-

-      while (maxred <= red)

-      {

-        red -= maxred;

-        maxred <<= 1;

-        blackheight++;

-      }

-

-      root = TreeBag<T>.maketreer(ref head, blackheight, maxred, red);

-      blackdepth = blackheight;

-      size = z;

-#if BAG

-      size += ec;

-#endif

-

-      if (raise)

-      {

-        if ((ActiveEvents & EventTypeEnum.Added) != 0)

-        {

-          CircularQueue<T> wasAdded = new CircularQueue<T>();

-          foreach (T item in this)

-            wasAdded.Enqueue(item);

-          foreach (T item in wasAdded)

-            raiseItemsAdded(item, 1);

-        }

-        if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-          raiseCollectionChanged();

-      }

-      return;

-    }

-

-    #endregion

-

-#if BAG

-    /// <summary></summary>

-    /// <value>True since this collection has bag semantics.</value>

-    [Tested]

-    public bool AllowsDuplicates { [Tested]get { return true; } }

-#else

-    /// <summary></summary>

-    /// <value>False since this tree has set semantics.</value>

-    [Tested]

-    public bool AllowsDuplicates { [Tested]get { return false; } }

-#endif

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return true; } }

-

-    #endregion

-

-    #region IEditableCollection<T> Members

-

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>Speed.Log</value>

-    [Tested]

-    public Speed ContainsSpeed { [Tested]get { return Speed.Log; } }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public bool Contains(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node next; int comp = 0;

-

-      next = root;

-      while (next != null)

-      {

-        comp = comparer.Compare(next.item, item);

-        if (comp == 0)

-          return true;

-

-        next = comp < 0 ? right(next) : left(next);

-      }

-

-      return false;

-    }

-

-

-    //Variant for dictionary use

-    //Will return the actual matching item in the ref argument.

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public bool Find(ref T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node next; int comp = 0;

-

-      next = root;

-      while (next != null)

-      {

-        comp = comparer.Compare(next.item, item);

-        if (comp == 0)

-        {

-          item = next.item;

-          return true;

-        }

-

-        next = comp < 0 ? right(next) : left(next);

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Find or add the item to the tree. If the tree does not contain

-    /// an item equivalent to this item add it, else return the exisiting

-    /// one in the ref argument. 

-    ///

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns>True if item was found</returns>

-    [Tested]

-    public bool FindOrAdd(ref T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      bool wasfound;

-

-      //Note: blackdepth of the tree is set inside addIterative

-      if (addIterative(item, ref item, false, out wasfound))

-      {

-        size++;

-        if (ActiveEvents != 0 && !wasfound)

-          raiseForAdd(item);

-        return wasfound;

-      }

-      else

-        return true;

-

-    }

-

-

-    //For dictionary use. 

-    //If found, the matching entry will be updated with the new item.

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. If the collection has bag semantics,

-    /// this updates all equivalent copies in

-    /// the collection.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public bool Update(T item)

-    {

-      T olditem = item;

-      return Update(item, out olditem);

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// with a binary copy of the supplied value. If the collection has bag semantics,

-    /// this updates all equivalent copies in

-    /// the collection.

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool Update(T item, out T olditem)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-#if NCP

-      stackcheck();

-

-      int level = 0;

-#endif

-      Node cursor = root;

-      int comp = 0;

-

-      while (cursor != null)

-      {

-        comp = comparer.Compare(cursor.item, item);

-        if (comp == 0)

-        {

-#if NCP

-          Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-          olditem = cursor.item;

-#if BAG

-          int items = cursor.items;

-#endif

-          cursor.item = item;

-#if NCP

-          while (level > 0)

-          {

-            Node child = cursor;

-

-            cursor = path[--level];

-            path[level] = null;

-#if NCP

-            Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#else

-						if (Node.CopyNode(maxsnapid, ref cursor, generation))

-						{

-							if (dirs[level] > 0)

-								cursor.left = child;

-							else

-								cursor.right = child;

-						}

-#endif

-          }

-

-          root = cursor;

-#endif

-#if BAG

-          if (ActiveEvents != 0)

-            raiseForUpdate(item, olditem, items);

-#else

-          if (ActiveEvents != 0)

-            raiseForUpdate(item, olditem);

-#endif

-          return true;

-        }

-#if NCP

-        dirs[level] = comp;

-        path[level++] = cursor;

-#endif

-        cursor = comp < 0 ? cursor.right : cursor.left;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// with a binary copy of the supplied value; else add the value to the collection. 

-    ///

-    /// <i>NOTE: the bag implementation is currently wrong! ?????</i>

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    [Tested]

-    public bool UpdateOrAdd(T item)

-    { T olditem; return UpdateOrAdd(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(T item, out T olditem)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      bool wasfound;

-      olditem = default(T);

-

-

-      //Note: blackdepth of the tree is set inside addIterative

-      if (addIterative(item, ref olditem, true, out wasfound))

-      {

-        size++;

-        if (ActiveEvents != 0)

-          raiseForAdd(wasfound ? olditem : item);

-        return wasfound;

-      }

-      else

-      {

-#warning for bag implementation: count is wrong

-        if (ActiveEvents != 0)

-          raiseForUpdate(item, olditem, 1);

-        return true;

-      }

-    }

-

-

-    /// <summary>

-    /// Remove a particular item from this collection. If the collection has bag

-    /// semantics only one copy equivalent to the supplied item is removed. 

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public bool Remove(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      if (root == null)

-        return false;

-

-      int junk;

-      bool retval = removeIterative(ref item, false, out junk);

-      if (ActiveEvents != 0 && retval)

-        raiseForRemove(item);

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this collection if found. If the collection

-    /// has bag semantics only one copy equivalent to the supplied item is removed,

-    /// which one is implementation dependent. 

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public bool Remove(T item, out T removeditem)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      removeditem = item;

-      if (root == null)

-        return false;

-

-      int junk;

-      bool retval = removeIterative(ref removeditem, false, out junk);

-      if (ActiveEvents != 0 && retval)

-        raiseForRemove(item);

-      return retval;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item">input: item to remove; output: item actually removed</param>

-    /// <param name="all">If true, remove all copies</param>

-    /// <param name="wasRemoved"></param>

-    /// <returns></returns>

-    private bool removeIterative(ref T item, bool all, out int wasRemoved)

-    {

-      wasRemoved = 0;

-      //Stage 1: find item

-      stackcheck();

-

-      int level = 0, comp;

-      Node cursor = root;

-

-      while (true)

-      {

-        comp = comparer.Compare(cursor.item, item);

-        if (comp == 0)

-        {

-          item = cursor.item;

-#if BAG

-          if (!all && cursor.items > 1)

-          {

-#if NCP

-            Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-            cursor.items--;

-            cursor.size--;

-            while (level-- > 0)

-            {

-              Node kid = cursor;

-

-              cursor = path[level];

-#if NCP

-              Node.update(ref cursor, dirs[level] > 0, kid, maxsnapid, generation);

-#endif

-              cursor.size--;

-              path[level] = null;

-            }

-            size--;

-            wasRemoved = 1;

-            return true;

-          }

-          wasRemoved = cursor.items;

-#else

-          wasRemoved = 1;

-#endif

-          break;

-        }

-

-        Node child = comp > 0 ? cursor.left : cursor.right;

-

-        if (child == null)

-          return false;

-

-        dirs[level] = comp;

-        path[level++] = cursor;

-        cursor = child;

-      }

-

-      return removeIterativePhase2(cursor, level);

-    }

-

-

-    private bool removeIterativePhase2(Node cursor, int level)

-    {

-      if (size == 1)

-      {

-        clear();

-        return true;

-      }

-

-#if BAG

-      int removedcount = cursor.items;

-      size -= removedcount;

-#else

-      //We are certain to remove one node:

-      size--;

-#endif

-      //Stage 2: if item's node has no null child, find predecessor

-      int level_of_item = level;

-

-      if (cursor.left != null && cursor.right != null)

-      {

-        dirs[level] = 1;

-        path[level++] = cursor;

-        cursor = cursor.left;

-        while (cursor.right != null)

-        {

-          dirs[level] = -1;

-          path[level++] = cursor;

-          cursor = cursor.right;

-        }

-#if NCP

-        Node.CopyNode(ref path[level_of_item], maxsnapid, generation);

-#endif

-        path[level_of_item].item = cursor.item;

-#if BAG

-        path[level_of_item].items = cursor.items;

-#endif

-      }

-

-      //Stage 3: splice out node to be removed

-      Node newchild = cursor.right == null ? cursor.left : cursor.right;

-      bool demote_or_rotate = newchild == null && !cursor.red;

-

-      //assert newchild.red 

-      if (newchild != null)

-      {

-        newchild.red = false;

-      }

-

-      if (level == 0)

-      {

-        root = newchild;

-        return true;

-      }

-

-      level--;

-      cursor = path[level];

-      path[level] = null;

-

-      int comp = dirs[level];

-      Node childsibling;

-#if NCP

-      Node.update(ref cursor, comp > 0, newchild, maxsnapid, generation);

-#else

-			if (comp > 0)

-				cursor.left = newchild;

-			else

-				cursor.right = newchild;

-#endif

-      childsibling = comp > 0 ? cursor.right : cursor.left;

-#if BAG

-      cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-      cursor.size--;

-#endif

-

-      //Stage 4: demote till we must rotate

-      Node farnephew = null, nearnephew = null;

-

-      while (demote_or_rotate)

-      {

-        if (childsibling.red)

-          break; //rotate 2+?

-

-        farnephew = comp > 0 ? childsibling.right : childsibling.left;

-        if (farnephew != null && farnephew.red)

-          break; //rotate 1b

-

-        nearnephew = comp > 0 ? childsibling.left : childsibling.right;

-        if (nearnephew != null && nearnephew.red)

-          break; //rotate 1c

-

-        //demote cursor

-        childsibling.red = true;

-        if (level == 0)

-        {

-          cursor.red = false;

-          blackdepth--;

-#if NCP

-          root = cursor;

-#endif

-          return true;

-        }

-        else if (cursor.red)

-        {

-          cursor.red = false;

-          demote_or_rotate = false;

-          break; //No rotation

-        }

-        else

-        {

-          Node child = cursor;

-

-          cursor = path[--level];

-          path[level] = null;

-          comp = dirs[level];

-          childsibling = comp > 0 ? cursor.right : cursor.left;

-#if NCP

-          Node.update(ref cursor, comp > 0, child, maxsnapid, generation);

-#endif

-#if BAG

-          cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-          cursor.size--;

-#endif

-        }

-      }

-

-      //Stage 5: rotate 

-      if (demote_or_rotate)

-      {

-        //At start:

-        //parent = cursor (temporary for swapping nodes)

-        //childsibling is the sibling of the updated child (x)

-        //cursor is always the top of the subtree

-        Node parent = cursor;

-

-        if (childsibling.red)

-        {//Case 2 and perhaps more. 

-          //The y.rank == px.rank >= x.rank+2 >=2 so both nephews are != null 

-          //(and black). The grandnephews are children of nearnephew

-          Node neargrandnephew, fargrandnephew;

-

-          if (comp > 0)

-          {

-            nearnephew = childsibling.left;

-            farnephew = childsibling.right;

-            neargrandnephew = nearnephew.left;

-            fargrandnephew = nearnephew.right;

-          }

-          else

-          {

-            nearnephew = childsibling.right;

-            farnephew = childsibling.left;

-            neargrandnephew = nearnephew.right;

-            fargrandnephew = nearnephew.left;

-          }

-

-          if (fargrandnephew != null && fargrandnephew.red)

-          {//Case 2+1b

-#if NCP

-            Node.CopyNode(ref nearnephew, maxsnapid, generation);

-

-            //The end result of this will always be e copy of parent

-            Node.update(ref parent, comp < 0, neargrandnephew, maxsnapid, generation);

-            Node.update(ref childsibling, comp > 0, nearnephew, maxsnapid, generation);

-#endif

-            if (comp > 0)

-            {

-              nearnephew.left = parent;

-              parent.right = neargrandnephew;

-            }

-            else

-            {

-              nearnephew.right = parent;

-              parent.left = neargrandnephew;

-            }

-

-            cursor = childsibling;

-            childsibling.red = false;

-            nearnephew.red = true;

-            fargrandnephew.red = false;

-#if BAG

-            cursor.size = parent.size;

-            nearnephew.size = cursor.size - cursor.items - farnephew.size;

-            parent.size = nearnephew.size - nearnephew.items - fargrandnephew.size;

-#elif MAINTAIN_SIZE

-            cursor.size = parent.size;

-            nearnephew.size = cursor.size - 1 - farnephew.size;

-            parent.size = nearnephew.size - 1 - fargrandnephew.size;

-#endif

-          }

-          else if (neargrandnephew != null && neargrandnephew.red)

-          {//Case 2+1c

-#if NCP

-            Node.CopyNode(ref neargrandnephew, maxsnapid, generation);

-#endif

-            if (comp > 0)

-            {

-#if NCP

-              Node.update(ref childsibling, true, neargrandnephew, maxsnapid, generation);

-              Node.update(ref nearnephew, true, neargrandnephew.right, maxsnapid, generation);

-              Node.update(ref parent, false, neargrandnephew.left, maxsnapid, generation);

-#else

-							childsibling.left = neargrandnephew;

-							nearnephew.left = neargrandnephew.right;

-							parent.right = neargrandnephew.left;

-#endif

-              neargrandnephew.left = parent;

-              neargrandnephew.right = nearnephew;

-            }

-            else

-            {

-#if NCP

-              Node.update(ref childsibling, false, neargrandnephew, maxsnapid, generation);

-              Node.update(ref nearnephew, false, neargrandnephew.left, maxsnapid, generation);

-              Node.update(ref parent, true, neargrandnephew.right, maxsnapid, generation);

-#else

-							childsibling.right = neargrandnephew;

-							nearnephew.right = neargrandnephew.left;

-							parent.left = neargrandnephew.right;

-#endif

-              neargrandnephew.right = parent;

-              neargrandnephew.left = nearnephew;

-            }

-

-            cursor = childsibling;

-            childsibling.red = false;

-#if BAG

-            cursor.size = parent.size;

-            parent.size = parent.items + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-            nearnephew.size = nearnephew.items + (nearnephew.left == null ? 0 : nearnephew.left.size) + (nearnephew.right == null ? 0 : nearnephew.right.size);

-            neargrandnephew.size = neargrandnephew.items + parent.size + nearnephew.size;

-#elif MAINTAIN_SIZE

-            cursor.size = parent.size;

-            parent.size = 1 + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-            nearnephew.size = 1 + (nearnephew.left == null ? 0 : nearnephew.left.size) + (nearnephew.right == null ? 0 : nearnephew.right.size);

-            neargrandnephew.size = 1 + parent.size + nearnephew.size;

-#endif

-          }

-          else

-          {//Case 2 only

-#if NCP

-            Node.update(ref parent, comp < 0, nearnephew, maxsnapid, generation);

-            Node.update(ref childsibling, comp > 0, parent, maxsnapid, generation);

-#else

-						if (comp > 0)

-						{

-							childsibling.left = parent;

-							parent.right = nearnephew;

-						}

-						else

-						{

-							childsibling.right = parent;

-							parent.left = nearnephew;

-						}

-#endif

-            cursor = childsibling;

-            childsibling.red = false;

-            nearnephew.red = true;

-#if BAG

-            cursor.size = parent.size;

-            parent.size -= farnephew.size + cursor.items;

-#elif MAINTAIN_SIZE

-            cursor.size = parent.size;

-            parent.size -= farnephew.size + 1;

-#endif

-          }

-        }

-        else if (farnephew != null && farnephew.red)

-        {//Case 1b

-          nearnephew = comp > 0 ? childsibling.left : childsibling.right;

-#if NCP

-          Node.update(ref parent, comp < 0, nearnephew, maxsnapid, generation);

-          Node.CopyNode(ref childsibling, maxsnapid, generation);

-          if (comp > 0)

-          {

-            childsibling.left = parent;

-            childsibling.right = farnephew;

-          }

-          else

-          {

-            childsibling.right = parent;

-            childsibling.left = farnephew;

-          }

-#else

-					if (comp > 0)

-					{

-						childsibling.left = parent;

-						parent.right = nearnephew;

-					}

-					else

-					{

-						childsibling.right = parent;

-						parent.left = nearnephew;

-					}

-#endif

-          cursor = childsibling;

-          cursor.red = parent.red;

-          parent.red = false;

-          farnephew.red = false;

-

-#if BAG

-          cursor.size = parent.size;

-          parent.size -= farnephew.size + cursor.items;

-#elif MAINTAIN_SIZE

-          cursor.size = parent.size;

-          parent.size -= farnephew.size + 1;

-#endif

-        }

-        else if (nearnephew != null && nearnephew.red)

-        {//Case 1c

-#if NCP

-          Node.CopyNode(ref nearnephew, maxsnapid, generation);

-#endif

-          if (comp > 0)

-          {

-#if NCP

-            Node.update(ref childsibling, true, nearnephew.right, maxsnapid, generation);

-            Node.update(ref parent, false, nearnephew.left, maxsnapid, generation);

-#else

-						childsibling.left = nearnephew.right;

-						parent.right = nearnephew.left;

-#endif

-            nearnephew.left = parent;

-            nearnephew.right = childsibling;

-          }

-          else

-          {

-#if NCP

-            Node.update(ref childsibling, false, nearnephew.left, maxsnapid, generation);

-            Node.update(ref parent, true, nearnephew.right, maxsnapid, generation);

-#else

-						childsibling.right = nearnephew.left;

-						parent.left = nearnephew.right;

-#endif

-            nearnephew.right = parent;

-            nearnephew.left = childsibling;

-          }

-

-          cursor = nearnephew;

-          cursor.red = parent.red;

-          parent.red = false;

-#if BAG

-          cursor.size = parent.size;

-          parent.size = parent.items + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-          childsibling.size = childsibling.items + (childsibling.left == null ? 0 : childsibling.left.size) + (childsibling.right == null ? 0 : childsibling.right.size);

-#elif MAINTAIN_SIZE

-          cursor.size = parent.size;

-          parent.size = 1 + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-          childsibling.size = 1 + (childsibling.left == null ? 0 : childsibling.left.size) + (childsibling.right == null ? 0 : childsibling.right.size);

-#endif

-        }

-        else

-        {//Case 1a can't happen

-          throw new InternalException("Case 1a can't happen here");

-        }

-

-        //Resplice cursor:

-        if (level == 0)

-        {

-          root = cursor;

-        }

-        else

-        {

-          Node swap = cursor;

-

-          cursor = path[--level];

-          path[level] = null;

-#if NCP

-          Node.update(ref cursor, dirs[level] > 0, swap, maxsnapid, generation);

-#else

-				

-					if (dirs[level] > 0)

-						cursor.left = swap;

-					else

-						cursor.right = swap;

-#endif

-#if BAG

-          cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-          cursor.size--;

-#endif

-        }

-      }

-

-      //Stage 6: fixup to the root

-      while (level > 0)

-      {

-        Node child = cursor;

-

-        cursor = path[--level];

-        path[level] = null;

-#if NCP

-        if (child != (dirs[level] > 0 ? cursor.left : cursor.right))

-          Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-#if BAG

-        cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-        cursor.size--;

-#endif

-      }

-

-#if NCP

-      root = cursor;

-#endif

-      return true;

-    }

-

-

-    /// <summary>

-    /// Remove all items from this collection.

-    /// </summary>

-    [Tested]

-    public void Clear()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      if (size == 0)

-        return;

-      int oldsize = size;

-      clear();

-      if ((ActiveEvents & EventTypeEnum.Cleared) != 0)

-        raiseCollectionCleared(true, oldsize);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    private void clear()

-    {

-      size = 0;

-      root = null;

-      blackdepth = 0;

-    }

-

-

-    /// <summary>

-    /// Remove all items in another collection from this one. If this collection

-    /// has bag semantics, take multiplicities into account.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      T jtem;

-

-      bool mustRaise = (ActiveEvents & (EventTypeEnum.Removed | EventTypeEnum.Changed)) != 0;

-      RaiseForRemoveAllHandler raiseHandler = mustRaise ? new RaiseForRemoveAllHandler(this) : null;

-

-      foreach (T item in items)

-      {

-        if (root == null)

-          break;

-

-        jtem = item;

-        int junk;

-        if (removeIterative(ref jtem, false, out junk) && mustRaise)

-          raiseHandler.Remove(jtem);

-      }

-      if (mustRaise)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one. If this collection

-    /// has bag semantics, take multiplicities into account.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      //A much more efficient version is possible if items is sorted like this.

-      //Well, it is unclear how efficient it would be.

-      //We could use a marking method!?

-#warning how does this work together with persistence?

-      TreeBag<T> t = (TreeBag<T>)MemberwiseClone();

-

-      T jtem = default(T);

-      t.clear();

-      foreach (T item in items)

-        if (ContainsCount(item) > t.ContainsCount(item))

-        {

-          t.add(item, ref jtem);

-        }

-      if (size == t.size)

-        return;

-

-#warning improve (mainly for bag) by usig a Node iterator instead of ItemMultiplicities()

-      CircularQueue<KeyValuePair<T, int>> wasRemoved = null;

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-      {

-        wasRemoved = new CircularQueue<KeyValuePair<T, int>>();

-        SCG.IEnumerator<KeyValuePair<T, int>> ie = ItemMultiplicities().GetEnumerator();

-        foreach (KeyValuePair<T, int> p in t.ItemMultiplicities())

-        {

-          //We know p.Key is in this!

-          while (ie.MoveNext())

-          {

-            if (comparer.Compare(ie.Current.Key, p.Key) == 0)

-            {

-#if BAG

-              int removed = ie.Current.Value - p.Value;

-              if (removed > 0)

-                wasRemoved.Enqueue(new KeyValuePair<T,int>(p.Key, removed));

-#endif

-              break;

-            }

-            else

-              wasRemoved.Enqueue(ie.Current);

-          }

-        }

-        while (ie.MoveNext())

-          wasRemoved.Enqueue(ie.Current);

-      }

-

-      root = t.root;

-      size = t.size;

-      blackdepth = t.blackdepth;

-      if (wasRemoved != null)

-        foreach (KeyValuePair<T, int> p in wasRemoved)

-          raiseItemsRemoved(p.Key, p.Value);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection.

-    /// If this collection has bag semantics (<code>AllowsDuplicates==true</code>)

-    /// the check is made with respect to multiplicities, else multiplicities

-    /// are not taken into account.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      //TODO: fix bag implementation

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      //This is worst-case O(m*logn)

-      foreach (T item in items)

-        if (!Contains(item)) return false;

-

-      return true;

-    }

-

-

-    //Higher order:

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the items of this

-    /// indexed sorted collection satisfying a certain predicate.

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new indexed sorted collection.</returns>

-    [Tested]

-    public IIndexedSorted<T> FindAll(Fun<T, bool> filter)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      TreeBag<T> res = new TreeBag<T>(comparer);

-      SCG.IEnumerator<T> e = GetEnumerator();

-      Node head = null, tail = null;

-      int z = 0;

-#if BAG

-      int ec = 0;

-#endif

-      while (e.MoveNext())

-      {

-        T thisitem = e.Current;

-#if BAG

-        //We could document that filter will only be called 

-        //once on each unique item. That might even be good for the user!

-        if (tail != null && comparer.Compare(thisitem, tail.item) == 0)

-        {

-          tail.items++;

-          ec++;

-          continue;

-        }

-#endif

-        if (filter(thisitem))

-        {

-          if (head == null)

-          {

-            head = tail = new Node();

-          }

-          else

-          {

-#if BAG

-            tail.size = tail.items;

-#endif

-            tail.right = new Node();

-            tail = tail.right;

-          }

-

-          tail.item = thisitem;

-          z++;

-        }

-      }

-#if BAG

-      if (tail != null)

-        tail.size = tail.items;

-#endif

-

-      if (z == 0)

-        return res;

-

-      int blackheight = 0, red = z, maxred = 1;

-

-      while (maxred <= red)

-      {

-        red -= maxred;

-        maxred <<= 1;

-        blackheight++;

-      }

-

-      res.root = TreeBag<T>.maketreer(ref head, blackheight, maxred, red);

-      res.blackdepth = blackheight;

-      res.size = z;

-#if BAG

-      res.size += ec;

-#endif

-      return res;

-    }

-

-

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the results of

-    /// mapping all items of this list.

-    /// <exception cref="ArgumentException"/> if the map is not increasing over 

-    /// the items of this collection (with respect to the two given comparison 

-    /// relations).

-    /// </summary>

-    /// <param name="mapper">The delegate definging the map.</param>

-    /// <param name="c">The comparion relation to use for the result.</param>

-    /// <returns>The new sorted collection.</returns>

-    [Tested]

-    public IIndexedSorted<V> Map<V>(Fun<T, V> mapper, SCG.IComparer<V> c)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      TreeBag<V> res = new TreeBag<V>(c);

-

-      if (size == 0)

-        return res;

-

-      SCG.IEnumerator<T> e = GetEnumerator();

-      TreeBag<V>.Node head = null, tail = null;

-      V oldv = default(V);

-      int z = 0;

-#if BAG

-      T lastitem = default(T);

-#endif

-      while (e.MoveNext())

-      {

-        T thisitem = e.Current;

-#if BAG

-        //We could document that mapper will only be called 

-        //once on each unique item. That might even be good for the user!

-        if (tail != null && comparer.Compare(thisitem, lastitem) == 0)

-        {

-          tail.items++;

-          continue;

-        }

-#endif

-        V newv = mapper(thisitem);

-

-        if (head == null)

-        {

-          head = tail = new TreeBag<V>.Node();

-          z++;

-        }

-        else

-        {

-          int comp = c.Compare(oldv, newv);

-#if BAG

-          if (comp == 0)

-          {

-            tail.items++;

-            continue;

-          }

-          if (comp > 0)

-#else

-          if (comp >= 0)

-#endif

-            throw new ArgumentException("mapper not monotonic");

-#if BAG

-          tail.size = tail.items;

-#endif

-          tail.right = new TreeBag<V>.Node();

-          tail = tail.right;

-          z++;

-        }

-#if BAG

-        lastitem = thisitem;

-#endif

-        tail.item = oldv = newv;

-      }

-

-#if BAG

-      tail.size = tail.items;

-#endif

-

-      int blackheight = 0, red = z, maxred = 1;

-

-      while (maxred <= red)

-      {

-        red -= maxred;

-        maxred <<= 1;

-        blackheight++;

-      }

-

-      res.root = TreeBag<V>.maketreer(ref head, blackheight, maxred, red);

-      res.blackdepth = blackheight;

-      res.size = size;

-      return res;

-    }

-

-

-    //below is the bag utility stuff

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    [Tested]

-    public int ContainsCount(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      Node next; int comp = 0;

-

-      next = root;

-      while (next != null)

-      {

-        comp = comparer.Compare(next.item, item);

-        if (comp == 0)

-          return next.items;

-

-        next = comp < 0 ? right(next) : left(next);

-      }

-

-      return 0;

-#else

-      //Since we are strictly not AllowsDuplicates we just do

-      return Contains(item) ? 1 : 0;

-#endif

-    }

-

-#if BAG

-    //TODO: make work with snapshots

-    class Multiplicities : CollectionValueBase<KeyValuePair<T, int>>, ICollectionValue<KeyValuePair<T, int>>

-    {

-      TreeBag<T> treebag;

-      int origstamp;

-      internal Multiplicities(TreeBag<T> treebag) { this.treebag = treebag; this.origstamp = treebag.stamp; }

-      public override KeyValuePair<T, int> Choose() { return new KeyValuePair<T, int>(treebag.root.item, treebag.root.items); }

-

-      public override SCG.IEnumerator<KeyValuePair<T, int>> GetEnumerator()

-      {

-        return getEnumerator(treebag.root, origstamp); //TODO: NBNBNB

-      }

-

-      private SCG.IEnumerator<KeyValuePair<T, int>> getEnumerator(Node node, int origstamp)

-      {

-        if (node == null)

-          yield break;

-

-        if (node.left != null)

-        {

-          SCG.IEnumerator<KeyValuePair<T, int>> child = getEnumerator(node.left, origstamp);

-

-          while (child.MoveNext())

-          {

-            treebag.modifycheck(origstamp);

-            yield return child.Current;

-          }

-        }

-        yield return new KeyValuePair<T, int>(node.item, node.items);

-        if (node.right != null)

-        {

-          SCG.IEnumerator<KeyValuePair<T, int>> child = getEnumerator(node.right, origstamp);

-

-          while (child.MoveNext())

-          {

-            treebag.modifycheck(origstamp);

-            yield return child.Current;

-          }

-        }

-      }

-

-      public override bool IsEmpty { get { return treebag.IsEmpty; } }

-      public override int Count { get { int i = 0; foreach (KeyValuePair<T, int> p in this) i++; return i; } } //TODO: make better

-      public override Speed CountSpeed { get { return Speed.Linear; } } //TODO: make better

-    }

-#endif

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      return new DropMultiplicity<T>(ItemMultiplicities());

-#else

-      return this;

-#endif

-    }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      return new Multiplicities(this);

-#else

-      return new MultiplicityOne<T>(this);

-#endif

-    }

-

-    /// <summary>

-    /// Remove all items equivalent to a given value.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public void RemoveAllCopies(T item)

-    {

-#if BAG

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      int removed;

-      if (removeIterative(ref item, true, out removed) && ActiveEvents != 0)

-      {

-        raiseForRemove(item, removed);

-      }

-#else

-      Remove(item);

-#endif

-    }

-

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    private Node findNode(int i)

-    {

-#if NCP

-      if (isSnapShot)

-        throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-#if MAINTAIN_SIZE

-      Node next = root;

-

-      if (i >= 0 && i < size)

-        while (true)

-        {

-          int j = next.left == null ? 0 : next.left.size;

-

-          if (i > j)

-          {

-#if BAG

-            i -= j + next.items;

-            if (i < 0)

-              return next;

-#else

-            i -= j + 1;

-#endif

-            next = next.right;

-          }

-          else if (i == j)

-            return next;

-          else

-            next = next.left;

-        }

-

-      throw new IndexOutOfRangeException();

-#else

-			throw new NotSupportedException();

-#endif

-    }

-

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <value>The i'th item of this list.</value>

-    /// <param name="i">the index to lookup</param>

-    [Tested]

-    public T this[int i] { [Tested]	get { return findNode(i).item; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Log; } }

-

-

-    //TODO: return -upper instead of -1 in case of not found

-    /// <summary>

-    /// Searches for an item in this indexed collection going forwards from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of first occurrence from start of the item

-    /// if found, else the two-complement 

-    /// (always negative) of the index at which the item would be put if it was added.</returns>

-    [Tested]

-    public int IndexOf(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      int upper;

-      return indexOf(item, out upper);

-    }

-

-

-    private int indexOf(T item, out int upper)

-    {

-#if NCP

-      if (isSnapShot)

-        throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-#if MAINTAIN_SIZE

-      int ind = 0; Node next = root;

-

-      while (next != null)

-      {

-        int comp = comparer.Compare(item, next.item);

-

-        if (comp < 0)

-          next = next.left;

-        else

-        {

-          int leftcnt = next.left == null ? 0 : next.left.size;

-

-          if (comp == 0)

-          {

-#if BAG

-            upper = ind + leftcnt + next.items - 1;

-            return ind + leftcnt;

-#else

-            return upper = ind + leftcnt;

-#endif

-          }

-          else

-          {

-#if BAG

-            ind = ind + next.items + leftcnt;

-#else

-            ind = ind + 1 + leftcnt;

-#endif

-            next = next.right;

-          }

-        }

-      }

-#endif

-      upper = ~ind;

-      return ~ind;

-    }

-

-

-    /// <summary>

-    /// Searches for an item in the tree going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of last occurrence from the end of item if found, 

-    /// else the two-complement (always negative) of the index at which 

-    /// the item would be put if it was added.</returns>

-    [Tested]

-    public int LastIndexOf(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      int res;

-      indexOf(item, out res);

-      return res;

-#else

-      //We have AllowsDuplicates==false for the set

-      return IndexOf(item);

-#endif

-    }

-

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <param name="i">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T RemoveAt(int i)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      T retval = removeAt(i);

-      if (ActiveEvents != 0)

-        raiseForRemove(retval);

-      return retval;

-    }

-

-    T removeAt(int i)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-#if MAINTAIN_SIZE

-      if (i < 0 || i >= size)

-        throw new IndexOutOfRangeException("Index out of range for sequenced collectionvalue");

-

-      //We must follow the pattern of removeIterative()

-      while (dirs.Length < 2 * blackdepth)

-      {

-        dirs = new int[2 * dirs.Length];

-        path = new Node[2 * dirs.Length];

-      }

-

-      int level = 0;

-      Node cursor = root;

-

-      while (true)

-      {

-        int j = cursor.left == null ? 0 : cursor.left.size;

-

-        if (i > j)

-        {

-#if BAG

-          i -= j + cursor.items;

-          if (i < 0)

-            break;

-#else

-          i -= j + 1;

-#endif

-          dirs[level] = -1;

-          path[level++] = cursor;

-          cursor = cursor.right;

-        }

-        else if (i == j)

-          break;

-        else

-        {

-          dirs[level] = 1;

-          path[level++] = cursor;

-          cursor = cursor.left;

-        }

-      }

-

-      T retval = cursor.item;

-

-#if BAG

-      if (cursor.items > 1)

-      {

-        resplicebag(level, cursor);

-        size--;

-        return retval;

-      }

-#endif

-      removeIterativePhase2(cursor, level);

-      return retval;

-#else

-			throw new NotSupportedException();

-#endif

-    }

-

-#if BAG

-    private void resplicebag(int level, Node cursor)

-    {

-#if NCP

-      Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-      cursor.items--;

-      cursor.size--;

-      while (level-- > 0)

-      {

-        Node kid = cursor;

-

-        cursor = path[level];

-#if NCP

-        Node.update(ref cursor, dirs[level] > 0, kid, maxsnapid, generation);

-#endif

-        cursor.size--;

-        path[level] = null;

-      }

-    }

-#endif

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// <exception cref="IndexOutOfRangeException"/>???. 

-    /// </summary>

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public void RemoveInterval(int start, int count)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (start < 0 || count < 0 || start + count > this.size)

-        throw new ArgumentOutOfRangeException();

-

-      updatecheck();

-

-      if (count == 0)

-        return;

-

-      //This is terrible for large count. We should split the tree at 

-      //the endpoints of the range and fuse the parts!

-      //We really need good internal destructive split and catenate functions!

-      //Alternative for large counts: rebuild tree using maketree()

-      for (int i = 0; i < count; i++)

-        removeAt(start);

-

-      if ((ActiveEvents & EventTypeEnum.Cleared) != 0)

-        raiseCollectionCleared(false, count);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/>.

-    /// </summary>

-    /// <value>The directed collection of items in a specific index interval.</value>

-    /// <param name="start">The low index of the interval (inclusive).</param>

-    /// <param name="end">The high index of the interval (exclusive).</param>

-    [Tested]

-    public IDirectedCollectionValue<T> this[int start, int end]

-    {

-      [Tested]

-      get

-      {

-        checkRange(start, end - start);

-        return new Interval(this, start, end - start, true);

-      }

-    }

-

-    #region Interval nested class

-    class Interval : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      int start, length, stamp;

-

-      bool forwards;

-

-      TreeBag<T> tree;

-

-

-      internal Interval(TreeBag<T> tree, int start, int count, bool forwards)

-      {

-#if NCP

-        if (tree.isSnapShot)

-          throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-        this.start = start; this.length = count; this.forwards = forwards;

-        this.tree = tree; this.stamp = tree.stamp;

-      }

-

-      public override bool IsEmpty { get { return length == 0; } }

-

-      [Tested]

-      public override int Count { [Tested]get { return length; } }

-

-

-      public override Speed CountSpeed { get { return Speed.Constant; } }

-

-

-      public override T Choose()

-      {

-        if (length == 0)

-          throw new NoSuchItemException();

-        return tree[start];

-      }

-

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator()

-      {

-#if MAINTAIN_SIZE

-        tree.modifycheck(stamp);

-#if BAG

-        int togo;

-#endif

-        Node cursor = tree.root;

-        Node[] path = new Node[2 * tree.blackdepth];

-        int level = 0, totaltogo = length;

-

-        if (totaltogo == 0)

-          yield break;

-

-        if (forwards)

-        {

-          int i = start;

-

-          while (true)

-          {

-            int j = cursor.left == null ? 0 : cursor.left.size;

-

-            if (i > j)

-            {

-#if BAG

-              i -= j + cursor.items;

-              if (i < 0)

-              {

-                togo = cursor.items + i;

-                break;

-              }

-#else

-              i -= j + 1;

-#endif

-              cursor = cursor.right;

-            }

-            else if (i == j)

-            {

-#if BAG

-              togo = cursor.items;

-#endif

-              break;

-            }

-            else

-            {

-              path[level++] = cursor;

-              cursor = cursor.left;

-            }

-          }

-

-          T current = cursor.item;

-

-          while (totaltogo-- > 0)

-          {

-            yield return current;

-            tree.modifycheck(stamp);

-#if BAG

-            if (--togo > 0)

-              continue;

-#endif

-            if (cursor.right != null)

-            {

-              path[level] = cursor = cursor.right;

-              while (cursor.left != null)

-                path[++level] = cursor = cursor.left;

-            }

-            else if (level == 0)

-              yield break;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-#if BAG

-            togo = cursor.items;

-#endif

-          }

-        }

-        else

-        {

-          int i = start + length - 1;

-

-          while (true)

-          {

-            int j = cursor.left == null ? 0 : cursor.left.size;

-

-            if (i > j)

-            {

-#if BAG

-              if (i - j < cursor.items)

-              {

-                togo = i - j + 1;

-                break;

-              }

-              i -= j + cursor.items;

-#else

-              i -= j + 1;

-#endif

-              path[level++] = cursor;

-              cursor = cursor.right;

-            }

-            else if (i == j)

-            {

-#if BAG

-              togo = 1;

-#endif

-              break;

-            }

-            else

-            {

-              cursor = cursor.left;

-            }

-          }

-

-          T current = cursor.item;

-

-          while (totaltogo-- > 0)

-          {

-            yield return current;

-            tree.modifycheck(stamp);

-#if BAG

-            if (--togo > 0)

-              continue;

-#endif

-            if (cursor.left != null)

-            {

-              path[level] = cursor = cursor.left;

-              while (cursor.right != null)

-                path[++level] = cursor = cursor.right;

-            }

-            else if (level == 0)

-              yield break;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-#if BAG

-            togo = cursor.items;

-#endif

-          }

-        }

-

-#else

-			throw new NotSupportedException();

-#endif

-      }

-

-

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      { return new Interval(tree, start, length, !forwards); }

-

-

-      [Tested]

-      IDirectedEnumerable<T> C5.IDirectedEnumerable<T>.Backwards()

-      { return Backwards(); }

-

-

-      [Tested]

-      public override EnumerationDirection Direction

-      {

-        [Tested]

-        get

-        {

-          return forwards ? EnumerationDirection.Forwards : EnumerationDirection.Backwards;

-        }

-      }

-    }

-    #endregion

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    public override IDirectedCollectionValue<T> Backwards() { return RangeAll().Backwards(); }

-

-

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    #endregion

-

-    #region PriorityQueue Members

-

-    /// <summary>

-    /// The comparer object supplied at creation time for this collection

-    /// </summary>

-    /// <value>The comparer</value>

-    public SCG.IComparer<T> Comparer { get { return comparer; } }

-

-

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// </summary>

-    /// <returns>The least item.</returns>

-    [Tested]

-    public T FindMin()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (size == 0)

-        throw new NoSuchItemException();

-      Node cursor = root, next = left(cursor);

-

-      while (next != null)

-      {

-        cursor = next;

-        next = left(cursor);

-      }

-

-      return cursor.item;

-    }

-

-

-    /// <summary>

-    /// Remove the least item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMin()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      //persistence guard?

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      //We must follow the pattern of removeIterative()

-      stackcheck();

-

-      T retval = deleteMin();

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(retval, 1);

-        raiseCollectionChanged();

-      }

-      return retval;

-    }

-

-    private T deleteMin()

-    {

-      int level = 0;

-      Node cursor = root;

-

-      while (cursor.left != null)

-      {

-        dirs[level] = 1;

-        path[level++] = cursor;

-        cursor = cursor.left;

-      }

-

-      T retval = cursor.item;

-

-#if BAG

-      if (cursor.items > 1)

-      {

-        resplicebag(level, cursor);

-        size--;

-        return retval;

-      }

-#endif

-      removeIterativePhase2(cursor, level);

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// </summary>

-    /// <returns>The largest item.</returns>

-    [Tested]

-    public T FindMax()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      Node cursor = root, next = right(cursor);

-

-      while (next != null)

-      {

-        cursor = next;

-        next = right(cursor);

-      }

-

-      return cursor.item;

-    }

-

-

-    /// <summary>

-    /// Remove the largest item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMax()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      //persistence guard?

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      //We must follow the pattern of removeIterative()

-      stackcheck();

-

-      T retval = deleteMax();

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(retval, 1);

-        raiseCollectionChanged();

-      }

-      return retval;

-    }

-

-    private T deleteMax()

-    {

-      int level = 0;

-      Node cursor = root;

-

-      while (cursor.right != null)

-      {

-        dirs[level] = -1;

-        path[level++] = cursor;

-        cursor = cursor.right;

-      }

-

-      T retval = cursor.item;

-

-#if BAG

-      if (cursor.items > 1)

-      {

-        resplicebag(level, cursor);

-        size--;

-        return retval;

-      }

-#endif

-      removeIterativePhase2(cursor, level);

-      return retval;

-    }

-    #endregion

-

-    #region IPredecesorStructure<T> Members

-

-    /// <summary>

-    /// Find the strict predecessor in the sorted collection of a particular value,

-    /// i.e. the largest item in the collection less than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than or equal to the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the predecessor for.</param>

-    /// <returns>The predecessor.</returns>

-    [Tested]

-    public T Predecessor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp < 0)

-        {

-          bestsofar = cursor;

-          cursor = right(cursor);

-        }

-        else if (comp == 0)

-        {

-          cursor = left(cursor);

-          while (cursor != null)

-          {

-            bestsofar = cursor;

-            cursor = right(cursor);

-          }

-        }

-        else

-          cursor = left(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-

-    /// <summary>

-    /// Find the weak predecessor in the sorted collection of a particular value,

-    /// i.e. the largest item in the collection less than or equal to the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the weak predecessor for.</param>

-    /// <returns>The weak predecessor.</returns>

-    [Tested]

-    public T WeakPredecessor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp < 0)

-        {

-          bestsofar = cursor;

-          cursor = right(cursor);

-        }

-        else if (comp == 0)

-          return cursor.item;

-        else

-          cursor = left(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-

-    /// <summary>

-    /// Find the strict successor in the sorted collection of a particular value,

-    /// i.e. the least item in the collection greater than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than or equal to the maximum of this collection.)</exception>

-    /// <param name="item">The item to find the successor for.</param>

-    /// <returns>The successor.</returns>

-    [Tested]

-    public T Successor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp > 0)

-        {

-          bestsofar = cursor;

-          cursor = left(cursor);

-        }

-        else if (comp == 0)

-        {

-          cursor = right(cursor);

-          while (cursor != null)

-          {

-            bestsofar = cursor;

-            cursor = left(cursor);

-          }

-        }

-        else

-          cursor = right(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-

-    /// <summary>

-    /// Find the weak successor in the sorted collection of a particular value,

-    /// i.e. the least item in the collection greater than or equal to the supplied value.

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than the maximum of this collection.)</exception>

-    /// </summary>

-    /// <param name="item">The item to find the weak successor for.</param>

-    /// <returns>The weak successor.</returns>

-    [Tested]

-    public T WeakSuccessor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp == 0)

-          return cursor.item;

-        else if (comp > 0)

-        {

-          bestsofar = cursor;

-          cursor = left(cursor);

-        }

-        else

-          cursor = right(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-    #endregion

-

-    #region ISorted<T> Members

-

-    /// <summary>

-    /// Query this sorted collection for items greater than or equal to a supplied value.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeFrom(T bot)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, true, bot, false, default(T), EnumerationDirection.Forwards);

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items between two supplied values.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeFromTo(T bot, T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, true, bot, true, top, EnumerationDirection.Forwards);

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items less than a supplied value.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeTo(T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, false, default(T), true, top, EnumerationDirection.Forwards);

-    }

-

-

-    /// <summary>

-    /// Create a directed collection with the same items as this collection.

-    /// </summary>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeAll()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, false, default(T), false, default(T), EnumerationDirection.Forwards);

-    }

-

-

-    [Tested]

-    IDirectedEnumerable<T> ISorted<T>.RangeFrom(T bot) { return RangeFrom(bot); }

-

-

-    [Tested]

-    IDirectedEnumerable<T> ISorted<T>.RangeFromTo(T bot, T top) { return RangeFromTo(bot, top); }

-

-

-    [Tested]

-    IDirectedEnumerable<T> ISorted<T>.RangeTo(T top) { return RangeTo(top); }

-

-

-    //Utility for CountXxxx. Actually always called with strict = true.

-    private int countTo(T item, bool strict)

-    {

-#if NCP

-      if (isSnapShot)

-        throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-#if MAINTAIN_SIZE

-      int ind = 0, comp = 0; Node next = root;

-

-      while (next != null)

-      {

-        comp = comparer.Compare(item, next.item);

-        if (comp < 0)

-          next = next.left;

-        else

-        {

-          int leftcnt = next.left == null ? 0 : next.left.size;

-#if BAG

-          if (comp == 0)

-            return strict ? ind + leftcnt : ind + leftcnt + next.items;

-          else

-          {

-            ind = ind + next.items + leftcnt;

-            next = next.right;

-          }

-#else

-          if (comp == 0)

-            return strict ? ind + leftcnt : ind + leftcnt + 1;

-          else

-          {

-            ind = ind + 1 + leftcnt;

-            next = next.right;

-          }

-#endif

-        }

-      }

-

-      //if we get here, we are at the same side of the whole collection:

-      return ind;

-#else

-			throw new NotSupportedException("Code compiled w/o size!");

-#endif

-    }

-

-

-    /// <summary>

-    /// Perform a search in the sorted collection for the ranges in which a

-    /// non-increasing (i.e. weakly decrerasing) function from the item type to 

-    /// <code>int</code> is

-    /// negative, zero respectively positive. If the supplied cut function is

-    /// not non-increasing, the result of this call is undefined.

-    /// </summary>

-    /// <param name="c">The cut function <code>T</code> to <code>int</code>, given

-    /// as an <code>IComparable&lt;T&gt;</code> object, where the cut function is

-    /// the <code>c.CompareTo(T that)</code> method.</param>

-    /// <param name="low">Returns the largest item in the collection, where the

-    /// cut function is positive (if any).</param>

-    /// <param name="lowIsValid">True if the cut function is positive somewhere

-    /// on this collection.</param>

-    /// <param name="high">Returns the least item in the collection, where the

-    /// cut function is negative (if any).</param>

-    /// <param name="highIsValid">True if the cut function is negative somewhere

-    /// on this collection.</param>

-    /// <returns></returns>

-    [Tested]

-    public bool Cut(IComparable<T> c, out T low, out bool lowIsValid, out T high, out bool highIsValid)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, lbest = null, rbest = null;

-      bool res = false;

-

-      while (cursor != null)

-      {

-        int comp = c.CompareTo(cursor.item);

-

-        if (comp > 0)

-        {

-          lbest = cursor;

-          cursor = right(cursor);

-        }

-        else if (comp < 0)

-        {

-          rbest = cursor;

-          cursor = left(cursor);

-        }

-        else

-        {

-          res = true;

-

-          Node tmp = left(cursor);

-

-          while (tmp != null && c.CompareTo(tmp.item) == 0)

-            tmp = left(tmp);

-

-          if (tmp != null)

-          {

-            lbest = tmp;

-            tmp = right(tmp);

-            while (tmp != null)

-            {

-              if (c.CompareTo(tmp.item) > 0)

-              {

-                lbest = tmp;

-                tmp = right(tmp);

-              }

-              else

-                tmp = left(tmp);

-            }

-          }

-

-          tmp = right(cursor);

-          while (tmp != null && c.CompareTo(tmp.item) == 0)

-            tmp = right(tmp);

-

-          if (tmp != null)

-          {

-            rbest = tmp;

-            tmp = left(tmp);

-            while (tmp != null)

-            {

-              if (c.CompareTo(tmp.item) < 0)

-              {

-                rbest = tmp;

-                tmp = left(tmp);

-              }

-              else

-                tmp = right(tmp);

-            }

-          }

-

-          break;

-        }

-      }

-

-      if (highIsValid = (rbest != null))

-        high = rbest.item;

-      else

-        high = default(T);

-

-      if (lowIsValid = (lbest != null))

-        low = lbest.item;

-      else

-        low = default(T);

-

-      return res;

-    }

-

-

-    /// <summary>

-    /// Determine the number of items at or above a supplied threshold.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountFrom(T bot)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return size - countTo(bot, true);

-    }

-

-

-    /// <summary>

-    /// Determine the number of items between two supplied thresholds.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountFromTo(T bot, T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (comparer.Compare(bot, top) >= 0)

-        return 0;

-

-      return countTo(top, true) - countTo(bot, true);

-    }

-

-

-    /// <summary>

-    /// Determine the number of items below a supplied threshold.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountTo(T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return countTo(top, true);

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection above or at a supplied threshold.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    [Tested]

-    public void RemoveRangeFrom(T low)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int count = CountFrom(low);

-

-      if (count == 0)

-        return;

-

-      stackcheck();

-      CircularQueue<T> wasRemoved = (ActiveEvents & EventTypeEnum.Removed) != 0 ? new CircularQueue<T>() : null;

-

-      for (int i = 0; i < count; i++)

-      {

-        T item = deleteMax();

-        if (wasRemoved != null)

-          wasRemoved.Enqueue(item);

-      }

-      if (wasRemoved != null)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection between two supplied thresholds.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    [Tested]

-    public void RemoveRangeFromTo(T low, T hi)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int count = CountFromTo(low, hi);

-

-      if (count == 0)

-        return;

-

-      CircularQueue<T> wasRemoved = (ActiveEvents & EventTypeEnum.Removed) != 0 ? new CircularQueue<T>() : null;

-      int junk;

-      for (int i = 0; i < count; i++)

-      {

-        T item = Predecessor(hi);

-        removeIterative(ref item, false, out junk);

-        if (wasRemoved != null)

-          wasRemoved.Enqueue(item);

-      }

-      if (wasRemoved != null)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection below a supplied threshold.

-    /// </summary>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    [Tested]

-    public void RemoveRangeTo(T hi)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int count = CountTo(hi);

-

-      if (count == 0)

-        return;

-

-      stackcheck();

-      CircularQueue<T> wasRemoved = (ActiveEvents & EventTypeEnum.Removed) != 0 ? new CircularQueue<T>() : null;

-

-      for (int i = 0; i < count; i++)

-      {

-        T item = deleteMin();

-        if (wasRemoved != null)

-          wasRemoved.Enqueue(item);

-      }

-      if (wasRemoved != null)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IPersistent<T> Members

-#if NCP

-    int maxsnapid { get { return snapList == null ? -1 : findLastLiveSnapShot(); } }

-

-    int findLastLiveSnapShot()

-    {

-      if (snapList == null)

-        return -1;

-      SnapRef lastLiveSnapRef = snapList.Prev;

-      object _snapshot = null;

-      while (lastLiveSnapRef != null && (_snapshot = lastLiveSnapRef.Tree.Target) == null)

-        lastLiveSnapRef = lastLiveSnapRef.Prev;

-      if (lastLiveSnapRef == null)

-      {

-        snapList = null;

-        return -1;

-      }

-      if (snapList.Prev != lastLiveSnapRef)

-      {

-        snapList.Prev = lastLiveSnapRef;

-        lastLiveSnapRef.Next = snapList;

-      }

-      return ((TreeBag<T>)_snapshot).generation;

-    }

-

-    [Serializable]

-    class SnapRef

-    {

-      public SnapRef Prev, Next;

-      public WeakReference Tree;

-      public SnapRef(TreeBag<T> tree) { Tree = new WeakReference(tree); }

-      public void Dispose()

-      {

-        Next.Prev = Prev;

-        if (Prev != null)

-          Prev.Next = Next;

-        Next = Prev = null;

-      }

-    }

-#endif

-

-    /// <summary>

-    /// If this tree is a snapshot, remove registration in base tree

-    /// </summary>

-    [Tested]

-    public void Dispose()

-    {

-#if NCP

-      if (!isValid)

-        return;

-      if (isSnapShot)

-      {

-        snapList.Dispose();

-        snapDispose();

-      }

-      else

-      {

-        if (snapList != null)

-        {

-          SnapRef someSnapRef = snapList.Prev;

-          while (someSnapRef != null)

-          {

-            TreeBag<T> lastsnap;

-            if ((lastsnap = someSnapRef.Tree.Target as TreeBag<T>) != null)

-              lastsnap.snapDispose();

-            someSnapRef = someSnapRef.Prev;

-          }

-        }

-        snapList = null;

-        Clear();

-      }

-#else

-      Clear();

-#endif

-    }

-

-    private void snapDispose()

-    {

-      root = null;

-      dirs = null;

-      path = null;

-      comparer = null;

-      isValid = false;

-      snapList = null;

-    }

-

-    /// <summary>

-    /// Make a (read-only) snapshot of this collection.

-    /// </summary>

-    /// <returns>The snapshot.</returns>

-    [Tested]

-    public ISorted<T> Snapshot()

-    {

-#if NCP

-      if (isSnapShot)

-        throw new InvalidOperationException("Cannot snapshot a snapshot");

-

-      TreeBag<T> res = (TreeBag<T>)MemberwiseClone();

-      SnapRef newSnapRef = new SnapRef(res);

-      res.isReadOnly = true;

-      res.isSnapShot = true;

-      res.snapList = newSnapRef;

-

-      findLastLiveSnapShot();

-      if (snapList == null)

-        snapList = new SnapRef(this);

-      SnapRef lastLiveSnapRef = snapList.Prev;

-

-      newSnapRef.Prev = lastLiveSnapRef;

-      if (lastLiveSnapRef != null)

-        lastLiveSnapRef.Next = newSnapRef;

-      newSnapRef.Next = snapList;

-      snapList.Prev = newSnapRef;

-

-      generation++;

-

-      return res;

-#endif

-    }

-

-    #endregion

-

-    #region TreeBag.Range nested class

-

-    internal class Range : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      //We actually need exclusive upper and lower bounds, and flags to 

-      //indicate whether the bound is present (we canot rely on default(T))

-      private int stamp, size;

-

-      private TreeBag<T> basis;

-

-      private T lowend, highend;

-

-      private bool haslowend, hashighend;

-

-      EnumerationDirection direction;

-

-

-      [Tested]

-      public Range(TreeBag<T> basis, bool haslowend, T lowend, bool hashighend, T highend, EnumerationDirection direction)

-      {

-        this.basis = basis;

-        stamp = basis.stamp;

-

-        //lowind will be const; should we cache highind?

-        this.lowend = lowend; //Inclusive

-        this.highend = highend;//Exclusive

-        this.haslowend = haslowend;

-        this.hashighend = hashighend;

-        this.direction = direction;

-        if (!basis.isSnapShot)

-          size = haslowend ?

-              (hashighend ? basis.CountFromTo(lowend, highend) : basis.CountFrom(lowend)) :

-              (hashighend ? basis.CountTo(highend) : basis.Count);

-      }

-

-      #region IEnumerable<T> Members

-

-

-      #region TreeBag.Range.Enumerator nested class

-

-      internal class Enumerator : SCG.IEnumerator<T>

-      {

-        #region Private Fields

-        private bool valid = false, ready = true;

-

-        private SCG.IComparer<T> comparer;

-

-        private T current;

-#if BAG

-        int togo;

-#endif

-

-        private Node cursor;

-

-        private Node[] path; // stack of nodes

-

-        private int level = 0;

-

-        private Range range;

-

-        private bool forwards;

-

-        #endregion

-        [Tested]

-        public Enumerator(Range range)

-        {

-          comparer = range.basis.comparer;

-          path = new Node[2 * range.basis.blackdepth];

-          this.range = range;

-          forwards = range.direction == EnumerationDirection.Forwards;

-          cursor = new Node();

-          if (forwards)

-            cursor.right = range.basis.root;

-          else

-            cursor.left = range.basis.root;

-          range.basis.modifycheck(range.stamp);

-        }

-

-

-        int compare(T i1, T i2) { return comparer.Compare(i1, i2); }

-

-

-        /// <summary>

-        /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-        /// </summary>

-        /// <value>The current value of the enumerator.</value>

-        [Tested]

-        public T Current

-        {

-          [Tested]

-          get

-          {

-            if (valid)

-              return current;

-            else

-              throw new InvalidOperationException();

-          }

-        }

-

-

-        //Maintain a stack of nodes that are roots of

-        //subtrees not completely exported yet. Invariant:

-        //The stack nodes together with their right subtrees

-        //consists of exactly the items we have not passed

-        //yet (the top of the stack holds current item).

-        /// <summary>

-        /// Move enumerator to next item in tree, or the first item if

-        /// this is the first call to MoveNext. 

-        /// <exception cref="CollectionModifiedException"/> if underlying tree was modified.

-        /// </summary>

-        /// <returns>True if enumerator is valid now</returns>

-        [Tested]

-        public bool MoveNext()

-        {

-          range.basis.modifycheck(range.stamp);

-          if (!ready)

-            return false;

-#if BAG

-          if (--togo > 0)

-            return true;

-#endif

-          if (forwards)

-          {

-            if (!valid && range.haslowend)

-            {

-              cursor = cursor.right;

-              while (cursor != null)

-              {

-                int comp = compare(cursor.item, range.lowend);

-

-                if (comp > 0)

-                {

-                  path[level++] = cursor;

-#if NCP

-                  cursor = range.basis.left(cursor);

-#else

-									cursor = cursor.left;

-#endif

-                }

-                else if (comp < 0)

-                {

-#if NCP

-                  cursor = range.basis.right(cursor);

-#else

-									cursor = cursor.right;

-#endif

-                }

-                else

-                {

-                  path[level] = cursor;

-                  break;

-                }

-              }

-

-              if (cursor == null)

-              {

-                if (level == 0)

-                  return valid = ready = false;

-                else

-                  cursor = path[--level];

-              }

-            }

-#if NCP

-            else if (range.basis.right(cursor) != null)

-            {

-              path[level] = cursor = range.basis.right(cursor);

-

-              Node next = range.basis.left(cursor);

-

-              while (next != null)

-              {

-                path[++level] = cursor = next;

-                next = range.basis.left(cursor);

-              }

-            }

-#else

-						else if (cursor.right != null)

-						{

-							path[level] = cursor = cursor.right;

-							while (cursor.left != null)

-								path[++level] = cursor = cursor.left;

-						}

-#endif

-            else if (level == 0)

-              return valid = ready = false;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-            if (range.hashighend && compare(current, range.highend) >= 0)

-              return valid = ready = false;

-

-#if BAG

-            togo = cursor.items;

-#endif

-            return valid = true;

-          }

-          else

-          {

-            if (!valid && range.hashighend)

-            {

-              cursor = cursor.left;

-              while (cursor != null)

-              {

-                int comp = compare(cursor.item, range.highend);

-

-                if (comp < 0)

-                {

-                  path[level++] = cursor;

-#if NCP

-                  cursor = range.basis.right(cursor);

-#else

-									cursor = cursor.right;

-#endif

-                }

-                else

-                {

-#if NCP

-                  cursor = range.basis.left(cursor);

-#else

-									cursor = cursor.left;

-#endif

-                }

-              }

-

-              if (cursor == null)

-              {

-                if (level == 0)

-                  return valid = ready = false;

-                else

-                  cursor = path[--level];

-              }

-            }

-#if NCP

-            else if (range.basis.left(cursor) != null)

-            {

-              path[level] = cursor = range.basis.left(cursor);

-

-              Node next = range.basis.right(cursor);

-

-              while (next != null)

-              {

-                path[++level] = cursor = next;

-                next = range.basis.right(cursor);

-              }

-            }

-#else

-						else if (cursor.left != null)

-						{

-							path[level] = cursor = cursor.left;

-							while (cursor.right != null)

-								path[++level] = cursor = cursor.right;

-						}

-#endif

-            else if (level == 0)

-              return valid = ready = false;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-            if (range.haslowend && compare(current, range.lowend) < 0)

-              return valid = ready = false;

-

-#if BAG

-            togo = cursor.items;

-#endif

-            return valid = true;

-          }

-        }

-

-

-        [Tested]

-        public void Dispose()

-        {

-          comparer = null;

-          current = default(T);

-          cursor = null;

-          path = null;

-          range = null;

-        }

-

-        #region IEnumerator Members

-

-        object System.Collections.IEnumerator.Current

-        {

-          get { return Current; }

-        }

-

-        bool System.Collections.IEnumerator.MoveNext()

-        {

-          return MoveNext();

-        }

-

-        void System.Collections.IEnumerator.Reset()

-        {

-          throw new Exception("The method or operation is not implemented.");

-        }

-

-        #endregion

-      }

-

-      #endregion

-

-

-      public override T Choose()

-      {

-        if (size == 0) throw new NoSuchItemException();

-        return lowend;

-      }

-

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator() { return new Enumerator(this); }

-

-

-      [Tested]

-      public override EnumerationDirection Direction { [Tested]get { return direction; } }

-

-

-      #endregion

-

-      #region Utility

-

-      bool inside(T item)

-      {

-        return (!haslowend || basis.comparer.Compare(item, lowend) >= 0) && (!hashighend || basis.comparer.Compare(item, highend) < 0);

-      }

-

-

-      void checkstamp()

-      {

-        if (stamp < basis.stamp)

-          throw new CollectionModifiedException();

-      }

-

-

-      void syncstamp() { stamp = basis.stamp; }

-

-      #endregion

-

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      {

-        Range b = (Range)MemberwiseClone();

-

-        b.direction = direction == EnumerationDirection.Forwards ? EnumerationDirection.Backwards : EnumerationDirection.Forwards;

-        return b;

-      }

-

-

-      [Tested]

-      IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-

-      public override bool IsEmpty { get { return size == 0; } }

-

-      [Tested]

-      public override int Count { [Tested] get { return size; } }

-

-      //TODO: check that this is correct

-      public override Speed CountSpeed { get { return Speed.Constant; } }

-

-    }

-

-    #endregion

-

-    #region Diagnostics

-    /// <summary>

-    /// Display this node on the console, and recursively its subnodes.

-    /// </summary>

-    /// <param name="n">Node to display</param>

-    /// <param name="space">Indentation</param>

-    private void minidump(Node n, string space)

-    {

-      if (n == null)

-      {

-        //	System.Console.WriteLine(space + "null");

-      }

-      else

-      {

-        minidump(n.right, space + "  ");

-        Console.WriteLine(String.Format("{0} {4} (size={1}, items={8}, h={2}, gen={3}, id={6}){7}", space + n.item,

-#if MAINTAIN_SIZE

- n.size,

-#else

-				0,

-#endif

- 0,

-#if NCP

- n.generation,

-#endif

- n.red ? "RED" : "BLACK",

- 0,

- 0,

-#if NCP

-#if SEPARATE_EXTRA

-				n.extra == null ? "" : String.Format(" [extra: lg={0}, c={1}, i={2}]", n.extra.lastgeneration, n.extra.leftnode ? "L" : "R", n.extra.oldref == null ? "()" : "" + n.extra.oldref.item),

-#else

- n.lastgeneration == -1 ? "" : String.Format(" [extra: lg={0}, c={1}, i={2}]", n.lastgeneration, n.leftnode ? "L" : "R", n.oldref == null ? "()" : "" + n.oldref.item),

-#endif

-#else

-				"",

-#endif

-#if BAG

- n.items

-#else

- 1

-#endif

-));

-        minidump(n.left, space + "  ");

-      }

-    }

-

-

-    /// <summary>

-    /// Print the tree structure to the console stdout.

-    /// </summary>

-    [Tested(via = "Sawtooth")]

-    public void dump() { dump(""); }

-

-

-    /// <summary>

-    /// Print the tree structure to the console stdout.

-    /// </summary>

-    [Tested(via = "Sawtooth")]

-    public void dump(string msg)

-    {

-      Console.WriteLine(String.Format(">>>>>>>>>>>>>>>>>>> dump {0} (count={1}, blackdepth={2}, depth={3}, gen={4})", msg, size, blackdepth,

-      0

-      ,

-#if NCP

- generation

-#endif

-));

-      minidump(root, "");

-      check("", Console.Out); Console.WriteLine("<<<<<<<<<<<<<<<<<<<");

-    }

-

-

-    /// <summary>

-    /// Display this tree on the console.

-    /// </summary>

-    /// <param name="msg">Identifying string of this call to dump</param>

-    /// <param name="err">Extra (error)message to include</param>

-    void dump(string msg, string err)

-    {

-      Console.WriteLine(String.Format(">>>>>>>>>>>>>>>>>>> dump {0} (count={1}, blackdepth={2}, depth={3}, gen={4})", msg, size, blackdepth,

-      0

-      ,

-#if NCP

- generation

-#endif

-));

-      minidump(root, ""); Console.Write(err);

-      Console.WriteLine("<<<<<<<<<<<<<<<<<<<");

-    }

-

-

-    /// <summary>

-    /// Print warning m on o if b is false.

-    /// </summary>

-    /// <param name="b">Condition that should hold</param>

-    /// <param name="n">Place (used for id display)</param>

-    /// <param name="m">Message</param>

-    /// <param name="o">Output stream</param>

-    /// <returns>b</returns>

-    bool massert(bool b, Node n, string m, System.IO.TextWriter o)

-    {

-      if (!b) o.WriteLine("*** Node (item={0}, id={1}): {2}", n.item,

-        0

-        , m);

-

-      return b;

-    }

-

-

-    bool rbminicheck(Node n, bool redp, System.IO.TextWriter o, out T min, out T max, out int blackheight, int maxgen)

-    {//Red-Black invariant

-      bool res = true;

-

-      res = massert(!(n.red && redp), n, "RED parent of RED node", o) && res;

-      res = massert(n.left == null || n.right != null || n.left.red, n, "Left child black, but right child empty", o) && res;

-      res = massert(n.right == null || n.left != null || n.right.red, n, "Right child black, but left child empty", o) && res;

-#if BAG

-      bool sb = n.size == (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + n.items;

-

-      res = massert(sb, n, "Bad size", o) && res;

-#elif MAINTAIN_SIZE

-      bool sb = n.size == (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + 1;

-

-      res = massert(sb, n, "Bad size", o) && res;

-#endif

-      min = max = n.item;

-

-      T otherext;

-      int lbh = 0, rbh = 0;

-

-      if (n.left != null)

-      {

-        res = rbminicheck(n.left, n.red, o, out min, out otherext, out lbh, generation) && res;

-        res = massert(comparer.Compare(n.item, otherext) > 0, n, "Value not > all left children", o) && res;

-      }

-

-      if (n.right != null)

-      {

-        res = rbminicheck(n.right, n.red, o, out otherext, out max, out rbh, generation) && res;

-        res = massert(comparer.Compare(n.item, otherext) < 0, n, "Value not < all right children", o) && res;

-      }

-

-      res = massert(rbh == lbh, n, "Different blackheights of children", o) && res;

-      blackheight = n.red ? rbh : rbh + 1;

-      return res;

-    }

-

-

-

-

-#if NCP

-

-    bool rbminisnapcheck(Node n, System.IO.TextWriter o, out int size, out T min, out T max)

-    {

-      bool res = true;

-

-      min = max = n.item;

-

-      int lsz = 0, rsz = 0;

-      T otherext;

-#if SEPARATE_EXTRA

-			Node.Extra extra = n.extra;

-			Node child = (extra != null && extra.lastgeneration >= treegen && extra.leftnode) ? extra.oldref : n.left;

-#else

-      Node child = (n.lastgeneration >= generation && n.leftnode) ? n.oldref : n.left;

-#endif

-      if (child != null)

-      {

-        res = rbminisnapcheck(child, o, out lsz, out min, out otherext) && res;

-        res = massert(comparer.Compare(n.item, otherext) > 0, n, "Value not > all left children", o) && res;

-      }

-

-#if SEPARATE_EXTRA

-			child = (extra != null && extra.lastgeneration >= treegen && !extra.leftnode) ? extra.oldref : n.right;

-#else

-      child = (n.lastgeneration >= generation && !n.leftnode) ? n.oldref : n.right;

-#endif

-      if (child != null)

-      {

-        res = rbminisnapcheck(child, o, out rsz, out otherext, out max) && res;

-        res = massert(comparer.Compare(n.item, otherext) < 0, n, "Value not < all right children", o) && res;

-      }

-#if BAG

-      size = n.items + lsz + rsz;

-#else

-      size = 1 + lsz + rsz;

-#endif

-      return res;

-    }

-#endif

-

-    /// <summary>

-    /// Checks red-black invariant. Dumps tree to console if bad

-    /// </summary>

-    /// <param name="name">Title of dump</param>

-    /// <returns>false if invariant violation</returns>

-    [Tested(via = "Sawtooth")]

-    public bool Check(string name)

-    {

-      System.Text.StringBuilder e = new System.Text.StringBuilder();

-      System.IO.TextWriter o = new System.IO.StringWriter(e);

-

-      if (!check(name, o))

-        return true;

-      else

-      {

-        dump(name, e.ToString());

-        return false;

-      }

-    }

-

-

-    /// <summary>

-    /// Checks red-black invariant. Dumps tree to console if bad

-    /// </summary>

-    /// <returns>false if invariant violation</returns>

-    [Tested]

-    public bool Check()

-    {

-      //return check("", System.IO.TextWriter.Null);

-      //Console.WriteLine("bamse");

-      if (!isValid)

-        return true;

-      return Check("-");

-    }

-

-

-    bool check(string msg, System.IO.TextWriter o)

-    {

-      if (root != null)

-      {

-        T max, min;

-        int blackheight;

-#if NCP

-        if (isSnapShot)

-        {

-          //Console.WriteLine("Im'a snapshot");

-          int thesize;

-          bool rv = rbminisnapcheck(root, o, out thesize, out min, out max);

-

-          rv = massert(size == thesize, root, "bad snapshot size", o) && rv;

-          return !rv;

-        }

-#endif

-        bool res = rbminicheck(root, false, o, out min, out max, out blackheight, generation);

-        res = massert(blackheight == blackdepth, root, "bad blackh/d", o) && res;

-        res = massert(!root.red, root, "root is red", o) && res;

-#if MAINTAIN_SIZE

-        res = massert(root.size == size, root, "count!=root.size", o) && res;

-#endif

-        return !res;

-      }

-      else

-        return false;

-    }

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this TreeBag.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      TreeBag<T> clone = new TreeBag<T>(comparer, EqualityComparer);

-      //TODO: make sure the TreeBag AddSorted copies tree bags smartly!!!

-      clone.AddSorted(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-}

-

-
-#endif
diff --git a/mcs/class/Mono.C5/C5/trees/RedBlackTreeDictionary.cs b/mcs/class/Mono.C5/C5/trees/RedBlackTreeDictionary.cs
deleted file mode 100644
index be277179687..00000000000
--- a/mcs/class/Mono.C5/C5/trees/RedBlackTreeDictionary.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using SCG = System.Collections.Generic;

-

-namespace C5

-{

-  /// <summary>

-  /// A sorted generic dictionary based on a red-black tree set.

-  /// </summary>

-  public class TreeDictionary<K, V> : SortedDictionaryBase<K, V>, IDictionary<K, V>, ISortedDictionary<K, V>

-  {

-

-    #region Constructors

-

-    /// <summary>

-    /// Create a red-black tree dictionary using the natural comparer for keys.

-    /// <exception cref="ArgumentException"/> if the key type K is not comparable.

-    /// </summary>

-    public TreeDictionary() : this(Comparer<K>.Default, EqualityComparer<K>.Default) { }

-

-    /// <summary>

-    /// Create a red-black tree dictionary using an external comparer for keys.

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    public TreeDictionary(SCG.IComparer<K> comparer) : this(comparer, new ComparerZeroHashCodeEqualityComparer<K>(comparer)) { }

-

-    TreeDictionary(SCG.IComparer<K> comparer, SCG.IEqualityComparer<K> equalityComparer) : base(comparer,equalityComparer)

-    {

-      pairs = sortedpairs = new TreeSet<KeyValuePair<K, V>>(new KeyValuePairComparer<K, V>(comparer));

-    }

-

-    #endregion

-

-    //TODO: put in interface

-    /// <summary>

-    /// Make a snapshot of the current state of this dictionary

-    /// </summary>

-    /// <returns>The snapshot</returns>

-    [Tested]

-    public SCG.IEnumerable<KeyValuePair<K, V>> Snapshot()

-    {

-      TreeDictionary<K, V> res = (TreeDictionary<K, V>)MemberwiseClone();

-

-      res.pairs = (TreeSet<KeyValuePair<K, V>>)((TreeSet<KeyValuePair<K, V>>)sortedpairs).Snapshot();

-      return res;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override object Clone()

-    {

-      TreeDictionary<K, V> clone = new TreeDictionary<K, V>(Comparer, EqualityComparer);

-      clone.sortedpairs.AddSorted(sortedpairs);

-      return clone;

-    }

-

-  }

-}
-#endif
diff --git a/mcs/class/Mono.C5/C5/trees/RedBlackTreeSet.cs b/mcs/class/Mono.C5/C5/trees/RedBlackTreeSet.cs
deleted file mode 100644
index 2275011d005..00000000000
--- a/mcs/class/Mono.C5/C5/trees/RedBlackTreeSet.cs
+++ /dev/null
@@ -1,4493 +0,0 @@
-#if NET_2_0
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-#define MAINTAIN_SIZE

-#define BAGnot

-#define NCP

-

-#if BAG

-#if !MAINTAIN_SIZE

-#error  BAG defined without MAINTAIN_SIZE!

-#endif

-#endif

-

-

-using System;

-using SCG = System.Collections.Generic;

-

-// NOTE NOTE NOTE NOTE

-// This source file is used to produce both TreeSet<T> and TreeBag<T>

-// It should be copied to a file called TreeBag.cs in which all code mentions of 

-// TreeSet is changed to TreeBag and the preprocessor symbol BAG is defined.

-// NOTE: there may be problems with documentation comments.

-

-namespace C5

-{

-#if BAG

-  /// <summary>

-  /// An implementation of Red-Black trees as an indexed, sorted collection with bag semantics,

-  /// cf. <a href="litterature.htm#CLRS">CLRS</a>. (<see cref="T:C5.TreeSet`1"/> for an 

-  /// implementation with set semantics).

-  /// <br/>

-  /// The comparer (sorting order) may be either natural, because the item type is comparable 

-  /// (generic: <see cref="T:C5.IComparable`1"/> or non-generic: System.IComparable) or it can

-  /// be external and supplied by the user in the constructor.

-  /// <br/>

-  /// Each distinct item is only kept in one place in the tree - together with the number

-  /// of times it is a member of the bag. Thus, if two items that are equal according

-  /// </summary>

-#else

-  /// <summary>

-  /// An implementation of Red-Black trees as an indexed, sorted collection with set semantics,

-  /// cf. <a href="litterature.htm#CLRS">CLRS</a>. <see cref="T:C5.TreeBag`1"/> for a version 

-  /// with bag semantics. <see cref="T:C5.TreeDictionary`2"/> for a sorted dictionary 

-  /// based on this tree implementation.

-  /// <i>

-  /// The comparer (sorting order) may be either natural, because the item type is comparable 

-  /// (generic: <see cref="T:C5.IComparable`1"/> or non-generic: System.IComparable) or it can

-  /// be external and supplied by the user in the constructor.</i>

-  ///

-  /// <i>TODO: describe performance here</i>

-  /// <i>TODO: discuss persistence and its useful usage modes. Warn about the space

-  /// leak possible with other usage modes.</i>

-  /// </summary>

-#endif

-  [Serializable]

-  public class TreeSet<T> : SequencedBase<T>, IIndexedSorted<T>, IPersistentSorted<T>

-  {

-    #region Fields

-

-    SCG.IComparer<T> comparer;

-

-    Node root;

-

-    //TODO: wonder if we should remove that

-    int blackdepth = 0;

-

-    //We double these stacks for the iterative add and remove on demand

-    //TODO: refactor dirs[] into bool fields on Node (?)

-    private int[] dirs = new int[2];

-

-    private Node[] path = new Node[2];

-#if NCP

-    //TODO: refactor into separate class

-    bool isSnapShot = false;

-

-    int generation;

-

-    bool isValid = true;

-

-    SnapRef snapList;

-#endif

-    #endregion

-

-    #region Events

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public override EventTypeEnum ListenableEvents { get { return EventTypeEnum.Basic; } }

-

-    #endregion

-    #region Util

-

-    /// <summary>

-    /// Fetch the left child of n taking node-copying persistence into

-    /// account if relevant. 

-    /// </summary>

-    /// <param name="n"></param>

-    /// <returns></returns>

-    private Node left(Node n)

-    {

-#if NCP

-      if (isSnapShot)

-      {

-#if SEPARATE_EXTRA

-				Node.Extra e = n.extra;

-

-				if (e != null && e.lastgeneration >= treegen && e.leftnode)

-					return e.oldref;

-#else

-        if (n.lastgeneration >= generation && n.leftnode)

-          return n.oldref;

-#endif

-      }

-#endif

-      return n.left;

-    }

-

-

-    private Node right(Node n)

-    {

-#if NCP

-      if (isSnapShot)

-      {

-#if SEPARATE_EXTRA

-				Node.Extra e = n.extra;

-

-				if (e != null && e.lastgeneration >= treegen && !e.leftnode)

-					return e.oldref;

-#else

-        if (n.lastgeneration >= generation && !n.leftnode)

-          return n.oldref;

-#endif

-      }

-#endif

-      return n.right;

-    }

-

-

-    //This method should be called by methods that use the internal 

-    //traversal stack, unless certain that there is room enough

-    private void stackcheck()

-    {

-      while (dirs.Length < 2 * blackdepth)

-      {

-        dirs = new int[2 * dirs.Length];

-        path = new Node[2 * dirs.Length];

-      }

-    }

-

-    #endregion

-

-    #region Node nested class

-

-

-    /// <summary>

-    /// The type of node in a Red-Black binary tree

-    /// </summary>

-    [Serializable]

-    class Node

-    {

-      public bool red = true;

-

-      public T item;

-

-      public Node left;

-

-      public Node right;

-

-#if MAINTAIN_SIZE

-      public int size = 1;

-#endif

-

-#if BAG

-      public int items = 1;

-#endif

-

-#if NCP

-      //TODO: move everything into (separate) Extra

-      public int generation;

-#if SEPARATE_EXTRA

-			internal class Extra

-			{

-				public int lastgeneration;

-

-				public Node oldref;

-

-				public bool leftnode;

-

-				//public Node next;

-			}

-

-			public Extra extra;

-

-#else

-      public int lastgeneration = -1;

-

-      public Node oldref;

-

-      public bool leftnode;

-#endif

-

-      /// <summary>

-      /// Update a child pointer

-      /// </summary>

-      /// <param name="cursor"></param>

-      /// <param name="leftnode"></param>

-      /// <param name="child"></param>

-      /// <param name="maxsnapid"></param>

-      /// <param name="generation"></param>

-      /// <returns>True if node was *copied*</returns>

-      internal static bool update(ref Node cursor, bool leftnode, Node child, int maxsnapid, int generation)

-      {

-        Node oldref = leftnode ? cursor.left : cursor.right;

-

-        if (child == oldref)

-          return false;

-

-        bool retval = false;

-

-        if (cursor.generation <= maxsnapid)

-        {

-#if SEPARATE_EXTRA

-					if (cursor.extra == null)

-					{

-						Extra extra = cursor.extra = new Extra();	

-

-						extra.leftnode = leftnode;

-						extra.lastgeneration = maxsnapid;

-						extra.oldref = oldref;

-					}

-					else if (cursor.extra.leftnode != leftnode || cursor.extra.lastgeneration < maxsnapid)

-#else

-          if (cursor.lastgeneration == -1)

-          {

-            cursor.leftnode = leftnode;

-            cursor.lastgeneration = maxsnapid;

-            cursor.oldref = oldref;

-          }

-          else if (cursor.leftnode != leftnode || cursor.lastgeneration < maxsnapid)

-#endif

-          {

-            CopyNode(ref cursor, maxsnapid, generation);

-            retval = true;

-          }

-        }

-

-        if (leftnode)

-          cursor.left = child;

-        else

-          cursor.right = child;

-

-        return retval;

-      }

-

-

-      //If cursor.extra.lastgeneration==maxsnapid, the extra pointer will 

-      //always be used in the old copy of cursor. Therefore, after 

-      //making the clone, we should update the old copy by restoring

-      //the child pointer and setting extra to null.

-      //OTOH then we cannot clean up unused Extra objects unless we link

-      //them together in a doubly linked list.

-      public static bool CopyNode(ref Node cursor, int maxsnapid, int generation)

-      {

-        if (cursor.generation <= maxsnapid)

-        {

-          cursor = (Node)(cursor.MemberwiseClone());

-          cursor.generation = generation;

-#if SEPARATE_EXTRA

-					cursor.extra = null;

-#else

-          cursor.lastgeneration = -1;

-#endif

-          return true;

-        }

-        else

-          return false;

-      }

-

-#endif

-    }

-

-    #endregion

-

-    #region Constructors

-

-    /// <summary>

-    /// Create a red-black tree collection with natural comparer and item equalityComparer.

-    /// We assume that if <code>T</code> is comparable, its default equalityComparer 

-    /// will be compatible with the comparer.

-    /// </summary>

-    /// <exception cref="NotComparableException">If <code>T</code> is not comparable.

-    /// </exception>

-    public TreeSet() : this(Comparer<T>.Default, EqualityComparer<T>.Default) { }

-

-

-    /// <summary>

-    /// Create a red-black tree collection with an external comparer. 

-    /// <para>The itemequalityComparer will be a compatible 

-    /// <see cref="T:C5.ComparerZeroHashCodeEqualityComparer`1"/> since the 

-    /// default equalityComparer for T (<see cref="P:C5.EqualityComparer`1.Default"/>)

-    /// is unlikely to be compatible with the external comparer. This makes the

-    /// tree inadequate for use as item in a collection of unsequenced or sequenced sets or bags

-    /// (<see cref="T:C5.ICollection`1"/> and <see cref="T:C5.ISequenced`1"/>)

-    /// </para>

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    public TreeSet(SCG.IComparer<T> comparer) : this(comparer, new ComparerZeroHashCodeEqualityComparer<T>(comparer)) { }

-

-    /// <summary>

-    /// Create a red-black tree collection with an external comparer and an external

-    /// item equalityComparer, assumed consistent.

-    /// </summary>

-    /// <param name="comparer">The external comparer</param>

-    /// <param name="equalityComparer">The external item equalityComparer</param>

-    public TreeSet(SCG.IComparer<T> comparer, SCG.IEqualityComparer<T> equalityComparer)

-      : base(equalityComparer)

-    {

-      if (comparer == null)

-        throw new NullReferenceException("Item comparer cannot be null");

-      this.comparer = comparer;

-    }

-

-    #endregion

-

-    #region TreeSet.Enumerator nested class

-

-    /// <summary>

-    /// An enumerator for a red-black tree collection. Based on an explicit stack

-    /// of subtrees waiting to be enumerated. Currently only used for the tree set 

-    /// enumerators (tree bag enumerators use an iterator block based enumerator).

-    /// </summary>

-    internal class Enumerator : SCG.IEnumerator<T>

-    {

-      #region Private Fields

-      TreeSet<T> tree;

-

-      bool valid = false;

-

-      int stamp;

-

-      T current;

-

-      Node cursor;

-

-      Node[] path; // stack of nodes

-

-      int level = 0;

-      #endregion

-      /// <summary>

-      /// Create a tree enumerator

-      /// </summary>

-      /// <param name="tree">The red-black tree to enumerate</param>

-      public Enumerator(TreeSet<T> tree)

-      {

-        this.tree = tree;

-        stamp = tree.stamp;

-        path = new Node[2 * tree.blackdepth];

-        cursor = new Node();

-        cursor.right = tree.root;

-      }

-

-

-      /// <summary>

-      /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-      /// </summary>

-      /// <value>The current item of the enumerator.</value>

-      [Tested]

-      public T Current

-      {

-        [Tested]

-        get

-        {

-          if (valid)

-            return current;

-          else

-            throw new InvalidOperationException();

-        }

-      }

-

-

-      //Maintain a stack of nodes that are roots of

-      //subtrees not completely exported yet. Invariant:

-      //The stack nodes together with their right subtrees

-      //consists of exactly the items we have not passed

-      //yet (the top of the stack holds current item).

-      /// <summary>

-      /// Move enumerator to next item in tree, or the first item if

-      /// this is the first call to MoveNext. 

-      /// <exception cref="CollectionModifiedException"/> if underlying tree was modified.

-      /// </summary>

-      /// <returns>True if enumerator is valid now</returns>

-      [Tested]

-      public bool MoveNext()

-      {

-        tree.modifycheck(stamp);

-        if (cursor.right != null)

-        {

-          path[level] = cursor = cursor.right;

-          while (cursor.left != null)

-            path[++level] = cursor = cursor.left;

-        }

-        else if (level == 0)

-          return valid = false;

-        else

-          cursor = path[--level];

-

-        current = cursor.item;

-        return valid = true;

-      }

-

-

-      #region IDisposable Members for Enumerator

-

-      bool disposed;

-

-

-      /// <summary>

-      /// Call Dispose(true) and then suppress finalization of this enumerator.

-      /// </summary>

-      [Tested]

-      public void Dispose()

-      {

-        Dispose(true);

-        GC.SuppressFinalize(this);

-      }

-

-

-      /// <summary>

-      /// Remove the internal data (notably the stack array).

-      /// </summary>

-      /// <param name="disposing">True if called from Dispose(),

-      /// false if called from the finalizer</param>

-      protected virtual void Dispose(bool disposing)

-      {

-        if (!disposed)

-        {

-          if (disposing)

-          {

-          }

-

-          current = default(T);

-          cursor = null;

-          path = null;

-          disposed = true;

-        }

-      }

-

-

-      /// <summary>

-      /// Finalizer for enumerator

-      /// </summary>

-      ~Enumerator()

-      {

-        Dispose(false);

-      }

-      #endregion

-

-

-      #region IEnumerator Members

-

-      object System.Collections.IEnumerator.Current

-      {

-        get { return Current; }

-      }

-

-      bool System.Collections.IEnumerator.MoveNext()

-      {

-        return MoveNext();

-      }

-

-      void System.Collections.IEnumerator.Reset()

-      {

-        throw new Exception("The method or operation is not implemented.");

-      }

-

-      #endregion

-    }

-#if NCP

-    /// <summary>

-    /// An enumerator for a snapshot of a node copy persistent red-black tree

-    /// collection.

-    /// </summary>

-    internal class SnapEnumerator : SCG.IEnumerator<T>

-    {

-      #region Private Fields

-      TreeSet<T> tree;

-

-      bool valid = false;

-

-      int stamp;

-#if BAG

-      int togo;

-#endif

-

-      T current;

-

-      Node cursor;

-

-      Node[] path; // stack of nodes

-

-      int level;

-      #endregion

-

-      /// <summary>

-      /// Creta an enumerator for a snapshot of a node copy persistent red-black tree

-      /// collection

-      /// </summary>

-      /// <param name="tree">The snapshot</param>

-      public SnapEnumerator(TreeSet<T> tree)

-      {

-        this.tree = tree;

-        stamp = tree.stamp;

-        path = new Node[2 * tree.blackdepth];

-        cursor = new Node();

-        cursor.right = tree.root;

-      }

-

-

-      #region SCG.IEnumerator<T> Members

-

-      /// <summary>

-      /// Move enumerator to next item in tree, or the first item if

-      /// this is the first call to MoveNext. 

-      /// <exception cref="CollectionModifiedException"/> if underlying tree was modified.

-      /// </summary>

-      /// <returns>True if enumerator is valid now</returns>

-      [Tested]

-      public bool MoveNext()

-      {

-        tree.modifycheck(stamp);//???

-

-#if BAG

-        if (--togo > 0)

-          return true;

-#endif

-        Node next = tree.right(cursor);

-

-        if (next != null)

-        {

-          path[level] = cursor = next;

-          next = tree.left(cursor);

-          while (next != null)

-          {

-            path[++level] = cursor = next;

-            next = tree.left(cursor);

-          }

-        }

-        else if (level == 0)

-          return valid = false;

-        else

-          cursor = path[--level];

-

-#if BAG

-        togo = cursor.items;

-#endif

-        current = cursor.item;

-        return valid = true;

-      }

-

-

-      /// <summary>

-      /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-      /// </summary>

-      /// <value>The current value of the enumerator.</value>

-      [Tested]

-      public T Current

-      {

-        [Tested]

-        get

-        {

-          if (valid)

-            return current;

-          else

-            throw new InvalidOperationException();

-        }

-      }

-

-      #endregion

-

-      #region IDisposable Members

-

-      [Tested]

-      void System.IDisposable.Dispose()

-      {

-        tree = null;

-        valid = false;

-        current = default(T);

-        cursor = null;

-        path = null;

-      }

-

-      #endregion

-

-      #region IEnumerator Members

-

-      object System.Collections.IEnumerator.Current

-      {

-        get { return Current; }

-      }

-

-      bool System.Collections.IEnumerator.MoveNext()

-      {

-        return MoveNext();

-      }

-

-      void System.Collections.IEnumerator.Reset()

-      {

-        throw new Exception("The method or operation is not implemented.");

-      }

-

-      #endregion

-    }

-#endif

-    #endregion

-

-    #region IEnumerable<T> Members

-

-    private SCG.IEnumerator<T> getEnumerator(Node node, int origstamp)

-    {

-      if (node == null)

-        yield break;

-

-      if (node.left != null)

-      {

-        SCG.IEnumerator<T> child = getEnumerator(node.left, origstamp);

-

-        while (child.MoveNext())

-        {

-          modifycheck(origstamp);

-          yield return child.Current;

-        }

-      }

-#if BAG

-      int togo = node.items;

-      while (togo-- > 0)

-      {

-        modifycheck(origstamp);

-        yield return node.item;

-      }

-#else

-      modifycheck(origstamp);

-      yield return node.item;

-#endif

-      if (node.right != null)

-      {

-        SCG.IEnumerator<T> child = getEnumerator(node.right, origstamp);

-

-        while (child.MoveNext())

-        {

-          modifycheck(origstamp);

-          yield return child.Current;

-        }

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <exception cref="NoSuchItemException">If tree is empty</exception>

-    /// <returns></returns>

-    [Tested]

-    public override T Choose()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-

-      if (size == 0)

-        throw new NoSuchItemException();

-      return root.item;

-    }

-

-

-    /// <summary>

-    /// Create an enumerator for this tree

-    /// </summary>

-    /// <returns>The enumerator</returns>

-    [Tested]

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if NCP

-      if (isSnapShot)

-        return new SnapEnumerator(this);

-#endif

-#if BAG

-      return getEnumerator(root, stamp);

-#else

-      return new Enumerator(this);

-#endif

-    }

-

-    #endregion

-

-    #region ISink<T> Members

-

-    /// <summary>

-    /// Add item to tree. If already there, return the found item in the second argument.

-    /// </summary>

-    /// <param name="item">Item to add</param>

-    /// <param name="founditem">item found</param>

-    /// <param name="update">whether item in node should be updated</param>

-    /// <param name="wasfound">true if found in bag, false if not found or tre is a set</param>

-    /// <returns>True if item was added</returns>

-    bool addIterative(T item, ref T founditem, bool update, out bool wasfound)

-    {

-      wasfound = false;

-      if (root == null)

-      {

-        root = new Node();

-        root.red = false;

-        blackdepth = 1;

-        root.item = item;

-#if NCP

-        root.generation = generation;

-#endif

-        return true;

-      }

-

-      stackcheck();

-

-      int level = 0;

-      Node cursor = root;

-

-      while (true)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp == 0)

-        {

-          founditem = cursor.item;

-#if BAG

-          wasfound = true;

-          bool nodeWasUpdated = true;

-#if NCP

-          Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-          if (update)

-            cursor.item = item;

-          else

-          {

-            cursor.items++;

-            cursor.size++;

-          }

-#else

-          bool nodeWasUpdated = update;

-          if (update)

-          {

-#if NCP

-            Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-            cursor.item = item;

-          }

-#endif

-

-          while (level-- > 0)

-          {

-            if (nodeWasUpdated)

-            {

-              Node kid = cursor;

-

-              cursor = path[level];

-#if NCP

-              Node.update(ref cursor, dirs[level] > 0, kid, maxsnapid, generation);

-#endif

-#if BAG

-              if (!update)

-                cursor.size++;

-#endif

-            }

-

-            path[level] = null;

-          }

-#if BAG

-          return !update;

-#else

-          if (update)

-            root = cursor;

-

-          return false;

-#endif

-        }

-

-        //else

-        Node child = comp > 0 ? cursor.left : cursor.right;

-

-        if (child == null)

-        {

-          child = new Node();

-          child.item = item;

-#if NCP

-          child.generation = generation;

-          Node.update(ref cursor, comp > 0, child, maxsnapid, generation);

-#else

-					if (comp > 0) { cursor.left = child; }

-					else { cursor.right = child; }

-#endif

-#if MAINTAIN_SIZE

-          cursor.size++;

-#endif

-          dirs[level] = comp;

-          break;

-        }

-        else

-        {

-          dirs[level] = comp;

-          path[level++] = cursor;

-          cursor = child;

-        }

-      }

-

-      //We have just added the red node child to "cursor"

-      while (cursor.red)

-      {

-        //take one step up:

-        Node child = cursor;

-

-        cursor = path[--level];

-        path[level] = null;

-#if NCP

-        Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-#if MAINTAIN_SIZE

-        cursor.size++;

-#endif

-        int comp = dirs[level];

-        Node childsibling = comp > 0 ? cursor.right : cursor.left;

-

-        if (childsibling != null && childsibling.red)

-        {

-          //Promote

-          child.red = false;

-#if NCP

-          Node.update(ref cursor, comp < 0, childsibling, maxsnapid, generation);

-#endif

-          childsibling.red = false;

-

-          //color cursor red & take one step up the tree unless at root

-          if (level == 0)

-          {

-            root = cursor;

-            blackdepth++;

-            return true;

-          }

-          else

-          {

-            cursor.red = true;

-#if NCP

-            child = cursor;

-            cursor = path[--level];

-            Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-            path[level] = null;

-#if MAINTAIN_SIZE

-            cursor.size++;

-#endif

-          }

-        }

-        else

-        {

-          //ROTATE!!!

-          int childcomp = dirs[level + 1];

-

-          cursor.red = true;

-          if (comp > 0)

-          {

-            if (childcomp > 0)

-            {//zagzag

-#if NCP

-              Node.update(ref cursor, true, child.right, maxsnapid, generation);

-              Node.update(ref child, false, cursor, maxsnapid, generation);

-#else

-							cursor.left = child.right;

-							child.right = cursor;

-#endif

-              cursor = child;

-            }

-            else

-            {//zagzig

-              Node badgrandchild = child.right;

-#if NCP

-              Node.update(ref cursor, true, badgrandchild.right, maxsnapid, generation);

-              Node.update(ref child, false, badgrandchild.left, maxsnapid, generation);

-              Node.CopyNode(ref badgrandchild, maxsnapid, generation);

-#else

-							cursor.left = badgrandchild.right;

-							child.right = badgrandchild.left;

-#endif

-              badgrandchild.left = child;

-              badgrandchild.right = cursor;

-              cursor = badgrandchild;

-            }

-          }

-          else

-          {//comp < 0

-            if (childcomp < 0)

-            {//zigzig

-#if NCP

-              Node.update(ref cursor, false, child.left, maxsnapid, generation);

-              Node.update(ref child, true, cursor, maxsnapid, generation);

-#else

-							cursor.right = child.left;

-							child.left = cursor;

-#endif

-              cursor = child;

-            }

-            else

-            {//zigzag

-              Node badgrandchild = child.left;

-#if NCP

-              Node.update(ref cursor, false, badgrandchild.left, maxsnapid, generation);

-              Node.update(ref child, true, badgrandchild.right, maxsnapid, generation);

-              Node.CopyNode(ref badgrandchild, maxsnapid, generation);

-#else

-							cursor.right = badgrandchild.left;

-							child.left = badgrandchild.right;

-#endif

-              badgrandchild.right = child;

-              badgrandchild.left = cursor;

-              cursor = badgrandchild;

-            }

-          }

-

-          cursor.red = false;

-

-#if MAINTAIN_SIZE

-          Node n;

-

-#if BAG

-          n = cursor.right;

-          cursor.size = n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + n.items;

-          n = cursor.left;

-          n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + n.items;

-          cursor.size += n.size + cursor.items;

-#else

-          n = cursor.right;

-          cursor.size = n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + 1;

-          n = cursor.left;

-          n.size = (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + 1;

-          cursor.size += n.size + 1;

-#endif

-#endif

-          if (level == 0)

-          {

-            root = cursor;

-            return true;

-          }

-          else

-          {

-            child = cursor;

-            cursor = path[--level];

-            path[level] = null;

-#if NCP

-            Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#else

-						if (dirs[level] > 0)

-							cursor.left = child;

-						else

-							cursor.right = child;

-#endif

-#if MAINTAIN_SIZE

-            cursor.size++;

-#endif

-            break;

-          }

-        }

-      }

-#if NCP

-      bool stillmore = true;

-#endif

-      while (level > 0)

-      {

-        Node child = cursor;

-

-        cursor = path[--level];

-        path[level] = null;

-#if NCP

-        if (stillmore)

-          stillmore = Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-#if MAINTAIN_SIZE

-        cursor.size++;

-#endif

-      }

-

-      root = cursor;

-      return true;

-    }

-

-

-    /// <summary>

-    /// Add an item to this collection if possible. If this collection has set

-    /// semantics, the item will be added if not already in the collection. If

-    /// bag semantics, the item will always be added.

-    /// </summary>

-    /// <param name="item">The item to add.</param>

-    /// <returns>True if item was added.</returns>

-    [Tested]

-    public bool Add(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      //Note: blackdepth of the tree is set inside addIterative

-      T jtem = default(T);

-      if (!add(item, ref jtem))

-        return false;

-      if (ActiveEvents != 0)

-        raiseForAdd(jtem);

-      return true;

-    }

-

-    private bool add(T item, ref T j)

-    {

-      bool wasFound;

-

-      if (addIterative(item, ref j, false, out wasFound))

-      {

-        size++;

-        if (!wasFound)

-          j = item;

-        return true;

-      }

-      else

-        return false;

-    }

-

-    /// <summary>

-    /// Add the elements from another collection with a more specialized item type 

-    /// to this collection. If this

-    /// collection has set semantics, only items not already in the collection

-    /// will be added.

-    /// </summary>

-    /// <typeparam name="U">The type of items to add</typeparam>

-    /// <param name="items">The items to add</param>

-    [Tested]

-    public void AddAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int c = 0;

-      T j = default(T);

-      bool tmp;

-

-      bool raiseAdded = (ActiveEvents & EventTypeEnum.Added) != 0;

-      CircularQueue<T> wasAdded = raiseAdded ? new CircularQueue<T>() : null;

-

-      foreach (T i in items)

-        if (addIterative(i, ref j, false, out tmp))

-        {

-          c++;

-          if (raiseAdded)

-            wasAdded.Enqueue(tmp ? j : i);

-        }

-      if (c == 0)

-        return;

-

-      size += c;

-      //TODO: implement a RaiseForAddAll() method

-      if (raiseAdded)

-        foreach (T item in wasAdded)

-          raiseItemsAdded(item, 1);

-      if (((ActiveEvents & EventTypeEnum.Changed) != 0))

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Add all the items from another collection with an enumeration order that 

-    /// is increasing in the items. <para>The idea is that the implementation may use

-    /// a faster algorithm to merge the two collections.</para>

-    /// <exception cref="ArgumentException"/> if the enumerated items turns out

-    /// not to be in increasing order.

-    /// </summary>

-    /// <param name="items">The collection to add.</param>

-    /// <typeparam name="U"></typeparam>

-    [Tested]

-    public void AddSorted<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (size > 0)

-        AddAll(items);

-      else

-      {

-        if (!isValid)

-          throw new ViewDisposedException("Snapshot has been disposed");

-        updatecheck();

-        addSorted(items, true, true);

-      }

-    }

-

-    #region add-sorted helpers

-

-    //Create a RB tree from x+2^h-1  (x < 2^h, h>=1) nodes taken from a

-    //singly linked list of red nodes using only the right child refs.

-    //The x nodes at depth h+1 will be red, the rest black.

-    //(h is the blackdepth of the resulting tree)

-    static Node maketreer(ref Node rest, int blackheight, int maxred, int red)

-    {

-      if (blackheight == 1)

-      {

-        Node top = rest;

-

-        rest = rest.right;

-        if (red > 0)

-        {

-          top.right = null;

-          rest.left = top;

-          top = rest;

-#if BAG

-          top.size += top.left.size;

-#elif MAINTAIN_SIZE

-          top.size = 1 + red;

-#endif

-          rest = rest.right;

-          red--;

-        }

-

-        if (red > 0)

-        {

-#if BAG

-          top.size += rest.size;

-#endif

-          top.right = rest;

-          rest = rest.right;

-          top.right.right = null;

-        }

-        else

-          top.right = null;

-

-        top.red = false;

-        return top;

-      }

-      else

-      {

-        maxred >>= 1;

-

-        int lred = red > maxred ? maxred : red;

-        Node left = maketreer(ref rest, blackheight - 1, maxred, lred);

-        Node top = rest;

-

-        rest = rest.right;

-        top.left = left;

-        top.red = false;

-        top.right = maketreer(ref rest, blackheight - 1, maxred, red - lred);

-#if BAG

-        top.size = top.items + top.left.size + top.right.size;

-#elif MAINTAIN_SIZE

-        top.size = (maxred << 1) - 1 + red;

-#endif

-        return top;

-      }

-    }

-

-

-    void addSorted<U>(SCG.IEnumerable<U> items, bool safe, bool raise) where U : T

-    {

-      SCG.IEnumerator<U> e = items.GetEnumerator(); ;

-      if (size > 0)

-        throw new InternalException("This can't happen");

-

-      if (!e.MoveNext())

-        return;

-

-      //To count theCollect 

-      Node head = new Node(), tail = head;

-      int z = 1;

-      T lastitem = tail.item = e.Current;

-#if BAG

-      int ec = 0;

-#endif

-

-      while (e.MoveNext())

-      {

-#if BAG

-        T thisitem = e.Current;

-        int comp = comparer.Compare(lastitem, thisitem);

-        if (comp > 0)

-          throw new ArgumentException("Argument not sorted");

-        if (comp == 0)

-        {

-          tail.items++;

-          ec++;

-        }

-        else

-        {

-          tail.size = tail.items;

-          z++;

-          tail.right = new Node();

-          tail = tail.right;

-          lastitem = tail.item = thisitem;

-#if NCP

-          tail.generation = generation;

-#endif

-        }

-#else

-        z++;

-        tail.right = new Node();

-        tail = tail.right;

-        tail.item = e.Current;

-        if (safe)

-        {

-          if (comparer.Compare(lastitem, tail.item) >= 0)

-            throw new ArgumentException("Argument not sorted");

-

-          lastitem = tail.item;

-        }

-#if NCP

-        tail.generation = generation;

-#endif

-#endif

-      }

-#if BAG

-      tail.size = tail.items;

-#endif

-      int blackheight = 0, red = z, maxred = 1;

-

-      while (maxred <= red)

-      {

-        red -= maxred;

-        maxred <<= 1;

-        blackheight++;

-      }

-

-      root = TreeSet<T>.maketreer(ref head, blackheight, maxred, red);

-      blackdepth = blackheight;

-      size = z;

-#if BAG

-      size += ec;

-#endif

-

-      if (raise)

-      {

-        if ((ActiveEvents & EventTypeEnum.Added) != 0)

-        {

-          CircularQueue<T> wasAdded = new CircularQueue<T>();

-          foreach (T item in this)

-            wasAdded.Enqueue(item);

-          foreach (T item in wasAdded)

-            raiseItemsAdded(item, 1);

-        }

-        if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-          raiseCollectionChanged();

-      }

-      return;

-    }

-

-    #endregion

-

-#if BAG

-    /// <summary></summary>

-    /// <value>True since this collection has bag semantics.</value>

-    [Tested]

-    public bool AllowsDuplicates { [Tested]get { return true; } }

-#else

-    /// <summary></summary>

-    /// <value>False since this tree has set semantics.</value>

-    [Tested]

-    public bool AllowsDuplicates { [Tested]get { return false; } }

-#endif

-    /// <summary>

-    /// By convention this is true for any collection with set semantics.

-    /// </summary>

-    /// <value>True if only one representative of a group of equal items 

-    /// is kept in the collection together with the total count.</value>

-    public virtual bool DuplicatesByCounting { get { return true; } }

-

-    #endregion

-

-    #region IEditableCollection<T> Members

-

-

-    /// <summary>

-    /// The value is symbolic indicating the type of asymptotic complexity

-    /// in terms of the size of this collection (worst-case or amortized as

-    /// relevant).

-    /// </summary>

-    /// <value>Speed.Log</value>

-    [Tested]

-    public Speed ContainsSpeed { [Tested]get { return Speed.Log; } }

-

-    /// <summary>

-    /// Check if this collection contains (an item equivalent to according to the

-    /// itemequalityComparer) a particular value.

-    /// </summary>

-    /// <param name="item">The value to check for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public bool Contains(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node next; int comp = 0;

-

-      next = root;

-      while (next != null)

-      {

-        comp = comparer.Compare(next.item, item);

-        if (comp == 0)

-          return true;

-

-        next = comp < 0 ? right(next) : left(next);

-      }

-

-      return false;

-    }

-

-

-    //Variant for dictionary use

-    //Will return the actual matching item in the ref argument.

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, return in the ref argument (a

-    /// binary copy of) the actual value found.

-    /// </summary>

-    /// <param name="item">The value to look for.</param>

-    /// <returns>True if the items is in this collection.</returns>

-    [Tested]

-    public bool Find(ref T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node next; int comp = 0;

-

-      next = root;

-      while (next != null)

-      {

-        comp = comparer.Compare(next.item, item);

-        if (comp == 0)

-        {

-          item = next.item;

-          return true;

-        }

-

-        next = comp < 0 ? right(next) : left(next);

-      }

-

-      return false;

-    }

-

-

-    /// <summary>

-    /// Find or add the item to the tree. If the tree does not contain

-    /// an item equivalent to this item add it, else return the exisiting

-    /// one in the ref argument. 

-    ///

-    /// </summary>

-    /// <param name="item"></param>

-    /// <returns>True if item was found</returns>

-    [Tested]

-    public bool FindOrAdd(ref T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      bool wasfound;

-

-      //Note: blackdepth of the tree is set inside addIterative

-      if (addIterative(item, ref item, false, out wasfound))

-      {

-        size++;

-        if (ActiveEvents != 0 && !wasfound)

-          raiseForAdd(item);

-        return wasfound;

-      }

-      else

-        return true;

-

-    }

-

-

-    //For dictionary use. 

-    //If found, the matching entry will be updated with the new item.

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// to with a binary copy of the supplied value. If the collection has bag semantics,

-    /// this updates all equivalent copies in

-    /// the collection.

-    /// </summary>

-    /// <param name="item">Value to update.</param>

-    /// <returns>True if the item was found and hence updated.</returns>

-    [Tested]

-    public bool Update(T item)

-    {

-      T olditem = item;

-      return Update(item, out olditem);

-    }

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// with a binary copy of the supplied value. If the collection has bag semantics,

-    /// this updates all equivalent copies in

-    /// the collection.

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool Update(T item, out T olditem)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-#if NCP

-      stackcheck();

-

-      int level = 0;

-#endif

-      Node cursor = root;

-      int comp = 0;

-

-      while (cursor != null)

-      {

-        comp = comparer.Compare(cursor.item, item);

-        if (comp == 0)

-        {

-#if NCP

-          Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-          olditem = cursor.item;

-#if BAG

-          int items = cursor.items;

-#endif

-          cursor.item = item;

-#if NCP

-          while (level > 0)

-          {

-            Node child = cursor;

-

-            cursor = path[--level];

-            path[level] = null;

-#if NCP

-            Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#else

-						if (Node.CopyNode(maxsnapid, ref cursor, generation))

-						{

-							if (dirs[level] > 0)

-								cursor.left = child;

-							else

-								cursor.right = child;

-						}

-#endif

-          }

-

-          root = cursor;

-#endif

-#if BAG

-          if (ActiveEvents != 0)

-            raiseForUpdate(item, olditem, items);

-#else

-          if (ActiveEvents != 0)

-            raiseForUpdate(item, olditem);

-#endif

-          return true;

-        }

-#if NCP

-        dirs[level] = comp;

-        path[level++] = cursor;

-#endif

-        cursor = comp < 0 ? cursor.right : cursor.left;

-      }

-

-      olditem = default(T);

-      return false;

-    }

-

-

-    /// <summary>

-    /// Check if this collection contains an item equivalent according to the

-    /// itemequalityComparer to a particular value. If so, update the item in the collection 

-    /// with a binary copy of the supplied value; else add the value to the collection. 

-    ///

-    /// <i>NOTE: the bag implementation is currently wrong! ?????</i>

-    /// </summary>

-    /// <param name="item">Value to add or update.</param>

-    /// <returns>True if the item was found and updated (hence not added).</returns>

-    [Tested]

-    public bool UpdateOrAdd(T item)

-    { T olditem; return UpdateOrAdd(item, out olditem); }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item"></param>

-    /// <param name="olditem"></param>

-    /// <returns></returns>

-    public bool UpdateOrAdd(T item, out T olditem)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      bool wasfound;

-      olditem = default(T);

-

-

-      //Note: blackdepth of the tree is set inside addIterative

-      if (addIterative(item, ref olditem, true, out wasfound))

-      {

-        size++;

-        if (ActiveEvents != 0)

-          raiseForAdd(wasfound ? olditem : item);

-        return wasfound;

-      }

-      else

-      {

-#warning for bag implementation: count is wrong

-        if (ActiveEvents != 0)

-          raiseForUpdate(item, olditem, 1);

-        return true;

-      }

-    }

-

-

-    /// <summary>

-    /// Remove a particular item from this collection. If the collection has bag

-    /// semantics only one copy equivalent to the supplied item is removed. 

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public bool Remove(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      if (root == null)

-        return false;

-

-      int junk;

-      bool retval = removeIterative(ref item, false, out junk);

-      if (ActiveEvents != 0 && retval)

-        raiseForRemove(item);

-      return retval;

-    }

-

-    /// <summary>

-    /// Remove a particular item from this collection if found. If the collection

-    /// has bag semantics only one copy equivalent to the supplied item is removed,

-    /// which one is implementation dependent. 

-    /// If an item was removed, report a binary copy of the actual item removed in 

-    /// the argument.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    /// <param name="removeditem">The removed value.</param>

-    /// <returns>True if the item was found (and removed).</returns>

-    [Tested]

-    public bool Remove(T item, out T removeditem)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      removeditem = item;

-      if (root == null)

-        return false;

-

-      int junk;

-      bool retval = removeIterative(ref removeditem, false, out junk);

-      if (ActiveEvents != 0 && retval)

-        raiseForRemove(item);

-      return retval;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <param name="item">input: item to remove; output: item actually removed</param>

-    /// <param name="all">If true, remove all copies</param>

-    /// <param name="wasRemoved"></param>

-    /// <returns></returns>

-    private bool removeIterative(ref T item, bool all, out int wasRemoved)

-    {

-      wasRemoved = 0;

-      //Stage 1: find item

-      stackcheck();

-

-      int level = 0, comp;

-      Node cursor = root;

-

-      while (true)

-      {

-        comp = comparer.Compare(cursor.item, item);

-        if (comp == 0)

-        {

-          item = cursor.item;

-#if BAG

-          if (!all && cursor.items > 1)

-          {

-#if NCP

-            Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-            cursor.items--;

-            cursor.size--;

-            while (level-- > 0)

-            {

-              Node kid = cursor;

-

-              cursor = path[level];

-#if NCP

-              Node.update(ref cursor, dirs[level] > 0, kid, maxsnapid, generation);

-#endif

-              cursor.size--;

-              path[level] = null;

-            }

-            size--;

-            wasRemoved = 1;

-            return true;

-          }

-          wasRemoved = cursor.items;

-#else

-          wasRemoved = 1;

-#endif

-          break;

-        }

-

-        Node child = comp > 0 ? cursor.left : cursor.right;

-

-        if (child == null)

-          return false;

-

-        dirs[level] = comp;

-        path[level++] = cursor;

-        cursor = child;

-      }

-

-      return removeIterativePhase2(cursor, level);

-    }

-

-

-    private bool removeIterativePhase2(Node cursor, int level)

-    {

-      if (size == 1)

-      {

-        clear();

-        return true;

-      }

-

-#if BAG

-      int removedcount = cursor.items;

-      size -= removedcount;

-#else

-      //We are certain to remove one node:

-      size--;

-#endif

-      //Stage 2: if item's node has no null child, find predecessor

-      int level_of_item = level;

-

-      if (cursor.left != null && cursor.right != null)

-      {

-        dirs[level] = 1;

-        path[level++] = cursor;

-        cursor = cursor.left;

-        while (cursor.right != null)

-        {

-          dirs[level] = -1;

-          path[level++] = cursor;

-          cursor = cursor.right;

-        }

-#if NCP

-        Node.CopyNode(ref path[level_of_item], maxsnapid, generation);

-#endif

-        path[level_of_item].item = cursor.item;

-#if BAG

-        path[level_of_item].items = cursor.items;

-#endif

-      }

-

-      //Stage 3: splice out node to be removed

-      Node newchild = cursor.right == null ? cursor.left : cursor.right;

-      bool demote_or_rotate = newchild == null && !cursor.red;

-

-      //assert newchild.red 

-      if (newchild != null)

-      {

-        newchild.red = false;

-      }

-

-      if (level == 0)

-      {

-        root = newchild;

-        return true;

-      }

-

-      level--;

-      cursor = path[level];

-      path[level] = null;

-

-      int comp = dirs[level];

-      Node childsibling;

-#if NCP

-      Node.update(ref cursor, comp > 0, newchild, maxsnapid, generation);

-#else

-			if (comp > 0)

-				cursor.left = newchild;

-			else

-				cursor.right = newchild;

-#endif

-      childsibling = comp > 0 ? cursor.right : cursor.left;

-#if BAG

-      cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-      cursor.size--;

-#endif

-

-      //Stage 4: demote till we must rotate

-      Node farnephew = null, nearnephew = null;

-

-      while (demote_or_rotate)

-      {

-        if (childsibling.red)

-          break; //rotate 2+?

-

-        farnephew = comp > 0 ? childsibling.right : childsibling.left;

-        if (farnephew != null && farnephew.red)

-          break; //rotate 1b

-

-        nearnephew = comp > 0 ? childsibling.left : childsibling.right;

-        if (nearnephew != null && nearnephew.red)

-          break; //rotate 1c

-

-        //demote cursor

-        childsibling.red = true;

-        if (level == 0)

-        {

-          cursor.red = false;

-          blackdepth--;

-#if NCP

-          root = cursor;

-#endif

-          return true;

-        }

-        else if (cursor.red)

-        {

-          cursor.red = false;

-          demote_or_rotate = false;

-          break; //No rotation

-        }

-        else

-        {

-          Node child = cursor;

-

-          cursor = path[--level];

-          path[level] = null;

-          comp = dirs[level];

-          childsibling = comp > 0 ? cursor.right : cursor.left;

-#if NCP

-          Node.update(ref cursor, comp > 0, child, maxsnapid, generation);

-#endif

-#if BAG

-          cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-          cursor.size--;

-#endif

-        }

-      }

-

-      //Stage 5: rotate 

-      if (demote_or_rotate)

-      {

-        //At start:

-        //parent = cursor (temporary for swapping nodes)

-        //childsibling is the sibling of the updated child (x)

-        //cursor is always the top of the subtree

-        Node parent = cursor;

-

-        if (childsibling.red)

-        {//Case 2 and perhaps more. 

-          //The y.rank == px.rank >= x.rank+2 >=2 so both nephews are != null 

-          //(and black). The grandnephews are children of nearnephew

-          Node neargrandnephew, fargrandnephew;

-

-          if (comp > 0)

-          {

-            nearnephew = childsibling.left;

-            farnephew = childsibling.right;

-            neargrandnephew = nearnephew.left;

-            fargrandnephew = nearnephew.right;

-          }

-          else

-          {

-            nearnephew = childsibling.right;

-            farnephew = childsibling.left;

-            neargrandnephew = nearnephew.right;

-            fargrandnephew = nearnephew.left;

-          }

-

-          if (fargrandnephew != null && fargrandnephew.red)

-          {//Case 2+1b

-#if NCP

-            Node.CopyNode(ref nearnephew, maxsnapid, generation);

-

-            //The end result of this will always be e copy of parent

-            Node.update(ref parent, comp < 0, neargrandnephew, maxsnapid, generation);

-            Node.update(ref childsibling, comp > 0, nearnephew, maxsnapid, generation);

-#endif

-            if (comp > 0)

-            {

-              nearnephew.left = parent;

-              parent.right = neargrandnephew;

-            }

-            else

-            {

-              nearnephew.right = parent;

-              parent.left = neargrandnephew;

-            }

-

-            cursor = childsibling;

-            childsibling.red = false;

-            nearnephew.red = true;

-            fargrandnephew.red = false;

-#if BAG

-            cursor.size = parent.size;

-            nearnephew.size = cursor.size - cursor.items - farnephew.size;

-            parent.size = nearnephew.size - nearnephew.items - fargrandnephew.size;

-#elif MAINTAIN_SIZE

-            cursor.size = parent.size;

-            nearnephew.size = cursor.size - 1 - farnephew.size;

-            parent.size = nearnephew.size - 1 - fargrandnephew.size;

-#endif

-          }

-          else if (neargrandnephew != null && neargrandnephew.red)

-          {//Case 2+1c

-#if NCP

-            Node.CopyNode(ref neargrandnephew, maxsnapid, generation);

-#endif

-            if (comp > 0)

-            {

-#if NCP

-              Node.update(ref childsibling, true, neargrandnephew, maxsnapid, generation);

-              Node.update(ref nearnephew, true, neargrandnephew.right, maxsnapid, generation);

-              Node.update(ref parent, false, neargrandnephew.left, maxsnapid, generation);

-#else

-							childsibling.left = neargrandnephew;

-							nearnephew.left = neargrandnephew.right;

-							parent.right = neargrandnephew.left;

-#endif

-              neargrandnephew.left = parent;

-              neargrandnephew.right = nearnephew;

-            }

-            else

-            {

-#if NCP

-              Node.update(ref childsibling, false, neargrandnephew, maxsnapid, generation);

-              Node.update(ref nearnephew, false, neargrandnephew.left, maxsnapid, generation);

-              Node.update(ref parent, true, neargrandnephew.right, maxsnapid, generation);

-#else

-							childsibling.right = neargrandnephew;

-							nearnephew.right = neargrandnephew.left;

-							parent.left = neargrandnephew.right;

-#endif

-              neargrandnephew.right = parent;

-              neargrandnephew.left = nearnephew;

-            }

-

-            cursor = childsibling;

-            childsibling.red = false;

-#if BAG

-            cursor.size = parent.size;

-            parent.size = parent.items + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-            nearnephew.size = nearnephew.items + (nearnephew.left == null ? 0 : nearnephew.left.size) + (nearnephew.right == null ? 0 : nearnephew.right.size);

-            neargrandnephew.size = neargrandnephew.items + parent.size + nearnephew.size;

-#elif MAINTAIN_SIZE

-            cursor.size = parent.size;

-            parent.size = 1 + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-            nearnephew.size = 1 + (nearnephew.left == null ? 0 : nearnephew.left.size) + (nearnephew.right == null ? 0 : nearnephew.right.size);

-            neargrandnephew.size = 1 + parent.size + nearnephew.size;

-#endif

-          }

-          else

-          {//Case 2 only

-#if NCP

-            Node.update(ref parent, comp < 0, nearnephew, maxsnapid, generation);

-            Node.update(ref childsibling, comp > 0, parent, maxsnapid, generation);

-#else

-						if (comp > 0)

-						{

-							childsibling.left = parent;

-							parent.right = nearnephew;

-						}

-						else

-						{

-							childsibling.right = parent;

-							parent.left = nearnephew;

-						}

-#endif

-            cursor = childsibling;

-            childsibling.red = false;

-            nearnephew.red = true;

-#if BAG

-            cursor.size = parent.size;

-            parent.size -= farnephew.size + cursor.items;

-#elif MAINTAIN_SIZE

-            cursor.size = parent.size;

-            parent.size -= farnephew.size + 1;

-#endif

-          }

-        }

-        else if (farnephew != null && farnephew.red)

-        {//Case 1b

-          nearnephew = comp > 0 ? childsibling.left : childsibling.right;

-#if NCP

-          Node.update(ref parent, comp < 0, nearnephew, maxsnapid, generation);

-          Node.CopyNode(ref childsibling, maxsnapid, generation);

-          if (comp > 0)

-          {

-            childsibling.left = parent;

-            childsibling.right = farnephew;

-          }

-          else

-          {

-            childsibling.right = parent;

-            childsibling.left = farnephew;

-          }

-#else

-					if (comp > 0)

-					{

-						childsibling.left = parent;

-						parent.right = nearnephew;

-					}

-					else

-					{

-						childsibling.right = parent;

-						parent.left = nearnephew;

-					}

-#endif

-          cursor = childsibling;

-          cursor.red = parent.red;

-          parent.red = false;

-          farnephew.red = false;

-

-#if BAG

-          cursor.size = parent.size;

-          parent.size -= farnephew.size + cursor.items;

-#elif MAINTAIN_SIZE

-          cursor.size = parent.size;

-          parent.size -= farnephew.size + 1;

-#endif

-        }

-        else if (nearnephew != null && nearnephew.red)

-        {//Case 1c

-#if NCP

-          Node.CopyNode(ref nearnephew, maxsnapid, generation);

-#endif

-          if (comp > 0)

-          {

-#if NCP

-            Node.update(ref childsibling, true, nearnephew.right, maxsnapid, generation);

-            Node.update(ref parent, false, nearnephew.left, maxsnapid, generation);

-#else

-						childsibling.left = nearnephew.right;

-						parent.right = nearnephew.left;

-#endif

-            nearnephew.left = parent;

-            nearnephew.right = childsibling;

-          }

-          else

-          {

-#if NCP

-            Node.update(ref childsibling, false, nearnephew.left, maxsnapid, generation);

-            Node.update(ref parent, true, nearnephew.right, maxsnapid, generation);

-#else

-						childsibling.right = nearnephew.left;

-						parent.left = nearnephew.right;

-#endif

-            nearnephew.right = parent;

-            nearnephew.left = childsibling;

-          }

-

-          cursor = nearnephew;

-          cursor.red = parent.red;

-          parent.red = false;

-#if BAG

-          cursor.size = parent.size;

-          parent.size = parent.items + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-          childsibling.size = childsibling.items + (childsibling.left == null ? 0 : childsibling.left.size) + (childsibling.right == null ? 0 : childsibling.right.size);

-#elif MAINTAIN_SIZE

-          cursor.size = parent.size;

-          parent.size = 1 + (parent.left == null ? 0 : parent.left.size) + (parent.right == null ? 0 : parent.right.size);

-          childsibling.size = 1 + (childsibling.left == null ? 0 : childsibling.left.size) + (childsibling.right == null ? 0 : childsibling.right.size);

-#endif

-        }

-        else

-        {//Case 1a can't happen

-          throw new InternalException("Case 1a can't happen here");

-        }

-

-        //Resplice cursor:

-        if (level == 0)

-        {

-          root = cursor;

-        }

-        else

-        {

-          Node swap = cursor;

-

-          cursor = path[--level];

-          path[level] = null;

-#if NCP

-          Node.update(ref cursor, dirs[level] > 0, swap, maxsnapid, generation);

-#else

-				

-					if (dirs[level] > 0)

-						cursor.left = swap;

-					else

-						cursor.right = swap;

-#endif

-#if BAG

-          cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-          cursor.size--;

-#endif

-        }

-      }

-

-      //Stage 6: fixup to the root

-      while (level > 0)

-      {

-        Node child = cursor;

-

-        cursor = path[--level];

-        path[level] = null;

-#if NCP

-        if (child != (dirs[level] > 0 ? cursor.left : cursor.right))

-          Node.update(ref cursor, dirs[level] > 0, child, maxsnapid, generation);

-#endif

-#if BAG

-        cursor.size -= removedcount;

-#elif MAINTAIN_SIZE

-        cursor.size--;

-#endif

-      }

-

-#if NCP

-      root = cursor;

-#endif

-      return true;

-    }

-

-

-    /// <summary>

-    /// Remove all items from this collection.

-    /// </summary>

-    [Tested]

-    public void Clear()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      if (size == 0)

-        return;

-      int oldsize = size;

-      clear();

-      if ((ActiveEvents & EventTypeEnum.Cleared) != 0)

-        raiseCollectionCleared(true, oldsize);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    private void clear()

-    {

-      size = 0;

-      root = null;

-      blackdepth = 0;

-    }

-

-

-    /// <summary>

-    /// Remove all items in another collection from this one. If this collection

-    /// has bag semantics, take multiplicities into account.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to remove.</param>

-    [Tested]

-    public void RemoveAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      T jtem;

-

-      bool mustRaise = (ActiveEvents & (EventTypeEnum.Removed | EventTypeEnum.Changed)) != 0;

-      RaiseForRemoveAllHandler raiseHandler = mustRaise ? new RaiseForRemoveAllHandler(this) : null;

-

-      foreach (T item in items)

-      {

-        if (root == null)

-          break;

-

-        jtem = item;

-        int junk;

-        if (removeIterative(ref jtem, false, out junk) && mustRaise)

-          raiseHandler.Remove(jtem);

-      }

-      if (mustRaise)

-        raiseHandler.Raise();

-    }

-

-    /// <summary>

-    /// Remove all items not in some other collection from this one. If this collection

-    /// has bag semantics, take multiplicities into account.

-    /// </summary>

-    /// <typeparam name="U"></typeparam>

-    /// <param name="items">The items to retain.</param>

-    [Tested]

-    public void RetainAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      //A much more efficient version is possible if items is sorted like this.

-      //Well, it is unclear how efficient it would be.

-      //We could use a marking method!?

-#warning how does this work together with persistence?

-      TreeSet<T> t = (TreeSet<T>)MemberwiseClone();

-

-      T jtem = default(T);

-      t.clear();

-      foreach (T item in items)

-        if (ContainsCount(item) > t.ContainsCount(item))

-        {

-          t.add(item, ref jtem);

-        }

-      if (size == t.size)

-        return;

-

-#warning improve (mainly for bag) by usig a Node iterator instead of ItemMultiplicities()

-      CircularQueue<KeyValuePair<T, int>> wasRemoved = null;

-      if ((ActiveEvents & EventTypeEnum.Removed) != 0)

-      {

-        wasRemoved = new CircularQueue<KeyValuePair<T, int>>();

-        SCG.IEnumerator<KeyValuePair<T, int>> ie = ItemMultiplicities().GetEnumerator();

-        foreach (KeyValuePair<T, int> p in t.ItemMultiplicities())

-        {

-          //We know p.Key is in this!

-          while (ie.MoveNext())

-          {

-            if (comparer.Compare(ie.Current.Key, p.Key) == 0)

-            {

-#if BAG

-              int removed = ie.Current.Value - p.Value;

-              if (removed > 0)

-                wasRemoved.Enqueue(new KeyValuePair<T,int>(p.Key, removed));

-#endif

-              break;

-            }

-            else

-              wasRemoved.Enqueue(ie.Current);

-          }

-        }

-        while (ie.MoveNext())

-          wasRemoved.Enqueue(ie.Current);

-      }

-

-      root = t.root;

-      size = t.size;

-      blackdepth = t.blackdepth;

-      if (wasRemoved != null)

-        foreach (KeyValuePair<T, int> p in wasRemoved)

-          raiseItemsRemoved(p.Key, p.Value);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    /// <summary>

-    /// Check if this collection contains all the values in another collection.

-    /// If this collection has bag semantics (<code>AllowsDuplicates==true</code>)

-    /// the check is made with respect to multiplicities, else multiplicities

-    /// are not taken into account.

-    /// </summary>

-    /// <param name="items">The </param>

-    /// <typeparam name="U"></typeparam>

-    /// <returns>True if all values in <code>items</code>is in this collection.</returns>

-    [Tested]

-    public bool ContainsAll<U>(SCG.IEnumerable<U> items) where U : T

-    {

-      //TODO: fix bag implementation

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      //This is worst-case O(m*logn)

-      foreach (T item in items)

-        if (!Contains(item)) return false;

-

-      return true;

-    }

-

-

-    //Higher order:

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the items of this

-    /// indexed sorted collection satisfying a certain predicate.

-    /// </summary>

-    /// <param name="filter">The filter delegate defining the predicate.</param>

-    /// <returns>The new indexed sorted collection.</returns>

-    [Tested]

-    public IIndexedSorted<T> FindAll(Fun<T, bool> filter)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      TreeSet<T> res = new TreeSet<T>(comparer);

-      SCG.IEnumerator<T> e = GetEnumerator();

-      Node head = null, tail = null;

-      int z = 0;

-#if BAG

-      int ec = 0;

-#endif

-      while (e.MoveNext())

-      {

-        T thisitem = e.Current;

-#if BAG

-        //We could document that filter will only be called 

-        //once on each unique item. That might even be good for the user!

-        if (tail != null && comparer.Compare(thisitem, tail.item) == 0)

-        {

-          tail.items++;

-          ec++;

-          continue;

-        }

-#endif

-        if (filter(thisitem))

-        {

-          if (head == null)

-          {

-            head = tail = new Node();

-          }

-          else

-          {

-#if BAG

-            tail.size = tail.items;

-#endif

-            tail.right = new Node();

-            tail = tail.right;

-          }

-

-          tail.item = thisitem;

-          z++;

-        }

-      }

-#if BAG

-      if (tail != null)

-        tail.size = tail.items;

-#endif

-

-      if (z == 0)

-        return res;

-

-      int blackheight = 0, red = z, maxred = 1;

-

-      while (maxred <= red)

-      {

-        red -= maxred;

-        maxred <<= 1;

-        blackheight++;

-      }

-

-      res.root = TreeSet<T>.maketreer(ref head, blackheight, maxred, red);

-      res.blackdepth = blackheight;

-      res.size = z;

-#if BAG

-      res.size += ec;

-#endif

-      return res;

-    }

-

-

-    /// <summary>

-    /// Create a new indexed sorted collection consisting of the results of

-    /// mapping all items of this list.

-    /// <exception cref="ArgumentException"/> if the map is not increasing over 

-    /// the items of this collection (with respect to the two given comparison 

-    /// relations).

-    /// </summary>

-    /// <param name="mapper">The delegate definging the map.</param>

-    /// <param name="c">The comparion relation to use for the result.</param>

-    /// <returns>The new sorted collection.</returns>

-    [Tested]

-    public IIndexedSorted<V> Map<V>(Fun<T, V> mapper, SCG.IComparer<V> c)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      TreeSet<V> res = new TreeSet<V>(c);

-

-      if (size == 0)

-        return res;

-

-      SCG.IEnumerator<T> e = GetEnumerator();

-      TreeSet<V>.Node head = null, tail = null;

-      V oldv = default(V);

-      int z = 0;

-#if BAG

-      T lastitem = default(T);

-#endif

-      while (e.MoveNext())

-      {

-        T thisitem = e.Current;

-#if BAG

-        //We could document that mapper will only be called 

-        //once on each unique item. That might even be good for the user!

-        if (tail != null && comparer.Compare(thisitem, lastitem) == 0)

-        {

-          tail.items++;

-          continue;

-        }

-#endif

-        V newv = mapper(thisitem);

-

-        if (head == null)

-        {

-          head = tail = new TreeSet<V>.Node();

-          z++;

-        }

-        else

-        {

-          int comp = c.Compare(oldv, newv);

-#if BAG

-          if (comp == 0)

-          {

-            tail.items++;

-            continue;

-          }

-          if (comp > 0)

-#else

-          if (comp >= 0)

-#endif

-            throw new ArgumentException("mapper not monotonic");

-#if BAG

-          tail.size = tail.items;

-#endif

-          tail.right = new TreeSet<V>.Node();

-          tail = tail.right;

-          z++;

-        }

-#if BAG

-        lastitem = thisitem;

-#endif

-        tail.item = oldv = newv;

-      }

-

-#if BAG

-      tail.size = tail.items;

-#endif

-

-      int blackheight = 0, red = z, maxred = 1;

-

-      while (maxred <= red)

-      {

-        red -= maxred;

-        maxred <<= 1;

-        blackheight++;

-      }

-

-      res.root = TreeSet<V>.maketreer(ref head, blackheight, maxred, red);

-      res.blackdepth = blackheight;

-      res.size = size;

-      return res;

-    }

-

-

-    //below is the bag utility stuff

-    /// <summary>

-    /// Count the number of items of the collection equal to a particular value.

-    /// Returns 0 if and only if the value is not in the collection.

-    /// </summary>

-    /// <param name="item">The value to count.</param>

-    /// <returns>The number of copies found.</returns>

-    [Tested]

-    public int ContainsCount(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      Node next; int comp = 0;

-

-      next = root;

-      while (next != null)

-      {

-        comp = comparer.Compare(next.item, item);

-        if (comp == 0)

-          return next.items;

-

-        next = comp < 0 ? right(next) : left(next);

-      }

-

-      return 0;

-#else

-      //Since we are strictly not AllowsDuplicates we just do

-      return Contains(item) ? 1 : 0;

-#endif

-    }

-

-#if BAG

-    //TODO: make work with snapshots

-    class Multiplicities : CollectionValueBase<KeyValuePair<T, int>>, ICollectionValue<KeyValuePair<T, int>>

-    {

-      TreeBag<T> treebag;

-      int origstamp;

-      internal Multiplicities(TreeBag<T> treebag) { this.treebag = treebag; this.origstamp = treebag.stamp; }

-      public override KeyValuePair<T, int> Choose() { return new KeyValuePair<T, int>(treebag.root.item, treebag.root.items); }

-

-      public override SCG.IEnumerator<KeyValuePair<T, int>> GetEnumerator()

-      {

-        return getEnumerator(treebag.root, origstamp); //TODO: NBNBNB

-      }

-

-      private SCG.IEnumerator<KeyValuePair<T, int>> getEnumerator(Node node, int origstamp)

-      {

-        if (node == null)

-          yield break;

-

-        if (node.left != null)

-        {

-          SCG.IEnumerator<KeyValuePair<T, int>> child = getEnumerator(node.left, origstamp);

-

-          while (child.MoveNext())

-          {

-            treebag.modifycheck(origstamp);

-            yield return child.Current;

-          }

-        }

-        yield return new KeyValuePair<T, int>(node.item, node.items);

-        if (node.right != null)

-        {

-          SCG.IEnumerator<KeyValuePair<T, int>> child = getEnumerator(node.right, origstamp);

-

-          while (child.MoveNext())

-          {

-            treebag.modifycheck(origstamp);

-            yield return child.Current;

-          }

-        }

-      }

-

-      public override bool IsEmpty { get { return treebag.IsEmpty; } }

-      public override int Count { get { int i = 0; foreach (KeyValuePair<T, int> p in this) i++; return i; } } //TODO: make better

-      public override Speed CountSpeed { get { return Speed.Linear; } } //TODO: make better

-    }

-#endif

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<T> UniqueItems()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      return new DropMultiplicity<T>(ItemMultiplicities());

-#else

-      return this;

-#endif

-    }

-

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public virtual ICollectionValue<KeyValuePair<T, int>> ItemMultiplicities()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      return new Multiplicities(this);

-#else

-      return new MultiplicityOne<T>(this);

-#endif

-    }

-

-    /// <summary>

-    /// Remove all items equivalent to a given value.

-    /// </summary>

-    /// <param name="item">The value to remove.</param>

-    [Tested]

-    public void RemoveAllCopies(T item)

-    {

-#if BAG

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      int removed;

-      if (removeIterative(ref item, true, out removed) && ActiveEvents != 0)

-      {

-        raiseForRemove(item, removed);

-      }

-#else

-      Remove(item);

-#endif

-    }

-

-

-    #endregion

-

-    #region IIndexed<T> Members

-

-    private Node findNode(int i)

-    {

-#if NCP

-      if (isSnapShot)

-        throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-#if MAINTAIN_SIZE

-      Node next = root;

-

-      if (i >= 0 && i < size)

-        while (true)

-        {

-          int j = next.left == null ? 0 : next.left.size;

-

-          if (i > j)

-          {

-#if BAG

-            i -= j + next.items;

-            if (i < 0)

-              return next;

-#else

-            i -= j + 1;

-#endif

-            next = next.right;

-          }

-          else if (i == j)

-            return next;

-          else

-            next = next.left;

-        }

-

-      throw new IndexOutOfRangeException();

-#else

-			throw new NotSupportedException();

-#endif

-    }

-

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <value>The i'th item of this list.</value>

-    /// <param name="i">the index to lookup</param>

-    [Tested]

-    public T this[int i] { [Tested]	get { return findNode(i).item; } }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value></value>

-    public virtual Speed IndexingSpeed { get { return Speed.Log; } }

-

-

-    //TODO: return -upper instead of -1 in case of not found

-    /// <summary>

-    /// Searches for an item in this indexed collection going forwards from the start.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of first occurrence from start of the item

-    /// if found, else the two-complement 

-    /// (always negative) of the index at which the item would be put if it was added.</returns>

-    [Tested]

-    public int IndexOf(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      int upper;

-      return indexOf(item, out upper);

-    }

-

-

-    private int indexOf(T item, out int upper)

-    {

-#if NCP

-      if (isSnapShot)

-        throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-#if MAINTAIN_SIZE

-      int ind = 0; Node next = root;

-

-      while (next != null)

-      {

-        int comp = comparer.Compare(item, next.item);

-

-        if (comp < 0)

-          next = next.left;

-        else

-        {

-          int leftcnt = next.left == null ? 0 : next.left.size;

-

-          if (comp == 0)

-          {

-#if BAG

-            upper = ind + leftcnt + next.items - 1;

-            return ind + leftcnt;

-#else

-            return upper = ind + leftcnt;

-#endif

-          }

-          else

-          {

-#if BAG

-            ind = ind + next.items + leftcnt;

-#else

-            ind = ind + 1 + leftcnt;

-#endif

-            next = next.right;

-          }

-        }

-      }

-#endif

-      upper = ~ind;

-      return ~ind;

-    }

-

-

-    /// <summary>

-    /// Searches for an item in the tree going backwords from the end.

-    /// </summary>

-    /// <param name="item">Item to search for.</param>

-    /// <returns>Index of last occurrence from the end of item if found, 

-    /// else the two-complement (always negative) of the index at which 

-    /// the item would be put if it was added.</returns>

-    [Tested]

-    public int LastIndexOf(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-#if BAG

-      int res;

-      indexOf(item, out res);

-      return res;

-#else

-      //We have AllowsDuplicates==false for the set

-      return IndexOf(item);

-#endif

-    }

-

-

-    /// <summary>

-    /// Remove the item at a specific position of the list.

-    /// <exception cref="IndexOutOfRangeException"/> if i is negative or

-    /// &gt;= the size of the collection.

-    /// </summary>

-    /// <param name="i">The index of the item to remove.</param>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T RemoveAt(int i)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-      T retval = removeAt(i);

-      if (ActiveEvents != 0)

-        raiseForRemove(retval);

-      return retval;

-    }

-

-    T removeAt(int i)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-#if MAINTAIN_SIZE

-      if (i < 0 || i >= size)

-        throw new IndexOutOfRangeException("Index out of range for sequenced collectionvalue");

-

-      //We must follow the pattern of removeIterative()

-      while (dirs.Length < 2 * blackdepth)

-      {

-        dirs = new int[2 * dirs.Length];

-        path = new Node[2 * dirs.Length];

-      }

-

-      int level = 0;

-      Node cursor = root;

-

-      while (true)

-      {

-        int j = cursor.left == null ? 0 : cursor.left.size;

-

-        if (i > j)

-        {

-#if BAG

-          i -= j + cursor.items;

-          if (i < 0)

-            break;

-#else

-          i -= j + 1;

-#endif

-          dirs[level] = -1;

-          path[level++] = cursor;

-          cursor = cursor.right;

-        }

-        else if (i == j)

-          break;

-        else

-        {

-          dirs[level] = 1;

-          path[level++] = cursor;

-          cursor = cursor.left;

-        }

-      }

-

-      T retval = cursor.item;

-

-#if BAG

-      if (cursor.items > 1)

-      {

-        resplicebag(level, cursor);

-        size--;

-        return retval;

-      }

-#endif

-      removeIterativePhase2(cursor, level);

-      return retval;

-#else

-			throw new NotSupportedException();

-#endif

-    }

-

-#if BAG

-    private void resplicebag(int level, Node cursor)

-    {

-#if NCP

-      Node.CopyNode(ref cursor, maxsnapid, generation);

-#endif

-      cursor.items--;

-      cursor.size--;

-      while (level-- > 0)

-      {

-        Node kid = cursor;

-

-        cursor = path[level];

-#if NCP

-        Node.update(ref cursor, dirs[level] > 0, kid, maxsnapid, generation);

-#endif

-        cursor.size--;

-        path[level] = null;

-      }

-    }

-#endif

-    /// <summary>

-    /// Remove all items in an index interval.

-    /// <exception cref="IndexOutOfRangeException"/>???. 

-    /// </summary>

-    /// <param name="start">The index of the first item to remove.</param>

-    /// <param name="count">The number of items to remove.</param>

-    [Tested]

-    public void RemoveInterval(int start, int count)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (start < 0 || count < 0 || start + count > this.size)

-        throw new ArgumentOutOfRangeException();

-

-      updatecheck();

-

-      if (count == 0)

-        return;

-

-      //This is terrible for large count. We should split the tree at 

-      //the endpoints of the range and fuse the parts!

-      //We really need good internal destructive split and catenate functions!

-      //Alternative for large counts: rebuild tree using maketree()

-      for (int i = 0; i < count; i++)

-        removeAt(start);

-

-      if ((ActiveEvents & EventTypeEnum.Cleared) != 0)

-        raiseCollectionCleared(false, count);

-      if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// <exception cref="IndexOutOfRangeException"/>.

-    /// </summary>

-    /// <value>The directed collection of items in a specific index interval.</value>

-    /// <param name="start">The low index of the interval (inclusive).</param>

-    /// <param name="end">The high index of the interval (exclusive).</param>

-    [Tested]

-    public IDirectedCollectionValue<T> this[int start, int end]

-    {

-      [Tested]

-      get

-      {

-        checkRange(start, end - start);

-        return new Interval(this, start, end - start, true);

-      }

-    }

-

-    #region Interval nested class

-    class Interval : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      int start, length, stamp;

-

-      bool forwards;

-

-      TreeSet<T> tree;

-

-

-      internal Interval(TreeSet<T> tree, int start, int count, bool forwards)

-      {

-#if NCP

-        if (tree.isSnapShot)

-          throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-        this.start = start; this.length = count; this.forwards = forwards;

-        this.tree = tree; this.stamp = tree.stamp;

-      }

-

-      public override bool IsEmpty { get { return length == 0; } }

-

-      [Tested]

-      public override int Count { [Tested]get { return length; } }

-

-

-      public override Speed CountSpeed { get { return Speed.Constant; } }

-

-

-      public override T Choose()

-      {

-        if (length == 0)

-          throw new NoSuchItemException();

-        return tree[start];

-      }

-

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator()

-      {

-#if MAINTAIN_SIZE

-        tree.modifycheck(stamp);

-#if BAG

-        int togo;

-#endif

-        Node cursor = tree.root;

-        Node[] path = new Node[2 * tree.blackdepth];

-        int level = 0, totaltogo = length;

-

-        if (totaltogo == 0)

-          yield break;

-

-        if (forwards)

-        {

-          int i = start;

-

-          while (true)

-          {

-            int j = cursor.left == null ? 0 : cursor.left.size;

-

-            if (i > j)

-            {

-#if BAG

-              i -= j + cursor.items;

-              if (i < 0)

-              {

-                togo = cursor.items + i;

-                break;

-              }

-#else

-              i -= j + 1;

-#endif

-              cursor = cursor.right;

-            }

-            else if (i == j)

-            {

-#if BAG

-              togo = cursor.items;

-#endif

-              break;

-            }

-            else

-            {

-              path[level++] = cursor;

-              cursor = cursor.left;

-            }

-          }

-

-          T current = cursor.item;

-

-          while (totaltogo-- > 0)

-          {

-            yield return current;

-            tree.modifycheck(stamp);

-#if BAG

-            if (--togo > 0)

-              continue;

-#endif

-            if (cursor.right != null)

-            {

-              path[level] = cursor = cursor.right;

-              while (cursor.left != null)

-                path[++level] = cursor = cursor.left;

-            }

-            else if (level == 0)

-              yield break;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-#if BAG

-            togo = cursor.items;

-#endif

-          }

-        }

-        else

-        {

-          int i = start + length - 1;

-

-          while (true)

-          {

-            int j = cursor.left == null ? 0 : cursor.left.size;

-

-            if (i > j)

-            {

-#if BAG

-              if (i - j < cursor.items)

-              {

-                togo = i - j + 1;

-                break;

-              }

-              i -= j + cursor.items;

-#else

-              i -= j + 1;

-#endif

-              path[level++] = cursor;

-              cursor = cursor.right;

-            }

-            else if (i == j)

-            {

-#if BAG

-              togo = 1;

-#endif

-              break;

-            }

-            else

-            {

-              cursor = cursor.left;

-            }

-          }

-

-          T current = cursor.item;

-

-          while (totaltogo-- > 0)

-          {

-            yield return current;

-            tree.modifycheck(stamp);

-#if BAG

-            if (--togo > 0)

-              continue;

-#endif

-            if (cursor.left != null)

-            {

-              path[level] = cursor = cursor.left;

-              while (cursor.right != null)

-                path[++level] = cursor = cursor.right;

-            }

-            else if (level == 0)

-              yield break;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-#if BAG

-            togo = cursor.items;

-#endif

-          }

-        }

-

-#else

-			throw new NotSupportedException();

-#endif

-      }

-

-

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      { return new Interval(tree, start, length, !forwards); }

-

-

-      [Tested]

-      IDirectedEnumerable<T> C5.IDirectedEnumerable<T>.Backwards()

-      { return Backwards(); }

-

-

-      [Tested]

-      public override EnumerationDirection Direction

-      {

-        [Tested]

-        get

-        {

-          return forwards ? EnumerationDirection.Forwards : EnumerationDirection.Backwards;

-        }

-      }

-    }

-    #endregion

-

-    /// <summary>

-    /// Create a collection containing the same items as this collection, but

-    /// whose enumerator will enumerate the items backwards. The new collection

-    /// will become invalid if the original is modified. Method typicaly used as in

-    /// <code>foreach (T x in coll.Backwards()) {...}</code>

-    /// </summary>

-    /// <returns>The backwards collection.</returns>

-    [Tested]

-    public override IDirectedCollectionValue<T> Backwards() { return RangeAll().Backwards(); }

-

-

-    [Tested]

-    IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-    #endregion

-

-    #region PriorityQueue Members

-

-    /// <summary>

-    /// The comparer object supplied at creation time for this collection

-    /// </summary>

-    /// <value>The comparer</value>

-    public SCG.IComparer<T> Comparer { get { return comparer; } }

-

-

-    /// <summary>

-    /// Find the current least item of this priority queue.

-    /// </summary>

-    /// <returns>The least item.</returns>

-    [Tested]

-    public T FindMin()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (size == 0)

-        throw new NoSuchItemException();

-      Node cursor = root, next = left(cursor);

-

-      while (next != null)

-      {

-        cursor = next;

-        next = left(cursor);

-      }

-

-      return cursor.item;

-    }

-

-

-    /// <summary>

-    /// Remove the least item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMin()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      //persistence guard?

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      //We must follow the pattern of removeIterative()

-      stackcheck();

-

-      T retval = deleteMin();

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(retval, 1);

-        raiseCollectionChanged();

-      }

-      return retval;

-    }

-

-    private T deleteMin()

-    {

-      int level = 0;

-      Node cursor = root;

-

-      while (cursor.left != null)

-      {

-        dirs[level] = 1;

-        path[level++] = cursor;

-        cursor = cursor.left;

-      }

-

-      T retval = cursor.item;

-

-#if BAG

-      if (cursor.items > 1)

-      {

-        resplicebag(level, cursor);

-        size--;

-        return retval;

-      }

-#endif

-      removeIterativePhase2(cursor, level);

-      return retval;

-    }

-

-

-    /// <summary>

-    /// Find the current largest item of this priority queue.

-    /// </summary>

-    /// <returns>The largest item.</returns>

-    [Tested]

-    public T FindMax()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      Node cursor = root, next = right(cursor);

-

-      while (next != null)

-      {

-        cursor = next;

-        next = right(cursor);

-      }

-

-      return cursor.item;

-    }

-

-

-    /// <summary>

-    /// Remove the largest item from this  priority queue.

-    /// </summary>

-    /// <returns>The removed item.</returns>

-    [Tested]

-    public T DeleteMax()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      //persistence guard?

-      updatecheck();

-      if (size == 0)

-        throw new NoSuchItemException();

-

-      //We must follow the pattern of removeIterative()

-      stackcheck();

-

-      T retval = deleteMax();

-      if (ActiveEvents != 0)

-      {

-        raiseItemsRemoved(retval, 1);

-        raiseCollectionChanged();

-      }

-      return retval;

-    }

-

-    private T deleteMax()

-    {

-      int level = 0;

-      Node cursor = root;

-

-      while (cursor.right != null)

-      {

-        dirs[level] = -1;

-        path[level++] = cursor;

-        cursor = cursor.right;

-      }

-

-      T retval = cursor.item;

-

-#if BAG

-      if (cursor.items > 1)

-      {

-        resplicebag(level, cursor);

-        size--;

-        return retval;

-      }

-#endif

-      removeIterativePhase2(cursor, level);

-      return retval;

-    }

-    #endregion

-

-    #region IPredecesorStructure<T> Members

-

-    /// <summary>

-    /// Find the strict predecessor in the sorted collection of a particular value,

-    /// i.e. the largest item in the collection less than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than or equal to the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the predecessor for.</param>

-    /// <returns>The predecessor.</returns>

-    [Tested]

-    public T Predecessor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp < 0)

-        {

-          bestsofar = cursor;

-          cursor = right(cursor);

-        }

-        else if (comp == 0)

-        {

-          cursor = left(cursor);

-          while (cursor != null)

-          {

-            bestsofar = cursor;

-            cursor = right(cursor);

-          }

-        }

-        else

-          cursor = left(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-

-    /// <summary>

-    /// Find the weak predecessor in the sorted collection of a particular value,

-    /// i.e. the largest item in the collection less than or equal to the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is less than the minimum of this collection.)</exception>

-    /// <param name="item">The item to find the weak predecessor for.</param>

-    /// <returns>The weak predecessor.</returns>

-    [Tested]

-    public T WeakPredecessor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp < 0)

-        {

-          bestsofar = cursor;

-          cursor = right(cursor);

-        }

-        else if (comp == 0)

-          return cursor.item;

-        else

-          cursor = left(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-

-    /// <summary>

-    /// Find the strict successor in the sorted collection of a particular value,

-    /// i.e. the least item in the collection greater than the supplied value.

-    /// </summary>

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than or equal to the maximum of this collection.)</exception>

-    /// <param name="item">The item to find the successor for.</param>

-    /// <returns>The successor.</returns>

-    [Tested]

-    public T Successor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp > 0)

-        {

-          bestsofar = cursor;

-          cursor = left(cursor);

-        }

-        else if (comp == 0)

-        {

-          cursor = right(cursor);

-          while (cursor != null)

-          {

-            bestsofar = cursor;

-            cursor = left(cursor);

-          }

-        }

-        else

-          cursor = right(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-

-    /// <summary>

-    /// Find the weak successor in the sorted collection of a particular value,

-    /// i.e. the least item in the collection greater than or equal to the supplied value.

-    /// <exception cref="NoSuchItemException"> if no such element exists (the

-    /// supplied  value is greater than the maximum of this collection.)</exception>

-    /// </summary>

-    /// <param name="item">The item to find the weak successor for.</param>

-    /// <returns>The weak successor.</returns>

-    [Tested]

-    public T WeakSuccessor(T item)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, bestsofar = null;

-

-      while (cursor != null)

-      {

-        int comp = comparer.Compare(cursor.item, item);

-

-        if (comp == 0)

-          return cursor.item;

-        else if (comp > 0)

-        {

-          bestsofar = cursor;

-          cursor = left(cursor);

-        }

-        else

-          cursor = right(cursor);

-      }

-

-      if (bestsofar != null)

-        return bestsofar.item;

-      else

-        throw new NoSuchItemException();

-    }

-

-    #endregion

-

-    #region ISorted<T> Members

-

-    /// <summary>

-    /// Query this sorted collection for items greater than or equal to a supplied value.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeFrom(T bot)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, true, bot, false, default(T), EnumerationDirection.Forwards);

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items between two supplied values.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive).</param>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeFromTo(T bot, T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, true, bot, true, top, EnumerationDirection.Forwards);

-    }

-

-

-    /// <summary>

-    /// Query this sorted collection for items less than a supplied value.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive).</param>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeTo(T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, false, default(T), true, top, EnumerationDirection.Forwards);

-    }

-

-

-    /// <summary>

-    /// Create a directed collection with the same items as this collection.

-    /// </summary>

-    /// <returns>The result directed collection.</returns>

-    [Tested]

-    public IDirectedCollectionValue<T> RangeAll()

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return new Range(this, false, default(T), false, default(T), EnumerationDirection.Forwards);

-    }

-

-

-    [Tested]

-    IDirectedEnumerable<T> ISorted<T>.RangeFrom(T bot) { return RangeFrom(bot); }

-

-

-    [Tested]

-    IDirectedEnumerable<T> ISorted<T>.RangeFromTo(T bot, T top) { return RangeFromTo(bot, top); }

-

-

-    [Tested]

-    IDirectedEnumerable<T> ISorted<T>.RangeTo(T top) { return RangeTo(top); }

-

-

-    //Utility for CountXxxx. Actually always called with strict = true.

-    private int countTo(T item, bool strict)

-    {

-#if NCP

-      if (isSnapShot)

-        throw new NotSupportedException("Indexing not supported for snapshots");

-#endif

-#if MAINTAIN_SIZE

-      int ind = 0, comp = 0; Node next = root;

-

-      while (next != null)

-      {

-        comp = comparer.Compare(item, next.item);

-        if (comp < 0)

-          next = next.left;

-        else

-        {

-          int leftcnt = next.left == null ? 0 : next.left.size;

-#if BAG

-          if (comp == 0)

-            return strict ? ind + leftcnt : ind + leftcnt + next.items;

-          else

-          {

-            ind = ind + next.items + leftcnt;

-            next = next.right;

-          }

-#else

-          if (comp == 0)

-            return strict ? ind + leftcnt : ind + leftcnt + 1;

-          else

-          {

-            ind = ind + 1 + leftcnt;

-            next = next.right;

-          }

-#endif

-        }

-      }

-

-      //if we get here, we are at the same side of the whole collection:

-      return ind;

-#else

-			throw new NotSupportedException("Code compiled w/o size!");

-#endif

-    }

-

-

-    /// <summary>

-    /// Perform a search in the sorted collection for the ranges in which a

-    /// non-increasing (i.e. weakly decrerasing) function from the item type to 

-    /// <code>int</code> is

-    /// negative, zero respectively positive. If the supplied cut function is

-    /// not non-increasing, the result of this call is undefined.

-    /// </summary>

-    /// <param name="c">The cut function <code>T</code> to <code>int</code>, given

-    /// as an <code>IComparable&lt;T&gt;</code> object, where the cut function is

-    /// the <code>c.CompareTo(T that)</code> method.</param>

-    /// <param name="low">Returns the largest item in the collection, where the

-    /// cut function is positive (if any).</param>

-    /// <param name="lowIsValid">True if the cut function is positive somewhere

-    /// on this collection.</param>

-    /// <param name="high">Returns the least item in the collection, where the

-    /// cut function is negative (if any).</param>

-    /// <param name="highIsValid">True if the cut function is negative somewhere

-    /// on this collection.</param>

-    /// <returns></returns>

-    [Tested]

-    public bool Cut(IComparable<T> c, out T low, out bool lowIsValid, out T high, out bool highIsValid)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      Node cursor = root, lbest = null, rbest = null;

-      bool res = false;

-

-      while (cursor != null)

-      {

-        int comp = c.CompareTo(cursor.item);

-

-        if (comp > 0)

-        {

-          lbest = cursor;

-          cursor = right(cursor);

-        }

-        else if (comp < 0)

-        {

-          rbest = cursor;

-          cursor = left(cursor);

-        }

-        else

-        {

-          res = true;

-

-          Node tmp = left(cursor);

-

-          while (tmp != null && c.CompareTo(tmp.item) == 0)

-            tmp = left(tmp);

-

-          if (tmp != null)

-          {

-            lbest = tmp;

-            tmp = right(tmp);

-            while (tmp != null)

-            {

-              if (c.CompareTo(tmp.item) > 0)

-              {

-                lbest = tmp;

-                tmp = right(tmp);

-              }

-              else

-                tmp = left(tmp);

-            }

-          }

-

-          tmp = right(cursor);

-          while (tmp != null && c.CompareTo(tmp.item) == 0)

-            tmp = right(tmp);

-

-          if (tmp != null)

-          {

-            rbest = tmp;

-            tmp = left(tmp);

-            while (tmp != null)

-            {

-              if (c.CompareTo(tmp.item) < 0)

-              {

-                rbest = tmp;

-                tmp = left(tmp);

-              }

-              else

-                tmp = right(tmp);

-            }

-          }

-

-          break;

-        }

-      }

-

-      if (highIsValid = (rbest != null))

-        high = rbest.item;

-      else

-        high = default(T);

-

-      if (lowIsValid = (lbest != null))

-        low = lbest.item;

-      else

-        low = default(T);

-

-      return res;

-    }

-

-

-    /// <summary>

-    /// Determine the number of items at or above a supplied threshold.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountFrom(T bot)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return size - countTo(bot, true);

-    }

-

-

-    /// <summary>

-    /// Determine the number of items between two supplied thresholds.

-    /// </summary>

-    /// <param name="bot">The lower bound (inclusive)</param>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountFromTo(T bot, T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      if (comparer.Compare(bot, top) >= 0)

-        return 0;

-

-      return countTo(top, true) - countTo(bot, true);

-    }

-

-

-    /// <summary>

-    /// Determine the number of items below a supplied threshold.

-    /// </summary>

-    /// <param name="top">The upper bound (exclusive)</param>

-    /// <returns>The number of matcing items.</returns>

-    [Tested]

-    public int CountTo(T top)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      return countTo(top, true);

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection above or at a supplied threshold.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    [Tested]

-    public void RemoveRangeFrom(T low)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int count = CountFrom(low);

-

-      if (count == 0)

-        return;

-

-      stackcheck();

-      CircularQueue<T> wasRemoved = (ActiveEvents & EventTypeEnum.Removed) != 0 ? new CircularQueue<T>() : null;

-

-      for (int i = 0; i < count; i++)

-      {

-        T item = deleteMax();

-        if (wasRemoved != null)

-          wasRemoved.Enqueue(item);

-      }

-      if (wasRemoved != null)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection between two supplied thresholds.

-    /// </summary>

-    /// <param name="low">The lower threshold (inclusive).</param>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    [Tested]

-    public void RemoveRangeFromTo(T low, T hi)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int count = CountFromTo(low, hi);

-

-      if (count == 0)

-        return;

-

-      CircularQueue<T> wasRemoved = (ActiveEvents & EventTypeEnum.Removed) != 0 ? new CircularQueue<T>() : null;

-      int junk;

-      for (int i = 0; i < count; i++)

-      {

-        T item = Predecessor(hi);

-        removeIterative(ref item, false, out junk);

-        if (wasRemoved != null)

-          wasRemoved.Enqueue(item);

-      }

-      if (wasRemoved != null)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-

-    /// <summary>

-    /// Remove all items of this collection below a supplied threshold.

-    /// </summary>

-    /// <param name="hi">The upper threshold (exclusive).</param>

-    [Tested]

-    public void RemoveRangeTo(T hi)

-    {

-      if (!isValid)

-        throw new ViewDisposedException("Snapshot has been disposed");

-      updatecheck();

-

-      int count = CountTo(hi);

-

-      if (count == 0)

-        return;

-

-      stackcheck();

-      CircularQueue<T> wasRemoved = (ActiveEvents & EventTypeEnum.Removed) != 0 ? new CircularQueue<T>() : null;

-

-      for (int i = 0; i < count; i++)

-      {

-        T item = deleteMin();

-        if (wasRemoved != null)

-          wasRemoved.Enqueue(item);

-      }

-      if (wasRemoved != null)

-        raiseForRemoveAll(wasRemoved);

-      else if ((ActiveEvents & EventTypeEnum.Changed) != 0)

-        raiseCollectionChanged();

-    }

-

-    #endregion

-

-    #region IPersistent<T> Members

-#if NCP

-    int maxsnapid { get { return snapList == null ? -1 : findLastLiveSnapShot(); } }

-

-    int findLastLiveSnapShot()

-    {

-      if (snapList == null)

-        return -1;

-      SnapRef lastLiveSnapRef = snapList.Prev;

-      object _snapshot = null;

-      while (lastLiveSnapRef != null && (_snapshot = lastLiveSnapRef.Tree.Target) == null)

-        lastLiveSnapRef = lastLiveSnapRef.Prev;

-      if (lastLiveSnapRef == null)

-      {

-        snapList = null;

-        return -1;

-      }

-      if (snapList.Prev != lastLiveSnapRef)

-      {

-        snapList.Prev = lastLiveSnapRef;

-        lastLiveSnapRef.Next = snapList;

-      }

-      return ((TreeSet<T>)_snapshot).generation;

-    }

-

-    [Serializable]

-    class SnapRef

-    {

-      public SnapRef Prev, Next;

-      public WeakReference Tree;

-      public SnapRef(TreeSet<T> tree) { Tree = new WeakReference(tree); }

-      public void Dispose()

-      {

-        Next.Prev = Prev;

-        if (Prev != null)

-          Prev.Next = Next;

-        Next = Prev = null;

-      }

-    }

-#endif

-

-    /// <summary>

-    /// If this tree is a snapshot, remove registration in base tree

-    /// </summary>

-    [Tested]

-    public void Dispose()

-    {

-#if NCP

-      if (!isValid)

-        return;

-      if (isSnapShot)

-      {

-        snapList.Dispose();

-        snapDispose();

-      }

-      else

-      {

-        if (snapList != null)

-        {

-          SnapRef someSnapRef = snapList.Prev;

-          while (someSnapRef != null)

-          {

-            TreeSet<T> lastsnap;

-            if ((lastsnap = someSnapRef.Tree.Target as TreeSet<T>) != null)

-              lastsnap.snapDispose();

-            someSnapRef = someSnapRef.Prev;

-          }

-        }

-        snapList = null;

-        Clear();

-      }

-#else

-      Clear();

-#endif

-    }

-

-    private void snapDispose()

-    {

-      root = null;

-      dirs = null;

-      path = null;

-      comparer = null;

-      isValid = false;

-      snapList = null;

-    }

-

-    /// <summary>

-    /// Make a (read-only) snapshot of this collection.

-    /// </summary>

-    /// <returns>The snapshot.</returns>

-    [Tested]

-    public ISorted<T> Snapshot()

-    {

-#if NCP

-      if (isSnapShot)

-        throw new InvalidOperationException("Cannot snapshot a snapshot");

-

-      TreeSet<T> res = (TreeSet<T>)MemberwiseClone();

-      SnapRef newSnapRef = new SnapRef(res);

-      res.isReadOnly = true;

-      res.isSnapShot = true;

-      res.snapList = newSnapRef;

-

-      findLastLiveSnapShot();

-      if (snapList == null)

-        snapList = new SnapRef(this);

-      SnapRef lastLiveSnapRef = snapList.Prev;

-

-      newSnapRef.Prev = lastLiveSnapRef;

-      if (lastLiveSnapRef != null)

-        lastLiveSnapRef.Next = newSnapRef;

-      newSnapRef.Next = snapList;

-      snapList.Prev = newSnapRef;

-

-      generation++;

-

-      return res;

-#endif

-    }

-

-    #endregion

-

-    #region TreeSet.Range nested class

-

-    internal class Range : DirectedCollectionValueBase<T>, IDirectedCollectionValue<T>

-    {

-      //We actually need exclusive upper and lower bounds, and flags to 

-      //indicate whether the bound is present (we canot rely on default(T))

-      private int stamp, size;

-

-      private TreeSet<T> basis;

-

-      private T lowend, highend;

-

-      private bool haslowend, hashighend;

-

-      EnumerationDirection direction;

-

-

-      [Tested]

-      public Range(TreeSet<T> basis, bool haslowend, T lowend, bool hashighend, T highend, EnumerationDirection direction)

-      {

-        this.basis = basis;

-        stamp = basis.stamp;

-

-        //lowind will be const; should we cache highind?

-        this.lowend = lowend; //Inclusive

-        this.highend = highend;//Exclusive

-        this.haslowend = haslowend;

-        this.hashighend = hashighend;

-        this.direction = direction;

-        if (!basis.isSnapShot)

-          size = haslowend ?

-              (hashighend ? basis.CountFromTo(lowend, highend) : basis.CountFrom(lowend)) :

-              (hashighend ? basis.CountTo(highend) : basis.Count);

-      }

-

-      #region IEnumerable<T> Members

-

-

-      #region TreeSet.Range.Enumerator nested class

-

-      internal class Enumerator : SCG.IEnumerator<T>

-      {

-        #region Private Fields

-        private bool valid = false, ready = true;

-

-        private SCG.IComparer<T> comparer;

-

-        private T current;

-#if BAG

-        int togo;

-#endif

-

-        private Node cursor;

-

-        private Node[] path; // stack of nodes

-

-        private int level = 0;

-

-        private Range range;

-

-        private bool forwards;

-

-        #endregion

-        [Tested]

-        public Enumerator(Range range)

-        {

-          comparer = range.basis.comparer;

-          path = new Node[2 * range.basis.blackdepth];

-          this.range = range;

-          forwards = range.direction == EnumerationDirection.Forwards;

-          cursor = new Node();

-          if (forwards)

-            cursor.right = range.basis.root;

-          else

-            cursor.left = range.basis.root;

-          range.basis.modifycheck(range.stamp);

-        }

-

-

-        int compare(T i1, T i2) { return comparer.Compare(i1, i2); }

-

-

-        /// <summary>

-        /// Undefined if enumerator is not valid (MoveNext hash been called returning true)

-        /// </summary>

-        /// <value>The current value of the enumerator.</value>

-        [Tested]

-        public T Current

-        {

-          [Tested]

-          get

-          {

-            if (valid)

-              return current;

-            else

-              throw new InvalidOperationException();

-          }

-        }

-

-

-        //Maintain a stack of nodes that are roots of

-        //subtrees not completely exported yet. Invariant:

-        //The stack nodes together with their right subtrees

-        //consists of exactly the items we have not passed

-        //yet (the top of the stack holds current item).

-        /// <summary>

-        /// Move enumerator to next item in tree, or the first item if

-        /// this is the first call to MoveNext. 

-        /// <exception cref="CollectionModifiedException"/> if underlying tree was modified.

-        /// </summary>

-        /// <returns>True if enumerator is valid now</returns>

-        [Tested]

-        public bool MoveNext()

-        {

-          range.basis.modifycheck(range.stamp);

-          if (!ready)

-            return false;

-#if BAG

-          if (--togo > 0)

-            return true;

-#endif

-          if (forwards)

-          {

-            if (!valid && range.haslowend)

-            {

-              cursor = cursor.right;

-              while (cursor != null)

-              {

-                int comp = compare(cursor.item, range.lowend);

-

-                if (comp > 0)

-                {

-                  path[level++] = cursor;

-#if NCP

-                  cursor = range.basis.left(cursor);

-#else

-									cursor = cursor.left;

-#endif

-                }

-                else if (comp < 0)

-                {

-#if NCP

-                  cursor = range.basis.right(cursor);

-#else

-									cursor = cursor.right;

-#endif

-                }

-                else

-                {

-                  path[level] = cursor;

-                  break;

-                }

-              }

-

-              if (cursor == null)

-              {

-                if (level == 0)

-                  return valid = ready = false;

-                else

-                  cursor = path[--level];

-              }

-            }

-#if NCP

-            else if (range.basis.right(cursor) != null)

-            {

-              path[level] = cursor = range.basis.right(cursor);

-

-              Node next = range.basis.left(cursor);

-

-              while (next != null)

-              {

-                path[++level] = cursor = next;

-                next = range.basis.left(cursor);

-              }

-            }

-#else

-						else if (cursor.right != null)

-						{

-							path[level] = cursor = cursor.right;

-							while (cursor.left != null)

-								path[++level] = cursor = cursor.left;

-						}

-#endif

-            else if (level == 0)

-              return valid = ready = false;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-            if (range.hashighend && compare(current, range.highend) >= 0)

-              return valid = ready = false;

-

-#if BAG

-            togo = cursor.items;

-#endif

-            return valid = true;

-          }

-          else

-          {

-            if (!valid && range.hashighend)

-            {

-              cursor = cursor.left;

-              while (cursor != null)

-              {

-                int comp = compare(cursor.item, range.highend);

-

-                if (comp < 0)

-                {

-                  path[level++] = cursor;

-#if NCP

-                  cursor = range.basis.right(cursor);

-#else

-									cursor = cursor.right;

-#endif

-                }

-                else

-                {

-#if NCP

-                  cursor = range.basis.left(cursor);

-#else

-									cursor = cursor.left;

-#endif

-                }

-              }

-

-              if (cursor == null)

-              {

-                if (level == 0)

-                  return valid = ready = false;

-                else

-                  cursor = path[--level];

-              }

-            }

-#if NCP

-            else if (range.basis.left(cursor) != null)

-            {

-              path[level] = cursor = range.basis.left(cursor);

-

-              Node next = range.basis.right(cursor);

-

-              while (next != null)

-              {

-                path[++level] = cursor = next;

-                next = range.basis.right(cursor);

-              }

-            }

-#else

-						else if (cursor.left != null)

-						{

-							path[level] = cursor = cursor.left;

-							while (cursor.right != null)

-								path[++level] = cursor = cursor.right;

-						}

-#endif

-            else if (level == 0)

-              return valid = ready = false;

-            else

-              cursor = path[--level];

-

-            current = cursor.item;

-            if (range.haslowend && compare(current, range.lowend) < 0)

-              return valid = ready = false;

-

-#if BAG

-            togo = cursor.items;

-#endif

-            return valid = true;

-          }

-        }

-

-

-        [Tested]

-        public void Dispose()

-        {

-          comparer = null;

-          current = default(T);

-          cursor = null;

-          path = null;

-          range = null;

-        }

-

-        #region IEnumerator Members

-

-        object System.Collections.IEnumerator.Current

-        {

-          get { return Current; }

-        }

-

-        bool System.Collections.IEnumerator.MoveNext()

-        {

-          return MoveNext();

-        }

-

-        void System.Collections.IEnumerator.Reset()

-        {

-          throw new Exception("The method or operation is not implemented.");

-        }

-

-        #endregion

-      }

-

-      #endregion

-

-

-      public override T Choose()

-      {

-        if (size == 0) throw new NoSuchItemException();

-        return lowend;

-      }

-

-      [Tested]

-      public override SCG.IEnumerator<T> GetEnumerator() { return new Enumerator(this); }

-

-

-      [Tested]

-      public override EnumerationDirection Direction { [Tested]get { return direction; } }

-

-

-      #endregion

-

-      #region Utility

-

-      bool inside(T item)

-      {

-        return (!haslowend || basis.comparer.Compare(item, lowend) >= 0) && (!hashighend || basis.comparer.Compare(item, highend) < 0);

-      }

-

-

-      void checkstamp()

-      {

-        if (stamp < basis.stamp)

-          throw new CollectionModifiedException();

-      }

-

-

-      void syncstamp() { stamp = basis.stamp; }

-

-      #endregion

-

-      [Tested]

-      public override IDirectedCollectionValue<T> Backwards()

-      {

-        Range b = (Range)MemberwiseClone();

-

-        b.direction = direction == EnumerationDirection.Forwards ? EnumerationDirection.Backwards : EnumerationDirection.Forwards;

-        return b;

-      }

-

-

-      [Tested]

-      IDirectedEnumerable<T> IDirectedEnumerable<T>.Backwards() { return Backwards(); }

-

-

-      public override bool IsEmpty { get { return size == 0; } }

-

-      [Tested]

-      public override int Count { [Tested] get { return size; } }

-

-      //TODO: check that this is correct

-      public override Speed CountSpeed { get { return Speed.Constant; } }

-

-    }

-

-    #endregion

-

-    #region Diagnostics

-    /// <summary>

-    /// Display this node on the console, and recursively its subnodes.

-    /// </summary>

-    /// <param name="n">Node to display</param>

-    /// <param name="space">Indentation</param>

-    private void minidump(Node n, string space)

-    {

-      if (n == null)

-      {

-        //	System.Console.WriteLine(space + "null");

-      }

-      else

-      {

-        minidump(n.right, space + "  ");

-        Console.WriteLine(String.Format("{0} {4} (size={1}, items={8}, h={2}, gen={3}, id={6}){7}", space + n.item,

-#if MAINTAIN_SIZE

- n.size,

-#else

-				0,

-#endif

- 0,

-#if NCP

- n.generation,

-#endif

- n.red ? "RED" : "BLACK",

- 0,

- 0,

-#if NCP

-#if SEPARATE_EXTRA

-				n.extra == null ? "" : String.Format(" [extra: lg={0}, c={1}, i={2}]", n.extra.lastgeneration, n.extra.leftnode ? "L" : "R", n.extra.oldref == null ? "()" : "" + n.extra.oldref.item),

-#else

- n.lastgeneration == -1 ? "" : String.Format(" [extra: lg={0}, c={1}, i={2}]", n.lastgeneration, n.leftnode ? "L" : "R", n.oldref == null ? "()" : "" + n.oldref.item),

-#endif

-#else

-				"",

-#endif

-#if BAG

- n.items

-#else

- 1

-#endif

-));

-        minidump(n.left, space + "  ");

-      }

-    }

-

-

-    /// <summary>

-    /// Print the tree structure to the console stdout.

-    /// </summary>

-    [Tested(via = "Sawtooth")]

-    public void dump() { dump(""); }

-

-

-    /// <summary>

-    /// Print the tree structure to the console stdout.

-    /// </summary>

-    [Tested(via = "Sawtooth")]

-    public void dump(string msg)

-    {

-      Console.WriteLine(String.Format(">>>>>>>>>>>>>>>>>>> dump {0} (count={1}, blackdepth={2}, depth={3}, gen={4})", msg, size, blackdepth,

-      0

-      ,

-#if NCP

- generation

-#endif

-));

-      minidump(root, "");

-      check("", Console.Out); Console.WriteLine("<<<<<<<<<<<<<<<<<<<");

-    }

-

-

-    /// <summary>

-    /// Display this tree on the console.

-    /// </summary>

-    /// <param name="msg">Identifying string of this call to dump</param>

-    /// <param name="err">Extra (error)message to include</param>

-    void dump(string msg, string err)

-    {

-      Console.WriteLine(String.Format(">>>>>>>>>>>>>>>>>>> dump {0} (count={1}, blackdepth={2}, depth={3}, gen={4})", msg, size, blackdepth,

-      0

-      ,

-#if NCP

- generation

-#endif

-));

-      minidump(root, ""); Console.Write(err);

-      Console.WriteLine("<<<<<<<<<<<<<<<<<<<");

-    }

-

-

-    /// <summary>

-    /// Print warning m on o if b is false.

-    /// </summary>

-    /// <param name="b">Condition that should hold</param>

-    /// <param name="n">Place (used for id display)</param>

-    /// <param name="m">Message</param>

-    /// <param name="o">Output stream</param>

-    /// <returns>b</returns>

-    bool massert(bool b, Node n, string m, System.IO.TextWriter o)

-    {

-      if (!b) o.WriteLine("*** Node (item={0}, id={1}): {2}", n.item,

-        0

-        , m);

-

-      return b;

-    }

-

-

-    bool rbminicheck(Node n, bool redp, System.IO.TextWriter o, out T min, out T max, out int blackheight, int maxgen)

-    {//Red-Black invariant

-      bool res = true;

-

-      res = massert(!(n.red && redp), n, "RED parent of RED node", o) && res;

-      res = massert(n.left == null || n.right != null || n.left.red, n, "Left child black, but right child empty", o) && res;

-      res = massert(n.right == null || n.left != null || n.right.red, n, "Right child black, but left child empty", o) && res;

-#if BAG

-      bool sb = n.size == (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + n.items;

-

-      res = massert(sb, n, "Bad size", o) && res;

-#elif MAINTAIN_SIZE

-      bool sb = n.size == (n.left == null ? 0 : n.left.size) + (n.right == null ? 0 : n.right.size) + 1;

-

-      res = massert(sb, n, "Bad size", o) && res;

-#endif

-      min = max = n.item;

-

-      T otherext;

-      int lbh = 0, rbh = 0;

-

-      if (n.left != null)

-      {

-        res = rbminicheck(n.left, n.red, o, out min, out otherext, out lbh, generation) && res;

-        res = massert(comparer.Compare(n.item, otherext) > 0, n, "Value not > all left children", o) && res;

-      }

-

-      if (n.right != null)

-      {

-        res = rbminicheck(n.right, n.red, o, out otherext, out max, out rbh, generation) && res;

-        res = massert(comparer.Compare(n.item, otherext) < 0, n, "Value not < all right children", o) && res;

-      }

-

-      res = massert(rbh == lbh, n, "Different blackheights of children", o) && res;

-      blackheight = n.red ? rbh : rbh + 1;

-      return res;

-    }

-

-

-

-

-#if NCP

-

-    bool rbminisnapcheck(Node n, System.IO.TextWriter o, out int size, out T min, out T max)

-    {

-      bool res = true;

-

-      min = max = n.item;

-

-      int lsz = 0, rsz = 0;

-      T otherext;

-#if SEPARATE_EXTRA

-			Node.Extra extra = n.extra;

-			Node child = (extra != null && extra.lastgeneration >= treegen && extra.leftnode) ? extra.oldref : n.left;

-#else

-      Node child = (n.lastgeneration >= generation && n.leftnode) ? n.oldref : n.left;

-#endif

-      if (child != null)

-      {

-        res = rbminisnapcheck(child, o, out lsz, out min, out otherext) && res;

-        res = massert(comparer.Compare(n.item, otherext) > 0, n, "Value not > all left children", o) && res;

-      }

-

-#if SEPARATE_EXTRA

-			child = (extra != null && extra.lastgeneration >= treegen && !extra.leftnode) ? extra.oldref : n.right;

-#else

-      child = (n.lastgeneration >= generation && !n.leftnode) ? n.oldref : n.right;

-#endif

-      if (child != null)

-      {

-        res = rbminisnapcheck(child, o, out rsz, out otherext, out max) && res;

-        res = massert(comparer.Compare(n.item, otherext) < 0, n, "Value not < all right children", o) && res;

-      }

-#if BAG

-      size = n.items + lsz + rsz;

-#else

-      size = 1 + lsz + rsz;

-#endif

-      return res;

-    }

-#endif

-

-    /// <summary>

-    /// Checks red-black invariant. Dumps tree to console if bad

-    /// </summary>

-    /// <param name="name">Title of dump</param>

-    /// <returns>false if invariant violation</returns>

-    [Tested(via = "Sawtooth")]

-    public bool Check(string name)

-    {

-      System.Text.StringBuilder e = new System.Text.StringBuilder();

-      System.IO.TextWriter o = new System.IO.StringWriter(e);

-

-      if (!check(name, o))

-        return true;

-      else

-      {

-        dump(name, e.ToString());

-        return false;

-      }

-    }

-

-

-    /// <summary>

-    /// Checks red-black invariant. Dumps tree to console if bad

-    /// </summary>

-    /// <returns>false if invariant violation</returns>

-    [Tested]

-    public bool Check()

-    {

-      //return check("", System.IO.TextWriter.Null);

-      //Console.WriteLine("bamse");

-      if (!isValid)

-        return true;

-      return Check("-");

-    }

-

-

-    bool check(string msg, System.IO.TextWriter o)

-    {

-      if (root != null)

-      {

-        T max, min;

-        int blackheight;

-#if NCP

-        if (isSnapShot)

-        {

-          //Console.WriteLine("Im'a snapshot");

-          int thesize;

-          bool rv = rbminisnapcheck(root, o, out thesize, out min, out max);

-

-          rv = massert(size == thesize, root, "bad snapshot size", o) && rv;

-          return !rv;

-        }

-#endif

-        bool res = rbminicheck(root, false, o, out min, out max, out blackheight, generation);

-        res = massert(blackheight == blackdepth, root, "bad blackh/d", o) && res;

-        res = massert(!root.red, root, "root is red", o) && res;

-#if MAINTAIN_SIZE

-        res = massert(root.size == size, root, "count!=root.size", o) && res;

-#endif

-        return !res;

-      }

-      else

-        return false;

-    }

-    #endregion

-

-    #region ICloneable Members

-

-    /// <summary>

-    /// Make a shallow copy of this TreeSet.

-    /// </summary>

-    /// <returns></returns>

-    public virtual object Clone()

-    {

-      TreeSet<T> clone = new TreeSet<T>(comparer, EqualityComparer);

-      //TODO: make sure the TreeBag AddSorted copies tree bags smartly!!!

-      clone.AddSorted(this);

-      return clone;

-    }

-

-    #endregion

-

-  }

-}

-

-
-#endif
diff --git a/mcs/class/Mono.C5/ChangeLog b/mcs/class/Mono.C5/ChangeLog
index ba428cdeacb..7617ccc1f7e 100644
--- a/mcs/class/Mono.C5/ChangeLog
+++ b/mcs/class/Mono.C5/ChangeLog
@@ -1,20 +1,6 @@
-2006-02-16  Martin Baulig  <martin@ximian.com>
-
-	Importing version 1.0 of C5, http://www.itu.dk/research/c5/.
-
-	* C5/trees/RedBlackTreeBag.cs: Added autogenerated file.
-	* C5/linkedlists/HashedLinkedList.cs: Likewise.
-	* C5/arrays/HashedArrayList.cs: Likewise.
-
-	* PreProcess/: Removed; we keep the autogenerated files in SVN.
-
-2006-02-16  Martin Baulig  <martin@ximian.com>
-
-	* C5/: New directory containing all the source code.
-
 2005-07-10  Kamil Skalski <nazgul@nemerle.org>
 
-	* C5/Builder.cs: Use MakeGenericType instead of BindGenericParameters.
+	* Builder.cs: Use MakeGenericType instead of BindGenericParameters.
 
 2005-06-27  Ben Maurer  <bmaurer@ximian.com>
 
@@ -24,7 +10,7 @@
 
 	Reflect latest API changes.
 
-	* C5/Collections.cs (EnumerableBase): Explicitly implement
+	* Collections.cs (EnumerableBase): Explicitly implement
 	System.Collections.IEnumerable.GetEnumerator().	
 
 	* Makefile: Add `nowarn:169'.
@@ -39,14 +25,14 @@
 
 2004-11-19  Martin Baulig  <martin@ximian.com>
 
-	* C5/Wrappers.cs: Removed all the FIXME's.  GMCS can now compile the
+	* Wrappers.cs: Removed all the FIXME's.  GMCS can now compile the
 	original, unmodified code :-)
 
 2004-11-12  Martin Baulig  <martin@ximian.com>
 
-	* C5/Wrappers.cs: Added workaround for #69082.
+	* Wrappers.cs: Added workaround for #69082.
 
-	* C5/linkedlists/LinkedList.cs: Added workaround for bug #57747.
+	* linkedlists/LinkedList.cs: Added workaround for bug #57747.
 
 2004-08-16  Martin Baulig  <martin@ximian.com>
 
diff --git a/mcs/class/Mono.C5/C5.old/Collections.cs b/mcs/class/Mono.C5/Collections.cs
index d85f6217098..d85f6217098 100644
--- a/mcs/class/Mono.C5/C5.old/Collections.cs
+++ b/mcs/class/Mono.C5/Collections.cs
diff --git a/mcs/class/Mono.C5/C5.old/Dictionaries.cs b/mcs/class/Mono.C5/Dictionaries.cs
index 6d6d4983daa..6d6d4983daa 100644
--- a/mcs/class/Mono.C5/C5.old/Dictionaries.cs
+++ b/mcs/class/Mono.C5/Dictionaries.cs
diff --git a/mcs/class/Mono.C5/C5.old/Interfaces.cs b/mcs/class/Mono.C5/Interfaces.cs
index c999dc21d7d..c999dc21d7d 100644
--- a/mcs/class/Mono.C5/C5.old/Interfaces.cs
+++ b/mcs/class/Mono.C5/Interfaces.cs
diff --git a/mcs/class/Mono.C5/LICENSE.txt b/mcs/class/Mono.C5/LICENSE.txt
index 50e744c9f8a..495ee7c5e80 100644
--- a/mcs/class/Mono.C5/LICENSE.txt
+++ b/mcs/class/Mono.C5/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft.

+Copyright (c) 2003-2004 Niels Joergen Kokholm <kokholm@itu.dk>, Peter Sestoft <sestoft@dina.kvl.dk>

 

 Permission is hereby granted, free of charge, to any person obtaining a copy

 of this software and associated documentation files (the "Software"), to deal

diff --git a/mcs/class/Mono.C5/Mono.C5.dll.sources b/mcs/class/Mono.C5/Mono.C5.dll.sources
index 0ec353c86fa..54331d01057 100644
--- a/mcs/class/Mono.C5/Mono.C5.dll.sources
+++ b/mcs/class/Mono.C5/Mono.C5.dll.sources
@@ -1,33 +1,18 @@
-C5/hashing/HashTable.cs
-C5/hashing/HashBag.cs
-C5/hashing/HashDictionary.cs
-C5/trees/RedBlackTreeBag.cs
-C5/trees/RedBlackTreeDictionary.cs
-C5/trees/RedBlackTreeSet.cs
-C5/linkedlists/HashedLinkedList.cs
-C5/linkedlists/LinkedList.cs
-C5/heaps/IntervalHeap.cs
-C5/arrays/HashedArrayList.cs
-C5/arrays/SortedArray.cs
-C5/arrays/CircularQueue.cs
-C5/arrays/ArrayList.cs
-C5/MappedEnumerators.cs
-C5/Dictionaries.cs
-C5/Collections.cs
-C5/Random.cs
-C5/Exceptions.cs
-C5/Interfaces.cs
-C5/Sorting.cs
-C5/Attributes.cs
-C5/Enums.cs
-C5/AssemblyInfo.cs
-C5/Hashers.cs
-C5/Delegates.cs
-C5/Records.cs
-C5/WrappedArray.cs
-C5/Wrappers.cs
-C5/Events.cs
-C5/Builtin.cs
-C5/ViewSupport.cs
-C5/Comparer.cs
-C5/Formatting.cs
+arrays/ArrayList.cs
+arrays/HashedArray.cs
+arrays/SortedArray.cs
+AssemblyInfo.cs
+Builder.cs
+Collections.cs
+Dictionaries.cs
+hashing/HashBag.cs
+hashing/HashDictionary.cs
+hashing/HashTable.cs
+heaps/IntervalHeap.cs
+Interfaces.cs
+linkedlists/HashedLinkedLIst.cs
+linkedlists/LinkedList.cs
+trees/RedBlackTree.cs
+trees/RedBlackTreeBag.cs
+trees/TreeDictionary.cs
+Wrappers.cs
diff --git a/mcs/class/Mono.C5/Test/AssemblyInfo.cs b/mcs/class/Mono.C5/Test/AssemblyInfo.cs
index 5a12cf79079..e08ead5c6e5 100644
--- a/mcs/class/Mono.C5/Test/AssemblyInfo.cs
+++ b/mcs/class/Mono.C5/Test/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

diff --git a/mcs/class/Mono.C5/Test/BasesTest.cs b/mcs/class/Mono.C5/Test/BasesTest.cs
index 60cfe17b29a..51d448d3716 100644
--- a/mcs/class/Mono.C5/Test/BasesTest.cs
+++ b/mcs/class/Mono.C5/Test/BasesTest.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,398 +23,235 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

 

-namespace C5UnitTests.support

+namespace nunit.support

 {

-  namespace bases

-  {

-    [TestFixture]

-    public class ArrayBaseTest

-    {

-      class ABT : ArrayBase<string>

-      {

-        public ABT() : base(8,NaturalEqualityComparer<string>.Default) { }

-

-        public override string Choose() { if (size > 0) return array[0]; throw new NoSuchItemException(); }

-

-        public string this[int i] { get { return array[i]; } set { array[i] = value; } }

-

-

-        public int thesize { get { return size; } set { size = value; } }

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        ABT abt = new ABT();

-

-        abt.thesize = 3;

-        abt[2] = "aaa";

-        // Assert.IsFalse(abt.Check());

-        abt[0] = "##";

-        abt[1] = "##";

-        Assert.IsTrue(abt.Check());

-      }

-    }

-  }

-

-  namespace itemops

-  {

-    [TestFixture]

-    public class Comparers

-    {

-      class dbl : IComparable<dbl>

-      {

-        double d;

-

-        public dbl(double din) { d = din; }

-

-        public int CompareTo(dbl that)

-        {

-          return d < that.d ? -1 : d == that.d ? 0 : 1;

-        }

-        public bool Equals(dbl that) { return d == that.d; }

-      }

-

-      [Test]

-      [ExpectedException(typeof(NotComparableException))]

-      public void NotComparable()

-      {

-        SCG.IComparer<object> foo = Comparer<object>.Default;

-      }

-

-      [Test]

-      public void GenericC()

-      {

-        SCG.IComparer<dbl> h = new NaturalComparer<dbl>();

-        dbl s = new dbl(3.4);

-        dbl t = new dbl(3.4);

-        dbl u = new dbl(7.4);

-

-        Assert.AreEqual(0, h.Compare(s, t));

-        Assert.IsTrue(h.Compare(s, u) < 0);

-      }

-

-

-      [Test]

-      public void OrdinaryC()

-      {

-        SCG.IComparer<string> h = new NaturalComparerO<string>();

-        string s = "bamse";

-        string t = "bamse";

-        string u = "bimse";

-

-        Assert.AreEqual(0, h.Compare(s, t));

-        Assert.IsTrue(h.Compare(s, u) < 0);

-      }

-

-

-      [Test]

-      public void GenericCViaBuilder()

-      {

-        SCG.IComparer<dbl> h = Comparer<dbl>.Default;

-        dbl s = new dbl(3.4);

-        dbl t = new dbl(3.4);

-        dbl u = new dbl(7.4);

-

-        Assert.AreEqual(0, h.Compare(s, t));

-        Assert.IsTrue(h.Compare(s, u) < 0);

-        Assert.AreSame(h, Comparer<dbl>.Default);

-      }

-

-

-      [Test]

-      public void OrdinaryCViaBuilder()

-      {

-        SCG.IComparer<string> h = Comparer<string>.Default;

-        string s = "bamse";

-        string t = "bamse";

-        string u = "bimse";

-

-        Assert.AreEqual(0, h.Compare(s, t));

-        Assert.IsTrue(h.Compare(s, u) < 0);

-        Assert.AreSame(h, Comparer<string>.Default);

-

-      }

-

-

-      [Test]

-      public void ICViaBuilder()

-      {

-        SCG.IComparer<int> h = Comparer<int>.Default;

-        int s = 4;

-        int t = 4;

-        int u = 5;

-

-        Assert.AreEqual(0, h.Compare(s, t));

-        Assert.IsTrue(h.Compare(s, u) < 0);

-        Assert.AreSame(h, Comparer<int>.Default);

-

-      }

-

-      [Test]

-      public void Nulls()

-      {

-        Assert.IsTrue(Comparer<string>.Default.Compare(null, "abe") < 0);

-        Assert.IsTrue(Comparer<string>.Default.Compare(null, null) == 0);

-        Assert.IsTrue(Comparer<string>.Default.Compare("abe", null) > 0);

-      }

-    }

-

-    [TestFixture]

-    public class EqualityComparers

-    {

-      [Test]

-      public void ReftypeequalityComparer()

-      {

-        SCG.IEqualityComparer<string> h = NaturalEqualityComparer<string>.Default;

-        string s = "bamse";

-        string t = "bamse";

-        string u = "bimse";

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-      }

-

-

-      [Test]

-      public void ValuetypeequalityComparer()

-      {

-        SCG.IEqualityComparer<double> h = NaturalEqualityComparer<double>.Default;

-        double s = 3.4;

-        double t = 3.4;

-        double u = 5.7;

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-      }

-

-      internal class REHTest { public override int GetHashCode() { return 37; } }

-

-      [Test]

-      public void ReferenceEqualityEqualityComparerTest()

-      {

-        REHTest rehtest = new REHTest();

-        SCG.IEqualityComparer<REHTest> equalityComparer = ReferenceEqualityComparer<REHTest>.Default;

-        Assert.AreEqual(37, rehtest.GetHashCode());

-        Assert.IsFalse(equalityComparer.GetHashCode(rehtest) == 37);

-      }

-

-      [Test]

-      public void ReftypeequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<string> h = EqualityComparer<string>.Default;

-        string s = "bamse";

-        string t = "bamse";

-        string u = "bimse";

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<string>.Default);

-      }

-

-

-      [Test]

-      public void ValuetypeequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<double> h = EqualityComparer<double>.Default;

-        double s = 3.4;

-        double t = 3.4;

-        double u = 5.7;

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<double>.Default);

-      }

-

-

-      [Test]

-      public void IntequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<int> h = EqualityComparer<int>.Default;

-        int s = 3;

-        int t = 3;

-        int u = 5;

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<int>.Default);

-      }

-

-      [Test]

-      public void DoubleequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<double> h = EqualityComparer<double>.Default;

-        double s = 3.1;

-        double t = 3.1;

-        double u = 5.2;

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<double>.Default);

-      }

-

-      [Test]

-      public void CharequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<char> h = EqualityComparer<char>.Default;

-        char s = '�';

-        char t = '�';

-        char u = 'r';

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<char>.Default);

-      }

-

-      [Test]

-      public void ByteequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<byte> h = EqualityComparer<byte>.Default;

-        byte s = 3;

-        byte t = 3;

-        byte u = 5;

-

-        Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<byte>.Default);

-      }

-

-      [Test]

-      public void UnseqequalityComparerViaBuilder()

-      {

-        SCG.IEqualityComparer<ICollection<int>> h = EqualityComparer<ICollection<int>>.Default;

-        ICollection<int> s = new LinkedList<int>();

-        ICollection<int> t = new LinkedList<int>();

-        ICollection<int> u = new LinkedList<int>();

-        s.Add(1); s.Add(2); s.Add(3);

-        t.Add(3); t.Add(2); t.Add(1);

-        u.Add(3); u.Add(2); u.Add(4);

-        Assert.AreEqual(s.GetUnsequencedHashCode(), h.GetHashCode(s));

-        Assert.IsTrue(h.Equals(s, t));

-        Assert.IsFalse(h.Equals(s, u));

-        Assert.AreSame(h, EqualityComparer<ICollection<int>>.Default);

-      }

-

-      [Test]

-      public void SeqequalityComparerViaBuilder2()

-      {

-        SCG.IEqualityComparer<LinkedList<int>> h = EqualityComparer<LinkedList<int>>.Default;

-        LinkedList<int> s = new LinkedList<int>();

-        s.Add(1); s.Add(2); s.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(1, 2, 3), h.GetHashCode(s));

-      }

-

-      [Test]

-      public void UnseqequalityComparerViaBuilder2()

-      {

-        SCG.IEqualityComparer<HashSet<int>> h = EqualityComparer<HashSet<int>>.Default;

-        HashSet<int> s = new HashSet<int>();

-        s.Add(1); s.Add(2); s.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(1, 2, 3), h.GetHashCode(s));

-      }

-

-      //generic types implementing collection interfaces

-      [Test]

-      public void SeqequalityComparerViaBuilder3()

-      {

-        SCG.IEqualityComparer<IList<int>> h = EqualityComparer<IList<int>>.Default;

-        IList<int> s = new LinkedList<int>();

-        s.Add(1); s.Add(2); s.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(1, 2, 3), h.GetHashCode(s));

-      }

-

-      interface IFoo<T> : ICollection<T> { void Bamse();      }

-

-      class Foo<T> : HashSet<T>, IFoo<T>

-      {

-        internal Foo() : base() { }

-        public void Bamse() { }

-      }

-

-      [Test]

-      public void UnseqequalityComparerViaBuilder3()

-      {

-        SCG.IEqualityComparer<IFoo<int>> h = EqualityComparer<IFoo<int>>.Default;

-        IFoo<int> s = new Foo<int>();

-        s.Add(1); s.Add(2); s.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(1, 2, 3), h.GetHashCode(s));

-      }

-

-      //Nongeneric types implementing collection types:

-      interface IBaz : ISequenced<int> { void Bamse(); }

-

-      class Baz : LinkedList<int>, IBaz

-      {

-        internal Baz() : base() { }

-        public void Bamse() { }

-        //int ISequenced<int>.GetHashCode() { return sequencedhashcode(); }

-        //bool ISequenced<int>.Equals(ISequenced<int> that) { return sequencedequals(that); }

-      }

-

-#warning This test fails because of an error in .Net 2.0

-      //[Test]

-      public void SeqequalityComparerViaBuilder4()

-      {

-        SCG.IEqualityComparer<IBaz> h = EqualityComparer<IBaz>.Default;

-        IBaz s = new Baz();

-        s.Add(1); s.Add(2); s.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(1, 2, 3), h.GetHashCode(s));

-      }

-

-      interface IBar : ICollection<int>

-      {

-        void Bamse();

-      }

-

-      class Bar : HashSet<int>, IBar

-      {

-        internal Bar() : base() { }

-        public void Bamse() { }

-

-        //TODO: remove all this workaround stuff:

- 

-        bool ICollection<int>.ContainsAll<U>(System.Collections.Generic.IEnumerable<U> items) 

-        {

-          throw new NotImplementedException();

-        }

- 

-        void ICollection<int>.RemoveAll<U>(System.Collections.Generic.IEnumerable<U> items) 

-        {

-          throw new NotImplementedException();

-        }

-

-        void ICollection<int>.RetainAll<U>(System.Collections.Generic.IEnumerable<U> items) 

-        {

-          throw new NotImplementedException();

-        }

-

-        void IExtensible<int>.AddAll<U>(System.Collections.Generic.IEnumerable<U> items) 

-        {

-          throw new NotImplementedException();

-        }

-

-      }

-

-      [Test]

-      public void UnseqequalityComparerViaBuilder4()

-      {

-        SCG.IEqualityComparer<IBar> h = EqualityComparer<IBar>.Default;

-        IBar s = new Bar();

-        s.Add(1); s.Add(2); s.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(1, 2, 3), h.GetHashCode(s));

-      }

-    }

-  }

+	namespace bases

+	{

+		[TestFixture]

+		public class ArrayBaseTest

+		{

+			class ABT: ArrayBase<string>

+			{

+				public ABT() : base(8,new DefaultReferenceTypeHasher<string>()) { }

+

+

+				public string this[int i] { get { return array[i]; } set { array[i] = value; } }

+

+

+				public int thesize { get { return size; } set { size = value; } }

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				ABT abt = new ABT();

+

+				abt.thesize = 3;

+				abt[2] = "aaa";

+				Assert.IsFalse(abt.Check());

+				abt[0] = "##";

+				abt[1] = "##";

+				Assert.IsTrue(abt.Check());

+			}

+		}

+	}

+

+

+

+

+	namespace itemops

+	{

+		[TestFixture]

+		public class Comparers

+		{

+			class dbl: IComparable<dbl>

+			{

+				double d;

+

+				public dbl(double din) { d = din; }

+

+				public int CompareTo(dbl that)

+				{

+					return d < that.d ? -1 : d == that.d ? 0 : 1;

+				}

+                public bool Equals(dbl that) { return d == that.d; }

+            }

+

+			[Test]

+			public void GenericC()

+			{

+				IComparer<dbl> h = new NaturalComparer<dbl>();

+				dbl s = new dbl(3.4);

+				dbl t = new dbl(3.4);

+				dbl u = new dbl(7.4);

+

+				Assert.AreEqual(0, h.Compare(s, t));

+				Assert.IsTrue(h.Compare(s, u) < 0);

+			}

+

+

+			[Test]

+			public void OrdinaryC()

+			{

+				IComparer<string> h = new NaturalComparerO<string>();

+				string s = "bamse";

+				string t = "bamse";

+				string u = "bimse";

+

+				Assert.AreEqual(0, h.Compare(s, t));

+				Assert.IsTrue(h.Compare(s, u) < 0);

+			}

+

+

+			[Test]

+			public void GenericCViaBuilder()

+			{

+				IComparer<dbl> h = C5.ComparerBuilder.FromComparable<dbl>.Examine();

+				dbl s = new dbl(3.4);

+				dbl t = new dbl(3.4);

+				dbl u = new dbl(7.4);

+

+				Assert.AreEqual(0, h.Compare(s, t));

+				Assert.IsTrue(h.Compare(s, u) < 0);

+			}

+

+			[Test]

+			public void OrdinaryCViaBuilder()

+			{

+				IComparer<string> h = C5.ComparerBuilder.FromComparable<string>.Examine();

+				string s = "bamse";

+				string t = "bamse";

+				string u = "bimse";

+

+				Assert.AreEqual(0, h.Compare(s, t));

+				Assert.IsTrue(h.Compare(s, u) < 0);

+			}

+

+			[Test]

+			public void ICViaBuilder()

+			{

+				IComparer<int> h = C5.ComparerBuilder.FromComparable<int>.Examine();

+				int s = 4;

+				int t = 4;

+				int u = 5;

+

+				Assert.AreEqual(0, h.Compare(s, t));

+				Assert.IsTrue(h.Compare(s, u) < 0);

+			}

+

+		}

+

+		[TestFixture]

+		public class Hashers

+		{

+			[Test]

+			public void Reftypehasher()

+			{

+				IHasher<string> h = new DefaultReferenceTypeHasher<string>();

+				string s = "bamse";

+				string t = "bamse";

+				string u = "bimse";

+

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+

+			[Test]

+			public void Valuetypehasher()

+			{

+				IHasher<double> h = new DefaultValueTypeHasher<double>();

+				double s = 3.4;

+				double t = 3.4;

+				double u = 5.7;

+

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+

+			[Test]

+			public void ReftypehasherViaBuilder()

+			{

+				IHasher<string> h = C5.HasherBuilder.ByPrototype<string>.Examine();

+				string s = "bamse";

+				string t = "bamse";

+				string u = "bimse";

+

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+

+			[Test]

+			public void ValuetypehasherViaBuilder()

+			{

+				IHasher<double> h = C5.HasherBuilder.ByPrototype<double>.Examine();

+				double s = 3.4;

+				double t = 3.4;

+				double u = 5.7;

+

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+

+			[Test]

+			public void InthasherViaBuilder()

+			{

+				IHasher<int> h = C5.HasherBuilder.ByPrototype<int>.Examine();

+				int s = 3;

+				int t = 3;

+				int u = 5;

+

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+			[Test]

+			public void UnseqhasherViaBuilder()

+			{

+				IHasher<ICollection<int>> h = C5.HasherBuilder.ByPrototype<ICollection<int>>.Examine();

+				ICollection<int> s = new LinkedList<int>();

+				ICollection<int> t = new LinkedList<int>();

+				ICollection<int> u = new LinkedList<int>();

+				s.Add(1);s.Add(2);s.Add(3);

+				t.Add(3);t.Add(2);t.Add(1);

+				u.Add(3);u.Add(2);u.Add(4);

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+

+			[Test]

+			public void SeqhasherViaBuilder()

+			{

+				IHasher<ISequenced<int>> h = C5.HasherBuilder.ByPrototype<ISequenced<int>>.Examine();

+				ISequenced<int> s = new LinkedList<int>();

+				ISequenced<int> t = new LinkedList<int>();

+				ISequenced<int> u = new LinkedList<int>();

+				s.Add(1);s.Add(2);s.Add(3);

+				t.Add(1);t.Add(2);t.Add(3);

+				u.Add(3);u.Add(2);u.Add(1);

+				Assert.AreEqual(s.GetHashCode(), h.GetHashCode(s));

+				Assert.IsTrue(h.Equals(s, t));

+				Assert.IsFalse(h.Equals(s, u));

+			}

+

+

+		}

+

+

+	}

 }

+#endif

diff --git a/mcs/class/Mono.C5/Test/ChangeLog b/mcs/class/Mono.C5/Test/ChangeLog
new file mode 100644
index 00000000000..897084c70f3
--- /dev/null
+++ b/mcs/class/Mono.C5/Test/ChangeLog
@@ -0,0 +1,48 @@
+2005-01-19  Martin Baulig  <martin@ximian.com>
+
+	* test/RedBlackTreeSetTests.cs: Decrease number of iterations.
+	* arrays/SortedArrayTests.cs: Likewise.
+
+2005-01-19  Martin Baulig  <martin@ximian.com>
+
+	* Sorting.cs: 2000 elements is enough for us.
+
+2005-01-19  Martin Baulig  <martin@ximian.com>
+
+	* trees/RedBlackTreeSetTests.cs: Put the threading tests into a
+	"Threading" category, so we can exclude them when running in the
+	debugger.
+	* arrays/SortedArrayTests.cs: Likewise.
+
+2004-12-04  Martin Baulig  <martin@ximian.com>
+
+	* hashing/HashTableTests.cs: Disabled some tests which make
+	assumptions about the ordering of elements in the hashtable.  They
+	also do not work on Windows.
+	* hashing/HashBagTests.cs: Likewise.
+	* hashing/HashDictionaryTests.cs: Likewise.
+
+2004-12-03  Martin Baulig  <martin@ximian.com>
+
+	* arrays/SortedArrayTests.cs: Removed the exception message from
+	the [ExpectedException(typeof(ArgumentOutOfRangeException))].
+
+	* trees/RedBlackTreeSetTests.cs: Likewise.
+	* trees/Bag.cs: Likewise.
+
+2004-11-26  Martin Baulig  <martin@ximian.com>
+
+	* */*.cs: Added some more `#if FIXME's to comment out tests which
+	are currently crashing or hanging.
+
+2004-11-20  Martin Baulig  <martin@ximian.com>
+
+	* arrays/ArrayListTest.cs: Comment out some anonymous methods.
+	* arrays/HashedArrayListTest.cs: Likewise.
+	* linkedlists/HashedLinkedListTest.cs: Likewise.
+	* linkedlists/LinkedListTest.cs: Likewise.
+
+2004-11-15  Martin Baulig  <martin@ximian.com>
+
+	Importing version 0.5 of C5's test suite, http://www.itu.dk/research/c5/.
+
diff --git a/mcs/class/Mono.C5/Test/Records.cs b/mcs/class/Mono.C5/Test/Records.cs
deleted file mode 100644
index cb237824b77..00000000000
--- a/mcs/class/Mono.C5/Test/Records.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-

-namespace C5UnitTests.RecordsTests

-{

-  [TestFixture]

-  public class Basic

-  {

-    [SetUp]

-    public void Init()

-    {

-    }

-    [Test]

-    public void FourElement()

-    {

-      Rec<string, string, int, int> rec1, rec2, rec3;

-      rec1 = new Rec<string, string, int, int>("abe", null, 0, 1);

-      rec2 = new Rec<string, string, int, int>("abe", null, 0, 1);

-      rec3 = new Rec<string, string, int, int>("abe", "kat", 0, 1);

-      Assert.IsTrue(rec1 == rec2);

-      Assert.IsFalse(rec1 != rec2);

-      Assert.IsFalse(rec1 == rec3);

-      Assert.IsTrue(rec1 != rec3);

-      Assert.IsTrue(rec1.Equals(rec2));

-      Assert.IsFalse(rec1.Equals(rec3));

-      //

-      Assert.IsFalse(rec1.Equals(null));

-      Assert.IsFalse(rec1.Equals("bamse"));

-      //

-      Assert.IsTrue(rec1.GetHashCode() == rec2.GetHashCode());

-      Assert.IsFalse(rec1.GetHashCode() == rec3.GetHashCode());

-      //

-      Assert.AreEqual("abe", rec1.X1);

-      Assert.IsNull(rec1.X2);

-      Assert.AreEqual(0, rec1.X3);

-      Assert.AreEqual(1, rec1.X4);

-    }

-

-

-    [Test]

-    public void ThreeElement()

-    {

-      Rec<string, string, int> rec1, rec2, rec3;

-      rec1 = new Rec<string, string, int>("abe", null, 0);

-      rec2 = new Rec<string, string, int>("abe", null, 0);

-      rec3 = new Rec<string, string, int>("abe", "kat", 0);

-      Assert.IsTrue(rec1 == rec2);

-      Assert.IsFalse(rec1 != rec2);

-      Assert.IsFalse(rec1 == rec3);

-      Assert.IsTrue(rec1 != rec3);

-      Assert.IsTrue(rec1.Equals(rec2));

-      Assert.IsFalse(rec1.Equals(rec3));

-      //

-      Assert.IsFalse(rec1.Equals(null));

-      Assert.IsFalse(rec1.Equals("bamse"));

-      //

-      Assert.IsTrue(rec1.GetHashCode() == rec2.GetHashCode());

-      Assert.IsFalse(rec1.GetHashCode() == rec3.GetHashCode());

-      //

-      Assert.AreEqual("abe", rec1.X1);

-      Assert.IsNull(rec1.X2);

-      Assert.AreEqual(0, rec1.X3);

-

-    }

-

-    [Test]

-    public void TwoElement()

-    {

-      Rec<string, string> rec1, rec2, rec3;

-      rec1 = new Rec<string, string>("abe", null);

-      rec2 = new Rec<string, string>("abe", null);

-      rec3 = new Rec<string, string>("abe", "kat");

-      Assert.IsTrue(rec1 == rec2);

-      Assert.IsFalse(rec1 != rec2);

-      Assert.IsFalse(rec1 == rec3);

-      Assert.IsTrue(rec1 != rec3);

-      Assert.IsTrue(rec1.Equals(rec2));

-      Assert.IsFalse(rec1.Equals(rec3));

-      //

-      Assert.IsFalse(rec1.Equals(null));

-      Assert.IsFalse(rec1.Equals("bamse"));

-      //

-      Assert.IsTrue(rec1.GetHashCode() == rec2.GetHashCode());

-      Assert.IsFalse(rec1.GetHashCode() == rec3.GetHashCode());

-      //

-      Assert.AreEqual("abe", rec1.X1);

-      Assert.IsNull(rec1.X2);

-    }

-

-    [TearDown]

-    public void Dispose()

-    {

-    }

-  }

-

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/Test/Sorting.cs b/mcs/class/Mono.C5/Test/Sorting.cs
index 38deb379c3c..f5506f00787 100644
--- a/mcs/class/Mono.C5/Test/Sorting.cs
+++ b/mcs/class/Mono.C5/Test/Sorting.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,9 +23,9 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

-namespace C5UnitTests.SortingTests

+namespace nunit.SortingTests

 {

 	[TestFixture]

 	public class SortRandom

@@ -43,7 +44,7 @@ namespace C5UnitTests.SortingTests
 		{

 			ic = new IC();

 			ran = new Random(3456);

-			length = 100000;

+			length = 2000;

 			a = new int[length];

 			for (int i = 0; i < length; i++)

 				a[i] = ran.Next();

@@ -105,7 +106,7 @@ namespace C5UnitTests.SortingTests
 		{

 			ic = new IC();

 			ran = new Random(3456);

-			length = 100000;

+			length = 2000;

 			a = new int[length];

 			for (int i = 0; i < length; i++)

 				a[i] = ran.Next(3, 23);

@@ -164,7 +165,7 @@ namespace C5UnitTests.SortingTests
 		public void Init()

 		{

 			ic = new IC();

-			length = 100000;

+			length = 2000;

 			a = new int[length];

 			for (int i = 0; i < length; i++)

 				a[i] = i;

@@ -223,7 +224,7 @@ namespace C5UnitTests.SortingTests
 		public void Init()

 		{

 			ic = new IC();

-			length = 100000;

+			length = 2000;

 			a = new int[length];

 			for (int i = 0; i < length; i++)

 				a[i] = -i;

@@ -265,4 +266,5 @@ namespace C5UnitTests.SortingTests
 		[TearDown]

 		public void Dispose() { ic = null; a = null; }

 	}

-}
\ No newline at end of file
+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/SupportClasses.cs b/mcs/class/Mono.C5/Test/SupportClasses.cs
index e48ba49dab8..c6221c01065 100644
--- a/mcs/class/Mono.C5/Test/SupportClasses.cs
+++ b/mcs/class/Mono.C5/Test/SupportClasses.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,472 +23,141 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

+using C = System.Collections;

 

-

-namespace C5UnitTests

+namespace nunit

 {

-  class SC : SCG.IComparer<string>

-  {

-    public int Compare(string a, string b)

-    {

-      return a.CompareTo(b);

-    }

+	using System;

+	using C5;

+	using NUnit.Framework;

+	class SC: IComparer<string>

+	{

+		public int Compare(string a, string b)

+		{

+			return a.CompareTo(b);

+		}

+

+

+		public void appl(String s)

+		{

+			System.Console.WriteLine("--{0}", s);

+		}

+	}

+

+

+

+	class IC: IComparer<int>, IComparable<int>, IComparer<IC>, IComparable<IC>

+	{

+		public int Compare(int a, int b)

+		{

+			return a > b ? 1 : a < b ? -1 : 0;

+		}

+

+

+		public int Compare(IC a, IC b)

+		{

+			return a._i > b._i ? 1 : a._i < b._i ? -1 : 0;

+		}

+

+

+		private int _i;

+

+

+		public int i

+		{

+			get { return _i; }

+			set { _i = value; }

+		}

+

+

+		public IC() { }

+

+

+		public IC(int i) { _i = i; }

+

+

+		public int CompareTo(int that) 		{			return _i > that ? 1 : _i < that ? -1 : 0;		}

+

+        public bool Equals(int that) { return _i == that; }

+

+

+        public int CompareTo(IC that) { return _i > that._i ? 1 : _i < that._i ? -1 : 0; }

+        public bool Equals(IC that) { return _i == that._i; }

 

 

-    public void appl(String s)

-    {

-      System.Console.WriteLine("--{0}", s);

-    }

-  }

+        public static bool eq(MSG.IEnumerable<int> me, params int[] that)

+		{

+			int i = 0, maxind = that.Length - 1;

 

-  class TenEqualityComparer : SCG.IEqualityComparer<int>, SCG.IComparer<int>

-  {

-    TenEqualityComparer() { }

-    public static TenEqualityComparer Default { get { return new TenEqualityComparer(); } }

-    public int GetHashCode(int item) { return (item / 10).GetHashCode(); }

-    public bool Equals(int item1, int item2) { return item1 / 10 == item2 / 10; }

-    public int Compare(int a, int b) { return (a / 10).CompareTo(b / 10); }

-  }

+			foreach (int item in me)

+				if (i > maxind || item != that[i++])

+					return false;

 

-  class IC : SCG.IComparer<int>, IComparable<int>, SCG.IComparer<IC>, IComparable<IC>

-  {

-    public int Compare(int a, int b)

-    {

-      return a > b ? 1 : a < b ? -1 : 0;

-    }

+			return i == maxind + 1;

+		}

+		public static bool seq(ICollection<int> me, params int[] that)

+		{

+			int[] me2 = me.ToArray();

 

+			Array.Sort(me2);

 

-    public int Compare(IC a, IC b)

-    {

-      return a._i > b._i ? 1 : a._i < b._i ? -1 : 0;

-    }

+			int i = 0, maxind = that.Length - 1;

 

+			foreach (int item in me2)

+				if (i > maxind || item != that[i++])

+					return false;

 

-    private int _i;

+			return i == maxind + 1;

+		}

+	}

 

+	

+	class RevIC: IComparer<int>

+	{

+		public int Compare(int a, int b)

+		{

+			return a > b ? -1 : a < b ? 1 : 0;

+		}

+	}

 

-    public int i

-    {

-      get { return _i; }

-      set { _i = value; }

-    }

 

 

-    public IC() { }

+	public delegate int Int2Int(int i);

 

 

-    public IC(int i) { _i = i; }

+	public class FunEnumerable: MSG.IEnumerable<int>

+	{

+		int size;

 

+		Int2Int f;

 

-    public int CompareTo(int that) { return _i > that ? 1 : _i < that ? -1 : 0; }

 

-    public bool Equals(int that) { return _i == that; }

+		public FunEnumerable(int size, Int2Int f)

+		{

+			this.size = size; this.f = f;

+		}

 

 

-    public int CompareTo(IC that) { return _i > that._i ? 1 : _i < that._i ? -1 : 0; }

-    public bool Equals(IC that) { return _i == that._i; }

+		public bool Exists(Filter<int> filter) { return false; }

 

 

-    public static bool eq(SCG.IEnumerable<int> me, params int[] that)

-    {

-      int i = 0, maxind = that.Length - 1;

+		public bool All(Filter<int> filter) { return false; }

 

-      foreach (int item in me)

-        if (i > maxind || item != that[i++])

-          return false;

 

-      return i == maxind + 1;

-    }

-    public static bool seteq(ICollectionValue<int> me, params int[] that)

-    {

-      int[] me2 = me.ToArray();

+		public MSG.IEnumerator<int> GetEnumerator()

+		{

+			for (int i = 0; i < size; i++)

+				yield return f(i);

+		}

 

-      Array.Sort(me2);

+		C.IEnumerator C.IEnumerable.GetEnumerator ()

+		{

+			return GetEnumerator ();

+		}

 

-      int i = 0, maxind = that.Length - 1;

-

-      foreach (int item in me2)

-        if (i > maxind || item != that[i++])

-          return false;

-

-      return i == maxind + 1;

-    }

-    public static bool seteq(ICollectionValue<KeyValuePair<int, int>> me, params int[] that)

-    {

-      ArrayList<KeyValuePair<int, int>> first = new ArrayList<KeyValuePair<int, int>>();

-      first.AddAll(me);

-      ArrayList<KeyValuePair<int, int>> other = new ArrayList<KeyValuePair<int, int>>();

-      for (int i = 0; i < that.Length; i += 2)

-      {

-        other.Add(new KeyValuePair<int, int>(that[i], that[i + 1]));

-      }

-      return other.UnsequencedEquals(first);

-    }

-  }

-

-  class RevIC : SCG.IComparer<int>

-  {

-    public int Compare(int a, int b)

-    {

-      return a > b ? -1 : a < b ? 1 : 0;

-    }

-  }

-

-  public class FunEnumerable : SCG.IEnumerable<int>

-  {

-    int size;

-    Fun<int, int> f;

-

-    public FunEnumerable(int size, Fun<int, int> f)

-    {

-      this.size = size; this.f = f;

-    }

-

-    public SCG.IEnumerator<int> GetEnumerator()

-    {

-      for (int i = 0; i < size; i++)

-        yield return f(i);

-    }

-

-

-    #region IEnumerable Members

-

-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-    {

-      throw new Exception("The method or operation is not implemented.");

-    }

-

-    #endregion

-  }

-

-  public class BadEnumerableException : Exception { }

-

-  public class BadEnumerable<T> : CollectionValueBase<T>, ICollectionValue<T>

-  {

-    T[] contents;

-    Exception exception;

-

-    public BadEnumerable(Exception exception, params T[] contents)

-    {

-      this.contents = (T[])contents.Clone();

-      this.exception = exception;

-    }

-

-    public override SCG.IEnumerator<T> GetEnumerator()

-    {

-      for (int i = 0; i < contents.Length; i++)

-        yield return contents[i];

-      throw exception;

-    }

-

-    public override bool IsEmpty { get { return false; } }

-

-    public override int Count { get { return contents.Length + 1; } }

-

-    public override Speed CountSpeed { get { return Speed.Constant; } }

-

-    public override T Choose() { throw exception; }

-  }

-

-  public class CollectionEventList<T>

-  {

-    ArrayList<CollectionEvent<T>> happened;

-    EventTypeEnum listenTo;

-    SCG.IEqualityComparer<T> itemequalityComparer;

-    public CollectionEventList(SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      happened = new ArrayList<CollectionEvent<T>>();

-      this.itemequalityComparer = itemequalityComparer;

-    }

-    public void Listen(ICollectionValue<T> list, EventTypeEnum listenTo)

-    {

-      this.listenTo = listenTo;

-      if ((listenTo & EventTypeEnum.Changed) != 0)

-        list.CollectionChanged += new CollectionChangedHandler<T>(changed);

-      if ((listenTo & EventTypeEnum.Cleared) != 0)

-        list.CollectionCleared += new CollectionClearedHandler<T>(cleared);

-      if ((listenTo & EventTypeEnum.Removed) != 0)

-        list.ItemsRemoved += new ItemsRemovedHandler<T>(removed);

-      if ((listenTo & EventTypeEnum.Added) != 0)

-        list.ItemsAdded += new ItemsAddedHandler<T>(added);

-      if ((listenTo & EventTypeEnum.Inserted) != 0)

-        list.ItemInserted += new ItemInsertedHandler<T>(inserted);

-      if ((listenTo & EventTypeEnum.RemovedAt) != 0)

-        list.ItemRemovedAt += new ItemRemovedAtHandler<T>(removedAt);

-    }

-    public void Add(CollectionEvent<T> e) { happened.Add(e); }

-    /// <summary>

-    /// Check that we have seen exactly the events in expected that match listenTo.

-    /// </summary>

-    /// <param name="expected"></param>

-    public void Check(SCG.IEnumerable<CollectionEvent<T>> expected)

-    {

-      int i = 0;

-      foreach (CollectionEvent<T> expectedEvent in expected)

-      {

-        if ((expectedEvent.Act & listenTo) == 0)

-          continue;

-        if (i >= happened.Count)

-          Assert.Fail(string.Format("Event number {0} did not happen:\n expected {1}", i, expectedEvent));

-        if (!expectedEvent.Equals(happened[i], itemequalityComparer))

-          Assert.Fail(string.Format("Event number {0}:\n expected {1}\n but saw {2}", i, expectedEvent, happened[i]));

-        i++;

-      }

-      if (i < happened.Count)

-        Assert.Fail(string.Format("Event number {0} seen but no event expected:\n {1}", i, happened[i]));

-      happened.Clear();

-    }

-    public void Clear() { happened.Clear(); }

-    public void Print(System.IO.TextWriter writer)

-    {

-      happened.Apply(delegate(CollectionEvent<T> e) { writer.WriteLine(e); });

-    }

-    void changed(object sender)

-    {

-      happened.Add(new CollectionEvent<T>(EventTypeEnum.Changed, new EventArgs(), sender));

-    }

-    void cleared(object sender, ClearedEventArgs eventArgs)

-    {

-      happened.Add(new CollectionEvent<T>(EventTypeEnum.Cleared, eventArgs, sender));

-    }

-    void added(object sender, ItemCountEventArgs<T> eventArgs)

-    {

-      happened.Add(new CollectionEvent<T>(EventTypeEnum.Added, eventArgs, sender));

-    }

-    void removed(object sender, ItemCountEventArgs<T> eventArgs)

-    {

-      happened.Add(new CollectionEvent<T>(EventTypeEnum.Removed, eventArgs, sender));

-    }

-    void inserted(object sender, ItemAtEventArgs<T> eventArgs)

-    {

-      happened.Add(new CollectionEvent<T>(EventTypeEnum.Inserted, eventArgs, sender));

-    }

-    void removedAt(object sender, ItemAtEventArgs<T> eventArgs)

-    {

-      happened.Add(new CollectionEvent<T>(EventTypeEnum.RemovedAt, eventArgs, sender));

-    }

-  }

-

-  public sealed class CollectionEvent<T>

-  {

-    public readonly EventTypeEnum Act;

-    public readonly EventArgs Args;

-    public readonly object Sender;

-

-    public CollectionEvent(EventTypeEnum act, EventArgs args, object sender)

-    {

-      this.Act = act;

-      this.Args = args;

-      this.Sender = sender;

-    }

-

-    public bool Equals(CollectionEvent<T> otherEvent, SCG.IEqualityComparer<T> itemequalityComparer)

-    {

-      if (otherEvent == null || Act != otherEvent.Act || !object.ReferenceEquals(Sender, otherEvent.Sender))

-        return false;

-      switch (Act)

-      {

-        case EventTypeEnum.None:

-          break;

-        case EventTypeEnum.Changed:

-          return true;

-        case EventTypeEnum.Cleared:

-          if (Args is ClearedRangeEventArgs)

-          {

-            ClearedRangeEventArgs a = Args as ClearedRangeEventArgs, o = otherEvent.Args as ClearedRangeEventArgs;

-            if (o == null)

-              return false;

-            return a.Full == o.Full && a.Start == o.Start && a.Count == o.Count;

-          }

-          else

-          {

-            if (otherEvent.Args is ClearedRangeEventArgs)

-              return false;

-            ClearedEventArgs a = Args as ClearedEventArgs, o = otherEvent.Args as ClearedEventArgs;

-            return a.Full == o.Full && a.Count == o.Count;

-          }

-        case EventTypeEnum.Added:

-          {

-            ItemCountEventArgs<T> a = Args as ItemCountEventArgs<T>, o = otherEvent.Args as ItemCountEventArgs<T>;

-            return itemequalityComparer.Equals(a.Item, o.Item) && a.Count == o.Count;

-          }

-        case EventTypeEnum.Removed:

-          {

-            ItemCountEventArgs<T> a = Args as ItemCountEventArgs<T>, o = otherEvent.Args as ItemCountEventArgs<T>;

-            return itemequalityComparer.Equals(a.Item, o.Item) && a.Count == o.Count;

-          }

-        case EventTypeEnum.Inserted:

-          {

-            ItemAtEventArgs<T> a = Args as ItemAtEventArgs<T>, o = otherEvent.Args as ItemAtEventArgs<T>;

-            return a.Index == o.Index && itemequalityComparer.Equals(a.Item, o.Item);

-          }

-        case EventTypeEnum.RemovedAt:

-          {

-            ItemAtEventArgs<T> a = Args as ItemAtEventArgs<T>, o = otherEvent.Args as ItemAtEventArgs<T>;

-            return a.Index == o.Index && itemequalityComparer.Equals(a.Item, o.Item);

-          }

-      }

-      throw new ApplicationException("Illegat Act: " + Act);

-    }

-

-    public override string ToString()

-    {

-      return string.Format("Act: {0}, Args : {1}, Source : {2}", Act, Args, Sender);

-    }

-

-  }

-

-  public class CHC

-  {

-    static public int unsequencedhashcode(params int[] a)

-    {

-      int h = 0;

-      foreach (int i in a)

-      {

-        h += (int)(((uint)i * 1529784657 + 1) ^ ((uint)i * 2912831877) ^ ((uint)i * 1118771817 + 2));

-      }

-      return h;

-    }

-    static public int sequencedhashcode(params int[] a)

-    {

-      int h = 0;

-      foreach (int i in a) { h = h * 31 + i; }

-      return h;

-    }

-  }

-

-  //This class is a modified sample from VS2005 beta1 documentation

-  public class RadixFormatProvider : IFormatProvider

-  {

-    RadixFormatter _radixformatter;

-    public RadixFormatProvider(int radix)

-    {

-      if (radix < 2 || radix > 36)

-        throw new ArgumentException(String.Format(

-            "The radix \"{0}\" is not in the range 2..36.",

-            radix));

-      _radixformatter = new RadixFormatter(radix);

-    }

-    public object GetFormat(Type argType)

-    {

-      if (argType == typeof(ICustomFormatter))

-        return _radixformatter;

-      else

-        return null;

-    }

-  }

-

-  //This class is a modified sample from VS2005 beta1 documentation

-  public class RadixFormatter : ICustomFormatter

-  {

-    int radix;

-    public RadixFormatter(int radix)

-    {

-      if (radix < 2 || radix > 36)

-        throw new ArgumentException(String.Format(

-            "The radix \"{0}\" is not in the range 2..36.",

-            radix));

-      this.radix = radix;

-    }

-

-    // The value to be formatted is returned as a signed string 

-    // of digits from the rDigits array. 

-    private static char[] rDigits = {

-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 

-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 

-        'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 

-        'U', 'V', 'W', 'X', 'Y', 'Z' };

-

-    public string Format(string formatString,

-        object argToBeFormatted, IFormatProvider provider)

-    {

-      /*switch (Type.GetTypeCode(argToBeFormatted.GetType()))

-      {

-        case TypeCode.Boolean:

-          break;

-        case TypeCode.Byte:

-          break;

-        case TypeCode.Char:

-          break;

-        case TypeCode.DBNull:

-          break;

-        case TypeCode.DateTime:

-          break;

-        case TypeCode.Decimal:

-          break;

-        case TypeCode.Double:

-          break;

-        case TypeCode.Empty:

-          break;

-        case TypeCode.Int16:

-          break;

-        case TypeCode.Int32:

-          break;

-        case TypeCode.Int64:

-          break;

-        case TypeCode.Object:

-          break;

-        case TypeCode.SByte:

-          break;

-        case TypeCode.Single:

-          break;

-        case TypeCode.String:

-          break;

-        case TypeCode.UInt16:

-          break;

-        case TypeCode.UInt32:

-          break;

-        case TypeCode.UInt64:

-          break;

-      }*/

-      int intToBeFormatted;

-      try

-      {

-        intToBeFormatted = (int)argToBeFormatted;

-      }

-      catch (Exception)

-      {

-        if (argToBeFormatted is IFormattable)

-          return ((IFormattable)argToBeFormatted).

-              ToString(formatString, provider);

-        else

-          return argToBeFormatted.ToString();

-      }

-      return formatInt(intToBeFormatted);

-    }

-

-    private string formatInt(int intToBeFormatted)

-    {

-      // The formatting is handled here.

-      if (intToBeFormatted == 0)

-        return "0";

-      int digitIndex = 0;

-      int intPositive;

-      char[] outDigits = new char[31];

-

-      // Verify that the argument can be converted to a int integer.

-      // Extract the magnitude for conversion.

-      intPositive = Math.Abs(intToBeFormatted);

-

-      // Convert the magnitude to a digit string.

-      for (digitIndex = 0; digitIndex <= 32; digitIndex++)

-      {

-        if (intPositive == 0) break;

-

-        outDigits[outDigits.Length - digitIndex - 1] =

-            rDigits[intPositive % radix];

-        intPositive /= radix;

-      }

-

-      // Add a minus sign if the argument is negative.

-      if (intToBeFormatted < 0)

-        outDigits[outDigits.Length - digitIndex++ - 1] =

-            '-';

-

-      return new string(outDigits,

-          outDigits.Length - digitIndex, digitIndex);

-    }

-  }

+		public void Apply(Applier<int> a) { }

+	}

 

 }

+#endif

diff --git a/mcs/class/Mono.C5/Test/WrappersTest.cs b/mcs/class/Mono.C5/Test/WrappersTest.cs
deleted file mode 100644
index 15a13f3dbfc..00000000000
--- a/mcs/class/Mono.C5/Test/WrappersTest.cs
+++ /dev/null
@@ -1,857 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-

-

-namespace C5UnitTests.wrappers

-{

-  namespace Events

-  {

-    [TestFixture]

-    public class IList_

-    {

-      private ArrayList<int> list;

-      ICollectionValue<int> guarded;

-      CollectionEventList<int> seen;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>(TenEqualityComparer.Default);

-        guarded = new GuardedList<int>(list);

-        seen = new CollectionEventList<int>(IntEqualityComparer.Default);

-      }

-

-      private void listen() { seen.Listen(guarded, EventTypeEnum.All); }

-

-      [Test]

-      public void Listenable()

-      {

-        Assert.AreEqual(EventTypeEnum.All, guarded.ListenableEvents);

-        Assert.AreEqual(EventTypeEnum.None, guarded.ActiveEvents);

-        listen();

-        Assert.AreEqual(EventTypeEnum.All, guarded.ActiveEvents);

-      }

-

-      [Test]

-      public void SetThis()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list[1] = 45;

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-          });

-      }

-

-      [Test]

-      public void Insert()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Insert(1, 45);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-          });

-      }

-

-      [Test]

-      public void InsertAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.InsertAll<int>(1, new int[] { 666, 777, 888 });

-        //seen.Print(Console.Error);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(666,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(666, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(777,2), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(777, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(888,3), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(888, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-          });

-        list.InsertAll<int>(1, new int[] {});

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.InsertFirst(45);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-          });

-        list.InsertLast(88);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(88,4), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(88, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-          });

-      }

-

-      [Test]

-      public void Remove()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Remove();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(8, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void RemoveFirst()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveFirst();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(4,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(4, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void RemoveLast()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveLast();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(8,2), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(8, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Reverse();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.View(1, 0).Reverse();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Sort();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.View(1, 0).Sort();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Shuffle()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Shuffle();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.View(1, 0).Shuffle();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void RemoveAt()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveAt(1);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveInterval(1, 2);

-        seen.Check(new CollectionEvent<int>[] {

-           new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,2,1), guarded),

-         new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.RemoveInterval(1, 0);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Update()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Update(53);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-          });

-        list.Update(67);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void FindOrAdd()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        int val = 53;

-        list.FindOrAdd(ref val);

-        seen.Check(new CollectionEvent<int>[] {});

-        val = 67;

-        list.FindOrAdd(ref val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-      }

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        int val = 53;

-        list.UpdateOrAdd(val);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        val = 67;

-        list.UpdateOrAdd(val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.UpdateOrAdd(51, out val);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(53, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(51, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        val = 67;

-        list.UpdateOrAdd(81, out val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(81, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-      }

-

-      [Test]

-      public void RemoveItem()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.Remove(53);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Remove(11);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(18, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void RemoveAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.RemoveAll<int>(new int[] { 32, 187, 45 });

-        //TODO: the order depends on internals of the HashSet

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(35, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(45, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.RemoveAll<int>(new int[] { 200, 300 });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.View(1, 1).Clear();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,1,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.Clear();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,2,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.Clear();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void ListDispose()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.View(1, 1).Dispose();

-        seen.Check(new CollectionEvent<int>[] {});

-        list.Dispose();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,3,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)

-        });

-        list.Dispose();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.RetainAll<int>(new int[] { 32, 187, 45, 62, 82, 95, 2 });

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(15, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(25, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(55, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(75, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.RetainAll<int>(new int[] { 32, 187, 45, 62, 82, 95, 2 });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(3 * i + 5);

-        }

-        listen();

-        list.RemoveAllCopies(14);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(11, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(14, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(17, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.RemoveAllCopies(14);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Add()

-      {

-        listen();

-        seen.Check(new CollectionEvent<int>[0]);

-        list.Add(23);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.AddAll<int>(new int[] { 45, 56, 67 });

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(56, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.AddAll<int>(new int[] { });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; seen = null; }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewChanged()

-      {

-        IList<int> w = list.View(0, 0);

-        w.CollectionChanged += new CollectionChangedHandler<int>(w_CollectionChanged);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewCleared()

-      {

-        IList<int> w = list.View(0, 0);

-        w.CollectionCleared += new CollectionClearedHandler<int>(w_CollectionCleared);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewAdded()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemsAdded += new ItemsAddedHandler<int>(w_ItemAdded);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewInserted()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemInserted += new ItemInsertedHandler<int>(w_ItemInserted);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewRemoved()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemsRemoved += new ItemsRemovedHandler<int>(w_ItemRemoved);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewRemovedAt()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemRemovedAt += new ItemRemovedAtHandler<int>(w_ItemRemovedAt);

-      }

-

-      void w_CollectionChanged(object sender)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_CollectionCleared(object sender, ClearedEventArgs eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemAdded(object sender, ItemCountEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemInserted(object sender, ItemAtEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemRemoved(object sender, ItemCountEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemRemovedAt(object sender, ItemAtEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-    }

-

-    [TestFixture]

-    public class StackQueue

-    {

-      private ArrayList<int> list;

-      ICollectionValue<int> guarded;

-      CollectionEventList<int> seen;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>(TenEqualityComparer.Default);

-        guarded = new GuardedList<int>(list);

-        seen = new CollectionEventList<int>(IntEqualityComparer.Default);

-      }

-

-      private void listen() { seen.Listen(guarded, EventTypeEnum.All); }

-

-

-      [Test]

-      public void EnqueueDequeue()

-      {

-        listen();

-        list.Enqueue(67);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(67,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Enqueue(2);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(2,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(2, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Dequeue();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(67,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(67, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Dequeue();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(2,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(2, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [Test]

-      public void PushPop()

-      {

-        listen();

-        seen.Check(new CollectionEvent<int>[0]);

-        list.Push(23);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(23,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Push(-12);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(-12,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(-12, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Pop();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(-12,1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(-12, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-        list.Pop();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(23,0), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(23, 1), guarded),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), guarded)});

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; seen = null; }

-    }

-

-

-  }

-

-  namespace wrappedarray

-  {

-    [TestFixture]

-    public class Basic

-    {

-

-      [SetUp]

-      public void Init()

-      {

-      }

-

-      [TearDown]

-      public void Dispose()

-      {

-      }

-

-      [Test]

-      public void NoExc()

-      {

-        WrappedArray<int> wrapped = new WrappedArray<int>(new int[] { 4, 6, 5 });

-        Assert.AreEqual(6, wrapped[1]);

-        Assert.IsTrue(IC.eq(wrapped[1, 2], 6, 5));

-        //

-        Fun<int, bool> is4 = delegate(int i) { return i == 4; };

-        Assert.AreEqual(EventTypeEnum.None, wrapped.ActiveEvents);

-        Assert.AreEqual(false, wrapped.All(is4));

-        Assert.AreEqual(true, wrapped.AllowsDuplicates);

-        wrapped.Apply(delegate(int i) { });

-        Assert.AreEqual("{ 5, 6, 4 }", wrapped.Backwards().ToString());

-        Assert.AreEqual(true, wrapped.Check());

-        wrapped.Choose();

-        Assert.AreEqual(true, wrapped.Contains(4));

-        Assert.AreEqual(true, wrapped.ContainsAll(new ArrayList<int>()));

-        Assert.AreEqual(1, wrapped.ContainsCount(4));

-        Assert.AreEqual(Speed.Linear, wrapped.ContainsSpeed);

-        int[] extarray = new int[5];

-        wrapped.CopyTo(extarray, 1);

-        Assert.IsTrue(IC.eq(extarray, 0, 4, 6, 5, 0));

-        Assert.AreEqual(3, wrapped.Count);

-        Assert.AreEqual(Speed.Constant, wrapped.CountSpeed);

-        Assert.AreEqual(EnumerationDirection.Forwards, wrapped.Direction);

-        Assert.AreEqual(false, wrapped.DuplicatesByCounting);

-        Assert.AreEqual(IntEqualityComparer.Default, wrapped.EqualityComparer);

-        Assert.AreEqual(true, wrapped.Exists(is4));

-        Assert.IsTrue(IC.eq(wrapped.Filter(is4), 4));

-        int j = 5;

-        Assert.AreEqual(true, wrapped.Find(ref j));

-        Assert.AreEqual(true, wrapped.Find(is4, out j));

-        Assert.AreEqual("[ 0:4 ]", wrapped.FindAll(is4).ToString());

-        Assert.AreEqual(0, wrapped.FindIndex(is4));

-        Assert.AreEqual(true, wrapped.FindLast(is4, out j));

-        Assert.AreEqual(0, wrapped.FindLastIndex(is4));

-        Assert.AreEqual(4, wrapped.First);

-        wrapped.GetEnumerator();

-        Assert.AreEqual(CHC.sequencedhashcode(4, 6, 5), wrapped.GetSequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(4, 6, 5), wrapped.GetUnsequencedHashCode());

-        Assert.AreEqual(Speed.Constant, wrapped.IndexingSpeed);

-        Assert.AreEqual(2, wrapped.IndexOf(5));

-        Assert.AreEqual(false, wrapped.IsEmpty);

-        Assert.AreEqual(true, wrapped.IsReadOnly);

-        Assert.AreEqual(false, wrapped.IsSorted());

-        Assert.AreEqual(true, wrapped.IsValid);

-        Assert.AreEqual(5, wrapped.Last);

-        Assert.AreEqual(2, wrapped.LastIndexOf(5));

-        Assert.AreEqual(EventTypeEnum.None, wrapped.ListenableEvents);

-        Fun<int, string> i2s = delegate(int i) { return string.Format("T{0}", i); };

-        Assert.AreEqual("[ 0:T4, 1:T6, 2:T5 ]", wrapped.Map<string>(i2s).ToString());

-        Assert.AreEqual(0, wrapped.Offset);

-        wrapped.Reverse();

-        Assert.AreEqual("[ 0:5, 1:6, 2:4 ]", wrapped.ToString());

-        IList<int> other = new ArrayList<int>(); other.AddAll<int>(new int[] { 4, 5, 6 });

-        Assert.IsFalse(wrapped.SequencedEquals(other));

-        j = 30;

-        Assert.AreEqual(true, wrapped.Show(new System.Text.StringBuilder(), ref j, null));

-        wrapped.Sort();

-        Assert.AreEqual("[ 0:4, 1:5, 2:6 ]", wrapped.ToString());

-        Assert.IsNotNull(wrapped.SyncRoot);

-        Assert.IsTrue(IC.eq(wrapped.ToArray(), 4, 5, 6));

-        Assert.AreEqual("[ ... ]", wrapped.ToString("L4", null));

-        Assert.AreEqual(null, wrapped.Underlying);

-        Assert.IsTrue(IC.seteq(wrapped.UniqueItems(), 4, 5, 6));

-        Assert.IsTrue(wrapped.UnsequencedEquals(other));

-        wrapped.Shuffle();

-        Assert.IsTrue(IC.seteq(wrapped.UniqueItems(), 4, 5, 6));

-      }

-

-      [Test]

-      public void WithExc()

-      {

-        WrappedArray<int> wrapped = new WrappedArray<int>(new int[] { 3, 4, 6, 5, 7 });

-        //

-        try { wrapped.Add(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.AddAll<int>(null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Clear(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Dispose(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        int j = 1;

-        try { wrapped.FindOrAdd(ref j); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Insert(1, 1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Insert(wrapped.View(0, 0), 1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.InsertAll<int>(1, null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.InsertFirst(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.InsertLast(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Remove(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Remove(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveAll<int>(null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveAllCopies(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveAt(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveFirst(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveInterval(0, 0); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveLast(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RetainAll<int>(null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Update(1, out j); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.UpdateOrAdd(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-      }

-

-      [Test]

-      public void View()

-      {

-        WrappedArray<int> outerwrapped = new WrappedArray<int>(new int[] { 3, 4, 6, 5, 7 });

-        WrappedArray<int> wrapped = (WrappedArray<int>)outerwrapped.View(1, 3);

-        //

-        Assert.AreEqual(6, wrapped[1]);

-        Assert.IsTrue(IC.eq(wrapped[1, 2], 6, 5));

-        //

-        Fun<int, bool> is4 = delegate(int i) { return i == 4; };

-        Assert.AreEqual(EventTypeEnum.None, wrapped.ActiveEvents);

-        Assert.AreEqual(false, wrapped.All(is4));

-        Assert.AreEqual(true, wrapped.AllowsDuplicates);

-        wrapped.Apply(delegate(int i) { });

-        Assert.AreEqual("{ 5, 6, 4 }", wrapped.Backwards().ToString());

-        Assert.AreEqual(true, wrapped.Check());

-        wrapped.Choose();

-        Assert.AreEqual(true, wrapped.Contains(4));

-        Assert.AreEqual(true, wrapped.ContainsAll(new ArrayList<int>()));

-        Assert.AreEqual(1, wrapped.ContainsCount(4));

-        Assert.AreEqual(Speed.Linear, wrapped.ContainsSpeed);

-        int[] extarray = new int[5];

-        wrapped.CopyTo(extarray, 1);

-        Assert.IsTrue(IC.eq(extarray, 0, 4, 6, 5, 0));

-        Assert.AreEqual(3, wrapped.Count);

-        Assert.AreEqual(Speed.Constant, wrapped.CountSpeed);

-        Assert.AreEqual(EnumerationDirection.Forwards, wrapped.Direction);

-        Assert.AreEqual(false, wrapped.DuplicatesByCounting);

-        Assert.AreEqual(IntEqualityComparer.Default, wrapped.EqualityComparer);

-        Assert.AreEqual(true, wrapped.Exists(is4));

-        Assert.IsTrue(IC.eq(wrapped.Filter(is4), 4));

-        int j = 5;

-        Assert.AreEqual(true, wrapped.Find(ref j));

-        Assert.AreEqual(true, wrapped.Find(is4, out j));

-        Assert.AreEqual("[ 0:4 ]", wrapped.FindAll(is4).ToString());

-        Assert.AreEqual(0, wrapped.FindIndex(is4));

-        Assert.AreEqual(true, wrapped.FindLast(is4, out j));

-        Assert.AreEqual(0, wrapped.FindLastIndex(is4));

-        Assert.AreEqual(4, wrapped.First);

-        wrapped.GetEnumerator();

-        Assert.AreEqual(CHC.sequencedhashcode(4, 6, 5), wrapped.GetSequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(4, 6, 5), wrapped.GetUnsequencedHashCode());

-        Assert.AreEqual(Speed.Constant, wrapped.IndexingSpeed);

-        Assert.AreEqual(2, wrapped.IndexOf(5));

-        Assert.AreEqual(false, wrapped.IsEmpty);

-        Assert.AreEqual(true, wrapped.IsReadOnly);

-        Assert.AreEqual(false, wrapped.IsSorted());

-        Assert.AreEqual(true, wrapped.IsValid);

-        Assert.AreEqual(5, wrapped.Last);

-        Assert.AreEqual(2, wrapped.LastIndexOf(5));

-        Assert.AreEqual(EventTypeEnum.None, wrapped.ListenableEvents);

-        Fun<int, string> i2s = delegate(int i) { return string.Format("T{0}", i); };

-        Assert.AreEqual("[ 0:T4, 1:T6, 2:T5 ]", wrapped.Map<string>(i2s).ToString());

-        Assert.AreEqual(1, wrapped.Offset);

-        wrapped.Reverse();

-        Assert.AreEqual("[ 0:5, 1:6, 2:4 ]", wrapped.ToString());

-        IList<int> other = new ArrayList<int>(); other.AddAll<int>(new int[] { 4, 5, 6 });

-        Assert.IsFalse(wrapped.SequencedEquals(other));

-        j = 30;

-        Assert.AreEqual(true, wrapped.Show(new System.Text.StringBuilder(), ref j, null));

-        wrapped.Sort();

-        Assert.AreEqual("[ 0:4, 1:5, 2:6 ]", wrapped.ToString());

-        Assert.IsNotNull(wrapped.SyncRoot);

-        Assert.IsTrue(IC.eq(wrapped.ToArray(), 4, 5, 6));

-        Assert.AreEqual("[ ... ]", wrapped.ToString("L4", null));

-        Assert.AreEqual(outerwrapped, wrapped.Underlying);

-        Assert.IsTrue(IC.seteq(wrapped.UniqueItems(), 4, 5, 6));

-        Assert.IsTrue(wrapped.UnsequencedEquals(other));

-        //

-        Assert.IsTrue(wrapped.TrySlide(1));

-        Assert.IsTrue(IC.eq(wrapped, 5, 6, 7));

-        Assert.IsTrue(wrapped.TrySlide(-1, 2));

-        Assert.IsTrue(IC.eq(wrapped, 4, 5));

-        Assert.IsFalse(wrapped.TrySlide(-2));

-        Assert.IsTrue(IC.eq(wrapped.Span(outerwrapped.ViewOf(7)), 4, 5, 6, 7));

-        //

-        wrapped.Shuffle();

-        Assert.IsTrue(IC.seteq(wrapped.UniqueItems(), 4, 5));

-        Assert.IsTrue(wrapped.IsValid);

-        wrapped.Dispose();

-        Assert.IsFalse(wrapped.IsValid);

-      }

-

-      [Test]

-      public void ViewWithExc()

-      {

-        WrappedArray<int> outerwrapped = new WrappedArray<int>(new int[] { 3, 4, 6, 5, 7 });

-        WrappedArray<int> wrapped = (WrappedArray<int>)outerwrapped.View(1, 3);

-        //

-        try { wrapped.Add(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.AddAll<int>(null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Clear(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        //Should not throw

-        //try { wrapped.Dispose(); Assert.Fail("No throw"); }

-        //catch (FixedSizeCollectionException) { }

-        int j = 1;

-        try { wrapped.FindOrAdd(ref j); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Insert(1, 1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Insert(wrapped.View(0, 0), 1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.InsertAll<int>(1, null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.InsertFirst(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.InsertLast(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Remove(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Remove(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveAll<int>(null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveAllCopies(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveAt(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveFirst(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveInterval(0, 0); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RemoveLast(); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.RetainAll<int>(null); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.Update(1, out j); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-        try { wrapped.UpdateOrAdd(1); Assert.Fail("No throw"); }

-        catch (FixedSizeCollectionException) { }

-      }

-    }

-  }

-}

-

diff --git a/mcs/class/Mono.C5/Test/arrays/ArrayListTest.cs b/mcs/class/Mono.C5/Test/arrays/ArrayListTest.cs
index af492d1c56d..b33cf88d989 100644
--- a/mcs/class/Mono.C5/Test/arrays/ArrayListTest.cs
+++ b/mcs/class/Mono.C5/Test/arrays/ArrayListTest.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,3800 +23,2429 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

-

-namespace C5UnitTests.arrays.list

-{

-  using CollectionOfInt = ArrayList<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.ListTester<CollectionOfInt>().Test(factory);

-      new C5UnitTests.Templates.Events.QueueTester<CollectionOfInt>().Test(factory);

-      new C5UnitTests.Templates.Events.StackTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Clone.ViewTester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.ViewTester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new ArrayList<T>(); }

-  }

-

-  namespace Events

-  {

-    [TestFixture]

-    public class IList_

-    {

-      private ArrayList<int> list;

-      CollectionEventList<int> seen;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>(TenEqualityComparer.Default);

-        seen = new CollectionEventList<int>(IntEqualityComparer.Default);

-      }

-

-      private void listen() { seen.Listen(list, EventTypeEnum.Added); }

-

-      [Test]

-      public void Listenable()

-      {

-        Assert.AreEqual(EventTypeEnum.All, list.ListenableEvents);

-        Assert.AreEqual(EventTypeEnum.None, list.ActiveEvents);

-        listen();

-        Assert.AreEqual(EventTypeEnum.Added, list.ActiveEvents);

-      }

-

-      [Test]

-      public void SetThis()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list[1] = 45;

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-      }

-

-      [Test]

-      public void Insert()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Insert(1, 45);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-      }

-

-      [Test]

-      public void InsertAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.InsertAll<int>(1, new int[] { 666, 777, 888 });

-        //seen.Print(Console.Error);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(666,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(666, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(777,2), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(777, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(888,3), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(888, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-        list.InsertAll<int>(1, new int[] {});

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.InsertFirst(45);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-        list.InsertLast(88);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(88,4), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(88, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-      }

-

-      [Test]

-      public void Remove()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Remove();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(8, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveFirst()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveFirst();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(4,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(4, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveLast()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveLast();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(8,2), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(8, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Reverse();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.View(1, 0).Reverse();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Sort();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.View(1, 0).Sort();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Shuffle()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Shuffle();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.View(1, 0).Shuffle();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void RemoveAt()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveAt(1);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveInterval(1, 2);

-        seen.Check(new CollectionEvent<int>[] {

-           new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,2,1), list),

-         new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.RemoveInterval(1, 0);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Update()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Update(53);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-        list.Update(67);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void FindOrAdd()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        int val = 53;

-        list.FindOrAdd(ref val);

-        seen.Check(new CollectionEvent<int>[] {});

-        val = 67;

-        list.FindOrAdd(ref val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-      }

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        int val = 53;

-        list.UpdateOrAdd(val);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        val = 67;

-        list.UpdateOrAdd(val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.UpdateOrAdd(51, out val);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(53, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(51, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        val = 67;

-        list.UpdateOrAdd(81, out val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(81, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-      }

-

-      [Test]

-      public void RemoveItem()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.Remove(53);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Remove(11);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(18, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.RemoveAll<int>(new int[] { 32, 187, 45 });

-        //TODO: the order depends on internals of the HashSet

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(35, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.RemoveAll<int>(new int[] { 200, 300 });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.View(1, 1).Clear();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,1,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.Clear();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,2,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.Clear();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void ListDispose()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.View(1, 1).Dispose();

-        seen.Check(new CollectionEvent<int>[] {});

-        list.Dispose();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,3,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.Dispose();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.RetainAll<int>(new int[] { 32, 187, 45, 62, 82, 95, 2 });

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(15, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(25, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(55, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(75, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.RetainAll<int>(new int[] { 32, 187, 45, 62, 82, 95, 2 });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(3 * i + 5);

-        }

-        listen();

-        list.RemoveAllCopies(14);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(11, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(14, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(17, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.RemoveAllCopies(14);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Add()

-      {

-        listen();

-        seen.Check(new CollectionEvent<int>[0]);

-        list.Add(23);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.AddAll<int>(new int[] { 45, 56, 67 });

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.AddAll<int>(new int[] { });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; seen = null; }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewChanged()

-      {

-        IList<int> w = list.View(0, 0);

-        w.CollectionChanged += new CollectionChangedHandler<int>(w_CollectionChanged);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewCleared()

-      {

-        IList<int> w = list.View(0, 0);

-        w.CollectionCleared += new CollectionClearedHandler<int>(w_CollectionCleared);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewAdded()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemsAdded += new ItemsAddedHandler<int>(w_ItemAdded);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewInserted()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemInserted += new ItemInsertedHandler<int>(w_ItemInserted);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewRemoved()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemsRemoved += new ItemsRemovedHandler<int>(w_ItemRemoved);

-      }

-

-      [Test]

-      [ExpectedException(typeof(UnlistenableEventException))]

-      public void ViewRemovedAt()

-      {

-        IList<int> w = list.View(0, 0);

-        w.ItemRemovedAt += new ItemRemovedAtHandler<int>(w_ItemRemovedAt);

-      }

-

-      void w_CollectionChanged(object sender)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_CollectionCleared(object sender, ClearedEventArgs eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemAdded(object sender, ItemCountEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemInserted(object sender, ItemAtEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemRemoved(object sender, ItemCountEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-

-      void w_ItemRemovedAt(object sender, ItemAtEventArgs<int> eventArgs)

-      {

-        throw new NotImplementedException();

-      }

-    }

-

-    [TestFixture]

-    public class StackQueue

-    {

-

-      private ArrayList<int> list;

-      CollectionEventList<int> seen;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>(TenEqualityComparer.Default);

-        seen = new CollectionEventList<int>(IntEqualityComparer.Default);

-      }

-

-      private void listen() { seen.Listen(list, EventTypeEnum.All); }

-

-      [Test]

-      public void EnqueueDequeue()

-      {

-        listen();

-        list.Enqueue(67);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(67,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Enqueue(2);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(2,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(2, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Dequeue();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(67,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Dequeue();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(2,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(2, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void PushPop()

-      {

-        listen();

-        seen.Check(new CollectionEvent<int>[0]);

-        list.Push(23);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(23,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Push(-12);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(-12,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(-12, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Pop();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(-12,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(-12, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Pop();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(23,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(23, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; seen = null; }

-    }

-  }

-

-  namespace Safety

-  {

-    /// <summary>

-    /// Tests to see if the collection classes are robust for enumerable arguments that throw exceptions.

-    /// </summary>

-    [TestFixture]

-    public class BadEnumerable

-    {

-      private ArrayList<int> list;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-      }

-

-      [Test]

-      public void InsertAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        try

-        {

-          list.InsertAll<int>(1, new BadEnumerable<int>(new BadEnumerableException(), 9, 8, 7));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 9, 8, 7, 56, 8));

-

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        try

-        {

-          list.View(0, 1).AddAll<int>(new BadEnumerable<int>(new BadEnumerableException(), 9, 8, 7));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 9, 8, 7, 56, 8));

-      }

-

-      [Test]

-      public void RemoveAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        try

-        {

-          list.RemoveAll(new BadEnumerable<int>(new BadEnumerableException(), 9, 8, 7));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 56, 8));

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        try

-        {

-          list.RetainAll(new BadEnumerable<int>(new BadEnumerableException(), 9, 8, 7));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 56, 8));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        try

-        {

-          list.ContainsAll(new BadEnumerable<int>(new BadEnumerableException(), 4, 18));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 56, 8));

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-    /// <summary>

-    /// Tests to see if the collection classes are robust for delegate arguments that throw exceptions.

-    /// </summary>

-    [TestFixture]

-    public class BadFun

-    {

-      private ArrayList<int> list;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-      }

-

-      [Test]

-      public void NoTests() { }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-  namespace Enumerable

-  {

-    [TestFixture]

-    public class Multiops

-    {

-      private ArrayList<int> list;

-

-      private Fun<int, bool> always, never, even;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-        always = delegate { return true; };

-        never = delegate { return false; };

-        even = delegate(int i) { return i % 2 == 0; };

-      }

-

-

-      [Test]

-      public void All()

-      {

-        Assert.IsTrue(list.All(always));

-        Assert.IsTrue(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(8);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(5);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsFalse(list.All(even));

-      }

-

-

-      [Test]

-      public void Exists()

-      {

-        Assert.IsFalse(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(5);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(8);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsTrue(list.Exists(even));

-      }

-

-

-      [Test]

-      public void Apply()

-      {

-        int sum = 0;

-        Act<int> a = delegate(int i) { sum = i + 10 * sum; };

-

-        list.Apply(a);

-        Assert.AreEqual(0, sum);

-        sum = 0;

-        list.Add(5); list.Add(8); list.Add(7); list.Add(5);

-        list.Apply(a);

-        Assert.AreEqual(5875, sum);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-

-

-    [TestFixture]

-    public class GetEnumerator

-    {

-      private ArrayList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new ArrayList<int>(); }

-

-

-      [Test]

-      public void Empty()

-      {

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        Assert.IsFalse(e.MoveNext());

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-        list.Add(5);

-        list.Add(10);

-        list.Add(1);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(8, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(10, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(1, e.Current);

-        Assert.IsFalse(e.MoveNext());

-      }

-

-

-      [Test]

-      public void DoDispose()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        e.MoveNext();

-        e.MoveNext();

-        e.Dispose();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        e.MoveNext();

-        list.Add(99);

-        e.MoveNext();

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-  namespace CollectionOrSink

-  {

-    [TestFixture]

-    public class Formatting

-    {

-      ICollection<int> coll;

-      IFormatProvider rad16;

-      [SetUp]

-      public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-      [TearDown]

-      public void Dispose() { coll = null; rad16 = null; }

-      [Test]

-      public void Format()

-      {

-        Assert.AreEqual("[  ]", coll.ToString());

-        coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-        Assert.AreEqual("[ 0:-4, 1:28, 2:129, 3:65530 ]", coll.ToString());

-        Assert.AreEqual("[ 0:-4, 1:1C, 2:81, 3:FFFA ]", coll.ToString(null, rad16));

-        Assert.AreEqual("[ 0:-4, 1:28... ]", coll.ToString("L14", null));

-        Assert.AreEqual("[ 0:-4, 1:1C... ]", coll.ToString("L14", rad16));

-      }

-    }

-

-    [TestFixture]

-    public class CollectionOrSink

-    {

-      private ArrayList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new ArrayList<int>(); }

-

-      [Test]

-      public void Choose()

-      {

-        list.Add(7);

-        Assert.AreEqual(7, list.Choose());

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadChoose()

-      {

-        list.Choose();

-      }

-

-      [Test]

-      public void CountEtAl()

-      {

-        Assert.AreEqual(0, list.Count);

-        Assert.IsTrue(list.IsEmpty);

-        Assert.IsTrue(list.AllowsDuplicates);

-        list.Add(5);

-        Assert.AreEqual(1, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        list.Add(5);

-        Assert.AreEqual(2, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        list.Add(8);

-        Assert.AreEqual(3, list.Count);

-      }

-

-

-      [Test]

-      public void AddAll()

-      {

-        list.Add(3); list.Add(4); list.Add(5);

-

-        ArrayList<int> list2 = new ArrayList<int>();

-

-        list2.AddAll(list);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        list.AddAll(list2);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        Assert.IsTrue(IC.eq(list, 3, 4, 5, 3, 4, 5));

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-    [TestFixture]

-    public class FindPredicate

-    {

-      private ArrayList<int> list;

-      Fun<int, bool> pred;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>(TenEqualityComparer.Default);

-        pred = delegate(int i) { return i % 5 == 0; };

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Find()

-      {

-        int i;

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.Find(pred, out i));

-        Assert.AreEqual(45, i);

-      }

-

-      [Test]

-      public void FindLast()

-      {

-        int i;

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.FindLast(pred, out i));

-        Assert.AreEqual(675, i);

-      }

-

-      [Test]

-      public void FindIndex()

-      {

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(4, list.FindIndex(pred));

-      }

-

-      [Test]

-      public void FindLastIndex()

-      {

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(6, list.FindLastIndex(pred));

-      }

-    }

-

-    [TestFixture]

-    public class UniqueItems

-    {

-      private ArrayList<int> list;

-

-      [SetUp]

-      public void Init() { list = new ArrayList<int>(); }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Test()

-      {

-        Assert.IsTrue(IC.seteq(list.UniqueItems()));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-        list.AddAll<int>(new int[] { 7, 9, 7 });

-        Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 2, 9, 1));

-      }

-    }

-

-    [TestFixture]

-    public class ArrayTest

-    {

-      private ArrayList<int> list;

-

-      int[] a;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-        a = new int[10];

-        for (int i = 0; i < 10; i++)

-          a[i] = 1000 + i;

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      private string aeq(int[] a, params int[] b)

-      {

-        if (a.Length != b.Length)

-          return "Lengths differ: " + a.Length + " != " + b.Length;

-

-        for (int i = 0; i < a.Length; i++)

-          if (a[i] != b[i])

-            return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

-

-        return "Alles klar";

-      }

-

-

-      [Test]

-      public void ToArray()

-      {

-        Assert.AreEqual("Alles klar", aeq(list.ToArray()));

-        list.Add(7);

-        list.Add(7);

-        Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 7));

-      }

-

-

-      [Test]

-      public void CopyTo()

-      {

-        list.CopyTo(a, 1);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(6);

-        list.CopyTo(a, 2);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(4);

-        list.Add(4);

-        list.Add(9);

-        list.CopyTo(a, 4);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 1009));

-        list.Clear();

-        list.Add(7);

-        list.CopyTo(a, 9);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 7));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad()

-      {

-        list.CopyTo(a, 11);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad2()

-      {

-        list.CopyTo(a, -1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToTooFar()

-      {

-        list.Add(3);

-        list.Add(3);

-        list.CopyTo(a, 9);

-      }

-    }

-

-    [TestFixture]

-    public class Sync

-    {

-      private ArrayList<int> list;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      [Test]

-      public void Get()

-      {

-        Assert.IsNotNull(list.SyncRoot);

-      }

-    }

-  }

+using MSG = System.Collections.Generic;

 

 

+namespace nunit.arrays.list

+{

+	namespace Enumerable

+	{

+		[TestFixture]

+		public class Multiops

+		{

+			private ArrayList<int> list;

+

+			private Filter<int> always, never, even;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new ArrayList<int>();

+				always = delegate{return true;};

+				never = delegate{return false;};

+				even = delegate(int i){return i%2==0;};

+			}

+

+

+			[Test]

+			public void All()

+			{

+				Assert.IsTrue(list.All(always));

+				Assert.IsTrue(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(8);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(5);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsFalse(list.All(even));

+			}

+

+

+			[Test]

+			public void Exists()

+			{

+				Assert.IsFalse(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(5);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(8);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsTrue(list.Exists(even));

+			}

+

+

+			[Test]

+			public void Apply()

+			{

+				int sum = 0;

+				Applier<int> a = delegate(int i){sum=i+10*sum;};

+

+				list.Apply(a);

+				Assert.AreEqual(0, sum);

+				sum = 0;

+				list.Add(5);list.Add(8);list.Add(7);list.Add(5);

+				list.Apply(a);

+				Assert.AreEqual(5875, sum);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+

+

+

+		[TestFixture]

+		public class GetEnumerator

+		{

+			private ArrayList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new ArrayList<int>(); }

+

+

+			[Test]

+			public void Empty()

+			{

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+				list.Add(5);

+				list.Add(10);

+				list.Add(1);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(8, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(10, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(1, e.Current);

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void DoDispose()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				e.MoveNext();

+				e.Dispose();

+			}

 

 

-  namespace EditableCollection

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private ArrayList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new ArrayList<int>(); }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor1()

-      {

-        new ArrayList<int>(null);

-      }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor2()

-      {

-        new ArrayList<int>(5, null);

-      }

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsFalse(list.Contains(5));

-        list.Add(5);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        list.Add(8);

-        list.Add(10);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsTrue(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-        list.Remove(8);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsFalse(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-      }

-

-

-      [Test]

-      public void ContainsCount()

-      {

-        Assert.AreEqual(0, list.ContainsCount(5));

-        list.Add(5);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        list.Add(8);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        Assert.AreEqual(1, list.ContainsCount(8));

-        list.Add(5);

-        Assert.AreEqual(2, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        Assert.AreEqual(1, list.ContainsCount(8));

-      }

-

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        list.Add(5); list.Add(7); list.Add(5);

-        Assert.AreEqual(2, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.RemoveAllCopies(5);

-        Assert.AreEqual(0, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.Add(5); list.Add(8); list.Add(5);

-        list.RemoveAllCopies(8);

-        Assert.IsTrue(IC.eq(list, 7, 5, 5));

-      }

-

-

-      [Test]

-      public void FindAll()

-      {

-        Fun<int, bool> f = delegate(int i) { return i % 2 == 0; };

-

-        Assert.IsTrue(list.FindAll(f).IsEmpty);

-        list.Add(5); list.Add(8); list.Add(5); list.Add(10); list.Add(8);

-        Assert.IsTrue(((ArrayList<int>)list.FindAll(f)).Check());

-        Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10, 8));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-

-        Assert.IsTrue(list.ContainsAll(list2));

-        list2.Add(4);

-        Assert.IsFalse(list.ContainsAll(list2));

-        list.Add(4);

-        Assert.IsTrue(list.ContainsAll(list2));

-        list.Add(5);

-        Assert.IsTrue(list.ContainsAll(list2));

-        list2.Add(4);

-        Assert.IsFalse(list.ContainsAll(list2));

-        list.Add(4);

-        Assert.IsTrue(list.ContainsAll(list2));

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7); list2.Add(7); list2.Add(4);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4, 5));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(5); list2.Add(5); list2.Add(6);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 5, 6));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list));

-      }

-

-

-      [Test]

-      public void RemoveAll()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7); list2.Add(7); list2.Add(4);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 6));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(6); list2.Add(5); list2.Add(5); list2.Add(6);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        Assert.IsFalse(list.FIFO);

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        Assert.IsFalse(list.Remove(2));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(list.Remove(4));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4, 5, 6));

-        Assert.AreEqual(6, list.RemoveLast());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4, 5));

-        list.Add(7);

-        Assert.AreEqual(4, list.RemoveFirst());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5, 7));

-

-        list.FIFO = true;

-        list.Clear();

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        Assert.IsFalse(list.Remove(2));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(list.Remove(4));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5, 4, 6));

-        Assert.AreEqual(6, list.RemoveLast());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5, 4));

-        list.Add(7);

-        Assert.AreEqual(4, list.RemoveFirst());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 4, 7));

-      }

-

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(7); list.Add(7);

-        list.Clear();

-        Assert.IsTrue(list.IsEmpty);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-

-

-  namespace Indexed

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-      }

-

-

-      [Test]

-      public void IndexOf()

-      {

-        Assert.AreEqual(~0, dit.IndexOf(6));

-        dit.Add(7);

-        Assert.AreEqual(~1, dit.IndexOf(6));

-        Assert.AreEqual(~1, dit.LastIndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        dit.Add(5); dit.Add(7); dit.Add(8); dit.Add(7);

-        Assert.AreEqual(~5, dit.IndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        Assert.AreEqual(4, dit.LastIndexOf(7));

-        Assert.AreEqual(3, dit.IndexOf(8));

-        Assert.AreEqual(1, dit.LastIndexOf(5));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-

-

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

 

-    [TestFixture]

-    public class Removing

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-      }

-

-

-      [Test]

-      public void RemoveAt()

-      {

-        dit.Add(5); dit.Add(7); dit.Add(9); dit.Add(1); dit.Add(2);

-        Assert.AreEqual(7, dit.RemoveAt(1));

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

-        Assert.AreEqual(5, dit.RemoveAt(0));

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1, 2));

-        Assert.AreEqual(2, dit.RemoveAt(2));

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad0()

-      {

-        dit.RemoveAt(0);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBadM1()

-      {

-        dit.RemoveAt(-1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad1()

-      {

-        dit.Add(8);

-        dit.RemoveAt(1);

-      }

-

-

-      [Test]

-      public void RemoveInterval()

-      {

-        dit.RemoveInterval(0, 0);

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(3, 0);

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

-        dit.RemoveInterval(3, 1);

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

-        dit.RemoveInterval(1, 3);

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 60));

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit));

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

-        dit.RemoveInterval(2, 2);

-        Assert.IsTrue(((ArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-  }

+				e.MoveNext();

+				list.Add(99);

+				e.MoveNext();

+			}

 

 

+/*

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void TooEarlyCurrent()

+			{

+				int none = list.GetEnumerator().Current;

+			}

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void TooLateMoveNext()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void TooLateCurrent()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+

+				int i = e.Current;

+			}

+

+

+	

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterDispose()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				e.Dispose();

+				e.MoveNext();

+			}

+

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void CurrentAfterDispose()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				e.Dispose();

+

+				int i = e.Current;

+			}

+*/

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

 

 

-  namespace List

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IList<int> lst;

 

 

-      [SetUp]

-      public void Init() { lst = new ArrayList<int>(); }

+	namespace CollectionOrSink

+	{

+		[TestFixture]

+		public class CollectionOrSink

+		{

+			private ArrayList<int> list;

 

 

-      [TearDown]

-      public void Dispose() { lst = null; }

+			[SetUp]

+			public void Init() { list = new ArrayList<int>(); }

 

 

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void FirstBad()

-      {

-        int f = lst.First;

-      }

+			[Test]

+			public void CountEtAl()

+			{

+				Assert.AreEqual(0, list.Count);

+				Assert.IsTrue(list.IsEmpty);

+				Assert.IsTrue(list.AllowsDuplicates);

+				list.Add(5);

+				Assert.AreEqual(1, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				list.Add(5);

+				Assert.AreEqual(2, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				list.Add(8);

+				Assert.AreEqual(3, list.Count);

+			}

 

 

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void LastBad()

-      {

-        int f = lst.Last;

-      }

+			[Test]

+			public void AddAll()

+			{

+				list.Add(3);list.Add(4);list.Add(5);

 

+				ArrayList<int> list2 = new ArrayList<int>();

 

-      [Test]

-      public void FirstLast()

-      {

-        lst.Add(19);

-        Assert.AreEqual(19, lst.First);

-        Assert.AreEqual(19, lst.Last);

-        lst.Add(34); lst.InsertFirst(12);

-        Assert.AreEqual(12, lst.First);

-        Assert.AreEqual(34, lst.Last);

-      }

+				list2.AddAll(list);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				list.AddAll(list2);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				Assert.IsTrue(IC.eq(list, 3, 4, 5, 3, 4, 5));

+			}

 

 

-      [Test]

-      public void This()

-      {

-        lst.Add(34);

-        Assert.AreEqual(34, lst[0]);

-        lst[0] = 56;

-        Assert.AreEqual(56, lst.First);

-        lst.Add(7); lst.Add(7); lst.Add(7); lst.Add(7);

-        lst[0] = 45; lst[2] = 78; lst[4] = 101;

-        Assert.IsTrue(IC.eq(lst, 45, 7, 78, 7, 101));

-      }

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

 

 

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptyGet()

-      {

-        int f = lst[0];

-      }

 

+		[TestFixture]

+		public class ArrayTest

+		{

+			private ArrayList<int> list;

 

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowGet()

-      {

-        lst.Add(7);

+			int[] a;

 

-        int f = lst[-1];

-      }

 

+			[SetUp]

+			public void Init()

+			{

+				list = new ArrayList<int>();

+				a = new int[10];

+				for (int i = 0; i < 10; i++)

+					a[i] = 1000 + i;

+			}

 

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiGet()

-      {

-        lst.Add(6);

 

-        int f = lst[1];

-      }

+			[TearDown]

+			public void Dispose() { list = null; }

 

 

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptySet()

-      {

-        lst[0] = 4;

-      }

+			private string aeq(int[] a, params int[] b)

+			{

+				if (a.Length != b.Length)

+					return "Lengths differ: " + a.Length + " != " + b.Length;

 

+				for (int i = 0; i < a.Length; i++)

+					if (a[i] != b[i])

+						return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

 

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowSet()

-      {

-        lst.Add(7);

-        lst[-1] = 9;

-      }

+				return "Alles klar";

+			}

 

 

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiSet()

-      {

-        lst.Add(6);

-        lst[1] = 11;

-      }

-    }

+			[Test]

+			public void ToArray()

+			{

+				Assert.AreEqual("Alles klar", aeq(list.ToArray()));

+				list.Add(7);

+				list.Add(7);

+				Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 7));

+			}

 

 

+			[Test]

+			public void CopyTo()

+			{

+				list.CopyTo(a, 1);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(6);

+				list.CopyTo(a, 2);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(4);

+				list.Add(4);

+				list.Add(9);

+				list.CopyTo(a, 4);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 1009));

+				list.Clear();

+				list.Add(7);

+				list.CopyTo(a, 9);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 7));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToBad()

+			{

+				list.Add(3);

+				list.CopyTo(a, 10);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void CopyToBad2()

+			{

+				list.CopyTo(a, -1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToTooFar()

+			{

+				list.Add(3);

+				list.Add(3);

+				list.CopyTo(a, 9);

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Sync

+		{

+			private ArrayList<int> list;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new ArrayList<int>();

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+

+

+			[Test]

+			public void Get()

+			{

+				Assert.IsNotNull(list.SyncRoot);

+			}

+		}

+	}

+

+

+

+

+	namespace EditableCollection

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private ArrayList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new ArrayList<int>(); }

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsFalse(list.Contains(5));

+				list.Add(5);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				list.Add(8);

+				list.Add(10);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsTrue(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+				list.Remove(8);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsFalse(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+			}

+

+

+			[Test]

+			public void ContainsCount()

+			{

+				Assert.AreEqual(0, list.ContainsCount(5));

+				list.Add(5);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				list.Add(8);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				Assert.AreEqual(1, list.ContainsCount(8));

+				list.Add(5);

+				Assert.AreEqual(2, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				Assert.AreEqual(1, list.ContainsCount(8));

+			}

+

+

+			[Test]

+			public void RemoveAllCopies()

+			{

+				list.Add(5);list.Add(7);list.Add(5);

+				Assert.AreEqual(2, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.RemoveAllCopies(5);

+				Assert.AreEqual(0, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.Add(5);list.Add(8);list.Add(5);

+				list.RemoveAllCopies(8);

+				Assert.IsTrue(IC.eq(list, 7, 5, 5));

+			}

+

+

+			[Test]

+			public void FindAll()

+			{

+				Filter<int> f = delegate(int i){return i%2==0;};

+

+				Assert.IsTrue(list.FindAll(f).IsEmpty);

+				list.Add(5);list.Add(8);list.Add(5);list.Add(10);list.Add(8);

+				Assert.IsTrue(((ArrayList<int>)list.FindAll(f)).Check());

+				Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10, 8));

+			}

+

+

+			[Test]

+			public void ContainsAll()

+			{

+				ArrayList<int> list2 = new ArrayList<int>();

+

+				Assert.IsTrue(list.ContainsAll(list2));

+				list2.Add(4);

+				Assert.IsFalse(list.ContainsAll(list2));

+				list.Add(4);

+				Assert.IsTrue(list.ContainsAll(list2));

+				list.Add(5);

+				Assert.IsTrue(list.ContainsAll(list2));

+				list2.Add(4);

+				Assert.IsFalse(list.ContainsAll(list2));

+				list.Add(4);

+				Assert.IsTrue(list.ContainsAll(list2));

+			}

+

+

+			[Test]

+			public void RetainAll()

+			{

+				ArrayList<int> list2 = new ArrayList<int>();

+

+				list.Add(4);list.Add(4);list.Add(5);list.Add(4);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);list2.Add(7);list2.Add(4);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 4, 5));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(5);list2.Add(5);list2.Add(6);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 5, 6));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list));

+			}

+

+

+			[Test]

+			public void RemoveAll()

+			{

+				ArrayList<int> list2 = new ArrayList<int>();

+

+				list.Add(4);list.Add(4);list.Add(5);list.Add(4);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);list2.Add(7);list2.Add(4);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 6));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(6);list2.Add(5);list2.Add(5);list2.Add(6);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 4));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 4));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				list.Add(4);list.Add(4);list.Add(5);list.Add(4);list.Add(6);

+				Assert.IsFalse(list.Remove(2));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(list.Remove(4));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 5, 4, 6));

+				Assert.AreEqual(6, list.RemoveLast());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 5, 4));

+				list.Add(7);

+				Assert.AreEqual(4, list.RemoveFirst());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 4, 7));

+			}

+

+

+			[Test]

+			public void Clear()

+			{

+				list.Add(7);list.Add(7);

+				list.Clear();

+				Assert.IsTrue(list.IsEmpty);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

+

+

+

+

+	namespace Indexed

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+			}

+

+

+			[Test]

+			public void IndexOf()

+			{

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(-1, dit.LastIndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				dit.Add(5);dit.Add(7);dit.Add(8);dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				Assert.AreEqual(4, dit.LastIndexOf(7));

+				Assert.AreEqual(3, dit.IndexOf(8));

+				Assert.AreEqual(1, dit.LastIndexOf(5));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Removing

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+			}

+

+

+			[Test]

+			public void RemoveAt()

+			{

+				dit.Add(5);dit.Add(7);dit.Add(9);dit.Add(1);dit.Add(2);

+				Assert.AreEqual(7, dit.RemoveAt(1));

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

+				Assert.AreEqual(5, dit.RemoveAt(0));

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1, 2));

+				Assert.AreEqual(2, dit.RemoveAt(2));

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad0()

+			{

+				dit.RemoveAt(0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBadM1()

+			{

+				dit.RemoveAt(-1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad1()

+			{

+				dit.Add(8);

+				dit.RemoveAt(1);

+			}

+

+

+			[Test]

+			public void RemoveInterval()

+			{

+				dit.RemoveInterval(0, 0);

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(3, 0);

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

+				dit.RemoveInterval(3, 1);

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

+				dit.RemoveInterval(1, 3);

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 60));

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit));

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

+				dit.RemoveInterval(2, 2);

+				Assert.IsTrue(((ArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+	}

+

+

+

+

+	namespace List

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new ArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void FirstBad()

+			{

+				int f = lst.First;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void LastBad()

+			{

+				int f = lst.Last;

+			}

+

+

+			[Test]

+			public void FirstLast()

+			{

+				lst.Add(19);

+				Assert.AreEqual(19, lst.First);

+				Assert.AreEqual(19, lst.Last);

+				lst.Add(34);lst.InsertFirst(12);

+				Assert.AreEqual(12, lst.First);

+				Assert.AreEqual(34, lst.Last);

+			}

+

+

+			[Test]

+			public void This()

+			{

+				lst.Add(34);

+				Assert.AreEqual(34, lst[0]);

+				lst[0] = 56;

+				Assert.AreEqual(56, lst.First);

+				lst.Add(7);lst.Add(7);lst.Add(7);lst.Add(7);

+				lst[0] = 45;lst[2] = 78;lst[4] = 101;

+				Assert.IsTrue(IC.eq(lst, 45, 7, 78, 7, 101));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptyGet()

+			{

+				int f = lst[0];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowGet()

+			{

+				lst.Add(7);

+

+				int f = lst[-1];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiGet()

+			{

+				lst.Add(6);

 

-    [TestFixture]

-    public class Inserting

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new ArrayList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Insert()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 4);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5));

-        lst.Insert(3, 2);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

-      }

-

-      [Test]

-      public void InsertDuplicate()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 5);

-        Assert.IsTrue(IC.eq(lst, 7, 5, 5));

-      }

-

-

-      [Test]

-      public void InsertAllDuplicate1()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        lst.InsertAll<int>(1, new int[] { 1, 2, 3, 4 });

-        Assert.IsTrue(IC.eq(lst, 7, 1, 2, 3, 4, 3));

-        Assert.IsTrue(lst.Check());

-      }

-      [Test]

-      public void InsertAllDuplicate2()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        lst.InsertAll<int>(1, new int[] { 5, 6, 5, 8 });

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 5, 6, 5, 8, 3));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertLow()

-      {

-        lst.Add(7);

-        lst.Insert(-1, 9);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertHi()

-      {

-        lst.Add(6);

-        lst.Insert(2, 11);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        for (int i = 0; i < 7; i++)

-          lst.Add(2 * i);

-

-        Assert.IsFalse(lst.FIFO);

-        Assert.AreEqual(12, lst.Remove());

-        Assert.AreEqual(10, lst.Remove());

-        lst.FIFO = true;

-        Assert.AreEqual(0, lst.Remove());

-        Assert.AreEqual(2, lst.Remove());

-        lst.FIFO = false;

-        Assert.AreEqual(8, lst.Remove());

-        Assert.AreEqual(6, lst.Remove());

-      }

-

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        lst.InsertFirst(4);

-        lst.InsertLast(5);

-        lst.InsertFirst(14);

-        lst.InsertLast(15);

-        lst.InsertFirst(24);

-        lst.InsertLast(25);

-        lst.InsertFirst(34);

-        lst.InsertLast(55);

-        Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

-      }

-

-

-      [Test]

-      public void InsertFirst()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        lst.ViewOf(2).InsertFirst(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 3, 2, 5));

-        lst.ViewOf(3).InsertFirst(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 5));

-        lst.ViewOf(5).InsertFirst(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 9, 5));

-      }

-

-      [Test]

-      public void InsertAfter()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        lst.LastViewOf(2).InsertLast(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 3, 2, 7, 5));

-        lst.LastViewOf(1).InsertLast(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5));

-        lst.LastViewOf(5).InsertLast(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5, 9));

-      }

-

-      [Test]

-      public void InsertAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-

-        IList<int> lst2 = new ArrayList<int>();

-

-        lst2.Add(7); lst2.Add(8); lst2.Add(9);

-        lst.InsertAll(0, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

-        lst.InsertAll(7, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4, 7, 8, 9));

-        lst.InsertAll(5, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 7, 8, 9, 3, 4, 7, 8, 9));

-      }

-

-

-      [Test]

-      public void Map()

-      {

-        Fun<int, string> m = delegate(int i) { return "<<" + i + ">>"; };

-        IList<string> r = lst.Map(m);

-

-        Assert.IsTrue(r.Check());

-        Assert.IsTrue(r.IsEmpty);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        r = lst.Map(m);

-        Assert.IsTrue(r.Check());

-        Assert.AreEqual(4, r.Count);

-        for (int i = 0; i < 4; i++)

-          Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapper()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapperView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAllView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemove() { lst.Remove(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveFirst() { lst.RemoveFirst(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveLast() { lst.RemoveLast(); }

-

-

-      [Test]

-      public void RemoveFirstLast()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        Assert.AreEqual(1, lst.RemoveFirst());

-        Assert.AreEqual(4, lst.RemoveLast());

-        Assert.AreEqual(2, lst.RemoveFirst());

-        Assert.AreEqual(3, lst.RemoveLast());

-        Assert.IsTrue(lst.IsEmpty);

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(0, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 0).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-        lst.View(5, 1).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void BadReverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.View(8, 3).Reverse();

-      }

-    }

+				int f = lst[1];

+			}

 

-    [TestFixture]

-    public class Combined

-    {

-      private IList<KeyValuePair<int, int>> lst;

-

-

-      [SetUp]

-      public void Init()

-      {

-        lst = new ArrayList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        for (int i = 0; i < 10; i++)

-          lst.Add(new KeyValuePair<int, int>(i, i + 30));

-      }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Find()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-        Assert.IsTrue(lst.Find(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Find(ref p));

-      }

-

-

-      [Test]

-      public void FindOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.FindOrAdd(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.FindOrAdd(ref p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void Update()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Update(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Update(p));

-      }

-

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.UpdateOrAdd(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.UpdateOrAdd(p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void RemoveWithReturn()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Remove(p, out p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        Assert.AreEqual(4, lst[3].Key);

-        Assert.AreEqual(34, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Remove(p, out p));

-      }

-    }

 

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptySet()

+			{

+				lst[0] = 4;

+			}

 

-    [TestFixture]

-    public class SortingTests

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new ArrayList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Sort()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(5); lst.Add(7); lst.Add(3);

-        Assert.IsFalse(lst.IsSorted(new IC()));

-        lst.Sort(new IC());

-        Assert.IsTrue(lst.IsSorted());

-        Assert.IsTrue(lst.IsSorted(new IC()));

-        Assert.IsTrue(IC.eq(lst, 3, 5, 5, 6, 7));

-      }

-

-

-      [Test]

-      public void Stability()

-      {

-        IList<KeyValuePair<int, string>> lst2 = new ArrayList<KeyValuePair<int, string>>();

-        SCG.IComparer<KeyValuePair<int, string>> c = new KeyValuePairComparer<int, string>(new IC());

-

-        lst2.Add(new KeyValuePair<int, string>(5, "a"));

-        lst2.Add(new KeyValuePair<int, string>(5, "b"));

-        lst2.Add(new KeyValuePair<int, string>(6, "c"));

-        lst2.Add(new KeyValuePair<int, string>(4, "d"));

-        lst2.Add(new KeyValuePair<int, string>(3, "e"));

-        lst2.Add(new KeyValuePair<int, string>(4, "f"));

-        lst2.Add(new KeyValuePair<int, string>(5, "handle"));

-        Assert.IsFalse(lst2.IsSorted(c));

-        lst2.Sort(c);

-        Assert.IsTrue(lst2.IsSorted(c));

-

-        KeyValuePair<int, string> p = lst2.RemoveFirst();

-

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual("e", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(4, p.Key);

-        Assert.AreEqual("d", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(4, p.Key);

-        Assert.AreEqual("f", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(5, p.Key);

-        Assert.AreEqual("a", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(5, p.Key);

-        Assert.AreEqual("b", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(5, p.Key);

-        Assert.AreEqual("handle", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(6, p.Key);

-        Assert.AreEqual("c", p.Value);

-        Assert.IsTrue(lst2.IsEmpty);

-      }

-    }

 

-    [TestFixture]

-    public class ShuffleTests

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowSet()

+			{

+				lst.Add(7);

+				lst[-1] = 9;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiSet()

+			{

+				lst.Add(6);

+				lst[1] = 11;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Inserting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new ArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Insert()

+			{

+				lst.Insert(0, 5);

+				Assert.IsTrue(IC.eq(lst, 5));

+				lst.Insert(0, 7);

+				Assert.IsTrue(IC.eq(lst, 7, 5));

+				lst.Insert(1, 4);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5));

+				lst.Insert(3, 2);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertLow()

+			{

+				lst.Add(7);

+				lst.Insert(-1, 9);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertHi()

+			{

+				lst.Add(6);

+				lst.Insert(2, 11);

+			}

+

+

+			[Test]

+			public void FIFO()

+			{

+				for (int i = 0; i < 7; i++)

+					lst.Add(2 * i);

+

+				Assert.IsTrue(lst.FIFO);

+				Assert.AreEqual(0, lst.Remove());

+				Assert.AreEqual(2, lst.Remove());

+				lst.FIFO = false;

+				Assert.AreEqual(12, lst.Remove());

+				Assert.AreEqual(10, lst.Remove());

+				lst.FIFO = true;

+				Assert.AreEqual(4, lst.Remove());

+				Assert.AreEqual(6, lst.Remove());

+			}

+

+

+			[Test]

+			public void InsertFirstLast()

+			{

+				lst.InsertFirst(4);

+				lst.InsertLast(5);

+				lst.InsertFirst(14);

+				lst.InsertLast(15);

+				lst.InsertFirst(24);

+				lst.InsertLast(25);

+				lst.InsertFirst(34);

+				lst.InsertLast(55);

+				Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

+			}

+

+

+			[Test]

+			public void InsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertBefore(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 3, 2, 5));

+				lst.InsertBefore(8, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 5));

+				lst.InsertBefore(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 9, 5));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertBefore(7, 4);

+			}

+

+

+			[Test]

+			public void InsertAfter()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertAfter(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 3, 2, 7, 5));

+				lst.InsertAfter(8, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5));

+				lst.InsertAfter(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5, 9));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfter()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertAfter(7, 4);

+			}

+

+

+			[Test]

+			public void InsertAll()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+

+				IList<int> lst2 = new ArrayList<int>();

+

+				lst2.Add(7);lst2.Add(8);lst2.Add(9);

+				lst.InsertAll(0, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

+				lst.InsertAll(7, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4, 7, 8, 9));

+				lst.InsertAll(5, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 7, 8, 9, 3, 4, 7, 8, 9));

+			}

+

+			[Test]

+			public void Map()

+			{

+				Mapper<int,string> m = delegate(int i){return "<<"+i+">>";};

+				IList<string> r = lst.Map(m);

+

+				Assert.IsTrue(r.Check());

+				Assert.IsTrue(r.IsEmpty);

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				r = lst.Map(m);

+				Assert.IsTrue(r.Check());

+				Assert.AreEqual(4, r.Count);

+				for (int i = 0; i < 4; i++)

+					Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

+			}

+

+			[Test]

+			public void RemoveFirstLast()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				Assert.AreEqual(1, lst.RemoveFirst());

+				Assert.AreEqual(4, lst.RemoveLast());

+				Assert.AreEqual(2, lst.RemoveFirst());

+				Assert.AreEqual(3, lst.RemoveLast());

+				Assert.IsTrue(lst.IsEmpty);

+			}

+

+

+			[Test]

+			public void Reverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse();

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(0, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 0);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+				lst.Reverse(5, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void BadReverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse(8, 3);

+			}

+		}

+

+		[TestFixture]

+		public class Combined

+		{

+			private IList<KeyValuePair<int,int>> lst;

+

+

+			[SetUp]

+			public void Init()

+			{

+				lst = new ArrayList<KeyValuePair<int,int>>();

+				for (int i = 0; i < 10; i++)

+					lst.Add(new KeyValuePair<int,int>(i,i+30));

+			}

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Find()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+				Assert.IsTrue(lst.Find(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Find(ref p));

+			}

+

+

+			[Test]

+			public void FindOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.FindOrAdd(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.FindOrAdd(ref p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void Update()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Update(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Update(p));

+			}

+

+

+			[Test]

+			public void UpdateOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.UpdateOrAdd(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.UpdateOrAdd(p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void RemoveWithReturn()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.RemoveWithReturn(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				Assert.AreEqual(4, lst[3].key);

+				Assert.AreEqual(34, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.RemoveWithReturn(ref p));

+			}

+		}

+

+

+		[TestFixture]

+		public class Sorting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new ArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+			[Test]

+			public void Sort()

+			{

+				lst.Add(5);lst.Add(6);lst.Add(5);lst.Add(7);lst.Add(3);

+				Assert.IsFalse(lst.IsSorted(new IC()));

+				lst.Sort(new IC());

+				Assert.IsTrue(lst.IsSorted(new IC()));

+				Assert.IsTrue(IC.eq(lst, 3, 5, 5, 6, 7));

+			}

+

+			[Test]

+			public void Stability()

+			{

+				IList<KeyValuePair<int,string>> lst2 = new ArrayList<KeyValuePair<int,string>>();

+				IComparer<KeyValuePair<int,string>> c = new KeyValuePairComparer<int,string>(new IC());

+

+				lst2.Add(new KeyValuePair<int,string>(5, "a"));

+				lst2.Add(new KeyValuePair<int,string>(5, "b"));

+				lst2.Add(new KeyValuePair<int,string>(6, "c"));

+				lst2.Add(new KeyValuePair<int,string>(4, "d"));

+				lst2.Add(new KeyValuePair<int,string>(3, "e"));

+				lst2.Add(new KeyValuePair<int,string>(4, "f"));

+				lst2.Add(new KeyValuePair<int,string>(5, "h"));

+				Assert.IsFalse(lst2.IsSorted(c));

+				lst2.Sort(c);

+				Assert.IsTrue(lst2.IsSorted(c));

+

+				KeyValuePair<int,string> p = lst2.RemoveFirst();

+

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual("e", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(4, p.key);

+				Assert.AreEqual("d", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(4, p.key);

+				Assert.AreEqual("f", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(5, p.key);

+				Assert.AreEqual("a", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(5, p.key);

+				Assert.AreEqual("b", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(5, p.key);

+				Assert.AreEqual("h", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(6, p.key);

+				Assert.AreEqual("c", p.value);

+				Assert.IsTrue(lst2.IsEmpty);

+			}

+		}

+	}

+

+

+    namespace IStackQueue

     {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new ArrayList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Shuffle()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(5); lst.Add(7); lst.Add(3);

-        for (int i = 0; i < 100; i++)

+        [TestFixture]

+        public class Stack

         {

-          lst.Shuffle(new C5Random(i + 1));

-          Assert.IsTrue(lst.Check(), "Check " + i);

-          int[] lst2 = lst.ToArray();

-          Sorting.IntroSort<int>(lst2);

-          Assert.IsTrue(IC.eq(lst2, 3, 5, 5, 6, 7), "Contents " + i);

-        }

-      }

-    }

-

-  }

-

-

-  namespace IStackQueue

-  {

-    [TestFixture]

-    public class Stack

-    {

-      private IStack<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new ArrayList<int>(); }

+            private IStack<int> list;

 

 

-      [Test]

-      public void Normal()

-      {

-        list.Push(7);

-        list.Push(5);

-        list.Push(7);

-        list.Push(8);

-        list.Push(9);

-        Assert.AreEqual(9, list.Pop());

-        Assert.AreEqual(8, list.Pop());

-        Assert.AreEqual(7, list.Pop());

-        Assert.AreEqual(5, list.Pop());

-        Assert.AreEqual(7, list.Pop());

-      }

+            [SetUp]

+            public void Init() { list = new ArrayList<int>(); }

 

 

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void PopEmpty()

-      {

-        list.Push(5);

-        Assert.AreEqual(5, list.Pop());

-        list.Pop();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-    [TestFixture]

-    public class Queue

-    {

-      private IQueue<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new ArrayList<int>(); }

-

-

-      [Test]

-      public void Normal()

-      {

-        list.Enqueue(7);

-        list.Enqueue(5);

-        list.Enqueue(7);

-        list.Enqueue(8);

-        list.Enqueue(9);

-        Assert.AreEqual(7, list.Dequeue());

-        Assert.AreEqual(5, list.Dequeue());

-        Assert.AreEqual(7, list.Dequeue());

-        Assert.AreEqual(8, list.Dequeue());

-        Assert.AreEqual(9, list.Dequeue());

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void DeQueueEmpty()

-      {

-        list.Enqueue(5);

-        Assert.AreEqual(5, list.Dequeue());

-        list.Dequeue();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-  namespace Range

-  {

-    [TestFixture]

-    public class Range

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new ArrayList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void GetRange()

-      {

-        //Assert.IsTrue(IC.eq(lst[0, 0)));

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

-        Assert.IsTrue(IC.eq(lst[3, 4], 3, 4, 5, 6));

-        Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void BadGetRange()

-      {

-        object foo = lst[0, 11];

-      }

-

-

-      [Test]

-      public void Backwards()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[0, 4].Backwards(), 3, 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[3, 4].Backwards(), 6, 5, 4, 3));

-        Assert.IsTrue(IC.eq(lst[6, 4].Backwards(), 9, 8, 7, 6));

-      }

-

-

-      [Test]

-      public void DirectionAndCount()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

+            [Test]

+            public void Normal()

+            {

+                list.Push(7);

+                list.Push(5);

+                list.Push(7);

+                list.Push(8);

+                list.Push(9);

+                Assert.AreEqual(9, list.Pop());

+                Assert.AreEqual(8, list.Pop());

+                Assert.AreEqual(7, list.Pop());

+                Assert.AreEqual(5, list.Pop());

+                Assert.AreEqual(7, list.Pop());

+            }

 

-        Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

-        Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 4].Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 4].Backwards().Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

-        Assert.AreEqual(4, lst[3, 4].Count);

-        Assert.AreEqual(4, lst[3, 4].Backwards().Count);

-        Assert.AreEqual(10, lst.Backwards().Count);

-      }

 

+            [Test]

+            [ExpectedException(typeof(InvalidOperationException))]

+            public void PopEmpty()

+            {

+                list.Push(5);

+                Assert.AreEqual(5, list.Pop());

+                list.Pop();

+            }

 

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

 

-        foreach (int i in lst)

-        {

-          lst.Add(45 + i);

+            [TearDown]

+            public void Dispose() { list = null; }

         }

-      }

-    }

-  }

-

-

+        [TestFixture]

+        public class Queue

+        {

+            private IQueue<int> list;

 

 

-  namespace View

-  {

-    [TestFixture]

-    public class Simple

-    {

-      ArrayList<int> list, view;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-        list.Add(0); list.Add(1); list.Add(2); list.Add(3);

-        view = (ArrayList<int>)list.View(1, 2);

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        list = view = null;

-      }

-

-

-      void check()

-      {

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(view.Check());

-      }

-

-

-      //static void pint(IEnumerable<int> l) { foreach (int cell in l) Console.WriteLine(cell); }

-

-      [Test]

-      public void InsertPointer()

-      {

-        IList<int> view2 = list.View(2, 0);

-        list.Insert(view2, 7);

-        check();

-        list.Insert(list, 8);

-        check();

-        view.Insert(view2, 9);

-        check();

-        view.Insert(list.View(3, 2), 10);

-        check();

-        view.Insert(list.ViewOf(0), 11);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 11, 1, 9, 7, 2, 10, 3, 8));

-        Assert.IsTrue(IC.eq(view, 11, 1, 9, 7, 2, 10));

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad1()

-      {

-        view.Insert(list.View(0, 0), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad2()

-      {

-        view.Insert(list, 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad3()

-      {

-        list.Insert(new ArrayList<int>(), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad4()

-      {

-        list.Insert(new ArrayList<int>().View(0, 0), 7);

-      }

-

-

-      [Test]

-      public void Span()

-      {

-        IList<int> span = list.View(1, 0).Span(list.View(2, 0));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(1, span.Offset);

-        Assert.AreEqual(1, span.Count);

-        span = list.View(0, 2).Span(list.View(2, 2));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(0, span.Offset);

-        Assert.AreEqual(4, span.Count);

-        span = list.View(3, 1).Span(list.View(1, 1));

-        Assert.IsNull(span);

-      }

-

-      [Test]

-      public void ViewOf()

-      {

-        for (int i = 0; i < 4; i++)

-          list.Add(i);

-        IList<int> v = view.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.LastViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(6, v.Offset);

-      }

-

-      [Test]

-      public void ArrayStuff()

-      {

-        Assert.IsTrue(IC.eq(view.ToArray(), 1, 2));

-        int[] extarray = new int[5];

-        view.CopyTo(extarray, 2);

-        Assert.IsTrue(IC.eq(extarray, 0, 0, 1, 2, 0));

-      }

-

-      [Test]

-      public void BadViewOf()

-      {

-        Assert.IsNull(view.ViewOf(5));

-        Assert.IsNull(view.LastViewOf(5));

-        Assert.IsNull(view.ViewOf(3));

-        Assert.IsNull(view.LastViewOf(3));

-        Assert.IsNull(view.ViewOf(0));

-        Assert.IsNull(view.LastViewOf(0));

-      }

-

-      [Test]

-      public void Add()

-      {

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2));

-        view.InsertFirst(10);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 10, 1, 2));

-        view.Clear();

-        Assert.IsFalse(view.IsReadOnly);

-        Assert.IsTrue(view.AllowsDuplicates);

-        Assert.IsTrue(view.IsEmpty);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 3));

-        Assert.IsTrue(IC.eq(view));

-        view.Add(8);

-        Assert.IsFalse(view.IsEmpty);

-        Assert.IsTrue(view.AllowsDuplicates);

-        Assert.IsFalse(view.IsReadOnly);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 3));

-        Assert.IsTrue(IC.eq(view, 8));

-        view.Add(12);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12));

-        view./*ViewOf(12)*/InsertLast(15);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12, 15));

-        view.ViewOf(12).InsertFirst(18);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

-

-        ArrayList<int> lst2 = new ArrayList<int>();

-

-        lst2.Add(90); lst2.Add(92);

-        view.AddAll(lst2);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

-        view.InsertLast(66);

-        check();

-

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

-      }

-

-

-      [Test]

-      public void Bxxx()

-      {

-        Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

-        Assert.AreSame(list, view.Underlying);

-        Assert.IsNull(list.Underlying);

-        Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

-        Assert.AreEqual(0, list.Offset);

-        Assert.AreEqual(1, view.Offset);

-      }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsTrue(view.Contains(1));

-        Assert.IsFalse(view.Contains(0));

-

-        ArrayList<int> lst2 = new ArrayList<int>();

-

-        lst2.Add(2);

-        Assert.IsTrue(view.ContainsAll(lst2));

-        lst2.Add(3);

-        Assert.IsFalse(view.ContainsAll(lst2));

-        Assert.AreEqual(Speed.Linear, view.ContainsSpeed);

-        Assert.AreEqual(2, view.Count);

-        view.Add(1);

-        Assert.AreEqual(1, view.ContainsCount(2));

-        Assert.AreEqual(2, view.ContainsCount(1));

-        Assert.AreEqual(3, view.Count);

-      }

-

-

-      [Test]

-      public void CreateView()

-      {

-        ArrayList<int> view2 = (ArrayList<int>)view.View(1, 0);

-

-        Assert.AreSame(list, view2.Underlying);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        Assert.IsFalse(view.FIFO);

-        view.FIFO = true;

-        view.Add(23); view.Add(24); view.Add(25);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

-        Assert.AreEqual(1, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

-        view.FIFO = false;

-        Assert.IsFalse(view.FIFO);

-        Assert.AreEqual(25, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24));

-      }

-

-

-      [Test]

-      public void MapEtc()

-      {

-        ArrayList<double> dbl = (ArrayList<double>)view.Map(new Fun<int, double>(delegate(int i) { return i / 10.0; }));

-

-        Assert.IsTrue(dbl.Check());

-        Assert.AreEqual(0.1, dbl[0]);

-        Assert.AreEqual(0.2, dbl[1]);

-        for (int i = 0; i < 10; i++) view.Add(i);

-

-        list = (ArrayList<int>)view.FindAll(new Fun<int, bool>(delegate(int i) { return i % 4 == 1; }));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 1, 1, 5, 9));

-      }

-

-

-      [Test]

-      public void FL()

-      {

-        Assert.AreEqual(1, view.First);

-        Assert.AreEqual(2, view.Last);

-      }

-

-

-      [Test]

-      public void Indexing()

-      {

-        list.Clear();

-        for (int i = 0; i < 20; i++) list.Add(i);

-

-        view = (ArrayList<int>)list.View(5, 7);

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

-      }

-

-

-      [Test]

-      public void Insert()

-      {

-        view.Insert(0, 34);

-        view.Insert(1, 35);

-        view.Insert(4, 36);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

-

-        IList<int> list2 = new ArrayList<int>();

-

-        list2.AddAll(view);

-        view.InsertAll(3, list2);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 34, 35, 1, 2, 36, 2, 36));

-      }

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RangeCheck1()

-      {

-        IList<int> lst = new ArrayList<int>();

-        lst.Add(2);

-        lst = lst.View(1, 1);

-      }

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RangeCheck2()

-      {

-        IList<int> lst = new ArrayList<int>();

-        lst.Add(2);

-        lst = lst.View(1, -1);

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        view.Add(45); view.Add(47); view.Add(46); view.Add(48);

-        Assert.IsFalse(view.IsSorted(new IC()));

-        view.Sort(new IC());

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 5, 3, 3, 0));

-        Assert.IsTrue(view.Remove(0));

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 5, 3, 3));

-        view.RemoveAllCopies(3);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 5));

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 5, 3));

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 5, 1, 5, 3, 1, 3, 0));

-

-        view.FIFO = true;

-        view.Clear(); view.Add(1); view.Add(2);

-

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 1, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(0));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3));

-        view.RemoveAllCopies(3);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5, 1));

-        Assert.IsTrue(IC.eq(list, 0, 2, 5, 1, 3));

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 2, 5, 1, 1, 5, 3, 1, 3, 0));

-

-        view.FIFO = false;

-

-        ArrayList<int> l2 = new ArrayList<int>();

-

-        l2.Add(1); l2.Add(2); l2.Add(2); l2.Add(3); l2.Add(1);

-        view.RemoveAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view, 5, 5, 1, 3, 0));

-        view.RetainAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 3));

-        view.Add(2); view.Add(4); view.Add(5);

-        Assert.AreEqual(1, view.RemoveAt(0));

-        Assert.AreEqual(5, view.RemoveAt(3));

-        Assert.AreEqual(2, view.RemoveAt(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 3, 4));

-        view.Add(8);

-        Assert.AreEqual(3, view.RemoveFirst());

-        Assert.AreEqual(8, view.RemoveLast());

-        view.Add(2); view.Add(5); view.Add(3); view.Add(1);

-        view.RemoveInterval(1, 2);

-        check();

-        Assert.IsTrue(IC.eq(view, 4, 3, 1));

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        view.Clear();

-        for (int i = 0; i < 10; i++) view.Add(10 + i);

-

-        view.View(3, 4).Reverse();

-        check();

-        Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

-        view.Reverse();

-        Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

-        Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

-      }

-

-

-      [Test]

-      public void Slide()

-      {

-        view.Slide(1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 3));

-        view.Slide(-2);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1));

-        view.Slide(0, 3);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1, 2));

-        view.Slide(2, 1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2));

-        Assert.AreEqual(view, view.Slide(-1, 0));

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(28);

-        Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

-      }

-      [Test]

-      public void Iterate()

-      {

-        list.Clear();

-        view = null;

-        foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 2, 7 }) list.Add(i);

-

-        view = (ArrayList<int>)list.View(list.Count - 2, 2);

-        while (true)

-        {

-          if ((view.Last - view.First) % 2 == 1)

-            view.Insert(1, 666);

-          check();

-          if (view.Offset == 0)

-            break;

-          else

-            view.Slide(-1, 2);

-        }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 2, 4, 8, 666, 13, 6, 1, 666, 2, 666, 7));

-      }

+            [SetUp]

+            public void Init() { list = new ArrayList<int>(); }

 

 

-      [Test]

-      public void SyncRoot()

-      {

-        Assert.AreSame(view.SyncRoot, list.SyncRoot);

-      }

-    }

-    [TestFixture]

-    public class MulipleViews

-    {

-      IList<int> list;

-      IList<int>[][] views;

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>();

-        for (int i = 0; i < 6; i++)

-          list.Add(i);

-        views = new IList<int>[7][];

-        for (int i = 0; i < 7; i++)

-        {

-          views[i] = new IList<int>[7 - i];

-          for (int j = 0; j < 7 - i; j++)

-            views[i][j] = list.View(i, j);

-        }

-      }

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        views = null;

-      }

-      [Test]

-      public void Insert()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(3, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAt()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(3);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 3 && i + j > 3 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveInterval(3, 2);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i <= 5 ? 3 : i - 2, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j == 0 ? 0 : i <= 3 && i + j > 4 ? j - 2 : i > 4 || i + j <= 3 ? j : j - 1, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-

-      [Test]

-      public void InsertAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.InsertLast(777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(5);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 5 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 5 && i + j > 5 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void InsertAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(0, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 && j == 0 ? 0 : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(0);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i == 0 && j > 0 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void Clear()

-      {

-        Assert.IsTrue(list.Check(), "list check before clear");

-        views[2][3].Clear();

-        Assert.IsTrue(list.Check(), "list check after clear");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 2 ? i : i < 6 ? 2 : i - 3, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(s(i, j), views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      private int s(int i, int j)

-      {

-        if (j == 0) return 0;

-        int k = i + j - 1; //end

-        if (i > 4 || k <= 1) return j;

-        if (i >= 2) return k > 4 ? k - 4 : 0;

-        if (i <= 2) return k >= 4 ? j - 3 : 2 - i;

-        return -1;

-      }

-      [Test]

-      public void InsertAll()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before insertAll");

-        list.InsertAll(3, list2);

-        Assert.IsTrue(list.Check(), "list check after insertAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before AddAll");

-        list.View(1, 2).AddAll(list2);

-        Assert.IsTrue(list.Check(), "list check after AddAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void RemoveAll1()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new ArrayList<int>();

-            for (int k = 0; k < 6; k++) list.Add(k);

-            ArrayList<int> v = (ArrayList<int>)list.View(i, j);

-            list.RemoveAll(list2);

-            Assert.IsTrue(list.Check(), "list check after RemoveAll, i=" + i + ", j=" + j);

-          }

-        }

-      }

-      [Test]

-      public void RemoveAll2()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-        Assert.IsTrue(list.Check(), "list check before RemoveAll");

-        list.RemoveAll(list2);

-

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(1, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(1, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(1, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(1, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(1, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(1, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(1, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(1, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(1, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(1, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(1, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(2, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(2, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(2, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(2, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(2, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(2, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(2, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(1, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(1, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(2, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(2, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(1, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(2, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(1, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(2, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(0, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(1, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(0, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(1, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-        Assert.IsTrue(list.Check(), "list check after RemoveAll");

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-        list2.Add(2); list2.Add(4); list2.Add(5);

-        Assert.IsTrue(list.Check(), "list check before RetainAll");

-        list.RetainAll(list2);

-

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(0, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(0, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(0, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(0, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(0, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(0, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(0, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(0, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(0, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(0, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(0, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(1, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(1, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(1, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(1, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(1, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(1, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(1, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(0, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(0, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(1, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(1, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(2, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(3, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(2, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(3, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(1, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(2, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(1, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(2, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-        Assert.IsTrue(list.Check(), "list check after RetainAll");

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        ArrayList<int> list2 = new ArrayList<int>();

-        list2.Add(0); list2.Add(2); list2.Add(2); list2.Add(2); list2.Add(5); list2.Add(2); list2.Add(1);

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new ArrayList<int>();

-            list.AddAll(list2);

-            ArrayList<int> v = (ArrayList<int>)list.View(i, j);

-            list.RemoveAllCopies(2);

-            Assert.AreEqual((i == 0 && j > 0 ? 1 : 0) + (i <= 4 && i + j > 4 ? 1 : 0) + (i <= 6 && i + j > 6 ? 1 : 0), v.Count, "v.Count, i=" + i + ", j=" + j);

-            Assert.AreEqual(i == 0 ? 0 : i <= 4 ? 1 : i <= 6 ? 2 : 3, v.Offset, "v.Offset, i=" + i + ", j=" + j);

-            Assert.IsTrue(list.Check(), "list check after RemoveAllCopies, i=" + i + ", j=" + j);

-          }

-        }

-      }

-

-      private void checkDisposed(bool reverse, int start, int count)

-      {

-        int k = 0;

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            if (i + j <= start || i >= start + count || (i <= start && i + j >= start + count) || (reverse && start <= i && start + count >= i + j))

-            {

-              try

-              {

-                k = views[i][j].Count;

-              }

-              catch (ViewDisposedException)

-              {

-                Assert.Fail("view[" + i + "][" + j + "] threw");

-              }

-              Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] size");

-              if (reverse && ((j > 0 && start <= i && start + count >= i + j) || (j == 0 && start < i && start + count > i)))

-                Assert.AreEqual(start + (start + count - i - j), views[i][j].Offset, "view[" + i + "][" + j + "] offset (mirrored)");

-              else

-                Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            }

-            else

+            [Test]

+            public void Normal()

             {

-              try

-              {

-                k = views[i][j].Count;

-                Assert.Fail("view[" + i + "][" + j + "] no throw");

-              }

-              catch (ViewDisposedException) { }

+                list.EnQueue(7);

+                list.EnQueue(5);

+                list.EnQueue(7);

+                list.EnQueue(8);

+                list.EnQueue(9);

+                Assert.AreEqual(7, list.DeQueue());

+                Assert.AreEqual(5, list.DeQueue());

+                Assert.AreEqual(7, list.DeQueue());

+                Assert.AreEqual(8, list.DeQueue());

+                Assert.AreEqual(9, list.DeQueue());

             }

-          }

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Reverse");

-        list2.Reverse();

-        Assert.IsTrue(list.Check(), "list check after Reverse");

-        checkDisposed(true, start, count);

-      }

-      [Test]

-      public void Sort()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Sort");

-        list2.Sort();

-        Assert.IsTrue(list.Check(), "list check after Sort");

-        checkDisposed(false, start, count);

-      }

-      [Test]

-      public void Shuffle()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Shuffle");

-        list2.Shuffle();

-        Assert.IsTrue(list.Check(), "list check after Shuffle");

-        checkDisposed(false, start, count);

-      }

-

-

-    }

-  }

-

-

-

-

-  namespace ArrayListOfTreesORLists

-  {

-    [TestFixture]

-    public class MultiLevelUnorderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ICollection<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dut = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new ArrayList<ICollection<int>>();

-        Dat = new ArrayList<ICollection<int>>();

-        Dut = new ArrayList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelOrderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ISequenced<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dut = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new ArrayList<ICollection<int>>();

-        Dat = new ArrayList<ICollection<int>>();

-        Dut = new ArrayList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dit); Dut.Add(dut); Dut.Add(dat);

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

 

-    [TestFixture]

-    public class MultiLevelUnOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-        dot = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(2); dat.Add(1);

-        dut.Add(3);

-        dot.Add(1); dot.Add(2);

-        Dit = new ArrayList<ISequenced<int>>();

-        Dat = new ArrayList<ISequenced<int>>();

-        Dut = new ArrayList<ISequenced<int>>();

-        Dot = new ArrayList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-        Assert.IsTrue(Dit.UnsequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

 

+            [Test]

+            [ExpectedException(typeof(InvalidOperationException))]

+            public void DeQueueEmpty()

+            {

+                list.EnQueue(5);

+                Assert.AreEqual(5, list.DeQueue());

+                list.DeQueue();

+            }

 

 

-    [TestFixture]

-    public class MultiLevelOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-        dot = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(2); dat.Add(1);

-        dut.Add(3);

-        dot.Add(1); dot.Add(2);

-        Dit = new ArrayList<ISequenced<int>>();

-        Dat = new ArrayList<ISequenced<int>>();

-        Dut = new ArrayList<ISequenced<int>>();

-        Dot = new ArrayList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsFalse(Dit.SequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

+            [TearDown]

+            public void Dispose() { list = null; }

+        }

     }

-  }

 

 

+    namespace Range

+	{

+		[TestFixture]

+		public class Range

+		{

+			private IList<int> lst;

 

 

-  namespace HashingAndEquals

-  {

-    [TestFixture]

-    public class ISequenced

-    {

-      private ISequenced<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-      }

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-        Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(7), dut.GetSequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(0); dit.Add(31);

-        dat.Add(1); dat.Add(0);

-        Assert.AreEqual(dit.GetSequencedHashCode(), dat.GetSequencedHashCode());

-        Assert.IsFalse(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dat));

-        Assert.IsTrue(dat.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dut));

-        Assert.IsTrue(dut.SequencedEquals(dit));

-        dit.Add(7);

-        ((ArrayList<int>)dut).InsertFirst(7);

-        Assert.IsFalse(dit.SequencedEquals(dut));

-        Assert.IsFalse(dut.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class IEditableCollection

-    {

-      private ICollection<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(-1657792980); dit.Add(-1570288808);

-        dat.Add(1862883298); dat.Add(-272461342);

-        Assert.AreEqual(dit.GetUnsequencedHashCode(), dat.GetUnsequencedHashCode());

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsTrue(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-        dit.Add(7);

-        dut.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

+			[SetUp]

+			public void Init() { lst = new ArrayList<int>(); }

 

 

+			[TearDown]

+			public void Dispose() { lst = null; }

 

-    [TestFixture]

-    public class MultiLevelUnorderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ICollection<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new ArrayList<ICollection<int>>();

-        Dat = new ArrayList<ICollection<int>>();

-        Dut = new ArrayList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

 

+			[Test]

+			public void GetRange()

+			{

+				//Assert.IsTrue(IC.eq(lst[0, 0)));

+				for (int i = 0; i < 10; i++) lst.Add(i);

 

+				Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

+				Assert.IsTrue(IC.eq(lst[3, 4], 3, 4, 5, 6));

+				Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

+			}

 

-    [TestFixture]

-    public class MultiLevelOrderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ISequenced<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new ArrayList<ICollection<int>>();

-        Dat = new ArrayList<ICollection<int>>();

-        Dut = new ArrayList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dit); Dut.Add(dut); Dut.Add(dat);

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

 

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void BadGetRange()

+			{

+				object foo= lst[0, 11];

+			}

+

+

+			[Test]

+			public void Backwards()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[0, 4].Backwards(), 3, 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[3, 4].Backwards(), 6, 5, 4, 3));

+				Assert.IsTrue(IC.eq(lst[6, 4].Backwards(), 9, 8, 7, 6));

+			}

+

+

+			[Test]

+			public void DirectionAndCount()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

+				Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 4].Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 4].Backwards().Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

+				Assert.AreEqual(4, lst[3, 4].Count);

+				Assert.AreEqual(4, lst[3, 4].Backwards().Count);

+				Assert.AreEqual(10, lst.Backwards().Count);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				foreach (int i in lst)

+				{

+					lst.Add(45 + i);

+				}

+			}

+		}

+	}

+

+

+

+

+	namespace View

+	{

+		[TestFixture]

+		public class Simple

+		{

+			ArrayList<int> list, view;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new ArrayList<int>();

+				list.Add(0);list.Add(1);list.Add(2);list.Add(3);

+				view = (ArrayList<int>)list.View(1, 2);

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				list = view = null;

+			}

+

+

+			void check()

+			{

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(view.Check());

+			}

+

+

+			//static void pint(IEnumerable<int> l) { foreach (int i in l) Console.WriteLine(i); }

+

+			[Test]

+			public void Add()

+			{

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2));

+				view.InsertFirst(10);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 10, 1, 2));

+				view.Clear();

+				Assert.IsFalse(view.IsReadOnly);

+				Assert.IsTrue(view.AllowsDuplicates);

+				Assert.IsTrue(view.IsEmpty);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 3));

+				Assert.IsTrue(IC.eq(view));

+				view.Add(8);

+				Assert.IsFalse(view.IsEmpty);

+				Assert.IsTrue(view.AllowsDuplicates);

+				Assert.IsFalse(view.IsReadOnly);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 3));

+				Assert.IsTrue(IC.eq(view, 8));

+				view.Add(12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12));

+				view.InsertAfter(15, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12, 15));

+				view.InsertBefore(18, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

+

+				ArrayList<int> lst2 = new ArrayList<int>();

+

+				lst2.Add(90);lst2.Add(92);

+				view.AddAll(lst2);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

+				view.InsertLast(66);

+				check();

+

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

+			}

+

+

+			[Test]

+			public void Bxxx()

+			{

+				Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

+                Assert.AreSame(list, view.Underlying);

+                Assert.IsNull(list.Underlying);

+                Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

+				Assert.AreEqual(0,list.Offset);

+				Assert.AreEqual(1,view.Offset);

+			}

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsTrue(view.Contains(1));

+				Assert.IsFalse(view.Contains(0));

+

+				ArrayList<int> lst2 = new ArrayList<int>();

+

+				lst2.Add(2);

+				Assert.IsTrue(view.ContainsAll(lst2));

+				lst2.Add(3);

+				Assert.IsFalse(view.ContainsAll(lst2));

+				Assert.AreEqual(Speed.Linear, view.ContainsSpeed);

+				Assert.AreEqual(2, view.Count);

+				view.Add(1);

+				Assert.AreEqual(1, view.ContainsCount(2));

+				Assert.AreEqual(2, view.ContainsCount(1));

+				Assert.AreEqual(3, view.Count);

+			}

+

+

+			[Test]

+			public void CreateView()

+			{

+				ArrayList<int> view2 = (ArrayList<int>)view.View(1, 0);

+

+                Assert.AreSame(list, view2.Underlying);

+            }

 

 

-    [TestFixture]

-    public class MultiLevelUnOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-        dot = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        dot.Add(2); dot.Add(1);

-        Dit = new ArrayList<ISequenced<int>>();

-        Dat = new ArrayList<ISequenced<int>>();

-        Dut = new ArrayList<ISequenced<int>>();

-        Dot = new ArrayList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-        Assert.IsTrue(Dit.UnsequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

+			[Test]

+			public void FIFO()

+			{

+				Assert.IsTrue(view.FIFO);

+				view.Add(23);view.Add(24);view.Add(25);

+				check();

+				Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

+				Assert.AreEqual(1, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

+				view.FIFO = false;

+				Assert.IsFalse(view.FIFO);

+				Assert.AreEqual(25, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24));

+			}

+

+

+			[Test]

+			public void MapEtc()

+			{

+				ArrayList<double> dbl = (ArrayList<double>)view.Map(new Mapper<int,double>(delegate(int i){return i/10.0;}));

+

+				Assert.IsTrue(dbl.Check());

+				Assert.AreEqual(0.1, dbl[0]);

+				Assert.AreEqual(0.2, dbl[1]);

+				for (int i = 0; i < 10; i++) view.Add(i);

+

+				list = (ArrayList<int>)view.FindAll(new Filter<int>(delegate(int i){return i%4==1;}));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 1, 1, 5, 9));

+			}

+

+

+			[Test]

+			public void FL()

+			{

+				Assert.AreEqual(1, view.First);

+				Assert.AreEqual(2, view.Last);

+			}

+

+

+			[Test]

+			public void Indexing()

+			{

+				list.Clear();

+				for (int i = 0; i < 20; i++) list.Add(i);

+

+				view = (ArrayList<int>)list.View(5, 7);

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

+			}

+

+

+			[Test]

+			public void Insert()

+			{

+				view.Insert(0, 34);

+				view.Insert(1, 35);

+				view.Insert(4, 36);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

+

+				IList<int> list2 = new ArrayList<int>();

+

+				list2.AddAll(view);

+				view.InsertAll(3, list2);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 34, 35, 1, 2, 36, 2, 36));

+			}

+

+            [Test]

+            [ExpectedException(typeof(ArgumentException))]

+            public void RangeCheck1()

+            {

+                IList<int> lst = new ArrayList<int>();

+                lst.Add(2);

+                lst = lst.View(1, 1);

+            }

 

+            [Test]

+            [ExpectedException(typeof(ArgumentOutOfRangeException))]

+            public void RangeCheck2()

+            {

+                IList<int> lst = new ArrayList<int>();

+                lst.Add(2);

+                lst = lst.View(1, -1);

+            }

 

 

-    [TestFixture]

-    public class MultiLevelOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new ArrayList<int>();

-        dat = new ArrayList<int>();

-        dut = new ArrayList<int>();

-        dot = new ArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        dot.Add(2); dot.Add(1);

-        Dit = new ArrayList<ISequenced<int>>();

-        Dat = new ArrayList<ISequenced<int>>();

-        Dut = new ArrayList<ISequenced<int>>();

-        Dot = new ArrayList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsFalse(Dit.SequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

-  }

-}
\ No newline at end of file
+            [Test]

+			public void Sort()

+			{

+				view.Add(45);view.Add(47);view.Add(46);view.Add(48);

+				Assert.IsFalse(view.IsSorted(new IC()));

+				view.Sort(new IC());

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 1, 3, 0));

+				Assert.IsTrue(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 1, 5, 3, 1, 3, 0));

+				Assert.IsTrue(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3, 0));

+				Assert.IsTrue(view.Remove(0));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3));

+				view.RemoveAllCopies(3);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5, 1));

+				Assert.IsTrue(IC.eq(list, 0, 2, 5, 1, 3));

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 2, 5, 1, 1, 5, 3, 1, 3, 0));

+

+				ArrayList<int> l2 = new ArrayList<int>();

+

+				l2.Add(1);l2.Add(2);l2.Add(2);l2.Add(3);l2.Add(1);

+				view.RemoveAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view, 5, 5, 1, 3, 0));

+				view.RetainAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view, 1, 3));

+				view.Add(2);view.Add(4);view.Add(5);

+				Assert.AreEqual(1, view.RemoveAt(0));

+				Assert.AreEqual(5, view.RemoveAt(3));

+				Assert.AreEqual(2, view.RemoveAt(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 3, 4));

+				view.Add(8);

+				Assert.AreEqual(3, view.RemoveFirst());

+				Assert.AreEqual(8, view.RemoveLast());

+				view.Add(2);view.Add(5);view.Add(3);view.Add(1);

+				view.RemoveInterval(1, 2);

+				check();

+				Assert.IsTrue(IC.eq(view, 4, 3, 1));

+			}

+

+

+			[Test]

+			public void Reverse()

+			{

+				view.Clear();

+				for (int i = 0; i < 10; i++) view.Add(10 + i);

+

+				view.Reverse(3, 4);

+				check();

+				Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

+				view.Reverse();

+				Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

+				Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

+			}

+

+

+			[Test]

+			public void Slide()

+			{

+				view.Slide(1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 3));

+				view.Slide(-2);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1));

+				view.Slide(0, 3);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1, 2));

+				view.Slide(2, 1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2));

+				view.Slide(-1, 0);

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(28);

+				Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

+			}

+			[Test]

+			public void Iterate()

+			{

+				list.Clear();

+				view = null;

+				foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 2, 7 }) list.Add(i);

+

+				view = (ArrayList<int>)list.View(list.Count - 2, 2);

+				while (true)

+				{

+					if ((view.Last - view.First) % 2 == 1)

+						view.Insert(1, 666);

+					check();

+					if (view.Offset == 0)

+						break;

+					else

+						view.Slide(-1,2);

+				}

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 2, 4, 8, 666, 13, 6, 1, 666, 2, 666, 7));

+			}

+

+

+			[Test]

+			public void SyncRoot()

+			{

+				Assert.AreSame(view.SyncRoot, list.SyncRoot);

+			}

+		}

+	}

+

+

+

+

+	namespace ArrayListOfTreesORLists

+	{

+		[TestFixture]

+		public class MultiLevelUnorderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ICollection<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new TreeSet<int>(new IC());

+				dut = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new ArrayList<ICollection<int>>();

+				Dat = new ArrayList<ICollection<int>>();

+				Dut = new ArrayList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ISequenced<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new TreeSet<int>(new IC());

+				dut = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new ArrayList<ICollection<int>>();

+				Dat = new ArrayList<ICollection<int>>();

+				Dut = new ArrayList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new TreeSet<int>(new IC());

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+				dot = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(2);dat.Add(1);

+				dut.Add(3);

+				dot.Add(1);dot.Add(2);

+				Dit = new ArrayList<ISequenced<int>>();

+				Dat = new ArrayList<ISequenced<int>>();

+				Dut = new ArrayList<ISequenced<int>>();

+				Dot = new ArrayList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new TreeSet<int>(new IC());

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+				dot = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(2);dat.Add(1);

+				dut.Add(3);

+				dot.Add(1);dot.Add(2);

+				Dit = new ArrayList<ISequenced<int>>();

+				Dat = new ArrayList<ISequenced<int>>();

+				Dut = new ArrayList<ISequenced<int>>();

+				Dot = new ArrayList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+	}

+

+

+

+

+	namespace HashingAndEquals

+	{

+		[TestFixture]

+		public class ISequenced

+		{

+			private ISequenced<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(7), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(0);dit.Add(31);

+				dat.Add(1);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				((ArrayList<int>)dut).InsertFirst(7);

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class IEditableCollection

+		{

+			private ICollection<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count, params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count << 16) + retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1, 3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1, 3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(2);dit.Add(1);

+				dat.Add(3);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				dut.Add(7);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnorderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ICollection<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new ArrayList<ICollection<int>>();

+				Dat = new ArrayList<ICollection<int>>();

+				Dut = new ArrayList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ISequenced<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new ArrayList<ICollection<int>>();

+				Dat = new ArrayList<ICollection<int>>();

+				Dut = new ArrayList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+				dot = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				dot.Add(2);dot.Add(1);

+				Dit = new ArrayList<ISequenced<int>>();

+				Dat = new ArrayList<ISequenced<int>>();

+				Dut = new ArrayList<ISequenced<int>>();

+				Dot = new ArrayList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new ArrayList<int>();

+				dat = new ArrayList<int>();

+				dut = new ArrayList<int>();

+				dot = new ArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				dot.Add(2);dot.Add(1);

+				Dit = new ArrayList<ISequenced<int>>();

+				Dat = new ArrayList<ISequenced<int>>();

+				Dut = new ArrayList<ISequenced<int>>();

+				Dot = new ArrayList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+	}

+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/arrays/CircularQueueTest.cs b/mcs/class/Mono.C5/Test/arrays/CircularQueueTest.cs
deleted file mode 100644
index f8562221059..00000000000
--- a/mcs/class/Mono.C5/Test/arrays/CircularQueueTest.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-namespace C5UnitTests.arrays.circularqueue

-{

-  using CollectionOfInt = CircularQueue<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(); };

-      new C5UnitTests.Templates.Events.QueueTester<CollectionOfInt>().Test(factory);

-      new C5UnitTests.Templates.Events.StackTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      //TODO: Test Circular Queue for Clone(?) and Serializable 

-      //C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      //C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  //[TestFixture]

-  public class Template

-  {

-    private CircularQueue<int> queue;

-

-    [SetUp]

-    public void Init()

-    {

-      queue = new CircularQueue<int>();

-    }

-

-    [Test]

-    public void LeTest()

-    {

-    }

-

-    [TearDown]

-    public void Dispose() { queue = null; }

-

-  }

-

-  [TestFixture]

-  public class Formatting

-  {

-    CircularQueue<int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = new CircularQueue<int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{  }", coll.ToString());

-      foreach (int i in new int[] { -4, 28, 129, 65530 })

-        coll.Enqueue(i);

-      Assert.AreEqual("{ -4, 28, 129, 65530 }", coll.ToString());

-      Assert.AreEqual("{ -4, 1C, 81, FFFA }", coll.ToString(null, rad16));

-      Assert.AreEqual("{ -4, 28, 129... }", coll.ToString("L14", null));

-      Assert.AreEqual("{ -4, 1C, 81... }", coll.ToString("L14", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class CircularQueue

-  {

-    private CircularQueue<int> queue;

-

-    [SetUp]

-    public void Init()

-    {

-      queue = new CircularQueue<int>();

-    }

-

-    void loadup1()

-    {

-      queue.Enqueue(11);

-      queue.Enqueue(12);

-      queue.Enqueue(13);

-      queue.Dequeue();

-      queue.Enqueue(103);

-      queue.Enqueue(14);

-      queue.Enqueue(15);

-    }

-

-    void loadup2()

-    {

-      loadup1();

-      for (int i = 0; i < 4; i++)

-      {

-        queue.Dequeue();

-        queue.Enqueue(1000 + i);

-      }

-    }

-

-    void loadup3()

-    {

-      for (int i = 0; i < 18; i++)

-      {

-        queue.Enqueue(i);

-        Assert.IsTrue(queue.Check());

-      }

-      for (int i = 0; i < 14; i++)

-      {

-        Assert.IsTrue(queue.Check());

-        queue.Dequeue();

-      }

-    }

-

-    [Test]

-    public void Expand()

-    {

-      Assert.IsTrue(queue.Check());

-      loadup3();

-      Assert.IsTrue(IC.eq(queue, 14, 15, 16, 17));

-    }

-

-    [Test]

-    public void Simple()

-    {

-      loadup1();

-      Assert.IsTrue(queue.Check());

-      Assert.AreEqual(5, queue.Count);

-      Assert.IsTrue(IC.eq(queue, 12, 13, 103, 14, 15));

-      Assert.AreEqual(12, queue.Choose());

-    }

-

-    [Test]

-    public void Stack()

-    {

-      queue.Push(1);

-      Assert.IsTrue(queue.Check());

-      queue.Push(2);

-      Assert.IsTrue(queue.Check());

-      queue.Push(3);

-      Assert.IsTrue(queue.Check());

-      Assert.AreEqual(3, queue.Pop());

-      Assert.IsTrue(queue.Check());

-      Assert.AreEqual(2, queue.Pop());

-      Assert.IsTrue(queue.Check());

-      Assert.AreEqual(1, queue.Pop());

-      Assert.IsTrue(queue.Check());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      queue.Choose();

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadDequeue()

-    {

-      queue.Dequeue();

-    }

-

-    [Test]

-    public void Simple2()

-    {

-      loadup2();

-      Assert.IsTrue(queue.Check());

-      Assert.AreEqual(5, queue.Count);

-      Assert.IsTrue(IC.eq(queue, 15, 1000, 1001, 1002, 1003));

-      Assert.AreEqual(15, queue.Choose());

-    }

-

-    [Test]

-    public void Counting()

-    {

-      Assert.IsTrue(queue.IsEmpty);

-      Assert.AreEqual(0, queue.Count);

-      Assert.AreEqual(Speed.Constant, queue.CountSpeed);

-      queue.Enqueue(11);

-      Assert.IsFalse(queue.IsEmpty);

-      queue.Enqueue(12);

-      Assert.AreEqual(2, queue.Count);

-    }

-

-    [TearDown]

-    public void Dispose() { queue = null; }

-

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/Test/arrays/HashedArrayListTest.cs b/mcs/class/Mono.C5/Test/arrays/HashedArrayListTest.cs
index aa4e7262802..7bf6e23e6dc 100644
--- a/mcs/class/Mono.C5/Test/arrays/HashedArrayListTest.cs
+++ b/mcs/class/Mono.C5/Test/arrays/HashedArrayListTest.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,3384 +23,1964 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

 

-namespace C5UnitTests.arrays.hashed

+namespace nunit.arrays.hashed

 {

-  using CollectionOfInt = HashedArrayList<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.ListTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Clone.ViewTester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.ViewTester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new HashedArrayList<T>(); }

-  }

-

-  namespace Events

-  {

-    class TenEqualityComparer : SCG.IEqualityComparer<int>

-    {

-      TenEqualityComparer() { }

-      public static TenEqualityComparer Default { get { return new TenEqualityComparer(); } }

-      public int GetHashCode(int item) { return (item / 10).GetHashCode(); }

-      public bool Equals(int item1, int item2) { return item1 / 10 == item2 / 10; }

-    }

-

-    [TestFixture]

-    public class IList_

-    {

-      private HashedArrayList<int> list;

-      CollectionEventList<int> seen;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>(TenEqualityComparer.Default);

-        seen = new CollectionEventList<int>(IntEqualityComparer.Default);

-      }

-

-      private void listen() { seen.Listen(list, EventTypeEnum.All); }

-

-      [Test]

-      public void SetThis()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list[1] = 45;

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-      }

-

-      [Test]

-      public void Insert()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Insert(1, 45);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-      }

-

-      [Test]

-      public void InsertAll()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.InsertAll<int>(1, new int[] { 666, 777, 888 });

-        //seen.Print(Console.Error);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(666,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(666, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(777,2), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(777, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(888,3), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(888, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-        list.InsertAll<int>(1, new int[] {});

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.InsertFirst(45);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-        list.InsertLast(88);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(88,4), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(88, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-      }

-

-      [Test]

-      public void Remove()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Remove();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveFirst()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveFirst();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(4,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(4, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveLast()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveLast();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Reverse();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.View(1, 0).Reverse();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Sort();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.View(1, 0).Sort();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Shuffle()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Shuffle();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.View(1, 0).Shuffle();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void RemoveAt()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.RemoveAt(1);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.RemoveInterval(1, 2);

-        seen.Check(new CollectionEvent<int>[] {

-           new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,2,1), list),

-         new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.RemoveInterval(1, 0);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Update()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        list.Update(53);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-          });

-        list.Update(67);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void FindOrAdd()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        int val = 53;

-        list.FindOrAdd(ref val);

-        seen.Check(new CollectionEvent<int>[] {});

-        val = 67;

-        list.FindOrAdd(ref val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-      }

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        list.Add(4); list.Add(56); list.Add(8);

-        listen();

-        int val = 53;

-        list.UpdateOrAdd(val);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        val = 67;

-        list.UpdateOrAdd(val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.UpdateOrAdd(51, out val);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(53, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(51, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        val = 67;

-        list.UpdateOrAdd(81, out val);

-        seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(81, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-      }

-

-      [Test]

-      public void RemoveItem()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.Remove(53);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Remove(11);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(18, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void RemoveAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.RemoveAll<int>(new int[] { 32, 187, 45 });

-        //TODO: the order depends on internals of the HashSet

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(35, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(45, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.RemoveAll<int>(new int[] { 200, 300 });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.View(1, 1).Clear();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,1,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.Clear();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,2,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.Clear();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void ListDispose()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        listen();

-        list.View(1, 1).Dispose();

-        seen.Check(new CollectionEvent<int>[] {});

-        list.Dispose();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,3,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)

-        });

-        list.Dispose();

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.RetainAll<int>(new int[] { 32, 187, 45, 62, 82, 95, 2 });

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(15, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(25, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(55, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(75, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.RetainAll<int>(new int[] { 32, 187, 45, 62, 82, 95, 2 });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(3 * i + 5);

-        }

-        listen();

-        list.RemoveAllCopies(14);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(11, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.RemoveAllCopies(14);

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [Test]

-      public void Add()

-      {

-        listen();

-        seen.Check(new CollectionEvent<int>[0]);

-        list.Add(23);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        for (int i = 0; i < 10; i++)

-        {

-          list.Add(10 * i + 5);

-        }

-        listen();

-        list.AddAll<int>(new int[] { 145, 56, 167 });

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(145, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(167, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.AddAll<int>(new int[] { });

-        seen.Check(new CollectionEvent<int>[] {});

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; seen = null; }

-    }

-

-    [TestFixture]

-    public class StackQueue

-    {

-

-      private ArrayList<int> list;

-      CollectionEventList<int> seen;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new ArrayList<int>(TenEqualityComparer.Default);

-        seen = new CollectionEventList<int>(IntEqualityComparer.Default);

-      }

-

-      private void listen() { seen.Listen(list, EventTypeEnum.All); }

-

-      [Test]

-      public void EnqueueDequeue()

-      {

-        listen();

-        list.Enqueue(67);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(67,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Enqueue(2);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(2,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(2, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Dequeue();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(67,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(67, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Dequeue();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(2,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(2, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [Test]

-      public void PushPop()

-      {

-        listen();

-        seen.Check(new CollectionEvent<int>[0]);

-        list.Push(23);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(23,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Push(-12);

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(-12,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(-12, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Pop();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(-12,1), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(-12, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-        list.Pop();

-        seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(23,0), list),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(23, 1), list),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), list)});

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; seen = null; }

-    }

-

-

-  }

-

-  namespace Safety

-  {

-    /// <summary>

-    /// Tests to see if the collection classes are robust for enumerable arguments that throw exceptions.

-    /// </summary>

-    [TestFixture]

-    public class BadEnumerable

-    {

-      private HashedArrayList<int> list;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-      }

-

-      [Test]

-      public void InsertAll()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        try

-        {

-          list.InsertAll<int>(1, new BadEnumerable<int>(new BadEnumerableException(), 91, 81, 71));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 91, 81, 71, 56, 18));

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        try

-        {

-          list.View(0, 1).AddAll<int>(new BadEnumerable<int>(new BadEnumerableException(), 91, 81, 71));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 91, 81, 71, 56, 18));

-      }

-

-      [Test]

-      public void RemoveAll()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        try

-        {

-          list.RemoveAll(new BadEnumerable<int>(new BadEnumerableException(), 9, 8, 7));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 56, 18));

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        try

-        {

-          list.RetainAll(new BadEnumerable<int>(new BadEnumerableException(), 9, 8, 7));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 56, 18));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        list.Add(4); list.Add(56); list.Add(18);

-        try

-        {

-          list.ContainsAll(new BadEnumerable<int>(new BadEnumerableException(), 4, 18));

-          Assert.Fail("Should not get here");

-        }

-        catch (BadEnumerableException) { }

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 56, 18));

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-    /// <summary>

-    /// Tests to see if the collection classes are robust for delegate arguments that throw exceptions.

-    /// </summary>

-    [TestFixture]

-    public class BadFun

-    {

-      private HashedArrayList<int> list;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-      }

-

-      [Test]

-      public void NoTests() { }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-  namespace Enumerable

-  {

-    [TestFixture]

-    public class Multiops

-    {

-      private HashedArrayList<int> list;

-

-      private Fun<int, bool> always, never, even;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-        always = delegate { return true; };

-        never = delegate { return false; };

-        even = delegate(int i) { return i % 2 == 0; };

-      }

-

-

-      [Test]

-      public void All()

-      {

-        Assert.IsTrue(list.All(always));

-        Assert.IsTrue(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(8);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(5);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsFalse(list.All(even));

-      }

-

-

-      [Test]

-      public void Exists()

-      {

-        Assert.IsFalse(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(5);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(8);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsTrue(list.Exists(even));

-      }

-

-

-      [Test]

-      public void Apply()

-      {

-        int sum = 0;

-        Act<int> a = delegate(int i) { sum = i + 10 * sum; };

-

-        list.Apply(a);

-        Assert.AreEqual(0, sum);

-        sum = 0;

-        list.Add(5); list.Add(8); list.Add(7); list.Add(5);

-        list.Apply(a);

-        Assert.AreEqual(587, sum);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-

-

-    [TestFixture]

-    public class GetEnumerator

-    {

-      private HashedArrayList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new HashedArrayList<int>(); }

-

-

-      [Test]

-      public void Empty()

-      {

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        Assert.IsFalse(e.MoveNext());

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-        list.Add(5);

-        list.Add(10);

-        list.Add(1);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(8, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(10, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(1, e.Current);

-        Assert.IsFalse(e.MoveNext());

-      }

-

-

-      [Test]

-      public void DoDispose()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        e.MoveNext();

-        e.MoveNext();

-        e.Dispose();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        e.MoveNext();

-        list.Add(99);

-        e.MoveNext();

-      }

-

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-  namespace CollectionOrSink

-  {

-    [TestFixture]

-    public class Formatting

-    {

-      ICollection<int> coll;

-      IFormatProvider rad16;

-      [SetUp]

-      public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-      [TearDown]

-      public void Dispose() { coll = null; rad16 = null; }

-      [Test]

-      public void Format()

-      {

-        Assert.AreEqual("[  ]", coll.ToString());

-        coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-        Assert.AreEqual("[ 0:-4, 1:28, 2:129, 3:65530 ]", coll.ToString());

-        Assert.AreEqual("[ 0:-4, 1:1C, 2:81, 3:FFFA ]", coll.ToString(null, rad16));

-        Assert.AreEqual("[ 0:-4, 1:28... ]", coll.ToString("L14", null));

-        Assert.AreEqual("[ 0:-4, 1:1C... ]", coll.ToString("L14", rad16));

-      }

-    }

-

-    [TestFixture]

-    public class CollectionOrSink

-    {

-      private HashedArrayList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new HashedArrayList<int>(); }

-

-      [Test]

-      public void Choose()

-      {

-        list.Add(7);

-        Assert.AreEqual(7, list.Choose());

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadChoose()

-      {

-        list.Choose();

-      }

-

-

-      [Test]

-      public void CountEtAl()

-      {

-        Assert.AreEqual(0, list.Count);

-        Assert.IsTrue(list.IsEmpty);

-        Assert.IsFalse(list.AllowsDuplicates);

-        Assert.IsTrue(list.Add(5));

-        Assert.AreEqual(1, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        Assert.IsFalse(list.Add(5));

-        Assert.AreEqual(1, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        Assert.IsTrue(list.Add(8));

-        Assert.AreEqual(2, list.Count);

-      }

-

-

-      [Test]

-      public void AddAll()

-      {

-        list.Add(3); list.Add(4); list.Add(5);

-

-        HashedArrayList<int> list2 = new HashedArrayList<int>();

-

-        list2.AddAll(list);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        list.AddAll(list2);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        Assert.IsTrue(IC.eq(list, 3, 4, 5));

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-    [TestFixture]

-    public class FindPredicate

-    {

-      private HashedArrayList<int> list;

-      Fun<int, bool> pred;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>(TenEqualityComparer.Default);

-        pred = delegate(int i) { return i % 5 == 0; };

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Find()

-      {

-        int i;

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.Find(pred, out i));

-        Assert.AreEqual(45, i);

-      }

-

-      [Test]

-      public void FindLast()

-      {

-        int i;

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.FindLast(pred, out i));

-        Assert.AreEqual(675, i);

-      }

-

-      [Test]

-      public void FindIndex()

-      {

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(4, list.FindIndex(pred));

-      }

-

-      [Test]

-      public void FindLastIndex()

-      {

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(6, list.FindLastIndex(pred));

-      }

-    }

-

-    [TestFixture]

-    public class UniqueItems

-    {

-      private HashedArrayList<int> list;

-

-      [SetUp]

-      public void Init() { list = new HashedArrayList<int>(); }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Test()

-      {

-        Assert.IsTrue(IC.seteq(list.UniqueItems()));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-        list.AddAll<int>(new int[] { 7, 9, 7 });

-        Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 1, 9, 1));

-      }

-    }

-

-    [TestFixture]

-    public class ArrayTest

-    {

-      private HashedArrayList<int> list;

-

-      int[] a;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-        a = new int[10];

-        for (int i = 0; i < 10; i++)

-          a[i] = 1000 + i;

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      private string aeq(int[] a, params int[] b)

-      {

-        if (a.Length != b.Length)

-          return "Lengths differ: " + a.Length + " != " + b.Length;

-

-        for (int i = 0; i < a.Length; i++)

-          if (a[i] != b[i])

-            return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

-

-        return "Alles klar";

-      }

-

-

-      [Test]

-      public void ToArray()

-      {

-        Assert.AreEqual("Alles klar", aeq(list.ToArray()));

-        list.Add(7);

-        list.Add(8);

-        Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 8));

-      }

-

-

-      [Test]

-      public void CopyTo()

-      {

-        list.CopyTo(a, 1);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(6);

-        list.CopyTo(a, 2);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(4);

-        list.Add(5);

-        list.Add(9);

-        list.CopyTo(a, 4);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 1009));

-        list.Clear();

-        list.Add(7);

-        list.CopyTo(a, 9);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 7));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad()

-      {

-        list.CopyTo(a, 11);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad2()

-      {

-        list.CopyTo(a, -1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToTooFar()

-      {

-        list.Add(3);

-        list.Add(4);

-        list.CopyTo(a, 9);

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Sync

-    {

-      private HashedArrayList<int> list;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      [Test]

-      public void Get()

-      {

-        Assert.IsNotNull(list.SyncRoot);

-      }

-    }

-  }

-

-

-

-

-  namespace EditableCollection

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private HashedArrayList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new HashedArrayList<int>(); }

-

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor1()

-      {

-        new HashedArrayList<int>(null);

-      }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor2()

-      {

-        new HashedArrayList<int>(5, null);

-      }

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsFalse(list.Contains(5));

-        list.Add(5);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        list.Add(8);

-        list.Add(10);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsTrue(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-        list.Remove(8);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsFalse(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-      }

-

-      [Test]

-      public void BadAdd()

-      {

-        Assert.IsTrue(list.Add(5));

-        Assert.IsTrue(list.Add(8));

-        Assert.IsFalse(list.Add(5));

-      }

-

-

-      [Test]

-      public void ContainsCount()

-      {

-        Assert.AreEqual(0, list.ContainsCount(5));

-        list.Add(5);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        list.Add(8);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        Assert.AreEqual(1, list.ContainsCount(8));

-      }

-

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        list.Add(5); list.Add(7);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.RemoveAllCopies(5);

-        Assert.AreEqual(0, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.Add(5); list.Add(8);

-        list.RemoveAllCopies(8);

-        Assert.IsTrue(IC.eq(list, 7, 5));

-      }

-

-

-      [Test]

-      public void FindAll()

-      {

-        Fun<int, bool> f = delegate(int i) { return i % 2 == 0; };

-

-        Assert.IsTrue(list.FindAll(f).IsEmpty);

-        list.Add(5); list.Add(8); list.Add(10);

-        Assert.IsTrue(((HashedArrayList<int>)list.FindAll(f)).Check());

-        Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        HashedArrayList<int> list2 = new HashedArrayList<int>();

-

-        Assert.IsTrue(list.ContainsAll(list2));

-        list2.Add(4);

-        Assert.IsFalse(list.ContainsAll(list2));

-        list.Add(4);

-        Assert.IsTrue(list.ContainsAll(list2));

-        list.Add(5);

-        Assert.IsTrue(list.ContainsAll(list2));

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        HashedArrayList<int> list2 = new HashedArrayList<int>();

-

-        list.Add(4); list.Add(5); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(5); list2.Add(5); list2.Add(6);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 6));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list));

-      }

-

-

-      [Test]

-      public void RemoveAll()

-      {

-        HashedArrayList<int> list2 = new HashedArrayList<int>();

-

-        list.Add(4); list.Add(5); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 6));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(6); list2.Add(5);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        list.Add(4); list.Add(5); list.Add(6);

-        Assert.IsFalse(list.Remove(2));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(list.Remove(4));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 6));

-        Assert.AreEqual(6, list.RemoveLast());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5));

-        list.Add(7);

-        Assert.AreEqual(5, list.RemoveFirst());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 7));

-      }

-

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(7); list.Add(6);

-        list.Clear();

-        Assert.IsTrue(list.IsEmpty);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-

-

-  namespace IIndexed

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-      }

-

-

-      [Test]

-      public void IndexOf()

-      {

-        Assert.AreEqual(~0, dit.IndexOf(6));

-        dit.Add(7);

-        Assert.AreEqual(~1, dit.IndexOf(6));

-        Assert.AreEqual(~1, dit.LastIndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        dit.Add(5); dit.Add(7); dit.Add(8); dit.Add(7);

-        Assert.AreEqual(~3, dit.IndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        Assert.AreEqual(0, dit.LastIndexOf(7));

-        Assert.AreEqual(2, dit.IndexOf(8));

-        Assert.AreEqual(1, dit.LastIndexOf(5));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Removing

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-      }

-

-

-      [Test]

-      public void RemoveAt()

-      {

-        dit.Add(5); dit.Add(7); dit.Add(9); dit.Add(1); dit.Add(2);

-        Assert.AreEqual(7, dit.RemoveAt(1));

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

-        Assert.AreEqual(5, dit.RemoveAt(0));

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1, 2));

-        Assert.AreEqual(2, dit.RemoveAt(2));

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad0()

-      {

-        dit.RemoveAt(0);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBadM1()

-      {

-        dit.RemoveAt(-1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad1()

-      {

-        dit.Add(8);

-        dit.RemoveAt(1);

-      }

-

-

-      [Test]

-      public void RemoveInterval()

-      {

-        dit.RemoveInterval(0, 0);

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(3, 0);

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

-        dit.RemoveInterval(3, 1);

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

-        dit.RemoveInterval(1, 3);

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 60));

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit));

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

-        dit.RemoveInterval(2, 2);

-        Assert.IsTrue(((HashedArrayList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-  }

-

-

-

-

-  namespace IList

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedArrayList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void FirstBad()

-      {

-        int f = lst.First;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void LastBad()

-      {

-        int f = lst.Last;

-      }

-

-

-      [Test]

-      public void FirstLast()

-      {

-        lst.Add(19);

-        Assert.AreEqual(19, lst.First);

-        Assert.AreEqual(19, lst.Last);

-        lst.Add(34); lst.InsertFirst(12);

-        Assert.AreEqual(12, lst.First);

-        Assert.AreEqual(34, lst.Last);

-      }

-

-

-      [Test]

-      public void This()

-      {

-        lst.Add(34);

-        Assert.AreEqual(34, lst[0]);

-        lst[0] = 56;

-        Assert.AreEqual(56, lst.First);

-        lst.Add(7); lst.Add(77); lst.Add(777); lst.Add(7777);

-        lst[0] = 45; lst[2] = 78; lst[4] = 101;

-        Assert.IsTrue(IC.eq(lst, 45, 7, 78, 777, 101));

-      }

-

-      [Test]

-      public void ThisWithUpdates()

-      {

-        HashedArrayList<KeyValuePair<int, int>> pairlist = new HashedArrayList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        pairlist.Add(new KeyValuePair<int, int>(10, 50));

-        pairlist.Add(new KeyValuePair<int, int>(11, 51));

-        pairlist.Add(new KeyValuePair<int, int>(12, 52));

-        pairlist.Add(new KeyValuePair<int, int>(13, 53));

-        pairlist[2] = new KeyValuePair<int, int>(12, 102);

-        Assert.IsTrue(pairlist.Check());

-        Assert.AreEqual(new KeyValuePair<int, int>(12, 102), pairlist[2]);

-        pairlist[2] = new KeyValuePair<int, int>(22, 202);

-        Assert.IsTrue(pairlist.Check());

-        Assert.AreEqual(new KeyValuePair<int, int>(22, 202), pairlist[2]);

-        pairlist[1] = new KeyValuePair<int, int>(12, 303);

-        Assert.IsTrue(pairlist.Check());

-        Assert.AreEqual(new KeyValuePair<int, int>(12, 303), pairlist[1]);

-        Assert.AreEqual(new KeyValuePair<int, int>(22, 202), pairlist[2]);

-      }

-

-      [Test]

-      [ExpectedException(typeof(DuplicateNotAllowedException))]

-      public void ThisWithUpdatesBad()

-      {

-        HashedArrayList<KeyValuePair<int, int>> pairlist = new HashedArrayList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        pairlist.Add(new KeyValuePair<int, int>(10, 50));

-        pairlist.Add(new KeyValuePair<int, int>(11, 51));

-        pairlist.Add(new KeyValuePair<int, int>(12, 52));

-        pairlist.Add(new KeyValuePair<int, int>(13, 53));

-        pairlist[2] = new KeyValuePair<int, int>(11, 102);

-      }

-

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptyGet()

-      {

-        int f = lst[0];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowGet()

-      {

-        lst.Add(7);

-

-        int f = lst[-1];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiGet()

-      {

-        lst.Add(6);

-

-        int f = lst[1];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptySet()

-      {

-        lst[0] = 4;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowSet()

-      {

-        lst.Add(7);

-        lst[-1] = 9;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiSet()

-      {

-        lst.Add(6);

-        lst[1] = 11;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Inserting

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedArrayList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Insert()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 4);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5));

-        lst.Insert(3, 2);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

-      }

-

-      [Test]

-      [ExpectedException(typeof(DuplicateNotAllowedException))]

-      public void InsertDuplicate()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 5);

-      }

-

-      [Test]

-      public void InsertAllDuplicate1()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        try

-        {

-          lst.InsertAll<int>(1, new int[] { 1, 2, 3, 4 });

-        }

-        catch (DuplicateNotAllowedException)

-        {

-        }

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 1, 2, 3));

-      }

-

-      [Test]

-      public void InsertAllDuplicate2()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        try

-        {

-          lst.InsertAll<int>(1, new int[] { 5, 6, 5, 8 });

-        }

-        catch (DuplicateNotAllowedException)

-        {

-        }

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 5, 6, 3));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertLow()

-      {

-        lst.Add(7);

-        lst.Insert(-1, 9);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertHi()

-      {

-        lst.Add(6);

-        lst.Insert(2, 11);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        for (int i = 0; i < 7; i++)

-          lst.Add(2 * i);

-

-        Assert.IsFalse(lst.FIFO);

-        Assert.AreEqual(12, lst.Remove());

-        Assert.AreEqual(10, lst.Remove());

-        lst.FIFO = true;

-        Assert.AreEqual(0, lst.Remove());

-        Assert.AreEqual(2, lst.Remove());

-        lst.FIFO = false;

-        Assert.AreEqual(8, lst.Remove());

-        Assert.AreEqual(6, lst.Remove());

-      }

-

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        lst.InsertFirst(4);

-        lst.InsertLast(5);

-        lst.InsertFirst(14);

-        lst.InsertLast(15);

-        lst.InsertFirst(24);

-        lst.InsertLast(25);

-        lst.InsertFirst(34);

-        lst.InsertLast(55);

-        Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

-      }

-

-

-      [Test]

-      public void InsertFirst()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        lst.Add(5);

-        lst.ViewOf(2).InsertFirst(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 3, 4, 5));

-        lst.ViewOf(3).InsertFirst(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 5));

-        lst.ViewOf(5).InsertFirst(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 9, 5));

-      }

-

-

-      [Test]

-      public void BadFirst()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        Assert.IsNull(lst.ViewOf(4));

-      }

-

-

-      [Test]

-      public void InsertAfter()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        lst.Add(5);

-        lst.LastViewOf(2).InsertLast(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 7, 3, 4, 5));

-        lst.LastViewOf(1).InsertLast(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5));

-        lst.LastViewOf(5).InsertLast(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5, 9));

-      }

-

-

-      [Test]

-      public void BadInsertAfter()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(6);

-        lst.Add(5);

-        Assert.IsNull(lst.ViewOf(4));

-      }

-

-

-      [Test]

-      public void InsertAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-

-        IList<int> lst2 = new HashedArrayList<int>();

-

-        lst2.Add(7); lst2.Add(8); lst2.Add(9);

-        lst.InsertAll(0, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

-        lst.RemoveAll(lst2);

-        lst.InsertAll(4, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 3, 4, 7, 8, 9));

-        lst.RemoveAll(lst2);

-        lst.InsertAll(2, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 7, 8, 9, 3, 4));

-      }

-

-      [Test]

-      [ExpectedException(typeof(DuplicateNotAllowedException))]

-      public void InsertAllBad()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-

-        IList<int> lst2 = new HashedArrayList<int>();

-

-        lst2.Add(5); lst2.Add(2); lst2.Add(9);

-        lst.InsertAll(0, lst2);

-      }

-

-

-      [Test]

-      public void Map()

-      {

-        Fun<int, string> m = delegate(int i) { return "<<" + i + ">>"; };

-        IList<string> r = lst.Map(m);

-

-        Assert.IsTrue(((HashedArrayList<string>)r).Check());

-        Assert.IsTrue(r.IsEmpty);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        r = lst.Map(m);

-        Assert.IsTrue(((HashedArrayList<string>)r).Check());

-        Assert.AreEqual(4, r.Count);

-        for (int i = 0; i < 4; i++)

-          Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

-      }

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapper()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapperView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAllView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemove() { lst.Remove(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveFirst() { lst.RemoveFirst(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveLast() { lst.RemoveLast(); }

-

-

-      [Test]

-      public void RemoveFirstLast()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        Assert.AreEqual(1, lst.RemoveFirst());

-        Assert.AreEqual(4, lst.RemoveLast());

-        Assert.AreEqual(2, lst.RemoveFirst());

-        Assert.AreEqual(3, lst.RemoveLast());

-        Assert.IsTrue(lst.IsEmpty);

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(0, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 0).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-        lst.View(5, 1).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void BadReverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.View(8, 3).Reverse();

-      }

-    }

-

-

-    [TestFixture]

-    public class Combined

-    {

-      private IList<KeyValuePair<int, int>> lst;

-

-

-      [SetUp]

-      public void Init()

-      {

-        lst = new HashedArrayList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        for (int i = 0; i < 10; i++)

-          lst.Add(new KeyValuePair<int, int>(i, i + 30));

-      }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Find()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Find(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Find(ref p));

-      }

-

-

-      [Test]

-      public void FindOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.FindOrAdd(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.FindOrAdd(ref p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void Update()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Update(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Update(p));

-      }

-

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.UpdateOrAdd(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.UpdateOrAdd(p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void RemoveWithReturn()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

+	namespace Enumerable

+	{

+		[TestFixture]

+		public class Multiops

+		{

+			private HashedArrayList<int> list;

+

+			private Filter<int> always, never, even;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedArrayList<int>();

+				always = delegate{return true;};

+				never = delegate{return false;};

+				even = delegate(int i){return i%2==0;};

+			}

+

+

+			[Test]

+			public void All()

+			{

+				Assert.IsTrue(list.All(always));

+				Assert.IsTrue(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(8);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(5);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsFalse(list.All(even));

+			}

+

+

+			[Test]

+			public void Exists()

+			{

+				Assert.IsFalse(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(5);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(8);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsTrue(list.Exists(even));

+			}

+

+

+			[Test]

+			public void Apply()

+			{

+				int sum = 0;

+				Applier<int> a = delegate(int i){sum=i+10*sum;};

+

+				list.Apply(a);

+				Assert.AreEqual(0, sum);

+				sum = 0;

+				list.Add(5);list.Add(8);list.Add(7);list.Add(5);

+				list.Apply(a);

+				Assert.AreEqual(587, sum);

+			}

+

 

-        Assert.IsTrue(lst.Remove(p, out p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        Assert.AreEqual(4, lst[3].Key);

-        Assert.AreEqual(34, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Remove(p, out p));

-      }

-    }

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

 

 

-    [TestFixture]

-    public class Sorting

-    {

-      private IList<int> lst;

 

+		[TestFixture]

+		public class GetEnumerator

+		{

+			private HashedArrayList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new HashedArrayList<int>(); }

+

+

+			[Test]

+			public void Empty()

+			{

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+				list.Add(5);

+				list.Add(10);

+				list.Add(1);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

 

-      [SetUp]

-      public void Init() { lst = new HashedArrayList<int>(); }

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(8, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(10, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(1, e.Current);

+				Assert.IsFalse(e.MoveNext());

+			}

 

 

-      [TearDown]

-      public void Dispose() { lst = null; }

+			[Test]

+			public void DoDispose()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

 

+				MSG.IEnumerator<int> e = list.GetEnumerator();

 

-      [Test]

-      public void Sort()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(55); lst.Add(7); lst.Add(3);

-        Assert.IsFalse(lst.IsSorted(new IC()));

-        lst.Sort(new IC());

-        Assert.IsTrue(lst.IsSorted());

-        Assert.IsTrue(lst.IsSorted(new IC()));

-        Assert.IsTrue(IC.eq(lst, 3, 5, 6, 7, 55));

-      }

-    }

-  }

+				e.MoveNext();

+				e.MoveNext();

+				e.Dispose();

+			}

 

 

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

 

+				MSG.IEnumerator<int> e = list.GetEnumerator();

 

-  namespace Range

-  {

-    [TestFixture]

-    public class Range

-    {

-      private IList<int> lst;

+				e.MoveNext();

+				list.Add(99);

+				e.MoveNext();

+			}

 

 

-      [SetUp]

-      public void Init() { lst = new HashedArrayList<int>(); }

 

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void GetRange()

-      {

-        //Assert.IsTrue(IC.eq(lst[0, 0)));

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

-        Assert.IsTrue(IC.eq(lst[3, 3], 3, 4, 5));

-        Assert.IsTrue(IC.eq(lst[6, 3], 6, 7, 8));

-        Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

-      }

-

-

-      [Test]

-      public void Backwards()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[0, 3].Backwards(), 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[3, 3].Backwards(), 5, 4, 3));

-        Assert.IsTrue(IC.eq(lst[6, 4].Backwards(), 9, 8, 7, 6));

-      }

-

-

-      [Test]

-      public void DirectionAndCount()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

-        Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 4].Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 4].Backwards().Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

-        Assert.AreEqual(4, lst[3, 4].Count);

-        Assert.AreEqual(4, lst[3, 4].Backwards().Count);

-        Assert.AreEqual(10, lst.Backwards().Count);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        foreach (int i in lst)

-        {

-          lst.Add(45 + i);

-        }

-      }

-    }

-  }

-

-

-

-

-  namespace View

-  {

-    [TestFixture]

-    public class Simple

-    {

-      HashedArrayList<int> list;

-      HashedArrayList<int> view;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-        list.Add(0); list.Add(1); list.Add(2); list.Add(3);

-        view = (HashedArrayList<int>)list.View(1, 2);

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        view = null;

-      }

-

-

-      void check()

-      {

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(view.Check());

-      }

-

-      [Test]

-      public void InsertPointer()

-      {

-        IList<int> view2 = list.View(2, 0);

-        list.Insert(view2, 7);

-        check();

-        list.Insert(list, 8);

-        check();

-        view.Insert(view2, 9);

-        check();

-        view.Insert(list.View(3, 2), 10);

-        check();

-        view.Insert(list.ViewOf(0), 11);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 11, 1, 9, 7, 2, 10, 3, 8));

-        Assert.IsTrue(IC.eq(view, 11, 1, 9, 7, 2, 10));

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad1()

-      {

-        view.Insert(list.View(0, 0), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad2()

-      {

-        view.Insert(list, 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad3()

-      {

-        list.Insert(new ArrayList<int>(), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad4()

-      {

-        list.Insert(new ArrayList<int>().View(0, 0), 7);

-      }

-

-

-      [Test]

-      public void Span()

-      {

-        IList<int> span = list.View(1, 0).Span(list.View(2, 0));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(1, span.Offset);

-        Assert.AreEqual(1, span.Count);

-        span = list.View(0, 2).Span(list.View(2, 2));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(0, span.Offset);

-        Assert.AreEqual(4, span.Count);

-        span = list.View(3, 1).Span(list.View(1, 1));

-        Assert.IsNull(span);

-      }

-

-      [Test]

-      public void ViewOf()

-      {

-        for (int i = 0; i < 4; i++)

-          list.Add(i);

-        IList<int> v = view.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.LastViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-      }

-

-      [Test]

-      public void BadViewOf()

-      {

-        Assert.IsNull(view.ViewOf(5));

-        Assert.IsNull(view.LastViewOf(5));

-        Assert.IsNull(view.ViewOf(3));

-        Assert.IsNull(view.LastViewOf(3));

-        Assert.IsNull(view.ViewOf(0));

-        Assert.IsNull(view.LastViewOf(0));

-      }

-

-

-      [Test]

-      public void ArrayStuff()

-      {

-        Assert.IsTrue(IC.eq(view.ToArray(), 1, 2));

-        int[] extarray = new int[5];

-        view.CopyTo(extarray, 2);

-        Assert.IsTrue(IC.eq(extarray, 0, 0, 1, 2, 0));

-      }

-

-

-      [Test]

-      public void Add()

-      {

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2));

-        view.InsertFirst(10);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 10, 1, 2));

-        view.Clear();

-        Assert.IsFalse(view.IsReadOnly);

-        Assert.IsFalse(view.AllowsDuplicates);

-        Assert.IsTrue(view.IsEmpty);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 3));

-        Assert.IsTrue(IC.eq(view));

-        view.Add(8);

-        Assert.IsFalse(view.IsEmpty);

-        Assert.IsFalse(view.AllowsDuplicates);

-        Assert.IsFalse(view.IsReadOnly);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 3));

-        Assert.IsTrue(IC.eq(view, 8));

-        view.Add(12);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12));

-        view./*ViewOf(12).*/InsertLast(15);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12, 15));

-        view.ViewOf(12).InsertFirst(18);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

-

-        HashedArrayList<int> lst2 = new HashedArrayList<int>();

-

-        lst2.Add(90); lst2.Add(92);

-        view.AddAll(lst2);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

-        view.InsertLast(66);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

-      }

-

-

-      [Test]

-      public void Bxxx()

-      {

-        Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

-        Assert.AreSame(list, view.Underlying);

-        Assert.IsNull(list.Underlying);

-        Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

-        Assert.AreEqual(0, list.Offset);

-        Assert.AreEqual(1, view.Offset);

-      }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsTrue(view.Contains(1));

-        Assert.IsFalse(view.Contains(0));

-

-        HashedArrayList<int> lst2 = new HashedArrayList<int>();

-

-        lst2.Add(2);

-        Assert.IsTrue(view.ContainsAll(lst2));

-        lst2.Add(3);

-        Assert.IsFalse(view.ContainsAll(lst2));

-        Assert.AreEqual(Speed.Constant, view.ContainsSpeed);

-        Assert.AreEqual(2, view.Count);

-        view.Add(1);

-        Assert.AreEqual(1, view.ContainsCount(2));

-        Assert.AreEqual(1, view.ContainsCount(1));

-        Assert.AreEqual(2, view.Count);

-      }

-

-

-      [Test]

-      public void CreateView()

-      {

-        HashedArrayList<int> view2 = (HashedArrayList<int>)view.View(1, 0);

-

-        Assert.AreSame(list, view2.Underlying);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        Assert.IsFalse(view.FIFO);

-        view.FIFO = true;

-        view.Add(23); view.Add(24); view.Add(25);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

-        Assert.AreEqual(1, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

-        view.FIFO = false;

-        Assert.IsFalse(view.FIFO);

-        Assert.AreEqual(25, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24));

-      }

-

-

-      [Test]

-      public void MapEtc()

-      {

-        HashedArrayList<double> dbl = (HashedArrayList<double>)view.Map(new Fun<int, double>(delegate(int i) { return i / 10.0; }));

-

-        Assert.IsTrue(dbl.Check());

-        Assert.AreEqual(0.1, dbl[0]);

-        Assert.AreEqual(0.2, dbl[1]);

-        for (int i = 0; i < 10; i++) view.Add(i);

-

-        HashedArrayList<int> list2 = (HashedArrayList<int>)view.FindAll(new Fun<int, bool>(delegate(int i) { return i % 4 == 1; }));

-

-        Assert.IsTrue(list2.Check());

-        Assert.IsTrue(IC.eq(list2, 1, 5, 9));

-      }

-

-

-      [Test]

-      public void FL()

-      {

-        Assert.AreEqual(1, view.First);

-        Assert.AreEqual(2, view.Last);

-      }

-

-

-      [Test]

-      public void Indexing()

-      {

-        list.Clear();

-        for (int i = 0; i < 20; i++) list.Add(i);

-

-        view = (HashedArrayList<int>)list.View(5, 7);

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

-      }

-

-

-      [Test]

-      public void Insert()

-      {

-        view.Insert(0, 34);

-        view.Insert(1, 35);

-        view.Insert(4, 36);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

-

-        IList<int> list2 = new HashedArrayList<int>();

-

-        list2.Add(40); list2.Add(41);

-        view.InsertAll(3, list2);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 40, 41, 2, 36));

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        view.Add(45); view.Add(47); view.Add(46); view.Add(48);

-        Assert.IsFalse(view.IsSorted(new IC()));

-        view.Sort(new IC());

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 5));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        Assert.IsFalse(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        Assert.IsFalse(view.Remove(0));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        view.RemoveAllCopies(3);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        Assert.IsTrue(IC.eq(list, 0, 2, 5, 3));

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 2, 5, 1));

-

-        HashedArrayList<int> l2 = new HashedArrayList<int>();

-

-        l2.Add(1); l2.Add(2); l2.Add(2); l2.Add(3); l2.Add(1);

-        view.RemoveAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view, 5));

-        view.RetainAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(2); view.Add(4); view.Add(5);

-        Assert.AreEqual(2, view.RemoveAt(0));

-        Assert.AreEqual(5, view.RemoveAt(1));

-        Assert.AreEqual(4, view.RemoveAt(0));

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(8); view.Add(6); view.Add(78);

-        Assert.AreEqual(8, view.RemoveFirst());

-        Assert.AreEqual(78, view.RemoveLast());

-        view.Add(2); view.Add(5); view.Add(3); view.Add(1);

-        view.RemoveInterval(1, 2);

-        check();

-        Assert.IsTrue(IC.eq(view, 6, 1));

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        view.Clear();

-        for (int i = 0; i < 10; i++) view.Add(10 + i);

-

-        view.View(3, 4).Reverse();

-        check();

-        Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

-        view.Reverse();

-        Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

-        Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

-      }

-

-

-      [Test]

-      public void Slide()

-      {

-        view.Slide(1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 3));

-        view.Slide(-2);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1));

-        view.Slide(0, 3);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1, 2));

-        view.Slide(2, 1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2));

-        view.Slide(-1, 0);

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(28);

-        Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

-      }

-      [Test]

-      public void Iterate()

-      {

-        list.Clear();

-        view = null;

-        foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 10, 11 }) list.Add(i);

-

-        view = (HashedArrayList<int>)list.View(list.Count - 2, 2);

-        int j = 666;

-        while (true)

-        {

-          //Console.WriteLine("View: {0}:  {1} --> {2}", view.Count, view.First, view.Last);

-          if ((view.Last - view.First) % 2 == 1)

-            view.Insert(1, j++);

-          check();

-          if (view.Offset == 0)

-            break;

-          else

-            view.Slide(-1, 2);

-        }

-        //foreach (int cell in list) Console.Write(" " + cell);

-        //Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 2, 4, 8, 668, 13, 6, 1, 667, 10, 666, 11));

-      }

-

-

-      [Test]

-      public void SyncRoot()

-      {

-        Assert.AreSame(view.SyncRoot, list.SyncRoot);

-      }

-    }

-

-    [TestFixture]

-    public class MulipleViews

-    {

-      IList<int> list;

-      IList<int>[][] views;

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedArrayList<int>();

-        for (int i = 0; i < 6; i++)

-          list.Add(i);

-        views = new IList<int>[7][];

-        for (int i = 0; i < 7; i++)

-        {

-          views[i] = new IList<int>[7 - i];

-          for (int j = 0; j < 7 - i; j++)

-            views[i][j] = list.View(i, j);

-        }

-      }

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        views = null;

-      }

-      [Test]

-      public void Insert()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(3, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAt()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(3);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 3 && i + j > 3 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveInterval(3, 2);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i <= 5 ? 3 : i - 2, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j == 0 ? 0 : i <= 3 && i + j > 4 ? j - 2 : i > 4 || i + j <= 3 ? j : j - 1, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void InsertAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.InsertLast(777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(5);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 5 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 5 && i + j > 5 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void InsertAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(0, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 && j == 0 ? 0 : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(0);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i == 0 && j > 0 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void Clear()

-      {

-        Assert.IsTrue(list.Check(), "list check before clear");

-        //for (int i = 0; i < 7; i++)

-        //for (int j = 0; j < 7 - i; j++)

-        //Console.WriteLine("// view[{0}][{1}] : {2}", i, j, ((HashedArrayList<int>) views[i][j]).GetHashCode());

-        views[2][3].Clear();

-        Assert.IsTrue(list.Check(), "list check after clear");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 2 ? i : i < 6 ? 2 : i - 3, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(s(i, j), views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      private int s(int i, int j)

-      {

-        if (j == 0) return 0;

-        int k = i + j - 1; //end

-        if (i > 4 || k <= 1) return j;

-        if (i >= 2) return k > 4 ? k - 4 : 0;

-        if (i <= 2) return k >= 4 ? j - 3 : 2 - i;

-        return -1;

-      }

-      [Test]

-      public void InsertAll()

-      {

-        IList<int> list2 = new HashedArrayList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before insertAll");

-        list.InsertAll(3, list2);

-        Assert.IsTrue(list.Check(), "list check after insertAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        IList<int> list2 = new HashedArrayList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before AddAll");

-        list.View(1, 2).AddAll(list2);

-        Assert.IsTrue(list.Check(), "list check after AddAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void Remove()

-      {

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new HashedArrayList<int>();

-            for (int k = 0; k < 6; k++) list.Add(k);

-            HashedArrayList<int> v = (HashedArrayList<int>)list.View(i, j);

-            list.Remove(3);

-            Assert.IsTrue(list.Check(), "list check after Remove, i=" + i + ", j=" + j);

-          }

-        }

-      }

-      [Test]

-      public void RemoveAll1()

-      {

-        IList<int> list2 = new HashedArrayList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new HashedArrayList<int>();

-            for (int k = 0; k < 6; k++) list.Add(k);

-            HashedArrayList<int> v = (HashedArrayList<int>)list.View(i, j);

-            list.RemoveAll(list2);

-            Assert.IsTrue(list.Check(), "list check after RemoveAll, i=" + i + ", j=" + j);

-          }

-        }

-      }

-      [Test]

-      public void RemoveAll2()

-      {

-        IList<int> list2 = new HashedArrayList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-        Assert.IsTrue(list.Check(), "list check before RemoveAll");

-        list.RemoveAll(list2);

-

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(1, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(1, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(1, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(1, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(1, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(1, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(1, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(1, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(1, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(1, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(1, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(2, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(2, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(2, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(2, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(2, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(2, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(2, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(1, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(1, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(2, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(2, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(1, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(2, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(1, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(2, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(0, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(1, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(0, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(1, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-        Assert.IsTrue(list.Check(), "list check after RemoveAll");

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        IList<int> list2 = new HashedArrayList<int>();

-        list2.Add(2); list2.Add(4); list2.Add(5);

-        Assert.IsTrue(list.Check(), "list check before RetainAll");

-        list.RetainAll(list2);

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(0, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(0, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(0, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(0, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(0, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(0, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(0, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(0, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(0, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(0, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(0, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(1, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(1, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(1, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(1, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(1, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(1, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(1, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(0, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(0, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(1, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(1, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(2, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(3, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(2, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(3, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(1, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(2, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(1, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(2, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-        Assert.IsTrue(list.Check(), "list check after RetainAll");

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        IList<int> list2 = new HashedArrayList<int>();

-        list2.Add(0); list2.Add(2); list2.Add(82); list2.Add(92); list2.Add(5); list2.Add(2); list2.Add(1);

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new HashedArrayList<int>();

-            list.AddAll(list2);

-            HashedArrayList<int> v = (HashedArrayList<int>)list.View(i, j);

-            list.RemoveAllCopies(2);

-            Assert.IsTrue(list.Check(), "list check after RemoveAllCopies, i=" + i + ", j=" + j);

-          }

-        }

-      }

-

-      private void checkDisposed(bool reverse, int start, int count)

-      {

-        int k = 0;

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            if (i + j <= start || i >= start + count || (i <= start && i + j >= start + count) || (reverse && start <= i && start + count >= i + j))

-            {

-              try

-              {

-                k = views[i][j].Count;

-              }

-              catch (ViewDisposedException)

-              {

-                Assert.Fail("view[" + i + "][" + j + "] threw");

-              }

-              Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] size");

-              if (reverse && ((j > 0 && start <= i && start + count >= i + j) || (j == 0 && start < i && start + count > i)))

-                Assert.AreEqual(start + (start + count - i - j), views[i][j].Offset, "view[" + i + "][" + j + "] offset (mirrored)");

-              else

-                Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            }

-            else

-            {

-              try

-              {

-                k = views[i][j].Count;

-                Assert.Fail("view[" + i + "][" + j + "] no throw");

-              }

-              catch (ViewDisposedException) { }

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

+

+

+

+

+	namespace CollectionOrSink

+	{

+		[TestFixture]

+		public class CollectionOrSink

+		{

+			private HashedArrayList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new HashedArrayList<int>(); }

+

+

+			[Test]

+			public void CountEtAl()

+			{

+				Assert.AreEqual(0, list.Count);

+				Assert.IsTrue(list.IsEmpty);

+				Assert.IsFalse(list.AllowsDuplicates);

+				Assert.IsTrue(list.Add(5));

+				Assert.AreEqual(1, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				Assert.IsFalse(list.Add(5));

+				Assert.AreEqual(1, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				Assert.IsTrue(list.Add(8));

+				Assert.AreEqual(2, list.Count);

+			}

+

+			[Test]

+			public void AddAll()

+			{

+				list.Add(3);list.Add(4);list.Add(5);

+

+				HashedArrayList<int> list2 = new HashedArrayList<int>();

+

+				list2.AddAll(list);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				list.AddAll(list2);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				Assert.IsTrue(IC.eq(list, 3, 4, 5));

+			}

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+

+

+

+		[TestFixture]

+		public class ArrayTest

+		{

+			private HashedArrayList<int> list;

+

+			int[] a;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedArrayList<int>();

+				a = new int[10];

+				for (int i = 0; i < 10; i++)

+					a[i] = 1000 + i;

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+

+

+			private string aeq(int[] a, params int[] b)

+			{

+				if (a.Length != b.Length)

+					return "Lengths differ: " + a.Length + " != " + b.Length;

+

+				for (int i = 0; i < a.Length; i++)

+					if (a[i] != b[i])

+						return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

+

+				return "Alles klar";

+			}

+

+

+			[Test]

+			public void ToArray()

+			{

+				Assert.AreEqual("Alles klar", aeq(list.ToArray()));

+				list.Add(7);

+				list.Add(8);

+				Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 8));

+			}

+

+

+			[Test]

+			public void CopyTo()

+			{

+				list.CopyTo(a, 1);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(6);

+				list.CopyTo(a, 2);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(4);

+				list.Add(5);

+				list.Add(9);

+				list.CopyTo(a, 4);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 1009));

+				list.Clear();

+				list.Add(7);

+				list.CopyTo(a, 9);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 7));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToBad()

+			{

+				list.Add(3);

+				list.CopyTo(a, 10);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void CopyToBad2()

+			{

+				list.CopyTo(a, -1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToTooFar()

+			{

+				list.Add(3);

+				list.Add(4);

+				list.CopyTo(a, 9);

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Sync

+		{

+			private HashedArrayList<int> list;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedArrayList<int>();

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+

+

+			[Test]

+			public void Get()

+			{

+				Assert.IsNotNull(list.SyncRoot);

+			}

+		}

+	}

+

+

+

+

+	namespace EditableCollection

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private HashedArrayList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new HashedArrayList<int>(); }

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsFalse(list.Contains(5));

+				list.Add(5);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				list.Add(8);

+				list.Add(10);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsTrue(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+				list.Remove(8);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsFalse(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+			}

+

+			[Test]

+			public void BadAdd()

+			{

+				Assert.IsTrue(list.Add(5));

+				Assert.IsTrue(list.Add(8));

+				Assert.IsFalse(list.Add(5));

+			}

+

+

+			[Test]

+			public void ContainsCount()

+			{

+				Assert.AreEqual(0, list.ContainsCount(5));

+				list.Add(5);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				list.Add(8);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				Assert.AreEqual(1, list.ContainsCount(8));

+			}

+

+

+			[Test]

+			public void RemoveAllCopies()

+			{

+				list.Add(5);list.Add(7);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.RemoveAllCopies(5);

+				Assert.AreEqual(0, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.Add(5);list.Add(8);

+				list.RemoveAllCopies(8);

+				Assert.IsTrue(IC.eq(list, 7, 5));

+			}

+

+

+			[Test]

+			public void FindAll()

+			{

+				Filter<int> f = delegate(int i){return i%2==0;};

+

+				Assert.IsTrue(list.FindAll(f).IsEmpty);

+				list.Add(5);list.Add(8);list.Add(10);

+				Assert.IsTrue(((ArrayList<int>)list.FindAll(f)).Check());

+				Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10));

+			}

+

+

+			[Test]

+			public void ContainsAll()

+			{

+				HashedArrayList<int> list2 = new HashedArrayList<int>();

+

+				Assert.IsTrue(list.ContainsAll(list2));

+				list2.Add(4);

+				Assert.IsFalse(list.ContainsAll(list2));

+				list.Add(4);

+				Assert.IsTrue(list.ContainsAll(list2));

+				list.Add(5);

+				Assert.IsTrue(list.ContainsAll(list2));

+			}

+

+			[Test]

+			public void RetainAll()

+			{

+				HashedArrayList<int> list2 = new HashedArrayList<int>();

+

+				list.Add(4);list.Add(5);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 5));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(5);list2.Add(5);list2.Add(6);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 6));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list));

+			}

+

+			[Test]

+			public void RemoveAll()

+			{

+				HashedArrayList<int> list2 = new HashedArrayList<int>();

+

+				list.Add(4);list.Add(5);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 6));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(6);list2.Add(5);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				list.Add(4);list.Add(5);list.Add(6);

+				Assert.IsFalse(list.Remove(2));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(list.Remove(4));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 6));

+				Assert.AreEqual(6, list.RemoveLast());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5));

+				list.Add(7);

+				Assert.AreEqual(5, list.RemoveFirst());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 7));

+			}

+

+

+			[Test]

+			public void Clear()

+			{

+				list.Add(7);list.Add(6);

+				list.Clear();

+				Assert.IsTrue(list.IsEmpty);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

+

+

+

+

+	namespace IIndexed

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+			}

+

+

+			[Test]

+			public void IndexOf()

+			{

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(-1, dit.LastIndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				dit.Add(5);dit.Add(7);dit.Add(8);dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				Assert.AreEqual(0, dit.LastIndexOf(7));

+				Assert.AreEqual(2, dit.IndexOf(8));

+				Assert.AreEqual(1, dit.LastIndexOf(5));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Removing

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+			}

+

+

+			[Test]

+			public void RemoveAt()

+			{

+				dit.Add(5);dit.Add(7);dit.Add(9);dit.Add(1);dit.Add(2);

+				Assert.AreEqual(7, dit.RemoveAt(1));

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

+				Assert.AreEqual(5, dit.RemoveAt(0));

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1, 2));

+				Assert.AreEqual(2, dit.RemoveAt(2));

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad0()

+			{

+				dit.RemoveAt(0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBadM1()

+			{

+				dit.RemoveAt(-1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad1()

+			{

+				dit.Add(8);

+				dit.RemoveAt(1);

+			}

+

+			[Test]

+			public void RemoveInterval()

+			{

+				dit.RemoveInterval(0, 0);

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(3, 0);

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

+				dit.RemoveInterval(3, 1);

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

+				dit.RemoveInterval(1, 3);

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 60));

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit));

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

+				dit.RemoveInterval(2, 2);

+				Assert.IsTrue(((HashedArrayList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40));

+			}

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+	}

+

+

+

+

+	namespace IList

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void FirstBad()

+			{

+				int f = lst.First;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void LastBad()

+			{

+				int f = lst.Last;

+			}

+

+

+			[Test]

+			public void FirstLast()

+			{

+				lst.Add(19);

+				Assert.AreEqual(19, lst.First);

+				Assert.AreEqual(19, lst.Last);

+				lst.Add(34);lst.InsertFirst(12);

+				Assert.AreEqual(12, lst.First);

+				Assert.AreEqual(34, lst.Last);

+			}

+

+			[Test]

+			public void This()

+			{

+				lst.Add(34);

+				Assert.AreEqual(34, lst[0]);

+				lst[0] = 56;

+				Assert.AreEqual(56, lst.First);

+				lst.Add(7);lst.Add(77);lst.Add(777);lst.Add(7777);

+				lst[0] = 45;lst[2] = 78;lst[4] = 101;

+				Assert.IsTrue(IC.eq(lst, 45, 7, 78, 777, 101));

+			}

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptyGet()

+			{

+				int f = lst[0];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowGet()

+			{

+				lst.Add(7);

+

+				int f = lst[-1];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiGet()

+			{

+				lst.Add(6);

+

+				int f = lst[1];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptySet()

+			{

+				lst[0] = 4;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowSet()

+			{

+				lst.Add(7);

+				lst[-1] = 9;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiSet()

+			{

+				lst.Add(6);

+				lst[1] = 11;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Inserting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+			[Test]

+			public void Insert()

+			{

+				lst.Insert(0, 5);

+				Assert.IsTrue(IC.eq(lst, 5));

+				lst.Insert(0, 7);

+				Assert.IsTrue(IC.eq(lst, 7, 5));

+				lst.Insert(1, 4);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5));

+				lst.Insert(3, 2);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

+			}

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertLow()

+			{

+				lst.Add(7);

+				lst.Insert(-1, 9);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertHi()

+			{

+				lst.Add(6);

+				lst.Insert(2, 11);

+			}

+

+

+			[Test]

+			public void FIFO()

+			{

+				for (int i = 0; i < 7; i++)

+					lst.Add(2 * i);

+

+				Assert.IsTrue(lst.FIFO);

+				Assert.AreEqual(0, lst.Remove());

+				Assert.AreEqual(2, lst.Remove());

+				lst.FIFO = false;

+				Assert.AreEqual(12, lst.Remove());

+				Assert.AreEqual(10, lst.Remove());

+				lst.FIFO = true;

+				Assert.AreEqual(4, lst.Remove());

+				Assert.AreEqual(6, lst.Remove());

+			}

+

+			[Test]

+			public void InsertFirstLast()

+			{

+				lst.InsertFirst(4);

+				lst.InsertLast(5);

+				lst.InsertFirst(14);

+				lst.InsertLast(15);

+				lst.InsertFirst(24);

+				lst.InsertLast(25);

+				lst.InsertFirst(34);

+				lst.InsertLast(55);

+				Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

+			}

+

+			[Test]

+			public void InsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				lst.Add(5);

+				lst.InsertBefore(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 3, 4, 5));

+				lst.InsertBefore(8, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 5));

+				lst.InsertBefore(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 9, 5));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertBefore(7, 4);

+			}

+

+			[Test]

+			public void InsertAfter()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				lst.Add(5);

+				lst.InsertAfter(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 7, 3, 4, 5));

+				lst.InsertAfter(8, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5));

+				lst.InsertAfter(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5, 9));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfter()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(6);

+				lst.Add(5);

+				lst.InsertAfter(7, 4);

+			}

+

+			[Test]

+			public void InsertAll()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+

+				IList<int> lst2 = new HashedArrayList<int>();

+

+				lst2.Add(7);lst2.Add(8);lst2.Add(9);

+				lst.InsertAll(0, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

+				lst.RemoveAll(lst2);

+				lst.InsertAll(4, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 3, 4, 7, 8, 9));

+				lst.RemoveAll(lst2);

+				lst.InsertAll(2, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 7, 8, 9, 3, 4));

+			}

+

+			[Test]

+			public void Map()

+			{

+				Mapper<int,string> m = delegate(int i){return "<<"+i+">>";};

+				IList<string> r = lst.Map(m);

+

+				Assert.IsTrue(((ArrayList<string>)r).Check());

+				Assert.IsTrue(r.IsEmpty);

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				r = lst.Map(m);

+				Assert.IsTrue(((ArrayList<string>)r).Check());

+				Assert.AreEqual(4, r.Count);

+				for (int i = 0; i < 4; i++)

+					Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

+			}

+

+

+			[Test]

+			public void RemoveFirstLast()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				Assert.AreEqual(1, lst.RemoveFirst());

+				Assert.AreEqual(4, lst.RemoveLast());

+				Assert.AreEqual(2, lst.RemoveFirst());

+				Assert.AreEqual(3, lst.RemoveLast());

+				Assert.IsTrue(lst.IsEmpty);

+			}

+

+			[Test]

+			public void Reverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse();

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(0, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 0);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+				lst.Reverse(5, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+			}

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void BadReverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse(8, 3);

+			}

+		}

+

+

+		[TestFixture]

+		public class Combined

+		{

+			private IList<KeyValuePair<int,int>> lst;

+

+

+			[SetUp]

+			public void Init()

+			{

+				lst = new HashedArrayList<KeyValuePair<int,int>>();

+				for (int i = 0; i < 10; i++)

+					lst.Add(new KeyValuePair<int,int>(i, i + 30));

+			}

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+			[Test]

+			public void Find()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Find(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Find(ref p));

+			}

+

+

+			[Test]

+			public void FindOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.FindOrAdd(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.FindOrAdd(ref p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void Update()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Update(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Update(p));

+			}

+

+

+			[Test]

+			public void UpdateOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.UpdateOrAdd(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.UpdateOrAdd(p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void RemoveWithReturn()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.RemoveWithReturn(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				Assert.AreEqual(4, lst[3].key);

+				Assert.AreEqual(34, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.RemoveWithReturn(ref p));

+			}

+		}

+

+		[TestFixture]

+		public class Sorting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Sort()

+			{

+				lst.Add(5);lst.Add(6);lst.Add(55);lst.Add(7);lst.Add(3);

+				Assert.IsFalse(lst.IsSorted(new IC()));

+				lst.Sort(new IC());

+				Assert.IsTrue(lst.IsSorted(new IC()));

+				Assert.IsTrue(IC.eq(lst, 3, 5, 6, 7, 55));

+			}

+		}

+	}

+

+

+

+	namespace Range

+	{

+		[TestFixture]

+		public class Range

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedArrayList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void GetRange()

+			{

+				//Assert.IsTrue(IC.eq(lst[0, 0)));

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

+				Assert.IsTrue(IC.eq(lst[3, 3], 3, 4, 5));

+				Assert.IsTrue(IC.eq(lst[6, 3], 6, 7, 8));

+				Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

+			}

+

+

+			[Test]

+			public void Backwards()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[0, 3].Backwards(), 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[3, 3].Backwards(),  5, 4, 3));

+				Assert.IsTrue(IC.eq(lst[6, 4].Backwards(),  9, 8, 7, 6));

+			}

+

+

+			[Test]

+			public void DirectionAndCount()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

+				Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 4].Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 4].Backwards().Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

+				Assert.AreEqual(4, lst[3, 4].Count);

+				Assert.AreEqual(4, lst[3, 4].Backwards().Count);

+				Assert.AreEqual(10, lst.Backwards().Count);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				foreach (int i in lst)

+				{

+					lst.Add(45 + i);

+				}

+			}

+		}

+	}

+

+

+

+

+	namespace View

+	{

+		[TestFixture]

+		public class Simple

+		{

+			HashedArrayList<int> list;

+			HashedArrayList<int> view;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedArrayList<int>();

+				list.Add(0);list.Add(1);list.Add(2);list.Add(3);

+				view = (HashedArrayList<int>)list.View(1, 2);

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				list = null;

+				view = null;

+			}

+

+

+			void check()

+			{

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(view.Check());

+			}

+

+

+			[Test]

+			public void Add()

+			{

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2));

+				view.InsertFirst(10);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 10, 1, 2));

+				view.Clear();

+				Assert.IsFalse(view.IsReadOnly);

+				Assert.IsFalse(view.AllowsDuplicates);

+				Assert.IsTrue(view.IsEmpty);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 3));

+				Assert.IsTrue(IC.eq(view));

+				view.Add(8);

+				Assert.IsFalse(view.IsEmpty);

+				Assert.IsFalse(view.AllowsDuplicates);

+				Assert.IsFalse(view.IsReadOnly);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 3));

+				Assert.IsTrue(IC.eq(view, 8));

+				view.Add(12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12));

+				view.InsertAfter(15, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12, 15));

+				view.InsertBefore(18, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

+

+				HashedArrayList<int> lst2 = new HashedArrayList<int>();

+

+				lst2.Add(90);lst2.Add(92);

+				view.AddAll(lst2);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

+				view.InsertLast(66);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

+			}

+

+

+			[Test]

+			public void Bxxx()

+			{

+				Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

+                Assert.AreSame(list, view.Underlying);

+                Assert.IsNull(list.Underlying);

+                Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

+				Assert.AreEqual(0,list.Offset);

+				Assert.AreEqual(1,view.Offset);

+			}

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsTrue(view.Contains(1));

+				Assert.IsFalse(view.Contains(0));

+

+				HashedArrayList<int> lst2 = new HashedArrayList<int>();

+

+				lst2.Add(2);

+				Assert.IsTrue(view.ContainsAll(lst2));

+				lst2.Add(3);

+				Assert.IsFalse(view.ContainsAll(lst2));

+				Assert.AreEqual(Speed.Constant, view.ContainsSpeed);

+				Assert.AreEqual(2, view.Count);

+				view.Add(1);

+				Assert.AreEqual(1, view.ContainsCount(2));

+				Assert.AreEqual(1, view.ContainsCount(1));

+				Assert.AreEqual(2, view.Count);

+			}

+

+

+			[Test]

+			public void CreateView()

+			{

+				HashedArrayList<int> view2 = (HashedArrayList<int>)view.View(1, 0);

+

+                Assert.AreSame(list, view2.Underlying);

             }

-          }

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Reverse");

-        list2.Reverse();

-        Assert.IsTrue(list.Check(), "list check after Reverse");

-        checkDisposed(true, start, count);

-      }

-

-      [Test]

-      public void Sort()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Sort");

-        list2.Sort();

-        Assert.IsTrue(list.Check(), "list check after Sort");

-        checkDisposed(false, start, count);

-      }

-      [Test]

-      public void Shuffle()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Shuffle");

-        list2.Shuffle();

-        Assert.IsTrue(list.Check(), "list check after Shuffle");

-        checkDisposed(false, start, count);

-      }

-

-

-    }

-

-  }

-

-  namespace HashingAndEquals

-  {

-    [TestFixture]

-    public class IIndexed

-    {

-      private ISequenced<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-        dat = new HashedArrayList<int>();

-        dut = new HashedArrayList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-      }

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-        Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(7), dut.GetSequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(0); dit.Add(31);

-        dat.Add(1); dat.Add(0);

-        Assert.AreEqual(dit.GetSequencedHashCode(), dat.GetSequencedHashCode());

-        Assert.IsFalse(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dat));

-        Assert.IsTrue(dat.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dut));

-        Assert.IsTrue(dut.SequencedEquals(dit));

-        dit.Add(7);

-        ((HashedArrayList<int>)dut).InsertFirst(7);

-        Assert.IsFalse(dit.SequencedEquals(dut));

-        Assert.IsFalse(dut.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class IEditableCollection

-    {

-      private ICollection<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-        dat = new HashedArrayList<int>();

-        dut = new HashedArrayList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(-1657792980); dit.Add(-1570288808);

-        dat.Add(1862883298); dat.Add(-272461342);

-        Assert.AreEqual(dit.GetUnsequencedHashCode(), dat.GetUnsequencedHashCode());

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsTrue(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-        dit.Add(7);

-        dut.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelUnorderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ICollection<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-        dat = new HashedArrayList<int>();

-        dut = new HashedArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new HashedArrayList<ICollection<int>>();

-        Dat = new HashedArrayList<ICollection<int>>();

-        Dut = new HashedArrayList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelOrderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ISequenced<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-        dat = new HashedArrayList<int>();

-        dut = new HashedArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new HashedArrayList<ICollection<int>>();

-        Dat = new HashedArrayList<ICollection<int>>();

-        Dut = new HashedArrayList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dit); Dut.Add(dut); Dut.Add(dat);

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelUnOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-        dat = new HashedArrayList<int>();

-        dut = new HashedArrayList<int>();

-        dot = new HashedArrayList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        dot.Add(2); dot.Add(1);

-        Dit = new HashedArrayList<ISequenced<int>>();

-        Dat = new HashedArrayList<ISequenced<int>>();

-        Dut = new HashedArrayList<ISequenced<int>>();

-        Dot = new HashedArrayList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-        Assert.IsTrue(Dit.UnsequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedArrayList<int>();

-        dat = new HashedArrayList<int>();

-        dut = new HashedArrayList<int>();

-        dot = new HashedArrayList<int>();

-        dit.Add(2); dit.Add(1); //{2,1}

-        dat.Add(1); dat.Add(2); //{1,2}

-        dut.Add(3);            //{3}

-        dot.Add(2); dot.Add(1); //{2,1}

-        Dit = new HashedArrayList<ISequenced<int>>();

-        Dat = new HashedArrayList<ISequenced<int>>();

-        Dut = new HashedArrayList<ISequenced<int>>();

-        Dot = new HashedArrayList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit); // {{2,1},{3}}

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat); // {{3},{2,1},{1,2}}

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit); // {{2,1},{3}}

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut); // {{2,1},{3}}

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

-  }

-}
\ No newline at end of file
+

+

+			[Test]

+			public void FIFO()

+			{

+				Assert.IsTrue(view.FIFO);

+				view.Add(23);view.Add(24);view.Add(25);

+				check();

+				Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

+				Assert.AreEqual(1, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

+				view.FIFO = false;

+				Assert.IsFalse(view.FIFO);

+				Assert.AreEqual(25, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24));

+			}

+

+

+			[Test]

+			public void MapEtc()

+			{

+				ArrayList<double> dbl = (ArrayList<double>)view.Map(new Mapper<int,double>(delegate(int i){return i/10.0;}));

+

+				Assert.IsTrue(dbl.Check());

+				Assert.AreEqual(0.1, dbl[0]);

+				Assert.AreEqual(0.2, dbl[1]);

+				for (int i = 0; i < 10; i++) view.Add(i);

+

+				ArrayList<int> list2 = (ArrayList<int>)view.FindAll(new Filter<int>(delegate(int i){return i%4==1;}));

+

+				Assert.IsTrue(list2.Check());

+				Assert.IsTrue(IC.eq(list2, 1, 5, 9));

+			}

+

+

+			[Test]

+			public void FL()

+			{

+				Assert.AreEqual(1, view.First);

+				Assert.AreEqual(2, view.Last);

+			}

+

+

+			[Test]

+			public void Indexing()

+			{

+				list.Clear();

+				for (int i = 0; i < 20; i++) list.Add(i);

+

+				view = (HashedArrayList<int>)list.View(5, 7);

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

+			}

+

+

+			[Test]

+			public void Insert()

+			{

+				view.Insert(0, 34);

+				view.Insert(1, 35);

+				view.Insert(4, 36);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

+

+				IList<int> list2 = new HashedArrayList<int>();

+

+				list2.Add(40);list2.Add(41);

+				view.InsertAll(3, list2);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 40, 41, 2, 36));

+			}

+

+

+			[Test]

+			public void Sort()

+			{

+				view.Add(45);view.Add(47);view.Add(46);view.Add(48);

+				Assert.IsFalse(view.IsSorted(new IC()));

+				view.Sort(new IC());

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 1, 2, 5));

+				Assert.IsTrue(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				Assert.IsFalse(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				Assert.IsFalse(view.Remove(0));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				view.RemoveAllCopies(3);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				Assert.IsTrue(IC.eq(list, 0, 2, 5, 3));

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 2, 5, 1));

+

+				HashedArrayList<int> l2 = new HashedArrayList<int>();

+

+				l2.Add(1);l2.Add(2);l2.Add(2);l2.Add(3);l2.Add(1);

+				view.RemoveAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view, 5));

+				view.RetainAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(2);view.Add(4);view.Add(5);

+				Assert.AreEqual(2, view.RemoveAt(0));

+				Assert.AreEqual(5, view.RemoveAt(1));

+				Assert.AreEqual(4, view.RemoveAt(0));

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(8);view.Add(6);view.Add(78);

+				Assert.AreEqual(8, view.RemoveFirst());

+				Assert.AreEqual(78, view.RemoveLast());

+				view.Add(2);view.Add(5);view.Add(3);view.Add(1);

+				view.RemoveInterval(1, 2);

+				check();

+				Assert.IsTrue(IC.eq(view, 6, 1));

+			}

+

+

+			[Test]

+			public void Reverse()

+			{

+				view.Clear();

+				for (int i = 0; i < 10; i++) view.Add(10 + i);

+

+				view.Reverse(3, 4);

+				check();

+				Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

+				view.Reverse();

+				Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

+				Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

+			}

+

+

+			[Test]

+			public void Slide()

+			{

+				view.Slide(1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 3));

+				view.Slide(-2);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1));

+				view.Slide(0, 3);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1, 2));

+				view.Slide(2, 1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2));

+				view.Slide(-1, 0);

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(28);

+				Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

+			}

+			[Test]

+			public void Iterate()

+			{

+				list.Clear();

+				view = null;

+				foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 10, 11 }) list.Add(i);

+

+				view = (HashedArrayList<int>)list.View(list.Count - 2, 2);

+				int j = 666;

+				while (true)

+				{

+					//Console.WriteLine("View: {0}:  {1} --> {2}", view.Count, view.First, view.Last);

+					if ((view.Last - view.First) % 2 == 1)

+						view.Insert(1, j++);

+					check();

+					if (view.Offset == 0)

+						break;

+					else

+						view.Slide(-1,2);

+				}

+				//foreach (int i in list) Console.Write(" " + i);

+				//Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 2, 4, 8, 668, 13, 6, 1, 667, 10, 666, 11));

+			}

+

+

+			[Test]

+			public void SyncRoot()

+			{

+				Assert.AreSame(view.SyncRoot, list.SyncRoot);

+			}

+		}

+	}

+

+	namespace HashingAndEquals

+	{

+		[TestFixture]

+		public class IIndexed

+		{

+			private ISequenced<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+				dat = new HashedArrayList<int>();

+				dut = new HashedArrayList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(7), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(0);dit.Add(31);

+				dat.Add(1);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				((HashedArrayList<int>)dut).InsertFirst(7);

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class IEditableCollection

+		{

+			private ICollection<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+				dat = new HashedArrayList<int>();

+				dut = new HashedArrayList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count, params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count << 16) + retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1, 3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1, 3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(2);dit.Add(1);

+				dat.Add(3);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				dut.Add(7);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnorderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ICollection<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+				dat = new HashedArrayList<int>();

+				dut = new HashedArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new HashedArrayList<ICollection<int>>();

+				Dat = new HashedArrayList<ICollection<int>>();

+				Dut = new HashedArrayList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ISequenced<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+				dat = new HashedArrayList<int>();

+				dut = new HashedArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new HashedArrayList<ICollection<int>>();

+				Dat = new HashedArrayList<ICollection<int>>();

+				Dut = new HashedArrayList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+				dat = new HashedArrayList<int>();

+				dut = new HashedArrayList<int>();

+				dot = new HashedArrayList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				dot.Add(2);dot.Add(1);

+				Dit = new HashedArrayList<ISequenced<int>>();

+				Dat = new HashedArrayList<ISequenced<int>>();

+				Dut = new HashedArrayList<ISequenced<int>>();

+				Dot = new HashedArrayList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedArrayList<int>();

+				dat = new HashedArrayList<int>();

+				dut = new HashedArrayList<int>();

+				dot = new HashedArrayList<int>();

+				dit.Add(2);dit.Add(1); //{2,1}

+				dat.Add(1);dat.Add(2); //{1,2}

+				dut.Add(3);            //{3}

+				dot.Add(2);dot.Add(1); //{2,1}

+				Dit = new HashedArrayList<ISequenced<int>>();

+				Dat = new HashedArrayList<ISequenced<int>>();

+				Dut = new HashedArrayList<ISequenced<int>>();

+				Dot = new HashedArrayList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit); // {{2,1},{3}}

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat); // {{3},{2,1},{1,2}}

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit); // {{2,1},{3}}

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut); // {{2,1},{3}}

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+	}

+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/arrays/SortedArrayTests.cs b/mcs/class/Mono.C5/Test/arrays/SortedArrayTests.cs
index 4cc4e1a2d64..e20a592af69 100644
--- a/mcs/class/Mono.C5/Test/arrays/SortedArrayTests.cs
+++ b/mcs/class/Mono.C5/Test/arrays/SortedArrayTests.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,63 +23,16 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

-namespace C5UnitTests.arrays.sorted

+namespace nunit.arrays.sorted

 {

-  using CollectionOfInt = SortedArray<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.SortedIndexedTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new SortedArray<T>(); }

-  }

-

-

-  [TestFixture]

-  public class Formatting

-  {

-    ICollection<int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{  }", coll.ToString());

-      coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-      Assert.AreEqual("{ -4, 28, 129, 65530 }", coll.ToString());

-      Assert.AreEqual("{ -4, 1C, 81, FFFA }", coll.ToString(null, rad16));

-      Assert.AreEqual("{ -4, 28, 129... }", coll.ToString("L14", null));

-      Assert.AreEqual("{ -4, 1C, 81... }", coll.ToString("L14", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class Ranges

+	[TestFixture]

+	public class Ranges

 	{

 		private SortedArray<int> array;

 

-		private SCG.IComparer<int> c;

+		private IComparer<int> c;

 

 

 		[SetUp]

@@ -96,7 +50,7 @@ namespace C5UnitTests.arrays.sorted
 		[Test]

 		public void Enumerator()

 		{

-			SCG.IEnumerator<int> e = array.RangeFromTo(5, 17).GetEnumerator();

+			MSG.IEnumerator<int> e = array.RangeFromTo(5, 17).GetEnumerator();

 			int i = 3;

 

 			while (e.MoveNext())

@@ -109,10 +63,10 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(CollectionModifiedException))]

+		[ExpectedException(typeof(InvalidOperationException))]

 		public void Enumerator3()

 		{

-			SCG.IEnumerator<int> e = array.RangeFromTo(5, 17).GetEnumerator();

+			MSG.IEnumerator<int> e = array.RangeFromTo(5, 17).GetEnumerator();

 

 			e.MoveNext();

 			array.Add(67);

@@ -288,58 +242,8 @@ namespace C5UnitTests.arrays.sorted
 			array = new SortedArray<int>(new IC());

 		}

 

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new SortedArray<int>(null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor2()

-    {

-      new SortedArray<int>(5, null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor3()

-    {

-      new SortedArray<int>(5, null, EqualityComparer<int>.Default);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor4()

-    {

-      new SortedArray<int>(5, Comparer<int>.Default, null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor5()

-    {

-      new SortedArray<int>(5, null, null);

-    }

-

-    [Test]

-    public void Choose()

-    {

-      array.Add(7);

-      Assert.AreEqual(7, array.Choose());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      array.Choose();

-    }

-

-

-

-    private void loadup()

+

+		private void loadup()

 		{

 			for (int i = 10; i < 20; i++)

 			{

@@ -406,100 +310,19 @@ namespace C5UnitTests.arrays.sorted
 			KeyValuePair<int,string> p = new KeyValuePair<int,string>(3, "tre");

 

 			Assert.IsFalse(bag.FindOrAdd(ref p));

-			p.Value = "drei";

+			p.value = "drei";

 			Assert.IsTrue(bag.FindOrAdd(ref p));

-			Assert.AreEqual("tre", p.Value);

-			p.Value = "three";

+			Assert.AreEqual("tre", p.value);

+			p.value = "three";

 			Assert.AreEqual(1, bag.ContainsCount(p));

-			Assert.AreEqual("tre", bag[0].Value);

+			Assert.AreEqual("tre", bag[0].value);

 		}

 	}

 

-  [TestFixture]

-  public class FindPredicate

-  {

-    private SortedArray<int> list;

-    Fun<int, bool> pred;

-

-    [SetUp]

-    public void Init()

-    {

-      list = new SortedArray<int>(TenEqualityComparer.Default);

-      pred = delegate(int i) { return i % 5 == 0; };

-    }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Find()

-    {

-      int i;

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.Find(pred, out i));

-      Assert.AreEqual(45, i);

-    }

-

-    [Test]

-    public void FindLast()

-    {

-      int i;

-      Assert.IsFalse(list.FindLast(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.FindLast(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.FindLast(pred, out i));

-      Assert.AreEqual(675, i);

-    }

-

-    [Test]

-    public void FindIndex()

-    {

-      Assert.IsFalse(0 <= list.FindIndex(pred));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(0 <= list.FindIndex(pred));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.AreEqual(3, list.FindIndex(pred));

-    }

-

-    [Test]

-    public void FindLastIndex()

-    {

-      Assert.IsFalse(0 <= list.FindLastIndex(pred));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(0 <= list.FindLastIndex(pred));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.AreEqual(7, list.FindLastIndex(pred));

-    }

-  }

-

-  [TestFixture]

-  public class UniqueItems

-  {

-    private SortedArray<int> list;

-

-    [SetUp]

-    public void Init() { list = new SortedArray<int>(); }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Test()

-    {

-      Assert.IsTrue(IC.seteq(list.UniqueItems()));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-      list.AddAll<int>(new int[] { 7, 9, 7 });

-      Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 1, 9, 1));

-    }

-  }

-

-  [TestFixture]

-  public class ArrayTest

+

+

+	[TestFixture]

+	public class ArrayTest

 	{

 		private SortedArray<int> tree;

 

@@ -563,10 +386,11 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToBad()

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToBad()

 		{

-			tree.CopyTo(a, 11);

+			tree.Add(3);

+			tree.CopyTo(a, 10);

 		}

 

 

@@ -579,8 +403,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToTooFar()

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToTooFar()

 		{

 			tree.Add(3);

 			tree.Add(4);

@@ -614,8 +438,8 @@ namespace C5UnitTests.arrays.sorted
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.Find(ref p));

-			Assert.AreEqual(3, p.Key);

-			Assert.AreEqual(33, p.Value);

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

 			p = new KeyValuePair<int,int>(13, 78);

 			Assert.IsFalse(lst.Find(ref p));

 		}

@@ -627,12 +451,12 @@ namespace C5UnitTests.arrays.sorted
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.FindOrAdd(ref p));

-			Assert.AreEqual(3, p.Key);

-			Assert.AreEqual(33, p.Value);

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

 			p = new KeyValuePair<int,int>(13, 79);

 			Assert.IsFalse(lst.FindOrAdd(ref p));

-			Assert.AreEqual(13, lst[10].Key);

-			Assert.AreEqual(79, lst[10].Value);

+			Assert.AreEqual(13, lst[10].key);

+			Assert.AreEqual(79, lst[10].value);

 		}

 

 

@@ -642,8 +466,8 @@ namespace C5UnitTests.arrays.sorted
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.Update(p));

-			Assert.AreEqual(3, lst[3].Key);

-			Assert.AreEqual(78, lst[3].Value);

+			Assert.AreEqual(3, lst[3].key);

+			Assert.AreEqual(78, lst[3].value);

 			p = new KeyValuePair<int,int>(13, 78);

 			Assert.IsFalse(lst.Update(p));

 		}

@@ -655,12 +479,12 @@ namespace C5UnitTests.arrays.sorted
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.UpdateOrAdd(p));

-			Assert.AreEqual(3, lst[3].Key);

-			Assert.AreEqual(78, lst[3].Value);

+			Assert.AreEqual(3, lst[3].key);

+			Assert.AreEqual(78, lst[3].value);

 			p = new KeyValuePair<int,int>(13, 79);

 			Assert.IsFalse(lst.UpdateOrAdd(p));

-			Assert.AreEqual(13, lst[10].Key);

-			Assert.AreEqual(79, lst[10].Value);

+			Assert.AreEqual(13, lst[10].key);

+			Assert.AreEqual(79, lst[10].value);

 		}

 

 

@@ -669,14 +493,14 @@ namespace C5UnitTests.arrays.sorted
 		{

 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

-            Assert.IsTrue(lst.Remove(p, out p));

-            Assert.AreEqual(3, p.Key);

-			Assert.AreEqual(33, p.Value);

-			Assert.AreEqual(4, lst[3].Key);

-			Assert.AreEqual(34, lst[3].Value);

+			Assert.IsTrue(lst.RemoveWithReturn(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			Assert.AreEqual(4, lst[3].key);

+			Assert.AreEqual(34, lst[3].value);

 			p = new KeyValuePair<int,int>(13, 78);

-            Assert.IsFalse(lst.Remove(p, out p));

-        }

+			Assert.IsFalse(lst.RemoveWithReturn(ref p));

+		}

 	}

 

 

@@ -758,7 +582,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

 		public void Empty()

 		{

 			array.Clear();

@@ -767,7 +591,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

 		public void HighIndex()

 		{

 			array.RemoveAt(array.Count);

@@ -775,7 +599,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

 		public void LowIndex()

 		{

 			array.RemoveAt(-1);

@@ -895,7 +719,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

 		public void PredecessorTooLow1()

 		{

 			tree.Predecessor(-2);

@@ -903,7 +727,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

 		public void PredecessorTooLow2()

 		{

 			tree.Predecessor(0);

@@ -928,8 +752,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void WeakPredecessorTooLow1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void WeakPredecessorTooLow1()

 		{

 			tree.WeakPredecessor(-1);

 		}

@@ -952,16 +776,16 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void SuccessorTooHigh1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void SuccessorTooHigh1()

 		{

 			tree.Successor(38);

 		}

 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void SuccessorTooHigh2()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void SuccessorTooHigh2()

 		{

 			tree.Successor(39);

 		}

@@ -985,8 +809,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void WeakSuccessorTooHigh1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void WeakSuccessorTooHigh1()

 		{

 			tree.WeakSuccessor(39);

 		}

@@ -1039,7 +863,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty1()

 		{

 			tree.FindMin();

@@ -1047,7 +871,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty2()

 		{

 			tree.FindMax();

@@ -1055,7 +879,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty3()

 		{

 			tree.DeleteMin();

@@ -1063,7 +887,7 @@ namespace C5UnitTests.arrays.sorted
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty4()

 		{

 			tree.DeleteMax();

@@ -1119,8 +943,8 @@ namespace C5UnitTests.arrays.sorted
 		[Test]

 		public void GoodIndex()

 		{

-			Assert.AreEqual(~0, array.IndexOf(20));

-			Assert.AreEqual(~0, array.LastIndexOf(20));

+			Assert.AreEqual(-1, array.IndexOf(20));

+			Assert.AreEqual(-1, array.LastIndexOf(20));

 			populate();

 			Assert.AreEqual(10, array[0]);

 			Assert.AreEqual(30, array[1]);

@@ -1130,16 +954,16 @@ namespace C5UnitTests.arrays.sorted
 			Assert.AreEqual(1, array.IndexOf(30));

 			Assert.AreEqual(2, array.IndexOf(50));

 			Assert.AreEqual(3, array.IndexOf(70));

-			Assert.AreEqual(~1, array.IndexOf(20));

-			Assert.AreEqual(~0, array.IndexOf(0));

-			Assert.AreEqual(~4, array.IndexOf(90));

+			Assert.AreEqual(-1, array.IndexOf(20));

+			Assert.AreEqual(-1, array.IndexOf(0));

+			Assert.AreEqual(-1, array.IndexOf(90));

 			Assert.AreEqual(0, array.LastIndexOf(10));

 			Assert.AreEqual(1, array.LastIndexOf(30));

 			Assert.AreEqual(2, array.LastIndexOf(50));

 			Assert.AreEqual(3, array.LastIndexOf(70));

-			Assert.AreEqual(~1, array.LastIndexOf(20));

-			Assert.AreEqual(~0, array.LastIndexOf(0));

-			Assert.AreEqual(~4, array.LastIndexOf(90));

+			Assert.AreEqual(-1, array.LastIndexOf(20));

+			Assert.AreEqual(-1, array.LastIndexOf(0));

+			Assert.AreEqual(-1, array.LastIndexOf(90));

 		}

 

 

@@ -1224,7 +1048,7 @@ namespace C5UnitTests.arrays.sorted
 		{

 			private SortedArray<int> tree;

 

-			private SCG.IEnumerator<int> e;

+			private MSG.IEnumerator<int> e;

 

 

 			[SetUp]

@@ -1248,8 +1072,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterAdd()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterAdd()

 			{

 				e.MoveNext();

 				tree.Add(34);

@@ -1260,8 +1084,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterRemove()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterRemove()

 			{

 				e.MoveNext();

 				tree.Remove(34);

@@ -1270,8 +1094,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterClear()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterClear()

 			{

 				e.MoveNext();

 				tree.Clear();

@@ -1294,7 +1118,7 @@ namespace C5UnitTests.arrays.sorted
 		{

 			private SortedArray<int> tree;

 

-			private SCG.IEnumerator<int> e;

+			private MSG.IEnumerator<int> e;

 

 

 			[SetUp]

@@ -1318,8 +1142,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterAdd()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterAdd()

 			{

 				tree.Add(34);

 				e.MoveNext();

@@ -1329,8 +1153,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterRemove()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterRemove()

 			{

 				tree.Remove(34);

 				e.MoveNext();

@@ -1338,8 +1162,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterClear()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterClear()

 			{

 				tree.Clear();

 				e.MoveNext();

@@ -1393,7 +1217,7 @@ namespace C5UnitTests.arrays.sorted
 		{

 			private SortedArray<int> array;

 

-			private SCG.IComparer<int> ic;

+			private IComparer<int> ic;

 

 

 			[SetUp]

@@ -1432,7 +1256,7 @@ namespace C5UnitTests.arrays.sorted
 			{

 				Simple simple1 = new Simple();

 

-				array.Apply(new Act<int>(simple1.apply));

+				array.Apply(new Applier<int>(simple1.apply));

 				Assert.AreEqual(0, simple1.appfield1);

 				Assert.AreEqual(0, simple1.appfield2);

 

@@ -1440,7 +1264,7 @@ namespace C5UnitTests.arrays.sorted
 

 				for (int i = 0; i < 10; i++) array.Add(i);

 

-				array.Apply(new Act<int>(simple2.apply));

+				array.Apply(new Applier<int>(simple2.apply));

 				Assert.AreEqual(10, simple2.appfield1);

 				Assert.AreEqual(285, simple2.appfield2);

 			}

@@ -1449,77 +1273,77 @@ namespace C5UnitTests.arrays.sorted
 			[Test]

 			public void All()

 			{

-				Assert.IsTrue(array.All(new Fun<int, bool>(never)));

-				Assert.IsTrue(array.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.All(new Fun<int, bool>(always)));

+				Assert.IsTrue(array.All(new Filter<int>(never)));

+				Assert.IsTrue(array.All(new Filter<int>(even)));

+				Assert.IsTrue(array.All(new Filter<int>(always)));

 				for (int i = 0; i < 10; i++)					array.Add(i);

 

-				Assert.IsFalse(array.All(new Fun<int, bool>(never)));

-				Assert.IsFalse(array.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.All(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.All(new Filter<int>(never)));

+				Assert.IsFalse(array.All(new Filter<int>(even)));

+				Assert.IsTrue(array.All(new Filter<int>(always)));

 				array.Clear();

 				for (int i = 0; i < 10; i++)					array.Add(i * 2);

 

-				Assert.IsFalse(array.All(new Fun<int, bool>(never)));

-				Assert.IsTrue(array.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.All(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.All(new Filter<int>(never)));

+				Assert.IsTrue(array.All(new Filter<int>(even)));

+				Assert.IsTrue(array.All(new Filter<int>(always)));

 				array.Clear();

 				for (int i = 0; i < 10; i++)					array.Add(i * 2 + 1);

 

-				Assert.IsFalse(array.All(new Fun<int, bool>(never)));

-				Assert.IsFalse(array.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.All(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.All(new Filter<int>(never)));

+				Assert.IsFalse(array.All(new Filter<int>(even)));

+				Assert.IsTrue(array.All(new Filter<int>(always)));

 			}

 

 

 			[Test]

 			public void Exists()

 			{

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(never)));

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(even)));

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.Exists(new Filter<int>(never)));

+				Assert.IsFalse(array.Exists(new Filter<int>(even)));

+				Assert.IsFalse(array.Exists(new Filter<int>(always)));

 				for (int i = 0; i < 10; i++)					array.Add(i);

 

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(never)));

-				Assert.IsTrue(array.Exists(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.Exists(new Filter<int>(never)));

+				Assert.IsTrue(array.Exists(new Filter<int>(even)));

+				Assert.IsTrue(array.Exists(new Filter<int>(always)));

 				array.Clear();

 				for (int i = 0; i < 10; i++)					array.Add(i * 2);

 

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(never)));

-				Assert.IsTrue(array.Exists(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.Exists(new Filter<int>(never)));

+				Assert.IsTrue(array.Exists(new Filter<int>(even)));

+				Assert.IsTrue(array.Exists(new Filter<int>(always)));

 				array.Clear();

 				for (int i = 0; i < 10; i++)					array.Add(i * 2 + 1);

 

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(never)));

-				Assert.IsFalse(array.Exists(new Fun<int, bool>(even)));

-				Assert.IsTrue(array.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(array.Exists(new Filter<int>(never)));

+				Assert.IsFalse(array.Exists(new Filter<int>(even)));

+				Assert.IsTrue(array.Exists(new Filter<int>(always)));

 			}

 

 

 			[Test]

 			public void FindAll()

 			{

-				Assert.AreEqual(0, array.FindAll(new Fun<int, bool>(never)).Count);

+				Assert.AreEqual(0, array.FindAll(new Filter<int>(never)).Count);

 				for (int i = 0; i < 10; i++)

 					array.Add(i);

 

-				Assert.AreEqual(0, array.FindAll(new Fun<int, bool>(never)).Count);

-				Assert.AreEqual(10, array.FindAll(new Fun<int, bool>(always)).Count);

-				Assert.AreEqual(5, array.FindAll(new Fun<int, bool>(even)).Count);

-				Assert.IsTrue(((SortedArray<int>)array.FindAll(new Fun<int, bool>(even))).Check());

+				Assert.AreEqual(0, array.FindAll(new Filter<int>(never)).Count);

+				Assert.AreEqual(10, array.FindAll(new Filter<int>(always)).Count);

+				Assert.AreEqual(5, array.FindAll(new Filter<int>(even)).Count);

+				Assert.IsTrue(((SortedArray<int>)array.FindAll(new Filter<int>(even))).Check());

 			}

 

 

 			[Test]

 			public void Map()

 			{

-				Assert.AreEqual(0, array.Map(new Fun<int,string>(themap), new SC()).Count);

+				Assert.AreEqual(0, array.Map(new Mapper<int,string>(themap), new SC()).Count);

 				for (int i = 0; i < 11; i++)

 					array.Add(i * i * i);

 

-				IIndexedSorted<string> res = array.Map(new Fun<int,string>(themap), new SC());

+				IIndexedSorted<string> res = array.Map(new Mapper<int,string>(themap), new SC());

 

 				Assert.IsTrue(((SortedArray<string>)res).Check());

 				Assert.AreEqual(11, res.Count);

@@ -1537,7 +1361,7 @@ namespace C5UnitTests.arrays.sorted
 				for (int i = 0; i < 11; i++)

 					array.Add(i * i * i);

 

-				ISorted<string> res = array.Map(new Fun<int,string>(badmap), new SC());

+				ISorted<string> res = array.Map(new Mapper<int,string>(badmap), new SC());

 			}

 

 

@@ -1656,11 +1480,10 @@ namespace C5UnitTests.arrays.sorted
 			[SetUp]

 			public void Init() { array = new SortedArray<int>(new IC()); }

 

-

 			[Test]

 			public void EmptyEmpty()

 			{

-				array.AddAll(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				array.AddAll(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(0, array.Count);

 				Assert.IsTrue(array.Check());

 			}

@@ -1671,7 +1494,7 @@ namespace C5UnitTests.arrays.sorted
 			{

 				for (int i = 4; i < 9; i++) array.Add(i);

 

-				array.AddAll(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				array.AddAll(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(5, array.Count);

 				Assert.IsTrue(array.Check());

 			}

@@ -1680,7 +1503,7 @@ namespace C5UnitTests.arrays.sorted
 			[Test]

 			public void EmptySome()

 			{

-				array.AddAll(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				array.AddAll(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(4, array.Count);

 				Assert.IsTrue(array.Check());

 				Assert.AreEqual(0, array[0]);

@@ -1695,7 +1518,7 @@ namespace C5UnitTests.arrays.sorted
 			{

 				for (int i = 3; i < 9; i++) array.Add(i);

 

-				array.AddAll(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				array.AddAll(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(9, array.Count);

 				Assert.IsTrue(array.Check());

 				Assert.IsTrue(IC.eq(array, 0, 1, 3,4, 5, 6, 7, 8, 9));

@@ -1727,7 +1550,7 @@ namespace C5UnitTests.arrays.sorted
 			[Test]

 			public void EmptyEmpty()

 			{

-				array.AddSorted(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				array.AddSorted(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(0, array.Count);

 				Assert.IsTrue(array.Check());

 			}

@@ -1739,7 +1562,7 @@ namespace C5UnitTests.arrays.sorted
 			{

 				for (int i = 4; i < 9; i++) array.Add(i);

 

-				array.AddSorted(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				array.AddSorted(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(5, array.Count);

 				Assert.IsTrue(array.Check());

 			}

@@ -1749,7 +1572,7 @@ namespace C5UnitTests.arrays.sorted
 			[Test]

 			public void EmptySome()

 			{

-				array.AddSorted(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				array.AddSorted(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(4, array.Count);

 				Assert.IsTrue(array.Check());

 				Assert.AreEqual(0, array[0]);

@@ -1765,7 +1588,7 @@ namespace C5UnitTests.arrays.sorted
 			{

 				for (int i = 3; i < 9; i++) array.Add(i);

 

-				array.AddSorted(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				array.AddSorted(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(9, array.Count);

 				Assert.IsTrue(array.Check());

 				Assert.IsTrue(IC.eq(array, 0, 1, 3, 4, 5, 6, 7, 8, 9));

@@ -1775,7 +1598,7 @@ namespace C5UnitTests.arrays.sorted
 			[ExpectedException(typeof(ArgumentException), "Argument not sorted")]

 			public void EmptyBad()

 			{

-				array.AddSorted(new FunEnumerable(9, new Fun<int,int>(bad)));

+				array.AddSorted(new FunEnumerable(9, new Int2Int(bad)));

 			}

 

 

@@ -1913,8 +1736,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RemoveRangeBad3()

+			[ExpectedException(typeof(ArgumentException))]

+			public void RemoveRangeBad3()

 			{

 				array.RemoveInterval(3, 8);

 			}

@@ -1923,7 +1746,7 @@ namespace C5UnitTests.arrays.sorted
 			[Test]

 			public void GetRange()

 			{

-				SCG.IEnumerable<int> e = array[3, 3];

+				MSG.IEnumerable<int> e = array[3, 3];

 

 				Assert.IsTrue(IC.eq(e, 3, 4, 5));

 				e = array[3, 0];

@@ -1948,8 +1771,8 @@ namespace C5UnitTests.arrays.sorted
 

 

 			[Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void GetRangeBad3()

+			[ExpectedException(typeof(ArgumentException))]

+			public void GetRangeBad3()

 			{

 				object foo = array[3, 8];

 			}

@@ -1966,11 +1789,12 @@ namespace C5UnitTests.arrays.sorted
 	namespace Sync

 	{

 		[TestFixture]

+		[Category ("Threading")]

 		public class SyncRoot

 		{

 			private SortedArray<int> tree;

 

-			int sz = 5000;

+			int sz = 50;

 

 

 			[Test]

@@ -2079,14 +1903,13 @@ namespace C5UnitTests.arrays.sorted
 			public void Dispose() { tree = null; }

 		}

 

-

-

 		//[TestFixture]

+		[Category ("Threading")]

 		public class ConcurrentQueries

 		{

 			private SortedArray<int> tree;

 

-			int sz = 500000;

+			int sz = 500;

 

 

 			[SetUp]

@@ -2114,7 +1937,7 @@ namespace C5UnitTests.arrays.sorted
 				public void a(int i) { count++; }

 

 

-				public void traverse() { t.Apply(new Act<int>(a)); }

+				public void traverse() { t.Apply(new Applier<int>(a)); }

 			}

 

 

@@ -2158,7 +1981,6 @@ namespace C5UnitTests.arrays.sorted
 

 

 

-

 	namespace Hashing

 	{

 		[TestFixture]

@@ -2170,16 +1992,16 @@ namespace C5UnitTests.arrays.sorted
 			[SetUp]

 			public void Init()

 			{

-                dit = new SortedArray<int>(8,Comparer<int>.Default, EqualityComparer<int>.Default);

-                dat = new SortedArray<int>(8,Comparer<int>.Default, EqualityComparer<int>.Default);

-                dut = new SortedArray<int>(8,new RevIC(), EqualityComparer<int>.Default);

+				dit = new SortedArray<int>(new IC());

+				dat = new SortedArray<int>(new IC());

+				dut = new SortedArray<int>(new RevIC());

 			}

 

 

 			[Test]

 			public void EmptyEmpty()

 			{

-				Assert.IsTrue(dit.SequencedEquals(dat));

+				Assert.IsTrue(dit.Equals(dat));

 			}

 

 

@@ -2187,23 +2009,35 @@ namespace C5UnitTests.arrays.sorted
 			public void EmptyNonEmpty()

 			{

 				dit.Add(3);

-				Assert.IsFalse(dit.SequencedEquals(dat));

-				Assert.IsFalse(dat.SequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 			}

 

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

 			[Test]

 			public void HashVal()

 			{

-				Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

+				Assert.AreEqual(hasher(), dit.GetHashCode());

 				dit.Add(3);

-				Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

 				dit.Add(7);

-				Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-				Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

 				dut.Add(3);

-				Assert.AreEqual(CHC.sequencedhashcode(3), dut.GetSequencedHashCode());

+				Assert.AreEqual(hasher(3), dut.GetHashCode());

 				dut.Add(7);

-				Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

 			}

 

 

@@ -2213,11 +2047,11 @@ namespace C5UnitTests.arrays.sorted
 				dit.Add(3);

 				dit.Add(7);

 				dat.Add(3);

-				Assert.IsFalse(dit.SequencedEquals(dat));

-				Assert.IsFalse(dat.SequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 				dat.Add(7);

-				Assert.IsTrue(dit.SequencedEquals(dat));

-				Assert.IsTrue(dat.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

 			}

 

 

@@ -2226,23 +2060,23 @@ namespace C5UnitTests.arrays.sorted
 			{

 				dit.Add(3);

 				dut.Add(3);

-				Assert.IsTrue(dit.SequencedEquals(dut));

-				Assert.IsTrue(dut.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 				dit.Add(7);

 				dut.Add(7);

-				Assert.IsFalse(dit.SequencedEquals(dut));

-				Assert.IsFalse(dut.SequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

 			}

 

 

 			[Test]

 			public void Reflexive()

 			{

-				Assert.IsTrue(dit.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(3);

-				Assert.IsTrue(dit.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(7);

-				Assert.IsTrue(dit.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 			}

 

 

@@ -2266,16 +2100,16 @@ namespace C5UnitTests.arrays.sorted
 			[SetUp]

 			public void Init()

 			{

-                dit = new SortedArray<int>(8,Comparer<int>.Default, EqualityComparer<int>.Default);

-                dat = new SortedArray<int>(8,Comparer<int>.Default, EqualityComparer<int>.Default);

-                dut = new SortedArray<int>(8,new RevIC(), EqualityComparer<int>.Default);

+				dit = new SortedArray<int>(new IC());

+				dat = new SortedArray<int>(new IC());

+				dut = new SortedArray<int>(new RevIC());

 			}

 

 

 			[Test]

 			public void EmptyEmpty()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

+				Assert.IsTrue(dit.Equals(dat));

 			}

 

 

@@ -2283,25 +2117,36 @@ namespace C5UnitTests.arrays.sorted
 			public void EmptyNonEmpty()

 			{

 				dit.Add(3);

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dat.UnsequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count,params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count<<16)+retval;

 			}

 

 

 			[Test]

 			public void HashVal()

 			{

-                Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-                dit.Add(3);

-                Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-                dit.Add(7);

-                Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-                Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-                dut.Add(3);

-                Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-                dut.Add(7);

-                Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-            }

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1,3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2,3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1,3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2,7, 3), dut.GetHashCode());

+			}

 

 

 			[Test]

@@ -2310,11 +2155,11 @@ namespace C5UnitTests.arrays.sorted
 				dit.Add(3);

 				dit.Add(7);

 				dat.Add(3);

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dat.UnsequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 				dat.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

-				Assert.IsTrue(dat.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

 			}

 

 

@@ -2323,23 +2168,23 @@ namespace C5UnitTests.arrays.sorted
 			{

 				dit.Add(3);

 				dut.Add(3);

-				Assert.IsTrue(dit.UnsequencedEquals(dut));

-				Assert.IsTrue(dut.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 				dit.Add(7);

 				dut.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dut));

-				Assert.IsTrue(dut.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 			}

 

 

 			[Test]

 			public void Reflexive()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(3);

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 			}

 

 

@@ -2353,4 +2198,5 @@ namespace C5UnitTests.arrays.sorted
 		}

 

 	}

-}
\ No newline at end of file
+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/hashing/HashBagTests.cs b/mcs/class/Mono.C5/Test/hashing/HashBagTests.cs
index bfd9da8425f..c673f2a34fc 100644
--- a/mcs/class/Mono.C5/Test/hashing/HashBagTests.cs
+++ b/mcs/class/Mono.C5/Test/hashing/HashBagTests.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,578 +23,443 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

-namespace C5UnitTests.hashtable.bag

+using MSG = System.Collections.Generic;

+namespace nunit.hashtable.bag

 {

-  using CollectionOfInt = HashBag<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.CollectionTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new HashBag<T>(); }

-  }

-

-

-  [TestFixture]

-  public class Formatting

-  {

-    ICollection<int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{{  }}", coll.ToString());

-      coll.AddAll<int>(new int[] { -4, 28, 129, 65530, -4, 28 });

-      Assert.AreEqual("{{ 65530(*1), -4(*2), 28(*2), 129(*1) }}", coll.ToString());

-      Assert.AreEqual("{{ FFFA(*1), -4(*2), 1C(*2), 81(*1) }}", coll.ToString(null, rad16));

-      Assert.AreEqual("{{ 65530(*1), -4(*2)... }}", coll.ToString("L18", null));

-      Assert.AreEqual("{{ FFFA(*1), -4(*2)... }}", coll.ToString("L18", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class Combined

-  {

-    private ICollection<KeyValuePair<int, int>> lst;

-

-

-    [SetUp]

-    public void Init()

-    {

-      lst = new HashBag<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-      for (int i = 0; i < 10; i++)

-        lst.Add(new KeyValuePair<int, int>(i, i + 30));

-    }

-

-

-    [TearDown]

-    public void Dispose() { lst = null; }

-

-

-    [Test]

-    public void Find()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-      Assert.IsTrue(lst.Find(ref p));

-      Assert.AreEqual(3, p.Key);

-      Assert.AreEqual(33, p.Value);

-      p = new KeyValuePair<int, int>(13, 78);

-      Assert.IsFalse(lst.Find(ref p));

-    }

-

-

-    [Test]

-    public void FindOrAdd()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-      KeyValuePair<int, int> q = new KeyValuePair<int, int>();

-

-      Assert.IsTrue(lst.FindOrAdd(ref p));

-      Assert.AreEqual(3, p.Key);

-      Assert.AreEqual(33, p.Value);

-      p = new KeyValuePair<int, int>(13, 79);

-      Assert.IsFalse(lst.FindOrAdd(ref p));

-      q.Key = 13;

-      Assert.IsTrue(lst.Find(ref q));

-      Assert.AreEqual(13, q.Key);

-      Assert.AreEqual(79, q.Value);

-    }

-

-

-    [Test]

-    public void Update()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-      KeyValuePair<int, int> q = new KeyValuePair<int, int>();

-

-      Assert.IsTrue(lst.Update(p));

-      q.Key = 3;

-      Assert.IsTrue(lst.Find(ref q));

-      Assert.AreEqual(3, q.Key);

-      Assert.AreEqual(78, q.Value);

-      p = new KeyValuePair<int, int>(13, 78);

-      Assert.IsFalse(lst.Update(p));

-    }

-

-

-    [Test]

-    public void UpdateOrAdd()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-      KeyValuePair<int, int> q = new KeyValuePair<int, int>();

-

-      Assert.IsTrue(lst.UpdateOrAdd(p));

-      q.Key = 3;

-      Assert.IsTrue(lst.Find(ref q));

-      Assert.AreEqual(3, q.Key);

-      Assert.AreEqual(78, q.Value);

-      p = new KeyValuePair<int, int>(13, 79);

-      Assert.IsFalse(lst.UpdateOrAdd(p));

-      q.Key = 13;

-      Assert.IsTrue(lst.Find(ref q));

-      Assert.AreEqual(13, q.Key);

-      Assert.AreEqual(79, q.Value);

-    }

-

-

-    [Test]

-    public void RemoveWithReturn()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-      //KeyValuePair<int, int> q = new KeyValuePair<int, int>();

-

-      Assert.IsTrue(lst.Remove(p, out p));

-      Assert.AreEqual(3, p.Key);

-      Assert.AreEqual(33, p.Value);

-      p = new KeyValuePair<int, int>(13, 78);

-      Assert.IsFalse(lst.Remove(p, out p));

-    }

-  }

-

-

-

-  [TestFixture]

-  public class CollectionOrSink

-  {

-    private HashBag<int> hashbag;

-

-

-    [SetUp]

-    public void Init() { hashbag = new HashBag<int>(); }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new HashBag<int>(null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor2()

-    {

-      new HashBag<int>(5, null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor3()

-    {

-      new HashBag<int>(5, 0.5, null);

-    }

-

-    [Test]

-    public void Choose()

-    {

-      hashbag.Add(7);

-      Assert.AreEqual(7, hashbag.Choose());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      hashbag.Choose();

-    }

-

-

-    [Test]

-    public void CountEtAl()

-    {

-      Assert.IsFalse(hashbag.IsReadOnly);

-      Assert.IsFalse(hashbag.SyncRoot == null);

-      Assert.AreEqual(0, hashbag.Count);

-      Assert.IsTrue(hashbag.IsEmpty);

-      Assert.IsTrue(hashbag.AllowsDuplicates);

-      Assert.IsTrue(hashbag.Add(0));

-      Assert.AreEqual(1, hashbag.Count);

-      Assert.IsFalse(hashbag.IsEmpty);

-      Assert.IsTrue(hashbag.Add(5));

-      Assert.AreEqual(2, hashbag.Count);

-      Assert.IsTrue(hashbag.Add(5));

-      Assert.AreEqual(3, hashbag.Count);

-      Assert.IsFalse(hashbag.IsEmpty);

-      Assert.IsTrue(hashbag.Add(8));

-      Assert.AreEqual(4, hashbag.Count);

-      Assert.AreEqual(2, hashbag.ContainsCount(5));

-      Assert.AreEqual(1, hashbag.ContainsCount(8));

-      Assert.AreEqual(1, hashbag.ContainsCount(0));

-    }

-

-

-    [Test]

-    public void AddAll()

-    {

-      hashbag.Add(3); hashbag.Add(4); hashbag.Add(4); hashbag.Add(5); hashbag.Add(4);

-

-      HashBag<int> hashbag2 = new HashBag<int>();

-

-      hashbag2.AddAll(hashbag);

-      Assert.IsTrue(IC.seteq(hashbag2, 3, 4, 4, 4, 5));

-      hashbag.Add(9);

-      hashbag.AddAll(hashbag2);

-      Assert.IsTrue(IC.seteq(hashbag2, 3, 4, 4, 4, 5));

-      Assert.IsTrue(IC.seteq(hashbag, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 9));

-    }

-

-

-    [Test]

-    public void ContainsCount()

-    {

-      Assert.AreEqual(0, hashbag.ContainsCount(5));

-      hashbag.Add(5);

-      Assert.AreEqual(1, hashbag.ContainsCount(5));

-      Assert.AreEqual(0, hashbag.ContainsCount(7));

-      hashbag.Add(8);

-      Assert.AreEqual(1, hashbag.ContainsCount(5));

-      Assert.AreEqual(0, hashbag.ContainsCount(7));

-      Assert.AreEqual(1, hashbag.ContainsCount(8));

-      hashbag.Add(5);

-      Assert.AreEqual(2, hashbag.ContainsCount(5));

-      Assert.AreEqual(0, hashbag.ContainsCount(7));

-      Assert.AreEqual(1, hashbag.ContainsCount(8));

-    }

-

-

-    [Test]

-    public void RemoveAllCopies()

-    {

-      hashbag.Add(5); hashbag.Add(7); hashbag.Add(5);

-      Assert.AreEqual(2, hashbag.ContainsCount(5));

-      Assert.AreEqual(1, hashbag.ContainsCount(7));

-      hashbag.RemoveAllCopies(5);

-      Assert.AreEqual(0, hashbag.ContainsCount(5));

-      Assert.AreEqual(1, hashbag.ContainsCount(7));

-      hashbag.Add(5); hashbag.Add(8); hashbag.Add(5);

-      hashbag.RemoveAllCopies(8);

-      Assert.IsTrue(IC.eq(hashbag, 7, 5, 5));

-    }

-

-

-    [Test]

-    public void ContainsAll()

-    {

-      HashBag<int> list2 = new HashBag<int>();

-

-      Assert.IsTrue(hashbag.ContainsAll(list2));

-      list2.Add(4);

-      Assert.IsFalse(hashbag.ContainsAll(list2));

-      hashbag.Add(4);

-      Assert.IsTrue(hashbag.ContainsAll(list2));

-      hashbag.Add(5);

-      Assert.IsTrue(hashbag.ContainsAll(list2));

-      list2.Add(20);

-      Assert.IsFalse(hashbag.ContainsAll(list2));

-      hashbag.Add(20);

-      Assert.IsTrue(hashbag.ContainsAll(list2));

-      list2.Add(4);

-      Assert.IsFalse(hashbag.ContainsAll(list2));

-      hashbag.Add(4);

-      Assert.IsTrue(hashbag.ContainsAll(list2));

-    }

-

-

-    [Test]

-    public void RetainAll()

-    {

-      HashBag<int> list2 = new HashBag<int>();

-

-      hashbag.Add(4); hashbag.Add(5); hashbag.Add(4); hashbag.Add(6); hashbag.Add(4);

-      list2.Add(5); list2.Add(4); list2.Add(7); list2.Add(4);

-      hashbag.RetainAll(list2);

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 5));

-      hashbag.Add(6);

-      list2.Clear();

-      list2.Add(7); list2.Add(8); list2.Add(9);

-      hashbag.RetainAll(list2);

-      Assert.IsTrue(IC.eq(hashbag));

-    }

-

-

-    [Test]

-    public void RemoveAll()

-    {

-      HashBag<int> list2 = new HashBag<int>();

-

-      hashbag.Add(4); hashbag.Add(5); hashbag.Add(6); hashbag.Add(4); hashbag.Add(5);

-      list2.Add(5); list2.Add(4); list2.Add(7); list2.Add(4);

-      hashbag.RemoveAll(list2);

-      Assert.IsTrue(IC.seteq(hashbag, 5, 6));

-      hashbag.Add(5); hashbag.Add(4);

-      list2.Clear();

-      list2.Add(6); list2.Add(5);

-      hashbag.RemoveAll(list2);

-      Assert.IsTrue(IC.seteq(hashbag, 4, 5));

-      list2.Clear();

-      list2.Add(7); list2.Add(8); list2.Add(9);

-      hashbag.RemoveAll(list2);

-      Assert.IsTrue(IC.seteq(hashbag, 4, 5));

-    }

-

-

-    [Test]

-    public void Remove()

-    {

-      hashbag.Add(4); hashbag.Add(4); hashbag.Add(5); hashbag.Add(4); hashbag.Add(6);

-      Assert.IsFalse(hashbag.Remove(2));

-      Assert.IsTrue(hashbag.Remove(4));

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 5, 6));

-      hashbag.Add(7);

-      hashbag.Add(21); hashbag.Add(37); hashbag.Add(53); hashbag.Add(69); hashbag.Add(53); hashbag.Add(85);

-      Assert.IsTrue(hashbag.Remove(5));

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 6, 7, 21, 37, 53, 53, 69, 85));

-      Assert.IsFalse(hashbag.Remove(165));

-      Assert.IsTrue(hashbag.Check());

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 6, 7, 21, 37, 53, 53, 69, 85));

-      Assert.IsTrue(hashbag.Remove(53));

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 6, 7, 21, 37, 53, 69, 85));

-      Assert.IsTrue(hashbag.Remove(37));

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 6, 7, 21, 53, 69, 85));

-      Assert.IsTrue(hashbag.Remove(85));

-      Assert.IsTrue(IC.seteq(hashbag, 4, 4, 6, 7, 21, 53, 69));

-    }

-

-

-    [TearDown]

-    public void Dispose() { hashbag = null; }

-  }

-

-  [TestFixture]

-  public class FindPredicate

-  {

-    private HashBag<int> list;

-    Fun<int, bool> pred;

-

-    [SetUp]

-    public void Init()

-    {

-      list = new HashBag<int>(TenEqualityComparer.Default);

-      pred = delegate(int i) { return i % 5 == 0; };

-    }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Find()

-    {

-      int i;

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.Find(pred, out i));

-      Assert.AreEqual(45, i);

-    }

-

-  }

-

-  [TestFixture]

-  public class UniqueItems

-  {

-    private HashBag<int> list;

-

-    [SetUp]

-    public void Init() { list = new HashBag<int>(); }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Test()

-    {

-      Assert.IsTrue(IC.seteq(list.UniqueItems()));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-      list.AddAll<int>(new int[] { 7, 9, 7 });

-      Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 2, 9, 1));

-    }

-  }

-

-  [TestFixture]

-  public class ArrayTest

-  {

-    private HashBag<int> hashbag;

-

-    int[] a;

-

-

-    [SetUp]

-    public void Init()

-    {

-      hashbag = new HashBag<int>();

-      a = new int[10];

-      for (int i = 0; i < 10; i++)

-        a[i] = 1000 + i;

-    }

-

-

-    [TearDown]

-    public void Dispose() { hashbag = null; }

-

-

-    private string aeq(int[] a, params int[] b)

-    {

-      if (a.Length != b.Length)

-        return "Lengths differ: " + a.Length + " != " + b.Length;

-

-      for (int i = 0; i < a.Length; i++)

-        if (a[i] != b[i])

-          return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

-

-      return "Alles klar";

-    }

-

-

-    [Test]

-    public void ToArray()

-    {

-      Assert.AreEqual("Alles klar", aeq(hashbag.ToArray()));

-      hashbag.Add(7);

-      hashbag.Add(3);

-      hashbag.Add(10);

-      hashbag.Add(3);

-

-      int[] r = hashbag.ToArray();

-

-      Array.Sort(r);

-      Assert.AreEqual("Alles klar", aeq(r, 3, 3, 7, 10));

-    }

-

-

-    [Test]

-    public void CopyTo()

-    {

-      //Note: for small ints the itemequalityComparer is the identity!

-      hashbag.CopyTo(a, 1);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-      hashbag.Add(6);

-      hashbag.CopyTo(a, 2);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-      hashbag.Add(4);

-      hashbag.Add(6);

-      hashbag.Add(9);

-      hashbag.CopyTo(a, 4);

-

-      //TODO: make independent of interequalityComparer

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 6, 9, 4, 1008, 1009));

-      hashbag.Clear();

-      hashbag.Add(7);

-      hashbag.CopyTo(a, 9);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 6, 9, 4, 1008, 7));

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToBad()

-    {

-      hashbag.CopyTo(a, 11);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToBad2()

-    {

-      hashbag.CopyTo(a, -1);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToTooFar()

-    {

-      hashbag.Add(3);

-      hashbag.Add(8);

-      hashbag.CopyTo(a, 9);

-    }

-  }

-

-

-

-  [TestFixture]

-  public class HashingEquals

-  {

-    private ICollection<int> h1, h2;

-

-

-    [SetUp]

-    public void Init()

-    {

-      h1 = new HashBag<int>();

-      h2 = new LinkedList<int>();

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      h1 = h2 = null;

-    }

-

-

-    [Test]

-    public void Hashing()

-    {

-      Assert.AreEqual(h1.GetUnsequencedHashCode(), h2.GetUnsequencedHashCode());

-      h1.Add(7);

-      h2.Add(9);

-      Assert.IsTrue(h1.GetUnsequencedHashCode() != h2.GetUnsequencedHashCode());

-      h2.Add(7);

-      h1.Add(9);

-      Assert.IsTrue(h1.GetUnsequencedHashCode() == h2.GetUnsequencedHashCode());

-    }

-

-

-    [Test]

-    public void Equals()

-    {

-      Assert.IsTrue(h1.UnsequencedEquals(h2));

-//            Code 1550734257, Pair (3 x 1602896434, 2 x 1186320090) number 169185 matched oth

-//er pair (3 x -1615223932, 2 x 1019546595)

-      h1.Add(1602896434);

-      h1.Add(1186320090);

-      h1.Add(1602896434);

-      h1.Add(1186320090);

-      h1.Add(1602896434);

-      h2.Add(-1615223932);

-      h2.Add(1019546595);

-      h2.Add(-1615223932);

-      h2.Add(1019546595);

-      h2.Add(-1615223932);

-      Assert.IsTrue(h1.GetUnsequencedHashCode() == h2.GetUnsequencedHashCode());

-      Assert.IsTrue(!h1.UnsequencedEquals(h2));

-      h1.Clear();

-      h2.Clear();

-      h1.Add(1);

-      h1.Add(2);

-      h2.Add(2);

-      h2.Add(1);

-      Assert.IsTrue(h1.GetUnsequencedHashCode() == h2.GetUnsequencedHashCode());

-      Assert.IsTrue(h1.UnsequencedEquals(h2));

-    }

-  }

+	[TestFixture]

+	public class Combined

+	{

+		private ICollection<KeyValuePair<int,int>> lst;

+

+

+		[SetUp]

+		public void Init()

+		{

+			lst = new HashBag<KeyValuePair<int,int>>();

+			for (int i = 0; i < 10; i++)

+				lst.Add(new KeyValuePair<int,int>(i, i + 30));

+		}

+

+

+		[TearDown]

+		public void Dispose() { lst = null; }

+

+

+		[Test]

+		public void Find()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+			Assert.IsTrue(lst.Find(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			p = new KeyValuePair<int,int>(13, 78);

+			Assert.IsFalse(lst.Find(ref p));

+		}

+

+

+		[Test]

+		public void FindOrAdd()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+			KeyValuePair<int,int> q = new KeyValuePair<int,int>();

+

+			Assert.IsTrue(lst.FindOrAdd(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			p = new KeyValuePair<int,int>(13, 79);

+			Assert.IsFalse(lst.FindOrAdd(ref p));

+			q.key = 13;

+			Assert.IsTrue(lst.Find(ref q));

+			Assert.AreEqual(13, q.key);

+			Assert.AreEqual(79, q.value);

+		}

+

+

+		[Test]

+		public void Update()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+			KeyValuePair<int,int> q = new KeyValuePair<int,int>();

+

+			Assert.IsTrue(lst.Update(p));

+			q.key = 3;

+			Assert.IsTrue(lst.Find(ref q));

+			Assert.AreEqual(3, q.key);

+			Assert.AreEqual(78, q.value);

+			p = new KeyValuePair<int,int>(13, 78);

+			Assert.IsFalse(lst.Update(p));

+		}

+

+

+		[Test]

+		public void UpdateOrAdd()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+			KeyValuePair<int,int> q = new KeyValuePair<int,int>();

+

+			Assert.IsTrue(lst.UpdateOrAdd(p));

+			q.key = 3;

+			Assert.IsTrue(lst.Find(ref q));

+			Assert.AreEqual(3, q.key);

+			Assert.AreEqual(78, q.value);

+			p = new KeyValuePair<int,int>(13, 79);

+			Assert.IsFalse(lst.UpdateOrAdd(p));

+			q.key = 13;

+			Assert.IsTrue(lst.Find(ref q));

+			Assert.AreEqual(13, q.key);

+			Assert.AreEqual(79, q.value);

+		}

+

+

+		[Test]

+		public void RemoveWithReturn()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+			KeyValuePair<int,int> q = new KeyValuePair<int,int>();

+

+			Assert.IsTrue(lst.RemoveWithReturn(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			p = new KeyValuePair<int,int>(13, 78);

+			Assert.IsFalse(lst.RemoveWithReturn(ref p));

+		}

+	}

+

+

+	[TestFixture]

+	public class CollectionOrSink

+	{

+		private HashBag<int> hashbag;

+

+

+		[SetUp]

+		public void Init() { hashbag = new HashBag<int>(); }

+

+

+		[Test]

+		public void CountEtAl()

+		{

+			Assert.IsFalse(hashbag.IsReadOnly);

+			Assert.IsFalse(hashbag.SyncRoot == null);

+			Assert.AreEqual(0, hashbag.Count);

+			Assert.IsTrue(hashbag.IsEmpty);

+			Assert.IsTrue(hashbag.AllowsDuplicates);

+			Assert.IsTrue(hashbag.Add(0));

+			Assert.AreEqual(1, hashbag.Count);

+			Assert.IsFalse(hashbag.IsEmpty);

+			Assert.IsTrue(hashbag.Add(5));

+			Assert.AreEqual(2, hashbag.Count);

+			Assert.IsTrue(hashbag.Add(5));

+			Assert.AreEqual(3, hashbag.Count);

+			Assert.IsFalse(hashbag.IsEmpty);

+			Assert.IsTrue(hashbag.Add(8));

+			Assert.AreEqual(4, hashbag.Count);

+			Assert.AreEqual(2, hashbag.ContainsCount(5));

+			Assert.AreEqual(1, hashbag.ContainsCount(8));

+			Assert.AreEqual(1, hashbag.ContainsCount(0));

+		}

+

+

+		[Test]

+		public void AddAll()

+		{

+			hashbag.Add(3);hashbag.Add(4);hashbag.Add(4);hashbag.Add(5);hashbag.Add(4);

+

+			HashBag<int> hashbag2 = new HashBag<int>();

+

+			hashbag2.AddAll(hashbag);

+			Assert.IsTrue(IC.seq(hashbag2, 3, 4, 4, 4, 5));

+			hashbag.Add(9);

+			hashbag.AddAll(hashbag2);

+			Assert.IsTrue(IC.seq(hashbag2, 3, 4, 4, 4, 5));

+			Assert.IsTrue(IC.seq(hashbag, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 9));

+		}

+

+

+		[Test]

+		public void ContainsCount()

+		{

+			Assert.AreEqual(0, hashbag.ContainsCount(5));

+			hashbag.Add(5);

+			Assert.AreEqual(1, hashbag.ContainsCount(5));

+			Assert.AreEqual(0, hashbag.ContainsCount(7));

+			hashbag.Add(8);

+			Assert.AreEqual(1, hashbag.ContainsCount(5));

+			Assert.AreEqual(0, hashbag.ContainsCount(7));

+			Assert.AreEqual(1, hashbag.ContainsCount(8));

+			hashbag.Add(5);

+			Assert.AreEqual(2, hashbag.ContainsCount(5));

+			Assert.AreEqual(0, hashbag.ContainsCount(7));

+			Assert.AreEqual(1, hashbag.ContainsCount(8));

+		}

+

+

+		[Test]

+		[Ignore("This is also failing on windows. Martin")]

+		public void RemoveAllCopies()

+		{

+			hashbag.Add(5);hashbag.Add(7);hashbag.Add(5);

+			Assert.AreEqual(2, hashbag.ContainsCount(5));

+			Assert.AreEqual(1, hashbag.ContainsCount(7));

+			hashbag.RemoveAllCopies(5);

+			Assert.AreEqual(0, hashbag.ContainsCount(5));

+			Assert.AreEqual(1, hashbag.ContainsCount(7));

+			hashbag.Add(5);hashbag.Add(8);hashbag.Add(5);

+			hashbag.RemoveAllCopies(8);

+			Assert.IsTrue(IC.eq(hashbag, 7, 5, 5));

+		}

+

+

+		[Test]

+		public void ContainsAll()

+		{

+			HashBag<int> list2 = new HashBag<int>();

+

+			Assert.IsTrue(hashbag.ContainsAll(list2));

+			list2.Add(4);

+			Assert.IsFalse(hashbag.ContainsAll(list2));

+			hashbag.Add(4);

+			Assert.IsTrue(hashbag.ContainsAll(list2));

+			hashbag.Add(5);

+			Assert.IsTrue(hashbag.ContainsAll(list2));

+			list2.Add(20);

+			Assert.IsFalse(hashbag.ContainsAll(list2));

+			hashbag.Add(20);

+			Assert.IsTrue(hashbag.ContainsAll(list2));

+			list2.Add(4);

+			Assert.IsFalse(hashbag.ContainsAll(list2));

+			hashbag.Add(4);

+			Assert.IsTrue(hashbag.ContainsAll(list2));

+		}

+

+

+		[Test]

+		public void RetainAll()

+		{

+			HashBag<int> list2 = new HashBag<int>();

+

+			hashbag.Add(4);hashbag.Add(5);hashbag.Add(4);hashbag.Add(6);hashbag.Add(4);

+			list2.Add(5);list2.Add(4);list2.Add(7);list2.Add(4);

+			hashbag.RetainAll(list2);

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 5));

+			hashbag.Add(6);

+			list2.Clear();

+			list2.Add(7);list2.Add(8);list2.Add(9);

+			hashbag.RetainAll(list2);

+			Assert.IsTrue(IC.eq(hashbag));

+		}

+

+

+		[Test]

+		public void RemoveAll()

+		{

+			HashBag<int> list2 = new HashBag<int>();

+

+			hashbag.Add(4);hashbag.Add(5);hashbag.Add(6);hashbag.Add(4);hashbag.Add(5);

+			list2.Add(5);list2.Add(4);list2.Add(7);list2.Add(4);

+			hashbag.RemoveAll(list2);

+			Assert.IsTrue(IC.seq(hashbag, 5, 6));

+			hashbag.Add(5);hashbag.Add(4);

+			list2.Clear();

+			list2.Add(6);list2.Add(5);

+			hashbag.RemoveAll(list2);

+			Assert.IsTrue(IC.seq(hashbag, 4, 5));

+			list2.Clear();

+			list2.Add(7);list2.Add(8);list2.Add(9);

+			hashbag.RemoveAll(list2);

+			Assert.IsTrue(IC.seq(hashbag, 4, 5));

+		}

+

+

+		[Test]

+		public void Remove()

+		{

+			hashbag.Add(4);hashbag.Add(4);hashbag.Add(5);hashbag.Add(4);hashbag.Add(6);

+			Assert.IsFalse(hashbag.Remove(2));

+			Assert.IsTrue(hashbag.Remove(4));

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 5, 6));

+			hashbag.Add(7);

+			hashbag.Add(21);hashbag.Add(37);hashbag.Add(53);hashbag.Add(69);hashbag.Add(53);hashbag.Add(85);

+			Assert.IsTrue(hashbag.Remove(5));

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 6, 7, 21, 37, 53, 53, 69, 85));

+			Assert.IsFalse(hashbag.Remove(165));

+			Assert.IsTrue(hashbag.Check());

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 6, 7, 21, 37, 53, 53, 69, 85));

+			Assert.IsTrue(hashbag.Remove(53));

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 6, 7, 21, 37, 53, 69, 85));

+			Assert.IsTrue(hashbag.Remove(37));

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 6, 7, 21, 53, 69, 85));

+			Assert.IsTrue(hashbag.Remove(85));

+			Assert.IsTrue(IC.seq(hashbag, 4, 4, 6, 7, 21, 53, 69));

+		}

+

+

+		[TearDown]

+		public void Dispose() { hashbag = null; }

+	}

+

+

+	[TestFixture]

+	public class ArrayTest

+	{

+		private HashBag<int> hashbag;

+

+		int[] a;

+

+

+		[SetUp]

+		public void Init()

+		{

+			hashbag = new HashBag<int>();

+			a = new int[10];

+			for (int i = 0; i < 10; i++)

+				a[i] = 1000 + i;

+		}

+

+

+		[TearDown]

+		public void Dispose() { hashbag = null; }

+

+

+		private string aeq(int[] a, params int[] b)

+		{

+			if (a.Length != b.Length)

+				return "Lengths differ: " + a.Length + " != " + b.Length;

+

+			for (int i = 0; i < a.Length; i++)

+				if (a[i] != b[i])

+					return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

+

+			return "Alles klar";

+		}

+

+

+		[Test]

+		public void ToArray()

+		{

+			Assert.AreEqual("Alles klar", aeq(hashbag.ToArray()));

+			hashbag.Add(7);

+			hashbag.Add(3);

+			hashbag.Add(10);

+			hashbag.Add(3);

+

+			int[] r = hashbag.ToArray();

+

+			Array.Sort(r);

+			Assert.AreEqual("Alles klar", aeq(r, 3, 3, 7, 10));

+		}

+

+

+		[Test]

+		[Ignore("This is also failing on windows. Martin")]

+		public void CopyTo()

+		{

+			//Note: for small ints the itemhasher is the identity!

+			hashbag.CopyTo(a, 1);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+			hashbag.Add(6);

+			hashbag.CopyTo(a, 2);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+			hashbag.Add(4);

+			hashbag.Add(6);

+			hashbag.Add(9);

+			hashbag.CopyTo(a, 4);

+

+			//TODO: make independent of interhasher

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 6, 9, 4, 1008, 1009));

+			hashbag.Clear();

+			hashbag.Add(7);

+			hashbag.CopyTo(a, 9);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 6, 9, 4, 1008, 7));

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToBad()

+		{

+			hashbag.Add(3);

+			hashbag.CopyTo(a, 10);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void CopyToBad2()

+		{

+			hashbag.CopyTo(a, -1);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToTooFar()

+		{

+			hashbag.Add(3);

+			hashbag.Add(8);

+			hashbag.CopyTo(a, 9);

+		}

+	}

+

+

+	[TestFixture]

+	public class HashingEquals

+	{

+		private ICollection<int> h1, h2;

+

+

+		[SetUp]

+		public void Init()

+		{

+			h1 = new HashBag<int>();

+			h2 = new LinkedList<int>();

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			h1 = h2 = null;

+		}

+

+

+		[Test]

+		public void Hashing()

+		{

+			Assert.AreEqual(h1.GetHashCode(), h2.GetHashCode());

+			h1.Add(7);

+			h2.Add(9);

+			Assert.IsTrue(h1.GetHashCode() != h2.GetHashCode());

+			h2.Add(7);

+			h1.Add(9);

+			Assert.IsTrue(h1.GetHashCode() == h2.GetHashCode());

+		}

+

+

+		[Test]

+		public void Equals()

+		{

+			Assert.IsTrue(h1.Equals(h2));

+			h1.Add(1);

+			h1.Add(2);

+			h1.Add(1);

+			h1.Add(2);

+			h2.Add(0);

+			h2.Add(3);

+			h2.Add(0);

+			h2.Add(3);

+			Assert.IsTrue(h1.GetHashCode() == h2.GetHashCode());

+			Assert.IsTrue(!h1.Equals(h2));

+			h1.Clear();

+			h2.Clear();

+			h1.Add(1);

+			h1.Add(2);

+			h2.Add(2);

+			h2.Add(1);

+			Assert.IsTrue(h1.GetHashCode() == h2.GetHashCode());

+			Assert.IsTrue(h1.Equals(h2));

+		}

+	}

 }

+#endif

diff --git a/mcs/class/Mono.C5/Test/hashing/HashDictionaryTests.cs b/mcs/class/Mono.C5/Test/hashing/HashDictionaryTests.cs
index dfdaa98572b..e7446784198 100644
--- a/mcs/class/Mono.C5/Test/hashing/HashDictionaryTests.cs
+++ b/mcs/class/Mono.C5/Test/hashing/HashDictionaryTests.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,303 +23,228 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

-namespace C5UnitTests.hashtable.dictionary

+using MSG = System.Collections.Generic;

+namespace nunit.hashtable.dictionary

 {

-  using DictionaryIntToInt = HashDictionary<int,int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<DictionaryIntToInt> factory = delegate() { return new DictionaryIntToInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.DictionaryTester<DictionaryIntToInt>().Test(factory);

-    }

-  }

-

-  static class Factory

-  {

-    public static IDictionary<K, V> New<K, V>() { return new HashDictionary<K, V>(); }

-  }

-

-  [TestFixture]

-  public class Formatting

-  {

-    IDictionary<int, int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = Factory.New<int, int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{  }", coll.ToString());

-      coll.Add(23, 67); coll.Add(45, 89);

-      Assert.AreEqual("{ 45 => 89, 23 => 67 }", coll.ToString());

-      Assert.AreEqual("{ 2D => 59, 17 => 43 }", coll.ToString(null, rad16));

-      Assert.AreEqual("{ 45 => 89, ... }", coll.ToString("L14", null));

-      Assert.AreEqual("{ 2D => 59, ... }", coll.ToString("L14", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class HashDict

-  {

-    private HashDictionary<string, string> dict;

-

-

-    [SetUp]

-    public void Init()

-    {

-      dict = new HashDictionary<string, string>();

-      //dict = TreeDictionary<string,string>.MakeNaturalO<string,string>();

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new HashDictionary<int, int>(null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor2()

-    {

-      new HashDictionary<int, int>(5, 0.5, null);

-    }

-

-    [Test]

-    public void Choose()

-    {

-      dict.Add("ER", "FOO");

-      Assert.AreEqual(new KeyValuePair<string, string>("ER", "FOO"), dict.Choose());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      dict.Choose();

-    }

-

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      dict = null;

-    }

-

-

-    [Test]

-    public void Initial()

-    {

-      bool res;

-

-      Assert.IsFalse(dict.IsReadOnly);

-      Assert.AreEqual(0, dict.Count, "new dict should be empty");

-      dict.Add("A", "B");

-      Assert.AreEqual(1, dict.Count, "bad count");

-      Assert.AreEqual("B", dict["A"], "Wrong value for dict[A]");

-      dict.Add("C", "D");

-      Assert.AreEqual(2, dict.Count, "bad count");

-      Assert.AreEqual("B", dict["A"], "Wrong value");

-      Assert.AreEqual("D", dict["C"], "Wrong value");

-      res = dict.Remove("A");

-      Assert.IsTrue(res, "bad return value from Remove(A)");

-      Assert.AreEqual(1, dict.Count, "bad count");

-      Assert.AreEqual("D", dict["C"], "Wrong value of dict[C]");

-      res = dict.Remove("Z");

-      Assert.IsFalse(res, "bad return value from Remove(Z)");

-      Assert.AreEqual(1, dict.Count, "bad count");

-      Assert.AreEqual("D", dict["C"], "Wrong value of dict[C] (2)");

-    }

-

-

-    [Test]

-    public void Contains()

-    {

-      dict.Add("C", "D");

-      Assert.IsTrue(dict.Contains("C"));

-      Assert.IsFalse(dict.Contains("D"));

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(DuplicateNotAllowedException), "Key being added: 'A'")]

-    public void IllegalAdd()

-    {

-      dict.Add("A", "B");

-      dict.Add("A", "B");

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void GettingNonExisting()

-    {

-      Console.WriteLine(dict["R"]);

-    }

-

-

-    [Test]

-    public void Setter()

-    {

-      dict["R"] = "UYGUY";

-      Assert.AreEqual("UYGUY", dict["R"]);

-      dict["R"] = "UIII";

-      Assert.AreEqual("UIII", dict["R"]);

-      dict["S"] = "VVV";

-      Assert.AreEqual("UIII", dict["R"]);

-      Assert.AreEqual("VVV", dict["S"]);

-      //dict.dump();

-    }

-

-    [Test]

-    public void CombinedOps()

-    {

-      dict["R"] = "UIII";

-      dict["S"] = "VVV";

-      dict["T"] = "XYZ";

-

-      string s;

-

-      Assert.IsTrue(dict.Remove("S", out s));

-      Assert.AreEqual("VVV", s);

-      Assert.IsFalse(dict.Contains("S"));

-      Assert.IsFalse(dict.Remove("A", out s));

-

-      //

-      Assert.IsTrue(dict.Find("T", out s));

-      Assert.AreEqual("XYZ", s);

-      Assert.IsFalse(dict.Find("A", out s));

-

-      //

-      Assert.IsTrue(dict.Update("R", "UHU"));

-      Assert.AreEqual("UHU", dict["R"]);

-      Assert.IsFalse(dict.Update("A", "W"));

-      Assert.IsFalse(dict.Contains("A"));

-

-      //

-      s = "KKK";

-      Assert.IsFalse(dict.FindOrAdd("B", ref s));

-      Assert.AreEqual("KKK", dict["B"]);

-      Assert.IsTrue(dict.FindOrAdd("T", ref s));

-      Assert.AreEqual("XYZ", s);

-

-      //

-      s = "LLL";

-      Assert.IsTrue(dict.UpdateOrAdd("R", s));

-      Assert.AreEqual("LLL", dict["R"]);

-      s = "MMM";

-      Assert.IsFalse(dict.UpdateOrAdd("C", s));

-      Assert.AreEqual("MMM", dict["C"]);

-    }

-

-    [Test]

-    public void DeepBucket()

-    {

-      HashDictionary<int, int> dict2 = new HashDictionary<int, int>();

-

-      for (int i = 0; i < 5; i++)

-        dict2[16 * i] = 5 * i;

-

-      for (int i = 0; i < 5; i++)

-        Assert.AreEqual(5 * i, dict2[16 * i]);

-

-      for (int i = 0; i < 5; i++)

-        dict2[16 * i] = 7 * i + 1;

-

-      for (int i = 0; i < 5; i++)

-        Assert.AreEqual(7 * i + 1, dict2[16 * i]);

-      Assert.IsTrue(dict.Check());

-    }

-  }

-

-

-

-  [TestFixture]

-  public class Enumerators

-  {

-    private HashDictionary<string, string> dict;

-

-    private SCG.IEnumerator<KeyValuePair<string, string>> dictenum;

-

-

-    [SetUp]

-    public void Init()

-    {

-      dict = new HashDictionary<string, string>();

-      dict["S"] = "A";

-      dict["T"] = "B";

-      dict["R"] = "C";

-      dictenum = dict.GetEnumerator();

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      dictenum = null;

-      dict = null;

-    }

-

-

-    [Test]

-    public void Keys()

-    {

-      SCG.IEnumerator<string> keys = dict.Keys.GetEnumerator();

-

-      Assert.IsTrue(keys.MoveNext());

-      Assert.AreEqual("R", keys.Current);

-      Assert.IsTrue(keys.MoveNext());

-      Assert.AreEqual("T", keys.Current);

-      Assert.IsTrue(keys.MoveNext());

-      Assert.AreEqual("S", keys.Current);

-      Assert.IsFalse(keys.MoveNext());

-    }

-

-

-    [Test]

-    public void Values()

-    {

-      SCG.IEnumerator<string> values = dict.Values.GetEnumerator();

-

-      Assert.IsTrue(values.MoveNext());

-      Assert.AreEqual("C", values.Current);

-      Assert.IsTrue(values.MoveNext());

-      Assert.AreEqual("B", values.Current);

-      Assert.IsTrue(values.MoveNext());

-      Assert.AreEqual("A", values.Current);

-      Assert.IsFalse(values.MoveNext());

-    }

-

-    [Test]

-    public void Fun()

-    {

-      Assert.AreEqual("B", dict.Fun("T"));

-    }

-

-

-    [Test]

-    public void NormalUse()

-    {

-      Assert.IsTrue(dictenum.MoveNext());

-      Assert.AreEqual(dictenum.Current, new KeyValuePair<string, string>("R", "C"));

-      Assert.IsTrue(dictenum.MoveNext());

-      Assert.AreEqual(dictenum.Current, new KeyValuePair<string, string>("T", "B"));

-      Assert.IsTrue(dictenum.MoveNext());

-      Assert.AreEqual(dictenum.Current, new KeyValuePair<string, string>("S", "A"));

-      Assert.IsFalse(dictenum.MoveNext());

-    }

-  }

+	[TestFixture]

+	public class HashDict

+	{

+		private HashDictionary<string,string> dict;

+

+

+		[SetUp]

+		public void Init()

+		{

+			dict = new HashDictionary<string,string>();

+			//dict = TreeDictionary<string,string>.MakeNaturalO<string,string>();

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			dict = null;

+		}

+

+

+		[Test]

+		public void Initial()

+		{

+			bool res;

+

+			Assert.IsFalse(dict.IsReadOnly);

+			Assert.AreEqual(0, dict.Count, "new dict should be empty");

+			dict.Add("A", "B");

+			Assert.AreEqual(1, dict.Count, "bad count");

+			Assert.AreEqual("B", dict["A"], "Wrong value for dict[A]");

+			dict.Add("C", "D");

+			Assert.AreEqual(2, dict.Count, "bad count");

+			Assert.AreEqual("B", dict["A"], "Wrong value");

+			Assert.AreEqual("D", dict["C"], "Wrong value");

+			res = dict.Remove("A");

+			Assert.IsTrue(res, "bad return value from Remove(A)");

+			Assert.AreEqual(1, dict.Count, "bad count");

+			Assert.AreEqual("D", dict["C"], "Wrong value of dict[C]");

+			res = dict.Remove("Z");

+			Assert.IsFalse(res, "bad return value from Remove(Z)");

+			Assert.AreEqual(1, dict.Count, "bad count");

+			Assert.AreEqual("D", dict["C"], "Wrong value of dict[C] (2)");

+		}

+

+

+		[Test]

+		public void Contains()

+		{

+			dict.Add("C", "D");

+			Assert.IsTrue(dict.Contains("C"));

+			Assert.IsFalse(dict.Contains("D"));

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentException), "Item has already been added.  Key in dictionary: 'A'  Key being added: 'A'")]

+		public void IllegalAdd()

+		{

+			dict.Add("A", "B");

+			dict.Add("A", "B");

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentException), "Key not present in Dictionary")]

+		public void GettingNonExisting()

+		{

+			Console.WriteLine(dict["R"]);

+		}

+

+

+		[Test]

+		public void Setter()

+		{

+			dict["R"] = "UYGUY";

+			Assert.AreEqual("UYGUY", dict["R"]);

+			dict["R"] = "UIII";

+			Assert.AreEqual("UIII", dict["R"]);

+			dict["S"] = "VVV";

+			Assert.AreEqual("UIII", dict["R"]);

+			Assert.AreEqual("VVV", dict["S"]);

+			//dict.dump();

+		}

+

+		[Test]

+		public void CombinedOps()

+		{

+			dict["R"] = "UIII";

+			dict["S"] = "VVV";

+			dict["T"] = "XYZ";

+

+			string s;

+

+			Assert.IsTrue(dict.Remove("S", out s));

+			Assert.AreEqual("VVV", s);

+			Assert.IsFalse(dict.Contains("S"));

+			Assert.IsFalse(dict.Remove("A", out s));

+

+			//

+			Assert.IsTrue(dict.Find("T", out s));

+			Assert.AreEqual("XYZ", s);

+			Assert.IsFalse(dict.Find("A", out s));

+

+			//

+			Assert.IsTrue(dict.Update("R", "UHU"));

+			Assert.AreEqual("UHU", dict["R"]);

+			Assert.IsFalse(dict.Update("A", "W"));

+			Assert.IsFalse(dict.Contains("A"));

+

+			//

+			s = "KKK";

+			Assert.IsFalse(dict.FindOrAdd("B", ref s));

+			Assert.AreEqual("KKK", dict["B"]);

+			Assert.IsTrue(dict.FindOrAdd("T", ref s));

+			Assert.AreEqual("XYZ", s);

+

+			//

+			s = "LLL";

+			Assert.IsTrue(dict.UpdateOrAdd("R", s));

+			Assert.AreEqual("LLL", dict["R"]);

+			s = "MMM";

+			Assert.IsFalse(dict.UpdateOrAdd("C", s));

+			Assert.AreEqual("MMM", dict["C"]);

+		}

+

+		[Test]

+		public void DeepBucket()

+		{

+			HashDictionary<int,int> dict2 = new HashDictionary<int,int>();

+

+			for (int i = 0; i < 5; i++)

+				dict2[16 * i] = 5 * i;

+

+			for (int i = 0; i < 5; i++)

+				Assert.AreEqual(5 * i, dict2[16 * i]);

+

+			for (int i = 0; i < 5; i++)

+				dict2[16 * i] = 7 * i + 1;

+

+			for (int i = 0; i < 5; i++)

+				Assert.AreEqual(7 * i + 1, dict2[16 * i]);

+			Assert.IsTrue(dict.Check());

+		}

+	}

+

+

+

+	[TestFixture]

+	public class Enumerators

+	{

+		private HashDictionary<string,string> dict;

+

+		private MSG.IEnumerator<KeyValuePair<string,string>> dictenum;

+

+

+		[SetUp]

+		public void Init()

+		{

+			dict = new HashDictionary<string,string>();

+			dict["S"] = "A";

+			dict["T"] = "B";

+			dict["R"] = "C";

+			dictenum = dict.GetEnumerator();

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			dictenum = null;

+			dict = null;

+		}

+

+

+		[Test]

+		[Ignore("This is also failing on windows. Martin")]

+		public void Keys()

+		{

+			MSG.IEnumerator<string> keys = dict.Keys.GetEnumerator();

+

+			Assert.IsTrue(keys.MoveNext());

+			Assert.AreEqual("R", keys.Current);

+			Assert.IsTrue(keys.MoveNext());

+			Assert.AreEqual("T", keys.Current);

+			Assert.IsTrue(keys.MoveNext());

+			Assert.AreEqual("S", keys.Current);

+			Assert.IsFalse(keys.MoveNext());

+		}

+

+

+		[Test]

+		[Ignore("This is also failing on windows. Martin")]

+		public void Values()

+		{

+			MSG.IEnumerator<string> values = dict.Values.GetEnumerator();

+

+			Assert.IsTrue(values.MoveNext());

+			Assert.AreEqual("C", values.Current);

+			Assert.IsTrue(values.MoveNext());

+			Assert.AreEqual("B", values.Current);

+			Assert.IsTrue(values.MoveNext());

+			Assert.AreEqual("A", values.Current);

+			Assert.IsFalse(values.MoveNext());

+		}

+

+

+		[Test]

+		[Ignore("This is also failing on windows. Martin")]

+		public void NormalUse()

+		{

+			Assert.IsTrue(dictenum.MoveNext());

+			Assert.AreEqual(dictenum.Current, new KeyValuePair<string,string>("R", "C"));

+			Assert.IsTrue(dictenum.MoveNext());

+			Assert.AreEqual(dictenum.Current, new KeyValuePair<string,string>("T", "B"));

+			Assert.IsTrue(dictenum.MoveNext());

+			Assert.AreEqual(dictenum.Current, new KeyValuePair<string,string>("S", "A"));

+			Assert.IsFalse(dictenum.MoveNext());

+		}

+	}

 }

-

-

-

-

-

+#endif

diff --git a/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs b/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs
index 34197091356..f44a6d3389e 100644
--- a/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs
+++ b/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,43 +23,17 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

-namespace C5UnitTests.hashtable.set

+using MSG = System.Collections.Generic;

+namespace nunit.hashtable.set

 {

-  using CollectionOfInt = HashSet<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.CollectionTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new HashSet<T>(); }

-  }

-

-

-  namespace Enumerable

+	namespace Enumerable

 	{

 		[TestFixture]

 		public class Multiops

 		{

 			private HashSet<int> list;

 

-			private Fun<int, bool> always, never, even;

+			private Filter<int> always, never, even;

 

 

 			[SetUp]

@@ -106,10 +81,11 @@ namespace C5UnitTests.hashtable.set
 

 

 			[Test]

+			[Ignore("This is also failing on windows. Martin")]

 			public void Apply()

 			{

 				int sum = 0;

-				Act<int> a = delegate(int i){sum=i+10*sum;};

+				Applier<int> a = delegate(int i){sum=i+10*sum;};

 

 				list.Apply(a);

 				Assert.AreEqual(0, sum);

@@ -139,7 +115,7 @@ namespace C5UnitTests.hashtable.set
 			[Test]

 			public void Empty()

 			{

-				SCG.IEnumerator<int> e = hashset.GetEnumerator();

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

 

 				Assert.IsFalse(e.MoveNext());

 			}

@@ -158,9 +134,87 @@ namespace C5UnitTests.hashtable.set
 				hashset.Add(18);

 				hashset.Add(17);

 				hashset.Add(33);

-				Assert.IsTrue(IC.seteq(hashset, 1, 5, 8, 10, 16, 17, 18, 33));

+				Assert.IsTrue(IC.seq(hashset, 1, 5, 8, 10, 16, 17, 18, 33));

 			}

 

+

+#if SAFEENUMERATORS

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void TooEarlyCurrent()

+			{

+				int none = hashset.GetEnumerator().Current;

+			}

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void TooLateMoveNext()

+			{

+				hashset.Add(5);

+				hashset.Add(8);

+				hashset.Add(5);

+

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

+

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void TooLateCurrent()

+			{

+				hashset.Add(5);

+				hashset.Add(8);

+				hashset.Add(5);

+

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

+

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+				e.MoveNext();

+

+				int i = e.Current;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterDispose()

+			{

+				hashset.Add(5);

+				hashset.Add(8);

+				hashset.Add(5);

+

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

+

+				e.MoveNext();

+				e.Dispose();

+				e.MoveNext();

+			}

+			

+			

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void CurrentAfterDispose()

+			{

+				hashset.Add(5);

+				hashset.Add(8);

+				hashset.Add(5);

+

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

+

+				e.MoveNext();

+				e.Dispose();

+

+				int i = e.Current;

+			}

+#endif

+

 			[Test]

 			public void DoDispose()

 			{

@@ -168,7 +222,7 @@ namespace C5UnitTests.hashtable.set
 				hashset.Add(8);

 				hashset.Add(5);

 

-				SCG.IEnumerator<int> e = hashset.GetEnumerator();

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

 

 				e.MoveNext();

 				e.MoveNext();

@@ -177,14 +231,14 @@ namespace C5UnitTests.hashtable.set
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

 			{

 				hashset.Add(5);

 				hashset.Add(8);

 				hashset.Add(5);

 

-				SCG.IEnumerator<int> e = hashset.GetEnumerator();

+				MSG.IEnumerator<int> e = hashset.GetEnumerator();

 

 				e.MoveNext();

 				hashset.Add(99);

@@ -197,31 +251,13 @@ namespace C5UnitTests.hashtable.set
 		}

 	}

 

+

+

+

 	namespace CollectionOrSink

 	{

-    [TestFixture]

-    public class Formatting

-    {

-      ICollection<int> coll;

-      IFormatProvider rad16;

-      [SetUp]

-      public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-      [TearDown]

-      public void Dispose() { coll = null; rad16 = null; }

-      [Test]

-      public void Format()

-      {

-        Assert.AreEqual("{  }", coll.ToString());

-        coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-        Assert.AreEqual("{ 65530, -4, 28, 129 }", coll.ToString());

-        Assert.AreEqual("{ FFFA, -4, 1C, 81 }", coll.ToString(null, rad16));

-        Assert.AreEqual("{ 65530, -4, ... }", coll.ToString("L14", null));

-        Assert.AreEqual("{ FFFA, -4, ... }", coll.ToString("L14", rad16));

-      }

-    }

-

-    [TestFixture]

-    public class CollectionOrSink

+		[TestFixture]

+		public class CollectionOrSink

 		{

 			private HashSet<int> hashset;

 

@@ -229,22 +265,9 @@ namespace C5UnitTests.hashtable.set
 			[SetUp]

 			public void Init() { hashset = new HashSet<int>(); }

 

-      [Test]

-      public void Choose()

-      {

-        hashset.Add(7);

-        Assert.AreEqual(7, hashset.Choose());

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadChoose()

-      {

-        hashset.Choose();

-      }

 

-      [Test]

-      public void CountEtAl()

+			[Test]

+			public void CountEtAl()

 			{

 				Assert.AreEqual(0, hashset.Count);

 				Assert.IsTrue(hashset.IsEmpty);

@@ -270,11 +293,11 @@ namespace C5UnitTests.hashtable.set
 				HashSet<int> hashset2 = new HashSet<int>();

 

 				hashset2.AddAll(hashset);

-				Assert.IsTrue(IC.seteq(hashset2, 3, 4, 5));

+				Assert.IsTrue(IC.seq(hashset2, 3, 4, 5));

 				hashset.Add(9);

 				hashset.AddAll(hashset2);

-				Assert.IsTrue(IC.seteq(hashset2, 3, 4, 5));

-				Assert.IsTrue(IC.seteq(hashset, 3, 4, 5, 9));

+				Assert.IsTrue(IC.seq(hashset2, 3, 4, 5));

+				Assert.IsTrue(IC.seq(hashset, 3, 4, 5, 9));

 			}

 

 

@@ -282,59 +305,10 @@ namespace C5UnitTests.hashtable.set
 			public void Dispose() { hashset = null; }

 		}

 

-    [TestFixture]

-    public class FindPredicate

-    {

-      private HashSet<int> list;

-      Fun<int, bool> pred;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashSet<int>(TenEqualityComparer.Default);

-        pred = delegate(int i) { return i % 5 == 0; };

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Find()

-      {

-        int i;

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.Find(pred, out i));

-        Assert.AreEqual(45, i);

-      }

-    }

-

-    [TestFixture]

-    public class UniqueItems

-    {

-      private HashSet<int> list;

-

-      [SetUp]

-      public void Init() { list = new HashSet<int>(); }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Test()

-      {

-        Assert.IsTrue(IC.seteq(list.UniqueItems()));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-        list.AddAll<int>(new int[] { 7, 9, 7 });

-        Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 1, 9, 1));

-      }

-    }

-

-    [TestFixture]

-    public class ArrayTest

+

+

+		[TestFixture]

+		public class ArrayTest

 		{

 			private HashSet<int> hashset;

 

@@ -384,9 +358,10 @@ namespace C5UnitTests.hashtable.set
 

 

 			[Test]

+			[Ignore("This is also failing on windows. Martin")]

 			public void CopyTo()

 			{

-				//Note: for small ints the itemequalityComparer is the identity!

+				//Note: for small ints the itemhasher is the identity!

 				hashset.CopyTo(a, 1);

 				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

 				hashset.Add(6);

@@ -396,7 +371,7 @@ namespace C5UnitTests.hashtable.set
 				hashset.Add(9);

 				hashset.CopyTo(a, 4);

 

-				//TODO: make test independent on onterequalityComparer

+				//TODO: make test independent on onterhasher

 				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 9, 4, 1007, 1008, 1009));

 				hashset.Clear();

 				hashset.Add(7);

@@ -406,10 +381,11 @@ namespace C5UnitTests.hashtable.set
 

 

 			[Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad()

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToBad()

 			{

-				hashset.CopyTo(a, 11);

+				hashset.Add(3);

+				hashset.CopyTo(a, 10);

 			}

 

 

@@ -422,8 +398,8 @@ namespace C5UnitTests.hashtable.set
 

 

 			[Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToTooFar()

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToTooFar()

 			{

 				hashset.Add(3);

 				hashset.Add(8);

@@ -482,7 +458,7 @@ namespace C5UnitTests.hashtable.set
 				hashset.Add(7);

 				hashset.Add(7 - 1503427877);

 

-				//foreach (int cell in hashset) Console.WriteLine("A: {0}", cell);

+				//foreach (int i in hashset) Console.WriteLine("A: {0}", i);

 				hashset.Remove(7);

 				Assert.IsTrue(hashset.Contains(7 - 1503427877));

 			}

@@ -507,28 +483,7 @@ namespace C5UnitTests.hashtable.set
 			public void Init() { hashset = new HashSet<int>(); }

 

 

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor1()

-      {

-        new HashSet<int>(null);

-      }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor2()

-      {

-        new HashSet<int>(5, null);

-      }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor3()

-      {

-        new HashSet<int>(5, 0.5, null);

-      }

-

-      [Test]

+			[Test]

 			public void Contains()

 			{

 				Assert.IsFalse(hashset.Contains(5));

@@ -588,7 +543,7 @@ namespace C5UnitTests.hashtable.set
 					a[i] = 3 * i + 1;

 				}

 

-				Assert.IsTrue(IC.seteq(hashset, a));

+				Assert.IsTrue(IC.seq(hashset, a));

 			}

 

 

@@ -611,6 +566,7 @@ namespace C5UnitTests.hashtable.set
 

 

 			[Test]

+			[Ignore("This is also failing on windows. Martin")]

 			public void RemoveAllCopies()

 			{

 				hashset.Add(5);hashset.Add(7);hashset.Add(5);

@@ -652,12 +608,12 @@ namespace C5UnitTests.hashtable.set
 				hashset.Add(4);hashset.Add(5);hashset.Add(6);

 				list2.Add(5);list2.Add(4);list2.Add(7);

 				hashset.RetainAll(list2);

-				Assert.IsTrue(IC.seteq(hashset, 4, 5));

+				Assert.IsTrue(IC.seq(hashset, 4, 5));

 				hashset.Add(6);

 				list2.Clear();

 				list2.Add(7);list2.Add(8);list2.Add(9);

 				hashset.RetainAll(list2);

-				Assert.IsTrue(IC.seteq(hashset));

+				Assert.IsTrue(IC.seq(hashset));

 			}

 

 

@@ -688,19 +644,19 @@ namespace C5UnitTests.hashtable.set
 				hashset.Add(4);hashset.Add(4);hashset.Add(5);hashset.Add(4);hashset.Add(6);

 				Assert.IsFalse(hashset.Remove(2));

 				Assert.IsTrue(hashset.Remove(4));

-				Assert.IsTrue(IC.seteq(hashset, 5, 6));

+				Assert.IsTrue(IC.seq(hashset, 5, 6));

 				hashset.Add(7);

 				hashset.Add(21);hashset.Add(37);hashset.Add(53);hashset.Add(69);hashset.Add(85);

 				Assert.IsTrue(hashset.Remove(5));

-				Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 37, 53, 69, 85));

+				Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 37, 53, 69, 85));

 				Assert.IsFalse(hashset.Remove(165));

-				Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 37, 53, 69, 85));

+				Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 37, 53, 69, 85));

 				Assert.IsTrue(hashset.Remove(53));

-				Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 37, 69, 85));

+				Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 37, 69, 85));

 				Assert.IsTrue(hashset.Remove(37));

-				Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 69, 85));

+				Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 69, 85));

 				Assert.IsTrue(hashset.Remove(85));

-				Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 69));

+				Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 69));

 			}

 

 

@@ -726,8 +682,8 @@ namespace C5UnitTests.hashtable.set
 			[SetUp]

 			public void Init()

 			{

-                lst = new HashSet<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-                for (int i = 0; i < 10; i++)

+				lst = new HashSet<KeyValuePair<int,int>>();

+				for (int i = 0; i < 10; i++)

 					lst.Add(new KeyValuePair<int,int>(i, i + 30));

 			}

 

@@ -742,8 +698,8 @@ namespace C5UnitTests.hashtable.set
 				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 				Assert.IsTrue(lst.Find(ref p));

-				Assert.AreEqual(3, p.Key);

-				Assert.AreEqual(33, p.Value);

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

 				p = new KeyValuePair<int,int>(13, 78);

 				Assert.IsFalse(lst.Find(ref p));

 			}

@@ -756,14 +712,14 @@ namespace C5UnitTests.hashtable.set
 				KeyValuePair<int,int> q = new KeyValuePair<int,int>();

 

 				Assert.IsTrue(lst.FindOrAdd(ref p));

-				Assert.AreEqual(3, p.Key);

-				Assert.AreEqual(33, p.Value);

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

 				p = new KeyValuePair<int,int>(13, 79);

 				Assert.IsFalse(lst.FindOrAdd(ref p));

-				q.Key = 13;

+				q.key = 13;

 				Assert.IsTrue(lst.Find(ref q));

-				Assert.AreEqual(13, q.Key);

-				Assert.AreEqual(79, q.Value);

+				Assert.AreEqual(13, q.key);

+				Assert.AreEqual(79, q.value);

 			}

 

 

@@ -774,10 +730,10 @@ namespace C5UnitTests.hashtable.set
 				KeyValuePair<int,int> q = new KeyValuePair<int,int>();

 

 				Assert.IsTrue(lst.Update(p));

-				q.Key = 3;

+				q.key = 3;

 				Assert.IsTrue(lst.Find(ref q));

-				Assert.AreEqual(3, q.Key);

-				Assert.AreEqual(78, q.Value);

+				Assert.AreEqual(3, q.key);

+				Assert.AreEqual(78, q.value);

 				p = new KeyValuePair<int,int>(13, 78);

 				Assert.IsFalse(lst.Update(p));

 			}

@@ -790,16 +746,16 @@ namespace C5UnitTests.hashtable.set
 				KeyValuePair<int,int> q = new KeyValuePair<int,int>();

 

 				Assert.IsTrue(lst.UpdateOrAdd(p));

-				q.Key = 3;

+				q.key = 3;

 				Assert.IsTrue(lst.Find(ref q));

-				Assert.AreEqual(3, q.Key);

-				Assert.AreEqual(78, q.Value);

+				Assert.AreEqual(3, q.key);

+				Assert.AreEqual(78, q.value);

 				p = new KeyValuePair<int,int>(13, 79);

 				Assert.IsFalse(lst.UpdateOrAdd(p));

-				q.Key = 13;

+				q.key = 13;

 				Assert.IsTrue(lst.Find(ref q));

-				Assert.AreEqual(13, q.Key);

-				Assert.AreEqual(79, q.Value);

+				Assert.AreEqual(13, q.key);

+				Assert.AreEqual(79, q.value);

 			}

 

 

@@ -807,17 +763,15 @@ namespace C5UnitTests.hashtable.set
 			public void RemoveWithReturn()

 			{

 				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

-				//KeyValuePair<int,int> q = new KeyValuePair<int,int>();

+				KeyValuePair<int,int> q = new KeyValuePair<int,int>();

 

-                Assert.IsTrue(lst.Remove(p, out p));

-                Assert.AreEqual(3, p.Key);

-				Assert.AreEqual(33, p.Value);

+				Assert.IsTrue(lst.RemoveWithReturn(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

 				p = new KeyValuePair<int,int>(13, 78);

-                Assert.IsFalse(lst.Remove(p, out p));

-            }

+				Assert.IsFalse(lst.RemoveWithReturn(ref p));

+			}

 		}

-

-

 	}

 

 

@@ -843,7 +797,7 @@ namespace C5UnitTests.hashtable.set
 			[Test]

 			public void EmptyEmpty()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

+				Assert.IsTrue(dit.Equals(dat));

 			}

 

 

@@ -851,34 +805,45 @@ namespace C5UnitTests.hashtable.set
 			public void EmptyNonEmpty()

 			{

 				dit.Add(3);

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dat.UnsequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count, params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count << 16) + retval;

 			}

 

 

 			[Test]

 			public void HashVal()

 			{

-                Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-                dit.Add(3);

-                Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-                dit.Add(7);

-                Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-                Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-                dut.Add(3);

-                Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-                dut.Add(7);

-                Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-            }

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1, 3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1, 3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());

+			}

 

 

 			[Test]

 			public void EqualHashButDifferent()

 			{

-				dit.Add(-1657792980);dit.Add(-1570288808);

-				dat.Add(1862883298);dat.Add(-272461342);

-				Assert.AreEqual(dit.GetUnsequencedHashCode(), dat.GetUnsequencedHashCode());

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

+				dit.Add(2);dit.Add(1);

+				dat.Add(3);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

 			}

 

 

@@ -888,11 +853,11 @@ namespace C5UnitTests.hashtable.set
 				dit.Add(3);

 				dit.Add(7);

 				dat.Add(3);

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dat.UnsequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 				dat.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

-				Assert.IsTrue(dat.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

 			}

 

 

@@ -901,23 +866,23 @@ namespace C5UnitTests.hashtable.set
 			{

 				dit.Add(3);

 				dut.Add(3);

-				Assert.IsTrue(dit.UnsequencedEquals(dut));

-				Assert.IsTrue(dut.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 				dit.Add(7);

 				dut.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dut));

-				Assert.IsTrue(dut.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 			}

 

 

 			[Test]

 			public void Reflexive()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(3);

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 			}

 

 

@@ -958,8 +923,8 @@ namespace C5UnitTests.hashtable.set
 			[Test]

 			public void Check()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dit.UnsequencedEquals(dut));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

 			}

 

 

@@ -968,8 +933,8 @@ namespace C5UnitTests.hashtable.set
 			{

 				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

 				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

-				Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-				Assert.IsFalse(Dit.UnsequencedEquals(Dut));

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

 			}

 

 

@@ -1009,8 +974,8 @@ namespace C5UnitTests.hashtable.set
 			[Test]

 			public void Check()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dit.UnsequencedEquals(dut));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

 			}

 

 

@@ -1020,8 +985,8 @@ namespace C5UnitTests.hashtable.set
 				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

 				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

 				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

-				Assert.IsFalse(Dit.SequencedEquals(Dat));

-				Assert.IsTrue(Dit.SequencedEquals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

 			}

 

 

@@ -1064,9 +1029,9 @@ namespace C5UnitTests.hashtable.set
 			[Test]

 			public void Check()

 			{

-				Assert.IsFalse(dit.SequencedEquals(dat));

-				Assert.IsTrue(dit.SequencedEquals(dot));

-				Assert.IsFalse(dit.SequencedEquals(dut));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

 			}

 

 

@@ -1077,10 +1042,10 @@ namespace C5UnitTests.hashtable.set
 				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

 				Dut.Add(dot);Dut.Add(dut);//Dut.Add(dit);

 				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

-				Assert.IsTrue(Dit.UnsequencedEquals(Dit));

-				Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-				Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-				Assert.IsTrue(Dit.UnsequencedEquals(Dot));

+				Assert.IsTrue(Dit.Equals(Dit));

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

 			}

 

 

@@ -1092,4 +1057,5 @@ namespace C5UnitTests.hashtable.set
 			}

 		}

 	}

-}
\ No newline at end of file
+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/heaps/HeapTests.cs b/mcs/class/Mono.C5/Test/heaps/HeapTests.cs
index e0e3dfdf8ed..2df1686415a 100644
--- a/mcs/class/Mono.C5/Test/heaps/HeapTests.cs
+++ b/mcs/class/Mono.C5/Test/heaps/HeapTests.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,530 +23,171 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

-namespace C5UnitTests.heaps

+namespace nunit.heaps

 {

-  using CollectionOfInt = IntervalHeap<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.PriorityQueueTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  [TestFixture]

-  public class Events

-  {

-    IPriorityQueue<int> queue;

-    ArrayList<KeyValuePair<Acts, int>> events;

-

-

-    [SetUp]

-    public void Init()

-    {

-      queue = new IntervalHeap<int>();

-      events = new ArrayList<KeyValuePair<Acts, int>>();

-    }

-

-

-    [TearDown]

-    public void Dispose() { queue = null; events = null; }

-

-    [Test]

-    public void Listenable()

-    {

-      Assert.AreEqual(EventTypeEnum.Basic, queue.ListenableEvents);

-    }

-    

-    enum Acts

-    {

-      Add, Remove, Changed

-    }

-

-    [Test]

-    public void Direct()

-    {

-      CollectionChangedHandler<int> cch;

-      ItemsAddedHandler<int> iah;

-      ItemsRemovedHandler<int> irh;

-      Assert.AreEqual(EventTypeEnum.None, queue.ActiveEvents);

-      queue.CollectionChanged += (cch = new CollectionChangedHandler<int>(queue_CollectionChanged));

-      Assert.AreEqual(EventTypeEnum.Changed, queue.ActiveEvents);

-      queue.ItemsAdded += (iah = new ItemsAddedHandler<int>(queue_ItemAdded));

-      Assert.AreEqual(EventTypeEnum.Changed | EventTypeEnum.Added, queue.ActiveEvents);

-      queue.ItemsRemoved += (irh = new ItemsRemovedHandler<int>(queue_ItemRemoved));

-      Assert.AreEqual(EventTypeEnum.Changed | EventTypeEnum.Added | EventTypeEnum.Removed, queue.ActiveEvents);

-      queue.Add(34);

-      queue.Add(56);

-      queue.AddAll<int>(new int[] {});

-      queue.Add(34);

-      queue.Add(12);

-      queue.DeleteMax();

-      queue.DeleteMin();

-      queue.AddAll<int>(new int[] { 4, 5, 6, 2 });

-      Assert.AreEqual(17, events.Count);

-      int[] vals = { 34, 0, 56, 0, 34, 0, 12, 0, 56, 0, 12, 0, 4, 5, 6, 2, 0 };

-      Acts[] acts = { Acts.Add, Acts.Changed, Acts.Add, Acts.Changed, Acts.Add, Acts.Changed, Acts.Add, Acts.Changed, 

-                Acts.Remove, Acts.Changed, Acts.Remove, Acts.Changed, Acts.Add, Acts.Add, Acts.Add, Acts.Add, Acts.Changed };

-      for (int i = 0; i < vals.Length; i++)

-      {

-        //Console.WriteLine("{0}", events[cell]);

-        Assert.AreEqual(acts[i], events[i].Key, "Action " + i);

-        Assert.AreEqual(vals[i], events[i].Value, "Value " + i);

-      }

-      queue.CollectionChanged -= cch;

-      Assert.AreEqual(EventTypeEnum.Added | EventTypeEnum.Removed, queue.ActiveEvents);

-      queue.ItemsAdded -= iah;

-      Assert.AreEqual(EventTypeEnum.Removed, queue.ActiveEvents);

-      queue.ItemsRemoved -= irh;

-      Assert.AreEqual(EventTypeEnum.None, queue.ActiveEvents);

-    }

-

-    [Test]

-    public void Guarded()

-    {

-      ICollectionValue<int> guarded = new GuardedCollectionValue<int>(queue);

-      guarded.CollectionChanged += new CollectionChangedHandler<int>(queue_CollectionChanged);

-      guarded.ItemsAdded += new ItemsAddedHandler<int>(queue_ItemAdded);

-      guarded.ItemsRemoved += new ItemsRemovedHandler<int>(queue_ItemRemoved);

-      queue.Add(34);

-      queue.Add(56);

-      queue.Add(34);

-      queue.Add(12);

-      queue.DeleteMax();

-      queue.DeleteMin();

-      queue.AddAll<int>(new int[] { 4, 5, 6, 2 });

-      Assert.AreEqual(17, events.Count);

-      int[] vals = { 34, 0, 56, 0, 34, 0, 12, 0, 56, 0, 12, 0, 4, 5, 6, 2, 0 };

-      Acts[] acts = { Acts.Add, Acts.Changed, Acts.Add, Acts.Changed, Acts.Add, Acts.Changed, Acts.Add, Acts.Changed, 

-                Acts.Remove, Acts.Changed, Acts.Remove, Acts.Changed, Acts.Add, Acts.Add, Acts.Add, Acts.Add, Acts.Changed };

-      for (int i = 0; i < vals.Length; i++)

-      {

-        //Console.WriteLine("{0}", events[cell]);

-        Assert.AreEqual(vals[i], events[i].Value);

-        Assert.AreEqual(acts[i], events[i].Key);

-      }

-    }

-

-

-    void queue_CollectionChanged(object sender)

-    {

-      events.Add(new KeyValuePair<Acts, int>(Acts.Changed, 0));

-    }

-    void queue_ItemAdded(object sender, ItemCountEventArgs<int> e)

-    {

-      events.Add(new KeyValuePair<Acts, int>(Acts.Add, e.Item));

-    }

-    void queue_ItemRemoved(object sender, ItemCountEventArgs<int> e)

-    {

-      events.Add(new KeyValuePair<Acts, int>(Acts.Remove, e.Item));

-    }

-  }

-

-  [TestFixture]

-  public class Formatting

-  {

-    IntervalHeap<int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = new IntervalHeap<int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{  }", coll.ToString());

-      coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-      Assert.AreEqual("{ -4, 65530, 28, 129 }", coll.ToString());

-      Assert.AreEqual("{ -4, FFFA, 1C, 81 }", coll.ToString(null, rad16));

-      Assert.AreEqual("{ -4, 65530, ... }", coll.ToString("L14", null));

-      Assert.AreEqual("{ -4, FFFA, ... }", coll.ToString("L14", rad16));

-    }

-  }

-

-

-  [TestFixture]

-  public class IntervalHeapTests

-  {

-    IPriorityQueue<int> queue;

-

-

-    [SetUp]

-    public void Init() { queue = new IntervalHeap<int>(); }

-

-

-    [TearDown]

-    public void Dispose() { queue = null; }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new IntervalHeap<int>(null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor2()

-    {

-      new IntervalHeap<int>(5, null);

-    }

-

-    [Test]

-    public void Handles()

-    {

-      IPriorityQueueHandle<int>[] handles = new IPriorityQueueHandle<int>[10];

-

-      queue.Add(ref handles[0], 7);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[1], 72);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[2], 27);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[3], 17);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[4], 70);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[5], 1);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[6], 2);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[7], 7);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[8], 8);

-      Assert.IsTrue(queue.Check());

-      queue.Add(ref handles[9], 9);

-      Assert.IsTrue(queue.Check());

-      queue.Delete(handles[2]);

-      Assert.IsTrue(queue.Check());

-      queue.Delete(handles[0]);

-      Assert.IsTrue(queue.Check());

-      queue.Delete(handles[8]);

-      Assert.IsTrue(queue.Check());

-      queue.Delete(handles[4]);

-      Assert.IsTrue(queue.Check());

-      queue.Delete(handles[6]);

-      Assert.IsTrue(queue.Check());

-      Assert.AreEqual(5, queue.Count);

-    }

-

-    [Test]

-    public void Replace()

-    {

-      IPriorityQueueHandle<int> handle = null;

-      queue.Add(6);

-      queue.Add(10);

-      queue.Add(ref handle, 7);

-      queue.Add(21);

-      Assert.AreEqual(7, queue.Replace(handle, 12));

-      Assert.AreEqual(21, queue.FindMax());

-      Assert.AreEqual(12, queue.Replace(handle, 34));

-      Assert.AreEqual(34, queue.FindMax());

-      Assert.IsTrue(queue.Check());

-      //replace max

-      Assert.AreEqual(34, queue.Replace(handle, 60));

-      Assert.AreEqual(60, queue.FindMax());

-      Assert.AreEqual(60, queue.Replace(handle, queue[handle] + 80));

-      Assert.AreEqual(140, queue.FindMax());

-      Assert.IsTrue(queue.Check());

-    }

-

-    [Test]

-    public void Replace2()

-    {

-      IPriorityQueueHandle<int> handle = null;

-      queue.Add(6);

-      queue.Add(10);

-      queue.Add(ref handle, 7);

-      //Replace last item in queue with something large

-      Assert.AreEqual(7, queue.Replace(handle, 12));

-      Assert.IsTrue(queue.Check());

-    }

-

-    [Test]

-    public void ReuseHandle()

-    {

-      IPriorityQueueHandle<int> handle = null;

-      queue.Add(ref handle, 7);

-      queue.Delete(handle);

-      queue.Add(ref handle, 8);

-    }

-

-    [Test]

-    [ExpectedException(typeof(InvalidPriorityQueueHandleException))]

-    public void ErrorAddValidHandle()

-    {

-      IPriorityQueueHandle<int> handle = null;

-      queue.Add(ref handle, 7);

-      queue.Add(ref handle, 8);

-    }

-

-    [Test]

-    [ExpectedException(typeof(InvalidPriorityQueueHandleException))]

-    public void ErrorDeleteInvalidHandle()

-    {

-      IPriorityQueueHandle<int> handle = null;

-      queue.Add(ref handle, 7);

-      queue.Delete(handle);

-      queue.Delete(handle);

-    }

-

-    [Test]

-    [ExpectedException(typeof(InvalidPriorityQueueHandleException))]

-    public void ErrorReplaceInvalidHandle()

-    {

-      IPriorityQueueHandle<int> handle = null;

-      queue.Add(ref handle, 7);

-      queue.Delete(handle);

-      queue.Replace(handle, 13);

-    }

-

-    [Test]

-    public void Simple()

-    {

-      Assert.IsTrue(queue.AllowsDuplicates);

-      Assert.AreEqual(0, queue.Count);

-      queue.Add(8); queue.Add(18); queue.Add(8); queue.Add(3);

-      Assert.AreEqual(4, queue.Count);

-      Assert.AreEqual(18, queue.DeleteMax());

-      Assert.AreEqual(3, queue.Count);

-      Assert.AreEqual(3, queue.DeleteMin());

-      Assert.AreEqual(2, queue.Count);

-      Assert.AreEqual(8, queue.FindMax());

-      Assert.AreEqual(8, queue.DeleteMax());

-      Assert.AreEqual(8, queue.FindMax());

-      queue.Add(15);

-      Assert.AreEqual(15, queue.FindMax());

-      Assert.AreEqual(8, queue.FindMin());

-      Assert.IsTrue(queue.Comparer.Compare(2, 3) < 0);

-      Assert.IsTrue(queue.Comparer.Compare(4, 3) > 0);

-      Assert.IsTrue(queue.Comparer.Compare(3, 3) == 0);

-

-    }

-

-

-    [Test]

-    public void Enumerate()

-    {

-      int[] a = new int[4];

-      int siz = 0;

-      foreach (int i in queue)

-        siz++;

-      Assert.AreEqual(0, siz);

-

-      queue.Add(8); queue.Add(18); queue.Add(8); queue.Add(3);

-

-      foreach (int i in queue)

-        a[siz++] = i;

-      Assert.AreEqual(4, siz);

-      Array.Sort(a, 0, siz);

-      Assert.AreEqual(3, a[0]);

-      Assert.AreEqual(8, a[1]);

-      Assert.AreEqual(8, a[2]);

-      Assert.AreEqual(18, a[3]);

-

-      siz = 0;

-      Assert.AreEqual(18, queue.DeleteMax());

-      foreach (int i in queue)

-        a[siz++] = i;

-      Assert.AreEqual(3, siz);

-      Array.Sort(a, 0, siz);

-      Assert.AreEqual(3, a[0]);

-      Assert.AreEqual(8, a[1]);

-      Assert.AreEqual(8, a[2]);

-

-      siz = 0;

-      Assert.AreEqual(8, queue.DeleteMax());

-      foreach (int i in queue)

-        a[siz++] = i;

-      Assert.AreEqual(2, siz);

-      Array.Sort(a, 0, siz);

-      Assert.AreEqual(3, a[0]);

-      Assert.AreEqual(8, a[1]);

-

-      siz = 0;

-      Assert.AreEqual(8, queue.DeleteMax());

-      foreach (int i in queue)

-        a[siz++] = i;

-      Assert.AreEqual(1, siz);

-      Assert.AreEqual(3, a[0]);

-    }

-

-    [Test]

-    public void Random()

-    {

-      int length = 1000;

-      int[] a = new int[length];

-      Random ran = new Random(6754);

-

-      for (int i = 0; i < length; i++)

-        queue.Add(a[i] = ran.Next());

-

-      Assert.IsTrue(queue.Check());

-      Array.Sort(a);

-      for (int i = 0; i < length / 2; i++)

-      {

-        Assert.AreEqual(a[length - i - 1], queue.DeleteMax());

-        Assert.IsTrue(queue.Check());

-        Assert.AreEqual(a[i], queue.DeleteMin());

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.IsEmpty);

-    }

-

-    [Test]

-    public void RandomWithHandles()

-    {

-      int length = 1000;

-      int[] a = new int[length];

-      Random ran = new Random(6754);

-

-      for (int i = 0; i < length; i++)

-      {

-        IPriorityQueueHandle<int> h = null;

-        queue.Add(ref h, a[i] = ran.Next());

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.Check());

-      Array.Sort(a);

-      for (int i = 0; i < length / 2; i++)

-      {

-        Assert.AreEqual(a[length - i - 1], queue.DeleteMax());

-        Assert.IsTrue(queue.Check());

-        Assert.AreEqual(a[i], queue.DeleteMin());

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.IsEmpty);

-    }

-

-    [Test]

-    public void RandomWithDeleteHandles()

-    {

-      Random ran = new Random(6754);

-      int length = 1000;

-      int[] a = new int[length];

-      ArrayList<int> shuffle = new ArrayList<int>(length);

-      IPriorityQueueHandle<int>[] h = new IPriorityQueueHandle<int>[length];

-

-      for (int i = 0; i < length; i++)

-      {

-        shuffle.Add(i);

-        queue.Add(ref h[i], a[i] = ran.Next());

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.Check());

-      shuffle.Shuffle(ran);

-      for (int i = 0; i < length; i++)

-      {

-        int j = shuffle[i];

-        Assert.AreEqual(a[j], queue.Delete(h[j]));

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.IsEmpty);

-    }

-

-    [Test]

-    public void RandomIndexing()

-    {

-      Random ran = new Random(6754);

-      int length = 1000;

-      int[] a = new int[length];

-      int[] b = new int[length];

-      ArrayList<int> shuffle = new ArrayList<int>(length);

-      IPriorityQueueHandle<int>[] h = new IPriorityQueueHandle<int>[length];

-

-      for (int i = 0; i < length; i++)

-      {

-        shuffle.Add(i);

-        queue.Add(ref h[i], a[i] = ran.Next());

-        b[i] = ran.Next();

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.Check());

-      shuffle.Shuffle(ran);

-      for (int i = 0; i < length; i++)

-      {

-        int j = shuffle[i];

-        Assert.AreEqual(a[j], queue[h[j]]);

-        queue[h[j]] = b[j];

-        Assert.AreEqual(b[j], queue[h[j]]);

-        Assert.IsTrue(queue.Check());

-      }

-    }

-

-

-

-    [Test]

-    public void RandomDuplicates()

-    {

-      int length = 1000;

-      int s;

-      int[] a = new int[length];

-      Random ran = new Random(6754);

-

-      for (int i = 0; i < length; i++)

-        queue.Add(a[i] = ran.Next(3, 13));

-      Assert.IsTrue(queue.Check());

-

-      Array.Sort(a);

-

-      for (int i = 0; i < length / 2; i++)

-      {

-        Assert.AreEqual(a[i], queue.DeleteMin());

-        Assert.IsTrue(queue.Check());

-        Assert.AreEqual(a[length - i - 1], s = queue.DeleteMax());

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.IsEmpty);

-    }

-

-

-    [Test]

-    public void AddAll()

-    {

-      int length = 1000;

-      int[] a = new int[length];

-      Random ran = new Random(6754);

-

-      LinkedList<int> lst = new LinkedList<int>();

-      for (int i = 0; i < length; i++)

-        lst.Add(a[i] = ran.Next());

-

-      queue.AddAll(lst);

-      Assert.IsTrue(queue.Check());

-      Array.Sort(a);

-      for (int i = 0; i < length / 2; i++)

-      {

-        Assert.AreEqual(a[length - i - 1], queue.DeleteMax());

-        Assert.IsTrue(queue.Check());

-        Assert.AreEqual(a[i], queue.DeleteMin());

-        Assert.IsTrue(queue.Check());

-      }

-

-      Assert.IsTrue(queue.IsEmpty);

-    }

-

-  }

-

-

-}
\ No newline at end of file
+

+	[TestFixture]

+	public class IntervalHeapTests

+	{

+		IPriorityQueue<int> queue;

+

+

+		[SetUp]

+		public void Init() { queue = new IntervalHeap<int>(); }

+

+

+		[TearDown]

+		public void Dispose() { queue = null; }

+

+

+        [Test]

+        public void Simple()

+        {

+            Assert.IsTrue(queue.AllowsDuplicates);

+            Assert.AreEqual(0, queue.Count);

+            queue.Add(8); queue.Add(18); queue.Add(8); queue.Add(3);

+            Assert.AreEqual(4, queue.Count);

+            Assert.AreEqual(18, queue.DeleteMax());

+            Assert.AreEqual(3, queue.Count);

+            Assert.AreEqual(3, queue.DeleteMin());

+            Assert.AreEqual(2, queue.Count);

+            Assert.AreEqual(8, queue.FindMax());

+            Assert.AreEqual(8, queue.DeleteMax());

+            Assert.AreEqual(8, queue.FindMax());

+            queue.Add(15);

+            Assert.AreEqual(15, queue.FindMax());

+            Assert.AreEqual(8, queue.FindMin());

+            Assert.IsNotNull(queue.SyncRoot);

+            Assert.IsTrue(queue.Comparer.Compare(2, 3) < 0);

+            Assert.IsTrue(queue.Comparer.Compare(4, 3) > 0);

+            Assert.IsTrue(queue.Comparer.Compare(3, 3) == 0);

+

+        }

+

+

+        [Test]

+        public void Enumerate()

+        {

+            int[] a = new int[4];

+            int siz = 0;

+            foreach (int i in queue)

+                siz++;

+            Assert.AreEqual(0, siz);

+

+            queue.Add(8); queue.Add(18); queue.Add(8); queue.Add(3);

+

+            foreach (int i in queue)

+                a[siz++] = i;

+            Assert.AreEqual(4, siz);

+            Array.Sort(a,0,siz);

+            Assert.AreEqual(3, a[0]);

+            Assert.AreEqual(8, a[1]);

+            Assert.AreEqual(8, a[2]);

+            Assert.AreEqual(18, a[3]);

+

+            siz = 0;

+            Assert.AreEqual(18, queue.DeleteMax());

+            foreach (int i in queue)

+                a[siz++] = i;

+            Assert.AreEqual(3, siz);

+            Array.Sort(a, 0, siz);

+            Assert.AreEqual(3, a[0]);

+            Assert.AreEqual(8, a[1]);

+            Assert.AreEqual(8, a[2]);

+

+            siz = 0;

+            Assert.AreEqual(8, queue.DeleteMax());

+            foreach (int i in queue)

+                a[siz++] = i;

+            Assert.AreEqual(2, siz);

+            Array.Sort(a, 0, siz);

+            Assert.AreEqual(3, a[0]);

+            Assert.AreEqual(8, a[1]);

+

+            siz = 0;

+            Assert.AreEqual(8, queue.DeleteMax());

+            foreach (int i in queue)

+                a[siz++] = i;

+            Assert.AreEqual(1, siz);

+            Assert.AreEqual(3, a[0]);

+        }

+

+        [Test]

+        public void Random()

+		{

+			int length = 1000;

+			int[] a = new int[length];

+			Random ran = new Random(6754);

+

+			for (int i = 0; i < length; i++)

+				queue.Add(a[i] = ran.Next());

+

+			Assert.IsTrue(queue.Check());

+			Array.Sort(a);

+			for (int i = 0; i < length / 2; i++)

+			{

+				Assert.AreEqual(a[length - i - 1], queue.DeleteMax());

+				Assert.IsTrue(queue.Check());

+				Assert.AreEqual(a[i], queue.DeleteMin());

+				Assert.IsTrue(queue.Check());

+			}

+

+			Assert.IsTrue(queue.IsEmpty);

+		}

+

+

+		[Test]

+		public void RandomDuplicates()

+		{

+			int length = 1000;

+			int s;

+			int[] a = new int[length];

+			Random ran = new Random(6754);

+

+			for (int i = 0; i < length; i++)

+				queue.Add(a[i] = ran.Next(3, 13));

+			Assert.IsTrue(queue.Check());

+

+			Array.Sort(a);

+

+			for (int i = 0; i < length/2; i++)

+			{

+				Assert.AreEqual(a[i], queue.DeleteMin());

+				Assert.IsTrue(queue.Check());

+				Assert.AreEqual(a[length - i - 1], s = queue.DeleteMax());

+				Assert.IsTrue(queue.Check());

+			}

+

+			Assert.IsTrue(queue.IsEmpty);

+		}

+

+

+		[Test]

+		public void AddAll()

+		{

+			int length = 1000;

+			int[] a = new int[length];

+			Random ran = new Random(6754);

+

+			LinkedList<int> lst = new LinkedList<int>();

+			for (int i = 0; i < length; i++)

+				lst.Add(a[i] = ran.Next());

+

+			queue.AddAll(lst);

+			Assert.IsTrue(queue.Check());

+			Array.Sort(a);

+			for (int i = 0; i < length / 2; i++)

+			{

+				Assert.AreEqual(a[length - i - 1], queue.DeleteMax());

+				Assert.IsTrue(queue.Check());

+				Assert.AreEqual(a[i], queue.DeleteMin());

+				Assert.IsTrue(queue.Check());

+			}

+

+			Assert.IsTrue(queue.IsEmpty);

+		}

+	}

+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/linkedlists/HashedLinkedListTest.cs b/mcs/class/Mono.C5/Test/linkedlists/HashedLinkedListTest.cs
index 077f51c66bc..47b069918c6 100644
--- a/mcs/class/Mono.C5/Test/linkedlists/HashedLinkedListTest.cs
+++ b/mcs/class/Mono.C5/Test/linkedlists/HashedLinkedListTest.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,2820 +23,2011 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

 

-namespace C5UnitTests.linkedlists.hashed

+namespace nunit.linkedlists.hashed

 {

-  using CollectionOfInt = HashedLinkedList<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.ListTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Clone.ViewTester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.ViewTester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new HashedLinkedList<T>(); }

-  }

-

-

-  namespace Enumerable

-  {

-    [TestFixture]

-    public class Multiops

-    {

-      private HashedLinkedList<int> list;

-

-      private Fun<int, bool> always, never, even;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedLinkedList<int>();

-        always = delegate { return true; };

-        never = delegate { return false; };

-        even = delegate(int i) { return i % 2 == 0; };

-      }

-

-

-      [Test]

-      public void All()

-      {

-        Assert.IsTrue(list.All(always));

-        Assert.IsTrue(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(8);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(5);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsFalse(list.All(even));

-      }

-

-

-      [Test]

-      public void Exists()

-      {

-        Assert.IsFalse(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(5);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(8);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsTrue(list.Exists(even));

-      }

-

-

-      [Test]

-      public void Apply()

-      {

-        int sum = 0;

-        Act<int> a = delegate(int i) { sum = i + 10 * sum; };

-

-        list.Apply(a);

-        Assert.AreEqual(0, sum);

-        sum = 0;

-        list.Add(5); list.Add(8); list.Add(7); list.Add(5);

-        list.Apply(a);

-        Assert.AreEqual(587, sum);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-

-

-    [TestFixture]

-    public class GetEnumerator

-    {

-      private HashedLinkedList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new HashedLinkedList<int>(); }

-

-

-      [Test]

-      public void Empty()

-      {

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        Assert.IsFalse(e.MoveNext());

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-        list.Add(5);

-        list.Add(10);

-        list.Add(1);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(8, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(10, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(1, e.Current);

-        Assert.IsFalse(e.MoveNext());

-      }

-

-

-      [Test]

-      public void DoDispose()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        e.MoveNext();

-        e.MoveNext();

-        e.Dispose();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-

-        SCG.IEnumerator<int> e = list.GetEnumerator();

-

-        e.MoveNext();

-        list.Add(99);

-        e.MoveNext();

-      }

-

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-  namespace CollectionOrSink

-  {

-    [TestFixture]

-    public class Formatting

-    {

-      ICollection<int> coll;

-      IFormatProvider rad16;

-      [SetUp]

-      public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-      [TearDown]

-      public void Dispose() { coll = null; rad16 = null; }

-      [Test]

-      public void Format()

-      {

-        Assert.AreEqual("[  ]", coll.ToString());

-        coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-        Assert.AreEqual("[ -4, 28, 129, 65530 ]", coll.ToString());

-        Assert.AreEqual("[ -4, 1C, 81, FFFA ]", coll.ToString(null, rad16));

-        Assert.AreEqual("[ -4, 28, 129... ]", coll.ToString("L14", null));

-        Assert.AreEqual("[ -4, 1C, 81... ]", coll.ToString("L14", rad16));

-      }

-    }

-

-    [TestFixture]

-    public class CollectionOrSink

-    {

-      private HashedLinkedList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new HashedLinkedList<int>(); }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor1()

-      {

-        new HashedLinkedList<int>(null);

-      }

-

-      [Test]

-      public void Choose()

-      {

-        list.Add(7);

-        Assert.AreEqual(7, list.Choose());

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadChoose()

-      {

-        list.Choose();

-      }

-

-

-      [Test]

-      public void CountEtAl()

-      {

-        Assert.AreEqual(0, list.Count);

-        Assert.IsTrue(list.IsEmpty);

-        Assert.IsFalse(list.AllowsDuplicates);

-        Assert.IsTrue(list.Add(5));

-        Assert.AreEqual(1, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        Assert.IsFalse(list.Add(5));

-        Assert.AreEqual(1, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        Assert.IsTrue(list.Add(8));

-        Assert.AreEqual(2, list.Count);

-      }

-

-

-      [Test]

-      public void AddAll()

-      {

-        list.Add(3); list.Add(4); list.Add(5);

-

-        HashedLinkedList<int> list2 = new HashedLinkedList<int>();

-

-        list2.AddAll(list);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        list.AddAll(list2);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        Assert.IsTrue(IC.eq(list, 3, 4, 5));

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-

-    [TestFixture]

-    public class FindPredicate

-    {

-      private HashedLinkedList<int> list;

-      Fun<int, bool> pred;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedLinkedList<int>(TenEqualityComparer.Default);

-        pred = delegate(int i) { return i % 5 == 0; };

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Find()

-      {

-        int i;

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.Find(pred, out i));

-        Assert.AreEqual(45, i);

-      }

-

-      [Test]

-      public void FindLast()

-      {

-        int i;

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.FindLast(pred, out i));

-        Assert.AreEqual(675, i);

-      }

-

-      [Test]

-      public void FindIndex()

-      {

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(4, list.FindIndex(pred));

-      }

-

-      [Test]

-      public void FindLastIndex()

-      {

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(6, list.FindLastIndex(pred));

-      }

-    }

-

-    [TestFixture]

-    public class UniqueItems

-    {

-      private HashedLinkedList<int> list;

-

-      [SetUp]

-      public void Init() { list = new HashedLinkedList<int>(); }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Test()

-      {

-        Assert.IsTrue(IC.seteq(list.UniqueItems()));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-        list.AddAll<int>(new int[] { 7, 9, 7 });

-        Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 1, 9, 1));

-      }

-    }

-

-    [TestFixture]

-    public class ArrayTest

-    {

-      private HashedLinkedList<int> list;

-

-      int[] a;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedLinkedList<int>();

-        a = new int[10];

-        for (int i = 0; i < 10; i++)

-          a[i] = 1000 + i;

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      private string aeq(int[] a, params int[] b)

-      {

-        if (a.Length != b.Length)

-          return "Lengths differ: " + a.Length + " != " + b.Length;

-

-        for (int i = 0; i < a.Length; i++)

-          if (a[i] != b[i])

-            return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

-

-        return "Alles klar";

-      }

-

-

-      [Test]

-      public void ToArray()

-      {

-        Assert.AreEqual("Alles klar", aeq(list.ToArray()));

-        list.Add(7);

-        list.Add(8);

-        Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 8));

-      }

-

-

-      [Test]

-      public void CopyTo()

-      {

-        list.CopyTo(a, 1);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(6);

-        list.CopyTo(a, 2);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(4);

-        list.Add(5);

-        list.Add(9);

-        list.CopyTo(a, 4);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 1009));

-        list.Clear();

-        list.Add(7);

-        list.CopyTo(a, 9);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 7));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad()

-      {

-        list.CopyTo(a, 11);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad2()

-      {

-        list.CopyTo(a, -1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToTooFar()

-      {

-        list.Add(3);

-        list.Add(4);

-        list.CopyTo(a, 9);

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Sync

-    {

-      private HashedLinkedList<int> list;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedLinkedList<int>();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      [Test]

-      public void Get()

-      {

-        Assert.IsNotNull(list.SyncRoot);

-      }

-    }

-  }

-

-

-

-

-  namespace EditableCollection

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private HashedLinkedList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new HashedLinkedList<int>(); }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsFalse(list.Contains(5));

-        list.Add(5);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        list.Add(8);

-        list.Add(10);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsTrue(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-        list.Remove(8);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsFalse(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-      }

-

-      [Test]

-      public void BadAdd()

-      {

-        Assert.IsTrue(list.Add(5));

-        Assert.IsTrue(list.Add(8));

-        Assert.IsFalse(list.Add(5));

-      }

-

-

-      [Test]

-      public void ContainsCount()

-      {

-        Assert.AreEqual(0, list.ContainsCount(5));

-        list.Add(5);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        list.Add(8);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        Assert.AreEqual(1, list.ContainsCount(8));

-      }

-

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        list.Add(5); list.Add(7);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.RemoveAllCopies(5);

-        Assert.IsTrue(list.Check());

-        Assert.AreEqual(0, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.Add(5); list.Add(8);

-        list.RemoveAllCopies(8);

-        Assert.IsTrue(IC.eq(list, 7, 5));

-      }

-

-

-      [Test]

-      public void FindAll()

-      {

-        Fun<int, bool> f = delegate(int i) { return i % 2 == 0; };

-

-        Assert.IsTrue(list.FindAll(f).IsEmpty);

-        list.Add(5); list.Add(8); list.Add(10);

-        Assert.IsTrue(((HashedLinkedList<int>)list.FindAll(f)).Check());

-        Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        HashedLinkedList<int> list2 = new HashedLinkedList<int>();

-

-        Assert.IsTrue(list.ContainsAll(list2));

-        list2.Add(4);

-        Assert.IsFalse(list.ContainsAll(list2));

-        list.Add(4);

-        Assert.IsTrue(list.ContainsAll(list2));

-        list.Add(5);

-        Assert.IsTrue(list.ContainsAll(list2));

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        HashedLinkedList<int> list2 = new HashedLinkedList<int>();

-

-        list.Add(4); list.Add(5); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(5); list2.Add(5); list2.Add(6);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 6));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list));

-      }

-

-

-      [Test]

-      public void RemoveAll()

-      {

-        HashedLinkedList<int> list2 = new HashedLinkedList<int>();

-

-        list.Add(4); list.Add(5); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 6));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(6); list2.Add(5);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        list.Add(4); list.Add(5); list.Add(6);

-        Assert.IsFalse(list.Remove(2));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(list.Remove(4));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 6));

-        Assert.AreEqual(6, list.RemoveLast());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5));

-        list.Add(7);

-        Assert.AreEqual(5, list.RemoveFirst());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 7));

-      }

-

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(7); list.Add(6);

-        list.Clear();

-        Assert.IsTrue(list.IsEmpty);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-

-

-  namespace IIndexed

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-      }

-

-

-      [Test]

-      public void IndexOf()

-      {

-        Assert.AreEqual(~0, dit.IndexOf(6));

-        dit.Add(7);

-        Assert.AreEqual(~1, dit.IndexOf(6));

-        Assert.AreEqual(~1, dit.LastIndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        dit.Add(5); dit.Add(7); dit.Add(8); dit.Add(7);

-        Assert.AreEqual(~3, dit.IndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        Assert.AreEqual(0, dit.LastIndexOf(7));

-        Assert.AreEqual(2, dit.IndexOf(8));

-        Assert.AreEqual(1, dit.LastIndexOf(5));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Removing

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-      }

-

-

-      [Test]

-      public void RemoveAt()

-      {

-        dit.Add(5); dit.Add(7); dit.Add(9); dit.Add(1); dit.Add(2);

-        Assert.AreEqual(7, dit.RemoveAt(1));

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

-        Assert.AreEqual(5, dit.RemoveAt(0));

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1, 2));

-        Assert.AreEqual(2, dit.RemoveAt(2));

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad0()

-      {

-        dit.RemoveAt(0);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBadM1()

-      {

-        dit.RemoveAt(-1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad1()

-      {

-        dit.Add(8);

-        dit.RemoveAt(1);

-      }

-

-

-      [Test]

-      public void RemoveInterval()

-      {

-        dit.RemoveInterval(0, 0);

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(3, 0);

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

-        dit.RemoveInterval(3, 1);

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

-        dit.RemoveInterval(1, 3);

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 60));

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit));

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

-        dit.RemoveInterval(2, 2);

-        Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-  }

-

-

-

-

-  namespace IList_

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedLinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void FirstBad()

-      {

-        int f = lst.First;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void LastBad()

-      {

-        int f = lst.Last;

-      }

-

-

-      [Test]

-      public void FirstLast()

-      {

-        lst.Add(19);

-        Assert.AreEqual(19, lst.First);

-        Assert.AreEqual(19, lst.Last);

-        lst.Add(34); lst.InsertFirst(12);

-        Assert.AreEqual(12, lst.First);

-        Assert.AreEqual(34, lst.Last);

-      }

-

-

-      [Test]

-      public void This()

-      {

-        lst.Add(34);

-        Assert.AreEqual(34, lst[0]);

-        lst[0] = 56;

-        Assert.AreEqual(56, lst.First);

-        lst.Add(7); lst.Add(77); lst.Add(777); lst.Add(7777);

-        lst[0] = 45; lst[2] = 78; lst[4] = 101;

-        Assert.IsTrue(IC.eq(lst, 45, 7, 78, 777, 101));

-      }

-

-      [Test]

-      public void ThisWithUpdates()

-      {

-        HashedLinkedList<KeyValuePair<int, int>> pairlist = new HashedLinkedList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        pairlist.Add(new KeyValuePair<int, int>(10, 50));

-        pairlist.Add(new KeyValuePair<int, int>(11, 51));

-        pairlist.Add(new KeyValuePair<int, int>(12, 52));

-        pairlist.Add(new KeyValuePair<int, int>(13, 53));

-        pairlist[2] = new KeyValuePair<int, int>(12, 102);

-        Assert.IsTrue(pairlist.Check());

-        Assert.AreEqual(new KeyValuePair<int, int>(12, 102), pairlist[2]);

-        pairlist[2] = new KeyValuePair<int, int>(22, 202);

-        Assert.IsTrue(pairlist.Check());

-        Assert.AreEqual(new KeyValuePair<int, int>(22, 202), pairlist[2]);

-        pairlist[1] = new KeyValuePair<int, int>(12, 303);

-        Assert.IsTrue(pairlist.Check());

-        Assert.AreEqual(new KeyValuePair<int, int>(12, 303), pairlist[1]);

-        Assert.AreEqual(new KeyValuePair<int, int>(22, 202), pairlist[2]);

-      }

-

-      [Test]

-      [ExpectedException(typeof(ArgumentException))]

-      public void ThisWithUpdatesBad()

-      {

-        HashedLinkedList<KeyValuePair<int, int>> pairlist = new HashedLinkedList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        pairlist.Add(new KeyValuePair<int, int>(10, 50));

-        pairlist.Add(new KeyValuePair<int, int>(11, 51));

-        pairlist.Add(new KeyValuePair<int, int>(12, 52));

-        pairlist.Add(new KeyValuePair<int, int>(13, 53));

-        pairlist[2] = new KeyValuePair<int, int>(11, 102);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptyGet()

-      {

-        int f = lst[0];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowGet()

-      {

-        lst.Add(7);

-

-        int f = lst[-1];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiGet()

-      {

-        lst.Add(6);

-

-        int f = lst[1];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptySet()

-      {

-        lst[0] = 4;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowSet()

-      {

-        lst.Add(7);

-        lst[-1] = 9;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiSet()

-      {

-        lst.Add(6);

-        lst[1] = 11;

-      }

-    }

-

-

-    [TestFixture]

-    public class Combined

-    {

-      private IList<KeyValuePair<int, int>> lst;

-

-

-      [SetUp]

-      public void Init()

-      {

-        lst = new HashedLinkedList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        for (int i = 0; i < 10; i++)

-          lst.Add(new KeyValuePair<int, int>(i, i + 30));

-      }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Find()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Find(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Find(ref p));

-      }

-

-

-      [Test]

-      public void FindOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.FindOrAdd(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.FindOrAdd(ref p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void Update()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Update(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Update(p));

-      }

-

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.UpdateOrAdd(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.UpdateOrAdd(p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void RemoveWithReturn()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Remove(p, out p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        Assert.AreEqual(4, lst[3].Key);

-        Assert.AreEqual(34, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Remove(p, out p));

-      }

-    }

-

-

-    [TestFixture]

-    public class Inserting

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedLinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Insert()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 4);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5));

-        lst.Insert(3, 2);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

-      }

-

-      [Test]

-      [ExpectedException(typeof(DuplicateNotAllowedException))]

-      public void InsertDuplicate()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 5);

-      }

-

-      [Test]

-      public void InsertAllDuplicate1()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        try

-        {

-          lst.InsertAll<int>(1, new int[] { 1, 2, 3, 4 });

-        }

-        catch (DuplicateNotAllowedException)

-        {

-        }

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 1, 2, 3));

-      }

-

-      [Test]

-      public void InsertAllDuplicate2()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        try

-        {

-          lst.InsertAll<int>(1, new int[] { 5, 6, 5, 8 });

-        }

-        catch (DuplicateNotAllowedException)

-        {

-        }

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 5, 6, 3));

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertLow()

-      {

-        lst.Add(7);

-        lst.Insert(-1, 9);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertHi()

-      {

-        lst.Add(6);

-        lst.Insert(2, 11);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        for (int i = 0; i < 7; i++)

-          lst.Add(2 * i);

-

-        Assert.IsTrue(lst.FIFO);

-        Assert.AreEqual(0, lst.Remove());

-        Assert.AreEqual(2, lst.Remove());

-        lst.FIFO = false;

-        Assert.AreEqual(12, lst.Remove());

-        Assert.AreEqual(10, lst.Remove());

-        lst.FIFO = true;

-        Assert.AreEqual(4, lst.Remove());

-        Assert.AreEqual(6, lst.Remove());

-      }

-

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        lst.InsertFirst(4);

-        lst.InsertLast(5);

-        lst.InsertFirst(14);

-        lst.InsertLast(15);

-        lst.InsertFirst(24);

-        lst.InsertLast(25);

-        lst.InsertFirst(34);

-        lst.InsertLast(55);

-        Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

-      }

-

-

-      [Test]

-      public void InsertFirst()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        lst.Add(5);

-        lst.ViewOf(2).InsertFirst(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 3, 4, 5));

-        lst.ViewOf(3).InsertFirst(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 5));

-        lst.ViewOf(5).InsertFirst(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 9, 5));

-      }

-

-

-      [Test]

-      public void BadViewOf()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        Assert.IsNull(lst.ViewOf(4));

-      }

-

-

-      [Test]

-      public void InsertAfter()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        lst.Add(5);

-        lst.LastViewOf(2).InsertLast(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 7, 3, 4, 5));

-        lst.LastViewOf(1).InsertLast(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5));

-        lst.LastViewOf(5).InsertLast(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5, 9));

-      }

-

-

-      [Test]

-      public void BadInsertAfter()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(6);

-        lst.Add(5);

-        Assert.IsNull(lst.ViewOf(4));

-      }

-

-

-      [Test]

-      public void InsertAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-

-        IList<int> lst2 = new HashedLinkedList<int>();

-

-        lst2.Add(7); lst2.Add(8); lst2.Add(9);

-        lst.InsertAll(0, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

-        lst.RemoveAll(lst2);

-        lst.InsertAll(4, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 3, 4, 7, 8, 9));

-        lst.RemoveAll(lst2);

-        lst.InsertAll(2, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 7, 8, 9, 3, 4));

-      }

-

-      [Test]

-      [ExpectedException(typeof(DuplicateNotAllowedException))]

-      public void InsertAllBad()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-

-        IList<int> lst2 = new HashedLinkedList<int>();

-

-        lst2.Add(5); lst2.Add(2); lst2.Add(9);

-        lst.InsertAll(0, lst2);

-      }

-

-

-      [Test]

-      public void Map()

-      {

-        Fun<int, string> m = delegate(int i) { return "<<" + i + ">>"; };

-        IList<string> r = lst.Map(m);

-

-        Assert.IsTrue(((HashedLinkedList<string>)r).Check());

-        Assert.IsTrue(r.IsEmpty);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        r = lst.Map(m);

-        Assert.IsTrue(((HashedLinkedList<string>)r).Check());

-        Assert.AreEqual(4, r.Count);

-        for (int i = 0; i < 4; i++)

-          Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

-      }

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapper()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapperView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAllView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemove() { lst.Remove(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveFirst() { lst.RemoveFirst(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveLast() { lst.RemoveLast(); }

-

-

-      [Test]

-      public void RemoveFirstLast()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        Assert.AreEqual(1, lst.RemoveFirst());

-        Assert.AreEqual(4, lst.RemoveLast());

-        Assert.AreEqual(2, lst.RemoveFirst());

-        Assert.AreEqual(3, lst.RemoveLast());

-        Assert.IsTrue(lst.IsEmpty);

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(0, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 0).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-        lst.View(5, 1).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void BadReverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.View(8, 3).Reverse();

-      }

-    }

-

-

-

-    [TestFixture]

-    public class SortingTest

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedLinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Sort()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(55); lst.Add(7); lst.Add(3);

-        Assert.IsFalse(lst.IsSorted(new IC()));

-        lst.Sort(new IC());

-        Assert.IsTrue(lst.Check(), "Check ");

-        Assert.IsTrue(lst.IsSorted());

-        Assert.IsTrue(lst.IsSorted(new IC()));

-        Assert.IsTrue(IC.eq(lst, 3, 5, 6, 7, 55));

-      }

-    }

-

-    [TestFixture]

-    public class ShuffleTests

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedLinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Shuffle()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(5); lst.Add(7); lst.Add(3);

-        for (int i = 0; i < 100; i++)

-        {

-          lst.Shuffle(new C5Random(i + 1));

-          Assert.IsTrue(lst.Check(), "Check " + i);

-          int[] lst2 = lst.ToArray();

-          Sorting.IntroSort<int>(lst2);

-          Assert.IsTrue(IC.eq(lst2, 3, 5, 6, 7), "Contents " + i);

-        }

-      }

-    }

-  }

-

-  namespace Range

-  {

-    [TestFixture]

-    public class Range

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new HashedLinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void GetRange()

-      {

-        //Assert.IsTrue(IC.eq(lst[0, 0)));

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

-        Assert.IsTrue(IC.eq(lst[3, 3], 3, 4, 5));

-        Assert.IsTrue(IC.eq(lst[6, 3], 6, 7, 8));

-        Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

-      }

-

-

-      [Test]

-      public void Backwards()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[0, 3].Backwards(), 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[3, 3].Backwards(), 5, 4, 3));

-        Assert.IsTrue(IC.eq(lst[6, 4].Backwards(), 9, 8, 7, 6));

-      }

-

-

-      [Test]

-      public void DirectionAndCount()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

-        Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 7].Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 7].Backwards().Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

-        Assert.AreEqual(4, lst[3, 4].Count);

-        Assert.AreEqual(4, lst[3, 4].Backwards().Count);

-        Assert.AreEqual(10, lst.Backwards().Count);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        foreach (int i in lst)

-        {

-          lst.Add(45 + i);

-        }

-      }

-    }

-  }

-

-

-

-

-  namespace View

-  {

-    [TestFixture]

-    public class Simple

-    {

-      HashedLinkedList<int> list;

-      HashedLinkedList<int> view;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedLinkedList<int>();

-        list.Add(0); list.Add(1); list.Add(2); list.Add(3);

-        view = (HashedLinkedList<int>)list.View(1, 2);

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        view = null;

-      }

-

-

-      void check()

-      {

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(view.Check());

-      }

-

-      [Test]

-      public void InsertPointer()

-      {

-        IList<int> view2 = list.View(2, 0);

-        list.Insert(view2, 7);

-        check();

-        list.Insert(list, 8);

-        check();

-        view.Insert(view2, 9);

-        check();

-        view.Insert(list.View(3, 2), 10);

-        check();

-        view.Insert(list.ViewOf(0), 11);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 11, 1, 9, 7, 2, 10, 3, 8));

-        Assert.IsTrue(IC.eq(view, 11, 1, 9, 7, 2, 10));

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad1()

-      {

-        view.Insert(list.View(0, 0), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad2()

-      {

-        view.Insert(list, 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad3()

-      {

-        list.Insert(new ArrayList<int>(), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad4()

-      {

-        list.Insert(new ArrayList<int>().View(0, 0), 7);

-      }

-

-      [Test]

-      public void Span()

-      {

-        IList<int> span = list.View(1, 0).Span(list.View(2, 0));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(1, span.Offset);

-        Assert.AreEqual(1, span.Count);

-        span = list.View(0, 2).Span(list.View(2, 2));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(0, span.Offset);

-        Assert.AreEqual(4, span.Count);

-        span = list.View(3, 1).Span(list.View(1, 1));

-        Assert.IsNull(span);

-      }

-

-      [Test]

-      public void ViewOf()

-      {

-        for (int i = 0; i < 4; i++)

-          list.Add(i);

-        IList<int> v = view.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.LastViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-      }

-

-      [Test]

-      public void BadViewOf()

-      {

-        Assert.IsNull(view.ViewOf(5));

-        Assert.IsNull(view.LastViewOf(5));

-        Assert.IsNull(view.ViewOf(3));

-        Assert.IsNull(view.LastViewOf(3));

-        Assert.IsNull(view.ViewOf(0));

-        Assert.IsNull(view.LastViewOf(0));

-      }

-

-

-      [Test]

-      public void ArrayStuff()

-      {

-        Assert.IsTrue(IC.eq(view.ToArray(), 1, 2));

-        int[] extarray = new int[5];

-        view.CopyTo(extarray, 2);

-        Assert.IsTrue(IC.eq(extarray, 0, 0, 1, 2, 0));

-      }

-

-      [Test]

-      public void Add()

-      {

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2));

-        view.InsertFirst(10);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 10, 1, 2));

-        view.Clear();

-        Assert.IsFalse(view.IsReadOnly);

-        Assert.IsFalse(view.AllowsDuplicates);

-        Assert.IsTrue(view.IsEmpty);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 3));

-        Assert.IsTrue(IC.eq(view));

-        view.Add(8);

-        Assert.IsFalse(view.IsEmpty);

-        Assert.IsFalse(view.AllowsDuplicates);

-        Assert.IsFalse(view.IsReadOnly);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 3));

-        Assert.IsTrue(IC.eq(view, 8));

-        view.Add(12);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12));

-        view./*ViewOf(12).*/InsertLast(15);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12, 15));

-        view.ViewOf(12).InsertFirst(18);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

-

-        HashedLinkedList<int> lst2 = new HashedLinkedList<int>();

-

-        lst2.Add(90); lst2.Add(92);

-        view.AddAll(lst2);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

-        view.InsertLast(66);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

-      }

-

-

-      [Test]

-      public void Bxxx()

-      {

-        Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

-        Assert.AreSame(list, view.Underlying);

-        Assert.IsNull(list.Underlying);

-        Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

-        Assert.AreEqual(0, list.Offset);

-        Assert.AreEqual(1, view.Offset);

-      }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsTrue(view.Contains(1));

-        Assert.IsFalse(view.Contains(0));

-

-        HashedLinkedList<int> lst2 = new HashedLinkedList<int>();

-

-        lst2.Add(2);

-        Assert.IsTrue(view.ContainsAll(lst2));

-        lst2.Add(3);

-        Assert.IsFalse(view.ContainsAll(lst2));

-        Assert.AreEqual(Speed.Constant, view.ContainsSpeed);

-        Assert.AreEqual(2, view.Count);

-        view.Add(1);

-        Assert.AreEqual(1, view.ContainsCount(2));

-        Assert.AreEqual(1, view.ContainsCount(1));

-        Assert.AreEqual(2, view.Count);

-      }

-

-

-      [Test]

-      public void CreateView()

-      {

-        HashedLinkedList<int> view2 = (HashedLinkedList<int>)view.View(1, 0);

-

-        Assert.AreSame(list, view2.Underlying);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        Assert.IsTrue(view.FIFO);

-        view.Add(23); view.Add(24); view.Add(25);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

-        Assert.AreEqual(1, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

-        view.FIFO = false;

-        Assert.IsFalse(view.FIFO);

-        Assert.AreEqual(25, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24));

-      }

-

-

-      [Test]

-      public void MapEtc()

-      {

-        HashedLinkedList<double> dbl = (HashedLinkedList<double>)view.Map(new Fun<int, double>(delegate(int i) { return i / 10.0; }));

-

-        Assert.IsTrue(dbl.Check());

-        Assert.AreEqual(0.1, dbl[0]);

-        Assert.AreEqual(0.2, dbl[1]);

-        for (int i = 0; i < 10; i++) view.Add(i);

-

-        HashedLinkedList<int> list2 = (HashedLinkedList<int>)view.FindAll(new Fun<int, bool>(delegate(int i) { return i % 4 == 1; }));

-

-        Assert.IsTrue(list2.Check());

-        Assert.IsTrue(IC.eq(list2, 1, 5, 9));

-      }

-

-

-      [Test]

-      public void FL()

-      {

-        Assert.AreEqual(1, view.First);

-        Assert.AreEqual(2, view.Last);

-      }

-

-

-      [Test]

-      public void Indexing()

-      {

-        list.Clear();

-        for (int i = 0; i < 20; i++) list.Add(i);

-

-        view = (HashedLinkedList<int>)list.View(5, 7);

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

-      }

-

-

-      [Test]

-      public void Insert()

-      {

-        view.Insert(0, 34);

-        view.Insert(1, 35);

-        view.Insert(4, 36);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

-

-        IList<int> list2 = new HashedLinkedList<int>();

-

-        list2.Add(40); list2.Add(41);

-        view.InsertAll(3, list2);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 40, 41, 2, 36));

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        view.Add(45); view.Add(47); view.Add(46); view.Add(48);

-        Assert.IsFalse(view.IsSorted(new IC()));

-        view.Sort(new IC());

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 5));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        Assert.IsFalse(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        Assert.IsFalse(view.Remove(0));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        view.RemoveAllCopies(3);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5));

-        Assert.IsTrue(IC.eq(list, 0, 2, 5, 3));

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 2, 5, 1));

-

-        HashedLinkedList<int> l2 = new HashedLinkedList<int>();

-

-        l2.Add(1); l2.Add(2); l2.Add(2); l2.Add(3); l2.Add(1);

-        view.RemoveAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view, 5));

-        view.RetainAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(2); view.Add(4); view.Add(5);

-        Assert.AreEqual(2, view.RemoveAt(0));

-        Assert.AreEqual(5, view.RemoveAt(1));

-        Assert.AreEqual(4, view.RemoveAt(0));

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(8); view.Add(6); view.Add(78);

-        Assert.AreEqual(8, view.RemoveFirst());

-        Assert.AreEqual(78, view.RemoveLast());

-        view.Add(2); view.Add(5); view.Add(3); view.Add(1);

-        view.RemoveInterval(1, 2);

-        check();

-        Assert.IsTrue(IC.eq(view, 6, 1));

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        view.Clear();

-        for (int i = 0; i < 10; i++) view.Add(10 + i);

-

-        view.View(3, 4).Reverse();

-        check();

-        Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

-        view.Reverse();

-        Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

-        Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

-      }

-

-

-      [Test]

-      public void Slide()

-      {

-        view.Slide(1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 3));

-        view.Slide(-2);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1));

-        view.Slide(0, 3);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1, 2));

-        view.Slide(2, 1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2));

-        view.Slide(-1, 0);

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(28);

-        Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

-      }

-      [Test]

-      public void Iterate()

-      {

-        list.Clear();

-        check();

-        view = null;

-        foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 10, 11 }) list.Add(i);

-

-        view = (HashedLinkedList<int>)list.View(list.Count - 2, 2);

-        int j = 666;

-        while (true)

-        {

-          check();

-          //Console.WriteLine("View: {0}:  {1} --> {2}", view.Count, view.First, view.Last);

-          if ((view.Last - view.First) % 2 == 1)

-            view.Insert(1, j++);

-          check();

-          if (view.Offset == 0)

-            break;

-          else

-            view.Slide(-1, 2);

-        }

-        //foreach (int cell in list) Console.Write(" " + cell);

-        //Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 2, 4, 8, 668, 13, 6, 1, 667, 10, 666, 11));

-      }

-

-

-      [Test]

-      public void SyncRoot()

-      {

-        Assert.AreSame(view.SyncRoot, list.SyncRoot);

-      }

-    }

-    [TestFixture]

-    public class MulipleViews

-    {

-      IList<int> list;

-      IList<int>[][] views;

-      [SetUp]

-      public void Init()

-      {

-        list = new HashedLinkedList<int>();

-        for (int i = 0; i < 6; i++)

-          list.Add(i);

-        views = new IList<int>[7][];

-        for (int i = 0; i < 7; i++)

-        {

-          views[i] = new IList<int>[7 - i];

-          for (int j = 0; j < 7 - i; j++)

-            views[i][j] = list.View(i, j);

-        }

-      }

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        views = null;

-      }

-      [Test]

-      public void Insert()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(3, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAt()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(3);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 3 && i + j > 3 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveInterval(3, 2);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i <= 5 ? 3 : i - 2, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j == 0 ? 0 : i <= 3 && i + j > 4 ? j - 2 : i > 4 || i + j <= 3 ? j : j - 1, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void InsertAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.InsertLast(777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(5);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 5 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 5 && i + j > 5 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void InsertAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(0, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 && j == 0 ? 0 : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(0);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i == 0 && j > 0 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void Clear()

-      {

-        Assert.IsTrue(list.Check(), "list check before clear");

-        //for (int i = 0; i < 7; i++)

-        //for (int j = 0; j < 7 - i; j++)

-        //Console.WriteLine("// view[{0}][{1}] : {2}", i, j, ((HashedLinkedList<int>) views[i][j]).GetHashCode());

-        views[2][3].Clear();

-        Assert.IsTrue(list.Check(), "list check after clear");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 2 ? i : i < 6 ? 2 : i - 3, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(s(i, j), views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      private int s(int i, int j)

-      {

-        if (j == 0) return 0;

-        int k = i + j - 1; //end

-        if (i > 4 || k <= 1) return j;

-        if (i >= 2) return k > 4 ? k - 4 : 0;

-        if (i <= 2) return k >= 4 ? j - 3 : 2 - i;

-        return -1;

-      }

-      [Test]

-      public void InsertAll()

-      {

-        IList<int> list2 = new HashedLinkedList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before insertAll");

-        list.InsertAll(3, list2);

-        Assert.IsTrue(list.Check(), "list check after insertAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        IList<int> list2 = new HashedLinkedList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before AddAll");

-        list.View(1, 2).AddAll(list2);

-        Assert.IsTrue(list.Check(), "list check after AddAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void Remove()

-      {

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new HashedLinkedList<int>();

-            for (int k = 0; k < 6; k++) list.Add(k);

-            HashedLinkedList<int> v = (HashedLinkedList<int>)list.View(i, j);

-            list.Remove(3);

-            Assert.IsTrue(list.Check(), "list check after Remove, i=" + i + ", j=" + j);

-          }

-        }

-      }

-      [Test]

-      public void RemoveAll1()

-      {

-        IList<int> list2 = new HashedLinkedList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new HashedLinkedList<int>();

-            for (int k = 0; k < 6; k++) list.Add(k);

-            HashedLinkedList<int> v = (HashedLinkedList<int>)list.View(i, j);

-            list.RemoveAll(list2);

-            Assert.IsTrue(list.Check(), "list check after RemoveAll, i=" + i + ", j=" + j);

-          }

-        }

-      }

-      [Test]

-      public void RemoveAll2()

-      {

-        IList<int> list2 = new HashedLinkedList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-        Assert.IsTrue(list.Check(), "list check before RemoveAll");

-        list.RemoveAll(list2);

-

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(1, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(1, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(1, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(1, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(1, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(1, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(1, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(1, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(1, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(1, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(1, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(2, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(2, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(2, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(2, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(2, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(2, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(2, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(1, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(1, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(2, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(2, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(1, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(2, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(1, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(2, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(0, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(1, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(0, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(1, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-        Assert.IsTrue(list.Check(), "list check after RemoveAll");

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        IList<int> list2 = new HashedLinkedList<int>();

-        list2.Add(2); list2.Add(4); list2.Add(5);

-        Assert.IsTrue(list.Check(), "list check before RetainAll");

-        list.RetainAll(list2);

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(0, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(0, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(0, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(0, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(0, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(0, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(0, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(0, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(0, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(0, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(0, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(1, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(1, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(1, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(1, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(1, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(1, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(1, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(0, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(0, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(1, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(1, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(2, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(3, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(2, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(3, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(1, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(2, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(1, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(2, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-

-        Assert.IsTrue(list.Check(), "list check after RetainAll");

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        IList<int> list2 = new HashedLinkedList<int>();

-        list2.Add(0); list2.Add(2); list2.Add(82); list2.Add(92); list2.Add(5); list2.Add(2); list2.Add(1);

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new HashedLinkedList<int>();

-            list.AddAll(list2);

-            HashedLinkedList<int> v = (HashedLinkedList<int>)list.View(i, j);

-            list.RemoveAllCopies(2);

-            Assert.IsTrue(list.Check(), "list check after RemoveAllCopies, i=" + i + ", j=" + j);

-          }

-        }

-      }

-

-      private void checkDisposed(bool reverse, int start, int count)

-      {

-        int k = 0;

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            if (i + j <= start || i >= start + count || (i <= start && i + j >= start + count) || (reverse && start <= i && start + count >= i + j))

-            {

-              try

-              {

-                k = views[i][j].Count;

-              }

-              catch (ViewDisposedException)

-              {

-                Assert.Fail("view[" + i + "][" + j + "] threw");

-              }

-              Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] size");

-              if (reverse && ((j > 0 && start <= i && start + count >= i + j) || (j == 0 && start < i && start + count > i)))

-                Assert.AreEqual(start + (start + count - i - j), views[i][j].Offset, "view[" + i + "][" + j + "] offset (mirrored)");

-              else

-                Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            }

-            else

-            {

-              try

-              {

-                k = views[i][j].Count;

-                Assert.Fail("view[" + i + "][" + j + "] no throw");

-              }

-              catch (ViewDisposedException) { }

+	namespace Enumerable

+	{

+		[TestFixture]

+		public class Multiops

+		{

+			private HashedLinkedList<int> list;

+

+			private Filter<int> always, never, even;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedLinkedList<int>();

+				always = delegate{return true;};

+				never = delegate{return false;};

+				even = delegate(int i){return i%2==0;};

+			}

+

+

+			[Test]

+			public void All()

+			{

+				Assert.IsTrue(list.All(always));

+				Assert.IsTrue(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(8);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(5);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsFalse(list.All(even));

+			}

+

+

+			[Test]

+			public void Exists()

+			{

+				Assert.IsFalse(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(5);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(8);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsTrue(list.Exists(even));

+			}

+

+

+			[Test]

+			public void Apply()

+			{

+				int sum = 0;

+				Applier<int> a = delegate(int i){sum=i+10*sum;};

+

+				list.Apply(a);

+				Assert.AreEqual(0, sum);

+				sum = 0;

+				list.Add(5);list.Add(8);list.Add(7);list.Add(5);

+				list.Apply(a);

+				Assert.AreEqual(587, sum);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+

+

+

+		[TestFixture]

+		public class GetEnumerator

+		{

+			private HashedLinkedList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new HashedLinkedList<int>(); }

+

+

+			[Test]

+			public void Empty()

+			{

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+				list.Add(5);

+				list.Add(10);

+				list.Add(1);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(8, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(10, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(1, e.Current);

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void DoDispose()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				e.MoveNext();

+				e.Dispose();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				e.MoveNext();

+				list.Add(99);

+				e.MoveNext();

+			}

+

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

+

+

+

+

+	namespace CollectionOrSink

+	{

+		[TestFixture]

+		public class CollectionOrSink

+		{

+			private HashedLinkedList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new HashedLinkedList<int>(); }

+

+

+			[Test]

+			public void CountEtAl()

+			{

+				Assert.AreEqual(0, list.Count);

+				Assert.IsTrue(list.IsEmpty);

+				Assert.IsFalse(list.AllowsDuplicates);

+				Assert.IsTrue(list.Add(5));

+				Assert.AreEqual(1, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				Assert.IsFalse(list.Add(5));

+				Assert.AreEqual(1, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				Assert.IsTrue(list.Add(8));

+				Assert.AreEqual(2, list.Count);

+			}

+

+

+			[Test]

+			public void AddAll()

+			{

+				list.Add(3);list.Add(4);list.Add(5);

+

+				HashedLinkedList<int> list2 = new HashedLinkedList<int>();

+

+				list2.AddAll(list);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				list.AddAll(list2);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				Assert.IsTrue(IC.eq(list, 3, 4, 5));

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+

+

+

+		[TestFixture]

+		public class ArrayTest

+		{

+			private HashedLinkedList<int> list;

+

+			int[] a;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedLinkedList<int>();

+				a = new int[10];

+				for (int i = 0; i < 10; i++)

+					a[i] = 1000 + i;

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+

+

+			private string aeq(int[] a, params int[] b)

+			{

+				if (a.Length != b.Length)

+					return "Lengths differ: " + a.Length + " != " + b.Length;

+

+				for (int i = 0; i < a.Length; i++)

+					if (a[i] != b[i])

+						return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

+

+				return "Alles klar";

+			}

+

+

+			[Test]

+			public void ToArray()

+			{

+				Assert.AreEqual("Alles klar", aeq(list.ToArray()));

+				list.Add(7);

+				list.Add(8);

+				Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 8));

+			}

+

+

+			[Test]

+			public void CopyTo()

+			{

+				list.CopyTo(a, 1);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(6);

+				list.CopyTo(a, 2);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(4);

+				list.Add(5);

+				list.Add(9);

+				list.CopyTo(a, 4);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 1009));

+				list.Clear();

+				list.Add(7);

+				list.CopyTo(a, 9);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 5, 9, 1008, 7));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToBad()

+			{

+				list.Add(3);

+				list.CopyTo(a, 10);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void CopyToBad2()

+			{

+				list.CopyTo(a, -1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToTooFar()

+			{

+				list.Add(3);

+				list.Add(4);

+				list.CopyTo(a, 9);

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Sync

+		{

+			private HashedLinkedList<int> list;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedLinkedList<int>();

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+

+

+			[Test]

+			public void Get()

+			{

+				Assert.IsNotNull(list.SyncRoot);

+			}

+		}

+	}

+

+

+

+

+	namespace EditableCollection

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private HashedLinkedList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new HashedLinkedList<int>(); }

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsFalse(list.Contains(5));

+				list.Add(5);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				list.Add(8);

+				list.Add(10);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsTrue(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+				list.Remove(8);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsFalse(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+			}

+

+			[Test]

+			public void BadAdd()

+			{

+				Assert.IsTrue(list.Add(5));

+				Assert.IsTrue(list.Add(8));

+				Assert.IsFalse(list.Add(5));

+			}

+

+

+			[Test]

+			public void ContainsCount()

+			{

+				Assert.AreEqual(0, list.ContainsCount(5));

+				list.Add(5);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				list.Add(8);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				Assert.AreEqual(1, list.ContainsCount(8));

+			}

+

+

+			[Test]

+			public void RemoveAllCopies()

+			{

+				list.Add(5);list.Add(7);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.RemoveAllCopies(5);

+				Assert.IsTrue(list.Check());

+				Assert.AreEqual(0, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.Add(5);list.Add(8);

+				list.RemoveAllCopies(8);

+				Assert.IsTrue(IC.eq(list, 7, 5));

+			}

+

+			[Test]

+			public void FindAll()

+			{

+				Filter<int> f = delegate(int i){return i%2==0;};

+

+				Assert.IsTrue(list.FindAll(f).IsEmpty);

+				list.Add(5);list.Add(8);list.Add(10);

+				Assert.IsTrue(((LinkedList<int>)list.FindAll(f)).Check());

+				Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10));

+			}

+

+			[Test]

+			public void ContainsAll()

+			{

+				HashedLinkedList<int> list2 = new HashedLinkedList<int>();

+

+				Assert.IsTrue(list.ContainsAll(list2));

+				list2.Add(4);

+				Assert.IsFalse(list.ContainsAll(list2));

+				list.Add(4);

+				Assert.IsTrue(list.ContainsAll(list2));

+				list.Add(5);

+				Assert.IsTrue(list.ContainsAll(list2));

+			}

+

+

+			[Test]

+			public void RetainAll()

+			{

+				HashedLinkedList<int> list2 = new HashedLinkedList<int>();

+

+				list.Add(4);list.Add(5);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 5));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(5);list2.Add(5);list2.Add(6);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 6));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list));

+			}

+

+

+			[Test]

+			public void RemoveAll()

+			{

+				HashedLinkedList<int> list2 = new HashedLinkedList<int>();

+

+				list.Add(4);list.Add(5);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 6));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(6);list2.Add(5);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4));

+			}

+

+			[Test]

+			public void Remove()

+			{

+				list.Add(4);list.Add(5);list.Add(6);

+				Assert.IsFalse(list.Remove(2));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(list.Remove(4));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 6));

+				Assert.AreEqual(6, list.RemoveLast());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5));

+				list.Add(7);

+				Assert.AreEqual(5, list.RemoveFirst());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 7));

+			}

+

+

+			[Test]

+			public void Clear()

+			{

+				list.Add(7);list.Add(6);

+				list.Clear();

+				Assert.IsTrue(list.IsEmpty);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

+

+

+

+

+	namespace IIndexed

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+			}

+

+

+			[Test]

+			public void IndexOf()

+			{

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(-1, dit.LastIndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				dit.Add(5);dit.Add(7);dit.Add(8);dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				Assert.AreEqual(0, dit.LastIndexOf(7));

+				Assert.AreEqual(2, dit.IndexOf(8));

+				Assert.AreEqual(1, dit.LastIndexOf(5));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Removing

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+			}

+

+

+			[Test]

+			public void RemoveAt()

+			{

+				dit.Add(5);dit.Add(7);dit.Add(9);dit.Add(1);dit.Add(2);

+				Assert.AreEqual(7, dit.RemoveAt(1));

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

+				Assert.AreEqual(5, dit.RemoveAt(0));

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1, 2));

+				Assert.AreEqual(2, dit.RemoveAt(2));

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad0()

+			{

+				dit.RemoveAt(0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBadM1()

+			{

+				dit.RemoveAt(-1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad1()

+			{

+				dit.Add(8);

+				dit.RemoveAt(1);

+			}

+

+

+			[Test]

+			public void RemoveInterval()

+			{

+				dit.RemoveInterval(0, 0);

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(3, 0);

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

+				dit.RemoveInterval(3, 1);

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

+				dit.RemoveInterval(1, 3);

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 60));

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit));

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

+				dit.RemoveInterval(2, 2);

+				Assert.IsTrue(((HashedLinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+	}

+

+

+

+

+	namespace IList

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedLinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void FirstBad()

+			{

+				int f = lst.First;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void LastBad()

+			{

+				int f = lst.Last;

+			}

+

+

+			[Test]

+			public void FirstLast()

+			{

+				lst.Add(19);

+				Assert.AreEqual(19, lst.First);

+				Assert.AreEqual(19, lst.Last);

+				lst.Add(34);lst.InsertFirst(12);

+				Assert.AreEqual(12, lst.First);

+				Assert.AreEqual(34, lst.Last);

+			}

+

+

+			[Test]

+			public void This()

+			{

+				lst.Add(34);

+				Assert.AreEqual(34, lst[0]);

+				lst[0] = 56;

+				Assert.AreEqual(56, lst.First);

+				lst.Add(7);lst.Add(77);lst.Add(777);lst.Add(7777);

+				lst[0] = 45;lst[2] = 78;lst[4] = 101;

+				Assert.IsTrue(IC.eq(lst, 45, 7, 78, 777, 101));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptyGet()

+			{

+				int f = lst[0];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowGet()

+			{

+				lst.Add(7);

+

+				int f = lst[-1];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiGet()

+			{

+				lst.Add(6);

+

+				int f = lst[1];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptySet()

+			{

+				lst[0] = 4;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowSet()

+			{

+				lst.Add(7);

+				lst[-1] = 9;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiSet()

+			{

+				lst.Add(6);

+				lst[1] = 11;

+			}

+		}

+

+

+		[TestFixture]

+		public class Combined

+		{

+			private IList<KeyValuePair<int,int>> lst;

+

+

+			[SetUp]

+			public void Init()

+			{

+				lst = new HashedLinkedList<KeyValuePair<int,int>>();

+				for (int i = 0; i < 10; i++)

+					lst.Add(new KeyValuePair<int,int>(i, i + 30));

+			}

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Find()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Find(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Find(ref p));

+			}

+

+

+			[Test]

+			public void FindOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.FindOrAdd(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.FindOrAdd(ref p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void Update()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Update(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Update(p));

+			}

+

+

+			[Test]

+			public void UpdateOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.UpdateOrAdd(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.UpdateOrAdd(p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void RemoveWithReturn()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.RemoveWithReturn(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				Assert.AreEqual(4, lst[3].key);

+				Assert.AreEqual(34, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.RemoveWithReturn(ref p));

+			}

+		}

+

+		[TestFixture]

+		public class Inserting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedLinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Insert()

+			{

+				lst.Insert(0, 5);

+				Assert.IsTrue(IC.eq(lst, 5));

+				lst.Insert(0, 7);

+				Assert.IsTrue(IC.eq(lst, 7, 5));

+				lst.Insert(1, 4);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5));

+				lst.Insert(3, 2);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertLow()

+			{

+				lst.Add(7);

+				lst.Insert(-1, 9);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertHi()

+			{

+				lst.Add(6);

+				lst.Insert(2, 11);

+			}

+

+

+			[Test]

+			public void FIFO()

+			{

+				for (int i = 0; i < 7; i++)

+					lst.Add(2 * i);

+

+				Assert.IsTrue(lst.FIFO);

+				Assert.AreEqual(0, lst.Remove());

+				Assert.AreEqual(2, lst.Remove());

+				lst.FIFO = false;

+				Assert.AreEqual(12, lst.Remove());

+				Assert.AreEqual(10, lst.Remove());

+				lst.FIFO = true;

+				Assert.AreEqual(4, lst.Remove());

+				Assert.AreEqual(6, lst.Remove());

+			}

+

+

+			[Test]

+			public void InsertFirstLast()

+			{

+				lst.InsertFirst(4);

+				lst.InsertLast(5);

+				lst.InsertFirst(14);

+				lst.InsertLast(15);

+				lst.InsertFirst(24);

+				lst.InsertLast(25);

+				lst.InsertFirst(34);

+				lst.InsertLast(55);

+				Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

+			}

+

+

+			[Test]

+			public void InsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				lst.Add(5);

+				lst.InsertBefore(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 3, 4, 5));

+				lst.InsertBefore(8, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 5));

+				lst.InsertBefore(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 4, 9, 5));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertBefore(7, 4);

+			}

+

+

+			[Test]

+			public void InsertAfter()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				lst.Add(5);

+				lst.InsertAfter(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 7, 3, 4, 5));

+				lst.InsertAfter(8, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5));

+				lst.InsertAfter(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 7, 3, 4, 5, 9));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfter()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(6);

+				lst.Add(5);

+				lst.InsertAfter(7, 4);

+			}

+

+

+			[Test]

+			public void InsertAll()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+

+				IList<int> lst2 = new HashedLinkedList<int>();

+

+				lst2.Add(7);lst2.Add(8);lst2.Add(9);

+				lst.InsertAll(0, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

+				lst.RemoveAll(lst2);

+				lst.InsertAll(4, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 3, 4, 7, 8, 9));

+				lst.RemoveAll(lst2);

+				lst.InsertAll(2, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 7, 8, 9, 3, 4));

+			}

+

+

+			[Test]

+			public void Map()

+			{

+				Mapper<int,string> m = delegate(int i){return "<<"+i+">>";};

+				IList<string> r = lst.Map(m);

+

+				Assert.IsTrue(((LinkedList<string>)r).Check());

+				Assert.IsTrue(r.IsEmpty);

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				r = lst.Map(m);

+				Assert.IsTrue(((LinkedList<string>)r).Check());

+				Assert.AreEqual(4, r.Count);

+				for (int i = 0; i < 4; i++)

+					Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

+			}

+

+

+			[Test]

+			public void RemoveFirstLast()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				Assert.AreEqual(1, lst.RemoveFirst());

+				Assert.AreEqual(4, lst.RemoveLast());

+				Assert.AreEqual(2, lst.RemoveFirst());

+				Assert.AreEqual(3, lst.RemoveLast());

+				Assert.IsTrue(lst.IsEmpty);

+			}

+

+

+			[Test]

+			public void Reverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse();

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(0, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 0);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+				lst.Reverse(5, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void BadReverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse(8, 3);

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Sorting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedLinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Sort()

+			{

+				lst.Add(5);lst.Add(6);lst.Add(55);lst.Add(7);lst.Add(3);

+				Assert.IsFalse(lst.IsSorted(new IC()));

+				lst.Sort(new IC());

+				Assert.IsTrue(lst.IsSorted(new IC()));

+				Assert.IsTrue(IC.eq(lst, 3, 5, 6, 7, 55));

+			}

+		}

+	}

+

+

+

+

+	namespace Range

+	{

+		[TestFixture]

+		public class Range

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new HashedLinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void GetRange()

+			{

+				//Assert.IsTrue(IC.eq(lst[0, 0)));

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

+				Assert.IsTrue(IC.eq(lst[3, 3], 3, 4, 5));

+				Assert.IsTrue(IC.eq(lst[6, 3], 6, 7, 8));

+				Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

+			}

+

+

+			[Test]

+			public void Backwards()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[0, 3].Backwards(), 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[3, 3].Backwards(),  5, 4, 3));

+				Assert.IsTrue(IC.eq(lst[6, 4].Backwards(),  9, 8, 7, 6));

+			}

+

+

+			[Test]

+			public void DirectionAndCount()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

+				Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 7].Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 7].Backwards().Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

+				Assert.AreEqual(4, lst[3, 4].Count);

+				Assert.AreEqual(4, lst[3, 4].Backwards().Count);

+				Assert.AreEqual(10, lst.Backwards().Count);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				foreach (int i in lst)

+				{

+					lst.Add(45 + i);

+				}

+			}

+		}

+	}

+

+

+

+

+	namespace View

+	{

+		[TestFixture]

+		public class Simple

+		{

+			HashedLinkedList<int> list;

+			LinkedList<int> view;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new HashedLinkedList<int>();

+				list.Add(0);list.Add(1);list.Add(2);list.Add(3);

+				view = (LinkedList<int>)list.View(1, 2);

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				list = null;

+				view = null;

+			}

+

+

+			void check()

+			{

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(view.Check());

+			}

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfterLow()

+			{

+				view.InsertAfter(876, 0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfterHigh()

+			{

+				view.InsertAfter(876, 0);

+			}

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBeforeLow()

+			{

+				view.InsertBefore(876, 0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBeforeHigh()

+			{

+				view.InsertBefore(876, 0);

+			}

+

+

+			[Test]

+			public void Add()

+			{

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2));

+				view.InsertFirst(10);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 10, 1, 2));

+				view.Clear();

+				Assert.IsFalse(view.IsReadOnly);

+				Assert.IsFalse(view.AllowsDuplicates);

+				Assert.IsTrue(view.IsEmpty);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 3));

+				Assert.IsTrue(IC.eq(view));

+				view.Add(8);

+				Assert.IsFalse(view.IsEmpty);

+				Assert.IsFalse(view.AllowsDuplicates);

+				Assert.IsFalse(view.IsReadOnly);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 3));

+				Assert.IsTrue(IC.eq(view, 8));

+				view.Add(12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12));

+				view.InsertAfter(15, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12, 15));

+				view.InsertBefore(18, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

+

+				HashedLinkedList<int> lst2 = new HashedLinkedList<int>();

+

+				lst2.Add(90);lst2.Add(92);

+				view.AddAll(lst2);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

+				view.InsertLast(66);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

+			}

+

+

+			[Test]

+			public void Bxxx()

+			{

+				Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

+                Assert.AreSame(list, view.Underlying);

+                Assert.IsNull(list.Underlying);

+                Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

+				Assert.AreEqual(0,list.Offset);

+				Assert.AreEqual(1,view.Offset);

+			}

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsTrue(view.Contains(1));

+				Assert.IsFalse(view.Contains(0));

+

+				HashedLinkedList<int> lst2 = new HashedLinkedList<int>();

+

+				lst2.Add(2);

+				Assert.IsTrue(view.ContainsAll(lst2));

+				lst2.Add(3);

+				Assert.IsFalse(view.ContainsAll(lst2));

+				Assert.AreEqual(Speed.Constant, view.ContainsSpeed);

+				Assert.AreEqual(2, view.Count);

+				view.Add(1);

+				Assert.AreEqual(1, view.ContainsCount(2));

+				Assert.AreEqual(1, view.ContainsCount(1));

+				Assert.AreEqual(2, view.Count);

+			}

+

+

+			[Test]

+			public void CreateView()

+			{

+				LinkedList<int> view2 = (LinkedList<int>)view.View(1, 0);

+

+                Assert.AreSame(list, view2.Underlying);

             }

-          }

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Reverse");

-        list2.Reverse();

-        Assert.IsTrue(list.Check(), "list check after Reverse");

-        checkDisposed(true, start, count);

-      }

-

-      [Test]

-      public void Sort()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Sort");

-        list2.Sort();

-        Assert.IsTrue(list.Check(), "list check after Sort");

-        checkDisposed(false, start, count);

-      }

-      [Test]

-      public void Shuffle()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Shuffle");

-        list2.Shuffle();

-        Assert.IsTrue(list.Check(), "list check after Shuffle");

-        checkDisposed(false, start, count);

-      }

-

-

-    }

-

-  }

-

-  namespace HashingAndEquals

-  {

-    [TestFixture]

-    public class ISequenced

-    {

-      private ISequenced<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-        dat = new HashedLinkedList<int>();

-        dut = new HashedLinkedList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-      }

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-        Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(7), dut.GetSequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(0); dit.Add(31);

-        dat.Add(1); dat.Add(0);

-        Assert.AreEqual(dit.GetSequencedHashCode(), dat.GetSequencedHashCode());

-        Assert.IsFalse(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dat));

-        Assert.IsTrue(dat.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dut));

-        Assert.IsTrue(dut.SequencedEquals(dit));

-        dit.Add(7);

-        ((HashedLinkedList<int>)dut).InsertFirst(7);

-        Assert.IsFalse(dit.SequencedEquals(dut));

-        Assert.IsFalse(dut.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class IEditableCollection

-    {

-      private ICollection<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-        dat = new HashedLinkedList<int>();

-        dut = new HashedLinkedList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(-1657792980); dit.Add(-1570288808);

-        dat.Add(1862883298); dat.Add(-272461342);

-        Assert.AreEqual(dit.GetUnsequencedHashCode(), dat.GetUnsequencedHashCode());

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsTrue(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-        dit.Add(7);

-        dut.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelUnorderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ICollection<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-        dat = new HashedLinkedList<int>();

-        dut = new HashedLinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new HashedLinkedList<ICollection<int>>();

-        Dat = new HashedLinkedList<ICollection<int>>();

-        Dut = new HashedLinkedList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelOrderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ISequenced<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-        dat = new HashedLinkedList<int>();

-        dut = new HashedLinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new HashedLinkedList<ICollection<int>>();

-        Dat = new HashedLinkedList<ICollection<int>>();

-        Dut = new HashedLinkedList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dit); Dut.Add(dut); Dut.Add(dat);

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelUnOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-        dat = new HashedLinkedList<int>();

-        dut = new HashedLinkedList<int>();

-        dot = new HashedLinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        dot.Add(2); dot.Add(1);

-        Dit = new HashedLinkedList<ISequenced<int>>();

-        Dat = new HashedLinkedList<ISequenced<int>>();

-        Dut = new HashedLinkedList<ISequenced<int>>();

-        Dot = new HashedLinkedList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-        Assert.IsTrue(Dit.UnsequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new HashedLinkedList<int>();

-        dat = new HashedLinkedList<int>();

-        dut = new HashedLinkedList<int>();

-        dot = new HashedLinkedList<int>();

-        dit.Add(2); dit.Add(1); //{2,1}

-        dat.Add(1); dat.Add(2); //{1,2}

-        dut.Add(3);            //{3}

-        dot.Add(2); dot.Add(1); //{2,1}

-        Dit = new HashedLinkedList<ISequenced<int>>();

-        Dat = new HashedLinkedList<ISequenced<int>>();

-        Dut = new HashedLinkedList<ISequenced<int>>();

-        Dot = new HashedLinkedList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit); // {{2,1},{3}}

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat); // {{3},{2,1},{1,2}}

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit); // {{2,1},{3}}

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut); // {{2,1},{3}}

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

-  }

-}
\ No newline at end of file
+

+

+			[Test]

+			public void FIFO()

+			{

+				Assert.IsTrue(view.FIFO);

+				view.Add(23);view.Add(24);view.Add(25);

+				check();

+				Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

+				Assert.AreEqual(1, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

+				view.FIFO = false;

+				Assert.IsFalse(view.FIFO);

+				Assert.AreEqual(25, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24));

+			}

+

+

+			[Test]

+			public void MapEtc()

+			{

+				LinkedList<double> dbl = (LinkedList<double>)view.Map(new Mapper<int,double>(delegate(int i){return i/10.0;}));

+

+				Assert.IsTrue(dbl.Check());

+				Assert.AreEqual(0.1, dbl[0]);

+				Assert.AreEqual(0.2, dbl[1]);

+				for (int i = 0; i < 10; i++) view.Add(i);

+

+				LinkedList<int> list2 = (LinkedList<int>)view.FindAll(new Filter<int>(delegate(int i){return i%4==1;}));

+

+				Assert.IsTrue(list2.Check());

+				Assert.IsTrue(IC.eq(list2, 1, 5, 9));

+			}

+

+

+			[Test]

+			public void FL()

+			{

+				Assert.AreEqual(1, view.First);

+				Assert.AreEqual(2, view.Last);

+			}

+

+

+			[Test]

+			public void Indexing()

+			{

+				list.Clear();

+				for (int i = 0; i < 20; i++) list.Add(i);

+

+				view = (LinkedList<int>)list.View(5, 7);

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

+			}

+

+

+			[Test]

+			public void Insert()

+			{

+				view.Insert(0, 34);

+				view.Insert(1, 35);

+				view.Insert(4, 36);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

+

+				IList<int> list2 = new HashedLinkedList<int>();

+

+				list2.Add(40);list2.Add(41);

+				view.InsertAll(3, list2);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 40, 41, 2, 36));

+			}

+

+

+			[Test]

+			public void Sort()

+			{

+				view.Add(45);view.Add(47);view.Add(46);view.Add(48);

+				Assert.IsFalse(view.IsSorted(new IC()));

+				view.Sort(new IC());

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 1, 2, 5));

+				Assert.IsTrue(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				Assert.IsFalse(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				Assert.IsFalse(view.Remove(0));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				view.RemoveAllCopies(3);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5));

+				Assert.IsTrue(IC.eq(list, 0, 2, 5, 3));

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 2, 5, 1));

+

+				HashedLinkedList<int> l2 = new HashedLinkedList<int>();

+

+				l2.Add(1);l2.Add(2);l2.Add(2);l2.Add(3);l2.Add(1);

+				view.RemoveAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view, 5));

+				view.RetainAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(2);view.Add(4);view.Add(5);

+				Assert.AreEqual(2, view.RemoveAt(0));

+				Assert.AreEqual(5, view.RemoveAt(1));

+				Assert.AreEqual(4, view.RemoveAt(0));

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(8);view.Add(6);view.Add(78);

+				Assert.AreEqual(8, view.RemoveFirst());

+				Assert.AreEqual(78, view.RemoveLast());

+				view.Add(2);view.Add(5);view.Add(3);view.Add(1);

+				view.RemoveInterval(1, 2);

+				check();

+				Assert.IsTrue(IC.eq(view, 6, 1));

+			}

+

+

+			[Test]

+			public void Reverse()

+			{

+				view.Clear();

+				for (int i = 0; i < 10; i++) view.Add(10 + i);

+

+				view.Reverse(3, 4);

+				check();

+				Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

+				view.Reverse();

+				Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

+				Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

+			}

+

+

+			[Test]

+			public void Slide()

+			{

+				view.Slide(1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 3));

+				view.Slide(-2);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1));

+				view.Slide(0, 3);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1, 2));

+				view.Slide(2, 1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2));

+				view.Slide(-1, 0);

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(28);

+				Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

+			}

+			[Test]

+			public void Iterate()

+			{

+				list.Clear();

+				view = null;

+				foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 10, 11 }) list.Add(i);

+

+				view = (LinkedList<int>)list.View(list.Count - 2, 2);

+				int j = 666;

+				while (true)

+				{

+					//Console.WriteLine("View: {0}:  {1} --> {2}", view.Count, view.First, view.Last);

+					if ((view.Last - view.First) % 2 == 1)

+						view.Insert(1, j++);

+					check();

+					if (view.Offset == 0)

+						break;

+					else

+						view.Slide(-1,2);

+				}

+				//foreach (int i in list) Console.Write(" " + i);

+				//Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 2, 4, 8, 668, 13, 6, 1, 667, 10, 666, 11));

+			}

+

+

+			[Test]

+			public void SyncRoot()

+			{

+				Assert.AreSame(view.SyncRoot, list.SyncRoot);

+			}

+		}

+	}

+

+	namespace HashingAndEquals

+	{

+		[TestFixture]

+		public class ISequenced

+		{

+			private ISequenced<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+				dat = new HashedLinkedList<int>();

+				dut = new HashedLinkedList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(7), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(0);dit.Add(31);

+				dat.Add(1);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				((HashedLinkedList<int>)dut).InsertFirst(7);

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class IEditableCollection

+		{

+			private ICollection<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+				dat = new HashedLinkedList<int>();

+				dut = new HashedLinkedList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count, params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count << 16) + retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1, 3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1, 3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(2);dit.Add(1);

+				dat.Add(3);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				dut.Add(7);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnorderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ICollection<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+				dat = new HashedLinkedList<int>();

+				dut = new HashedLinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new HashedLinkedList<ICollection<int>>();

+				Dat = new HashedLinkedList<ICollection<int>>();

+				Dut = new HashedLinkedList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ISequenced<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+				dat = new HashedLinkedList<int>();

+				dut = new HashedLinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new HashedLinkedList<ICollection<int>>();

+				Dat = new HashedLinkedList<ICollection<int>>();

+				Dut = new HashedLinkedList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+				dat = new HashedLinkedList<int>();

+				dut = new HashedLinkedList<int>();

+				dot = new HashedLinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				dot.Add(2);dot.Add(1);

+				Dit = new HashedLinkedList<ISequenced<int>>();

+				Dat = new HashedLinkedList<ISequenced<int>>();

+				Dut = new HashedLinkedList<ISequenced<int>>();

+				Dot = new HashedLinkedList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new HashedLinkedList<int>();

+				dat = new HashedLinkedList<int>();

+				dut = new HashedLinkedList<int>();

+				dot = new HashedLinkedList<int>();

+				dit.Add(2);dit.Add(1); //{2,1}

+				dat.Add(1);dat.Add(2); //{1,2}

+				dut.Add(3);            //{3}

+				dot.Add(2);dot.Add(1); //{2,1}

+				Dit = new HashedLinkedList<ISequenced<int>>();

+				Dat = new HashedLinkedList<ISequenced<int>>();

+				Dut = new HashedLinkedList<ISequenced<int>>();

+				Dot = new HashedLinkedList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit); // {{2,1},{3}}

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat); // {{3},{2,1},{1,2}}

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit); // {{2,1},{3}}

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut); // {{2,1},{3}}

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+	}

+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/linkedlists/LinkedListTest.cs b/mcs/class/Mono.C5/Test/linkedlists/LinkedListTest.cs
index 2ba2f89ebf4..b2ae4a3e867 100644
--- a/mcs/class/Mono.C5/Test/linkedlists/LinkedListTest.cs
+++ b/mcs/class/Mono.C5/Test/linkedlists/LinkedListTest.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,3390 +23,2384 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

 

-namespace C5UnitTests.linkedlists.plain

+namespace nunit.linkedlists.plain

 {

-  using CollectionOfInt = LinkedList<int>;

+	namespace Enumerable

+	{

+		[TestFixture]

+		public class Multiops

+		{

+			private LinkedList<int> list;

+

+			private Filter<int> always, never, even;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new LinkedList<int>();

+				always = delegate{return true;};

+				never = delegate{return false;};

+				even = delegate(int i){return i%2==0;};

+			}

+

+

+			[Test]

+			public void All()

+			{

+				Assert.IsTrue(list.All(always));

+				Assert.IsTrue(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(8);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsTrue(list.All(even));

+				list.Add(5);

+				Assert.IsTrue(list.All(always));

+				Assert.IsFalse(list.All(never));

+				Assert.IsFalse(list.All(even));

+			}

+

+

+			[Test]

+			public void Exists()

+			{

+				Assert.IsFalse(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(5);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsFalse(list.Exists(even));

+				list.Add(8);

+				Assert.IsTrue(list.Exists(always));

+				Assert.IsFalse(list.Exists(never));

+				Assert.IsTrue(list.Exists(even));

+			}

+

+

+			[Test]

+			public void Apply()

+			{

+				int sum = 0;

+				Applier<int> a = delegate(int i){sum=i+10*sum;};

+

+				list.Apply(a);

+				Assert.AreEqual(0, sum);

+				sum = 0;

+				list.Add(5);list.Add(8);list.Add(7);list.Add(5);

+				list.Apply(a);

+				Assert.AreEqual(5875, sum);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+

+

+

+		[TestFixture]

+		public class GetEnumerator

+		{

+			private LinkedList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new LinkedList<int>(); }

+

+

+			[Test]

+			public void Empty()

+			{

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

+				list.Add(5);

+				list.Add(10);

+				list.Add(1);

+

+				MSG.IEnumerator<int> e = list.GetEnumerator();

+

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(8, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(5, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(10, e.Current);

+				Assert.IsTrue(e.MoveNext());

+				Assert.AreEqual(1, e.Current);

+				Assert.IsFalse(e.MoveNext());

+			}

+

+

+			[Test]

+			public void DoDispose()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

 

-  [TestFixture]

-  public class GenericTesters

-  {

+				MSG.IEnumerator<int> e = list.GetEnumerator();

 

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.ListTester<CollectionOfInt>().Test(factory);

-      new C5UnitTests.Templates.Events.QueueTester<CollectionOfInt>().Test(factory);

-      new C5UnitTests.Templates.Events.StackTester<CollectionOfInt>().Test(factory);

-    }

+				e.MoveNext();

+				e.MoveNext();

+				e.Dispose();

+			}

 

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Clone.ViewTester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.ViewTester<CollectionOfInt>();

-    }

-  }

 

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new LinkedList<T>(); }

-  }

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				list.Add(5);

+				list.Add(8);

+				list.Add(5);

 

-  namespace Enumerable

-  {

-    [TestFixture]

-    public class Multiops

-    {

-      private LinkedList<int> list;

-

-      private Fun<int, bool> always, never, even;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>();

-        always = delegate { return true; };

-        never = delegate { return false; };

-        even = delegate(int i) { return i % 2 == 0; };

-      }

-

-

-      [Test]

-      public void All()

-      {

-        Assert.IsTrue(list.All(always));

-        Assert.IsTrue(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(8);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsTrue(list.All(even));

-        list.Add(5);

-        Assert.IsTrue(list.All(always));

-        Assert.IsFalse(list.All(never));

-        Assert.IsFalse(list.All(even));

-      }

-

-

-      [Test]

-      public void Exists()

-      {

-        Assert.IsFalse(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(5);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsFalse(list.Exists(even));

-        list.Add(8);

-        Assert.IsTrue(list.Exists(always));

-        Assert.IsFalse(list.Exists(never));

-        Assert.IsTrue(list.Exists(even));

-      }

-

-

-      [Test]

-      public void Apply()

-      {

-        int sum = 0;

-        Act<int> a = delegate(int i) { sum = i + 10 * sum; };

-

-        list.Apply(a);

-        Assert.AreEqual(0, sum);

-        sum = 0;

-        list.Add(5); list.Add(8); list.Add(7); list.Add(5);

-        list.Apply(a);

-        Assert.AreEqual(5875, sum);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

+				MSG.IEnumerator<int> e = list.GetEnumerator();

 

+				e.MoveNext();

+				list.Add(99);

+				e.MoveNext();

+			}

 

 

-    [TestFixture]

-    public class GetEnumerator

-    {

-      private LinkedList<int> list;

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

 

 

-      [SetUp]

-      public void Init() { list = new LinkedList<int>(); }

 

 

-      [Test]

-      public void Empty()

-      {

-        SCG.IEnumerator<int> e = list.GetEnumerator();

+	namespace CollectionOrExtensible

+	{

+		[TestFixture]

+		public class CollectionOrSink

+		{

+			private LinkedList<int> list;

 

-        Assert.IsFalse(e.MoveNext());

-      }

 

+			[SetUp]

+			public void Init() { list = new LinkedList<int>(); }

 

-      [Test]

-      public void Normal()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

-        list.Add(5);

-        list.Add(10);

-        list.Add(1);

 

-        SCG.IEnumerator<int> e = list.GetEnumerator();

+			[Test]

+			public void CountEtAl()

+			{

+				Assert.AreEqual(0, list.Count);

+				Assert.IsTrue(list.IsEmpty);

+				Assert.IsTrue(list.AllowsDuplicates);

+				list.Add(5);

+				Assert.AreEqual(1, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				list.Add(5);

+				Assert.AreEqual(2, list.Count);

+				Assert.IsFalse(list.IsEmpty);

+				list.Add(8);

+				Assert.AreEqual(3, list.Count);

+			}

+

+

+			[Test]

+			public void AddAll()

+			{

+				list.Add(3);list.Add(4);list.Add(5);

+

+				LinkedList<int> list2 = new LinkedList<int>();

+

+				list2.AddAll(list);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				list.AddAll(list2);

+				Assert.IsTrue(IC.eq(list2, 3, 4, 5));

+				Assert.IsTrue(IC.eq(list, 3, 4, 5, 3, 4, 5));

+			}

 

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(8, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(5, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(10, e.Current);

-        Assert.IsTrue(e.MoveNext());

-        Assert.AreEqual(1, e.Current);

-        Assert.IsFalse(e.MoveNext());

-      }

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

 

 

-      [Test]

-      public void DoDispose()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

 

-        SCG.IEnumerator<int> e = list.GetEnumerator();

+		[TestFixture]

+		public class ArrayTest

+		{

+			private LinkedList<int> list;

 

-        e.MoveNext();

-        e.MoveNext();

-        e.Dispose();

-      }

+			int[] a;

 

 

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        list.Add(5);

-        list.Add(8);

-        list.Add(5);

+			[SetUp]

+			public void Init()

+			{

+				list = new LinkedList<int>();

+				a = new int[10];

+				for (int i = 0; i < 10; i++)

+					a[i] = 1000 + i;

+			}

 

-        SCG.IEnumerator<int> e = list.GetEnumerator();

 

-        e.MoveNext();

-        list.Add(99);

-        e.MoveNext();

-      }

+			[TearDown]

+			public void Dispose() { list = null; }

 

 

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-  namespace CollectionOrExtensible

-  {

-    [TestFixture]

-    public class Formatting

-    {

-      ICollection<int> coll;

-      IFormatProvider rad16;

-      [SetUp]

-      public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-      [TearDown]

-      public void Dispose() { coll = null; rad16 = null; }

-      [Test]

-      public void Format()

-      {

-        Assert.AreEqual("[  ]", coll.ToString());

-        coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-        Assert.AreEqual("[ -4, 28, 129, 65530 ]", coll.ToString());

-        Assert.AreEqual("[ -4, 1C, 81, FFFA ]", coll.ToString(null, rad16));

-        Assert.AreEqual("[ -4, 28, 129... ]", coll.ToString("L14", null));

-        Assert.AreEqual("[ -4, 1C, 81... ]", coll.ToString("L14", rad16));

-      }

-    }

+			private string aeq(int[] a, params int[] b)

+			{

+				if (a.Length != b.Length)

+					return "Lengths differ: " + a.Length + " != " + b.Length;

 

-    [TestFixture]

-    public class CollectionOrSink

-    {

-      private LinkedList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new LinkedList<int>(); }

-

-      [Test]

-      [ExpectedException(typeof(NullReferenceException))]

-      public void NullEqualityComparerinConstructor1()

-      {

-        new LinkedList<int>(null);

-      }

-

-      [Test]

-      public void Choose()

-      {

-        list.Add(7);

-        Assert.AreEqual(7, list.Choose());

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadChoose()

-      {

-        list.Choose();

-      }

-

-

-      [Test]

-      public void CountEtAl()

-      {

-        Assert.AreEqual(0, list.Count);

-        Assert.IsTrue(list.IsEmpty);

-        Assert.IsTrue(list.AllowsDuplicates);

-        list.Add(5);

-        Assert.AreEqual(1, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        list.Add(5);

-        Assert.AreEqual(2, list.Count);

-        Assert.IsFalse(list.IsEmpty);

-        list.Add(8);

-        Assert.AreEqual(3, list.Count);

-      }

-

-

-      [Test]

-      public void AddAll()

-      {

-        list.Add(3); list.Add(4); list.Add(5);

-

-        LinkedList<int> list2 = new LinkedList<int>();

-

-        list2.AddAll(list);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        list.AddAll(list2);

-        Assert.IsTrue(IC.eq(list2, 3, 4, 5));

-        Assert.IsTrue(IC.eq(list, 3, 4, 5, 3, 4, 5));

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

+				for (int i = 0; i < a.Length; i++)

+					if (a[i] != b[i])

+						return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

 

-    [TestFixture]

-    public class FindPredicate

-    {

-      private LinkedList<int> list;

-      Fun<int, bool> pred;

-

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>(TenEqualityComparer.Default);

-        pred = delegate(int i) { return i % 5 == 0; };

-      }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Find()

-      {

-        int i;

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.Find(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.Find(pred, out i));

-        Assert.AreEqual(45, i);

-      }

-

-      [Test]

-      public void FindLast()

-      {

-        int i;

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(list.FindLast(pred, out i));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.IsTrue(list.FindLast(pred, out i));

-        Assert.AreEqual(675, i);

-      }

-

-      [Test]

-      public void FindIndex()

-      {

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(4, list.FindIndex(pred));

-      }

-

-      [Test]

-      public void FindLastIndex()

-      {

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-        Assert.IsFalse(0 <= list.FindLastIndex(pred));

-        list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-        Assert.AreEqual(6, list.FindLastIndex(pred));

-      }

-    }

-

-    [TestFixture]

-    public class UniqueItems

-    {

-      private LinkedList<int> list;

-

-      [SetUp]

-      public void Init() { list = new LinkedList<int>(); }

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-      [Test]

-      public void Test()

-      {

-        Assert.IsTrue(IC.seteq(list.UniqueItems()));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-        list.AddAll<int>(new int[] { 7, 9, 7 });

-        Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-        Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 2, 9, 1));

-      }

-    }

-

-    [TestFixture]

-    public class ArrayTest

-    {

-      private LinkedList<int> list;

-

-      int[] a;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>();

-        a = new int[10];

-        for (int i = 0; i < 10; i++)

-          a[i] = 1000 + i;

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-

-

-      private string aeq(int[] a, params int[] b)

-      {

-        if (a.Length != b.Length)

-          return "Lengths differ: " + a.Length + " != " + b.Length;

-

-        for (int i = 0; i < a.Length; i++)

-          if (a[i] != b[i])

-            return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

-

-        return "Alles klar";

-      }

-

-

-      [Test]

-      public void ToArray()

-      {

-        Assert.AreEqual("Alles klar", aeq(list.ToArray()));

-        list.Add(7);

-        list.Add(7);

-        Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 7));

-      }

-

-

-      [Test]

-      public void CopyTo()

-      {

-        list.CopyTo(a, 1);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(6);

-        list.CopyTo(a, 2);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-        list.Add(4);

-        list.Add(4);

-        list.Add(9);

-        list.CopyTo(a, 4);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 1009));

-        list.Clear();

-        list.Add(7);

-        list.CopyTo(a, 9);

-        Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 7));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad()

-      {

-        list.CopyTo(a, 11);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToBad2()

-      {

-        list.CopyTo(a, -1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void CopyToTooFar()

-      {

-        list.Add(3);

-        list.Add(3);

-        list.CopyTo(a, 9);

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Sync

-    {

-      private LinkedList<int> list;

+				return "Alles klar";

+			}

 

 

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>();

-      }

+			[Test]

+			public void ToArray()

+			{

+				Assert.AreEqual("Alles klar", aeq(list.ToArray()));

+				list.Add(7);

+				list.Add(7);

+				Assert.AreEqual("Alles klar", aeq(list.ToArray(), 7, 7));

+			}

 

 

-      [TearDown]

-      public void Dispose() { list = null; }

+			[Test]

+			public void CopyTo()

+			{

+				list.CopyTo(a, 1);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(6);

+				list.CopyTo(a, 2);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+				list.Add(4);

+				list.Add(4);

+				list.Add(9);

+				list.CopyTo(a, 4);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 1009));

+				list.Clear();

+				list.Add(7);

+				list.CopyTo(a, 9);

+				Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 4, 4, 9, 1008, 7));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToBad()

+			{

+				list.Add(3);

+				list.CopyTo(a, 10);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void CopyToBad2()

+			{

+				list.CopyTo(a, -1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void CopyToTooFar()

+			{

+				list.Add(3);

+				list.Add(3);

+				list.CopyTo(a, 9);

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Sync

+		{

+			private LinkedList<int> list;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new LinkedList<int>();

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+

+

+			[Test]

+			public void Get()

+			{

+				Assert.IsNotNull(list.SyncRoot);

+			}

+		}

+	}

+

+

+

+

+	namespace EditableCollection

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private LinkedList<int> list;

+

+

+			[SetUp]

+			public void Init() { list = new LinkedList<int>(); }

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsFalse(list.Contains(5));

+				list.Add(5);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				list.Add(8);

+				list.Add(10);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsTrue(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+				list.Remove(8);

+				Assert.IsTrue(list.Contains(5));

+				Assert.IsFalse(list.Contains(7));

+				Assert.IsFalse(list.Contains(8));

+				Assert.IsTrue(list.Contains(10));

+			}

+

+

+			[Test]

+			public void ContainsCount()

+			{

+				Assert.AreEqual(0, list.ContainsCount(5));

+				list.Add(5);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				list.Add(8);

+				Assert.AreEqual(1, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				Assert.AreEqual(1, list.ContainsCount(8));

+				list.Add(5);

+				Assert.AreEqual(2, list.ContainsCount(5));

+				Assert.AreEqual(0, list.ContainsCount(7));

+				Assert.AreEqual(1, list.ContainsCount(8));

+			}

+

+

+			[Test]

+			public void RemoveAllCopies()

+			{

+				list.Add(5);list.Add(7);list.Add(5);

+				Assert.AreEqual(2, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.RemoveAllCopies(5);

+				Assert.AreEqual(0, list.ContainsCount(5));

+				Assert.AreEqual(1, list.ContainsCount(7));

+				list.Add(5);list.Add(8);list.Add(5);

+				list.RemoveAllCopies(8);

+				Assert.IsTrue(IC.eq(list, 7, 5, 5));

+			}

+

+

+			[Test]

+			public void FindAll()

+			{

+				Filter<int> f = delegate(int i){return i%2==0;};

+

+				Assert.IsTrue(list.FindAll(f).IsEmpty);

+				list.Add(5);list.Add(8);list.Add(5);list.Add(10);list.Add(8);

+				Assert.IsTrue(((LinkedList<int>)list.FindAll(f)).Check());

+				Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10, 8));

+			}

+

+

+			[Test]

+			public void ContainsAll()

+			{

+				LinkedList<int> list2 = new LinkedList<int>();

+

+				Assert.IsTrue(list.ContainsAll(list2));

+				list2.Add(4);

+				Assert.IsFalse(list.ContainsAll(list2));

+				list.Add(4);

+				Assert.IsTrue(list.ContainsAll(list2));

+				list.Add(5);

+				Assert.IsTrue(list.ContainsAll(list2));

+				list2.Add(4);

+				Assert.IsFalse(list.ContainsAll(list2));

+				list.Add(4);

+				Assert.IsTrue(list.ContainsAll(list2));

+			}

+

+

+			[Test]

+			public void RetainAll()

+			{

+				LinkedList<int> list2 = new LinkedList<int>();

+

+				list.Add(4);list.Add(4);list.Add(5);list.Add(4);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);list2.Add(7);list2.Add(4);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 4, 5));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(5);list2.Add(5);list2.Add(6);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 5, 6));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RetainAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list));

+			}

+

+

+			[Test]

+			public void RemoveAll()

+			{

+				LinkedList<int> list2 = new LinkedList<int>();

+

+				list.Add(4);list.Add(4);list.Add(5);list.Add(4);list.Add(6);

+				list2.Add(5);list2.Add(4);list2.Add(7);list2.Add(7);list2.Add(4);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 6));

+				list.Add(5);list.Add(4);list.Add(6);

+				list2.Clear();

+				list2.Add(6);list2.Add(5);list2.Add(5);list2.Add(6);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 4));

+				list2.Clear();

+				list2.Add(7);list2.Add(8);list2.Add(9);

+				list.RemoveAll(list2);

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 4));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				list.Add(4);list.Add(4);list.Add(5);list.Add(4);list.Add(6);

+				Assert.IsFalse(list.Remove(2));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(list.Remove(4));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 5, 4, 6));

+				Assert.AreEqual(6, list.RemoveLast());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 4, 5, 4));

+				list.Add(7);

+				Assert.AreEqual(4, list.RemoveFirst());

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 5, 4, 7));

+			}

+

+

+			[Test]

+			public void Clear()

+			{

+				list.Add(7);list.Add(7);

+				list.Clear();

+				Assert.IsTrue(list.IsEmpty);

+			}

+

+

+			[TearDown]

+			public void Dispose() { list = null; }

+		}

+	}

+

+

+

+

+	namespace IIndexed

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+			}

+

+

+			[Test]

+			public void IndexOf()

+			{

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(-1, dit.LastIndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				dit.Add(5);dit.Add(7);dit.Add(8);dit.Add(7);

+				Assert.AreEqual(-1, dit.IndexOf(6));

+				Assert.AreEqual(0, dit.IndexOf(7));

+				Assert.AreEqual(4, dit.LastIndexOf(7));

+				Assert.AreEqual(3, dit.IndexOf(8));

+				Assert.AreEqual(1, dit.LastIndexOf(5));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Removing

+		{

+			private IIndexed<int> dit;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+			}

+

+

+			[Test]

+			public void RemoveAt()

+			{

+				dit.Add(5);dit.Add(7);dit.Add(9);dit.Add(1);dit.Add(2);

+				Assert.AreEqual(7, dit.RemoveAt(1));

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

+				Assert.AreEqual(5, dit.RemoveAt(0));

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1, 2));

+				Assert.AreEqual(2, dit.RemoveAt(2));

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 9, 1));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad0()

+			{

+				dit.RemoveAt(0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBadM1()

+			{

+				dit.RemoveAt(-1);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void RemoveAtBad1()

+			{

+				dit.Add(8);

+				dit.RemoveAt(1);

+			}

+

+

+			[Test]

+			public void RemoveInterval()

+			{

+				dit.RemoveInterval(0, 0);

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(3, 0);

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

+				dit.RemoveInterval(3, 1);

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

+				dit.RemoveInterval(1, 3);

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 10, 60));

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit));

+				dit.Add(10);dit.Add(20);dit.Add(30);dit.Add(40);dit.Add(50);dit.Add(60);

+				dit.RemoveInterval(0, 2);

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

+				dit.RemoveInterval(2, 2);

+				Assert.IsTrue(((LinkedList<int>)dit).Check());

+				Assert.IsTrue(IC.eq(dit, 30, 40));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+			}

+		}

+	}

+

+

+

+

+	namespace IList

+	{

+		[TestFixture]

+		public class Searching

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new LinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void FirstBad()

+			{

+				int f = lst.First;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "List is empty")]

+			public void LastBad()

+			{

+				int f = lst.Last;

+			}

+

+

+			[Test]

+			public void FirstLast()

+			{

+				lst.Add(19);

+				Assert.AreEqual(19, lst.First);

+				Assert.AreEqual(19, lst.Last);

+				lst.Add(34);lst.InsertFirst(12);

+				Assert.AreEqual(12, lst.First);

+				Assert.AreEqual(34, lst.Last);

+			}

+

+

+			[Test]

+			public void This()

+			{

+				lst.Add(34);

+				Assert.AreEqual(34, lst[0]);

+				lst[0] = 56;

+				Assert.AreEqual(56, lst.First);

+				lst.Add(7);lst.Add(7);lst.Add(7);lst.Add(7);

+				lst[0] = 45;lst[2] = 78;lst[4] = 101;

+				Assert.IsTrue(IC.eq(lst, 45, 7, 78, 7, 101));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptyGet()

+			{

+				int f = lst[0];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowGet()

+			{

+				lst.Add(7);

+

+				int f = lst[-1];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiGet()

+			{

+				lst.Add(6);

 

-

-      [Test]

-      public void Get()

-      {

-        Assert.IsNotNull(list.SyncRoot);

-      }

-    }

-  }

-

-

-

-

-  namespace EditableCollection

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private LinkedList<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new LinkedList<int>(); }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsFalse(list.Contains(5));

-        list.Add(5);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        list.Add(8);

-        list.Add(10);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsTrue(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-        list.Remove(8);

-        Assert.IsTrue(list.Contains(5));

-        Assert.IsFalse(list.Contains(7));

-        Assert.IsFalse(list.Contains(8));

-        Assert.IsTrue(list.Contains(10));

-      }

-

-

-      [Test]

-      public void ContainsCount()

-      {

-        Assert.AreEqual(0, list.ContainsCount(5));

-        list.Add(5);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        list.Add(8);

-        Assert.AreEqual(1, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        Assert.AreEqual(1, list.ContainsCount(8));

-        list.Add(5);

-        Assert.AreEqual(2, list.ContainsCount(5));

-        Assert.AreEqual(0, list.ContainsCount(7));

-        Assert.AreEqual(1, list.ContainsCount(8));

-      }

-

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        list.Add(5); list.Add(7); list.Add(5);

-        Assert.AreEqual(2, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.RemoveAllCopies(5);

-        Assert.AreEqual(0, list.ContainsCount(5));

-        Assert.AreEqual(1, list.ContainsCount(7));

-        list.Add(5); list.Add(8); list.Add(5);

-        list.RemoveAllCopies(8);

-        Assert.IsTrue(IC.eq(list, 7, 5, 5));

-      }

-

-

-      [Test]

-      public void FindAll()

-      {

-        Fun<int, bool> f = delegate(int i) { return i % 2 == 0; };

-

-        Assert.IsTrue(list.FindAll(f).IsEmpty);

-        list.Add(5); list.Add(8); list.Add(5); list.Add(10); list.Add(8);

-        Assert.IsTrue(((LinkedList<int>)list.FindAll(f)).Check());

-        Assert.IsTrue(IC.eq(list.FindAll(f), 8, 10, 8));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-

-        Assert.IsTrue(list.ContainsAll(list2));

-        list2.Add(4);

-        Assert.IsFalse(list.ContainsAll(list2));

-        list.Add(4);

-        Assert.IsTrue(list.ContainsAll(list2));

-        list.Add(5);

-        Assert.IsTrue(list.ContainsAll(list2));

-        list2.Add(4);

-        Assert.IsFalse(list.ContainsAll(list2));

-        list.Add(4);

-        Assert.IsTrue(list.ContainsAll(list2));

-      }

-

-

-      [Test]

-      public void RetainAll()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7); list2.Add(7); list2.Add(4);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4, 5));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(5); list2.Add(5); list2.Add(6);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 5, 6));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RetainAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list));

-      }

-

-

-      [Test]

-      public void RemoveAll()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        list2.Add(5); list2.Add(4); list2.Add(7); list2.Add(7); list2.Add(4);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 6));

-        list.Add(5); list.Add(4); list.Add(6);

-        list2.Clear();

-        list2.Add(6); list2.Add(5); list2.Add(5); list2.Add(6);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4));

-        list2.Clear();

-        list2.Add(7); list2.Add(8); list2.Add(9);

-        list.RemoveAll(list2);

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-

-        Assert.IsTrue(list.FIFO);

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        Assert.IsFalse(list.Remove(2));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(list.Remove(4));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5, 4, 6));

-        Assert.AreEqual(6, list.RemoveLast());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5, 4));

-        list.Add(7);

-        Assert.AreEqual(4, list.RemoveFirst());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 5, 4, 7));

-

-        list.FIFO = false;

-        list.Clear();

-        list.Add(4); list.Add(4); list.Add(5); list.Add(4); list.Add(6);

-        Assert.IsFalse(list.Remove(2));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(list.Remove(4));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4, 5, 6));

-        Assert.AreEqual(6, list.RemoveLast());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 4, 5));

-        list.Add(7);

-        Assert.AreEqual(4, list.RemoveFirst());

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 4, 5, 7));

-      }

-

-

-      [Test]

-      public void Clear()

-      {

-        list.Add(7); list.Add(7);

-        list.Clear();

-        Assert.IsTrue(list.IsEmpty);

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-

-

-  namespace IIndexed

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-      }

-

-

-      [Test]

-      public void IndexOf()

-      {

-        Assert.AreEqual(~0, dit.IndexOf(6));

-        dit.Add(7);

-        Assert.AreEqual(~1, dit.IndexOf(6));

-        Assert.AreEqual(~1, dit.LastIndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        dit.Add(5); dit.Add(7); dit.Add(8); dit.Add(7);

-        Assert.AreEqual(~5, dit.IndexOf(6));

-        Assert.AreEqual(0, dit.IndexOf(7));

-        Assert.AreEqual(4, dit.LastIndexOf(7));

-        Assert.AreEqual(3, dit.IndexOf(8));

-        Assert.AreEqual(1, dit.LastIndexOf(5));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Removing

-    {

-      private IIndexed<int> dit;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-      }

-

-

-      [Test]

-      public void RemoveAt()

-      {

-        dit.Add(5); dit.Add(7); dit.Add(9); dit.Add(1); dit.Add(2);

-        Assert.AreEqual(7, dit.RemoveAt(1));

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 5, 9, 1, 2));

-        Assert.AreEqual(5, dit.RemoveAt(0));

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1, 2));

-        Assert.AreEqual(2, dit.RemoveAt(2));

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 9, 1));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad0()

-      {

-        dit.RemoveAt(0);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBadM1()

-      {

-        dit.RemoveAt(-1);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void RemoveAtBad1()

-      {

-        dit.Add(8);

-        dit.RemoveAt(1);

-      }

-

-

-      [Test]

-      public void RemoveInterval()

-      {

-        dit.RemoveInterval(0, 0);

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(3, 0);

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 40, 50, 60));

-        dit.RemoveInterval(3, 1);

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 20, 30, 50, 60));

-        dit.RemoveInterval(1, 3);

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 10, 60));

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit));

-        dit.Add(10); dit.Add(20); dit.Add(30); dit.Add(40); dit.Add(50); dit.Add(60);

-        dit.RemoveInterval(0, 2);

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40, 50, 60));

-        dit.RemoveInterval(2, 2);

-        Assert.IsTrue(((LinkedList<int>)dit).Check());

-        Assert.IsTrue(IC.eq(dit, 30, 40));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-      }

-    }

-  }

-

-

-

-

-  namespace IList_

-  {

-    [TestFixture]

-    public class Searching

-    {

-      private IList<int> lst;

+				int f = lst[1];

+			}

 

 

-      [SetUp]

-      public void Init() { lst = new LinkedList<int>(); }

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadEmptySet()

+			{

+				lst[0] = 4;

+			}

 

 

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void FirstBad()

-      {

-        int f = lst.First;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void LastBad()

-      {

-        int f = lst.Last;

-      }

-

-

-      [Test]

-      public void FirstLast()

-      {

-        lst.Add(19);

-        Assert.AreEqual(19, lst.First);

-        Assert.AreEqual(19, lst.Last);

-        lst.Add(34); lst.InsertFirst(12);

-        Assert.AreEqual(12, lst.First);

-        Assert.AreEqual(34, lst.Last);

-      }

-

-

-      [Test]

-      public void This()

-      {

-        lst.Add(34);

-        Assert.AreEqual(34, lst[0]);

-        lst[0] = 56;

-        Assert.AreEqual(56, lst.First);

-        lst.Add(7); lst.Add(7); lst.Add(7); lst.Add(7);

-        lst[0] = 45; lst[2] = 78; lst[4] = 101;

-        Assert.IsTrue(IC.eq(lst, 45, 7, 78, 7, 101));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptyGet()

-      {

-        int f = lst[0];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowGet()

-      {

-        lst.Add(7);

-

-        int f = lst[-1];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiGet()

-      {

-        lst.Add(6);

-

-        int f = lst[1];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadEmptySet()

-      {

-        lst[0] = 4;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadLowSet()

-      {

-        lst.Add(7);

-        lst[-1] = 9;

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void ThisBadHiSet()

-      {

-        lst.Add(6);

-        lst[1] = 11;

-      }

-    }

-

-

-    [TestFixture]

-    public class Combined

-    {

-      private IList<KeyValuePair<int, int>> lst;

-

-

-      [SetUp]

-      public void Init()

-      {

-        lst = new LinkedList<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());

-        for (int i = 0; i < 10; i++)

-          lst.Add(new KeyValuePair<int, int>(i, i + 30));

-      }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Find()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Find(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Find(ref p));

-      }

-

-

-      [Test]

-      public void FindOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.FindOrAdd(ref p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.FindOrAdd(ref p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void Update()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Update(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Update(p));

-      }

-

-

-      [Test]

-      public void UpdateOrAdd()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.UpdateOrAdd(p));

-        Assert.AreEqual(3, lst[3].Key);

-        Assert.AreEqual(78, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 79);

-        Assert.IsFalse(lst.UpdateOrAdd(p));

-        Assert.AreEqual(13, lst[10].Key);

-        Assert.AreEqual(79, lst[10].Value);

-      }

-

-

-      [Test]

-      public void RemoveWithReturn()

-      {

-        KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-        Assert.IsTrue(lst.Remove(p, out p));

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual(33, p.Value);

-        Assert.AreEqual(4, lst[3].Key);

-        Assert.AreEqual(34, lst[3].Value);

-        p = new KeyValuePair<int, int>(13, 78);

-        Assert.IsFalse(lst.Remove(p, out p));

-      }

-    }

-

-

-    [TestFixture]

-    public class Inserting

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new LinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Insert()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 4);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5));

-        lst.Insert(3, 2);

-        Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

-      }

-

-      [Test]

-      public void InsertDuplicate()

-      {

-        lst.Insert(0, 5);

-        Assert.IsTrue(IC.eq(lst, 5));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 5));

-        lst.Insert(1, 5);

-        Assert.IsTrue(IC.eq(lst, 7, 5, 5));

-      }

-

-      [Test]

-      public void InsertAllDuplicate1()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        lst.InsertAll<int>(1, new int[] { 1, 2, 3, 4 });

-        Assert.IsTrue(IC.eq(lst, 7, 1, 2, 3, 4, 3));

-        Assert.IsTrue(lst.Check());

-      }

-      [Test]

-      public void InsertAllDuplicate2()

-      {

-        lst.Insert(0, 3);

-        Assert.IsTrue(IC.eq(lst, 3));

-        lst.Insert(0, 7);

-        Assert.IsTrue(IC.eq(lst, 7, 3));

-        lst.InsertAll<int>(1, new int[] { 5, 6, 5, 8 });

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 5, 6, 5, 8, 3));

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertLow()

-      {

-        lst.Add(7);

-        lst.Insert(-1, 9);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void BadInsertHi()

-      {

-        lst.Add(6);

-        lst.Insert(2, 11);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        for (int i = 0; i < 7; i++)

-          lst.Add(2 * i);

-

-        Assert.IsTrue(lst.FIFO);

-        Assert.AreEqual(0, lst.Remove());

-        Assert.AreEqual(2, lst.Remove());

-        lst.FIFO = false;

-        Assert.AreEqual(12, lst.Remove());

-        Assert.AreEqual(10, lst.Remove());

-        lst.FIFO = true;

-        Assert.AreEqual(4, lst.Remove());

-        Assert.AreEqual(6, lst.Remove());

-      }

-

-

-      [Test]

-      public void InsertFirstLast()

-      {

-        lst.InsertFirst(4);

-        lst.InsertLast(5);

-        lst.InsertFirst(14);

-        lst.InsertLast(15);

-        lst.InsertFirst(24);

-        lst.InsertLast(25);

-        lst.InsertFirst(34);

-        lst.InsertLast(55);

-        Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

-      }

-

-

-      [Test]

-      public void InsertFirst()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        lst.ViewOf(2).InsertFirst(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 3, 2, 5));

-        lst.ViewOf(3).InsertFirst(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 5));

-        lst.ViewOf(5).InsertFirst(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 9, 5));

-      }

-

-

-      [Test]

-      public void BadInsertFirst()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        Assert.IsNull(lst.ViewOf(4));

-      }

-

-

-      [Test]

-      public void InsertAfter()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        lst.LastViewOf(2).InsertLast(7);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 2, 3, 2, 7, 5));

-        lst.LastViewOf(1).InsertLast(8);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5));

-        lst.LastViewOf(5).InsertLast(9);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5, 9));

-      }

-

-

-      [Test]

-      public void BadInsertAfter()

-      {

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(2);

-        lst.Add(5);

-        Assert.IsNull(lst.ViewOf(4));

-      }

-

-

-      [Test]

-      public void InsertAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-

-        IList<int> lst2 = new LinkedList<int>();

-

-        lst2.Add(7); lst2.Add(8); lst2.Add(9);

-        lst.InsertAll(0, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

-        lst.InsertAll(7, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4, 7, 8, 9));

-        lst.InsertAll(5, lst2);

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 7, 8, 9, 3, 4, 7, 8, 9));

-      }

-

-

-      [Test]

-      public void Map()

-      {

-        Fun<int, string> m = delegate(int i) { return "<<" + i + ">>"; };

-        IList<string> r = lst.Map(m);

-

-        Assert.IsTrue(r.Check());

-        Assert.IsTrue(r.IsEmpty);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        r = lst.Map(m);

-        Assert.IsTrue(r.Check());

-        Assert.AreEqual(4, r.Count);

-        for (int i = 0; i < 4; i++)

-          Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

-      }

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapper()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAll()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void BadMapperView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.Map(m);

-      }

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void ModifyingFindAllView()

-      {

-        lst = lst.View(0, 0);

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        Fun<int, bool> m = delegate(int i) { if (i == 2) lst.Add(7); return true; };

-        lst.FindAll(m);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemove() { lst.Remove(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveFirst() { lst.RemoveFirst(); }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void BadRemoveLast() { lst.RemoveLast(); }

-

-

-      [Test]

-      public void RemoveFirstLast()

-      {

-        lst.Add(1);

-        lst.Add(2);

-        lst.Add(3);

-        lst.Add(4);

-        Assert.AreEqual(1, lst.RemoveFirst());

-        Assert.AreEqual(4, lst.RemoveLast());

-        Assert.AreEqual(2, lst.RemoveFirst());

-        Assert.AreEqual(3, lst.RemoveLast());

-        Assert.IsTrue(lst.IsEmpty);

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void RemoveFirstEmpty()

-      {

-        lst.RemoveFirst();

-      }

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void RemoveLastEmpty()

-      {

-        lst.RemoveLast();

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(0, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 0).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

-        lst.View(7, 3).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-        lst.View(5, 1).Reverse();

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void BadReverse()

-      {

-        for (int i = 0; i < 10; i++)

-          lst.Add(i);

-

-        lst.View(8, 3).Reverse();

-      }

-    }

-

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadLowSet()

+			{

+				lst.Add(7);

+				lst[-1] = 9;

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void ThisBadHiSet()

+			{

+				lst.Add(6);

+				lst[1] = 11;

+			}

+		}

+

+

+		[TestFixture]

+		public class Combined

+		{

+			private IList<KeyValuePair<int,int>> lst;

+

+

+			[SetUp]

+			public void Init()

+			{

+				lst = new LinkedList<KeyValuePair<int,int>>();

+				for (int i = 0; i < 10; i++)

+					lst.Add(new KeyValuePair<int,int>(i, i + 30));

+			}

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Find()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Find(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Find(ref p));

+			}

+

+

+			[Test]

+			public void FindOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.FindOrAdd(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.FindOrAdd(ref p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void Update()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.Update(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.Update(p));

+			}

+

+

+			[Test]

+			public void UpdateOrAdd()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.UpdateOrAdd(p));

+				Assert.AreEqual(3, lst[3].key);

+				Assert.AreEqual(78, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 79);

+				Assert.IsFalse(lst.UpdateOrAdd(p));

+				Assert.AreEqual(13, lst[10].key);

+				Assert.AreEqual(79, lst[10].value);

+			}

+

+

+			[Test]

+			public void RemoveWithReturn()

+			{

+				KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+				Assert.IsTrue(lst.RemoveWithReturn(ref p));

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual(33, p.value);

+				Assert.AreEqual(4, lst[3].key);

+				Assert.AreEqual(34, lst[3].value);

+				p = new KeyValuePair<int,int>(13, 78);

+				Assert.IsFalse(lst.RemoveWithReturn(ref p));

+			}

+		}

+

+

+		[TestFixture]

+		public class Inserting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new LinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Insert()

+			{

+				lst.Insert(0, 5);

+				Assert.IsTrue(IC.eq(lst, 5));

+				lst.Insert(0, 7);

+				Assert.IsTrue(IC.eq(lst, 7, 5));

+				lst.Insert(1, 4);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5));

+				lst.Insert(3, 2);

+				Assert.IsTrue(IC.eq(lst, 7, 4, 5, 2));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertLow()

+			{

+				lst.Add(7);

+				lst.Insert(-1, 9);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(IndexOutOfRangeException))]

+			public void BadInsertHi()

+			{

+				lst.Add(6);

+				lst.Insert(2, 11);

+			}

+

+

+			[Test]

+			public void FIFO()

+			{

+				for (int i = 0; i < 7; i++)

+					lst.Add(2 * i);

+

+				Assert.IsTrue(lst.FIFO);

+				Assert.AreEqual(0, lst.Remove());

+				Assert.AreEqual(2, lst.Remove());

+				lst.FIFO = false;

+				Assert.AreEqual(12, lst.Remove());

+				Assert.AreEqual(10, lst.Remove());

+				lst.FIFO = true;

+				Assert.AreEqual(4, lst.Remove());

+				Assert.AreEqual(6, lst.Remove());

+			}

+

+

+			[Test]

+			public void InsertFirstLast()

+			{

+				lst.InsertFirst(4);

+				lst.InsertLast(5);

+				lst.InsertFirst(14);

+				lst.InsertLast(15);

+				lst.InsertFirst(24);

+				lst.InsertLast(25);

+				lst.InsertFirst(34);

+				lst.InsertLast(55);

+				Assert.IsTrue(IC.eq(lst, 34, 24, 14, 4, 5, 15, 25, 55));

+			}

+

+

+			[Test]

+			public void InsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertBefore(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 3, 2, 5));

+				lst.InsertBefore(8, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 5));

+				lst.InsertBefore(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 2, 8, 3, 2, 9, 5));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBefore()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertBefore(7, 4);

+			}

+

+

+			[Test]

+			public void InsertAfter()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertAfter(7, 2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 2, 3, 2, 7, 5));

+				lst.InsertAfter(8, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5));

+				lst.InsertAfter(9, 5);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 1, 8, 2, 3, 2, 7, 5, 9));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfter()

+			{

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(2);

+				lst.Add(5);

+				lst.InsertAfter(7, 4);

+			}

+

+

+			[Test]

+			public void InsertAll()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+

+				IList<int> lst2 = new LinkedList<int>();

+

+				lst2.Add(7);lst2.Add(8);lst2.Add(9);

+				lst.InsertAll(0, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4));

+				lst.InsertAll(7, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 3, 4, 7, 8, 9));

+				lst.InsertAll(5, lst2);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 1, 2, 7, 8, 9, 3, 4, 7, 8, 9));

+			}

+

+

+			[Test]

+			public void Map()

+			{

+				Mapper<int,string> m = delegate(int i){return "<<"+i+">>";};

+				IList<string> r = lst.Map(m);

+

+				Assert.IsTrue(r.Check());

+				Assert.IsTrue(r.IsEmpty);

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				r = lst.Map(m);

+				Assert.IsTrue(r.Check());

+				Assert.AreEqual(4, r.Count);

+				for (int i = 0; i < 4; i++)

+					Assert.AreEqual("<<" + (i + 1) + ">>", r[i]);

+			}

+

+

+			[Test]

+			public void RemoveFirstLast()

+			{

+				lst.Add(1);

+				lst.Add(2);

+				lst.Add(3);

+				lst.Add(4);

+				Assert.AreEqual(1, lst.RemoveFirst());

+				Assert.AreEqual(4, lst.RemoveLast());

+				Assert.AreEqual(2, lst.RemoveFirst());

+				Assert.AreEqual(3, lst.RemoveLast());

+				Assert.IsTrue(lst.IsEmpty);

+			}

+

+            [Test]

+            [ExpectedException(typeof(InvalidOperationException))]

+            public void RemoveFirstEmpty()

+            {

+                lst.RemoveFirst();

+            }

 

+            [Test]

+            [ExpectedException(typeof(InvalidOperationException))]

+            public void RemoveLastEmpty()

+            {

+                lst.RemoveLast();

+            }

 

-    [TestFixture]

-    public class SortingTests

+            [Test]

+            public void Reverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse();

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(0, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 0);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 2, 1, 0));

+				lst.Reverse(7, 3);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+				lst.Reverse(5, 1);

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(IC.eq(lst, 7, 8, 9, 6, 5, 4, 3, 0, 1, 2));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void BadReverse()

+			{

+				for (int i = 0; i < 10; i++)

+					lst.Add(i);

+

+				lst.Reverse(8, 3);

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Sorting

+		{

+			private IList<int> lst;

+

+

+			[SetUp]

+			public void Init() { lst = new LinkedList<int>(); }

+

+

+			[TearDown]

+			public void Dispose() { lst = null; }

+

+

+			[Test]

+			public void Sort()

+			{

+				lst.Add(5);lst.Add(6);lst.Add(5);lst.Add(7);lst.Add(3);

+				Assert.IsFalse(lst.IsSorted(new IC()));

+				lst.Sort(new IC());

+				Assert.IsTrue(lst.Check());

+				Assert.IsTrue(lst.IsSorted(new IC()));

+				Assert.IsTrue(IC.eq(lst, 3, 5, 5, 6, 7));

+			}

+

+

+			[Test]

+			public void Stability()

+			{

+				IList<KeyValuePair<int,string>> lst2 = new LinkedList<KeyValuePair<int,string>>();

+				IComparer<KeyValuePair<int,string>> c = new KeyValuePairComparer<int,string>(new IC());

+

+				lst2.Add(new KeyValuePair<int,string>(5, "a"));

+				lst2.Add(new KeyValuePair<int,string>(5, "b"));

+				lst2.Add(new KeyValuePair<int,string>(6, "c"));

+				lst2.Add(new KeyValuePair<int,string>(4, "d"));

+				lst2.Add(new KeyValuePair<int,string>(3, "e"));

+				lst2.Add(new KeyValuePair<int,string>(4, "f"));

+				lst2.Add(new KeyValuePair<int,string>(5, "h"));

+				Assert.IsFalse(lst2.IsSorted(c));

+				lst2.Sort(c);

+				Assert.IsTrue(lst2.IsSorted(c));

+

+				KeyValuePair<int,string> p = lst2.RemoveFirst();

+

+				Assert.AreEqual(3, p.key);

+				Assert.AreEqual("e", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(4, p.key);

+				Assert.AreEqual("d", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(4, p.key);

+				Assert.AreEqual("f", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(5, p.key);

+				Assert.AreEqual("a", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(5, p.key);

+				Assert.AreEqual("b", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(5, p.key);

+				Assert.AreEqual("h", p.value);

+				p = lst2.RemoveFirst();

+				Assert.AreEqual(6, p.key);

+				Assert.AreEqual("c", p.value);

+				Assert.IsTrue(lst2.IsEmpty);

+			}

+		}

+	}

+

+

+    namespace IStackQueue

     {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new LinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Sort()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(5); lst.Add(7); lst.Add(3);

-        Assert.IsFalse(lst.IsSorted(new IC()));

-        lst.Sort(new IC());

-        Assert.IsTrue(lst.Check());

-        Assert.IsTrue(lst.IsSorted());

-        Assert.IsTrue(lst.IsSorted(new IC()));

-        Assert.IsTrue(IC.eq(lst, 3, 5, 5, 6, 7));

-      }

-

-

-      [Test]

-      public void Stability()

-      {

-        IList<KeyValuePair<int, string>> lst2 = new LinkedList<KeyValuePair<int, string>>();

-        SCG.IComparer<KeyValuePair<int, string>> c = new KeyValuePairComparer<int, string>(new IC());

-

-        lst2.Add(new KeyValuePair<int, string>(5, "a"));

-        lst2.Add(new KeyValuePair<int, string>(5, "b"));

-        lst2.Add(new KeyValuePair<int, string>(6, "c"));

-        lst2.Add(new KeyValuePair<int, string>(4, "d"));

-        lst2.Add(new KeyValuePair<int, string>(3, "e"));

-        lst2.Add(new KeyValuePair<int, string>(4, "f"));

-        lst2.Add(new KeyValuePair<int, string>(5, "handle"));

-        Assert.IsFalse(lst2.IsSorted(c));

-        lst2.Sort(c);

-        Assert.IsTrue(lst2.IsSorted(c));

-

-        KeyValuePair<int, string> p = lst2.RemoveFirst();

-

-        Assert.AreEqual(3, p.Key);

-        Assert.AreEqual("e", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(4, p.Key);

-        Assert.AreEqual("d", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(4, p.Key);

-        Assert.AreEqual("f", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(5, p.Key);

-        Assert.AreEqual("a", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(5, p.Key);

-        Assert.AreEqual("b", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(5, p.Key);

-        Assert.AreEqual("handle", p.Value);

-        p = lst2.RemoveFirst();

-        Assert.AreEqual(6, p.Key);

-        Assert.AreEqual("c", p.Value);

-        Assert.IsTrue(lst2.IsEmpty);

-      }

-    }

-    [TestFixture]

-    public class ShuffleTests

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new LinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void Shuffle()

-      {

-        lst.Add(5); lst.Add(6); lst.Add(5); lst.Add(7); lst.Add(3);

-        for (int i = 0; i < 100; i++)

+        [TestFixture]

+        public class Stack

         {

-          lst.Shuffle(new C5Random(i + 1));

-          Assert.IsTrue(lst.Check(), "Check " + i);

-          int[] lst2 = lst.ToArray();

-          Sorting.IntroSort<int>(lst2);

-          Assert.IsTrue(IC.eq(lst2, 3, 5, 5, 6, 7), "Contents " + i);

-        }

-      }

-    }

-  }

-

+            private IStack<int> list;

 

-  namespace IStackQueue

-  {

-    [TestFixture]

-    public class Stack

-    {

-      private IStack<int> list;

 

+            [SetUp]

+            public void Init() { list = new LinkedList<int>(); }

 

-      [SetUp]

-      public void Init() { list = new LinkedList<int>(); }

 

+            [Test]

+            public void Normal()

+            {

+                list.Push(7);

+                list.Push(5);

+                list.Push(7);

+                list.Push(8);

+                list.Push(9);

+                Assert.AreEqual(9, list.Pop());

+                Assert.AreEqual(8, list.Pop());

+                Assert.AreEqual(7, list.Pop());

+                Assert.AreEqual(5, list.Pop());

+                Assert.AreEqual(7, list.Pop());

+            }

 

-      [Test]

-      public void Normal()

-      {

-        list.Push(7);

-        list.Push(5);

-        list.Push(7);

-        list.Push(8);

-        list.Push(9);

-        Assert.AreEqual(9, list.Pop());

-        Assert.AreEqual(8, list.Pop());

-        Assert.AreEqual(7, list.Pop());

-        Assert.AreEqual(5, list.Pop());

-        Assert.AreEqual(7, list.Pop());

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void PopEmpty()

-      {

-        list.Push(5);

-        Assert.AreEqual(5, list.Pop());

-        list.Pop();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-    [TestFixture]

-    public class Queue

-    {

-      private IQueue<int> list;

-

-

-      [SetUp]

-      public void Init() { list = new LinkedList<int>(); }

-

-

-      [Test]

-      public void Normal()

-      {

-        list.Enqueue(7);

-        list.Enqueue(5);

-        list.Enqueue(7);

-        list.Enqueue(8);

-        list.Enqueue(9);

-        Assert.AreEqual(7, list.Dequeue());

-        Assert.AreEqual(5, list.Dequeue());

-        Assert.AreEqual(7, list.Dequeue());

-        Assert.AreEqual(8, list.Dequeue());

-        Assert.AreEqual(9, list.Dequeue());

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NoSuchItemException))]

-      public void DeQueueEmpty()

-      {

-        list.Enqueue(5);

-        Assert.AreEqual(5, list.Dequeue());

-        list.Dequeue();

-      }

-

-

-      [TearDown]

-      public void Dispose() { list = null; }

-    }

-  }

-

-

-  namespace Range

-  {

-    [TestFixture]

-    public class Range

-    {

-      private IList<int> lst;

-

-

-      [SetUp]

-      public void Init() { lst = new LinkedList<int>(); }

-

-

-      [TearDown]

-      public void Dispose() { lst = null; }

-

-

-      [Test]

-      public void GetRange()

-      {

-        //Assert.IsTrue(IC.eq(lst[0, 0)));

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

-        Assert.IsTrue(IC.eq(lst[3, 4], 3, 4, 5, 6));

-        Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void BadGetRange()

-      {

-        object foo = lst[0, 11];

-      }

-

-

-      [Test]

-      public void Backwards()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[0, 4].Backwards(), 3, 2, 1, 0));

-        Assert.IsTrue(IC.eq(lst[3, 4].Backwards(), 6, 5, 4, 3));

-        Assert.IsTrue(IC.eq(lst[6, 4].Backwards(), 9, 8, 7, 6));

-      }

-

-

-      [Test]

-      public void DirectionAndCount()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

-

-        Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

-        Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 7].Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 7].Backwards().Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

-        Assert.AreEqual(4, lst[3, 4].Count);

-        Assert.AreEqual(4, lst[3, 4].Backwards().Count);

-        Assert.AreEqual(10, lst.Backwards().Count);

-      }

 

+            [Test]

+            [ExpectedException(typeof(InvalidOperationException))]

+            public void PopEmpty()

+            {

+                list.Push(5);

+                Assert.AreEqual(5, list.Pop());

+                list.Pop();

+            }

 

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterUpdate()

-      {

-        for (int i = 0; i < 10; i++) lst.Add(i);

 

-        foreach (int i in lst)

-        {

-          lst.Add(45 + i);

+            [TearDown]

+            public void Dispose() { list = null; }

         }

-      }

-    }

-  }

-

-

-

-

-  namespace View

-  {

-    [TestFixture]

-    public class Simple

-    {

-      LinkedList<int> list, view;

-

-

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>();

-        list.Add(0); list.Add(1); list.Add(2); list.Add(3);

-        view = (LinkedList<int>)list.View(1, 2);

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        list = view = null;

-      }

-

-

-      void check()

-      {

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(view.Check());

-      }

-

-

-      [Test]

-      public void InsertPointer()

-      {

-        IList<int> view2 = list.View(2, 0);

-        list.Insert(view2, 7);

-        check();

-        list.Insert(list, 8);

-        check();

-        view.Insert(view2, 9);

-        check();

-        view.Insert(list.View(3, 2), 10);

-        check();

-        view.Insert(list.ViewOf(0), 11);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 11, 1, 9, 7, 2, 10, 3, 8));

-        Assert.IsTrue(IC.eq(view, 11, 1, 9, 7, 2, 10));

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad1()

-      {

-        view.Insert(list.View(0, 0), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IndexOutOfRangeException))]

-      public void InsertPointerBad2()

-      {

-        view.Insert(list, 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad3()

-      {

-        list.Insert(new ArrayList<int>(), 7);

-      }

-

-      [Test]

-      [ExpectedException(typeof(IncompatibleViewException))]

-      public void InsertPointerBad4()

-      {

-        list.Insert(new ArrayList<int>().View(0, 0), 7);

-      }

-

-      [Test]

-      public void Span()

-      {

-        IList<int> span = list.View(1, 0).Span(list.View(2, 0));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(1, span.Offset);

-        Assert.AreEqual(1, span.Count);

-        span = list.View(0, 2).Span(list.View(2, 2));

-        Assert.IsTrue(span.Check());

-        Assert.AreEqual(0, span.Offset);

-        Assert.AreEqual(4, span.Count);

-        span = list.View(3, 1).Span(list.View(1, 1));

-        Assert.IsNull(span);

-      }

-

-      [Test]

-      public void ViewOf()

-      {

-        for (int i = 0; i < 4; i++)

-          list.Add(i);

-        IList<int> v = view.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.ViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(2, v.Offset);

-        v = list.LastViewOf(2);

-        Assert.IsTrue(v.Check());

-        Assert.IsTrue(IC.eq(v, 2));

-        Assert.AreEqual(6, v.Offset);

-      }

-

-      [Test]

-      public void BadViewOf()

-      {

-        Assert.IsNull(view.ViewOf(5));

-        Assert.IsNull(view.LastViewOf(5));

-        Assert.IsNull(view.ViewOf(3));

-        Assert.IsNull(view.LastViewOf(3));

-        Assert.IsNull(view.ViewOf(0));

-        Assert.IsNull(view.LastViewOf(0));

-      }

-

-      [Test]

-      public void ArrayStuff()

-      {

-        Assert.IsTrue(IC.eq(view.ToArray(), 1, 2));

-        int[] extarray = new int[5];

-        view.CopyTo(extarray, 2);

-        Assert.IsTrue(IC.eq(extarray, 0, 0, 1, 2, 0));

-      }

-

-

-      [Test]

-      public void Add()

-      {

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2));

-        view.InsertFirst(10);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

-        Assert.IsTrue(IC.eq(view, 10, 1, 2));

-        view.Clear();

-        Assert.IsFalse(view.IsReadOnly);

-        Assert.IsTrue(view.AllowsDuplicates);

-        Assert.IsTrue(view.IsEmpty);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 3));

-        Assert.IsTrue(IC.eq(view));

-        view.Add(8);

-        Assert.IsFalse(view.IsEmpty);

-        Assert.IsTrue(view.AllowsDuplicates);

-        Assert.IsFalse(view.IsReadOnly);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 3));

-        Assert.IsTrue(IC.eq(view, 8));

-        view.Add(12);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12));

-        view./*ViewOf(12).*/InsertLast(15);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 12, 15));

-        view.ViewOf(12).InsertFirst(18);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

-

-        LinkedList<int> lst2 = new LinkedList<int>();

-

-        lst2.Add(90); lst2.Add(92);

-        view.AddAll(lst2);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

-        view.InsertLast(66);

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

-        Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

-      }

-

-

-      [Test]

-      public void Bxxx()

-      {

-        Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

-        Assert.AreSame(list, view.Underlying);

-        Assert.IsNull(list.Underlying);

-        Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

-        Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

-        Assert.AreEqual(0, list.Offset);

-        Assert.AreEqual(1, view.Offset);

-      }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsTrue(view.Contains(1));

-        Assert.IsFalse(view.Contains(0));

-

-        LinkedList<int> lst2 = new LinkedList<int>();

-

-        lst2.Add(2);

-        Assert.IsTrue(view.ContainsAll(lst2));

-        lst2.Add(3);

-        Assert.IsFalse(view.ContainsAll(lst2));

-        Assert.AreEqual(Speed.Linear, view.ContainsSpeed);

-        Assert.AreEqual(2, view.Count);

-        view.Add(1);

-        Assert.AreEqual(1, view.ContainsCount(2));

-        Assert.AreEqual(2, view.ContainsCount(1));

-        Assert.AreEqual(3, view.Count);

-      }

-

-

-      [Test]

-      public void CreateView()

-      {

-        LinkedList<int> view2 = (LinkedList<int>)view.View(1, 0);

-

-        Assert.AreSame(list, view2.Underlying);

-      }

-

-

-      [Test]

-      public void FIFO()

-      {

-        Assert.IsTrue(view.FIFO);

-        view.Add(23); view.Add(24); view.Add(25);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

-        Assert.AreEqual(1, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

-        view.FIFO = false;

-        Assert.IsFalse(view.FIFO);

-        Assert.AreEqual(25, view.Remove());

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 23, 24));

-      }

-

-

-      [Test]

-      public void MapEtc()

-      {

-        LinkedList<double> dbl = (LinkedList<double>)view.Map(new Fun<int, double>(delegate(int i) { return i / 10.0; }));

-

-        Assert.IsTrue(dbl.Check());

-        Assert.AreEqual(0.1, dbl[0]);

-        Assert.AreEqual(0.2, dbl[1]);

-        for (int i = 0; i < 10; i++) view.Add(i);

-

-        list = (LinkedList<int>)view.FindAll(new Fun<int, bool>(delegate(int i) { return i % 4 == 1; }));

-        Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 1, 1, 5, 9));

-      }

-

-

-      [Test]

-      public void FL()

-      {

-        Assert.AreEqual(1, view.First);

-        Assert.AreEqual(2, view.Last);

-      }

-

-

-      [Test]

-      public void Indexing()

-      {

-        list.Clear();

-        for (int i = 0; i < 20; i++) list.Add(i);

-

-        view = (LinkedList<int>)list.View(5, 7);

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

-

-        for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

-      }

-

-

-      [Test]

-      public void INsert()

-      {

-        view.Insert(0, 34);

-        view.Insert(1, 35);

-        view.Insert(4, 36);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

-

-        IList<int> list2 = new LinkedList<int>();

-

-        list2.AddAll(view);

-        view.InsertAll(3, list2);

-        Assert.IsTrue(view.Check());

-        Assert.IsTrue(IC.eq(view, 34, 35, 1, 34, 35, 1, 2, 36, 2, 36));

-      }

-

-

-      [Test]

-      public void Sort()

-      {

-        view.Add(45); view.Add(47); view.Add(46); view.Add(48);

-        Assert.IsFalse(view.IsSorted(new IC()));

-        view.Sort(new IC());

-        check();

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

-        Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        view.FIFO = false;

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 5, 3, 3, 0));

-        Assert.IsTrue(view.Remove(0));

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 5, 3, 3));

-        view.RemoveAllCopies(3);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 2, 5));

-        Assert.IsTrue(IC.eq(list, 0, 1, 2, 5, 3));

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 5, 1, 5, 3, 1, 3, 0));

-

-        view.FIFO = true;

-        view.Clear(); view.Add(1); view.Add(2);

-

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 1, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3, 0));

-        Assert.IsTrue(view.Remove(0));

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3));

-        view.RemoveAllCopies(3);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 5, 1));

-        Assert.IsTrue(IC.eq(list, 0, 2, 5, 1, 3));

-        view.Add(1); view.Add(5); view.Add(3); view.Add(1); view.Add(3); view.Add(0);

-        Assert.IsTrue(IC.eq(view, 2, 5, 1, 1, 5, 3, 1, 3, 0));

-

-        LinkedList<int> l2 = new LinkedList<int>();

-

-        l2.Add(1); l2.Add(2); l2.Add(2); l2.Add(3); l2.Add(1);

-        view.RemoveAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view, 5, 5, 1, 3, 0));

-        view.RetainAll(l2);

-        check();

-        Assert.IsTrue(IC.eq(view, 1, 3));

-        view.Add(2); view.Add(4); view.Add(5);

-        Assert.AreEqual(1, view.RemoveAt(0));

-        Assert.AreEqual(5, view.RemoveAt(3));

-        Assert.AreEqual(2, view.RemoveAt(1));

-        check();

-        Assert.IsTrue(IC.eq(view, 3, 4));

-        view.Add(8);

-        Assert.AreEqual(3, view.RemoveFirst());

-        Assert.AreEqual(8, view.RemoveLast());

-        view.Add(2); view.Add(5); view.Add(3); view.Add(1);

-        view.RemoveInterval(1, 2);

-        check();

-        Assert.IsTrue(IC.eq(view, 4, 3, 1));

-      }

-

-

-      [Test]

-      public void Reverse()

-      {

-        view.Clear();

-        for (int i = 0; i < 10; i++) view.Add(10 + i);

-

-        view.View(3, 4).Reverse();

-        check();

-        Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

-        view.Reverse();

-        Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

-        Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

-      }

-

-

-      [Test]

-      public void Slide()

-      {

-        view.Slide(1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2, 3));

-        view.Slide(-2);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1));

-        view.Slide(0, 3);

-        check();

-        Assert.IsTrue(IC.eq(view, 0, 1, 2));

-        view.Slide(2, 1);

-        check();

-        Assert.IsTrue(IC.eq(view, 2));

-        Assert.AreEqual(view, view.Slide(-1, 0));

-        check();

-        Assert.IsTrue(IC.eq(view));

-        view.Add(28);

-        Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

-      }

-      [Test]

-      public void Iterate()

-      {

-        list.Clear();

-        view = null;

-        foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 2, 7 }) list.Add(i);

-

-        view = (LinkedList<int>)list.View(list.Count - 2, 2);

-        while (true)

+        [TestFixture]

+        public class Queue

         {

-          //Console.WriteLine("View: {0}:  {1} --> {2}", view.Count, view.First, view.Last);

-          if ((view.Last - view.First) % 2 == 1)

-            view.Insert(1, 666);

-          check();

-          if (view.Offset == 0)

-            break;

-          else

-            view.Slide(-1, 2);

-        }

-        //foreach (int cell in list) Console.Write(" " + cell);

-        //Assert.IsTrue(list.Check());

-        Assert.IsTrue(IC.eq(list, 2, 4, 8, 666, 13, 6, 1, 666, 2, 666, 7));

-      }

+            private IQueue<int> list;

 

 

-      [Test]

-      public void SyncRoot()

-      {

-        Assert.AreSame(view.SyncRoot, list.SyncRoot);

-      }

-    }

+            [SetUp]

+            public void Init() { list = new LinkedList<int>(); }

 

-    [TestFixture]

-    public class MulipleViews

-    {

-      IList<int> list;

-      IList<int>[][] views;

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>();

-        for (int i = 0; i < 6; i++)

-          list.Add(i);

-        views = new IList<int>[7][];

-        for (int i = 0; i < 7; i++)

-        {

-          views[i] = new IList<int>[7 - i];

-          for (int j = 0; j < 7 - i; j++)

-            views[i][j] = list.View(i, j);

-        }

-      }

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        views = null;

-      }

-      [Test]

-      public void Insert()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(3, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAt()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(3);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 3 && i + j > 3 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void RemoveInterval()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveInterval(3, 2);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 3 ? i : i <= 5 ? 3 : i - 2, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j == 0 ? 0 : i <= 3 && i + j > 4 ? j - 2 : i > 4 || i + j <= 3 ? j : j - 1, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-

-      [Test]

-      public void InsertAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.InsertLast(777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtEnd()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(5);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i <= 5 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i <= 5 && i + j > 5 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void InsertAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before insert");

-        list.Insert(0, 777);

-        Assert.IsTrue(list.Check(), "list check after insert");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 && j == 0 ? 0 : i + 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void RemoveAtStart()

-      {

-        Assert.IsTrue(list.Check(), "list check before remove");

-        list.RemoveAt(0);

-        Assert.IsTrue(list.Check(), "list check after remove");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i == 0 ? i : i - 1, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i == 0 && j > 0 ? j - 1 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-      [Test]

-      public void Clear()

-      {

-        Assert.IsTrue(list.Check(), "list check before clear");

-        views[2][3].Clear();

-        Assert.IsTrue(list.Check(), "list check after clear");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 2 ? i : i < 6 ? 2 : i - 3, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(s(i, j), views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      private int s(int i, int j)

-      {

-        if (j == 0) return 0;

-        int k = i + j - 1; //end

-        if (i > 4 || k <= 1) return j;

-        if (i >= 2) return k > 4 ? k - 4 : 0;

-        if (i <= 2) return k >= 4 ? j - 3 : 2 - i;

-        return -1;

-      }

-      [Test]

-      public void InsertAll()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before insertAll");

-        list.InsertAll(3, list2);

-        Assert.IsTrue(list.Check(), "list check after insertAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void AddAll()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-        for (int i = 0; i < 5; i++) { list2.Add(100 + i); }

-        Assert.IsTrue(list.Check(), "list check before AddAll");

-        list.View(1, 2).AddAll(list2);

-        Assert.IsTrue(list.Check(), "list check after AddAll");

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            Assert.AreEqual(i < 3 || (i == 3 && j == 0) ? i : i + 5, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            Assert.AreEqual(i < 3 && i + j > 3 ? j + 5 : j, views[i][j].Count, "view[" + i + "][" + j + "] count");

-          }

-      }

-

-      [Test]

-      public void RemoveAll1()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new LinkedList<int>();

-            for (int k = 0; k < 6; k++) list.Add(k);

-            LinkedList<int> v = (LinkedList<int>)list.View(i, j);

-            list.RemoveAll(list2);

-            Assert.IsTrue(list.Check(), "list check after RemoveAll, i=" + i + ", j=" + j);

-          }

-        }

-      }

-      [Test]

-      public void RemoveAll2()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-        list2.Add(1); list2.Add(3); list2.Add(4);

-        Assert.IsTrue(list.Check(), "list check before RemoveAll");

-        list.RemoveAll(list2);

-

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(1, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(1, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(1, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(1, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(1, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(1, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(1, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(1, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(1, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(1, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(1, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(2, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(2, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(2, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(2, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(2, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(2, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(2, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(1, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(1, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(2, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(2, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(1, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(2, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(1, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(2, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(0, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(1, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(0, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(1, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-        Assert.IsTrue(list.Check(), "list check after RemoveAll");

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-        list2.Add(2); list2.Add(4); list2.Add(5);

-        Assert.IsTrue(list.Check(), "list check before RetainAll");

-        list.RetainAll(list2);

-        Assert.AreEqual(0, views[0][0].Offset, "view [0][0] offset");

-        Assert.AreEqual(0, views[0][1].Offset, "view [0][1] offset");

-        Assert.AreEqual(0, views[0][2].Offset, "view [0][2] offset");

-        Assert.AreEqual(0, views[0][3].Offset, "view [0][3] offset");

-        Assert.AreEqual(0, views[0][4].Offset, "view [0][4] offset");

-        Assert.AreEqual(0, views[0][5].Offset, "view [0][5] offset");

-        Assert.AreEqual(0, views[0][6].Offset, "view [0][6] offset");

-        Assert.AreEqual(0, views[1][0].Offset, "view [1][0] offset");

-        Assert.AreEqual(0, views[1][1].Offset, "view [1][1] offset");

-        Assert.AreEqual(0, views[1][2].Offset, "view [1][2] offset");

-        Assert.AreEqual(0, views[1][3].Offset, "view [1][3] offset");

-        Assert.AreEqual(0, views[1][4].Offset, "view [1][4] offset");

-        Assert.AreEqual(0, views[1][5].Offset, "view [1][5] offset");

-        Assert.AreEqual(0, views[2][0].Offset, "view [2][0] offset");

-        Assert.AreEqual(0, views[2][1].Offset, "view [2][1] offset");

-        Assert.AreEqual(0, views[2][2].Offset, "view [2][2] offset");

-        Assert.AreEqual(0, views[2][3].Offset, "view [2][3] offset");

-        Assert.AreEqual(0, views[2][4].Offset, "view [2][4] offset");

-        Assert.AreEqual(1, views[3][0].Offset, "view [3][0] offset");

-        Assert.AreEqual(1, views[3][1].Offset, "view [3][1] offset");

-        Assert.AreEqual(1, views[3][2].Offset, "view [3][2] offset");

-        Assert.AreEqual(1, views[3][3].Offset, "view [3][3] offset");

-        Assert.AreEqual(1, views[4][0].Offset, "view [4][0] offset");

-        Assert.AreEqual(1, views[4][1].Offset, "view [4][1] offset");

-        Assert.AreEqual(1, views[4][2].Offset, "view [4][2] offset");

-        Assert.AreEqual(2, views[5][0].Offset, "view [5][0] offset");

-        Assert.AreEqual(2, views[5][1].Offset, "view [5][1] offset");

-        Assert.AreEqual(3, views[6][0].Offset, "view [6][0] offset");

-

-        Assert.AreEqual(0, views[0][0].Count, "view [0][0] count");

-        Assert.AreEqual(0, views[0][1].Count, "view [0][1] count");

-        Assert.AreEqual(0, views[0][2].Count, "view [0][2] count");

-        Assert.AreEqual(1, views[0][3].Count, "view [0][3] count");

-        Assert.AreEqual(1, views[0][4].Count, "view [0][4] count");

-        Assert.AreEqual(2, views[0][5].Count, "view [0][5] count");

-        Assert.AreEqual(3, views[0][6].Count, "view [0][6] count");

-        Assert.AreEqual(0, views[1][0].Count, "view [1][0] count");

-        Assert.AreEqual(0, views[1][1].Count, "view [1][1] count");

-        Assert.AreEqual(1, views[1][2].Count, "view [1][2] count");

-        Assert.AreEqual(1, views[1][3].Count, "view [1][3] count");

-        Assert.AreEqual(2, views[1][4].Count, "view [1][4] count");

-        Assert.AreEqual(3, views[1][5].Count, "view [1][5] count");

-        Assert.AreEqual(0, views[2][0].Count, "view [2][0] count");

-        Assert.AreEqual(1, views[2][1].Count, "view [2][1] count");

-        Assert.AreEqual(1, views[2][2].Count, "view [2][2] count");

-        Assert.AreEqual(2, views[2][3].Count, "view [2][3] count");

-        Assert.AreEqual(3, views[2][4].Count, "view [2][4] count");

-        Assert.AreEqual(0, views[3][0].Count, "view [3][0] count");

-        Assert.AreEqual(0, views[3][1].Count, "view [3][1] count");

-        Assert.AreEqual(1, views[3][2].Count, "view [3][2] count");

-        Assert.AreEqual(2, views[3][3].Count, "view [3][3] count");

-        Assert.AreEqual(0, views[4][0].Count, "view [4][0] count");

-        Assert.AreEqual(1, views[4][1].Count, "view [4][1] count");

-        Assert.AreEqual(2, views[4][2].Count, "view [4][2] count");

-        Assert.AreEqual(0, views[5][0].Count, "view [5][0] count");

-        Assert.AreEqual(1, views[5][1].Count, "view [5][1] count");

-        Assert.AreEqual(0, views[6][0].Count, "view [6][0] count");

-

-

-        Assert.IsTrue(list.Check(), "list check after RetainAll");

-      }

-

-      [Test]

-      public void RemoveAllCopies()

-      {

-        LinkedList<int> list2 = new LinkedList<int>();

-        list2.Add(0); list2.Add(2); list2.Add(2); list2.Add(2); list2.Add(5); list2.Add(2); list2.Add(1);

-        for (int i = 0; i < 7; i++)

-        {

-          for (int j = 0; j < 7 - i; j++)

-          {

-            list = new LinkedList<int>();

-            list.AddAll(list2);

-            LinkedList<int> v = (LinkedList<int>)list.View(i, j);

-            list.RemoveAllCopies(2);

-            Assert.AreEqual(i == 0 ? 0 : i <= 4 ? 1 : i <= 6 ? 2 : 3, v.Offset, "v.Offset, i=" + i + ", j=" + j);

-            Assert.AreEqual((i == 0 && j > 0 ? 1 : 0) + (i <= 4 && i + j > 4 ? 1 : 0) + (i <= 6 && i + j > 6 ? 1 : 0), v.Count, "v.Count, i=" + i + ", j=" + j);

-            Assert.IsTrue(list.Check(), "list check after RemoveAllCopies, i=" + i + ", j=" + j);

-          }

-        }

-      }

-

-      private void checkDisposed(bool reverse, int start, int count)

-      {

-        int k = 0;

-        for (int i = 0; i < 7; i++)

-          for (int j = 0; j < 7 - i; j++)

-          {

-            if (i + j <= start || i >= start + count || (i <= start && i + j >= start + count) || (reverse && start <= i && start + count >= i + j))

-            {

-              try

-              {

-                k = views[i][j].Count;

-              }

-              catch (ViewDisposedException)

-              {

-                Assert.Fail("view[" + i + "][" + j + "] threw");

-              }

-              Assert.AreEqual(j, views[i][j].Count, "view[" + i + "][" + j + "] size");

-              if (reverse && ((j > 0 && start <= i && start + count >= i + j) || (j == 0 && start < i && start + count > i)))

-                Assert.AreEqual(start + (start + count - i - j), views[i][j].Offset, "view[" + i + "][" + j + "] offset (mirrored)");

-              else

-                Assert.AreEqual(i, views[i][j].Offset, "view[" + i + "][" + j + "] offset");

-            }

-            else

+

+            [Test]

+            public void Normal()

             {

-              try

-              {

-                k = views[i][j].Count;

-                Assert.Fail("view[" + i + "][" + j + "] no throw");

-              }

-              catch (ViewDisposedException) { }

+                list.EnQueue(7);

+                list.EnQueue(5);

+                list.EnQueue(7);

+                list.EnQueue(8);

+                list.EnQueue(9);

+                Assert.AreEqual(7, list.DeQueue());

+                Assert.AreEqual(5, list.DeQueue());

+                Assert.AreEqual(7, list.DeQueue());

+                Assert.AreEqual(8, list.DeQueue());

+                Assert.AreEqual(9, list.DeQueue());

             }

-          }

-      }

-

-      [Test]

-      public void Reverse()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Reverse");

-        list2.Reverse();

-        Assert.IsTrue(list.Check(), "list check after Reverse");

-        checkDisposed(true, start, count);

-      }

-      [Test]

-      public void Sort()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Sort");

-        list2.Sort();

-        Assert.IsTrue(list.Check(), "list check after Sort");

-        checkDisposed(false, start, count);

-      }

-      [Test]

-      public void Shuffle()

-      {

-        int start = 2, count = 3;

-        IList<int> list2 = list.View(start, count);

-        Assert.IsTrue(list.Check(), "list check before Shuffle");

-        list2.Shuffle();

-        Assert.IsTrue(list.Check(), "list check after Shuffle");

-        checkDisposed(false, start, count);

-      }

-

-

-    }

-

-

-    [TestFixture]

-    public class Validity

-    {

-      IList<int> list;

-      IList<int> view;

-      [SetUp]

-      public void Init()

-      {

-        list = new LinkedList<int>();

-        for (int i = 0; i < 6; i++)

-          list.Add(i);

-        view = list.View(2, 3);

-        view.Dispose();

-      }

-      [TearDown]

-      public void Dispose()

-      {

-        list = null;

-        view = null;

-      }

-

-      //Properties

-

-      //

-      /*ActiveEvents,

-AllowsDuplicates,

-ContainsSpeed,

-Count,

-CountSpeed,

-Direction,

-DuplicatesByCounting,

-FIFO,

-First,

-EqualityComparer,

-IsEmpty,

-IsReadOnly,

-this[int index],

-this[int start, int count],

-Last,

-Offset,

-SyncRoot,

-Underlying

-*/

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Add()

-      {

-        view.Add(5);

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void AddAll_int_()

-      {

-        view.AddAll<int>(new int[] { });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void AddAll()

-      {

-        view.AddAll<int>(new int[] { });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void All()

-      {

-        view.All(delegate(int i) { return false; });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Apply()

-      {

-        view.Apply(delegate(int i) { });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Backwards()

-      {

-        view.Backwards();

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Choose()

-      {

-        view.Choose();

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Contains()

-      {

-        view.Contains(0);

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Clear()

-      {

-        view.Clear();

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void ContainsAll()

-      {

-        view.ContainsAll<int>(new int[] { });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void ContainsCount()

-      {

-        view.ContainsCount(0);

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void CopyTo()

-      {

-        view.CopyTo(new int[1], 0);

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Dequeue()

-      {

-        ((LinkedList<int>)view).Dequeue();

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Enqueue()

-      {

-        ((LinkedList<int>)view).Enqueue(0);

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Exists()

-      {

-        view.Exists(delegate(int i) { return false; });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Filter()

-      {

-        view.Filter(delegate(int i) { return true; });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void Find()

-      {

-        int i = 0;

-        view.Find(ref i);

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void FindAll()

-      {

-        view.FindAll(delegate(int i) { return false; });

-      }

-      [Test]

-      [ExpectedException(typeof(ViewDisposedException))]

-      public void FindOrAdd()

-      {

-        int i = 0;

-        view.FindOrAdd(ref i);

-      }

-

-      //TODO: wonder if it is allright to wait with the exception till the enumerator is actually used?

-      /*    [Test]

-      [ExpectedException(typeof(ListDisposedException))]

-      public void GetEnumerator()

-      {

-        view.GetEnumerator();

-      }

-    */

-      /*Method overview

-      Check(),

-      checkRange(int start, int count),

-      Dispose(),

-      Equals(object obj),

-      Finalize(),

-      fireBagItemsAdded(T item, int count),

-      fireBagItemsRemoved(T item, int count),

-      fireCollectionChanged(),

-      fireCollectionCleared(int start, int count),

-      fireItemAdded(T item),

-      fireItemInserted(T item, int index),

-      fireItemRemoved(T item),

-      fireItemRemovedAt(T item, int index),

-      GetEnumerator(),

-      GetHashCode(),

-      GetSequencedHashCode(),

-      GetType(),

-      GetUnsequencedHashCode(),

-      IndexOf(T item),

-      Insert(int i, T item),

-      ViewOf().InsertLast(T item, T target),

-      InsertAll(int i, IEnumerable<T> items),

-      ViewOf().InsertFirst(T item, T target),

-      InsertFirst(T item),

-      InsertLast(T item),

-      IsSorted(SCG.IComparer<T> c),

-      LastIndexOf(T item),

-      LastViewOf(T item),

-      Map<V>(Fun<T,V> mapper),

-      Map<V>(Fun<T,V> mapper, SCG.IEqualityComparer<V> equalityComparer),

-      MemberwiseClone(),

-      modifycheck(int stamp),

-      Pop(),

-      Push(T item),

-      Remove(),

-      Remove(T item),

-      Remove(T item, out T removeditem),

-      RemoveAll(IEnumerable<T> items),

-      RemoveAllCopies(T item),

-      RemoveAt(int i),

-      RemoveFirst(),

-      RemoveInterval(int start, int count),

-      RemoveLast(),

-      RetainAll(IEnumerable<T> items),

-      Reverse(),

-      Reverse(int start, int count),

-      SequencedEquals(ISequenced<T> that),

-      Shuffle(),

-      Shuffle(System.Random rnd),

-      Slide(int offset),

-      Slide(int offset, int size),

-      Sort(),

-      Sort(SCG.IComparer<T> c),

-      ToArray(),

-      ToString(),

-      UnsequencedEquals(ICollection<T> that),

-      Update(T item),

-      Update(T item, out T olditem),

-      updatecheck(),

-      UpdateOrAdd(T item),

-      UpdateOrAdd(T item, out T olditem),

-      View(int start, int count),

-      ViewOf(T item)

-            */

-    }

-  }

-

-

-

-

-  namespace LinkedListOfTreesORLists

-  {

-    [TestFixture]

-    public class MultiLevelUnorderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ICollection<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dut = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new LinkedList<ICollection<int>>();

-        Dat = new LinkedList<ICollection<int>>();

-        Dut = new LinkedList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

 

-    [TestFixture]

-    public class MultiLevelOrderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ISequenced<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dut = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new LinkedList<ICollection<int>>();

-        Dat = new LinkedList<ICollection<int>>();

-        Dut = new LinkedList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dit); Dut.Add(dut); Dut.Add(dat);

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class MultiLevelUnOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-        dot = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(2); dat.Add(1);

-        dut.Add(3);

-        dot.Add(1); dot.Add(2);

-        Dit = new LinkedList<ISequenced<int>>();

-        Dat = new LinkedList<ISequenced<int>>();

-        Dut = new LinkedList<ISequenced<int>>();

-        Dot = new LinkedList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-        Assert.IsTrue(Dit.UnsequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

 

+            [Test]

+            [ExpectedException(typeof(InvalidOperationException))]

+            public void DeQueueEmpty()

+            {

+                list.EnQueue(5);

+                Assert.AreEqual(5, list.DeQueue());

+                list.DeQueue();

+            }

 

 

-    [TestFixture]

-    public class MultiLevelOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-        dot = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(2); dat.Add(1);

-        dut.Add(3);

-        dot.Add(1); dot.Add(2);

-        Dit = new LinkedList<ISequenced<int>>();

-        Dat = new LinkedList<ISequenced<int>>();

-        Dut = new LinkedList<ISequenced<int>>();

-        Dot = new LinkedList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsFalse(Dit.SequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

+            [TearDown]

+            public void Dispose() { list = null; }

+        }

     }

-  }

 

 

+    namespace Range

+	{

+		[TestFixture]

+		public class Range

+		{

+			private IList<int> lst;

 

 

-  namespace HashingAndEquals

-  {

-    [TestFixture]

-    public class ISequenced

-    {

-      private ISequenced<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-      }

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-        Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(7), dut.GetSequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(0); dit.Add(31);

-        dat.Add(1); dat.Add(0);

-        Assert.AreEqual(dit.GetSequencedHashCode(), dat.GetSequencedHashCode());

-        Assert.IsFalse(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dat));

-        Assert.IsTrue(dat.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dut));

-        Assert.IsTrue(dut.SequencedEquals(dit));

-        dit.Add(7);

-        ((LinkedList<int>)dut).InsertFirst(7);

-        Assert.IsFalse(dit.SequencedEquals(dut));

-        Assert.IsFalse(dut.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

+			[SetUp]

+			public void Init() { lst = new LinkedList<int>(); }

 

 

+			[TearDown]

+			public void Dispose() { lst = null; }

 

-    [TestFixture]

-    public class IEditableCollection

-    {

-      private ICollection<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-      }

-

-

-      [Test]

-      public void EqualHashButDifferent()

-      {

-        dit.Add(-1657792980); dit.Add(-1570288808);

-        dat.Add(1862883298); dat.Add(-272461342);

-        Assert.AreEqual(dit.GetUnsequencedHashCode(), dat.GetUnsequencedHashCode());

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsTrue(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-        dit.Add(7);

-        dut.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

 

+			[Test]

+			public void GetRange()

+			{

+				//Assert.IsTrue(IC.eq(lst[0, 0)));

+				for (int i = 0; i < 10; i++) lst.Add(i);

 

+				Assert.IsTrue(IC.eq(lst[0, 3], 0, 1, 2));

+				Assert.IsTrue(IC.eq(lst[3, 4], 3, 4, 5, 6));

+				Assert.IsTrue(IC.eq(lst[6, 4], 6, 7, 8, 9));

+			}

 

-    [TestFixture]

-    public class MultiLevelUnorderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ICollection<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new LinkedList<ICollection<int>>();

-        Dat = new LinkedList<ICollection<int>>();

-        Dut = new LinkedList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dat));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

 

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void BadGetRange()

+			{

+				object foo= lst[0, 11];

+			}

 

 

-    [TestFixture]

-    public class MultiLevelOrderedOfUnOrdered

-    {

-      private ICollection<int> dit, dat, dut;

-

-      private ISequenced<ICollection<int>> Dit, Dat, Dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        Dit = new LinkedList<ICollection<int>>();

-        Dat = new LinkedList<ICollection<int>>();

-        Dut = new LinkedList<ICollection<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dit.UnsequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dit); Dut.Add(dut); Dut.Add(dat);

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = null;

-        Dit = Dat = Dut = null;

-      }

-    }

+			[Test]

+			public void Backwards()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

 

+				Assert.IsTrue(IC.eq(lst.Backwards(), 9, 8, 7, 6, 5, 4, 3, 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[0, 4].Backwards(), 3, 2, 1, 0));

+				Assert.IsTrue(IC.eq(lst[3, 4].Backwards(), 6, 5, 4, 3));

+				Assert.IsTrue(IC.eq(lst[6, 4].Backwards(), 9, 8, 7, 6));

+			}

 

 

-    [TestFixture]

-    public class MultiLevelUnOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-        dot = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        dot.Add(2); dot.Add(1);

-        Dit = new LinkedList<ISequenced<int>>();

-        Dat = new LinkedList<ISequenced<int>>();

-        Dut = new LinkedList<ISequenced<int>>();

-        Dot = new LinkedList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.UnsequencedEquals(Dut));

-        Assert.IsFalse(Dit.UnsequencedEquals(Dat));

-        Assert.IsTrue(Dit.UnsequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

+			[Test]

+			public void DirectionAndCount()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

 

+				Assert.AreEqual(EnumerationDirection.Forwards, lst.Direction);

+				Assert.AreEqual(EnumerationDirection.Forwards, lst[3, 7].Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst[3, 7].Backwards().Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, lst.Backwards().Direction);

+				Assert.AreEqual(4, lst[3, 4].Count);

+				Assert.AreEqual(4, lst[3, 4].Backwards().Count);

+				Assert.AreEqual(10, lst.Backwards().Count);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException))]

+			public void MoveNextAfterUpdate()

+			{

+				for (int i = 0; i < 10; i++) lst.Add(i);

+

+				foreach (int i in lst)

+				{

+					lst.Add(45 + i);

+				}

+			}

+		}

+	}

+

+

+

+

+	namespace View

+	{

+		[TestFixture]

+		public class Simple

+		{

+			LinkedList<int> list, view;

+

+

+			[SetUp]

+			public void Init()

+			{

+				list = new LinkedList<int>();

+				list.Add(0);list.Add(1);list.Add(2);list.Add(3);

+				view = (LinkedList<int>)list.View(1, 2);

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				list = view = null;

+			}

+

+

+			void check()

+			{

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(view.Check());

+			}

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfterLow()

+			{

+				view.InsertAfter(876, 0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertAfterHigh()

+			{

+				view.InsertAfter(876, 0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBeforeLow()

+			{

+				view.InsertBefore(876, 0);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Target item not found")]

+			public void BadInsertBeforeHigh()

+			{

+				view.InsertBefore(876, 0);

+			}

+

+

+

+			[Test]

+			public void Add()

+			{

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2));

+				view.InsertFirst(10);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 10, 1, 2, 3));

+				Assert.IsTrue(IC.eq(view, 10, 1, 2));

+				view.Clear();

+				Assert.IsFalse(view.IsReadOnly);

+				Assert.IsTrue(view.AllowsDuplicates);

+				Assert.IsTrue(view.IsEmpty);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 3));

+				Assert.IsTrue(IC.eq(view));

+				view.Add(8);

+				Assert.IsFalse(view.IsEmpty);

+				Assert.IsTrue(view.AllowsDuplicates);

+				Assert.IsFalse(view.IsReadOnly);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 3));

+				Assert.IsTrue(IC.eq(view, 8));

+				view.Add(12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12));

+				view.InsertAfter(15, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 12, 15));

+				view.InsertBefore(18, 12);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15));

+

+				LinkedList<int> lst2 = new LinkedList<int>();

+

+				lst2.Add(90);lst2.Add(92);

+				view.AddAll(lst2);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92));

+				view.InsertLast(66);

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 8, 18, 12, 15, 90, 92, 66, 3));

+				Assert.IsTrue(IC.eq(view, 8, 18, 12, 15, 90, 92, 66));

+			}

+

+

+			[Test]

+			public void Bxxx()

+			{

+				Assert.IsTrue(IC.eq(view.Backwards(), 2, 1));

+                Assert.AreSame(list, view.Underlying);

+                Assert.IsNull(list.Underlying);

+                Assert.AreEqual(EnumerationDirection.Forwards, view.Direction);

+				Assert.AreEqual(EnumerationDirection.Backwards, view.Backwards().Direction);

+				Assert.AreEqual(0,list.Offset);

+				Assert.AreEqual(1,view.Offset);

+			}

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsTrue(view.Contains(1));

+				Assert.IsFalse(view.Contains(0));

+

+				LinkedList<int> lst2 = new LinkedList<int>();

+

+				lst2.Add(2);

+				Assert.IsTrue(view.ContainsAll(lst2));

+				lst2.Add(3);

+				Assert.IsFalse(view.ContainsAll(lst2));

+				Assert.AreEqual(Speed.Linear, view.ContainsSpeed);

+				Assert.AreEqual(2, view.Count);

+				view.Add(1);

+				Assert.AreEqual(1, view.ContainsCount(2));

+				Assert.AreEqual(2, view.ContainsCount(1));

+				Assert.AreEqual(3, view.Count);

+			}

+

+

+			[Test]

+			public void CreateView()

+			{

+				LinkedList<int> view2 = (LinkedList<int>)view.View(1, 0);

+

+                Assert.AreSame(list, view2.Underlying);

+            }

 

 

-    [TestFixture]

-    public class MultiLevelOrderedOfOrdered

-    {

-      private ISequenced<int> dit, dat, dut, dot;

-

-      private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new LinkedList<int>();

-        dat = new LinkedList<int>();

-        dut = new LinkedList<int>();

-        dot = new LinkedList<int>();

-        dit.Add(2); dit.Add(1);

-        dat.Add(1); dat.Add(2);

-        dut.Add(3);

-        dot.Add(2); dot.Add(1);

-        Dit = new LinkedList<ISequenced<int>>();

-        Dat = new LinkedList<ISequenced<int>>();

-        Dut = new LinkedList<ISequenced<int>>();

-        Dot = new LinkedList<ISequenced<int>>();

-      }

-

-

-      [Test]

-      public void Check()

-      {

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsTrue(dit.SequencedEquals(dot));

-        Assert.IsFalse(dit.SequencedEquals(dut));

-      }

-

-

-      [Test]

-      public void Multi()

-      {

-        Dit.Add(dit); Dit.Add(dut); Dit.Add(dit);

-        Dat.Add(dut); Dat.Add(dit); Dat.Add(dat);

-        Dut.Add(dot); Dut.Add(dut); Dut.Add(dit);

-        Dot.Add(dit); Dot.Add(dit); Dot.Add(dut);

-        Assert.IsTrue(Dit.SequencedEquals(Dut));

-        Assert.IsFalse(Dit.SequencedEquals(Dat));

-        Assert.IsFalse(Dit.SequencedEquals(Dot));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = dat = dut = dot = null;

-        Dit = Dat = Dut = Dot = null;

-      }

-    }

-  }

-}
\ No newline at end of file
+			[Test]

+			public void FIFO()

+			{

+				Assert.IsTrue(view.FIFO);

+				view.Add(23);view.Add(24);view.Add(25);

+				check();

+				Assert.IsTrue(IC.eq(view, 1, 2, 23, 24, 25));

+				Assert.AreEqual(1, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24, 25));

+				view.FIFO = false;

+				Assert.IsFalse(view.FIFO);

+				Assert.AreEqual(25, view.Remove());

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 23, 24));

+			}

+

+

+			[Test]

+			public void MapEtc()

+			{

+				LinkedList<double> dbl = (LinkedList<double>)view.Map(new Mapper<int,double>(delegate(int i){return i/10.0;}));

+

+				Assert.IsTrue(dbl.Check());

+				Assert.AreEqual(0.1, dbl[0]);

+				Assert.AreEqual(0.2, dbl[1]);

+				for (int i = 0; i < 10; i++) view.Add(i);

+

+				list = (LinkedList<int>)view.FindAll(new Filter<int>(delegate(int i){return i%4==1;}));

+				Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 1, 1, 5, 9));

+			}

+

+

+			[Test]

+			public void FL()

+			{

+				Assert.AreEqual(1, view.First);

+				Assert.AreEqual(2, view.Last);

+			}

+

+

+			[Test]

+			public void Indexing()

+			{

+				list.Clear();

+				for (int i = 0; i < 20; i++) list.Add(i);

+

+				view = (LinkedList<int>)list.View(5, 7);

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i + 5, view[i]);

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.IndexOf(i + 5));

+

+				for (int i = 0; i < 7; i++) Assert.AreEqual(i, view.LastIndexOf(i + 5));

+			}

+

+

+			[Test]

+			public void INsert()

+			{

+				view.Insert(0, 34);

+				view.Insert(1, 35);

+				view.Insert(4, 36);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 2, 36));

+

+				IList<int> list2 = new LinkedList<int>();

+

+				list2.AddAll(view);

+				view.InsertAll(3, list2);

+				Assert.IsTrue(view.Check());

+				Assert.IsTrue(IC.eq(view, 34, 35, 1, 34, 35, 1, 2, 36, 2, 36));

+			}

+

+

+			[Test]

+			public void Sort()

+			{

+				view.Add(45);view.Add(47);view.Add(46);view.Add(48);

+				Assert.IsFalse(view.IsSorted(new IC()));

+				view.Sort(new IC());

+				check();

+				Assert.IsTrue(IC.eq(list, 0, 1, 2, 45, 46, 47, 48, 3));

+				Assert.IsTrue(IC.eq(view, 1, 2, 45, 46, 47, 48));

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 1, 2, 1, 5, 3, 1, 3, 0));

+				Assert.IsTrue(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 1, 5, 3, 1, 3, 0));

+				Assert.IsTrue(view.Remove(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3, 0));

+				Assert.IsTrue(view.Remove(0));

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5, 3, 1, 3));

+				view.RemoveAllCopies(3);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 5, 1));

+				Assert.IsTrue(IC.eq(list, 0, 2, 5, 1, 3));

+				view.Add(1);view.Add(5);view.Add(3);view.Add(1);view.Add(3);view.Add(0);

+				Assert.IsTrue(IC.eq(view, 2, 5, 1, 1, 5, 3, 1, 3, 0));

+

+				LinkedList<int> l2 = new LinkedList<int>();

+

+				l2.Add(1);l2.Add(2);l2.Add(2);l2.Add(3);l2.Add(1);

+				view.RemoveAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view, 5, 5, 1, 3, 0));

+				view.RetainAll(l2);

+				check();

+				Assert.IsTrue(IC.eq(view, 1, 3));

+				view.Add(2);view.Add(4);view.Add(5);

+				Assert.AreEqual(1, view.RemoveAt(0));

+				Assert.AreEqual(5, view.RemoveAt(3));

+				Assert.AreEqual(2, view.RemoveAt(1));

+				check();

+				Assert.IsTrue(IC.eq(view, 3, 4));

+				view.Add(8);

+				Assert.AreEqual(3, view.RemoveFirst());

+				Assert.AreEqual(8, view.RemoveLast());

+				view.Add(2);view.Add(5);view.Add(3);view.Add(1);

+				view.RemoveInterval(1, 2);

+				check();

+				Assert.IsTrue(IC.eq(view, 4, 3, 1));

+			}

+

+

+			[Test]

+			public void Reverse()

+			{

+				view.Clear();

+				for (int i = 0; i < 10; i++) view.Add(10 + i);

+

+				view.Reverse(3, 4);

+				check();

+				Assert.IsTrue(IC.eq(view, 10, 11, 12, 16, 15, 14, 13, 17, 18, 19));

+				view.Reverse();

+				Assert.IsTrue(IC.eq(view, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10));

+				Assert.IsTrue(IC.eq(list, 0, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 3));

+			}

+

+

+			[Test]

+			public void Slide()

+			{

+				view.Slide(1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2, 3));

+				view.Slide(-2);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1));

+				view.Slide(0, 3);

+				check();

+				Assert.IsTrue(IC.eq(view, 0, 1, 2));

+				view.Slide(2, 1);

+				check();

+				Assert.IsTrue(IC.eq(view, 2));

+				view.Slide(-1, 0);

+				check();

+				Assert.IsTrue(IC.eq(view));

+				view.Add(28);

+				Assert.IsTrue(IC.eq(list, 0, 28, 1, 2, 3));

+			}

+			[Test]

+			public void Iterate()

+			{

+				list.Clear();

+				view = null;

+				foreach (int i in new int[] { 2, 4, 8, 13, 6, 1, 2, 7 }) list.Add(i);

+

+				view = (LinkedList<int>)list.View(list.Count - 2, 2);

+				while (true)

+				{

+					//Console.WriteLine("View: {0}:  {1} --> {2}", view.Count, view.First, view.Last);

+					if ((view.Last - view.First) % 2 == 1)

+						view.Insert(1, 666);

+					check();

+					if (view.Offset == 0)

+						break;

+					else

+						view.Slide(-1,2);

+				}

+				//foreach (int i in list) Console.Write(" " + i);

+				//Assert.IsTrue(list.Check());

+				Assert.IsTrue(IC.eq(list, 2, 4, 8, 666, 13, 6, 1, 666, 2, 666, 7));

+			}

+

+

+			[Test]

+			public void SyncRoot()

+			{

+				Assert.AreSame(view.SyncRoot, list.SyncRoot);

+			}

+		}

+	}

+

+

+

+

+	namespace LinkedListOfTreesORLists

+	{

+		[TestFixture]

+		public class MultiLevelUnorderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ICollection<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new TreeSet<int>(new IC());

+				dut = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new LinkedList<ICollection<int>>();

+				Dat = new LinkedList<ICollection<int>>();

+				Dut = new LinkedList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ISequenced<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new TreeSet<int>(new IC());

+				dut = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new LinkedList<ICollection<int>>();

+				Dat = new LinkedList<ICollection<int>>();

+				Dut = new LinkedList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new TreeSet<int>(new IC());

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+				dot = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(2);dat.Add(1);

+				dut.Add(3);

+				dot.Add(1);dot.Add(2);

+				Dit = new LinkedList<ISequenced<int>>();

+				Dat = new LinkedList<ISequenced<int>>();

+				Dut = new LinkedList<ISequenced<int>>();

+				Dot = new LinkedList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new TreeSet<int>(new IC());

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+				dot = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(2);dat.Add(1);

+				dut.Add(3);

+				dot.Add(1);dot.Add(2);

+				Dit = new LinkedList<ISequenced<int>>();

+				Dat = new LinkedList<ISequenced<int>>();

+				Dut = new LinkedList<ISequenced<int>>();

+				Dot = new LinkedList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+	}

+

+

+

+

+	namespace HashingAndEquals

+	{

+		[TestFixture]

+		public class ISequenced

+		{

+			private ISequenced<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(7), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(0);dit.Add(31);

+				dat.Add(1);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				((LinkedList<int>)dut).InsertFirst(7);

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class IEditableCollection

+		{

+			private ICollection<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count, params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count << 16) + retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1, 3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1, 3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void EqualHashButDifferent()

+			{

+				dit.Add(2);dit.Add(1);

+				dat.Add(3);dat.Add(0);

+				Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());

+				Assert.IsFalse(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				dut.Add(7);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnorderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ICollection<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new LinkedList<ICollection<int>>();

+				Dat = new LinkedList<ICollection<int>>();

+				Dut = new LinkedList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Assert.IsTrue(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfUnOrdered

+		{

+			private ICollection<int> dit, dat, dut;

+

+			private ISequenced<ICollection<int>> Dit, Dat, Dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				Dit = new LinkedList<ICollection<int>>();

+				Dat = new LinkedList<ICollection<int>>();

+				Dut = new LinkedList<ICollection<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dut));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = null;

+				Dit = Dat = Dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelUnOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ICollection<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+				dot = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				dot.Add(2);dot.Add(1);

+				Dit = new LinkedList<ISequenced<int>>();

+				Dat = new LinkedList<ISequenced<int>>();

+				Dut = new LinkedList<ISequenced<int>>();

+				Dot = new LinkedList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsTrue(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class MultiLevelOrderedOfOrdered

+		{

+			private ISequenced<int> dit, dat, dut, dot;

+

+			private ISequenced<ISequenced<int>> Dit, Dat, Dut, Dot;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new LinkedList<int>();

+				dat = new LinkedList<int>();

+				dut = new LinkedList<int>();

+				dot = new LinkedList<int>();

+				dit.Add(2);dit.Add(1);

+				dat.Add(1);dat.Add(2);

+				dut.Add(3);

+				dot.Add(2);dot.Add(1);

+				Dit = new LinkedList<ISequenced<int>>();

+				Dat = new LinkedList<ISequenced<int>>();

+				Dut = new LinkedList<ISequenced<int>>();

+				Dot = new LinkedList<ISequenced<int>>();

+			}

+

+

+			[Test]

+			public void Check()

+			{

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsTrue(dit.Equals(dot));

+				Assert.IsFalse(dit.Equals(dut));

+			}

+

+

+			[Test]

+			public void Multi()

+			{

+				Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);

+				Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);

+				Dut.Add(dot);Dut.Add(dut);Dut.Add(dit);

+				Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);

+				Assert.IsTrue(Dit.Equals(Dut));

+				Assert.IsFalse(Dit.Equals(Dat));

+				Assert.IsFalse(Dit.Equals(Dot));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = dat = dut = dot = null;

+				Dit = Dat = Dut = Dot = null;

+			}

+		}

+	}

+}

+#endif

diff --git a/mcs/class/Mono.C5/Test/nunit.csproj b/mcs/class/Mono.C5/Test/nunit.csproj
index 48ae348935d..8263becbea6 100644
--- a/mcs/class/Mono.C5/Test/nunit.csproj
+++ b/mcs/class/Mono.C5/Test/nunit.csproj
@@ -1,7 +1,7 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project  DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <ProductVersion>8.0.50727</ProductVersion>

+    <ProductVersion>8.0.40426</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

     <ProjectGuid>{08CBFDEB-A2E2-4F0E-A4E1-B996B05569DE}</ProjectGuid>

     <OutputType>Library</OutputType>

@@ -32,6 +32,25 @@
     <IncrementalBuild>false</IncrementalBuild>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="nunit.framework, Version=2.1.4.0, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\NUnit\nunit.framework\bin\Debug\nunit.framework.dll</HintPath>

+      <Name>nunit.framework</Name>

+      <SpecificVersion>False</SpecificVersion>

+      <Aliases>global</Aliases>

+      <ExecutableExtension>.dll</ExecutableExtension>

+    </Reference>

+    <Reference Include="System">

+      <HintPath>..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.2.30703\System.dll</HintPath>

+      <Name>System</Name>

+    </Reference>

+    <Reference Include="System.Data">

+      <HintPath>..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.2.30703\System.Data.dll</HintPath>

+      <Name>System.Data</Name>

+    </Reference>

+    <Reference Include="System.Xml">

+      <HintPath>..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.2.30703\System.XML.dll</HintPath>

+      <Name>System.XML</Name>

+    </Reference>

     <ProjectReference Include="..\C5\C5.csproj">

       <Project>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

@@ -39,14 +58,12 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="arrays\CircularQueueTest.cs" />

     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="BasesTest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Records.cs" />

     <Compile Include="Sorting.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -80,10 +97,6 @@
     <Compile Include="linkedlists\LinkedListTest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="templates\Clone.cs" />

-    <Compile Include="templates\Events.cs" />

-    <Compile Include="templates\GenericCollectionTester.cs" />

-    <Compile Include="templates\List.cs" />

     <Compile Include="trees\Bag.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -93,16 +106,12 @@
     <Compile Include="trees\RedBlackTreeSetTests.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="WrappersTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <AppDesigner Include="Properties\" />

+    <AppDesigner Include="Project\" />

   </ItemGroup>

   <ItemGroup>

-    <Reference Include="nunit.framework, Version=2.2.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />

-  </ItemGroup>

-  <ItemGroup>

-    <Folder Include="Properties\" />

+    <Folder Include="Project\" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/mcs/class/Mono.C5/Test/nunit.csproj.user b/mcs/class/Mono.C5/Test/nunit.csproj.user
new file mode 100644
index 00000000000..9d081a79080
--- /dev/null
+++ b/mcs/class/Mono.C5/Test/nunit.csproj.user
@@ -0,0 +1,58 @@
+<Project  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <LastOpenVersion>8.0.40426</LastOpenVersion>

+    <ReferencePath>C:\Programmer\NUnit V2.1\bin\</ReferencePath>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

+    <DebugSecurityZoneURL>

+    </DebugSecurityZoneURL>

+    <DebugSecurityZone>NoZone</DebugSecurityZone>

+    <EnableASPDebugging>false</EnableASPDebugging>

+    <EnableASPXDebugging>false</EnableASPXDebugging>

+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

+    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>

+    <RemoteDebugEnabled>false</RemoteDebugEnabled>

+    <RemoteDebugMachine>

+    </RemoteDebugMachine>

+    <StartAction>Project</StartAction>

+    <StartArguments>

+    </StartArguments>

+    <StartPage>

+    </StartPage>

+    <StartProgram>

+    </StartProgram>

+    <StartURL>

+    </StartURL>

+    <StartWorkingDirectory>

+    </StartWorkingDirectory>

+    <StartWithIE>false</StartWithIE>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

+    <DebugSecurityZoneURL>

+    </DebugSecurityZoneURL>

+    <DebugSecurityZone>NoZone</DebugSecurityZone>

+    <EnableASPDebugging>false</EnableASPDebugging>

+    <EnableASPXDebugging>false</EnableASPXDebugging>

+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

+    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>

+    <RemoteDebugEnabled>false</RemoteDebugEnabled>

+    <RemoteDebugMachine>

+    </RemoteDebugMachine>

+    <StartAction>Project</StartAction>

+    <StartArguments>

+    </StartArguments>

+    <StartPage>

+    </StartPage>

+    <StartProgram>

+    </StartProgram>

+    <StartURL>

+    </StartURL>

+    <StartWorkingDirectory>

+    </StartWorkingDirectory>

+    <StartWithIE>true</StartWithIE>

+  </PropertyGroup>

+  <PropertyGroup>

+    <ProjectView>ProjectFiles</ProjectView>

+    <ProjectTrust>0</ProjectTrust>

+  </PropertyGroup>

+</Project>
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/Test/templates/Clone.cs b/mcs/class/Mono.C5/Test/templates/Clone.cs
deleted file mode 100644
index b8b655fdca8..00000000000
--- a/mcs/class/Mono.C5/Test/templates/Clone.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-

-namespace C5UnitTests.Templates.Extensible

-{

-  class Clone

-  {

-    public static void Tester<U>() where U : class, IExtensible<int>, new()

-    {

-      U extensible = new U();

-      RealTester<U>(extensible);

-      extensible.Add(12);

-      extensible.Add(23);

-      extensible.Add(56);

-      RealTester<U>(extensible);

-    }

-

-    public static void ViewTester<U>() where U : class, IList<int>, new()

-    {

-      U baselist = new U();

-      baselist.Add(12);

-      baselist.Add(23);

-      baselist.Add(56);

-      baselist.Add(112);

-      baselist.Add(123);

-      baselist.Add(156);

-      U view = (U)baselist.View(2, 2);

-      RealTester<U>(view);

-    }

-

-    public static void RealTester<U>(U extensible) where U : class, IExtensible<int>, new()

-    {

-      object clone = extensible.Clone();

-      Assert.IsNotNull(clone);

-      Assert.AreEqual(typeof(U), clone.GetType(),

-        String.Format("Wrong type '{0}' of clone of '{1}'", clone.GetType(), typeof(U)));

-      U theClone = clone as U;

-      Assert.IsTrue(theClone.Check(), "Clone does not pass Check()");

-      if (typeof(ICollection<int>).IsAssignableFrom(typeof(U)))

-        Assert.IsTrue(EqualityComparer<U>.Default.Equals(extensible, theClone), "Clone has wrong contents");

-      else //merely extensible

-        Assert.IsTrue(IC.eq(theClone, extensible.ToArray()), "Clone has wrong contents");

-    }

-  }

-

-  class Serialization

-  {

-    public static void Tester<U>() where U : class, IExtensible<int>, new()

-    {

-      U extensible = new U();

-      realtester<U>(extensible);

-      extensible.Add(12);

-      extensible.Add(23);

-      extensible.Add(56);

-      realtester<U>(extensible);

-    }

-

-    public static void ViewTester<U>() where U : class, IList<int>, new()

-    {

-      U baselist = new U();

-      baselist.Add(12);

-      baselist.Add(23);

-      baselist.Add(56);

-      baselist.Add(112);

-      baselist.Add(123);

-      baselist.Add(156);

-      U view = (U)baselist.View(2, 2);

-      realtester<U>(view);

-    }

-

-    private static void realtester<U>(U extensible) where U : class, IExtensible<int>, new()

-    {

-      System.Runtime.Serialization.Formatters.Binary.BinaryFormatter formatter =

-        new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();

-      System.IO.Stream stream = new System.IO.MemoryStream();

-      formatter.Serialize(stream, extensible);

-      stream.Flush();

-      stream.Seek(0L, System.IO.SeekOrigin.Begin);

-      object clone = formatter.Deserialize(stream);

-

-      Assert.IsNotNull(clone);

-      Assert.AreEqual(typeof(U), clone.GetType(),

-        String.Format("Wrong type '{0}' of clone of '{1}'", clone.GetType(), typeof(U)));

-      U theClone = clone as U;

-      Assert.IsTrue(theClone.Check(), "Clone does not pass Check()");

-      if (typeof(ICollection<int>).IsAssignableFrom(typeof(U)))

-        Assert.IsTrue(EqualityComparer<U>.Default.Equals(extensible, theClone), "Clone has wrong contents");

-      else //merely extensible

-        Assert.IsTrue(IC.eq(theClone, extensible.ToArray()), "Clone has wrong contents");

-    }

-  }

-

-}

-

diff --git a/mcs/class/Mono.C5/Test/templates/Events.cs b/mcs/class/Mono.C5/Test/templates/Events.cs
deleted file mode 100644
index 80ca259c237..00000000000
--- a/mcs/class/Mono.C5/Test/templates/Events.cs
+++ /dev/null
@@ -1,928 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-using System.Reflection;

-

-namespace C5UnitTests.Templates.Events

-{

-  public abstract class CollectionValueTester<TCollection, TItem> : GenericCollectionTester<TCollection, EventTypeEnum>

-    where TCollection : ICollectionValue<TItem>

-  {

-    protected TCollection collection;

-    protected CollectionEventList<TItem> seen;

-    protected EventTypeEnum listenTo;

-    protected void listen() { seen.Listen(collection, listenTo); }

-

-    public override void SetUp(TCollection list, EventTypeEnum testSpec)

-    {

-      this.collection = list;

-      listenTo = testSpec;

-      seen = new CollectionEventList<TItem>(EqualityComparer<TItem>.Default);

-    }

-

-    public SCG.IEnumerable<EventTypeEnum> SpecsBasic

-    {

-      get

-      {

-        CircularQueue<EventTypeEnum> specs = new CircularQueue<EventTypeEnum>();

-        //foreach (EventTypeEnum listenTo in Enum.GetValues(typeof(EventTypeEnum)))

-        //  if ((listenTo & ~EventTypeEnum.Basic) == 0)

-        //    specs.Enqueue(listenTo);

-        //specs.Enqueue(EventTypeEnum.Added | EventTypeEnum.Removed);

-        for (int spec = 0; spec <= (int)EventTypeEnum.Basic; spec++)

-          specs.Enqueue((EventTypeEnum)spec);

-        return specs;

-      }

-    }

-    public SCG.IEnumerable<EventTypeEnum> SpecsAll

-    {

-      get

-      {

-        CircularQueue<EventTypeEnum> specs = new CircularQueue<EventTypeEnum>();

-        //foreach (EventTypeEnum listenTo in Enum.GetValues(typeof(EventTypeEnum)))

-        //  specs.Enqueue(listenTo);

-        //specs.Enqueue(EventTypeEnum.Added | EventTypeEnum.Removed);

-

-        for (int spec = 0; spec <= (int)EventTypeEnum.All; spec++)

-          specs.Enqueue((EventTypeEnum)spec);

-        return specs;

-      }

-    }

-  }

-  public abstract class CollectionValueTester<U> : CollectionValueTester<U, int> where U : ICollectionValue<int>

-  {

-  }

-

-  public class ExtensibleTester<U> : CollectionValueTester<U> where U : IExtensible<int>

-  {

-    public override SCG.IEnumerable<EventTypeEnum> GetSpecs()

-    {

-      return SpecsBasic;

-    }

-    [Test]

-    public virtual void Listenable()

-    {

-      Assert.AreEqual(EventTypeEnum.Basic, collection.ListenableEvents);

-      Assert.AreEqual(EventTypeEnum.None, collection.ActiveEvents);

-      listen();

-      Assert.AreEqual(listenTo, collection.ActiveEvents);

-    }

-

-    [Test]

-    public void Add()

-    {

-      listen();

-      seen.Check(new CollectionEvent<int>[0]);

-      collection.Add(23);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-    [Test]

-    public void AddAll()

-    {

-      for (int i = 0; i < 10; i++)

-      {

-        collection.Add(10 * i + 5);

-      }

-      listen();

-      collection.AddAll<int>(new int[] { 45, 200, 56, 67 });

-      seen.Check(collection.AllowsDuplicates ?

-        collection.DuplicatesByCounting ?

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(200, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(55, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(65, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)}

-        :

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(200, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(56, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)}

-          :

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(200, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.AddAll<int>(new int[] { });

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-  }

-

-  public class CollectionTester<U> : ExtensibleTester<U> where U : ICollection<int>

-  {

-    [Test]

-    public void Update()

-    {

-      collection.Add(4); collection.Add(54); collection.Add(56); collection.Add(8);

-      listen();

-      collection.Update(53);

-      seen.Check(

-        collection.AllowsDuplicates ?

-        collection.DuplicatesByCounting ?

-        new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(54, 2), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 2), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          }

-        : new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(54, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          }

-        : new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(54, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          });

-      collection.Update(67);

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void FindOrAdd()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      int val = 53;

-      collection.FindOrAdd(ref val);

-      seen.Check(new CollectionEvent<int>[] { });

-      val = 67;

-      collection.FindOrAdd(ref val);

-      seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-    }

-

-    [Test]

-    public void UpdateOrAdd()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      int val = 53;

-      collection.UpdateOrAdd(val);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(53, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      val = 67;

-      collection.UpdateOrAdd(val);

-      seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.UpdateOrAdd(51, out val);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(53, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(51, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      val = 67;

-      collection.UpdateOrAdd(81, out val);

-      seen.Check(new CollectionEvent<int>[] { 

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(81, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-    }

-

-    [Test]

-    public void RemoveItem()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.Remove(53);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Remove(11);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(18, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-    [Test]

-    public void RemoveAll()

-    {

-      for (int i = 0; i < 10; i++)

-      {

-        collection.Add(10 * i + 5);

-      }

-      listen();

-      collection.RemoveAll<int>(new int[] { 32, 187, 45 });

-      //TODO: the order depends on internals of the HashSet

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(35, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(45, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.RemoveAll<int>(new int[] { 200, 300 });

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void RetainAll()

-    {

-      for (int i = 0; i < 10; i++)

-      {

-        collection.Add(10 * i + 5);

-      }

-      listen();

-      collection.RetainAll<int>(new int[] { 32, 187, 45, 62, 75, 82, 95, 2 });

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(15, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(25, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(55, 1), collection),

-          //new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(75, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.RetainAll<int>(new int[] { 32, 187, 45, 62, 75, 82, 95, 2 });

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void RemoveAllCopies()

-    {

-      for (int i = 0; i < 10; i++)

-      {

-        collection.Add(3 * i + 5);

-      }

-      listen();

-      collection.RemoveAllCopies(14);

-      seen.Check(

-        collection.AllowsDuplicates ?

-          collection.DuplicatesByCounting ?

-            new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(11, 3), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)}

-          :

-          new CollectionEvent<int>[] {

-            new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(11, 1), collection),

-            new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(14, 1), collection),

-            new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(17, 1), collection),

-            new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)}

-        :

-        new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(11, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.RemoveAllCopies(14);

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public virtual void Clear()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection.Clear();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedEventArgs(true, collection.AllowsDuplicates ? 3 : 2), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.Clear();

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-  }

-

-  public class IndexedTester<U> : CollectionTester<U> where U : IIndexed<int>

-  {

-    [Test]

-    public void RemoveAt()

-    {

-      collection.Add(4); collection.Add(16); collection.Add(28);

-      listen();

-      collection.RemoveAt(1);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(16,1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(16, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-    [Test]

-    public void RemoveInterval()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.RemoveInterval(1, 2);

-      seen.Check(new CollectionEvent<int>[] {

-        collection is IList<int> ?

-           new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,2,1), collection):

-           new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedEventArgs(false,2), collection),

-         new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.RemoveInterval(1, 0);

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-  }

-

-  public class SortedIndexedTester<U> : IndexedTester<U> where U : IIndexedSorted<int>

-  {

-    [Test]

-    public void DeleteMinMax()

-    {

-      collection.Add(34);

-      collection.Add(56);

-      collection.Add(34);

-      collection.Add(12);

-      listen();

-      collection.DeleteMax();

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), collection),

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.DeleteMin();

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(12, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-    }

-

-    [Test]

-    public void AddSorted()

-    {

-      listen();

-      collection.AddSorted(collection.AllowsDuplicates ? new int[] { 31, 62, 63, 93 } : new int[] { 31, 62, 93 });

-      seen.Check(collection.AllowsDuplicates ?

-        collection.DuplicatesByCounting ?

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(31, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(62, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(62, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(93, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)}

-        :

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(31, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(62, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(63, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(93, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)}

-          :

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(31, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(62, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(93, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.AddSorted(new int[] { });

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void RemoveRange()

-    {

-      for (int i = 0; i < 20; i++)

-        collection.Add(i * 10 + 5);

-      listen();

-      collection.RemoveRangeFrom(173);

-      //TODO: fix order to remove in:

-      seen.Check(

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(195, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(185, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(175, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.RemoveRangeFromTo(83, 113);

-      seen.Check(

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(105, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(95, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(85, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.RemoveRangeTo(33);

-      seen.Check(

-          new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(5, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(15, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(25, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.RemoveRangeFrom(173);

-      seen.Check(new CollectionEvent<int>[] { });

-      collection.RemoveRangeFromTo(83, 113);

-      seen.Check(new CollectionEvent<int>[] { });

-      collection.RemoveRangeTo(33);

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-  }

-

-  public class ListTester<U> : IndexedTester<U> where U : IList<int>

-  {

-    public override SCG.IEnumerable<EventTypeEnum> GetSpecs()

-    {

-      return SpecsAll;

-    }

-

-    [Test]

-    public override void Listenable()

-    {

-      Assert.AreEqual(EventTypeEnum.All, collection.ListenableEvents);

-      Assert.AreEqual(EventTypeEnum.None, collection.ActiveEvents);

-      listen();

-      Assert.AreEqual(listenTo, collection.ActiveEvents);

-    }

-    [Test]

-    public void SetThis()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection[1] = 45;

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(56,1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          });

-    }

-

-    [Test]

-    public void Insert()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection.Insert(1, 45);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          });

-    }

-

-    [Test]

-    public void InsertAll()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection.InsertAll<int>(1, new int[] { 666, 777, 888 });

-      //seen.Print(Console.Error);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(666,1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(666, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(777,2), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(777, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(888,3), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(888, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          });

-      collection.InsertAll<int>(1, new int[] { });

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void InsertFirstLast()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.InsertFirst(45);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(45,0), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(45, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          });

-      collection.InsertLast(88);

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(88,4), collection),

-          new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(88, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-          });

-    }

-

-    [Test]

-    public void Remove()

-    {

-      collection.FIFO = false;

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.Remove();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(18, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.FIFO = true;

-      collection.Remove();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(4, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-    [Test]

-    public void RemoveFirst()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.RemoveFirst();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(4,0), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(4, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-    [Test]

-    public void RemoveLast()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.RemoveLast();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(18,2), collection),

-          new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(18, 1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-    [Test]

-    public void Reverse()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection.Reverse();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.View(1, 0).Reverse();

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-

-    [Test]

-    public void Sort()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection.Sort();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.View(1, 0).Sort();

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void Shuffle()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(8);

-      listen();

-      collection.Shuffle();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.View(1, 0).Shuffle();

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public override void Clear()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.View(1, 1).Clear();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(false,1,1), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.Clear();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,2,0), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.Clear();

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    [Test]

-    public void ListDispose()

-    {

-      collection.Add(4); collection.Add(56); collection.Add(18);

-      listen();

-      collection.View(1, 1).Dispose();

-      seen.Check(new CollectionEvent<int>[] { });

-      collection.Dispose();

-      seen.Check(new CollectionEvent<int>[] {

-          new CollectionEvent<int>(EventTypeEnum.Cleared, new ClearedRangeEventArgs(true,3,0), collection),

-          new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-        });

-      collection.Dispose();

-      seen.Check(new CollectionEvent<int>[] { });

-    }

-

-    /* 

- 

-     * /

-        //[TearDown]

-        //public void Dispose() { list = null; seen = null; }

-        /*

-        [Test]

-        [ExpectedException(typeof(UnlistenableEventException))]

-        public void ViewChanged()

-        {

-          IList<int> w = collection.View(0, 0);

-          w.CollectionChanged += new CollectionChangedHandler<int>(w_CollectionChanged);

-        }

-

-        [Test]

-        [ExpectedException(typeof(UnlistenableEventException))]

-        public void ViewCleared()

-        {

-          IList<int> w = collection.View(0, 0);

-          w.CollectionCleared += new CollectionClearedHandler<int>(w_CollectionCleared);

-        }

-

-        [Test]

-        [ExpectedException(typeof(UnlistenableEventException))]

-        public void ViewAdded()

-        {

-          IList<int> w = collection.View(0, 0);

-          w.ItemsAdded += new ItemsAddedHandler<int>(w_ItemAdded);

-        }

-

-        [Test]

-        [ExpectedException(typeof(UnlistenableEventException))]

-        public void ViewInserted()

-        {

-          IList<int> w = collection.View(0, 0);

-          w.ItemInserted += new ItemInsertedHandler<int>(w_ItemInserted);

-        }

-

-        [Test]

-        [ExpectedException(typeof(UnlistenableEventException))]

-        public void ViewRemoved()

-        {

-          IList<int> w = collection.View(0, 0);

-          w.ItemsRemoved += new ItemsRemovedHandler<int>(w_ItemRemoved);

-        }

-

-        [Test]

-        [ExpectedException(typeof(UnlistenableEventException))]

-        public void ViewRemovedAt()

-        {

-          IList<int> w = collection.View(0, 0);

-          w.ItemRemovedAt += new ItemRemovedAtHandler<int>(w_ItemRemovedAt);

-        }

-

-        void w_CollectionChanged(object sender)

-        {

-          throw new NotImplementedException();

-        }

-

-        void w_CollectionCleared(object sender, ClearedEventArgs eventArgs)

-        {

-          throw new NotImplementedException();

-        }

-

-        void w_ItemAdded(object sender, ItemCountEventArgs<int> eventArgs)

-        {

-          throw new NotImplementedException();

-        }

-

-        void w_ItemInserted(object sender, ItemAtEventArgs<int> eventArgs)

-        {

-          throw new NotImplementedException();

-        }

-

-        void w_ItemRemoved(object sender, ItemCountEventArgs<int> eventArgs)

-        {

-          throw new NotImplementedException();

-        }

-

-        void w_ItemRemovedAt(object sender, ItemAtEventArgs<int> eventArgs)

-        {

-          throw new NotImplementedException();

-        }*/

-  }

-

-  public class StackTester<U> : CollectionValueTester<U> where U : IStack<int>

-  {

-    public override SCG.IEnumerable<EventTypeEnum> GetSpecs()

-    {

-      return SpecsBasic;

-    }

-

-    [Test]

-    public void PushPop()

-    {

-      listen();

-      seen.Check(new CollectionEvent<int>[0]);

-      collection.Push(23);

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(23,0), collection),

-              new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(23, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Push(-12);

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(-12,1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(-12, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Pop();

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(-12,1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(-12, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Pop();

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(23,0), collection),

-              new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(23, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-  }

-

-  public class QueueTester<U> : CollectionValueTester<U> where U : IQueue<int>

-  {

-    public override SCG.IEnumerable<EventTypeEnum> GetSpecs()

-    {

-      return SpecsBasic;

-    }

-

-    [Test]

-    public void EnqueueDequeue()

-    {

-      listen();

-      collection.Enqueue(67);

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(67,0), collection),

-              new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(67, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Enqueue(2);

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.Inserted, new ItemAtEventArgs<int>(2,1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(2, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Dequeue();

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(67,0), collection),

-              new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(67, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Dequeue();

-      seen.Check(new CollectionEvent<int>[] {

-              new CollectionEvent<int>(EventTypeEnum.RemovedAt, new ItemAtEventArgs<int>(2,0), collection),

-              new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(2, 1), collection),

-              new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-  }

-

-  public class PriorityQueueTester<U> : ExtensibleTester<U> where U : IPriorityQueue<int>

-  {

-    public override System.Collections.Generic.IEnumerable<EventTypeEnum> GetSpecs()

-    {

-      return SpecsBasic;

-    }

-

-    [Test]

-    public void Direct()

-    {

-      listen();

-      collection.Add(34);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(34, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.Add(56);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(56, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.AddAll<int>(new int[] { });

-      seen.Check(new CollectionEvent<int>[] {

-      });

-      collection.Add(34);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(34, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.Add(12);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(12, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.DeleteMax();

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), collection),

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.DeleteMin();

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(12, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.AddAll<int>(new int[] { 4, 5, 6, 2 });

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(4, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(5, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(6, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(2, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection)

-      });

-    }

-

-    [Test]

-    public void WithHandles()

-    {

-      listen();

-      IPriorityQueueHandle<int> handle = null, handle2;

-      collection.Add(34);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(34, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.Add(56);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(56, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.Add(ref handle, 34);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(34, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.Add(12);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(12, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.DeleteMax(out handle2);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(56, 1), collection),

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-      collection.DeleteMin(out handle2);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(12, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-

-      collection.Replace(handle, 117);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(34, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Added, new ItemCountEventArgs<int>(117, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-

-      collection.Delete(handle);

-      seen.Check(new CollectionEvent<int>[] {

-        new CollectionEvent<int>(EventTypeEnum.Removed, new ItemCountEventArgs<int>(117, 1), collection), 

-        new CollectionEvent<int>(EventTypeEnum.Changed, new EventArgs(), collection), 

-      });

-    }

-  }

-

-  public class DictionaryTester<U> : CollectionValueTester<U, KeyValuePair<int, int>> where U : IDictionary<int, int>

-  {

-    public override SCG.IEnumerable<EventTypeEnum> GetSpecs()

-    {

-      return SpecsBasic;

-    }

-

-    [Test]

-    public virtual void Listenable()

-    {

-      Assert.AreEqual(EventTypeEnum.Basic, collection.ListenableEvents);

-      Assert.AreEqual(EventTypeEnum.None, collection.ActiveEvents);

-      listen();

-      Assert.AreEqual(listenTo, collection.ActiveEvents);

-    }

-

-    [Test]

-    public void AddAndREmove()

-    {

-      listen();

-      seen.Check(new CollectionEvent<KeyValuePair<int, int>>[0]);

-      collection.Add(23, 45);

-      seen.Check(new CollectionEvent<KeyValuePair<int,int>>[] {

-          new CollectionEvent<KeyValuePair<int,int>>(EventTypeEnum.Added, new ItemCountEventArgs<KeyValuePair<int,int>>(new KeyValuePair<int,int>(23,45), 1), collection),

-          new CollectionEvent<KeyValuePair<int,int>>(EventTypeEnum.Changed, new EventArgs(), collection)});

-      collection.Remove(25);

-      seen.Check(new CollectionEvent<KeyValuePair<int, int>>[] {

-          new CollectionEvent<KeyValuePair<int,int>>(EventTypeEnum.Removed, new ItemCountEventArgs<KeyValuePair<int,int>>(new KeyValuePair<int,int>(23,45), 1), collection),

-          new CollectionEvent<KeyValuePair<int,int>>(EventTypeEnum.Changed, new EventArgs(), collection)});

-    }

-

-

-

-  }

-

-}

-

-

diff --git a/mcs/class/Mono.C5/Test/templates/GenericCollectionTester.cs b/mcs/class/Mono.C5/Test/templates/GenericCollectionTester.cs
deleted file mode 100644
index 20445636909..00000000000
--- a/mcs/class/Mono.C5/Test/templates/GenericCollectionTester.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-using System.Reflection;

-

-namespace C5UnitTests.Templates

-{

-  public abstract class GenericCollectionTester<U, W>

-  {

-    protected CircularQueue<MethodInfo> testMethods;

-    public GenericCollectionTester()

-    {

-      testMethods = new CircularQueue<MethodInfo>();

-      foreach (MethodInfo minfo in this.GetType().GetMethods())

-      {

-        if (minfo.GetParameters().Length == 0 &&

-             minfo.GetCustomAttributes(typeof(TestAttribute), false).Length > 0)

-          testMethods.Enqueue(minfo);

-      }

-    }

-

-    public virtual void Test(Fun<U> factory)

-    {

-      foreach (MethodInfo minfo in testMethods)

-      {

-        foreach (W testSpec in GetSpecs())

-        {

-          SetUp(factory(), testSpec);

-          //Console.WriteLine("Testing {0}, with method {1} and testSpec {{{2}}}", typeof(U), minfo.Name, testSpec);

-          try

-          {

-            minfo.Invoke(this, null);

-          }

-          catch (TargetInvocationException)

-          {

-            //if (e.InnerException is ExpectedExceptionAttribute)

-            //{

-            //}

-            //else

-            throw;

-          }

-          //tearDown

-        }

-      }

-    }

-

-    public abstract void SetUp(U collection, W testSpec);

-    public abstract SCG.IEnumerable<W> GetSpecs();

-  }

-

-  public abstract class GenericCollectionTester<U> : GenericCollectionTester<U, int>

-  {

-    public override System.Collections.Generic.IEnumerable<int> GetSpecs()

-    {

-      return new int[] { 0 };

-    }

-

-    public override void SetUp(U collection, int testSpec)

-    {

-      SetUp(collection);

-    }

-

-    public abstract void SetUp(object collection);

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/Test/templates/List.cs b/mcs/class/Mono.C5/Test/templates/List.cs
deleted file mode 100644
index 5ea90dc39d6..00000000000
--- a/mcs/class/Mono.C5/Test/templates/List.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using C5;

-using NUnit.Framework;

-using SCG = System.Collections.Generic;

-

-namespace C5UnitTests.Templates.List

-{

-  class Foo

-  {

-    public static void Tester<U>() where U : class, IList<int>, new()

-    {

-      U extensible = new U();

-      extensible.Add(12);

-      extensible.Add(23);

-      extensible.Add(56);

-    }

-  }

-}

-

diff --git a/mcs/class/Mono.C5/Test/trees/Bag.cs b/mcs/class/Mono.C5/Test/trees/Bag.cs
index 3c7b38ec177..160aa490174 100644
--- a/mcs/class/Mono.C5/Test/trees/Bag.cs
+++ b/mcs/class/Mono.C5/Test/trees/Bag.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,2910 +23,2765 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG=System.Collections.Generic;

 

 

-namespace C5UnitTests.trees.TreeBag

+namespace nunit.trees.TreeBag

 {

-  using CollectionOfInt = TreeBag<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.SortedIndexedTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new TreeBag<T>(); }

-  }

-

-

-  [TestFixture]

-  public class Formatting

-  {

-    ICollection<int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{{  }}", coll.ToString());

-      coll.AddAll<int>(new int[] { -4, 28, 129, 65530, -4, 28 });

-      Assert.AreEqual("{{ -4(*2), 28(*2), 129(*1), 65530(*1) }}", coll.ToString());

-      Assert.AreEqual("{{ -4(*2), 1C(*2), 81(*1), FFFA(*1) }}", coll.ToString(null, rad16));

-      Assert.AreEqual("{{ -4(*2), 28(*2)... }}", coll.ToString("L18", null));

-      Assert.AreEqual("{{ -4(*2), 1C(*2)... }}", coll.ToString("L18", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class Combined

-  {

-    private IIndexedSorted<KeyValuePair<int, int>> lst;

-

-

-    [SetUp]

-    public void Init()

-    {

-      lst = new TreeBag<KeyValuePair<int, int>>(new KeyValuePairComparer<int, int>(new IC()));

-      for (int i = 0; i < 10; i++)

-        lst.Add(new KeyValuePair<int, int>(i, i + 30));

-    }

-

-

-    [TearDown]

-    public void Dispose() { lst = null; }

-

-

-    [Test]

-    public void Find()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-      Assert.IsTrue(lst.Find(ref p));

-      Assert.AreEqual(3, p.Key);

-      Assert.AreEqual(33, p.Value);

-      p = new KeyValuePair<int, int>(13, 78);

-      Assert.IsFalse(lst.Find(ref p));

-    }

-

-

-    [Test]

-    public void FindOrAdd()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-      Assert.IsTrue(lst.FindOrAdd(ref p));

-      Assert.AreEqual(3, p.Key);

-      Assert.AreEqual(33, p.Value);

-      p = new KeyValuePair<int, int>(13, 79);

-      Assert.IsFalse(lst.FindOrAdd(ref p));

-      Assert.AreEqual(13, lst[11].Key);

-      Assert.AreEqual(79, lst[11].Value);

-    }

-

-

-    [Test]

-    public void Update()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-      Assert.IsTrue(lst.Update(p));

-      Assert.AreEqual(3, lst[3].Key);

-      Assert.AreEqual(78, lst[3].Value);

-      p = new KeyValuePair<int, int>(13, 78);

-      Assert.IsFalse(lst.Update(p));

-    }

-

-

-    [Test]

-    public void UpdateOrAdd()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-      Assert.IsTrue(lst.UpdateOrAdd(p));

-      Assert.AreEqual(3, lst[3].Key);

-      Assert.AreEqual(78, lst[3].Value);

-      p = new KeyValuePair<int, int>(13, 79);

-      Assert.IsFalse(lst.UpdateOrAdd(p));

-      Assert.AreEqual(13, lst[10].Key);

-      Assert.AreEqual(79, lst[10].Value);

-    }

-

-

-    [Test]

-    public void RemoveWithReturn()

-    {

-      KeyValuePair<int, int> p = new KeyValuePair<int, int>(3, 78);

-

-      Assert.IsTrue(lst.Remove(p, out p));

-      Assert.AreEqual(3, p.Key);

-      Assert.AreEqual(33, p.Value);

-      Assert.AreEqual(4, lst[3].Key);

-      Assert.AreEqual(34, lst[3].Value);

-      p = new KeyValuePair<int, int>(13, 78);

-      Assert.IsFalse(lst.Remove(p, out p));

-    }

-  }

-

-

-  [TestFixture]

-  public class Simple

-  {

-    private TreeBag<string> bag;

-

-

-    [SetUp]

-    public void Init()

-    {

-      bag = new TreeBag<string>(new SC());

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      bag = null;

-    }

-

-    [Test]

-    public void Initial()

-    {

-      bool res;

-

-      Assert.IsFalse(bag.IsReadOnly);

-      Assert.AreEqual(0, bag.Count, "new bag should be empty");

-      Assert.AreEqual(0, bag.ContainsCount("A"));

-      Assert.AreEqual(0, bag.ContainsCount("B"));

-      Assert.AreEqual(0, bag.ContainsCount("C"));

-      Assert.IsFalse(bag.Contains("A"));

-      Assert.IsFalse(bag.Contains("B"));

-      Assert.IsFalse(bag.Contains("C"));

-      bag.Add("A");

-      Assert.AreEqual(1, bag.Count);

-      Assert.AreEqual(1, bag.ContainsCount("A"));

-      Assert.AreEqual(0, bag.ContainsCount("B"));

-      Assert.AreEqual(0, bag.ContainsCount("C"));

-      Assert.IsTrue(bag.Contains("A"));

-      Assert.IsFalse(bag.Contains("B"));

-      Assert.IsFalse(bag.Contains("C"));

-      bag.Add("C");

-      Assert.AreEqual(2, bag.Count);

-      Assert.AreEqual(1, bag.ContainsCount("A"));

-      Assert.AreEqual(0, bag.ContainsCount("B"));

-      Assert.AreEqual(1, bag.ContainsCount("C"));

-      Assert.IsTrue(bag.Contains("A"));

-      Assert.IsFalse(bag.Contains("B"));

-      Assert.IsTrue(bag.Contains("C"));

-      bag.Add("C");

-      Assert.AreEqual(3, bag.Count);

-      Assert.AreEqual(1, bag.ContainsCount("A"));

-      Assert.AreEqual(0, bag.ContainsCount("B"));

-      Assert.AreEqual(2, bag.ContainsCount("C"));

-      Assert.IsTrue(bag.Contains("A"));

-      Assert.IsFalse(bag.Contains("B"));

-      Assert.IsTrue(bag.Contains("C"));

-      bag.Add("B");

-      bag.Add("C");

-      Assert.AreEqual(5, bag.Count);

-      Assert.AreEqual(1, bag.ContainsCount("A"));

-      Assert.AreEqual(1, bag.ContainsCount("B"));

-      Assert.AreEqual(3, bag.ContainsCount("C"));

-      Assert.IsTrue(bag.Contains("A"));

-      Assert.IsTrue(bag.Contains("B"));

-      Assert.IsTrue(bag.Contains("C"));

-      res = bag.Remove("C");

-      Assert.AreEqual(4, bag.Count);

-      Assert.AreEqual(1, bag.ContainsCount("A"));

-      Assert.AreEqual(1, bag.ContainsCount("B"));

-      Assert.AreEqual(2, bag.ContainsCount("C"));

-      Assert.IsTrue(bag.Contains("A"));

-      Assert.IsTrue(bag.Contains("B"));

-      Assert.IsTrue(bag.Contains("C"));

-      res = bag.Remove("A");

-      Assert.AreEqual(3, bag.Count);

-      Assert.AreEqual(0, bag.ContainsCount("A"));

-      Assert.AreEqual(1, bag.ContainsCount("B"));

-      Assert.AreEqual(2, bag.ContainsCount("C"));

-      Assert.IsFalse(bag.Contains("A"));

-      Assert.IsTrue(bag.Contains("B"));

-      Assert.IsTrue(bag.Contains("C"));

-      bag.RemoveAllCopies("C");

-      Assert.AreEqual(1, bag.Count);

-      Assert.AreEqual(0, bag.ContainsCount("A"));

-      Assert.AreEqual(1, bag.ContainsCount("B"));

-      Assert.AreEqual(0, bag.ContainsCount("C"));

-      Assert.IsFalse(bag.Contains("A"));

-      Assert.IsTrue(bag.Contains("B"));

-      Assert.IsFalse(bag.Contains("C"));

-      Assert.IsFalse(bag.Contains("Z"));

-      Assert.IsFalse(bag.Remove("Z"));

-      bag.RemoveAllCopies("Z");

-      Assert.AreEqual(1, bag.Count);

-      Assert.AreEqual(0, bag.ContainsCount("A"));

-      Assert.AreEqual(1, bag.ContainsCount("B"));

-      Assert.AreEqual(0, bag.ContainsCount("C"));

-      Assert.IsFalse(bag.Contains("A"));

-      Assert.IsTrue(bag.Contains("B"));

-      Assert.IsFalse(bag.Contains("C"));

-      Assert.IsFalse(bag.Contains("Z"));

-    }

-  }

-

-  [TestFixture]

-  public class FindOrAdd

-  {

-    private TreeBag<KeyValuePair<int, string>> bag;

-

-

-    [SetUp]

-    public void Init()

-    {

-      bag = new TreeBag<KeyValuePair<int, string>>(new KeyValuePairComparer<int, string>(new IC()));

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      bag = null;

-    }

-

-

-    [Test]

-    public void Test()

-    {

-      KeyValuePair<int, string> p = new KeyValuePair<int, string>(3, "tre");

-      Assert.IsFalse(bag.FindOrAdd(ref p));

-      p.Value = "drei";

-      Assert.IsTrue(bag.FindOrAdd(ref p));

-      Assert.AreEqual("tre", p.Value);

-      p.Value = "three";

-      Assert.AreEqual(2, bag.ContainsCount(p));

-      Assert.AreEqual("tre", bag[0].Value);

-    }

-  }

-

-

-  [TestFixture]

-  public class Enumerators

-  {

-    private TreeBag<string> bag;

-

-    private SCG.IEnumerator<string> bagenum;

-

-

-    [SetUp]

-    public void Init()

-    {

-      bag = new TreeBag<string>(new SC());

-      foreach (string s in new string[] { "A", "B", "A", "A", "B", "C", "D", "B" })

-        bag.Add(s);

-

-      bagenum = bag.GetEnumerator();

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      bagenum = null;

-      bag = null;

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(CollectionModifiedException))]

-    public void MoveNextOnModified()

-    {

-      //TODO: also problem before first MoveNext!!!!!!!!!!

-      bagenum.MoveNext();

-      bag.Add("T");

-      bagenum.MoveNext();

-    }

-

-

-    [Test]

-    public void NormalUse()

-    {

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "A");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "A");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "A");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "B");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "B");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "B");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "C");

-      Assert.IsTrue(bagenum.MoveNext());

-      Assert.AreEqual(bagenum.Current, "D");

-      Assert.IsFalse(bagenum.MoveNext());

-    }

-  }

-

-  [TestFixture]

-  public class Ranges

-  {

-    private TreeBag<int> tree;

-

-    private SCG.IComparer<int> c;

-

-

-    [SetUp]

-    public void Init()

-    {

-      c = new IC();

-      tree = new TreeBag<int>(c);

-      for (int i = 1; i <= 10; i++)

-      {

-        tree.Add(i * 2); tree.Add(i);

-      }

-    }

-

-

-    [Test]

-    public void Enumerator()

-    {

-      SCG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

-      int i = 0;

-      int[] all = new int[] { 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16 };

-      while (e.MoveNext())

-      {

-        Assert.AreEqual(all[i++], e.Current);

-      }

-

-      Assert.AreEqual(12, i);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(InvalidOperationException))]

-    public void Enumerator2()

-    {

-      SCG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

-      int i = e.Current;

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(InvalidOperationException))]

-    public void Enumerator3()

-    {

-      SCG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

-

-      while (e.MoveNext()) ;

-

-      int i = e.Current;

-    }

-

-

-    [Test]

-    public void Remove()

-    {

-      int[] all = new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 };

-

-      tree.RemoveRangeFrom(18);

-      Assert.IsTrue(IC.eq(tree, new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16 }));

-      tree.RemoveRangeFrom(28);

-      Assert.IsTrue(IC.eq(tree, new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16 }));

-      tree.RemoveRangeFrom(1);

-      Assert.IsTrue(IC.eq(tree));

-      foreach (int i in all) tree.Add(i);

-

-      tree.RemoveRangeTo(10);

-      Assert.IsTrue(IC.eq(tree, new int[] { 10, 10, 12, 14, 16, 18, 20 }));

-      tree.RemoveRangeTo(2);

-      Assert.IsTrue(IC.eq(tree, new int[] { 10, 10, 12, 14, 16, 18, 20 }));

-      tree.RemoveRangeTo(21);

-      Assert.IsTrue(IC.eq(tree));

-      foreach (int i in all) tree.Add(i);

-

-      tree.RemoveRangeFromTo(4, 8);

-      Assert.IsTrue(IC.eq(tree, 1, 2, 2, 3, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20));

-      tree.RemoveRangeFromTo(14, 28);

-      Assert.IsTrue(IC.eq(tree, 1, 2, 2, 3, 8, 8, 9, 10, 10, 12));

-      tree.RemoveRangeFromTo(0, 9);

-      Assert.IsTrue(IC.eq(tree, 9, 10, 10, 12));

-      tree.RemoveRangeFromTo(0, 81);

-      Assert.IsTrue(IC.eq(tree));

-    }

-

-

-    [Test]

-    public void Normal()

-    {

-      int[] all = new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 };

-

-      Assert.IsTrue(IC.eq(tree, all));

-      Assert.IsTrue(IC.eq(tree.RangeAll(), all));

-      Assert.AreEqual(20, tree.RangeAll().Count);

-      Assert.IsTrue(IC.eq(tree.RangeFrom(11), new int[] { 12, 14, 16, 18, 20 }));

-      Assert.AreEqual(5, tree.RangeFrom(11).Count);

-      Assert.IsTrue(IC.eq(tree.RangeFrom(12), new int[] { 12, 14, 16, 18, 20 }));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(1), all));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(0), all));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(21), new int[] { }));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(20), new int[] { 20 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(8), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(7), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6 }));

-      Assert.AreEqual(9, tree.RangeTo(7).Count);

-      Assert.IsTrue(IC.eq(tree.RangeTo(1), new int[] { }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(0), new int[] { }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(3), new int[] { 1, 2, 2 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(20), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(21), all));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(7, 12), new int[] { 7, 8, 8, 9, 10, 10 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 11), new int[] { 6, 6, 7, 8, 8, 9, 10, 10 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(1, 12), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10 }));

-      Assert.AreEqual(15, tree.RangeFromTo(1, 12).Count);

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(2, 12), new int[] { 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 21), new int[] { 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 20), new int[] { 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18 }));

-    }

-

-

-    [Test]

-    public void Backwards()

-    {

-      int[] all = new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 };

-      int[] lla = new int[] { 20, 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 };

-

-      Assert.IsTrue(IC.eq(tree, all));

-      Assert.IsTrue(IC.eq(tree.RangeAll().Backwards(), lla));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(11).Backwards(), new int[] { 20, 18, 16, 14, 12 }));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(12).Backwards(), new int[] { 20, 18, 16, 14, 12 }));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(1).Backwards(), lla));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(0).Backwards(), lla));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(21).Backwards(), new int[] { }));

-      Assert.IsTrue(IC.eq(tree.RangeFrom(20).Backwards(), new int[] { 20 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(8).Backwards(), new int[] { 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(7).Backwards(), new int[] { 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(1).Backwards(), new int[] { }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(0).Backwards(), new int[] { }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(3).Backwards(), new int[] { 2, 2, 1 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(20).Backwards(), new int[] { 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

-      Assert.IsTrue(IC.eq(tree.RangeTo(21).Backwards(), lla));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(7, 12).Backwards(), new int[] { 10, 10, 9, 8, 8, 7 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 11).Backwards(), new int[] { 10, 10, 9, 8, 8, 7, 6, 6 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(0, 12).Backwards(), new int[] { 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(1, 12).Backwards(), new int[] { 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 21).Backwards(), new int[] { 20, 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6 }));

-      Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 20).Backwards(), new int[] { 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6 }));

-    }

-

-

-    [Test]

-    public void Direction()

-    {

-      Assert.AreEqual(EnumerationDirection.Forwards, tree.Direction);

-      Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeFrom(20).Direction);

-      Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeTo(7).Direction);

-      Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeFromTo(1, 12).Direction);

-      Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeAll().Direction);

-      Assert.AreEqual(EnumerationDirection.Backwards, tree.Backwards().Direction);

-      Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeFrom(20).Backwards().Direction);

-      Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeTo(7).Backwards().Direction);

-      Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeFromTo(1, 12).Backwards().Direction);

-      Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeAll().Backwards().Direction);

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-      c = null;

-    }

-  }

-

-

-

-  [TestFixture]

-  public class BagItf

-  {

-    private TreeBag<int> tree;

-

-

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-      for (int i = 10; i < 20; i++)

-      {

-        tree.Add(i);

-        tree.Add(i + 5);

-      }

-    }

-

-

-    [Test]

-    public void Both()

-    {

-      Assert.AreEqual(0, tree.ContainsCount(7));

-      Assert.AreEqual(1, tree.ContainsCount(10));

-      Assert.AreEqual(2, tree.ContainsCount(17));

-      tree.RemoveAllCopies(17);

-      Assert.AreEqual(0, tree.ContainsCount(17));

-      tree.RemoveAllCopies(7);

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-    }

-  }

-

-

-

-  [TestFixture]

-  public class Div

-  {

-    private TreeBag<int> tree;

-

-

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-    }

-

-

-    private void loadup()

-    {

-      for (int i = 10; i < 20; i++)

-      {

-        tree.Add(i);

-        tree.Add(i + 5);

-      }

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new TreeBag<int>(null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor3()

-    {

-      new TreeBag<int>(null, EqualityComparer<int>.Default);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor4()

-    {

-      new TreeBag<int>(Comparer<int>.Default, null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor5()

-    {

-      new TreeBag<int>(null, null);

-    }

-

-    [Test]

-    public void Choose()

-    {

-      tree.Add(7);

-      Assert.AreEqual(7, tree.Choose());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      tree.Choose();

-    }

-

-

-    [Test]

-    public void NoDuplicates()

-    {

-      Assert.IsTrue(tree.AllowsDuplicates);

-      loadup();

-      Assert.IsTrue(tree.AllowsDuplicates);

-    }

-

-

-    [Test]

-    public void Add()

-    {

-      Assert.IsTrue(tree.Add(17));

-      Assert.IsTrue(tree.Add(17));

-      Assert.IsTrue(tree.Add(18));

-      Assert.IsTrue(tree.Add(18));

-      Assert.AreEqual(4, tree.Count);

-      Assert.IsTrue(IC.eq(tree, 17, 17, 18, 18));

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-    }

-  }

-

-  [TestFixture]

-  public class FindPredicate

-  {

-    private TreeBag<int> list;

-    Fun<int, bool> pred;

-

-    [SetUp]

-    public void Init()

-    {

-      list = new TreeBag<int>(TenEqualityComparer.Default);

-      pred = delegate(int i) { return i % 5 == 0; };

-    }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Find()

-    {

-      int i;

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.Find(pred, out i));

-      Assert.AreEqual(45, i);

-    }

-

-    [Test]

-    public void FindLast()

-    {

-      int i;

-      Assert.IsFalse(list.FindLast(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.FindLast(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.FindLast(pred, out i));

-      Assert.AreEqual(675, i);

-    }

-

-    [Test]

-    public void FindIndex()

-    {

-      Assert.IsFalse(0 <= list.FindIndex(pred));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(0 <= list.FindIndex(pred));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.AreEqual(3, list.FindIndex(pred));

-    }

-

-    [Test]

-    public void FindLastIndex()

-    {

-      Assert.IsFalse(0 <= list.FindLastIndex(pred));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(0 <= list.FindLastIndex(pred));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.AreEqual(7, list.FindLastIndex(pred));

-    }

-  }

-

-  [TestFixture]

-  public class UniqueItems

-  {

-    private TreeBag<int> list;

-

-    [SetUp]

-    public void Init() { list = new TreeBag<int>(); }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Test()

-    {

-      Assert.IsTrue(IC.seteq(list.UniqueItems()));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-      list.AddAll<int>(new int[] { 7, 9, 7 });

-      Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 2, 9, 1));

-    }

-  }

-

-  [TestFixture]

-  public class ArrayTest

-  {

-    private TreeBag<int> tree;

-

-    int[] a;

-

-

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-      a = new int[10];

-      for (int i = 0; i < 10; i++)

-        a[i] = 1000 + i;

-    }

-

-

-    [TearDown]

-    public void Dispose() { tree = null; }

-

-

-    private string aeq(int[] a, params int[] b)

-    {

-      if (a.Length != b.Length)

-        return "Lengths differ: " + a.Length + " != " + b.Length;

-

-      for (int i = 0; i < a.Length; i++)

-        if (a[i] != b[i])

-          return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

-

-      return "Alles klar";

-    }

-

-

-    [Test]

-    public void ToArray()

-    {

-      Assert.AreEqual("Alles klar", aeq(tree.ToArray()));

-      tree.Add(4);

-      tree.Add(7);

-      tree.Add(4);

-      Assert.AreEqual("Alles klar", aeq(tree.ToArray(), 4, 4, 7));

-    }

-

-

-    [Test]

-    public void CopyTo()

-    {

-      tree.CopyTo(a, 1);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

-      tree.Add(6);

-      tree.Add(6);

-      tree.CopyTo(a, 2);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 6, 1004, 1005, 1006, 1007, 1008, 1009));

-      tree.Add(4);

-      tree.Add(9);

-      tree.CopyTo(a, 4);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 6, 4, 6, 6, 9, 1008, 1009));

-      tree.Clear();

-      tree.Add(7);

-      tree.CopyTo(a, 9);

-      Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 6, 4, 6, 6, 9, 1008, 7));

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToBad()

-    {

-      tree.CopyTo(a, 11);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToBad2()

-    {

-      tree.CopyTo(a, -1);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToTooFar()

-    {

-      tree.Add(3);

-      tree.Add(4);

-      tree.CopyTo(a, 9);

-    }

-  }

-

-

-

-  [TestFixture]

-  public class Remove

-  {

-    private TreeBag<int> tree;

-

-

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-      for (int i = 10; i < 20; i++)

-      {

-        tree.Add(i);

-        tree.Add(i + 5);

-      }

-      //10,11,12,13,14,15,15,16,16,17,17,18,18,19,19,20,21,22,23,24

-    }

-

-

-    [Test]

-    public void SmallTrees()

-    {

-      tree.Clear();

-      tree.Add(9);

-      tree.Add(7);

-      tree.Add(9);

-      Assert.IsTrue(tree.Remove(7));

-      Assert.IsTrue(tree.Check(""));

-    }

-

-

-    [Test]

-    public void ByIndex()

-    {

-      //Remove root!

-      int n = tree.Count;

-      int i = tree[10];

-

-      Assert.AreEqual(17, tree.RemoveAt(10));

-      Assert.IsTrue(tree.Check(""));

-      Assert.IsTrue(tree.Contains(i));

-      Assert.AreEqual(n - 1, tree.Count);

-      Assert.AreEqual(17, tree.RemoveAt(9));

-      Assert.IsTrue(tree.Check(""));

-      Assert.IsFalse(tree.Contains(i));

-      Assert.AreEqual(n - 2, tree.Count);

-

-      //Low end

-      i = tree.FindMin();

-      tree.RemoveAt(0);

-      Assert.IsTrue(tree.Check(""));

-      Assert.IsFalse(tree.Contains(i));

-      Assert.AreEqual(n - 3, tree.Count);

-

-      //high end

-      i = tree.FindMax();

-      tree.RemoveAt(tree.Count - 1);

-      Assert.IsTrue(tree.Check(""));

-      Assert.IsFalse(tree.Contains(i));

-      Assert.AreEqual(n - 4, tree.Count);

-

-      //Some leaf

-      //tree.dump();

-      i = 18;

-      Assert.AreEqual(i, tree.RemoveAt(9));

-      Assert.IsTrue(tree.Check(""));

-      Assert.AreEqual(i, tree.RemoveAt(8));

-      Assert.IsTrue(tree.Check(""));

-      Assert.IsFalse(tree.Contains(i));

-      Assert.AreEqual(n - 6, tree.Count);

-    }

-

-

-    [Test]

-    public void AlmostEmpty()

-    {

-      //Almost empty

-      tree.Clear();

-      tree.Add(3);

-      tree.RemoveAt(0);

-      Assert.IsTrue(tree.Check(""));

-      Assert.IsFalse(tree.Contains(3));

-      Assert.AreEqual(0, tree.Count);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

-    public void Empty()

-    {

-      tree.Clear();

-      tree.RemoveAt(0);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

-    public void HighIndex()

-    {

-      tree.RemoveAt(tree.Count);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

-    public void LowIndex()

-    {

-      tree.RemoveAt(-1);

-    }

-

-

-    [Test]

-    public void Normal()

-    {

-      //Note: ids does not match for bag

-      Assert.IsFalse(tree.Remove(-20));

-

-      //1b

-      Assert.IsTrue(tree.Remove(20));

-      Assert.IsTrue(tree.Check("T1"));

-      Assert.IsFalse(tree.Remove(20));

-

-      //1b

-      Assert.IsTrue(tree.Remove(10));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //case 1c

-      Assert.IsTrue(tree.Remove(24));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //1a (terminating)

-      Assert.IsTrue(tree.Remove(16));

-      Assert.IsTrue(tree.Remove(16));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //2

-      Assert.IsTrue(tree.Remove(18));

-      Assert.IsTrue(tree.Remove(17));

-      Assert.IsTrue(tree.Remove(18));

-      Assert.IsTrue(tree.Remove(17));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //2+1b

-      Assert.IsTrue(tree.Remove(15));

-      Assert.IsTrue(tree.Remove(15));

-      for (int i = 0; i < 5; i++) tree.Add(17 + i);

-      Assert.IsTrue(tree.Remove(23));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //1a+1b

-      Assert.IsTrue(tree.Remove(11));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //2+1c

-      for (int i = 0; i < 10; i++)

-        tree.Add(50 - 2 * i);

-

-      Assert.IsTrue(tree.Remove(42));

-      Assert.IsTrue(tree.Remove(38));

-      Assert.IsTrue(tree.Remove(22));

-      Assert.IsTrue(tree.Remove(40));

-

-      //

-      for (int i = 0; i < 48; i++)

-        tree.Remove(i);

-

-      //Almost empty tree:*

-      Assert.IsFalse(tree.Remove(26));

-      Assert.IsTrue(tree.Remove(48));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-

-      //Empty tree:*

-      Assert.IsFalse(tree.Remove(26));

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-    }

-  }

-

-

-

-  [TestFixture]

-  public class PredecessorStructure

-  {

-    private TreeBag<int> tree;

-

-

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-    }

-

-

-    private void loadup()

-    {

-      for (int i = 0; i < 20; i++)

-        tree.Add(2 * i);

-      for (int i = 0; i < 10; i++)

-        tree.Add(4 * i);

-    }

-

-

-    [Test]

-    public void Predecessor()

-    {

-      loadup();

-      Assert.AreEqual(6, tree.Predecessor(7));

-      Assert.AreEqual(6, tree.Predecessor(8));

-

-      //The bottom

-      Assert.AreEqual(0, tree.Predecessor(1));

-

-      //The top

-      Assert.AreEqual(38, tree.Predecessor(39));

-    }

+	[TestFixture]

+	public class Combined

+	{

+		private IIndexedSorted<KeyValuePair<int,int>> lst;

+

+

+		[SetUp]

+		public void Init()

+		{

+			lst = new TreeBag<KeyValuePair<int,int>>(new KeyValuePairComparer<int,int>(new IC()));

+			for (int i = 0; i < 10; i++)

+				lst.Add(new KeyValuePair<int,int>(i, i + 30));

+		}

+

+

+		[TearDown]

+		public void Dispose() { lst = null; }

+

+

+		[Test]

+		public void Find()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+			Assert.IsTrue(lst.Find(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			p = new KeyValuePair<int,int>(13, 78);

+			Assert.IsFalse(lst.Find(ref p));

+		}

+

+

+		[Test] 

+		public void FindOrAdd()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+			Assert.IsTrue(lst.FindOrAdd(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			p = new KeyValuePair<int,int>(13, 79);

+			Assert.IsFalse(lst.FindOrAdd(ref p));

+			Assert.AreEqual(13, lst[11].key);

+			Assert.AreEqual(79, lst[11].value);

+		}

+

+

+		[Test]

+		public void Update()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+			Assert.IsTrue(lst.Update(p));

+			Assert.AreEqual(3, lst[3].key);

+			Assert.AreEqual(78, lst[3].value);

+			p = new KeyValuePair<int,int>(13, 78);

+			Assert.IsFalse(lst.Update(p));

+		}

+

+

+		[Test]

+		public void UpdateOrAdd()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+			Assert.IsTrue(lst.UpdateOrAdd(p));

+			Assert.AreEqual(3, lst[3].key);

+			Assert.AreEqual(78, lst[3].value);

+			p = new KeyValuePair<int,int>(13, 79);

+			Assert.IsFalse(lst.UpdateOrAdd(p));

+			Assert.AreEqual(13, lst[11].key);

+			Assert.AreEqual(79, lst[11].value);

+		}

+

+

+		[Test]

+		public void RemoveWithReturn()

+		{

+			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

+

+			Assert.IsTrue(lst.RemoveWithReturn(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			Assert.AreEqual(4, lst[3].key);

+			Assert.AreEqual(34, lst[3].value);

+			p = new KeyValuePair<int,int>(13, 78);

+			Assert.IsFalse(lst.RemoveWithReturn(ref p));

+		}

+	}

+

+

+	[TestFixture]

+	public class Simple

+	{

+		private TreeBag<string> bag;

+

+

+		[SetUp]

+		public void Init()

+		{

+			bag = new TreeBag<string>(new SC());

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			bag = null;

+		}

+

+			[Test]

+		public void Initial()

+		{

+			bool res;

+

+			Assert.IsFalse(bag.IsReadOnly);

+			Assert.AreEqual(0, bag.Count, "new bag should be empty");

+			Assert.AreEqual(0, bag.ContainsCount("A"));

+			Assert.AreEqual(0, bag.ContainsCount("B"));

+			Assert.AreEqual(0, bag.ContainsCount("C"));

+			Assert.IsFalse(bag.Contains("A"));

+			Assert.IsFalse(bag.Contains("B"));

+			Assert.IsFalse(bag.Contains("C"));

+			bag.Add("A");

+			Assert.AreEqual(1, bag.Count);

+			Assert.AreEqual(1, bag.ContainsCount("A"));

+			Assert.AreEqual(0, bag.ContainsCount("B"));

+			Assert.AreEqual(0, bag.ContainsCount("C"));

+			Assert.IsTrue(bag.Contains("A"));

+			Assert.IsFalse(bag.Contains("B"));

+			Assert.IsFalse(bag.Contains("C"));

+			bag.Add("C");

+			Assert.AreEqual(2, bag.Count);

+			Assert.AreEqual(1, bag.ContainsCount("A"));

+			Assert.AreEqual(0, bag.ContainsCount("B"));

+			Assert.AreEqual(1, bag.ContainsCount("C"));

+			Assert.IsTrue(bag.Contains("A"));

+			Assert.IsFalse(bag.Contains("B"));

+			Assert.IsTrue(bag.Contains("C"));

+			bag.Add("C");

+			Assert.AreEqual(3, bag.Count);

+			Assert.AreEqual(1, bag.ContainsCount("A"));

+			Assert.AreEqual(0, bag.ContainsCount("B"));

+			Assert.AreEqual(2, bag.ContainsCount("C"));

+			Assert.IsTrue(bag.Contains("A"));

+			Assert.IsFalse(bag.Contains("B"));

+			Assert.IsTrue(bag.Contains("C"));

+			bag.Add("B");

+			bag.Add("C");

+			Assert.AreEqual(5, bag.Count);

+			Assert.AreEqual(1, bag.ContainsCount("A"));

+			Assert.AreEqual(1, bag.ContainsCount("B"));

+			Assert.AreEqual(3, bag.ContainsCount("C"));

+			Assert.IsTrue(bag.Contains("A"));

+			Assert.IsTrue(bag.Contains("B"));

+			Assert.IsTrue(bag.Contains("C"));

+			res = bag.Remove("C");

+			Assert.AreEqual(4, bag.Count);

+			Assert.AreEqual(1, bag.ContainsCount("A"));

+			Assert.AreEqual(1, bag.ContainsCount("B"));

+			Assert.AreEqual(2, bag.ContainsCount("C"));

+			Assert.IsTrue(bag.Contains("A"));

+			Assert.IsTrue(bag.Contains("B"));

+			Assert.IsTrue(bag.Contains("C"));

+			res = bag.Remove("A");

+			Assert.AreEqual(3, bag.Count);

+			Assert.AreEqual(0, bag.ContainsCount("A"));

+			Assert.AreEqual(1, bag.ContainsCount("B"));

+			Assert.AreEqual(2, bag.ContainsCount("C"));

+			Assert.IsFalse(bag.Contains("A"));

+			Assert.IsTrue(bag.Contains("B"));

+			Assert.IsTrue(bag.Contains("C"));

+			bag.RemoveAllCopies("C");

+			Assert.AreEqual(1, bag.Count);

+			Assert.AreEqual(0, bag.ContainsCount("A"));

+			Assert.AreEqual(1, bag.ContainsCount("B"));

+			Assert.AreEqual(0, bag.ContainsCount("C"));

+			Assert.IsFalse(bag.Contains("A"));

+			Assert.IsTrue(bag.Contains("B"));

+			Assert.IsFalse(bag.Contains("C"));

+			Assert.IsFalse(bag.Contains("Z"));

+			Assert.IsFalse(bag.Remove("Z"));

+			bag.RemoveAllCopies("Z");

+			Assert.AreEqual(1, bag.Count);

+			Assert.AreEqual(0, bag.ContainsCount("A"));

+			Assert.AreEqual(1, bag.ContainsCount("B"));

+			Assert.AreEqual(0, bag.ContainsCount("C"));

+			Assert.IsFalse(bag.Contains("A"));

+			Assert.IsTrue(bag.Contains("B"));

+			Assert.IsFalse(bag.Contains("C"));

+			Assert.IsFalse(bag.Contains("Z"));

+		}

+	}

+

+	[TestFixture]

+	public class FindOrAdd

+	{

+		private TreeBag<KeyValuePair<int,string>> bag;

+

+

+		[SetUp]

+		public void Init()

+		{

+			bag = new TreeBag<KeyValuePair<int,string>>(new KeyValuePairComparer<int,string>(new IC()));

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			bag = null;

+		}

+

+

+		[Test]

+		public void Test()

+		{

+			KeyValuePair<int,string> p = new KeyValuePair<int,string>(3,"tre");

+			Assert.IsFalse(bag.FindOrAdd(ref p));

+			p.value = "drei";

+			Assert.IsTrue(bag.FindOrAdd(ref p));

+			Assert.AreEqual("tre", p.value);

+			p.value = "three";

+			Assert.AreEqual(2, bag.ContainsCount(p));

+			Assert.AreEqual("tre", bag[0].value);

+		}

+	}

+

+

+	[TestFixture]

+	public class Enumerators

+	{

+		private TreeBag<string> bag;

+

+		private MSG.IEnumerator<string> bagenum;

+

+

+		[SetUp]

+		public void Init()

+		{

+			bag = new TreeBag<string>(new SC());

+			foreach (string s in new string[] { "A", "B", "A", "A", "B", "C", "D", "B" })

+				bag.Add(s);

+

+			bagenum = bag.GetEnumerator();

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			bagenum = null;

+			bag = null;

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException))]

+		public void MoveNextOnModified()

+		{

+			//TODO: also problem before first MoveNext!!!!!!!!!!

+			bagenum.MoveNext();

+			bag.Add("T");

+			bagenum.MoveNext();

+		}

+

+

+		[Test]

+		public void NormalUse()

+		{

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "A");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "A");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "A");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "B");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "B");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "B");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "C");

+			Assert.IsTrue(bagenum.MoveNext());

+			Assert.AreEqual(bagenum.Current, "D");

+			Assert.IsFalse(bagenum.MoveNext());

+		}

+	}

+

+	[TestFixture]

+	public class Ranges

+	{

+		private TreeBag<int> tree;

+

+		private IComparer<int> c;

+

+

+		[SetUp]

+		public void Init()

+		{

+			c = new IC();

+			tree = new TreeBag<int>(c);

+			for (int i = 1; i <= 10; i++)

+			{

+				tree.Add(i * 2);tree.Add(i);

+			}

+		}

+

+

+		[Test]

+		public void Enumerator()

+		{

+			MSG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

+			int i = 0;

+			int[] all = new int[] { 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16 };

+			while (e.MoveNext())

+			{

+				Assert.AreEqual(all[i++], e.Current);

+			}

+

+			Assert.AreEqual(12, i);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException))]

+		public void Enumerator2()

+		{

+			MSG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

+			int i = e.Current;

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException))]

+		public void Enumerator3()

+		{

+			MSG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

+

+			while (e.MoveNext());

+

+			int i = e.Current;

+		}

+

+

+		[Test]

+		public void Remove()

+		{

+			int[] all = new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 };

+

+			tree.RemoveRangeFrom(18);

+			Assert.IsTrue(IC.eq(tree, new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16 }));

+			tree.RemoveRangeFrom(28);

+			Assert.IsTrue(IC.eq(tree, new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16 }));

+			tree.RemoveRangeFrom(1);

+			Assert.IsTrue(IC.eq(tree));

+			foreach (int i in all) tree.Add(i);

+

+			tree.RemoveRangeTo(10);

+			Assert.IsTrue(IC.eq(tree, new int[] { 10, 10, 12, 14, 16, 18, 20 }));

+			tree.RemoveRangeTo(2);

+			Assert.IsTrue(IC.eq(tree, new int[] { 10, 10, 12, 14, 16, 18, 20 }));

+			tree.RemoveRangeTo(21);

+			Assert.IsTrue(IC.eq(tree));

+			foreach (int i in all) tree.Add(i);

+

+			tree.RemoveRangeFromTo(4, 8);

+			Assert.IsTrue(IC.eq(tree, 1, 2, 2, 3, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20));

+			tree.RemoveRangeFromTo(14, 28);

+			Assert.IsTrue(IC.eq(tree, 1, 2, 2, 3, 8, 8, 9, 10, 10, 12));

+			tree.RemoveRangeFromTo(0, 9);

+			Assert.IsTrue(IC.eq(tree, 9, 10, 10, 12));

+			tree.RemoveRangeFromTo(0, 81);

+			Assert.IsTrue(IC.eq(tree));

+		}

+

+

+		[Test]

+		public void Normal()

+		{

+			int[] all = new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 };

+

+			Assert.IsTrue(IC.eq(tree, all));

+			Assert.IsTrue(IC.eq(tree.RangeAll(), all));

+			Assert.AreEqual(20, tree.RangeAll().Count);

+			Assert.IsTrue(IC.eq(tree.RangeFrom(11), new int[] { 12, 14, 16, 18, 20 }));

+			Assert.AreEqual(5, tree.RangeFrom(11).Count);

+			Assert.IsTrue(IC.eq(tree.RangeFrom(12), new int[] { 12, 14, 16, 18, 20 }));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(1), all));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(0), all));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(21), new int[] { }));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(20), new int[] { 20 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(8), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(7), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6 }));

+			Assert.AreEqual(9, tree.RangeTo(7).Count);

+			Assert.IsTrue(IC.eq(tree.RangeTo(1), new int[] { }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(0), new int[] {  }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(3), new int[] { 1, 2,2 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(20), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(21), all));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(7, 12), new int[] { 7, 8, 8, 9, 10, 10 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 11), new int[] { 6, 6, 7, 8, 8, 9, 10, 10 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(1, 12), new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10 }));

+			Assert.AreEqual(15, tree.RangeFromTo(1, 12).Count);

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(2, 12), new int[] { 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 21), new int[] { 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 20), new int[] { 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18 }));

+		}

+

+

+		[Test]

+		public void Backwards()

+		{

+			int[] all = new int[] { 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 10, 12, 14, 16, 18, 20 };

+			int[] lla = new int[] { 20, 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 };

+

+			Assert.IsTrue(IC.eq(tree, all));

+			Assert.IsTrue(IC.eq(tree.RangeAll().Backwards(), lla));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(11).Backwards(), new int[] { 20, 18, 16, 14, 12 }));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(12).Backwards(), new int[] { 20, 18, 16, 14, 12 }));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(1).Backwards(), lla));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(0).Backwards(), lla));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(21).Backwards(), new int[] { }));

+			Assert.IsTrue(IC.eq(tree.RangeFrom(20).Backwards(), new int[] { 20 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(8).Backwards(), new int[] { 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(7).Backwards(), new int[] { 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(1).Backwards(), new int[] { }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(0).Backwards(), new int[] {  }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(3).Backwards(), new int[] { 2, 2, 1 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(20).Backwards(), new int[] { 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

+			Assert.IsTrue(IC.eq(tree.RangeTo(21).Backwards(), lla));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(7, 12).Backwards(), new int[] { 10, 10, 9, 8, 8, 7 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 11).Backwards(), new int[] { 10, 10, 9, 8, 8, 7, 6, 6 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(0, 12).Backwards(), new int[] { 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(1, 12).Backwards(), new int[] { 10, 10, 9, 8, 8, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 21).Backwards(), new int[] { 20, 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6 }));

+			Assert.IsTrue(IC.eq(tree.RangeFromTo(6, 20).Backwards(), new int[] { 18, 16, 14, 12, 10, 10, 9, 8, 8, 7, 6, 6 }));

+		}

+

+

+		[Test]

+		public void Direction()

+		{

+			Assert.AreEqual(EnumerationDirection.Forwards, tree.Direction);

+			Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeFrom(20).Direction);

+			Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeTo(7).Direction);

+			Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeFromTo(1, 12).Direction);

+			Assert.AreEqual(EnumerationDirection.Forwards, tree.RangeAll().Direction);

+			Assert.AreEqual(EnumerationDirection.Backwards, tree.Backwards().Direction);

+			Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeFrom(20).Backwards().Direction);

+			Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeTo(7).Backwards().Direction);

+			Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeFromTo(1, 12).Backwards().Direction);

+			Assert.AreEqual(EnumerationDirection.Backwards, tree.RangeAll().Backwards().Direction);

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+			c = null;

+		}

+	}

+

+

+

+	[TestFixture]

+	public class BagItf

+	{

+		private TreeBag<int> tree;

+

+

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+			for (int i = 10; i < 20; i++)

+			{

+				tree.Add(i);

+				tree.Add(i + 5);

+			}

+		}

+

+

+		[Test]

+		public void Both()

+		{

+			Assert.AreEqual(0, tree.ContainsCount(7));

+			Assert.AreEqual(1, tree.ContainsCount(10));

+			Assert.AreEqual(2, tree.ContainsCount(17));

+			tree.RemoveAllCopies(17);

+			Assert.AreEqual(0, tree.ContainsCount(17));

+			tree.RemoveAllCopies(7);

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+		}

+	}

+

+

+

+	[TestFixture]

+	public class Div

+	{

+		private TreeBag<int> tree;

+

+

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+		}

+

+

+		private void loadup()

+		{

+			for (int i = 10; i < 20; i++)

+			{

+				tree.Add(i);

+				tree.Add(i + 5);

+			}

+		}

+

+

+		[Test]

+		public void NoDuplicates()

+		{

+            Assert.IsTrue(tree.AllowsDuplicates);

+            loadup();

+            Assert.IsTrue(tree.AllowsDuplicates);

+        }

+

+

+		[Test]

+		public void Add()

+		{

+			Assert.IsTrue(tree.Add(17));

+			Assert.IsTrue(tree.Add(17));

+			Assert.IsTrue(tree.Add(18));

+			Assert.IsTrue(tree.Add(18));

+			Assert.AreEqual(4, tree.Count);

+			Assert.IsTrue(IC.eq(tree, 17, 17, 18, 18));

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+		}

+	}

 

 

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void PredecessorTooLow1()

-    {

-      tree.Predecessor(-2);

-    }

-

 

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void PredecessorTooLow2()

-    {

-      tree.Predecessor(0);

-    }

+	[TestFixture]

+	public class ArrayTest

+	{

+		private TreeBag<int> tree;

+

+		int[] a;

+

+

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+			a = new int[10];

+			for (int i = 0; i < 10; i++)

+				a[i] = 1000 + i;

+		}

+

+

+		[TearDown]

+		public void Dispose() { tree = null; }

+

+

+		private string aeq(int[] a, params int[] b)

+		{

+			if (a.Length != b.Length)

+				return "Lengths differ: " + a.Length + " != " + b.Length;

+

+			for (int i = 0; i < a.Length; i++)

+				if (a[i] != b[i])

+					return String.Format("{0}'th elements differ: {1} != {2}", i, a[i], b[i]);

+

+			return "Alles klar";

+		}

+

+

+		[Test]

+		public void ToArray()

+		{

+			Assert.AreEqual("Alles klar", aeq(tree.ToArray()));

+			tree.Add(4);

+			tree.Add(7);

+			tree.Add(4);

+			Assert.AreEqual("Alles klar", aeq(tree.ToArray(), 4, 4, 7));

+		}

+

+

+		[Test]

+		public void CopyTo()

+		{

+			tree.CopyTo(a, 1);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));

+			tree.Add(6);

+			tree.Add(6);

+			tree.CopyTo(a, 2);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 6, 1004, 1005, 1006, 1007, 1008, 1009));

+			tree.Add(4);

+			tree.Add(9);

+			tree.CopyTo(a, 4);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 6, 4, 6, 6, 9, 1008, 1009));

+			tree.Clear();

+			tree.Add(7);

+			tree.CopyTo(a, 9);

+			Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 6, 4, 6, 6, 9, 1008, 7));

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToBad()

+		{

+			tree.Add(3);

+			tree.CopyTo(a, 10);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void CopyToBad2()

+		{

+			tree.CopyTo(a, -1);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToTooFar()

+		{

+			tree.Add(3);

+			tree.Add(4);

+			tree.CopyTo(a, 9);

+		}

+	}

+

+

+

+	[TestFixture]

+	public class Remove

+	{

+		private TreeBag<int> tree;

+

+

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+			for (int i = 10; i < 20; i++)

+			{

+				tree.Add(i);

+				tree.Add(i + 5);

+			}

+			//10,11,12,13,14,15,15,16,16,17,17,18,18,19,19,20,21,22,23,24

+		}

+

+

+		[Test]

+		public void SmallTrees()

+		{

+			tree.Clear();

+			tree.Add(9);

+			tree.Add(7);

+			tree.Add(9);

+			Assert.IsTrue(tree.Remove(7));

+			Assert.IsTrue(tree.Check(""));

+		}

+

+

+		[Test]

+		public void ByIndex()

+		{

+			//Remove root!

+			int n = tree.Count;

+			int i = tree[10];

+

+			Assert.AreEqual(17,tree.RemoveAt(10));

+			Assert.IsTrue(tree.Check(""));

+			Assert.IsTrue(tree.Contains(i));

+			Assert.AreEqual(n - 1, tree.Count);

+			Assert.AreEqual(17, tree.RemoveAt(9));

+			Assert.IsTrue(tree.Check(""));

+			Assert.IsFalse(tree.Contains(i));

+			Assert.AreEqual(n - 2, tree.Count);

+

+			//Low end

+			i = tree.FindMin();

+			tree.RemoveAt(0);

+			Assert.IsTrue(tree.Check(""));

+			Assert.IsFalse(tree.Contains(i));

+			Assert.AreEqual(n - 3, tree.Count);

+

+			//high end

+			i = tree.FindMax();

+			tree.RemoveAt(tree.Count - 1);

+			Assert.IsTrue(tree.Check(""));

+			Assert.IsFalse(tree.Contains(i));

+			Assert.AreEqual(n - 4, tree.Count);

+

+			//Some leaf

+			//tree.dump();

+			i = 18;

+			Assert.AreEqual(i, tree.RemoveAt(9));

+			Assert.IsTrue(tree.Check(""));

+			Assert.AreEqual(i, tree.RemoveAt(8));

+			Assert.IsTrue(tree.Check(""));

+			Assert.IsFalse(tree.Contains(i));

+			Assert.AreEqual(n - 6, tree.Count);

+		}

+

+

+		[Test]

+		public void AlmostEmpty()

+		{

+			//Almost empty

+			tree.Clear();

+			tree.Add(3);

+			tree.RemoveAt(0);

+			Assert.IsTrue(tree.Check(""));

+			Assert.IsFalse(tree.Contains(3));

+			Assert.AreEqual(0, tree.Count);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

+		public void Empty()

+		{

+			tree.Clear();

+			tree.RemoveAt(0);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

+		public void HighIndex()

+		{

+			tree.RemoveAt(tree.Count);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

+		public void LowIndex()

+		{

+			tree.RemoveAt(-1);

+		}

+

+

+		[Test]

+		public void Normal()

+		{

+			//Note: ids does not match for bag

+			Assert.IsFalse(tree.Remove(-20));

+

+			//1b

+			Assert.IsTrue(tree.Remove(20));

+			Assert.IsTrue(tree.Check("T1"));

+			Assert.IsFalse(tree.Remove(20));

+

+			//1b

+			Assert.IsTrue(tree.Remove(10));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//case 1c

+			Assert.IsTrue(tree.Remove(24));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//1a (terminating)

+			Assert.IsTrue(tree.Remove(16));

+			Assert.IsTrue(tree.Remove(16));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//2

+			Assert.IsTrue(tree.Remove(18));

+			Assert.IsTrue(tree.Remove(17));

+			Assert.IsTrue(tree.Remove(18));

+			Assert.IsTrue(tree.Remove(17));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//2+1b

+			Assert.IsTrue(tree.Remove(15));

+			Assert.IsTrue(tree.Remove(15));

+			for (int i = 0; i < 5; i++) tree.Add(17 + i);

+			Assert.IsTrue(tree.Remove(23));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//1a+1b

+			Assert.IsTrue(tree.Remove(11));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//2+1c

+			for (int i = 0; i < 10; i++)

+				tree.Add(50 - 2 * i);

+

+			Assert.IsTrue(tree.Remove(42));

+			Assert.IsTrue(tree.Remove(38));

+			Assert.IsTrue(tree.Remove(22));

+			Assert.IsTrue(tree.Remove(40));

+

+			//

+			for (int i = 0; i < 48; i++)

+				tree.Remove(i);

+

+			//Almost empty tree:*

+			Assert.IsFalse(tree.Remove(26));

+			Assert.IsTrue(tree.Remove(48));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+

+			//Empty tree:*

+			Assert.IsFalse(tree.Remove(26));

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+		}

+	}

+

+

+

+	[TestFixture]

+	public class PredecessorStructure

+	{

+		private TreeBag<int> tree;

+

+

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+		}

+

+

+		private void loadup()

+		{

+			for (int i = 0; i < 20; i++) 

+				tree.Add(2 * i);

+			for (int i = 0; i < 10; i++)

+				tree.Add(4 * i);

+		}

+

+

+		[Test]

+		public void Predecessor()

+		{

+			loadup();

+			Assert.AreEqual(6, tree.Predecessor(7));

+			Assert.AreEqual(6, tree.Predecessor(8));

+

+			//The bottom

+			Assert.AreEqual(0, tree.Predecessor(1));

+

+			//The top

+			Assert.AreEqual(38, tree.Predecessor(39));

+		}

 

 

-    [Test]

-    public void WeakPredecessor()

-    {

-      loadup();

-      Assert.AreEqual(6, tree.WeakPredecessor(7));

-      Assert.AreEqual(8, tree.WeakPredecessor(8));

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void PredecessorTooLow1()

+		{

+			tree.Predecessor(-2);

+		}

+

 

-      //The bottom

-      Assert.AreEqual(0, tree.WeakPredecessor(1));

-      Assert.AreEqual(0, tree.WeakPredecessor(0));

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void PredecessorTooLow2()

+		{

+			tree.Predecessor(0);

+		}

 

-      //The top

-      Assert.AreEqual(38, tree.WeakPredecessor(39));

-      Assert.AreEqual(38, tree.WeakPredecessor(38));

-    }

 

+		[Test]

+		public void WeakPredecessor()

+		{

+			loadup();

+			Assert.AreEqual(6, tree.WeakPredecessor(7));

+			Assert.AreEqual(8, tree.WeakPredecessor(8));

 

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void WeakPredecessorTooLow1()

-    {

-      tree.WeakPredecessor(-2);

-    }

+			//The bottom

+			Assert.AreEqual(0, tree.WeakPredecessor(1));

+			Assert.AreEqual(0, tree.WeakPredecessor(0));

 

+			//The top

+			Assert.AreEqual(38, tree.WeakPredecessor(39));

+			Assert.AreEqual(38, tree.WeakPredecessor(38));

+		}

 

-    [Test]

-    public void Successor()

-    {

-      loadup();

-      Assert.AreEqual(8, tree.Successor(7));

-      Assert.AreEqual(10, tree.Successor(8));

 

-      //The bottom

-      Assert.AreEqual(2, tree.Successor(0));

-      Assert.AreEqual(0, tree.Successor(-1));

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void WeakPredecessorTooLow1()

+		{

+			tree.WeakPredecessor(-2);

+		}

 

-      //The top

-      Assert.AreEqual(38, tree.Successor(37));

-    }

 

+		[Test]

+		public void Successor()

+		{

+			loadup();

+			Assert.AreEqual(8, tree.Successor(7));

+			Assert.AreEqual(10, tree.Successor(8));

 

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void SuccessorTooHigh1()

-    {

-      tree.Successor(38);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void SuccessorTooHigh2()

-    {

-      tree.Successor(39);

-    }

-

-

-    [Test]

-    public void WeakSuccessor()

-    {

-      loadup();

-      Assert.AreEqual(6, tree.WeakSuccessor(6));

-      Assert.AreEqual(8, tree.WeakSuccessor(7));

-

-      //The bottom

-      Assert.AreEqual(0, tree.WeakSuccessor(-1));

-      Assert.AreEqual(0, tree.WeakSuccessor(0));

-

-      //The top

-      Assert.AreEqual(38, tree.WeakSuccessor(37));

-      Assert.AreEqual(38, tree.WeakSuccessor(38));

-    }

+			//The bottom

+			Assert.AreEqual(2, tree.Successor(0));

+			Assert.AreEqual(0, tree.Successor(-1));

 

+			//The top

+			Assert.AreEqual(38, tree.Successor(37));

+		}

 

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void WeakSuccessorTooHigh1()

-    {

-      tree.WeakSuccessor(39);

-    }

 

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void SuccessorTooHigh1()

+		{

+			tree.Successor(38);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void SuccessorTooHigh2()

+		{

+			tree.Successor(39);

+		}

+

+

+		[Test]

+		public void WeakSuccessor()

+		{

+			loadup();

+			Assert.AreEqual(6, tree.WeakSuccessor(6));

+			Assert.AreEqual(8, tree.WeakSuccessor(7));

+

+			//The bottom

+			Assert.AreEqual(0, tree.WeakSuccessor(-1));

+			Assert.AreEqual(0, tree.WeakSuccessor(0));

+

+			//The top

+			Assert.AreEqual(38, tree.WeakSuccessor(37));

+			Assert.AreEqual(38, tree.WeakSuccessor(38));

+		}

 

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-    }

-  }

 

+		[Test]

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void WeakSuccessorTooHigh1()

+		{

+			tree.WeakSuccessor(39);

+		}

 

 

-  [TestFixture]

-  public class PriorityQueue

-  {

-    private TreeBag<int> tree;

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+		}

+	}

 

 

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-    }

 

+	[TestFixture]

+	public class PriorityQueue

+	{

+		private TreeBag<int> tree;

 

-    private void loadup()

-    {

-      foreach (int i in new int[] { 1, 2, 3, 4 })

-        tree.Add(i);

-      tree.Add(1);

-      tree.Add(3);

-    }

 

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+		}

 

-    [Test]

-    public void Normal()

-    {

-      loadup();

-      Assert.AreEqual(1, tree.FindMin());

-      Assert.AreEqual(4, tree.FindMax());

-      Assert.AreEqual(1, tree.DeleteMin());

-      Assert.AreEqual(4, tree.DeleteMax());

-      Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-      Assert.AreEqual(1, tree.FindMin());

-      Assert.AreEqual(3, tree.FindMax());

-      Assert.AreEqual(1, tree.DeleteMin());

-      Assert.AreEqual(3, tree.DeleteMax());

-      Assert.IsTrue(tree.Check("Normal test 2"), "Bad tree");

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void Empty1()

-    {

-      tree.FindMin();

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void Empty2()

-    {

-      tree.FindMax();

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void Empty3()

-    {

-      tree.DeleteMin();

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void Empty4()

-    {

-      tree.DeleteMax();

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-    }

-  }

-

-

-

-  [TestFixture]

-  public class IndexingAndCounting

-  {

-    private TreeBag<int> tree;

-

-

-    [SetUp]

-    public void Init()

-    {

-      tree = new TreeBag<int>(new IC());

-    }

-

-

-    private void populate()

-    {

-      tree.Add(30);

-      tree.Add(30);

-      tree.Add(50);

-      tree.Add(10);

-      tree.Add(70);

-      tree.Add(70);

-    }

-

-

-    [Test]

-    public void ToArray()

-    {

-      populate();

-

-      int[] a = tree.ToArray();

-

-      Assert.AreEqual(6, a.Length);

-      Assert.AreEqual(10, a[0]);

-      Assert.AreEqual(30, a[1]);

-      Assert.AreEqual(30, a[2]);

-      Assert.AreEqual(50, a[3]);

-      Assert.AreEqual(70, a[4]);

-      Assert.AreEqual(70, a[5]);

-    }

-

-

-    [Test]

-    public void GoodIndex()

-    {

-      Assert.AreEqual(-1, tree.IndexOf(20));

-      Assert.AreEqual(-1, tree.LastIndexOf(20));

-      populate();

-      Assert.AreEqual(10, tree[0]);

-      Assert.AreEqual(30, tree[1]);

-      Assert.AreEqual(30, tree[2]);

-      Assert.AreEqual(50, tree[3]);

-      Assert.AreEqual(70, tree[4]);

-      Assert.AreEqual(70, tree[5]);

-      Assert.AreEqual(0, tree.IndexOf(10));

-      Assert.AreEqual(1, tree.IndexOf(30));

-      Assert.AreEqual(3, tree.IndexOf(50));

-      Assert.AreEqual(4, tree.IndexOf(70));

-      Assert.AreEqual(~1, tree.IndexOf(20));

-      Assert.AreEqual(~0, tree.IndexOf(0));

-      Assert.AreEqual(~6, tree.IndexOf(90));

-      Assert.AreEqual(0, tree.LastIndexOf(10));

-      Assert.AreEqual(2, tree.LastIndexOf(30));

-      Assert.AreEqual(3, tree.LastIndexOf(50));

-      Assert.AreEqual(5, tree.LastIndexOf(70));

-      Assert.AreEqual(~1, tree.LastIndexOf(20));

-      Assert.AreEqual(~0, tree.LastIndexOf(0));

-      Assert.AreEqual(~6, tree.LastIndexOf(90));

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(IndexOutOfRangeException))]

-    public void IndexTooLarge()

-    {

-      populate();

-      Console.WriteLine(tree[6]);

-    }

-

-

-    [Test]

-    [ExpectedException(typeof(IndexOutOfRangeException))]

-    public void IndexTooSmall()

-    {

-      populate();

-      Console.WriteLine(tree[-1]);

-    }

-

-

-    [Test]

-    public void FilledTreeOutsideInput()

-    {

-      populate();

-      Assert.AreEqual(0, tree.CountFrom(90));

-      Assert.AreEqual(0, tree.CountFromTo(-20, 0));

-      Assert.AreEqual(0, tree.CountFromTo(80, 100));

-      Assert.AreEqual(0, tree.CountTo(0));

-      Assert.AreEqual(6, tree.CountTo(90));

-      Assert.AreEqual(6, tree.CountFromTo(-20, 90));

-      Assert.AreEqual(6, tree.CountFrom(0));

-    }

-

-

-    [Test]

-    public void FilledTreeIntermediateInput()

-    {

-      populate();

-      Assert.AreEqual(5, tree.CountFrom(20));

-      Assert.AreEqual(2, tree.CountFromTo(20, 40));

-      Assert.AreEqual(3, tree.CountTo(40));

-    }

-

-

-    [Test]

-    public void FilledTreeMatchingInput()

-    {

-      populate();

-      Assert.AreEqual(5, tree.CountFrom(30));

-      Assert.AreEqual(3, tree.CountFromTo(30, 70));

-      Assert.AreEqual(0, tree.CountFromTo(50, 30));

-      Assert.AreEqual(0, tree.CountFromTo(50, 50));

-      Assert.AreEqual(0, tree.CountTo(10));

-      Assert.AreEqual(3, tree.CountTo(50));

-    }

-

-

-    [Test]

-    public void CountEmptyTree()

-    {

-      Assert.AreEqual(0, tree.CountFrom(20));

-      Assert.AreEqual(0, tree.CountFromTo(20, 40));

-      Assert.AreEqual(0, tree.CountTo(40));

-    }

-

-

-    [TearDown]

-    public void Dispose()

-    {

-      tree = null;

-    }

-  }

-

-

-

-

-  namespace ModificationCheck

-  {

-    [TestFixture]

-    public class Enumerator

-    {

-      private TreeBag<int> tree;

-

-      private SCG.IEnumerator<int> e;

-

-

-      [SetUp]

-      public void Init()

-      {

-        tree = new TreeBag<int>(new IC());

-        for (int i = 0; i < 10; i++)

-          tree.Add(i);

-        tree.Add(3);

-        tree.Add(7);

-        e = tree.GetEnumerator();

-      }

-

-

-      [Test]

-      public void CurrentAfterModification()

-      {

-        e.MoveNext();

-        tree.Add(34);

-        Assert.AreEqual(0, e.Current);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterAdd()

-      {

-        tree.Add(34);

-        e.MoveNext();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterRemove()

-      {

-        tree.Remove(34);

-        e.MoveNext();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterClear()

-      {

-        tree.Clear();

-        e.MoveNext();

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        tree = null;

-        e = null;

-      }

-    }

 

+		private void loadup()

+		{

+			foreach (int i in new int[] { 1, 2, 3, 4 })

+				tree.Add(i);

+			tree.Add(1);

+			tree.Add(3);

+		}

 

 

-    [TestFixture]

-    public class RangeEnumerator

-    {

-      private TreeBag<int> tree;

+		[Test]

+		public void Normal()

+		{

+			loadup();

+			Assert.AreEqual(1, tree.FindMin());

+			Assert.AreEqual(4, tree.FindMax());

+			Assert.AreEqual(1, tree.DeleteMin());

+			Assert.AreEqual(4, tree.DeleteMax());

+			Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+			Assert.AreEqual(1, tree.FindMin());

+			Assert.AreEqual(3, tree.FindMax());

+			Assert.AreEqual(1, tree.DeleteMin());

+			Assert.AreEqual(3, tree.DeleteMax());

+			Assert.IsTrue(tree.Check("Normal test 2"), "Bad tree");

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

+		public void Empty1()

+		{

+			tree.FindMin();

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

+		public void Empty2()

+		{

+			tree.FindMax();

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

+		public void Empty3()

+		{

+			tree.DeleteMin();

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

+		public void Empty4()

+		{

+			tree.DeleteMax();

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+		}

+	}

+

+

+

+	[TestFixture]

+	public class IndexingAndCounting

+	{

+		private TreeBag<int> tree;

+

+

+		[SetUp]

+		public void Init()

+		{

+			tree = new TreeBag<int>(new IC());

+		}

+

+

+		private void populate()

+		{

+			tree.Add(30);

+			tree.Add(30);

+			tree.Add(50);

+			tree.Add(10);

+			tree.Add(70);

+			tree.Add(70);

+		}

+

+

+		[Test]

+		public void ToArray()

+		{

+			populate();

+

+			int[] a = tree.ToArray();

+

+			Assert.AreEqual(6, a.Length);

+			Assert.AreEqual(10, a[0]);

+			Assert.AreEqual(30, a[1]);

+			Assert.AreEqual(30, a[2]);

+			Assert.AreEqual(50, a[3]);

+			Assert.AreEqual(70, a[4]);

+			Assert.AreEqual(70, a[5]);

+		}

+

+

+		[Test]

+		public void GoodIndex()

+		{

+			Assert.AreEqual(-1, tree.IndexOf(20));

+			Assert.AreEqual(-1, tree.LastIndexOf(20));

+			populate();

+			Assert.AreEqual(10, tree[0]);

+			Assert.AreEqual(30, tree[1]);

+			Assert.AreEqual(30, tree[2]);

+			Assert.AreEqual(50, tree[3]);

+			Assert.AreEqual(70, tree[4]);

+			Assert.AreEqual(70, tree[5]);

+			Assert.AreEqual(0, tree.IndexOf(10));

+			Assert.AreEqual(1, tree.IndexOf(30));

+			Assert.AreEqual(3, tree.IndexOf(50));

+			Assert.AreEqual(4, tree.IndexOf(70));

+			Assert.AreEqual(-1, tree.IndexOf(20));

+			Assert.AreEqual(-1, tree.IndexOf(0));

+			Assert.AreEqual(-1, tree.IndexOf(90));

+			Assert.AreEqual(0, tree.LastIndexOf(10));

+			Assert.AreEqual(2, tree.LastIndexOf(30));

+			Assert.AreEqual(3, tree.LastIndexOf(50));

+			Assert.AreEqual(5, tree.LastIndexOf(70));

+			Assert.AreEqual(-1, tree.LastIndexOf(20));

+			Assert.AreEqual(-1, tree.LastIndexOf(0));

+			Assert.AreEqual(-1, tree.LastIndexOf(90));

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(IndexOutOfRangeException))]

+		public void IndexTooLarge()

+		{

+			populate();

+			Console.WriteLine(tree[6]);

+		}

+

+

+		[Test]

+		[ExpectedException(typeof(IndexOutOfRangeException))]

+		public void IndexTooSmall()

+		{

+			populate();

+			Console.WriteLine(tree[-1]);

+		}

+

+

+		[Test]

+		public void FilledTreeOutsideInput()

+		{

+			populate();

+			Assert.AreEqual(0, tree.CountFrom(90));

+			Assert.AreEqual(0, tree.CountFromTo(-20, 0));

+			Assert.AreEqual(0, tree.CountFromTo(80, 100));

+			Assert.AreEqual(0, tree.CountTo(0));

+			Assert.AreEqual(6, tree.CountTo(90));

+			Assert.AreEqual(6, tree.CountFromTo(-20, 90));

+			Assert.AreEqual(6, tree.CountFrom(0));

+		}

+

+

+		[Test]

+		public void FilledTreeIntermediateInput()

+		{

+			populate();

+			Assert.AreEqual(5, tree.CountFrom(20));

+			Assert.AreEqual(2, tree.CountFromTo(20, 40));

+			Assert.AreEqual(3, tree.CountTo(40));

+		}

+

+

+		[Test]

+		public void FilledTreeMatchingInput()

+		{

+			populate();

+			Assert.AreEqual(5, tree.CountFrom(30));

+			Assert.AreEqual(3, tree.CountFromTo(30, 70));

+			Assert.AreEqual(0, tree.CountFromTo(50, 30));

+			Assert.AreEqual(0, tree.CountFromTo(50, 50));

+			Assert.AreEqual(0, tree.CountTo(10));

+			Assert.AreEqual(3, tree.CountTo(50));

+		}

+

+

+		[Test]

+		public void CountEmptyTree()

+		{

+			Assert.AreEqual(0, tree.CountFrom(20));

+			Assert.AreEqual(0, tree.CountFromTo(20, 40));

+			Assert.AreEqual(0, tree.CountTo(40));

+		}

+

+

+		[TearDown]

+		public void Dispose()

+		{

+			tree = null;

+		}

+	}

+

+

+

+

+	namespace ModificationCheck

+	{

+		[TestFixture]

+		public class Enumerator

+		{

+			private TreeBag<int> tree;

+

+			private MSG.IEnumerator<int> e;

+

+

+			[SetUp]

+			public void Init()

+			{

+				tree = new TreeBag<int>(new IC());

+				for (int i = 0; i < 10; i++)

+					tree.Add(i);

+				tree.Add(3); 

+				tree.Add(7);

+				e = tree.GetEnumerator();

+			}

+

+

+			[Test]

+			public void CurrentAfterModification()

+			{

+				e.MoveNext();

+				tree.Add(34);

+				Assert.AreEqual(0, e.Current);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterAdd()

+			{

+				tree.Add(34);

+				e.MoveNext();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterRemove()

+			{

+				tree.Remove(34);

+				e.MoveNext();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterClear()

+			{

+				tree.Clear();

+				e.MoveNext();

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				tree = null;

+				e = null;

+			}

+		}

 

-      private SCG.IEnumerator<int> e;

 

 

-      [SetUp]

-      public void Init()

-      {

-        tree = new TreeBag<int>(new IC());

-        for (int i = 0; i < 10; i++)

-          tree.Add(i);

+		[TestFixture]

+		public class RangeEnumerator

+		{

+			private TreeBag<int> tree;

 

-        e = tree.RangeFromTo(3, 7).GetEnumerator();

-      }

+			private MSG.IEnumerator<int> e;

 

 

-      [Test]

-      public void CurrentAfterModification()

-      {

-        e.MoveNext();

-        tree.Add(34);

-        Assert.AreEqual(3, e.Current);

-      }

+			[SetUp]

+			public void Init()

+			{

+				tree = new TreeBag<int>(new IC());

+				for (int i = 0; i < 10; i++)

+					tree.Add(i);

 

+				e = tree.RangeFromTo(3, 7).GetEnumerator();

+			}

 

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterAdd()

-      {

-        tree.Add(34);

-        e.MoveNext();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterRemove()

-      {

-        tree.Remove(34);

-        e.MoveNext();

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterClear()

-      {

-        tree.Clear();

-        e.MoveNext();

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        tree = null;

-        e = null;

-      }

-    }

-  }

-

-

-

-

-  namespace PathcopyPersistence

-  {

-    [TestFixture]

-    public class Navigation

-    {

-      private TreeBag<int> tree, snap;

-

-      private SCG.IComparer<int> ic;

-

-

-      [SetUp]

-      public void Init()

-      {

-        ic = new IC();

-        tree = new TreeBag<int>(ic);

-        for (int i = 0; i <= 20; i++)

-          tree.Add(2 * i + 1);

-        tree.Add(13);

-        snap = (TreeBag<int>)tree.Snapshot();

-        for (int i = 0; i <= 10; i++)

-          tree.Remove(4 * i + 1);

-      }

-

-

-      private bool twomodeleven(int i)

-      {

-        return i % 11 == 2;

-      }

-

-

-      [Test]

-      public void InternalEnum()

-      {

-        Assert.IsTrue(IC.eq(snap.FindAll(new Fun<int, bool>(twomodeleven)), 13, 13, 35));

-      }

-

-

-      public void MoreCut()

-      {

-        //TODO: Assert.Fail("more tests of Cut needed");

-      }

-

-

-      [Test]

-      public void Cut()

-      {

-        int lo, hi;

-        bool lv, hv;

-

-        Assert.IsFalse(snap.Cut(new HigherOrder.CubeRoot(64), out lo, out lv, out hi, out hv));

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(5, hi);

-        Assert.AreEqual(3, lo);

-        Assert.IsTrue(snap.Cut(new HigherOrder.CubeRoot(125), out lo, out lv, out hi, out hv));

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(7, hi);

-        Assert.AreEqual(3, lo);

-        Assert.IsFalse(snap.Cut(new HigherOrder.CubeRoot(125000), out lo, out lv, out hi, out hv));

-        Assert.IsTrue(lv && !hv);

-        Assert.AreEqual(41, lo);

-        Assert.IsFalse(snap.Cut(new HigherOrder.CubeRoot(-27), out lo, out lv, out hi, out hv));

-        Assert.IsTrue(!lv && hv);

-        Assert.AreEqual(1, hi);

-      }

-

-

-      [Test]

-      public void Range()

-      {

-        Assert.IsTrue(IC.eq(snap.RangeFromTo(5, 16), 5, 7, 9, 11, 13, 13, 15));

-        Assert.IsTrue(IC.eq(snap.RangeFromTo(5, 17), 5, 7, 9, 11, 13, 13, 15));

-        Assert.IsTrue(IC.eq(snap.RangeFromTo(6, 16), 7, 9, 11, 13, 13, 15));

-      }

-

-

-      [Test]

-      public void Contains()

-      {

-        Assert.IsTrue(snap.Contains(5));

-        Assert.IsTrue(snap.Contains(13));

-        Assert.AreEqual(1, snap.ContainsCount(5));

-        Assert.AreEqual(2, snap.ContainsCount(13));

-      }

-

-

-      [Test]

-      public void FindMin()

-      {

-        Assert.AreEqual(1, snap.FindMin());

-      }

-

-

-      [Test]

-      public void FindMax()

-      {

-        Assert.AreEqual(41, snap.FindMax());

-      }

-

-

-      [Test]

-      public void Predecessor()

-      {

-        Assert.AreEqual(13, snap.Predecessor(15));

-        Assert.AreEqual(15, snap.Predecessor(16));

-        Assert.AreEqual(15, snap.Predecessor(17));

-        Assert.AreEqual(17, snap.Predecessor(18));

-      }

-

-

-      [Test]

-      public void Successor()

-      {

-        Assert.AreEqual(17, snap.Successor(15));

-        Assert.AreEqual(17, snap.Successor(16));

-        Assert.AreEqual(19, snap.Successor(17));

-        Assert.AreEqual(19, snap.Successor(18));

-      }

-

-

-      [Test]

-      public void WeakPredecessor()

-      {

-        Assert.AreEqual(15, snap.WeakPredecessor(15));

-        Assert.AreEqual(15, snap.WeakPredecessor(16));

-        Assert.AreEqual(17, snap.WeakPredecessor(17));

-        Assert.AreEqual(17, snap.WeakPredecessor(18));

-      }

-

-

-      [Test]

-      public void WeakSuccessor()

-      {

-        Assert.AreEqual(15, snap.WeakSuccessor(15));

-        Assert.AreEqual(17, snap.WeakSuccessor(16));

-        Assert.AreEqual(17, snap.WeakSuccessor(17));

-        Assert.AreEqual(19, snap.WeakSuccessor(18));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NotSupportedException), "Indexing not supported for snapshots")]

-      public void CountTo()

-      {

-        int j = snap.CountTo(15);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NotSupportedException), "Indexing not supported for snapshots")]

-      public void Indexing()

-      {

-        int j = snap[4];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NotSupportedException), "Indexing not supported for snapshots")]

-      public void Indexing2()

-      {

-        int j = snap.IndexOf(5);

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        tree = null;

-        ic = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Single

-    {

-      private TreeBag<int> tree;

-

-      private SCG.IComparer<int> ic;

-

-

-      [SetUp]

-      public void Init()

-      {

-        ic = new IC();

-        tree = new TreeBag<int>(ic);

-        for (int i = 0; i < 10; i++)

-          tree.Add(2 * i + 1);

-      }

-

-

-      [Test]

-      public void EnumerationWithAdd()

-      {

-        int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

-        int i = 0;

-        TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

-

-        foreach (int j in snap)

-        {

-          Assert.AreEqual(1 + 2 * i++, j);

-          tree.Add(21 - j);

-          Assert.IsTrue(snap.Check("M"), "Bad snap!");

-          Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-          Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        }

-      }

-

-

-      [Test]

-      public void Remove()

-      {

-        int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

-        TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

-

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        tree.Remove(19);

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-      }

-

-

-      [Test]

-      public void RemoveNormal()

-      {

-        tree.Clear();

-        for (int i = 10; i < 20; i++)

-        {

-          tree.Add(i);

-          tree.Add(i + 10);

-        }

-        tree.Add(15);

-

-        int[] orig = new int[] { 10, 11, 12, 13, 14, 15, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 };

-        TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

-

-        Assert.IsFalse(tree.Remove(-20));

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-

-        //decrease items case

-        Assert.IsTrue(tree.Remove(15));

-        Assert.IsTrue(tree.Check("T1"));

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        //snap.dump();

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //No demote case, with move_item

-        Assert.IsTrue(tree.Remove(20));

-        Assert.IsTrue(tree.Check("T1"));

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.IsFalse(tree.Remove(20));

-

-        //plain case 2

-        tree.Snapshot();

-        Assert.IsTrue(tree.Remove(14));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //case 1b

-        Assert.IsTrue(tree.Remove(25));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //case 1c

-        Assert.IsTrue(tree.Remove(29));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //1a (terminating)

-        Assert.IsTrue(tree.Remove(10));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //2+1b

-        Assert.IsTrue(tree.Remove(12));

-        tree.Snapshot();

-        Assert.IsTrue(tree.Remove(11));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //1a+1b

-        Assert.IsTrue(tree.Remove(18));

-        Assert.IsTrue(tree.Remove(13));

-        Assert.IsTrue(tree.Remove(15));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //2+1c

-        for (int i = 0; i < 10; i++)

-          tree.Add(50 - 2 * i);

-

-        Assert.IsTrue(tree.Remove(42));

-        Assert.IsTrue(tree.Remove(38));

-        Assert.IsTrue(tree.Remove(28));

-        Assert.IsTrue(tree.Remove(40));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //

-        Assert.IsTrue(tree.Remove(16));

-        Assert.IsTrue(tree.Remove(23));

-        Assert.IsTrue(tree.Remove(17));

-        Assert.IsTrue(tree.Remove(19));

-        Assert.IsTrue(tree.Remove(50));

-        Assert.IsTrue(tree.Remove(26));

-        Assert.IsTrue(tree.Remove(21));

-        Assert.IsTrue(tree.Remove(22));

-        Assert.IsTrue(tree.Remove(24));

-        for (int i = 0; i < 48; i++)

-          tree.Remove(i);

-

-        //Almost empty tree:

-        Assert.IsFalse(tree.Remove(26));

-        Assert.IsTrue(tree.Remove(48));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //Empty tree:

-        Assert.IsFalse(tree.Remove(26));

-        Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-      }

-

-

-      [Test]

-      public void Add()

-      {

-        int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

-        TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

-

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        tree.Add(10);

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        tree.Add(16);

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-

-        tree.Add(9);

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-

-        //Promote+zigzig

-        tree.Add(40);

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        for (int i = 1; i < 4; i++)

-          tree.Add(40 - 2 * i);

-

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-

-        //Zigzag:

-        tree.Add(32);

-        Assert.IsTrue(snap.Check("M"), "Bad snap!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-      }

-

-

-      [Test]

-      public void Clear()

-      {

-        int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

-        TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

-

-        tree.Clear();

-        Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

-        Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

-        Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

-        Assert.AreEqual(0, tree.Count);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(InvalidOperationException), "Cannot snapshot a snapshot")]

-      public void SnapSnap()

-      {

-        TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

-

-        snap.Snapshot();

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        tree = null;

-        ic = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class Multiple

-    {

-      private TreeBag<int> tree;

-

-      private SCG.IComparer<int> ic;

-

-

-      private bool eq(SCG.IEnumerable<int> me, int[] that)

-      {

-        int i = 0, maxind = that.Length - 1;

-

-        foreach (int item in me)

-          if (i > maxind || ic.Compare(item, that[i++]) != 0)

-            return false;

-

-        return true;

-      }

-

-

-      [SetUp]

-      public void Init()

-      {

-        ic = new IC();

-        tree = new TreeBag<int>(ic);

-        for (int i = 0; i < 10; i++)

-          tree.Add(2 * i + 1);

-      }

-

-

-      [Test]

-      public void First()

-      {

-        TreeBag<int>[] snaps = new TreeBag<int>[10];

-

-        for (int i = 0; i < 10; i++)

-        {

-          snaps[i] = (TreeBag<int>)(tree.Snapshot());

-          tree.Add(2 * i);

-        }

 

-        for (int i = 0; i < 10; i++)

-        {

-          Assert.AreEqual(i + 10, snaps[i].Count);

-        }

+			[Test]

+			public void CurrentAfterModification()

+			{

+				e.MoveNext();

+				tree.Add(34);

+				Assert.AreEqual(3, e.Current);

+			}

 

-        snaps[5] = null;

-        snaps[9] = null;

-        GC.Collect();

-        snaps[8].Dispose();

-        tree.Remove(14);

-

-        int[] res = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19 };

-        int[] snap7 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 17, 19 };

-        int[] snap3 = new int[] { 0, 1, 2, 3, 4, 5, 7, 9, 11, 13, 15, 17, 19 };

-

-        Assert.IsTrue(IC.eq(snaps[3], snap3), "Snap 3 was changed!");

-        Assert.IsTrue(IC.eq(snaps[7], snap7), "Snap 7 was changed!");

-        Assert.IsTrue(IC.eq(tree, res));

-        Assert.IsTrue(tree.Check("B"));

-        Assert.IsTrue(snaps[3].Check("B"));

-        Assert.IsTrue(snaps[7].Check("B"));

-      }

-

-

-      [Test]

-      public void CollectingTheMaster()

-      {

-        TreeBag<int>[] snaps = new TreeBag<int>[10];

-

-        for (int i = 0; i < 10; i++)

-        {

-          snaps[i] = (TreeBag<int>)(tree.Snapshot());

-          tree.Add(2 * i);

-        }

 

-        tree = null;

-        GC.Collect();

-        for (int i = 0; i < 10; i++)

-        {

-          Assert.AreEqual(i + 10, snaps[i].Count);

-        }

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterAdd()

+			{

+				tree.Add(34);

+				e.MoveNext();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterRemove()

+			{

+				tree.Remove(34);

+				e.MoveNext();

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterClear()

+			{

+				tree.Clear();

+				e.MoveNext();

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				tree = null;

+				e = null;

+			}

+		}

+	}

+

+

+

+

+	namespace PathcopyPersistence

+	{

+		[TestFixture]

+		public class Navigation

+		{

+			private TreeBag<int> tree, snap;

+

+			private IComparer<int> ic;

+

+

+			[SetUp]

+			public void Init()

+			{

+				ic = new IC();

+				tree = new TreeBag<int>(ic);

+				for (int i = 0; i <= 20; i++)

+					tree.Add(2 * i + 1);

+				tree.Add(13);

+				snap = (TreeBag<int>)tree.Snapshot();

+				for (int i = 0; i <= 10; i++)

+					tree.Remove(4 * i + 1);

+			}

+

+

+			private bool twomodeleven(int i)

+			{

+				return i % 11 == 2;

+			}

+

+

+			[Test]

+			public void InternalEnum()

+			{

+				Assert.IsTrue(IC.eq(snap.FindAll(new Filter<int>(twomodeleven)), 13, 13, 35));

+			}

+

+

+			public void MoreCut()

+			{

+				//TODO: Assert.Fail("more tests of Cut needed");

+			}

+

+

+			[Test]

+			public void Cut()

+			{

+				int lo, hi;

+				bool lv, hv;

+

+				Assert.IsFalse(snap.Cut(new HigherOrder.CubeRoot(64), out lo, out lv, out hi, out hv));

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(5, hi);

+				Assert.AreEqual(3, lo);

+				Assert.IsTrue(snap.Cut(new HigherOrder.CubeRoot(125), out lo, out lv, out hi, out hv));

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(7, hi);

+				Assert.AreEqual(3, lo);

+				Assert.IsFalse(snap.Cut(new HigherOrder.CubeRoot(125000), out lo, out lv, out hi, out hv));

+				Assert.IsTrue(lv && !hv);

+				Assert.AreEqual(41, lo);

+				Assert.IsFalse(snap.Cut(new HigherOrder.CubeRoot(-27), out lo, out lv, out hi, out hv));

+				Assert.IsTrue(!lv && hv);

+				Assert.AreEqual(1, hi);

+			}

+

+

+			[Test]

+			public void Range()

+			{

+				Assert.IsTrue(IC.eq(snap.RangeFromTo(5, 16), 5, 7, 9, 11,13,  13, 15));

+				Assert.IsTrue(IC.eq(snap.RangeFromTo(5, 17), 5, 7, 9, 11,13,  13, 15));

+				Assert.IsTrue(IC.eq(snap.RangeFromTo(6, 16), 7, 9, 11,13,  13, 15));

+			}

+

+

+			[Test]

+			public void Contains()

+			{

+				Assert.IsTrue(snap.Contains(5));

+				Assert.IsTrue(snap.Contains(13));

+				Assert.AreEqual(1, snap.ContainsCount(5));

+				Assert.AreEqual(2, snap.ContainsCount(13));

+			}

+

+

+			[Test]

+			public void FindMin()

+			{

+				Assert.AreEqual(1, snap.FindMin());

+			}

+

+

+			[Test]

+			public void FindMax()

+			{

+				Assert.AreEqual(41, snap.FindMax());

+			}

+

+

+			[Test]

+			public void Predecessor()

+			{

+				Assert.AreEqual(13, snap.Predecessor(15));

+				Assert.AreEqual(15, snap.Predecessor(16));

+				Assert.AreEqual(15, snap.Predecessor(17));

+				Assert.AreEqual(17, snap.Predecessor(18));

+			}

+

+

+			[Test]

+			public void Successor()

+			{

+				Assert.AreEqual(17, snap.Successor(15));

+				Assert.AreEqual(17, snap.Successor(16));

+				Assert.AreEqual(19, snap.Successor(17));

+				Assert.AreEqual(19, snap.Successor(18));

+			}

+

+

+			[Test]

+			public void WeakPredecessor()

+			{

+				Assert.AreEqual(15, snap.WeakPredecessor(15));

+				Assert.AreEqual(15, snap.WeakPredecessor(16));

+				Assert.AreEqual(17, snap.WeakPredecessor(17));

+				Assert.AreEqual(17, snap.WeakPredecessor(18));

+			}

+

+

+			[Test]

+			public void WeakSuccessor()

+			{

+				Assert.AreEqual(15, snap.WeakSuccessor(15));

+				Assert.AreEqual(17, snap.WeakSuccessor(16));

+				Assert.AreEqual(17, snap.WeakSuccessor(17));

+				Assert.AreEqual(19, snap.WeakSuccessor(18));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(NotSupportedException), "Indexing not supported for snapshots")]

+			public void CountTo()

+			{

+				int j = snap.CountTo(15);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(NotSupportedException), "Indexing not supported for snapshots")]

+			public void Indexing()

+			{

+				int j = snap[4];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(NotSupportedException), "Indexing not supported for snapshots")]

+			public void Indexing2()

+			{

+				int j = snap.IndexOf(5);

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				tree = null;

+				ic = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Single

+		{

+			private TreeBag<int> tree;

+

+			private IComparer<int> ic;

+

+

+			[SetUp]

+			public void Init()

+			{

+				ic = new IC();

+				tree = new TreeBag<int>(ic);

+				for (int i = 0; i < 10; i++)

+					tree.Add(2 * i + 1);

+			}

+

+

+			[Test]

+			public void EnumerationWithAdd()

+			{

+				int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

+				int i = 0;

+				TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

+

+				foreach (int j in snap)

+				{

+					Assert.AreEqual(1 + 2 * i++, j);

+					tree.Add(21 - j);

+					Assert.IsTrue(snap.Check("M"), "Bad snap!");

+					Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+					Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				}

+			}

+

+

+			[Test]

+			public void Remove()

+			{

+				int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

+				TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

+

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				tree.Remove(19);

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+			}

+

+

+			[Test]

+			public void RemoveNormal()

+			{

+				tree.Clear();

+				for (int i = 10; i < 20; i++)

+				{

+					tree.Add(i);

+					tree.Add(i + 10);

+				}

+				tree.Add(15);

+

+				int[] orig = new int[] { 10, 11, 12, 13, 14, 15, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 };

+				TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

+

+				Assert.IsFalse(tree.Remove(-20));

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+

+				//decrease items case

+				Assert.IsTrue(tree.Remove(15));

+				Assert.IsTrue(tree.Check("T1"));

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				//snap.dump();

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//No demote case, with move_item

+				Assert.IsTrue(tree.Remove(20));

+				Assert.IsTrue(tree.Check("T1"));

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.IsFalse(tree.Remove(20));

+

+				//plain case 2

+				tree.Snapshot();

+				Assert.IsTrue(tree.Remove(14));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//case 1b

+				Assert.IsTrue(tree.Remove(25));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//case 1c

+				Assert.IsTrue(tree.Remove(29));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//1a (terminating)

+				Assert.IsTrue(tree.Remove(10));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//2+1b

+				Assert.IsTrue(tree.Remove(12));

+				tree.Snapshot();

+				Assert.IsTrue(tree.Remove(11));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//1a+1b

+				Assert.IsTrue(tree.Remove(18));

+				Assert.IsTrue(tree.Remove(13));

+				Assert.IsTrue(tree.Remove(15));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//2+1c

+				for (int i = 0; i < 10; i++)

+					tree.Add(50 - 2 * i);

+

+				Assert.IsTrue(tree.Remove(42));

+				Assert.IsTrue(tree.Remove(38));

+				Assert.IsTrue(tree.Remove(28));

+				Assert.IsTrue(tree.Remove(40));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//

+				Assert.IsTrue(tree.Remove(16));

+				Assert.IsTrue(tree.Remove(23));

+				Assert.IsTrue(tree.Remove(17));

+				Assert.IsTrue(tree.Remove(19));

+				Assert.IsTrue(tree.Remove(50));

+				Assert.IsTrue(tree.Remove(26));

+				Assert.IsTrue(tree.Remove(21));

+				Assert.IsTrue(tree.Remove(22));

+				Assert.IsTrue(tree.Remove(24));

+				for (int i = 0; i < 48; i++)

+					tree.Remove(i);

+

+				//Almost empty tree:

+				Assert.IsFalse(tree.Remove(26));

+				Assert.IsTrue(tree.Remove(48));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//Empty tree:

+				Assert.IsFalse(tree.Remove(26));

+				Assert.IsTrue(tree.Check("Normal test 1"), "Bad tree");

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+			}

+

+

+			[Test]

+			public void Add()

+			{

+				int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

+				TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

+

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				tree.Add(10);

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				tree.Add(16);

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+

+				tree.Add(9);

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+

+				//Promote+zigzig

+				tree.Add(40);

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				for (int i = 1; i < 4; i++)

+					tree.Add(40 - 2 * i);

+

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+

+				//Zigzag:

+				tree.Add(32);

+				Assert.IsTrue(snap.Check("M"), "Bad snap!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+			}

+

+

+			[Test]

+			public void Clear()

+			{

+				int[] orig = new int[] { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };

+				TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

+

+				tree.Clear();

+				Assert.IsTrue(snap.Check("Snap"), "Bad snap!");

+				Assert.IsTrue(tree.Check("Tree"), "Bad tree!");

+				Assert.IsTrue(IC.eq(snap, orig), "Snap was changed!");

+				Assert.AreEqual(0, tree.Count);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(InvalidOperationException), "Cannot snapshot a snapshot")]

+			public void SnapSnap()

+			{

+				TreeBag<int> snap = (TreeBag<int>)tree.Snapshot();

+

+				snap.Snapshot();

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				tree = null;

+				ic = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class Multiple

+		{

+			private TreeBag<int> tree;

+

+			private IComparer<int> ic;

+

+

+			private bool eq(MSG.IEnumerable<int> me, int[] that)

+			{

+				int i = 0, maxind = that.Length - 1;

+

+				foreach (int item in me)

+					if (i > maxind || ic.Compare(item, that[i++]) != 0)

+						return false;

+

+				return true;

+			}

+

+

+			[SetUp]

+			public void Init()

+			{

+				ic = new IC();

+				tree = new TreeBag<int>(ic);

+				for (int i = 0; i < 10; i++)

+					tree.Add(2 * i + 1);

+			}

+

+

+			[Test]

+			public void First()

+			{

+				TreeBag<int>[] snaps = new TreeBag<int>[10];

+

+				for (int i = 0; i < 10; i++)

+				{

+					snaps[i] = (TreeBag<int>)(tree.Snapshot());

+					tree.Add(2 * i);

+				}

 

-        snaps[5] = null;

-        snaps[9] = null;

-        GC.Collect();

-        snaps[8].Dispose();

+				for (int i = 0; i < 10; i++)

+				{

+					Assert.AreEqual(i + 10, snaps[i].Count);

+				}

 

-        int[] snap7 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 17, 19 };

-        int[] snap3 = new int[] { 0, 1, 2, 3, 4, 5, 7, 9, 11, 13, 15, 17, 19 };

+				snaps[5] = null;

+				snaps[9] = null;

+				GC.Collect();

+				snaps[8].Dispose();

+				tree.Remove(14);

 

-        Assert.IsTrue(IC.eq(snaps[3], snap3), "Snap 3 was changed!");

-        Assert.IsTrue(IC.eq(snaps[7], snap7), "Snap 7 was changed!");

-        Assert.IsTrue(snaps[3].Check("B"));

-        Assert.IsTrue(snaps[7].Check("B"));

-      }

+				int[] res = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19 };

+				int[] snap7 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 17, 19 };

+				int[] snap3 = new int[] { 0, 1, 2, 3, 4, 5, 7, 9, 11, 13, 15, 17, 19 };

 

+				Assert.IsTrue(IC.eq(snaps[3], snap3), "Snap 3 was changed!");

+				Assert.IsTrue(IC.eq(snaps[7], snap7), "Snap 7 was changed!");

+				Assert.IsTrue(IC.eq(tree, res));

+				Assert.IsTrue(tree.Check("B"));

+				Assert.IsTrue(snaps[3].Check("B"));

+				Assert.IsTrue(snaps[7].Check("B"));

+			}

 

-      [TearDown]

-      public void Dispose()

-      {

-        tree = null;

-        ic = null;

-      }

-    }

-  }

 

+			[Test]

+			public void CollectingTheMaster()

+			{

+				TreeBag<int>[] snaps = new TreeBag<int>[10];

 

+				for (int i = 0; i < 10; i++)

+				{

+					snaps[i] = (TreeBag<int>)(tree.Snapshot());

+					tree.Add(2 * i);

+				}

 

+				tree = null;

+				GC.Collect();

+				for (int i = 0; i < 10; i++)

+				{

+					Assert.AreEqual(i + 10, snaps[i].Count);

+				}

 

-  namespace HigherOrder

-  {

-    internal class CubeRoot : IComparable<int>

-    {

-      private int c;

+				snaps[5] = null;

+				snaps[9] = null;

+				GC.Collect();

+				snaps[8].Dispose();

 

+				int[] snap7 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 17, 19 };

+				int[] snap3 = new int[] { 0, 1, 2, 3, 4, 5, 7, 9, 11, 13, 15, 17, 19 };

 

-      internal CubeRoot(int c) { this.c = c; }

+				Assert.IsTrue(IC.eq(snaps[3], snap3), "Snap 3 was changed!");

+				Assert.IsTrue(IC.eq(snaps[7], snap7), "Snap 7 was changed!");

+				Assert.IsTrue(snaps[3].Check("B"));

+				Assert.IsTrue(snaps[7].Check("B"));

+			}

 

 

-      public int CompareTo(int that) { return c - that * that * that; }

-      public bool Equals(int that) { return c == that * that * that; }

-    }

+			[TearDown]

+			public void Dispose()

+			{

+				tree = null;

+				ic = null;

+			}

+		}

+	}

 

 

 

-    class Interval : IComparable<int>

-    {

-      private int b, t;

 

+	namespace HigherOrder

+	{

+		internal class CubeRoot: IComparable<int>

+		{

+			private int c;

 

-      internal Interval(int b, int t) { this.b = b; this.t = t; }

 

+			internal CubeRoot(int c) { this.c = c; }

 

-      public int CompareTo(int that) { return that < b ? 1 : that > t ? -1 : 0; }

-      public bool Equals(int that) { return that >= b && that <= t; }

-    }

+

+            public int CompareTo(int that) { return c - that * that * that; }

+            public bool Equals(int that) { return c == that * that * that; }

+        }

+

+

+

+        class Interval: IComparable<int>

+		{

+			private int b, t;

+

+

+			internal Interval(int b, int t) { this.b = b; this.t = t; }

+

+

+            public int CompareTo(int that) { return that < b ? 1 : that > t ? -1 : 0; }

+            public bool Equals(int that) { return that >= b && that <= t; }

+        }

 

 

 

-    [TestFixture]

-    public class Simple

-    {

-      private TreeBag<int> tree;

+        [TestFixture]

+		public class Simple

+		{

+			private TreeBag<int> tree;

 

-      private SCG.IComparer<int> ic;

+			private IComparer<int> ic;

 

 

-      [SetUp]

-      public void Init()

-      {

-        ic = new IC();

-        tree = new TreeBag<int>(ic);

-      }

+			[SetUp]

+			public void Init()

+			{

+				ic = new IC();

+				tree = new TreeBag<int>(ic);

+			}

 

 

-      private bool never(int i) { return false; }

+			private bool never(int i) { return false; }

 

 

-      private bool always(int i) { return true; }

+			private bool always(int i) { return true; }

 

 

-      private bool even(int i) { return i % 2 == 0; }

+			private bool even(int i) { return i % 2 == 0; }

 

 

-      private string themap(int i) { return String.Format("AA {0,4} BB", i); }

+			private string themap(int i) { return String.Format("AA {0,4} BB", i); }

 

 

-      private string badmap(int i) { return String.Format("AA {0} BB", i); }

+			private string badmap(int i) { return String.Format("AA {0} BB", i); }

 

 

-      private int appfield1;

+			private int appfield1;

 

-      private int appfield2;

+			private int appfield2;

 

 

-      private void apply(int i) { appfield1++; appfield2 += i * i; }

+			private void apply(int i) { appfield1++; appfield2 += i * i; }

 

 

-      [Test]

-      public void Apply()

-      {

-        Simple simple1 = new Simple();

+			[Test]

+			public void Apply()

+			{

+				Simple simple1 = new Simple();

 

-        tree.Apply(new Act<int>(simple1.apply));

-        Assert.AreEqual(0, simple1.appfield1);

-        Assert.AreEqual(0, simple1.appfield2);

+				tree.Apply(new Applier<int>(simple1.apply));

+				Assert.AreEqual(0, simple1.appfield1);

+				Assert.AreEqual(0, simple1.appfield2);

 

-        Simple simple2 = new Simple();

+				Simple simple2 = new Simple();

 

-        for (int i = 0; i < 10; i++) tree.Add(i);

-        tree.Add(2);

+				for (int i = 0; i < 10; i++) tree.Add(i);

+				tree.Add(2);

 

-        tree.Apply(new Act<int>(simple2.apply));

-        Assert.AreEqual(11, simple2.appfield1);

-        Assert.AreEqual(289, simple2.appfield2);

-      }

+				tree.Apply(new Applier<int>(simple2.apply));

+				Assert.AreEqual(11, simple2.appfield1);

+				Assert.AreEqual(289, simple2.appfield2);

+			}

 

 

-      [Test]

-      public void All()

-      {

-        Assert.IsTrue(tree.All(new Fun<int, bool>(never)));

-        Assert.IsTrue(tree.All(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

-        for (int i = 0; i < 10; i++) tree.Add(i);

+			[Test]

+			public void All()

+			{

+				Assert.IsTrue(tree.All(new Filter<int>(never)));

+				Assert.IsTrue(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

+				for (int i = 0; i < 10; i++)					tree.Add(i);

 

-        Assert.IsFalse(tree.All(new Fun<int, bool>(never)));

-        Assert.IsFalse(tree.All(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

-        tree.Clear();

-        for (int i = 0; i < 10; i++) tree.Add(i * 2);

+				Assert.IsFalse(tree.All(new Filter<int>(never)));

+				Assert.IsFalse(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

+				tree.Clear();

+				for (int i = 0; i < 10; i++)					tree.Add(i * 2);

 

-        Assert.IsFalse(tree.All(new Fun<int, bool>(never)));

-        Assert.IsTrue(tree.All(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

-        tree.Clear();

-        for (int i = 0; i < 10; i++) tree.Add(i * 2 + 1);

+				Assert.IsFalse(tree.All(new Filter<int>(never)));

+				Assert.IsTrue(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

+				tree.Clear();

+				for (int i = 0; i < 10; i++)					tree.Add(i * 2 + 1);

 

-        Assert.IsFalse(tree.All(new Fun<int, bool>(never)));

-        Assert.IsFalse(tree.All(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

-      }

+				Assert.IsFalse(tree.All(new Filter<int>(never)));

+				Assert.IsFalse(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

+			}

 

 

-      [Test]

-      public void Exists()

-      {

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(even)));

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(always)));

-        for (int i = 0; i < 10; i++) tree.Add(i);

+			[Test]

+			public void Exists()

+			{

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(even)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(always)));

+				for (int i = 0; i < 10; i++)					tree.Add(i);

 

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-        Assert.IsTrue(tree.Exists(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.Exists(new Fun<int, bool>(always)));

-        tree.Clear();

-        for (int i = 0; i < 10; i++) tree.Add(i * 2);

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(even)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(always)));

+				tree.Clear();

+				for (int i = 0; i < 10; i++)					tree.Add(i * 2);

 

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-        Assert.IsTrue(tree.Exists(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.Exists(new Fun<int, bool>(always)));

-        tree.Clear();

-        for (int i = 0; i < 10; i++) tree.Add(i * 2 + 1);

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(even)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(always)));

+				tree.Clear();

+				for (int i = 0; i < 10; i++)					tree.Add(i * 2 + 1);

 

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-        Assert.IsFalse(tree.Exists(new Fun<int, bool>(even)));

-        Assert.IsTrue(tree.Exists(new Fun<int, bool>(always)));

-      }

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(even)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(always)));

+			}

 

 

-      [Test]

-      public void FindAll()

-      {

-        Assert.AreEqual(0, tree.FindAll(new Fun<int, bool>(never)).Count);

-        for (int i = 0; i < 10; i++)

-          tree.Add(i);

-        tree.Add(2);

+			[Test]

+			public void FindAll()

+			{

+				Assert.AreEqual(0, tree.FindAll(new Filter<int>(never)).Count);

+				for (int i = 0; i < 10; i++)

+					tree.Add(i);

+				tree.Add(2);

 

-        Assert.AreEqual(0, tree.FindAll(new Fun<int, bool>(never)).Count);

-        Assert.AreEqual(11, tree.FindAll(new Fun<int, bool>(always)).Count);

-        Assert.AreEqual(6, tree.FindAll(new Fun<int, bool>(even)).Count);

-        Assert.IsTrue(((TreeBag<int>)tree.FindAll(new Fun<int, bool>(even))).Check("R"));

-      }

-

-

-      [Test]

-      public void Map()

-      {

-        Assert.AreEqual(0, tree.Map(new Fun<int, string>(themap), new SC()).Count);

-        for (int i = 0; i < 14; i++)

-          tree.Add(i * i * i);

-        tree.Add(1);

-

-        IIndexedSorted<string> res = tree.Map(new Fun<int, string>(themap), new SC());

-

-        Assert.IsTrue(((TreeBag<string>)res).Check("R"));

-        Assert.AreEqual(15, res.Count);

-        Assert.AreEqual("AA    0 BB", res[0]);

-        Assert.AreEqual("AA    1 BB", res[1]);

-        Assert.AreEqual("AA    1 BB", res[2]);

-        Assert.AreEqual("AA    8 BB", res[3]);

-        Assert.AreEqual("AA   27 BB", res[4]);

-        Assert.AreEqual("AA  125 BB", res[6]);

-        Assert.AreEqual("AA 1000 BB", res[11]);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentException), "mapper not monotonic")]

-      public void BadMap()

-      {

-        for (int i = 0; i < 11; i++)

-          tree.Add(i * i * i);

-

-        ISorted<string> res = tree.Map(new Fun<int, string>(badmap), new SC());

-      }

-

-

-      [Test]

-      public void Cut()

-      {

-        for (int i = 0; i < 10; i++)

-          tree.Add(i);

-        tree.Add(3);

-

-        int low, high;

-        bool lval, hval;

-

-        Assert.IsTrue(tree.Cut(new CubeRoot(27), out low, out lval, out high, out hval));

-        Assert.IsTrue(lval && hval);

-        Assert.AreEqual(4, high);

-        Assert.AreEqual(2, low);

-        Assert.IsFalse(tree.Cut(new CubeRoot(30), out low, out lval, out high, out hval));

-        Assert.IsTrue(lval && hval);

-        Assert.AreEqual(4, high);

-        Assert.AreEqual(3, low);

-      }

-

-

-      [Test]

-      public void CutInt()

-      {

-        for (int i = 0; i < 10; i++)

-          tree.Add(2 * i);

-

-        int low, high;

-        bool lval, hval;

-

-        Assert.IsFalse(tree.Cut(new IC(3), out low, out lval, out high, out hval));

-        Assert.IsTrue(lval && hval);

-        Assert.AreEqual(4, high);

-        Assert.AreEqual(2, low);

-        Assert.IsTrue(tree.Cut(new IC(6), out low, out lval, out high, out hval));

-        Assert.IsTrue(lval && hval);

-        Assert.AreEqual(8, high);

-        Assert.AreEqual(4, low);

-      }

-

-

-      [Test]

-      public void CutInterval()

-      {

-        for (int i = 0; i < 10; i++)

-          tree.Add(2 * i);

-

-        int lo, hi;

-        bool lv, hv;

-

-        Assert.IsTrue(tree.Cut(new Interval(5, 9), out lo, out lv, out hi, out hv));

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(10, hi);

-        Assert.AreEqual(4, lo);

-        Assert.IsTrue(tree.Cut(new Interval(6, 10), out lo, out lv, out hi, out hv));

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(12, hi);

-        Assert.AreEqual(4, lo);

-        for (int i = 0; i < 100; i++)

-          tree.Add(2 * i);

-

-        tree.Cut(new Interval(77, 105), out lo, out lv, out hi, out hv);

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(106, hi);

-        Assert.AreEqual(76, lo);

-        tree.Cut(new Interval(5, 7), out lo, out lv, out hi, out hv);

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(8, hi);

-        Assert.AreEqual(4, lo);

-        tree.Cut(new Interval(80, 110), out lo, out lv, out hi, out hv);

-        Assert.IsTrue(lv && hv);

-        Assert.AreEqual(112, hi);

-        Assert.AreEqual(78, lo);

-      }

-

-

-      [Test]

-      public void UpperCut()

-      {

-        for (int i = 0; i < 10; i++)

-          tree.Add(i);

+				Assert.AreEqual(0, tree.FindAll(new Filter<int>(never)).Count);

+				Assert.AreEqual(11, tree.FindAll(new Filter<int>(always)).Count);

+				Assert.AreEqual(6, tree.FindAll(new Filter<int>(even)).Count);

+				Assert.IsTrue(((TreeBag<int>)tree.FindAll(new Filter<int>(even))).Check("R"));

+			}

+

+

+			[Test]

+			public void Map()

+			{

+				Assert.AreEqual(0, tree.Map(new Mapper<int,string>(themap), new SC()).Count);

+				for (int i = 0; i < 14; i++)

+					tree.Add(i * i * i);

+				tree.Add(1);

+

+				IIndexedSorted<string> res = tree.Map(new Mapper<int,string>(themap), new SC());

+

+				Assert.IsTrue(((TreeBag<string>)res).Check("R"));

+				Assert.AreEqual(15, res.Count);

+				Assert.AreEqual("AA    0 BB", res[0]);

+				Assert.AreEqual("AA    1 BB", res[1]);

+				Assert.AreEqual("AA    1 BB", res[2]);

+				Assert.AreEqual("AA    8 BB", res[3]);

+				Assert.AreEqual("AA   27 BB", res[4]);

+				Assert.AreEqual("AA  125 BB", res[6]);

+				Assert.AreEqual("AA 1000 BB", res[11]);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "mapper not monotonic")]

+			public void BadMap()

+			{

+				for (int i = 0; i < 11; i++)

+					tree.Add(i * i * i);

+

+				ISorted<string> res = tree.Map(new Mapper<int,string>(badmap), new SC());

+			}

+

+

+			[Test]

+			public void Cut()

+			{

+				for (int i = 0; i < 10; i++)

+					tree.Add(i);

+				tree.Add(3);

+

+				int low, high;

+				bool lval, hval;

+

+				Assert.IsTrue(tree.Cut(new CubeRoot(27), out low, out lval, out high, out hval));

+				Assert.IsTrue(lval && hval);

+				Assert.AreEqual(4, high);

+				Assert.AreEqual(2, low);

+				Assert.IsFalse(tree.Cut(new CubeRoot(30), out low, out lval, out high, out hval));

+				Assert.IsTrue(lval && hval);

+				Assert.AreEqual(4, high);

+				Assert.AreEqual(3, low);

+			}

+

+

+			[Test]

+			public void CutInt()

+			{

+				for (int i = 0; i < 10; i++)

+					tree.Add(2 * i);

+

+				int low, high;

+				bool lval, hval;

+

+				Assert.IsFalse(tree.Cut(new IC(3), out low, out lval, out high, out hval));

+				Assert.IsTrue(lval && hval);

+				Assert.AreEqual(4, high);

+				Assert.AreEqual(2, low);

+				Assert.IsTrue(tree.Cut(new IC(6), out low, out lval, out high, out hval));

+				Assert.IsTrue(lval && hval);

+				Assert.AreEqual(8, high);

+				Assert.AreEqual(4, low);

+			}

+

+

+			[Test]

+			public void CutInterval()

+			{

+				for (int i = 0; i < 10; i++)

+					tree.Add(2 * i);

+

+				int lo, hi;

+				bool lv, hv;

+

+				Assert.IsTrue(tree.Cut(new Interval(5, 9), out lo, out lv, out hi, out hv));

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(10, hi);

+				Assert.AreEqual(4, lo);

+				Assert.IsTrue(tree.Cut(new Interval(6, 10), out lo, out lv, out hi, out hv));

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(12, hi);

+				Assert.AreEqual(4, lo);

+				for (int i = 0; i < 100; i++)

+					tree.Add(2 * i);

+

+				tree.Cut(new Interval(77, 105), out lo, out lv, out hi, out hv);

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(106, hi);

+				Assert.AreEqual(76, lo);

+				tree.Cut(new Interval(5, 7), out lo, out lv, out hi, out hv);

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(8, hi);

+				Assert.AreEqual(4, lo);

+				tree.Cut(new Interval(80, 110), out lo, out lv, out hi, out hv);

+				Assert.IsTrue(lv && hv);

+				Assert.AreEqual(112, hi);

+				Assert.AreEqual(78, lo);

+			}

+

+

+			[Test]

+			public void UpperCut()

+			{

+				for (int i = 0; i < 10; i++)

+					tree.Add(i);

 

-        int l, h;

-        bool lv, hv;

+				int l, h;

+				bool lv, hv;

 

-        Assert.IsFalse(tree.Cut(new CubeRoot(1000), out l, out lv, out h, out hv));

-        Assert.IsTrue(lv && !hv);

-        Assert.AreEqual(9, l);

-        Assert.IsFalse(tree.Cut(new CubeRoot(-50), out l, out lv, out h, out hv));

-        Assert.IsTrue(!lv && hv);

-        Assert.AreEqual(0, h);

-      }

+				Assert.IsFalse(tree.Cut(new CubeRoot(1000), out l, out lv, out h, out hv));

+				Assert.IsTrue(lv && !hv);

+				Assert.AreEqual(9, l);

+				Assert.IsFalse(tree.Cut(new CubeRoot(-50), out l, out lv, out h, out hv));

+				Assert.IsTrue(!lv && hv);

+				Assert.AreEqual(0, h);

+			}

 

 

-      [TearDown]

-      public void Dispose() { ic = null; tree = null; }

-    }

-  }

+			[TearDown]

+			public void Dispose() { ic = null; tree = null; }

+		}

+	}

 

 

 

 

-  namespace MultiOps

-  {

-    [TestFixture]

-    public class AddAll

-    {

-      private int sqr(int i) { return i * i; }

+	namespace MultiOps

+	{

+		[TestFixture]

+		public class AddAll

+		{

+			private int sqr(int i) { return i * i; }

 

 

-      TreeBag<int> tree;

+			TreeBag<int> tree;

 

 

-      [SetUp]

-      public void Init() { tree = new TreeBag<int>(new IC()); }

+			[SetUp]

+			public void Init() { tree = new TreeBag<int>(new IC()); }

 

 

-      [Test]

-      public void EmptyEmpty()

-      {

-        tree.AddAll(new FunEnumerable(0, new Fun<int, int>(sqr)));

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(tree.Check());

-      }

+			[Test]

+			public void EmptyEmpty()

+			{

+				tree.AddAll(new FunEnumerable(0, new Int2Int(sqr)));

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(tree.Check());

+			}

 

 

-      [Test]

-      public void SomeEmpty()

-      {

-        for (int i = 4; i < 9; i++) tree.Add(i);

-

-        tree.AddAll(new FunEnumerable(0, new Fun<int, int>(sqr)));

-        Assert.AreEqual(5, tree.Count);

-        Assert.IsTrue(tree.Check());

-      }

+			[Test]

+			public void SomeEmpty()

+			{

+				for (int i = 4; i < 9; i++) tree.Add(i);

+

+				tree.AddAll(new FunEnumerable(0, new Int2Int(sqr)));

+				Assert.AreEqual(5, tree.Count);

+				Assert.IsTrue(tree.Check());

+			}

 

 

-      [Test]

-      public void EmptySome()

-      {

-        tree.AddAll(new FunEnumerable(4, new Fun<int, int>(sqr)));

-        Assert.AreEqual(4, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.AreEqual(0, tree[0]);

-        Assert.AreEqual(1, tree[1]);

-        Assert.AreEqual(4, tree[2]);

-        Assert.AreEqual(9, tree[3]);

-      }

+			[Test]

+			public void EmptySome()

+			{

+				tree.AddAll(new FunEnumerable(4, new Int2Int(sqr)));

+				Assert.AreEqual(4, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.AreEqual(0, tree[0]);

+				Assert.AreEqual(1, tree[1]);

+				Assert.AreEqual(4, tree[2]);

+				Assert.AreEqual(9, tree[3]);

+			}

 

 

-      [Test]

-      public void SomeSome()

-      {

-        for (int i = 5; i < 9; i++) tree.Add(i);

-        tree.Add(1);

+			[Test]

+			public void SomeSome()

+			{

+				for (int i = 5; i < 9; i++) tree.Add(i);

+				tree.Add(1);

 

-        tree.AddAll(new FunEnumerable(4, new Fun<int, int>(sqr)));

-        Assert.AreEqual(9, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 0, 1, 1, 4, 5, 6, 7, 8, 9));

-      }

+				tree.AddAll(new FunEnumerable(4, new Int2Int(sqr)));

+				Assert.AreEqual(9, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 0, 1, 1, 4, 5, 6, 7, 8, 9));

+			}

 

 

-      [TearDown]

-      public void Dispose() { tree = null; }

-    }

+			[TearDown]

+			public void Dispose() { tree = null; }

+		}

 

 

 

-    [TestFixture]

-    public class AddSorted

-    {

-      private int sqr(int i) { return i * i; }

+		[TestFixture]

+		public class AddSorted

+		{

+			private int sqr(int i) { return i * i; }

 

-      private int step(int i) { return i / 3; }

+			private int step(int i) { return i/3; }

 

 

-      private int bad(int i) { return i * (5 - i); }

+			private int bad(int i) { return i * (5 - i); }

 

 

-      TreeBag<int> tree;

+			TreeBag<int> tree;

 

 

-      [SetUp]

-      public void Init() { tree = new TreeBag<int>(new IC()); }

+			[SetUp]

+			public void Init() { tree = new TreeBag<int>(new IC()); }

 

 

-      [Test]

-      public void EmptyEmpty()

-      {

-        tree.AddSorted(new FunEnumerable(0, new Fun<int, int>(sqr)));

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(tree.Check());

-      }

+			[Test]

+			public void EmptyEmpty()

+			{

+				tree.AddSorted(new FunEnumerable(0, new Int2Int(sqr)));

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(tree.Check());

+			}

 

 

-      [Test]

-      public void SomeEmpty()

-      {

-        for (int i = 4; i < 9; i++) tree.Add(i);

+			[Test]

+			public void SomeEmpty()

+			{

+				for (int i = 4; i < 9; i++) tree.Add(i);

 

-        tree.AddSorted(new FunEnumerable(0, new Fun<int, int>(sqr)));

-        Assert.AreEqual(5, tree.Count);

-        Assert.IsTrue(tree.Check());

-      }

+				tree.AddSorted(new FunEnumerable(0, new Int2Int(sqr)));

+				Assert.AreEqual(5, tree.Count);

+				Assert.IsTrue(tree.Check());

+			}

 

 

-      [Test]

-      public void EmptySome()

-      {

-        tree.AddSorted(new FunEnumerable(4, new Fun<int, int>(sqr)));

-        Assert.AreEqual(4, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.AreEqual(0, tree[0]);

-        Assert.AreEqual(1, tree[1]);

-        Assert.AreEqual(4, tree[2]);

-        Assert.AreEqual(9, tree[3]);

-      }

-

-      [Test]

-      public void EmptySome2()

-      {

-        tree.AddSorted(new FunEnumerable(4, new Fun<int, int>(step)));

-        //tree.dump();

-        Assert.AreEqual(4, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.AreEqual(0, tree[0]);

-        Assert.AreEqual(0, tree[1]);

-        Assert.AreEqual(0, tree[2]);

-        Assert.AreEqual(1, tree[3]);

-      }

-

-

-      [Test]

-      public void SomeSome()

-      {

-        for (int i = 5; i < 9; i++) tree.Add(i);

-        tree.Add(1);

-

-        tree.AddSorted(new FunEnumerable(4, new Fun<int, int>(sqr)));

-        Assert.AreEqual(9, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 0, 1, 1, 4, 5, 6, 7, 8, 9));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentException), "Argument not sorted")]

-      public void EmptyBad()

-      {

-        tree.AddSorted(new FunEnumerable(9, new Fun<int, int>(bad)));

-      }

-

-

-      [TearDown]

-      public void Dispose() { tree = null; }

-    }

-

-

-

-    [TestFixture]

-    public class Rest

-    {

-      TreeBag<int> tree, tree2;

-

-

-      [SetUp]

-      public void Init()

-      {

-        tree = new TreeBag<int>(new IC());

-        tree2 = new TreeBag<int>(new IC());

-        for (int i = 0; i < 10; i++)

-          tree.Add(i);

-        tree.Add(4);

-

-        for (int i = 0; i < 10; i++)

-          tree2.Add(2 * i);

-      }

-

-

-      [Test]

-      public void RemoveAll()

-      {

-        tree.RemoveAll(tree2.RangeFromTo(3, 7));

-        Assert.AreEqual(9, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 4, 5, 7, 8, 9));

-        tree.RemoveAll(tree2.RangeFromTo(3, 7));

-        Assert.AreEqual(8, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 5, 7, 8, 9));

-        tree.RemoveAll(tree2.RangeFromTo(13, 17));

-        Assert.AreEqual(8, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 5, 7, 8, 9));

-        tree.RemoveAll(tree2.RangeFromTo(3, 17));

-        Assert.AreEqual(7, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 5, 7, 9));

-        for (int i = 0; i < 10; i++) tree2.Add(i);

-

-        tree.RemoveAll(tree2.RangeFromTo(-1, 10));

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree));

-      }

-

-      private void pint<T>(SCG.IEnumerable<T> e)

-      {

-        foreach (T i in e)

-          Console.Write("{0} ", i);

-

-        Console.WriteLine();

-      }

-

-      [Test]

-      public void RetainAll()

-      {

-        tree.Add(8); tree2.Add(6);

-        //pint<int>(tree);

-        //pint<int>(tree2);

-        tree.RetainAll(tree2.RangeFromTo(3, 17));

-        Assert.AreEqual(3, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 4, 6, 8));

-        tree.RetainAll(tree2.RangeFromTo(1, 17));

-        Assert.AreEqual(3, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 4, 6, 8));

-        tree.RetainAll(tree2.RangeFromTo(3, 5));

-        Assert.AreEqual(1, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree, 4));

-        tree.RetainAll(tree2.RangeFromTo(7, 17));

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree));

-        for (int i = 0; i < 10; i++) tree.Add(i);

-

-        tree.RetainAll(tree2.RangeFromTo(5, 5));

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree));

-        for (int i = 0; i < 10; i++) tree.Add(i);

-

-        tree.RetainAll(tree2.RangeFromTo(15, 25));

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(tree.Check());

-        Assert.IsTrue(IC.eq(tree));

-      }

-

-

-      [Test]

-      public void ContainsAll()

-      {

-        Assert.IsFalse(tree.ContainsAll(tree2));

-        Assert.IsTrue(tree.ContainsAll(tree));

-        tree2.Clear();

-        Assert.IsTrue(tree.ContainsAll(tree2));

-        tree.Clear();

-        Assert.IsTrue(tree.ContainsAll(tree2));

-        tree2.Add(8);

-        Assert.IsFalse(tree.ContainsAll(tree2));

-      }

-

-

-      [Test]

-      public void RemoveInterval()

-      {

-        tree.RemoveInterval(3, 4);

-        Assert.IsTrue(tree.Check());

-        Assert.AreEqual(7, tree.Count);

-        Assert.IsTrue(IC.eq(tree, 0, 1, 2, 6, 7, 8, 9));

-        tree.RemoveInterval(2, 3);

-        Assert.IsTrue(tree.Check());

-        Assert.AreEqual(4, tree.Count);

-        Assert.IsTrue(IC.eq(tree, 0, 1, 8, 9));

-        tree.RemoveInterval(0, 4);

-        Assert.IsTrue(tree.Check());

-        Assert.AreEqual(0, tree.Count);

-        Assert.IsTrue(IC.eq(tree));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RemoveRangeBad1()

-      {

-        tree.RemoveInterval(-3, 8);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RemoveRangeBad2()

-      {

-        tree.RemoveInterval(3, -8);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RemoveRangeBad3()

-      {

-        tree.RemoveInterval(3, 9);

-      }

-

-

-      [Test]

-      public void GetRange()

-      {

-        Assert.IsTrue(IC.eq(tree[3, 3]));

-        Assert.IsTrue(IC.eq(tree[3, 4], 3));

-        Assert.IsTrue(IC.eq(tree[3, 5], 3, 4));

-        Assert.IsTrue(IC.eq(tree[3, 6], 3, 4, 4));

-        Assert.IsTrue(IC.eq(tree[3, 7], 3, 4, 4, 5));

-        Assert.IsTrue(IC.eq(tree[4, 4]));

-        Assert.IsTrue(IC.eq(tree[4, 5], 4));

-        Assert.IsTrue(IC.eq(tree[4, 6], 4, 4));

-        Assert.IsTrue(IC.eq(tree[4, 7], 4, 4, 5));

-        Assert.IsTrue(IC.eq(tree[4, 8], 4, 4, 5, 6));

-        Assert.IsTrue(IC.eq(tree[5, 5]));

-        Assert.IsTrue(IC.eq(tree[5, 6], 4));

-        Assert.IsTrue(IC.eq(tree[5, 7], 4, 5));

-        Assert.IsTrue(IC.eq(tree[5, 8], 4, 5, 6));

-        Assert.IsTrue(IC.eq(tree[5, 9], 4, 5, 6, 7));

-        Assert.IsTrue(IC.eq(tree[5, 11], 4, 5, 6, 7, 8, 9));

-      }

-

-

-      [Test]

-      public void GetRangeBackwards()

-      {

-        Assert.IsTrue(IC.eq(tree[3, 3].Backwards()));

-        Assert.IsTrue(IC.eq(tree[3, 4].Backwards(), 3));

-        Assert.IsTrue(IC.eq(tree[3, 5].Backwards(), 4, 3));

-        Assert.IsTrue(IC.eq(tree[3, 6].Backwards(), 4, 4, 3));

-        Assert.IsTrue(IC.eq(tree[3, 7].Backwards(), 5, 4, 4, 3));

-        Assert.IsTrue(IC.eq(tree[4, 4].Backwards()));

-        Assert.IsTrue(IC.eq(tree[4, 5].Backwards(), 4));

-        Assert.IsTrue(IC.eq(tree[4, 6].Backwards(), 4, 4));

-        Assert.IsTrue(IC.eq(tree[4, 7].Backwards(), 5, 4, 4));

-        Assert.IsTrue(IC.eq(tree[4, 8].Backwards(), 6, 5, 4, 4));

-        Assert.IsTrue(IC.eq(tree[5, 5].Backwards()));

-        Assert.IsTrue(IC.eq(tree[5, 6].Backwards(), 4));

-        Assert.IsTrue(IC.eq(tree[5, 7].Backwards(), 5, 4));

-        Assert.IsTrue(IC.eq(tree[5, 8].Backwards(), 6, 5, 4));

-        Assert.IsTrue(IC.eq(tree[5, 9].Backwards(), 7, 6, 5, 4));

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void GetRangeBad1()

-      {

-        object foo = tree[-3, 0];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void GetRangeBad2()

-      {

-        object foo = tree[3, 2];

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void GetRangeBad3()

-      {

-        object foo = tree[3, 12];

-      }

-

-

-      [TearDown]

-      public void Dispose() { tree = null; tree2 = null; }

-    }

-  }

-

-

-  namespace Hashing

-  {

-    [TestFixture]

-    public class ISequenced

-    {

-      private ISequenced<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new TreeBag<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dat = new TreeBag<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dut = new TreeBag<int>(new RevIC(), EqualityComparer<int>.Default);

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-      }

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-        Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.sequencedhashcode(3), dut.GetSequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.SequencedEquals(dat));

-        Assert.IsFalse(dat.SequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dat));

-        Assert.IsTrue(dat.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dut));

-        Assert.IsTrue(dut.SequencedEquals(dit));

-        dit.Add(7);

-        dut.Add(7);

-        Assert.IsFalse(dit.SequencedEquals(dut));

-        Assert.IsFalse(dut.SequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.SequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-

-

-

-    [TestFixture]

-    public class IEditableCollection

-    {

-      private ICollection<int> dit, dat, dut;

-

-

-      [SetUp]

-      public void Init()

-      {

-        dit = new TreeBag<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dat = new TreeBag<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-        dut = new TreeBag<int>(new RevIC(), EqualityComparer<int>.Default);

-      }

-

-

-      [Test]

-      public void EmptyEmpty()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-      }

-

-

-      [Test]

-      public void EmptyNonEmpty()

-      {

-        dit.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void HashVal()

-      {

-        Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-        dit.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-        dit.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-        Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-        dut.Add(3);

-        Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-        dut.Add(7);

-        Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-      }

-

-

-      [Test]

-      public void Normal()

-      {

-        dit.Add(3);

-        dit.Add(7);

-        dat.Add(3);

-        Assert.IsFalse(dit.UnsequencedEquals(dat));

-        Assert.IsFalse(dat.UnsequencedEquals(dit));

-        dat.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dat));

-        Assert.IsTrue(dat.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void WrongOrder()

-      {

-        dit.Add(3);

-        dut.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-        dit.Add(7);

-        dut.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dut));

-        Assert.IsTrue(dut.UnsequencedEquals(dit));

-      }

-

-

-      [Test]

-      public void Reflexive()

-      {

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(3);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-        dit.Add(7);

-        Assert.IsTrue(dit.UnsequencedEquals(dit));

-      }

-

-

-      [TearDown]

-      public void Dispose()

-      {

-        dit = null;

-        dat = null;

-        dut = null;

-      }

-    }

-  }

+			[Test]

+			public void EmptySome()

+			{

+				tree.AddSorted(new FunEnumerable(4, new Int2Int(sqr)));

+				Assert.AreEqual(4, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.AreEqual(0, tree[0]);

+				Assert.AreEqual(1, tree[1]);

+				Assert.AreEqual(4, tree[2]);

+				Assert.AreEqual(9, tree[3]);

+			}

+

+			[Test]

+			public void EmptySome2()

+			{

+				tree.AddSorted(new FunEnumerable(4, new Int2Int(step)));

+				//tree.dump();

+				Assert.AreEqual(4, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.AreEqual(0, tree[0]);

+				Assert.AreEqual(0, tree[1]);

+				Assert.AreEqual(0, tree[2]);

+				Assert.AreEqual(1, tree[3]);

+			}

+

+

+			[Test]

+			public void SomeSome()

+			{

+				for (int i = 5; i < 9; i++) tree.Add(i);

+				tree.Add(1);

+

+				tree.AddSorted(new FunEnumerable(4, new Int2Int(sqr)));

+				Assert.AreEqual(9, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 0, 1,1, 4, 5, 6, 7, 8, 9));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException), "Argument not sorted")]

+			public void EmptyBad()

+			{

+				tree.AddSorted(new FunEnumerable(9, new Int2Int(bad)));

+			}

+

+

+			[TearDown]

+			public void Dispose() { tree = null; }

+		}

+

+

+

+		[TestFixture]

+		public class Rest

+		{

+			TreeBag<int> tree, tree2;

+

+

+			[SetUp]

+			public void Init()

+			{

+				tree = new TreeBag<int>(new IC());

+				tree2 = new TreeBag<int>(new IC());

+				for (int i = 0; i < 10; i++)

+					tree.Add(i);

+				tree.Add(4);

+

+				for (int i = 0; i < 10; i++)

+					tree2.Add(2 * i);

+			}

+

+

+			[Test]

+			public void RemoveAll()

+			{

+				tree.RemoveAll(tree2.RangeFromTo(3, 7));

+				Assert.AreEqual(9, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3,4, 5, 7, 8, 9));

+				tree.RemoveAll(tree2.RangeFromTo(3, 7));

+				Assert.AreEqual(8, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 5, 7, 8, 9));

+				tree.RemoveAll(tree2.RangeFromTo(13, 17));

+				Assert.AreEqual(8, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 5, 7, 8, 9));

+				tree.RemoveAll(tree2.RangeFromTo(3, 17));

+				Assert.AreEqual(7, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 0, 1, 2, 3, 5, 7, 9));

+				for (int i = 0; i < 10; i++) tree2.Add(i);

+

+				tree.RemoveAll(tree2.RangeFromTo(-1, 10));

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree));

+			}

+

+			private void pint<T>(MSG.IEnumerable<T> e)

+			{

+				foreach (T i in e)

+					Console.Write("{0} ", i);

+

+				Console.WriteLine();

+			}

+

+			[Test]

+			public void RetainAll()

+			{

+				tree.Add(8);tree2.Add(6);

+				//pint<int>(tree);

+				//pint<int>(tree2);

+				tree.RetainAll(tree2.RangeFromTo(3, 17));

+				Assert.AreEqual(3, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 4, 6, 8));

+				tree.RetainAll(tree2.RangeFromTo(1, 17));

+				Assert.AreEqual(3, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 4, 6 , 8));

+				tree.RetainAll(tree2.RangeFromTo(3, 5));

+				Assert.AreEqual(1, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree, 4));

+				tree.RetainAll(tree2.RangeFromTo(7, 17));

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree));

+				for (int i = 0; i < 10; i++) tree.Add(i);

+

+				tree.RetainAll(tree2.RangeFromTo(5, 5));

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree));

+				for (int i = 0; i < 10; i++) tree.Add(i);

+

+				tree.RetainAll(tree2.RangeFromTo(15, 25));

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(tree.Check());

+				Assert.IsTrue(IC.eq(tree));

+			}

+

+

+			[Test]

+			public void ContainsAll()

+			{

+				Assert.IsFalse(tree.ContainsAll(tree2));

+				Assert.IsTrue(tree.ContainsAll(tree));

+				tree2.Clear();

+				Assert.IsTrue(tree.ContainsAll(tree2));

+				tree.Clear();

+				Assert.IsTrue(tree.ContainsAll(tree2));

+				tree2.Add(8);

+				Assert.IsFalse(tree.ContainsAll(tree2));

+			}

+

+

+			[Test]

+			public void RemoveInterval()

+			{

+				tree.RemoveInterval(3, 4);

+				Assert.IsTrue(tree.Check());

+				Assert.AreEqual(7, tree.Count);

+				Assert.IsTrue(IC.eq(tree, 0, 1, 2, 6, 7, 8, 9));

+				tree.RemoveInterval(2, 3);

+				Assert.IsTrue(tree.Check());

+				Assert.AreEqual(4, tree.Count);

+				Assert.IsTrue(IC.eq(tree, 0, 1, 8,9));

+				tree.RemoveInterval(0, 4);

+				Assert.IsTrue(tree.Check());

+				Assert.AreEqual(0, tree.Count);

+				Assert.IsTrue(IC.eq(tree));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void RemoveRangeBad1()

+			{

+				tree.RemoveInterval(-3, 8);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void RemoveRangeBad2()

+			{

+				tree.RemoveInterval(3, -8);

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void RemoveRangeBad3()

+			{

+				tree.RemoveInterval(3, 9);

+			}

+

+

+			[Test]

+			public void GetRange()

+			{

+				Assert.IsTrue(IC.eq(tree[3, 3]));

+				Assert.IsTrue(IC.eq(tree[3, 4], 3));

+				Assert.IsTrue(IC.eq(tree[3, 5], 3, 4));

+				Assert.IsTrue(IC.eq(tree[3, 6], 3, 4, 4));

+				Assert.IsTrue(IC.eq(tree[3, 7], 3, 4, 4, 5));

+				Assert.IsTrue(IC.eq(tree[4, 4]));

+				Assert.IsTrue(IC.eq(tree[4, 5], 4));

+				Assert.IsTrue(IC.eq(tree[4, 6], 4, 4));

+				Assert.IsTrue(IC.eq(tree[4, 7], 4, 4, 5));

+				Assert.IsTrue(IC.eq(tree[4, 8], 4, 4, 5, 6));

+				Assert.IsTrue(IC.eq(tree[5, 5]));

+				Assert.IsTrue(IC.eq(tree[5, 6], 4));

+				Assert.IsTrue(IC.eq(tree[5, 7], 4, 5));

+				Assert.IsTrue(IC.eq(tree[5, 8], 4, 5, 6));

+				Assert.IsTrue(IC.eq(tree[5, 9], 4, 5, 6, 7));

+				Assert.IsTrue(IC.eq(tree[5, 11], 4, 5, 6, 7, 8, 9));

+			}

+

+

+			[Test]

+			public void GetRangeBackwards()

+			{

+				Assert.IsTrue(IC.eq(tree[3, 3].Backwards()));

+				Assert.IsTrue(IC.eq(tree[3, 4].Backwards(), 3));

+				Assert.IsTrue(IC.eq(tree[3, 5].Backwards(), 4, 3));

+				Assert.IsTrue(IC.eq(tree[3, 6].Backwards(), 4, 4, 3));

+				Assert.IsTrue(IC.eq(tree[3, 7].Backwards(), 5, 4, 4, 3));

+				Assert.IsTrue(IC.eq(tree[4, 4].Backwards()));

+				Assert.IsTrue(IC.eq(tree[4, 5].Backwards(), 4));

+				Assert.IsTrue(IC.eq(tree[4, 6].Backwards(), 4, 4));

+				Assert.IsTrue(IC.eq(tree[4, 7].Backwards(), 5, 4, 4));

+				Assert.IsTrue(IC.eq(tree[4, 8].Backwards(), 6, 5, 4, 4));

+				Assert.IsTrue(IC.eq(tree[5, 5].Backwards()));

+				Assert.IsTrue(IC.eq(tree[5, 6].Backwards(), 4));

+				Assert.IsTrue(IC.eq(tree[5, 7].Backwards(), 5, 4));

+				Assert.IsTrue(IC.eq(tree[5, 8].Backwards(), 6, 5, 4));

+				Assert.IsTrue(IC.eq(tree[5, 9].Backwards(), 7, 6, 5, 4));

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void GetRangeBad1()

+			{

+				object foo = tree[-3, 0];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentOutOfRangeException))]

+			public void GetRangeBad2()

+			{

+				object foo = tree[3, 2];

+			}

+

+

+			[Test]

+			[ExpectedException(typeof(ArgumentException))]

+			public void GetRangeBad3()

+			{

+				object foo = tree[3, 12];

+			}

+

+

+			[TearDown]

+			public void Dispose() { tree = null; tree2 = null; }

+		}

+	}

+

+

+	namespace Hashing

+	{

+		[TestFixture]

+		public class ISequenced

+		{

+			private ISequenced<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new TreeBag<int>(new IC());

+				dat = new TreeBag<int>(new IC());

+				dut = new TreeBag<int>(new RevIC());

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				dut.Add(7);

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+

+

+

+		[TestFixture]

+		public class IEditableCollection

+		{

+			private ICollection<int> dit, dat, dut;

+

+

+			[SetUp]

+			public void Init()

+			{

+				dit = new TreeBag<int>(new IC());

+				dat = new TreeBag<int>(new IC());

+				dut = new TreeBag<int>(new RevIC());

+			}

+

+

+			[Test]

+			public void EmptyEmpty()

+			{

+				Assert.IsTrue(dit.Equals(dat));

+			}

+

+

+			[Test]

+			public void EmptyNonEmpty()

+			{

+				dit.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count, params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count << 16) + retval;

+			}

+

+

+			[Test]

+			public void HashVal()

+			{

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1, 3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1, 3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());

+			}

+

+

+			[Test]

+			public void Normal()

+			{

+				dit.Add(3);

+				dit.Add(7);

+				dat.Add(3);

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+				dat.Add(7);

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

+			}

+

+

+			[Test]

+			public void WrongOrder()

+			{

+				dit.Add(3);

+				dut.Add(3);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+				dit.Add(7);

+				dut.Add(7);

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

+			}

+

+

+			[Test]

+			public void Reflexive()

+			{

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(3);

+				Assert.IsTrue(dit.Equals(dit));

+				dit.Add(7);

+				Assert.IsTrue(dit.Equals(dit));

+			}

+

+

+			[TearDown]

+			public void Dispose()

+			{

+				dit = null;

+				dat = null;

+				dut = null;

+			}

+		}

+	}

 

 }

+#endif

diff --git a/mcs/class/Mono.C5/Test/trees/Dictionary.cs b/mcs/class/Mono.C5/Test/trees/Dictionary.cs
index 5380c332d71..e9ed72995d8 100644
--- a/mcs/class/Mono.C5/Test/trees/Dictionary.cs
+++ b/mcs/class/Mono.C5/Test/trees/Dictionary.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,40 +23,13 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG=System.Collections.Generic;

+using MSG=System.Collections.Generic;

 

 

-namespace C5UnitTests.trees.RBDictionary

+namespace nunit.trees.RBDictionary

 {

-  static class Factory

-  {

-    public static IDictionary<K,V> New<K,V>() { return new TreeDictionary<K,V>(); }

-  }

-

-

-  [TestFixture]

-  public class Formatting

-  {

-    IDictionary<int,int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = Factory.New<int,int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("[  ]", coll.ToString());

-      coll.Add(23, 67); coll.Add(45, 89);

-      Assert.AreEqual("[ 23 => 67, 45 => 89 ]", coll.ToString());

-      Assert.AreEqual("[ 17 => 43, 2D => 59 ]", coll.ToString(null, rad16));

-      Assert.AreEqual("[ 23 => 67, ... ]", coll.ToString("L14", null));

-      Assert.AreEqual("[ 17 => 43, ... ]", coll.ToString("L14", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class RBDict

+	[TestFixture]

+	public class RBDict

 	{

 		private TreeDictionary<string,string> dict;

 

@@ -67,26 +41,11 @@ namespace C5UnitTests.trees.RBDictionary
 		[TearDown]

 		public void Dispose() { dict = null; }

 

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new TreeDictionary<int,int>(null);

-    }

-

-    [Test]

-    public void Choose()

-    {

-      dict.Add("YES","NO");

-      Assert.AreEqual(new KeyValuePair<string,string>("YES","NO"), dict.Choose());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      dict.Choose();

-    }

+		[Test]

+		public void SyncRoot()

+		{

+			Assert.IsFalse(dict.SyncRoot == null);

+		}

 

 		[Test]

 		public void Pred()

@@ -94,14 +53,14 @@ namespace C5UnitTests.trees.RBDictionary
 			dict.Add("A", "1");

 			dict.Add("C", "2");

 			dict.Add("E", "3");

-			Assert.AreEqual("1", dict.Predecessor("B").Value);

-			Assert.AreEqual("1", dict.Predecessor("C").Value);

-			Assert.AreEqual("1", dict.WeakPredecessor("B").Value);

-			Assert.AreEqual("2", dict.WeakPredecessor("C").Value);

-			Assert.AreEqual("2", dict.Successor("B").Value);

-			Assert.AreEqual("3", dict.Successor("C").Value);

-			Assert.AreEqual("2", dict.WeakSuccessor("B").Value);

-			Assert.AreEqual("2", dict.WeakSuccessor("C").Value);

+			Assert.AreEqual("1", dict.Predecessor("B").value);

+			Assert.AreEqual("1", dict.Predecessor("C").value);

+			Assert.AreEqual("1", dict.WeakPredecessor("B").value);

+			Assert.AreEqual("2", dict.WeakPredecessor("C").value);

+			Assert.AreEqual("2", dict.Successor("B").value);

+			Assert.AreEqual("3", dict.Successor("C").value);

+			Assert.AreEqual("2", dict.WeakSuccessor("B").value);

+			Assert.AreEqual("2", dict.WeakSuccessor("C").value);

 		}

 

 

@@ -141,7 +100,7 @@ namespace C5UnitTests.trees.RBDictionary
 

 

 		[Test]

-		[ExpectedException(typeof(DuplicateNotAllowedException), "Key being added: 'A'")]

+		[ExpectedException(typeof(ArgumentException), "Item has already been added.  Key in dictionary: 'A'  Key being added: 'A'")]

 		public void IllegalAdd()

 		{

 			dict.Add("A", "B");

@@ -150,8 +109,8 @@ namespace C5UnitTests.trees.RBDictionary
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void GettingNonExisting()

+		[ExpectedException(typeof(ArgumentException), "Key not present in Dictionary")]

+		public void GettingNonExisting()

 		{

 			Console.WriteLine(dict["R"]);

 		}

@@ -176,7 +135,7 @@ namespace C5UnitTests.trees.RBDictionary
 	{

 		private TreeDictionary<string,string> dict;

 

-		private SCG.IEnumerator<KeyValuePair<string,string>> dictenum;

+		private MSG.IEnumerator<KeyValuePair<string,string>> dictenum;

 

 

 		[SetUp]

@@ -202,7 +161,7 @@ namespace C5UnitTests.trees.RBDictionary
 		[Test]

 		public void Keys()

 		{

-			SCG.IEnumerator<string> keys = dict.Keys.GetEnumerator();

+			MSG.IEnumerator<string> keys = dict.Keys.GetEnumerator();

 			Assert.AreEqual(3, dict.Keys.Count);

 			Assert.IsTrue(keys.MoveNext());

 			Assert.AreEqual("R",keys.Current);

@@ -216,7 +175,7 @@ namespace C5UnitTests.trees.RBDictionary
 		[Test]

 		public void Values()

 		{

-			SCG.IEnumerator<string> values = dict.Values.GetEnumerator();

+			MSG.IEnumerator<string> values = dict.Values.GetEnumerator();

 			Assert.AreEqual(3, dict.Values.Count);

 			Assert.IsTrue(values.MoveNext());

 			Assert.AreEqual("C",values.Current);

@@ -227,11 +186,6 @@ namespace C5UnitTests.trees.RBDictionary
 			Assert.IsFalse(values.MoveNext());

 		}

 

-    [Test]

-    public void Fun()

-    {

-      Assert.AreEqual("B", dict.Fun("T"));

-    }

 

 

 		[Test]

@@ -293,7 +247,7 @@ namespace C5UnitTests.trees.RBDictionary
 

 

 			[Test]

-			[ExpectedException(typeof(ReadOnlyCollectionException))]

+			[ExpectedException(typeof(InvalidOperationException))]

 			public void UpdateSnap()

 			{

 				snap["Y"] = "J";

@@ -309,3 +263,4 @@ namespace C5UnitTests.trees.RBDictionary
 		}

 	}

 }

+#endif

diff --git a/mcs/class/Mono.C5/Test/trees/RedBlackTreeSetTests.cs b/mcs/class/Mono.C5/Test/trees/RedBlackTreeSetTests.cs
index 09a13182df7..117ba6dd2b3 100644
--- a/mcs/class/Mono.C5/Test/trees/RedBlackTreeSetTests.cs
+++ b/mcs/class/Mono.C5/Test/trees/RedBlackTreeSetTests.cs
@@ -1,5 +1,6 @@
+#if NET_2_0

 /*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>

  Permission is hereby granted, free of charge, to any person obtaining a copy

  of this software and associated documentation files (the "Software"), to deal

  in the Software without restriction, including without limitation the rights

@@ -22,59 +23,12 @@
 using System;

 using C5;

 using NUnit.Framework;

-using SCG = System.Collections.Generic;

+using MSG = System.Collections.Generic;

 

-namespace C5UnitTests.trees.TreeSet

+namespace nunit.trees.TreeSet

 {

-  using CollectionOfInt = TreeSet<int>;

-

-  [TestFixture]

-  public class GenericTesters

-  {

-    [Test]

-    public void TestEvents()

-    {

-      Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };

-      new C5UnitTests.Templates.Events.SortedIndexedTester<CollectionOfInt>().Test(factory);

-    }

-

-    [Test]

-    public void Extensible()

-    {

-      C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();

-      C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();

-    }

-  }

-

-  static class Factory

-  {

-    public static ICollection<T> New<T>() { return new TreeSet<T>(); }

-  }

-

-

-  [TestFixture]

-  public class Formatting

-  {

-    ICollection<int> coll;

-    IFormatProvider rad16;

-    [SetUp]

-    public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }

-    [TearDown]

-    public void Dispose() { coll = null; rad16 = null; }

-    [Test]

-    public void Format()

-    {

-      Assert.AreEqual("{  }", coll.ToString());

-      coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });

-      Assert.AreEqual("{ -4, 28, 129, 65530 }", coll.ToString());

-      Assert.AreEqual("{ -4, 1C, 81, FFFA }", coll.ToString(null, rad16));

-      Assert.AreEqual("{ -4, 28, 129... }", coll.ToString("L14", null));

-      Assert.AreEqual("{ -4, 1C, 81... }", coll.ToString("L14", rad16));

-    }

-  }

-

-  [TestFixture]

-  public class Combined

+	[TestFixture]

+	public class Combined

 	{

 		private IIndexedSorted<KeyValuePair<int,int>> lst;

 

@@ -98,8 +52,8 @@ namespace C5UnitTests.trees.TreeSet
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.Find(ref p));

-			Assert.AreEqual(3, p.Key);

-			Assert.AreEqual(33, p.Value);

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

 			p = new KeyValuePair<int,int>(13, 78);

 			Assert.IsFalse(lst.Find(ref p));

 		}

@@ -111,12 +65,12 @@ namespace C5UnitTests.trees.TreeSet
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.FindOrAdd(ref p));

-			Assert.AreEqual(3, p.Key);

-			Assert.AreEqual(33, p.Value);

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

 			p = new KeyValuePair<int,int>(13, 79);

 			Assert.IsFalse(lst.FindOrAdd(ref p));

-			Assert.AreEqual(13, lst[10].Key);

-			Assert.AreEqual(79, lst[10].Value);

+			Assert.AreEqual(13, lst[10].key);

+			Assert.AreEqual(79, lst[10].value);

 		}

 

 

@@ -126,8 +80,8 @@ namespace C5UnitTests.trees.TreeSet
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.Update(p));

-			Assert.AreEqual(3, lst[3].Key);

-			Assert.AreEqual(78, lst[3].Value);

+			Assert.AreEqual(3, lst[3].key);

+			Assert.AreEqual(78, lst[3].value);

 			p = new KeyValuePair<int,int>(13, 78);

 			Assert.IsFalse(lst.Update(p));

 		}

@@ -139,12 +93,12 @@ namespace C5UnitTests.trees.TreeSet
 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

 			Assert.IsTrue(lst.UpdateOrAdd(p));

-			Assert.AreEqual(3, lst[3].Key);

-			Assert.AreEqual(78, lst[3].Value);

+			Assert.AreEqual(3, lst[3].key);

+			Assert.AreEqual(78, lst[3].value);

 			p = new KeyValuePair<int,int>(13, 79);

 			Assert.IsFalse(lst.UpdateOrAdd(p));

-			Assert.AreEqual(13, lst[10].Key);

-			Assert.AreEqual(79, lst[10].Value);

+			Assert.AreEqual(13, lst[10].key);

+			Assert.AreEqual(79, lst[10].value);

 		}

 

 

@@ -153,14 +107,14 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);

 

-            Assert.IsTrue(lst.Remove(p, out p));

-            Assert.AreEqual(3, p.Key);

-			Assert.AreEqual(33, p.Value);

-			Assert.AreEqual(4, lst[3].Key);

-			Assert.AreEqual(34, lst[3].Value);

+			Assert.IsTrue(lst.RemoveWithReturn(ref p));

+			Assert.AreEqual(3, p.key);

+			Assert.AreEqual(33, p.value);

+			Assert.AreEqual(4, lst[3].key);

+			Assert.AreEqual(34, lst[3].value);

 			p = new KeyValuePair<int,int>(13, 78);

-            Assert.IsFalse(lst.Remove(p, out p));

-        }

+			Assert.IsFalse(lst.RemoveWithReturn(ref p));

+		}

 	}

 

 

@@ -169,7 +123,7 @@ namespace C5UnitTests.trees.TreeSet
 	{

 		private TreeSet<int> tree;

 

-		private SCG.IComparer<int> c;

+		private IComparer<int> c;

 

 

 		[SetUp]

@@ -187,7 +141,7 @@ namespace C5UnitTests.trees.TreeSet
 		[Test]

 		public void Enumerator()

 		{

-			SCG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

+			MSG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

 			int i = 3;

 

 			while (e.MoveNext())

@@ -203,7 +157,7 @@ namespace C5UnitTests.trees.TreeSet
 		[ExpectedException(typeof(InvalidOperationException))]

 		public void Enumerator2()

 		{

-			SCG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

+			MSG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

 			int i = e.Current;

 		}

 

@@ -212,7 +166,7 @@ namespace C5UnitTests.trees.TreeSet
 		[ExpectedException(typeof(InvalidOperationException))]

 		public void Enumerator3()

 		{

-			SCG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

+			MSG.IEnumerator<int> e = tree.RangeFromTo(5, 17).GetEnumerator();

 

 			while (e.MoveNext());

 

@@ -396,50 +350,8 @@ namespace C5UnitTests.trees.TreeSet
 			}

 		}

 

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor1()

-    {

-      new TreeSet<int>(null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor3()

-    {

-      new TreeSet<int>(null, EqualityComparer<int>.Default);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor4()

-    {

-      new TreeSet<int>(Comparer<int>.Default, null);

-    }

-

-    [Test]

-    [ExpectedException(typeof(NullReferenceException))]

-    public void NullEqualityComparerinConstructor5()

-    {

-      new TreeSet<int>(null, null);

-    }

-

-    [Test]

-    public void Choose()

-    {

-      tree.Add(7);

-      Assert.AreEqual(7, tree.Choose());

-    }

-

-    [Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void BadChoose()

-    {

-      tree.Choose();

-    }

-

-

-    [Test]

+

+		[Test]

 		public void NoDuplicates()

 		{

 			Assert.IsFalse(tree.AllowsDuplicates);

@@ -492,100 +404,19 @@ namespace C5UnitTests.trees.TreeSet
 			KeyValuePair<int,string> p = new KeyValuePair<int,string>(3, "tre");

 

 			Assert.IsFalse(bag.FindOrAdd(ref p));

-			p.Value = "drei";

+			p.value = "drei";

 			Assert.IsTrue(bag.FindOrAdd(ref p));

-			Assert.AreEqual("tre", p.Value);

-			p.Value = "three";

+			Assert.AreEqual("tre", p.value);

+			p.value = "three";

 			Assert.AreEqual(1, bag.ContainsCount(p));

-			Assert.AreEqual("tre", bag[0].Value);

+			Assert.AreEqual("tre", bag[0].value);

 		}

 	}

 

-  [TestFixture]

-  public class FindPredicate

-  {

-    private TreeSet<int> list;

-    Fun<int, bool> pred;

-

-    [SetUp]

-    public void Init()

-    {

-      list = new TreeSet<int>(TenEqualityComparer.Default);

-      pred = delegate(int i) { return i % 5 == 0; };

-    }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Find()

-    {

-      int i;

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.Find(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.Find(pred, out i));

-      Assert.AreEqual(45, i);

-    }

-

-    [Test]

-    public void FindLast()

-    {

-      int i;

-      Assert.IsFalse(list.FindLast(pred, out i));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(list.FindLast(pred, out i));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.IsTrue(list.FindLast(pred, out i));

-      Assert.AreEqual(675, i);

-    }

-

-    [Test]

-    public void FindIndex()

-    {

-      Assert.IsFalse(0 <= list.FindIndex(pred));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(0 <= list.FindIndex(pred));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.AreEqual(3, list.FindIndex(pred));

-    }

-

-    [Test]

-    public void FindLastIndex()

-    {

-      Assert.IsFalse(0 <= list.FindLastIndex(pred));

-      list.AddAll<int>(new int[] { 4, 22, 67, 37 });

-      Assert.IsFalse(0 <= list.FindLastIndex(pred));

-      list.AddAll<int>(new int[] { 45, 122, 675, 137 });

-      Assert.AreEqual(7, list.FindLastIndex(pred));

-    }

-  }

-

-  [TestFixture]

-  public class UniqueItems

-  {

-    private TreeSet<int> list;

-

-    [SetUp]

-    public void Init() { list = new TreeSet<int>(); }

-

-    [TearDown]

-    public void Dispose() { list = null; }

-

-    [Test]

-    public void Test()

-    {

-      Assert.IsTrue(IC.seteq(list.UniqueItems()));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));

-      list.AddAll<int>(new int[] { 7, 9, 7 });

-      Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));

-      Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 1, 9, 1));

-    }

-  }

-

-  [TestFixture]

-  public class ArrayTest

+

+

+	[TestFixture]

+	public class ArrayTest

 	{

 		private TreeSet<int> tree;

 

@@ -649,10 +480,11 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToBad()

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToBad()

 		{

-			tree.CopyTo(a, 11);

+			tree.Add(3);

+			tree.CopyTo(a, 10);

 		}

 

 

@@ -665,8 +497,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-    [ExpectedException(typeof(ArgumentOutOfRangeException))]

-    public void CopyToTooFar()

+		[ExpectedException(typeof(ArgumentException))]

+		public void CopyToTooFar()

 		{

 			tree.Add(3);

 			tree.Add(4);

@@ -755,7 +587,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

 		public void Empty()

 		{

 			tree.Clear();

@@ -764,7 +596,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

 		public void HighIndex()

 		{

 			tree.RemoveAt(tree.Count);

@@ -772,7 +604,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collectionvalue")]

+		[ExpectedException(typeof(IndexOutOfRangeException), "Index out of range for sequenced collection")]

 		public void LowIndex()

 		{

 			tree.RemoveAt(-1);

@@ -892,16 +724,16 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void PredecessorTooLow1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void PredecessorTooLow1()

 		{

 			tree.Predecessor(-2);

 		}

 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void PredecessorTooLow2()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void PredecessorTooLow2()

 		{

 			tree.Predecessor(0);

 		}

@@ -925,8 +757,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void WeakPredecessorTooLow1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void WeakPredecessorTooLow1()

 		{

 			tree.WeakPredecessor(-2);

 		}

@@ -949,16 +781,16 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void SuccessorTooHigh1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void SuccessorTooHigh1()

 		{

 			tree.Successor(38);

 		}

 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void SuccessorTooHigh2()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void SuccessorTooHigh2()

 		{

 			tree.Successor(39);

 		}

@@ -982,8 +814,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-    [ExpectedException(typeof(NoSuchItemException))]

-    public void WeakSuccessorTooHigh1()

+		[ExpectedException(typeof(ArgumentOutOfRangeException))]

+		public void WeakSuccessorTooHigh1()

 		{

 			tree.WeakSuccessor(39);

 		}

@@ -1036,7 +868,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty1()

 		{

 			tree.FindMin();

@@ -1044,7 +876,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty2()

 		{

 			tree.FindMax();

@@ -1052,7 +884,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty3()

 		{

 			tree.DeleteMin();

@@ -1060,7 +892,7 @@ namespace C5UnitTests.trees.TreeSet
 

 

 		[Test]

-		[ExpectedException(typeof(NoSuchItemException))]

+		[ExpectedException(typeof(InvalidOperationException), "Priority queue is empty")]

 		public void Empty4()

 		{

 			tree.DeleteMax();

@@ -1127,16 +959,16 @@ namespace C5UnitTests.trees.TreeSet
 			Assert.AreEqual(1, tree.IndexOf(30));

 			Assert.AreEqual(2, tree.IndexOf(50));

 			Assert.AreEqual(3, tree.IndexOf(70));

-			Assert.AreEqual(~1, tree.IndexOf(20));

-			Assert.AreEqual(~0, tree.IndexOf(0));

-			Assert.AreEqual(~4, tree.IndexOf(90));

+			Assert.AreEqual(-1, tree.IndexOf(20));

+			Assert.AreEqual(-1, tree.IndexOf(0));

+			Assert.AreEqual(-1, tree.IndexOf(90));

 			Assert.AreEqual(0, tree.LastIndexOf(10));

 			Assert.AreEqual(1, tree.LastIndexOf(30));

 			Assert.AreEqual(2, tree.LastIndexOf(50));

 			Assert.AreEqual(3, tree.LastIndexOf(70));

-			Assert.AreEqual(~1, tree.LastIndexOf(20));

-			Assert.AreEqual(~0, tree.LastIndexOf(0));

-			Assert.AreEqual(~4, tree.LastIndexOf(90));

+			Assert.AreEqual(-1, tree.LastIndexOf(20));

+			Assert.AreEqual(-1, tree.LastIndexOf(0));

+			Assert.AreEqual(-1, tree.LastIndexOf(90));

 		}

 

 

@@ -1221,7 +1053,7 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			private TreeSet<int> tree;

 

-			private SCG.IEnumerator<int> e;

+			private MSG.IEnumerator<int> e;

 

 

 			[SetUp]

@@ -1245,8 +1077,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterAdd()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterAdd()

 			{

 				tree.Add(34);

 				e.MoveNext();

@@ -1256,8 +1088,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterRemove()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterRemove()

 			{

 				tree.Remove(34);

 				e.MoveNext();

@@ -1265,8 +1097,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterClear()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterClear()

 			{

 				tree.Clear();

 				e.MoveNext();

@@ -1288,7 +1120,7 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			private TreeSet<int> tree;

 

-			private SCG.IEnumerator<int> e;

+			private MSG.IEnumerator<int> e;

 

 

 			[SetUp]

@@ -1312,8 +1144,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterAdd()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterAdd()

 			{

 				tree.Add(34);

 				e.MoveNext();

@@ -1323,8 +1155,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterRemove()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterRemove()

 			{

 				tree.Remove(34);

 				e.MoveNext();

@@ -1332,8 +1164,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(CollectionModifiedException))]

-      public void MoveNextAfterClear()

+			[ExpectedException(typeof(InvalidOperationException), "Collection was modified")]

+			public void MoveNextAfterClear()

 			{

 				tree.Clear();

 				e.MoveNext();

@@ -1359,7 +1191,7 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			private TreeSet<int> tree, snap;

 

-			private SCG.IComparer<int> ic;

+			private IComparer<int> ic;

 

 

 			[SetUp]

@@ -1385,7 +1217,7 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void InternalEnum()

 			{

-				Assert.IsTrue(IC.eq(snap.FindAll(new Fun<int, bool>(twomodeleven)), 13, 35));

+				Assert.IsTrue(IC.eq(snap.FindAll(new Filter<int>(twomodeleven)), 13, 35));

 			}

 

 			

@@ -1524,7 +1356,7 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			private TreeSet<int> tree;

 

-			private SCG.IComparer<int> ic;

+			private IComparer<int> ic;

 

 

 			[SetUp]

@@ -1752,10 +1584,10 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			private TreeSet<int> tree;

 

-			private SCG.IComparer<int> ic;

+			private IComparer<int> ic;

 

 

-			private bool eq(SCG.IEnumerable<int> me, int[] that)

+			private bool eq(MSG.IEnumerable<int> me, int[] that)

 			{

 				int i = 0, maxind = that.Length - 1;

 

@@ -1892,7 +1724,7 @@ namespace C5UnitTests.trees.TreeSet
 		{

 			private TreeSet<int> tree;

 

-			private SCG.IComparer<int> ic;

+			private IComparer<int> ic;

 

 

 			[SetUp]

@@ -1931,7 +1763,7 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				Simple simple1 = new Simple();

 

-				tree.Apply(new Act<int>(simple1.apply));

+				tree.Apply(new Applier<int>(simple1.apply));

 				Assert.AreEqual(0, simple1.appfield1);

 				Assert.AreEqual(0, simple1.appfield2);

 

@@ -1939,7 +1771,7 @@ namespace C5UnitTests.trees.TreeSet
 

 				for (int i = 0; i < 10; i++) tree.Add(i);

 

-				tree.Apply(new Act<int>(simple2.apply));

+				tree.Apply(new Applier<int>(simple2.apply));

 				Assert.AreEqual(10, simple2.appfield1);

 				Assert.AreEqual(285, simple2.appfield2);

 			}

@@ -1948,77 +1780,77 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void All()

 			{

-				Assert.IsTrue(tree.All(new Fun<int, bool>(never)));

-				Assert.IsTrue(tree.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

+				Assert.IsTrue(tree.All(new Filter<int>(never)));

+				Assert.IsTrue(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

 				for (int i = 0; i < 10; i++)					tree.Add(i);

 

-				Assert.IsFalse(tree.All(new Fun<int, bool>(never)));

-				Assert.IsFalse(tree.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.All(new Filter<int>(never)));

+				Assert.IsFalse(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

 				tree.Clear();

 				for (int i = 0; i < 10; i++)					tree.Add(i * 2);

 

-				Assert.IsFalse(tree.All(new Fun<int, bool>(never)));

-				Assert.IsTrue(tree.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.All(new Filter<int>(never)));

+				Assert.IsTrue(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

 				tree.Clear();

 				for (int i = 0; i < 10; i++)					tree.Add(i * 2 + 1);

 

-				Assert.IsFalse(tree.All(new Fun<int, bool>(never)));

-				Assert.IsFalse(tree.All(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.All(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.All(new Filter<int>(never)));

+				Assert.IsFalse(tree.All(new Filter<int>(even)));

+				Assert.IsTrue(tree.All(new Filter<int>(always)));

 			}

 

 

 			[Test]

 			public void Exists()

 			{

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(even)));

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(even)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(always)));

 				for (int i = 0; i < 10; i++)					tree.Add(i);

 

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-				Assert.IsTrue(tree.Exists(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(even)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(always)));

 				tree.Clear();

 				for (int i = 0; i < 10; i++)					tree.Add(i * 2);

 

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-				Assert.IsTrue(tree.Exists(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(even)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(always)));

 				tree.Clear();

 				for (int i = 0; i < 10; i++)					tree.Add(i * 2 + 1);

 

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(never)));

-				Assert.IsFalse(tree.Exists(new Fun<int, bool>(even)));

-				Assert.IsTrue(tree.Exists(new Fun<int, bool>(always)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(never)));

+				Assert.IsFalse(tree.Exists(new Filter<int>(even)));

+				Assert.IsTrue(tree.Exists(new Filter<int>(always)));

 			}

 

 

 			[Test]

 			public void FindAll()

 			{

-				Assert.AreEqual(0, tree.FindAll(new Fun<int, bool>(never)).Count);

+				Assert.AreEqual(0, tree.FindAll(new Filter<int>(never)).Count);

 				for (int i = 0; i < 10; i++)

 					tree.Add(i);

 

-				Assert.AreEqual(0, tree.FindAll(new Fun<int, bool>(never)).Count);

-				Assert.AreEqual(10, tree.FindAll(new Fun<int, bool>(always)).Count);

-				Assert.AreEqual(5, tree.FindAll(new Fun<int, bool>(even)).Count);

-				Assert.IsTrue(((TreeSet<int>)tree.FindAll(new Fun<int, bool>(even))).Check("R"));

+				Assert.AreEqual(0, tree.FindAll(new Filter<int>(never)).Count);

+				Assert.AreEqual(10, tree.FindAll(new Filter<int>(always)).Count);

+				Assert.AreEqual(5, tree.FindAll(new Filter<int>(even)).Count);

+				Assert.IsTrue(((TreeSet<int>)tree.FindAll(new Filter<int>(even))).Check("R"));

 			}

 

 

 			[Test]

 			public void Map()

 			{

-				Assert.AreEqual(0, tree.Map(new Fun<int,string>(themap), new SC()).Count);

+				Assert.AreEqual(0, tree.Map(new Mapper<int,string>(themap), new SC()).Count);

 				for (int i = 0; i < 11; i++)

 					tree.Add(i * i * i);

 

-				IIndexedSorted<string> res = tree.Map(new Fun<int,string>(themap), new SC());

+				IIndexedSorted<string> res = tree.Map(new Mapper<int,string>(themap), new SC());

 

 				Assert.IsTrue(((TreeSet<string>)res).Check("R"));

 				Assert.AreEqual(11, res.Count);

@@ -2036,7 +1868,7 @@ namespace C5UnitTests.trees.TreeSet
 				for (int i = 0; i < 11; i++)

 					tree.Add(i * i * i);

 

-				ISorted<string> res = tree.Map(new Fun<int,string>(badmap), new SC());

+				ISorted<string> res = tree.Map(new Mapper<int,string>(badmap), new SC());

 			}

 

 

@@ -2159,7 +1991,7 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void EmptyEmpty()

 			{

-				tree.AddAll(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				tree.AddAll(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(0, tree.Count);

 				Assert.IsTrue(tree.Check());

 			}

@@ -2170,7 +2002,7 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				for (int i = 4; i < 9; i++) tree.Add(i);

 

-				tree.AddAll(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				tree.AddAll(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(5, tree.Count);

 				Assert.IsTrue(tree.Check());

 			}

@@ -2179,7 +2011,7 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void EmptySome()

 			{

-				tree.AddAll(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				tree.AddAll(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(4, tree.Count);

 				Assert.IsTrue(tree.Check());

 				Assert.AreEqual(0, tree[0]);

@@ -2194,7 +2026,7 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				for (int i = 5; i < 9; i++) tree.Add(i);

 

-				tree.AddAll(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				tree.AddAll(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(8, tree.Count);

 				Assert.IsTrue(tree.Check());

 				Assert.IsTrue(IC.eq(tree, 0, 1, 4, 5, 6, 7, 8, 9));

@@ -2226,7 +2058,7 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void EmptyEmpty()

 			{

-				tree.AddSorted(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				tree.AddSorted(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(0, tree.Count);

 				Assert.IsTrue(tree.Check());

 			}

@@ -2238,7 +2070,7 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				for (int i = 4; i < 9; i++) tree.Add(i);

 

-				tree.AddSorted(new FunEnumerable(0, new Fun<int,int>(sqr)));

+				tree.AddSorted(new FunEnumerable(0, new Int2Int(sqr)));

 				Assert.AreEqual(5, tree.Count);

 				Assert.IsTrue(tree.Check());

 			}

@@ -2248,7 +2080,7 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void EmptySome()

 			{

-				tree.AddSorted(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				tree.AddSorted(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(4, tree.Count);

 				Assert.IsTrue(tree.Check());

 				Assert.AreEqual(0, tree[0]);

@@ -2264,7 +2096,7 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				for (int i = 5; i < 9; i++) tree.Add(i);

 

-				tree.AddSorted(new FunEnumerable(4, new Fun<int,int>(sqr)));

+				tree.AddSorted(new FunEnumerable(4, new Int2Int(sqr)));

 				Assert.AreEqual(8, tree.Count);

 				Assert.IsTrue(tree.Check());

 				Assert.IsTrue(IC.eq(tree, 0, 1, 4, 5, 6, 7, 8, 9));

@@ -2274,7 +2106,7 @@ namespace C5UnitTests.trees.TreeSet
 			[ExpectedException(typeof(ArgumentException), "Argument not sorted")]

 			public void EmptyBad()

 			{

-				tree.AddSorted(new FunEnumerable(9, new Fun<int,int>(bad)));

+				tree.AddSorted(new FunEnumerable(9, new Int2Int(bad)));

 			}

 

 

@@ -2412,8 +2244,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void RemoveRangeBad3()

+			[ExpectedException(typeof(ArgumentException))]

+			public void RemoveRangeBad3()

 			{

 				tree.RemoveInterval(3, 8);

 			}

@@ -2422,7 +2254,7 @@ namespace C5UnitTests.trees.TreeSet
 			[Test]

 			public void GetRange()

 			{

-				SCG.IEnumerable<int> e = tree[3, 6];

+				MSG.IEnumerable<int> e = tree[3, 6];

 

 				Assert.IsTrue(IC.eq(e, 3, 4, 5));

 				e = tree[3, 3];

@@ -2447,8 +2279,8 @@ namespace C5UnitTests.trees.TreeSet
 

 

 			[Test]

-      [ExpectedException(typeof(ArgumentOutOfRangeException))]

-      public void GetRangeBad3()

+			[ExpectedException(typeof(ArgumentException))]

+			public void GetRangeBad3()

 			{

 				object foo = tree[3, 11];

 			}

@@ -2460,16 +2292,15 @@ namespace C5UnitTests.trees.TreeSet
 	}

 

 

-

-

 	namespace Sync

 	{

+		[Category ("Threading")]

 		[TestFixture]

 		public class SyncRoot

 		{

 			private TreeSet<int> tree;

 

-			int sz = 5000;

+			int sz = 50;

 

 

 			[Test]

@@ -2578,14 +2409,13 @@ namespace C5UnitTests.trees.TreeSet
 			public void Dispose() { tree = null; }

 		}

 

-

-

 		//[TestFixture]

+		[Category ("Threading")]

 		public class ConcurrentQueries

 		{

 			private TreeSet<int> tree;

 

-			int sz = 500000;

+			int sz = 500;

 

 

 			[SetUp]

@@ -2613,7 +2443,7 @@ namespace C5UnitTests.trees.TreeSet
 				public void a(int i) { count++; }

 

 

-				public void traverse() { t.Apply(new Act<int>(a)); }

+				public void traverse() { t.Apply(new Applier<int>(a)); }

 			}

 

 

@@ -2655,9 +2485,6 @@ namespace C5UnitTests.trees.TreeSet
 		}

 	}

 

-

-

-

 	namespace Hashing

 	{

 		[TestFixture]

@@ -2669,16 +2496,16 @@ namespace C5UnitTests.trees.TreeSet
 			[SetUp]

 			public void Init()

 			{

-                dit = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-                dat = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-                dut = new TreeSet<int>(new RevIC(), EqualityComparer<int>.Default);

+				dit = new TreeSet<int>(new IC());

+				dat = new TreeSet<int>(new IC());

+				dut = new TreeSet<int>(new RevIC());

 			}

 

 

 			[Test]

 			public void EmptyEmpty()

 			{

-				Assert.IsTrue(dit.SequencedEquals(dat));

+				Assert.IsTrue(dit.Equals(dat));

 			}

 

 

@@ -2686,23 +2513,35 @@ namespace C5UnitTests.trees.TreeSet
 			public void EmptyNonEmpty()

 			{

 				dit.Add(3);

-				Assert.IsFalse(dit.SequencedEquals(dat));

-				Assert.IsFalse(dat.SequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 			}

 

+

+			public int hasher(params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval = retval * 31 + i;

+

+				return retval;

+			}

+

+

 			[Test]

 			public void HashVal()

 			{

-				Assert.AreEqual(CHC.sequencedhashcode(), dit.GetSequencedHashCode());

+				Assert.AreEqual(hasher(), dit.GetHashCode());

 				dit.Add(3);

-				Assert.AreEqual(CHC.sequencedhashcode(3), dit.GetSequencedHashCode());

+				Assert.AreEqual(hasher(3), dit.GetHashCode());

 				dit.Add(7);

-				Assert.AreEqual(CHC.sequencedhashcode(3, 7), dit.GetSequencedHashCode());

-				Assert.AreEqual(CHC.sequencedhashcode(), dut.GetSequencedHashCode());

+				Assert.AreEqual(hasher(3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(), dut.GetHashCode());

 				dut.Add(3);

-				Assert.AreEqual(CHC.sequencedhashcode(3), dut.GetSequencedHashCode());

+				Assert.AreEqual(hasher(3), dut.GetHashCode());

 				dut.Add(7);

-				Assert.AreEqual(CHC.sequencedhashcode(7, 3), dut.GetSequencedHashCode());

+				Assert.AreEqual(hasher(7, 3), dut.GetHashCode());

 			}

 

 

@@ -2712,11 +2551,11 @@ namespace C5UnitTests.trees.TreeSet
 				dit.Add(3);

 				dit.Add(7);

 				dat.Add(3);

-				Assert.IsFalse(dit.SequencedEquals(dat));

-				Assert.IsFalse(dat.SequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 				dat.Add(7);

-				Assert.IsTrue(dit.SequencedEquals(dat));

-				Assert.IsTrue(dat.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

 			}

 

 

@@ -2725,23 +2564,23 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				dit.Add(3);

 				dut.Add(3);

-				Assert.IsTrue(dit.SequencedEquals(dut));

-				Assert.IsTrue(dut.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 				dit.Add(7);

 				dut.Add(7);

-				Assert.IsFalse(dit.SequencedEquals(dut));

-				Assert.IsFalse(dut.SequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dut));

+				Assert.IsFalse(dut.Equals(dit));

 			}

 

 

 			[Test]

 			public void Reflexive()

 			{

-				Assert.IsTrue(dit.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(3);

-				Assert.IsTrue(dit.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(7);

-				Assert.IsTrue(dit.SequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 			}

 

 

@@ -2765,16 +2604,16 @@ namespace C5UnitTests.trees.TreeSet
 			[SetUp]

 			public void Init()

 			{

-                dit = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-                dat = new TreeSet<int>(Comparer<int>.Default, EqualityComparer<int>.Default);

-                dut = new TreeSet<int>(new RevIC(), EqualityComparer<int>.Default);

+				dit = new TreeSet<int>(new IC());

+				dat = new TreeSet<int>(new IC());

+				dut = new TreeSet<int>(new RevIC());

 			}

 

 

 			[Test]

 			public void EmptyEmpty()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

+				Assert.IsTrue(dit.Equals(dat));

 			}

 

 

@@ -2782,25 +2621,36 @@ namespace C5UnitTests.trees.TreeSet
 			public void EmptyNonEmpty()

 			{

 				dit.Add(3);

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dat.UnsequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

+			}

+

+

+			public int hasher(int count,params int[] items)

+			{

+				int retval = 0;

+

+				foreach (int i in items)

+					retval ^= i;

+

+				return (count<<16)+retval;

 			}

 

 

 			[Test]

 			public void HashVal()

 			{

-                Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());

-                dit.Add(3);

-                Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());

-                dit.Add(7);

-                Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());

-                Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());

-                dut.Add(3);

-                Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());

-                dut.Add(7);

-                Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());

-            }

+				Assert.AreEqual(hasher(0), dit.GetHashCode());

+				dit.Add(3);

+				Assert.AreEqual(hasher(1,3), dit.GetHashCode());

+				dit.Add(7);

+				Assert.AreEqual(hasher(2,3, 7), dit.GetHashCode());

+				Assert.AreEqual(hasher(0), dut.GetHashCode());

+				dut.Add(3);

+				Assert.AreEqual(hasher(1,3), dut.GetHashCode());

+				dut.Add(7);

+				Assert.AreEqual(hasher(2,7, 3), dut.GetHashCode());

+			}

 

 

 			[Test]

@@ -2809,11 +2659,11 @@ namespace C5UnitTests.trees.TreeSet
 				dit.Add(3);

 				dit.Add(7);

 				dat.Add(3);

-				Assert.IsFalse(dit.UnsequencedEquals(dat));

-				Assert.IsFalse(dat.UnsequencedEquals(dit));

+				Assert.IsFalse(dit.Equals(dat));

+				Assert.IsFalse(dat.Equals(dit));

 				dat.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dat));

-				Assert.IsTrue(dat.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dat));

+				Assert.IsTrue(dat.Equals(dit));

 			}

 

 

@@ -2822,23 +2672,23 @@ namespace C5UnitTests.trees.TreeSet
 			{

 				dit.Add(3);

 				dut.Add(3);

-				Assert.IsTrue(dit.UnsequencedEquals(dut));

-				Assert.IsTrue(dut.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 				dit.Add(7);

 				dut.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dut));

-				Assert.IsTrue(dut.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dut));

+				Assert.IsTrue(dut.Equals(dit));

 			}

 

 

 			[Test]

 			public void Reflexive()

 			{

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(3);

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 				dit.Add(7);

-				Assert.IsTrue(dit.UnsequencedEquals(dit));

+				Assert.IsTrue(dit.Equals(dit));

 			}

 

 

@@ -2852,4 +2702,5 @@ namespace C5UnitTests.trees.TreeSet
 		}

 

 	}

-}
\ No newline at end of file
+}

+#endif

diff --git a/mcs/class/Mono.C5/UserGuideExamples/AnagramHashBag.cs b/mcs/class/Mono.C5/UserGuideExamples/AnagramHashBag.cs
deleted file mode 100644
index cc1ca504d10..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/AnagramHashBag.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams 2004-08-08, 2004-11-16

-

-// Compile with 

-//   csc /r:C5.dll AnagramHashBag.cs 

-

-using System;

-using System.IO;                        // StreamReader, TextReader

-using System.Text;                      // Encoding

-using System.Text.RegularExpressions;   // Regex

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace AnagramHashBag

-{

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      Console.OutputEncoding = Encoding.GetEncoding("iso-8859-1");

-      SCG.IEnumerable<String> ss;

-      if (args.Length == 2)

-        ss = ReadFileWords(args[0], int.Parse(args[1]));

-      else

-        ss = args;

-      // foreach (String s in FirstAnagramOnly(ss)) 

-      //   Console.WriteLine(s);

-      //   Console.WriteLine("===");

-      Timer t = new Timer();

-      SCG.IEnumerable<SCG.IEnumerable<String>> classes = AnagramClasses(ss);

-      int count = 0;

-      foreach (SCG.IEnumerable<String> anagramClass in classes)

-      {

-        count++;

-        foreach (String s in anagramClass) 

-           Console.Write(s + " ");

-         Console.WriteLine();

-      }

-      Console.WriteLine("{0} non-trivial anagram classes", count);

-      Console.WriteLine(t.Check());

-    }

-

-    // Read words at most n words from a file

-

-    public static SCG.IEnumerable<String> ReadFileWords(String filename, int n)

-    {

-      Regex delim = new Regex("[^a-z���A-Z���0-9-]+");

-      Encoding enc = Encoding.GetEncoding("iso-8859-1");

-      using (TextReader rd = new StreamReader(filename, enc))

-      {

-        for (String line = rd.ReadLine(); line != null; line = rd.ReadLine()) {

-          foreach (String s in delim.Split(line))

-            if (s != "")

-              yield return s.ToLower();

-          if (--n == 0)

-            yield break;

-        }

-      }

-    }

-

-    // From an anagram point of view, a word is just a bag of

-    // characters.  So an anagram class is represented as HashBag<char>

-    // which permits fast equality comparison -- we shall use them as

-    // elements of hash sets or keys in hash maps.

-

-    public static HashBag<char> AnagramClass(String s) {

-      HashBag<char> anagram = new HashBag<char>();

-      foreach (char c in s)

-        anagram.Add(c);

-      return anagram;

-    }

-

-    // Given a sequence of strings, return only the first member of each

-    // anagram class.

-

-    public static SCG.IEnumerable<String> FirstAnagramOnly(SCG.IEnumerable<String> ss)

-    {

-      HashSet<HashBag<char>> anagrams = new HashSet<HashBag<char>>();

-      foreach (String s in ss) {

-        HashBag<char> anagram = AnagramClass(s);

-        if (!anagrams.Contains(anagram)) {

-          anagrams.Add(anagram);

-          yield return s;

-        }

-      }

-    }

-

-    // Given a sequence of strings, return all non-trivial anagram

-    // classes.  

-

-    // Using HashBag<char> and an unsequenced equalityComparer, this performs as

-    // follows on 1600 MHz Mobile P4 and .Net 2.0 beta 1 (wall-clock

-    // time):

-    //  50 000 words  2 822 classes   2.0 sec

-    // 100 000 words  5 593 classes   4.3 sec

-    // 200 000 words 11 705 classes   8.8 sec

-    // 300 000 words 20 396 classes  52.0 sec includes swapping

-    // 347 165 words 24 428 classes 146.0 sec includes swapping

-

-    // The maximal memory consumption is less than 180 MB.

-

-    public static SCG.IEnumerable<SCG.IEnumerable<String>>

-      AnagramClasses(SCG.IEnumerable<String> ss)

-    {

-      IDictionary<HashBag<char>, TreeSet<String>> classes

-        = new HashDictionary<HashBag<char>, TreeSet<String>>();

-      foreach (String s in ss) {

-        HashBag<char> anagram = AnagramClass(s);

-        TreeSet<String> anagramClass;

-        if (!classes.Find(anagram, out anagramClass))

-          classes[anagram] = anagramClass = new TreeSet<String>();

-        anagramClass.Add(s);

-      }

-      foreach (TreeSet<String> anagramClass in classes.Values)

-        if (anagramClass.Count > 1)

-          yield return anagramClass;

-    }

-  }

-

-// Crude timing utility ----------------------------------------

-

-  public class Timer

-  {

-    private DateTime start;

-

-    public Timer()

-    {

-      start = DateTime.Now;

-    }

-

-    public double Check()

-    {

-      TimeSpan dur = DateTime.Now - start;

-      return dur.TotalSeconds;

-    }

-  }

-

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/AnagramStrings.cs b/mcs/class/Mono.C5/UserGuideExamples/AnagramStrings.cs
deleted file mode 100644
index 314e7a41111..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/AnagramStrings.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams represented as sorted strings 2004-08-26

-

-// To represent an anagram class, use a string containing the sorted

-// characters of a word.  

-

-// This is faster than a TreeBag<char> because the words and hence

-// bags are small.  Takes 15 CPU seconds and 138 MB RAM to find the

-// 26,058 anagram classes among 347,000 distinct words.

-

-// Compile with 

-//   csc /r:C5.dll Anagrams.cs 

-

-using System;

-using System.IO;                        // StreamReader, TextReader

-using System.Text;			// Encoding

-using System.Text.RegularExpressions;   // Regex

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace AnagramStrings

-{

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      Console.OutputEncoding = Encoding.GetEncoding("iso-8859-1");

-      SCG.IEnumerable<String> ss;

-      if (args.Length == 1)

-        ss = ReadFileWords(args[0]);

-      else

-        ss = args;

-

-      Timer t = new Timer();

-      SCG.IEnumerable<SCG.IEnumerable<String>> classes = AnagramClasses(ss);

-      int count = 0;

-      foreach (SCG.IEnumerable<String> anagramClass in classes)

-      {

-        count++;

-        // foreach (String s in anagramClass) 

-        //   Console.Write(s + " ");

-        // Console.WriteLine();

-      }

-      Console.WriteLine("{0} anagram classes", count);

-      Console.WriteLine(t.Check());

-    }

-

-    // Read words from a file

-

-    public static SCG.IEnumerable<String> ReadFileWords(String filename)

-    {

-      Regex delim = new Regex("[^a-z���A-Z���0-9-]+");

-      using (TextReader rd = new StreamReader(filename, Encoding.GetEncoding("iso-8859-1")))

-      {

-        for (String line = rd.ReadLine(); line != null; line = rd.ReadLine())

-          foreach (String s in delim.Split(line))

-            if (s != "")

-              yield return s.ToLower();

-      }

-    }

-

-    // From an anagram point of view, a word is just a bag of characters.

-

-    public static CharBag AnagramClass(String s)

-    {

-      return new CharBag(s);

-    }

-

-    // Given a sequence of strings, return all non-trivial anagram classes   

-

-    public static SCG.IEnumerable<SCG.IEnumerable<String>> AnagramClasses(SCG.IEnumerable<String> ss)

-    {

-      IDictionary<CharBag, HashSet<String>> classes

-        = new TreeDictionary<CharBag, HashSet<String>>();

-      foreach (String s in ss)

-      {

-        CharBag anagram = AnagramClass(s);

-        HashSet<String> anagramClass;

-        if (!classes.Find(anagram, out anagramClass))

-          classes[anagram] = anagramClass = new HashSet<String>();

-        anagramClass.Add(s);

-      }

-      foreach (HashSet<String> anagramClass in classes.Values)

-        if (anagramClass.Count > 1

-      ) // && anagramClass.Exists(delegate(String s) { return !s.EndsWith("s"); }))

-          yield return anagramClass;

-    }

-  }

-

-// A bag of characters is represented as a sorted string of the

-// characters, with multiplicity.  Since natural language words are

-// short, the bags are small, so this is vastly better than

-// representing character bags using HashBag<char> or TreeBag<char>

-

-  class CharBag : IComparable<CharBag>

-  {

-    private readonly String contents; // The bag's characters, sorted, with multiplicity

-

-    public CharBag(String s)

-    {

-      char[] chars = s.ToCharArray();

-      Array.Sort(chars);

-      this.contents = new String(chars);

-    }

-

-    public override int GetHashCode()

-    {

-      return contents.GetHashCode();

-    }

-

-    public bool Equals(CharBag that)

-    {

-      return this.contents.Equals(that.contents);

-    }

-

-    public int CompareTo(CharBag that)

-    {

-      return this.contents.CompareTo(that.contents);

-    }

-  }

-

-// Crude timing utility ----------------------------------------

-

-  public class Timer

-  {

-    private DateTime start;

-

-    public Timer()

-    {

-      start = DateTime.Now;

-    }

-

-    public double Check()

-    {

-      TimeSpan dur = DateTime.Now - start;

-      return dur.TotalSeconds;

-    }

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/AnagramTreeBag.cs b/mcs/class/Mono.C5/UserGuideExamples/AnagramTreeBag.cs
deleted file mode 100644
index e8120758ca8..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/AnagramTreeBag.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams 2004-08-08, 2004-11-16

-

-// Compile with 

-//   csc /r:C5.dll AnagramTreeBag.cs 

-

-using System;

-using System.IO;                        // StreamReader, TextReader

-using System.Text;			// Encoding

-using System.Text.RegularExpressions;   // Regex

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace AnagramTreeBag

-{

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      Console.OutputEncoding = Encoding.GetEncoding("iso-8859-1");

-      SCG.IEnumerable<String> ss;

-      if (args.Length == 2)

-        ss = ReadFileWords(args[0], int.Parse(args[1]));

-      else

-        ss = args;

-      // foreach (String s in FirstAnagramOnly(ss)) 

-      //   Console.WriteLine(s);

-      //   Console.WriteLine("===");

-      Timer t = new Timer();

-      SCG.IEnumerable<SCG.IEnumerable<String>> classes = AnagramClasses(ss);

-      int count = 0;

-      foreach (SCG.IEnumerable<String> anagramClass in classes)

-      {

-        count++;

-	// foreach (String s in anagramClass)

-	//   Console.Write(s + " ");

-	// Console.WriteLine();

-      }

-      Console.WriteLine("{0} non-trivial anagram classes", count);

-      Console.WriteLine(t.Check());

-    }

-

-    // Read words at most n words from a file

-

-    public static SCG.IEnumerable<String> ReadFileWords(String filename, int n)

-    {

-      Regex delim = new Regex("[^a-z���A-Z���0-9-]+");

-      Encoding enc = Encoding.GetEncoding("iso-8859-1");

-      using (TextReader rd = new StreamReader(filename, enc))

-      {

-        for (String line = rd.ReadLine(); line != null; line = rd.ReadLine())

-        {

-          foreach (String s in delim.Split(line))

-            if (s != "")

-              yield return s.ToLower();

-          if (--n == 0)

-            yield break;

-        }

-      }

-    }

-

-    // From an anagram point of view, a word is just a bag of

-    // characters.  So an anagram class is represented as TreeBag<char>

-    // which permits fast equality comparison -- we shall use them as

-    // elements of hash sets or keys in hash maps.

-

-    public static TreeBag<char> AnagramClass(String s)

-    {

-      TreeBag<char> anagram = new TreeBag<char>(Comparer<char>.Default, EqualityComparer<char>.Default);

-      foreach (char c in s)

-        anagram.Add(c);

-      return anagram;

-    }

-

-    // Given a sequence of strings, return only the first member of each

-    // anagram class.

-

-    public static SCG.IEnumerable<String> FirstAnagramOnly(SCG.IEnumerable<String> ss)

-    {

-      HashSet<TreeBag<char>> anagrams = new HashSet<TreeBag<char>>();

-      foreach (String s in ss)

-      {

-        TreeBag<char> anagram = AnagramClass(s);

-        if (!anagrams.Contains(anagram))

-        {

-          anagrams.Add(anagram);

-          yield return s;

-        }

-      }

-    }

-

-    // Given a sequence of strings, return all non-trivial anagram

-    // classes.  

-

-    // Using TreeBag<char> and an unsequenced equalityComparer, this performs as

-    // follows on 1600 MHz Mobile P4 and .Net 2.0 beta 1 (wall-clock

-    // time; number of distinct words):

-

-    //  50 000 words  2 822 classes   2.4 sec

-    // 100 000 words  5 593 classes   4.6 sec

-    // 200 000 words 11 705 classes   9.6 sec

-    // 300 000 words 20 396 classes  88.2 sec (includes swapping)

-    // 347 165 words 24 428 classes 121.3 sec (includes swapping)

-

-    // The maximal memory consumption is around 180 MB.

-

-    public static SCG.IEnumerable<SCG.IEnumerable<String>>

-      AnagramClasses(SCG.IEnumerable<String> ss)

-    {

-      IDictionary<TreeBag<char>, TreeSet<String>> classes;

-      classes = new HashDictionary<TreeBag<char>, TreeSet<String>>();

-      foreach (String s in ss)

-      {

-        TreeBag<char> anagram = AnagramClass(s);

-        TreeSet<String> anagramClass;

-        if (!classes.Find(anagram, out anagramClass))

-          classes[anagram] = anagramClass = new TreeSet<String>();

-        anagramClass.Add(s);

-      }

-      foreach (TreeSet<String> anagramClass in classes.Values)

-        if (anagramClass.Count > 1)

-          yield return anagramClass;

-    }

-  }

-

-// Crude timing utility ----------------------------------------

-

-  public class Timer

-  {

-    private DateTime start;

-

-    public Timer()

-    {

-      start = DateTime.Now;

-    }

-

-    public double Check()

-    {

-      TimeSpan dur = DateTime.Now - start;

-      return dur.TotalSeconds;

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Anagrams.cs b/mcs/class/Mono.C5/UserGuideExamples/Anagrams.cs
deleted file mode 100644
index 64ca20f515f..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Anagrams.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams 2004-08-08, 2004-11-16

-

-// Compile with 

-//   csc /r:C5.dll Anagrams.cs 

-

-using System;

-using System.IO;                        // StreamReader, TextReader

-using System.Text;			// Encoding

-using System.Text.RegularExpressions;   // Regex

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace Anagrams

-{

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      Console.OutputEncoding = Encoding.GetEncoding("iso-8859-1");

-      SCG.IEnumerable<String> ss;

-      if (args.Length == 2)

-        ss = ReadFileWords(args[0], int.Parse(args[1]));

-      else

-        ss = args;

-      // foreach (String s in FirstAnagramOnly(ss)) 

-      //   Console.WriteLine(s);

-      //   Console.WriteLine("===");

-      Timer t = new Timer();

-      SCG.IEnumerable<SCG.IEnumerable<String>> classes = AnagramClasses(ss);

-      int count = 0;

-      foreach (SCG.IEnumerable<String> anagramClass in classes)

-      {

-        count++;

-        // foreach (String s in anagramClass) 

-        //   Console.Write(s + " ");

-        // Console.WriteLine();

-      }

-      Console.WriteLine("{0} non-trivial anagram classes", count);

-      Console.WriteLine(t.Check());

-    }

-

-    // Read words at most n words from a file

-

-    public static SCG.IEnumerable<String> ReadFileWords(String filename, int n)

-    {

-      Regex delim = new Regex("[^a-z���A-Z���0-9-]+");

-      Encoding enc = Encoding.GetEncoding("iso-8859-1");

-      using (TextReader rd = new StreamReader(filename, enc))

-      {

-        for (String line = rd.ReadLine(); line != null; line = rd.ReadLine())

-        {

-          foreach (String s in delim.Split(line))

-            if (s != "")

-              yield return s.ToLower();

-          if (--n == 0)

-            yield break;

-        }

-      }

-    }

-

-    // From an anagram point of view, a word is just a bag of

-    // characters.  So an anagram class is represented as TreeBag<char>

-    // which permits fast equality comparison -- we shall use them as

-    // elements of hash sets or keys in hash maps.

-

-    public static TreeBag<char> AnagramClass(String s)

-    {

-      TreeBag<char> anagram = new TreeBag<char>(Comparer<char>.Default, EqualityComparer<char>.Default);

-      foreach (char c in s)

-        anagram.Add(c);

-      return anagram;

-    }

-

-    // Given a sequence of strings, return only the first member of each

-    // anagram class.

-

-    public static SCG.IEnumerable<String> FirstAnagramOnly(SCG.IEnumerable<String> ss)

-    {

-      SCG.IEqualityComparer<TreeBag<char>> tbh

-        = UnsequencedCollectionEqualityComparer<TreeBag<char>, char>.Default;

-      HashSet<TreeBag<char>> anagrams = new HashSet<TreeBag<char>>(tbh);

-      foreach (String s in ss)

-      {

-        TreeBag<char> anagram = AnagramClass(s);

-        if (!anagrams.Contains(anagram))

-        {

-          anagrams.Add(anagram);

-          yield return s;

-        }

-      }

-    }

-

-    // Given a sequence of strings, return all non-trivial anagram

-    // classes.  Should use a *sequenced* equalityComparer on a TreeBag<char>,

-    // obviously: after all, characters can be sorted by ASCII code.  On

-    // 347 000 distinct Danish words this takes 70 cpu seconds, 180 MB

-    // memory, and 263 wall-clock seconds (due to swapping).

-

-    // Using a TreeBag<char> and a sequenced equalityComparer takes 82 cpu seconds

-    // and 180 MB RAM to find the 26,058 anagram classes among 347,000

-    // distinct words.

-

-    // Using an unsequenced equalityComparer on TreeBag<char> or HashBag<char>

-    // makes it criminally slow: at least 1200 cpu seconds.  This must

-    // be because many bags get the same hash code, so that there are

-    // many collisions.  But exactly how the unsequenced equalityComparer works is

-    // not clear ... or is it because unsequenced equality is slow?

-

-    public static SCG.IEnumerable<SCG.IEnumerable<String>> AnagramClasses(SCG.IEnumerable<String> ss)

-    {

-      bool unseq = true;

-      IDictionary<TreeBag<char>, TreeSet<String>> classes;

-      if (unseq)

-      {

-        SCG.IEqualityComparer<TreeBag<char>> unsequencedTreeBagEqualityComparer

-    = UnsequencedCollectionEqualityComparer<TreeBag<char>, char>.Default;

-        classes = new HashDictionary<TreeBag<char>, TreeSet<String>>(unsequencedTreeBagEqualityComparer);

-      }

-      else

-      {

-        SCG.IEqualityComparer<TreeBag<char>> sequencedTreeBagEqualityComparer

-    = SequencedCollectionEqualityComparer<TreeBag<char>, char>.Default;

-        classes = new HashDictionary<TreeBag<char>, TreeSet<String>>(sequencedTreeBagEqualityComparer);

-      }

-      foreach (String s in ss)

-      {

-        TreeBag<char> anagram = AnagramClass(s);

-        TreeSet<String> anagramClass;

-        if (!classes.Find(anagram, out anagramClass))

-          classes[anagram] = anagramClass = new TreeSet<String>();

-        anagramClass.Add(s);

-      }

-      foreach (TreeSet<String> anagramClass in classes.Values)

-        if (anagramClass.Count > 1)

-          yield return anagramClass;

-    }

-  }

-

-// Crude timing utility ----------------------------------------

-

-  public class Timer

-  {

-    private DateTime start;

-

-    public Timer()

-    {

-      start = DateTime.Now;

-    }

-

-    public double Check()

-    {

-      TimeSpan dur = DateTime.Now - start;

-      return dur.TotalSeconds;

-    }

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/Antipatterns.cs b/mcs/class/Mono.C5/UserGuideExamples/Antipatterns.cs
deleted file mode 100644
index 94d373434b8..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Antipatterns.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: Antipatterns 2004-12-29

-

-// Compile with 

-//   csc /r:C5.dll Antipatterns.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace Antipatterns {

-  class Antipatterns {

-    public static void Main(String[] args) {

-      ModifyInner();

-      DontModifyInner();

-    }

-

-    // Anti-pattern: modifying an inner collection while it is a

-    // member of an outer one may cause it to be lost from the outer

-    // collection.

-    

-    private static void ModifyInner() {

-      Console.WriteLine("\nAnti-pattern: Add to outer, modify, lose");

-      ICollection<ISequenced<int>> outer = new HashSet<ISequenced<int>>();

-      for (int i=0; i<100; i++) {

-        ISequenced<int> inner = new TreeSet<int>();

-        inner.Add(i); inner.Add(i+1);

-        outer.Add(inner);

-      }

-      ISequenced<int> 

-        inner1 = new TreeSet<int>(), 

-        inner2 = new TreeSet<int>(),

-        inner3 = new TreeSet<int>();    

-      inner1.AddAll<int>(new int[] { 2, 3, 5, 7, 11 });

-      inner2.AddAll(inner1); inner2.Add(13);

-      inner3.AddAll(inner1); 

-      outer.Add(inner1);

-      Console.WriteLine("inner1 in outer: {0}", outer.Contains(inner1));

-      Console.WriteLine("inner2 in outer: {0}", outer.Contains(inner2));

-      Console.WriteLine("inner3 in outer: {0}", outer.Contains(inner3));

-      inner1.Add(13);

-      Console.WriteLine("inner1 equals inner2: {0}", 

-                        outer.EqualityComparer.Equals(inner1, inner2));

-      Console.WriteLine("inner1 equals inner3: {0}", 

-                        outer.EqualityComparer.Equals(inner1, inner3));

-      Console.WriteLine("inner1 in outer: {0}", outer.Contains(inner1));

-      Console.WriteLine("inner2 in outer: {0}", outer.Contains(inner2));

-      Console.WriteLine("inner3 in outer: {0}", outer.Contains(inner3));

-      Console.WriteLine("outer.Count: {0}", outer.Count);

-    }

-

-    private static void DontModifyInner() {

-      Console.WriteLine("\nMake a snapshot and add it to outer");

-      ICollection<ISequenced<int>> outer = new HashSet<ISequenced<int>>();

-      for (int i=0; i<100; i++) {

-        ISequenced<int> inner = new TreeSet<int>();

-        inner.Add(i); inner.Add(i+1);

-        outer.Add(inner);

-      }

-      IPersistentSorted<int> 

-        inner1 = new TreeSet<int>(), 

-        inner2 = new TreeSet<int>(),

-        inner3 = new TreeSet<int>();    

-      inner1.AddAll<int>(new int[] { 2, 3, 5, 7, 11 });

-      inner2.AddAll(inner1); inner2.Add(13);

-      inner3.AddAll(inner1); 

-      // Take a snapshot and add it to outer:

-      outer.Add(inner1.Snapshot());

-      Console.WriteLine("inner1 in outer: {0}", outer.Contains(inner1));

-      Console.WriteLine("inner2 in outer: {0}", outer.Contains(inner2));

-      Console.WriteLine("inner3 in outer: {0}", outer.Contains(inner3));

-      inner1.Add(13);

-      Console.WriteLine("inner1 equals inner2: {0}", 

-                        outer.EqualityComparer.Equals(inner1, inner2));

-      Console.WriteLine("inner1 equals inner3: {0}", 

-                        outer.EqualityComparer.Equals(inner1, inner3));

-      Console.WriteLine("inner1 in outer: {0}", outer.Contains(inner1));

-      Console.WriteLine("inner2 in outer: {0}", outer.Contains(inner2));

-      Console.WriteLine("inner3 in outer: {0}", outer.Contains(inner3));

-      Console.WriteLine("outer.Count: {0}", outer.Count);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Cloning.cs b/mcs/class/Mono.C5/UserGuideExamples/Cloning.cs
deleted file mode 100644
index beeea8f0c8a..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Cloning.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams 2004-12-

-

-// Compile with 

-//   csc /r:C5.dll Cloning.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace MyCloningTest {

-  class MyTest {

-    public static void Main(String[] args) {

-      IList<int> lst = new ArrayList<int>();

-      lst.AddAll(new int[] { 2, 3, 5, 7, 11, 13 });

-      Console.WriteLine(lst);

-      IList<int> v1 = lst.ViewOf(7);

-      Console.WriteLine(v1);

-      IList<int> v2 = (IList<int>)v1.Clone();

-      v2.Slide(1);

-      Console.WriteLine(v1);

-      Console.WriteLine(v2);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/CollectionCollection.cs b/mcs/class/Mono.C5/UserGuideExamples/CollectionCollection.cs
deleted file mode 100644
index 5e90c1cff72..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/CollectionCollection.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: collections of collections 2004-11-16

-

-// Compile with 

-//   csc /r:C5.dll CollectionCollection.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace CollectionCollection

-{

-  class MyTest

-  {

-    private static IList<int> col1 = new LinkedList<int>(),

-      col2 = new LinkedList<int>(), col3 = new LinkedList<int>();

-

-    public static void Main(String[] args) {

-      ListEqualityComparers();

-      IntSetSet();

-      CharBagSet();

-    }

-      

-    public static void ListEqualityComparers() {

-      col1.AddAll<int>(new int[] { 7, 9, 13 });

-      col2.AddAll<int>(new int[] { 7, 9, 13 });

-      col3.AddAll<int>(new int[] { 9, 7, 13 });

-

-      // Default equality and hasher == sequenced equality and hasher

-      HashSet<IList<int>> hs1 = new HashSet<IList<int>>();

-      Equalities("Default equality (sequenced equality)", hs1.EqualityComparer);

-      hs1.Add(col1); hs1.Add(col2); hs1.Add(col3);

-      Console.WriteLine("hs1.Count = {0}", hs1.Count);

-

-      // Sequenced equality and hasher 

-      SCG.IEqualityComparer<IList<int>> seqEqualityComparer

-        = SequencedCollectionEqualityComparer<IList<int>, int>.Default;

-      HashSet<IList<int>> hs2 = new HashSet<IList<int>>(seqEqualityComparer);

-      Equalities("Sequenced equality", hs2.EqualityComparer);

-      hs2.Add(col1); hs2.Add(col2); hs2.Add(col3);

-      Console.WriteLine("hs2.Count = {0}", hs2.Count);

-

-      // Unsequenced equality and hasher

-      SCG.IEqualityComparer<IList<int>> unseqEqualityComparer

-        = UnsequencedCollectionEqualityComparer<IList<int>, int>.Default;

-      HashSet<IList<int>> hs3 = new HashSet<IList<int>>(unseqEqualityComparer);

-      Equalities("Unsequenced equality", hs3.EqualityComparer);

-      hs3.Add(col1); hs3.Add(col2); hs3.Add(col3);

-      Console.WriteLine("hs3.Count = {0}", hs3.Count);

-

-      // Reference equality and hasher

-      SCG.IEqualityComparer<IList<int>> refEqEqualityComparer 

-        = ReferenceEqualityComparer<IList<int>>.Default;

-      HashSet<IList<int>> hs4 = new HashSet<IList<int>>(refEqEqualityComparer);

-      Equalities("Reference equality", hs4.EqualityComparer);

-      hs4.Add(col1); hs4.Add(col2); hs4.Add(col3);

-      Console.WriteLine("hs4.Count = {0}", hs4.Count);

-    }

-

-    public static void Equalities(String msg, SCG.IEqualityComparer<IList<int>> equalityComparer)

-    {

-      Console.WriteLine("\n{0}:", msg);

-      Console.Write("Equals(col1,col2)={0,-5}; ", equalityComparer.Equals(col1, col2));

-      Console.Write("Equals(col1,col3)={0,-5}; ", equalityComparer.Equals(col1, col3));

-      Console.WriteLine("Equals(col2,col3)={0,-5}", equalityComparer.Equals(col2, col3));

-    }

-

-    public static void IntSetSet() {

-      ICollection<ISequenced<int>> outer = new HashSet<ISequenced<int>>();

-      int[] ss = { 2, 3, 5, 7 };

-      TreeSet<int> inner = new TreeSet<int>();

-      outer.Add(inner.Snapshot());

-      foreach (int i in ss) { 

-        inner.Add(i);

-        outer.Add(inner.Snapshot());

-      }

-      foreach (ISequenced<int> s in outer) {

-        int sum = 0;

-        s.Apply(delegate(int x) { sum += x; });

-        Console.WriteLine("Set has {0} elements and sum {1}", s.Count, sum);

-      }

-    }

-

-    public static void CharBagSet() { 

-      String text = 

-        @"three sorted streams aligned by leading masters are stored 

-          there; an integral triangle ends, and stable tables keep;

-          being alert, they later reread the logarithm, peek at the

-          recent center, then begin to send their reader algorithm.";

-      String[] words = text.Split(' ', '\n', '\r', ';', ',', '.');

-      ICollection<ICollection<char>> anagrams 

-        = new HashSet<ICollection<char>>();

-      int count = 0;

-      foreach (String word in words) {

-        if (word != "") {

-          count++;

-          HashBag<char> anagram = new HashBag<char>();

-          anagram.AddAll<char>(word.ToCharArray());

-          anagrams.Add(anagram);

-        }

-      }

-      Console.WriteLine("Found {0} anagrams", count - anagrams.Count);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/CollectionSanity.cs b/mcs/class/Mono.C5/UserGuideExamples/CollectionSanity.cs
deleted file mode 100644
index fa332ee763b..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/CollectionSanity.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams 2004-12-08

-

-// Compile with 

-//   csc /r:C5.dll CollectionSanity.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace CollectionSanity {

-  class CollectionSanity {

-    public static void Main(String[] args) {

-      IList<int> col1 = new LinkedList<int>(),

-        col2 = new LinkedList<int>(), col3 = new LinkedList<int>();

-      col1.AddAll<int>(new int[] { 7, 9, 13 });

-      col2.AddAll<int>(new int[] { 7, 9, 13 });

-      col3.AddAll<int>(new int[] { 9, 7, 13 });

-

-      HashSet<IList<int>> hs1 = new HashSet<IList<int>>();

-      hs1.Add(col1); hs1.Add(col2); hs1.Add(col3);

-      Console.WriteLine("hs1 is sane: {0}", EqualityComparerSanity<int,IList<int>>(hs1));

-    }

-    

-    // When colls is a collection of collections, this method checks

-    // that all `inner' collections use the exact same equalityComparer.  Note

-    // that two equalityComparer objects may be functionally (extensionally)

-    // identical, yet be distinct objects.  However, if the equalityComparers

-    // were obtained from EqualityComparer<T>.Default, there will be at most one

-    // equalityComparer for each type T.

-

-    public static bool EqualityComparerSanity<T,U>(ICollectionValue<U> colls) 

-      where U : IExtensible<T>

-    {

-      SCG.IEqualityComparer<T> equalityComparer = null;

-      foreach (IExtensible<T> coll in colls) {

-        if (equalityComparer == null) 

-          equalityComparer = coll.EqualityComparer;

-        if (equalityComparer != coll.EqualityComparer) 

-          return false;

-      }

-      return true;

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/EventPatterns.cs b/mcs/class/Mono.C5/UserGuideExamples/EventPatterns.cs
deleted file mode 100644
index 36d41a66ef4..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/EventPatterns.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: EventPatterns.cs for pattern chapter

-

-// Compile with 

-//   csc /r:C5.dll EventPatterns.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace EventPatterns {

-  class EventPatterns {

-    public static void Main(String[] args) {

-      UnindexedCollectionEvents();

-      Console.WriteLine("--------------------");

-      IndexedCollectionEvents();

-      Console.WriteLine("--------------------");

-      UpdateEvent();

-    }

-

-    public static void UnindexedCollectionEvents() {

-      ICollection<int> coll = new ArrayList<int>();

-      ICollection<int> bag1 = new HashBag<int>();

-      bag1.AddAll(new int[] { 3, 2, 5, 5, 7, 7, 5, 3, 7, 7 });

-      // Add change handler

-      coll.CollectionChanged 

-        += delegate(Object c)  { 

-             Console.WriteLine("Collection changed"); 

-           };

-      // Add cleared handler

-      coll.CollectionCleared 

-        += delegate(Object c, ClearedEventArgs args) { 

-             Console.WriteLine("Collection cleared"); 

-           };

-      // Add added handler

-      coll.ItemsAdded 

-        += delegate(Object c, ItemCountEventArgs<int> args) { 

-             Console.WriteLine("Item {0} added", args.Item); 

-           };

-      // Add item count handler

-      AddItemsAddedCounter(coll);

-      AddItemsRemovedCounter(coll);

-      coll.AddAll(bag1);

-      coll.RemoveAll(new int[] { 2, 5, 6, 3, 7, 2 });

-      coll.Clear();

-      ICollection<int> bag2 = new HashBag<int>();

-      // Add added handler with multiplicity

-      bag2.ItemsAdded 

-        += delegate(Object c, ItemCountEventArgs<int> args) { 

-             Console.WriteLine("{0} copies of {1} added", 

-                               args.Count, args.Item);

-           };

-      bag2.AddAll(bag1);

-      // Add removed handler with multiplicity

-      bag2.ItemsRemoved 

-        += delegate(Object c, ItemCountEventArgs<int> args) { 

-             Console.WriteLine("{0} copies of {1} removed", 

-                               args.Count, args.Item);

-           };

-      bag2.RemoveAllCopies(7);

-    }

-

-    // This works for all kinds of collections, also those with bag

-    // semantics and representing duplicates by counting:

-

-    private static void AddItemsAddedCounter<T>(ICollection<T> coll) {

-      int addedCount = 0;

-      coll.ItemsAdded 

-        += delegate(Object c, ItemCountEventArgs<T> args) { 

-             addedCount += args.Count; 

-           };

-      coll.CollectionChanged 

-        += delegate(Object c) { 

-             if (addedCount > 0)

-               Console.WriteLine("{0} items were added", addedCount);

-             addedCount = 0;

-           };

-    }

-

-    // This works for all kinds of collections, also those with bag

-    // semantics and representing duplicates by counting:

-

-    private static void AddItemsRemovedCounter<T>(ICollection<T> coll) {

-      int removedCount = 0;

-      coll.ItemsRemoved 

-        += delegate(Object c, ItemCountEventArgs<T> args) { 

-             removedCount += args.Count; 

-           };

-      coll.CollectionChanged 

-        += delegate(Object c) { 

-             if (removedCount > 0)

-               Console.WriteLine("{0} items were removed", removedCount);

-             removedCount = 0;

-           };

-    }

-

-    // Event patterns on indexed collections

-

-    public static void IndexedCollectionEvents() {

-      IList<int> coll = new ArrayList<int>();

-      ICollection<int> bag = new HashBag<int>();

-      bag.AddAll(new int[] { 3, 2, 5, 5, 7, 7, 5, 3, 7, 7 });

-      // Add item inserted handler

-      coll.ItemInserted 

-        += delegate(Object c, ItemAtEventArgs<int> args)  { 

-             Console.WriteLine("Item {0} inserted at {1}", 

-                               args.Item, args.Index); 

-           };

-      coll.InsertAll(0, bag);

-      // Add item removed-at handler

-      coll.ItemRemovedAt 

-        += delegate(Object c, ItemAtEventArgs<int> args)  { 

-             Console.WriteLine("Item {0} removed at {1}", 

-                               args.Item, args.Index); 

-           };

-      coll.RemoveLast();

-      coll.RemoveFirst();

-      coll.RemoveAt(1);

-    }

-

-    // Recognizing Update event as a Removed-Added-Changed sequence

-

-    private enum State { Before, Removed, Updated };

-

-    private static void AddItemUpdatedHandler<T>(ICollection<T> coll) {

-      State state = State.Before;

-      T removed = default(T), added = default(T);

-      coll.ItemsRemoved 

-        += delegate(Object c, ItemCountEventArgs<T> args) { 

-             if (state==State.Before) {

-               state = State.Removed; 

-               removed = args.Item;

-             } else 

-               state = State.Before;

-           };

-      coll.ItemsAdded 

-        += delegate(Object c, ItemCountEventArgs<T> args) { 

-             if (state==State.Removed) { 

-               state = State.Updated; 

-               added = args.Item; 

-             } else 

-               state = State.Before;

-           };

-      coll.CollectionChanged 

-        += delegate(Object c)  { 

-             if (state==State.Updated) 

-               Console.WriteLine("Item {0} was updated to {1}", 

-                                 removed, added);

-             state = State.Before;

-           };

-    }

-

-    public static void UpdateEvent() {

-      ICollection<Teacher> coll = new HashSet<Teacher>();

-      AddItemUpdatedHandler(coll);

-      Teacher kristian = new Teacher("Kristian", "physics");

-      coll.Add(kristian);

-      coll.Add(new Teacher("Poul Einer", "mathematics"));

-      // This should be caught by the update handler:

-      coll.Update(new Teacher("Thomas", "mathematics"));

-      // This should not be caught by the update handler:

-      coll.Remove(kristian);

-      coll.Add(new Teacher("Jens", "physics"));

-      // The update handler is activated also by indexed updates

-      IList<int> list = new ArrayList<int>();

-      list.AddAll(new int[] { 7, 11, 13 });

-      AddItemUpdatedHandler(list);

-      list[1] = 9;

-    }

-  }

-

-  // Example class where objects may be equal yet display differently

-

-  class Teacher : IEquatable<Teacher> { 

-    private readonly String name, subject;

-

-    public Teacher(String name, String subject) { 

-      this.name = name; this.subject = subject;

-    }

-

-    public bool Equals(Teacher that) {

-      return this.subject.Equals(that.subject);

-    }

-

-    public override int GetHashCode() {

-      return subject.GetHashCode();

-    }

-

-    public override String ToString() {

-      return name + "[" + subject + "]";

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Fileindex.cs b/mcs/class/Mono.C5/UserGuideExamples/Fileindex.cs
deleted file mode 100644
index e609031ce87..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Fileindex.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: File index: read a text file, build and print a list of

-// words and the line numbers (without duplicates) on which they occur.

-

-// Compile with 

-//   csc /r:C5.dll Fileindex.cs 

-

-using System;                           // Console

-using System.IO;                        // StreamReader, TextReader

-using System.Text.RegularExpressions;   // Regex

-using C5;                               // IDictionary, TreeDictionary, TreeSet

-

-namespace FileIndex

-{

-  class Fileindex

-  {

-    static void Main(String[] args)

-    {

-      if (args.Length != 1)

-        Console.WriteLine("Usage: Fileindex <filename>\n");

-      else

-      {

-        IDictionary<String, TreeSet<int>> index = IndexFile(args[0]);

-        PrintIndex(index);

-      }

-    }

-

-    static IDictionary<String, TreeSet<int>> IndexFile(String filename)

-    {

-      IDictionary<String, TreeSet<int>> index = new TreeDictionary<String, TreeSet<int>>();

-      Regex delim = new Regex("[^a-zA-Z0-9]+");

-      using (TextReader rd = new StreamReader(filename))

-      {

-        int lineno = 0;

-        for (String line = rd.ReadLine(); line != null; line = rd.ReadLine())

-        {

-          String[] res = delim.Split(line);

-          lineno++;

-          foreach (String s in res)

-            if (s != "")

-            {

-              if (!index.Contains(s))

-                index[s] = new TreeSet<int>();

-              index[s].Add(lineno);

-            }

-        }

-      }

-      return index;

-    }

-

-    static void PrintIndex(IDictionary<String, TreeSet<int>> index)

-    {

-      foreach (String word in index.Keys)

-      {

-        Console.Write("{0}: ", word);

-        foreach (int ln in index[word])

-          Console.Write("{0} ", ln);

-        Console.WriteLine();

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/GCHForm.cs b/mcs/class/Mono.C5/UserGuideExamples/GCHForm.cs
deleted file mode 100644
index dc37742d2fb..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/GCHForm.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Drawing;

-using System.Collections;

-using System.ComponentModel;

-using System.Windows.Forms;

-using System.Diagnostics;

-using C5;

-

-namespace GConvexHull

-{

-	/// <summary>

-	/// Summary description for Form1.

-	/// </summary>

-  public class TesterForm : System.Windows.Forms.Form

-  {

-    //My data

-

-    //My GUI stuff

-    private System.Windows.Forms.Panel drawarea;

-

-    private Graphics drawg;

-

-    //Std stuff

-    private System.Windows.Forms.Button runButton;

-    private TextBox pointCount;

-

-    /// <summary>

-    /// Required designer variable.

-    /// </summary>

-    private System.ComponentModel.Container components = null;

-

-

-    public TesterForm()

-    {

-      //

-      // Required for Windows Form Designer support

-      //

-      InitializeComponent();

-

-      //

-      // TODO: Add any constructor code after InitializeComponent call

-      //

-      drawg = drawarea.CreateGraphics();

-      reset();

-    }

-

-

-    /// <summary>

-    /// Clean up any resources being used.

-    /// </summary>

-    protected override void Dispose(bool disposing)

-    {

-      if (disposing)

-      {

-        if (components != null)

-        {

-          components.Dispose();

-        }

-      }

-

-      base.Dispose(disposing);

-    }

-

-    #region Windows Form Designer generated code

-    /// <summary>

-    /// Required method for Designer support - do not modify

-    /// the contents of this method with the code editor.

-    /// </summary>

-    private void InitializeComponent()

-    {

-      this.drawarea = new System.Windows.Forms.Panel();

-      this.runButton = new System.Windows.Forms.Button();

-      this.pointCount = new System.Windows.Forms.TextBox();

-      this.SuspendLayout();

-      // 

-      // drawarea

-      // 

-      this.drawarea.BackColor = System.Drawing.Color.White;

-      this.drawarea.Location = new System.Drawing.Point(8, 9);

-      this.drawarea.Name = "drawarea";

-      this.drawarea.Size = new System.Drawing.Size(500, 500);

-      this.drawarea.TabIndex = 0;

-      this.drawarea.Paint += new System.Windows.Forms.PaintEventHandler(this.drawarea_Paint);

-      this.drawarea.Invalidated += new System.Windows.Forms.InvalidateEventHandler(this.drawarea_Invalidated);

-      this.drawarea.MouseMove += new System.Windows.Forms.MouseEventHandler(this.drawarea_MouseMove);

-      this.drawarea.MouseClick += new System.Windows.Forms.MouseEventHandler(this.drawarea_MouseClick);

-      // 

-      // runButton

-      // 

-      this.runButton.Location = new System.Drawing.Point(8, 516);

-      this.runButton.Name = "runButton";

-      this.runButton.Size = new System.Drawing.Size(42, 20);

-      this.runButton.TabIndex = 1;

-      this.runButton.Text = "Run";

-      this.runButton.Click += new System.EventHandler(this.runButton_Click);

-      // 

-      // pointCount

-      // 

-      this.pointCount.Location = new System.Drawing.Point(97, 517);

-      this.pointCount.Name = "pointCount";

-      this.pointCount.Size = new System.Drawing.Size(55, 20);

-      this.pointCount.TabIndex = 5;

-      // 

-      // TesterForm

-      // 

-      this.ClientSize = new System.Drawing.Size(524, 550);

-      this.Controls.Add(this.pointCount);

-      this.Controls.Add(this.runButton);

-      this.Controls.Add(this.drawarea);

-      this.Name = "TesterForm";

-      this.Text = "C5 Tester";

-      this.Load += new System.EventHandler(this.TesterForm_Load);

-      this.ResumeLayout(false);

-      this.PerformLayout();

-

-    }

-    #endregion

-

-    /// <summary>

-    /// The main entry point for the application.

-    /// </summary>

-    [STAThread]

-    static void Main()

-    {

-      Application.EnableVisualStyles();

-      Application.Run(new TesterForm());

-    }

-

-    Point[] pts;

-    Point[] chpts;

-

-    private void runButton_Click(object sender, System.EventArgs e)

-    {

-      int N = int.Parse(pointCount.Text);

-      pts = new Point[N];

-      for (int i = 0; i < N; i++)

-        pts[i] = Point.Random(500, 500);

-      chpts = Convexhull.ConvexHull(pts);

-

-      drawarea.Invalidate();

-    }

-

-

-    private void drawarea_Paint(object sender, System.Windows.Forms.PaintEventArgs e)

-    {

-      mydraw();

-    }

-

-

-    private void resetButton_Click(object sender, System.EventArgs e)

-    {

-      reset();

-    }

-

-

-    private void reset()

-    {

-      drawarea.Invalidate();//(new Rectangle(0, 0, 40, 40));

-    }

-

-

-

-    public void mydraw()

-    {

-      if (pts == null)

-      {

-        return;

-      }

-      for (int i = 0; i < pts.Length; i++)

-      {

-        Point p = pts[i];

-        drawg.DrawEllipse(new Pen(Color.Red), transx(p.x) - 2, transy(p.y) - 2, 4, 4);

-      }

-      for (int i = 0; i < chpts.Length; i++)

-      {

-        int j = i + 1 < chpts.Length ? i + 1 : 0;

-        drawg.DrawEllipse(new Pen(Color.Blue), transx(chpts[i].x) - 2, transy(chpts[i].y) - 2, 4, 4);

-        drawg.DrawLine(new Pen(Color.LawnGreen), transx(chpts[i].x), transx(chpts[i].y), transx(chpts[j].x), transx(chpts[j].y));

-      }

-    }

-

-

-

-    private int transx(double x)

-    {

-      return (int)x;

-    }

-

-

-    private int transy(double y)

-    {

-      return (int)y;

-    }

-

-

-    private void dumpButton_Click(object sender, System.EventArgs e)

-    {

-      Debug.WriteLine("###############");

-      Debug.WriteLine("###############");

-    }

-

-

-    private void graphTypeControlArray_Click(object sender, System.EventArgs e)

-    {

-      Debug.WriteLine(e.GetType());

-      Debug.WriteLine(sender.GetType());

-      drawarea.Invalidate();

-    }

-

-

-    private void drawarea_MouseMove(object sender, MouseEventArgs e)

-    {

-    }

-

-

-    private void drawarea_MouseClick(object sender, MouseEventArgs e)

-    {

-      //double x = untransx(e.X), y = untransy(e.Y);

-

-    }

-

-

-    private void drawarea_Invalidated(object sender, InvalidateEventArgs e)

-    {

-      //msg.Text = e.InvalidRect + "";

-      //mydraw();

-    }

-

-

-    private void preparedFigureSelection_SelectedIndexChanged(object sender, System.EventArgs e)

-    {

-    }

-

-    private void voronoiButton_CheckedChanged(object sender, EventArgs e)

-    {

-      graphTypeControlArray_Click(sender, e);

-    }

-

-    private void delaunayButton_CheckedChanged(object sender, EventArgs e)

-    {

-      graphTypeControlArray_Click(sender, e);

-    }

-

-    private void TesterForm_Load(object sender, EventArgs e)

-    {

-

-    }

-

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/GCHForm.resx b/mcs/class/Mono.C5/UserGuideExamples/GCHForm.resx
deleted file mode 100644
index 04d94f3d103..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/GCHForm.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>25</value>

-  </metadata>

-</root>
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/GConvexHull.cs b/mcs/class/Mono.C5/UserGuideExamples/GConvexHull.cs
deleted file mode 100644
index 48675b3bc69..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/GConvexHull.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// Compile with 

-//    csc /r:C5.dll GConvexHull.cs

-

-using System;

-using C5;

-

-namespace GConvexHull

-{

-// Find the convex hull of a point set in the plane

-

-// An implementation of Graham's (1972) point elimination algorithm,

-// as modified by Andrew (1979) to find lower and upper hull separately.

-

-// This implementation correctly handle duplicate points, and

-// multiple points with the same x-coordinate.

-

-// 1. Sort the points lexicographically by increasing (x,y), thus 

-//    finding also a leftmost point L and a rightmost point R.

-// 2. Partition the point set into two lists, upper and lower, according as 

-//    point is above or below the segment LR.  The upper list begins with 

-//    L and ends with R; the lower list begins with R and ends with L.

-// 3. Traverse the point lists clockwise, eliminating all but the extreme

-//    points (thus eliminating also duplicate points).

-// 4. Join the point lists (in clockwise order) in an array, 

-//    leaving out L from lower and R from upper.

-

-  public class Convexhull

-  {

-    public static Point[] ConvexHull(Point[] pts)

-    {

-      // 1. Sort points lexicographically by increasing (x, y)

-      int N = pts.Length;

-      Array.Sort(pts);

-      Point left = pts[0], right = pts[N - 1];

-      // 2. Partition into lower hull and upper hull

-      IList<Point> lower = new LinkedList<Point>(),

-        upper = new LinkedList<Point>();

-      lower.InsertFirst(left); upper.InsertLast(left);

-      for (int i = 0; i < N; i++)

-      {

-        double det = Point.Area2(left, right, pts[i]);

-        if (det < 0)

-          lower.InsertFirst(pts[i]);

-        else if (det > 0)

-          upper.InsertLast(pts[i]);

-      }

-      lower.InsertFirst(right);

-      upper.InsertLast(right);

-      // 3. Eliminate points not on the hull

-      Eliminate(lower);

-      Eliminate(upper);

-      // 4. Join the lower and upper hull, leaving out lower.Last and upper.Last

-      Point[] res = new Point[lower.Count + upper.Count - 2];

-      lower[0, lower.Count - 1].CopyTo(res, 0);

-      upper[0, upper.Count - 1].CopyTo(res, lower.Count - 1);

-      return res;

-    }

-

-    // Graham's scan

-    public static void Eliminate(IList<Point> lst)

-    {

-      IList<Point> view = lst.View(0, 0);

-      int slide = 0;

-      while (view.TrySlide(slide, 3))

-        if (Point.Area2(view[0], view[1], view[2]) < 0)   // right turn

-          slide = 1;

-        else

-        {                                                 // left or straight

-          view.RemoveAt(1);

-          slide = view.Offset != 0 ? -1 : 0;

-        }

-    }

-  }

-

-// ------------------------------------------------------------

-

-// Points in the plane

-

-  public class Point : IComparable<Point>

-  {

-    private static readonly C5Random rnd = new C5Random(42);

-

-    public readonly double x, y;

-

-    public Point(double x, double y)

-    {

-      this.x = x; this.y = y;

-    }

-

-    public override string ToString()

-    {

-      return "(" + x + ", " + y + ")";

-    }

-

-    public static Point Random(int w, int h)

-    {

-      return new Point(rnd.Next(w), rnd.Next(h));

-    }

-

-    public bool Equals(Point p2)

-    {

-      return x == p2.x && y == p2.y;

-    }

-

-    public int CompareTo(Point p2)

-    {

-      int major = x.CompareTo(p2.x);

-      return major != 0 ? major : y.CompareTo(p2.y);

-    }

-

-    // Twice the signed area of the triangle (p0, p1, p2)

-    public static double Area2(Point p0, Point p1, Point p2)

-    {

-      return p0.x * (p1.y - p2.y) + p1.x * (p2.y - p0.y) + p2.x * (p0.y - p1.y);

-    }

-  }

-

-// ------------------------------------------------------------

-

-  class GConvexHull

-  {

-    static void Main(String[] args)

-    {

-      if (args.Length == 1)

-      {

-        string arg = args[0];

-        int N = int.Parse(arg);

-        Point[] pts = new Point[N];

-        for (int i = 0; i < N; i++)

-          pts[i] = Point.Random(500, 500);

-        Point[] chpts = Convexhull.ConvexHull(pts);

-        Console.WriteLine("Area is " + Area(chpts));

-        Print(chpts);

-      }

-      else

-        Console.WriteLine("Usage: GConvexHull <pointcount>\n");

-    }

-

-    // The area of a polygon (represented by an array of ordered vertices)

-    public static double Area(Point[] pts)

-    {

-      int N = pts.Length;

-      Point origo = new Point(0, 0);

-      double area2 = 0;

-      for (int i = 0; i < N; i++)

-        area2 += Point.Area2(origo, pts[i], pts[(i + 1) % N]);

-      return Math.Abs(area2 / 2);

-    }

-

-    public static void Print(Point[] pts)

-    {

-      int N = pts.Length;

-      for (int i = 0; i < N; i++)

-        Console.WriteLine(pts[i]);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/GNfaToDfa.cs b/mcs/class/Mono.C5/UserGuideExamples/GNfaToDfa.cs
deleted file mode 100644
index 86766061162..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/GNfaToDfa.cs
+++ /dev/null
@@ -1,666 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// Compile with 

-//    csc /r:C5.dll GNfaToDfa.cs

-

-// C5 examples: RegExp -> NFA -> DFA -> Graph

-// Java 2000-10-07, GC# 2001-10-23, C# 2.0 2003-09-03, C# 2.0+C5 2004-08-08

-

-// This file contains, in order:

-//   * Helper class Set<T> defined in terms of C5 classes.

-//   * A class Nfa for representing an NFA (a nondeterministic finite 

-//     automaton), and for converting it to a DFA (a deterministic 

-//     finite automaton).  Most complexity is in this class.

-//   * A class Dfa for representing a DFA, a deterministic finite 

-//     automaton, and for writing a dot input file representing the DFA.

-//   * Classes for representing regular expressions, and for building an 

-//     NFA from a regular expression

-//   * A test class that creates an NFA, a DFA, and a dot input file 

-//     for a number of small regular expressions.  The DFAs are 

-//     not minimized.

-

-using System;

-using System.Text;

-using System.IO;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace GNfaToDfa

-{

-

-  public class Set<T> : HashSet<T> {

-    public Set(SCG.IEnumerable<T> enm) : base() {

-      AddAll(enm);

-    }

-

-    public Set(params T[] elems) : this((SCG.IEnumerable<T>)elems) { }

-

-    // Set union (+), difference (-), and intersection (*):

-

-    public static Set<T> operator +(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set+Set");

-      else {

-        Set<T> res = new Set<T>(s1);

-        res.AddAll(s2);

-        return res;

-      }

-    }

-

-    public static Set<T> operator -(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set-Set");

-      else {

-        Set<T> res = new Set<T>(s1);

-        res.RemoveAll(s2);

-        return res;

-      }

-    }

-

-    public static Set<T> operator *(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set*Set");

-      else {

-        Set<T> res = new Set<T>(s1);

-        res.RetainAll(s2);

-        return res;

-      }

-    }

-

-    // Equality of sets; take care to avoid infinite loops

-

-    public static bool operator ==(Set<T> s1, Set<T> s2) {

-      return EqualityComparer<Set<T>>.Default.Equals(s1, s2);

-    }

-

-    public static bool operator !=(Set<T> s1, Set<T> s2) {

-      return !(s1 == s2);

-    }

-

-    public override bool Equals(Object that) {

-      return this == (that as Set<T>);

-    }

-

-    public override int GetHashCode() {

-      return EqualityComparer<Set<T>>.Default.GetHashCode(this);

-    }

-

-    // Subset (<=) and superset (>=) relation:

-

-    public static bool operator <=(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set<=Set");

-      else

-        return s1.ContainsAll(s2);

-    }

-

-    public static bool operator >=(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set>=Set");

-      else

-        return s2.ContainsAll(s1);

-    }

-    

-    public override String ToString() {

-      StringBuilder sb = new StringBuilder();

-      sb.Append("{");

-      bool first = true;

-      foreach (T x in this) {

-        if (!first)

-          sb.Append(",");

-        sb.Append(x);

-        first = false;

-      }

-      sb.Append("}");

-      return sb.ToString();

-    }

-  }

-

-// ----------------------------------------------------------------------

-

-// Regular expressions, NFAs, DFAs, and dot graphs

-// sestoft@dina.kvl.dk * 

-// Java 2001-07-10 * C# 2001-10-22 * Gen C# 2001-10-23, 2003-09-03

-

-// In the Generic C# 2.0 version we 

-//  use Queue<int> and Queue<Set<int>> for worklists

-//  use Set<int> for pre-DFA states

-//  use ArrayList<Transition> for NFA transition relations

-//  use HashDictionary<Set<int>, HashDictionary<String, Set<int>>>

-//  and HashDictionary<int, HashDictionary<String, int>> for DFA transition relations

-

-/* Class Nfa and conversion from NFA to DFA ---------------------------

-

-  A nondeterministic finite automaton (NFA) is represented as a

-  dictionary mapping a state number (int) to an arraylist of

-  Transitions, a Transition being a pair of a label lab (a string,

-  null meaning epsilon) and a target state (an int).

-

-  A DFA is created from an NFA in two steps:

-

-    (1) Construct a DFA whose each of whose states is composite,

-        namely a set of NFA states (Set of int).  This is done by

-        methods CompositeDfaTrans and EpsilonClose.

-

-    (2) Replace composite states (Set of int) by simple states

-        (int).  This is done by methods Rename and MkRenamer.

-

-  Method CompositeDfaTrans works as follows: 

-

-    Create the epsilon-closure S0 (a Set of ints) of the start state

-    s0, and put it in a worklist (a Queue).  Create an empty DFA

-    transition relation, which is a dictionary mapping a composite

-    state (an epsilon-closed set of ints) to a dictionary mapping a

-    label (a non-null string) to a composite state.

-

-    Repeatedly choose a composite state S from the worklist.  If it is

-    not already in the keyset of the DFA transition relation, compute

-    for every non-epsilon label lab the set T of states reachable by

-    that label from some state s in S.  Compute the epsilon-closure

-    Tclose of every such state T and put it on the worklist.  Then add

-    the transition S -lab-> Tclose to the DFA transition relation, for

-    every lab.

-

-  Method EpsilonClose works as follows: 

-

-    Given a set S of states.  Put the states of S in a worklist.

-    Repeatedly choose a state s from the worklist, and consider all

-    epsilon-transitions s -eps-> s' from s.  If s' is in S already,

-    then do nothing; otherwise add s' to S and the worklist.  When the

-    worklist is empty, S is epsilon-closed; return S.

-

-  Method MkRenamer works as follows: 

-

-    Given a dictionary mapping a set of int to something, create an

-    injective dictionary mapping from set of int to int, by choosing a

-    fresh int for every key in the given dictionary.

-

-  Method Rename works as follows:

-

-    Given a dictionary mapping a set of int to a dictionary mapping a

-    string to set of int, use the result of MkRenamer to replace all

-    sets of ints by ints.

-

-*/

-

-  class Nfa {

-    private readonly int startState;

-    private readonly int exitState;    // This is the unique accept state

-    private readonly IDictionary<int, ArrayList<Transition>> trans;

-

-    public Nfa(int startState, int exitState) {

-      this.startState = startState; this.exitState = exitState;

-      trans = new HashDictionary<int, ArrayList<Transition>>();

-      if (!startState.Equals(exitState))

-        trans.Add(exitState, new ArrayList<Transition>());

-    }

-

-    public int Start { get { return startState; } }

-

-    public int Exit { get { return exitState; } }

-

-    public IDictionary<int, ArrayList<Transition>> Trans {

-      get { return trans; }

-    }

-

-    public void AddTrans(int s1, String lab, int s2) {

-      ArrayList<Transition> s1Trans;

-      if (trans.Contains(s1))

-        s1Trans = trans[s1];

-      else {

-        s1Trans = new ArrayList<Transition>();

-        trans.Add(s1, s1Trans);

-      }

-      s1Trans.Add(new Transition(lab, s2));

-    }

-

-    public void AddTrans(KeyValuePair<int, ArrayList<Transition>> tr) {

-      // Assumption: if tr is in trans, it maps to an empty list (end state)

-      trans.Remove(tr.Key);

-      trans.Add(tr.Key, tr.Value);

-    }

-

-    public override String ToString() {

-      return "NFA start=" + startState + " exit=" + exitState;

-    }

-

-    // Construct the transition relation of a composite-state DFA from

-    // an NFA with start state s0 and transition relation trans (a

-    // dictionary mapping int to arraylist of Transition).  The start

-    // state of the constructed DFA is the epsilon closure of s0, and

-    // its transition relation is a dictionary mapping a composite state

-    // (a set of ints) to a dictionary mapping a label (a string) to a

-    // composite state (a set of ints).

-

-    static IDictionary<Set<int>, IDictionary<String, Set<int>>>

-      CompositeDfaTrans(int s0, IDictionary<int, ArrayList<Transition>> trans) {

-      Set<int> S0 = EpsilonClose(new Set<int>(s0), trans);

-      IQueue<Set<int>> worklist = new CircularQueue<Set<int>>();

-      worklist.Enqueue(S0);

-      // The transition relation of the DFA

-      IDictionary<Set<int>, IDictionary<String, Set<int>>> res =

-        new HashDictionary<Set<int>, IDictionary<String, Set<int>>>();

-      while (!worklist.IsEmpty) {

-        Set<int> S = worklist.Dequeue();

-        if (!res.Contains(S)) {

-          // The S -lab-> T transition relation being constructed for a given S

-          IDictionary<String, Set<int>> STrans =

-            new HashDictionary<String, Set<int>>();

-          // For all s in S, consider all transitions s -lab-> t

-          foreach (int s in S) {

-            // For all non-epsilon transitions s -lab-> t, add t to T

-            foreach (Transition tr in trans[s]) {

-              if (tr.lab != null) {        // Non-epsilon transition

-                Set<int> toState;

-                if (STrans.Contains(tr.lab))   // Already a transition on lab

-                  toState = STrans[tr.lab];

-                else {                         // No transitions on lab yet

-                  toState = new Set<int>();

-                  STrans.Add(tr.lab, toState);

-                }

-                toState.Add(tr.target);

-              }

-            }

-          }

-          // Epsilon-close all T such that S -lab-> T, and put on worklist

-          IDictionary<String, Set<int>> STransClosed =

-            new HashDictionary<String, Set<int>>();

-          foreach (KeyValuePair<String, Set<int>> entry in STrans) {

-            Set<int> Tclose = EpsilonClose(entry.Value, trans);

-            STransClosed.Add(entry.Key, Tclose);

-            worklist.Enqueue(Tclose);

-          }

-          res.Add(S, STransClosed);

-        }

-      }

-      return res;

-    }

-

-    // Compute epsilon-closure of state set S in transition relation trans.  

-

-    static Set<int>

-      EpsilonClose(Set<int> S, IDictionary<int, ArrayList<Transition>> trans) {

-      // The worklist initially contains all S members

-      IQueue<int> worklist = new CircularQueue<int>();

-      S.Apply(worklist.Enqueue);

-      Set<int> res = new Set<int>(S);

-      while (!worklist.IsEmpty) {

-        int s = worklist.Dequeue();

-        foreach (Transition tr in trans[s]) {

-          if (tr.lab == null && !res.Contains(tr.target)) {

-            res.Add(tr.target);

-            worklist.Enqueue(tr.target);

-          }

-        }

-      }

-      return res;

-    }

-

-    // Compute a renamer, which is a dictionary mapping set of int to int

-

-    static IDictionary<Set<int>, int> MkRenamer(ICollectionValue<Set<int>> states)

-    {

-      IDictionary<Set<int>, int> renamer = new HashDictionary<Set<int>, int>();

-      int count = 0;

-      foreach (Set<int> k in states)

-        renamer.Add(k, count++);

-      return renamer;

-    }

-

-    // Using a renamer (a dictionary mapping set of int to int), replace

-    // composite (set of int) states with simple (int) states in the

-    // transition relation trans, which is a dictionary mapping set of

-    // int to a dictionary mapping from string to set of int.  The

-    // result is a dictionary mapping from int to a dictionary mapping

-    // from string to int.

-

-    static IDictionary<int, IDictionary<String, int>>

-      Rename(IDictionary<Set<int>, int> renamer,

-             IDictionary<Set<int>, IDictionary<String, Set<int>>> trans)

-    {

-      IDictionary<int, IDictionary<String, int>> newtrans =

-        new HashDictionary<int, IDictionary<String, int>>();

-      foreach (KeyValuePair<Set<int>, IDictionary<String, Set<int>>> entry

-         in trans) {

-        Set<int> k = entry.Key;

-        IDictionary<String, int> newktrans = new HashDictionary<String, int>();

-        foreach (KeyValuePair<String, Set<int>> tr in entry.Value)

-          newktrans.Add(tr.Key, renamer[tr.Value]);

-        newtrans.Add(renamer[k], newktrans);

-      }

-      return newtrans;

-    }

-

-    static Set<int> AcceptStates(ICollectionValue<Set<int>> states,

-               IDictionary<Set<int>, int> renamer,

-               int exit)

-    {

-      Set<int> acceptStates = new Set<int>();

-      foreach (Set<int> state in states)

-        if (state.Contains(exit))

-          acceptStates.Add(renamer[state]);

-      return acceptStates;

-    }

-

-    public Dfa ToDfa() {

-      IDictionary<Set<int>, IDictionary<String, Set<int>>>

-        cDfaTrans = CompositeDfaTrans(startState, trans);

-      Set<int> cDfaStart = EpsilonClose(new Set<int>(startState), trans);

-      ICollectionValue<Set<int>> cDfaStates = cDfaTrans.Keys;

-      IDictionary<Set<int>, int> renamer = MkRenamer(cDfaStates);

-      IDictionary<int, IDictionary<String, int>> simpleDfaTrans =

-        Rename(renamer, cDfaTrans);

-      int simpleDfaStart = renamer[cDfaStart];

-      Set<int> simpleDfaAccept = AcceptStates(cDfaStates, renamer, exitState);

-      return new Dfa(simpleDfaStart, simpleDfaAccept, simpleDfaTrans);

-    }

-

-    // Nested class for creating distinctly named states when constructing NFAs

-

-    public class NameSource {

-      private static int nextName = 0;

-

-      public int next() {

-        return nextName++;

-      }

-    }

-

-    // Write an input file for the dot program.  You can find dot at

-    // http://www.research.att.com/sw/tools/graphviz/

-

-    public void WriteDot(String filename) {

-      TextWriter wr =

-        new StreamWriter(new FileStream(filename, FileMode.Create,

-                                        FileAccess.Write));

-      wr.WriteLine("// Format this file as a Postscript file with ");

-      wr.WriteLine("//    dot " + filename + " -Tps -o out.ps\n");

-      wr.WriteLine("digraph nfa {");

-      wr.WriteLine("size=\"11,8.25\";");

-      wr.WriteLine("rotate=90;");

-      wr.WriteLine("rankdir=LR;");

-      wr.WriteLine("start [style=invis];");    // Invisible start node

-      wr.WriteLine("start -> d" + startState); // Edge into start state

-

-      // The accept state has a double circle

-      wr.WriteLine("d" + exitState + " [peripheries=2];");

-

-      // The transitions 

-      foreach (KeyValuePair<int, ArrayList<Transition>> entry in trans) {

-        int s1 = entry.Key;

-        foreach (Transition s1Trans in entry.Value) {

-          String lab = s1Trans.lab ?? "eps";

-          int s2 = s1Trans.target;

-          wr.WriteLine("d" + s1 + " -> d" + s2 + " [label=\"" + lab + "\"];");

-        }

-      }

-      wr.WriteLine("}");

-      wr.Close();

-    }

-  }

-

-// Class Transition, a transition from one state to another ----------

-

-  public class Transition {

-    public readonly String lab;

-    public readonly int target;

-

-    public Transition(String lab, int target) {

-      this.lab = lab; this.target = target;

-    }

-

-    public override String ToString() {

-      return "-" + lab + "-> " + target;

-    }

-  }

-

-// Class Dfa, deterministic finite automata --------------------------

-

-/*

-   A deterministic finite automaton (DFA) is represented as a

-   dictionary mapping state number (int) to a dictionary mapping label

-   (a non-null string) to a target state (an int).

-*/

-

-  class Dfa {

-    private readonly int startState;

-    private readonly Set<int> acceptStates;

-    private readonly IDictionary<int, IDictionary<String, int>> trans;

-

-    public Dfa(int startState, Set<int> acceptStates,

-	       IDictionary<int, IDictionary<String, int>> trans)

-    {

-      this.startState = startState;

-      this.acceptStates = acceptStates;

-      this.trans = trans;

-    }

-

-    public int Start { get { return startState; } }

-

-    public Set<int> Accept { get { return acceptStates; } }

-

-    public IDictionary<int, IDictionary<String, int>> Trans {

-      get { return trans; }

-    }

-

-    public override String ToString() {

-      return "DFA start=" + startState + "\naccept=" + acceptStates;

-    }

-

-    // Write an input file for the dot program.  You can find dot at

-    // http://www.research.att.com/sw/tools/graphviz/

-

-    public void WriteDot(String filename) {

-      TextWriter wr =

-        new StreamWriter(new FileStream(filename, FileMode.Create,

-                                        FileAccess.Write));

-      wr.WriteLine("// Format this file as a Postscript file with ");

-      wr.WriteLine("//    dot " + filename + " -Tps -o out.ps\n");

-      wr.WriteLine("digraph dfa {");

-      wr.WriteLine("size=\"11,8.25\";");

-      wr.WriteLine("rotate=90;");

-      wr.WriteLine("rankdir=LR;");

-      wr.WriteLine("start [style=invis];");    // Invisible start node

-      wr.WriteLine("start -> d" + startState); // Edge into start state

-

-      // Accept states are double circles

-      foreach (int state in trans.Keys)

-        if (acceptStates.Contains(state))

-          wr.WriteLine("d" + state + " [peripheries=2];");

-

-      // The transitions 

-      foreach (KeyValuePair<int, IDictionary<String, int>> entry in trans) {

-        int s1 = entry.Key;

-        foreach (KeyValuePair<String, int> s1Trans in entry.Value) {

-          String lab = s1Trans.Key;

-          int s2 = s1Trans.Value;

-          wr.WriteLine("d" + s1 + " -> d" + s2 + " [label=\"" + lab + "\"];");

-        }

-      }

-      wr.WriteLine("}");

-      wr.Close();

-    }

-  }

-

-// Regular expressions ----------------------------------------------

-//

-// Abstract syntax of regular expressions

-//    r ::= A | r1 r2 | (r1|r2) | r*

-//

-

-  abstract class Regex {

-    abstract public Nfa MkNfa(Nfa.NameSource names);

-  }

-

-  class Eps : Regex {

-    // The resulting nfa0 has form s0s -eps-> s0e

-

-    public override Nfa MkNfa(Nfa.NameSource names) {

-      int s0s = names.next();

-      int s0e = names.next();

-      Nfa nfa0 = new Nfa(s0s, s0e);

-      nfa0.AddTrans(s0s, null, s0e);

-      return nfa0;

-    }

-  }

-

-  class Sym : Regex {

-    String sym;

-

-    public Sym(String sym) {

-      this.sym = sym;

-    }

-

-    // The resulting nfa0 has form s0s -sym-> s0e

-

-    public override Nfa MkNfa(Nfa.NameSource names) {

-      int s0s = names.next();

-      int s0e = names.next();

-      Nfa nfa0 = new Nfa(s0s, s0e);

-      nfa0.AddTrans(s0s, sym, s0e);

-      return nfa0;

-    }

-  }

-

-  class Seq : Regex {

-    Regex r1, r2;

-

-    public Seq(Regex r1, Regex r2) {

-      this.r1 = r1; this.r2 = r2;

-    }

-

-    // If   nfa1 has form s1s ----> s1e 

-    // and  nfa2 has form s2s ----> s2e 

-    // then nfa0 has form s1s ----> s1e -eps-> s2s ----> s2e

-

-    public override Nfa MkNfa(Nfa.NameSource names) {

-      Nfa nfa1 = r1.MkNfa(names);

-      Nfa nfa2 = r2.MkNfa(names);

-      Nfa nfa0 = new Nfa(nfa1.Start, nfa2.Exit);

-      foreach (KeyValuePair<int, ArrayList<Transition>> entry in nfa1.Trans)

-        nfa0.AddTrans(entry);

-      foreach (KeyValuePair<int, ArrayList<Transition>> entry in nfa2.Trans)

-        nfa0.AddTrans(entry);

-      nfa0.AddTrans(nfa1.Exit, null, nfa2.Start);

-      return nfa0;

-    }

-  }

-

-  class Alt : Regex {

-    Regex r1, r2;

-

-    public Alt(Regex r1, Regex r2) {

-      this.r1 = r1; this.r2 = r2;

-    }

-

-    // If   nfa1 has form s1s ----> s1e 

-    // and  nfa2 has form s2s ----> s2e 

-    // then nfa0 has form s0s -eps-> s1s ----> s1e -eps-> s0e

-    //                    s0s -eps-> s2s ----> s2e -eps-> s0e

-

-    public override Nfa MkNfa(Nfa.NameSource names) {

-      Nfa nfa1 = r1.MkNfa(names);

-      Nfa nfa2 = r2.MkNfa(names);

-      int s0s = names.next();

-      int s0e = names.next();

-      Nfa nfa0 = new Nfa(s0s, s0e);

-      foreach (KeyValuePair<int, ArrayList<Transition>> entry in nfa1.Trans)

-        nfa0.AddTrans(entry);

-      foreach (KeyValuePair<int, ArrayList<Transition>> entry in nfa2.Trans)

-        nfa0.AddTrans(entry);

-      nfa0.AddTrans(s0s, null, nfa1.Start);

-      nfa0.AddTrans(s0s, null, nfa2.Start);

-      nfa0.AddTrans(nfa1.Exit, null, s0e);

-      nfa0.AddTrans(nfa2.Exit, null, s0e);

-      return nfa0;

-    }

-  }

-

-  class Star : Regex {

-    Regex r;

-

-    public Star(Regex r) {

-      this.r = r;

-    }

-

-    // If   nfa1 has form s1s ----> s1e 

-    // then nfa0 has form s0s ----> s0s

-    //                    s0s -eps-> s1s

-    //                    s1e -eps-> s0s

-

-    public override Nfa MkNfa(Nfa.NameSource names) {

-      Nfa nfa1 = r.MkNfa(names);

-      int s0s = names.next();

-      Nfa nfa0 = new Nfa(s0s, s0s);

-      foreach (KeyValuePair<int, ArrayList<Transition>> entry in nfa1.Trans)

-        nfa0.AddTrans(entry);

-      nfa0.AddTrans(s0s, null, nfa1.Start);

-      nfa0.AddTrans(nfa1.Exit, null, s0s);

-      return nfa0;

-    }

-  }

-

-// Trying the RE->NFA->DFA translation on three regular expressions

-

-  class TestNFA {

-    public static void Main(String[] args) {

-      Regex a = new Sym("A");

-      Regex b = new Sym("B");

-      Regex c = new Sym("C");

-      Regex abStar = new Star(new Alt(a, b));

-      Regex bb = new Seq(b, b);

-      Regex r = new Seq(abStar, new Seq(a, b));

-      // The regular expression (a|b)*ab

-      BuildAndShow("ex1", r);

-      // The regular expression ((a|b)*ab)*

-      BuildAndShow("ex2", new Star(r));

-      // The regular expression ((a|b)*ab)((a|b)*ab)

-      BuildAndShow("ex3", new Seq(r, r));

-      // The regular expression (a|b)*abb, from ASU 1986 p 136

-      BuildAndShow("ex4", new Seq(abStar, new Seq(a, bb)));

-      // SML reals: sign?((digit+(\.digit+)?))([eE]sign?digit+)?

-      Regex d = new Sym("digit");

-      Regex dPlus = new Seq(d, new Star(d));

-      Regex s = new Sym("sign");

-      Regex sOpt = new Alt(s, new Eps());

-      Regex dot = new Sym(".");

-      Regex dotDigOpt = new Alt(new Eps(), new Seq(dot, dPlus));

-      Regex mant = new Seq(sOpt, new Seq(dPlus, dotDigOpt));

-      Regex e = new Sym("e");

-      Regex exp = new Alt(new Eps(), new Seq(e, new Seq(sOpt, dPlus)));

-      Regex smlReal = new Seq(mant, exp);

-      BuildAndShow("ex5", smlReal);

-    }

-

-    public static void BuildAndShow(String fileprefix, Regex r) {

-      Nfa nfa = r.MkNfa(new Nfa.NameSource());

-      Console.WriteLine(nfa);

-      Console.WriteLine("Writing NFA graph to file");

-      nfa.WriteDot(fileprefix + "nfa.dot");

-      Console.WriteLine("---");

-      Dfa dfa = nfa.ToDfa();

-      Console.WriteLine(dfa);

-      Console.WriteLine("Writing DFA graph to file");

-      dfa.WriteDot(fileprefix + "dfa.dot");

-      Console.WriteLine();

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/GettingStarted.cs b/mcs/class/Mono.C5/UserGuideExamples/GettingStarted.cs
deleted file mode 100644
index 8fac0f9d23e..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/GettingStarted.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: GettingStarted 2005-01-18

-

-// Compile with 

-//   csc /r:C5.dll GettingStarted.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace GettingStarted {

-  class GettingStarted {

-    public static void Main(String[] args) {

-      IList<String> names = new ArrayList<String>();

-      names.AddAll(new String[] { "Hoover", "Roosevelt", 

-                                  "Truman", "Eisenhower", "Kennedy" });

-      // Print list:

-      Console.WriteLine(names);

-      // Print item 1 ("Roosevelt") in the list:

-      Console.WriteLine(names[1]);

-      // Create a list view comprising post-WW2 presidents:

-      IList<String> postWWII = names.View(2, 3);

-      // Print item 2 ("Kennedy") in the view:

-      Console.WriteLine(postWWII[2]);

-      // Enumerate and print the list view in reverse chronological order:

-      foreach (String name in postWWII.Backwards()) 

-        Console.WriteLine(name);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Graph.cs b/mcs/class/Mono.C5/UserGuideExamples/Graph.cs
deleted file mode 100644
index 6c52f2f125e..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Graph.cs
+++ /dev/null
@@ -1,1679 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: Graph representation with basic algorithms using C5 

-

-

-// Compile with 

-//   csc /r:C5.dll Graph.cs 

-

-

-// The code is structured as a rudimentary Graph library, with an interface

-// for (edge)weighted graphs and a single implementation based on an

-// adjacency list representation using hash dictionaries. 

-

-

-// The algorithms implemented include:

-//

-// Breadth-First-Search and Depth-First-Search, with an interface based on actions

-// to be taken as edges are traversed. Applications are checking for connectedness,

-// counting components

-//

-// Priority-First-Search, where edges are traversed according to either weight or 

-// accumulated weight from the start of the search.

-// An application of the non-accumulating version is the construction of a minimal

-// spanning tree and therefore the following approximation algorithm. 

-// Applications of the accumulating version are the construction of a shortest path

-// and the computation of the distance from one vertex to another one.

-//

-// An approximation algorithm for Travelling Salesman Problems, 

-// where the weights satisfies the triangle inequality. 

-

-

-// Pervasive generic parameters:

-//                      V: The type of a vertex in a graph. Vertices are identified

-//                         by the Equals method inherited from object (or overridden).

-//                      E: The type of additional data associated with edges in a graph.

-//                      W: The type of values of weights on edges in a weighted graph, 

-//                         in practise usually int or double. Must be comparable and 

-//                         there must be given a compatible way to add values.

-           

-// Interfaces:

-//                      IGraph<V,E,W>: The interface for a graph implementation with

-//                         vertex type V, edge dat type E and weight values of type W.           

-//                      IWeight<E,W>: The interface of a weight function 

-

-// Classes:

-//                      HashGraph<V,E,W>: An implementation of IWeightedGraph<V,E,W> based on 

-//                          adjacency lists represented as hash dictionaries.

-//                      HashGraph<V,E,W>.EdgesValue: A helper class for the Edges() method

-//                      CountWeight<E>: A 

-//                      IntWeight:

-//                      DoubleWeight:

-

-// Value Types:

-//                      Edge<V,E>: 

-//                      EdgeAction<V,E,U>:

-

-// Some notes:

-// The code only supports "natural" equality of vertices.

-

-using C5;

-using System;

-using SCG = System.Collections.Generic;

-

-namespace Graph

-{

-  /// <summary>

-  /// (Duer ikke)

-  /// </summary>

-  /// <typeparam name="V"></typeparam>

-  /// <typeparam name="E"></typeparam>

-  interface IGraphVertex<V, E,W> where W : IComparable<W>

-  {

-    V Value { get;}

-    IGraph<V, E, W> Graph { get;}

-    ICollectionValue<KeyValuePair<V, E>> Adjacent { get;}

-

-  }

-

-  class Vertex<V>

-  {

-    //V v;

-  }

-/// <summary>

-/// 

-/// </summary>

-/// <typeparam name="V"></typeparam>

-/// <typeparam name="E"></typeparam>

-/// <typeparam name="W"></typeparam>

-  interface IGraph<V, E, W> where W : IComparable<W>

-  {

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The weight object for this graph</value>

-    IWeight<E, W> Weight { get;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of vertices in this graph</value>

-    int VertexCount { get;}

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of edges in this graph</value>

-    int EdgeCount { get;}

-

-    /// <summary>

-    /// The collection of vertices of this graph.

-    /// The return value is a snapshot, not a live view onto the graph.

-    /// </summary>

-    /// <returns></returns>

-    ICollectionValue<V> Vertices();

-

-    /// <summary>

-    /// The collection of edges incident to a particular vertex.

-    /// The return value is a snapshot og (endvertex, edgedata) pairs.

-    /// </summary>

-    /// <param name="vertex"></param>

-    /// <returns></returns>

-    ICollectionValue<KeyValuePair<V, E>> Adjacent(V vertex);

-

-    /// <summary>

-    /// The collection of all edges in the graph. The return value is a snapshot

-    /// of Edge values. Each edge is present once for an undefined direction.

-    /// </summary>

-    /// <returns></returns>

-    ICollectionValue<Edge<V, E>> Edges();

-

-    /// <summary>

-    /// Add a(n isolated) vertex to the graph Ignore if vertex is already in the graph.

-    /// </summary>

-    /// <param name="vertex"></param>

-    /// <returns>True if the vertex was added.</returns>

-    bool AddVertex(V vertex);

-

-    /// <summary>

-    /// Add an edge to the graph. If the edge is already in the graph, update the 

-    /// edge data. Add vertices as needed.

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="end"></param>

-    /// <param name="edgedata"></param>

-    /// <returns>True if the edge was added</returns>

-    bool AddEdge(V start, V end, E edgedata);

-

-    /// <summary>

-    /// Remove a vertex and all its incident edges from the graph.

-    /// </summary>

-    /// <returns>True if the vertex was already in the graph and hence was removed</returns>

-    bool RemoveVertex(V vertex);

-

-    /// <summary>

-    /// Remove an edge from the graph. Do not remove the vertices if they become isolated.

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="end"></param>

-    /// <param name="edgedata">On output, the edge data associated with the removed edge.</param>

-    /// <returns>True if </returns>

-    bool RemoveEdge(V start, V end, out E edgedata);

-

-    /// <summary>

-    /// Is there an edge from start to end in this graph, and if so, what is 

-    /// the data on that edge.

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="end"></param>

-    /// <param name="edge"></param>

-    /// <returns></returns>

-    bool FindEdge(V start, V end, out E edge);

-

-    /// <summary>

-    /// Construct the subgraph corresponding to a set of vertices.

-    /// </summary>

-    /// <param name="vs"></param>

-    /// <returns></returns>

-    IGraph<V, E, W> SubGraph(ICollectionValue<V> vs);

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>True if graph is connected</value>

-    bool IsConnected { get; }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <value>The number of connected components of this graph</value>

-    int ComponentCount { get;}

-

-    /// <summary>

-    /// Compute the connnected components of this graph. 

-    /// </summary>

-    /// <returns>A collection of (vertex,component) pairs, where the first part of the

-    /// pair is some vertex in the component.</returns>

-    ICollectionValue<KeyValuePair<V, IGraph<V, E, W>>> Components();

-

-    /// <summary>

-    /// Traverse the connected component containing the <code>start</code> vertex, 

-    /// in either BFS or DFS order, beginning at <code>start</code> and performing the action 

-    /// <code>act</code> on each edge part of the constructed tree.

-    /// </summary>

-    /// <param name="bfs">True if BFS, false if DFS</param>

-    /// <param name="start">The vertex to start at</param>

-    /// <param name="act">The action to perform at each node</param>

-    void TraverseVertices(bool bfs, V start, Action<Edge<V, E>> act);

-

-    /// <summary>

-    /// Traverse an undirected graph in either BFS or DFS order, performing the action 

-    /// <code>act</code> on each vertex. 

-    /// The start vertex of each component of the graph is undefinded. 

-    /// </summary>

-    /// <param name="bfs">True if BFS, false if DFS</param>

-    /// <param name="act"></param>

-    void TraverseVertices(bool bfs, Action<V> act);

-

-    /// <summary>

-    /// Traverse an undirected graph in either BFS or DFS order, performing the action 

-    /// <code>act</code> on each edge in the traversal and beforecomponent/aftercomponent 

-    /// at the start and end of each component (with argument: the start vertex of the component).

-    /// </summary>

-    /// <param name="bfs">True if BFS, false if DFS</param>

-    /// <param name="act"></param>

-    /// <param name="beforecomponent"></param>

-    /// <param name="aftercomponent"></param>

-    void TraverseVertices(bool bfs, Action<Edge<V, E>> act, Action<V> beforecomponent, Action<V> aftercomponent);

-

-    /// <summary>

-    /// A more advanced Depth First Search traversal.

-    /// </summary>

-    /// <param name="start">The vertex to start the search at</param>

-    /// <param name="beforevertex">Action to perform when a vertex is first encountered.</param>

-    /// <param name="aftervertex">Action to perform when all edges out of a vertex has been handles.</param>

-    /// <param name="onfollow">Action to perform as an edge is traversed.</param>

-    /// <param name="onfollowed">Action to perform when an edge is travesed back.</param>

-    /// <param name="onnotfollowed">Action to perform when an edge (a backedge)is seen, but not followed.</param>

-    void DepthFirstSearch(V start, Action<V> beforevertex, Action<V> aftervertex,

-            Action<Edge<V, E>> onfollow, Action<Edge<V, E>> onfollowed, Action<Edge<V, E>> onnotfollowed);

-

-    //TODO: perhaps we should avoid exporting this?

-    /// <summary>

-    /// Traverse the part of the graph reachable from start in order of least distance 

-    /// from start according to the weight function. Perform act on the edges of the 

-    /// traversal as they are recognised.

-    /// </summary>

-    /// <typeparam name="W"></typeparam>

-    /// <param name="weight"></param>

-    /// <param name="start"></param>

-    /// <param name="act"></param>

-    void PriorityFirstTraverse(bool accumulating, V start, EdgeAction<V, E, W> act);

-

-    /// <summary>

-    /// Compute the (a) shortest path from start to end. THrow an exception if end cannot be reached rom start.

-    /// </summary>

-    /// <param name="weight"></param>

-    /// <param name="start"></param>

-    /// <param name="end"></param>

-    /// <returns></returns>

-    ICollectionValue<Edge<V, E>> ShortestPath(V start, V end);

-

-    /// <summary>

-    /// Compute the Distance from start to end, i.e. the total weight of a shortest path from start to end. 

-    /// Throw an exception if end cannot be reached rom start.

-    /// </summary>

-    /// <param name="start"></param>

-    /// <param name="end"></param>

-    /// <returns></returns>

-    W Distance(V start, V end);

-

-    /// <summary>

-    /// Compute a minimum spanning tree for the graph.

-    /// Throw an exception if this graph is not connected.

-    /// </summary>

-    /// <param name="root">(The starting point of the PFS, to be removed)</param>

-    /// <returns></returns>

-    IGraph<V, E, W> MinimumSpanningTree(out V root);

-

-    /// <summary>

-    /// Compute a factor 2 approximation to a Minimum Weight

-    /// Perfect Matching in a graph using NNs

-    /// </summary>

-    /// <returns></returns>

-    ICollectionValue<Edge<V, E>> ApproximateMWPM();

-

-    /// <summary>

-    /// Construct a closed Euler tour of this graph if one exists, i.e. if 

-    /// the graph is connected and all vertices have even degrees. Throw an

-    /// ArgumentException if no closed Euler tour exists.

-    /// </summary>

-    /// <returns>A list of vertices in an Euler tour of this graph.</returns>

-    IList<V> EulerTour();

-

-    /// <summary>

-    /// This is intended for implementations of the very simple factor 2 approximation

-    /// algorithms for the travelling salesman problem for Euclidic weight/distance 

-    /// functions, i.e. distances that satisfy the triangle inequality. (We do not do 3/2)

-    /// </summary>

-    /// <returns></returns>

-    IDirectedCollectionValue<V> ApproximateTSP();

-

-    /// <summary>

-    /// Pretty-print the graph to the console (for debugging purposes).

-    /// </summary>

-    void Print(System.IO.TextWriter output);

-  }

-

-/// <summary>

-/// The type of an edge in a graph. An edge is identified by its pair of 

-/// vertices. The pair is considered ordered, and so an Edge really describes

-/// an edge of the graph in a particular traversal direction.

-/// </summary>

-/// <typeparam name="V">The type of a vertex.</typeparam>

-/// <typeparam name="E">The type of data asociated with edges.</typeparam>

-  struct Edge<V, E>

-  {

-    static SCG.IEqualityComparer<V> vequalityComparer = EqualityComparer<V>.Default;

-    public readonly V start, end;

-    public readonly E edgedata;

-    public Edge(V start, V end, E edgedata)

-    {

-      if (vequalityComparer.Equals(start, end))

-        throw new ArgumentException("Illegal: start and end are equal");

-      this.start = start; this.end = end; this.edgedata = edgedata;

-    }

-

-    public Edge<V, E> Reverse()

-    {

-      return new Edge<V, E>(end, start, edgedata);

-    }

-

-    public override string ToString()

-    {

-      return String.Format("(start='{0}', end='{1}', edgedata='{2}')", start, end, edgedata); ;

-    }

-

-    public override bool Equals(object obj)

-    {

-      if (obj is Edge<V, E>)

-      {

-        Edge<V, E> other = (Edge<V, E>)obj;

-        return vequalityComparer.Equals(start, other.start) && vequalityComparer.Equals(end, other.end);

-      }

-      return false;

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public override int GetHashCode()

-    {

-      //TODO: should we use xor? Or a random factor?

-      return start.GetHashCode() + 148712671 * end.GetHashCode();

-    }

-

-    /// <summary>

-    /// The unordered equalityComparer compares edges independent of the order of the vertices.

-    /// </summary>

-    public class UnorderedEqualityComparer : SCG.IEqualityComparer<Edge<V, E>>

-    {

-      /// <summary>

-      /// Check if two edges have the same vertices irrespective of order.

-      /// </summary>

-      /// <param name="i1"></param>

-      /// <param name="i2"></param>

-      /// <returns></returns>

-      public bool Equals(Edge<V, E> i1, Edge<V, E> i2)

-      {

-        return (vequalityComparer.Equals(i1.start, i2.start) && vequalityComparer.Equals(i1.end, i2.end)) ||

-            (vequalityComparer.Equals(i1.end, i2.start) && vequalityComparer.Equals(i1.start, i2.end));

-      }

-

-      /// <summary>

-      /// Return a hash code compatible with the unordered equals.

-      /// </summary>

-      /// <param name="item"></param>

-      /// <returns></returns>

-      public int GetHashCode(Edge<V, E> item)

-      {

-        return item.start.GetHashCode() ^ item.end.GetHashCode();

-      }

-    }

-  }

-

-/// <summary>

-/// The type of the weight object of a graph. This consists of a function mapping

-/// edge data values to weight values, and an operation to add two weight values.

-/// It is required that weight values are comparable.

-/// 

-/// The user must assure that the add operation is commutative and fulfills 

-/// Add(w1,w2) &le; w1 for all w1 and w2 that can appear as weights or sums of

-/// weights. In practise, W will be int or double, all weight values will be 

-/// non-negative and the addition will be the natural addition on W.

-/// </summary>

-/// <typeparam name="E"></typeparam>

-/// <typeparam name="W"></typeparam>

-  interface IWeight<E, W> where W : IComparable<W>

-  {

-    /// <summary>

-    /// Compute the weight value corresponding to specific edge data.

-    /// </summary>

-    /// <param name="edgedata"></param>

-    /// <returns></returns>

-    W Weight(E edgedata);

-

-    /// <summary>

-    /// Add two weight values.

-    /// </summary>

-    /// <param name="w1"></param>

-    /// <param name="w2"></param>

-    /// <returns></returns>

-    W Add(W w1, W w2);

-  }

-

-/// <summary>

-/// An action to perform when an edge is encountered during a traversal of the graph.

-/// The "extra" parameter is for additional information supplied by the traversal 

-/// algorithm. 

-/// The intention of the bool return value is that returning false is a signal to the

-/// traversal algorithm to abandon the traversl because the user has already found

-/// what he was looking for.

-/// </summary>

-/// <typeparam name="V"></typeparam>

-/// <typeparam name="E"></typeparam>

-/// <typeparam name="U"></typeparam>

-/// <param name="edge"></param>

-/// <param name="extra"></param>

-/// <returns></returns>

-  delegate bool EdgeAction<V, E, U>(Edge<V, E> edge, U extra);

-

-

-/*

-  For a dense graph, we would use data fields:

-

-  E'[,] or E'[][] for the matrix. Possibly E'[][] for a triangular one!

-  Here E' = struct{E edgedata, bool present} or class{E edgedata}, or if E is a class just E.

-  Thus E' is E! for value types. Or we could have two matrices: E[][] and bool[][]. 

-

-  HashDictionary<V,int> to map vertex ids to indices.

-  ArrayList<V> for the map the other way.

-  Or simply a HashedArrayList<V> to get both?

-

-  PresentList<int>, FreeList<int> or similar, if we do not want to compact the indices in the matrix on each delete.

-  If we compact, we always do a delete on the vertex<->index map by a replace and a removelast:

-    vimap[ind]=vimap[vimap.Count]; vimap.RemoveLast(); //also reorder matrix!

-  

-

-*/

-

-/// <summary>

-/// An implementation of IGraph&le;V,E,W&ge; based on an adjacency list representation using hash dictionaries.

-/// As a consequence, this will be most efficient for sparse graphs.

-/// </summary>

-/// <typeparam name="V"></typeparam>

-/// <typeparam name="E"></typeparam>

-/// <typeparam name="W"></typeparam>

-  class HashGraph<V, E, W> : IGraph<V, E, W> where W : IComparable<W>

-  {

-    int edgecount;

-

-    HashDictionary<V, HashDictionary<V, E>> graph;

-

-    IWeight<E, W> weight;

-

-    public IWeight<E, W> Weight { get { return weight; } }

-

-

-    /// <summary>

-    /// Create an initially empty graph.

-    /// </summary>

-    /// <param name="weight"></param>

-    [UsedBy("testTSP")]

-    public HashGraph(IWeight<E, W> weight)

-    {

-      this.weight = weight;

-      edgecount = 0;

-      graph = new HashDictionary<V, HashDictionary<V, E>>();

-    }

-

-    /// <summary>

-    /// Constructing a graph with no isolated vertices given a collection of edges.

-    /// </summary>

-    /// <param name="edges"></param>

-    [UsedBy()]

-    public HashGraph(IWeight<E, W> weight, SCG.IEnumerable<Edge<V, E>> edges) : this(weight)

-    {

-      foreach (Edge<V, E> edge in edges)

-      {

-        if (edge.start.Equals(edge.end))

-          throw new ApplicationException("Edge has equal start and end");

-        {

-          HashDictionary<V, E> edgeset;

-          //TODO: utilize upcoming FindOrAddSome operation

-          if (!graph.Find(edge.start, out edgeset))

-            graph.Add(edge.start, edgeset = new HashDictionary<V, E>());

-          if (!edgeset.UpdateOrAdd(edge.end, edge.edgedata))

-            edgecount++;

-          if (!graph.Find(edge.end, out edgeset))

-            graph.Add(edge.end, edgeset = new HashDictionary<V, E>());

-          edgeset.UpdateOrAdd(edge.start, edge.edgedata);

-        }

-      }

-    }

-

-    /// <summary>

-    /// This constructs a graph with a given set of vertices.

-    /// Will only allow these vertices.

-    /// Duplicate edges are allowed.

-    /// </summary>

-    /// <param name="vertices"></param>

-    /// <param name="edges"></param>

-    public HashGraph(IWeight<E, W> weight, SCG.IEnumerable<V> vertices, SCG.IEnumerable<Edge<V, E>> edges) : this(weight)

-    {

-      foreach (V v in vertices)

-        graph.Add(v, new HashDictionary<V, E>());

-      foreach (Edge<V, E> edge in edges)

-      {

-        HashDictionary<V, E> edgeset;

-        if (edge.start.Equals(edge.end))

-          throw new ApplicationException("Edge has equal start and end");

-        if (!graph.Find(edge.start, out edgeset))

-          throw new ApplicationException("Edge has unknown start");

-        if (!edgeset.UpdateOrAdd(edge.end, edge.edgedata))

-          edgecount++;

-        if (!graph.Find(edge.end, out edgeset))

-          throw new ApplicationException("Edge has unknown end");

-        edgeset.UpdateOrAdd(edge.start, edge.edgedata);

-      }

-    }

-

-    [UsedBy("testCOMP")]

-    public int VertexCount { get { return graph.Count; } }

-

-    [UsedBy("testCOMP")]

-    public int EdgeCount { get { return edgecount; } }

-

-    public ICollectionValue<V> Vertices()

-    {

-      return new GuardedCollectionValue<V>(graph.Keys);

-    }

-

-    public ICollectionValue<KeyValuePair<V, E>> Adjacent(V vertex)

-    {

-      return new GuardedCollectionValue<KeyValuePair<V, E>>(graph[vertex]);

-    }

-

-    class EdgesValue : CollectionValueBase<Edge<V, E>>

-    {

-      HashGraph<V, E, W> graph;

-      internal EdgesValue(HashGraph<V, E, W> g) { graph = g; }

-

-      public override bool IsEmpty { get { return graph.edgecount == 0; } }

-

-      public override int Count { get { return graph.edgecount; } }

-

-      public override Speed CountSpeed { get { return Speed.Constant; } }

-

-

-      public override Edge<V, E> Choose()

-      {

-        KeyValuePair<V, HashDictionary<V, E>> adjacent = graph.graph.Choose();

-        KeyValuePair<V, E> otherend = graph.graph[adjacent.Key].Choose();

-        return new Edge<V, E>(adjacent.Key, otherend.Key, otherend.Value);

-      }

-

-      public override SCG.IEnumerator<Edge<V, E>> GetEnumerator()

-      {

-        HashSet<Edge<V, E>> seen = new HashSet<Edge<V, E>>(new Edge<V, E>.UnorderedEqualityComparer());

-        foreach (V v in graph.graph.Keys)

-          foreach (KeyValuePair<V, E> p in graph.graph[v])

-          {

-            Edge<V, E> edge = new Edge<V, E>(v, p.Key, p.Value);

-            if (!seen.FindOrAdd(ref edge))

-              yield return edge;

-          }

-      }

-    }

-

-    public ICollectionValue<Edge<V, E>> Edges()

-    {

-      return new EdgesValue(this);

-    }

-

-    public bool AddVertex(V v)

-    {

-      if (graph.Contains(v))

-        return false;

-      graph.Add(v, new HashDictionary<V, E>());

-      return true;

-    }

-

-    //Note: no warning on update of edgedata!

-    //TODO: Shouldn�t Update or Add return the old value?

-    //Then it would be easy to check for updates 

-    public bool AddEdge(V start, V end, E edgedata)

-    {

-      bool retval = false;

-      HashDictionary<V, E> edgeset;

-      if (graph.Find(start, out edgeset))

-        retval = !edgeset.UpdateOrAdd(end, edgedata);

-      else

-      {

-        graph[start] = edgeset = new HashDictionary<V, E>();

-        edgeset[end] = edgedata;

-        retval = true;

-      }

-      if (graph.Find(end, out edgeset))

-        edgeset.UpdateOrAdd(start, edgedata);

-      else

-      {

-        graph[end] = edgeset = new HashDictionary<V, E>();

-        edgeset[start] = edgedata;

-      }

-      if (retval)

-        edgecount++;

-      return retval;

-    }

-

-    public bool RemoveVertex(V vertex)

-    {

-      HashDictionary<V, E> edgeset;

-      if (!graph.Find(vertex, out edgeset))

-        return false;

-      foreach (V othervertex in edgeset.Keys)

-        graph[othervertex].Remove(vertex); //Assert retval==true

-      edgecount -= edgeset.Count;

-      graph.Remove(vertex);

-      return true;

-    }

-

-    public bool RemoveEdge(V start, V end, out E edgedata)

-    {

-      HashDictionary<V, E> edgeset;

-      if (!graph.Find(start, out edgeset))

-      {

-        edgedata = default(E);

-        return false;

-      }

-      if (!edgeset.Remove(end, out edgedata))

-        return false;

-      graph[end].Remove(start);

-      edgecount--;

-      return true;

-    }

-

-    public bool FindEdge(V start, V end, out E edgedata)

-    {

-      HashDictionary<V, E> edges;

-      if (!graph.Find(start, out edges))

-      {

-        edgedata = default(E);

-        return false;

-      }

-      return edges.Find(end, out edgedata);

-    }

-

-    public IGraph<V, E, W> SubGraph(ICollectionValue<V> vs)

-    {

-      HashSet<V> vertexset = vs as HashSet<V>;

-      if (vertexset == null)

-      {

-        vertexset = new HashSet<V>();

-        vertexset.AddAll(vs);

-      }

-

-      return new HashGraph<V, E, W>(weight,

-          vs,

-          Edges().Filter(delegate(Edge<V, E> e) { return vertexset.Contains(e.start) && vertexset.Contains(e.end); }));

-    }

-

-    public bool IsConnected

-    {

-      //TODO: optimize: needs to change Action<Edge<V,E>> to EdgeAction to be able to break out

-      get { return ComponentCount <= 1; }

-    }

-

-    public int ComponentCount

-    {

-      get

-      {

-        int components = 0;

-        TraverseVertices(false, null, delegate(V v) { components++; }, null);

-        return components;

-      }

-    }

-

-    public ICollectionValue<KeyValuePair<V, IGraph<V, E, W>>> Components()

-    {

-      ArrayList<KeyValuePair<V, IGraph<V, E, W>>> retval = new ArrayList<KeyValuePair<V, IGraph<V, E, W>>>();

-      HashGraph<V, E, W> component;

-      ArrayList<V> vertices = null;

-      Action<Edge<V, E>> edgeaction = delegate(Edge<V, E> e)

-      {

-        vertices.Add(e.end);

-      };

-      Action<V> beforecomponent = delegate(V v)

-      {

-        vertices = new ArrayList<V>();

-        vertices.Add(v);

-      };

-      Action<V> aftercomponent = delegate(V v)

-      {

-        //component = SubGraph(vertices);

-        component = new HashGraph<V, E, W>(weight);

-        foreach (V start in vertices)

-        {

-          //component.graph[start] = graph[start].Clone();

-          HashDictionary<V, E> edgeset = component.graph[start] = new HashDictionary<V, E>();

-          foreach (KeyValuePair<V, E> adjacent in graph[start])

-            edgeset[adjacent.Key] = adjacent.Value;

-        }

-        retval.Add(new KeyValuePair<V, IGraph<V, E, W>>(v, component));

-      };

-      TraverseVertices(false, edgeaction, beforecomponent, aftercomponent);

-      return retval;

-    }

-

-    [UsedBy("test1")]

-    public void TraverseVertices(bool bfs, V start, Action<Edge<V, E>> act)

-    {

-      if (!graph.Contains(start))

-        throw new ArgumentException("start Vertex not in graph");

-      IList<Edge<V, E>> todo = new LinkedList<Edge<V, E>>();

-      todo.FIFO = bfs;

-      HashSet<V> seen = new HashSet<V>();

-      V v;

-      while (!todo.IsEmpty || seen.Count == 0)

-      {

-        if (seen.Count > 1)

-        {

-          Edge<V, E> e = todo.Remove();

-          if (act != null)

-            act(e);

-          v = e.end;

-        }

-        else

-        {

-          seen.Add(start);

-          v = start;

-        }

-

-        HashDictionary<V, E> adjacent;

-        if (graph.Find(v, out adjacent))

-        {

-          foreach (KeyValuePair<V, E> p in adjacent)

-          {

-            V end = p.Key;

-            if (!seen.FindOrAdd(ref end))

-              todo.Add(new Edge<V, E>(v, end, p.Value));

-          }

-        }

-      }

-    }

-

-    public void TraverseVertices(bool bfs, Action<V> act)

-    {

-      TraverseVertices(bfs, delegate(Edge<V, E> e) { act(e.end); }, act, null);

-    }

-

-    //TODO: merge the hash set here with the intra omponent one?

-    public void TraverseVertices(bool bfs, Action<Edge<V, E>> act, Action<V> beforecomponent, Action<V> aftercomponent)

-    {

-      HashSet<V> missing = new HashSet<V>();

-      missing.AddAll(Vertices());

-      Action<Edge<V, E>> myact = act + delegate(Edge<V, E> e) { missing.Remove(e.end); };

-      Action<V> mybeforecomponent = beforecomponent + delegate(V v) { missing.Remove(v); };

-      while (!missing.IsEmpty)

-      {

-        V start = default(V);

-        foreach (V v in missing)

-        { start = v; break; }

-        mybeforecomponent(start);

-        TraverseVertices(bfs, start, myact);

-        if (aftercomponent != null)

-          aftercomponent(start);

-      }

-    }

-

-    delegate void Visitor(V v, V parent, bool atRoot);

-

-    //TODO: allow actions to be null

-    [UsedBy("testDFS")]

-    public void DepthFirstSearch(V start, Action<V> before, Action<V> after,

-        Action<Edge<V, E>> onfollow, Action<Edge<V, E>> onfollowed, Action<Edge<V, E>> onnotfollowed)

-    {

-      HashSet<V> seen = new HashSet<V>();

-      seen.Add(start);

-      //If we do not first set visit = null, the compiler will complain at visit(end)

-      //that visit is uninitialized

-      Visitor visit = null;

-      visit = delegate(V v, V parent, bool atRoot)

-      {

-        before(v);

-        HashDictionary<V, E> adjacent;

-        if (graph.Find(v, out adjacent))

-          foreach (KeyValuePair<V, E> p in adjacent)

-          {

-            V end = p.Key;

-            Edge<V, E> e = new Edge<V, E>(v, end, p.Value);

-            if (!seen.FindOrAdd(ref end))

-            {

-              onfollow(e);

-              visit(end, v, false);

-              onfollowed(e);

-            }

-            else

-            {

-              if (!atRoot && !parent.Equals(end))

-                onnotfollowed(e);

-            }

-          }

-        after(v);

-      };

-      visit(start, default(V), true);

-    }

-

-    public void PriorityFirstTraverse(bool accumulated, V start, EdgeAction<V, E, W> act)

-    {

-      if (!graph.Contains(start))

-        throw new ArgumentException("Graph does not contain start");

-      IPriorityQueue<W> fringe = new IntervalHeap<W>();

-      HashDictionary<V, IPriorityQueueHandle<W>> seen = new HashDictionary<V, IPriorityQueueHandle<W>>();

-      HashDictionary<IPriorityQueueHandle<W>, Edge<V, E>> bestedge = new HashDictionary<IPriorityQueueHandle<W>, Edge<V, E>>();

-

-      IPriorityQueueHandle<W> h = null;

-      V current;

-      W currentdist;

-      while (!fringe.IsEmpty || seen.Count == 0)

-      {

-        if (seen.Count == 0)

-        {

-          seen.Add(start, h);

-          current = start;

-          currentdist = default(W);

-        }

-        else

-        {

-          currentdist = fringe.DeleteMin(out h);

-          Edge<V, E> e = bestedge[h];

-          if (!act(e, currentdist))

-            break;

-          bestedge.Remove(h);

-          current = e.end;

-        }

-        HashDictionary<V, E> adjacentnodes;

-        if (graph.Find(current, out adjacentnodes))

-          foreach (KeyValuePair<V, E> adjacent in adjacentnodes)

-          {

-            V end = adjacent.Key;

-            E edgedata = adjacent.Value;

-            W dist = weight.Weight(edgedata), olddist;

-            if (accumulated && !current.Equals(start)) dist = weight.Add(currentdist, weight.Weight(edgedata));

-            if (!seen.Find(end, out h))

-            {

-              h = null;

-              fringe.Add(ref h, dist);

-              seen[end] = h;

-              bestedge[h] = new Edge<V, E>(current, end, edgedata);

-            }

-            else if (fringe.Find(h, out olddist) && dist.CompareTo(olddist) < 0)

-            {

-              fringe[h] = dist;

-              bestedge[h] = new Edge<V, E>(current, end, edgedata);

-            }

-          }

-      }

-    }

-

-    public W Distance(V start, V end)

-    {

-      W dist = default(W);

-      bool found = false;

-      PriorityFirstTraverse(true, start, delegate(Edge<V, E> e, W w)

-      {

-        if (end.Equals(e.end)) { dist = w; found = true; return false; }

-        else return true;

-      });

-      if (found)

-        return dist;

-      throw new ArgumentException(String.Format("No path from {0} to {1}", start, end));

-    }

-

-

-    public ICollectionValue<Edge<V, E>> ShortestPath(V start, V end)

-    {

-      HashDictionary<V, Edge<V, E>> backtrack = new HashDictionary<V, Edge<V, E>>();

-      PriorityFirstTraverse(true, start, delegate(Edge<V, E> e, W w) { backtrack[e.end] = e; return !end.Equals(e.end); });

-      ArrayList<Edge<V, E>> path = new ArrayList<Edge<V, E>>();

-      Edge<V, E> edge;

-      V v = end;

-      while (backtrack.Find(v, out edge))

-      {

-        path.Add(edge);

-        v = edge.start;

-      }

-      if (path.IsEmpty)

-        throw new ArgumentException(String.Format("No path from {0} to {1}", start, end));

-      path.Reverse();

-      return path;

-    }

-

-    /// <summary>

-    /// NB: assume connected, throw exception if not

-    /// </summary>

-    /// <typeparam name="W"></typeparam>

-    /// <param name="edgeWeight"></param>

-    /// <returns></returns>

-    public IGraph<V, E, W> MinimumSpanningTree(out V start)

-    {

-      ArrayList<Edge<V, E>> edges = new ArrayList<Edge<V, E>>();

-      start = default(V);

-      foreach (V v in graph.Keys)

-      { start = v; break; }

-      PriorityFirstTraverse(false, start, delegate(Edge<V, E> e, W w) { edges.Add(e); return true; });

-      if (edges.Count != graph.Count - 1)

-        throw new ArgumentException("Graph not connected");

-      return new HashGraph<V, E, W>(weight, edges);

-    }

-

-    public ICollectionValue<Edge<V, E>> ApproximateMWPM()

-    {

-      //Assume graph complete and even number of vertices

-      HashGraph<V, E, W> clone = new HashGraph<V, E, W>(weight, Edges());

-      ArrayList<Edge<V, E>> evenpath = new ArrayList<Edge<V, E>>();

-      ArrayList<Edge<V, E>> oddpath = new ArrayList<Edge<V, E>>();

-      V start = default(V);

-      foreach (V v in clone.Vertices()) { start = v; break; }

-      V current = start;

-      W evenweight, oddweight;

-      evenweight = oddweight = default(W);

-      bool even = true;

-      while (clone.VertexCount > 0)

-      {

-        V bestvertex = default(V);

-        E bestedge = default(E);

-        W bestweight = default(W);

-        if (clone.VertexCount == 1)

-        {

-          bestvertex = start;

-          bestedge = graph[current][start];

-          bestweight = weight.Weight(bestedge);

-        }

-        else

-        {

-          bool first = true;

-          foreach (KeyValuePair<V, E> p in clone.graph[current])

-          {

-            W thisweight = weight.Weight(p.Value);

-            if (first || bestweight.CompareTo(thisweight) > 0)

-            {

-              bestvertex = p.Key;

-              bestweight = thisweight;

-              bestedge = p.Value;

-            }

-            first = false;

-          }

-        }

-        clone.RemoveVertex(current);

-        //Console.WriteLine("-* {0} / {1} / {2}", bestvertex, bestweight, tour.Count);

-        if (even)

-        {

-          evenweight = evenpath.Count < 1 ? bestweight : weight.Add(evenweight, bestweight);

-          evenpath.Add(new Edge<V, E>(current, bestvertex, bestedge));

-        }

-        else

-        {

-          oddweight = oddpath.Count < 1 ? bestweight : weight.Add(oddweight, bestweight);

-          oddpath.Add(new Edge<V, E>(current, bestvertex, bestedge));

-        }

-        current = bestvertex;

-        even = !even;

-      }

-      //Console.WriteLine("Totalweights: even: {0} and odd: {1}", evenweight, oddweight);

-      return evenweight.CompareTo(oddweight) < 0 ? evenpath : oddpath;

-    }

-

-    /// <summary>

-    /// The construction is performed as follows: 

-    /// Start at some vertex. Greedily construct a path starting there by 

-    /// following edges at random until no more unused edges are available

-    /// from the current node, which must be the start node. Then follow 

-    /// the path constructed so far and whenever we meet a vertex with 

-    /// unused edges, construct a path from there greedily as above, 

-    /// inserting into the path in front of us.

-    /// 

-    /// The algorithm will use constant time for each vertex added 

-    /// to the path and 

-    /// 

-    /// Illustrates use of views as a safe version of listnode pointers 

-    /// and hashed linked lists for choosing some item in constant time combined 

-    /// with (expected) constant time remove.

-    /// </summary>

-    /// <returns></returns>

-    public IList<V> EulerTour()

-    {

-      bool debug = false;

-      //Assert connected and all degrees even. (Connected is checked at the end)

-      string fmt = "Graph does not have a closed Euler tour: vertex {0} has odd degree {1}";

-      foreach (KeyValuePair<V, HashDictionary<V, E>> adj in graph)

-        if (adj.Value.Count % 2 != 0)

-          throw new ArgumentException(String.Format(fmt, adj.Key, adj.Value.Count));

-

-      LinkedList<V> path = new LinkedList<V>();

-      //Clone the graph data to keep track of used edges.

-      HashDictionary<V, HashedArrayList<V>> edges = new HashDictionary<V, HashedArrayList<V>>();

-      V start = default(V);

-      HashedArrayList<V> adjacent = null;

-      foreach (KeyValuePair<V, HashDictionary<V, E>> p in graph)

-      {

-        adjacent = new HashedArrayList<V>();

-        adjacent.AddAll(p.Value.Keys);

-        start = p.Key;

-        edges.Add(start, adjacent);

-      }

-

-      path.Add(start);

-      IList<V> view = path.View(0, 1);

-      while (adjacent.Count > 0)

-      {

-        V current = view[0];

-        if (debug) Console.WriteLine("==> {0}", current);

-        //Augment the path (randomly) until we return here and all edges

-        while (adjacent.Count > 0)

-        {

-          if (debug) Console.WriteLine(" => {0}, {1}", current, path.Count);

-          V next = adjacent.RemoveFirst();

-          view.Add(next);

-          if (debug) Console.WriteLine("EDGE: " + current + "->" + next);

-          if (!edges[next].Remove(current))

-            Console.WriteLine("Bad");

-          current = next;

-          adjacent = edges[current];

-        }

-        //When we get here, the view contains a closed path, i.e.

-        //view[view.Count-1] == view[0] and we have followed all edges from view[0]

-        //We slide forward along the rest of the path constructed so far and stop at the

-        //first vertex with still unfollwed edges.

-        while (view.Offset < path.Count - 1 && adjacent.Count == 0)

-        {

-          view.Slide(1, 1);

-          if (debug) Console.WriteLine(" -> {0}, {1}", view[0], path.Count);

-          adjacent = edges[view[0]];

-        }

-      }

-      if (path.Count <= edges.Count)

-        throw new ArgumentException("Graph was not connected");

-      return path;

-    }

-

-    /// <summary>

-    /// The purpose of this struct is to be able to create and add new,

-    /// synthetic vertices to a graph. 

-    /// </summary>

-    struct Vplus : IEquatable<Vplus>

-    {

-      internal readonly V vertex; internal readonly int id;

-      static SCG.IEqualityComparer<V> vequalityComparer = EqualityComparer<V>.Default;

-      internal Vplus(V v) { vertex = v; id = 0; }

-      internal Vplus(int i) { vertex = default(V); id = i; }

-      //We should override Equals and GetHashCode

-

-      public override string ToString()

-      { return id == 0 ? String.Format("real({0})", vertex) : String.Format("fake({0})", id); }

-

-      public override bool Equals(object obj) { throw new NotImplementedException(); }

-

-      public bool Equals(Vplus other) { return vequalityComparer.Equals(vertex, other.vertex) && id == other.id; }

-

-      public override int GetHashCode() { return vequalityComparer.GetHashCode(vertex) + id; }

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    /// <returns></returns>

-    public IDirectedCollectionValue<V> ApproximateTSP2()

-    {

-      /* Construct a minimum spanning tree for the graph */

-      V root;

-      IGraph<V, E, W> tree = MinimumSpanningTree(out root);

-

-      //Console.WriteLine("========= Matching of odd vertices of mst =========");

-      ArrayList<V> oddvertices = new ArrayList<V>();

-      foreach (V v in tree.Vertices())

-        if (tree.Adjacent(v).Count % 2 != 0)

-          oddvertices.Add(v);

-

-      ICollectionValue<Edge<V, E>> matching = SubGraph(oddvertices).ApproximateMWPM();

-

-      //Console.WriteLine("========= Fuse matching and tree =========");

-      //We must split the edges of the matching with fake temporary vertices

-      //since the matching and the tree may have common edges

-

-      HashGraph<Vplus, E, W> fused = new HashGraph<Vplus, E, W>(weight);

-      foreach (Edge<V, E> e in tree.Edges())

-        fused.AddEdge(new Vplus(e.start), new Vplus(e.end), e.edgedata);

-      int fakeid = 1;

-      foreach (Edge<V, E> e in matching)

-      {

-        Vplus fakevertex = new Vplus(fakeid++);

-        fused.AddEdge(new Vplus(e.start), fakevertex, e.edgedata);

-        fused.AddEdge(fakevertex, new Vplus(e.end), e.edgedata);

-      }

-      fused.Print(Console.Out);

-

-      //Console.WriteLine("========= Remove fake vertices and perform shortcuts =========");

-      IList<Vplus> fusedtour = fused.EulerTour();

-      HashSet<V> seen = new HashSet<V>();

-      IList<V> tour = new ArrayList<V>();

-

-      foreach (Vplus vplus in fused.EulerTour())

-      {

-        V v = vplus.vertex;

-        if (vplus.id == 0 && !seen.FindOrAdd(ref v))

-          tour.Add(v);

-      }

-      return tour;

-    }

-

-    /// <summary>

-    /// (Refer to the litterature, Vazirani)

-    /// 

-    /// (Describe: MST+Euler+shortcuts)

-    /// </summary>

-    /// <returns></returns>

-    [UsedBy("testTSP")]

-    public IDirectedCollectionValue<V> ApproximateTSP()

-    {

-      /* Construct a minimum spanning tree for the graph */

-      V root;

-      IGraph<V, E, W> tree = MinimumSpanningTree(out root);

-

-      /* (Virtually) double all edges of MST and construct an Euler tour of the vertices*/

-      LinkedList<V> tour = new LinkedList<V>();

-      tour.Add(root);

-      tour.Add(root);

-      IList<V> view = tour.View(1, 1);

-

-      Action<Edge<V, E>> onfollow = delegate(Edge<V, E> e)

-      {

-        //slide the view until it points to the last copy of e.start

-        while (!view[0].Equals(e.start))

-          view.Slide(1);

-        //then insert two copies of e.end and slide the view one backwards

-        view.InsertFirst(e.end);

-        view.InsertFirst(e.end);

-        view.Slide(1, 1);

-      };

-

-      tree.TraverseVertices(false, root, onfollow);

-

-      /* Finally, slide along the Euler tour and shortcut by removing vertices already seen*/

-      HashSet<V> seen = new HashSet<V>();

-      view = tour.View(0, tour.Count);

-      while (view.Offset < tour.Count - 1)

-      {

-        V v = view[0];

-        if (seen.FindOrAdd(ref v))

-          view.RemoveFirst();

-        else

-          view.Slide(1, view.Count - 1);

-      }

-      return tour;

-    }

-

-    public void Print(System.IO.TextWriter output)

-    {

-      output.WriteLine("Graph has {0} vertices, {1} edges, {2} components", graph.Count, edgecount, ComponentCount);

-      foreach (KeyValuePair<V, HashDictionary<V, E>> p in graph)

-      {

-        output.Write(" {0} ->  ", p.Key);

-        foreach (KeyValuePair<V, E> p2 in p.Value)

-          output.Write("{1} (data {2}), ", p.Key, p2.Key, p2.Value);

-        output.WriteLine();

-      }

-    }

-  }

-

-/// <summary>

-/// A weight on a graph that assigns the weight 1 to every edge.

-/// </summary>

-/// <typeparam name="E">(Ignored) type of edgedata</typeparam>

-  class CountWeight<E> : IWeight<E, int>

-  {

-    public int Weight(E edgedata) { return 1; }

-

-    public int Add(int w1, int w2) { return w1 + w2; }

-  }

-

-/// <summary>

-/// A weight on an IGraph&lt;V,int&gt; that uses the value of the edgedata as the weight value.

-/// </summary>

-  class IntWeight : IWeight<int, int>

-  {

-

-    public int Weight(int edgedata) { return edgedata; }

-

-    public int Add(int w1, int w2) { return w1 + w2; }

-

-  }

-

-/// <summary>

-/// A weight on an IGraph&lt;V,double&gt; that uses the value of the edgedata as the weight value.

-/// </summary>

-  class DoubleWeight : IWeight<double, double>

-  {

-

-    public double Weight(double edgedata) { return edgedata; }

-

-    public double Add(double w1, double w2) { return w1 + w2; }

-

-  }

-

-/// <summary>

-/// Attribute used for marking which examples use a particuler graph method

-/// </summary>

-  class UsedByAttribute : Attribute

-  {

-    string[] tests;

-    internal UsedByAttribute(params string[] tests) { this.tests = tests; }

-

-    public override string ToString()

-    {

-      System.Text.StringBuilder sb = new System.Text.StringBuilder();

-      for (int i = 0; i < tests.Length; i++)

-      {

-        if (i > 0)

-          sb.Append(", ");

-        sb.Append(tests[i]);

-      }

-      return sb.ToString();

-    }

-  }

-

-/// <summary>

-/// Attribute for marking example methods with a description

-/// </summary>

-  class ExampleDescriptionAttribute : Attribute

-  {

-    string text;

-    internal ExampleDescriptionAttribute(string text) { this.text = text; }

-

-    public override string ToString() { return text; }

-  }

-

-/// <summary>

-/// A selection of test cases

-/// </summary>

-  class Test

-  {

-    static SCG.IEnumerable<Edge<int, int>> Grid(int n)

-    {

-      Random ran = new Random(1717);

-      for (int i = 1; i <= n; i++)

-      {

-        for (int j = 1; j <= n; j++)

-        {

-          yield return new Edge<int, int>(1000 * i + j, 1000 * (i + 1) + j, ran.Next(1, 100));

-          yield return new Edge<int, int>(1000 * i + j, 1000 * i + j + 1, ran.Next(1, 100));

-        }

-      }

-    }

-

-    static SCG.IEnumerable<Edge<string, int>> Snake(int n)

-    {

-      for (int i = 1; i <= n; i++)

-      {

-        yield return new Edge<string, int>("U" + i, "L" + i, 1);

-        yield return new Edge<string, int>("U" + i, "U" + (i + 1), i % 2 == 0 ? 1 : 10);

-        yield return new Edge<string, int>("L" + i, "L" + (i + 1), i % 2 == 0 ? 10 : 1);

-      }

-    }

-

-    /// <summary>

-    /// Create the edges of a forest of complete binary trees.

-    /// </summary>

-    /// <param name="treeCount">Number of trees</param>

-    /// <param name="height">Height of trees</param>

-    /// <returns></returns>

-    static SCG.IEnumerable<Edge<string, int>> Forest(int treeCount, int height)

-    {

-      for (int i = 0; i < treeCount; i++)

-      {

-        IList<string> q = new ArrayList<string>();

-        string root = String.Format("[{0}]", i);

-        int lmax = height + root.Length;

-        q.Add(root);

-        while (!q.IsEmpty)

-        {

-          string s = q.Remove();

-          string s2 = s + "L";

-          if (s2.Length < lmax)

-            q.Add(s2);

-          yield return new Edge<string, int>(s, s2, 0);

-          s2 = s + "R";

-          if (s2.Length < lmax)

-            q.Add(s2);

-          yield return new Edge<string, int>(s, s2, 0);

-        }

-      }

-    }

-

-    /// <summary>

-    /// Create edges of a graph correspondingto a "wheel" shape: the ecnter and equidistant 

-    /// points around the perimeter. The edgedata and edge weights are the euclidean distances.

-    /// </summary>

-    /// <param name="complete">True means the graph will be complete, false that the graph

-    /// will have edges for the spokes and between neighboring perimeter vetices.</param>

-    /// <param name="n">The number of perimeter vertices, must be at least 3.</param>

-    /// <returns>An enumerable with the edges</returns>

-    static SCG.IEnumerable<Edge<string, double>> Wheel(bool complete, int n)

-    {

-      if (n < 3)

-        throw new ArgumentOutOfRangeException("n must be at least 3");

-      string center = "C";

-      string[] perimeter = new string[n];

-      for (int i = 0; i < n; i++)

-      {

-        perimeter[i] = "P" + i;

-        yield return new Edge<string, double>(perimeter[i], center, 1);

-      }

-      if (complete)

-        for (int i = 0; i < n - 1; i++)

-          for (int j = i + 1; j < n; j++)

-            yield return new Edge<string, double>(perimeter[i], perimeter[j], 2 * Math.Sin((j - i) * Math.PI / n));

-      else

-      {

-        for (int i = 0; i < n - 1; i++)

-          yield return new Edge<string, double>(perimeter[i], perimeter[i + 1], 2 * Math.Sin(Math.PI / n));

-        yield return new Edge<string, double>(perimeter[n - 1], perimeter[0], 2 * Math.Sin(Math.PI / n));

-      }

-    }

-

-

-    /// <summary>

-    /// []

-    /// </summary>

-    [ExampleDescription("Basic BFS and DFS using TraverseVertices method")]

-    static void test1()

-    {

-      IGraph<int, int, int> g = new HashGraph<int, int, int>(new CountWeight<int>(), Grid(3));

-      Console.WriteLine("Edge count: {0}", g.Edges().Count);

-      Console.WriteLine("BFS:");

-      g.TraverseVertices(true, 1001, delegate(Edge<int, int> e) { Console.WriteLine(e); });

-      Console.WriteLine("DFS:");

-      g.TraverseVertices(false, 1001, delegate(Edge<int, int> e) { Console.WriteLine(e); });

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    [ExampleDescription("Component methods")]

-    static void testCOMP()

-    {

-      IGraph<string, int, int> g = new HashGraph<string, int, int>(new CountWeight<int>(), Forest(2, 2));

-      Console.WriteLine("Forest has: Vertices: {0}, Edges: {1}, Components: {2}", g.VertexCount, g.EdgeCount, g.ComponentCount);

-      //g.Print(Console.Out);

-      foreach (KeyValuePair<string, IGraph<string, int, int>> comp in g.Components())

-      {

-        Console.WriteLine("Component of {0}:", comp.Key);

-        comp.Value.Print(Console.Out);

-      }

-    }

-

-    //TODO: remove?

-    static void test3()

-    {

-      HashGraph<int, int, int> g = new HashGraph<int, int, int>(new CountWeight<int>(), Grid(5));

-      g.Print(Console.Out);

-      //EdgeWeight<int, IntWeight> weight = delegate(int i) { return i; };

-      Console.WriteLine("========= PFS accum =========");

-      g.PriorityFirstTraverse(

-          true,

-          2002,

-          delegate(Edge<int, int> e, int d) { Console.WriteLine("Edge: {0}, at distance {1}", e, d); return true; });

-      Console.WriteLine("========= PFS not accum =========");

-      g.PriorityFirstTraverse(

-          false,

-          2002,

-          delegate(Edge<int, int> e, int d) { Console.WriteLine("Edge: {0}, at distance {1}", e, d); return true; });

-      Console.WriteLine("========= MST =========");

-      int root;

-      g.MinimumSpanningTree(out root).Print(Console.Out);

-      Console.WriteLine("========= SP =========");

-      foreach (Edge<int, int> edge in g.ShortestPath(1001, 5005))

-        Console.WriteLine(edge);

-    }

-

-    static void test4()

-    {

-      IGraph<string, int, int> g = new HashGraph<string, int, int>(new IntWeight(), Snake(5));

-      Console.WriteLine("Edge count: {0}", g.Edges().Count);

-      Console.WriteLine("========= PFS =========");

-      g.PriorityFirstTraverse(false,

-          "U3",

-          delegate(Edge<string, int> e, int d) { Console.WriteLine("Edge: {0}, at distance {1}", e, d); return true; });

-      Console.WriteLine("========= MST =========");

-      string root;

-      IGraph<string, int, int> mst = g.MinimumSpanningTree(out root);

-      mst.Print(Console.Out);

-      Console.WriteLine("DFS:");

-      mst.TraverseVertices(false, root, delegate(Edge<string, int> e) { Console.WriteLine(e); });

-      Console.WriteLine("ATSP:");

-      int first = 0;

-      foreach (string s in g.ApproximateTSP())

-      {

-        Console.Write((first++ == 0 ? "" : " -> ") + s);

-      }

-    }

-

-    /// <summary>

-    /// This example examines the two variants of a priority-first search:

-    ///  with accumulated weights, leading to shortest paths from start;

-    ///  with non-acumulated weights, leading to a minimum spanning tree.

-    /// </summary>

-    [ExampleDescription("Priority-first-search with and without accumulated weights")]

-    static void testPFS()

-    {

-      IGraph<string, double, double> g = new HashGraph<string, double, double>(new DoubleWeight(), Wheel(false, 10));

-      g.Print(Console.Out);

-      Console.WriteLine("========= PFS non-accumulated weights (-> MST) =========");

-      g.PriorityFirstTraverse(false,

-          "P0",

-          delegate(Edge<string, double> e, double d) { Console.WriteLine("Edge: {0}, at distance {1}", e, d); return true; });

-      Console.WriteLine("========= PFS accumulated weights (-> Shortst paths from start) =========");

-      g.PriorityFirstTraverse(true,

-          "P0",

-          delegate(Edge<string, double> e, double d) { Console.WriteLine("Edge: {0}, at distance {1}", e, d); return true; });

-    }

-

-    /// <summary>

-    /// 

-    /// 

-    /// (Refer to Vazirani, or do that where ApproximateTSP is implemented)

-    /// 

-    /// Note that the tour created is not optimal. [Describe why]

-    /// </summary>

-    [ExampleDescription("Approximate TSP")]

-    static void testTSP()

-    {

-      IGraph<string, double, double> g = new HashGraph<string, double, double>(new DoubleWeight(), Wheel(true, 10));

-      //g.Print(Console.Out);

-      Console.WriteLine("========= MST =========");

-      string root;

-      IGraph<string, double, double> mst = g.MinimumSpanningTree(out root);

-      mst.TraverseVertices(false,

-         root,

-         delegate(Edge<string, double> e) { Console.WriteLine("Edge: {0} -> {1}", e.start, e.end); });

-      Console.WriteLine("========= Approximate TSP =========");

-      int first = 0;

-      foreach (string s in g.ApproximateTSP())

-      {

-        Console.Write((first++ == 0 ? "" : " -> ") + s);

-      }

-    }

-

-    /// <summary>

-    /// 

-    /// 

-    /// (Refer to Vazirani, or do that where ApproximateTSP is implemented)

-    /// 

-    /// Note that the tour created is not optimal. [Describe why]

-    /// </summary>

-    [ExampleDescription("Approximate TSP2")]

-    static void testTSP2()

-    {

-      HashGraph<string, double, double> g = new HashGraph<string, double, double>(new DoubleWeight(), Wheel(true, 20));

-

-      foreach (string s in g.ApproximateTSP2())

-        Console.WriteLine("# " + s);

-      //g.Print(Console.Out);

-      /*

-        Console.WriteLine("========= MST =========");

-        string root;

-        IGraph<string, double, double> mst = g.MinimumSpanningTree(out root);

-        mst.TraverseVertices(false,

-           root,

-           delegate(Edge<string, double> e) { Console.WriteLine("Edge: {0} -> {1}", e.start, e.end); });

-        ArrayList<string> oddvertices = new ArrayList<string>();

-        foreach (string v in mst.Vertices())

-            if (mst.Adjacent(v).Count % 2 != 0)

-                oddvertices.Add(v);

-

-        Console.WriteLine("========= Matching of odd vertices of mst =========");

-        ICollectionValue<Edge<string, double>> matching = g.SubGraph(oddvertices).ApproximateMWPM();

-

-        Console.WriteLine("========= Add matching to mst =========");

-        //We must split the edges of the matchin with fake temporary vertices

-        //(For a general vertex type, we would have to augment it to Pair<V,int> 

-        int fake = 0;

-        foreach (Edge<string, double> e in matching)

-        {

-            string fakevertex = "_" + (fake++);

-            mst.AddEdge(e.start, fakevertex, 0);

-            mst.AddEdge(fakevertex, e.end, e.edgedata);

-        }

-        //mst.Print(Console.Out);

-

-        IList<string> tour = mst.EulerTour(), view = tour.View(1, tour.Count - 1);

-

-        //Remove fake vertices

-         while (view.Count > 0)

-            if (view[0].StartsWith("_"))

-                view.RemoveFirst();

-            else

-                view.Slide(1, view.Count - 1);

-

-        Console.WriteLine("========= Approximate TSP 2 =========");

-        //Short cut

-        view = tour.View(1, tour.Count - 1);

-        HashSet<string> seen = new HashSet<string>();

-

-        while (view.Count > 0)

-        {

-            string s = view[0];

-            if (seen.FindOrAdd(ref s))

-                view.RemoveFirst();

-            else

-                view.Slide(1, view.Count - 1);

-        }

-

-        foreach (string s in tour)

-            Console.WriteLine(". " + s);*/

-    }

-

-    /// <summary>

-    /// 

-    /// </summary>

-    static void testEuler()

-    {

-      HashGraph<string, double, double> g = new HashGraph<string, double, double>(new DoubleWeight(), Wheel(true, 6));

-      foreach (string s in g.EulerTour())

-        Console.Write(s + " ");

-      Console.WriteLine();

-    }

-

-    /// <summary>

-    /// An articulation point in a graph is a vertex, whose removal will 

-    /// disconnect the graph (or its component). This example uses the 

-    /// extended DepthFirstSearch method to compute articulation points

-    /// of a graph.

-    /// 

-    /// (Refer to Sedgewick. )

-    /// 

-    /// Each vertex is given an index in traversal order. 

-    /// For each vertex, we compute the least index reachable by going downwards

-    /// in the DFS tree and then following a single non-dfs edge. 

-    /// 

-    /// Since we cannot store the DFS indices in the vertices without changing the 

-    /// (assumed given) vertex type, V, we remember the indices in a V-&gt;int 

-    /// hash dictionary, index. The "least reachable" values are then stored in an 

-    /// array keyed by the index.

-    /// 

-    /// The root of the search is an articulation point if it has more than one

-    /// outgoing DFS edges. Other articulation points are non-root vertices, va,

-    /// with an outgoing DFS edge, where the the least reachable index of the other 

-    /// vertex is greater or equal to the index of va. 

-    /// </summary>

-    [ExampleDescription("Using the advanced DFS to compute articulation points")]

-    static void testDFS()

-    {

-      HashGraph<string, int, int> g = new HashGraph<string, int, int>(new IntWeight());

-      g.AddEdge("A", "B", 0);

-      g.AddEdge("A", "E", 0);

-      g.AddEdge("B", "E", 0);

-      g.AddEdge("B", "C", 0);

-      g.AddEdge("B", "H", 0);

-      g.AddEdge("H", "I", 0);

-      g.AddEdge("B", "D", 0);

-      g.AddEdge("C", "D", 0);

-      g.AddEdge("C", "F", 0);

-      g.AddEdge("C", "G", 0);

-      g.AddEdge("F", "G", 0);

-

-      HashDictionary<string, int> index = new HashDictionary<string, int>();

-      int[] leastIndexReachableFrom = new int[g.VertexCount];

-      int nextindex = 0;

-      int outgoingFromRoot = 0;

-      Action<string> beforevertex = delegate(string v)

-      {

-        int i = (index[v] = nextindex++);

-        leastIndexReachableFrom[i] = i;

-      };

-      Action<string> aftervertex = delegate(string v)

-      {

-        int i = index[v];

-        if (i == 0 && outgoingFromRoot > 1)

-          Console.WriteLine("Articulation point: {0} ({1}>1 outgoing DFS edges from start)",

-              v, outgoingFromRoot);

-      };

-      Action<Edge<string, int>> onfollow = delegate(Edge<string, int> e)

-      {

-      };

-      Action<Edge<string, int>> onfollowed = delegate(Edge<string, int> e)

-      {

-        int startind = index[e.start], endind = index[e.end];

-        if (startind == 0)

-          outgoingFromRoot++;

-        else

-        {

-          int leastIndexReachable = leastIndexReachableFrom[endind];

-          if (leastIndexReachable >= startind)

-            Console.WriteLine("Articulation point: {0} (least index reachable via {3} is {1} >= this index {2})",

-                e.start, leastIndexReachable, startind, e);

-          if (leastIndexReachableFrom[startind] > leastIndexReachable)

-            leastIndexReachableFrom[startind] = leastIndexReachable;

-        }

-      };

-      Action<Edge<string, int>> onnotfollowed = delegate(Edge<string, int> e)

-      {

-        int startind = index[e.start], endind = index[e.end];

-        if (leastIndexReachableFrom[startind] > endind)

-          leastIndexReachableFrom[startind] = endind;

-      };

-

-      string root = "C";

-      g.DepthFirstSearch(root, beforevertex, aftervertex, onfollow, onfollowed, onnotfollowed);

-      Console.WriteLine("Edges:");

-      foreach (Edge<string, int> e in g.Edges())

-        Console.WriteLine("/ {0}", e);

-    }

-

-    static void Main(String[] args)

-    {

-      if (args.Length != 1)

-      {

-        Console.WriteLine("Usage: Graph.exe testno");

-        System.Reflection.MethodInfo[] mis = typeof(Test).GetMethods(

-            System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);

-        foreach (System.Reflection.MethodInfo mi in mis)

-        {

-          if (mi.GetParameters().Length == 0 && mi.ReturnType == typeof(void) && mi.Name.StartsWith("test"))

-          {

-            object[] attrs = mi.GetCustomAttributes(typeof(ExampleDescriptionAttribute), false);

-            Console.WriteLine(" {0} : {1}", mi.Name.Substring(4), attrs.Length > 0 ? attrs[0] : "");

-          }

-        }

-      }

-      else

-      {

-        string testMethodName = String.Format("test{0}", args[0]);

-

-        System.Reflection.MethodInfo mi = typeof(Test).GetMethod(testMethodName,

-            System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);

-

-        if (mi == null)

-          Console.WriteLine("No such testmethod, {0}", testMethodName);

-        else

-        {

-          object[] attrs = mi.GetCustomAttributes(typeof(ExampleDescriptionAttribute), false);

-          Console.WriteLine("============================== {0}() ==================================", testMethodName);

-          Console.WriteLine("Description: {0}", attrs.Length > 0 ? attrs[0] : "None");

-          Console.WriteLine("===========================================================================");

-          mi.Invoke(null, null);

-        }

-      }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/HashCodes.cs b/mcs/class/Mono.C5/UserGuideExamples/HashCodes.cs
deleted file mode 100644
index 40938d3291c..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/HashCodes.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: hash codes, good and bad 2005-02-28

-

-// Compile with 

-//   csc /r:C5.dll HashCodes.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace MyHashCodesTest {

-  class MyTest {

-    public static void Main(String[] args) {

-      int count = int.Parse(args[0]); 

-      {

-	Console.Write("Good hash function: ");

-	Timer t = new Timer();

-	HashSet<int> good 

-	  = MakeRandom(count, new GoodIntegerEqualityComparer());

-	Console.WriteLine("({0} sec, {1} items)", t.Check(), good.Count);

-	ISortedDictionary<int,int> bcd = good.BucketCostDistribution();

-	foreach (KeyValuePair<int,int> entry in bcd) 

-	  Console.WriteLine("{0,7} bucket(s) with cost {1,5}", 

-			    entry.Value, entry.Key);

-      }

-      {

-	Console.Write("Bad hash function:  ");

-	Timer t = new Timer();

-	HashSet<int> bad = MakeRandom(count, new BadIntegerEqualityComparer());

-	Console.WriteLine("({0} sec, {1} items)", t.Check(), bad.Count);

-	ISortedDictionary<int,int> bcd = bad.BucketCostDistribution();

-	foreach (KeyValuePair<int,int> entry in bcd) 

-	  Console.WriteLine("{0,7} bucket(s) with cost {1,5}", 

-			    entry.Value, entry.Key);

-      }

-    }

-

-    private static readonly C5Random rnd = new C5Random();

-    

-    public static HashSet<int> MakeRandom(int count, 

-					  SCG.IEqualityComparer<int> eqc) {

-      HashSet<int> res;

-      if (eqc == null) 

-	res = new HashSet<int>();

-      else

-	res = new HashSet<int>(eqc);

-      for (int i=0; i<count; i++)

-	res.Add(rnd.Next(1000000));    

-      return res;

-    }

-

-    private class BadIntegerEqualityComparer : SCG.IEqualityComparer<int> {

-      public bool Equals(int i1, int i2) {

-	return i1 == i2;

-      }

-      public int GetHashCode(int i) {

-	return i % 7;

-      }

-    }

-

-    private class GoodIntegerEqualityComparer : SCG.IEqualityComparer<int> {

-      public bool Equals(int i1, int i2) {

-	return i1 == i2;

-      }

-      public int GetHashCode(int i) {

-	return i;

-      }

-    }

-  }

-

-  // Crude timing utility

-   

-  public class Timer {

-    private DateTime start;

-    

-    public Timer() {

-      start = DateTime.Now;

-    }

-    

-    public double Check() {

-      TimeSpan dur = DateTime.Now - start;

-      return dur.TotalSeconds;

-    }

-  }

-}

-

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Jobqueue.cs b/mcs/class/Mono.C5/UserGuideExamples/Jobqueue.cs
deleted file mode 100644
index 15944f702be..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Jobqueue.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: job queue 2004-11-22

-

-// Compile with 

-//   csc /r:C5.dll Anagrams.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-class MyJobQueueTest {

-  public static void Main(String[] args) {

-    JobQueue jq = new JobQueue();

-    // One user submits three jobs at time=27

-    Rid rid1 = jq.Submit(new Ip("62.150.83.11"), 27),

-        rid2 = jq.Submit(new Ip("62.150.83.11"), 27),

-        rid3 = jq.Submit(new Ip("62.150.83.11"), 27);

-    // One job is executed

-    jq.ExecuteOne();

-    // Another user submits two jobs at time=55

-    Rid rid4 = jq.Submit(new Ip("130.225.17.5"), 55),

-        rid5 = jq.Submit(new Ip("130.225.17.5"), 55);

-    // One more job is executed

-    jq.ExecuteOne();

-    // The first user tries to cancel his first and last job

-    jq.Cancel(rid1);

-    jq.Cancel(rid3);

-    // The remaining jobs are executed

-    while (jq.ExecuteOne() != null) { } 

-  }

-}

-

-class JobQueue {

-  private readonly IPriorityQueue<Job> jobQueue;

-  private readonly IDictionary<Rid,IPriorityQueueHandle<Job>> jobs;

-  private readonly HashBag<Ip> userJobs;

-

-  public JobQueue() {

-    this.jobQueue = new IntervalHeap<Job>();

-    this.jobs = new HashDictionary<Rid,IPriorityQueueHandle<Job>>();

-    this.userJobs = new HashBag<Ip>();

-  }

-

-  public Rid Submit(Ip ip, int time) {

-    int jobCount = userJobs.ContainsCount(ip);

-    Rid rid = new Rid();

-    Job job = new Job(rid, ip, time + 60 * jobCount);

-    IPriorityQueueHandle<Job> h = null;

-    jobQueue.Add(ref h, job);

-    userJobs.Add(ip);

-    jobs.Add(rid, h);

-    Console.WriteLine("Submitted {0}", job);    

-    return rid;

-  }

-

-  public Job ExecuteOne() {

-    if (!jobQueue.IsEmpty) {

-      Job job = jobQueue.DeleteMin();

-      userJobs.Remove(job.ip);

-      jobs.Remove(job.rid);

-      Console.WriteLine("Executed {0}", job);    

-      return job;

-    } else

-      return null;

-  }

-

-  public void Cancel(Rid rid) {

-    IPriorityQueueHandle<Job> h;

-    if (jobs.Remove(rid, out h)) {

-      Job job = jobQueue.Delete(h);

-      userJobs.Remove(job.ip);

-      Console.WriteLine("Cancelled {0}", job);

-    }

-  }

-}

-

-class Job : IComparable<Job> {

-  public readonly Rid rid;

-  public readonly Ip ip;

-  public readonly int time;

-

-  public Job(Rid rid, Ip ip, int time) {

-    this.rid = rid;

-    this.ip = ip;

-    this.time = time;

-  }

-

-  public int CompareTo(Job that) {

-    return this.time - that.time;

-  }

-

-  public override String ToString() {

-    return rid.ToString();

-  }

-}

-

-class Rid { 

-  private readonly int ridNumber;

-  private static int nextRid = 1;

-  public Rid() {

-    ridNumber = nextRid++;

-  }

-  public override String ToString() {

-    return "rid=" + ridNumber;

-  }

-}

-

-class Ip { 

-  public readonly String ipString;

-

-  public Ip(String ipString) {

-    this.ipString = ipString;

-  }

-

-  public override int GetHashCode() {

-    return ipString.GetHashCode();

-  }

-

-  public override bool Equals(Object that) {

-    return 

-      that != null 

-      && that is Ip 

-      && this.ipString.Equals(((Ip)that).ipString);

-  }

-}

- 

-

diff --git a/mcs/class/Mono.C5/UserGuideExamples/KeywordRecognition.cs b/mcs/class/Mono.C5/UserGuideExamples/KeywordRecognition.cs
deleted file mode 100644
index 3758383a2f8..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/KeywordRecognition.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: Keyword recognition 2004-12-20

-

-// Compile with 

-//   csc /r:C5.dll KeywordRecognition.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace KeywordRecognition {

-

-class KeywordRecognition {

-  // Array of 77 keywords:

-

-  static readonly String[] keywordArray = 

-    { "abstract", "as", "base", "bool", "break", "byte", "case", "catch",

-      "char", "checked", "class", "const", "continue", "decimal", "default",

-      "delegate", "do", "double", "else", "enum", "event", "explicit",

-      "extern", "false", "finally", "fixed", "float", "for", "foreach",

-      "goto", "if", "implicit", "in", "int", "interface", "internal", "is",

-      "lock", "long", "namespace", "new", "null", "object", "operator",

-      "out", "override", "params", "private", "protected", "public",

-      "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof",

-      "stackalloc", "static", "string", "struct", "switch", "this", "throw",

-      "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe",

-      "ushort", "using", "virtual", "void", "volatile", "while" };

-  

-  private static readonly ICollection<String> kw1;

-

-  private static readonly ICollection<String> kw2;

-

-  private static readonly ICollection<String> kw3;

-

-  private static readonly SCG.IDictionary<String,bool> kw4 = 

-    new SCG.Dictionary<String,bool>();

-

-

-  class SC : SCG.IComparer<string>

-  {

-    public int Compare(string a, string b)

-    {

-      return StringComparer.InvariantCulture.Compare(a,b);

-    }

-  }

-

-  class SH : SCG.IEqualityComparer<string>

-  {

-    public int GetHashCode(string item)

-    {

-      return item.GetHashCode();

-    }

-

-    public bool Equals(string i1, string i2)

-    {

-      return i1 == null ? i2 == null : i1.Equals(i2,StringComparison.InvariantCulture);

-    }

-  }

-

-  static KeywordRecognition() { 

-    kw1 = new HashSet<String>();

-    kw1.AddAll<string>(keywordArray); 

-    kw2 = new TreeSet<String>(new SC());

-    kw2.AddAll<string>(keywordArray);

-    kw3 = new SortedArray<String>(new SC());

-    kw3.AddAll<string>(keywordArray);

-    kw4 = new SCG.Dictionary<String,bool>();

-    foreach (String keyword in keywordArray) 

-      kw4.Add(keyword, false);

-  }

-

-  public static bool IsKeyword1(String s) {

-    return kw1.Contains(s);

-  }

-

-  public static bool IsKeyword2(String s) {

-    return kw2.Contains(s);

-  }

-

-  public static bool IsKeyword3(String s) {

-    return kw3.Contains(s);

-  }

-

-  public static bool IsKeyword4(String s) { 

-    return kw4.ContainsKey(s); 

-  }

-

-  public static bool IsKeyword5(String s) { 

-    return Array.BinarySearch(keywordArray, s) >= 0; 

-  }

-

-  public static void Main(String[] args) {

-    if (args.Length != 2) 

-      Console.WriteLine("Usage: KeywordRecognition <iterations> <word>\n");

-    else {

-      int count = int.Parse(args[0]);

-      String id = args[1];

-

-      {

-        Console.Write("HashSet.Contains ");

-        Timer t = new Timer();

-        for (int i=0; i<count; i++)

-          IsKeyword1(id);

-        Console.WriteLine(t.Check());      

-      }

-

-      {

-        Console.Write("TreeSet.Contains ");

-        Timer t = new Timer();

-        for (int i=0; i<count; i++)

-          IsKeyword2(id);

-        Console.WriteLine(t.Check());      

-      }

-

-      {

-        Console.Write("SortedArray.Contains ");

-        Timer t = new Timer();

-        for (int i=0; i<count; i++)

-          IsKeyword3(id);

-        Console.WriteLine(t.Check());      

-      }

-

-      {

-        Console.Write("SCG.Dictionary.ContainsKey ");

-        Timer t = new Timer();

-        for (int i=0; i<count; i++)

-          IsKeyword4(id);

-        Console.WriteLine(t.Check());      

-      }

-

-      {

-        Console.Write("Array.BinarySearch ");

-        Timer t = new Timer();

-        for (int i=0; i<count; i++)

-          IsKeyword5(id);

-        Console.WriteLine(t.Check());      

-      }

-    }

-  }

-}

-

-// Crude timing utility ----------------------------------------

-   

-public class Timer {

-  private DateTime start;

-

-  public Timer() {

-    start = DateTime.Now;

-  }

-

-  public double Check() {

-    TimeSpan dur = DateTime.Now - start;

-    return dur.TotalSeconds;

-  }

-}

-

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/ListPatterns.cs b/mcs/class/Mono.C5/UserGuideExamples/ListPatterns.cs
deleted file mode 100644
index f980ce6e55f..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/ListPatterns.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: ListPatterns.cs for pattern chapter

-

-// Compile with 

-//   csc /r:C5.dll ListPatterns.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace ListPatterns {

-  class ListPatterns {

-    public static void Main(String[] args) {

-      IList<int> list = new ArrayList<int>();

-      list.AddAll(new int[] { 23, 29, 31, 37, 41, 43, 47, 53 });

-      // Reversing and swapping

-      Console.WriteLine(list);

-      list.Reverse();

-      Console.WriteLine(list);

-      ReverseInterval(list, 2, 3);

-      Console.WriteLine(list);

-      SwapInitialFinal(list, 2);

-      Console.WriteLine(list);

-      // Clearing all or part of list

-      list.CollectionCleared 

-	+= delegate(Object c, ClearedEventArgs eargs) {

-	     ClearedRangeEventArgs ceargs = eargs as ClearedRangeEventArgs;

-	     if (ceargs != null) 

-	       Console.WriteLine("Cleared [{0}..{1}]", 

-				 ceargs.Start, ceargs.Start+ceargs.Count-1);

-	   };

-      RemoveSublist1(list, 1, 2);

-      Console.WriteLine(list);

-      RemoveSublist2(list, 1, 2);

-      Console.WriteLine(list);

-      RemoveTail1(list, 3);

-      Console.WriteLine(list);

-      RemoveTail2(list, 2);

-      Console.WriteLine(list);

-    }

-

-    // Reverse list[i..i+n-1]

-

-    public static void ReverseInterval<T>(IList<T> list, int i, int n) {

-      list.View(i,n).Reverse();

-    }

-

-    // Swap list[0..i-1] with list[i..Count-1]

-

-    public static void SwapInitialFinal<T>(IList<T> list, int i) {

-      list.View(0,i).Reverse();

-      list.View(i,list.Count-i).Reverse();

-      list.Reverse();

-    }

-

-    // Remove sublist of a list

-

-    public static void RemoveSublist1<T>(IList<T> list, int i, int n) {

-      list.RemoveInterval(i, n);

-    }

-

-    public static void RemoveSublist2<T>(IList<T> list, int i, int n) {

-      list.View(i, n). Clear();

-    }

-

-

-    // Remove tail of a list

-

-    public static void RemoveTail1<T>(IList<T> list, int i) {

-      list.RemoveInterval(i, list.Count-i);

-    }

-

-    public static void RemoveTail2<T>(IList<T> list, int i) {

-      list.View(i, list.Count-i).Clear();

-    }

-

-    // Pattern for finding and using first (leftmost) x in list

-

-    private static void PatFirst<T>(IList<T> list, T x) { 

-      int j = list.IndexOf(x);

-      if (j >= 0) { 

-	// x is a position j in list

-      } else {

-	// x is not in list

-      }

-    }

-

-    // Pattern for finding and using last (rightmost) x in list

-

-    private static void PatLast<T>(IList<T> list, T x) { 

-      int j = list.LastIndexOf(x);

-      if (j >= 0) { 

-	// x is at position j in list

-      } else {

-	// x is not in list

-      }

-    }

-

-    // Pattern for finding and using first (leftmost) x in list[i..i+n-1]

-

-    private static void PatFirstSublist<T>(IList<T> list, T x, int i, int n) { 

-      int j = list.View(i,n).IndexOf(x);

-      if (j >= 0) { 

-	// x is at position j+i in list

-      } else {

-	// x is not in list[i..i+n-1]

-      }

-    }

-

-    // Pattern for finding and using last (rightmost) x in list[i..i+n-1]

-

-    private static void PatLastSublist<T>(IList<T> list, T x, int i, int n) { 

-      int j = list.View(i,n).LastIndexOf(x);

-      if (j >= 0) { 

-	// x is at position j+i in list

-      } else {

-	// x is not in list[i..i+n-1]

-      }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Locking.cs b/mcs/class/Mono.C5/UserGuideExamples/Locking.cs
deleted file mode 100644
index 30365596407..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Locking.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// C5 example: locking 2005-11-07

-

-// Compile with 

-//   csc /r:C5.dll Locking.cs 

-

-using System;

-using System.Threading;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace Locking {

-  class Locking {

-    static ArrayList<int> coll = new ArrayList<int>();

-    // static SCG.List<int> coll = new SCG.List<int>();

-    static readonly int count = 1000;

-

-    public static void Main(String[] args) {

-      Console.WriteLine("Adding and removing without locking:");

-      RunTwoThreads(delegate { AddAndRemove(15000); });

-      Console.WriteLine("coll has {0} items, should be 0", coll.Count);

-

-      coll = new ArrayList<int>();

-      Console.WriteLine("Adding and removing with locking:");

-      RunTwoThreads(delegate { SafeAddAndRemove(15000); });

-      Console.WriteLine("coll has {0} items, should be 0", coll.Count);

-

-      Console.WriteLine("Moving items without locking:");

-      ArrayList<int> from, to;

-      from = new ArrayList<int>();

-      to = new ArrayList<int>();

-      for (int i=0; i<count; i++) 

-        from.Add(i);

-      RunTwoThreads(delegate { while (!from.IsEmpty) Move(from, to); });

-      Console.WriteLine("coll has {0} items, should be {1}", to.Count, count);

-

-      Console.WriteLine("Moving items with locking:");

-      from = new ArrayList<int>();

-      to = new ArrayList<int>();

-      for (int i=0; i<count; i++) 

-        from.Add(i);

-      RunTwoThreads(delegate { while (!from.IsEmpty) SafeMove(from, to); });

-      Console.WriteLine("coll has {0} items, should be {1}", to.Count, count);

-    }

-

-    public static void RunTwoThreads(Act run) {

-      Thread t1 = new Thread(new ThreadStart(run)),

-             t2 = new Thread(new ThreadStart(run));

-      t1.Start(); t2.Start();

-      t1.Join(); t2.Join();

-    }

-

-    // Concurrently adding to and removing from an arraylist

-

-    public static void AddAndRemove(int count) {

-      for (int i=0; i<count; i++) 

-        coll.Add(i);

-      for (int i=0; i<count; i++)

-        coll.Remove(i);

-    }

-

-    private static readonly Object sync = new Object();

-

-    public static void SafeAddAndRemove(int count) {

-      for (int i=0; i<count; i++) 

-        lock (sync)

-          coll.Add(i);

-      for (int i=0; i<count; i++)

-        lock (sync)

-          coll.Remove(i);

-    }

-

-    public static void SafeAdd<T>(IExtensible<T> coll, T x) { 

-      lock (sync) {

-        coll.Add(x);

-      }

-    }

-

-    public static void Move<T>(ICollection<T> from, ICollection<T> to) { 

-      if (!from.IsEmpty) {  

-        T x = from.Choose();

-        Thread.Sleep(0);        // yield processor to other threads

-        from.Remove(x);

-        to.Add(x);

-      }

-    }

-    

-    public static void SafeMove<T>(ICollection<T> from, ICollection<T> to) { 

-      lock (sync) 

-        if (!from.IsEmpty) {  

-          T x = from.Choose();

-          Thread.Sleep(0);      // yield processor to other threads

-          from.Remove(x);

-          to.Add(x);

-        }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Makefile b/mcs/class/Mono.C5/UserGuideExamples/Makefile
deleted file mode 100644
index a2db8fc60fd..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile for C5 book examples

-

-USERGUIDEFILES= Anagrams.cs Antipatterns.cs CollectionSanity.cs EventPatterns.cs \

-	Fileindex.cs GConvexHull.cs GNfaToDfa.cs GettingStarted.cs \

-	Graph.cs Graphcopy.cs HashCodes.cs Jobqueue.cs \

-	KeywordRecognition.cs ListPatterns.cs ListPatterns.cs \

-	Locking.cs MultiDictionary.cs PointLocation.cs \

-	RandomSelection.cs ReadOnlyPatterns.cs Sets.cs \

-	SortedIterationPatterns.cs SortedIterationPatterns.cs \

-	SortingPermutation.cs Toposort.cs ViewPatterns.cs WrappedArray.cs

-

-all: c5examples.zip

-

-c5examples.zip: ${USERGUIDEFILES}

-	rm -f C5.examples.zip

-	zip C5.examples.zip ${USERGUIDEFILES}

-

-clean:

-	rm -f C5.examples.zip

-	rm -f *.dot

-	rm -f *.exe

-	rm -f *.ps

-	rm -f *.eps

-

-.SUFFIXES :

-.SUFFIXES : .cs

-

diff --git a/mcs/class/Mono.C5/UserGuideExamples/MultiCollection.cs b/mcs/class/Mono.C5/UserGuideExamples/MultiCollection.cs
deleted file mode 100644
index 32ec13ae7d0..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/MultiCollection.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace MultiCollection

-{

-  class BasicCollectionValue<T> : CollectionValueBase<T>, ICollectionValue<T>

-  {

-    SCG.IEnumerable<T> enumerable;

-    Fun<T> chooser;

-    int count;

-    //TODO: add delegate for checking validity!

-

-    public BasicCollectionValue(SCG.IEnumerable<T> e, Fun<T> chooser, int c) { enumerable = e; count = c; this.chooser = chooser; }

-

-    public override int Count { get { return count; } }

-

-    public override Speed CountSpeed { get { return Speed.Constant; } }

-

-    public override bool IsEmpty { get { return count == 0; } }

-

-    public override T Choose() { return chooser(); }

-

-    public override System.Collections.Generic.IEnumerator<T> GetEnumerator()

-    {

-      return enumerable.GetEnumerator();

-    }

-  }

-

-  interface IMultiCollection<K, V>

-  {

-    SCG.IEqualityComparer<K> KeyEqualityComparer { get;}

-    SCG.IEqualityComparer<V> ValueEqualityComparer { get;}

-    bool Add(K k, V v);

-    bool Remove(K k, V v);

-    ICollectionValue<V> this[K k] { get;}

-    ICollectionValue<K> Keys { get;}

-    SCG.IEnumerable<V> Values { get;}

-

-  }

-

-  class BasicMultiCollection<K, V, W, U> : IMultiCollection<K, V>//: IDictionary<K, W>

-  where W : ICollection<V>, new()

-      where U : IDictionary<K, W>, new()

-  {

-    U dict = new U();

-

-    public SCG.IEqualityComparer<K> KeyEqualityComparer { get { return EqualityComparer<K>.Default; } }

-

-    public SCG.IEqualityComparer<V> ValueEqualityComparer { get { return EqualityComparer<V>.Default; } } //TODO: depends on W!

-

-    public bool Add(K k, V v)

-    {

-      W w;

-      if (!dict.Find(k, out w)) 

-        dict.Add(k,w = new W());

-      return w.Add(v);

-    }

-

-    public bool Remove(K k, V v)

-    {

-      W w;

-      if (dict.Find(k, out w) && w.Remove(v))

-      {

-        if (w.Count == 0)

-          dict.Remove(k);

-        return true;

-      }

-      return false;

-    }

-

-    public ICollectionValue<V> this[K k] { get { return dict[k]; } }

-

-    public ICollectionValue<K> Keys { get { return dict.Keys; } }

-

-    public SCG.IEnumerable<V> Values

-    {

-      get

-      {

-        foreach (W w in dict.Values)

-          foreach (V v in w)

-            yield return v;

-      }

-    }

-  }

-

-  class WordIndex : BasicMultiCollection<string,int,HashSet<int>,HashDictionary<string,HashSet<int>>>

-  {

-  }

-

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      WordIndex wi = new WordIndex();

-      wi.Add("ja", 2);

-      wi.Add("nej", 4);

-      wi.Add("ja", 7);

-      foreach (string s in wi.Keys)

-      {

-        Console.WriteLine(s + " -->");

-        foreach (int line in wi[s])

-        {

-          Console.WriteLine(" " + line);

-        }

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/MultiDictionary.cs b/mcs/class/Mono.C5/UserGuideExamples/MultiDictionary.cs
deleted file mode 100644
index 22fad233345..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/MultiDictionary.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

-

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: 2006-01-29

-

-// Compile with 

-//   csc /r:C5.dll MultiDictionary.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace MultiDictionaries {

-

-  using MultiDictionary2;

-

-  class MyTest {

-    public static void Main(String[] args) {

-      MultiHashDictionary<int,String> mdict = new MultiHashDictionary<int,String>();

-      mdict.Add(2, "to");

-      mdict.Add(2, "deux");

-      mdict.Add(2, "two");

-      mdict.Add(20, "tyve");

-      mdict.Add(20, "twenty");

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      Console.WriteLine("mdict.Count (keys) is {0}", 

-                        ((IDictionary<int,ICollection<String>>)mdict).Count);

-      Console.WriteLine("mdict[2].Count is {0}", mdict[2].Count);

-      mdict.Remove(20, "tyve");

-      mdict.Remove(20, "twenty");

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      ICollection<String> zwei = new HashSet<String>();

-      zwei.Add("zwei");

-      mdict[2] = zwei;

-      mdict[-2] = zwei;

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      zwei.Add("kaksi");

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      ICollection<String> empty = new HashSet<String>();

-      mdict[0] = empty;

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      Console.WriteLine("mdict contains key 0: {0}", mdict.Contains(0));

-      mdict.Remove(-2);

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      zwei.Remove("kaksi");

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-      zwei.Clear();

-      Console.WriteLine(mdict);

-      Console.WriteLine("mdict.Count is {0}", mdict.Count);

-    }

-  }

-}

-

-namespace MultiDictionary1 {

-  // Here we implement a multivalued dictionary as a hash dictionary

-  // from keys to value collections.  The value collections may have set

-  // or bag semantics.

-  

-  // The value collections are externally modifiable (as in Peter

-  // Golde's PowerCollections library), and therefore:

-  //

-  //  * A value collection associated with a key may be null or

-  //  non-empty.  Hence for correct semantics, the Contains(k) method

-  //  must check that the value collection associated with a key is

-  //  non-null and non-empty.

-  //  

-  //  * A value collection may be shared between two or more keys.

-  //

-

-  // A C5 hash dictionary each of whose keys map to a collection of values.

-

-  public class MultiHashDictionary<K,V> : HashDictionary<K, ICollection<V>> {

-

-    // Return total count of values associated with keys.  This basic

-    // implementation simply sums over all value collections, and so

-    // is a linear-time operation in the total number of values.  

-

-    public new virtual int Count { 

-      get { 

-        int count = 0;

-        foreach (KeyValuePair<K,ICollection<V>> entry in this) 

-          if (entry.Value != null)

-            count += entry.Value.Count;

-        return count;

-      }

-    }

-

-    public override Speed CountSpeed {

-      get { return Speed.Linear; }

-    }

-

-    // Add a (key,value) pair

-

-    public virtual void Add(K k, V v) {

-      ICollection<V> values;

-      if (!base.Find(k, out values) || values == null) {

-        values = new HashSet<V>();

-        Add(k, values);

-      } 

-      values.Add(v);

-    }

-

-    // Remove a single (key,value) pair, if present; return true if

-    // anything was removed, else false

-

-    public virtual bool Remove(K k, V v) {

-      ICollection<V> values;

-      if (base.Find(k, out values) && values != null) {

-        if (values.Remove(v)) {

-          if (values.IsEmpty)

-            base.Remove(k);

-          return true;

-        } 

-      }

-      return false;

-    }

-    

-    // Determine whether key k is associated with a value

-

-    public override bool Contains(K k) { 

-      ICollection<V> values;

-      return Find(k, out values) && values != null && !values.IsEmpty;

-    }

-

-    // Determine whether each key in ks is associated with a value

-

-    public override bool ContainsAll<U>(SCG.IEnumerable<U> ks) { 

-      foreach (K k in ks) 

-        if (!Contains(k))

-          return false;

-      return true;

-    }

-

-    // Get or set the value collection associated with key k

-

-    public override ICollection<V> this[K k] {

-      get {

-        ICollection<V> values;

-        return base.Find(k, out values) && values != null ? values : new HashSet<V>();

-      }

-      set {

-        base[k] = value;

-      }

-    }

-

-    // Inherited from base class HashDictionary<K,ICollection<V>>:

-

-    // Add(K k, ICollection<V> values) 

-    // AddAll(IEnumerable<KeyValuePair<K,ICollection<V>>> kvs) 

-    // Clear

-    // Clone

-    // Find(K k, out ICollection<V> values)

-    // Find(ref K k, out ICollection<V> values)

-    // FindOrAdd(K k, ref ICollection<V> values) 

-    // Remove(K k) 

-    // Remove(K k, out ICollection<V> values) 

-    // Update(K k, ICollection<V> values)

-    // Update(K k, ICollection<V> values, out ICollection<V> oldValues)

-    // UpdateOrAdd(K k, ICollection<V> values)

-    // UpdateOrAdd(K k, ICollection<V> values, out ICollection<V> oldValues)

-  }

-}

-

-

-namespace MultiDictionary2 {

-  // Here we implement a multivalued dictionary as a hash dictionary

-  // from keys to value collections.  The value collections may have

-  // set or bag semantics.  This version uses event listeners to make

-  // the Count operation constant time.

-  

-  //  * To avoid recomputing the total number of values for the Count

-  //  property, one may cache it and then use event listeners on the

-  //  value collections to keep the cached count updated.  In turn, this

-  //  requires such event listeners on the dictionary also.

-  

-  // A C5 hash dictionary each of whose keys map to a collection of values.

-

-  public class MultiHashDictionary<K,V> : HashDictionary<K, ICollection<V>> {

-    private int count = 0;      // Cached value count, updated by events only

-

-    private void IncrementCount(Object sender, ItemCountEventArgs<V> args) {

-      count += args.Count;

-    }

-

-    private void DecrementCount(Object sender, ItemCountEventArgs<V> args) {

-      count -= args.Count;

-    }

-

-    private void ClearedCount(Object sender, ClearedEventArgs args) {

-      count -= args.Count;

-    }

-

-    public MultiHashDictionary() {

-      ItemsAdded += 

-        delegate(Object sender, ItemCountEventArgs<KeyValuePair<K,ICollection<V>>> args) {

-          ICollection<V> values = args.Item.Value;

-          if (values != null) {

-            count += values.Count;

-            values.ItemsAdded += IncrementCount;

-            values.ItemsRemoved += DecrementCount;

-            values.CollectionCleared += ClearedCount;

-          }

-        };

-      ItemsRemoved += 

-        delegate(Object sender, ItemCountEventArgs<KeyValuePair<K,ICollection<V>>> args) {

-          ICollection<V> values = args.Item.Value;

-          if (values != null) {

-            count -= values.Count;

-            values.ItemsAdded -= IncrementCount;

-            values.ItemsRemoved -= DecrementCount;

-            values.CollectionCleared -= ClearedCount;

-          }

-        };

-    }

-

-    // Return total count of values associated with keys.  

-

-    public new virtual int Count { 

-      get { 

-        return count;

-      }

-    }

-

-    public override Speed CountSpeed {

-      get { return Speed.Constant; }

-    }

-

-    // Add a (key,value) pair

-

-    public virtual void Add(K k, V v) {

-      ICollection<V> values;

-      if (!base.Find(k, out values) || values == null) {

-        values = new HashSet<V>();

-        Add(k, values);

-      } 

-      values.Add(v);

-    }

-

-    // Remove a single (key,value) pair, if present; return true if

-    // anything was removed, else false

-

-    public virtual bool Remove(K k, V v) {

-      ICollection<V> values;

-      if (base.Find(k, out values) && values != null) {

-        if (values.Remove(v)) {

-          if (values.IsEmpty)

-            base.Remove(k);

-          return true;

-        } 

-      }

-      return false;

-    }

-    

-    // Determine whether key k is associated with a value

-

-    public override bool Contains(K k) { 

-      ICollection<V> values;

-      return Find(k, out values) && values != null && !values.IsEmpty;

-    }

-

-    // Determine whether each key in ks is associated with a value

-

-    public override bool ContainsAll<U>(SCG.IEnumerable<U> ks) { 

-      foreach (K k in ks) 

-        if (!Contains(k))

-          return false;

-      return true;

-    }

-

-    // Get or set the value collection associated with key k

-

-    public override ICollection<V> this[K k] {

-      get {

-        ICollection<V> values;

-        return base.Find(k, out values) && values != null ? values : new HashSet<V>();

-      }

-      set {

-        base[k] = value;

-      }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/PointLocation.cs b/mcs/class/Mono.C5/UserGuideExamples/PointLocation.cs
deleted file mode 100644
index 88f24aa91db..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/PointLocation.cs
+++ /dev/null
@@ -1,774 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.Diagnostics;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace PointLocation

-{

-  //public enum Site { Cell,Edge,Outside}

-  /// <summary>

-  /// A line segment with associated data of type T for the cell 

-  /// to its right respectively left.

-  /// </summary>

-  public struct Edge<T>

-    {

-      public double xs, ys, xe, ye;

-      

-      public T right, left;

-      

-      public Edge(double xs, double ys, double xe, double ye, T right, T left)

-	{

-	  this.xs = xs;

-	  this.ys = ys;

-	  this.xe = xe;

-	  this.ye = ye;

-	  this.right = right;

-	  this.left = left;

-	}

-      

-      

-      public T Cell(bool upper)

-	{

-	  return (DoubleComparer.StaticCompare(xs, xe) < 0) == upper ? left : right;

-	}

-      

-      

-      public override string ToString()

-	{

-	  return String.Format("[({0:G5};{1:G5})->({2:G5};{3:G5})/R:{4} L:{5}]", xs, ys, xe, ye, right, left);

-	}

-    }

-  

-  

-  

-  /// <summary>

-  /// A data structure for point location in a plane divided into

-  /// cells by edges. This is the classical use of persistent trees

-  /// by Sarnak and Tarjan [?]. See de Berg et al for alternatives.

-  /// 

-  /// The internal data is an outer sorted dictionary that maps each

-  /// x coordinate of an endpoint of some edge to an inner sorted set

-  /// of the edges crossing or touching the vertical line at that x

-  /// coordinate, the edges being ordered by their y coordinates

-  /// to the immediate right of x. Lookup of a point (x,y) is done by

-  /// finding the predecessor of x cell the outer dictionary and then locating

-  /// the edges above and below (x,y) by searching in the inner sorted set.

-  /// 

-  /// The creation of the inner sorted sets is done by maintaining a

-  /// (persistent) tree of edges, inserting and deleting edges according

-  /// to a horzontal sweep of the edges while saving a snapshot of the

-  /// inner tree in the outer dictionary at each new x coordinate.

-  ///

-  /// If there are n edges, there will be 2n updates to the inner tree,

-  /// and in the worst case, the inner tree will have size Omega(n) for

-  /// Omega(n) snapshots. We will use O(n*logn) time and O(n) space for

-  /// sorting the endpoints. If we use a nodecopying persistent inner tree,

-  /// we will use O(n) space and time for building the data structure proper.

-  /// If we use a pathcopy persistent tree, we will use O(n*logn) time and

-  /// space for the data struicture. Finally, if we use a non-persistent

-  /// tree with a full copy for snapshot, we may use up to O(n^2) space and

-  /// time for building the datastructure.

-  ///

-  /// Lookup will take O(logn) time in any case, but taking the memory

-  /// hierarchy into consideration, a low space use is very beneficial

-  /// for large problems.

-  ///

-  /// The code assumes that the given set of edges is correct, in particular

-  /// that they do not touch at interior points (e.g. cross or coincide). 

-  /// </summary>

-	

-  public class PointLocator<T>

-  {

-    private TreeDictionary<double,ISorted<Edge<T>>> htree;

-    

-    private EdgeComparer<T> lc = new EdgeComparer<T>();

-    

-    private SCG.IComparer<EndPoint> epc = new EndPoint(0, 0, true, 0);

-    

-    private DoubleComparer dc = new DoubleComparer();

-    

-    private TreeDictionary<EndPoint,Edge<T>> endpoints;

-    

-    private int count;

-    

-    private bool built = false;

-    

-    public PointLocator()

-    {

-      //htree = new TreeDictionary<double,TreeSet<Edge<T>>>(dc);

-      endpoints = new TreeDictionary<EndPoint,Edge<T>>(epc);

-    }

-    

-    public PointLocator(SCG.IEnumerable<Edge<T>> edges)

-    {

-      //htree = new TreeDictionary<double,TreeSet<Edge<T>>>(dc);

-      endpoints = new TreeDictionary<EndPoint,Edge<T>>(epc);

-      foreach (Edge<T> edge in edges)

-	add(edge);

-    }

-    

-    private void add(Edge<T> edge)

-    {

-      int c = DoubleComparer.StaticCompare(edge.xs, edge.xe);

-      

-      if (c == 0)

-	return;

-      

-      endpoints.Add(new EndPoint(edge.xs, edge.ys, c < 0, count), edge);

-      endpoints.Add(new EndPoint(edge.xe, edge.ye, c > 0, count++), edge);

-    }

-

-    public void Add(Edge<T> edge)

-    {

-      if (built)

-	throw new InvalidOperationException("PointLocator static when built");

-      add(edge);

-    }

-    

-    public void AddAll(SCG.IEnumerable<Edge<T>> edges)

-    {

-      if (built)

-	throw new InvalidOperationException("PointLocator static when built");

-      

-      foreach (Edge<T> edge in edges)

-	add(edge);

-    }

-    

-    public void Build()

-    {

-      //htree.Clear();

-      htree = new TreeDictionary<double,ISorted<Edge<T>>>(dc);

-      

-      TreeSet<Edge<T>> vtree = new TreeSet<Edge<T>>(lc);

-      double lastx = Double.NegativeInfinity;

-      

-      foreach (KeyValuePair<EndPoint,Edge<T>> p in endpoints)

-	{

-	  if (dc.Compare(p.Key.x,lastx)>0)

-	    {

-	      //Put an empty snapshot at -infinity!

-	      htree[lastx] = (ISorted<Edge<T>>)(vtree.Snapshot());

-	      lc.X = lastx = p.Key.x;

-	      lc.compareToRight = false;

-	    }

-	  

-	  if (p.Key.start)

-	    {

-	      if (!lc.compareToRight)

-		lc.compareToRight = true;

-	      Debug.Assert(vtree.Check());

-	      bool chk = vtree.Add(p.Value);

-	      Debug.Assert(vtree.Check());

-	      

-	      Debug.Assert(chk,"edge was not added!",""+p.Value);

-	    }

-	  else

-	    {

-	      Debug.Assert(!lc.compareToRight);

-	      

-	      Debug.Assert(vtree.Check("C"));

-	      

-	      bool chk = vtree.Remove(p.Value);

-	      Debug.Assert(vtree.Check("D"));

-	      

-	      Debug.Assert(chk,"edge was not removed!",""+p.Value);

-	    }

-	}

-      lc.compareToRight = true;

-      

-      htree[lastx] = (TreeSet<Edge<T>>)(vtree.Snapshot());

-      built = true;

-    }

-    

-    

-    /*public void Clear()

-      {

-      endpoints.Clear();

-      htree.Clear();

-      }*/

-    /// <summary>

-    /// Find the cell, if any, containing (x,y).

-    /// </summary>

-    /// <param name="x">x coordinate of point</param>

-    /// <param name="y">y coordinate of point</param>

-    /// <param name="below">Associate data of cell according to edge below</param>

-    /// <param name="above">Associate data of cell according to edge above</param>

-    /// <returns>True if point is inside some cell</returns>

-    public bool Place(double x, double y, out T cell)

-    {

-      if (!built)

-	throw new InvalidOperationException("PointLocator must be built first");

-      

-      KeyValuePair<double,ISorted<Edge<T>>> p = htree.WeakPredecessor(x);

-      

-      //if (DoubleComparer.StaticCompare(cell.key,x)==0)

-      //Just note it, we have thrown away the vertical edges!

-      Edge<T> low, high;

-      bool lval, hval;

-      PointComparer<T> c = new PointComparer<T>(x, y);

-      

-      //Return value true here means we are at an edge.

-      //But note that if x is in htree.Keys, we may be at a

-      //vertical edge even if the return value is false here.

-      //Therefore we do not attempt to sort out completely the case

-      //where (x,y) is on an edge or even on several edges,

-      //and just deliver some cell it is in.

-      p.Value.Cut(c, out low, out lval, out high, out hval);

-      if (!lval || !hval)

-	{

-	  cell = default(T);

-	  return false;

-	}

-      else

-	{

-	  cell = low.Cell(true);//high.Cell(false);

-	  return true;

-	}

-    }

-    

-    public void Place(double x, double y, out T upper, out bool hval, out T lower, out bool lval)

-    {

-      if (!built)

-	throw new InvalidOperationException("PointLocator must be built first");

-      

-      KeyValuePair<double,ISorted<Edge<T>>> p = htree.WeakPredecessor(x);

-      

-      //if (DoubleComparer.StaticCompare(cell.key,x)==0)

-      //Just note it, we have thrown away the vertical edges!

-      Edge<T> low, high;

-      PointComparer<T> c = new PointComparer<T>(x, y);

-      

-      //Return value true here means we are at an edge.

-      //But note that if x is in htree.Keys, we may be at a

-      //vertical edge even if the return value is false here.

-      //Therefore we do not attempt to sort out completely the case

-      //where (x,y) is on an edge or even on several edges,

-      //and just deliver some cell it is in.

-      p.Value.Cut(c, out low, out lval, out high, out hval);

-      upper = hval ? high.Cell(false) : default(T);

-      lower = lval ? low.Cell(true) : default(T);

-      return; 

-    }

-    

-    public void Test(double x, double y)

-    {

-      T cell;

-      

-      if (Place(x, y, out cell))

-	Console.WriteLine("({0}; {1}): <- {2} ", x, y, cell);

-      else

-	Console.WriteLine("({0}; {1}): -", x, y);

-    }

-    

-    /// <summary>

-    /// Endpoint of an edge with ordering/comparison according to x

-    /// coordinates with arbitration by the id field. 

-    /// The client is assumed to keep the ids unique.

-    /// </summary>

-    public /*private*/ struct EndPoint: SCG.IComparer<EndPoint>

-    {

-      public double x, y;

-      

-      public bool start;

-      

-      private int id;

-      

-      

-      public EndPoint(double x, double y, bool left, int id)

-	{

-	  this.x = x;this.y = y;this.start = left;this.id = id;

-	}

-      

-      

-      public int Compare(EndPoint a, EndPoint b)

-	{

-	  int c = DoubleComparer.StaticCompare(a.x, b.x);

-	  

-	  return c != 0 ? c : (a.start && !b.start) ? 1 : (!a.start && b.start) ? -1 : a.id < b.id ? -1 : a.id > b.id ? 1 : 0;

-	}

-    }

-  }

-

-  /// <summary>

-  /// Compare two doubles with tolerance. 

-  /// </summary>

-  class DoubleComparer: SCG.IComparer<double>

-  {

-    private const double eps = 1E-10;

-    

-    public int Compare(double a, double b)

-    {

-      return a > b + eps ? 1 : a < b - eps ? -1 : 0;

-    }

-

-    public static int StaticCompare(double a, double b)

-    {

-      return a > b + eps ? 1 : a < b - eps ? -1 : 0;

-    }

-  }

-

-  /// <summary>

-  /// Compare a given point (x,y) to edges: is the point above, at or below

-  /// the edge. Assumes edges not vertical. 

-  /// </summary>

-  class PointComparer<T>: IComparable<Edge<T>>

-  {

-    private double x, y;

-    

-    public PointComparer(double x, double y)

-    {

-      this.x = x; this.y = y;

-    }

-    

-    public int CompareTo(Edge<T> a)

-    {

-      double ya = (a.ye - a.ys) / (a.xe - a.xs) * (x - a.xs) + a.ys;

-      

-      return DoubleComparer.StaticCompare(y, ya);

-    }

-    

-    public bool Equals(Edge<T> a) { return CompareTo(a) == 0; }

-  }

-

-  /// <summary>

-  /// Compare two edges at a given x coordinate:

-  /// Compares the y-coordinate  to the immediate right of x of the two edges.

-  /// Assumes edges to be compared are not vertical.

-  /// </summary>

-  class EdgeComparer<T>: SCG.IComparer<Edge<T>>

-  {

-    private double x;

-    

-    public bool compareToRight = true;

-    

-    public double X { get { return x; } set { x = value; } }

-    

-    public int Compare(Edge<T> line1, Edge<T> line2)

-    {

-      double a1 = (line1.ye - line1.ys) / (line1.xe - line1.xs);

-      double a2 = (line2.ye - line2.ys) / (line2.xe - line2.xs);

-      double ya = a1 * (x - line1.xs) + line1.ys;

-      double yb = a2 * (x - line2.xs) + line2.ys;

-      int c = DoubleComparer.StaticCompare(ya, yb);

-      

-      return c != 0 ? c : (compareToRight ? 1 : -1) * DoubleComparer.StaticCompare(a1, a2);

-    }

-  }

-

-  namespace Test

-    {

-      public class Ugly : EnumerableBase<Edge<int>>, SCG.IEnumerable<Edge<int>>, SCG.IEnumerator<Edge<int>>

-      {

-	private int level = -1, maxlevel;

-	

-	private bool leftend = false;

-	

-	public Ugly(int maxlevel)

-	{

-	  this.maxlevel = maxlevel;

-	}

-	

-	public override SCG.IEnumerator<Edge<int>> GetEnumerator()

-	{

-	  return (SCG.IEnumerator<Edge<int>>)MemberwiseClone();

-	}

-	

-	public void Reset()

-	{

-	  level = -1;

-	  leftend = false;

-	}

-	

-	public bool MoveNext()

-	{

-	  if (level > maxlevel)

-	    throw new InvalidOperationException();

-	  

-	  if (leftend)

-	    {

-	      leftend = false;

-	      return true;

-	    }

-	  else

-	    {

-	      leftend = true;

-	      return ++level <= maxlevel;

-	    }

-	}

-	

-	public Edge<int> Current

-	{

-	  get

-	    {

-	      if (level < 0 || level > maxlevel)

-		throw new InvalidOperationException();

-	      

-	      double y = (level * 37) % maxlevel;

-	      double deltax = leftend ? 1 : maxlevel;

-	      

-	      if (leftend)

-		return new Edge<int>(0, y, level, y - 0.5, 0, 0);

-	      else

-		return new Edge<int>(level, y - 0.5, level, y, 0, 0);

-	    }

-	}

-	

-	

-	public void Dispose() { }

-	

-#region IEnumerable Members

-

-	System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-	{

-	  throw new Exception("The method or operation is not implemented.");

-	}

-

-#endregion

-	

-#region IEnumerator Members

-	

-	object System.Collections.IEnumerator.Current

-	{

-	  get { throw new Exception("The method or operation is not implemented."); }

-	}

-	

-	void System.Collections.IEnumerator.Reset()

-	{

-	  throw new Exception("The method or operation is not implemented.");

-	}

-	

-#endregion

-      }

-

-      public class TestUgly

-      {

-	private Ugly ugly;

-	

-	private int d;

-	

-	private PointLocator<int> pointlocator;

-	

-	

-	public TestUgly(int d)

-	{

-	  this.d = d;

-	  ugly = new Ugly(d);

-	}

-	

-	

-	public double Traverse()

-	{

-	  double xsum = 0;

-	  

-	  foreach (Edge<int> e in ugly)	xsum += e.xe;

-	  

-	  return xsum;

-	}

-	

-	public bool LookUp(int count, int seed)

-	{

-	  Random random = new Random(seed);

-	  bool res = false;

-	  

-	  for (int i = 0; i < count; i++)

-	    {

-	      int cell;

-	      

-	      res ^= pointlocator.Place(random.NextDouble() * d, random.NextDouble() * d, out cell);

-	    }

-	  

-	  return res;

-	}

-

-	public static void Run(string[] args)

-	{

-	  int d = args.Length >= 2 ? int.Parse(args[1]) : 400;//00;

-	  int repeats = args.Length >= 3 ? int.Parse(args[2]) : 10;

-	  int lookups = args.Length >= 4 ? int.Parse(args[3]) : 500;//00;

-	  

-	  new TestUgly(d).run(lookups);

-	}

-	

-	

-	public void run(int lookups)

-	{

-	  double s = 0;

-	  

-	  s += Traverse();

-	  

-	  pointlocator = new PointLocator<int>(ugly);

-	  pointlocator.Build();

-	  

-	  LookUp(lookups, 567);

-	}

-      }

-      

-      public class Lattice : EnumerableBase<Edge<string>>, SCG.IEnumerable<Edge<string>>, SCG.IEnumerator<Edge<string>>, System.Collections.IEnumerator

-      {

-	private int currenti = -1, currentj = 0, currentid = 0;

-	

-	private bool currenthoriz = true;

-	

-	private int maxi, maxj;

-	

-	private double a11 = 1, a21 = -1, a12 = 1, a22 = 1;

-	

-	public Lattice(int maxi, int maxj, double a11, double a21, double a12, double a22)

-	{

-	  this.maxi = maxi;

-	  this.maxj = maxj;

-	  this.a11 = a11;

-	  this.a12 = a12;

-	  this.a21 = a21;

-	  this.a22 = a22;

-	}

-

-	public Lattice(int maxi, int maxj)

-	{

-	  this.maxi = maxi;

-	  this.maxj = maxj;

-	}

-	

-	public override SCG.IEnumerator<Edge<string>> GetEnumerator()

-	{

-	  return (SCG.IEnumerator<Edge<string>>)MemberwiseClone();

-	}

-	

-	public void Reset()

-	{

-	  currenti = -1;

-	  currentj = 0;

-	  currentid = -1;

-	  currenthoriz = true;

-	}

-	

-	public bool MoveNext()

-	{

-	  currentid++;

-	  if (currenthoriz)

-	    {

-	      if (++currenti >= maxi)

-		{

-		  if (currentj >= maxj)

-		    return false;

-		  

-		  currenti = 0;

-		  currenthoriz = false;

-		}

-	      

-	      return true;

-	    }

-	  else

-	    {

-	      if (++currenti > maxi)

-		{

-		  currenti = 0;

-		  currenthoriz = true;

-		  if (++currentj > maxj)

-		    return false;

-		}

-	      

-	      return true;

-	    }

-	}

-	

-	

-	private string i2l(int i)

-	{

-	  int ls = 0, j = i;

-	  

-	  do { ls++; j = j / 26 - 1; } while (j >= 0);

-	  

-	  char[] res = new char[ls];

-	  

-	  while (ls > 0) { res[--ls] = (char)(65 + i % 26); i = i / 26 - 1; }

-	  

-	  //res[0]--;

-	  return new String(res);

-	}

-	

-	

-	private string fmtid(int i, int j)

-	{

-	  return "";//cell + ";" + cell;

-	  /*if (cell < 0 || cell < 0 || cell >= maxi || cell >= maxj)

-	    return "Outside";

-	    

-	    return String.Format("{0}{1}", i2l(cell), cell);*/

-	}

-	

-	

-	public Edge<string> Current

-	{

-	  get

-	    {

-	      if (currenti >= maxi && currentj >= maxj)

-		throw new InvalidOperationException();

-	      

-	      double xs = currenti * a11 + currentj * a12;

-	      double ys = currenti * a21 + currentj * a22;

-	      double deltax = currenthoriz ? a11 : a12;

-	      double deltay = currenthoriz ? a21 : a22;

-	      string r = fmtid(currenti, currenthoriz ? currentj - 1 : currentj);

-	      string l = fmtid(currenthoriz ? currenti : currenti - 1, currentj);

-	      

-	      return new Edge<string>(xs, ys, xs + deltax, ys + deltay, r, l);

-	    }

-	}

-	

-	

-	public void Dispose() { }

-	

-#region IEnumerable Members

-	

-	System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

-	{

-	  throw new Exception("The method or operation is not implemented.");

-	}

-	

-#endregion

-	

-#region IEnumerator Members

-	

-	object System.Collections.IEnumerator.Current

-	{

-	  get { throw new Exception("The method or operation is not implemented."); }

-	}

-	

-	bool System.Collections.IEnumerator.MoveNext()

-	{

-	  throw new Exception("The method or operation is not implemented.");

-	}

-	

-	void System.Collections.IEnumerator.Reset()

-	{

-	  throw new Exception("The method or operation is not implemented.");

-	}

-	

-#endregion

-      }

-      

-      public class TestLattice

-      {

-	private Lattice lattice;

-	

-	private int d;

-	

-	private PointLocator<string> pointlocator;

-	

-	

-	public TestLattice(int d)

-	{

-	  this.d = d;

-	  lattice = new Lattice(d, d, 1, 0, 0, 1);

-	}

-

-	public TestLattice(int d, double shear)

-	{

-	  this.d = d;

-	  lattice = new Lattice(d, d, 1, 0, shear, 1);

-	}

-

-	public double Traverse()

-	{

-	  double xsum = 0;

-	  

-	  foreach (Edge<string> e in lattice)	xsum += e.xe;

-	  

-	  return xsum;

-	}

-	

-	

-	public bool LookUp(int count, int seed)

-	{

-	  Random random = new Random(seed);

-	  bool res = false;

-	  

-	  for (int i = 0; i < count; i++)

-	    {

-	      string cell;

-	      

-	      res ^= pointlocator.Place(random.NextDouble() * d, random.NextDouble() * d, out cell);

-	    }

-	  

-	  return res;

-	}

-	

-	

-	public static void Run()

-	{

- 	  int d = 200;

- 	  int repeats = 2;

- 	  int lookups = 50000;

- 	  TestLattice tl = null;

-	  

- 	  Console.WriteLine("TestLattice Run({0}), means over {1} repeats:", d, repeats);

- 	  tl = new TestLattice(d, 0.000001);

-

- 	  tl.Traverse();

-	  

- 	  tl.pointlocator = new PointLocator<string>();

-	  

- 	  tl.pointlocator.AddAll(tl.lattice);

-	  

- 	  tl.pointlocator.Build();

-	  

- 	  tl.LookUp(lookups, 567);

-	}

-	

-	

-	public void BasicRun()

-	{

-	  pointlocator.Test(-0.5, -0.5);

-	  pointlocator.Test(-0.5, 0.5);

-	  pointlocator.Test(-0.5, 1.5);

-	  pointlocator.Test(0.5, -0.5);

-	  pointlocator.Test(0.5, 0.5);

-	  pointlocator.Test(0.5, 1.5);

-	  pointlocator.Test(1.5, -0.5);

-	  pointlocator.Test(1.5, 0.5);

-	  pointlocator.Test(1.5, 1.5);

-	  pointlocator.Test(1.5, 4.99);

-	  pointlocator.Test(1.5, 5);

-	  pointlocator.Test(1.5, 5.01);

-	  pointlocator.Test(1.99, 4.99);

-	  pointlocator.Test(1.99, 5);

-	  pointlocator.Test(1.99, 5.01);

-	  pointlocator.Test(2, 4.99);

-	  pointlocator.Test(2, 5);

-	  pointlocator.Test(2, 5.01);

-	  pointlocator.Test(2.01, 4.99);

-	  pointlocator.Test(2.01, 5);

-	  pointlocator.Test(2.01, 5.01);

-	}

-      }

-    }

-

-  public class TestPointLocation {

-    public static void Main(String[] args) {

-      Test.TestUgly.Run(new String[0]);

-    }

-  }

-}

-

diff --git a/mcs/class/Mono.C5/UserGuideExamples/RandomSelection.cs b/mcs/class/Mono.C5/UserGuideExamples/RandomSelection.cs
deleted file mode 100644
index 8049758ad67..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/RandomSelection.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: RandomSelection.cs for pattern chapter

-

-// Compile with 

-//   csc /r:C5.dll RandomSelection.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace RandomSelection {

-  class RandomSelection {

-    public static void Main(String[] args) {

-      ArrayList<int> list = new ArrayList<int>(), copy1, copy2;

-      list.AddAll(new int[] { 2, 3, 5, 7, 11, 13, 17, 19 });

-      copy1 = (ArrayList<int>)list.Clone();

-      copy2 = (ArrayList<int>)list.Clone();

-      const int N = 7;

-      Console.WriteLine("-- With replacement:");

-      foreach (int x in RandomWith(list, N))

-        Console.Write("{0} ", x);

-      Console.WriteLine("\n-- Without replacement:");

-      foreach (int x in RandomWithout1(copy1, N))

-        Console.Write("{0} ", x);

-      Console.WriteLine("\n-- Without replacement:");

-      foreach (int x in RandomWithout2(copy2, N))

-        Console.Write("{0} ", x);

-      Console.WriteLine();

-    }

-

-    private static readonly C5Random rnd = new C5Random();

-

-    // Select N random items from coll, with replacement.

-    // Does not modify the given list.

-

-    public static SCG.IEnumerable<T> RandomWith<T>(IIndexed<T> coll, int N) {

-      for (int i=N; i>0; i--) { 

-        T x = coll[rnd.Next(coll.Count)];

-        yield return x;

-      }

-    }

-

-    // Select N random items from list, without replacement.

-    // Modifies the given list.

-

-    public static SCG.IEnumerable<T> RandomWithout1<T>(IList<T> list, int N) {

-      list.Shuffle(rnd);     

-      foreach (T x in list.View(0, N)) 

-        yield return x;

-    }

-

-    // Select N random items from list, without replacement.

-    // Faster when list is efficiently indexable and modifiable.

-    // Modifies the given list.

-

-    public static SCG.IEnumerable<T> RandomWithout2<T>(ArrayList<T> list, int N) {

-      for (int i=N; i>0; i--) { 

-        int j = rnd.Next(list.Count);

-        T x = list[j], replacement = list.RemoveLast();

-        if (j < list.Count) 

-          list[j] = replacement;

-        yield return x;

-      }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/ReadOnlyPatterns.cs b/mcs/class/Mono.C5/UserGuideExamples/ReadOnlyPatterns.cs
deleted file mode 100644
index feb3cf12ec8..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/ReadOnlyPatterns.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: ReadOnlyPatterns.cs for pattern chapter

-

-// Compile with 

-//   csc /r:C5.dll ReadOnlyPatterns.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace ReadOnlyPatterns {

-  class ReadOnlyPatterns {

-    public static void Main(String[] args) {

-      GuardHashSet<int>();

-      GuardTreeSet<int>();

-      GuardList<int>();

-      GuardHashDictionary<int,int>();

-      GuardSortedDictionary<int,int>();

-    }

-

-    // Read-only access to a hash-based collection

-    

-    static void GuardHashSet<T>() {

-      ICollection<T> coll = new HashSet<T>();

-      DoWork(new GuardedCollection<T>(coll));

-    }

-

-    static void DoWork<T>(ICollection<T> gcoll) { 

-      // Use gcoll ... 

-    }

-

-    // Read-only access to an indexed sorted collection

-

-    static void GuardTreeSet<T>() {

-      IIndexedSorted<T> coll = new TreeSet<T>(); 

-      DoWork(new GuardedIndexedSorted<T>(coll));

-    }

-    

-    static void DoWork<T>(IIndexedSorted<T> gcoll) { 

-      // Use gcoll ...

-    }

-

-    // Read-only access to a list

-

-    static void GuardList<T>() {

-      IList<T> coll = new ArrayList<T>(); 

-      DoWork(new GuardedList<T>(coll));

-    }

-    

-    static void DoWork<T>(IList<T> gcoll) { 

-      // Use gcoll ...

-    }

-

-    // Read-only access to a dictionary

-

-    static void GuardHashDictionary<K,V>() {

-      IDictionary<K,V> dict = new HashDictionary<K,V>(); 

-      DoWork(new GuardedDictionary<K,V>(dict));

-    }

-    

-    static void DoWork<K,V>(IDictionary<K,V> gdict) { 

-      // Use gdict ...

-    }

-

-    // Read-only access to a sorted dictionary

-

-    static void GuardSortedDictionary<K,V>() {

-      ISortedDictionary<K,V> dict = new TreeDictionary<K,V>(); 

-      DoWork(new GuardedSortedDictionary<K,V>(dict));

-    }

-    

-    static void DoWork<K,V>(ISortedDictionary<K,V> gdict) { 

-      // Use gdict ...

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Sets.cs b/mcs/class/Mono.C5/UserGuideExamples/Sets.cs
deleted file mode 100644
index 0ddbeef7a06..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Sets.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: functional sets 2004-12-21

-

-// Compile with 

-//   csc /r:C5.dll Sets.cs 

-

-using System;

-using System.Text;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace Sets {

-  // The class of sets with item type T, implemented as a subclass of

-  // HashSet<T> but with functional infix operators * + - that compute

-  // intersection, union and difference functionally.  That is, they

-  // create a new set object instead of modifying an existing one.

-  // The hasher is automatically created so that it is appropriate for

-  // T.  In particular, this is true when T has the form Set<W> for

-  // some W, since Set<W> implements ICollectionValue<W>.

-

-  public class Set<T> : HashSet<T> {

-    public Set(SCG.IEnumerable<T> enm) : base() {

-      AddAll(enm);

-    }

-

-    public Set(params T[] elems) : this((SCG.IEnumerable<T>)elems) { }

-

-    // Set union (+), difference (-), and intersection (*):

-

-    public static Set<T> operator +(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set+Set");

-      else {

-        Set<T> res = new Set<T>(s1);

-        res.AddAll(s2);

-        return res;

-      }

-    }

-

-    public static Set<T> operator -(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set-Set");

-      else {

-        Set<T> res = new Set<T>(s1);

-        res.RemoveAll(s2);

-        return res;

-      }

-    }

-

-    public static Set<T> operator *(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set*Set");

-      else {

-        Set<T> res = new Set<T>(s1);

-        res.RetainAll(s2);

-        return res;

-      }

-    }

-

-    // Equality of sets; take care to avoid infinite loops

-

-    public static bool operator ==(Set<T> s1, Set<T> s2) {

-      return EqualityComparer<Set<T>>.Default.Equals(s1, s2);

-    }

-

-    public static bool operator !=(Set<T> s1, Set<T> s2) {

-      return !(s1 == s2);

-    }

-

-    public override bool Equals(Object that) {

-      return this == (that as Set<T>);

-    }

-

-    public override int GetHashCode() {

-      return EqualityComparer<Set<T>>.Default.GetHashCode(this);

-    }

-

-    // Subset (<=) and superset (>=) relation:

-

-    public static bool operator <=(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set<=Set");

-      else

-        return s1.ContainsAll(s2);

-    }

-

-    public static bool operator >=(Set<T> s1, Set<T> s2) {

-      if (s1 == null || s2 == null) 

-        throw new ArgumentNullException("Set>=Set");

-      else

-        return s2.ContainsAll(s1);

-    }

-    

-    public override String ToString() {

-      StringBuilder sb = new StringBuilder();

-      sb.Append("{");

-      bool first = true;

-      foreach (T x in this) {

-        if (!first)

-          sb.Append(",");

-        sb.Append(x);

-        first = false;

-      }

-      sb.Append("}");

-      return sb.ToString();

-    }

-  }

-

-  class MyTest {

-    public static void Main(String[] args) {

-      Set<int> s1 = new Set<int>(2, 3, 5, 7, 11);

-      Set<int> s2 = new Set<int>(2, 4, 6, 8, 10);

-      Console.WriteLine("s1 + s2 = {0}", s1 + s2);

-      Console.WriteLine("s1 * s2 = {0}", s1 * s2);

-      Console.WriteLine("s1 - s2 = {0}", s1 - s2);

-      Console.WriteLine("s1 - s1 = {0}", s1 - s1);

-      Console.WriteLine("s1 + s1 == s1 is {0}", s1 + s1 == s1);

-      Console.WriteLine("s1 * s1 == s1 is {0}", s1 * s1 == s1);

-      Set<Set<int>> ss1 = new Set<Set<int>>(s1, s2, s1 + s2);

-      Console.WriteLine("ss1 = {0}", ss1);

-      Console.WriteLine("IntersectionClose(ss1) = {0}", IntersectionClose(ss1));

-      Set<Set<int>> ss2 =

-        new Set<Set<int>>(new Set<int>(2, 3), new Set<int>(1, 3), new Set<int>(1, 2));

-      Console.WriteLine("ss2 = {0}", ss2);

-      Console.WriteLine("IntersectionClose(ss2) = {0}", IntersectionClose(ss2));

-    }

-

-    // Given a set SS of sets of Integers, compute its intersection

-    // closure, that is, the least set TT such that SS is a subset of TT

-    // and such that for any two sets t1 and t2 in TT, their

-    // intersection is also in TT.  

-

-    // For instance, if SS is {{2,3}, {1,3}, {1,2}}, 

-    // then TT is {{2,3}, {1,3}, {1,2}, {3}, {2}, {1}, {}}.

-

-    // Both the argument and the result is a Set<Set<int>>

-

-    static Set<Set<T>> IntersectionClose<T>(Set<Set<T>> ss) {

-      IQueue<Set<T>> worklist = new CircularQueue<Set<T>>();

-      foreach (Set<T> s in ss)

-        worklist.Enqueue(s);

-      HashSet<Set<T>> tt = new HashSet<Set<T>>();

-      while (worklist.Count != 0) {

-        Set<T> s = worklist.Dequeue();

-        foreach (Set<T> t in tt) {

-          Set<T> ts = t * s;

-          if (!tt.Contains(ts))

-            worklist.Enqueue(ts);

-        }

-        tt.Add(s);

-      }

-      return new Set<Set<T>>((SCG.IEnumerable<Set<T>>)tt);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/SortedIterationPatterns.cs b/mcs/class/Mono.C5/UserGuideExamples/SortedIterationPatterns.cs
deleted file mode 100644
index 5bfe072e3a5..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/SortedIterationPatterns.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: SortedIterationPatterns.cs for pattern chapter

-

-// Compile with 

-//   csc /r:C5.dll SortedIterationPatterns.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace SortedIterationPatterns {

-  class SortedIterationPatterns {

-    public static void Main(String[] args) {

-      ISorted<int> sorted = new TreeSet<int>();

-      sorted.AddAll(new int[] { 23, 29, 31, 37, 41, 43, 47, 53 });

-      Console.WriteLine(sorted);

-      if (args.Length == 1) { 

-        int n = int.Parse(args[0]);

-        int res;

-        if (Predecessor(sorted, n, out res))

-          Console.WriteLine("{0} has predecessor {1}", n, res);

-        if (WeakPredecessor(sorted, n, out res))

-          Console.WriteLine("{0} has weak predecessor {1}", n, res);

-        if (Successor(sorted, n, out res))

-          Console.WriteLine("{0} has successor {1}", n, res);

-        if (WeakSuccessor(sorted, n, out res))

-          Console.WriteLine("{0} has weak successor {1}", n, res);

-      }

-      IterBeginEnd(sorted);

-      IterBeginEndBackwards(sorted);

-      IterIncExc(sorted, 29, 47);

-      IterIncExcBackwards(sorted, 29, 47);

-      IterIncEnd(sorted, 29);

-      IterBeginExc(sorted, 47);

-      IterIncInc(sorted, 29, 47);

-      IterBeginInc(sorted, 47);

-      IterExcExc(sorted, 29, 47);

-      IterExcEnd(sorted, 29);

-      IterExcInc(sorted, 29, 47);

-    }

-

-    // --- Predecessor and successor patterns --------------------

-

-    // Find weak successor of y in coll, or return false

-

-    public static bool WeakSuccessor<T>(ISorted<T> coll, T y, out T ySucc) 

-      where T : IComparable<T>

-    {

-      T yPred;

-      bool hasPred, hasSucc, 

-        hasY = coll.Cut(y, out yPred, out hasPred, out ySucc, out hasSucc);

-      if (hasY)

-        ySucc = y;

-      return hasY || hasSucc;

-    }

-

-    // Find weak predecessor of y in coll, or return false

-

-    public static bool WeakPredecessor<T>(ISorted<T> coll, T y, out T yPred) 

-      where T : IComparable<T>

-    {

-      T ySucc;

-      bool hasPred, hasSucc, 

-        hasY = coll.Cut(y, out yPred, out hasPred, out ySucc, out hasSucc);

-      if (hasY) 

-        yPred = y;

-      return hasY || hasPred;

-    }

-

-    // Find (strict) successor of y in coll, or return false

-

-    public static bool Successor<T>(ISorted<T> coll, T y, out T ySucc) 

-      where T : IComparable<T>

-    {

-      bool hasPred, hasSucc;

-      T yPred;

-      coll.Cut(y, out yPred, out hasPred, out ySucc, out hasSucc);

-      return hasSucc;

-    }

-

-    // Find (strict) predecessor of y in coll, or return false

-

-    public static bool Predecessor<T>(ISorted<T> coll, T y, out T yPred) 

-      where T : IComparable<T>

-    {

-      bool hasPred, hasSucc;

-      T ySucc;

-      coll.Cut(y, out yPred, out hasPred, out ySucc, out hasSucc);

-      return hasPred;

-    }

-

-    // --- Sorted iteration patterns -----------------------------

-

-    // Iterate over all items

-    

-    public static void IterBeginEnd<T>(ISorted<T> coll) {

-      foreach (T x in coll) { 

-        Console.Write("{0} ", x);

-      }

-      Console.WriteLine();

-    }

-

-    // Iterate over all items, backwards

-    

-    public static void IterBeginEndBackwards<T>(ISorted<T> coll) {

-      foreach (T x in coll.Backwards()) { 

-        Console.Write("{0} ", x);

-      }

-      Console.WriteLine();

-    }

-

-    // Iterate over [x1,x2[

-    

-    public static void IterIncExc<T>(ISorted<T> coll, T x1, T x2) {

-      foreach (T x in coll.RangeFromTo(x1, x2)) { 

-        Console.Write("{0} ", x);

-      }

-      Console.WriteLine();

-    }

-

-    // Iterate over [x1,x2[, backwards

-    

-    public static void IterIncExcBackwards<T>(ISorted<T> coll, T x1, T x2) {

-      foreach (T x in coll.RangeFromTo(x1, x2).Backwards()) { 

-        Console.Write("{0} ", x);

-      }

-      Console.WriteLine();

-    }

-

-    // Iterate over [x1...]

-    

-    public static void IterIncEnd<T>(ISorted<T> coll, T x1) {

-      foreach (T x in coll.RangeFrom(x1)) { 

-        Console.Write("{0} ", x);

-      }

-      Console.WriteLine();

-    }

-

-    // Iterate over [...x2[

-    

-    public static void IterBeginExc<T>(ISorted<T> coll, T x2) {

-      foreach (T x in coll.RangeTo(x2)) { 

-        Console.Write("{0} ", x);

-      }

-      Console.WriteLine();

-    }

-

-    // Iterate over [x1...x2]

-    

-    public static void IterIncInc<T>(ISorted<T> coll, T x1, T x2) 

-      where T : IComparable<T>

-    {

-      T x2Succ; 

-      bool x2HasSucc = Successor(coll, x2, out x2Succ);

-      IDirectedEnumerable<T> range = 

-        x2HasSucc ? coll.RangeFromTo(x1, x2Succ) : coll.RangeFrom(x1);

-      foreach (T x in range) {

-        Console.Write("{0} ", x);

-      } 

-      Console.WriteLine();

-    }

-

-    // Iterate over [...x2]

-    

-    public static void IterBeginInc<T>(ISorted<T> coll, T x2) 

-      where T : IComparable<T>

-    {

-      T x2Succ; 

-      bool x2HasSucc = Successor(coll, x2, out x2Succ);

-      IDirectedEnumerable<T> range = 

-        x2HasSucc ? coll.RangeTo(x2Succ) : coll.RangeAll();

-      foreach (T x in range) {

-        Console.Write("{0} ", x);

-      } 

-      Console.WriteLine();

-    }

-

-    // Iterate over ]x1...x2[

-    

-    public static void IterExcExc<T>(ISorted<T> coll, T x1, T x2)

-      where T : IComparable<T>

-    {

-      T x1Succ;

-      bool x1HasSucc = Successor(coll, x1, out x1Succ);

-      IDirectedEnumerable<T> range = 

-        x1HasSucc ? coll.RangeFromTo(x1Succ, x2) : new ArrayList<T>();

-      foreach (T x in range) {

-        Console.Write("{0} ", x);

-      } 

-      Console.WriteLine();

-    }

-

-    // Iterate over ]x1...]

-    

-    public static void IterExcEnd<T>(ISorted<T> coll, T x1) 

-      where T : IComparable<T>

-    {

-      T x1Succ;

-      bool x1HasSucc = Successor(coll, x1, out x1Succ);

-      IDirectedEnumerable<T> range = 

-        x1HasSucc ? coll.RangeFrom(x1Succ) : new ArrayList<T>();

-      foreach (T x in range) {

-        Console.Write("{0} ", x);

-      } 

-      Console.WriteLine();

-    }

-

-    // Iterate over ]x1...x2]

-    

-    public static void IterExcInc<T>(ISorted<T> coll, T x1, T x2) 

-      where T : IComparable<T>

-    {

-      T x1Succ, x2Succ;

-      bool x1HasSucc = Successor(coll, x1, out x1Succ),

-           x2HasSucc = Successor(coll, x2, out x2Succ);

-      IDirectedEnumerable<T> range = 

-        x1HasSucc ? (x2HasSucc ? coll.RangeFromTo(x1Succ, x2Succ) 

-                               : coll.RangeFrom(x1Succ))

-                  : new ArrayList<T>();

-      foreach (T x in range) {

-        Console.Write("{0} ", x);

-      } 

-      Console.WriteLine();

-    }

-

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/SortingPermutation.cs b/mcs/class/Mono.C5/UserGuideExamples/SortingPermutation.cs
deleted file mode 100644
index 83c135012b7..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/SortingPermutation.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// C5 example

-// 2004-11

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace SortingPermutation

-{

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      String[] cities = 

-      { "Tokyo", "Beijing", "Hangzhou", "Kyoto", "Beijing", "Copenhagen", "Seattle" };

-      IList<String> alst = new ArrayList<String>();

-      alst.AddAll<String>(cities);

-      foreach (int i in MySort.GetPermutation1(alst))

-        Console.Write("{0} ", i);

-      Console.WriteLine();

-      IList<String> llst = new LinkedList<String>();

-      llst.AddAll<String>(cities);

-      foreach (int i in MySort.GetPermutation2(llst))

-        Console.Write("{0} ", i);

-      Console.WriteLine();

-      Console.WriteLine("The rank of the cities:");

-      ArrayList<int> res = MySort.GetPermutation1(MySort.GetPermutation2(llst));

-      foreach (int i in res)

-        Console.Write("{0} ", i);

-      Console.WriteLine();

-    }

-  }

-

-  class MySort

-  {

-    // Fast for array lists and similar, but not stable; slow for linked lists

-

-    public static ArrayList<int> GetPermutation1<T>(IList<T> lst)

-      where T : IComparable<T>

-    {

-      ArrayList<int> res = new ArrayList<int>(lst.Count);

-      for (int i = 0; i < lst.Count; i++)

-        res.Add(i);

-      res.Sort(new DelegateComparer<int>

-               (delegate(int i, int j) { return lst[i].CompareTo(lst[j]); }));

-      return res;

-    }

-

-    // Stable and fairly fast both for array lists and linked lists, 

-    // but does copy the collection's items. 

-

-    public static ArrayList<int> GetPermutation2<T>(IList<T> lst)

-      where T : IComparable<T>

-    {

-      int i = 0;

-      IList<KeyValuePair<T, int>> zipList =

-        lst.Map<KeyValuePair<T, int>>

-            (delegate(T x) { return new KeyValuePair<T, int>(x, i++); });

-      zipList.Sort(new KeyValueComparer<T>(lst));

-      ArrayList<int> res = new ArrayList<int>(lst.Count);

-      foreach (KeyValuePair<T, int> p in zipList)

-        res.Add(p.Value);

-      return res;

-    }

-

-    private class KeyValueComparer<T> : SCG.IComparer<KeyValuePair<T, int>>

-      where T : IComparable<T>

-    {

-      private readonly IList<T> lst;

-      public KeyValueComparer(IList<T> lst)

-      {

-        this.lst = lst;

-      }

-      public int Compare(KeyValuePair<T, int> p1, KeyValuePair<T, int> p2)

-      {

-        return p1.Key.CompareTo(p2.Key);

-      }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/TestSortedArray.cs b/mcs/class/Mono.C5/UserGuideExamples/TestSortedArray.cs
deleted file mode 100644
index 15a814b4bc0..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/TestSortedArray.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: anagrams 2004-12-08

-

-// Compile with 

-//   csc /r:C5.dll TestSortedArray.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace TestSortedArray {

-  class TestSortedArray {

-    public static void Main(String[] args) {

-      SortedArray<Object> sarr = new SortedArray<Object>();

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/ThisFun.cs b/mcs/class/Mono.C5/UserGuideExamples/ThisFun.cs
deleted file mode 100644
index 1fd29f1c122..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/ThisFun.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Experiment: implicit conversion of indexer to function

-// sestoft@dina.kvl.dk * 2005-11-08

-

-using System;

-using C5;

-

-class MyFunTest {

-  public static void Main(String[] args) {

-    FooBar fb = new FooBar();

-    IList<int> list = new LinkedList<int>();

-    list.AddAll(new int[] { 2, 3, 5, 7, 11 });

-    list.Map<double>(fb).Apply(Console.WriteLine);

-    list.Apply(fb);

-  }

-}

-

-class FooBar {

-  public double this[int x] { 

-    get { 

-      Console.WriteLine(x); 

-      return x + 1.5; 

-    } 

-  }

-

-  public Fun<int,double> Fun {

-    get { 

-      return delegate(int x) { return this[x]; };

-    }

-  }

-

-  public Act<int> Act {

-    get { 

-      return delegate(int x) { double junk = this[x]; };

-    }

-  }

-  

-  public static implicit operator Fun<int,double>(FooBar fb) {

-    return delegate(int x) { return fb[x]; };

-  }  

-

-  public static implicit operator Act<int>(FooBar fb) {

-    return delegate(int x) { double junk = fb[x]; };

-  }  

-}

-

-

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Toposort.cs b/mcs/class/Mono.C5/UserGuideExamples/Toposort.cs
deleted file mode 100644
index e078f6a5bee..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Toposort.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: topological sorting 2005-09-09

-

-// Compile with 

-//   csc /r:C5.dll Toposort.cs 

-

-using System;

-using System.Text;

-using C5;

-using SCG = System.Collections.Generic;

-using SDD = System.Diagnostics.Debug;

-

-namespace Toposort {

-  class TestToposort {

-    public static void Main(String[] args) {

-      Node<String> 

-        d = new Node<String>("d"), 

-        e = new Node<String>("e"),

-        c = new Node<String>("c", d, e),

-        b = new Node<String>("b", d),

-        a = new Node<String>("a", d, b, c);

-      foreach (Node<String> n in Toposort0(a))

-        Console.WriteLine(n);

-      Console.WriteLine();

-      foreach (Node<String> n in Toposort1(a))

-        Console.WriteLine(n);

-      Console.WriteLine();

-      foreach (Node<String> n in Toposort2(a))

-        Console.WriteLine(n);

-    }

-

-    // Toposort 0, adding each node when finished, after its descendants.

-    // Classic depth-first search.  Does not terminate on cyclic graphs.

-    

-    public static IList<Node<T>> Toposort0<T>(params Node<T>[] starts) {

-      HashedLinkedList<Node<T>> sorted = new HashedLinkedList<Node<T>>();

-      foreach (Node<T> start in starts) 

-        if (!sorted.Contains(start)) 

-          AddNode0(sorted, start);

-      return sorted; 

-    }

-

-    private static void AddNode0<T>(IList<Node<T>> sorted, Node<T> node) {

-      SDD.Assert(!sorted.Contains(node));

-      foreach (Node<T> child in node.children) 

-        if (!sorted.Contains(child)) 

-          AddNode0(sorted, child);

-      sorted.InsertLast(node);

-    }

-

-    // Toposort 1, using hash index to add each node before its descendants.

-    // Terminates also on cyclic graphs.

-    

-    public static IList<Node<T>> Toposort1<T>(params Node<T>[] starts) {

-      HashedLinkedList<Node<T>> sorted = new HashedLinkedList<Node<T>>();

-      foreach (Node<T> start in starts) 

-        if (!sorted.Contains(start)) {

-          sorted.InsertLast(start);

-          AddNode1(sorted, start);

-        }

-      return sorted; 

-    }

-

-    private static void AddNode1<T>(IList<Node<T>> sorted, Node<T> node) {

-      SDD.Assert(sorted.Contains(node));

-      foreach (Node<T> child in node.children) 

-        if (!sorted.Contains(child)) {

-          sorted.ViewOf(node).InsertFirst(child);

-          AddNode1(sorted, child);

-        }

-    }

-

-    // Toposort 2, node rescanning using a view.

-    // Uses no method call stack and no extra data structures, but slower.

-

-    public static IList<Node<T>> Toposort2<T>(params Node<T>[] starts) {

-      HashedLinkedList<Node<T>> sorted = new HashedLinkedList<Node<T>>();

-      foreach (Node<T> start in starts) 

-        if (!sorted.Contains(start)) {

-          sorted.InsertLast(start);

-          using (IList<Node<T>> cursor = sorted.View(sorted.Count-1,1)) {

-            do { 

-              Node<T> child;

-              while (null != (child = PendingChild(sorted, cursor.First))) {

-                cursor.InsertFirst(child);

-                cursor.Slide(0,1);

-              }

-            } while (cursor.TrySlide(+1));

-          }

-        }

-      return sorted; 

-    }

-

-    static Node<T> PendingChild<T>(IList<Node<T>> sorted, Node<T> node) {

-      foreach (Node<T> child in node.children) 

-        if (!sorted.Contains(child))

-          return child;

-      return null;

-    }

-  }

-

-  class Node<T> { 

-    public readonly T id;

-    public readonly Node<T>[] children;

-

-    public Node(T id, params Node<T>[] children) { 

-      this.id = id; this.children = children;

-    }

-

-    public override String ToString() { 

-      return id.ToString();

-    }

-

-    public Node<T> this[int i] {

-      set { children[i] = value; }

-      get { return children[i]; }

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/TreeTraversal.cs b/mcs/class/Mono.C5/UserGuideExamples/TreeTraversal.cs
deleted file mode 100644
index 0fbc2478aec..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/TreeTraversal.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// C5 example

-// 2004-11-09

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace TreeTraversal

-{

-  class MyTest

-  {

-    public static void Main(String[] args)

-    {

-      Tree<int> t = MakeTree(1, 15);

-      Act<int> act = delegate(int val) { Console.Write("{0} ", val); };

-      Console.WriteLine("Depth-first:");

-      Tree<int>.DepthFirst(t, act);

-      Console.WriteLine("\nBreadth-first:");

-      Tree<int>.BreadthFirst(t, act);

-      Console.WriteLine("\nDepth-first:");

-      Tree<int>.Traverse(t, act, new ArrayList<Tree<int>>());

-      Console.WriteLine("\nBreadth-first:");

-      Tree<int>.Traverse(t, act, new LinkedList<Tree<int>>());

-      Console.WriteLine();

-    }

-

-    // Build n-node tree with root numbered b and other nodes numbered b+1..b+n

-    public static Tree<int> MakeTree(int b, int n)

-    {

-      if (n == 0)

-        return null;

-      else

-      {

-        int k = n / 2;

-        Tree<int> t1 = MakeTree(b + 1, k), t2 = MakeTree(b + k + 1, n - 1 - k);

-        return new Tree<int>(b, t1, t2);

-      }

-    }

-  }

-

-  class Tree<T>

-  {

-    private T val;

-    private Tree<T> t1, t2;

-    public Tree(T val) : this(val, null, null) { }

-    public Tree(T val, Tree<T> t1, Tree<T> t2)

-    {

-      this.val = val; this.t1 = t1; this.t2 = t2;

-    }

-

-    public static void DepthFirst(Tree<T> t, Act<T> act)

-    {

-      IStack<Tree<T>> work = new ArrayList<Tree<T>>();

-      work.Push(t);

-      while (!work.IsEmpty)

-      {

-        Tree<T> cur = work.Pop();

-        if (cur != null)

-        {

-          work.Push(cur.t2);

-          work.Push(cur.t1);

-          act(cur.val);

-        }

-      }

-    }

-

-    public static void BreadthFirst(Tree<T> t, Act<T> act)

-    {

-      IQueue<Tree<T>> work = new CircularQueue<Tree<T>>();

-      work.Enqueue(t);

-      while (!work.IsEmpty)

-      {

-        Tree<T> cur = work.Dequeue();

-        if (cur != null)

-        {

-          work.Enqueue(cur.t1);

-          work.Enqueue(cur.t2);

-          act(cur.val);

-        }

-      }

-    }

-

-    public static void Traverse(Tree<T> t, Act<T> act, IList<Tree<T>> work)

-    {

-      work.Clear();

-      work.Add(t);

-      while (!work.IsEmpty)

-      {

-        Tree<T> cur = work.Remove();

-        if (cur != null)

-        {

-          if (work.FIFO)

-          {

-            work.Add(cur.t1);

-            work.Add(cur.t2);

-          }

-          else

-          {

-            work.Add(cur.t2);

-            work.Add(cur.t1);

-          }

-          act(cur.val);

-        }

-      }

-    }

-  }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/Try.cs b/mcs/class/Mono.C5/UserGuideExamples/Try.cs
deleted file mode 100644
index 6617ffad48d..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Try.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: various tests 2005-01-01

-

-// Compile with 

-//   csc /r:C5.dll Try.cs 

-

-using System;

-using System.Text;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace Try

-{

-  class MyTest

-  {

-    public static void Main()

-    {

-      IList<bool> list = new ArrayList<bool>();

-      list.AddAll(new bool[] { false, false, true, true, false });

-      list.CollectionCleared 

-	+= delegate(Object coll, ClearedEventArgs args) {

-	  ClearedRangeEventArgs crargs = args as ClearedRangeEventArgs;

-	  if (crargs != null) {

-	    Console.WriteLine("Cleared {0} to {1}", 

-			      crargs.Start, crargs.Start+crargs.Count-1);

-	  } else {

-	    Console.WriteLine("Cleared {0} items", args.Count);

-	  }

-	};

-      list.RemoveInterval(2, 2);

-      HashSet<int> hash = new HashSet<int>();

-      hash.ItemsRemoved 

-	+= delegate {

-	  Console.WriteLine("Item was removed");

-	};

-      hash.ItemsAdded 

-	+= delegate {

-	  Console.WriteLine("Item was added");

-	};

-      hash.UpdateOrAdd(2);

-      hash.UpdateOrAdd(2);

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj b/mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj
deleted file mode 100644
index f2559711fd9..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{B2A29FF2-A5C5-4F07-8CE7-FF5D744D7562}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <RootNamespace>UserGuideExamples</RootNamespace>

-    <AssemblyName>UserGuideExamples</AssemblyName>

-    <WarningLevel>4</WarningLevel>

-    <StartupObject>

-    </StartupObject>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>.\bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <OutputPath>.\bin\Release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-  </PropertyGroup>

-  <ItemGroup>

-    <Compile Include="AnagramHashBag.cs" />

-    <Compile Include="Anagrams.cs" />

-    <Compile Include="AnagramStrings.cs" />

-    <Compile Include="AnagramTreeBag.cs" />

-    <Compile Include="Antipatterns.cs" />

-    <Compile Include="Cloning.cs" />

-    <Compile Include="CollectionCollection.cs" />

-    <Compile Include="CollectionSanity.cs" />

-    <Compile Include="EventPatterns.cs" />

-    <Compile Include="GettingStarted.cs" />

-    <Compile Include="Graph.cs" />

-    <Compile Include="Fileindex.cs" />

-    <Compile Include="GCHForm.cs">

-      <SubType>Form</SubType>

-    </Compile>

-    <Compile Include="GConvexHull.cs" />

-    <Compile Include="GNfaToDfa.cs" />

-    <Compile Include="HashCodes.cs" />

-    <Compile Include="Jobqueue.cs" />

-    <Compile Include="KeywordRecognition.cs" />

-    <Compile Include="ListPatterns.cs" />

-    <Compile Include="Locking.cs" />

-    <Compile Include="MultiCollection.cs" />

-    <Compile Include="MultiDictionary.cs" />

-    <Compile Include="PointLocation.cs" />

-    <Compile Include="RandomSelection.cs" />

-    <Compile Include="ReadOnlyPatterns.cs" />

-    <Compile Include="Sets.cs" />

-    <Compile Include="SortedIterationPatterns.cs" />

-    <Compile Include="SortingPermutation.cs" />

-    <Compile Include="TestSortedArray.cs" />

-    <Compile Include="ThisFun.cs" />

-    <Compile Include="Toposort.cs" />

-    <Compile Include="TreeTraversal.cs" />

-    <Compile Include="Try.cs" />

-    <Compile Include="ViewPatterns.cs" />

-    <Compile Include="Views.cs" />

-    <Compile Include="WrappedArray.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <EmbeddedResource Include="GCHForm.resx">

-      <DependentUpon>GCHForm.cs</DependentUpon>

-    </EmbeddedResource>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\C5\C5.csproj">

-      <Project>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Name>C5</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="Makefile" />

-  </ItemGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Drawing" />

-    <Reference Include="System.Windows.Forms" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-</Project>
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/UserGuideExamples/ViewPatterns.cs b/mcs/class/Mono.C5/UserGuideExamples/ViewPatterns.cs
deleted file mode 100644
index c1330ed6f10..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/ViewPatterns.cs
+++ /dev/null
@@ -1,340 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: ViewPatterns 2005-07-22

-

-// Compile with 

-//   csc /r:C5.dll ViewPatterns.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace ViewPatterns {

-  class Views {

-    public static void Main(String[] args) {

-      IList<char> lst = new ArrayList<char>();

-      lst.AddAll<char>(new char[] { 'a', 'b', 'c', 'd' });

-      IList<char> v1 = lst.View(1, 1);

-      Console.WriteLine("v1 = {0}", v1);

-      InsertBeforeFirst(v1, '<', 'b');

-      InsertAfterFirst(v1, '>', 'b');

-      Console.WriteLine("v1 = {0}", v1);

-      char x; 

-      if (SequencePredecessor(v1, 'b', out x)) 

-        Console.WriteLine("Predecessor of b is " + x);

-      if (SequenceSuccessor(v1, 'b', out x)) 

-        Console.WriteLine("Successor of b is " + x);

-      if (!SequencePredecessor(v1, 'c', out x)) 

-        Console.WriteLine("c has no predecessor");

-      if (!SequenceSuccessor(v1, 'a', out x)) 

-        Console.WriteLine("a has no successor");

-      IList<char> lst2 = new ArrayList<char>();

-      lst2.AddAll<char>(new char[] { 'a', 'b', 'c', 'A', 'a', 'd', 'a' });

-      foreach (int i in IndexesOf(lst2, 'a')) 

-        Console.Write("{0} ", i);

-      Console.WriteLine();

-      foreach (int i in ReverseIndexesOf(lst2, 'a')) 

-        Console.Write("{0} ", i);

-      Console.WriteLine();

-      Console.WriteLine(lst2);

-      IList<char> view = lst2.View(2,0);

-      InsertAtView(lst2, view, 'y');

-      Console.WriteLine(lst2);

-      InsertIntoView(view, 'x');

-      Console.WriteLine(lst2);

-    }

-

-    // --- Patterns for zero-item views -----------------------------

-

-    // Number of items before zero-item view

-   

-    public static int ItemsBefore<T>(IList<T> view) {

-      return view.Offset;

-    }

-

-    // Number of items after zero-item view

-   

-    public static int ItemsAfter<T>(IList<T> view) {

-      return view.Underlying.Count - view.Offset;

-    }

-

-    // Move (zero-item) view one item to the left

-   

-    public static void MoveLeft<T>(IList<T> view) {

-      // One of these:

-      view.Slide(-1);

-      view.TrySlide(-1);

-    }

-

-    // Move (zero-item) view one item to the right

-   

-    public static void MoveRight<T>(IList<T> view) {

-      // One of these:

-      view.Slide(+1);

-      view.TrySlide(+1);

-    }

-

-    // Test whether (zero-item) view is at beginning of list

-   

-    public static bool AtBeginning<T>(IList<T> view) {

-      return view.Offset == 0;

-    }

-

-    // Test whether (zero-item) view is at end of list

-   

-    public static bool AtEnd<T>(IList<T> view) {

-      return view.Offset == view.Underlying.Count;

-    }

-

-    // Insert x into zero-item view and into underlying list

-   

-    public static void InsertIntoView<T>(IList<T> view, T x) {

-      view.Add(x);

-    }

-

-    // Insert x into list at zero-item view 

-   

-    public static void InsertAtView<T>(IList<T> list, IList<T> view, T x) {

-      list.Insert(view, x);

-    }

-

-    // Delete the item before zero-item view 

-   

-    public static void DeleteBefore<T>(IList<T> view) {

-      view.Slide(-1,1).RemoveFirst();

-    }

-

-    // Delete the item after zero-item view 

-   

-    public static void DeleteAfter<T>(IList<T> view) {

-      view.Slide(0,1).RemoveFirst();

-    }

-

-    // Get the zero-item view at left endpoint.  Succeeds on all lists

-    // and valid views.

-

-    public static IList<T> LeftEndView<T>(IList<T> list) {

-      return list.View(0,0);

-    }

-

-    // Get the zero-item view at right endpoint.  Succeeds on all

-    // lists and valid views.

-

-    public static IList<T> RightEndView<T>(IList<T> list) {

-      return list.View(list.Count,0);

-    }

-

-

-    // --- Patterns for one-item views ------------------------------

-

-    // Find the sequence predecessor x of y; or throw exception

-

-    public static T SequencePredecessor<T>(IList<T> list, T y) {

-      return list.ViewOf(y).Slide(-1)[0];

-    }  

-    

-    // Find the sequence predecessor x of y; or return false 

-

-    public static bool SequencePredecessor<T>(IList<T> list, T y, out T x) {

-      IList<T> view = list.ViewOf(y);

-      bool ok = view != null && view.TrySlide(-1);

-      x = ok ? view[0] : default(T);

-      return ok;

-    }  

-

-    // Find the sequence successor x of y; or throw exception

-

-    public static T SequenceSuccessor<T>(IList<T> list, T y) {

-      return list.ViewOf(y).Slide(+1)[0];

-    }  

-

-    // Find the sequence successor x of y; or return false

-

-    public static bool SequenceSuccessor<T>(IList<T> list, T y, out T x) {

-      IList<T> view = list.ViewOf(y);

-      bool ok = view != null && view.TrySlide(+1);

-      x = ok ? view[0] : default(T);

-      return ok;

-    }  

-

-    // Insert x into list after first occurrence of y (or throw

-    // NullReferenceException).

-    

-    public static void InsertAfterFirst<T>(IList<T> list, T x, T y) {

-      list.Insert(list.ViewOf(y), x);

-    }

-

-    // Insert x into list before first occurrence of y (or throw

-    // NullReferenceException)

-    

-    public static void InsertBeforeFirst<T>(IList<T> list, T x, T y) {

-      list.Insert(list.ViewOf(y).Slide(0, 0), x);

-    }

-

-    // Insert x into list after last occurrence of y (or throw

-    // NullReferenceException).

-    

-    public static void InsertAfterLast<T>(IList<T> list, T x, T y) {

-      list.Insert(list.LastViewOf(y), x);

-    }

-

-    // Insert x into list before last occurrence of y (or throw

-    // NullReferenceException)

-    

-    public static void InsertBeforeLast<T>(IList<T> list, T x, T y) {

-      list.Insert(list.LastViewOf(y).Slide(0, 0), x);

-    }

-

-    // Same meaning as InsertBeforeFirst on a proper list, but not on

-    // a view

-

-    public static void InsertBeforeFirstAlt<T>(IList<T> list, T x, T y) {

-      list.ViewOf(y).InsertFirst(x);

-    }

-

-    // Delete the sequence predecessor of first y; or throw exception

-

-    public static T RemovePredecessorOfFirst<T>(IList<T> list, T y) {

-      return list.ViewOf(y).Slide(-1).Remove();

-    }

-

-    // Delete the sequence successor of first y; or throw exception

-

-    public static T RemoveSuccessorOfFirst<T>(IList<T> list, T y) {

-      return list.ViewOf(y).Slide(+1).Remove();

-    }

-

-    // --- Other view patterns --------------------------------------

-

-    // Replace the first occurrence of each x from xs by y in list:

-    

-    public static void ReplaceXsByY<T>(HashedLinkedList<T> list, T[] xs, T y) {

-      foreach (T x in xs) {

-        using (IList<T> view = list.ViewOf(x)) {

-          if (view != null) { 

-            view.Remove();

-            view.Add(y);

-          }

-        }

-      }

-    }

-

-    // Get index in underlying list of view's left end

-    

-    public static int LeftEndIndex<T>(IList<T> view) { 

-      return view.Offset;

-    }

-

-    // Get index in underlying list of view's right end

-

-    public static int RightEndIndex<T>(IList<T> view) { 

-      return view.Offset + view.Count;

-    }

-

-    // Test whether views overlap 

-

-    public static bool Overlap<T>(IList<T> u, IList<T> w) { 

-      if (u.Underlying == null || u.Underlying != w.Underlying) 

-        throw new ArgumentException("views must have same underlying list");

-      else

-        return u.Offset < w.Offset+w.Count && w.Offset < u.Offset+u.Count;

-    }

-

-    // Find the length of the overlap between two views

-

-    public static int OverlapLength<T>(IList<T> u, IList<T> w) { 

-      if (Overlap(u, w))

-        return Math.Min(u.Offset+u.Count, w.Offset+w.Count) 

-             - Math.Max(u.Offset, w.Offset);

-      else

-        return -1; // No overlap

-    }

-

-    // Test whether view u contains view v 

-

-    public static bool ContainsView<T>(IList<T> u, IList<T> w) { 

-      if (u.Underlying == null || u.Underlying != w.Underlying) 

-        throw new ArgumentException("views must have same underlying list");

-      else

-        if (w.Count > 0)

-          return u.Offset <= w.Offset && w.Offset+w.Count <= u.Offset+u.Count;

-        else

-          return u.Offset < w.Offset && w.Offset < u.Offset+u.Count;

-    }

-

-    // Test whether views u and v have (or are) the same underlying list

-

-    public static bool SameUnderlying<T>(IList<T> u, IList<T> w) { 

-      return (u.Underlying ?? u) == (w.Underlying ?? w);

-    }

-

-    // Find the index of the first item that satisfies p

-

-    public static int FindFirstIndex<T>(IList<T> list, Fun<T,bool> p) {

-      using (IList<T> view = list.View(0, 0)) {

-        while (view.TrySlide(0, 1)) {

-          if (p(view.First)) 

-            return view.Offset;

-          view.Slide(+1, 0);

-        }

-      }

-      return -1;

-    }

-

-    // Find the index of the last item that satisfies p

-    

-    public static int FindLastIndex<T>(IList<T> list, Fun<T,bool> p) {

-      using (IList<T> view = list.View(list.Count, 0)) {

-        while (view.TrySlide(-1, 1)) {

-          if (p(view.First)) 

-            return view.Offset;

-        }

-      }

-      return -1;

-    }

-

-    // Yield indexes of all items equal to x, in list order:

-

-    public static SCG.IEnumerable<int> IndexesOf<T>(IList<T> list, T x) { 

-      IList<T> tail = list.View(0, list.Count);

-      tail = tail.ViewOf(x);

-      while (tail != null) {

-        yield return tail.Offset;

-        tail = tail.Slide(+1,0).Span(list);

-        tail = tail.ViewOf(x); 

-      }

-    }

-

-    // Yield indexes of items equal to x, in reverse list order.

-

-    public static SCG.IEnumerable<int> ReverseIndexesOf<T>(IList<T> list, T x) {

-      IList<T> head = list.View(0, list.Count);

-      head = head.LastViewOf(x);

-      while (head != null) {

-        yield return head.Offset;

-        head = list.Span(head.Slide(0,0));

-        head = head.LastViewOf(x);

-      }

-    }

-

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/Views.cs b/mcs/class/Mono.C5/UserGuideExamples/Views.cs
deleted file mode 100644
index 6cf96bf1291..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/Views.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: Views 2004-12-29 OBSOLETE

-

-// Compile with 

-//   csc /r:C5.dll Views.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace Views {

-  class Views {

-    public static void Main(String[] args) {

-      IList<char> lst = new LinkedList<char>();

-      lst.AddAll<char>(new char[] { 'a', 'b', 'c', 'd' });

-      IList<char> 

-        A = lst.View(0, 2),

-        B = lst.View(2, 0),

-        C = lst.View(2, 1),

-        D = lst.View(3, 1),

-        E = lst.View(4, 0),

-        F = lst.View(1, 2),

-        G = lst.View(0, 4);

-      IList<char>[] views = { A, B, C, D, E, F, G };

-      Console.WriteLine("ABCDEFG overlaps with:");

-      foreach (IList<char> u in views) {

-        foreach (IList<char> w in views) 

-          Console.Write(Overlap(u, w) ? '+' : '-');

-        Console.WriteLine();

-      }   

-      Console.WriteLine("ABCDEFG overlap length:");

-      foreach (IList<char> u in views) {

-        foreach (IList<char> w in views) {

-          int len = OverlapLength(u, w);

-          Console.Write(len >= 0 ? String.Format("{0}", len) : " ");

-        }

-        Console.WriteLine();

-      }   

-      Console.WriteLine("ABCDEFG contained in:");

-      foreach (IList<char> u in views) {

-        foreach (IList<char> w in views) 

-          Console.Write(ContainsView(u, w) ? '+' : '-');

-        Console.WriteLine();

-      }   

-    }

-    

-    public static int LeftEndIndex<T>(IList<T> u) { 

-      return u.Offset;

-    }

-

-    public static int RightEndIndex<T>(IList<T> u) { 

-      return u.Offset+u.Count;

-    }

-

-    public static bool Overlap<T>(IList<T> u, IList<T> w) { 

-      if (u.Underlying == null || u.Underlying != w.Underlying) 

-        throw new ArgumentException("views must have same underlying list");

-      else

-        return u.Offset < w.Offset+w.Count && w.Offset < u.Offset+u.Count;

-    }

-

-    public static int OverlapLength<T>(IList<T> u, IList<T> w) { 

-      if (Overlap(u, w))

-	return Math.Min(u.Offset+u.Count, w.Offset+w.Count) 

-	     - Math.Max(u.Offset, w.Offset);

-      else

-	return -1; // No overlap

-    }

-

-    public static bool ContainsView<T>(IList<T> u, IList<T> w) { 

-      if (u.Underlying == null || u.Underlying != w.Underlying) 

-        throw new ArgumentException("views must have same underlying list");

-      else

-        if (w.Count > 0)

-          return u.Offset <= w.Offset && w.Offset+w.Count <= u.Offset+u.Count;

-        else

-          return u.Offset < w.Offset && w.Offset < u.Offset+u.Count;

-    }

-

-    public static bool SameUnderlying<T>(IList<T> u, IList<T> w) { 

-      return (u.Underlying ?? u) == (w.Underlying ?? w);

-    }

-

-    // Replace the first occurrence of each x from xs by y in list:

-    

-    public static void ReplaceXsByY<T>(HashedLinkedList<T> list, T[] xs, T y) {

-      foreach (T x in xs) {

-        using (IList<T> view = list.ViewOf(x)) {

-          if (view != null) { 

-            view.Remove();

-            view.Add(y);

-          }

-        }

-      }

-    }

-

-    // Find first item that satisfies p

-

-    public static bool Find<T>(IList<T> list, Fun<T,bool> p, out T res) {

-      IList<T> view = list.View(0, 0);

-      while (view.Offset < list.Count) {

-        view.Slide(+1, 1);

-        if (p(view.First)) {

-          res = view.First;

-          return true;

-        }

-      }

-      res = default(T);

-      return false;

-    }

-

-    // Or, using that the list is enumerable:

-

-    public static bool Find1<T>(IList<T> list, Fun<T,bool> p, out T res) {

-      foreach (T x in list) { 

-        if (p(x)) {

-          res = x;

-          return true;

-        }

-      }

-      res = default(T);

-      return false;

-    }

-

-    // Find last item that satisfies p

-

-    public static bool FindLast<T>(IList<T> list, Fun<T,bool> p, out T res) {

-      IList<T> view = list.View(list.Count, 0);

-      while (view.Offset > 0) {

-        view.Slide(-1, 1);

-        if (p(view.First)) {

-          res = view.First;

-          return true;

-        }

-      }

-      res = default(T);

-      return false;

-    }

-  }

-}

diff --git a/mcs/class/Mono.C5/UserGuideExamples/WrappedArray.cs b/mcs/class/Mono.C5/UserGuideExamples/WrappedArray.cs
deleted file mode 100644
index 398b9bf5b44..00000000000
--- a/mcs/class/Mono.C5/UserGuideExamples/WrappedArray.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// C5 example: WrappedArray 2005-07-21

-

-// Compile with 

-//   csc /r:C5.dll WrappedArray.cs 

-

-using System;

-using C5;

-using SCG = System.Collections.Generic;

-

-namespace WrappedArray {

-  class WrappedArray {

-    public static void Main(String[] args) {

-    }

-

-

-    // System.Array.Exists

-

-    public static bool Exists<T>(T[] arr, Fun<T,bool> p) {

-      return new WrappedArray<T>(arr).Exists(p);

-    }  

-

-    // System.Array.TrueForAll

-

-    public static bool TrueForAll<T>(T[] arr, Fun<T,bool> p) {

-      return new WrappedArray<T>(arr).All(p);

-    }  

-

-    // System.Array.Find(T[], Predicate)

-    // This loses the valuable bool returned by C5 Find.

-

-    public static T Find<T>(T[] arr, Fun<T,bool> p) {

-      T res; 

-      new WrappedArray<T>(arr).Find(p, out res);

-      return res;

-    }  

-

-    // System.Array.FindAll(T[], Predicate)

-

-    public static T[] FindAll<T>(T[] arr, Fun<T,bool> p) {

-      return new WrappedArray<T>(arr).FindAll(p).ToArray();

-    }  

-

-    // System.Array.FindIndex(T[], Predicate)

-

-    public static int FindIndex<T>(T[] arr, Fun<T,bool> p) {

-      return new WrappedArray<T>(arr).FindIndex(p);

-    }  

-

-    // System.Array.FindIndex(T[], int, Predicate)

-

-    public static int FindIndex<T>(T[] arr, int i, Fun<T,bool> p) {

-      int j = new WrappedArray<T>(arr).View(i,arr.Length-i).FindIndex(p);

-      return j < 0 ? j : j+i;

-    }  

-

-    // System.Array.FindIndex(T[], int, int, Predicate)

-

-    public static int FindIndex<T>(T[] arr, int i, int n, Fun<T,bool> p) {

-      int j = new WrappedArray<T>(arr).View(i,n).FindIndex(p);

-      return j < 0 ? j : j+i;

-    }  

-

-    // System.Array.FindLast(T[], Predicate)

-    // This loses the valuable bool returned by C5 Find.

-

-    public static T FindLast<T>(T[] arr, Fun<T,bool> p) {

-      T res; 

-      new WrappedArray<T>(arr).FindLast(p, out res);

-      return res;

-    }  

-

-    // System.Array.FindLastIndex(T[], Predicate)

-

-    public static int FindLastIndex<T>(T[] arr, Fun<T,bool> p) {

-      return new WrappedArray<T>(arr).FindIndex(p);

-    }  

-

-    // System.Array.FindLastIndex(T[], int, Predicate)

-

-    public static int FindLastIndex<T>(T[] arr, int i, Fun<T,bool> p) {

-      int j = new WrappedArray<T>(arr).View(i,arr.Length-i).FindIndex(p);

-      return j < 0 ? j : j+i;

-    }  

-

-    // System.Array.FindLastIndex(T[], int, int, Predicate)

-

-    public static int FindLastIndex<T>(T[] arr, int i, int n, Fun<T,bool> p) {

-      int j = new WrappedArray<T>(arr).View(i,n).FindIndex(p);

-      return j < 0 ? j : j+i;

-    }  

-    

-    // System.Array.ForEach(T[], Action)

-

-    public static void ForEach<T>(T[] arr, Act<T> act) {

-      new WrappedArray<T>(arr).Apply(act);

-    }  

-

-    // System.Array.IndexOf(T[], T)

-

-    public static int IndexOf<T>(T[] arr, T x) {

-      int j = new WrappedArray<T>(arr).IndexOf(x);

-      return j < 0 ? -1 : j;

-    }  

-    

-    // System.Array.IndexOf(T[], T, int)

-

-    public static int IndexOf<T>(T[] arr, T x, int i) {

-      int j = new WrappedArray<T>(arr).View(i, arr.Length-i).IndexOf(x);

-      return j < 0 ? -1 : j+i;

-    }  

-    

-    // System.Array.IndexOf(T[], T, int, int)

-

-    public static int IndexOf<T>(T[] arr, T x, int i, int n) {

-      int j = new WrappedArray<T>(arr).View(i, n).IndexOf(x);

-      return j < 0 ? -1 : j+i;

-    }  

-

-    // System.Array.LastIndexOf(T[], T)

-

-    public static int LastIndexOf<T>(T[] arr, T x) {

-      int j = new WrappedArray<T>(arr).LastIndexOf(x);

-      return j < 0 ? -1 : j;

-    }  

-    

-    // System.Array.LastIndexOf(T[], T, int)

-

-    public static int LastIndexOf<T>(T[] arr, T x, int i) {

-      int j = new WrappedArray<T>(arr).View(i, arr.Length-i).LastIndexOf(x);

-      return j < 0 ? -1 : j+i;

-    }  

-    

-    // System.Array.LastIndexOf(T[], T, int, int)

-

-    public static int LastIndexOf<T>(T[] arr, T x, int i, int n) {

-      int j = new WrappedArray<T>(arr).View(i, n).LastIndexOf(x);

-      return j < 0 ? -1 : j+i;

-    }  

-

-    // System.Array.Sort(T[])

-

-    public static void Sort<T>(T[] arr) {

-      new WrappedArray<T>(arr).Sort();

-    }  

-

-    // System.Array.Sort(T[], int, int)

-

-    public static void Sort<T>(T[] arr, int i, int n) {

-      new WrappedArray<T>(arr).View(i, n).Sort();

-    }  

-

-    // System.Array.Sort(T[], SCG.IComparer<T>)

-

-    public static void Sort<T>(T[] arr, SCG.IComparer<T> cmp) {

-      new WrappedArray<T>(arr).Sort(cmp);

-    }  

-    

-    // System.Array.Sort(T[], int, int, SCG.IComparer<T>)

-

-    public static void Sort<T>(T[] arr, int i, int n, SCG.IComparer<T> cmp) {

-      new WrappedArray<T>(arr).View(i, n).Sort(cmp);

-    }  

-    

-    // System.Array.Sort(T[], Comparison)

-

-    public static void Sort<T>(T[] arr, Comparison<T> csn) {

-      new WrappedArray<T>(arr).Sort(new DelegateComparer<T>(csn));

-    }  

-  }

-}

diff --git a/mcs/class/Mono.C5/C5.old/Wrappers.cs b/mcs/class/Mono.C5/Wrappers.cs
index fed4fa7eeaf..fed4fa7eeaf 100644
--- a/mcs/class/Mono.C5/C5.old/Wrappers.cs
+++ b/mcs/class/Mono.C5/Wrappers.cs
diff --git a/mcs/class/Mono.C5/add-conditional.pl b/mcs/class/Mono.C5/add-conditional.pl
deleted file mode 100755
index ac758cc9b6b..00000000000
--- a/mcs/class/Mono.C5/add-conditional.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-foreach my $file (@ARGV) {
-    open FILE,"+<",$file;
-    my $contents = "";
-    while (defined ($_ = <FILE>)) {
-	$contents .= $_;
-    }
-    truncate FILE, 0;
-    seek FILE, 0, 0;
-    print FILE "#if NET_2_0\n";
-    print FILE $contents . "\n";
-    print FILE "#endif\n";
-    close FILE;
-}
diff --git a/mcs/class/Mono.C5/C5.old/arrays/ArrayList.cs b/mcs/class/Mono.C5/arrays/ArrayList.cs
index cc7a050ce6e..cc7a050ce6e 100644
--- a/mcs/class/Mono.C5/C5.old/arrays/ArrayList.cs
+++ b/mcs/class/Mono.C5/arrays/ArrayList.cs
diff --git a/mcs/class/Mono.C5/C5.old/arrays/HashedArray.cs b/mcs/class/Mono.C5/arrays/HashedArray.cs
index c5538d99462..c5538d99462 100644
--- a/mcs/class/Mono.C5/C5.old/arrays/HashedArray.cs
+++ b/mcs/class/Mono.C5/arrays/HashedArray.cs
diff --git a/mcs/class/Mono.C5/C5.old/arrays/SortedArray.cs b/mcs/class/Mono.C5/arrays/SortedArray.cs
index 77478fbf78b..77478fbf78b 100644
--- a/mcs/class/Mono.C5/C5.old/arrays/SortedArray.cs
+++ b/mcs/class/Mono.C5/arrays/SortedArray.cs
diff --git a/mcs/class/Mono.C5/doc/AssemblyInfo.cs b/mcs/class/Mono.C5/doc/AssemblyInfo.cs
deleted file mode 100644
index 5a12cf79079..00000000000
--- a/mcs/class/Mono.C5/doc/AssemblyInfo.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-

-//

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-//

-[assembly: AssemblyTitle("")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-//

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-

-[assembly: AssemblyVersion("1.0.*")]

-

-//

-// In order to sign your assembly you must specify a key to use. Refer to the 

-// Microsoft .NET Framework documentation for more information on assembly signing.

-//

-// Use the attributes below to control which key is used for signing. 

-//

-// Notes: 

-//   (*) If no key is specified, the assembly is not signed.

-//   (*) KeyName refers to a key that has been installed in the Crypto Service

-//       Provider (CSP) on your machine. KeyFile refers to a file which contains

-//       a key.

-//   (*) If the KeyFile and the KeyName values are both specified, the 

-//       following processing occurs:

-//       (1) If the KeyName can be found in the CSP, that key is used.

-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

-//           in the KeyFile is installed into the CSP and used.

-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

-//       When specifying the KeyFile, the location of the KeyFile should be

-//       relative to the project output directory which is

-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

-//       located in the project directory, you would specify the AssemblyKeyFile 

-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

-//       documentation for more information on this.

-//

-[assembly: AssemblyDelaySign(false)]

-[assembly: AssemblyKeyFile("")]

-[assembly: AssemblyKeyName("")]

diff --git a/mcs/class/Mono.C5/doc/Test.cs b/mcs/class/Mono.C5/doc/Test.cs
deleted file mode 100644
index c30c6b6fab2..00000000000
--- a/mcs/class/Mono.C5/doc/Test.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using MSG = System.Collections.Generic;

-

-namespace Try

-{

-/*

-	/// <summary>

-	/// Affenpinscher 

-	/// </summary>

-	public class SSS<T,U>

-	{

-		/// <summary>

-		/// GGGGGGG <cell>tidlig <seealso cref="T:Try.Foo!3"/> <b alk="foo">bonny</b> namse</cell> efter

-		/// </summary>

-		/// <param name="u">zeU</param>

-		/// <param name="cell">zeI</param>

-		/// <param name="t">zeT</param>

-		/// <returns>zeReturn</returns>

-		public static T g(out U u, ref int cell, T t) { u = default(U); return default(T); }

-		

-		/// <summary>

-		/// Nested klasse

-		/// </summary>

-		public class Inner<K>

-		{

-			/// <summary>

-			/// IIIIIIIIII

-			/// </summary>

-			/// <param name="t">TTTTTTTTTT</param>

-			/// <param name="k">KKKKKKK</param>

-			/// <returns>RRRRRRRRRRR</returns>

-			public U indre(T t, K k) { return default(U); }

-		}

-        /// <summary>

-        /// Jaj ja

-        /// </summary>

-        public class NongenNested

-        {

-            /// <summary>

-            /// Det er et y

-            /// </summary>

-            public int y;

-        }

-        /// <summary>

-		/// Lolololola

-		/// </summary>

-		public U lefield;

-		/// <summary>

-		/// Cococococola

-		/// </summary>

-		public static Foo<T,U,U> gramse;

-		/// <summary>

-		/// zesum

-		/// </summary>

-		/// <value>zeval</value>

-		public SSS<T,T> leprop { get { return default(SSS<T,T>); } }

-		/// <summary>

-		/// Sju

-		/// </summary>

-		/// <param name="f">ffffffff</param>

-		/// <param name="johndoe">ffffffff</param>

-		public string s<V,X,Y,Z>(Foo<T,Y,SSS<Z,T>> f, int johndoe) { return "7"; }

-		/// <summary>

-		/// intuism

-		/// </summary>

-		/// <param name="tudse">froe</param>

-		/// <param name="frank">sin</param>

-		public SSS(T[] tudse, double frank) { }

-	}

-

-	/// <summary>

-	/// ooh 

-	/// </summary>

-

-	public class HHH

-	{

-		/// <summary>

-		/// MusseKom

-		/// </summary>

-		public class Musse { }

-	}

-

-

-

-	/// <summary>

-	/// Hejsa 

-	/// </summary>

-	public class Foo<K,L,M> { }

-

-*/

-	/// <summary>

-	/// Hejsa

-	/// </summary>

-	public delegate void Mapper<T,U>(T t);

-

-

-

-	/// <summary>

-	/// Los accoutables

-	/// </summary>

-	public interface IEnumerable<T>

-	{

-		// <summary>

-		// getegetegeteg

-		// </summary>

-		// <returns>leturn</returns>

-		//MSG.IEnumerator<T> GetEnumerator();

-

-

-		/// <summary>

-		/// Apply a delegate to all items of this collection.

-		/// </summary>

-		/// <param name="a">The delegate to apply</param>

-		void Map<U>(Mapper<T,U> a);

-	}

-}

diff --git a/mcs/class/Mono.C5/doc/Timer.cs b/mcs/class/Mono.C5/doc/Timer.cs
deleted file mode 100644
index 67751a5b489..00000000000
--- a/mcs/class/Mono.C5/doc/Timer.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-using System;

-using System.IO;

-using System.Reflection;

-using System.Xml;

-using System.Diagnostics;

-

-namespace DocNet

-{

-    class Timer

-    {

-        static System.Diagnostics.Process p;

-

-        static long sws;

-

-        static long svm;

-

-        static double stt;

-

-        static DateTime swc;

-

-        public long ws;

-

-        public long vm;

-

-        public double tt;

-

-        public DateTime wc;

-

-        public double deltat;

-

-        public double deltac;

-

-

-        public Timer()

-        {

-            if (p == null)

-            {

-                p = System.Diagnostics.Process.GetCurrentProcess();

-                stt = p.TotalProcessorTime.TotalMilliseconds;

-                sws = p.WorkingSet64;

-                svm = p.VirtualMemorySize64;

-                swc = DateTime.Now;

-            }

-        }

-

-

-        public double snap()

-        {

-            double oldt = tt;

-            DateTime oldc = wc; p.Refresh();

-            tt = p.TotalProcessorTime.TotalMilliseconds - stt;

-            deltat = tt - oldt;

-            ws = p.WorkingSet64 - sws;

-            vm = p.VirtualMemorySize64 - svm;

-            wc = DateTime.Now;

-

-            TimeSpan x = oldc.Subtract(wc);

-

-            deltac = -x.TotalMilliseconds;

-            return deltac;

-        }

-    }

-}
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/doc/docNet.csproj b/mcs/class/Mono.C5/doc/docNet.csproj
deleted file mode 100644
index e417f7689b0..00000000000
--- a/mcs/class/Mono.C5/doc/docNet.csproj
+++ /dev/null
@@ -1,83 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <ProductVersion>8.0.40607</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{42811A81-6A99-4C7A-A6DA-DF104C767B72}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <StartupObject>

-    </StartupObject>

-    <RootNamespace>docNet</RootNamespace>

-    <NoStandardLibraries>false</NoStandardLibraries>

-    <AssemblyName>docNet</AssemblyName>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <OutputPath>.\bin\Debug\</OutputPath>

-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

-    <DefineConstants>DEBUG</DefineConstants>

-    <WarningLevel>4</WarningLevel>

-    <IncrementalBuild>false</IncrementalBuild>

-    <DocumentationFile>docnet.xml</DocumentationFile>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <OutputPath>.\bin\Release\</OutputPath>

-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

-    <DefineConstants>TRACE</DefineConstants>

-    <WarningLevel>4</WarningLevel>

-    <IncrementalBuild>false</IncrementalBuild>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Xml">

-      <HintPath>..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.2.30703\System.XML.dll</HintPath>

-      <Name>System.XML</Name>

-    </Reference>

-    <ProjectReference Include="..\C5\C5.csproj">

-      <Project>{D70489CD-ABDA-48FF-BD1E-BE3F7495BE71}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Name>C5</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="docnet.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Content Include="docbuild\banner.htm" />

-    <Content Include="docbuild\docnet.css" />

-    <Content Include="docbuild\frames.htm" />

-    <Content Include="docbuild\litterature.htm" />

-    <Content Include="docbuild\userguide.htm" />

-    <Content Include="overview.xslt" />

-    <Compile Include="Test.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Timer.cs" />

-    <Content Include="trans.xslt" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="dodoc.cmd" />

-    <None Include="mkcurrent.cmd" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-    <ApplicationIcon>

-    </ApplicationIcon>

-  </PropertyGroup>

-  <ProjectExtensions>

-    <VisualStudio>

-    </VisualStudio>

-  </ProjectExtensions>

-</Project>
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/doc/docbuild/banner.htm b/mcs/class/Mono.C5/doc/docbuild/banner.htm
deleted file mode 100644
index 41cbc5f6120..00000000000
--- a/mcs/class/Mono.C5/doc/docbuild/banner.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html >

-<head>

-    <link rel="stylesheet" type="text/css" href="docnet.css">

-</head>

-<body>

-    <p>

-        <font size="6"><b>C5 documentation</b></font> Legend: <code class="greenbg">A</code>:

-        abstract, <code class="greenbg">F</code>: final, <code class="greenbg">N</code>:

-        non-virtual, <code class="greenbg">P</code>: protected, <code class="greenbg">S</code>:

-        static. &nbsp;<a href="userguide.htm" target="_blank">User's Guide</a></p>

-</body>

-</html>

diff --git a/mcs/class/Mono.C5/doc/docbuild/docnet.css b/mcs/class/Mono.C5/doc/docbuild/docnet.css
deleted file mode 100644
index b47b0693ba5..00000000000
--- a/mcs/class/Mono.C5/doc/docbuild/docnet.css
+++ /dev/null
@@ -1,131 +0,0 @@
-BODY

-{

-    FONT-FAMILY: "Verdana", sans-serif;

-    FONT-SIZE: x-small;

-}

-CODE 

-{

-    FONT-SIZE: x-small;

-}

-A:link

-{

-    COLOR: #4e4887

-}

-A:visited

-{

-    COLOR: #8080c8

-}

-A:active

-{

-    COLOR: #f16043

-}

-A:hover

-{

-    COLOR: #f16043

-}

-P

-{

-    MARGIN-BOTTOM: 0.5em;

-    MARGIN-TOP: 0.5em

-}

-.greenbg

-{

-    BACKGROUND-COLOR: #00ff00;

-    font-weight:bold

-}

-TABLE

-{

-    BORDER-BOTTOM: medium none;

-    BORDER-LEFT: medium none;

-    BORDER-RIGHT: medium none;

-    BORDER-TOP: medium none;

-}

-TD

-{

-    BACKGROUND-COLOR: #bedfff;

-    BORDER-BOTTOM: medium none;

-    BORDER-LEFT: medium none;

-    BORDER-RIGHT: medium none;

-    BORDER-TOP: medium none;

-    FONT-SIZE:x-small;

-    MARGIN: 2px;

-    PADDING-BOTTOM: 2px;

-    PADDING-LEFT: 2px;

-    PADDING-RIGHT: 2px;

-    PADDING-TOP: 2px;

-    TEXT-ALIGN: left

-}

-TH

-{

-    BACKGROUND-COLOR: #ffdfbe;

-    BORDER-BOTTOM: medium none;

-    BORDER-LEFT: medium none;

-    BORDER-RIGHT: medium none;

-    BORDER-TOP: medium none;

-    FONT-SIZE: x-small;

-    MARGIN: 2px;

-    PADDING-BOTTOM: 2px;

-    PADDING-LEFT: 2px;

-    PADDING-RIGHT: 2px;

-    PADDING-TOP: 2px;

-    TEXT-ALIGN: left

-}

-TH

-{

-    BACKGROUND-COLOR: #ffaa57

-}

-UL

-{

-    MARGIN-TOP: 0.5em

-}

-OL

-{

-    MARGIN-TOP: 0.5em

-}

-H1

-{

-    COLOR: #336699;

-    FONT-SIZE: x-large;

-    MARGIN-BOTTOM: 0.5em;

-    MARGIN-TOP: 1em;

-    PADDING-LEFT: 4px

-}

-H2

-{

-    BORDER-LEFT: #4e4887 8px solid;

-    BORDER-TOP: #4e4887 1px solid;

-    COLOR: #4e4887;

-    FONT-SIZE: medium;

-    MARGIN-BOTTOM: 0.5em;

-    MARGIN-TOP: 1em;

-    PADDING-LEFT: 4px

-}

-H3

-{

-    BORDER-LEFT: #4e4887 4px solid;

-    BORDER-TOP: #4e4887 1px solid;

-    COLOR: #4e4887;

-    FONT-SIZE: small;

-    MARGIN-BOTTOM: 0.5em;

-    MARGIN-TOP: 1em;

-    PADDING-LEFT: 4px

-}

-H4

-{

-    COLOR: #4e4887;

-    FONT-SIZE: small;

-    MARGIN-BOTTOM: 0.5em

-}

-H5

-{

-    COLOR: #4e4887;

-    FONT-SIZE: x-small;

-    MARGIN-BOTTOM: 0.5em

-}

-H6

-{

-    COLOR: #4e4887;

-    FONT-SIZE: x-small;

-    FONT-STYLE: italic;

-    MARGIN-BOTTOM: 0.5em

-}

diff --git a/mcs/class/Mono.C5/doc/docbuild/frames.htm b/mcs/class/Mono.C5/doc/docbuild/frames.htm
deleted file mode 100644
index d903905392e..00000000000
--- a/mcs/class/Mono.C5/doc/docbuild/frames.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>

-<frameset rows="84,*">

-	<frame name="banner" scrolling="no" noresize src="banner.htm">

-	<frameset cols="200,*">

-		<frame name="contents" src="contents.htm">

-		<frame name="main" >

-	</frameset>

-	<noframes>

-		<p>This page requires frames, but your browser does not support them.</p>

-	</noframes>

-</frameset>

-</html>

diff --git a/mcs/class/Mono.C5/doc/docbuild/litterature.htm b/mcs/class/Mono.C5/doc/docbuild/litterature.htm
deleted file mode 100644
index 9e969e669e8..00000000000
--- a/mcs/class/Mono.C5/doc/docbuild/litterature.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-<head>

-<title>C5 collection classes - litterature references</title>

-<meta name="GENERATOR" content="Microsoft Visual Studio.NET 7.0">

-<meta name=ProgId content=VisualStudio.HTML>

-<meta name=Originator content="Microsoft Visual Studio.NET 7.0">

-</head>

-<body>

-<h1>C5 collection classes - litterature references</h1>

-<table border="1" cellspacing="0">

-    <tr>

-        <td>

-            <a name="CLRS">CLRS</a></td>

-        <td>Cormen, Leiserson, Rivest, Shamir: ...</td>

-    </tr>

-    <tr>

-        <td>

-            <a name="DSST">DSST</a></td>

-        <td>D, Sarnak, Sleator, Tarjan, ...</td>

-    </tr>

-    <tr>

-        <td>

-            <a name="Tarjan1">Tarjan1</a>Tarjan: (the booklet)</td>

-        <td></td>

-    </tr>

-    <tr>

-        <td>

-            <a name=""></a></td>

-        <td></td>

-    </tr>

-    <tr>

-        <td>

-            <a name=""></a></td>

-        <td></td>

-    </tr>

-    <tr>

-        <td>

-            <a name=""></a></td>

-        <td></td>

-    </tr>

-    <tr>

-        <td>

-            <a name=""></a></td>

-        <td></td>

-    </tr>

-    <tr>

-        <td>

-            <a name=""></a></td>

-        <td></td>

-    </tr>

-    <tr>

-        <td>

-            <a name=""></a></td>

-        <td></td>

-    </tr>

-</table>

-

-

-</body>

-</html>

diff --git a/mcs/class/Mono.C5/doc/docbuild/userguide.htm b/mcs/class/Mono.C5/doc/docbuild/userguide.htm
deleted file mode 100644
index cea0e026e0e..00000000000
--- a/mcs/class/Mono.C5/doc/docbuild/userguide.htm
+++ /dev/null
@@ -1,2519 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-  <title>C5 User's Guide</title>

-  <style>

-<!--

-.revvid      { color: #FFFFFF; background-color: #00AA00; font-weight: bold }

--->

-  </style>

-</head>

-<body>

-<h1><a class="mozTocH1" name="mozTocId905770"></a>C5 User's guide for

-prerelease version 0.5</h1>

-<h2><a class="mozTocH2" name="mozTocId507311"></a>Table of contents</h2>

-<ul class="readonly" id="mozToc">

-<!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6--><li><a href="#mozTocId905770">C5

-User's guide for prerelease version 0.5</a>

-    <ul>

-      <li><a href="#mozTocId507311">Table of contents</a></li>

-    </ul>

-  </li>

-  <li><a href="#mozTocId564527">Overview</a></li>

-  <li><a href="#mozTocId86956">Interfaces</a>

-    <ul>

-      <li><a href="#mozTocId21725">"Proper" collection interfaces</a></li>

-      <li><a href="#mozTocId721827">Dictionary interfaces</a></li>

-      <li><a href="#mozTocId908053">Query result interfaces</a></li>

-    </ul>

-  </li>

-  <li><a href="#mozTocId110895">To construct a collection</a>

-    <ul>

-      <li><a href="#mozTocId850165">To use an external equalityComparer</a></li>

-      <li><a href="#mozTocId162938">To use an external comparer</a></li>

-      <li><a href="#mozTocId957374">To make collections of collections</a></li>

-    </ul>

-  </li>

-  <li><a href="#mozTocId486186">Special topics</a>

-    <ul>

-      <li><a href="#mozTocId48263">To choose a set or bag collection</a></li>

-      <li><a href="#mozTocId929755">To work on part of a list: list

-views</a></li>

-      <li><a href="#mozTocId650306">To work with persistent red-black

-trees</a></li>

-      <li><a href="#mozTocId553609">To implement new collection classes

-or subclass an existing one</a></li>

-      <li><a href="#mozTocId753674">To present a read only view of a

-collection</a></li>

-    </ul>

-  </li>

-  <li><a href="#mozTocId6619">Collection classes by data structure/class</a></li>

-  <li><a href="#mozTocId393559">Planned architecture or interface

-changes for first release</a></li>

-  <li><a href="#mozTocId336849">Performance details for proper

-collection classes</a></li>

-  <li><a href="#mozTocId712409">Performance details for dictionary

-classes</a></li>

-</ul>

-<h1><a class="mozTocH1" name="mozTocId564527"></a>Overview<br>

-</h1>

-<p>C5 is a comprehensive library of collection classes for the <a

- href="http://www.ecma-international.org/publications/standards/Ecma-335.htm">Common

-Language Infrastructure</a> (CLI). This guide describes prerelease

-version 0.5 of&nbsp; C5. <br>

-</p>

-<p>C5 is a

-refactoring and extension of the <a

- href="http://www.dina.kvl.dk/%7Esestoft/gcsharp/index.html#collection">generic

-collection classes</a> developed by Peter Sestoft while visiting

-Microsoft

-Research in Cambridge.</p>

-<p> Unless stated otherwise types mentioned below will belong to the

-"C5"

-namespace; and all code examples assume a "using C5;" clause (and no

-"using System.Collection.Generics;" clause)..&nbsp;</p>

-<p>The goals in the development of the library has been</p>

-<ul>

-  <li>

-    <p class="MsoNormal"><span style="" lang="EN-US">To create a

-library of collection classes for the CLI that can assist expert and

-non-expert programmers on the platform to develop correct and efficient

-applications.</span> </p>

-  </li>

-  <li>

-    <p class="MsoNormal"><span style="" lang="EN-US">The library should

-at least fill the gaps in the standard &#8220;System.Collections.Generics&#8221;

-namespace compared to standard collection class libraries for related

-object oriented languages like Java, and utilize the new facilities for

-generic </span><span style="" lang="EN-US">programming. Microsoft

-recently (mid 2004) seems to have changed their minds and ntend to

-bridge that gap in the beta2 version of VS 2005 due at the end of 2004.</span>

-    </p>

-  </li>

-</ul>

-<p>In order to fulfill the efficiency goal, the library utilizes

-first-class <a href="#datastructures">data structures</a>

-inside its collection classes. The library has been constructed with

-the modern

-object oriented programming principle of&nbsp; "<a href="#Interfaces">code

-to interfaces, not to implementations</a>" in mind, while the interface

-architecture has been carefully crafted to reflect the efficient data

-structures

-actually existence.</p>

-<p>A collection in the sense of this library is a plain "collection of

-items of a single type". A collection does not impose any other logical

-structure on its items than perhaps uniqueness or sequence ordering.</p>

-<p>The main division line among the collection classes of this library

-is the

-distinction between <a href="#Proper%20collection%20interfaces">"proper"

-collections</a> and <a href="#Dictionary%20interfaces">dictionaries</a>.

-A

-dictionary is a class that defines a partial function (or map) from one

-item

-type (the keys) to another one (the values). A dictionary can be viewed

-as a

-collection of (key,value) pairs having the property of defining a

-partial

-function.</p>

-<p>The item type for the collection classes are always given by generic

-parameters. For a proper collection, there will be a single parameter,

-customarily called T, as in HashSet&lt;T&gt;. For a dictionary there

-will be two - the key and value types -

-as in HashDictionary&lt;K,V&gt;.</p>

-<p>A collection class, or rather the data structure inside, can be

-either

-equality based or comparison based. An equality based collection will

-have an

-associated so-called equalityComparer of type <a href="main.htm#T:C5.IEqualityComparer%601">IEqualityComparer&lt;T&gt;</a>,

-where T is the item type of the collection. A comparison based

-collection has an

-associated comparer of type <a href="main.htm#T:C5.IComparer%601">IComparer&lt;T&gt;</a>.

-The section below on <a href="#Constructing">creation</a> of

-collection classes

-explains how the equalityComparers and comparers are chosen. NB: this design will

-be modified soon, cf. <a href="#planned">Planned changes</a>.<br>

-</p>

-<p>Collection classes in the library have either set or bag semantics.

-A set

-collection can at most contain one copy of an item, while bag

-collections may

-contain several. One can programmatically see at runtime if an editable

-collection class has set or bag semantics by checking the <a

- href="main.htm#P:C5.IExtensible%601.AllowsDuplicates">

-AllowsDuplicates</a>

-property. At compile time, refer to the <a href="#set%20or%20bag">set

-or bag table</a>

-below for an overview. <br>

-</p>

-<h1><a class="mozTocH1" name="mozTocId86956"></a><a name="Interfaces">Interfaces</a></h1>

-<p>The C5 library is designed to make it easy to program to interfaces

-instead

-of implementations. In particular, all public properties and methods of

-the

-collection classes belong to their implemented interfaces (except for

-the odd

-special diagnostic method and the odd mistake to be weeded out before

-release). The typical programming style

-would be</p>

-<blockquote>

-  <p><code>IList&lt;int&gt; lst = new LinkedList&lt;int&gt;();<br>

-lst.Add(7);</code></p>

-</blockquote>

-<p>instead of&nbsp;</p>

-<blockquote>

-  <p><code> LinkedList&lt;int&gt; lst = new LinkedList&lt;int&gt;();<br>

-lst.Add(7);</code></p>

-</blockquote>

-<p>Note that with this programming style, the Add call will be compiled

-to an

-interface call instead of a (virtual) method call, but interface calls

-on the

-CLR (at least the Microsoft implementation) are at most very slightly

-slower

-than virtual calls, so one should not shun the interface style for

-performance

-reasons.</p>

-<p>We will discuss the collection classes available in C5 structured

-according

-to the main functional interfaces of the <a

- href="#Proper%20collection%20interfaces">proper

-collections</a>, the <a href="#Dictionary%20interfaces">dictionaries</a>

-and the

-interfaces of <a href="#Query%20result%20interfaces">query results</a>.</p>

-<h2><a class="mozTocH2" name="mozTocId21725"></a><a

- name="Proper collection interfaces">"Proper" collection interfaces</a></h2>

-<p>The following diagam shows the type hierarchy of the proper

-collection classes:</p>

-<p><img alt="Interface hierarchy" src="ClsdiagWork.png"

- style="width: 757px; height: 498px;"><br>

-The&nbsp;most important interfaces - those that are directly

-implemented by

-collection classes - are listed to the left in this table with a short

-description in the middle and all implementing classes to the

-right.&nbsp;</p>

-<p>Please see also the <a href="#PerformanceProper">complete

-complexity table</a>

-for more comprehensive guidance.</p>

-<p>To identify which classes are equalityComparer or comparer based and which

-classes

-implement set or bag we use the following symbols:</p>

-<table border="1" width="471">

-  <tbody>

-    <tr>

-      <td width="116">set: <code class="revvid">S</code> </td>

-      <td width="117"> bag: <code class="revvid">B</code> </td>

-      <td width="117"> equalityComparer: <code class="revvid">H</code> </td>

-      <td width="117"> comparer: <code class="revvid">C</code> </td>

-    </tr>

-  </tbody>

-</table>

-<table border="1" width="100%">

-  <tbody>

-    <tr>

-      <th width="19%">Interface</th>

-      <th width="52%">Short description</th>

-      <th width="29%">Implementing classes</th>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a

- href="main.htm#T:C5.ICollection%601">ICollection&lt;T&gt;</a>&nbsp;</td>

-      <td valign="top" width="52%">This is the fundamental&nbsp;type

-of&nbsp; updateable collections. It has operations for searching for

-items, for adding, updating and removing one or a bunch of items, for

-clearing the collection and transforming the collection to an

-array.&nbsp;

-      <p>If one only needs these operations, the hash set and hash bag

-classes are fastest for if we have a equalityComparer for the items and the

-red-black tree classes are fastest if we must use a comparer.</p>

-      </td>

-      <td valign="top" width="29%"><code class="revvid">SH</code> <a

- href="main.htm#T:C5.HashSet%601">HashSet&lt;T&gt;</a><br>

-      <code class="revvid">BH</code> <a

- href="main.htm#T:C5.HashBag%601">HashBag&lt;T&gt;</a><br>

-      <code class="revvid">BH</code> <a

- href="main.htm#T:C5.LinkedList%601">LinkedList&lt;T&gt;</a><br>

-      <code class="revvid">SH</code> <a

- href="main.htm#T:C5.HashedLinkedList%601">HashedLinkedList&lt;T&gt;</a><br>

-      <code class="revvid">BH</code> <a

- href="main.htm#T:C5.ArrayList%601">ArrayList&lt;T&gt;</a><br>

-      <code class="revvid">SH</code> <a

- href="main.htm#T:C5.HashedArrayList%601"> HashedArrayList&lt;T&gt;<br>

-      </a> <code class="revvid">SC</code> <a

- href="main.htm#T:C5.SortedArray%601"> SortedArray&lt;T&gt;</a><br>

-      <code class="revvid">SC</code> <a

- href="main.htm#T:C5.TreeSet%601"> TreeSet&lt;T&gt;</a><br>

-      <code class="revvid">BC</code> <a

- href="main.htm#T:C5.TreeBag%601"> TreeBag&lt;T&gt;</a></td>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a

- href="main.htm#T:C5.IPriorityQueue%601">IPriorityQueue&lt;T&gt;</a>&nbsp;</td>

-      <td valign="top" width="52%">This is a special case in the

-library, being the only type of updateable collection interface that

-does not implement IEditableCollection&lt;T&gt;. The reason for its

-presence is the specialized "heap" data structures for priority queues

-that only support these operations.

-      <p>If one only needs these the priority queue operations and is

-satisfied with bag semantics, then IntervalHeap&lt;P&gt;&nbsp; is the

-fastest choice. </p>

-      </td>

-      <td valign="top" width="29%"> <code class="revvid">BC</code> <a

- href="main.htm#T:C5.IntervalHeap%601">IntervalHeap&lt;T&gt;</a><br>

-      <code class="revvid">SC</code> <a

- href="main.htm#T:C5.TreeSet%601"> TreeSet&lt;T&gt;</a><br>

-      <code class="revvid">BC</code> <a

- href="main.htm#T:C5.TreeBag%601"> TreeBag&lt;T&gt;</a></td>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a href="main.htm#T:C5.IList%601">IList&lt;T&gt;</a>&nbsp;</td>

-      <td valign="top" width="52%">This is an updateable collection

-with sequence order imposed on the items by the user at insertion time

-or by later rearrangements.&nbsp;

-      <p>There are two main base data structures: dynamic arrays and

-doubly linked lists with very different complexity profile.&nbsp;The

-plain linked list is fast for operations at the end points only, while

-the plain array list have very fast lookups by index, but update

-operations are only fast at the right end point.&nbsp;</p>

-      <p>The Hashed- variants employ an index based on a hash table.

-This speeds up lookups by item considerably and for the linked list

-variant also insertions before or after specific items. The index

-changes the classes from bags to sets.&nbsp;</p>

-      <p>The hashed variants more than double the time of otherwise

-fast update operations, and should only be used when really

-needed.&nbsp;</p>

-      </td>

-      <td valign="top" width="29%"> <code class="revvid">BH</code> <a

- href="main.htm#T:C5.LinkedList%601"> LinkedList&lt;T&gt;</a><br>

-      <code class="revvid">SH</code> <a

- href="main.htm#T:C5.HashedLinkedList%601"> HashedLinkedList&lt;T&gt;</a><br>

-      <code class="revvid">BH</code> <a

- href="main.htm#T:C5.ArrayList%601"> ArrayList&lt;T&gt;</a><br>

-      <code class="revvid">SH</code> <a

- href="main.htm#T:C5.HashedArrayList%601"> HashedArrayList&lt;T&gt;</a></td>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a

- href="main.htm#T:C5.IIndexedSorted%601">IIndexedSorted&lt;T&gt;</a>&nbsp;</td>

-      <td valign="top" width="52%">This is an updateable collection

-with sequence order given by a comparer.&nbsp;

-      <p>There are two main data structures inside the implementations:

-red-black search trees and a dynamic array kept sorted at all times.</p>

-      <p>The differences are chiefly that the trees have much faster

-update operations, while the sorted array is somewhat faster at index

-lookups. In fact, the sorted array should only be used for static

-operation, where the collection is created and populated and then not

-changed again. </p>

-      </td>

-      <td valign="top" width="29%"> <code class="revvid">SC</code> <a

- href="main.htm#T:C5.SortedArray%601"> SortedArray&lt;T&gt;</a><br>

-      <code class="revvid">SC</code> <a

- href="main.htm#T:C5.TreeSet%601"> TreeSet&lt;T&gt;</a><br>

-      <code class="revvid">BC</code> <a

- href="main.htm#T:C5.TreeBag%601"> TreeBag&lt;T&gt;</a></td>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a

- href="main.htm#T:C5.IPersistentSorted%601">IPersistentSorted&lt;T&gt;</a>&nbsp;</td>

-      <td valign="top" width="52%">This is a sorted collection that

-support very fast clones that themselves are sorted. The only

-implementation is the tree implementation with set and bag variants. </td>

-      <td valign="top" width="29%"> <code class="revvid">SC</code> <a

- href="main.htm#T:C5.TreeSet%601"> TreeSet&lt;T&gt;</a><br>

-      <code class="revvid">BC</code> <a

- href="main.htm#T:C5.TreeBag%601"> TreeBag&lt;T&gt;</a></td>

-    </tr>

-  </tbody>

-</table>

-<h2><a class="mozTocH2" name="mozTocId721827"></a><a

- name="Dictionary interfaces">Dictionary interfaces</a></h2>

-<p>There are two dictionary interfaces:</p>

-<table border="1" width="100%">

-  <tbody>

-    <tr>

-      <th valign="top" width="19%">Interface</th>

-      <th width="56%">Short description</th>

-      <th width="25%">Implementing classes</th>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a

- href="main.htm#T:C5.IDictionary%602">IDictionary&lt;K,V&gt;</a> </td>

-      <td width="56%">This is the base dictionary interface.&nbsp;

-      <p>The choice is that one should use the hash dictionary unless

-one only has a comparer for the items, in which case the tree

-dictionary can be used.&nbsp; </p>

-      </td>

-      <td width="25%"><a href="main.htm#T:C5.HashDictionary%602">HashDictionary&lt;K,V&gt;</a><br>

-      <a href="main.htm#T:C5.TreeDictionary%602">TreeDictionary&lt;K,V&gt;</a></td>

-    </tr>

-    <tr>

-      <td valign="top" width="19%"><a

- href="main.htm#T:C5.ISortedDictionary%602">ISortedDictionary&lt;K,V&gt;</a>

-      </td>

-      <td width="56%">This is a dictionary based on a comparer for the

-keys. There is only the tree implementation.&nbsp; </td>

-      <td width="25%"><a href="main.htm#T:C5.TreeDictionary%602">TreeDictionary&lt;K,V&gt;</a></td>

-    </tr>

-  </tbody>

-</table>

-<h2><a class="mozTocH2" name="mozTocId908053"></a><a

- name="Query result interfaces">Query result interfaces</a></h2>

-<p>Some of the most basic collection interfaces have an important usage

-as the

-types of results of queries to collections, although these interfaces

-also

-appear at the base of the other collection interfaces and even as the

-types of

-synthetic collections. The interfaces in question are the standard

-System.Collections.Generics.IEnumerable&lt;T&gt;,

-<a href="main.htm#T:C5.ICollectionValue%601">ICollectionValue&lt;T&gt;</a>,

-<a href="main.htm#T:C5.IDirectedEnumerable%601">IDirectedEnumerable&lt;T&gt;</a>

-and <a href="main.htm#T:C5.IDirectedCollectionValue%601">IDirectedCollectionValue&lt;T&gt;</a>.</p>

-<p>The differences between the "Enumerable" and "Collection"

-variants are that the "Enumerable" variant only knows how to

-enumerate through its items, the "Collection" variants also knows how

-many items it has (without having to walk through an enumeration). The

-"Directed" variants are used for results of queries to sequenced

-collections (implementing <a href="main.htm#T:C5.ISequenced%601">ISequenced&lt;T&gt;</a>)

-and therefore have a non-implementation dependent enumeration order.

-The

-"Directed" variants supports two operations, <a

- href="main.htm#M:C5.IDirectedCollectionValue%601.Backwards">Backwards()</a>

-to enable enumeration in the opposite direction and <a

- href="main.htm#P:C5.IDirectedEnumerable%601.Direction">Direction</a>

-to tell if the enumeration order is forwards or backwards with respect

-to the

-original collection.</p>

-<p>Note: operations on an enumerator created by the GetEnumerator()

-method on System.Collections.Generics.IEnumerable&lt;T&gt; cannot be

-interleaved with update

-operations on

-the underlying collection.</p>

-<p>Note: for all enumerators in the library the operations have O(1)

-amortized

-complexity.</p>

-<h1><a class="mozTocH1" name="mozTocId110895"></a>To <a

- name="Constructing">construct</a> a collection</h1>

-<p>All collections classes in C5 have (zero parameter) default

-constructors. So

-if we want to make a linked list of items of some type, <code>TheType</code>,

-and add an item to the list we will do</p>

-<p><code>&nbsp;&nbsp;&nbsp; IList&lt;TheType&gt; lst = new

-LinkedList&lt;TheType&gt;();<br>

-&nbsp;&nbsp;&nbsp; TheType t = ...;<br>

-&nbsp;&nbsp;&nbsp; lst.Add(t);</code></p>

-<p>The collection classes have no constructors that will take an array

-or a

-collection as parameter for prepopulating the collection, use the <a

- href="file:///C:/home/kokholm/c5/vs/C5/main.htm#M:C5.ISink%601.AddAll%28C5.IEnumerable%7B%210%7D%29">

-AddAll</a> method

-instead. NB: in the released version, expect constructors with an

-enumerable as argument and constructors with a variable number of

-arguments ("params") for the initialization of the collection, see the <a

- href="#planned">planned changes</a> section.<br>

-</p>

-<p>Some collection classes are governed by internal parameters that one

-can give

-non-default values at creation time (<code>fill</code> in <a

- href="main.htm#T:C5.HashSet%601">HashSet&lt;T&gt;</a>,&nbsp;

-<a href="main.htm#T:C5.HashBag%601">HashBag&lt;T&gt;</a>, <a

- href="main.htm#T:C5.HashDictionary%602">HashDictionary&lt;K,V&gt;</a>)

-or use internal tables that one can expand in advance if one has

-expectations of

-how large the collection will grow (HashSet&lt;T&gt;,&nbsp;

-HashBag&lt;T&gt;, HashDictionary&lt;K,V&gt;, <a

- href="main.htm#T:C5.ArrayList%601">ArrayList&lt;T&gt;</a>,

-<a href="main.htm#T:C5.HashedArrayList%601"> HashedArrayList&lt;T&gt;</a>,

-<a href="main.htm#T:C5.SortedArray%601">SortedArray&lt;T&gt;</a>,

-<a href="main.htm#T:C5.IntervalHeap%601">IntervalHeap&lt;T&gt;</a>).</p>

-<p>For equality-based collection classes, these constructors will use a

-default

-equalityComparer to define equality of items according to the following table:</p>

-<table border="1">

-  <tbody>

-    <tr>

-      <th>T</th>

-      <th>default equalityComparer (implements IEqualityComparer&lt;T&gt;)</th>

-      <th>Equality and hash code by</th>

-    </tr>

-    <tr>

-      <td>int</td>

-      <td><a href="main.htm#T:C5.IntEqualityComparer">IntEqualityComparer</a></td>

-      <td>Equals and hash code of integer</td>

-    </tr>

-    <tr>

-      <td>other value type</td>

-      <td><a href="main.htm#T:C5.DefaultValueTypeEqualityComparer%601">DefaultValueTypeEqualityComparer&lt;T&gt;</a></td>

-      <td>methods inherited from object</td>

-    </tr>

-    <tr>

-      <td>IEditableCollection&lt;S&gt;</td>

-      <td><a href="main.htm#T:C5.EqualityComparerBuilder.UnsequencedEqualityComparer%602">EqualityComparerBuilder.UnsequencedEqualityComparer&lt;S,IEditableCollection&lt;S&gt;&gt;</a></td>

-      <td>contents without regards to sequence</td>

-    </tr>

-    <tr>

-      <td>ISequenced&lt;S&gt;</td>

-      <td><a href="main.htm#T:C5.EqualityComparerBuilder.SequencedEqualityComparer%602">EqualityComparerBuilder.SequencedEqualityComparer&lt;S,IEditableCollection&lt;S&gt;&gt;</a></td>

-      <td>contents with regards to sequence</td>

-    </tr>

-    <tr>

-      <td>other reference type</td>

-      <td><a href="main.htm#T:C5.DefaultReferenceTypeEqualityComparer%601">DefaultReferenceTypeEqualityComparer&lt;T&gt;</a></td>

-      <td>methods inherited from object</td>

-    </tr>

-  </tbody>

-</table>

-<p>For comparison-based collection classes, these constructors will use

-a

-default comparer:</p>

-<table border="1">

-  <tbody>

-    <tr>

-      <th>T</th>

-      <th>default comparer&nbsp;<br>

-(implements IComparer&lt;T&gt;)</th>

-      <th>Comparison by</th>

-    </tr>

-    <tr>

-      <td>int</td>

-      <td>IC</td>

-      <td>Standard integer comparison</td>

-    </tr>

-    <tr>

-      <td>implementing IComparable&lt;T&gt;</td>

-      <td><a href="main.htm#T:C5.NaturalComparer%601">NaturalComparer&lt;T&gt;</a></td>

-      <td>The CompareTo(T o)&nbsp; instance method</td>

-    </tr>

-    <tr>

-      <td>other implementing System.IComparable</td>

-      <td><a href="main.htm#T:C5.NaturalComparerO%601">NaturalComparerO&lt;T&gt;</a></td>

-      <td>The CompareTo(object o) instance method</td>

-    </tr>

-    <tr>

-      <td>other</td>

-      <td>-</td>

-      <td><i>collection class constructor throws an exception</i></td>

-    </tr>

-  </tbody>

-</table>

-<p>Sometimes, the default equalityComparer or comparer is not the right one for

-the

-problem at hand. In that case one must get hold on a equalityComparer or comparer

-of the

-right kind and supply it to one of the constructors of the collection

-classes

-that supports such a parameter. The procedure is demonstrated in the

-sections

-below on <a href="#external%20equalityComparer">external equalityComparers</a>, <a

- href="#external%20comparer">external

-comparers</a> and <a href="#collections%20of%20collections">collections

-as items</a>.<br>

-</p>

-<p>NB: in the released version, expect the equalityComparers and comparers to be

-of the System.Collections.Generics.IComparer&lt;T&gt; type, see the <a

- href="userguide.htm#planned">planned changes</a> section.</p>

-<h2><a class="mozTocH2" name="mozTocId850165"></a>To use an <a

- name="external equalityComparer"> external equalityComparer</a></h2>

-<p>In addition to the helper classes referenced above, the library has

-the

-helper class <a href="main.htm#T:C5.KeyValuePairEqualityComparer%602">KeyValuePairEqualityComparer&lt;K,V&gt;</a>

-to construct a equalityComparer for pairs of the type <a

- href="main.htm#T:C5.KeyValuePair%602">KeyValuePair&lt;K,V&gt;</a>,

-the type of entry of a K to V dictionary. The constructed equalityComparer will

-only take

-the first component of the pair into account. We can use these classes

-in the

-following way to make a linked list (with hash index) of pairs of

-strings

-identified by their first components using some custom equalityComparer on

-strings:</p>

-<blockquote>

-  <p><code>IEqualityComparer&lt;string&gt; csh = ...;<br>

-IEqualityComparer&lt;KeyValuePair&lt;string,string&gt;&gt; cph =&nbsp;<br>

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-new KeyValuePairEqualityComparer&lt;string,string&gt;(csh);<br>

-IList&lt;KeyValuePair&lt;string,string&gt;&gt; lst =<br>

-  </code>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<code>

-new HashedLinkedList&lt;KeyValuePair&lt;string,string&gt;&gt;(cph);<br>

-lst.Add(new KeyValuePair&lt;string,string&gt;("abe","kat"));</code></p>

-</blockquote>

-<p>One may, of course, program a equalityComparer oneself. This one should always

-do if

-the item type is defined as a struct (value type) that does not

-override the

-Equals and GetHashCode methods of object, since in that case the

-default equalityComparer

-will use the slow default versions of those methods supplied by the

-runtime via

-reflection.&nbsp;</p>

-<h2><a class="mozTocH2" name="mozTocId162938"></a>To use an <a

- name="external comparer"> external comparer</a></h2>

-<p>There is a helper class for comparer of pairs: <a

- href="main.htm#T:C5.KeyValuePairEqualityComparer%602">KeyValuePairComparer&lt;K,V&gt;</a>.

-We will show an example of a custom comparer. Imagine wanting to

-compare double

-precision floating point numbers with a tolerance. The following code

-snippet

-shows how one could make a tree set out of such numbers:</p>

-<blockquote>

-  <p><code>class DC : IComparer&lt;double&gt; {<br>

-&nbsp;&nbsp; const double eps = 1E-10;<br>

-&nbsp;&nbsp; int Compare(double a, double b)&nbsp;<br>

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {return a &gt; b + eps ? 1 : a &lt; b -

-eps ? -1 : 0;}<br>

-}<br>

-  <br>

-void dowork() {<br>

-&nbsp;&nbsp; IComparer&lt;double&gt; dc = new DC();<br>

-&nbsp;&nbsp; ISorted&lt;double&gt; tree = new TreeSet&lt;double&gt;(dc);<br>

-&nbsp;&nbsp; tree.Add(3.45);<br>

-&nbsp;&nbsp; ...<br>

-}</code></p>

-</blockquote>

-<p>In this particular case, one would have to make sure, that two

-different

-floating point numbers are only identified by the comparer if they

-really should

-represent the same value and not by coincidence.</p>

-<h2><a class="mozTocH2" name="mozTocId957374"></a>To make <a

- name="collections of collections"> collections of collections</a></h2>

-<p>When one wants to use a collection whose items itself are of

-collection type,

-one usually wants the interior collections to be identified by contents

-- either

-according to or irrespective of sequence order. An example could be

-transformations of <a

- href="http://www.dina.kvl.dk/%7Esestoft/gcsharp/index.html#regexp">Finite

-Automatons</a>. The default equalityComparers and the EqualityComparerBuilder classes

-mentioned

-above may help to construct such collections of collections as in the

-examples

-that follow:</p>

-<p>To make an array list of sequenced collections identified by

-contents in

-sequenced fashion one would simply do:</p>

-<blockquote>

-  <p><code>ArrayList&lt;ISequenced&lt;int&gt;&gt; lst = new

-ArrayList&lt;ISequenced&lt;int&gt;&gt;();</code></p>

-</blockquote>

-<p>To make a linked list of linked lists identified by contents

-unsequenced, explicitly

-construct the collection equalityComparer:</p>

-<blockquote>

-  <p><code>IEqualityComparer&lt;LinkedList&lt;int&gt;&gt; lsth =<br>

-  </code>&nbsp;&nbsp;&nbsp;&nbsp; <code>new

-EqualityComparerBuilder.UnsequencedEqualityComparer&lt;int,LinkedList&lt;int&gt;&gt;();<br>

-LinkedList&lt;LinkedList&lt;int&gt;&gt; lst =<br>

-&nbsp;&nbsp; new LinkedList&lt;LinkedList&lt;int&gt;&gt;(lsth);</code></p>

-</blockquote>

-<p>If for some strange reason one would like to make a hash set of

-linked lists

-with the lists identified by reference equality one would simply do:</p>

-<blockquote>

-  <p><code>HashSet&lt;LinkedList&lt;int&gt;&gt; lst = new

-HashSet&lt;LinkedList&lt;int&gt;&gt;();</code></p>

-</blockquote>

-<p>If for even stranger reasons one would make a hash set of

-ISequenced&lt;int&gt; collections with the collections identified by

-reference

-equality one would do like this:</p>

-<blockquote>

-  <p><code>IEqualityComparer&lt;</code><code>ISequenced</code><code>&lt;int&gt;&gt;

-lsth =<br>

-  </code>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <code>new

-DefaultReferenceTypeEqualityComparer&lt;</code><code>ISequenced</code><code>&lt;int&gt;&gt;();<br>

-HashSet&lt;</code><code>ISequenced</code><code>&lt;int&gt;&gt; lst =<br>

-&nbsp;&nbsp; new HashSet&lt;</code><code>ISequenced</code><code>&lt;int&gt;&gt;(lsth);</code></p>

-</blockquote>

-<h1><a class="mozTocH1" name="mozTocId486186"></a>Special topics</h1>

-<h2><a class="mozTocH2" name="mozTocId48263"></a>To choose a <a

- name="set or bag"> set or bag</a> collection</h2>

-<p>The following table shows which of the collection classes have set

-semantics

-and which have bag semantics. All the implemented classes have fixed,

-compiled in semantics. <br>

-</p>

-<p>Note: when in a set collection, methods with an Add in the name will

-ignore

-attempts to add an item already there or flag the failed attempt by a

-Boolean return value; methods with an Insert in the name (only in

-lists) will throw an

-exception.</p>

-<table border="1" width="38%">

-  <tbody>

-    <tr>

-      <td valign="top" width="6%"><a href="main.htm#T:C5.HashSet%601">HashSet&lt;T&gt;</a></td>

-      <td valign="top" width="5%">set</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a href="main.htm#T:C5.HashBag%601">HashBag&lt;T&gt;</a></td>

-      <td valign="top" width="5%">bag</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a

- href="main.htm#T:C5.LinkedList%601"> LinkedList&lt;T&gt;</a></td>

-      <td valign="top" width="5%">bag</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a

- href="main.htm#T:C5.HashedLinkedList%601"> HashedLinkedList&lt;T&gt;</a></td>

-      <td valign="top" width="5%">set</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a

- href="main.htm#T:C5.ArrayList%601"> ArrayList&lt;T&gt;</a></td>

-      <td valign="top" width="5%">bag</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a

- href="main.htm#T:C5.HashedArrayList%601"> HashedArrayList&lt;T&gt; </a>

-      </td>

-      <td valign="top" width="5%">set</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a

- href="main.htm#T:C5.SortedArray%601"> SortedArray&lt;T&gt;</a></td>

-      <td valign="top" width="5%">set</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a href="main.htm#T:C5.TreeSet%601">TreeSet&lt;T&gt;</a></td>

-      <td valign="top" width="5%">set</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"> <a href="main.htm#T:C5.TreeBag%601">TreeBag&lt;T&gt;</a></td>

-      <td valign="top" width="5%">bag</td>

-    </tr>

-    <tr>

-      <td valign="top" width="6%"><a

- href="main.htm#T:C5.IntervalHeap%601">IntervalHeap&lt;T&gt;</a></td>

-      <td valign="top" width="5%">bag</td>

-    </tr>

-  </tbody>

-</table>

-<h2><a class="mozTocH2" name="mozTocId929755"></a>To work on part of a

-list: list views</h2>

-<p>The IList&lt;T&gt; interface supports via the <a

- href="main.htm#M:C5.IList%601.View%28System.Int32,System.Int32%29">

-View</a>

-method the functionality that one can zoom in on part of a list and use

-it as an

-IList&lt;T&gt; in its own right while having updates to the view passed

-through

-to the base (original) IList&lt;T&gt;. Using the <a

- href="main.htm#M:C5.IList%601.Slide%28System.Int32%29">Slide</a>

-method calls, one may move the view around the base list. Using Slide

-repeatedly

-one can implement safe ways to iterate over a list while updating it.

-The

-IList&lt;T&gt; interface also has properties <a

- href="main.htm#P:C5.IList%601.Underlying">Underlying</a>

-and <a href="main.htm#P:C5.IList%601.Offset">Offset</a> showing the

-base list of a

-view and the current site of a view.</p>

-<p>One can create a view on a view, but the new view will have the

-original base

-list as base. A view will be invalidated if an update operation is

-performed on

-the base list by any other means than through this particular view.</p>

-<p>The following code snippet shows a silly example of iterating over a

-list,

-doing an insertion each time certain combination of items are seen (the

-example

-iterates right to left and inserts 666 whenever two consecutive items

-have an

-odd difference):</p>

-<blockquote>

-  <p><code>IList&lt;int&gt; lst = ...;<br>

-IList&lt;int&gt; view = lst.CreateView(lst.Count-2, 2);<br>

-while (true) {<br>

-&nbsp;&nbsp;&nbsp; if ((view.Last - view.First) % 2 == 1)<br>

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; view.Insert(1, 666);<br>

-&nbsp;&nbsp;&nbsp; if (view.Offset == 0)<br>

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; break;<br>

-&nbsp;&nbsp;&nbsp; else<br>

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; view.Slide(-1,2);<br>

-}</code></p>

-</blockquote>

-<h2><a class="mozTocH2" name="mozTocId650306"></a>To work with

-persistent red-black trees</h2>

-<p>The search tree implementation in the library is based on node copy

-persistent red-black trees. The persistence is exposed in the <a

- href="main.htm#M:C5.IPersistentSorted%601.Snapshot">Snapshot</a>

-method that can be considered a very fast and space-saving way of

-making a

-read-only clone of the tree. When using persistence, the space use of a

-red-black tree in this implementation is linear in the number of

-operations

-since the creation of the tree.</p>

-<p>One use of persistence could be to safely enumerate a tree

-interleaved with

-updates:</p>

-<blockquote>

-  <p><code>IPersistentSorted&lt;int&gt; tree = new TreeSet&lt;int&gt;();<br>

-tree.Add(5);<br>

-...<br>

-ISorted&lt;int&gt; snap = tree.Snapshot();<br>

-foreach (int i in snap)<br>

-&nbsp;&nbsp;&nbsp; tree.Add(i+7);</code></p>

-</blockquote>

-<p>The GUITester project of the complete library source code contains

-an

-interesting (standard) usage of persistent search trees to the

-geometric problem

-of constructing an efficient data structure for point location in a

-division of

-the plane given by a list of line segments.</p>

-<h2><a class="mozTocH2" name="mozTocId553609"></a>To implement new

-collection classes or subclass an existing one</h2>

-<p>All interface methods and properties of the collection classes

-implemented in

-the library are virtual and so it should be safe to subclass these

-classes. Some

-classes may have protected members if they are subclassed in the

-library itself.

-We refer to the detailed reference manuals and the library source for

-information on the protected members and their role in subclassing.</p>

-<p>There is a sequence of helper classes designed to be used as base

-classes of

-collection classes: <a href="main.htm#T:C5.EnumerableBase%601">EnumerableBase&lt;T&gt;</a>,

-<a href="main.htm#T:C5.CollectionValueBase%601">CollectionValueBase&lt;T&gt;</a>,

-<a href="main.htm#T:C5.CollectionBase%601">CollectionBase&lt;T&gt;</a>,

-<a href="main.htm#T:C5.SequencedBase%601">SequencedBase&lt;T&gt;</a>

-and <a href="main.htm#T:C5.ArrayBase%601">ArrayBase&lt;T&gt;</a>.

-Please see the reference manual and the library source code for

-documentation

-and examples.</p>

-<p>As for dictionaries, the DictionaryBase&lt;K,V&gt; class will

-construct a

-class implementing IDictionary&lt;K,V&gt; by simply plugging in a set

-implementation.</p>

-<h2><a class="mozTocH2" name="mozTocId753674"></a>To present a read

-only view of a collection</h2>

-<p>The library contains a long list of wrapper classes all with name

-starting

-with Guarded having the purpose of creating a read-only view of an

-existing

-collection. The wrapping is done by the constructors of the classes. If

-we want

-to give some code access to only lookup operations on a, say, list we

-can do as

-follows:</p>

-<blockquote>

-  <p><code>IList&lt;int&gt; lst;<br>

-...<br>

-IList&lt;int&gt; rolst = new GList&lt;int&gt;(lst);<br>

-OtherObject.dowork(rolst);</code></p>

-</blockquote>

-<p>Please see the reference manual for details on available wrapper

-classes.</p>

-<h1><a class="mozTocH1" name="mozTocId6619"></a><a name="datastructures">Collection

-classes by data structure/class</a></h1>

-<p>The following table&nbsp;shows the underlying data structure of the

-various collection classes.</p>

-<table border="1">

-  <tbody>

-    <tr>

-      <th>Data structure</th>

-      <th>Classes</th>

-      <th>Primary Interfaces</th>

-    </tr>

-    <tr>

-      <td>hash table</td>

-      <td>HashSet&lt;T&gt;</td>

-      <td> ICollection&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>hash table</td>

-      <td>HashBag&lt;T&gt;</td>

-      <td> ICollection&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>hash table</td>

-      <td>HashDictionary&lt;K,V&gt;</td>

-      <td>IDictionary&lt;K,V&gt;</td>

-    </tr>

-    <tr>

-      <td>linked list</td>

-      <td>LinkedList&lt;T&gt;</td>

-      <td>IList&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>linked list with hash index</td>

-      <td>HashedLinkedList&lt;T&gt;</td>

-      <td>IList&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>dynamic array</td>

-      <td>ArrayList&lt;T&gt;</td>

-      <td>IList&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>dynamic array with hash index</td>

-      <td>HashedArrayList&lt;T&gt;</td>

-      <td>IList&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>sorted dynamic array</td>

-      <td>SortedArray&lt;T&gt;</td>

-      <td>IIndexedSorted&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>heap</td>

-      <td>IntervalHeap&lt;T&gt;</td>

-      <td>IPriorityQueue&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>red-black search tree</td>

-      <td>TreeSet&lt;T&gt;</td>

-      <td>IIndexedSorted&lt;T&gt;, IPersistentSorted&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>red-black search tree</td>

-      <td>TreeBag&lt;T&gt;</td>

-      <td>IIndexedSorted&lt;T&gt;, IPersistentSorted&lt;T&gt;</td>

-    </tr>

-    <tr>

-      <td>red-black search tree</td>

-      <td>TreeDictionary&lt;K,V&gt;</td>

-      <td>ISortedDictionary&lt;K,V&gt;</td>

-    </tr>

-  </tbody>

-</table>

-<br>

-<h1><a class="mozTocH1" name="mozTocId393559"></a>&lt;&gt;<a

- name="planned"></a>Planned<span style="font-weight: bold;"> </span>architecture

-or interface changes

-for first release<br>

-</h1>

-<ol>

-  <li>Eliminate the use of our own generic equality/comparator types,

-C5.IComparer&lt;T&gt; and C5.IEqualityComparer&lt;T&gt; and use the new design of

-VS 2005 beta1 in the form of the combined

-System.Collections.Generic.IComparer&lt;T&gt;.</li>

-  <li>Vararg (params) constructors? (And IEnum do.)</li>

-  <li>Possibly extended use of "wildcard style" operations like

-AddAll&lt;U&gt;(IEnumerable&lt;U&gt; items)?</li>

-  <li>Make all collection classes clonable and serializable.</li>

-</ol>

-<h1><a class="mozTocH1" name="mozTocId336849"></a><a

- name="PerformanceProper">Performance</a> details for proper collection

-classes</h1>

-<p>This section overviews the complexities of cc public methods and

-property

-accesses.</p>

-<p>In the table below, for lack of space we use the following numbers

-to

-identify collection classes:</p>

-<table border="1">

-  <tbody>

-    <tr>

-      <th>Class</th>

-      <th>Column</th>

-    </tr>

-    <tr>

-      <td>HashSet&lt;T&gt;</td>

-      <td>HS</td>

-    </tr>

-    <tr>

-      <td>HashBag&lt;T&gt;</td>

-      <td>HB</td>

-    </tr>

-    <tr>

-      <td>ArrayList&lt;T&gt;</td>

-      <td>AL</td>

-    </tr>

-    <tr>

-      <td>LinkedList&lt;T&gt;</td>

-      <td>LL</td>

-    </tr>

-    <tr>

-      <td>HashedArrayList&lt;T&gt;</td>

-      <td>HAL</td>

-    </tr>

-    <tr>

-      <td>HashedLinkedList&lt;T&gt;</td>

-      <td>HLL</td>

-    </tr>

-    <tr>

-      <td>TreeSet&lt;T&gt;</td>

-      <td>RBTS</td>

-    </tr>

-    <tr>

-      <td>TreeBag&lt;T&gt;</td>

-      <td>RBTB</td>

-    </tr>

-    <tr>

-      <td>SortedArray&lt;T&gt;</td>

-      <td>SA</td>

-    </tr>

-    <tr>

-      <td>IntervalHeap&lt;T&gt;</td>

-      <td>IH</td>

-    </tr>

-  </tbody>

-</table>

-<p>And the following special symbols:&nbsp;</p>

-<p>

-n size of collection,&nbsp;<br>

-m size of argument if collection-: not supported<br>

-*: means: suboptimal complexity (library is in error)<br>

-$: special at end: the operation is much faster at the start and/or end

-(end for

-array list, both for linked list)

-</p>

-<p>Note: we do not show return type&nbsp; or parameters for methods,

-just mark

-with ()<br>

-Note: we ignore time for reclaiming of internal array space (e.g. Clear)<br>

-User supplied operations like comparers or equalityComparers are assumed to be

-O(1)</p>

-<table border="1" height="2893" width="100%">

-  <tbody>

-    <tr>

-      <th height="23" width="9%">Member</th>

-      <th height="23" width="8%">HS</th>

-      <th height="23" width="8%">HB</th>

-      <th height="23" width="8%">AL</th>

-      <th height="23" width="8%">LL</th>

-      <th height="23" width="8%">HAL</th>

-      <th height="23" width="8%">HLL</th>

-      <th height="23" width="8%">RBTS</th>

-      <th height="23" width="8%">RBTB</th>

-      <th height="23" width="9%">SA</th>

-      <th height="23" width="9%">IH</th>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">&nbsp;IEnumerable&lt;T&gt;</font></i></td>

-      <td height="22" width="8%">&nbsp;&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="8%">&nbsp;</td>

-      <td height="22" width="9%">&nbsp;</td>

-      <td height="22" width="9%">&nbsp;</td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">GetEnumerator()</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IDirectedEnumerable&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="18%"><font size="2">Direction</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="18%"><font size="2">Backwards()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">ICollectionValue&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Count</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="18%"><font size="2">CopyTo</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">ToArray</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Apply()</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Exists()</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">All()</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IDirectedCollectionValue&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="18%"><font size="2">Backwards()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="13%"><i><font color="#808080" size="2">IExtensible&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">AllowsDuplicates</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">SyncRoot</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">IsEmpty</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Add</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">AddAll</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(mlog n)</font></td>

-      <td height="22" width="8%"><font size="2">O(mlog n)</font></td>

-      <td height="22" width="9%"><font size="2">O(mlog n)</font></td>

-      <td height="22" width="9%"><font size="2">??</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">ICollection&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">IsReadOnly</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">ContainsSpeed</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">GetHashCode</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Equals</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Contains</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">ContainsCount</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">ContainsAll</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(mn)*</font></td>

-      <td height="22" width="8%"><font size="2">O(mn)*</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="8%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="9%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Find</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">FindOrAdd</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Update</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">UpdateOrAdd</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Remove</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveWithReturn</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveAllCopies</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveAll</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(mn)*</font></td>

-      <td height="22" width="8%"><font size="2">O(mn)*</font></td>

-      <td height="22" width="8%"><font size="2">O(m+n)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="8%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="9%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Clear</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RetainAll</font></td>

-      <td height="22" width="8%"><font size="2">O(m)?</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(mn)*</font></td>

-      <td height="22" width="8%"><font size="2">O(mn)*</font></td>

-      <td height="22" width="8%"><font size="2">O(m+n)</font></td>

-      <td height="22" width="8%"><font size="2">O(m)</font></td>

-      <td height="22" width="8%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="8%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="9%"><font size="2">O(m logn)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">ISequenced&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">GetHashCode</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Equals</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IIndexed&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">this[i]</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">this[start,end]</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">IndexOf()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">LastIndexOf()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveAt</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveInterval</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n log n)*</font></td>

-      <td height="22" width="8%"><font size="2">O(n log n)*</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IList&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HB</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">AL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">LL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HAL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">HLL</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTS</font></i></td>

-      <td align="center" height="22" width="8%"><i><font color="#808080"

- size="2">RBTB</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">SA</font></i></td>

-      <td align="center" height="22" width="9%"><i><font color="#808080"

- size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">First</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Last</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">FIFO</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">this[i]</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Base</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Offset</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Map()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Insert()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">InsertFirst()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">InsertLast()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">InsertBefore()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">InsertAfter()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">InsertAll()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(m+n)</font></td>

-      <td height="22" width="8%"><font size="2">O(m+n)</font></td>

-      <td height="22" width="8%"><font size="2">O(m+n)</font></td>

-      <td height="22" width="8%"><font size="2">O(m+n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">FindAll()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Remove()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)$</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveFirst()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveLast()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">View()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Slide() (amount: d)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(d)</font></td>

-      <td height="22" width="8%"><font size="2">O(d)</font></td>

-      <td height="22" width="8%"><font size="2">O(d)</font></td>

-      <td height="22" width="8%"><font size="2">O(d)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Reverse()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">IsSorted()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Sort()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n log n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Shuffle()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IPriorityQueue&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HB</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">AL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">LL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HAL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HLL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTB</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">SA</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">FindMin()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">DeleteMin()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">FindMax()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="30" width="9%"><font size="2">DeleteMax()</font></td>

-      <td height="30" width="8%"><font size="2">-</font></td>

-      <td height="30" width="8%"><font size="2">-</font></td>

-      <td height="30" width="8%"><font size="2">-</font></td>

-      <td height="30" width="8%"><font size="2">-</font></td>

-      <td height="30" width="8%"><font size="2">-</font></td>

-      <td height="30" width="8%"><font size="2">-</font></td>

-      <td height="30" width="8%"><font size="2">O(log n)</font></td>

-      <td height="30" width="8%"><font size="2">O(log n)</font></td>

-      <td height="30" width="9%"><font size="2">O(log n)</font></td>

-      <td height="30" width="9%"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td height="30" width="9%"> <font size="2">Comparer</font></td>

-      <td height="30" width="8%"> <font size="2">-</font></td>

-      <td height="30" width="8%"> <font size="2">-</font></td>

-      <td height="30" width="8%"> <font size="2">-</font></td>

-      <td height="30" width="8%"> <font size="2">-</font></td>

-      <td height="30" width="8%"> <font size="2">-</font></td>

-      <td height="30" width="8%"> <font size="2">-</font></td>

-      <td height="30" width="8%"> <font size="2">O(1)</font></td>

-      <td height="30" width="8%"> <font size="2">O(1)</font></td>

-      <td height="30" width="9%"> <font size="2">O(1)</font></td>

-      <td height="30" width="9%"> <font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">ISorted&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HB</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">AL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">LL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HAL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HLL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTB</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">SA</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Predecessor</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Successor</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">WeakPredecessor</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">WeakSuccessor</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Cut</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeFrom</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeFromTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeAll</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">AddSorted</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">?</font></td>

-      <td height="22" width="8%"><font size="2">?</font></td>

-      <td height="22" width="9%"><font size="2">?</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveRangeFrom</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(nlog n)*</font></td>

-      <td height="22" width="8%"><font size="2">O(nlog n)*</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveRangeFromTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(nlog n)*</font></td>

-      <td height="22" width="8%"><font size="2">O(nlog n)*</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RemoveRangeTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(nlog n)*</font></td>

-      <td height="22" width="8%"><font size="2">O(nlog n)*</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IIndexedSorted&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HB</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">AL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">LL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HAL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HLL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTB</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">SA</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Map</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">CountFrom</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">CountFromTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">CountTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeFrom</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeFromTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">RangeTo</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="8%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">O(log n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">FindAll</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="8%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">O(n)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="14%"><i><font color="#808080" size="2">IPersistentSorted&lt;T&gt;</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HB</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">AL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">LL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HAL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">HLL</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTS</font></i></td>

-      <td height="22" width="8%"><i><font color="#808080" size="2">RBTB</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">SA</font></i></td>

-      <td height="22" width="9%"><i><font color="#808080" size="2">IH</font></i></td>

-    </tr>

-    <tr>

-      <td height="22" width="9%"><font size="2">Snapshot()</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">-</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="8%"><font size="2">O(1)</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-      <td height="22" width="9%"><font size="2">-</font></td>

-    </tr>

-  </tbody>

-</table>

-<h1><a class="mozTocH1" name="mozTocId712409"></a><a

- name="PerformanceDict">Performance</a> details for dictionary classes</h1>

-<table border="1" width="467">

-  <tbody>

-    <tr>

-      <th width="302">Member</th>

-      <th width="79">HashDictionary&lt;K,V&gt;</th>

-      <th width="64">TreeDictionary&lt;K,V&gt;</th>

-    </tr>

-    <tr>

-      <td width="302"><i><font color="#808080" size="2">IEnumerable&lt;KeyValuePair&lt;K,V&gt;&gt;</font></i></td>

-      <td width="79"><font color="#808080">&nbsp;</font></td>

-      <td width="64">&nbsp;</td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">GetEnumerator()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><i><font color="#808080" size="2">IDictionary&lt;K,V&gt;</font></i></td>

-      <td width="79"><font color="#808080">&nbsp;</font></td>

-      <td width="64">&nbsp;</td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">this[key]</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Count</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">IsReadOnly</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">SyncRoot</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Keys</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Values</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Add()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Remove()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Clear()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(1)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Contains()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Find()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">Update()</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">FindOrAdd</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><font size="2">UpdateOrAdd</font></td>

-      <td width="79"><font size="2">O(1)</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td width="302"><i><font color="#808080" size="2">ISortedDictionary&lt;K,V&gt;</font></i></td>

-      <td width="79"><font color="#808080">&nbsp;</font></td>

-      <td width="64">&nbsp;</td>

-    </tr>

-    <tr>

-      <td height="22" width="302"><font size="2">Predecessor</font></td>

-      <td width="79"><font size="2">-</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="302"><font size="2">Successor</font></td>

-      <td width="79"><font size="2">-</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="302"><font size="2">WeakPredecessor</font></td>

-      <td width="79"><font size="2">-</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-    <tr>

-      <td height="22" width="302"><font size="2">WeakSuccessor</font></td>

-      <td width="79"><font size="2">-</font></td>

-      <td height="22" width="64"><font size="2">O(log n)</font></td>

-    </tr>

-  </tbody>

-</table>

-</body>

-</html>

diff --git a/mcs/class/Mono.C5/doc/docnet.cs b/mcs/class/Mono.C5/doc/docnet.cs
deleted file mode 100644
index 7ca6e48dbcf..00000000000
--- a/mcs/class/Mono.C5/doc/docnet.cs
+++ /dev/null
@@ -1,772 +0,0 @@
-/*

- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft

- Permission is hereby granted, free of charge, to any person obtaining a copy

- of this software and associated documentation files (the "Software"), to deal

- in the Software without restriction, including without limitation the rights

- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- copies of the Software, and to permit persons to whom the Software is

- furnished to do so, subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be included in

- all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- SOFTWARE.

-*/

-

-// DocNet.cs

-// Author: Antonio Cisternino

-// Version: 0.1

-// Last update: 5/12/2001

-// Modified Jan 2004 by kokholm@itu.dk

-

-using System;

-using System.IO;

-using System.Reflection;

-using System.Xml;

-using System.Text;

-using System.Diagnostics;

-

-namespace DocNet

-{

-  class DocNet

-  {

-    private Assembly assembly;

-

-    //private XmlDocument xml;

-

-    private string defaultNamespace;

-

-    private string assemblyName;

-

-    private static C5.HashDictionary<string, string> longtype2short;

-

-    private static C5.HashDictionary<string, XmlNode> cachedDocComments;

-

-    static DocNet()

-    {

-      longtype2short = new C5.HashDictionary<string, string>();

-      cachedDocComments = new C5.HashDictionary<string, XmlNode>();

-      longtype2short.Add("System.Boolean", "bool");

-      longtype2short.Add("System.Byte", "byte");

-      longtype2short.Add("System.Int32", "int");

-      longtype2short.Add("System.Double", "double");

-      longtype2short.Add("System.Void", "void");

-      longtype2short.Add("System.Object", "object");

-      longtype2short.Add("System.String", "string");

-      longtype2short.Add("System.Collections.Generic.IEnumerable{T}", "IEnumerable{T}");

-      longtype2short.Add("System.Collections.Generic.IEnumerable{U}", "IEnumerable{U}");

-      //longtype2short.Add("", "");

-    }

-

-

-    DocNet(string a, string x, string defaultNamespace)

-    {

-      this.defaultNamespace = defaultNamespace;

-      assembly = Assembly.LoadFrom(a, null);

-      XmlDocument xml = new XmlDocument();

-      xml.Load(x);

-      assemblyName = xml.SelectSingleNode("doc/assembly/name").InnerXml;

-

-      if (!assembly.FullName.StartsWith(assemblyName + ","))

-        throw new Exception("Wrong assembly specified!\n>> " + assembly.FullName + "\n>> " + assemblyName);

-

-      foreach (XmlNode node in xml.SelectNodes("doc/members/member"))

-        cachedDocComments.Add(node.SelectNodes("@name").Item(0).Value, node);

-    }

-

-

-    private void CopyCodeDoc(XmlElement p, string xpath, XmlDocument ret)

-    {

-      XmlNode n;

-      //xml.SelectSingleNode(xpath);

-

-      if (cachedDocComments.Find(xpath, out n))

-      {

-        foreach (XmlNode child in n.ChildNodes)

-          p.AppendChild(ret.ImportNode(child, true));

-      }

-      //else

-      //  Console.Error.WriteLine("docNet: {0} not found", xpath);

-    }

-

-    string xmlClean(string s)

-    {

-//            return s.Replace("&", "&amp;").Replace("{", "&lt;").Replace("}", "&gt;").Replace("<", "&lt;").Replace(">", "&gt;");

-      return s.Replace("{", "<").Replace("}", ">");

-    }

-

-    private void AddSignature(XmlElement p, string signtext, XmlDocument ret)

-    {

-      XmlElement sign = CreateElement(ret, "Signature");

-

-      try

-      {

-        sign.InnerXml = signtext.Replace("&", "&amp;").Replace("{", "&lt;").Replace("}", "&gt;").Replace("<", "&lt;").Replace(">", "&gt;");

-      }

-      catch (XmlException)

-      {

-        Console.Error.WriteLine(signtext);

-      }

-      p.AppendChild(sign);

-    }

-

-    private void addImplements(XmlElement p, Type t, XmlDocument ret)

-    {

-      foreach (Type ty in t.GetInterfaces())

-      {

-        XmlElement impl = CreateElement(ret, "Implements");

-

-        if (ty.Assembly == assembly)

-        {

-          impl.SetAttribute("refid", "T:" + canonicalTypeName(ty, null));

-          impl.SetAttribute("C5", "");

-        }

-        AddSignature(impl, prettyTypeName(ty), ret);

-        p.AppendChild(impl);

-      }

-    }

-

-    private void addBases(XmlElement p, Type t, XmlDocument ret)

-    {

-      Type ty = t.BaseType;

-

-      while (ty != null)

-      {

-        XmlElement @base = CreateElement(ret, "Bases");

-

-        if (ty.Assembly == assembly)

-        {

-          @base.SetAttribute("refid", "T:" + canonicalTypeName(ty, null));

-          @base.SetAttribute("C5", "");

-        }

-

-        AddSignature(@base, prettyTypeName(ty), ret);

-        p.PrependChild(@base);

-        ty = ty.BaseType;

-      }

-    }

-

-

-

-    private XmlElement CreateElement(XmlDocument ret, string name)

-    {

-      return ret.CreateElement(null, name, null);

-    }

-

-    private void VisitField(bool inherited, FieldInfo f, XmlElement type, XmlDocument refman)

-    {

-      if (f.Name.Equals("value__"))

-        return;

-      string refid = "F:" + canonicalTypeName(f.DeclaringType, null) + "." + f.Name;

-      //string xpath = "doc/members/member[@name = \"" + refid + "\"]";

-      XmlElement el = CreateElement(refman, "Field");

-

-      el.SetAttribute("Name", f.Name);

-      el.SetAttribute("refid", refid);

-      el.SetAttribute("Static", f.IsStatic.ToString());

-      el.SetAttribute("Declared", xmlClean(prettyTypeName(f.DeclaringType)));

-      el.SetAttribute("CDeclared", canonicalTypeName(f.DeclaringType, null));

-      el.SetAttribute("Type", xmlClean(prettyTypeName(f.FieldType)));

-      el.SetAttribute("Access", f.IsPublic ? "public" : (f.IsPrivate || f.IsAssembly ? "private" : "protected"));

-      if (f.DeclaringType.Assembly == assembly)

-        el.SetAttribute("C5", "");

-

-      if (inherited)

-        el.SetAttribute("Inherited", "");

-

-      AddSignature(el, /*prettyTypeName(f.FieldType) + " " +*/ f.Name, refman);

-      CopyCodeDoc(el, refid, refman);

-      //AddSummary(el, xpath + "/summary", ret, doc);

-      type.AppendChild(el);

-    }

-

-    private void VisitEvent(bool inherited, EventInfo e, XmlElement type, XmlDocument ret)

-    {

-      string refid = "E:" + canonicalTypeName(e.DeclaringType, null) + "." + e.Name;

-      //string xpath = "doc/members/member[@name = \"" + refid + "\"]";

-      XmlElement el = CreateElement(ret, "Event");

-

-      el.SetAttribute("Name", e.Name);

-      el.SetAttribute("refid", refid);

-      //el.SetAttribute("Static", f.IsStatic.ToString());

-      //TODO: check virtual and final values on adders/removers

-      //el.SetAttribute("Virtual", e..IsVirtual.ToString());

-      //el.SetAttribute("Final", e.IsFinal.ToString());

-      el.SetAttribute("Declared", xmlClean(prettyTypeName(e.DeclaringType)));

-      el.SetAttribute("CDeclared", canonicalTypeName(e.DeclaringType, null));

-      el.SetAttribute("Type", xmlClean(prettyTypeName(e.EventHandlerType)));

-      MethodInfo addMethod = e.GetAddMethod(true);

-      el.SetAttribute("Access", addMethod.IsPublic ? "public" : addMethod.IsFamily ? "protected" : "private");//NBNBNB! e.IsPublic ? "public" : (e.IsPrivate || e.IsAssembly ? "private" : "protected"));

-      if (e.DeclaringType.Assembly == assembly)

-        el.SetAttribute("C5", "");

-

-      if (inherited)

-        el.SetAttribute("Inherited", "");

-

-      AddSignature(el, /*prettyTypeName(e.EventHandlerType) + " " +*/ e.Name, ret);

-      CopyCodeDoc(el, refid, ret);

-      //AddSummary(el, xpath + "/summary", ret, doc);

-      type.AppendChild(el);

-    }

-

-

-    private void VisitProperty(bool inherited, PropertyInfo p, XmlElement type, XmlDocument ret)

-    {

-      string refid = "P:" + canonicalPropertyName(p);

-      string xpath = "doc/members/member[@name = \"" + refid + "\"]";

-      XmlElement el = CreateElement(ret, "Property");

-

-      el.SetAttribute("Name", p.Name);

-      el.SetAttribute("refid", refid);

-      el.SetAttribute("Access", "public");//TODO: check if reasonable

-      MethodInfo m = p.CanRead ? p.GetGetMethod() : p.GetSetMethod();

-      if (m != null)

-      {

-        el.SetAttribute("Static", m.IsStatic.ToString());

-        el.SetAttribute("Abstract", m.IsAbstract.ToString());

-        el.SetAttribute("Virtual", m.IsVirtual.ToString());

-        el.SetAttribute("Final", m.IsFinal.ToString());

-      }

-      //else

-      //Console.Error.WriteLine("%%%%% {0} | {1}", p, p.DeclaringType);

-      el.SetAttribute("Declared", xmlClean(prettyTypeName(p.DeclaringType)));

-      el.SetAttribute("CDeclared", canonicalTypeName(p.DeclaringType, null));

-      el.SetAttribute("Get", p.CanRead.ToString());

-      el.SetAttribute("Set", p.CanWrite.ToString());

-      el.SetAttribute("Type", xmlClean(prettyTypeName(p.PropertyType)));

-

-      if (p.DeclaringType.Assembly == assembly)

-        el.SetAttribute("C5", "");

-

-      if (inherited)

-        el.SetAttribute("Inherited", "");

-

-      if (p.Name.Equals("Item"))

-        AddSignature(el, prettyIndexerSignature(p), ret);

-      else

-        AddSignature(el, /*prettyTypeName(p.PropertyType) + " " +*/ p.Name, ret);

-

-      //AddSummary(el, xpath + "/summary", ret, doc);

-      CopyCodeDoc(el, refid, ret);

-      //AddValue(el, xpath + "/value", ret, doc);

-      VisitParameters(p.GetIndexParameters(), el, ret, xpath);

-      type.AppendChild(el);

-    }

-

-

-    private void VisitParameters(ParameterInfo[] pars, XmlElement n, XmlDocument ret, string xpath)

-    {

-      foreach (ParameterInfo p in pars)

-      {

-        XmlElement el = CreateElement(ret, "Parameter");

-

-        el.SetAttribute("Name", p.Name);

-        el.SetAttribute("Type", prettyTypeName(p.ParameterType));

-        //AddSummary(el, xpath + "/param[@name = \"" + p.Name + "\"]", ret, doc);

-        CopyCodeDoc(el, xpath + "/param[@name = \"" + p.Name + "\"]", ret);

-

-        n.AppendChild(el);

-      }

-    }

-

-

-    private void VisitConstructor(Type t, ConstructorInfo c, XmlElement type, XmlDocument ret)

-    {

-      Type declaringType = c.DeclaringType;

-      string refid = "M:" + canonicalTypeName(c.DeclaringType, null) + "." + "#ctor";

-

-      refid += canonicalParameters(c.GetParameters(), new string[]{});

-

-      string xpath = "doc/members/member[@name = \"" + refid + "\"]";

-      XmlElement el = CreateElement(ret, "Constructor");

-      el.SetAttribute("Foo", c.IsConstructor ? "Con" : "San");

-      el.SetAttribute("refid", refid);

-      el.SetAttribute("Declared", prettyTypeName(declaringType));

-      el.SetAttribute("CDeclared", canonicalTypeName(declaringType, null));

-      el.SetAttribute("Access", c.IsPublic ? "public" : (c.IsPrivate ? "private" : "protected"));

-      //el.SetAttribute("Access", c.IsPublic ? "public" : (c.IsPrivate || c.IsAssembly ? "private" : "protected"));

-      if (declaringType.Assembly == assembly)

-        el.SetAttribute("C5", "");

-      if (declaringType != t)

-        el.SetAttribute("Inherited", "");

-      AddSignature(el, prettyConstructorSignature(c), ret);

-      CopyCodeDoc(el, refid, ret);

-      //AddSummary(el, xpath + "/summary", ret, doc);

-      VisitParameters(c.GetParameters(), el, ret, xpath);

-      type.AppendChild(el);

-    }

-

-

-    private void VisitMethod(bool inherited, MethodInfo m, XmlElement type, XmlDocument ret)

-    {

-      if (m.Name.StartsWith("get_") || m.Name.StartsWith("set_") || m.Name.StartsWith("add_") || m.Name.StartsWith("remove_"))

-        return;

-      bool isOperator = m.Name.StartsWith("op_");

-

-      string refid = "M:" + canonicalMethodName(m);

-

-      string xpath = "doc/members/member[@name = \"" + refid + "\"]";

-      XmlElement el = CreateElement(ret, isOperator ? "Operator" : "Method");

-

-      string mangledName = m.Name;

-      if (isOperator)

-      {

-        switch (mangledName)

-        {

-          case "op_Equality": mangledName = "operator =="; break;

-          case "op_Inequality": mangledName = "operator !="; break;

-          default: throw new ApplicationException("unknown operatorname, " + mangledName);

-        }

-      }

-      el.SetAttribute("Name", mangledName);

-      el.SetAttribute("refid", refid);

-      el.SetAttribute("Static", m.IsStatic.ToString());

-      el.SetAttribute("Abstract", m.IsAbstract.ToString());

-      el.SetAttribute("Virtual", m.IsVirtual.ToString());

-      el.SetAttribute("Final", m.IsFinal.ToString());

-      el.SetAttribute("Declared", xmlClean(prettyTypeName(m.DeclaringType)));

-      el.SetAttribute("CDeclared", canonicalTypeName(m.DeclaringType, null));

-      el.SetAttribute("ReturnType", xmlClean(prettyTypeName(m.ReturnType)));

-      if (m.DeclaringType.Assembly == assembly)

-        el.SetAttribute("C5", "");

-      if (inherited)

-        el.SetAttribute("Inherited", "");

-      el.SetAttribute("Access", m.IsPublic ? "public" : (m.IsPrivate || m.IsAssembly ? "private" : "protected"));

-      el.SetAttribute("Sealed", m.IsFinal.ToString());

-      AddSignature(el, prettyMethodSignature(mangledName, m), ret);

-      CopyCodeDoc(el, refid, ret);

-      VisitParameters(m.GetParameters(), el, ret, xpath);

-

-      foreach (Type gp in m.GetGenericArguments())

-        foreach (Type gc in gp.GetGenericParameterConstraints())

-          if (gc != typeof(object))

-          {

-            XmlElement constraint = CreateElement(ret, "constraint");

-            constraint.SetAttribute("Value", prettyTypeName(gp) + " : " + xmlClean(prettyTypeName(gc)));

-            el.AppendChild(constraint);

-          }

-      type.AppendChild(el);

-    }

-

-    public XmlDocument GenerateDoc()

-    {

-      BindingFlags flags = BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance | BindingFlags.NonPublic;

-

-      XmlDocument ret = new XmlDocument();

-      XmlElement root = CreateElement(ret, "Assembly");

-

-      root.SetAttribute("Name", assemblyName);

-

-      ret.AppendChild(root);

-

-      XmlElement type = null;

-      //string xpath = null;

-

-      foreach (Type t in assembly.GetTypes())

-      {

-        if (t.Name.StartsWith("DocNet"))

-          continue;

-

-        if (t.IsInterface)

-        {

-          type = CreateElement(ret, "Interface");

-          foreach (EventInfo e in t.GetEvents(flags))

-            VisitEvent(e.DeclaringType != t, e, type, ret);

-

-          foreach (PropertyInfo p in t.GetProperties(flags))

-            VisitProperty(false, p, type, ret);

-

-          foreach (MethodInfo m in t.GetMethods(flags))

-            VisitMethod(false, m, type, ret);

-        }

-        else if (t.IsValueType)

-        {

-          type = CreateElement(ret, "Struct");

-          foreach (FieldInfo f in t.GetFields(flags))

-            VisitField(f.DeclaringType != t, f, type, ret);

-

-          foreach (EventInfo e in t.GetEvents(flags))

-            VisitEvent(e.DeclaringType != t, e, type, ret);

-

-          foreach (PropertyInfo p in t.GetProperties(flags))

-            VisitProperty(p.DeclaringType != t, p, type, ret);

-

-          foreach (ConstructorInfo c in t.GetConstructors(flags))

-            VisitConstructor(t, c, type, ret);

-

-          foreach (MethodInfo m in t.GetMethods(flags))

-            VisitMethod(m.DeclaringType != t, m, type, ret);

-        }

-        else if (t.IsSubclassOf(typeof(Delegate)))

-        {

-          type = CreateElement(ret, "Delegate");

-          VisitMethod(false, t.GetMethod("Invoke"), type, ret);

-        }

-        else

-        { // Class

-          type = CreateElement(ret, "Class");

-          foreach (FieldInfo f in t.GetFields(flags))

-            VisitField(f.DeclaringType != t, f, type, ret);

-

-          foreach (EventInfo e in t.GetEvents(flags))

-            VisitEvent(e.DeclaringType != t, e, type, ret);

-

-          foreach (PropertyInfo p in t.GetProperties(flags))

-            VisitProperty(p.DeclaringType != t, p, type, ret);

-

-          foreach (ConstructorInfo c in t.GetConstructors(flags))

-            VisitConstructor(t, c, type, ret);

-

-          foreach (MethodInfo m in t.GetMethods(flags))

-            VisitMethod(m.DeclaringType != t, m, type, ret);

-        }

-

-        type.SetAttribute("Name", xmlClean(prettyTypeName(t)));

-        type.SetAttribute("Access", t.IsPublic || t.IsNestedPublic ? "public" : t.IsNestedFamily ? "protected" : "private");

-

-        string refid = "T:" + canonicalTypeName(t, null);

-

-        type.SetAttribute("refid", refid);

-        type.SetAttribute("C5", "");

-        AddSignature(type, prettyTypeName(t), ret);

-        addImplements(type, t, ret);

-        addBases(type, t, ret);

-

-        foreach (Type gp in t.GetGenericArguments())

-        {

-          if (gp.GenericParameterAttributes != GenericParameterAttributes.None)

-          {

-            XmlElement constraint = CreateElement(ret, "constraint");

-            string constraintText = null;

-            switch (gp.GenericParameterAttributes)

-            {

-              case GenericParameterAttributes.Contravariant:

-                break;

-              case GenericParameterAttributes.Covariant:

-                break;

-              case GenericParameterAttributes.DefaultConstructorConstraint:

-                constraintText = "new()";

-                break;

-              case GenericParameterAttributes.None:

-                break;

-              case GenericParameterAttributes.ReferenceTypeConstraint:

-                constraintText = "class";

-                break;

-              case GenericParameterAttributes.SpecialConstraintMask:

-                break;

-              case GenericParameterAttributes.NotNullableValueTypeConstraint:

-                constraintText = "struct";

-                break;

-              case GenericParameterAttributes.VarianceMask:

-                break;

-            }

-            constraint.SetAttribute("Value", String.Format("{0} : {1}", gp, constraintText));

-            type.AppendChild(constraint);

-          }

-          foreach (Type gc in gp.GetGenericParameterConstraints())

-          {

-            if (gc != typeof(object))

-            {

-              XmlElement constraint = CreateElement(ret, "constraint");

-              constraint.SetAttribute("Value", String.Format("{0} : {1}", prettyTypeName(gp), xmlClean(prettyTypeName(gc))));

-              type.AppendChild(constraint);

-            }

-          }

-        }

-

-        CopyCodeDoc(type, refid, ret);

-        root.AppendChild(type);

-      }

-

-      return ret;

-    }

-

-    C5.HashDictionary<Type, string> t2ptn = new C5.HashDictionary<Type, string>();

-    private string prettyTypeName(Type t)

-    {

-      string retval;

-      //if (!t2ptn.Find(t, out retval))

-      //{

-      int consumed = 0;

-      retval = prettyTypeName(t, ref consumed);

-      //    t2ptn.Add(t, retval);

-      //}

-      return retval;

-    }

-

-    private string prettyTypeName(Type t, ref int consumed)

-    {

-      StringBuilder ret = new StringBuilder();

-

-      if (t.IsGenericParameter)

-        ret.Append(t.Name);

-      else if (t.IsArray)

-        ret.Append(prettyTypeName(t.GetElementType()) + "[]");

-      else if (t.IsByRef)

-        ret.Append("ref ").Append(prettyTypeName(t.GetElementType()));

-      else if (!t.IsGenericType)

-        ret.Append(t.IsNested ? prettyTypeName(t.DeclaringType, ref consumed) + "." + t.Name : t.FullName);

-      else

-      {

-        bool first = true;

-        StringBuilder gps = new StringBuilder();

-        Type[] gp = t.GetGenericArguments();

-

-        ret.Append(t.IsNested ? prettyTypeName(t.DeclaringType, ref consumed) : t.Namespace).Append(".").Append(t.Name);

-        if (consumed < gp.Length)

-        {

-          //TODO: fix this ugly hack to remove `n 

-          ret.Remove(ret.Length - 2, 2);

-          //ret = ret.Substring(0, ret.Length - 2);

-          for (int i = consumed, length = gp.Length; i < length; i++)

-          {

-            Type ty = gp[i];

-

-            if (first) first = false;

-            else

-              gps.Append(",");

-

-            gps.Append(prettyTypeName(ty));

-          }

-

-          consumed = gp.Length;

-          ret.Append("{").Append(gps.ToString()).Append("}");

-        }

-      }

-

-      string retval = ret.ToString();

-

-      if (retval.StartsWith(defaultNamespace + "."))

-        retval = retval.Substring(defaultNamespace.Length + 1);

-

-      if (longtype2short.Contains(retval))

-        retval = longtype2short[retval];

-

-      return retval;

-    }

-

-    private string prettyParameters(ParameterInfo[] pars)

-    {

-      string ret = "";

-      bool first = true;

-

-      foreach (ParameterInfo p in pars)

-      {

-        if (first) first = false;

-        else

-          ret += ", ";

-        Type pt = p.ParameterType;

-        if (p.IsOut)

-        {

-          ret += "out ";

-          pt = pt.GetElementType();

-        }

-

-        ret += prettyTypeName(pt) + " " + p.Name;

-      }

-

-      return ret;

-    }

-

-    private string prettyMethodSignature(string name, MethodInfo m)

-    {

-      string gp = "";

-      if (m.IsGenericMethod)

-      {

-        Type[] gps = m.GetGenericArguments();

-        gp = "<";

-

-        for (int i = 0; i < gps.Length; i++)

-          gp += (i == 0 ? "" : ",") + gps[i].Name;

-

-        gp += ">";

-      }

-

-      return name + gp + "(" + prettyParameters(m.GetParameters()) + ")";

-    }

-

-    private string prettyConstructorSignature(ConstructorInfo c)

-    {

-      Type t = c.DeclaringType;

-

-      return prettyTypeName(t) + "(" + prettyParameters(c.GetParameters()) + ")";

-    }

-

-    private string prettyIndexerSignature(PropertyInfo p)

-    {

-      return /*prettyTypeName(p.PropertyType) + " " + */ "this[" + prettyParameters(p.GetIndexParameters()) + "]";

-    }

-

-

-    private string simpleTypeName(Type t)

-    {

-      return (t.IsNested ? simpleTypeName(t.DeclaringType) : t.Namespace) + "." + t.Name;

-    }

-

-

-    private string canonicalTypeName(Type t, string[] mgps)

-    {

-      string ret;

-

-      if (t.IsGenericParameter)

-        ret = "`" + t.GenericParameterPosition;

-      else if (t.IsArray)

-        ret = canonicalTypeName(t.GetElementType(), mgps) + "[]";

-      else if (t.IsByRef)

-        ret = canonicalTypeName(t.GetElementType(), mgps) + "@";

-      else

-      {

-        ret = simpleTypeName(t);

-        if (!t.IsGenericType)

-          ret += "";

-        else if (mgps == null)

-          ret += "";//"`" + t.GetGenericArguments().Length;

-        else

-        {

-          //TODO: fix this ugly hack to remove `n 

-          ret = ret.Substring(0, ret.Length - 2);

-

-          bool first = true;

-          string gps = "";

-          Type[] gp = t.GetGenericArguments();

-

-          foreach (Type ty in gp)

-          {

-            if (first) first = false;

-            else

-              gps += ",";

-

-            if (ty.IsGenericParameter)

-            {

-              bool ismgp = false;

-

-              foreach (string s in mgps) if (s.Equals(ty.Name)) ismgp = true;

-

-              gps += (ismgp ? "``" : "`") + ty.GenericParameterPosition;

-            }

-            else

-              gps += canonicalTypeName(ty, mgps);

-          }

-

-          ret += "{" + gps + "}";

-        }

-      }

-

-      return ret;

-    }

-

-    private string canonicalMethodName(MethodInfo m)

-    {

-      string ret = canonicalTypeName(m.DeclaringType, null) + "." + m.Name;

-

-      string[] gmps;

-

-      if (m.IsGenericMethod)

-      {

-        Type[] gps = m.GetGenericArguments();

-

-        ret += "``" + gps.Length;

-        gmps = new string[gps.Length];

-        for (int i = 0; i < gps.Length; i++)

-          gmps[i] = gps[i].Name;

-      }

-      else

-        gmps = new string[]{};

-

-      ret += canonicalParameters(m.GetParameters(), gmps);

-      return ret;

-    }

-

-    private string canonicalPropertyName(PropertyInfo p)

-    {

-      string pname = canonicalTypeName(p.DeclaringType, null) + "." + p.Name;

-      ParameterInfo[] pars = p.GetIndexParameters();

-

-      if (pars.Length > 0)

-        pname += canonicalParameters(pars, new string[]{});

-

-      return pname;

-    }

-

-    private string canonicalParameters(ParameterInfo[] pars, string[] gmps)

-    {

-      if (pars.Length == 0) return "";

-

-      string ret = "";

-      bool first = true;

-

-      foreach (ParameterInfo p in pars)

-      {

-        if (first) first = false;

-        else

-          ret += ",";

-

-        ret += canonicalTypeName(p.ParameterType, gmps); ;

-      }

-

-      return "(" + ret + ")";

-    }

-

-

-

-    static void Main(string[] args)

-    {

-      if (args.Length != 2)

-      {

-        args = new string[] { @"C5.dll", @"C5.xml" };

-

-      }

-      {

-        Timer timer = new Timer();

-        timer.snap();

-        DocNet doc = new DocNet(args[0], args[1], "C5");

-        XmlDocument merged = doc.GenerateDoc();

-        Console.Error.WriteLine("Time merge: {0} ms", timer.snap());

-

-        System.Xml.Xsl.XslCompiledTransform overview = new System.Xml.Xsl.XslCompiledTransform();

-        overview.Load(@"overview.xslt");

-        overview.Transform(merged, new XmlTextWriter(new StreamWriter(@"docbuild\contents.htm")));

-        Console.Error.WriteLine("Time, overview: {0} ms", timer.snap());

-

-        StringBuilder megaDoc = new StringBuilder();

-        using (XmlWriter writer = XmlWriter.Create(megaDoc))

-        {

-          writer.WriteStartElement("hack");

-          System.Xml.Xsl.XslCompiledTransform trans = new System.Xml.Xsl.XslCompiledTransform();

-          trans.Load(@"trans.xslt");

-          trans.Transform(merged, writer);

-          writer.WriteEndElement();

-          writer.Close();

-        }

-        Console.Error.WriteLine("Time trans: {0} ms", timer.snap());

-        System.Xml.XPath.XPathDocument megaXml =

-          new System.Xml.XPath.XPathDocument(XmlReader.Create(new StringReader(megaDoc.ToString())));

-        System.Xml.XPath.XPathNodeIterator nodes = megaXml.CreateNavigator().Select("/hack/*");

-        string docfn = null;

-        foreach (System.Xml.XPath.XPathNavigator var in nodes)

-        {

-          if (var.Name == "filestart")

-            docfn = var.GetAttribute("name", "");

-          if (var.Name == "html")

-          {

-            Console.Error.Write(".");

-            XmlWriter w = new XmlTextWriter(new StreamWriter(@"docbuild\types\" + docfn));

-            var.WriteSubtree(w);

-            w.Close();

-          }

-        }

-        Console.Error.WriteLine();

-        Console.Error.WriteLine("Time split: {0} ms", timer.snap());

-      }

-      Console.Write("? ");

-      Console.Read();

-    }

-  }

-}

-

diff --git a/mcs/class/Mono.C5/doc/dodoc.cmd b/mcs/class/Mono.C5/doc/dodoc.cmd
deleted file mode 100644
index 3ed5141a139..00000000000
--- a/mcs/class/Mono.C5/doc/dodoc.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-del docbuild\types\*.htm

-bin\Debug\docNet.exe ..\C5\bin\Debug\C5.dll ..\C5\c5.xml

diff --git a/mcs/class/Mono.C5/doc/mkcurrent.cmd b/mcs/class/Mono.C5/doc/mkcurrent.cmd
deleted file mode 100644
index 65cc5607136..00000000000
--- a/mcs/class/Mono.C5/doc/mkcurrent.cmd
+++ /dev/null
@@ -1,10 +0,0 @@
-cd c:\src\c5\src\C5\docNet\docbuild

-

-copy ..\..\C5\bin\Debug\C5.dll W:\research\c5\current

-copy ..\..\C5\bin\Debug\C5.pdb W:\research\c5\current

-

-rem del "W:\research\c5\current\types\*.htm"

-

-xcopy /Q *.htm W:\research\c5\current /S/Y

-copy docnet.css W:\research\c5\current

-pause

diff --git a/mcs/class/Mono.C5/doc/overview.xslt b/mcs/class/Mono.C5/doc/overview.xslt
deleted file mode 100644
index e410cd2318e..00000000000
--- a/mcs/class/Mono.C5/doc/overview.xslt
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" ?>

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-<xsl:output encoding = "ISO-8859-1"/>

-    <xsl:template match="/">

-        <html>

-            <head>

-                <title>

-                    <xsl:text>DocNet documentation for</xsl:text>

-                    <xsl:value-of select="Assembly/@Name" /></title>

-                <link rel="stylesheet" type="text/css" href="docnet.css" />

-            </head>

-            <body>

-                <h3>Interfaces overview</h3>

-                <xsl:for-each select="/Assembly/Interface[@Access != 'private']">

-                    <xsl:sort select="@Name" />

-                    <xsl:call-template name="htmllink" />

-                    <xsl:if test="position()!=last()">,<br/> </xsl:if>

-                </xsl:for-each>

-                <h3>Classes overview</h3>

-                <xsl:for-each select="/Assembly/Class[@Access != 'private']">

-                    <xsl:sort select="@Name" />

-                    <xsl:call-template name="htmllink" />

-                    <xsl:if test="position()!=last()">,<br/> </xsl:if>

-                </xsl:for-each>

-                <h3>Value Types overview</h3>

-                <xsl:for-each select="/Assembly/Struct[@Access != 'private']">

-                    <xsl:sort select="@Name" />

-                    <xsl:call-template name="htmllink" />

-                    <xsl:if test="position()!=last()">,<br/> </xsl:if>

-                </xsl:for-each>

-                <h3>Delegates overview</h3>

-                <xsl:for-each select="/Assembly/Delegate[@Access != 'private']">

-                    <xsl:sort select="@Name" />

-                    <xsl:call-template name="htmllink" />

-                    <xsl:if test="position()!=last()">,<br/> </xsl:if>

-                </xsl:for-each>

-            </body>

-        </html>

-    </xsl:template>

-    <xsl:template match="Signature">

-        <code>

-            <xsl:value-of select="." />

-        </code>

-    </xsl:template>

-    <xsl:template name="htmllink">

-        <xsl:choose>

-            <xsl:when test="@refid">

-                <xsl:element name="a">

-                    <xsl:attribute name="href">

-                        <!--xsl:text>main.htm#</xsl:text>

-                        <xsl:value-of select="@refid" /-->

-                        <xsl:text>types/</xsl:text><xsl:value-of select="substring(@refid,3)" /><xsl:text>.htm</xsl:text>

-                    </xsl:attribute>

-                    <xsl:attribute name="target">

-                        <xsl:text>main</xsl:text>

-                    </xsl:attribute>

-                    <xsl:apply-templates select="Signature" />

-                </xsl:element>

-            </xsl:when>

-            <xsl:otherwise>

-                <xsl:apply-templates select="Signature" />

-            </xsl:otherwise>

-        </xsl:choose>

-    </xsl:template>

-</xsl:stylesheet>

diff --git a/mcs/class/Mono.C5/doc/tolatex.xslt b/mcs/class/Mono.C5/doc/tolatex.xslt
deleted file mode 100644
index 0e929b9079b..00000000000
--- a/mcs/class/Mono.C5/doc/tolatex.xslt
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" ?>

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-    <xsl:output encoding = "ISO-8859-1" omit-xml-declaration="yes" indent="no"/>

-    <xsl:strip-space elements="*"/>

-    <xsl:template match="table">

-        <xsl:text>\begin{tabular}{lc|*{15}{c}}\hline\hline&#10;</xsl:text>

-        <xsl:apply-templates></xsl:apply-templates>

-        <xsl:text>\hline\hline&#10;\end{tabular}&#10;</xsl:text>

-    </xsl:template>

-    <xsl:template match="tr">

-        <xsl:choose>

-            <xsl:when test="td/i">

-                <xsl:text>\hline&#10;%</xsl:text><xsl:value-of select="td/i/font"/><xsl:text>&#10;</xsl:text>

-            </xsl:when>

-            <xsl:otherwise>

-                <xsl:for-each select="th">

-                    <xsl:if test="position()!=1">\turned{</xsl:if>

-                    <xsl:apply-templates/>

-                    <xsl:if test="position()!=1">}</xsl:if>

-                    <xsl:if test="position()!=last()"><xsl:text disable-output-escaping="yes" >&#10;&amp;&#32;</xsl:text></xsl:if>

-                </xsl:for-each>

-                <xsl:for-each select="td">

-                    <xsl:if test="position()=1">\texttt{</xsl:if>

-                    <xsl:if test="position()!=1">$</xsl:if>

-                    <xsl:apply-templates/>

-                    <xsl:if test="position()=1">}</xsl:if>

-                    <xsl:if test="position()!=1">$</xsl:if>

-                    <xsl:if test="position()!=last()"><xsl:text disable-output-escaping="yes" >&#32;&amp;&#32;</xsl:text></xsl:if>

-                </xsl:for-each>

-                <!---->\\&#10;<!---->

-            </xsl:otherwise>

-        </xsl:choose>

-    </xsl:template>

-    <xsl:template match ="th">

-        <xsl:apply-templates/>

-    </xsl:template>

-    <xsl:template match ="td">

-        <xsl:apply-templates/>

-    </xsl:template>

-    <xsl:template match="font">

-        <xsl:apply-templates/>

-    </xsl:template>

-</xsl:stylesheet>
\ No newline at end of file
diff --git a/mcs/class/Mono.C5/doc/trans.xslt b/mcs/class/Mono.C5/doc/trans.xslt
deleted file mode 100644
index 526c177acb7..00000000000
--- a/mcs/class/Mono.C5/doc/trans.xslt
+++ /dev/null
@@ -1,591 +0,0 @@
-<?xml version="1.0" ?>

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:output encoding = "ISO-8859-1"/>

-  <xsl:template match="/">

-    <xsl:apply-templates select="/Assembly/Interface" />

-    <xsl:apply-templates select="/Assembly/Class" />

-    <xsl:apply-templates select="/Assembly/Struct" />

-    <xsl:apply-templates select="/Assembly/Delegate" />

-  </xsl:template>

-  <xsl:template match="/Assembly/Interface">

-    <xsl:call-template name="file"/>

-  </xsl:template>

-  <xsl:template match="/Assembly/Class">

-    <xsl:call-template name="file"/>

-  </xsl:template>

-  <xsl:template match="/Assembly/Struct">

-    <xsl:call-template name="file"/>

-  </xsl:template>

-  <xsl:template match="/Assembly/Delegate">

-    <xsl:call-template name="file"/>

-  </xsl:template>

-  <xsl:template name="file">

-    <xsl:if test="@Access[.!='private']">

-      <xsl:text>&#13;&#10;</xsl:text>

-      <xsl:element name="filestart">

-        <xsl:attribute name="name">

-          <xsl:value-of select="substring(@refid,3)"/>

-          <xsl:text>.htm</xsl:text>

-        </xsl:attribute>

-      </xsl:element>

-      <xsl:text>&#13;&#10;</xsl:text>

-      <html >

-        <head>

-          <title>

-            <xsl:text>C5 doc: </xsl:text>

-            <xsl:value-of select="@Name" />

-          </title>

-          <link rel="stylesheet" type="text/css" href="../docnet.css" />

-        </head>

-        <xsl:element name="body">

-          <xsl:attribute name="onLoad">

-            <xsl:text>parent.document.title ='C5 doc: </xsl:text>

-            <xsl:value-of select="@Name" />

-            <xsl:text>'</xsl:text>

-          </xsl:attribute>

-          <h2>

-            <xsl:value-of select="name()"/>

-            <xsl:text>&#32;</xsl:text>

-            <xsl:call-template name="htmlname" />

-          </h2>

-          <xsl:apply-templates select="summary" />

-          <xsl:call-template name="typeparams" />

-          <xsl:call-template name="implements" />

-          <xsl:call-template name="implementedby" />

-          <xsl:call-template name="super" />

-          <xsl:apply-templates select="Bases" />

-          <xsl:call-template name="baseof" />

-          <xsl:call-template name="foverview" />

-          <xsl:call-template name="eoverview" />

-          <xsl:call-template name="poverview" />

-          <xsl:call-template name="coverview" />

-          <xsl:call-template name="moverview" />

-          <xsl:call-template name="ooverview" />

-          <xsl:call-template name="ftable" />

-          <xsl:call-template name="etable" />

-          <xsl:call-template name="ptable" />

-          <xsl:call-template name="ctable" />

-          <xsl:call-template name="mtable" />

-          <xsl:call-template name="otable" />

-        </xsl:element>

-      </html>

-    </xsl:if>

-  </xsl:template>

-  <xsl:template name="implements">

-    <xsl:for-each select="Implements">

-      <xsl:sort select="@refid" />

-      <xsl:if test="position()=1">

-        <h3>Implements</h3>

-      </xsl:if>

-      <xsl:call-template name="htmllink" />

-      <xsl:if test="position()!=last()">, </xsl:if>

-    </xsl:for-each>

-  </xsl:template>

-  <xsl:template name="super">

-    <xsl:variable name="leRefid" select="@refid" />

-    <xsl:for-each select="/Assembly/Interface[Implements[@refid = $leRefid ] and @Access != 'private']">

-      <xsl:sort select="@Name" />

-      <xsl:if test="position()=1">

-        <h3>Super</h3>

-      </xsl:if>

-      <xsl:call-template name="htmllink" />

-      <xsl:if test="position()!=last()">, </xsl:if>

-    </xsl:for-each>

-  </xsl:template>

-  <xsl:template name="implementedby">

-    <xsl:variable name="leRefid" select="@refid" />

-    <xsl:for-each select="/Assembly/Class[Implements[@refid = $leRefid ] and @Access != 'private']">

-      <xsl:sort select="@Name" />

-      <xsl:if test="position()=1">

-        <h3>Implemented by</h3>

-      </xsl:if>

-      <xsl:call-template name="htmllink" />

-      <xsl:if test="position()!=last()">, </xsl:if>

-    </xsl:for-each>

-  </xsl:template>

-  <xsl:template match="Bases">

-    <xsl:if test="position()=1">

-      <h3>Bases</h3>

-    </xsl:if>

-    <xsl:call-template name="htmllink" />

-    <xsl:if test="position()!=last()">, </xsl:if>

-  </xsl:template>

-  <xsl:template name="baseof">

-    <xsl:variable name="leRefid" select="@refid" />

-    <xsl:for-each select="/Assembly/Class[Bases[@refid = $leRefid ] and @Access != 'private']">

-      <xsl:sort select="@Name" />

-      <xsl:if test="position()=1">

-        <h3>Base of</h3>

-      </xsl:if>

-      <xsl:call-template name="htmllink" />

-      <xsl:if test="position()!=last()">, </xsl:if>

-    </xsl:for-each>

-  </xsl:template>

-  <xsl:template match="param">

-    <tr>

-      <td valign="top">

-        <!--code-->

-        <xsl:value-of select="@name" />

-        <!--/code-->

-        <xsl:text>:</xsl:text>

-      </td>

-      <td valign="top">

-        <xsl:apply-templates/>

-      </td>

-    </tr>

-  </xsl:template>

-  <xsl:template match="returns">

-    <xsl:if test="current()[../@ReturnType!='void']">

-      <tr>

-        <td valign="top">

-          <b>Returns:</b>

-        </td>

-        <td valign="top">

-          <xsl:apply-templates/>

-        </td>

-      </tr>

-    </xsl:if>

-  </xsl:template>

-  <xsl:template match="Signature">

-    <code>

-      <xsl:value-of select="." />

-    </code>

-  </xsl:template>

-  <xsl:template match="summary">

-    <xsl:apply-templates />

-  </xsl:template>

-  <xsl:template match="value">

-    <p>

-      <b>Value:</b>

-      <xsl:apply-templates />

-    </p>

-  </xsl:template>

-  <!-- templates for VS 2005 doc tags-->

-  <xsl:template match="exception">

-    <xsl:choose>

-      <xsl:when test="current()[name(..)='summary']">

-        <b>/Throws</b>

-        <xsl:value-of select="substring(@cref,3)" />

-        <xsl:apply-templates />

-      </xsl:when>

-      <xsl:otherwise>

-        <tr>

-          <td valign="top">

-            <xsl:variable name="leRefid" select="@cref" />

-            <xsl:variable name="leExcNode" select="/Assembly/Class[@refid = $leRefid  and @Access != 'private']"/>

-            <xsl:choose>

-              <xsl:when test="$leExcNode">

-                <xsl:for-each select="$leExcNode">

-                  <xsl:call-template name="htmllink" />

-                </xsl:for-each>

-              </xsl:when>

-              <xsl:otherwise>

-                <xsl:value-of select="substring(@cref,3)" />

-              </xsl:otherwise>

-            </xsl:choose>

-          </td>

-          <td valign="top">

-            <xsl:apply-templates />

-          </td>

-        </tr>

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <!--xsl:template match="code">

-        <code>

-            <xsl:apply-templates select="@* | node()" />

-        </code>

-    </xsl:template-->

-  <xsl:template match="item">

-    <li>

-      <xsl:apply-templates select="@* | node()" />

-    </li>

-  </xsl:template>

-  <!-- also do description and term tags, and other list types?-->

-  <xsl:template match="list">

-    <xsl:choose>

-      <xsl:when test="@type='ordered'">

-        <ol>

-          <xsl:apply-templates select="@* | node()" />

-        </ol>

-      </xsl:when>

-      <xsl:otherwise>

-        <ul>

-          <xsl:apply-templates select="@* | node()" />

-        </ul>

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <xsl:template match="para">

-    <p>

-      <xsl:apply-templates select="@* | node()" />

-    </p>

-  </xsl:template>

-  <xsl:template match="seealso">

-    <xsl:text>See also</xsl:text>

-    <xsl:variable name="leRefid" select="@cref" />

-    <xsl:variable name="leNode" select="//*[@refid=$leRefid]" />

-    <xsl:variable name="leFile" select="substring(ancestor::*[@refid and not(@Declared)]/@refid,3)" />

-    <xsl:choose>

-      <xsl:when test ="substring(@cref,1,2) = 'T:'">

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:value-of select="substring(@cref,3)" />

-            <xsl:text>.htm</xsl:text>

-          </xsl:attribute>

-          <xsl:value-of select="$leNode/Signature" />

-        </xsl:element>

-      </xsl:when>

-      <xsl:when test="$leNode/@CDeclared=$leFile">

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            #<xsl:value-of select="@cref" />

-          </xsl:attribute>

-          <xsl:value-of select="$leNode/Signature" />

-        </xsl:element>

-      </xsl:when>

-      <xsl:otherwise>

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:value-of select="$leNode/@CDeclared" />.htm#<xsl:value-of select="@cref" />

-          </xsl:attribute>

-          <xsl:value-of select="$leNode/@Declared" />.<xsl:value-of select="$leNode/Signature" />

-        </xsl:element>

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <xsl:template match="see">

-    <!--xsl:text>See </xsl:text-->

-    <xsl:variable name="leRefid" select="@cref" />

-    <xsl:variable name="leNode" select="//*[@refid=$leRefid]" />

-    <xsl:variable name="leFile" select="substring(ancestor::*[@refid and not(@Declared)]/@refid,3)" />

-    <xsl:choose>

-      <xsl:when test ="substring(@cref,1,2) = 'T:'">

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:value-of select="substring(@cref,3)" />

-            <xsl:text>.htm</xsl:text>

-          </xsl:attribute>

-          <xsl:value-of select="$leNode/Signature" />

-        </xsl:element>

-      </xsl:when>

-      <xsl:when test="$leNode/@CDeclared=$leFile">

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:text>#</xsl:text>

-            <xsl:value-of select="@cref" />

-          </xsl:attribute>

-          <xsl:value-of select="$leNode/Signature" />

-        </xsl:element>

-      </xsl:when>

-      <xsl:otherwise>

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:value-of select="$leNode/@CDeclared" />.htm#<xsl:value-of select="@cref" />

-          </xsl:attribute>

-          <xsl:value-of select="$leNode/@Declared" />.<xsl:value-of select="$leNode/Signature" />

-        </xsl:element>

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <xsl:template match="typeparam">

-    <tr>

-      <td valign="top">

-        <xsl:value-of select="@name" />

-      </td>

-      <td valign="top">

-        <xsl:apply-templates />

-      </td>

-    </tr>

-  </xsl:template>

-  <xsl:template match="constraint">

-    <tr>

-      <td valign="top"></td>

-      <td valign="top">

-        <xsl:value-of select="@Value" />

-      </td>

-    </tr>

-  </xsl:template>

-  <xsl:template match="@* | node()">

-    <xsl:copy>

-      <xsl:apply-templates select="@* | node()" />

-    </xsl:copy>

-  </xsl:template>

-  <!-- end templates for VS 2005 doc tags -->

-  <xsl:template name="typeparams">

-    <xsl:if test="typeparam">

-      <table>

-        <tr>

-          <td>

-            <b>Type parameters:</b>

-          </td>

-          <td></td>

-        </tr>

-        <xsl:apply-templates select="typeparam"/>

-        <xsl:if test="constraint">

-          <tr>

-            <td>

-              <b>Constraints:</b>

-            </td>

-            <td></td>

-          </tr>

-          <xsl:apply-templates select="constraint"/>

-        </xsl:if>

-      </table>

-    </xsl:if>

-  </xsl:template>

-  <xsl:template name="htmllink">

-    <xsl:choose>

-      <xsl:when test="@C5">

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:choose>

-              <xsl:when test ="substring(@refid,1,2) = 'T:'">

-                <xsl:value-of select="substring(@refid,3)" />

-                <xsl:text>.htm</xsl:text>

-              </xsl:when>

-              <xsl:otherwise>

-                <xsl:value-of select="@CDeclared"/>.htm#<xsl:value-of select="@refid" />

-              </xsl:otherwise>

-            </xsl:choose>

-          </xsl:attribute>

-          <xsl:apply-templates select="Signature" />

-        </xsl:element>

-      </xsl:when>

-      <xsl:otherwise>

-        <xsl:apply-templates select="Signature" />

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <xsl:template name="locallink">

-    <xsl:choose>

-      <xsl:when test="@refid">

-        <xsl:element name="a">

-          <xsl:attribute name="href">

-            <xsl:text>#</xsl:text>

-            <xsl:value-of select="concat(../@refid , '|',@refid)" />

-          </xsl:attribute>

-          <xsl:apply-templates select="Signature" />

-        </xsl:element>

-      </xsl:when>

-      <xsl:otherwise>

-        <xsl:apply-templates select="Signature" />

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <xsl:template name="htmlname">

-    <xsl:choose>

-      <xsl:when test="@refid">

-        <xsl:choose>

-          <xsl:when test ="not(@Declared)">

-            <!-- i.e. a type -->

-            <xsl:element name="a">

-              <xsl:attribute name="name">

-                <xsl:value-of select="@refid" />

-              </xsl:attribute>

-              <xsl:apply-templates select="Signature" />

-            </xsl:element>

-          </xsl:when>

-          <xsl:otherwise>

-            <!-- i.e. a member -->

-            <xsl:element name="a">

-              <xsl:attribute name="name">

-                <xsl:value-of select="concat(../@refid , '|',@refid)" />

-              </xsl:attribute>

-              <xsl:apply-templates select="Signature" />

-            </xsl:element>

-            <xsl:if test ="not(@Inherited)">

-              <!-- the canonical description -->

-              <xsl:element name="a">

-                <xsl:attribute name="name">

-                  <xsl:value-of select="@refid" />

-                </xsl:attribute>

-              </xsl:element>

-            </xsl:if>

-          </xsl:otherwise>

-        </xsl:choose>

-      </xsl:when>

-      <xsl:otherwise>

-        <xsl:apply-templates select="Signature" />

-      </xsl:otherwise>

-    </xsl:choose>

-  </xsl:template>

-  <xsl:template name="ftable">

-    <xsl:call-template name="table">

-      <xsl:with-param name="type">Field</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="etable">

-    <xsl:call-template name="table">

-      <xsl:with-param name="type">Event</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="ptable">

-    <xsl:call-template name="table">

-      <xsl:with-param name="type">Property</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="ctable">

-    <xsl:call-template name="table">

-      <xsl:with-param name="type">Constructor</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="mtable">

-    <xsl:call-template name="table">

-      <xsl:with-param name="type" select="'Method'"/>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="otable">

-    <xsl:call-template name="table">

-      <xsl:with-param name="type" select="'Operator'"/>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="table">

-    <xsl:param name="type" />

-    <xsl:param name="protection" />

-    <xsl:variable name="thenodes" select="*[name() = $type and @Access != 'private' and not(@Inherited)]" />

-    <xsl:if test="$thenodes">

-      <h3>

-        <xsl:value-of select="$type" />

-        <xsl:text> details</xsl:text>

-      </h3>

-      <table border="1">

-        <xsl:for-each select="$thenodes">

-          <xsl:sort select="@Name" />

-          <tr>

-            <td valign="top">

-              <xsl:if test="current()[@Virtual != 'True' and @Static != 'True']">

-                <code class="greenbg">N</code>

-              </xsl:if>

-              <xsl:if test="current()[@Final = 'True' and @Static != 'True']">

-                <code class="greenbg">F</code>

-              </xsl:if>

-              <xsl:if test="current()[@Abstract = 'True']">

-                <code class="greenbg">A</code>

-              </xsl:if>

-              <xsl:if test="current()[@Static = 'True']">

-                <code class="greenbg">S</code>

-              </xsl:if>

-              <xsl:if test="current()[@Access = 'protected']">

-                <code class="greenbg">P</code>

-              </xsl:if>

-              <code>

-                <xsl:text>&#32;</xsl:text>

-                <xsl:choose>

-                  <xsl:when test="@ReturnType">

-                    <xsl:value-of select="@ReturnType"/>

-                  </xsl:when>

-                  <xsl:otherwise>

-                    <xsl:value-of select="@Type"/>

-                  </xsl:otherwise>

-                </xsl:choose>

-                <xsl:text>&#32;</xsl:text>

-              </code>

-              <xsl:call-template name="htmlname" />

-            </td>

-            <td>

-              <!--xsl:if test="@Inherited">

-                                <xsl:text>Inherited from </xsl:text>

-                                <xsl:value-of select="@Declared"/>

-                                <xsl:text>: </xsl:text>

-                                <xsl:call-template name="htmllink" />

-                            </xsl:if-->

-              <xsl:if test="not(@Inherited)">

-                <xsl:if test="@Get">

-                  <b>Access: </b>

-                  <xsl:if test="@Get='True' and @Set='True'">Read-Write</xsl:if>

-                  <xsl:if test="@Get='True' and @Set='False'">Read-Only</xsl:if>

-                  <xsl:if test="@Get='False' and @Set='True'">Write-Only</xsl:if>

-                  <br/>

-                </xsl:if>

-                <xsl:apply-templates select="value" />

-                <xsl:apply-templates select="summary" />

-                <xsl:if test="exception">

-                  <table>

-                    <tr>

-                      <td>

-                        <b>Throws</b>

-                      </td>

-                      <td></td>

-                    </tr>

-                    <xsl:apply-templates select="exception" />

-                  </table>

-                </xsl:if>

-                <xsl:call-template name="typeparams"/>

-                <xsl:if test="current()[@ReturnType != 'void'] or param">

-                  <table>

-                    <xsl:apply-templates select="returns" />

-                    <xsl:if test="param">

-                      <tr>

-                        <td>

-                          <b>Parameters:</b>

-                        </td>

-                      </tr>

-                      <xsl:apply-templates select="param" />

-                    </xsl:if>

-                  </table>

-                </xsl:if>

-              </xsl:if>

-            </td>

-          </tr>

-        </xsl:for-each>

-      </table>

-    </xsl:if>

-  </xsl:template>

-  <xsl:template name="foverview">

-    <xsl:call-template name="overview">

-      <xsl:with-param name="type">Field</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="eoverview">

-    <xsl:call-template name="overview">

-      <xsl:with-param name="type">Event</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="poverview">

-    <xsl:call-template name="overview">

-      <xsl:with-param name="type">Property</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="coverview">

-    <xsl:call-template name="overview">

-      <xsl:with-param name="type">Constructor</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="moverview">

-    <xsl:call-template name="overview">

-      <xsl:with-param name="type">Method</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="ooverview">

-    <xsl:call-template name="overview">

-      <xsl:with-param name="type">Operator</xsl:with-param>

-    </xsl:call-template>

-  </xsl:template>

-  <xsl:template name="overview">

-    <xsl:param name="type" select="'[Unknown Locale]'" />

-    <xsl:for-each select="*[name() = $type and @Access != 'private']">

-      <xsl:sort select="@Name" />

-      <xsl:if test="position() = 1">

-        <h3>

-          <xsl:value-of select="$type" />

-          <xsl:text> overview</xsl:text>

-        </h3>

-      </xsl:if>

-      <xsl:choose>

-        <xsl:when test="@Inherited">

-          <xsl:call-template name="htmllink" />

-          <xsl:text>, </xsl:text>

-          <xsl:text>Inherited from </xsl:text>

-          <xsl:value-of select="@Declared"/>

-        </xsl:when>

-        <xsl:otherwise>

-          <xsl:call-template name="locallink" />

-        </xsl:otherwise>

-      </xsl:choose>

-      <xsl:if test="position()!=last()">

-        ,<br/>

-      </xsl:if>

-    </xsl:for-each>

-  </xsl:template>

-</xsl:stylesheet>

diff --git a/mcs/class/Mono.C5/C5.old/hashing/HashBag.cs b/mcs/class/Mono.C5/hashing/HashBag.cs
index 080da67c325..080da67c325 100644
--- a/mcs/class/Mono.C5/C5.old/hashing/HashBag.cs
+++ b/mcs/class/Mono.C5/hashing/HashBag.cs
diff --git a/mcs/class/Mono.C5/C5.old/hashing/HashDictionary.cs b/mcs/class/Mono.C5/hashing/HashDictionary.cs
index 325aee15cfb..325aee15cfb 100644
--- a/mcs/class/Mono.C5/C5.old/hashing/HashDictionary.cs
+++ b/mcs/class/Mono.C5/hashing/HashDictionary.cs
diff --git a/mcs/class/Mono.C5/C5.old/hashing/HashTable.cs b/mcs/class/Mono.C5/hashing/HashTable.cs
index bc734d9de13..bc734d9de13 100644
--- a/mcs/class/Mono.C5/C5.old/hashing/HashTable.cs
+++ b/mcs/class/Mono.C5/hashing/HashTable.cs
diff --git a/mcs/class/Mono.C5/C5.old/heaps/IntervalHeap.cs b/mcs/class/Mono.C5/heaps/IntervalHeap.cs
index 2ad55893721..2ad55893721 100644
--- a/mcs/class/Mono.C5/C5.old/heaps/IntervalHeap.cs
+++ b/mcs/class/Mono.C5/heaps/IntervalHeap.cs
diff --git a/mcs/class/Mono.C5/C5.old/linkedlists/HashedLinkedLIst.cs b/mcs/class/Mono.C5/linkedlists/HashedLinkedLIst.cs
index dab32392680..dab32392680 100644
--- a/mcs/class/Mono.C5/C5.old/linkedlists/HashedLinkedLIst.cs
+++ b/mcs/class/Mono.C5/linkedlists/HashedLinkedLIst.cs
diff --git a/mcs/class/Mono.C5/C5.old/linkedlists/LinkedList.cs b/mcs/class/Mono.C5/linkedlists/LinkedList.cs
index ebb9ae13b12..ebb9ae13b12 100644
--- a/mcs/class/Mono.C5/C5.old/linkedlists/LinkedList.cs
+++ b/mcs/class/Mono.C5/linkedlists/LinkedList.cs
diff --git a/mcs/class/Mono.C5/C5.old/trees/RedBlackTree.cs b/mcs/class/Mono.C5/trees/RedBlackTree.cs
index daca84a3c6a..daca84a3c6a 100644
--- a/mcs/class/Mono.C5/C5.old/trees/RedBlackTree.cs
+++ b/mcs/class/Mono.C5/trees/RedBlackTree.cs
diff --git a/mcs/class/Mono.C5/C5.old/trees/RedBlackTreeBag.cs b/mcs/class/Mono.C5/trees/RedBlackTreeBag.cs
index 21050b9e62c..21050b9e62c 100644
--- a/mcs/class/Mono.C5/C5.old/trees/RedBlackTreeBag.cs
+++ b/mcs/class/Mono.C5/trees/RedBlackTreeBag.cs
diff --git a/mcs/class/Mono.C5/C5.old/trees/TreeDictionary.cs b/mcs/class/Mono.C5/trees/TreeDictionary.cs
index 6194c20a44d..6194c20a44d 100644
--- a/mcs/class/Mono.C5/C5.old/trees/TreeDictionary.cs
+++ b/mcs/class/Mono.C5/trees/TreeDictionary.cs
diff --git a/mcs/class/Mono.C5/C5.old/trees/set2bag.pl b/mcs/class/Mono.C5/trees/set2bag.pl
index 86de8560b66..86de8560b66 100644
--- a/mcs/class/Mono.C5/C5.old/trees/set2bag.pl
+++ b/mcs/class/Mono.C5/trees/set2bag.pl
diff --git a/mcs/class/Mono.Cairo/ChangeLog b/mcs/class/Mono.Cairo/ChangeLog
index 31f1ed5a8d9..6c20cfe8ee1 100644
--- a/mcs/class/Mono.Cairo/ChangeLog
+++ b/mcs/class/Mono.Cairo/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-17  Alp Toker  <alp@atoker.com>
-
-	* Samples/x11/compile.sh: Remove unused gtk-sharp reference
-
 2005-12-19  Wade Berrier <wberrier@novell.com>
 
 	* Mono.Cairo/Makefile: Fix EXTRA_DIST to include samples
diff --git a/mcs/class/Mono.Cairo/Samples/x11/compile.sh b/mcs/class/Mono.Cairo/Samples/x11/compile.sh
index bf866e6d61e..70de6c64bdf 100755
--- a/mcs/class/Mono.Cairo/Samples/x11/compile.sh
+++ b/mcs/class/Mono.Cairo/Samples/x11/compile.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
-mcs -r:System.Drawing -r:Mono.Cairo arc.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo arcneg.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo clip.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo clip_img.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo curve_rect.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo curve_to.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo fillstroke.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo gradient.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo image.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo image_pattern.cs x11.cs
-mcs -r:System.Drawing -r:Mono.Cairo text.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp arc.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp arcneg.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp clip.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp clip_img.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp curve_rect.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp curve_to.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp fillstroke.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp gradient.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp image.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp image_pattern.cs x11.cs
+mcs -r:System.Drawing -r:Mono.Cairo -pkg:gtk-sharp text.cs x11.cs
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog
index a9fe8619d01..a1e85c57d21 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog
@@ -1,12 +1,3 @@
-2006-02-10  Senganal T  <tsenganal@novell.com>
-
-	* Tds.cs :
-		- GetSequentialColumn,BeginLoad, EndLoad,
-		LoadData, SkipRow, SkipToColumnIndex
-		New Methods to Support sequential loading of row data
-	* TdsComm.cs :
-		- Skip : Changed arugment type from int to long.
-
 2006-01-27  Senganal T  <tsenganal@novell.com>
 
 	* Tds.cs :
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs
index a27b284362e..885ed5ac648 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ITds.cs
@@ -71,11 +71,6 @@ namespace Mono.Data.Tds.Protocol {
 			set;
 		}
 
-		bool SequentialAccess {
-			get;
-			set;
-		}
-
 		#endregion // Properties
 
 		#region Methods
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs
index ab234e23f17..535c09fdf2c 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs
@@ -89,15 +89,6 @@ namespace Mono.Data.Tds.Protocol {
 
 		int recordsAffected = -1;
 
-		long StreamLength = 0;
-		long StreamIndex = 0;
-		int StreamColumnIndex = 0;
-
-		bool sequentialAccess = false;
-		bool isRowRead = false;
-		bool isResultRead = false;
-		bool LoadInProgress = false;
-
 		#endregion // Fields
 
 		#region Properties
@@ -175,156 +166,6 @@ namespace Mono.Data.Tds.Protocol {
 			set { parameters = value; }
 		}
 
-		public bool SequentialAccess {
-			get { return sequentialAccess; }
-			set { sequentialAccess = value; }
-		}
-
-		private void SkipRow ()
-		{
-			SkipToColumnIndex (Columns.Count);
-
-			StreamLength = 0;
-			StreamColumnIndex = 0;
-			StreamIndex = 0;
-			LoadInProgress = false;
-		}
-
-		private void SkipToColumnIndex (int colIndex)
-		{
-			if (LoadInProgress)
-				EndLoad ();
-
-			if (colIndex < StreamColumnIndex)
-				throw new Exception ("Cannot Skip to a colindex less than the curr index");
-
-			while (colIndex != StreamColumnIndex) {
-				TdsColumnType colType = (TdsColumnType)Columns[StreamColumnIndex]["ColumnType"];
-				if (!(colType == TdsColumnType.Image ||
-					colType == TdsColumnType.Text ||
-					colType == TdsColumnType.NText)) {
-					GetColumnValue (colType, false, StreamColumnIndex);
-					StreamColumnIndex ++;
-				}
-				else {
-					BeginLoad (colType);
-					Comm.Skip (StreamLength);
-					StreamLength = 0;
-					EndLoad ();
-				}
-			}
-		}
-
-		public object GetSequentialColumnValue (int colIndex)
-		{
-			if (colIndex < StreamColumnIndex)
-				throw new InvalidOperationException ("Invalid attempt tp read from column ordinal" + colIndex); 
-
-			if (LoadInProgress)
-				EndLoad ();
-
-			if (colIndex != StreamColumnIndex)
-				SkipToColumnIndex (colIndex);
-
-			object o = GetColumnValue ((TdsColumnType)Columns[colIndex]["ColumnType"], false, colIndex);
-			StreamColumnIndex++;
-			return o;
-		}
-
-		public long GetSequentialColumnValue (int colIndex, long fieldIndex, byte[] buffer, int bufferIndex, int size) 
-		{
-			if (colIndex < StreamColumnIndex)
-				throw new InvalidOperationException ("Invalid attempt tp read from column ordinal" + colIndex); 
-
-			if (colIndex != StreamColumnIndex) 
-				SkipToColumnIndex (colIndex);
-
-			if (!LoadInProgress)
-				BeginLoad ((TdsColumnType)Columns[colIndex]["ColumnType"]);
-
-			if (buffer == null) {
-				return StreamLength;
-			}
-			return LoadData (fieldIndex, buffer, bufferIndex, size);
-		}
-
-		private void BeginLoad(TdsColumnType colType) 
-		{
-			if (LoadInProgress)
-				EndLoad ();
-
-			StreamLength = 0;
-		
-			switch (colType) {
-			case TdsColumnType.Text :
-			case TdsColumnType.NText:
-			case TdsColumnType.Image:
-				if (Comm.GetByte () != 0) {
-					Comm.Skip (24);
-					StreamLength = Comm.GetTdsInt ();
-				}
-				break;
-			case TdsColumnType.BigVarChar:
-			case TdsColumnType.BigChar:
-			case TdsColumnType.BigBinary:
-			case TdsColumnType.BigVarBinary:
-				Comm.GetTdsShort ();
-				StreamLength = Comm.GetTdsShort ();
-				break;
-			case TdsColumnType.VarChar :
-			case TdsColumnType.NVarChar :
-			case TdsColumnType.Char:
-			case TdsColumnType.NChar:
-			case TdsColumnType.Binary:
-			case TdsColumnType.VarBinary:
-				StreamLength = Comm.GetTdsShort ();
-				break;
-			default :
-				StreamLength = -1;
-				break;
-			}
-
-			StreamIndex = 0;
-			LoadInProgress = true;
-		}
-
-		private void EndLoad()
-		{
-			if (StreamLength > 0)
-				Comm.Skip (StreamLength);
-			StreamLength = 0;
-			StreamIndex = 0;
-			StreamColumnIndex++;
-			LoadInProgress = false;
-		}
-
-		private long LoadData (long fieldIndex, byte[] buffer, int bufferIndex, int size)
-		{
-			if (StreamLength <= 0)
-				return StreamLength;
-
-			if (fieldIndex < StreamIndex)
-				throw new InvalidOperationException ("field index less than stream pos");
-
-			if (fieldIndex >= (StreamLength + StreamIndex))
-				return 0;
-
-			// Skip to the index
-			Comm.Skip ((int) (fieldIndex - StreamIndex));
-			StreamIndex += (fieldIndex - StreamIndex);
-
-			// Load the reqd amt of bytes	
-			int loadlen = (int) ((size > StreamLength) ? StreamLength : size);
-			byte[] arr = Comm.GetBytes (loadlen, true);
-
-			// update the index and stream length
-			StreamIndex +=  loadlen + (fieldIndex - StreamIndex);
-			StreamLength -= loadlen;
-			arr.CopyTo (buffer, bufferIndex);
-
-			return arr.Length;
-		}
-
 		#endregion // Properties
 
 		#region Events
@@ -459,13 +300,6 @@ namespace Mono.Data.Tds.Protocol {
 
 		public bool NextResult ()
 		{
-			if (SequentialAccess) {
-				if (isResultRead) {
-					while (NextRow ()) {}
-					isRowRead = false;
-					isResultRead = false;
-				}
-			}
 			if (!moreResults)
 				return false;
 
@@ -513,13 +347,6 @@ namespace Mono.Data.Tds.Protocol {
 
 		public bool NextRow ()
 		{
-			if (SequentialAccess) {
-				if (isRowRead) {
-					SkipRow ();
-					isRowRead = false;
-				}
-			}
-
 			TdsPacketSubType subType;
 			bool done = false;
 			bool result = false;
@@ -603,7 +430,7 @@ namespace Mono.Data.Tds.Protocol {
 				element = GetIntValue (colType);
 				break;
 			case TdsColumnType.Image :
-				if (outParam)
+				if (outParam) 
 					comm.Skip (1);
 				element = GetImageValue ();
 				break;
@@ -1064,14 +891,6 @@ namespace Mono.Data.Tds.Protocol {
 
 		protected void LoadRow ()
 		{
-			if (SequentialAccess) {
-				if (isRowRead)
-					SkipRow ();
-				isRowRead = true;
-				isResultRead = true;
-				return;
-			}
-
 			currentRow = new TdsDataRow ();
 
 			int i = 0;
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs
index e08c4033d10..06cf7ca4f1a 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsComm.cs
@@ -511,7 +511,7 @@ namespace Mono.Data.Tds.Protocol {
 			}
 		}
 		
-		public void Skip (long i)
+		public void Skip (int i)
 		{
 			for ( ; i > 0; i--)
 				GetByte ();
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds/ChangeLog b/mcs/class/Mono.Data.Tds/Mono.Data.Tds/ChangeLog
index a615b091a7e..983f3c5282b 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds/ChangeLog
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds/ChangeLog
@@ -1,9 +1,9 @@
-2006-01-05  Senganal T  <tsenganal@novell.com>
+2006-02-05  Senganal T  <tsenganal@novell.com>
 
 	* TdsMetaParameter.cs: Test for DbNull when updating the scale 
 	of decimal or numeric value. Fixes #77410
-
-	Patch By Sebastien Robitaille <sebastien.robitaille@croesus.com>
+	
+	Patch from Sebastien Robitaille <sebastien.robitaille@croesus.com>
 
 2005-10-20  Senganal T <tsenganal@novell.com>
 	
diff --git a/mcs/class/Mono.Data/ChangeLog b/mcs/class/Mono.Data/ChangeLog
index 7e9fa6008c7..b1addaff877 100644
--- a/mcs/class/Mono.Data/ChangeLog
+++ b/mcs/class/Mono.Data/ChangeLog
@@ -1,25 +1,3 @@
-2006-02-13  Daniel Morgan <danielmorgan@verizon.net>
-	
-	* ProviderSectionHandler.cs
-	* Provider.cs: add support 
-	for parameter prefix and command builder
-	
-	* app.config: updated the sample app.config file
-	to include parameterprefix and commandbuilder on
-	some providers
-
-2006-02-13  Daniel Morgan <danielmorgan@verizon.net>
-
-	Patches from Brad Langhorst <brad@langhorst.com>
-	
-	* ProviderSectionHandler.cs
-	* ProviderFactory
-	* ProviderCollection.cs
-	* DataTools.cs
-	* Provider.cs: catch invalid args, 
-	allow non-qualified assembly loading, 
-	warn about empty providers
-	
 2005-12-31  Daniel Morgan <danielmorgan@verizon.net>
 
 	* test/test.exe.config	
diff --git a/mcs/class/Mono.Data/DataTools.cs b/mcs/class/Mono.Data/DataTools.cs
index fda68b08da1..6322fc08878 100644
--- a/mcs/class/Mono.Data/DataTools.cs
+++ b/mcs/class/Mono.Data/DataTools.cs
@@ -46,80 +46,57 @@ namespace Mono.Data
 		static public IDataParameter AddParameter(IDbCommand Cmd, string ParameterName, DbType DbType, 

 			ParameterDirection Direction)

 		{

-			if (Cmd == null) 

-				throw new System.ArgumentNullException ("Cmd");

-			if (ParameterName == null) 

-				throw new System.ArgumentNullException ("ParameterName");

-

-			IDataParameter param = Cmd.CreateParameter ();

-			Cmd.Parameters.Add (param);

-			param.ParameterName = ParameterName;

-			param.Direction = Direction;

-			param.DbType = DbType;

+			IDataParameter param=Cmd.CreateParameter();

+			Cmd.Parameters.Add(param);

+			param.ParameterName=ParameterName;

+			param.Direction=Direction;

+			param.DbType=DbType;

 			return param;

 		}

 

 		static public IDataParameter AddParameter(IDbCommand Cmd, string ParameterName, DbType DbType)

 		{

-			if (Cmd == null) 

-				throw new System.ArgumentNullException ("Cmd");

-			if (ParameterName == null) 

-				throw new System.ArgumentNullException("ParameterName");

-

-			IDataParameter param = Cmd.CreateParameter ();

-			Cmd.Parameters.Add (param);

-			param.ParameterName = ParameterName;

-			param.DbType = DbType;

+			IDataParameter param=Cmd.CreateParameter();

+			Cmd.Parameters.Add(param);

+			param.ParameterName=ParameterName;

+			param.DbType=DbType;

 			return param;

 		}

 

-		static public DataSet FillDataSet (IDbConnection conn, string SelectCommand)

+		static public DataSet FillDataSet(IDbConnection conn, string SelectCommand)

 		{

-			if (conn == null) 

-				throw new System.ArgumentNullException ("conn");

-			if (SelectCommand == null) 

-				throw new System.ArgumentNullException ("SelectCommand");

-

-			DataSet ds = new DataSet ();

-			IDbDataAdapter adapter = ProviderFactory.CreateDataAdapter (conn, SelectCommand);

-			if (conn.State != ConnectionState.Open)

-				conn.Open ();

-			adapter.Fill (ds);

+			DataSet ds=new DataSet();

+			IDbDataAdapter adapter=ProviderFactory.CreateDataAdapter(conn, SelectCommand);

+			if (conn.State!=ConnectionState.Open)

+				conn.Open();

+			adapter.Fill(ds);

 			return ds;

 		}

 

 		static public DataSet FillDataSet(IDbCommand SelectCommand)

 		{

-			if (SelectCommand == null) 

-				throw new System.ArgumentNullException ("SelectCommand");

-

-			DataSet ds = new DataSet ();

-			IDbDataAdapter adapter = ProviderFactory.CreateDataAdapter (SelectCommand);

-			if (adapter.SelectCommand.Connection.State != ConnectionState.Open)

-				adapter.SelectCommand.Connection.Open ();

-			adapter.Fill (ds);

+			DataSet ds=new DataSet();

+			IDbDataAdapter adapter=ProviderFactory.CreateDataAdapter(SelectCommand);

+			if (adapter.SelectCommand.Connection.State!=ConnectionState.Open)

+				adapter.SelectCommand.Connection.Open();

+			adapter.Fill(ds);

 			return ds;

 		}

 

 		static public DataSet FillDataSet(string ConfigSetting, string SelectCommand)

 		{

-			if (ConfigSetting == null) 

-				throw new System.ArgumentNullException ("ConfigSetting");

-			if (SelectCommand == null) 

-				throw new System.ArgumentNullException ("SelectCommand");

-

-			IDbConnection conn = ProviderFactory.CreateConnectionFromConfig (ConfigSetting);

-			conn.Open ();

-			DataSet ds = null;

+			IDbConnection conn=ProviderFactory.CreateConnectionFromConfig(ConfigSetting);

+			conn.Open();

+			DataSet ds=null;

 			try

 			{

-				ds = new DataSet ();

-				IDbDataAdapter adapter = ProviderFactory.CreateDataAdapter (conn, SelectCommand);

-				adapter.Fill (ds);

+				ds=new DataSet();

+				IDbDataAdapter adapter=ProviderFactory.CreateDataAdapter(conn, SelectCommand);

+				adapter.Fill(ds);

 			}

 			finally

 			{

-				conn.Close ();

+				conn.Close();

 			}

 			return ds;

 		}

@@ -127,4 +104,3 @@ namespace Mono.Data
 

 	}

 }

-

diff --git a/mcs/class/Mono.Data/Provider.cs b/mcs/class/Mono.Data/Provider.cs
index 3fd993695a3..60c5fbdd351 100644
--- a/mcs/class/Mono.Data/Provider.cs
+++ b/mcs/class/Mono.Data/Provider.cs
@@ -48,25 +48,10 @@ namespace Mono.Data
 		private Assembly providerAssembly;

 		private string assemblyName;

 		private string description;

-		private string parameterprefix;

-		private string commandBuilderTypeName = String.Empty;

-		private Type commandBuilderType;

-

-		public Provider(string _name, string _connection, 

-			string _dataadapter, string _command, string _assembly,

-			string _description) 

-		{

-			name = _name;

-			connectionTypeName = _connection;

-			adapterTypeName = _dataadapter;

-			assemblyName = _assembly;

-			commandTypeName = _command;

-			description = _description;

-		}

-

+      

 		public Provider(string _name, string _connection, 

 			string _dataadapter, string _command, string _assembly,

-			string _description, string _parameterprefix, string _commandbuilder)

+			string _description)

 		{

 			name = _name;

 			connectionTypeName = _connection;

@@ -74,32 +59,11 @@ namespace Mono.Data
 			assemblyName = _assembly;

 			commandTypeName = _command;

 			description = _description;

-

-			switch(_parameterprefix) {

-			case "colon":

-				parameterprefix = ":"; // named parameter prefixed by a semicolon

-				break;

-			case "at":

-				parameterprefix = "@"; // named parameter prefixed by an at symbol

-				break;

-			case "questionmark":

-				parameterprefix = "?"; // postional parameter noted by the question mark

-				break;

-			}

-

-			commandBuilderTypeName = _commandbuilder;

 		}

 

 		public Provider(string _name, Type _connection, Type _dataadapter, Type _command,

 			string _description)

 		{

-			if (_connection == null) 

-				throw new System.ArgumentNullException ("_connection");

-			if (_dataadapter == null) 

-				throw new System.ArgumentNullException ("_dataadapter");

-			if (_command == null) 

-				throw new System.ArgumentNullException ("_command");

-

 			name = _name;

 			connectionTypeName = _connection.FullName;

 			adapterTypeName = _dataadapter.FullName;

@@ -120,19 +84,10 @@ namespace Mono.Data
 			get {return description;}

 		}

 

-		public string ParameterPrefix 

-		{

-			get {return parameterprefix;}

-		}

-

 		public Assembly ProviderAssembly {

 			get {

-				if (providerAssembly == null) {

-					if (assemblyName.IndexOf(',') == -1) //try to load with a partial name if that's all we have

-						providerAssembly = Assembly.LoadWithPartialName (assemblyName);

-					else 

-						providerAssembly = Assembly.Load (assemblyName);

-				}

+				if (providerAssembly == null)

+					providerAssembly = Assembly.Load (assemblyName);

 

 				return providerAssembly;

 			}

@@ -179,21 +134,6 @@ namespace Mono.Data
 			}

 		}

 

-		public Type CommandBuilderType {

-			get {

-				if (commandBuilderType == null) {

-					if (commandBuilderTypeName.Equals(String.Empty))

-						throw new Exception("Provider does not have CommandBuilder type defined.");

-					commandBuilderType = ProviderAssembly.GetType (commandBuilderTypeName, false);

-					if (commandBuilderType == null) {

-						throw new Exception (String.Format ("Unable to load type of command class: {0} from assembly: {1}",
-							commandBuilderTypeName, assemblyName));

-					}

-				}

-				return commandBuilderType;

-			}

-		}

-

 		public IDbConnection CreateConnection()

 		{

 			object connObj = null;

@@ -239,27 +179,5 @@ namespace Mono.Data
 

 			return (IDbCommand) commandObj;

 		}

-

-		public object CreateCommandBuilder(IDbDataAdapter adapter) 

-		{

-			if (adapter == null) 

-				throw new System.ArgumentNullException ("adapter");

-

-			object obj = (object) adapter;

-			if (!DataAdapterType.ToString ().Equals (obj.ToString ()))

-				throw new System.ArgumentException ("adapter not part of this provider.");

-				

-			if (commandBuilderTypeName.Equals (String.Empty))

-				throw new Exception ("Provider does not have CommandBuilder type defined.");

-			

-			object[] parms = new object [] { obj };

-			object commandBuilderObj = Activator.CreateInstance (CommandBuilderType, parms);

-			if (commandBuilderObj == null)

-				throw new Exception (String.Format ("Unable to create instance of command builder class: {0} from assembly: {1}",
-					commandBuilderTypeName, assemblyName));

-

-			return commandBuilderObj;

-		}

 	}

 }

-

diff --git a/mcs/class/Mono.Data/ProviderCollection.cs b/mcs/class/Mono.Data/ProviderCollection.cs
index 95411824d62..c82b36e4495 100644
--- a/mcs/class/Mono.Data/ProviderCollection.cs
+++ b/mcs/class/Mono.Data/ProviderCollection.cs
@@ -42,7 +42,7 @@ namespace Mono.Data
 	///    </para>

 	/// </summary>

 	/// <seealso cref='.ProviderCollection'/>

-	[Serializable ()]

+	[Serializable()]

 	public class ProviderCollection : DictionaryBase  

 	{

 		

@@ -51,8 +51,7 @@ namespace Mono.Data
 		///       Initializes a new instance of <see cref='.ProviderCollection'/>.

 		///    </para>

 		/// </summary>

-		public ProviderCollection ()

-

+		public ProviderCollection() 

 		{

 		}

 		

@@ -64,12 +63,9 @@ namespace Mono.Data
 		/// <param name='value'>

 		///       A <see cref='.ProviderCollection'/> from which the contents are copied

 		/// </param>

-		public ProviderCollection (ProviderCollection value) 

+		public ProviderCollection(ProviderCollection value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException ("value");

-

-			this.AddRange (value);

+			this.AddRange(value);

 		}

 		

 		/// <summary>

@@ -80,12 +76,9 @@ namespace Mono.Data
 		/// <param name='value'>

 		///       A array of <see cref='.Provider'/> objects with which to intialize the collection

 		/// </param>

-		public ProviderCollection (Provider[] value) 

+		public ProviderCollection(Provider[] value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException ("value");

-

-			this.AddRange (value);

+			this.AddRange(value);

 		}

 		

 		/// <summary>

@@ -96,50 +89,46 @@ namespace Mono.Data
 		///    <para> The entry at the specified index of the collection.</para>

 		/// </value>

 		/// <exception cref='System.ArgumentOutOfRangeException'><paramref name='index'/> is outside the valid range of indexes for the collection.</exception>

-		public Provider this [string Name] 

+		public Provider this[string Name] 

 		{

-			get {				

-				return ((Provider)(Dictionary [Name]));

+			get 

+			{

+				return ((Provider)(Dictionary[Name]));

 			}

-			set {

-				Dictionary [Name] = value;

+			set 

+			{

+				Dictionary[Name] = value;

 			}

 		}

 

 		public Provider FindByCommandType(Type CommandType)

 		{

-			if (CommandType == null) 

-				throw new System.ArgumentNullException ("CommandType");

-

-			foreach (Provider p in this) {

-				if (p.CommandType == CommandType)

+			foreach (Provider p in this)

+			{

+				if (p.CommandType==CommandType)

 					return p;

 			}

-			throw new IndexOutOfRangeException ();

+			throw new IndexOutOfRangeException();

 		}

 

 		public Provider FindByDataAdapterType(Type DataAdapterType)

 		{

-			if (DataAdapterType == null) 

-				throw new System.ArgumentNullException ("DataAdapterType");

-

-			foreach (Provider p in this) {

-				if (p.DataAdapterType == DataAdapterType)

+			foreach (Provider p in this)

+			{

+				if (p.DataAdapterType==DataAdapterType)

 					return p;

 			}

-			throw new IndexOutOfRangeException ();

+			throw new IndexOutOfRangeException();

 		}

 

 		public Provider FindByConnectionType(Type ConnectionType)

 		{

-			if (ConnectionType == null) 

-				throw new System.ArgumentNullException("ConnectionType");

-

-			foreach (Provider p in this) {

-				if (p.ConnectionType == ConnectionType)

+			foreach (Provider p in this)

+			{

+				if (p.ConnectionType==ConnectionType)

 					return p;

 			}

-			throw new IndexOutOfRangeException ();

+			throw new IndexOutOfRangeException();

 		}

 

 		/// <summary>

@@ -153,10 +142,7 @@ namespace Mono.Data
 		/// <seealso cref='.ProviderCollection.AddRange'/>

 		public void Add(Provider value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException ("value");

-

-			Dictionary.Add (value.Name, value);

+			Dictionary.Add(value.Name, value);

 		}

 		

 		/// <summary>

@@ -169,13 +155,12 @@ namespace Mono.Data
 		///   <para>None.</para>

 		/// </returns>

 		/// <seealso cref='.ProviderCollection.Add'/>

-		public void AddRange (Provider[] value) 

+		public void AddRange(Provider[] value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException ("value");

-

-			for (int i = 0; i < value.Length; i++) 

-				this.Add (value [i]);

+			for (int i = 0; (i < value.Length); i = (i + 1)) 

+			{

+				this.Add(value[i]);

+			}

 		}

 		

 		/// <summary>

@@ -192,11 +177,10 @@ namespace Mono.Data
 		/// <seealso cref='.ProviderCollection.Add'/>

 		public void AddRange(ProviderCollection value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException ("value");

-

 			foreach (Provider p in value)

-				this.Add (p);

+			{

+				this.Add(p);

+			}

 		}

 		

 		/// <summary>

@@ -209,12 +193,9 @@ namespace Mono.Data
 		///   otherwise, <see langword='false'/>.</para>

 		/// </returns>

 		/// <seealso cref='.ProviderCollection.IndexOf'/>

-		public bool Contains (Provider value) 

+		public bool Contains(Provider value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException("value");

-

-			return Dictionary.Contains (value);

+			return Dictionary.Contains(value);

 		}

 		

 		/// <summary>

@@ -232,9 +213,6 @@ namespace Mono.Data
 		/// <seealso cref='System.Array'/>

 		public void CopyTo(Provider[] array, int index) 

 		{

-			if (array == null) 

-				throw new System.ArgumentNullException ("array");

-

 			Dictionary.CopyTo(array, index);

 		}

 		

@@ -244,9 +222,9 @@ namespace Mono.Data
 		/// </summary>

 		/// <returns><para>None.</para></returns>

 		/// <seealso cref='System.Collections.IEnumerator'/>

-		public new ProviderEnumerator GetEnumerator () 

+		public new ProviderEnumerator GetEnumerator() 

 		{

-			return new ProviderEnumerator (this);

+			return new ProviderEnumerator(this);

 		}

 		

 		/// <summary>

@@ -258,9 +236,6 @@ namespace Mono.Data
 		/// <exception cref='System.ArgumentException'><paramref name='value'/> is not found in the Collection. </exception>

 		public void Remove(Provider value) 

 		{

-			if (value == null) 

-				throw new System.ArgumentNullException ("value");

-

 			Dictionary.Remove(value);

 		}

 		

@@ -273,9 +248,6 @@ namespace Mono.Data
 			

 			public ProviderEnumerator(ProviderCollection mappings) 

 			{

-				if (mappings == null) 

-					throw new System.ArgumentNullException ("mappings");

-

 				this.temp = ((IEnumerable)(mappings));

 				this.baseEnumerator = temp.GetEnumerator();

 			}

diff --git a/mcs/class/Mono.Data/ProviderFactory.cs b/mcs/class/Mono.Data/ProviderFactory.cs
index f86fce1bf84..e04bb85eee2 100644
--- a/mcs/class/Mono.Data/ProviderFactory.cs
+++ b/mcs/class/Mono.Data/ProviderFactory.cs
@@ -43,128 +43,90 @@ namespace Mono.Data
 	{

 		private static ProviderCollection providers;

 

-		static ProviderFactory ()

+		static ProviderFactory()

 		{

-			providers = (ProviderCollection) ConfigurationSettings.GetConfig ("mono.data/providers");

-			if (providers == null) {

-				providers = new ProviderCollection ();

-				// warn the developer or administrator that the provider list is empty

-				System.Diagnostics.Debug.Listeners.Add (new System.Diagnostics.TextWriterTraceListener (Console.Out));

-				System.Diagnostics.Debug.WriteLine ("No providers found. Did you set up a mono.data/providers area in your app.config or in machine.config?");

-			}

-

+			providers=(ProviderCollection) ConfigurationSettings.GetConfig("mono.data/providers");

+			if (providers==null)

+				providers=new ProviderCollection();

 		}

 

 		static public ProviderCollection Providers

 		{

-			get {

+			get

+			{

 				return providers;

 			}

 		}

 

-		static public IDbConnection CreateConnectionFromConfig (string Setting)

+		static public IDbConnection CreateConnectionFromConfig(string Setting)

 		{

-			if (Setting == null) 

-				throw new System.ArgumentNullException ("Setting");

-

-			return CreateConnection (ConfigurationSettings.AppSettings [Setting]);

+			return CreateConnection(ConfigurationSettings.AppSettings[Setting]);

 		}

 

 		static public IDbConnection CreateConnection(string ConnectionString)

 		{

-			if (ConnectionString == null) 

-				throw new System.ArgumentNullException ("ConnectionString");

-

-			string [] ConnectionAttributes = ConnectionString.Split (new Char [1] { ';' }); 

-			string ProviderName = null;

-			string NewConnectionString = "";

-			foreach (string s in ConnectionAttributes) {

-				string [] AttributeParts = s.Split (new Char [1] { '=' });

-				if (AttributeParts [0].ToLower ().Trim () == "factory")

-					ProviderName = AttributeParts [1].Trim ();

+			string[] ConnectionAttributes=ConnectionString.Split(new Char[1] { ';' }); 

+			string ProviderName=null;

+			string NewConnectionString="";

+			foreach (string s in ConnectionAttributes)

+			{

+				string[] AttributeParts=s.Split(new Char[1] { '=' });

+				if (AttributeParts[0].ToLower().Trim()=="factory")

+					ProviderName=AttributeParts[1].Trim();

 				else 

-					NewConnectionString += ";" + s;

+					NewConnectionString+=";"+s;

 			}

-			NewConnectionString = NewConnectionString.Remove (0, 1); // remove the initial semicolon

-			if (ProviderName == null) 

-				throw new System.ArgumentException ("The connection string must contain a 'factory=Provider.Class' token", "ConnectionString");

-			return CreateConnection (ProviderName, NewConnectionString);

+			NewConnectionString=NewConnectionString.Remove(0,1);

+			return CreateConnection(ProviderName, NewConnectionString);

 		}

 

 		static public IDbConnection CreateConnection(string ProviderName, string ConnectionString)

 		{

-			if (ProviderName == null) 

-				throw new System.ArgumentNullException("ProviderName");

-			if (ConnectionString == null) 

-				throw new System.ArgumentNullException ("ConnectionString");

-

-			Provider provider = providers [ProviderName];

-			IDbConnection conn = provider.CreateConnection ();

-			conn.ConnectionString = ConnectionString;

+			Provider provider=providers[ProviderName];

+			IDbConnection conn=provider.CreateConnection();

+			conn.ConnectionString=ConnectionString;

 			return conn;

 		}

 

-		static public IDbCommand CreateStoredProc (IDbConnection Conn, string CommandName)

+		static public IDbCommand CreateStoredProc(IDbConnection Conn, string CommandName)

 		{

-			if (Conn == null) 

-				throw new System.ArgumentNullException ("Conn");

-			if (CommandName == null) 

-				throw new System.ArgumentNullException ("CommandName");

-

-			IDbCommand cmd = Conn.CreateCommand ();

-			cmd.CommandText = CommandName;

-			cmd.CommandType = CommandType.StoredProcedure;

+			IDbCommand cmd=Conn.CreateCommand();

+			cmd.CommandText=CommandName;

+			cmd.CommandType=CommandType.StoredProcedure;

 			return cmd;

 		}

 

-		static public IDbDataAdapter CreateDataAdapter (IDbCommand SelectCommand)

+		static public IDbDataAdapter CreateDataAdapter(IDbCommand SelectCommand)

 		{

-			if (SelectCommand == null) 

-				throw new System.ArgumentNullException("SelectCommand");

-

-			Provider provider = providers.FindByCommandType (SelectCommand.GetType ());

-			IDbDataAdapter adapter = provider.CreateDataAdapter ();

-			adapter.SelectCommand = SelectCommand;

+			Provider provider=providers.FindByCommandType(SelectCommand.GetType());

+			IDbDataAdapter adapter=provider.CreateDataAdapter();

+			adapter.SelectCommand=SelectCommand;

 			return adapter;

 		}

 

-		static public IDbDataAdapter CreateDataAdapter (string ProviderName)

+		static public IDbDataAdapter CreateDataAdapter(string ProviderName)

 		{

-			if (ProviderName == null) 

-				throw new System.ArgumentNullException("ProviderName");

-

-			Provider provider = providers [ProviderName];

-			IDbDataAdapter adapter = provider.CreateDataAdapter ();

+			Provider provider=providers[ProviderName];

+			IDbDataAdapter adapter=provider.CreateDataAdapter();

 			return adapter;

 		}

 

-		static public IDbDataAdapter CreateDataAdapter (IDbConnection Conn, string SelectCommand)

+		static public IDbDataAdapter CreateDataAdapter(IDbConnection Conn, string SelectCommand)

 		{

-			if (Conn == null) 

-				throw new System.ArgumentNullException ("Conn");

-			if (SelectCommand == null) 

-				throw new System.ArgumentNullException("SelectCommand");

-

-			IDbCommand cmd = Conn.CreateCommand ();

-			cmd.CommandText = SelectCommand;

-			return CreateDataAdapter (cmd);

+			IDbCommand cmd=Conn.CreateCommand();

+			cmd.CommandText=SelectCommand;

+			return CreateDataAdapter(cmd);

 		}

 

-		static public IDbCommand CreateCommand (string ProviderName)

+		static public IDbCommand CreateCommand(string ProviderName)

 		{

-			if (ProviderName == null) 

-				throw new System.ArgumentNullException("ProviderName");

-

-			Provider provider = providers [ProviderName];

-			return provider.CreateCommand ();

+			Provider provider=providers[ProviderName];

+			return provider.CreateCommand();

 		}

 

-		static public IDbCommand CreateCommand (IDbConnection Conn)

+		static public IDbCommand CreateCommand(IDbConnection Conn)

 		{

-			if (Conn == null) 

-				throw new System.ArgumentNullException("Conn");

-

-			return Conn.CreateCommand ();

+			return Conn.CreateCommand();

 		}

 

 	}

diff --git a/mcs/class/Mono.Data/ProviderSectionHandler.cs b/mcs/class/Mono.Data/ProviderSectionHandler.cs
index ae552daa554..3f916a96e34 100644
--- a/mcs/class/Mono.Data/ProviderSectionHandler.cs
+++ b/mcs/class/Mono.Data/ProviderSectionHandler.cs
@@ -37,26 +37,21 @@ namespace Mono.Data
 {
 	public class ProviderSectionHandler : IConfigurationSectionHandler
 	{
-		public virtual object Create (object parent, object configContext, XmlNode section)
+		public virtual object Create(object parent,object configContext,XmlNode section)
 		{
-			if (section == null)
-				throw new System.ArgumentNullException ("section");
-
-			ProviderCollection providers = new ProviderCollection ();
+			ProviderCollection providers=new ProviderCollection();
 			
 			XmlNodeList ProviderList = section.SelectNodes ("./provider");
 
 			foreach (XmlNode ProviderNode in ProviderList) {
-				Provider provider = new Provider(
-					GetStringValue (ProviderNode, "name", true),
-					GetStringValue (ProviderNode, "connection", true),
-					GetStringValue (ProviderNode, "adapter", true),
-					GetStringValue (ProviderNode, "command", true),
-					GetStringValue (ProviderNode, "assembly", true),
-					GetStringValue (ProviderNode, "description", false),
-					GetStringValue (ProviderNode, "parameterprefix", false),
-					GetStringValue (ProviderNode, "commandbuilder", false));
-				providers.Add (provider);
+				Provider provider=new Provider(
+					GetStringValue(ProviderNode,"name",true),
+					GetStringValue(ProviderNode,"connection",true),
+					GetStringValue(ProviderNode,"adapter",true),
+					GetStringValue(ProviderNode,"command",true),
+					GetStringValue(ProviderNode,"assembly",true),
+					GetStringValue(ProviderNode,"description",false));
+				providers.Add(provider);
 			}
 			return providers;
 		}
diff --git a/mcs/class/Mono.Data/app.config b/mcs/class/Mono.Data/app.config
index 54c9a537de1..12e5744e6b9 100644
--- a/mcs/class/Mono.Data/app.config
+++ b/mcs/class/Mono.Data/app.config
@@ -24,9 +24,7 @@
 				adapter="System.Data.SqlClient.SqlDataAdapter" 

 				command="System.Data.SqlClient.SqlCommand" 

 				assembly="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"

-				description="Microsoft SQL Server 7.0/2000/2005"

-				parameterprefix="at"

-				commandbuilder="System.Data.SqlClient.SqlCommandBuilder"  />

+				description="Microsoft SQL Server 7.0/2000/2005" />

 			<provider 

 				name="System.Data.OleDb" 

 				connection="System.Data.OleDb.OleDbConnection" 

@@ -40,18 +38,14 @@
 				adapter="System.Data.Odbc.OdbcDataAdapter" 

 				command="System.Data.Odbc.OdbcCommand" 

 				assembly="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"

-				description="ODBC"

-				parameterprefix="questionmark"

-				commandbuilder="System.Data.Odbc.OdbcCommandBuilder" />

+				description="ODBC" />

 			<provider 

 				name="System.Data.OracleClient" 

 				connection="System.Data.OracleClient.OracleConnection" 

 				adapter="System.Data.OracleClient.OracleDataAdapter" 

 				command="System.Data.OracleClient.OracleCommand" 

-				assembly="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" 

-				description="Oracle"

-				parameterprefix="colon"

-				commandbuilder="System.Data.OracleClient.OracleCommandBuilder" />

+				assembly="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"

+				description="Oracle" />

 			<provider 

 				name="ByteFX.Data.MySqlClient" 

 				connection="ByteFX.Data.MySqlClient.MySqlConnection" 

@@ -65,34 +59,28 @@
 				adapter="Npgsql.NpgsqlDataAdapter" 

 				command="Npgsql.NpgsqlCommand" 

 				assembly="Npgsql, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"

-				description="PostgreSQL"

-				parameterprefix="at"

-				commandbuilder="Npgsql.NpgsqlCommandBuilder" />

+				description="PostgreSQL" />

 			<provider 

 				name="Mono.Data.SqliteClient" 

 				connection="Mono.Data.SqliteClient.SqliteConnection" 

 				adapter="Mono.Data.SqliteClient.SqliteDataAdapter" 

 				command="Mono.Data.SqliteClient.SqliteCommand" 

 				assembly="Mono.Data.SqliteClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"

-				description="SQL Lite"

-				parameterprefix="colon" />

+				description="SQL Lite" />

 			<provider 

 				name="Mono.Data.SybaseClient" 

 				connection="Mono.Data.SybaseClient.SybaseConnection" 

 				adapter="Mono.Data.SybaseClient.SybaseDataAdapter" 

 				command="Mono.Data.SybaseClient.SybaseCommand" 

 				assembly="Mono.Data.SybaseClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"

-				description="Sybase"

-				parameterprefix="at" />

+				description="Sybase" />

 			<provider 

 				name="FirebirdSql.Data.Firebird" 

 				connection="FirebirdSql.Data.Firebird.FbConnection" 

 				adapter="FirebirdSql.Data.Firebird.FbDataAdapter" 

 				command="FirebirdSql.Data.Firebird.FbCommand" 

 				assembly="FirebirdSql.Data.Firebird, Version=1.6.3.0, Culture=neutral, PublicKeyToken=e1b4f92304d7b12f"

-				description="Firebird"

-				parameterprefix="at"

-				commandbuilder="FirebirdSql.Data.Firebird.FbCommandBuilder" />

+				description="Firebird" />

 			<provider 

 				name="IBM.Data.DB2" 

 				connection="IBM.Data.DB2.DB2Connection" 

@@ -106,9 +94,7 @@
 				adapter="MySql.Data.MySqlClient.MySqlDataAdapter" 

 				command="MySql.Data.MySqlClient.MySqlCommand"

 				assembly="MySql.Data, Version=1.0.7.30073, Culture=neutral, PublicKeyToken=8e323390df8d9ed4"

-				description="MySQL (MySQL AB)"

-				parameterprefix="at"

-				commandbuilder="MySql.Data.MySqlClient.MySqlCommandBuilder" />

+				description="MySQL (MySQL AB)" />						

 		</providers>

 	</mono.data>

 </configuration>

diff --git a/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog b/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog
index fd026303540..5c8e0be1788 100644
--- a/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog
+++ b/mcs/class/Mono.Posix/Mono.Unix.Native/ChangeLog
@@ -1,16 +1,3 @@
-2006-02-25  Marek Safar  <marek.safar@seznam.cz>
-
-	* NativeConvert.generated.cs: Guarded CLSCompliant attribute by NET_2_0

-	until mcs is merged with gmcs.

-

-2006-02-21  Marek Safar  <marek.safar@seznam.cz>
-
-	* NativeConvert.generated.cs: Removed duplicated CLSCompliant attribute.

-

-2006-01-10  Raja R Harinath  <rharinath@novell.com>
-
-	* Syscall.cs (sys_futimes): Remove buggy custom marshaller on 'fd' parameter.
-
 2005-01-09  Jonathan Pryor <jonpryor@vt.edu>
 
 	* NativeConvert.cs: s/IsType/IsSet/g: deal with UnixFileSystemInfo method 
diff --git a/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.generated.cs b/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.generated.cs
index 3fc577ae51d..96297a4e92a 100644
--- a/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.generated.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.generated.cs
@@ -9,9 +9,8 @@ using System.Runtime.InteropServices;
 using Mono.Unix.Native;
 
 namespace Mono.Unix.Native {
-#if NET_2_0
-	[CLSCompliant (false)]

-#endif
+
+	[CLSCompliant (false)]
 	public sealed /* static */ partial class NativeConvert
 	{
 		private NativeConvert () {}
diff --git a/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs b/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs
index d835fec4624..1ba51307f99 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs
@@ -55,11 +55,11 @@ namespace Mono.Unix {
 					"UTF-8", out iutf8);
 			try {
 				if (bindtextdomain (ipackage, ilocaledir) == IntPtr.Zero)
-					throw new UnixIOException (Native.Errno.ENOMEM);
+					throw new OutOfMemoryException ("bindtextdomain");
 				if (bind_textdomain_codeset (ipackage, iutf8) == IntPtr.Zero)
-					throw new UnixIOException (Native.Errno.ENOMEM);
+					throw new OutOfMemoryException ("bind_textdomain_codeset");
 				if (textdomain (ipackage) == IntPtr.Zero)
-					throw new UnixIOException (Native.Errno.ENOMEM);
+					throw new OutOfMemoryException ("textdomain");
 			}
 			finally {
 				UnixMarshal.FreeHeap (ipackage);
diff --git a/mcs/class/Mono.Posix/Mono.Unix/ChangeLog b/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
index 47cf313d9d0..f797281a719 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
+++ b/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
@@ -1,78 +1,9 @@
-2006-02-23  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixFileSystemInfo.cs: Create() should return a UnixFileInfo if the file
-	  doesn't exist.  This allows callers to use UnixFileInfo.Exists to see if
-	  the file exists, and behaves more rationally e.g. if the directory
-	  contents changes while calling UnixDirectoryInfo.GetFileSystemEntries(),
-	  we'll get a UnixFileInfo entry that doesn't exist instead of an exception
-	  terminating the entire array creation.
-	* UnixSymbolicLinkInfo.cs: [Obsolete] the Contents property -- this property
-	  *always* creates a new object if HasContents=true, and since a
-	  UnixFileSystemInfo instance is (104+2*(sizeof(void*))+1) bytes (~113 bytes
-	  on 32-bit platforms), we don't want to create these frequently.  Add a
-	  GetContents() method as the replacement, to make it (slightly) more
-	  explicit that information won't be cached (and thus should be cached by
-	  the caller, if appropriate).  GetContents() throws an exception if
-	  HasContents=false instead of returning null; this change brings the
-	  implementation in line with the documentation.
-
-2006-02-18  Alp Toker  <alp@atoker.com>
-
-	* UnixEndPoint.cs: Avoid truncation of last two bytes of SocketAddress
-	string
-
-2006-01-26  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixMarshal.cs: Check for null arguments in PtrToString() and
-	  PtrToStringArray().
-
-2006-01-24  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixMarshal.cs (StringToHeap): Return IntPtr.Zero if `s' is null.
-
-2006-01-24  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixMarshal.cs (StringToHeap): Check for null arguments.
-
-2006-01-20  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixDriveInfo.cs: Properties should generate an InvalidOperationException,
-	  not an IOException.  Users can use IsReady to avoid exception generation.
-	* UnixIOException.cs: Create a custom message that embeds the error name 
-	  within the text, e.g. "Permission denied [EACCES]."
-	* UnixSymbolicLinkInfo.cs: This really should create the file FullPath, not
-	  OriginalPath.  Created files shouldn't ever be relative to the current
-	  working directory, as this can change at any time.
-
-2006-01-15  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixUserInfo.cs: The UnixUserInfo(Native.Passwd) constructor and 
-	  ToPasswd() should clone the underlying Native.Passwd, so
-	  that it doesn't get changed from underneath it.
-	* UnixGroupInfo.cs: The UnixGroupInfo(Native.Group) constructor should also
-	  clone the provided Native.Group instance.
-
-2006-01-14  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixGroupInfo.cs: ToGroup() should clone the underlying Native.Group, so
-	  that it doesn't get changed from underneath it.
-
-2006-01-13  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* Catalog.cs, UnixMarshal.cs: Throw `UnixIOException(Native.Errno.ENOMEM)`
-	  instead of System.OutOfMemoryException.  OOME should be reserved for use 
-	  by the CLR (according to FxDG).
-
-2006-01-12  Jonathan Pryor  <jonpryor@vt.edu>
-
-	* UnixPath.cs: Add ReadLink() and TryReadLink() methods.
-
 2006-01-12  Miguel de Icaza  <miguel@novell.com>
 
 	* PeerCred.cs: Do not define PeerCredData as this is a structure
 	known to the runtime.  Instead use the Mono.Posix.PeerCredData
 	internal class. 
-
+	
 2006-01-10  Jonathan Pryor <jonpryor@vt.edu>
 
 	* Catalog.cs: Don't use
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixDriveInfo.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixDriveInfo.cs
index db761c357f2..91cd65165bb 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixDriveInfo.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixDriveInfo.cs
@@ -158,9 +158,8 @@ namespace Mono.Unix {
 			int r = Native.Syscall.statvfs (fstab.fs_file, out stat);
 			if (r == -1 && throwException) {
 				Native.Errno e = Native.Syscall.GetLastError ();
-				throw new InvalidOperationException (
-						UnixMarshal.GetErrorDescription (e),
-						new UnixIOException (e));
+				throw new IOException (UnixMarshal.GetErrorDescription (e),
+					UnixMarshal.CreateExceptionForError (e));
 			}
 			else if (r == -1)
 				return false;
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
index bf0f6bfcf3e..4e3ee10f9c3 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
@@ -59,6 +59,8 @@ namespace Mono.Unix
 
 		public override EndPoint Create (SocketAddress socketAddress)
 		{
+			int size = socketAddress.Size;
+			byte [] bytes = new byte [size];
 			/*
 			 * Should also check this
 			 *
@@ -70,9 +72,8 @@ namespace Mono.Unix
 				throw new ArgumentException ("socketAddress is not a unix socket address.");
 			 */
 
-			byte [] bytes = new byte [socketAddress.Size - 2];
-			for (int i = 0; i < bytes.Length; i++) {
-				bytes [i] = socketAddress [i + 2];
+			for (int i = 2; i < size - 2; i++) {
+				bytes [i] = socketAddress [i];
 			}
 
 			string name = Encoding.Default.GetString (bytes);
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixEnvironment.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixEnvironment.cs
index 5c19cdeccd5..46591b8f062 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixEnvironment.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixEnvironment.cs
@@ -61,8 +61,7 @@ namespace Mono.Unix {
 				return buf.ToString ();
 			}
 			set {
-				int r = Native.Syscall.sethostname (value);
-				UnixMarshal.ThrowExceptionForLastErrorIf (r);
+				Native.Syscall.sethostname (value);
 			}
 		}
 
@@ -142,9 +141,7 @@ namespace Mono.Unix {
 
 		public static int CreateSession ()
 		{
-			int s = Native.Syscall.setsid ();
-			UnixMarshal.ThrowExceptionForLastErrorIf (s);
-			return s;
+			return Native.Syscall.setsid ();
 		}
 
 		public static void SetProcessGroup ()
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixFileSystemInfo.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixFileSystemInfo.cs
index f9cd3563e7e..34a0139c38b 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixFileSystemInfo.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixFileSystemInfo.cs
@@ -390,9 +390,6 @@ namespace Mono.Unix {
 		{
 			Native.Stat stat;
 			int r = Native.Syscall.lstat (path, out stat);
-			if (r == -1 && Native.Stdlib.GetLastError() == Native.Errno.ENOENT) {
-				return new UnixFileInfo (path);
-			}
 			UnixMarshal.ThrowExceptionForLastErrorIf (r);
 
 			if (IsFileType (stat.st_mode, Native.FilePermissions.S_IFDIR))
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixGroupInfo.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixGroupInfo.cs
index 50911f7d935..c032c02e79c 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixGroupInfo.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixGroupInfo.cs
@@ -57,19 +57,7 @@ namespace Mono.Unix {
 
 		public UnixGroupInfo (Native.Group group)
 		{
-			this.group = CopyGroup (group);
-		}
-
-		private static Native.Group CopyGroup (Native.Group group)
-		{
-			Native.Group g = new Native.Group ();
-
-			g.gr_gid    = group.gr_gid;
-			g.gr_mem    = group.gr_mem;
-			g.gr_name   = group.gr_name;
-			g.gr_passwd = group.gr_passwd;
-
-			return g;
+			this.group = group;
 		}
 
 		public string GroupName {
@@ -116,7 +104,7 @@ namespace Mono.Unix {
 
 		public Native.Group ToGroup ()
 		{
-			return CopyGroup (group);
+			return group;
 		}
 
 		public static UnixGroupInfo[] GetLocalGroups ()
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixIOException.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixIOException.cs
index 923e7aa08b6..fb8ca466a05 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixIOException.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixIOException.cs
@@ -44,25 +44,25 @@ namespace Mono.Unix {
 		{}
 		
 		public UnixIOException (int errno)
-			: base (GetMessage (Native.NativeConvert.ToErrno (errno)))
+			: base (UnixMarshal.GetErrorDescription (Native.NativeConvert.ToErrno (errno)))
 		{
 			this.errno = errno;
 		}
 		
 		public UnixIOException (int errno, Exception inner)
-			: base (GetMessage (Native.NativeConvert.ToErrno (errno)), inner)
+			: base (UnixMarshal.GetErrorDescription (Native.NativeConvert.ToErrno (errno)), inner)
 		{
 			this.errno = errno;
 		}
 
 		public UnixIOException (Native.Errno errno)
-			: base (GetMessage (errno))
+			: base (UnixMarshal.GetErrorDescription (errno))
 		{
 			this.errno = Native.NativeConvert.FromErrno (errno);
 		}
 
 		public UnixIOException (Native.Errno errno, Exception inner)
-			: base (GetMessage (errno), inner)
+			: base (UnixMarshal.GetErrorDescription (errno), inner)
 		{
 			this.errno = Native.NativeConvert.FromErrno (errno);
 		}
@@ -91,13 +91,6 @@ namespace Mono.Unix {
 		public Native.Errno ErrorCode {
 			get {return Native.NativeConvert.ToErrno (errno);}
 		}
-
-		private static string GetMessage (Native.Errno errno)
-		{
-			return string.Format ("{0} [{1}].",
-					UnixMarshal.GetErrorDescription (errno),
-					errno);
-		}
 	}
 }
 
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
index 9282356acf5..7b8d8c85cb2 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixMarshal.cs
@@ -140,9 +140,6 @@ namespace Mono.Unix {
 			if (p == IntPtr.Zero)
 				return null;
 
-			if (encoding == null)
-				throw new ArgumentNullException ("encoding");
-
 			int len = GetStringByteLength (p, encoding);
 
 			// Due to variable-length encoding schemes, GetStringByteLength() may
@@ -284,8 +281,6 @@ namespace Mono.Unix {
 		{
 			if (count < 0)
 				throw new ArgumentOutOfRangeException ("count", "< 0");
-			if (encoding == null)
-				throw new ArgumentNullException ("encoding");
 			if (stringArray == IntPtr.Zero)
 				return new string[count];
 
@@ -315,12 +310,6 @@ namespace Mono.Unix {
 
 		public static IntPtr StringToHeap (string s, int index, int count, Encoding encoding)
 		{
-			if (s == null)
-				return IntPtr.Zero;
-
-			if (encoding == null)
-				throw new ArgumentNullException ("encoding");
-
 			int min_byte_count = encoding.GetMaxByteCount(1);
 			char[] copy = s.ToCharArray (index, count);
 			byte[] marshal = new byte [encoding.GetByteCount (copy) + min_byte_count];
@@ -332,7 +321,7 @@ namespace Mono.Unix {
 
 			IntPtr mem = AllocHeap (marshal.Length);
 			if (mem == IntPtr.Zero)
-				throw new UnixIOException (Native.Errno.ENOMEM);
+				throw new OutOfMemoryException ();
 
 			bool copied = false;
 			try {
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixPath.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixPath.cs
index a7836db0bf2..271c4fe92cb 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixPath.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixPath.cs
@@ -224,44 +224,6 @@ namespace Mono.Unix {
 			} while (true);
 		}
 
-		// Read the specified symbolic link.  If the file isn't a symbolic link,
-		// return null; otherwise, return the contents of the symbolic link.
-		//
-		// readlink(2) is horribly evil, as there is no way to query how big the
-		// symlink contents are.  Consequently, it's trial and error...
-		private static string ReadSymbolicLink (string path, out Native.Errno errno)
-		{
-			errno = (Native.Errno) 0;
-			StringBuilder buf = new StringBuilder (256);
-			do {
-				int r = Native.Syscall.readlink (path, buf);
-				if (r < 0) {
-					errno = Native.Stdlib.GetLastError ();
-					return null;
-				}
-				else if (r == buf.Capacity) {
-					buf.Capacity *= 2;
-				}
-				else
-					return buf.ToString (0, r);
-			} while (true);
-		}
-
-		public static string TryReadLink (string path)
-		{
-			Native.Errno errno;
-			return ReadSymbolicLink (path, out errno);
-		}
-
-		public static string ReadLink (string path)
-		{
-			Native.Errno errno;
-			path = ReadSymbolicLink (path, out errno);
-			if (errno != 0)
-				UnixMarshal.ThrowExceptionForError (errno);
-			return path;
-		}
-
 		public static bool IsPathRooted (string path)
 		{
 			if (path == null || path.Length == 0)
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixSymbolicLinkInfo.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixSymbolicLinkInfo.cs
index b469af311e3..93b1bfeddb9 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixSymbolicLinkInfo.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixSymbolicLinkInfo.cs
@@ -49,9 +49,13 @@ namespace Mono.Unix {
 			get {return UnixPath.GetFileName (FullPath);}
 		}
 
-		[Obsolete ("Use GetContents()")]
 		public UnixFileSystemInfo Contents {
-			get {return GetContents ();}
+			get {
+				string path = TryReadLink ();
+				if (path != null)
+					return UnixFileSystemInfo.Create (ContentsPath);
+				return null;
+			}
 		}
 
 		public string ContentsPath {
@@ -66,17 +70,9 @@ namespace Mono.Unix {
 			}
 		}
 
-		public UnixFileSystemInfo GetContents ()
-		{
-			string path = ReadLink ();
-			return UnixFileSystemInfo.Create (
-						UnixPath.Combine (UnixPath.GetDirectoryName (FullPath), 
-							ContentsPath));
-		}
-
 		public void CreateSymbolicLinkTo (string path)
 		{
-			int r = Native.Syscall.symlink (path, FullName);
+			int r = Native.Syscall.symlink (path, OriginalPath);
 			UnixMarshal.ThrowExceptionForLastErrorIf (r);
 		}
 
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixUserInfo.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixUserInfo.cs
index 3379ebf863d..24488690f69 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixUserInfo.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixUserInfo.cs
@@ -67,22 +67,7 @@ namespace Mono.Unix {
 
 		public UnixUserInfo (Native.Passwd passwd)
 		{
-			this.passwd = CopyPasswd (passwd);
-		}
-
-		private static Native.Passwd CopyPasswd (Native.Passwd pw)
-		{
-			Native.Passwd p = new Native.Passwd ();
-
-			p.pw_name   = pw.pw_name;
-			p.pw_passwd = pw.pw_passwd;
-			p.pw_uid    = pw.pw_uid;
-			p.pw_gid    = pw.pw_gid;
-			p.pw_gecos  = pw.pw_gecos;
-			p.pw_dir    = pw.pw_dir;
-			p.pw_shell  = pw.pw_shell;
-
-			return p;
+			this.passwd = passwd;
 		}
 
 		public string UserName {
@@ -164,7 +149,7 @@ namespace Mono.Unix {
 
 		public Native.Passwd ToPasswd ()
 		{
-			return CopyPasswd (passwd);
+			return passwd;
 		}
 
 		public static UnixUserInfo[] GetLocalUsers ()
diff --git a/mcs/class/Mono.Security/Mono.Security.X509/ChangeLog b/mcs/class/Mono.Security/Mono.Security.X509/ChangeLog
index a2b1b9227eb..c85aaabe4d7 100644
--- a/mcs/class/Mono.Security/Mono.Security.X509/ChangeLog
+++ b/mcs/class/Mono.Security/Mono.Security.X509/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-24  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* PKCS12.cs: Consider String.Empty as a null password (e.g. don't
-	throw an IndexOutOfRangeException). Fix part of bug #77342.
-
 2006-01-05  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* X509Extension.cs: Extension data may be encapsulated (i.e. ASN.1
diff --git a/mcs/class/Mono.Security/Mono.Security.X509/PKCS12.cs b/mcs/class/Mono.Security/Mono.Security.X509/PKCS12.cs
index 06050faf7b8..7fcbf87a652 100644
--- a/mcs/class/Mono.Security/Mono.Security.X509/PKCS12.cs
+++ b/mcs/class/Mono.Security/Mono.Security.X509/PKCS12.cs
@@ -5,7 +5,7 @@
 //	Sebastien Pouliot <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004,2005,2006 Novell Inc. (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell Inc. (http://www.novell.com)
 //
 // Key derivation translated from Bouncy Castle JCE (http://www.bouncycastle.org/)
 // See bouncycastle.txt for license.
@@ -425,7 +425,7 @@ namespace Mono.Security.X509 {
 
 		public string Password {
 			set {
-				if ((value != null) && (value.Length > 0)) {
+				if (value != null) {
 					int size = value.Length;
 					int nul = 0;
 					if (size < MaximumPasswordLength) {
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.X509/ChangeLog b/mcs/class/Mono.Security/Test/Mono.Security.X509/ChangeLog
index 52a6ac12736..5ed2dff2b00 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.X509/ChangeLog
+++ b/mcs/class/Mono.Security/Test/Mono.Security.X509/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-24  Sebastien Pouliot  <sebastien@ximian.com>
-
-	* PKCS12Test.cs: Add a test case where the password is String.Empty 
-	when no password is required to decrypt the structures.
-
 2005-11-04  Sebastien Pouliot  <sebastien@ximian.com> 
  
 	* PKCS12Test.cs: Added tests for adding multiple keys with the same 
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.X509/PKCS12Test.cs b/mcs/class/Mono.Security/Test/Mono.Security.X509/PKCS12Test.cs
index 4a52e4d3fa5..1e830d3534b 100644
--- a/mcs/class/Mono.Security/Test/Mono.Security.X509/PKCS12Test.cs
+++ b/mcs/class/Mono.Security/Test/Mono.Security.X509/PKCS12Test.cs
@@ -5,7 +5,7 @@
 //	Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2005,2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
 using NUnit.Framework;
@@ -181,7 +181,7 @@ namespace MonoTests.Mono.Security.X509 {
 		}
 
 		[Test]
-		public void Farscape_NoPassword_Explicit_Null () 
+		public void Farscape_NoPassword_Explicit () 
 		{
 			// exported from MS certificate manager WITHOUT password
 			PKCS12 p12 = new PKCS12 (farscape_nopwd_pfx, (string)null);
@@ -191,16 +191,6 @@ namespace MonoTests.Mono.Security.X509 {
 		}
 
 		[Test]
-		public void Farscape_NoPassword_Explicit_Empty () 
-		{
-			// exported from MS certificate manager WITHOUT password
-			PKCS12 p12 = new PKCS12 (farscape_nopwd_pfx, String.Empty);
-			RSA rsa = (RSA) p12.Keys [0];
-			X509Certificate x509 = p12.Certificates [0];
-			AssertEquals (rsa.ToXmlString (false), x509.RSA.ToXmlString (false));
-		}
-
-		[Test]
 		public void Farscape_Weak () 
 		{
 			// exported from MS certificate manager WITHOUT strong encryption
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/Asn1Object.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/Asn1Object.cs
index dd5d26845f4..9c5cfa1d575 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/Asn1Object.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/Asn1Object.cs
@@ -109,7 +109,7 @@ namespace Novell.Directory.Ldap.Asn1
 		[CLSCompliantAttribute(false)]
 		public override System.String ToString()
 		{
-			System.String[] classTypes = new System.String[]{"[UNIVERSAL ", "[APPLICATION ", "[CONTEXT ", "[PRIVATE "};
+			System.String[] classTypes = new System.String[]{"[UNIVERSAL ", "[APPLICATION ", "[", "[PRIVATE "};
 			
 			System.Text.StringBuilder sb = new System.Text.StringBuilder();
 			Asn1Identifier id = getIdentifier(); // could be overridden.
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/ChangeLog b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/ChangeLog
deleted file mode 100644
index 339381d01f5..00000000000
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Asn1/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2006-06-02  Konstantin Triger <kostat@mainsoft.com>
-
-	* Asn1Object.cs: applying jldap patch, cvs revision 1.13.
\ No newline at end of file
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ChangeLog b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ChangeLog
index 4336397c95b..51e2dff9148 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ChangeLog
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ChangeLog
@@ -1,7 +1,3 @@
-2006-06-02  Konstantin Triger <kostat@mainsoft.com>
-
-	* SchemaParser.cs, RespControlVector.cs: performance refactoring.
-
 2005-16-11  Eyal Alaluf <eyala@mainsoft.com>
 	* RespExtensionSet.cs: Workaround for csc bug
 
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/RespControlVector.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/RespControlVector.cs
index 6096eaccdb2..1732bd46d38 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/RespControlVector.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/RespControlVector.cs
@@ -102,7 +102,7 @@ namespace Novell.Directory.Ldap.Utilclass
 				{
 					
 					/* Get next registered control */
-					if ((ctl = (RegisteredControl) this[i]) == null)
+					if ((ctl = (RegisteredControl) ToArray()[i]) == null)
 					{
 						throw new System.FieldAccessException();
 					}
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/SchemaParser.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/SchemaParser.cs
index fa8293f71b2..39c6a173219 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/SchemaParser.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/SchemaParser.cs
@@ -68,7 +68,7 @@ namespace Novell.Directory.Ldap.Utilclass
 		{
 			get
 			{
-				return qualifiers.GetEnumerator();
+				return new ArrayEnumeration(qualifiers.ToArray());
 			}
 			
 		}
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/ChangeLog b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/ChangeLog
index 3f5f42cf4cc..ab0f2a0ecda 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/ChangeLog
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/ChangeLog
@@ -1,15 +1,3 @@
-2006-02-26  Konstantin Triger <kostat@mainsoft.com>
-
-	* SupportClass.cs, Message.cs, MessageAgent.cs, MessageVector.cs: increase compliancy with jldap making
-		the MessageVector a synchronized collection. Based on Mike Glenn <mglenn@zoominternet.net> and 
-		JD Conley <jd.conley@coversant.net> patches.
-
-2006-01-26 Konstantin Triger <kostat@mainsoft.com>
-
-        * Connection.cs: TARGET_JVM: catch ObjectDisposedException in addition 
-        	to ThreadAbortException
-        * SupportClass.cs: TARGET_JVM: optimizing byte[] <-> sbyte[] conversion
-
 2005-11-06 Konstantin Triger <kostat@mainsoft.com>
 
         * LdapConnection.cs: TARGET_JVM: create GSSCredential only once, cleanup
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs
index e2886ba09ff..7390259824b 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs
@@ -1508,15 +1508,6 @@ namespace Novell.Directory.Ldap
 					// before closing sockets, from shutdown
 					return;
 				}
-#if TARGET_JVM
-				catch (ObjectDisposedException)
-				{
-					// we do not support Thread.Abort under java
-					// so we close the stream and the working thread
-					// catches ObjectDisposedException exception
-					return;
-				}
-#endif
 				catch (System.IO.IOException ioe)
 				{
 					
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Message.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Message.cs
index 998e76c72fd..4706750c862 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Message.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Message.cs
@@ -151,7 +151,7 @@ namespace Novell.Directory.Ldap
 				return null;
 			}
 			// sync on message so don't confuse with timer thread
-			lock (replies.SyncRoot)
+			lock (replies)
 			{
 				System.Object msg = null;
 				while (waitForReply_Renamed_Field)
@@ -160,7 +160,7 @@ namespace Novell.Directory.Ldap
 					{
 						try
 						{
-							System.Threading.Monitor.Wait(replies.SyncRoot);
+							System.Threading.Monitor.Wait(replies);
 						}
 						catch (System.Threading.ThreadInterruptedException ir)
 						{
@@ -213,7 +213,7 @@ namespace Novell.Directory.Ldap
 				{
 					return null;
 				}
-				lock (replies.SyncRoot)
+				lock (replies)
 				{
 					// Test and remove must be atomic
 					if ((replies.Count == 0))
@@ -466,7 +466,10 @@ namespace Novell.Directory.Ldap
 			{
 				return ;
 			}
+			lock(replies)
+			{
 			replies.Add(message);
+			}
 			message.RequestingMessage = msg; // Save request message info
 			switch (message.Type)
 			{
@@ -541,9 +544,9 @@ namespace Novell.Directory.Ldap
 		private void  sleepersAwake()
 		{
 			// Notify any thread waiting for this message id
-			lock (replies.SyncRoot)
+			lock (replies)
 			{
-				System.Threading.Monitor.Pulse(replies.SyncRoot);
+				System.Threading.Monitor.Pulse(replies);
 			}
 			// Notify a thread waiting for any message id
 			agent.sleepersAwake(false);
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageAgent.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageAgent.cs
index 27af28aa781..55ec2994ad5 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageAgent.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageAgent.cs
@@ -103,9 +103,10 @@ namespace Novell.Directory.Ldap
 			get
 			{
 				int count = 0;
-				for (int i = 0; i < messages.Count; i++)
+				System.Object[] msgs = messages.ToArray();
+				for (int i = 0; i < msgs.Length; i++)
 				{
-					Message m = (Message) messages[i];
+					Message m = (Message) msgs[i];
 					count += m.Count;
 				}
 				return count;
@@ -139,15 +140,15 @@ namespace Novell.Directory.Ldap
 				messages.Add(msgs[i]);
 				((Message) (msgs[i])).Agent = this;
 			}
-			lock (messages.SyncRoot)
+			lock (messages)
 			{
 				if (msgs.Length > 1)
 				{
-					System.Threading.Monitor.PulseAll(messages.SyncRoot); // wake all threads waiting for messages
+					System.Threading.Monitor.PulseAll(messages); // wake all threads waiting for messages
 				}
 				else if (msgs.Length == 1)
 				{
-					System.Threading.Monitor.Pulse(messages.SyncRoot); // only wake one thread
+					System.Threading.Monitor.Pulse(messages); // only wake one thread
 				}
 			}
 			return ;
@@ -160,12 +161,12 @@ namespace Novell.Directory.Ldap
 		/* package */
 		internal void  sleepersAwake(bool all)
 		{
-			lock (messages.SyncRoot)
+			lock (messages)
 			{
 				if (all)
-					System.Threading.Monitor.PulseAll(messages.SyncRoot);
+					System.Threading.Monitor.PulseAll(messages);
 				else
-					System.Threading.Monitor.Pulse(messages.SyncRoot);
+					System.Threading.Monitor.Pulse(messages);
 			}
 			return ;
 		}
@@ -367,7 +368,7 @@ namespace Novell.Directory.Ldap
 			else
 			{
 				// A msgId was NOT specified, any message will do
-				lock (messages.SyncRoot)
+				lock (messages)
 				{
 					while (true)
 					{
@@ -412,7 +413,7 @@ namespace Novell.Directory.Ldap
 						// No data, wait for something to come in.
 						try
 						{
-							System.Threading.Monitor.Wait(messages.SyncRoot);
+							System.Threading.Monitor.Wait(messages);
 						}
 						catch (System.Threading.ThreadInterruptedException ex)
 						{
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageVector.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageVector.cs
index fee7ab1db6a..cdbdb8ac427 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageVector.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/MessageVector.cs
@@ -38,9 +38,8 @@ namespace Novell.Directory.Ldap
 	/// to Vector needed for handling messages.
 	/// </summary>
 	/* package */
-	class MessageVector:System.Collections.IList
+	class MessageVector:System.Collections.ArrayList
 	{
-		private readonly System.Collections.ArrayList _innerList;
 		/// <summary>Returns an array containing all of the elements in this MessageVector.
 		/// The elements returned are in the same order in the array as in the
 		/// Vector.  The contents of the vector are cleared.
@@ -48,25 +47,29 @@ namespace Novell.Directory.Ldap
 		/// </summary>
 		/// <returns> the array containing all of the elements.
 		/// </returns>
-		internal System.Object[] ObjectArray
+		virtual internal System.Object[] ObjectArray
 		{
 			/* package */
 			
 			get
 			{
-				lock (this.SyncRoot)
+				lock (this)
 				{
-					System.Object[] results = ToArray();
-					Clear();
+					System.Object[] results = new System.Object[Count];
+					Array.Copy((System.Array) ToArray(), 0, (System.Array) results, 0, Count);
+					for (int i = 0; i < Count; i++)
+					{
+						ToArray()[i] = null;
+					}
+//					Count = 0;
 					return results;
 				}
 			}
 			
 		}
 		/* package */
-		internal MessageVector(int cap, int incr)
+		internal MessageVector(int cap, int incr):base(cap)
 		{
-			_innerList = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(cap));
 			return ;
 		}
 		
@@ -85,12 +88,12 @@ namespace Novell.Directory.Ldap
 		/* package */
 		internal Message findMessageById(int msgId)
 		{
-			lock (this.SyncRoot)
+			lock (this)
 			{
 				Message msg = null;
 				for (int i = 0; i < Count; i++)
 				{
-					if ((msg = (Message) this[i]) == null)
+					if ((msg = (Message) ToArray()[i]) == null)
 					{
 						throw new System.FieldAccessException();
 					}
@@ -102,106 +105,5 @@ namespace Novell.Directory.Ldap
 				throw new System.FieldAccessException();
 			}
 		}
-
-		#region ArrayList members

-		public object[] ToArray()

-		{

-			return _innerList.ToArray();

-		}

-		#endregion

-

-		#region IList Members

-

-		public int Add(object value)

-		{

-			return _innerList.Add(value);

-		}

-

-		public void Clear()

-		{

-			_innerList.Clear();

-		}

-

-		public bool Contains(object value)

-		{

-			return _innerList.Contains(value);

-		}

-

-		public int IndexOf(object value)

-		{

-			return _innerList.IndexOf(value);

-		}

-

-		public void Insert(int index, object value)

-		{

-			_innerList.Insert(index, value);

-		}

-

-		public bool IsFixedSize

-		{

-			get { return _innerList.IsFixedSize; }

-		}

-

-		public bool IsReadOnly

-		{

-			get { return _innerList.IsReadOnly; }

-		}

-

-		public void Remove(object value)

-		{

-			_innerList.Remove(value);

-		}

-

-		public void RemoveAt(int index)

-		{

-			_innerList.RemoveAt(index);

-		}

-

-		public object this[int index]

-		{

-			get

-			{

-				return _innerList[index];

-			}

-			set

-			{

-				_innerList[index] = value;

-			}

-		}

-

-		#endregion

-

-		#region ICollection Members

-

-		public void CopyTo(Array array, int index)

-		{

-			_innerList.CopyTo(array, index);

-		}

-

-		public int Count

-		{

-			get { return _innerList.Count; }

-		}

-

-		public bool IsSynchronized

-		{

-			get { return _innerList.IsSynchronized; }

-		}

-

-		public object SyncRoot

-		{

-			get { return _innerList.SyncRoot; }

-		}

-

-		#endregion

-

-		#region IEnumerable Members

-

-		public System.Collections.IEnumerator GetEnumerator()

-		{

-			return _innerList.GetEnumerator();

-		}

-

-		#endregion
 	}
 }
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/SupportClass.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/SupportClass.cs
index 0f9033a3dbe..2fe88cf1e6c 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/SupportClass.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/SupportClass.cs
@@ -87,14 +87,10 @@ using System;
 		[CLSCompliantAttribute(false)]
 		public static sbyte[] ToSByteArray(byte[] byteArray)
 		{
-#if TARGET_JVM
-			return vmw.common.TypeUtils.ToSByteArray(byteArray);
-#else
 			sbyte[] sbyteArray = new sbyte[byteArray.Length];
 			for(int index=0; index < byteArray.Length; index++)
 				sbyteArray[index] = (sbyte) byteArray[index];
 			return sbyteArray;
-#endif
 		}
 		/*******************************/
 		/// <summary>
@@ -105,14 +101,10 @@ using System;
 		[CLSCompliantAttribute(false)]
 		public static byte[] ToByteArray(sbyte[] sbyteArray)
 		{
-#if TARGET_JVM
-			return (byte[])vmw.common.TypeUtils.ToByteArray(sbyteArray);;
-#else
 			byte[] byteArray = new byte[sbyteArray.Length];
 			for(int index=0; index < sbyteArray.Length; index++)
 				byteArray[index] = (byte) sbyteArray[index];
 			return byteArray;
-#endif
 		}
 
 		/// <summary>
@@ -560,7 +552,7 @@ using System;
 		/// <param name="arrayList">The ArrayList instance</param>
 		/// <param name="element">The element to remove</param>
 		/// <returns>True if item is found in the ArrayList; otherwise, false</returns>  
-		public static System.Boolean VectorRemoveElement(System.Collections.IList arrayList, System.Object element)
+		public static System.Boolean VectorRemoveElement(System.Collections.ArrayList arrayList, System.Object element)
 		{
 			System.Boolean containsItem = arrayList.Contains(element);
 			arrayList.Remove(element);
diff --git a/mcs/class/Npgsql/ChangeLog b/mcs/class/Npgsql/ChangeLog
index 61f6e8c2517..8750e77d9df 100644
--- a/mcs/class/Npgsql/ChangeLog
+++ b/mcs/class/Npgsql/ChangeLog
@@ -1,9 +1,3 @@
-
-Thu Feb 23 10:29:13 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* Npgsql/NpgsqlCommand.cs: return count for fetch and move, too,
-	patch from Federico Di Gregorio <fog@initd.org>.
-
 2005-12-13  Francisco Figueiredo Jr.  <fxjrlists@yahoo.com.br>
 
 	* NpgsqlClosedState.cs:  Added a performance improvement fix. Npgsql now use a buffered stream for all server interactions.
diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlCommand.cs b/mcs/class/Npgsql/Npgsql/NpgsqlCommand.cs
index 3859931f5c7..f9454d37ff9 100644
--- a/mcs/class/Npgsql/Npgsql/NpgsqlCommand.cs
+++ b/mcs/class/Npgsql/Npgsql/NpgsqlCommand.cs
@@ -438,9 +438,7 @@ namespace Npgsql
             // [FIXME] Is there a better way to check this??
             if ((String.Compare(ret_string_tokens[0], "INSERT", true) == 0) ||
                     (String.Compare(ret_string_tokens[0], "UPDATE", true) == 0) ||
-                    (String.Compare(ret_string_tokens[0], "DELETE", true) == 0) ||
-                    (String.Compare(ret_string_tokens[0], "FETCH", true) == 0) ||
-                    (String.Compare(ret_string_tokens[0], "MOVE", true) == 0))
+                    (String.Compare(ret_string_tokens[0], "DELETE", true) == 0))
 
                 // The number of rows affected is in the third token for insert queries
                 // and in the second token for update and delete queries.
diff --git a/mcs/class/System.Configuration/System.Configuration.Internal/ChangeLog b/mcs/class/System.Configuration/System.Configuration.Internal/ChangeLog
index 64f51ea33f8..9f33abe4cb2 100644
--- a/mcs/class/System.Configuration/System.Configuration.Internal/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration.Internal/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-16  Chris Toshok  <toshok@ximian.com>
-
-	* DelegatingConfigHost.cs: flesh out the rest of this
-	implementation.
-
 2005-10-07  Chris Toshok  <toshok@ximian.com>
 
 	* IInternalConfigHost.cs: add some missing properties/methods.
diff --git a/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs b/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs
index 1251e9b67d8..594213b588a 100644
--- a/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs
+++ b/mcs/class/System.Configuration/System.Configuration.Internal/DelegatingConfigHost.cs
@@ -139,7 +139,7 @@ namespace System.Configuration.Internal
 
 		public virtual bool IsInitDelayed (IInternalConfigRecord configRecord)
 		{
-			return host.IsInitDelayed (configRecord);
+			throw new NotImplementedException ();
 		}
 		
 		public virtual bool IsFile (string streamName)
@@ -149,7 +149,7 @@ namespace System.Configuration.Internal
 		
 		public bool IsFullTrustSectionWithoutAptcaAllowed (IInternalConfigRecord configRecord)
 		{
-			return host.IsFullTrustSectionWithoutAptcaAllowed (configRecord);
+			throw new NotImplementedException ();
 		}
 
 		public virtual bool IsLocationApplicable (string configPath)
@@ -158,17 +158,19 @@ namespace System.Configuration.Internal
 		}
 
 		public bool IsRemote {
-			get { return host.IsRemote; }
+			get {
+				throw new NotImplementedException ();
+			}
 		}
 
 		public bool IsSecondaryRoot (string configPath)
 		{
-			return host.IsSecondaryRoot (configPath);
+			throw new NotImplementedException ();
 		}
 
 		public bool IsTrustedConfigPath (string configPath)
 		{
-			return host.IsTrustedConfigPath (configPath);
+			throw new NotImplementedException ();
 		}
 		
 		public virtual Stream OpenStreamForRead (string streamName)
@@ -178,7 +180,7 @@ namespace System.Configuration.Internal
 
 		public Stream OpenStreamForRead (string streamName, bool assertPermissions)
 		{
-			return host.OpenStreamForRead (streamName, assertPermissions);
+			throw new NotImplementedException ();
 		}
 		
 		public virtual Stream OpenStreamForWrite (string streamName, string templateStreamName, ref object writeContext)
@@ -188,7 +190,7 @@ namespace System.Configuration.Internal
 		
 		public Stream OpenStreamForWrite (string streamName, string templateStreamName, ref object writeContext, bool assertPermissions)
 		{
-			return host.OpenStreamForWrite (streamName, templateStreamName, ref writeContext, assertPermissions);
+			throw new NotImplementedException ();
 		}
 
 		public virtual bool PrefetchAll (string configPath, string streamName)
@@ -203,7 +205,7 @@ namespace System.Configuration.Internal
 
 		public virtual void RequireCompleteInit (IInternalConfigRecord configRecord)
 		{
-			host.RequireCompleteInit (configRecord);
+			throw new NotImplementedException ();
 		}
 		
 		public virtual object StartMonitoringStreamForChanges (string streamName, StreamChangeCallback callback)
@@ -228,7 +230,7 @@ namespace System.Configuration.Internal
 		
 		public void WriteCompleted (string streamName, bool success, object writeContext, bool assertPermissions)
 		{
-			host.WriteCompleted (streamName, success, writeContext, assertPermissions);
+			throw new NotImplementedException ();
 		}
 		
 		public virtual bool SupportsChangeNotifications {
@@ -243,7 +245,7 @@ namespace System.Configuration.Internal
 			get { return host.SupportsPath; }
 		}
 		
-		public virtual bool SupportsRefresh {
+		public virtual bool SupportsRefresh	{
 			get { return host.SupportsRefresh; }
 		}
 	}
diff --git a/mcs/class/System.Configuration/System.Configuration.dll.sources b/mcs/class/System.Configuration/System.Configuration.dll.sources
index 654d540d36c..446178bf2c5 100644
--- a/mcs/class/System.Configuration/System.Configuration.dll.sources
+++ b/mcs/class/System.Configuration/System.Configuration.dll.sources
@@ -22,7 +22,6 @@ System.Configuration.Provider/ProviderCollection.cs
 System.Configuration/AppSettingsSection.cs
 System.Configuration/CallbackValidator.cs
 System.Configuration/CallbackValidatorAttribute.cs
-System.Configuration/ClientConfigurationSystem.cs
 System.Configuration/CommaDelimitedStringCollection.cs
 System.Configuration/CommaDelimitedStringCollectionConverter.cs
 System.Configuration/ConfigHelper.cs
diff --git a/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs b/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs
index ff5945adddd..046e2d5f453 100644
--- a/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/AppSettingsSection.cs
@@ -29,7 +29,6 @@
 
 #if NET_2_0
 using System;
-using System.ComponentModel;
 using System.Collections.Specialized;
 using System.Xml;
 using System.IO;
@@ -44,10 +43,14 @@ namespace System.Configuration {
 
                 static AppSettingsSection ()
                 {
-                        _propFile = new ConfigurationProperty ("file", typeof(string), "",
-							       new StringConverter(), null, ConfigurationPropertyOptions.None);
-                        _propSettings = new ConfigurationProperty ("", typeof(KeyValueConfigurationCollection), null, 
-								   null, null, ConfigurationPropertyOptions.IsDefaultCollection);
+                        _propFile = new ConfigurationProperty ("file",
+                                                               typeof(string), 
+                                                               "", 
+                                                               ConfigurationPropertyOptions.None);
+                        _propSettings = new ConfigurationProperty ("",
+								   typeof(KeyValueConfigurationCollection),
+								   null, 
+								   ConfigurationPropertyOptions.IsDefaultCollection);
 
                         _properties     = new ConfigurationPropertyCollection ();
 
@@ -119,19 +122,10 @@ namespace System.Configuration {
 			}
 		}
 
+		[MonoTODO]
 		protected internal override object GetRuntimeObject ()
 		{
-			KeyValueInternalCollection col = new KeyValueInternalCollection ();
-				
-			foreach (string key in Settings.AllKeys) {
-				KeyValueConfigurationElement ele = Settings[key];
-				col.Add (ele.Key, ele.Value);
-			}
-				
-			if (!ConfigurationManager.ConfigurationSystem.SupportsUserConfig)
-				col.SetReadOnly ();
-
-			return col;
+			return base.GetRuntimeObject();
 		}
 	}
 }
diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index 02d0aae13bb..9d74a93cada 100644
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,107 +1,3 @@
-2006-02-01  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ConfigurationElement.cs : ListErrors() and SetPropertyValue()
-	  are protected.
-	* ConfigurationSection.cs : the .ctor() is protected.
-	* ConfigurationElementCollection.cs : CollectionType is public.
-	  Count and BaseAdd() are not virtual.
-	* ConfigurationPropertyCollection.cs : Count is not virtual.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* ConfigurationElement.cs: revert the patch that stores and writes
-	out xmlns attributes for all elements.
-
-	* ClientConfigurationSystem.cs: SupportsUserConfig == false.
-
-	* AppSettingsSection.cs (GetRuntimeObject): call col.SetReadOnly()
-	only if SupportsUserConfig != true.
-
-	* ConfigurationManager.cs (ConfigurationSystem): add a property
-	like ConfigurationFactory, and use it instead of the private field
-	throughout.
-
-2006-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* SectionGroupInfo.cs (ReadContent): handle "location" (seemingly)
-	correctly.
-
-	* InternalConfigurationRoot.cs: misc logical additions.  still
-	isn't useful.
-
-	* ConfigurationManager.cs (OpenExeConfigurationInternal): throw an
-	exception if both calling_assembly and exePath are null.  Allow
-	the exePath to be a path to a config file as well, checking to see
-	if it ends in .config before appending.
-	(OpenExeConfiguration): stop blindly passing
-	Assembly.GetCallingAssembly.  I'm assuming this will likely break
-	.dll.config usage.  need to investigate that (and write more unit
-	tests.)
-	(GetSection): call configSystem.GetSection.
-	(RefreshSection): call configSystem.RefreshSection.
-	(ChangeConfigurationSystem): modeled after the
-	ConfigurationSettings System.Web hack - allow
-	WebConfigurationManager to replace the current
-	IInternalConfigSystem.
-
-	* InternalConfigurationHost.cs (InternalConfigurationHost): make
-	abstract, and remove all the NotImplenmentedException's.
-
-	* ConfigurationElement.cs (DeserializeElement): store off the xml
-	namespace if there is one.
-	(SerializeElement): write out the namespace if there was one.
-
-	* ClientConfigurationSystem.cs: new class, based on some stack
-	traces I've seen in tests.  Kinda (well, not *kinda*..) hacky.
-
-	* Configuration.cs (NamespaceDeclared): implement.
-	(Load): don't swallow all exceptions, just the ones raised when we
-	open the stream for reading.
-	(ReadConfigFile): handle xmlns.
-
-2006-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* ConfigInfo.cs (ThrowException): throw a
-	ConfigurationErrorsException, not a ConfigurationException.
-
-	* SectionGroupInfo.cs (ReadContent): throw an exception
-	unconditionally if we see a <location>.  they aren't valid in
-	section groups.
-
-2006-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* KeyValueInternalCollection.cs: don't use a nested collection,
-	just defer to our base class.  This fixes usage of
-	ConfigurationManager.AppSettings.Keys.
-
-2006-01-13  Chris Toshok  <toshok@ximian.com>
-
-	* AppSettingsSection.cs (GetRuntimeObject): only access
-	Settings[key] once per iteration.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* ConfigurationManager.cs (AppSettings): just return
-	AppSettingsSection.GetRuntimeObject() here.
-
-	* AppSettingsSection.cs: fix the "file" property to match dumper
-	output.
-	(GetRuntimeObject): this returns a KeyValueInternalCollection in
-	MS's implementation.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* ElementInformation.cs (Validator): if propertyInfo == null,
-	return a DefaultValidator instance.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* AppSettingsSection.cs (.cctor): specify null for
-	validator/converter.
-
-	* ProtectedProviderSettings.cs (.cctor): specify null for
-	validator/converter.
-
 2006-01-03  Chris Toshok  <toshok@ximian.com>
 
 	* Configuration.cs (SaveAs): open with FileMode.OpenOrCreate so we
diff --git a/mcs/class/System.Configuration/System.Configuration/ClientConfigurationSystem.cs b/mcs/class/System.Configuration/System.Configuration/ClientConfigurationSystem.cs
deleted file mode 100644
index a8386563e16..00000000000
--- a/mcs/class/System.Configuration/System.Configuration/ClientConfigurationSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// System.Configuration.ClientConfigurationSystem.cs
-//
-// Authors:
-//  Chris Toshok (toshok@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-#if NET_2_0
-
-using System;
-using System.Reflection;
-using System.Configuration.Internal;
-
-namespace System.Configuration {
-
-	internal class ClientConfigurationSystem : IInternalConfigSystem
-	{
-		object IInternalConfigSystem.GetSection (string configKey)
-		{
-			Assembly a = Assembly.GetEntryAssembly();
-
-			Configuration cfg = ConfigurationManager.OpenExeConfigurationInternal (ConfigurationUserLevel.None, a, AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-			if (cfg == null) return null;
-			return cfg.GetSection (configKey);
-		}
-
-		void IInternalConfigSystem.RefreshConfig (string sectionName)
-		{
-		}
-
-		bool IInternalConfigSystem.SupportsUserConfig {
-			get { return false; }
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigInfo.cs b/mcs/class/System.Configuration/System.Configuration/ConfigInfo.cs
index ea971689b3d..4079767b83b 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigInfo.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigInfo.cs
@@ -73,7 +73,7 @@ namespace System.Configuration {
 		
 		protected void ThrowException (string text, XmlTextReader reader)
 		{
-			throw new ConfigurationErrorsException (text, StreamName, reader.LineNumber);
+			throw new ConfigurationException (text, StreamName, reader.LineNumber);
 		}
 		
 		public abstract void ReadConfig (Configuration cfg, string streamName, XmlTextReader reader);
diff --git a/mcs/class/System.Configuration/System.Configuration/Configuration.cs b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
index 5b662dfcb27..91641bdd628 100644
--- a/mcs/class/System.Configuration/System.Configuration/Configuration.cs
+++ b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
@@ -47,7 +47,6 @@ namespace System.Configuration {
 		SectionGroupInfo rootGroup;
 		IConfigSystem system;
 		bool hasFile;
-		string rootNamespace;
 		
 		string configPath;
 		string locationConfigPath;
@@ -177,9 +176,14 @@ namespace System.Configuration {
 			}
 		}
 
+		[MonoTODO]
 		public bool NamespaceDeclared {
-			get { return rootNamespace != null; }
-			set { rootNamespace = value ? "http://schemas.microsoft.com/.NetConfiguration/v2.0" : null; }
+			get {
+				throw new NotImplementedException ();
+			}
+			set {
+				throw new NotImplementedException ();
+			}
 		}
 
 		public ConfigurationSectionGroup RootSectionGroup {
@@ -361,10 +365,7 @@ namespace System.Configuration {
 			tw.Formatting = Formatting.Indented;
 			try {
 				tw.WriteStartDocument ();
-				if (rootNamespace != null)
-					tw.WriteStartElement ("configuration", rootNamespace);
-				else
-					tw.WriteStartElement ("configuration");
+				tw.WriteStartElement ("configuration");
 				if (rootGroup.HasConfigContent (this)) {
 					rootGroup.WriteConfig (this, tw, mode);
 				}
@@ -399,21 +400,16 @@ namespace System.Configuration {
 		
 		bool Load ()
 		{
-			if (streamName == null || streamName == "")
+			if (streamName == null)
 				return true;
 
 			XmlTextReader reader = null;
-			Stream stream = null;
-			
-			try {
-				stream = system.Host.OpenStreamForRead (streamName);
-			} catch (Exception e) {
-				return false;
-			}
-
 			try {
+				Stream stream = system.Host.OpenStreamForRead (streamName);
 				reader = new XmlTextReader (stream);
 				ReadConfigFile (reader, streamName);
+			} catch (Exception e) {
+				return false;
 			} finally {
 				if (reader != null)
 					reader.Close();
@@ -425,21 +421,11 @@ namespace System.Configuration {
 		internal void ReadConfigFile (XmlTextReader reader, string fileName)
 		{
 			reader.MoveToContent ();
-
 			if (reader.NodeType != XmlNodeType.Element || reader.Name != "configuration")
 				ThrowException ("Configuration file does not have a valid root element", reader);
 
-			if (reader.HasAttributes) {
-				while (reader.MoveToNextAttribute ()) {
-					if (reader.LocalName == "xmlns") {
-						rootNamespace = reader.Value;
-						continue;
-					}
-					ThrowException (String.Format ("Unrecognized attribute '{0}' in root element", reader.LocalName), reader);
-				}
-			}
-
-			reader.MoveToElement ();
+			if (reader.HasAttributes)
+				ThrowException ("Unrecognized attribute in root element", reader);
 
 			if (reader.IsEmptyElement) {
 				reader.Skip ();
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
index bfefca0fdaf..9fd0cced8a5 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
@@ -140,13 +140,13 @@ namespace System.Configuration
 		}
 
 		[MonoTODO]
-		protected void ListErrors (IList list)
+		public void ListErrors (IList list)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		protected void SetPropertyValue (ConfigurationProperty prop, object value, bool ignoreLocks)
+		public void SetPropertyValue (ConfigurationProperty prop, object value, bool ignoreLocks)
 		{
 			try {
 				/* XXX all i know for certain is that Validation happens here */
@@ -294,9 +294,6 @@ namespace System.Configuration
 					else if (reader.LocalName == "lockItem") {
 						LockItem = (reader.Value.ToLower() == "true");
 					}
-					else if (reader.LocalName == "xmlns") {
-						/* ignore */
-					}
 					else if (!OnDeserializeUnrecognizedAttribute (reader.LocalName, reader.Value))
 						throw new ConfigurationException ("Unrecognized attribute '" + reader.LocalName + "'.");
 
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
index 7d9832b3d58..45df76232db 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
@@ -80,7 +80,7 @@ namespace System.Configuration
 
 		#region Properties
 		
-		public virtual ConfigurationElementCollectionType CollectionType {
+		protected virtual ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.AddRemoveClearMap; }
 		}
 		
@@ -98,7 +98,7 @@ namespace System.Configuration
 			}
 		}
 
-		public int Count {
+		public virtual int Count {
 			get { return list.Count; }
 		}
 
@@ -147,7 +147,7 @@ namespace System.Configuration
 			BaseAdd (element, ThrowOnDuplicate);
 		}
 
-		protected void BaseAdd (ConfigurationElement element, bool throwIfExists)
+		protected virtual void BaseAdd (ConfigurationElement element, bool throwIfExists)
 		{
 			if (throwIfExists && BaseIndexOf (element) != -1)
 				throw new ConfigurationException ("Duplicate element in collection");
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
index 628d86de303..0bf8c6c5aff 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
@@ -44,8 +44,6 @@ namespace System.Configuration {
 	public static class ConfigurationManager
 	{
 		static InternalConfigurationFactory configFactory = new InternalConfigurationFactory ();
-		static IInternalConfigSystem configSystem = new ClientConfigurationSystem ();
-		static object lockobj = new object ();
 
 		[MonoTODO ("Evidence and version still needs work")]
 		static string GetAssemblyInfo (Assembly a)
@@ -79,11 +77,8 @@ namespace System.Configuration {
 			return Path.Combine (String.Format ("{0}_{1}", app_name, evidence_str), version);
 		}
 
-		internal static Configuration OpenExeConfigurationInternal (ConfigurationUserLevel userLevel, Assembly calling_assembly, string exePath)
+		static Configuration OpenExeConfigurationInternal (ConfigurationUserLevel userLevel, Assembly calling_assembly, string exePath)
 		{
-			if (calling_assembly == null && exePath == null)
-				throw new ArgumentException ("exePath must be specified when not running inside a stand alone exe.");
-
 			ExeConfigurationFileMap map = new ExeConfigurationFileMap ();
 
 			/* Roaming and RoamingAndLocal should be different
@@ -96,16 +91,13 @@ namespace System.Configuration {
 			switch (userLevel) {
 			case ConfigurationUserLevel.None:
 				if (exePath == null)
-					exePath = calling_assembly.Location;
+					exePath = Assembly.GetCallingAssembly ().Location;
 				else if (!File.Exists (exePath))
 					exePath = "";
 
-				if (exePath != "") {
-					if (!exePath.EndsWith (".config"))
-						map.ExeConfigFilename = exePath + ".config";
-					else
-						map.ExeConfigFilename = exePath;
-				}
+				if (exePath != "")
+					map.ExeConfigFilename = exePath + ".config";
+
 				break;
 			case ConfigurationUserLevel.PerUserRoaming:
 				map.RoamingUserConfigFilename = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), GetAssemblyInfo(calling_assembly));
@@ -123,12 +115,12 @@ namespace System.Configuration {
 
 		public static Configuration OpenExeConfiguration (ConfigurationUserLevel userLevel)
 		{
-			return OpenExeConfigurationInternal (userLevel, Assembly.GetEntryAssembly (), null);
+			return OpenExeConfigurationInternal (userLevel, Assembly.GetCallingAssembly (), Assembly.GetCallingAssembly ().Location);
 		}
 		
 		public static Configuration OpenExeConfiguration (string exePath)
 		{
-			return OpenExeConfigurationInternal (ConfigurationUserLevel.None, null, exePath);
+			return OpenExeConfigurationInternal (ConfigurationUserLevel.None, Assembly.GetCallingAssembly (), exePath);
 		}
 
 		[MonoTODO ("userLevel")]
@@ -152,24 +144,38 @@ namespace System.Configuration {
 			get { return configFactory; }
 		}
 
-		internal static IInternalConfigSystem ConfigurationSystem {
-			get { return configSystem; }
-		}
-
+		[MonoTODO ("this assembly stuff is probably wrong")]
 		public static object GetSection (string sectionName)
 		{
-			return ConfigurationSystem.GetSection (sectionName);
+			Assembly a = Assembly.GetEntryAssembly ();
+			if (a == null)
+				a = Assembly.GetCallingAssembly ();
+			Configuration cfg = OpenExeConfigurationInternal (ConfigurationUserLevel.None,
+									  a, a.Location);
+
+			if (cfg == null)
+				return null;
+
+			return cfg.GetSection (sectionName);
 		}
 
+		[MonoTODO]
 		public static void RefreshSection (string sectionName)
 		{
-			ConfigurationSystem.RefreshConfig (sectionName);
 		}
 
 		public static NameValueCollection AppSettings {
 			get {
 				AppSettingsSection appsettings = (AppSettingsSection) GetSection ("appSettings");
-				return (NameValueCollection)appsettings.GetRuntimeObject ();
+				KeyValueInternalCollection col = new KeyValueInternalCollection ();
+				
+				foreach (string key in appsettings.Settings.AllKeys) {
+					col.Add (appsettings.Settings[key].Key, appsettings.Settings[key].Value);
+				}
+				
+				col.SetReadOnly ();
+
+				return col;
 			}
 		}
 
@@ -177,20 +183,8 @@ namespace System.Configuration {
 		public static ConnectionStringSettingsCollection ConnectionStrings {
 			get {
 				ConnectionStringsSection connectionStrings = (ConnectionStringsSection) GetSection ("connectionStrings");
-				return connectionStrings.ConnectionStrings;
-			}
-		}
-
-		/* invoked from System.Web */
-		static IInternalConfigSystem ChangeConfigurationSystem (IInternalConfigSystem newSystem)
-		{
-			if (newSystem == null)
-				throw new ArgumentNullException ("newSystem");
 
-			lock (lockobj) {
-				IInternalConfigSystem old = configSystem;
-				configSystem = newSystem;
-				return old;
+				return connectionStrings.ConnectionStrings;
 			}
 		}
 	}
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyCollection.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyCollection.cs
index bbe44f45133..dfca501b349 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyCollection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyCollection.cs
@@ -42,7 +42,7 @@ namespace System.Configuration
 			collection = new List <ConfigurationProperty> ();
 		}
 
-		public int Count {
+		public virtual int Count {
 			get { return collection.Count; }
 		}
 
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationSection.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationSection.cs
index 2b42088ed87..5d0dce37fa4 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationSection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationSection.cs
@@ -39,7 +39,7 @@ namespace System.Configuration
 	{
 		SectionInformation sectionInformation;
 		
-		protected ConfigurationSection ()
+		public ConfigurationSection ()
 		{
 		}
 		
diff --git a/mcs/class/System.Configuration/System.Configuration/ElementInformation.cs b/mcs/class/System.Configuration/System.Configuration/ElementInformation.cs
index 6f82071bd90..d6c628d2cc3 100644
--- a/mcs/class/System.Configuration/System.Configuration/ElementInformation.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ElementInformation.cs
@@ -36,7 +36,7 @@ namespace System.Configuration
 		PropertyInformation propertyInfo;
 		ConfigurationElement owner;
 		PropertyInformationCollection properties;
-
+		
 		internal ElementInformation (ConfigurationElement owner, PropertyInformation propertyInfo)
 		{
 			this.propertyInfo = propertyInfo;
@@ -76,7 +76,7 @@ namespace System.Configuration
 		}
 		
 		public ConfigurationValidatorBase Validator {
-			get { return propertyInfo != null ? propertyInfo.Validator : new DefaultValidator(); }
+			get { return propertyInfo != null ? propertyInfo.Validator : null; }
 		}
 		
 		public PropertyInformationCollection Properties {
diff --git a/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs b/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
index 3b1235b2fd3..94bf85c6874 100644
--- a/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
+++ b/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
@@ -35,7 +35,7 @@ using System.Configuration.Internal;
 
 namespace System.Configuration
 {
-	abstract class InternalConfigurationHost: IInternalConfigHost
+	class InternalConfigurationHost: IInternalConfigHost
 	{
 		public virtual object CreateConfigurationContext (string configPath, string locationSubPath)
 		{
@@ -85,14 +85,14 @@ namespace System.Configuration
 			throw new NotImplementedException ();
 		}
 		
-		public abstract string GetStreamName (string configPath);
-		public abstract void Init (IInternalConfigRoot root, params object[] hostInitParams);
-		public abstract void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot root, params object[] hostInitConfigurationParams);
+		public virtual string GetStreamName (string configPath)
+		{
+			throw new NotImplementedException ();
+		}
 		
-		[MonoTODO ("remote config")]
 		public virtual string GetStreamNameForConfigSource (string streamName, string configSource)
 		{
-			throw new NotSupportedException ("mono does not support remote configuration");
+			throw new NotImplementedException ();
 		}
 		
 		public virtual object GetStreamVersion (string streamName)
@@ -105,6 +105,15 @@ namespace System.Configuration
 			throw new NotImplementedException ();
 		}
 		
+		public virtual void Init (IInternalConfigRoot root, params object[] hostInitParams)
+		{
+		}
+		
+		public virtual void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot root, params object[] hostInitConfigurationParams)
+		{
+			throw new NotImplementedException ();
+		}
+		
 		public virtual bool IsAboveApplication (string configPath)
 		{
 			throw new NotImplementedException ();
diff --git a/mcs/class/System.Configuration/System.Configuration/InternalConfigurationRoot.cs b/mcs/class/System.Configuration/System.Configuration/InternalConfigurationRoot.cs
index d51b5fd81a2..bfa3b583ddf 100644
--- a/mcs/class/System.Configuration/System.Configuration/InternalConfigurationRoot.cs
+++ b/mcs/class/System.Configuration/System.Configuration/InternalConfigurationRoot.cs
@@ -36,14 +36,6 @@ namespace System.Configuration
 {
 	class InternalConfigurationRoot: IInternalConfigRoot
 	{
-		IInternalConfigHost host;
-		bool isDesignTime;
-
-		public InternalConfigurationRoot ()
-		{
-		}
-
-		[MonoTODO]
 		public IInternalConfigRecord GetConfigRecord (string configPath)
 		{
 			throw new NotImplementedException ();
@@ -51,39 +43,35 @@ namespace System.Configuration
 		
 		public object GetSection (string section, string configPath)
 		{
-			IInternalConfigRecord rec = GetConfigRecord (configPath);
-			return rec.GetSection (section);
+			throw new NotImplementedException ();
 		}
-
-		[MonoTODO]
+		
 		public string GetUniqueConfigPath (string configPath)
 		{
-			return configPath;
+			throw new NotImplementedException ();
 		}
-
-		[MonoTODO]
+		
 		public IInternalConfigRecord GetUniqueConfigRecord (string configPath)
 		{
-			return GetConfigRecord (GetUniqueConfigPath (configPath));
+			throw new NotImplementedException ();
 		}
 		
 		public void Init (IInternalConfigHost host, bool isDesignTime)
 		{
-			this.host = host;
-			this.isDesignTime = isDesignTime;
 		}
-
-		[MonoTODO]
+		
 		public void RemoveConfig (string configPath)
 		{
-			host.DeleteStream (configPath);
-
 			if (ConfigRemoved != null)
 				ConfigRemoved (this, new InternalConfigEventArgs (configPath));
+				
+			throw new NotImplementedException ();
 		}
 		
 		public bool IsDesignTime {
-			get { return isDesignTime; }
+			get {
+				throw new NotImplementedException ();
+			}
 		}
 
 		public event InternalConfigEventHandler ConfigChanged;
diff --git a/mcs/class/System.Configuration/System.Configuration/KeyValueInternalCollection.cs b/mcs/class/System.Configuration/System.Configuration/KeyValueInternalCollection.cs
index b5db111b5ef..66450bcc148 100644
--- a/mcs/class/System.Configuration/System.Configuration/KeyValueInternalCollection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/KeyValueInternalCollection.cs
@@ -34,28 +34,43 @@ namespace System.Configuration
 {
 	internal class KeyValueInternalCollection: NameValueCollection
 	{
+		KeyValueConfigurationCollection col;
+
+		public KeyValueInternalCollection ()
+		{
+			col = new KeyValueConfigurationCollection ();
+		}
+
+		
 		public void SetReadOnly ()
 		{
-			base.IsReadOnly  = true;
+			col.SetReadOnly ();
 		}
 
 		public override void Add (string name, string val)
 		{
-			BaseAdd (name, val);
+			col.Add (new KeyValueConfigurationElement (name, val));
 		}
 
 		public override void Remove (string name)
 		{
-			BaseRemove (name);
+			col.Remove (name);
 		}
 
-		public override string[] AllKeys {
-			get { return BaseGetAllKeys (); }
+		public override string[] AllKeys
+		{
+			get {
+				return col.AllKeys;
+			}
 		}
 
 		public override string Get (string name)
 		{
-			return (string)BaseGet (name);
+			KeyValueConfigurationElement ele = col[name];
+			if (ele != null)
+				return ele.Value;
+
+			return null;
 		}
 
 			/*
diff --git a/mcs/class/System.Configuration/System.Configuration/ProtectedProviderSettings.cs b/mcs/class/System.Configuration/System.Configuration/ProtectedProviderSettings.cs
index 2cacd501698..8f24d2b7219 100644
--- a/mcs/class/System.Configuration/System.Configuration/ProtectedProviderSettings.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ProtectedProviderSettings.cs
@@ -37,8 +37,7 @@ namespace System.Configuration
 
 		static ProtectedProviderSettings ()
 		{
-			providersProp = new ConfigurationProperty ("", typeof (ProviderSettingsCollection), null,
-								   null, null, ConfigurationPropertyOptions.IsDefaultCollection);
+			providersProp = new ConfigurationProperty ("", typeof (ProviderSettingsCollection), null, ConfigurationPropertyOptions.IsDefaultCollection);
 
 			properties = new ConfigurationPropertyCollection ();
 			properties.Add (providersProp);
diff --git a/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs b/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
index 011276070f4..0e8a512f97d 100644
--- a/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
+++ b/mcs/class/System.Configuration/System.Configuration/SectionGroupInfo.cs
@@ -263,19 +263,19 @@ namespace System.Configuration
 		public void ReadRootData (XmlTextReader reader, Configuration config, bool overrideAllowed)
 		{
 			reader.MoveToContent ();
-			ReadContent (reader, config, overrideAllowed, true);
+			ReadContent (reader, config, overrideAllowed);
 		}
 		
 		public override void ReadData (Configuration config, XmlTextReader reader, bool overrideAllowed)
 		{
 			reader.MoveToContent ();
 			reader.ReadStartElement ();
-			ReadContent (reader, config, overrideAllowed, false);
+			ReadContent (reader, config, overrideAllowed);
 			reader.MoveToContent ();
 			reader.ReadEndElement ();
 		}
 		
-		void ReadContent (XmlTextReader reader, Configuration config, bool overrideAllowed, bool root)
+		void ReadContent (XmlTextReader reader, Configuration config, bool overrideAllowed)
 		{
 			StringBuilder spacing = new StringBuilder ();
 			while (reader.NodeType != XmlNodeType.EndElement) {
@@ -286,10 +286,11 @@ namespace System.Configuration
 					continue;
 				}
 				
-				if (reader.LocalName == "location") {
-					if (!root)
+				if (reader.LocalName == "location")
+				{
+					if (!config.HasFile)
 						ThrowException ("<location> elements are only allowed in <configuration> elements.", reader);
-
+						 
 					string allowOverrideAttr = reader.GetAttribute ("allowOverride");
 					bool allowOverride = allowOverrideAttr == null || allowOverrideAttr.Length == 0 || bool.Parse (allowOverrideAttr);
 					string path = reader.GetAttribute ("path");
@@ -305,7 +306,6 @@ namespace System.Configuration
 					}
 					continue;
 				}
-
 				
 				ConfigInfo data = (sections != null) ? (ConfigInfo) sections [reader.LocalName] : (ConfigInfo) null;
 				if (data == null) data = (groups != null) ? (ConfigInfo) groups [reader.LocalName] : (ConfigInfo) null;
diff --git a/mcs/class/System.Configuration/System.Configuration_test.dll.sources b/mcs/class/System.Configuration/System.Configuration_test.dll.sources
index 960dd8db83e..14b6b3122c6 100644
--- a/mcs/class/System.Configuration/System.Configuration_test.dll.sources
+++ b/mcs/class/System.Configuration/System.Configuration_test.dll.sources
@@ -1,7 +1,6 @@
 System.Configuration/CallbackValidatorTest.cs
 System.Configuration/CommaDelimitedStringCollectionConverterTest.cs
 System.Configuration/CommaDelimitedStringCollectionTest.cs
-System.Configuration/ConfigurationElementTest.cs
 System.Configuration/ConfigurationLockCollectionTest.cs
 System.Configuration/ConfigurationPermissionTest.cs
 System.Configuration/ConfigurationManagerTest.cs
diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationElementTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationElementTest.cs
deleted file mode 100644
index a9e313c3370..00000000000
--- a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationElementTest.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Configuration.ConfigurationElementTest.cs - Unit tests
-// for System.Configuration.ConfigurationElement.
-//
-// Author:
-//	Chris Toshok  <toshok@ximian.com>
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Configuration;
-using NUnit.Framework;
-
-namespace MonoTests.System.Configuration {
-	[TestFixture]
-	public class ConfigurationElementTest
-	{
-		[Test]
-		public void ElementInformation_validator () {
-			/* pick a Configuration class that doesn't
-			 * specify an ElementInformation override */
-			DefaultSection sect = new DefaultSection();
-			ElementInformation info = sect.ElementInformation;
-
-			Assert.AreEqual (typeof (DefaultValidator), info.Validator.GetType(), "A1");
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Configuration/Test/dumper/dumper.cs b/mcs/class/System.Configuration/Test/dumper/dumper.cs
deleted file mode 100644
index 8c690b227d6..00000000000
--- a/mcs/class/System.Configuration/Test/dumper/dumper.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-/* 
-** 1. compile using:
-**    gmcs dumper.cs -r:System.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Configuration.dll
-** 
-** 2. run it on windows:
-**    > dumper.exe > dumper.out.microsoft
-** 
-** 3. transfer that file to linux and do:
-**    $ dos2unix dumper.out.microsoft && sort dumper.out.microsoft > foo && mv foo dumper.out.microsoft
-** 
-** 4. run dumper on linux:
-**    $ mono dumper.exe > dumper.out.linux && sort dumper.out.linux > foo && mv foo dumper.out.linux
-** 
-** 5. diff the results:
-**    $ diff -u dumper.out.linux dumper.out.microsoft | grep ^[-+]
-*/
-
-using System;
-
-using System.Collections;
-using System.Configuration;
-using System.Net;
-using System.Reflection;
-using System.Web.Configuration;
-using System.Web.Services.Configuration;
-
-public class Dumper {
-	object[] things = {
-		new AnonymousIdentificationSection (),
-		new AssemblyCollection (),
-		new AssemblyInfo ("foo"),
-		new AuthenticationSection (),
-		new AuthorizationRuleCollection (),
-		new AuthorizationRule (AuthorizationRuleAction.Allow),
-		new AuthorizationSection (),
-		new BufferModesCollection (),
-		new BufferModeSettings ("name", 10, 10, 10, TimeSpan.FromMinutes (1), TimeSpan.FromMinutes(1), 10),
-		new BuildProviderCollection (),
-		new BuildProvider (".cs", "CSharpProvider"),
-		new CacheSection (),
-		new ClientTargetCollection (),
-		new ClientTarget ("alias", "userAgent"),
-		new ClientTargetSection (),
-		new CodeSubDirectoriesCollection (),
-		new CodeSubDirectory ("dirname"),
-		new CompilationSection (),
-		new CompilerCollection (),
-		new Compiler ("options", "ext", "lang", "type", 1),
-		new CustomErrorCollection (),
-		new CustomError (404, "redirect"),
-		new CustomErrorsSection (),
-		new DeploymentSection (),
-		new EventMappingSettingsCollection (),
-		new EventMappingSettings ("name", "type"),
-		new ExpressionBuilderCollection (),
-		new ExpressionBuilder ("prefix", "type"),
-		new FormsAuthenticationConfiguration (),
-		new FormsAuthenticationCredentials (),
-		new FormsAuthenticationUserCollection (),
-		new FormsAuthenticationUser ("name", "password"),
-		new GlobalizationSection (),
-		new HealthMonitoringSection (),
-		new HostingEnvironmentSection (),
-		new HttpCookiesSection (),
-		new HttpHandlerActionCollection (),
-		new HttpHandlerAction ("path", "type", "verb"),
-		new HttpHandlersSection (),
-		new HttpModuleActionCollection (),
-		new HttpModuleAction ("name", "type"),
-		new HttpModulesSection (),
-		new HttpRuntimeSection (),
-		new IdentitySection (),
-		new MachineKeySection (),
-		new MembershipSection (),
-		new NamespaceCollection (),
-		new NamespaceInfo ("name"),
-		new OutputCacheProfileCollection (),
-		new OutputCacheProfile ("name"),
-		new OutputCacheSection (),
-		new OutputCacheSettingsSection (),
-		new PagesSection (),
-		new PassportAuthentication (),
-		new ProcessModelSection (),
-		new ProfileGroupSettingsCollection (),
-		new ProfileGroupSettings ("name"),
-		new ProfilePropertySettingsCollection (),
-		new ProfilePropertySettings ("name"),
-		new ProfileSettingsCollection (),
-		new ProfileSettings ("name"),
-		new RoleManagerSection (),
-		new RootProfilePropertySettingsCollection (),
-		new RuleSettingsCollection (),
-		new RuleSettings ("name", "event", "provider", "profile", 1, 1, TimeSpan.FromMinutes (5), "custom"),
-		new SecurityPolicySection (),
-		new SessionPageStateSection (),
-		new SessionStateSection (),
-		new SqlCacheDependencyDatabaseCollection (),
-		new SqlCacheDependencyDatabase ("name", "connectionStringName"),
-		new SqlCacheDependencySection (),
-		new TagMapCollection (),
-		new TagMapInfo ("tagType", "mappedTag"),
-		new TagPrefixCollection (),
-		new TagPrefixInfo ("tagPrefix", "nameSpace", "assembly", "tagName", "source"),
-		new TraceSection (),
-		new TransformerInfoCollection (),
-		new TransformerInfo ("name", "type"),
-		new TrustLevelCollection (),
-		new TrustLevel ("name", "policyFile"),
-		new TrustSection (),
-		new UrlMappingCollection (),
-		new UrlMapping ("~/url", "~/mappedUrl"), /* UrlMapping uses a callback validator to validate the url(s) */
-		new UrlMappingsSection (),
-		new VirtualDirectoryMappingCollection (),
-		//		new VirtualDirectoryMapping ("\\phys\\dir", true),  /* PhysicalDirectory seems to validate its input without using a Validator (decorator, anyway..)*/
-		new WebControlsSection (),
-		new WebPartsPersonalizationAuthorization (),
-		new WebPartsPersonalization (),
-		new WebPartsSection (),
-		new XhtmlConformanceSection (),
-
-		/* System.Configuration stuff */
-		new AppSettingsSection (),
-		new IgnoreSection (),
-		new ConnectionStringSettings (),
-		new ConnectionStringSettingsCollection (),
-		new ProtectedProviderSettings (),
-
-		/* System.Web.Services stuff */
-		new DiagnosticsElement (),
-		new ProtocolElementCollection (),
-		new ProtocolElement (),
-		new SoapEnvelopeProcessingElement (),
-		new SoapExtensionTypeElementCollection (),
-		new SoapExtensionTypeElement (),
-		new TypeElementCollection (),
-		new TypeElement (),
-		new WebServicesSection (),
-		new WsdlHelpGeneratorElement (),
-		new WsiProfilesElementCollection (),
-		new WsiProfilesElement (),
-
-		/* System.Net stuff */
-		//new AuthenticationModuleElement (),
-		//new AuthenticationModuleElementCollection (),
-		//new AuthenticationModulesSection (),
-		//new BypassElement (),
-		//new BypassElementCollection (),
-		//new ConnectionManagementElement (),
-		//new ConnectionManagementElementCollection (),
-		//new ConnectionManagementSection (),
-		//new DefaultProxySection (),
-		//new HttpCachePolicyElement (),
-		//new Ipv6Element (),
-		//new ModuleElement (),
-		//new ModuleElementCollection (),
-	};
-
-	public Dumper ()
-	{
-	}
-
-	public void DumpProperties ()
-	{
-		foreach (object o in things) {
-			Type type = o.GetType ();
-			PropertyInfo pinfo = type.GetProperty ("Properties", BindingFlags.Instance | BindingFlags.NonPublic);
-
-			if (pinfo == null)
-				continue;
-
-			ConfigurationPropertyCollection col = (ConfigurationPropertyCollection)pinfo.GetValue (o, null);
-			foreach (ConfigurationProperty p in col) {
-				Console.WriteLine ("{0}.{1} (Type) = {2}", type, p.Name, p.Type);
-				if (p.Validator != null && p.Validator.GetType () != typeof (DefaultValidator))
-					Console.WriteLine ("{0}.{1} (Validator) = {2} ", type, p.Name, p.Validator);
-			}
-		}
-	}
-
-	public void DumpConverters ()
-	{
-		foreach (object o in things) {
-			Type type = o.GetType ();
-			PropertyInfo pinfo = type.GetProperty ("Properties", BindingFlags.Instance | BindingFlags.NonPublic);
-
-			if (pinfo == null)
-				continue;
-
-			ConfigurationPropertyCollection col = (ConfigurationPropertyCollection)pinfo.GetValue (o, null);
-			foreach (ConfigurationProperty p in col) {
-				if (p.Converter != null)
-					Console.WriteLine ("{0}.{1} (Converter) = {2} ", type, p.Name, p.Converter);
-			}
-		}
-	}
-
-	public void DumpElementProperties ()
-	{
-		foreach (object o in things) {
-			Type type = o.GetType ();
-			PropertyInfo pinfo = type.GetProperty ("ElementProperty", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-
-			if (pinfo == null)
-				continue;
-
-			ConfigurationElementProperty p = (ConfigurationElementProperty)pinfo.GetValue (o, null);
-			if (p == null)
-				Console.WriteLine ("{0}.ElementProperty = null", type);
-			else if (p.Validator == null)
-				Console.WriteLine ("{0}.ElementProperty (Validator) = null", type);
-			else
-				Console.WriteLine ("{0}.ElementProperty (Validator) = {1} ({2})", type, p.Validator, p.Validator.CanValidate (type));
-		}
-	}
-
-	public void DumpRuntimeObjects ()
-	{
-		foreach (object o in things) {
-			Type type = o.GetType ();
-			MethodInfo minfo = type.GetMethod ("GetRuntimeObject", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-
-			if (minfo == null)
-				continue;
-
-			object ro = minfo.Invoke (o, null);
-
-			if (ro == null)
-				Console.WriteLine ("{0}.GetRuntimeObject() = null", type);
-			else
-				Console.WriteLine ("{0}.GetRuntimeObject() = {1} ({2})", type, ro.GetType(), ro == o);
-			if (ro.GetType() == typeof (Hashtable)) {
-				foreach (object key in ((Hashtable)ro).Keys)
-					Console.WriteLine (" hash[{0}] = {1}", key, ((Hashtable)ro)[key]);
-			}
-		}
-	}
-
-	public static void Main (string[] args) {
-		Dumper d = new Dumper ();
-
-		try {
-			d.DumpProperties ();
-			d.DumpConverters ();
-			d.DumpElementProperties ();
-			d.DumpRuntimeObjects ();
-		}
-		catch (Exception e) {
-			Console.WriteLine (e);
-		}
-	}
-
-}
diff --git a/mcs/class/System.Configuration/Test/standalone/Makefile b/mcs/class/System.Configuration/Test/standalone/Makefile
index d344a269937..857fb53f53f 100644
--- a/mcs/class/System.Configuration/Test/standalone/Makefile
+++ b/mcs/class/System.Configuration/Test/standalone/Makefile
@@ -1,4 +1,4 @@
-TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe t15.exe t16.exe t17.exe t18.exe t19.exe t20.exe t21.exe t22.exe t23.exe t24.exe t25.exe t26.exe t27.exe t28.exe t29.exe
+TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe t15.exe t16.exe t17.exe t18.exe t19.exe t20.exe t21.exe t22.exe t23.exe t24.exe t25.exe t26.exe t27.exe
 
 check:	local compare
 
diff --git a/mcs/class/System.Configuration/Test/standalone/t28.cs b/mcs/class/System.Configuration/Test/standalone/t28.cs
deleted file mode 100644
index 61b9db5a141..00000000000
--- a/mcs/class/System.Configuration/Test/standalone/t28.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Text;
-using System.Configuration;
-using System.Web;
-
-class T1
-{
-	static void Main(string[] args)
-	{
-		try
-		{
-			NameValueCollection AppSettings = ConfigurationManager.AppSettings;
-		}
-		catch (ConfigurationErrorsException e) {
-			Console.WriteLine ("configuration exception thrown.");
-			return;
-		}
-		Console.WriteLine ("configuration exception not thrown.");
-	}
-}
diff --git a/mcs/class/System.Configuration/Test/standalone/t28.exe.config b/mcs/class/System.Configuration/Test/standalone/t28.exe.config
deleted file mode 100644
index 4f36cd7707e..00000000000
--- a/mcs/class/System.Configuration/Test/standalone/t28.exe.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<configuration>
-<system.web>
-  <location path="test.aspx">
-     <system.web>
-       <authorization>
-         <allow users="*" />
-       </authorization>
-     </system.web>
-  </location>
-</system.web>
-
-<appSettings>
-	<add key="hithere" value="Hello World!"/>
-</appSettings>
-
-</configuration>
diff --git a/mcs/class/System.Configuration/Test/standalone/t28.exe.expected b/mcs/class/System.Configuration/Test/standalone/t28.exe.expected
deleted file mode 100644
index 96ce3d192ca..00000000000
--- a/mcs/class/System.Configuration/Test/standalone/t28.exe.expected
+++ /dev/null
@@ -1 +0,0 @@
-configuration exception thrown.
diff --git a/mcs/class/System.Configuration/Test/standalone/t29.cs b/mcs/class/System.Configuration/Test/standalone/t29.cs
deleted file mode 100644
index 61b9db5a141..00000000000
--- a/mcs/class/System.Configuration/Test/standalone/t29.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Text;
-using System.Configuration;
-using System.Web;
-
-class T1
-{
-	static void Main(string[] args)
-	{
-		try
-		{
-			NameValueCollection AppSettings = ConfigurationManager.AppSettings;
-		}
-		catch (ConfigurationErrorsException e) {
-			Console.WriteLine ("configuration exception thrown.");
-			return;
-		}
-		Console.WriteLine ("configuration exception not thrown.");
-	}
-}
diff --git a/mcs/class/System.Configuration/Test/standalone/t29.exe.config b/mcs/class/System.Configuration/Test/standalone/t29.exe.config
deleted file mode 100644
index b0310a77a83..00000000000
--- a/mcs/class/System.Configuration/Test/standalone/t29.exe.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-<location path="test.aspx">
-   <system.web>
-     <authorization>
-       <allow users="*" />
-     </authorization>
-   </system.web>
-</location>
-
-<appSettings>
-	<add key="hithere" value="Hello World!"/>
-</appSettings>
-
-</configuration>
diff --git a/mcs/class/System.Configuration/Test/standalone/t29.exe.expected b/mcs/class/System.Configuration/Test/standalone/t29.exe.expected
deleted file mode 100644
index 958d877891c..00000000000
--- a/mcs/class/System.Configuration/Test/standalone/t29.exe.expected
+++ /dev/null
@@ -1 +0,0 @@
-configuration exception not thrown.
diff --git a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
index dfbc746d544..9b168a3cd45 100644
--- a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
@@ -31,9 +31,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct ("MONO CLI")]
 [assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc and Various Authors")]
 [assembly: AssemblyTrademark ("")]
-#if !TARGET_JVM
+
 [assembly: CLSCompliant (true)]
-#endif
 [assembly: AssemblyDefaultAlias ("System.Data.OracleClient.dll")]
 [assembly: AssemblyInformationalVersion ("0.0.0.1")]
 [assembly: NeutralResourcesLanguage ("en-US")]
@@ -41,6 +40,4 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 
 [assembly: AssemblyDelaySign (true)]
-#if !TARGET_JVM
 [assembly: AssemblyKeyFile ("../ecma.pub")]
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/ChangeLog b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/ChangeLog
deleted file mode 100644
index 56d63ce7cc8..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2006-02-26  Konstantin Triger <kostat@mainsoft.com>
-
-	* OracleDataReader.cs: Added GetOracleXXX stubs.
-	* OracleCommand.cs: Added ExecuteOracleXXX stubs.
-
-2006-02-26  Konstantin Triger <kostat@mainsoft.com>
-
-	* Regex.cs: Added.
-
-2006-02-19  Konstantin Triger <kostat@mainsoft.com>
-
-	* OracleConnection.cs: follow JDBC provider generic adapter mechanism.
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/ExceptionHelper.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/ExceptionHelper.cs
deleted file mode 100755
index 42f75868280..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/ExceptionHelper.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// System.Data.Common.ExceptionHelper
-//
-// Author:
-//   Boris Kirzner (borisk@mainsoft.com)
-//
-
-using System;
-
-namespace System.Data.OracleClient
-{
-	sealed class ExceptionHelper
-	{	
-		internal static ArgumentException InvalidSizeValue (int value)
-		{
-			string [] args = new string [] {value.ToString ()};
-			return new ArgumentException  (GetExceptionMessage ("Invalid parameter Size value '{0}'. The value must be greater than or equal to 0.",args));
-		}
-
-		internal static ArgumentOutOfRangeException InvalidDataRowVersion (DataRowVersion value)
-		{			
-			object [] args = new object [] { "DataRowVersion", value.ToString () } ;
-			return new ArgumentOutOfRangeException  (GetExceptionMessage ("{0}: Invalid DataRow Version enumeration value: {1}",args));
-		}
-
-		internal static ArgumentOutOfRangeException InvalidParameterDirection (ParameterDirection value)
-		{
-			object [] args = new object [] { "ParameterDirection", value.ToString () } ;
-			return new ArgumentOutOfRangeException  (GetExceptionMessage ("Invalid direction '{0}' for '{1}' parameter.",args));
-		}
-
-		internal static InvalidOperationException NoStoredProcedureExists (string procedureName) {
-			object [] args = new object [1] { procedureName } ;
-			return new InvalidOperationException  (GetExceptionMessage ("The stored procedure '{0}' doesn't exist.", args));
-		}
-
-		internal static ArgumentNullException ArgumentNull (string parameter)
-		{
-			return new ArgumentNullException (parameter);
-		}
-
-		internal static InvalidOperationException TransactionRequired ()
-		{
-			return new InvalidOperationException  (GetExceptionMessage ("Execute requires the command to have a transaction object when the connection assigned to the command is in a pending local transaction.  The Transaction property of the command has not been initialized."));
-		}
-
-		internal static ArgumentOutOfRangeException InvalidOleDbType (int value)
-		{
-			string [] args = new string [] { value.ToString() };
-			return new ArgumentOutOfRangeException  (GetExceptionMessage ("Invalid OleDbType enumeration value: {0}",args));
-		}
- 
-		internal static ArgumentException InvalidDbType(int value)
-		{
-			string [] args = new string [] { value.ToString () };
-			return new ArgumentException  (GetExceptionMessage ("No mapping exists from DbType {0} to a known {1}.",args));
-		}
-
-		internal static InvalidOperationException DeriveParametersNotSupported(Type type,CommandType commandType)
-		{
-			string [] args = new string [] { type.ToString(),commandType.ToString() };
-			return new InvalidOperationException  (GetExceptionMessage ("{0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{1}.",args));
-		}
-
-		internal static InvalidOperationException ReaderClosed (string mehodName)
-		{
-			string [] args = new string [] { mehodName };
-			return new InvalidOperationException  (GetExceptionMessage ("Invalid attempt to {0} when reader is closed.",args));
-		}
-
-		internal static ArgumentOutOfRangeException InvalidSqlDbType (int value)
-		{
-			string [] args = new string [] { value.ToString () };
-			return new ArgumentOutOfRangeException  (GetExceptionMessage ("{0}: Invalid SqlDbType enumeration value: {1}.",args));
-		}
-
-		internal static ArgumentException UnknownDataType (string type1, string type2)
-		{
-			string [] args = new string [] { type1, type2 };
-			return new ArgumentException  (GetExceptionMessage ("No mapping exists from DbType {0} to a known {1}.",args));
-		}
-
-		internal static InvalidOperationException TransactionNotInitialized ()
-		{
-			return new InvalidOperationException  (GetExceptionMessage ("Execute requires the command to have a transaction object when the connection assigned to the command is in a pending local transaction.  The Transaction property of the command has not been initialized."));
-		}
-
-		internal static InvalidOperationException ParametersNotInitialized (int parameterPosition,string parameterName,string parameterType)
-		{
-			object [] args = new object [] { parameterPosition, parameterName, parameterType };
-			return new InvalidOperationException  (GetExceptionMessage ("Parameter {0}: '{1}', the property DbType is uninitialized: OleDbType.{2}.",args));
-		}
-
-		internal static InvalidOperationException WrongParameterSize(string provider)
-		{
-			string [] args = new string [] { provider };
-			return new InvalidOperationException  (GetExceptionMessage ("{0}.Prepare method requires all variable length parameters to have an explicitly set non-zero Size.",args));
-		}
-
-		internal static InvalidOperationException ConnectionNotOpened (string operationName, string connectionState)
-		{
-			object [] args = new object [] { operationName, connectionState };
-			return new InvalidOperationException  (GetExceptionMessage ("{0} requires an open and available Connection. The connection's current state is {1}.",args));
-		}
-
-		internal static InvalidOperationException ConnectionNotInitialized (string methodName)
-		{
-			object [] args = new object [] { methodName };
-			return new InvalidOperationException (GetExceptionMessage ("{0}: Connection property has not been initialized.",args));
-		}
-
-		internal static InvalidOperationException OpenConnectionRequired (string methodName, object connectionState)
-		{
-			object [] args = new object [] { methodName, connectionState };
-			return new InvalidOperationException (GetExceptionMessage ("{0} requires an open and available Connection. The connection's current state is {1}.",args));
-		}
-
-		internal static InvalidOperationException OpenedReaderExists ()
-		{
-			return new InvalidOperationException (GetExceptionMessage ("There is already an open DataReader associated with this Connection which must be closed first."));
-		}
-
-		internal static InvalidOperationException ConnectionAlreadyOpen (object connectionState)
-		{
-			object [] args = new object [] { connectionState };
-			return new InvalidOperationException (GetExceptionMessage ("The connection is already Open (state={0}).",args));
-		}
-
-		internal static InvalidOperationException ConnectionStringNotInitialized ()
-		{
-			return new InvalidOperationException (GetExceptionMessage ("The ConnectionString property has not been initialized."));
-		}
-
-		internal static InvalidOperationException ConnectionIsBusy (object commandType,object connectionState)
-		{
-			object [] args = new object [] { commandType.ToString (), connectionState.ToString () };
-			return new InvalidOperationException (GetExceptionMessage ("The {0} is currently busy {1}.",args));
-		}
-
-		internal static InvalidOperationException NotAllowedWhileConnectionOpen (string propertyName, object connectionState)
-		{
-			object [] args = new object [] { propertyName, connectionState };
-			return new InvalidOperationException (GetExceptionMessage ("Not allowed to change the '{0}' property while the connection (state={1}).",args));
-		}
-
-		internal static ArgumentException OleDbNoProviderSpecified ()
-		{
-			return new ArgumentException (GetExceptionMessage ("An OLE DB Provider was not specified in the ConnectionString.  An example would be, 'Provider=SQLOLEDB;'."));
-		}
-
-		internal static ArgumentException InvalidValueForKey (string key)
-		{
-			string [] args = new string [] { key };
-			return new ArgumentException (String.Format ("Invalid value for key {0}",args));
-		}
-
-		internal static InvalidOperationException ParameterSizeNotInitialized( int parameterIndex, string parameterName,string parameterType,int parameterSize)
-		{
-			object [] args = new object [] { parameterIndex.ToString (), parameterName, parameterType, parameterSize.ToString () };
-			return new InvalidOperationException (GetExceptionMessage ("Parameter {0}: '{1}' of type: {2}, the property Size has an invalid size: {3}",args));
-		}
-
-		internal static ArgumentException InvalidUpdateStatus (UpdateStatus status)
-		{
-			object [] args = new object [] { status };
-			return new ArgumentException (GetExceptionMessage ("Invalid UpdateStatus: {0}",args));
-		}
-
-		internal static InvalidOperationException UpdateRequiresCommand (string command)
-		{
-			object [] args = new object [] { command };
-			return new InvalidOperationException (GetExceptionMessage ("Auto SQL generation during {0} requires a valid SelectCommand.",args));
-		}
-
-		internal static DataException RowUpdatedError ()
-		{
-			return new DataException (GetExceptionMessage ("RowUpdatedEvent: Errors occurred; no additional is information available."));
-		}
-
-		internal static ArgumentNullException CollectionNoNullsAllowed (object collection, object objectsType)
-		{
-			object [] args = new object [] {collection.GetType ().ToString (), objectsType.ToString ()};
-			return new ArgumentNullException (GetExceptionMessage ("The {0} only accepts non-null {1} type objects."));
-		}
-
-		internal static ArgumentException CollectionAlreadyContains(object objectType,string propertyName, object propertyValue, object collection)
-		{
-			object [] args = new object [] {objectType.ToString (), propertyName, propertyValue, collection.GetType ().ToString ()};
-			return new ArgumentException (GetExceptionMessage ("The {0} with {1} '{2}' is already contained by this {3}.",args));
-		}
-
-		internal static string GetExceptionMessage (string exceptionMessage,object [] args)
-		{
-			if ((args == null) || (args.Length == 0)) {
-				return exceptionMessage;
-			}
-			else {
-				return String.Format (exceptionMessage,args);
-			}
-		}
-
-		internal static string GetExceptionMessage (string exceptionMessage)
-		{
-			return GetExceptionMessage (exceptionMessage,null);
-		}
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleBFile.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleBFile.cs
deleted file mode 100644
index 3c0cbcf51a7..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleBFile.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// OracleBFile.cs 
-//
-// Part of the Mono class libraries at
-// mcs/class/System.Data.OracleClient/System.Data.OracleClient
-//
-// Assembly: System.Data.OracleClient.dll
-// Namespace: System.Data.OracleClient
-//
-// Author: Tim Coleman <tim@timcoleman.com>
-//
-// Copyright (C) Tim Coleman, 2003
-//
-// Licensed under the MIT/X11 License.
-//
-
-using System;
-using System.IO;
-using System.Data.SqlTypes;
-
-namespace System.Data.OracleClient {
-	public sealed class OracleBFile : Stream, ICloneable, INullable {
-		#region Fields
-
-		public static readonly new OracleBFile Null = new OracleBFile ();
-
-		OracleConnection connection;
-		bool isOpen = true;
-		bool notNull = false;
-
-		#endregion // Fields
-
-		#region Constructors
-
-		internal OracleBFile () {
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		public override bool CanRead {
-			get { return (IsNull || isOpen); }
-		}
-
-		public override bool CanSeek {
-			get { return (IsNull || isOpen); }
-		}
-
-		public override bool CanWrite {
-			get { return false; }
-		}
-
-		public OracleConnection Connection {
-			get { return connection; }
-		}
-
-		public string DirectoryName {
-			[MonoTODO]
-			get { 
-				if (!isOpen)
-					throw new ObjectDisposedException ("OracleBFile");
-				throw new NotImplementedException ();
-			}
-		}
-
-		public bool FileExists {
-			[MonoTODO]
-			get { 
-				if (!isOpen)
-					throw new ObjectDisposedException ("OracleBFile");
-				if (Connection.State == ConnectionState.Closed)
-					throw new InvalidOperationException ();
-				throw new NotImplementedException ();
-			}
-		}
-
-		public string FileName {
-			[MonoTODO]
-			get {
-				if (!isOpen)
-					throw new ObjectDisposedException ("OracleBFile");
-				if (IsNull)
-					return String.Empty;
-				throw new NotImplementedException ();
-			}
-		}
-
-		public bool IsNull {
-			get { return !notNull; }
-		}
-
-		public override long Length {
-			[MonoTODO]
-			get { 
-				if (!isOpen)
-					throw new ObjectDisposedException ("OracleBFile");
-				throw new NotImplementedException ();
-			}
-		}
-
-		public override long Position {
-			[MonoTODO]
-			get { 
-				if (!isOpen)
-					throw new ObjectDisposedException ("OracleBFile");
-				throw new NotImplementedException ();
-			}
-			[MonoTODO]
-			set {
-				if (!isOpen)
-					throw new ObjectDisposedException ("OracleBFile");
-				if (value > Length) 
-					throw new ArgumentOutOfRangeException ();
-				throw new NotImplementedException ();
-			}
-		}
-
-		public object Value {
-			[MonoTODO]
-			get { 
-				throw new NotImplementedException ();
-			}
-		}
-
-		#endregion // Properties
-
-		#region Methods
-
-		[MonoTODO]
-		public object Clone () {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public long CopyTo (OracleLob destination) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public long CopyTo (OracleLob destination, long destinationOffset) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public long CopyTo (long sourceOffset, OracleLob destination, long destinationOffset, long amount) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void Dispose () {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void Flush () {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override int Read (byte[] buffer, int offset, int count) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override long Seek (long offset, SeekOrigin origin) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void SetFileName (string directory, string file) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void SetLength (long value) {
-			throw new InvalidOperationException ();
-		}
-
-		[MonoTODO]
-		public override void Write (byte[] buffer, int offset, int count) {
-			throw new NotSupportedException ();
-		}
-
-		#endregion // Methods
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleBinary.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleBinary.cs
deleted file mode 100644
index 21b34d42392..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleBinary.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// OracleBinary.cs 
-//
-// Part of the Mono class libraries at
-// mcs/class/System.Data.OracleClient/System.Data.OracleClient
-//
-// Assembly: System.Data.OracleClient.dll
-// Namespace: System.Data.OracleClient
-//
-// Author: Tim Coleman <tim@timcoleman.com>
-//
-// Copyright (C) Tim Coleman, 2003
-//
-// Licensed under the MIT/X11 License.
-//
-
-using System;
-using System.IO;
-using System.Data.SqlTypes;
-
-namespace System.Data.OracleClient {
-	public struct OracleBinary : IComparable, INullable {
-		#region Fields
-
-		public static readonly OracleBinary Null = new OracleBinary ();
-
-		bool notNull; 
-		byte[] value; 
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public OracleBinary (byte[] b) {
-			value = b;
-			notNull = true;
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		public bool IsNull {
-			get { return !notNull; }
-		}
-
-		public byte this [int index] {
-			get { 
-				if (IsNull)
-					throw new Exception ("Data is null.");
-				return value [index];
-			}
-		}
-
-		public int Length {
-			get {
-				if (IsNull)
-					throw new Exception ("Data is null.");
-				return value.Length;
-			}
-		}
-
-		public byte[] Value {
-			get {
-				if (IsNull)
-					throw new Exception ("Data is null.");
-				return value;
-			}
-		}
-
-		#endregion // Properties
-
-		#region Methods
-
-		[MonoTODO]
-		public int CompareTo (object obj) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static OracleBinary Concat (OracleBinary x, OracleBinary y) {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override bool Equals (object value) {
-			throw new NotImplementedException ();
-		}
-
-		public static OracleBoolean Equals (OracleBinary x, OracleBinary y) {
-			if (x.IsNull || y.IsNull)
-				return OracleBoolean.Null;
-			return new OracleBoolean (x.Value == y.Value);
-		}
-
-		[MonoTODO]
-		public override int GetHashCode () {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static OracleBoolean GreaterThan (OracleBinary x, OracleBinary y) {
-			if (x.IsNull || y.IsNull)
-				return OracleBoolean.Null;
-			//return (x.Value > y.Value);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static OracleBoolean GreaterThanOrEqual (OracleBinary x, OracleBinary y) {
-			if (x.IsNull || y.IsNull)
-				return OracleBoolean.Null;
-			//return (x.Value >= y.Value);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static OracleBoolean LessThan (OracleBinary x, OracleBinary y) {
-			if (x.IsNull || y.IsNull)
-				return OracleBoolean.Null;
-			//return (x.Value < y.Value);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static OracleBoolean LessThanOrEqual (OracleBinary x, OracleBinary y) {
-			if (x.IsNull || y.IsNull)
-				return OracleBoolean.Null;
-			//return (x.Value <= y.Value);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static OracleBoolean NotEquals (OracleBinary x, OracleBinary y) {
-			if (x.IsNull || y.IsNull)
-				return OracleBoolean.Null;
-			//return (x.Value != y.Value);
-			throw new NotImplementedException ();
-		}
-
-		#endregion // Methods
-
-		#region Operators and Type Conversions
-
-		public static OracleBinary operator + (OracleBinary x, OracleBinary y) {
-			return Concat (x, y);
-		}
-
-		public static OracleBoolean operator == (OracleBinary x, OracleBinary y) {
-			return Equals (x, y);
-		}
-
-		public static OracleBoolean operator > (OracleBinary x, OracleBinary y) {
-			return GreaterThan (x, y);
-		}
-
-		public static OracleBoolean operator >= (OracleBinary x, OracleBinary y) {
-			return GreaterThanOrEqual (x, y);
-		}
-
-		public static OracleBoolean operator != (OracleBinary x, OracleBinary y) {
-			return NotEquals (x, y);
-		}
-
-		public static OracleBoolean operator < (OracleBinary x, OracleBinary y) {
-			return LessThan (x, y);
-		}
-
-		public static OracleBoolean operator <= (OracleBinary x, OracleBinary y) {
-			return LessThan (x, y);
-		}
-
-		public static explicit operator byte[] (OracleBinary x) {
-			return x.Value;
-		}
-
-		public static implicit operator OracleBinary (byte[] b) {
-			return new OracleBinary (b);
-		}
-
-		#endregion // Operators and Type Conversions
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs
deleted file mode 100644
index e9d054da6f0..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommand.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-//

-// System.Data.OracleClient.OracleCommand

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-using System;

-using System.Collections;

-using System.Text;

-using System.Text.RegularExpressions;

-using System.Data;

-using System.Data.Common;

-using System.Data.ProviderBase;

-using System.Globalization;

-

-using java.sql;

-// Cannot use this because it makes ArrayList ambiguous reference

-//using java.util;

-#if !USE_DOTNET_REGEXP

-using java.util.regex;

-#endif

-

-namespace System.Data.OracleClient {

-	public sealed class OracleCommand : AbstractDbCommand {

-

-		#region Fields

-#if USE_DOTNET_REGEXP			

-		internal static readonly Regex NamedParameterStoredProcedureRegExp = new Regex(@"^\s*{?\s*((?<RETVAL>\:\w+)\s*=\s*)?call\s+(?<PROCNAME>(((\[[^\]]*\])|([^\.\(])*)\s*\.\s*){0,2}(\[[^\]]*\]|((\s*[^\.\(\)\{\}\s])+)))\s*(\(\s*(?<USERPARAM>((""([^""]|(""""))*"")|('([^']|(''))*')|[^,])*)?\s*(,\s*(?<USERPARAM>((""([^""]|(""""))*"")|('([^']|(''))*')|[^,])*)\s*)*\))?\s*}?\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);

-#else

-		internal static readonly Pattern NamedParameterStoredProcedureRegExp = Pattern.compile(@"^\s*\{?\s*(?:(\:\w+)\s*=\s*)?call\s+((?:(?:(?:\[[^\]]*\])|(?:[^\.\(\)\{\}\[\]])*)\s*\.\s*){0,2}(?:\[[^\]]*\]|(?:(?:\s*[^\.\(\)\{\}\[\]])+)))\s*(?:\((.*)\))?\s*\}?\s*$", Pattern.CASE_INSENSITIVE);

-#endif

-		internal static readonly SimpleRegex NamedParameterRegExp = new OracleParamsRegex();

-

-//		internal static readonly int oracleTypeRefCursor = java.sql.Types.OTHER;

-		

-		private int _currentParameterIndex = 0;

-		private ResultSet _currentRefCursor;

-

-		#endregion // Fields

-

-		#region Constructors

-

-		/**

-		 * Initializes a new instance of the OracleCommand class.

-		 * The base constructor initializes all fields to their default values.

-		 * The following table shows initial property values for an instance of SqlCommand.

-		 */

-		public OracleCommand() : this(null, null, null) {

-		}

-

-		public OracleCommand(OracleConnection connection) : this(null, connection, null) {

-		}

-

-		/**

-		 * Initializes a new instance of the OracleCommand class with the text of the query.

-		 * @param cmdText The text of the query.

-		 */

-		public OracleCommand(String cmdText) : this(cmdText, null, null) {

-		}

-

-		/**

-		 * Initializes a new instance of the OracleCommand class with the text of the query and a SqlConnection.

-		 * @param cmdText The text of the query.

-		 * @param connection A SqlConnection that represents the connection to an instance of SQL Server.

-		 */

-		public OracleCommand(String cmdText, OracleConnection connection) : this(cmdText, connection, null) {

-		}

-

-		/**

-		 * Initializes a new instance of the OracleCommand class with the text of the query, a SqlConnection, and the Transaction.

-		 * @param cmdText The text of the query.

-		 * @param connection A SqlConnection that represents the connection to an instance of SQL Server.

-		 * @param transaction The SqlTransaction in which the OracleCommand executes.

-		 */

-		public OracleCommand(

-			String cmdText,

-			OracleConnection connection,

-			OracleTransaction transaction)

-			: base(cmdText, connection, transaction) {

-		}

-

-		#endregion // Constructors

-

-		#region Properties

-

-		public new OracleConnection Connection {

-			get { return (OracleConnection)base.Connection; }

-			set { base.Connection = (AbstractDBConnection)value; }

-		}

-

-		public new OracleParameterCollection Parameters {

-			get { 

-				return (OracleParameterCollection)base.Parameters; 

-			}

-		}

-

-		public new OracleTransaction Transaction {

-			get { return (OracleTransaction)base.Transaction; }

-			set { base.Transaction = (DbTransaction)value; }

-		}

-

-		protected override bool SkipParameter(DbParameter parameter) {

-			return ((OracleParameter)parameter).OracleType == OracleType.Cursor;

-		}

-

-		protected sealed override ResultSet CurrentResultSet {

-			get { 

-				try {

-					ResultSet resultSet = base.CurrentResultSet;

- 

-					if (resultSet != null) {

-						return resultSet;						

-					}

-					return CurrentRefCursor;

-				}

-				catch(SQLException e) {

-					throw CreateException(e);

-				}

-			}

-		}

-

-		private ResultSet CurrentRefCursor {

-			get {

-				if (_currentParameterIndex < 0) {

-					NextRefCursor();

-				}

-				if (_currentRefCursor == null && _currentParameterIndex < InternalParameters.Count) {

-					_currentRefCursor = (ResultSet)((CallableStatement)Statement).getObject(_currentParameterIndex + 1);

-				}

-				return _currentRefCursor;

-			}

-		}

-

-#if USE_DOTNET_REGEX

-		protected override Regex StoredProcedureRegExp

-#else

-		protected override java.util.regex.Pattern StoredProcedureRegExp {

-#endif

-			get { return NamedParameterStoredProcedureRegExp; }

-		}

-

-		protected override SimpleRegex ParameterRegExp {

-			get { return NamedParameterRegExp; }

-		}

-

-		#endregion // Properties

-

-		#region Methods

-

-		protected override bool NextResultSet() {

-			try { 

-				bool hasMoreResults = base.NextResultSet();

-

-				if (hasMoreResults) {

-					return true;

-				}

-				else {

-					return NextRefCursor();

-				}

-			}

-			catch (SQLException e) {

-				throw CreateException(e);

-			}

-		}

-

-		private bool NextRefCursor() {

-			_currentRefCursor = null;

-			for (_currentParameterIndex++;InternalParameters.Count > _currentParameterIndex;_currentParameterIndex++) {

-				OracleParameter param = (OracleParameter)InternalParameters[_currentParameterIndex];

-				if (param.OracleType == OracleType.Cursor && ((param.Direction & ParameterDirection.Output) == ParameterDirection.Output))

-					return true;						

-			}

-			return false;

-		}

-

-		public new OracleDataReader ExecuteReader() {

-			return (OracleDataReader)ExecuteReader(CommandBehavior.Default);

-		}

-

-		public new OracleDataReader ExecuteReader(CommandBehavior behavior) {

-			return (OracleDataReader)base.ExecuteReader(behavior);

-		}

-

-		public new OracleParameter CreateParameter() {

-			return (OracleParameter)CreateParameterInternal();

-		} 

-

-		protected sealed override void CheckParameters() {

-			//TBD

-		}

-

-		protected override AbstractDbParameter GetUserParameter(string parameterName, IList userParametersList, int userParametersListPosition) {

-			for(int i=0; i < userParametersList.Count; i++) {

-				OracleParameter userParameter = (OracleParameter)userParametersList[i];

-				if (String.Compare(parameterName, userParameter.InternalPlaceholder.Trim(), true, CultureInfo.InvariantCulture) == 0) {

-					return userParameter;

-				}

-			}

-

-			return null;

-		}

-

-		protected override AbstractDbParameter GetReturnParameter (IList userParametersList) {

-			for(int i=0; i < userParametersList.Count; i++) {

-				AbstractDbParameter userParameter = (AbstractDbParameter)userParametersList[i];

-				if (userParameter.Direction == ParameterDirection.ReturnValue) {

-					return userParameter;

-				}

-			}

-

-			return null; 

-		}

-

-		protected sealed override DbParameter CreateParameterInternal() {

-			return new OracleParameter();

-		}

-

-		protected sealed override DbParameterCollection CreateParameterCollection(AbstractDbCommand parent) {

-			return new OracleParameterCollection((OracleCommand)parent);

-		}

-

-		public override object Clone() {

-			OracleCommand clone = (OracleCommand)base.Clone();

-			clone._currentParameterIndex = 0;

-			clone._currentRefCursor = null;

-			return clone;

-		}

-

-		protected override void PrepareInternalParameters() {

-			InternalParameters.Clear();

-			_currentParameterIndex = -1;

-		}

-

-		

-		protected sealed override DbDataReader CreateReader() {

-			return new OracleDataReader(this);

-		}

-

-		protected sealed override SystemException CreateException(SQLException e) {

-			return new OracleException(e,Connection);		

-		}

-

-		public object ExecuteOracleScalar() {

-			throw new NotImplementedException();

-		}

-

-		public int ExecuteOracleNonQuery(

-			out OracleString rowid

-			) {

-			throw new NotImplementedException();

-		}

-

-		#endregion // Methods

-      

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs
deleted file mode 100644
index 60c2df3ffdf..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleCommandBuilder.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//

-// System.Data.OracleClient.OracleCommandBuilder

-//

-// Author:

-//   Rodrigo Moya (rodrigo@ximian.com)

-//   Tim Coleman (tim@timcoleman.com)

-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>

-//

-// Copyright (C) Rodrigo Moya, 2002

-// Copyright (C) Tim Coleman, 2002	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-using System;

-using System.ComponentModel;

-using System.Data;

-using System.Data.Common;

-using System.Data.ProviderBase;

-

-namespace System.Data.OracleClient {

-	/// <summary>

-	/// Provides a means of automatically generating single-table commands used to reconcile changes made to a DataSet with the associated database. This class cannot be inherited.

-	/// </summary>

-	public sealed class OracleCommandBuilder : AbstractDbCommandBuilder {

-		#region Fields

-

-		OracleDataAdapter adapter;

-		string quotePrefix;

-		string quoteSuffix;

-

-		#endregion // Fields

-

-		#region Constructors

-		

-		public OracleCommandBuilder () {

-			adapter = null;

-			quotePrefix = String.Empty;

-			quoteSuffix = String.Empty;

-		}

-

-		public OracleCommandBuilder (OracleDataAdapter adapter) 

-			: this () {

-			this.adapter = adapter;

-		}

-

-		#endregion // Constructors

-

-		#region Properties

-

-		public new OracleDataAdapter DataAdapter {

-			get {

-				return adapter;

-			}

-			set {

-				adapter = value;

-			}

-		}

-

-		public override string QuotePrefix {

-			get {

-				return quotePrefix;

-			}

-			set {

-				quotePrefix = value;

-			}

-		}

-

-		public override string QuoteSuffix {

-			get {

-				return quoteSuffix;

-			}

-			set {

-				quoteSuffix = value;

-			}

-		}

-

-		#endregion // Properties

-

-		#region Methods

-

-		public static void DeriveParameters (OracleCommand command) {

-			DeriveParameters((AbstractDbCommand)command);

-		}

-

-		[MonoTODO]

-		protected override void Dispose (bool disposing) {

-			throw new NotImplementedException ();		

-		}

-

-		[MonoTODO]

-		public new OracleCommand GetDeleteCommand () {

-			throw new NotImplementedException ();

-		}

-

-		[MonoTODO]

-		public new OracleCommand GetInsertCommand () {

-			throw new NotImplementedException ();

-		}

-

-		[MonoTODO]

-		public OracleCommand GetUpdatetCommand () {

-			throw new NotImplementedException ();

-		}

-

-		#endregion // Methods

-	}

-}

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConnection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConnection.cs
deleted file mode 100644
index e0daa9c2166..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConnection.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-//

-// System.Data.OracleClient.OracleConnection

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-

-using System.Data;

-using System.Data.Common;

-using System.Data.ProviderBase;

-using System.Collections;

-

-using java.sql;

-

-using System.Configuration;

-using Mainsoft.Data.Configuration;

-using Mainsoft.Data.Jdbc.Providers;

-

-namespace System.Data.OracleClient {

-	public sealed class OracleConnection : AbstractDBConnection, System.ICloneable {

-		#region Fields 

-

-		static readonly IConnectionProvider _connectionProvider;

-

-		#endregion //Fields

-

-		#region Events

-

-		public event OracleInfoMessageEventHandler InfoMessage;

-		public event StateChangeEventHandler StateChange;

-

-		#endregion // Events

-		

-		#region Constructors

-

-		static OracleConnection() {

-			IDictionary providerInfo = (IDictionary)((IList) ConfigurationSettings.GetConfig("Mainsoft.Data.Configuration/OracleClientProvider"))[0];

-			string providerType = (string) providerInfo ["type"];

-			if (providerType == null || providerType.Length == 0)

-				_connectionProvider = new GenericProvider (providerInfo); 

-			else {

-				Type t = Type.GetType (providerType);

-				_connectionProvider = (IConnectionProvider) Activator.CreateInstance (t , new object[] {providerInfo});

-			}

-		}

-

-		public OracleConnection() : this(null) {

-		}

-

-		public OracleConnection(String connectionString) : base(connectionString) {			

-		}

-

-		#endregion // Constructors

-

-		#region Methods

-

-		protected override IConnectionProvider GetConnectionProvider() {

-			return _connectionProvider;

-		}

-

-		public new OracleTransaction BeginTransaction(IsolationLevel level) {

-			return new OracleTransaction(level, this);

-		}

-

-		public new OracleTransaction BeginTransaction() {

-			return BeginTransaction(IsolationLevel.ReadCommitted);

-		}

-

-		public new OracleCommand CreateCommand() {

-			return new OracleCommand(this);

-		}

-

-		protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) {

-			return BeginTransaction();

-		}

-

-		protected override DbCommand CreateDbCommand() {

-			return CreateCommand();

-		}

-

-		protected sealed override SystemException CreateException(SQLException e) {

-			return new OracleException(e,this);		

-		}

-

-		protected sealed override SystemException CreateException(string message) {

-			return new OracleException(message, null, this);	

-		}

-

-		protected sealed override void OnSqlWarning(SQLWarning warning) {

-			OracleErrorCollection col = new OracleErrorCollection(warning, this);

-			OnOracleInfoMessage(new OracleInfoMessageEventArgs(col));

-		}

-

-        

-		protected sealed override void OnStateChanged(ConnectionState orig, ConnectionState current) {

-			if(StateChange != null) {

-				StateChange(this, new StateChangeEventArgs(orig, current));

-			}

-		}

-

-		public override void Close() {

-			ConnectionState orig = State;

-			base.Close();

-			ConnectionState current = State;

-			if(current != orig) {

-				OnStateChanged(orig, current);

-			}

-		}

-

-		private void OnOracleInfoMessage (OracleInfoMessageEventArgs value) {
-			if (InfoMessage != null) {
-				InfoMessage (this, value);
-			}
-		}

-

-		#endregion // Methods

-

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs
deleted file mode 100644
index 8fcc85bb4cc..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleConvert.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-//

-// System.Data.Oracle.OracleConvert

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-using System;

-using System.Collections;

-using System.Data.Common;

-using System.Data.ProviderBase;

-

-using java.sql;

-

-namespace System.Data.OracleClient {

-	#region oracle.sql.Types constants

-

-	internal enum JavaSqlTypes {

-		ARRAY = 2003 ,

-		BIGINT = -5, 

-		BINARY = -2 ,

-		BIT = -7 ,

-		BLOB = 2004, 

-		BOOLEAN = 16, 

-		CHAR = 1, 

-		CLOB = 2005, 

-		DATALINK = 70, 

-		DATE = 91, 

-		DECIMAL = 3, 

-		DISTINCT = 2001, 

-		DOUBLE = 8, 

-		FLOAT = 6, 

-		INTEGER = 4, 

-		JAVA_OBJECT = 2000, 

-		LONGVARBINARY = -4,

-		LONGVARCHAR = -1, 

-		NULL = 0, 

-		NUMERIC = 2 ,

-		OTHER = 1111 ,

-		REAL = 7 ,

-		REF = 2006 ,

-		SMALLINT = 5,

-		STRUCT = 2002, 

-		TIME = 92, 

-		TIMESTAMP = 93, 

-		TINYINT = -6, 

-		VARBINARY = -3, 

-		VARCHAR = 12,

-

-		//ORACLE types, see oracle.jdbc.OracleTypes

-		CURSOR = -10

-	}

-

-	#endregion

-	sealed class OracleConvert : DbConvert {

-

-		#region .Net types constants

-

-		internal static readonly Type TypeOfBoolean = typeof(Boolean);

-		internal static readonly Type TypeOfSByte = typeof(SByte);

-		internal static readonly Type TypeOfChar = typeof(Char);

-		internal static readonly Type TypeOfInt16 = typeof(Int16);

-		internal static readonly Type TypeOfInt32 = typeof(Int32);

-		internal static readonly Type TypeOfInt64 = typeof(Int64);

-		internal static readonly Type TypeOfByte = typeof(Byte);

-		internal static readonly Type TypeOfUInt16 = typeof(UInt16);

-		internal static readonly Type TypeOfUInt32 = typeof(UInt32);

-		internal static readonly Type TypeOfUInt64 = typeof(UInt64);

-		internal static readonly Type TypeOfDouble = typeof(Double);

-		internal static readonly Type TypeOfSingle = typeof(Single);

-		internal static readonly Type TypeOfDecimal = typeof(Decimal);

-		internal static readonly Type TypeOfString = typeof(String);

-		internal static readonly Type TypeOfDateTime = typeof(DateTime);		

-		internal static readonly Type TypeOfObject = typeof(object);

-		internal static readonly Type TypeOfGuid = typeof(Guid);

-		internal static readonly Type TypeOfType = typeof(Type);

-

-		// additional types

-		internal static readonly Type TypeOfByteArray = typeof(Byte[]);

-		internal static readonly Type TypeOfCharArray = typeof(Char[]);

-		internal static readonly Type TypeOfFloat = typeof (float);

-		internal static readonly Type TypeOfTimespan = typeof (TimeSpan);

-		static readonly Type TypeOfIDataReader = typeof(IDataReader);

-

-		#endregion

-

-		#region Methods

-

-		internal static String JdbcTypeNameToDbTypeName(string jdbcTypeName) {

-			return jdbcTypeName.Trim();;

-		}

-

-		internal static OracleType JdbcTypeToOracleType(int jdbcType) {

-			switch ((JavaSqlTypes)jdbcType) {

-				case JavaSqlTypes.ARRAY: return OracleType.Blob;

-				case JavaSqlTypes.BIGINT: return OracleType.Number;

-				case JavaSqlTypes.BINARY: return OracleType.Blob;

-				case JavaSqlTypes.BIT: return OracleType.Byte;

-				case JavaSqlTypes.BLOB: return OracleType.Blob;

-				case JavaSqlTypes.BOOLEAN: return OracleType.Byte;

-				case JavaSqlTypes.CHAR: return OracleType.Char;

-				case JavaSqlTypes.CLOB: return OracleType.Clob;

-//				case JavaSqlTypes.DATALINK: return OracleType.IUnknown;

-				case JavaSqlTypes.DATE: return OracleType.DateTime;

-				case JavaSqlTypes.DECIMAL: return OracleType.Number;

-				case JavaSqlTypes.CURSOR: return OracleType.Cursor;

-//				case JavaSqlTypes.DISTINCT: return OracleType.IUnknown; 

-				case JavaSqlTypes.DOUBLE: return OracleType.Double;

-				case JavaSqlTypes.FLOAT: return OracleType.Float;

-				case JavaSqlTypes.INTEGER: return OracleType.Int32;

-//				case JavaSqlTypes.JAVA_OBJECT: return OracleType.IUnknown;

-				case JavaSqlTypes.LONGVARBINARY: return OracleType.LongRaw;

-				case JavaSqlTypes.LONGVARCHAR: return OracleType.LongVarChar;

-//				case JavaSqlTypes.NULL: return OracleType.Empty;

-				case JavaSqlTypes.NUMERIC: return OracleType.Number;

-//				case JavaSqlTypes.OTHER: return OracleType.IUnknown;

-//				case JavaSqlTypes.REAL: return OracleType.Single;

-//				case JavaSqlTypes.REF: return OracleType.IUnknown;

-				case JavaSqlTypes.SMALLINT: return OracleType.Int16;

-//				case JavaSqlTypes.STRUCT: return OracleType.IUnknown;

-				case JavaSqlTypes.TIME: return OracleType.TimestampLocal;

-				case JavaSqlTypes.TIMESTAMP: return OracleType.Timestamp;

-				case JavaSqlTypes.TINYINT: return OracleType.Byte;

-				case JavaSqlTypes.VARBINARY: return OracleType.LongVarChar;

-				default:

-				case JavaSqlTypes.VARCHAR: return OracleType.VarChar;

-			}

-		}

-

-		internal static OracleType ValueTypeToOracleType(Type type) {

-			switch (Type.GetTypeCode(type)) {

-				case TypeCode.Boolean: return OracleType.Byte;

-				case TypeCode.Byte: return OracleType.Byte;

-				case TypeCode.Char: return OracleType.Char;

-				case TypeCode.DateTime: return OracleType.DateTime;

-//				case TypeCode.DBNull: return OracleType.Empty;

-				case TypeCode.Decimal: return OracleType.Number;

-				case TypeCode.Double: return OracleType.Double;

-//				case TypeCode.Empty: return OracleType.Empty;

-				case TypeCode.Int16: return OracleType.Int16;

-				case TypeCode.Int32: return OracleType.Int32;

-				case TypeCode.Int64: return OracleType.Number;

-				default:

-				case TypeCode.Object: {

-					if (type.Equals(TypeOfByteArray)) return  OracleType.Blob;

-					if (type.Equals(TypeOfTimespan)) return OracleType.Timestamp;

-					if (type.IsSubclassOf(TypeOfIDataReader)) return OracleType.Cursor;

-//					if (type.Equals(DbTypes.TypeOfGuid)) return OracleType.Guid;

-//

-					if (type.IsEnum)

-						return ValueTypeToOracleType (Enum.GetUnderlyingType (type));

-//

-					return OracleType.VarChar;

-				}

-				case TypeCode.SByte: return OracleType.SByte;

-				case TypeCode.Single: return OracleType.Float;

-				case TypeCode.String: return OracleType.VarChar;

-				case TypeCode.UInt16: return OracleType.UInt16;

-				case TypeCode.UInt32: return OracleType.UInt32;

-				case TypeCode.UInt64: return OracleType.Number;

-			}

-		}

-

-		internal static Type OracleTypeToValueType(OracleType oleDbType) {

-			switch (oleDbType) {

-//				case OracleType.BigInt : return DbTypes.TypeOfInt64;// typeof(long);

-//				case OracleType.Binary : return DbTypes.TypeOfByteArray;

-//				case OracleType.Boolean : return DbTypes.TypeOfBoolean;

-//				case OracleType.BSTR : return DbTypes.TypeOfString;

-				case OracleType.BFile : return TypeOfByteArray;

-				case OracleType.Blob : return TypeOfByteArray;

-				case OracleType.Byte : return TypeOfByte;

-				case OracleType.Char : return TypeOfString;

-				case OracleType.Clob : return TypeOfCharArray;

-				case OracleType.Cursor : return TypeOfIDataReader;

-				case OracleType.DateTime : return TypeOfDateTime;

-//				case OracleType.Currency : return TypeOfDecimal;

-//				case OracleType.Date : return TypeOfDateTime;

-//				case OracleType.DBDate : return TypeOfDateTime;

-//				case OracleType.DBTime : return TypeOfTimespan;

-//				case OracleType.DBTimeStamp : return TypeOfDateTime;

-//				case OracleType.Decimal : return TypeOfDecimal;

-				case OracleType.Double : return TypeOfDouble;

-				case OracleType.Float : return TypeOfFloat;

-				case OracleType.Int16 : return TypeOfInt16;

-				case OracleType.Int32 : return TypeOfInt32;

-				case OracleType.IntervalDayToSecond : return TypeOfTimespan;

-				case OracleType.IntervalYearToMonth : return TypeOfTimespan;

-				case OracleType.LongRaw : return TypeOfByteArray;

-//				case OracleType.Empty : return null; //typeof(DBNull);

-//				case OracleType.Error : return typeof(Exception);

-//				case OracleType.Filetime : return TypeOfDateTime;

-//				case OracleType.Guid : return TypeOfGuid;

-//				case OracleType.IDispatch : return TypeOfObject;

-//				case OracleType.Integer : return TypeOfInt32;

-//				case OracleType.IUnknown : return TypeOfObject;

-//				case OracleType.LongVarBinary : return TypeOfByteArray;

-				case OracleType.LongVarChar : return TypeOfString;

-				case OracleType.NChar : return TypeOfString;

-				case OracleType.NClob : return TypeOfString;

-				case OracleType.Number : return TypeOfDecimal;

-				case OracleType.NVarChar : return TypeOfString;

-				case OracleType.Raw : return TypeOfByteArray;

-

-				case OracleType.RowId : return TypeOfString;

-				case OracleType.SByte : return TypeOfSByte;

-				case OracleType.Timestamp : return TypeOfTimespan;

-				case OracleType.TimestampLocal : return TypeOfTimespan;

-				case OracleType.TimestampWithTZ : return TypeOfTimespan;

-				case OracleType.UInt16 : return TypeOfUInt16;

-

-				case OracleType.UInt32 : return TypeOfUInt32;

-				case OracleType.VarChar : return TypeOfString;

-//				case OracleType.LongVarWChar : return TypeOfString;

-//				case OracleType.Numeric : return TypeOfDecimal;

-//				case OracleType.PropVariant : return TypeOfObject;

-//				case OracleType.Single : return TypeOfFloat;

-//				case OracleType.SmallInt : return TypeOfInt16;

-//				case OracleType.TinyInt : return TypeOfSByte;

-//				case OracleType.UnsignedBigInt : return TypeOfUInt64;

-//				case OracleType.UnsignedInt : return TypeOfUInt32;

-//				case OracleType.UnsignedSmallInt : return TypeOfUInt16;

-//				case OracleType.UnsignedTinyInt : return TypeOfByte;

-//				case OracleType.VarBinary : return TypeOfByteArray;

-//				case OracleType.VarChar : return TypeOfString;

-//				case OracleType.Variant : return TypeOfObject;

-//				case OracleType.VarNumeric : return TypeOfDecimal;

-//				case OracleType.VarWChar : return TypeOfString;

-//				case OracleType.WChar : return TypeOfString;

-				default : return TypeOfObject;

-			}

-		}

-

-		internal static OracleType DbTypeToOracleType(DbType dbType) {

-			switch (dbType) {

-				case DbType.AnsiString : return OracleType.VarChar;

-				case DbType.Binary : return OracleType.Blob;

-				case DbType.Byte : return OracleType.Byte;

-				case DbType.Boolean : return OracleType.Byte;

-				case DbType.Currency : return OracleType.Number;

-				case DbType.Date : return OracleType.DateTime;

-				case DbType.DateTime : return OracleType.DateTime;

-				case DbType.Decimal : return OracleType.Number;

-				case DbType.Double : return OracleType.Double;

-				case DbType.Guid : return OracleType.Char;

-				case DbType.Int16 : return OracleType.Int16;

-				case DbType.Int32 : return OracleType.Int32;

-				case DbType.Int64 : return OracleType.Number;

-				case DbType.Object : return OracleType.Cursor;

-				case DbType.SByte : return OracleType.SByte;

-				case DbType.Single : return OracleType.Float;

-				case DbType.String : return OracleType.VarChar;

-				case DbType.Time : return OracleType.Timestamp;

-				case DbType.UInt16 : return OracleType.UInt16;

-				case DbType.UInt32 : return OracleType.UInt32;

-				case DbType.UInt64 : return OracleType.Number;

-				case DbType.VarNumeric : return OracleType.Number;

-				case DbType.AnsiStringFixedLength : return OracleType.NChar;

-				case DbType.StringFixedLength : return OracleType.Char;

-				default : throw ExceptionHelper.InvalidDbType((int)dbType);

-			}

-		}

-

-		internal static DbType OracleTypeToDbType(OracleType oleDbType) {

-			switch (oleDbType) {

-				case OracleType.BFile : return DbType.Binary;

-				case OracleType.Blob : return DbType.Binary;

-				case OracleType.Byte : return DbType.Byte;

-				case OracleType.Char : return DbType.StringFixedLength;

-				case OracleType.Clob : return DbType.String;

-				case OracleType.Cursor : return DbType.Object;

-				case OracleType.DateTime : return DbType.DateTime;

-				case OracleType.Double : return DbType.Double;

-				case OracleType.Float : return DbType.Single;

-				case OracleType.Int16 : return DbType.Int16;

-				case OracleType.Int32 : return DbType.Int32;

-				case OracleType.IntervalDayToSecond : return DbType.Time;

-				case OracleType.IntervalYearToMonth : return DbType.Time;

-				case OracleType.LongRaw : return DbType.Binary;

-				case OracleType.LongVarChar : return DbType.String;

-				case OracleType.NChar : return DbType.AnsiStringFixedLength;

-				case OracleType.NClob : return DbType.AnsiString;

-				case OracleType.Number : return DbType.VarNumeric;

-				case OracleType.NVarChar : return DbType.AnsiString;

-				case OracleType.Raw : return DbType.Binary;

-

-				case OracleType.RowId : return DbType.AnsiStringFixedLength;

-				case OracleType.SByte : return DbType.SByte;

-				case OracleType.Timestamp : return DbType.Time;

-				case OracleType.TimestampLocal : return DbType.Time;

-				case OracleType.TimestampWithTZ : return DbType.Time;

-				case OracleType.UInt16 : return DbType.UInt16;

-

-				case OracleType.UInt32 : return DbType.UInt32;

-				case OracleType.VarChar : return DbType.String;

-//				case OracleType.Empty : return DbType.Object;

-//				case OracleType.SmallInt : return DbType.Int16;

-//				case OracleType.Integer : return DbType.Int32;

-//				case OracleType.Single : return DbType.Single;

-//				case OracleType.Double : return DbType.Double;

-//				case OracleType.Currency : return DbType.Currency;

-//				case OracleType.Date : return DbType.DateTime;

-//				case OracleType.BSTR : return DbType.String;

-//				case OracleType.IDispatch : return DbType.Object;

-//				case OracleType.Error : return DbType.Object;

-//				case OracleType.Boolean : return DbType.Boolean;

-//				case OracleType.Variant : return DbType.Object;

-//				case OracleType.IUnknown : return DbType.Object;

-//				case OracleType.Decimal : return DbType.Decimal;

-//				case OracleType.TinyInt : return DbType.SByte;

-//				case OracleType.UnsignedTinyInt : return DbType.Byte;

-//				case OracleType.UnsignedSmallInt : return DbType.UInt16;

-//				case OracleType.UnsignedInt : return DbType.UInt32;

-//				case OracleType.BigInt : return DbType.Int64;

-//				case OracleType.UnsignedBigInt : return DbType.UInt64;

-//				case OracleType.Filetime : return DbType.DateTime;

-//				case OracleType.Guid : return DbType.Guid;

-//				case OracleType.Binary : return DbType.Binary;

-//				case OracleType.Char : return DbType.AnsiStringFixedLength;

-//				case OracleType.WChar : return DbType.StringFixedLength;

-//				case OracleType.Numeric : return DbType.Decimal;

-//				case OracleType.DBDate : return DbType.Date;

-//				case OracleType.DBTime : return DbType.Time;

-//				case OracleType.DBTimeStamp : return DbType.DateTime;

-//				case OracleType.PropVariant : return DbType.Object;

-//				case OracleType.VarNumeric : return DbType.VarNumeric;

-//				case OracleType.VarChar : return DbType.AnsiString;

-//				case OracleType.LongVarChar : return DbType.AnsiString;

-//				case OracleType.VarWChar : return DbType.String;

-//				case OracleType.LongVarWChar : return DbType.String;

-//				case OracleType.VarBinary : return DbType.Binary;

-//				case OracleType.LongVarBinary : return DbType.Binary;

-				default : throw ExceptionHelper.InvalidOleDbType((int)oleDbType);

-			}

-		}

-

-		internal static int	OracleTypeToJdbcType(OracleType oleDbType) {

-			switch(oleDbType) {

-				case OracleType.BFile : return (int)JavaSqlTypes.BINARY;

-				case OracleType.Blob : return (int)JavaSqlTypes.BINARY;

-				case OracleType.Byte : return (int)JavaSqlTypes.TINYINT;

-				case OracleType.Char : return (int)JavaSqlTypes.CHAR;

-				case OracleType.Clob : return (int)JavaSqlTypes.CLOB;

-				case OracleType.Cursor : return (int)JavaSqlTypes.CURSOR;

-				case OracleType.DateTime : return (int)JavaSqlTypes.TIMESTAMP;

-				case OracleType.Double : return (int)JavaSqlTypes.DOUBLE;

-				case OracleType.Float : return (int)JavaSqlTypes.FLOAT;

-				case OracleType.Int16 : return (int)JavaSqlTypes.SMALLINT;

-				case OracleType.Int32 : return (int)JavaSqlTypes.INTEGER;

-				case OracleType.IntervalDayToSecond : return (int)JavaSqlTypes.TIMESTAMP;

-				case OracleType.IntervalYearToMonth : return (int)JavaSqlTypes.TIMESTAMP;

-				case OracleType.LongRaw : return (int)JavaSqlTypes.LONGVARBINARY;

-				case OracleType.LongVarChar : return (int)JavaSqlTypes.LONGVARCHAR;

-				case OracleType.NChar : return (int)JavaSqlTypes.CHAR;

-				case OracleType.NClob : return (int)JavaSqlTypes.CLOB;

-				case OracleType.Number : return (int)JavaSqlTypes.NUMERIC;

-				case OracleType.NVarChar : return (int)JavaSqlTypes.VARCHAR;

-				case OracleType.Raw : return (int)JavaSqlTypes.BINARY;

-

-				case OracleType.RowId : return (int)JavaSqlTypes.VARCHAR;

-				case OracleType.SByte : return (int)JavaSqlTypes.TINYINT;

-				case OracleType.Timestamp : return (int)JavaSqlTypes.TIMESTAMP;

-				case OracleType.TimestampLocal : return (int)JavaSqlTypes.TIMESTAMP;

-				case OracleType.TimestampWithTZ : return (int)JavaSqlTypes.TIMESTAMP;

-				case OracleType.UInt16 : return (int)JavaSqlTypes.SMALLINT;

-

-				case OracleType.UInt32 : return (int)JavaSqlTypes.INTEGER;

-				case OracleType.VarChar : return (int)JavaSqlTypes.VARCHAR;

-//				case OracleType.BigInt : return Types.BIGINT;

-//				case OracleType.Binary : return Types.BINARY;

-//				case OracleType.Boolean : return Types.BIT;

-//				case OracleType.BSTR : return Types.VARCHAR;

-//				case OracleType.Char : return Types.CHAR;

-//				case OracleType.Currency : return Types.DECIMAL;

-//				case OracleType.Date : return Types.TIMESTAMP;

-//				case OracleType.DBDate : return Types.DATE;

-//				case OracleType.DBTime : return Types.TIME;

-//				case OracleType.DBTimeStamp : return Types.TIMESTAMP;

-//				case OracleType.Decimal : return Types.DECIMAL;

-//				case OracleType.Double : return Types.DOUBLE;

-//				case OracleType.Empty : return Types.NULL;

-//				case OracleType.Error : return Types.OTHER;

-//				case OracleType.Filetime : return Types.TIMESTAMP;

-//				case OracleType.Guid : return Types.CHAR;

-//				case OracleType.IDispatch : return Types.OTHER; //throw new ArgumentException("The " + oleDbType + " OracleType value is not supported.");

-//				case OracleType.Integer : return Types.INTEGER;

-//				case OracleType.IUnknown :  return Types.OTHER; //throw new ArgumentException("The " + oleDbType + " OracleType value is not supported.");

-//				case OracleType.LongVarBinary : return Types.LONGVARBINARY;

-//				case OracleType.LongVarChar : return Types.LONGVARCHAR;

-//				case OracleType.LongVarWChar : return Types.LONGVARCHAR;

-//				case OracleType.Numeric : return Types.NUMERIC;

-//				case OracleType.PropVariant : return Types.OTHER;

-//				case OracleType.Single : return Types.FLOAT;

-//				case OracleType.SmallInt : return Types.SMALLINT;

-//				case OracleType.TinyInt : return Types.TINYINT;

-//				case OracleType.UnsignedBigInt : return Types.BIGINT;

-//				case OracleType.UnsignedInt : return Types.INTEGER;

-//				case OracleType.UnsignedSmallInt : return Types.SMALLINT;

-//				case OracleType.UnsignedTinyInt : return Types.TINYINT;

-//				case OracleType.VarBinary : return Types.VARBINARY;

-//				case OracleType.VarChar : return Types.VARCHAR;

-//				case OracleType.Variant : return Types.VARCHAR;

-//				case OracleType.VarNumeric : return Types.DECIMAL;

-//				case OracleType.VarWChar : return Types.VARCHAR;

-//				case OracleType.WChar : return Types.VARCHAR;

-				default : throw ExceptionHelper.InvalidOleDbType((int)oleDbType);

-			}

-

-			#endregion // Methods

-		}

-	}

-}

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs
deleted file mode 100644
index 5ce70f4f72d..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleDataReader.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-//

-// System.Data.OracleClient.OracleDataReader

-//

-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>

-//

-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-using System.Data.Common;

-using System.Data.ProviderBase;

-

-using java.sql;

-

-namespace System.Data.OracleClient {

-	public sealed class OracleDataReader : AbstractDataReader {

-		#region Fields

-

-		#endregion // Fields

-

-		#region Constructors

-

-		internal OracleDataReader(OracleCommand command) : base(command) {

-		}

-

-		#endregion // Constructors

-

-		#region Methods

-

-		protected sealed override SystemException CreateException(string message, SQLException e) {

-			return new OracleException(message,e, (OracleConnection)_command.Connection);		

-		}

-

-		protected sealed override SystemException CreateException(java.io.IOException e) {

-			return new OracleException(e, (OracleConnection)_command.Connection);		

-		}

-

-		public override String GetDataTypeName(int columnIndex) {

-			try {

-				string jdbcTypeName = Results.getMetaData().getColumnTypeName(columnIndex + 1);

-				

-				return OracleConvert.JdbcTypeNameToDbTypeName(jdbcTypeName);

-			}

-			catch (SQLException e) {

-				throw CreateException(e);

-			}

-		}

-

-		protected override int GetProviderType(int jdbcType) {
-			return (int)OracleConvert.JdbcTypeToOracleType(jdbcType);   
-		}

-

-		public override decimal GetDecimal(int i) {

-			if (IsNumeric(i))

-				return GetDecimalSafe(i);

-

-			return base.GetDecimal(i);

-		}

-

-		public override double GetDouble(int i) {

-			if (IsNumeric(i))

-				return GetDoubleSafe(i);

-

-			return base.GetDouble(i);

-		}

-

-		public override float GetFloat(int i) {

-			if (IsNumeric(i))

-				return GetFloatSafe(i);

-

-			return base.GetFloat(i);

-		}

-//

-//		OracleClient does not "excuse" for Int16

-//

-//		public override short GetInt16(int i) {

-//			if (IsNumeric(i))

-//				return GetInt16Safe(i);

-//

-//			return base.GetInt16(i);

-//		}

-

-

-		public override int GetInt32(int i) {

-			if (IsNumeric(i))

-				return GetInt32Safe(i);

-

-			return base.GetInt32(i);

-		}

-

-		public override long GetInt64(int i) {

-			if (IsNumeric(i))

-				return GetInt64Safe(i);

-

-			return base.GetInt64(i);

-		}

-

-		#region GetOracleXXX

-

-		public OracleBFile GetOracleBFile(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleBinary GetOracleBinary(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleDateTime GetOracleDateTime(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleLob GetOracleLob(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleMonthSpan GetOracleMonthSpan(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleNumber GetOracleNumber(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleString GetOracleString(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public OracleTimeSpan GetOracleTimeSpan(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public object GetOracleValue(

-			int i

-			) {

-			throw new NotImplementedException();

-		}

-

-		public int GetOracleValues(

-			object[] values

-			) {

-			throw new NotImplementedException();

-		}

-

-		#endregion

-

-		#endregion // Methods

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleError.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleError.cs
deleted file mode 100644
index fbdb138062c..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleError.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//

-// System.Data.OleDb.OleDbError

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-namespace System.Data.OracleClient {

-	using java.sql;

-	using System.Data.Common;

-	using System.Data.ProviderBase;

-

-	[Serializable]

-	internal sealed class OracleError : AbstractDbError {

-

-		internal OracleError(SQLException e, AbstractDBConnection connection) : base(e, connection) {

-		}

-    

-		public String Message {

-			get {

-				return DbMessage;

-			}

-		}

-    

-		public int NativeError {

-			get {

-				return DbErrorCode;

-			}

-		}

-    

-		public String Source {

-			get {

-				return DbSource;

-			}

-		}

-    

-		public String SQLState {

-			get {

-				return DbSQLState;

-			}

-		}

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleErrorCollection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleErrorCollection.cs
deleted file mode 100644
index 8ff780aa160..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleErrorCollection.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//

-// System.Data.OleDb.OleDbErrorCollection

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-namespace System.Data.OracleClient {

-

-

-	using System.Collections;

-	using java.sql;

-	using System.Data.Common;

-	using System.Data.ProviderBase;

-

-	[Serializable]

-	public sealed class OracleErrorCollection : AbstractDbErrorCollection {

-		internal OracleErrorCollection(SQLException e, AbstractDBConnection connection) : base(e, connection) {

-		}

-		/**

-		 * Gets the error at the specified index.

-		 *

-		 * @param index of the error

-		 * @return Error on specified index

-		 */

-		internal OracleError this[int index] {

-			get {

-				return (OracleError)GetDbItem(index);

-			}

-		}

-

-		protected override AbstractDbError CreateDbError(SQLException e, AbstractDBConnection connection) {

-			return new OracleError(e, connection);

-		}

-

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs
deleted file mode 100644
index e538b0c5995..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleException.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-//

-// System.Data.SqlClient.SqlException

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-namespace System.Data.OracleClient {

-

-	using java.sql;

-

-	using System;

-	using System.Data.ProviderBase;

-

-	/**

-	 * The exception that is thrown when SQL Server returns a warning or error.

-	 * This class cannot be inherited.

-	 */

-

-	/*

-	* CURRENT LIMITATIONS

-	* 1. Constructor for serialization SqlException(SerializationInfo info, StreamingContext sc) 

-	*    is not supported.

-	* 2. Method "void GetObjectData(...,...)" is not supported (serialization)

-	*/

-

-	public sealed class OracleException : AbstractDbException {

-		internal OracleException(Exception cause, OracleConnection connection) : base(cause, connection) {}

-

-		internal OracleException(SQLException cause, OracleConnection connection) : base(cause, connection) {}

-

-		internal OracleException(string message, SQLException cause, OracleConnection connection) : base(message, cause, connection) {}

-

-		protected override AbstractDbErrorCollection DbErrors {

-			get {

-				return Errors;

-			}

-		}

-

-        

-

-		/**

-		 * Gets the severity level of the error returned from the SQL Server .NET 

-		 * Data Provider.

-		 * @return severity level of the first error in the collection.

-		 */

-//		public byte Class {

-//			get {

-//				SqlErrorCollection errors = Errors;

-//				return errors.Count > 0 ? errors[0].Class : (byte)0;

-//			}

-//		}

-

-		/**

-		 * Gets a collection of one or more SqlError objects that give detailed 

-		 * information about exceptions generated by the SQL Server .NET Data Provider.

-		 * @return collection of SqlError objects

-		 */

-		internal OracleErrorCollection Errors {

-			get {

-				return new OracleErrorCollection(_cause, _connection);

-			}

-		}

-

-		public int Code {

-			get { return DbErrorCode; }

-		}

-

-		/**

-		 * Gets the line number within the Transact-SQL command batch or stored 

-		 * procedure that generated the error.

-		 * @return line number of the first error in the collection.

-		 */

-//		public int LineNumber {

-//			get {

-//				SqlErrorCollection errors = Errors;

-//				return errors.Count > 0 ? errors[0].LineNumber : 0;

-//			}

-//		}

-

-		/**

-		 * Gets a number that identifies the type of error.

-		 * @return number that identifies the type of first error in the collection

-		 */

-//		public int Number {

-//			get {

-//				SqlErrorCollection errors = Errors;

-//				return errors.Count > 0 ? errors[0].Number : 0;

-//			}

-//		}

-

-		/**

-		 * Gets the name of the stored procedure or remote procedure call (RPC) 

-		 * that generated the error.

-		 * @return name of the stored procedure 

-		 */

-//		public String Procedure {

-//			get {

-//				SqlErrorCollection errors = Errors;

-//				return errors.Count > 0 ? errors[0].Procedure : null;

-//			}

-//		}

-

-		/**

-		 * Gets the name of the computer running an instance of SQL Server 

-		 * that generated the error.

-		 * @return name of the computer where error generated

-		 */

-//		public String Server {

-//			get {

-//				SqlErrorCollection errors = Errors;

-//				return errors.Count > 0 ? errors[0].Server : null;

-//			}

-//		}

-

-

-		/**

-		 * Gets a numeric error code from SQL Server that represents an error, 

-		 * warning or "no data found" message. 

-		 * @return numeric error code from SQL Server

-		 */

-//		public byte State {

-//			get {

-//				SqlErrorCollection errors = Errors;

-//				return errors.Count > 0 ? errors[0].State : (byte)0;

-//			}

-//		}

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs
deleted file mode 100644
index 86a0cc0bc7f..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleInfoMessageEventArgs.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//

-// System.Data.SqlClient.SqlInfoMessageEventArgs

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;

-

-namespace System.Data.OracleClient {

-	/// <summary>

-	/// Summary description for SqlInfoMessageEventArgs.

-	/// </summary>

-	public sealed class OracleInfoMessageEventArgs : EventArgs {
-		#region Fields
-
-		readonly OracleErrorCollection errors ;
-
-		#endregion // Fields
-
-		#region Constructors
-	
-		internal OracleInfoMessageEventArgs (OracleErrorCollection errors) {
-			this.errors = errors;
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		public OracleErrorCollection Errors {
-			get { return errors; }
-		}	
-
-		public string Message {
-			get { return errors[0].Message; }
-		}	
-
-		public string Source {
-			get { return errors[0].Source; }
-		}
-
-		#endregion // Properties
-
-		#region Methods
-
-		public override string ToString() {
-			return Message;
-		}
-
-		#endregion // Methods
-	}

-}

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleLob.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleLob.cs
deleted file mode 100644
index a7f9a1e73f1..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleLob.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-
-using System;
-using System.Data.SqlTypes;
-using System.IO;
-using System.Text;
-
-namespace System.Data.OracleClient {
-	public sealed class OracleLob : Stream, ICloneable, INullable {
-		#region Fields
-
-		public static readonly new OracleLob Null = new OracleLob ();
-
-		internal OracleConnection connection;
-		bool isBatched = false;
-		bool isOpen = true;
-		bool notNull = false;
-		OracleType type;
-
-		long length = -1;
-		long position = 1;
-
-		#endregion // Fields
-
-		#region Constructors
-
-		internal OracleLob () {
-		}
-
-
-		#endregion // Constructors
-
-		#region Properties
-
-		public override bool CanRead {
-			get { return (IsNull || isOpen); }
-		}
-
-		public override bool CanSeek {
-			get { return (IsNull || isOpen); }
-		}
-
-		public override bool CanWrite {
-			get { return isOpen; }
-		}
-
-		public int ChunkSize {
-			[MonoTODO]
-			get { 
-				AssertConnectionIsOpen ();
-				AssertObjectNotDisposed ();
-				throw new NotImplementedException ();
-			}
-		}
-
-		public OracleConnection Connection {
-			get { return connection; }
-		}
-
-		public bool IsBatched {
-			get { return isBatched; }
-		}
-
-		public bool IsNull {
-			get { return !notNull; }
-		}
-
-		public bool IsTemporary {
-			get { 
-				AssertConnectionIsOpen ();
-				AssertObjectNotDisposed ();
-				throw new NotImplementedException ();
-			}
-		}
-
-		public override long Length {
-			get { 
-				AssertConnectionIsOpen ();
-				AssertObjectNotDisposed ();
-				throw new NotImplementedException ();
-			}
-		}
-
-		public OracleType LobType {
-			get { return type; }
-		}
-
-		public override long Position {
-			get { 
-				AssertConnectionIsOpen ();
-				AssertObjectNotDisposed ();
-				return position;
-			}
-			set {
-				AssertConnectionIsOpen ();
-				AssertObjectNotDisposed ();
-				position = value;
-			}
-		}
-
-		public object Value {
-			get { 
-				AssertObjectNotDisposed ();
-				if (IsNull)
-					return DBNull.Value;
-				
-				byte[] buffer = null;
-
-				int len = (int) Length;
-				if (len == 0) {
-					// LOB is not Null, but it is Empty
-					if (LobType == OracleType.Clob)
-						return "";
-					else // OracleType.Blob
-						return new byte[0];
-				}
-
-				if (LobType == OracleType.Clob) {
-					buffer = new byte [len];
-					Read (buffer, 0, len);
-					UnicodeEncoding encoding = new UnicodeEncoding ();
-					return encoding.GetString (buffer);
-				}
-				else {
-					// OracleType.Blob
-					buffer = new byte [len];
-					Read (buffer, 0, len);
-					return buffer;
-				}
-			}
-		}
-
-		#endregion // Properties
-
-		#region Methods
-
-		[MonoTODO]
-		public void Append (OracleLob source) {
-			if (source.IsNull)
-				throw new ArgumentNullException ();
-			if (Connection.State == ConnectionState.Closed)
-				throw new InvalidOperationException ();
-			throw new NotImplementedException ();
-		}
-
-		void AssertAmountIsEven (long amount, string argName) {
-			if (amount % 2 == 1)
-				throw new ArgumentOutOfRangeException ("CLOB and NCLOB parameters require even number of bytes for this argument.");
-		}
-
-		void AssertAmountIsValid (long amount, string argName) {
-			if (amount > UInt32.MaxValue)
-				throw new ArgumentOutOfRangeException ("Argument too big.");
-			if (LobType == OracleType.Clob || LobType == OracleType.NClob)
-				AssertAmountIsEven (amount, argName);
-		}
-
-		void AssertConnectionIsOpen () {
-			if (connection.State == ConnectionState.Closed)
-				throw new InvalidOperationException ("Invalid operation. The connection is closed.");
-		}
-
-		void AssertObjectNotDisposed () {
-			if (!isOpen)
-				throw new ObjectDisposedException ("OracleLob");
-		}
-
-		void AssertTransactionExists () {
-//			if (connection.Transaction == null)
-//				throw new InvalidOperationException ("Modifying a LOB requires that the connection be transacted.");
-			throw new NotImplementedException ();
-		}
-
-		public void BeginBatch () {
-			BeginBatch (OracleLobOpenMode.ReadOnly);
-		}
-
-		public void BeginBatch (OracleLobOpenMode mode) {
-			AssertConnectionIsOpen ();
-			AssertObjectNotDisposed ();
-
-			isBatched = true;
-		}
-
-		[MonoTODO]
-		public object Clone () {
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void Close () {
-			isOpen = false;
-		}
-
-		public long CopyTo (OracleLob destination) {
-			return CopyTo (0, destination, 0, Length);
-		}
-
-		public long CopyTo (OracleLob destination, long destinationOffset) {
-			return CopyTo (0, destination, destinationOffset, Length);
-		}
-
-		public long CopyTo (long sourceOffset, OracleLob destination, long destinationOffset, long amount) {
-			if (destination.IsNull)
-				throw new ArgumentNullException ();
-
-			AssertAmountIsValid (sourceOffset, "sourceOffset");
-			AssertAmountIsValid (destinationOffset, "destinationOffset");
-			AssertAmountIsValid (amount, "amount");
-			AssertTransactionExists ();
-			AssertConnectionIsOpen ();
-
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void Dispose () {
-			throw new NotImplementedException ();
-		}
-
-		public void EndBatch () {
-			AssertConnectionIsOpen ();
-			AssertObjectNotDisposed ();
-
-			isBatched = false;
-		}
-
-		public long Erase () {
-			return Erase (0, Length);
-		}
-
-		public long Erase (long offset, long amount) {
-			if (offset < 0 || amount < 0)
-				throw new ArgumentOutOfRangeException ("Must be a positive value.");
-			if (offset + amount > Length)
-				throw new ArgumentOutOfRangeException ();
-
-			AssertAmountIsValid (offset, "offset");
-			AssertAmountIsValid (amount, "amount");
-
-			throw new NotImplementedException ();
-		}
-
-		public override void Flush () {
-			// No-op
-		}
-
-		public override int Read (byte[] buffer, int offset, int count) {
-			if (buffer == null)
-				throw new ArgumentNullException ();
-
-			AssertAmountIsValid (offset, "offset");
-			AssertAmountIsValid (count, "count");
-			AssertConnectionIsOpen ();
-			AssertObjectNotDisposed ();
-
-			throw new NotImplementedException ();
-
-			int bytesRead;
-			byte[] output = new byte[count];
-
-			output.CopyTo (buffer, offset);
-			position += bytesRead;
-			return bytesRead;
-		}
-
-		[MonoTODO]
-		public override long Seek (long offset, SeekOrigin origin) {
-			long newPosition = position;
-
-			switch (origin) {
-				case SeekOrigin.Begin:
-					newPosition = offset;
-					break;
-				case SeekOrigin.Current:
-					newPosition += offset;
-					break;
-				case SeekOrigin.End:
-					newPosition = Length - offset;
-					break;
-			}
-
-			if (newPosition > Length)
-				throw new ArgumentOutOfRangeException ();
-
-			position = newPosition;
-			return position;
-		}
-
-		[MonoTODO]
-		public override void SetLength (long value) {
-			AssertAmountIsValid (value, "value");
-			AssertTransactionExists ();
-			AssertConnectionIsOpen ();
-			AssertObjectNotDisposed ();
-
-			throw new NotImplementedException ();
-
-			length = value;
-		}
-
-		public override void Write (byte[] buffer, int offset, int count) {
-			if (buffer == null)
-				throw new ArgumentNullException ("Buffer is null.");
-			if (offset < 0 || count < 0)
-				throw new ArgumentOutOfRangeException ("Must be a positive value.");
-			if (offset + count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("The offset and count values specified exceed the buffer provided.");
-			AssertAmountIsValid (offset, "offset");
-			AssertAmountIsValid (count, "count");
-			AssertTransactionExists ();
-			AssertConnectionIsOpen ();
-			AssertObjectNotDisposed ();
-
-			byte[] value = null;
-			if (offset + count == buffer.Length && offset == 0)
-				value = buffer;
-			else {
-				value = new byte[count];
-				Array.Copy (buffer, offset, value, 0, count);
-			}
-
-			throw new NotImplementedException ();
-
-//			position += locator.Write (value, (uint) Position, (uint) value.Length, LobType);
-		}
-
-		#endregion // Methods
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs
deleted file mode 100644
index 8f8bd87b361..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameter.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-//

-// System.Data.OracleClient.OracleParameter

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-using System;

-using System.Text;

-using System.Data;

-using System.Data.Common;

-using System.Data.ProviderBase;

-using System.Globalization;

-

-using java.sql;

-using java.lang;

-

-namespace System.Data.OracleClient {

-	public sealed class OracleParameter : AbstractDbParameter, IDbDataParameter, ICloneable {

-

-		#region Fields

-

-		internal OracleType _oleDbType = OracleType.VarChar;

-

-		#endregion // Fields

-    

-		#region Constructors

-

-		public OracleParameter() {

-		}

-    

-		public OracleParameter(String parameterName, Object value)

-			: this (parameterName, OracleType.VarChar, 0, ParameterDirection.Input,

-			false, 0, 0, String.Empty, DataRowVersion.Current, value) {

-			_isDbTypeSet = false;

-		}

-    

-		public OracleParameter(String parameterName, OracleType dbType)

-			: this (parameterName, dbType, 0, ParameterDirection.Input,

-			false, 0, 0, String.Empty, DataRowVersion.Current, null) {

-		}

-    

-		public OracleParameter(String parameterName, OracleType dbType, int size)

-			: this (parameterName, dbType, size, ParameterDirection.Input,

-			false, 0, 0, String.Empty, DataRowVersion.Current, null) {

-		}

-    

-		public OracleParameter(String parameterName, OracleType dbType, int size,

-			String sourceColumn)

-			: this (parameterName, dbType, size, ParameterDirection.Input,

-			false, 0, 0, sourceColumn, DataRowVersion.Current, null) {

-		}

-    

-        

-		public OracleParameter(String parameterName, 

-			OracleType dbType, 

-			int size,

-			ParameterDirection direction, 

-			bool isNullable,

-			byte precision, 

-			byte scale, 

-			String sourceColumn,

-			DataRowVersion sourceVersion, 

-			Object value) {

-			ParameterName = parameterName;

-			OracleType = dbType;

-			Size = size;

-			Direction = direction;

-			IsNullable = isNullable;

-			Precision = precision;

-			Scale = scale;

-			SourceColumn = sourceColumn;

-			SourceVersion = sourceVersion;

-			Value = value;

-		}

-

-		#endregion // Constructors

-

-		#region Properties

-

-		public override DbType DbType {

-			get { return OracleConvert.OracleTypeToDbType(_oleDbType); }           

-			set { OracleType = OracleConvert.DbTypeToOracleType(value); }

-		}                

-        

-		public OracleType OracleType {

-			get { return _oleDbType; }            

-			set {

-				_oleDbType = value;

-				_isDbTypeSet = true;

-			}

-		}    

-    

-		public new Object Value {

-			get { return base.Value; }

-			set {

-				if (!_isDbTypeSet && (value != null) && (value != DBNull.Value)) {

-					_oleDbType = OracleConvert.ValueTypeToOracleType(value.GetType());

-				}

-				base.Value = value;

-			}

-		}

-

-		#endregion // Properties

-

-		#region Methods

-

-		public override String ToString() {

-			return ParameterName;

-		}

-

-		protected override string Placeholder {

-			get {

-				if (ParameterName.Length == 0 || ParameterName[0] == ':')

-					return ParameterName;

-

-				return String.Concat(":", ParameterName);

-			}

-		}

-

-		internal string InternalPlaceholder {

-			get {

-				return Placeholder;

-			}

-		}

-    

-		public override object Clone() {

-			OracleParameter clone = new OracleParameter();

-			CopyTo(clone);

-

-			clone._oleDbType = _oleDbType;

-			clone._isDbTypeSet = _isDbTypeSet;

-			return clone;

-		}

-

-		protected sealed override object ConvertValue(object value) {

-			// can not convert null or DbNull to other types

-			if (value == null || value == DBNull.Value) {

-				return value;

-			}

-

-			// TBD : some other way to do this?

-//			if (OracleType == OracleType.Binary) {

-//				return value;

-//			}

-			// .NET throws an exception to the user.

-			object convertedValue  = value;

-

-			// note : if we set user parameter jdbc type inside prepare interbal, the db type is not set

-			if (value is IConvertible && (_isDbTypeSet || IsJdbcTypeSet)) {

-				OracleType oleDbType = (_isDbTypeSet) ? OracleType : OracleConvert.JdbcTypeToOracleType((int)JdbcType);

-				Type to = OracleConvert.OracleTypeToValueType(oleDbType);

-				if (!(value is DateTime && to == OracleConvert.TypeOfTimespan)) //anyway will go by jdbc type

-					convertedValue = Convert.ChangeType(value,to);

-			}

-			return convertedValue;

-		}

-

-		protected sealed override void SetParameterName(ResultSet res) {

-			ParameterName = res.getString("COLUMN_NAME");

-		}

-

-		protected sealed override void SetParameterDbType(ResultSet res) {

-			int jdbcType = res.getInt("DATA_TYPE");			

-			// FIXME : is that correct?

-			if (jdbcType == Types.OTHER) {

-				string typeName = res.getString("TYPE_NAME");

-				if (String.Compare("REF CURSOR", typeName, true, CultureInfo.InvariantCulture) == 0) {

-					jdbcType = (int)JavaSqlTypes.CURSOR;

-				}

-				else if (String.Compare("BLOB",typeName,true, CultureInfo.InvariantCulture) == 0) {

-					jdbcType = (int)JavaSqlTypes.BLOB;

-				}

-				else if (String.Compare("CLOB",typeName,true, CultureInfo.InvariantCulture) == 0) {

-					jdbcType = (int)JavaSqlTypes.CLOB;

-				}

-				else if(String.Compare("FLOAT",typeName,true, CultureInfo.InvariantCulture) == 0) {

-					jdbcType = (int)JavaSqlTypes.FLOAT;

-				}

-				else if(String.Compare("NVARCHAR2",typeName,true, CultureInfo.InvariantCulture) == 0) {

-					jdbcType = (int)JavaSqlTypes.VARCHAR;

-				}

-				else if(String.Compare("NCHAR",typeName,true, CultureInfo.InvariantCulture) == 0) {

-					jdbcType = (int)JavaSqlTypes.CHAR;

-				}

-			}

-			OracleType = OracleConvert.JdbcTypeToOracleType(jdbcType);

-			JdbcType = jdbcType;

-		}

-

-		protected sealed override void SetSpecialFeatures(ResultSet res) {

-			// do nothing

-		}

-

-		protected sealed override int JdbcTypeFromProviderType() {

-			return OracleConvert.OracleTypeToJdbcType(OracleType);

-		}

-

-		#endregion // Methods

-    

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs
deleted file mode 100644
index 09844e93cca..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleParameterCollection.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//

-// System.Data.Common.OracleParameterCollection

-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-using System.Data.ProviderBase;

-

-namespace System.Data.OracleClient {

-	public sealed class OracleParameterCollection :  AbstractDbParameterCollection {

-		#region Constructors

-

-		public OracleParameterCollection(OracleCommand parent): base(parent) {

-		}

-

-		#endregion // Constructors

-

-		#region Properties

-        

-		public new OracleParameter this[int index] {

-			get { return (OracleParameter)base[index]; }

-			set { 

-				OnSchemaChanging();

-				base[index] = value; 

-			}

-		}

-

-		public new OracleParameter this[string parameterName] {

-			get { return (OracleParameter)base[parameterName]; }

-			set { 

-				OnSchemaChanging();

-				base[parameterName] = value; 

-			}

-		}

-

-		protected override Type ItemType { 

-			get { return typeof(OracleParameter); }

-		}

-

-		#endregion // Properties

-

-		#region Methods

-

-		public OracleParameter Add(OracleParameter value) {

-			base.Add(value);

-			return value;

-		}

-

-		public OracleParameter Add(string parameterName, object value) {

-			OracleParameter param = new OracleParameter(parameterName, value);

-			return Add(param);

-		}

-

-		public OracleParameter Add(string parameterName, OracleType sqlDbType) {

-			OracleParameter param = new OracleParameter(parameterName, sqlDbType);

-			return Add(param);

-		}

-

-		public OracleParameter Add(string parameterName, OracleType sqlDbType, int size) {

-			OracleParameter param = new OracleParameter(parameterName, sqlDbType, size);

-			return Add(param);

-		}

-

-		public OracleParameter Add(string parameterName, OracleType sqlDbType, int size, string sourceColumn) {

-			OracleParameter param = new OracleParameter(parameterName, sqlDbType, size, sourceColumn);

-			return Add(param);

-		}

-

-		#endregion // Methods        

-        

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleTransaction.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleTransaction.cs
deleted file mode 100644
index 0d4b4681662..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/OracleTransaction.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// 
-// System.Data.OracleClient.OracleTransaction.cs
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-

-namespace System.Data.OracleClient {

-

-	using System.Data.Common;

-	using System.Data.ProviderBase;

-	using System.Data;

-

-	public class OracleTransaction : AbstractTransaction {

-    

-		internal OracleTransaction(OracleConnection connection) : base(IsolationLevel.ReadCommitted, connection, null) {

-		}

-

-		internal OracleTransaction(OracleConnection connection, String transactionName) : base(IsolationLevel.ReadCommitted, connection, transactionName) {

-		}

-

-		internal OracleTransaction(IsolationLevel isolationLevel, OracleConnection connection) : base(isolationLevel, connection, null) {

-		}

-

-		public new OracleConnection Connection {

-			get {

-				return (OracleConnection)base.Connection;

-			}

-		}

-

-		public OracleTransaction Begin() {

-			return Begin(IsolationLevel.ReadCommitted);

-		}

-

-		public OracleTransaction Begin(IsolationLevel isolationLevetl) {

-			throw new InvalidOperationException("Only one transaction can be active on this session.");

-		}

-    

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/Regex.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/Regex.cs
deleted file mode 100755
index 947d810b418..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.jvm/Regex.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// System.Data.OracleClient.Regex.cs
-//
-// Authors:
-//   	Konstantin Triger (kostat@mainsoft.com)
-//
-// (c) 2006 Mainsoft corp. (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data.ProviderBase;
-
-namespace System.Data.OracleClient
-{
-	/// <summary>
-	/// Summary description for Regex.
-	/// </summary>
-	internal class OracleParamsRegex : SimpleRegex {
-		//static readonly char[] charsEnd = new char[] {' ', '\f', '\t', '\v', '\r', '\n',  ',', ';', '(', ')', '[', ']','='};
-		protected override SimpleMatch Match(string input, int beginning, int length) {
-
-			int actualLen = length-1; //there must be something after @
-			for (int i = beginning; i < actualLen; i++) {
-				char ch = input[i];
-				switch(ch) {
-					case '\'': {
-						int end = input.IndexOf('\'', i+1);
-						if (end < 0)
-							break;
-
-						i = end;
-						break;
-					}
-					case '"': {
-						int end = input.IndexOf('"', i+1);
-						if (end < 0)
-							break;
-
-						i = end;
-						break;
-					}
-					case '[': {
-						int end = input.IndexOf(']', i+1);
-						if (end < 0)
-							break;
-
-						i = end;
-						break;
-					}
-					case ':': {
-						int start = i;
-
-						do {
-							i++;
-						}while (i < length && input[i] == ':');
-
-						if (i - start > 1)
-							break;
-
-						while (i < length && IsWordChar(input[i]))
-							i++;
-	
-						return new SimpleMatch(this, length, true, start, i-start, input);
-					}
-				}
-			}
-
-			return new SimpleMatch(this, length, false, length, 0, input);
-		}
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.sln b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.sln
deleted file mode 100755
index 4f5bbd915a8..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient", "System.Data.OracleClient.vmwcsproj", "{168E2978-1640-405C-99B8-8CD81B27BC92}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data", "..\System.Data\System.Data.vmwcsproj", "{12CA069B-C324-48C1-9836-0014497A212C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Debug_Java = Debug_Java

-		Release = Release

-		Release_Java = Release_Java

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug.ActiveCfg = Debug_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug.Build.0 = Debug_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug_Java.Build.0 = Debug_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release.ActiveCfg = Release_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release.Build.0 = Release_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release_Java.ActiveCfg = Release_Java|.NET

-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release_Java.Build.0 = Release_Java|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Debug.ActiveCfg = Debug|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Debug.Build.0 = Debug|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Release.ActiveCfg = Release|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Release.Build.0 = Release|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Release_Java.ActiveCfg = Release_Java|.NET

-		{12CA069B-C324-48C1-9836-0014497A212C}.Release_Java.Build.0 = Release_Java|.NET

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.vmwcsproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.vmwcsproj
deleted file mode 100755
index 79a8f8316a9..00000000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.vmwcsproj
+++ /dev/null
@@ -1,58 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{168E2978-1640-405C-99B8-8CD81B27BC92}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OracleClient" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OracleClient" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-				<Reference Name="System.Data" Project="{12CA069B-C324-48C1-9836-0014497A212C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="Assembly\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assembly\Consts.cs.in" Link="..\..\build\common\Consts.cs.in" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assembly\Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assembly\MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleBoolean.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleDataAdapter.cs" SubType="Component" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleDateTime.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleInfoMessageEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleLobOpenMode.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleMonthSpan.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleNumber.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OraclePermission.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OraclePermissionAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleString.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleTimeSpan.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient\OracleType.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\ExceptionHelper.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleBFile.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleBinary.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand.cs" SubType="Component" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommandBuilder.cs" SubType="Component" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection.cs" SubType="Component" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConvert.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleError.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleErrorCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleInfoMessageEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleLob.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\Regex.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" REFS.JarPath.system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
index 0e532375fe1..d1f146a64c5 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-27  Konstantin Triger <kostat@mainsoft.com>
-
-	* OracleDataAdapter.cs: Do not throw ArgumentException when null is passed.
-
 2005-11-21  Senganal T   <tsenganal@novell.com>
 
 	* OracleCommandBuilder.cs :
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs
index a1fa94ece13..41f377e1d6b 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs
@@ -103,7 +103,7 @@ namespace System.Data.OracleClient {
 		IDbCommand IDbDataAdapter.DeleteCommand {
 			get { return DeleteCommand; }
 			set { 
-				if (value != null && !(value is OracleCommand)) 
+				if (!(value is OracleCommand)) 
 					throw new ArgumentException ();
 				DeleteCommand = (OracleCommand) value;
 			}
@@ -112,7 +112,7 @@ namespace System.Data.OracleClient {
 		IDbCommand IDbDataAdapter.InsertCommand {
 			get { return InsertCommand; }
 			set { 
-				if (value != null && !(value is OracleCommand)) 
+				if (!(value is OracleCommand)) 
 					throw new ArgumentException ();
 				InsertCommand = (OracleCommand) value;
 			}
@@ -121,7 +121,7 @@ namespace System.Data.OracleClient {
 		IDbCommand IDbDataAdapter.SelectCommand {
 			get { return SelectCommand; }
 			set { 
-				if (value != null && !(value is OracleCommand)) 
+				if (!(value is OracleCommand)) 
 					throw new ArgumentException ();
 				SelectCommand = (OracleCommand) value;
 			}
@@ -130,7 +130,7 @@ namespace System.Data.OracleClient {
 		IDbCommand IDbDataAdapter.UpdateCommand {
 			get { return UpdateCommand; }
 			set { 
-				if (value != null && !(value is OracleCommand)) 
+				if (!(value is OracleCommand)) 
 					throw new ArgumentException ();
 				UpdateCommand = (OracleCommand) value;
 			}
diff --git a/mcs/class/System.Data.OracleClient/Test/ChangeLog b/mcs/class/System.Data.OracleClient/Test/ChangeLog
index 1f02b4f4393..ed916f18bf9 100644
--- a/mcs/class/System.Data.OracleClient/Test/ChangeLog
+++ b/mcs/class/System.Data.OracleClient/Test/ChangeLog
@@ -1,8 +1,3 @@
-2006-02-09  Konstantin Triger <kostat@mainsoft.com>
-
-	* Added Mainsoft OracleClient testsuite. The running instructions can be found at
-	  System.Data.OracleClient.jvm/readme.txt.
-
 2005-01-16  Daniel Morgan <danielmorgan@verizon.net>
 
 	* ChangeLog: added file for oracle tests
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.sln b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.sln
deleted file mode 100755
index e9961495cf2..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.sln
+++ /dev/null
@@ -1,33 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient.Tests.J2EE", "System.Data.OracleClient.Tests.J2EE.vmwcsproj", "{8A846229-F249-415F-B69D-738374543437}"

-	ProjectSection(ProjectDependencies) = postProject

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1} = {39CC8FF7-EF1A-41A1-B727-42684211ECD1}

-	EndProjectSection

-EndProject

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Debug_Java = Debug_Java

-		Release_Java = Release_Java

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{8A846229-F249-415F-B69D-738374543437}.Debug.ActiveCfg = Debug|.NET

-		{8A846229-F249-415F-B69D-738374543437}.Debug.Build.0 = Debug|.NET

-		{8A846229-F249-415F-B69D-738374543437}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{8A846229-F249-415F-B69D-738374543437}.Debug_Java.Build.0 = Debug_Java|.NET

-		{8A846229-F249-415F-B69D-738374543437}.Release_Java.ActiveCfg = Release_Java|.NET

-		{8A846229-F249-415F-B69D-738374543437}.Release_Java.Build.0 = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.vmwcsproj b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.vmwcsproj
deleted file mode 100755
index 772fd1fb234..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.vmwcsproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{8A846229-F249-415F-B69D-738374543437}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OracleClient.Tests.J2EE" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OracleClient.Tests.J2EE" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="..\..\..\nunit20\nunit-console\bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-				<Reference Name="System.Data.OracleClient" AssemblyName="System.Data.OracleClient" HintPath="..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll"/>

-				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Open.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.data.oracleclient="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.OracleClient.jar" REFS.JarPath.system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\cygwin1\monobuild1\mcs\nunit20\nunit-console\bin\Debug_Java\nunit-console.exe" Prop2007="" Prop2008="" Prop2009="/wait /exclude=NotWorking System.Data.OracleClient.Tests.J2EE.dll" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.Data.ORACLE.sql b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.Data.ORACLE.sql
deleted file mode 100755
index eb663d32a51..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.Data.ORACLE.sql
+++ /dev/null
@@ -1,3447 +0,0 @@
-SET DEFINE ~
-alter session set nls_date_format='MM/DD/YYYY hh:mi:ss PM';
-
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (1, 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (3, 'Confections', 'Desserts, candies, and sweet breads' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (4, 'Dairy Products', 'Cheeses' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (5, 'Grains/Cereals', 'Breads, crackers, pasta, and cereal' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (6, 'Meat/Poultry', 'Prepared meats' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (7, 'Produce', 'Dried fruit and bean curd' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (8, 'Seafood', 'Seaweed and fish' ) ;
-
-INSERT INTO GHTDB_EX.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES ('10', 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) ;
-INSERT INTO GHTDB_EX.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES ('20', 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-
-
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (1, 'Yavine', 'Oved', 'Sales Representative', 'Mr', '12/8/1948 12:00:00 AM', '5/1/1992 12:00:00 AM', '507 - 20th Ave. E.Apt. 2A', 'Seattle', 'WA', '98122', 'USA', '(206) 555-9857', '5467', 'Education includes a BA in psychology from Colorado State University in 1970.  She also completed "The Art of the Cold Call."  Nancy is a member of Toastmasters International.', 1, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (2, 'Fuller', 'Andrew', 'Vice President, Sales', 'Dr.', '2/19/1952 12:00:00 AM', '8/14/1992 12:00:00 AM', '908 W. Capital Way', 'Tacoma', 'WA', '98401', 'USA', '(206) 555-9482', '3457', 'Andrew received his BTS commercial in 1974 and a Ph.D. in international marketing from the University of Dallas in 1981.  He is fluent in French and Italian and reads German.  He joined the company as a sales representative, was promoted to sales manager in January 1992 and to vice president of sales in March 1993.  Andrew is a member of the Sales Management Roundtable, the Seattle Chamber of Commerce, and the Pacific Rim Importers Association.', 1, 'http://accweb/emmployees/fuller.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (3, 'Leverling', 'Janet', 'Sales Representative', 'Ms.', '8/30/1963 12:00:00 AM', '4/1/1992 12:00:00 AM', '722 Moss Bay Blvd.', 'Kirkland', 'WA', '98033', 'USA', '(206) 555-3412', '3355', 'Janet has a BS degree in chemistry from Boston College (1984).  She has also completed a certificate program in food retailing management.  Janet was hired as a sales associate in 1991 and promoted to sales representative in February 1992.', 2, 'http://accweb/emmployees/leverling.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (4, 'Peacock', 'Margaret', 'Sales Representative', 'Mrs.', '9/19/1937 12:00:00 AM', '5/3/1993 12:00:00 AM', '4110 Old Redmond Rd.', 'Redmond', 'WA', '98052', 'USA', '(206) 555-8122', '5176', 'Margaret holds a BA in English literature from Concordia College (1958) and an MA from the American Institute of Culinary Arts (1966).  She was assigned to the London office temporarily from July through November 1992.', 2, 'http://accweb/emmployees/peacock.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (5, 'Buchanan', 'Steven', 'Sales Manager', 'Mr.', '3/4/1955 12:00:00 AM', '10/17/1993 12:00:00 AM', '14 Garrett Hill', 'London', NULL, 'SW1 8JR', 'UK', '(71) 555-4848', '3453', 'Steven Buchanan graduated from St. Andrews University, Scotland, with a BSC degree in 1976.  Upon joining the company as a sales representative in 1992, he spent 6 months in an orientation program at the Seattle office and then returned to his permanent post in London.  He was promoted to sales manager in March 1993.  Mr. Buchanan has completed the courses "Successful Telemarketing" and "International Sales Management."  He is fluent in French.', 2, 'http://accweb/emmployees/buchanan.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (6, 'Suyama', 'Michael', 'Sales Representative', 'Mr.', '7/2/1963 12:00:00 AM', '10/17/1993 12:00:00 AM', 'Coventry HouseMiner Rd.', 'London', NULL, 'EC2 7JR', 'UK', '(71) 555-7773', '428', 'Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses "Multi-Cultural Selling" and "Time Management for the Sales Professional."  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (7, 'King', 'Robert', 'Sales Representative', 'Mr.', '5/29/1960 12:00:00 AM', '1/2/1994 12:00:00 AM', 'Edgeham HollowWinchester Way', 'London', NULL, 'RG1 9SP', 'UK', '(71) 555-5598', '465', 'Robert King served in the Peace Corps and traveled extensively before completing his degree in English at the University of Michigan in 1992, the year he joined the company.  After completing a course entitled "Selling in Europe," he was transferred to the London office in March 1993.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (8, 'Callahan', 'Laura', 'Inside Sales Coordinator', 'Ms.', '1/9/1958 12:00:00 AM', '3/5/1994 12:00:00 AM', '4726 - 11th Ave. N.E.', 'Seattle', 'WA', '98105', 'USA', '(206) 555-1189', '2344', 'Laura received a BA in psychology from the University of Washington.  She has also completed a course in business French.  She reads and writes French.', 2, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9, 'Dodsworth', 'Anne', 'Sales Representative', 'Ms.', '1/27/1966 12:00:00 AM', '11/15/1994 12:00:00 AM', '7 Houndstooth Rd.', 'London', NULL, 'WG2 7LT', 'UK', '(71) 555-4444', '452', 'Anne has a BA degree in English from St. Lawrence College.  She is fluent in French and German.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (1, 'Eastern                                           ' ) ;
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (2, 'Western                                           ' ) ;
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (3, 'Northern                                          ' ) ;
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (4, 'Southern                                          ' ) ;
-
-
-INSERT INTO GHTDB.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (1, 'Speedy Express', '(503) 555-9831' ) ;
-INSERT INTO GHTDB.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (2, 'Comp2', '(503) 555-3199' ) ;
-INSERT INTO GHTDB.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (3, 'Federal Shipping', '(503) 555-9931' ) ;
-
-
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10248, 'VINET', 5, '7/4/1996 12:00:00 AM', '8/1/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 3, 255.39, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10249, 'TOMSP', 6, '7/5/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/10/1996 12:00:00 AM', 1, 11.61, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10250, 'HANAR', 4, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/12/1996 12:00:00 AM', 2, 65.83, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10251, 'VICTE', 3, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 1, 41.34, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10252, 'SUPRD', 4, '7/9/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', '7/11/1996 12:00:00 AM', 2, 51.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10253, 'HANAR', 3, '7/10/1996 12:00:00 AM', '7/24/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 2, 58.17, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10254, 'CHOPS', 5, '7/11/1996 12:00:00 AM', '8/8/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 2, 22.98, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10255, 'RICSU', 9, '7/12/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 3, 148.33, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10256, 'WELLI', 3, '7/15/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', '7/17/1996 12:00:00 AM', 2, 13.97, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10257, 'HILAA', 4, '7/16/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', '7/22/1996 12:00:00 AM', 3, 81.91, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10258, 'ERNSH', 1, '7/17/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 1, 140.51, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10259, 'CENTC', 4, '7/18/1996 12:00:00 AM', '8/15/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 3.25, 'Centro comercial Moctezuma', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10260, 'OTTIK', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/29/1996 12:00:00 AM', 1, 55.09, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10261, 'QUEDE', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/30/1996 12:00:00 AM', 2, 3.05, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10262, 'RATTC', 8, '7/22/1996 12:00:00 AM', '8/19/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 48.29, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10263, 'ERNSH', 9, '7/23/1996 12:00:00 AM', '8/20/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 146.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10264, 'FOLKO', 6, '7/24/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 3.67, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10265, 'BLONP', 2, '7/25/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 1, 55.28, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10266, 'WARTH', 3, '7/26/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 25.73, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10267, 'FRANK', 4, '7/29/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 1, 208.58, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10268, 'GROSR', 8, '7/30/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 3, 66.29, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10269, 'WHITC', 5, '7/31/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 4.56, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10270, 'WARTH', 1, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 1, 136.54, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10271, 'SPLIR', 6, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 2, 4.54, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10272, 'RATTC', 6, '8/2/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 2, 98.03, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10273, 'QUICK', 3, '8/5/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 3, 76.07, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10274, 'VINET', 6, '8/6/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 1, 6.01, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10275, 'MAGAA', 1, '8/7/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 26.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10276, 'TORTU', 8, '8/8/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', 3, 13.84, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10277, 'MORGK', 2, '8/9/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', 3, 125.77, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10278, 'BERGS', 8, '8/12/1996 12:00:00 AM', '9/9/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 92.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10279, 'LEHMS', 8, '8/13/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 25.83, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10280, 'BERGS', 2, '8/14/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', 1, 8.98, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10281, 'ROMEY', 4, '8/14/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 2.94, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10282, 'ROMEY', 4, '8/15/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 12.69, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10283, 'LILAS', 3, '8/16/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 84.81, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10284, 'LEHMS', 4, '8/19/1996 12:00:00 AM', '9/16/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', 1, 76.56, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10285, 'QUICK', 1, '8/20/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', 2, 76.83, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10286, 'QUICK', 8, '8/21/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 3, 229.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10287, 'RICAR', 8, '8/22/1996 12:00:00 AM', '9/19/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 12.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10288, 'REGGC', 4, '8/23/1996 12:00:00 AM', '9/20/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 7.45, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10289, 'BSBEV', 7, '8/26/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 22.77, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10290, 'COMMI', 8, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 79.7, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10291, 'QUEDE', 6, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', 2, 6.4, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10292, 'TRADH', 1, '8/28/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', 2, 1.35, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10293, 'TORTU', 1, '8/29/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 3, 21.18, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10294, 'RATTC', 4, '8/30/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', '9/5/1996 12:00:00 AM', 2, 147.26, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10295, 'VINET', 2, '9/2/1996 12:00:00 AM', '9/30/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 1.15, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10296, 'LILAS', 6, '9/3/1996 12:00:00 AM', '10/1/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 1, 0.12, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10297, 'BLONP', 5, '9/4/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 5.74, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10298, 'HUNGO', 6, '9/5/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 2, 168.22, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10299, 'RICAR', 4, '9/6/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', 2, 29.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10300, 'MAGAA', 2, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 17.68, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10301, 'WANDK', 8, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 45.08, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10302, 'SUPRD', 4, '9/10/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 2, 6.27, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10303, 'GODOS', 7, '9/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 107.83, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10304, 'TORTU', 1, '9/12/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 63.79, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10305, 'OLDWO', 8, '9/13/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 3, 257.62, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10306, 'ROMEY', 1, '9/16/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', 3, 7.56, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10307, 'LONEP', 2, '9/17/1996 12:00:00 AM', '10/15/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', 2, 0.56, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10308, 'ANATR', 7, '9/18/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', 3, 1.61, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10309, 'HUNGO', 3, '9/19/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 1, 47.3, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10310, 'THEBI', 8, '9/20/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', 2, 17.52, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10311, 'DUMON', 1, '9/20/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', 3, 24.69, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10312, 'WANDK', 2, '9/23/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 40.26, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10313, 'QUICK', 2, '9/24/1996 12:00:00 AM', '10/22/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 1.96, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10314, 'RATTC', 1, '9/25/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 74.16, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10315, 'ISLAT', 4, '9/26/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 41.76, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10316, 'RATTC', 1, '9/27/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', 3, 150.15, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10317, 'LONEP', 6, '9/30/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 12.69, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10318, 'ISLAT', 8, '10/1/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 4.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10319, 'TORTU', 7, '10/2/1996 12:00:00 AM', '10/30/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 3, 64.5, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10320, 'WARTH', 5, '10/3/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', 3, 34.57, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10321, 'ISLAT', 3, '10/3/1996 12:00:00 AM', '10/31/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 2, 3.43, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10322, 'PERIC', 7, '10/4/1996 12:00:00 AM', '11/1/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 3, 0.4, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10323, 'KOENE', 4, '10/7/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 4.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10324, 'SAVEA', 9, '10/8/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 214.27, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10325, 'KOENE', 1, '10/9/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 3, 64.86, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10326, 'BOLID', 4, '10/10/1996 12:00:00 AM', '11/7/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 2, 77.92, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10327, 'FOLKO', 2, '10/11/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 63.36, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10328, 'FURIB', 4, '10/14/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', 3, 87.03, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10329, 'SPLIR', 4, '10/15/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 2, 191.67, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10330, 'LILAS', 3, '10/16/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 1, 12.75, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10331, 'BONAP', 9, '10/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 1, 10.19, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10332, 'MEREP', 3, '10/17/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 2, 52.84, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10333, 'WARTH', 5, '10/18/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 3, 0.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10334, 'VICTE', 8, '10/21/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 2, 8.56, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10335, 'HUNGO', 7, '10/22/1996 12:00:00 AM', '11/19/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', 2, 42.11, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10336, 'PRINI', 7, '10/23/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 2, 15.51, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10337, 'FRANK', 4, '10/24/1996 12:00:00 AM', '11/21/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 108.26, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10338, 'OLDWO', 4, '10/25/1996 12:00:00 AM', '11/22/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 84.21, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10339, 'MEREP', 2, '10/28/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 15.66, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10340, 'BONAP', 1, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 166.31, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10341, 'SIMOB', 7, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 3, 26.78, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10342, 'FRANK', 4, '10/30/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 54.83, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10343, 'LEHMS', 4, '10/31/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '11/6/1996 12:00:00 AM', 1, 110.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10344, 'WHITC', 4, '11/1/1996 12:00:00 AM', '11/29/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 2, 23.29, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10345, 'QUICK', 2, '11/4/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', 2, 249.06, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10346, 'RATTC', 3, '11/5/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 142.08, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10347, 'FAMIA', 4, '11/6/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 3.1, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10348, 'WANDK', 4, '11/7/1996 12:00:00 AM', '12/5/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 2, 0.78, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10349, 'SPLIR', 7, '11/8/1996 12:00:00 AM', '12/6/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 1, 8.63, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10350, 'LAMAI', 6, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 64.19, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10351, 'ERNSH', 1, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 162.33, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10352, 'FURIB', 3, '11/12/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', 3, 1.3, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10353, 'PICCO', 7, '11/13/1996 12:00:00 AM', '12/11/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', 3, 360.63, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10354, 'PERIC', 8, '11/14/1996 12:00:00 AM', '12/12/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 3, 53.8, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10355, 'AROUT', 6, '11/15/1996 12:00:00 AM', '12/13/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 41.95, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10356, 'WANDK', 6, '11/18/1996 12:00:00 AM', '12/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 2, 36.71, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10357, 'LILAS', 1, '11/19/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 34.88, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10358, 'LAMAI', 5, '11/20/1996 12:00:00 AM', '12/18/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 1, 19.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10359, 'SEVES', 5, '11/21/1996 12:00:00 AM', '12/19/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', 3, 288.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10360, 'BLONP', 4, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 131.7, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10361, 'QUICK', 1, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 183.17, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10362, 'BONAP', 3, '11/25/1996 12:00:00 AM', '12/23/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', 1, 96.04, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10363, 'DRACD', 4, '11/26/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', 3, 30.54, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10364, 'EASTC', 1, '11/26/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/4/1996 12:00:00 AM', 1, 71.97, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10365, 'ANTON', 3, '11/27/1996 12:00:00 AM', '12/25/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 22, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10366, 'GALED', 8, '11/28/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/30/1996 12:00:00 AM', 2, 10.14, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10367, 'VAFFE', 7, '11/28/1996 12:00:00 AM', '12/26/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 13.55, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10368, 'ERNSH', 2, '11/29/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 101.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10369, 'SPLIR', 8, '12/2/1996 12:00:00 AM', '12/30/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 195.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10370, 'CHOPS', 6, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', 2, 1.17, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10371, 'LAMAI', 1, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', 1, 0.45, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10372, 'QUEEN', 5, '12/4/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 890.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10373, 'HUNGO', 4, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/11/1996 12:00:00 AM', 3, 124.12, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10374, 'WOLZA', 1, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 3, 3.94, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10375, 'HUNGC', 3, '12/6/1996 12:00:00 AM', '1/3/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 20.12, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10376, 'MEREP', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 2, 20.39, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10377, 'SEVES', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 22.21, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10378, 'FOLKO', 5, '12/10/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/19/1996 12:00:00 AM', 3, 5.44, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10379, 'QUEDE', 2, '12/11/1996 12:00:00 AM', '1/8/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 1, 45.03, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10380, 'HUNGO', 8, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 35.03, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10381, 'LILAS', 3, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 7.99, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10382, 'ERNSH', 4, '12/13/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '12/16/1996 12:00:00 AM', 1, 94.77, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10383, 'AROUT', 8, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/18/1996 12:00:00 AM', 3, 34.24, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10384, 'BERGS', 3, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 3, 168.64, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10385, 'SPLIR', 1, '12/17/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '12/23/1996 12:00:00 AM', 2, 30.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10386, 'FAMIA', 9, '12/18/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/25/1996 12:00:00 AM', 3, 13.99, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10387, 'SANTG', 1, '12/18/1996 12:00:00 AM', '1/15/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 2, 93.63, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10388, 'SEVES', 2, '12/19/1996 12:00:00 AM', '1/16/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 1, 34.86, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10389, 'BOTTM', 4, '12/20/1996 12:00:00 AM', '1/17/1997 12:00:00 AM', '12/24/1996 12:00:00 AM', 2, 47.42, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10390, 'ERNSH', 6, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/26/1996 12:00:00 AM', 1, 126.38, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10391, 'DRACD', 3, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/31/1996 12:00:00 AM', 3, 5.45, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10392, 'PICCO', 2, '12/24/1996 12:00:00 AM', '1/21/1997 12:00:00 AM', '1/1/1997 12:00:00 AM', 3, 122.46, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10393, 'SAVEA', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 126.56, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10394, 'HUNGC', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 30.34, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10395, 'HILAA', 6, '12/26/1996 12:00:00 AM', '1/23/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 1, 184.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10396, 'FRANK', 1, '12/27/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '1/6/1997 12:00:00 AM', 3, 135.35, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10397, 'PRINI', 5, '12/27/1996 12:00:00 AM', '1/24/1997 12:00:00 AM', '1/2/1997 12:00:00 AM', 1, 60.26, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10398, 'SAVEA', 2, '12/30/1996 12:00:00 AM', '1/27/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 89.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10399, 'VAFFE', 8, '12/31/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 3, 27.36, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10400, 'EASTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 83.93, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10401, 'RATTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 1, 12.51, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10402, 'ERNSH', 8, '1/2/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 2, 67.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10403, 'ERNSH', 4, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 73.79, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10404, 'MAGAA', 2, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 1, 155.97, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10405, 'LINOD', 1, '1/6/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', '1/22/1997 12:00:00 AM', 1, 34.82, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10406, 'QUEEN', 7, '1/7/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/13/1997 12:00:00 AM', 1, 108.04, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10407, 'OTTIK', 2, '1/7/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 91.48, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10408, 'FOLIG', 8, '1/8/1997 12:00:00 AM', '2/5/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 11.26, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10409, 'OCEAN', 3, '1/9/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 29.83, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10410, 'BOTTM', 3, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 3, 2.4, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10411, 'BOTTM', 9, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/21/1997 12:00:00 AM', 3, 23.65, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10412, 'WARTH', 8, '1/13/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 2, 3.77, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10413, 'LAMAI', 3, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 2, 95.66, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10414, 'FAMIA', 2, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/17/1997 12:00:00 AM', 3, 21.48, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10415, 'HUNGC', 3, '1/15/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 0.2, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10416, 'WARTH', 8, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 3, 22.72, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10417, 'SIMOB', 4, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/28/1997 12:00:00 AM', 3, 70.29, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10418, 'QUICK', 4, '1/17/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 17.55, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10419, 'RICSU', 4, '1/20/1997 12:00:00 AM', '2/17/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 137.35, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10420, 'WELLI', 3, '1/21/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 44.12, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10421, 'QUEDE', 8, '1/21/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 99.23, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10422, 'FRANS', 2, '1/22/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', 1, 3.02, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10423, 'GOURL', 6, '1/23/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 3, 24.5, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10424, 'MEREP', 7, '1/23/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 2, 370.61, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10425, 'LAMAI', 6, '1/24/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 7.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10426, 'GALED', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', 1, 18.69, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10427, 'PICCO', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 31.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10428, 'REGGC', 7, '1/28/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', 1, 11.09, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10429, 'HUNGO', 3, '1/29/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 56.63, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10430, 'ERNSH', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', 1, 458.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10431, 'BOTTM', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 44.17, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10432, 'SPLIR', 3, '1/31/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 4.34, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10433, 'PRINI', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 73.83, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10434, 'FOLKO', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', 2, 17.92, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10435, 'CONSH', 8, '2/4/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 9.21, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10436, 'BLONP', 3, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', 2, 156.66, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10437, 'WARTH', 8, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', 1, 19.97, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10438, 'TOMSP', 3, '2/6/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 8.24, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10439, 'MEREP', 6, '2/7/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', 3, 4.07, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10440, 'SAVEA', 4, '2/10/1997 12:00:00 AM', '3/10/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 86.53, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10441, 'OLDWO', 3, '2/10/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 73.02, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10442, 'ERNSH', 3, '2/11/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', 2, 47.94, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10443, 'REGGC', 8, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 1, 13.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10444, 'BERGS', 3, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', 3, 3.5, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10445, 'BERGS', 3, '2/13/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', 1, 9.3, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10446, 'TOMSP', 6, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', 1, 14.68, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10447, 'RICAR', 4, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', 2, 68.66, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10448, 'RANCH', 4, '2/17/1997 12:00:00 AM', '3/17/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 2, 38.82, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10449, 'BLONP', 3, '2/18/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/27/1997 12:00:00 AM', 2, 53.3, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10450, 'VICTE', 8, '2/19/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 7.23, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10451, 'QUICK', 4, '2/19/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 189.09, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10452, 'SAVEA', 8, '2/20/1997 12:00:00 AM', '3/20/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 1, 140.26, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10453, 'AROUT', 1, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 2, 25.36, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10454, 'LAMAI', 4, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', 3, 2.74, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10455, 'WARTH', 8, '2/24/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 180.45, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10456, 'KOENE', 8, '2/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 8.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10457, 'KOENE', 2, '2/25/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 11.57, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10458, 'SUPRD', 7, '2/26/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 147.06, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10459, 'VICTE', 4, '2/27/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 25.09, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10460, 'FOLKO', 8, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 16.27, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10461, 'LILAS', 1, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', 3, 148.61, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10462, 'CONSH', 2, '3/3/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 1, 6.17, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10463, 'SUPRD', 5, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', 3, 14.78, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10464, 'FURIB', 4, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 89, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10465, 'VAFFE', 1, '3/5/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 3, 145.04, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10466, 'COMMI', 4, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', 1, 11.93, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10467, 'MAGAA', 8, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 4.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10468, 'KOENE', 3, '3/7/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 44.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10469, 'WHITC', 1, '3/10/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 1, 60.18, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10470, 'BONAP', 4, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 64.56, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10471, 'BSBEV', 2, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 3, 45.59, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10472, 'SEVES', 8, '3/12/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', 1, 4.2, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10473, 'ISLAT', 1, '3/13/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 16.37, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10474, 'PERIC', 5, '3/13/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 2, 83.49, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10475, 'SUPRD', 9, '3/14/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', 1, 68.52, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10476, 'HILAA', 8, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 3, 4.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10477, 'PRINI', 5, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 13.02, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10478, 'VICTE', 2, '3/18/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', 3, 4.81, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10479, 'RATTC', 3, '3/19/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 708.95, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10480, 'FOLIG', 6, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 2, 1.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10481, 'RICAR', 8, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 64.33, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10482, 'LAZYK', 1, '3/21/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 7.48, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10483, 'WHITC', 7, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', 2, 15.28, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10484, 'BSBEV', 3, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', 3, 6.88, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10485, 'LINOD', 4, '3/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', 2, 64.45, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10486, 'HILAA', 1, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 30.53, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10487, 'QUEEN', 2, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', 2, 71.07, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10488, 'FRANK', 8, '3/27/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 4.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10489, 'PICCO', 6, '3/28/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 5.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10490, 'HILAA', 7, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', 2, 210.19, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10491, 'FURIB', 8, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', 3, 16.96, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10492, 'BOTTM', 3, '4/1/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 1, 62.89, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10493, 'LAMAI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 10.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10494, 'COMMI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 65.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10495, 'LAUGB', 3, '4/3/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 3, 4.65, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10496, 'TRADH', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 2, 46.77, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10497, 'LEHMS', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 1, 36.21, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10498, 'HILAA', 8, '4/7/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 2, 29.75, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10499, 'LILAS', 4, '4/8/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 102.02, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10500, 'LAMAI', 6, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', 1, 42.68, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10501, 'BLAUS', 9, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 3, 8.85, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10502, 'PERIC', 2, '4/10/1997 12:00:00 AM', '5/8/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 69.32, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10503, 'HUNGO', 6, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 16.74, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10504, 'WHITC', 4, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', 3, 59.13, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10505, 'MEREP', 3, '4/14/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 7.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10506, 'KOENE', 9, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 21.19, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10507, 'ANTON', 7, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '4/22/1997 12:00:00 AM', 1, 47.45, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10508, 'OTTIK', 1, '4/16/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', 2, 4.99, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10509, 'BLAUS', 4, '4/17/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 0.15, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10510, 'SAVEA', 6, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 3, 367.63, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10511, 'BONAP', 4, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 350.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10512, 'FAMIA', 7, '4/21/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', 2, 3.53, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10513, 'WANDK', 7, '4/22/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 1, 105.65, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10514, 'ERNSH', 3, '4/22/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 2, 789.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10515, 'QUICK', 2, '4/23/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 1, 204.47, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10516, 'HUNGO', 2, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 62.78, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10517, 'NORTS', 3, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 3, 32.07, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10518, 'TORTU', 4, '4/25/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', 2, 218.15, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10519, 'CHOPS', 6, '4/28/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 91.76, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10520, 'SANTG', 7, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 1, 13.37, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10521, 'CACTU', 8, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 17.22, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10522, 'LEHMS', 4, '4/30/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', 1, 45.33, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10523, 'SEVES', 7, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 2, 77.63, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10524, 'BERGS', 1, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 2, 244.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10525, 'BONAP', 1, '5/2/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 11.06, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10526, 'WARTH', 4, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', 2, 58.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10527, 'QUICK', 7, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 1, 41.9, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10528, 'GREAL', 6, '5/6/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 3.35, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10529, 'MAISD', 5, '5/7/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 66.69, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10530, 'PICCO', 3, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 2, 339.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10531, 'OCEAN', 7, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 8.12, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10532, 'EASTC', 7, '5/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 3, 74.46, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10533, 'FOLKO', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', 1, 188.04, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10534, 'LEHMS', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', 2, 27.94, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10535, 'ANTON', 4, '5/13/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/21/1997 12:00:00 AM', 1, 15.64, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10536, 'LEHMS', 3, '5/14/1997 12:00:00 AM', '6/11/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 58.88, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10537, 'RICSU', 1, '5/14/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 78.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10538, 'BSBEV', 9, '5/15/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 3, 4.87, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10539, 'BSBEV', 6, '5/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 3, 12.36, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10540, 'QUICK', 3, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 3, 1007.64, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10541, 'HANAR', 2, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', 1, 68.65, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10542, 'KOENE', 1, '5/20/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', 3, 10.95, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10543, 'LILAS', 8, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 48.17, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10544, 'LONEP', 4, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 24.91, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10545, 'LAZYK', 8, '5/22/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', 2, 11.92, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10546, 'VICTE', 1, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', 3, 194.72, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10547, 'SEVES', 3, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 178.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10548, 'TOMSP', 3, '5/26/1997 12:00:00 AM', '6/23/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 1.43, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10549, 'QUICK', 5, '5/27/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 171.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10550, 'GODOS', 7, '5/28/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 4.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10551, 'FURIB', 4, '5/28/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 72.95, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10552, 'HILAA', 2, '5/29/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 1, 83.22, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10553, 'WARTH', 2, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', 2, 149.49, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10554, 'OTTIK', 4, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 3, 120.97, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10555, 'SAVEA', 6, '6/2/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', 3, 252.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10556, 'SIMOB', 2, '6/3/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 9.8, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10557, 'LEHMS', 9, '6/3/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 96.72, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10558, 'AROUT', 1, '6/4/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', 2, 72.97, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10559, 'BLONP', 6, '6/5/1997 12:00:00 AM', '7/3/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 8.05, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10560, 'FRANK', 8, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 1, 36.65, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10561, 'FOLKO', 2, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 2, 242.21, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10562, 'REGGC', 1, '6/9/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', 1, 22.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10563, 'RICAR', 2, '6/10/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '6/24/1997 12:00:00 AM', 2, 60.43, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10564, 'RATTC', 4, '6/10/1997 12:00:00 AM', '7/8/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', 3, 13.75, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10565, 'MEREP', 8, '6/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 2, 7.15, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10566, 'BLONP', 9, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 1, 88.4, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10567, 'HUNGO', 1, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', 1, 33.97, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10568, 'GALED', 3, '6/13/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 3, 6.54, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10569, 'RATTC', 5, '6/16/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', 1, 58.98, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10570, 'MEREP', 3, '6/17/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', 3, 188.99, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10571, 'ERNSH', 8, '6/17/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 3, 26.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10572, 'BERGS', 3, '6/18/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', 2, 116.43, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10573, 'ANTON', 7, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', 3, 84.84, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10574, 'TRAIH', 4, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 37.6, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10575, 'MORGK', 5, '6/20/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 1, 127.34, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10576, 'TORTU', 3, '6/23/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 3, 18.56, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10577, 'TRAIH', 9, '6/23/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 25.41, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10578, 'BSBEV', 4, '6/24/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 3, 29.6, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10579, 'LETSS', 1, '6/25/1997 12:00:00 AM', '7/23/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 13.73, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10580, 'OTTIK', 4, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/1/1997 12:00:00 AM', 3, 75.89, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10581, 'FAMIA', 3, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', 1, 3.01, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10582, 'BLAUS', 3, '6/27/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 27.71, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10583, 'WARTH', 2, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 7.28, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10584, 'BLONP', 4, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 1, 59.14, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10585, 'WELLI', 7, '7/1/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 1, 13.41, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10586, 'REGGC', 9, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 0.48, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10587, 'QUEDE', 1, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 62.52, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10588, 'QUICK', 2, '7/3/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 3, 194.67, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10589, 'GREAL', 8, '7/4/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 4.42, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10590, 'MEREP', 4, '7/7/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 3, 44.77, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10591, 'VAFFE', 1, '7/7/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 55.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10592, 'LEHMS', 3, '7/8/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 32.1, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10593, 'LEHMS', 7, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', 2, 174.2, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10594, 'OLDWO', 3, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 2, 5.24, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10595, 'ERNSH', 2, '7/10/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 1, 96.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10596, 'WHITC', 8, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 1, 16.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10597, 'PICCO', 7, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 35.12, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10598, 'RATTC', 1, '7/14/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 44.42, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10599, 'BSBEV', 6, '7/15/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 3, 29.98, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10600, 'HUNGC', 4, '7/16/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 1, 45.13, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10601, 'HILAA', 7, '7/16/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 1, 58.3, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10602, 'VAFFE', 8, '7/17/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 2, 2.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10603, 'SAVEA', 8, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 2, 48.77, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10604, 'FURIB', 1, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 1, 7.46, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10605, 'MEREP', 1, '7/21/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 2, 379.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10606, 'TRADH', 4, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', 3, 79.4, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10607, 'SAVEA', 5, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 1, 200.24, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10608, 'TOMSP', 4, '7/23/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 27.79, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10609, 'DUMON', 7, '7/24/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', 2, 1.85, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10610, 'LAMAI', 8, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 1, 26.78, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10611, 'WOLZA', 6, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 80.65, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10612, 'SAVEA', 1, '7/28/1997 12:00:00 AM', '8/25/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 544.08, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10613, 'HILAA', 4, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 8.11, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10614, 'BLAUS', 8, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 3, 1.93, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10615, 'WILMK', 2, '7/30/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 3, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10616, 'GREAL', 1, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', 2, 116.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10617, 'GREAL', 4, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', 2, 18.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10618, 'MEREP', 1, '8/1/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 1, 154.68, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10619, 'MEREP', 3, '8/4/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', 3, 91.05, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10620, 'LAUGB', 2, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 3, 0.94, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10621, 'ISLAT', 4, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 2, 23.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10622, 'RICAR', 4, '8/6/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 3, 50.97, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10623, 'FRANK', 8, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 2, 97.18, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10624, 'THECR', 4, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 94.8, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10625, 'ANATR', 3, '8/8/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 1, 43.9, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10626, 'BERGS', 1, '8/11/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 2, 138.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10627, 'SAVEA', 8, '8/11/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 107.46, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10628, 'BLONP', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 30.36, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10629, 'GODOS', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 85.46, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10630, 'KOENE', 1, '8/13/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 32.35, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10631, 'LAMAI', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', 1, 0.87, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10632, 'WANDK', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 1, 41.38, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10633, 'ERNSH', 7, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', 3, 477.9, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10634, 'FOLIG', 4, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 487.38, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10635, 'MAGAA', 8, '8/18/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 47.46, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10636, 'WARTH', 4, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 1.15, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10637, 'QUEEN', 6, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 201.29, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10638, 'LINOD', 3, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 1, 158.44, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10639, 'SANTG', 7, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', 3, 38.64, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10640, 'WANDK', 4, '8/21/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', 1, 23.55, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10641, 'HILAA', 4, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 2, 179.61, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10642, 'SIMOB', 7, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', 3, 41.89, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10643, 'ALFKI', 6, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 29.46, 'Alfreds Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10644, 'WELLI', 3, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 2, 0.14, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10645, 'HANAR', 4, '8/26/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 12.41, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10646, 'HUNGO', 9, '8/27/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 142.33, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10647, 'QUEDE', 4, '8/27/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 2, 45.54, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10648, 'RICAR', 5, '8/28/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', 2, 14.25, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10649, 'MAISD', 5, '8/28/1997 12:00:00 AM', '9/25/1997 12:00:00 AM', '8/29/1997 12:00:00 AM', 3, 6.2, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10650, 'FAMIA', 5, '8/29/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 176.81, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10651, 'WANDK', 8, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 20.6, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10652, 'GOURL', 4, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 2, 7.14, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10653, 'FRANK', 1, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 93.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10654, 'BERGS', 5, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 1, 55.26, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10655, 'REGGC', 1, '9/3/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 4.41, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10656, 'GREAL', 6, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 1, 57.15, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10657, 'SAVEA', 2, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 2, 352.69, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10658, 'QUICK', 4, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 1, 364.15, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10659, 'QUEEN', 7, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 2, 105.81, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10660, 'HUNGC', 8, '9/8/1997 12:00:00 AM', '10/6/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 1, 111.29, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10661, 'HUNGO', 7, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 3, 17.55, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10662, 'LONEP', 3, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 2, 1.28, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10663, 'BONAP', 2, '9/10/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 113.15, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10664, 'FURIB', 1, '9/10/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 3, 1.27, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10665, 'LONEP', 1, '9/11/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', 2, 26.31, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10666, 'RICSU', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 2, 232.42, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10667, 'ERNSH', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 78.09, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10668, 'WANDK', 1, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 47.22, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10669, 'SIMOB', 2, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 1, 24.39, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10670, 'FRANK', 4, '9/16/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 1, 203.48, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10671, 'FRANR', 1, '9/17/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', 1, 30.34, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10672, 'BERGS', 9, '9/17/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 2, 95.75, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10673, 'WILMK', 2, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 22.76, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10674, 'ISLAT', 4, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 2, 0.9, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10675, 'FRANK', 5, '9/19/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 31.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10676, 'TORTU', 2, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', 2, 2.01, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10677, 'ANTON', 1, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 3, 4.03, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10678, 'SAVEA', 7, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 3, 388.98, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10679, 'BLONP', 8, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 27.94, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10680, 'OLDWO', 1, '9/24/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 1, 26.61, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10681, 'GREAL', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 76.13, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10682, 'ANTON', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 2, 36.13, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10683, 'DUMON', 2, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 1, 4.4, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10684, 'OTTIK', 3, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 1, 145.63, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10685, 'GOURL', 4, '9/29/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 33.75, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10686, 'PICCO', 2, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', 1, 96.5, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10687, 'HUNGO', 9, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', 2, 296.43, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10688, 'VAFFE', 4, '10/1/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 299.09, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10689, 'BERGS', 1, '10/1/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 13.42, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10690, 'HANAR', 1, '10/2/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 1, 15.8, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10691, 'QUICK', 2, '10/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', 2, 810.05, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10692, 'ALFKI', 4, '10/3/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 2, 61.02, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10693, 'WHITC', 3, '10/6/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', 3, 139.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10694, 'QUICK', 8, '10/6/1997 12:00:00 AM', '11/3/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', 3, 398.36, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10695, 'WILMK', 7, '10/7/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 16.72, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10696, 'WHITC', 8, '10/8/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 3, 102.55, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10697, 'LINOD', 3, '10/8/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 45.52, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10698, 'ERNSH', 4, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', 1, 272.47, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10699, 'MORGK', 3, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 3, 0.58, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10700, 'SAVEA', 3, '10/10/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 1, 65.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10701, 'HUNGO', 6, '10/13/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 3, 220.31, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10702, 'ALFKI', 4, '10/13/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 1, 23.94, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10703, 'FOLKO', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', 2, 152.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10704, 'QUEEN', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 4.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10705, 'HILAA', 9, '10/15/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 3.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10706, 'OLDWO', 8, '10/16/1997 12:00:00 AM', '11/13/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 3, 135.63, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10707, 'AROUT', 4, '10/16/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 3, 21.74, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10708, 'THEBI', 6, '10/17/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 2.96, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10709, 'GOURL', 1, '10/17/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '11/20/1997 12:00:00 AM', 3, 210.8, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10710, 'FRANS', 1, '10/20/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 1, 4.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10711, 'SAVEA', 5, '10/21/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 52.41, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10712, 'HUNGO', 3, '10/21/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 1, 89.93, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10713, 'SAVEA', 1, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', 1, 167.05, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10714, 'SAVEA', 5, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 3, 24.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10715, 'BONAP', 3, '10/23/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 1, 63.2, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10716, 'RANCH', 4, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 2, 22.57, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10717, 'FRANK', 1, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 59.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10718, 'KOENE', 1, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 3, 170.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10719, 'LETSS', 8, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 51.44, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10720, 'QUEDE', 8, '10/28/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 9.53, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10721, 'QUICK', 5, '10/29/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 3, 48.92, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10722, 'SAVEA', 8, '10/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/4/1997 12:00:00 AM', 1, 74.58, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10723, 'WHITC', 3, '10/30/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 1, 21.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10724, 'MEREP', 8, '10/30/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 57.75, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10725, 'FAMIA', 4, '10/31/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 3, 10.83, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10726, 'EASTC', 4, '11/3/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 16.56, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10727, 'REGGC', 2, '11/3/1997 12:00:00 AM', '12/1/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 89.9, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10728, 'QUEEN', 4, '11/4/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', 2, 58.33, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10729, 'LINOD', 8, '11/4/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 3, 141.06, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10730, 'BONAP', 5, '11/5/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 20.12, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10731, 'CHOPS', 7, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 96.65, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10732, 'BONAP', 3, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 16.97, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10733, 'BERGS', 1, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/10/1997 12:00:00 AM', 3, 110.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10734, 'GOURL', 2, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', 3, 1.63, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10735, 'LETSS', 6, '11/10/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 45.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10736, 'HUNGO', 9, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 44.1, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10737, 'VINET', 2, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 7.79, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10738, 'SPECD', 2, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 1, 2.91, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10739, 'VINET', 3, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', 3, 11.08, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10740, 'WHITC', 4, '11/13/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 2, 81.88, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10741, 'AROUT', 4, '11/14/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 10.96, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10742, 'BOTTM', 3, '11/14/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 243.73, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10743, 'AROUT', 1, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10744, 'VAFFE', 6, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 69.19, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10745, 'QUICK', 9, '11/18/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 3.52, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10746, 'CHOPS', 1, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 3, 31.43, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10747, 'PICCO', 6, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', 1, 117.33, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10748, 'SAVEA', 3, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 1, 232.55, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10749, 'ISLAT', 4, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 61.53, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10750, 'WARTH', 9, '11/21/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 79.3, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10751, 'RICSU', 3, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', 3, 130.79, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10752, 'NORTS', 2, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 3, 1.39, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10753, 'FRANS', 3, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 7.7, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10754, 'MAGAA', 6, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 3, 2.38, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10755, 'BONAP', 4, '11/26/1997 12:00:00 AM', '12/24/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 2, 16.71, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10756, 'SPLIR', 8, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', 2, 73.21, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10757, 'SAVEA', 6, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', 1, 8.19, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10758, 'RICSU', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', 3, 138.17, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10759, 'ANATR', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 3, 11.99, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10760, 'MAISD', 4, '12/1/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', 1, 155.64, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10761, 'RATTC', 5, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 2, 18.66, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10762, 'FOLKO', 3, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 328.74, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10763, 'FOLIG', 3, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 37.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10764, 'ERNSH', 6, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 145.45, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10765, 'QUICK', 3, '12/4/1997 12:00:00 AM', '1/1/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 3, 42.74, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10766, 'OTTIK', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 157.55, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10767, 'SUPRD', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 3, 1.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10768, 'AROUT', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 2, 146.32, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10769, 'VAFFE', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 65.06, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10770, 'HANAR', 8, '12/9/1997 12:00:00 AM', '1/6/1998 12:00:00 AM', '12/17/1997 12:00:00 AM', 3, 5.32, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10771, 'ERNSH', 9, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 11.19, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10772, 'LEHMS', 3, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 91.28, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10773, 'ERNSH', 1, '12/11/1997 12:00:00 AM', '1/8/1998 12:00:00 AM', '12/16/1997 12:00:00 AM', 3, 96.43, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10774, 'FOLKO', 4, '12/11/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 48.2, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10775, 'THECR', 7, '12/12/1997 12:00:00 AM', '1/9/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 20.25, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10776, 'ERNSH', 1, '12/15/1997 12:00:00 AM', '1/12/1998 12:00:00 AM', '12/18/1997 12:00:00 AM', 3, 351.53, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10777, 'GOURL', 7, '12/15/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 3.01, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10778, 'BERGS', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 1, 6.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10779, 'MORGK', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 2, 58.13, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10780, 'LILAS', 2, '12/16/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', 1, 42.13, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10781, 'WARTH', 2, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 3, 73.16, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10782, 'CACTU', 9, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 1.1, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10783, 'HANAR', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 124.98, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10784, 'MAGAA', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 70.09, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10785, 'GROSR', 1, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 3, 1.51, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10786, 'QUEEN', 8, '12/19/1997 12:00:00 AM', '1/16/1998 12:00:00 AM', '12/23/1997 12:00:00 AM', 1, 110.87, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10787, 'LAMAI', 2, '12/19/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 249.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10788, 'QUICK', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 42.7, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10789, 'FOLIG', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 100.6, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10790, 'GOURL', 6, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 28.23, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10791, 'FRANK', 6, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/1/1998 12:00:00 AM', 2, 16.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10792, 'WOLZA', 1, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 3, 23.79, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10793, 'AROUT', 3, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 3, 4.52, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10794, 'QUEDE', 6, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 1, 21.49, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10795, 'ERNSH', 8, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', 2, 126.66, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10796, 'HILAA', 3, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 26.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10797, 'DRACD', 7, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 33.35, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10798, 'ISLAT', 2, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 1, 2.33, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10799, 'KOENE', 9, '12/26/1997 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 30.76, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10800, 'SEVES', 1, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 137.44, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10801, 'BOLID', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 97.09, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10802, 'SIMOB', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 257.26, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10803, 'WELLI', 4, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/6/1998 12:00:00 AM', 1, 55.23, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10804, 'SEVES', 6, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 2, 27.33, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10805, 'THEBI', 2, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 237.34, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10806, 'VICTE', 3, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 22.11, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10807, 'FRANS', 4, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.36, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10808, 'OLDWO', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 45.53, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10809, 'WELLI', 7, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 1, 4.87, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10810, 'LAUGB', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 3, 4.33, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10811, 'LINOD', 8, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 1, 31.22, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10812, 'REGGC', 5, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 1, 59.78, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10813, 'RICAR', 1, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 1, 47.38, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10814, 'VICTE', 3, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 130.94, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10815, 'SAVEA', 2, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 14.62, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10816, 'GREAL', 4, '1/6/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 2, 719.78, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10817, 'KOENE', 3, '1/6/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 306.07, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10818, 'MAGAA', 7, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 3, 65.48, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10819, 'CACTU', 2, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 19.76, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10820, 'RATTC', 3, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 37.52, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10821, 'SPLIR', 1, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/15/1998 12:00:00 AM', 1, 36.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10822, 'TRAIH', 6, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 7, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10823, 'LILAS', 5, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 163.97, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10824, 'FOLKO', 8, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.23, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10825, 'DRACD', 1, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 79.25, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10826, 'BLONP', 6, '1/12/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 1, 7.09, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10827, 'BONAP', 1, '1/12/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 63.54, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10828, 'RANCH', 9, '1/13/1998 12:00:00 AM', '1/27/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 90.85, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10829, 'ISLAT', 9, '1/13/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 1, 154.72, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10830, 'TRADH', 4, '1/13/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 81.83, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10831, 'SANTG', 3, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 72.19, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10832, 'LAMAI', 2, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 43.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10833, 'OTTIK', 6, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 71.49, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10834, 'TRADH', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 3, 29.78, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10835, 'ALFKI', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 3, 69.53, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10836, 'ERNSH', 7, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 1, 411.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10837, 'BERGS', 9, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 13.32, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10838, 'LINOD', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 59.28, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10839, 'TRADH', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/22/1998 12:00:00 AM', 3, 35.43, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10840, 'LINOD', 4, '1/19/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 2, 2.71, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10841, 'SUPRD', 5, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 424.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10842, 'TORTU', 1, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 3, 54.42, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10843, 'VICTE', 4, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 9.26, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10844, 'PICCO', 8, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 25.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10845, 'QUICK', 8, '1/21/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 212.98, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10846, 'SUPRD', 2, '1/22/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 56.46, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10847, 'SAVEA', 4, '1/22/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 3, 487.57, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10848, 'CONSH', 7, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 38.24, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10849, 'KOENE', 9, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 2, 0.56, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10850, 'VICTE', 1, '1/23/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 49.19, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10851, 'RICAR', 5, '1/26/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 1, 160.55, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10852, 'RATTC', 8, '1/26/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 174.05, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10853, 'BLAUS', 9, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 2, 53.83, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10854, 'ERNSH', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', 2, 100.22, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10855, 'OLDWO', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 170.97, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10856, 'ANTON', 3, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 58.43, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10857, 'BERGS', 8, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 188.85, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10858, 'LACOR', 2, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 1, 52.51, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10859, 'FRANK', 1, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 76.1, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10860, 'FRANR', 3, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 3, 19.26, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10861, 'WHITC', 4, '1/30/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 14.93, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10862, 'LEHMS', 8, '1/30/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 53.23, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10863, 'HILAA', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 30.26, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10864, 'AROUT', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 3.04, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10865, 'QUICK', 2, '2/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 348.14, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10866, 'BERGS', 5, '2/3/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 109.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10867, 'LONEP', 6, '2/3/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 1, 1.93, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10868, 'QUEEN', 7, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 191.27, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10869, 'SEVES', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 143.28, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10870, 'WOLZA', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 3, 12.04, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10871, 'BONAP', 9, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 112.27, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10872, 'GODOS', 5, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 175.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10873, 'WILMK', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 0.82, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10874, 'GODOS', 5, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 2, 19.58, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10875, 'BERGS', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 2, 32.37, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10876, 'BONAP', 7, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 60.42, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10877, 'RICAR', 1, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 1, 38.06, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10878, 'QUICK', 4, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 46.69, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10879, 'WILMK', 3, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 8.5, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10880, 'FOLKO', 7, '2/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 88.01, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10881, 'CACTU', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 2.84, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10882, 'SAVEA', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 23.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10883, 'LONEP', 8, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 0.53, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10884, 'LETSS', 4, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 2, 90.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10885, 'SUPRD', 6, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 3, 5.64, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10886, 'HANAR', 1, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 4.99, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10887, 'GALED', 8, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 3, 1.25, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10888, 'GODOS', 1, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 51.87, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10889, 'RATTC', 9, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 3, 280.61, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10890, 'DUMON', 7, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 32.76, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10891, 'LEHMS', 7, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 20.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10892, 'MAISD', 4, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 120.27, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10893, 'KOENE', 9, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 2, 77.78, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10894, 'SAVEA', 1, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 1, 116.13, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10895, 'ERNSH', 3, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 1, 162.75, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10896, 'MAISD', 7, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 32.45, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10897, 'HUNGO', 3, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', 2, 603.54, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10898, 'OCEAN', 4, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 1.27, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10899, 'LILAS', 5, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 3, 1.21, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10900, 'WELLI', 1, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 1.66, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10901, 'HILAA', 4, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 1, 62.09, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10902, 'FOLKO', 1, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 1, 44.15, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10903, 'HANAR', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 36.71, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10904, 'WHITC', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 162.95, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10905, 'WELLI', 9, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 13.72, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10906, 'WOLZA', 4, '2/25/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 3, 26.29, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10907, 'SPECD', 6, '2/25/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 9.19, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10908, 'REGGC', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 32.96, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10909, 'SANTG', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', 2, 53.05, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10910, 'WILMK', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 38.11, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10911, 'GODOS', 3, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 1, 38.19, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10912, 'HUNGO', 2, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 580.91, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10913, 'QUEEN', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 1, 33.05, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10914, 'QUEEN', 6, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 21.19, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10915, 'TORTU', 2, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 2, 3.51, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10916, 'RANCH', 1, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 63.77, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10917, 'ROMEY', 4, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 2, 8.29, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10918, 'BOTTM', 3, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 48.83, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10919, 'LINOD', 2, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 19.8, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10920, 'AROUT', 4, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 29.61, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10921, 'VAFFE', 1, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 1, 176.48, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10922, 'HANAR', 5, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 3, 62.74, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10923, 'LAMAI', 7, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 68.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10924, 'BERGS', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 2, 151.52, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10925, 'HANAR', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 1, 2.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10926, 'ANATR', 4, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 39.92, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10927, 'LACOR', 4, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 19.79, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10928, 'GALED', 1, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 1.36, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10929, 'FRANK', 6, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 1, 33.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10930, 'SUPRD', 4, '3/6/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 15.55, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10931, 'RICSU', 4, '3/6/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 13.6, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10932, 'BONAP', 8, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 134.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10933, 'ISLAT', 6, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 3, 54.15, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10934, 'LEHMS', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 3, 32.01, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10935, 'WELLI', 4, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 47.59, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10936, 'GREAL', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 33.68, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10937, 'CACTU', 7, '3/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 31.51, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10938, 'QUICK', 3, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 31.89, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10939, 'MAGAA', 2, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 2, 76.33, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10940, 'BONAP', 8, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 3, 19.77, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10941, 'SAVEA', 7, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 400.81, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10942, 'REGGC', 9, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 17.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10943, 'BSBEV', 4, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 2.17, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10944, 'BOTTM', 6, '3/12/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 52.92, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10945, 'MORGK', 4, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 10.22, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10946, 'VAFFE', 1, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 27.2, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10947, 'BSBEV', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 3.26, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10948, 'GODOS', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 3, 23.39, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10949, 'BOTTM', 2, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', 3, 74.44, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10950, 'MAGAA', 1, '3/16/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 2.5, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10951, 'RICSU', 9, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 2, 30.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10952, 'ALFKI', 1, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 40.42, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10953, 'AROUT', 9, '3/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10954, 'LINOD', 5, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 1, 27.91, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10955, 'FOLKO', 8, '3/17/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 3.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10956, 'BLAUS', 6, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 44.65, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10957, 'HILAA', 8, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 105.36, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10958, 'OCEAN', 7, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 49.56, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10959, 'GOURL', 6, '3/18/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 4.98, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10960, 'HILAA', 3, '3/19/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 2.08, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10961, 'QUEEN', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 1, 104.47, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10962, 'QUICK', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 275.79, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10963, 'FURIB', 9, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 3, 2.7, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10964, 'SPECD', 3, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 2, 87.38, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10965, 'OLDWO', 6, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 3, 144.38, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10966, 'CHOPS', 4, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 27.19, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10967, 'TOMSP', 2, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 62.22, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10968, 'ERNSH', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', 3, 74.6, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10969, 'COMMI', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 2, 0.21, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10970, 'BOLID', 9, '3/24/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 1, 16.16, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10971, 'FRANR', 2, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 121.82, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10972, 'LACOR', 4, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 2, 0.02, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10973, 'LACOR', 6, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 15.17, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10974, 'SPLIR', 3, '3/25/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 12.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10975, 'BOTTM', 1, '3/25/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 32.27, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10976, 'HILAA', 1, '3/25/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 1, 37.97, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10977, 'FOLKO', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 208.5, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10978, 'MAISD', 9, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 2, 32.82, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10979, 'ERNSH', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', 2, 353.07, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10980, 'FOLKO', 4, '3/27/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 1, 1.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10981, 'HANAR', 1, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 193.37, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10982, 'BOTTM', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 14.01, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10983, 'SAVEA', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 2, 657.54, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10984, 'SAVEA', 1, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 211.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10985, 'HUNGO', 2, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 91.51, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10986, 'OCEAN', 8, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 217.86, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10987, 'EASTC', 8, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 1, 185.48, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10988, 'RATTC', 3, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 61.14, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10989, 'QUEDE', 2, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 34.76, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10990, 'ERNSH', 2, '4/1/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 3, 117.61, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10991, 'QUICK', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 1, 38.51, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10992, 'THEBI', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 4.27, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10993, 'FOLKO', 7, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 8.81, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10994, 'VAFFE', 2, '4/2/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', 3, 65.53, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10995, 'PERIC', 1, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 3, 46, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10996, 'QUICK', 4, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 1.12, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10997, 'LILAS', 8, '4/3/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 73.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10998, 'WOLZA', 8, '4/3/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 2, 20.31, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10999, 'OTTIK', 6, '4/3/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 96.35, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11000, 'RATTC', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 3, 55.12, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11001, 'FOLKO', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 2, 197.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11002, 'SAVEA', 4, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 1, 141.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11003, 'THECR', 3, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 3, 14.91, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11004, 'MAISD', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 44.84, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11005, 'WILMK', 2, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11006, 'GREAL', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 2, 25.19, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11007, 'PRINI', 8, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 202.24, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11008, 'ERNSH', 7, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', NULL, 3, 79.46, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11009, 'GODOS', 2, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 59.11, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11010, 'REGGC', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 28.71, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11011, 'ALFKI', 3, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 1, 1.21, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11012, 'FRANK', 1, '4/9/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 3, 242.95, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11013, 'ROMEY', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 32.99, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11014, 'LINOD', 2, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 3, 23.6, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11015, 'SANTG', 2, '4/10/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 4.62, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11016, 'AROUT', 9, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 33.8, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11017, 'ERNSH', 9, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 754.26, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11018, 'LONEP', 4, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 11.65, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11019, 'RANCH', 6, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', NULL, 3, 3.17, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11020, 'OTTIK', 2, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 43.3, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11021, 'QUICK', 3, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 1, 297.18, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11022, 'HANAR', 9, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 6.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11023, 'BSBEV', 1, '4/14/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 123.83, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11024, 'EASTC', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 74.36, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11025, 'WARTH', 6, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 3, 29.17, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11026, 'FRANS', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 1, 47.09, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11027, 'BOTTM', 1, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 52.52, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11028, 'KOENE', 2, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 1, 29.59, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11029, 'CHOPS', 4, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 47.84, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11030, 'SAVEA', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 2, 830.75, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11031, 'SAVEA', 6, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 227.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11032, 'WHITC', 2, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 606.19, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11033, 'RICSU', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 84.74, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11034, 'OLDWO', 8, '4/20/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 40.32, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11035, 'SUPRD', 2, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 0.17, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11036, 'DRACD', 8, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 3, 149.47, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11037, 'GODOS', 7, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 3.2, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11038, 'SUPRD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 2, 29.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11039, 'LINOD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', NULL, 2, 65, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11040, 'GREAL', 4, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', NULL, 3, 18.84, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11041, 'CHOPS', 3, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 2, 48.22, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11042, 'COMMI', 2, '4/22/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 29.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11043, 'SPECD', 5, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 8.8, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11044, 'WOLZA', 4, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 8.72, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11045, 'BOTTM', 6, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', NULL, 2, 70.58, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11046, 'WANDK', 8, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 71.64, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11047, 'EASTC', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 46.62, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11048, 'BOTTM', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 3, 24.12, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11049, 'GOURL', 3, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 8.34, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11050, 'FOLKO', 8, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 59.41, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11051, 'LAMAI', 7, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', NULL, 3, 2.79, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11052, 'HANAR', 3, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 67.26, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11053, 'PICCO', 2, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 53.05, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11054, 'CACTU', 8, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', NULL, 1, 0.33, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11055, 'HILAA', 7, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 120.92, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11056, 'EASTC', 8, '4/28/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 2, 278.96, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11057, 'NORTS', 3, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 4.13, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11058, 'BLAUS', 9, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', NULL, 3, 31.14, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11059, 'RICAR', 2, '4/29/1998 12:00:00 AM', '6/10/1998 12:00:00 AM', NULL, 2, 85.8, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11060, 'FRANS', 2, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 10.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11061, 'GREAL', 4, '4/30/1998 12:00:00 AM', '6/11/1998 12:00:00 AM', NULL, 3, 14.01, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11062, 'REGGC', 4, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', NULL, 2, 29.93, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11063, 'HUNGO', 3, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 81.73, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11064, 'SAVEA', 1, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 30.09, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11065, 'LILAS', 8, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', NULL, 1, 12.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11066, 'WHITC', 7, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 44.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11067, 'DRACD', 1, '5/4/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 7.98, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11068, 'QUEEN', 8, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', NULL, 2, 81.75, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11069, 'TORTU', 1, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 15.67, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11070, 'LEHMS', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 136, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11071, 'LILAS', 1, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 0.93, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11072, 'ERNSH', 4, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 258.64, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11073, 'PERIC', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 24.95, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11074, 'SIMOB', 7, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 18.44, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11075, 'RICSU', 8, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 6.19, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11076, 'BONAP', 4, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 38.28, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11077, 'RATTC', 1, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 8.53, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (1, 'Exotic Liquids', 'Charlotte Cooper', 'Purchasing Manager', '49 Gilbert St.', 'London', NULL, 'EC1 4SD', 'UK', '(171) 555-2222', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (2, 'New Orleans Cajun Delights', 'Shelley Burke', 'Order Administrator', 'P.O. Box 78934', 'New Orleans', 'LA', '70117', 'USA', '(100) 555-4822', NULL, '#CAJUN.HTM#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (3, 'Grandma Kelly''s Homestead', 'Regina Murphy', 'Sales Representative', '707 Oxford Rd.', 'Ann Arbor', 'MI', '48104', 'USA', '(313) 555-5735', '(313) 555-3349', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (4, 'Tokyo Traders', 'Yoshi Nagase', 'Marketing Manager', '9-8 Sekimai Musashino-shi', 'Tokyo', NULL, '100', 'Japan', '(03) 3555-5011', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (5, 'Cooperativa de Quesos ''Las Cabras''', 'Antonio del Valle Saavedra', 'Export Administrator', 'Calle del Rosal 4', 'Oviedo', 'Asturias', '33007', 'Spain', '(98) 598 76 54', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (6, 'Mayumi''s', 'Mayumi Ohno', 'Marketing Representative', '92 Setsuko Chuo-ku', 'Osaka', NULL, '545', 'Japan', '(06) 431-7877', NULL, 'Mayumi''s (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/mayumi.htm#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (7, 'Pavlova, Ltd.', 'Ian Devling', 'Marketing Manager', '74 Rose St. Moonie Ponds', 'Melbourne', 'Victoria', '3058', 'Australia', '(03) 444-2343', '(03) 444-6588', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (8, 'Specialty Biscuits, Ltd.', 'Peter Wilson', 'Sales Representative', '29 King''s Way', 'Manchester', NULL, 'M14 GSD', 'UK', '(161) 555-4448', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (9, 'PB Kn�ckebr�d AB', 'Lars Peterson', 'Sales Agent', 'Kaloadagatan 13', 'G�teborg', NULL, 'S-345 67', 'Sweden', '031-987 65 43', '031-987 65 91', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (10, 'Refrescos Americanas LTDA', 'Carlos Diaz', 'Marketing Manager', 'Av. das Americanas 12.890', 'Sao Paulo', NULL, '5442', 'Brazil', '(11) 555 4640', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (11, 'Heli S��waren GmbH & Co. KG', 'Petra Winkler', 'Sales Manager', 'Tiergartenstra�e 5', 'Berlin', NULL, '10785', 'Germany', '(010) 9984510', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (12, 'Plutzer Lebensmittelgro�m�rkte AG', 'Martin Bein', 'International Marketing Mgr.', 'Bogenallee 51', 'Frankfurt', NULL, '60439', 'Germany', '(069) 992755', NULL, 'Plutzer (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/plutzer.htm#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (13, 'Nord-Ost-Fisch Handelsgesellschaft mbH', 'Sven Petersen', 'Coordinator Foreign Markets', 'Frahmredder 112a', 'Cuxhaven', NULL, '27478', 'Germany', '(04721) 8713', '(04721) 8714', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (14, 'Formaggi Fortini s.r.l.', 'Elio Rossi', 'Sales Representative', 'Viale Dante, 75', 'Ravenna', NULL, '48100', 'Italy', '(0544) 60323', '(0544) 60603', '#FORMAGGI.HTM#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (15, 'Norske Meierier', 'Beate Vileid', 'Marketing Manager', 'Hatlevegen 5', 'Sandvika', NULL, '1320', 'Norway', '(0)2-953010', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (16, 'Bigfoot Breweries', 'Cheryl Saylor', 'Regional Account Rep.', '3400 - 8th Avenue Suite 210', 'Bend', 'OR', '97101', 'USA', '(503) 555-9931', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (17, 'Svensk Sj�f�da AB', 'Michael Bj�rn', 'Sales Representative', 'Brovallav�gen 231', 'Stockholm', NULL, 'S-123 45', 'Sweden', '08-123 45 67', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (18, 'Aux joyeux eccl�siastiques', 'Guyl�ne Nodier', 'Sales Manager', '203, Rue des Francs-Bourgeois', 'Paris', NULL, '75004', 'France', '(1) 03.83.00.68', '(1) 03.83.00.62', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (19, 'New England Seafood Cannery', 'Robb Merchant', 'Wholesale Account Agent', 'Order Processing Dept. 2100 Paul Revere Blvd.', 'Boston', 'MA', '02134', 'USA', '(617) 555-3267', '(617) 555-3389', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (20, 'Leka Trading', 'Chandra Leka', 'Owner', '471 Serangoon Loop, Suite #402', 'Singapore', NULL, '0512', 'Singapore', '555-8787', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (21, 'Lyngbysild', 'Niels Petersen', 'Sales Manager', 'Lyngbysild Fiskebakken 10', 'Lyngby', NULL, '2800', 'Denmark', '43844108', '43844115', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (22, 'Zaanse Snoepfabriek', 'Dirk Luchte', 'Accounting Manager', 'Verkoop Rijnweg 22', 'Zaandam', NULL, '9999 ZZ', 'Netherlands', '(12345) 1212', '(12345) 1210', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (23, 'Karkki Oy', 'Anne Heikkonen', 'Product Manager', 'Valtakatu 12', 'Lappeenranta', NULL, '53120', 'Finland', '(953) 10956', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (24, 'G''day, Mate', 'Wendy Mackenzie', 'Sales Representative', '170 Prince Edward Parade Hunter''s Hill', 'Sydney', 'NSW', '2042', 'Australia', '(02) 555-5914', '(02) 555-4873', 'G''day Mate (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/gdaymate.htm#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (25, 'Ma Maison', 'Jean-Guy Lauzon', 'Marketing Manager', '2960 Rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-9022', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (26, 'Pasta Buttini s.r.l.', 'Giovanni Giudici', 'Order Administrator', 'Via dei Gelsomini, 153', 'Salerno', NULL, '84100', 'Italy', '(089) 6547665', '(089) 6547667', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (27, 'Escargots Nouveaux', 'Marie Delamare', 'Sales Manager', '22, rue H. Voiron', 'Montceau', NULL, '71300', 'France', '85.57.00.07', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (28, 'Gai p�turage', 'Eliane Noz', 'Sales Representative', 'Bat. B 3, rue des Alpes', 'Annecy', NULL, '74000', 'France', '38.76.98.06', '38.76.98.58', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (29, 'For�ts d''�rables', 'Chantal Goulet', 'Accounting Manager', '148 rue Chasseur', 'Ste-Hyacinthe', 'Qu�bec', 'J2S 7S8', 'Canada', '(514) 555-2955', '(514) 555-2921', NULL ) ;
-
-
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (1, 'Chai', 1, 1, '10 boxes x 20 bags', 18, 520, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (2, 'Chang', 1, 1, '24 - 12 oz bottles', 19, 522, 40, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (3, 'Aniseed Syrup', 1, 2, '12 - 550 ml bottles', 10, 13, 70, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (4, 'Chef Anton''s Cajun Seasoning', 2, 2, '48 - 6 oz jars', 22, 53, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (5, 'Chef Anton''s Gumbo Mix', 2, 2, '36 boxes', 21.35, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (6, 'Grandma''s Boysenberry Spread', 3, 2, '12 - 8 oz jars', 25, 120, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (7, 'Uncle Bob''s Organic Dried Pears', 3, 7, '12 - 1 lb pkgs.', 30, 15, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (8, 'Northwoods Cranberry Sauce', 3, 2, '12 - 12 oz jars', 40, 6, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (9, 'Mishi Kobe Niku', 4, 6, '18 - 500 g pkgs.', 97, 29, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (10, 'Ikura', 4, 8, '12 - 200 ml jars', 31, 31, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (11, 'Queso Cabrales', 5, 4, '1 kg pkg.', 21, 22, 30, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (12, 'Queso Manchego La Pastora', 5, 4, '10 - 500 g pkgs.', 38, 86, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (13, 'Konbu', 6, 8, '2 kg box', 6, 24, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (14, 'Tofu', 6, 7, '40 - 100 g pkgs.', 23.25, 35, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (15, 'Genen Shouyu', 6, 2, '24 - 250 ml bottles', 15.5, 39, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (16, 'Pavlova', 7, 3, '32 - 500 g boxes', 17.45, 29, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (17, 'Alice Mutton', 7, 6, '20 - 1 kg tins', 39, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (18, 'Carnarvon Tigers', 7, 8, '16 kg pkg.', 62.5, 42, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (19, 'Teatime Chocolate Biscuits', 8, 3, '10 boxes x 12 pieces', 9.2, 25, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (20, 'Sir Rodney''s Marmalade', 8, 3, '30 gift boxes', 81, 40, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (21, 'Sir Rodney''s Scones', 8, 3, '24 pkgs. x 4 pieces', 10, 3, 40, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (22, 'Gustaf''s Kn�ckebr�d', 9, 5, '24 - 500 g pkgs.', 21, 104, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (23, 'Tunnbr�d', 9, 5, '12 - 250 g pkgs.', 9, 61, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (24, 'Guaran� Fant�stica', 10, 1, '12 - 355 ml cans', 4.5, 20, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (25, 'NuNuCa Nu�-Nougat-Creme', 11, 3, '20 - 450 g glasses', 14, 76, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (26, 'Gumb�r Gummib�rchen', 11, 3, '100 - 250 g bags', 31.23, 15, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (27, 'Schoggi Schokolade', 11, 3, '100 - 100 g pieces', 43.9, 49, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (28, 'R�ssle Sauerkraut', 12, 7, '25 - 825 g cans', 45.6, 26, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (29, 'Th�ringer Rostbratwurst', 12, 6, '50 bags x 30 sausgs.', 123.79, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (30, 'Nord-Ost Matjeshering', 13, 8, '10 - 200 g glasses', 25.89, 10, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (31, 'Gorgonzola Telino', 14, 4, '12 - 100 g pkgs', 12.5, 0, 70, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (32, 'Mascarpone Fabioli', 14, 4, '24 - 200 g pkgs.', 32, 9, 40, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (33, 'Geitost', 15, 4, '500 g', 2.5, 112, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (34, 'Sasquatch Ale', 16, 1, '24 - 12 oz bottles', 14, 111, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (35, 'Steeleye Stout', 16, 1, '24 - 12 oz bottles', 18, 20, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (36, 'Inlagd Sill', 17, 8, '24 - 250 g  jars', 19, 112, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (37, 'Gravad lax', 17, 8, '12 - 500 g pkgs.', 26, 11, 50, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (38, 'C�te de Blaye', 18, 1, '12 - 75 cl bottles', 263.5, 17, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (39, 'Chartreuse verte', 18, 1, '750 cc per bottle', 18, 69, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (40, 'Boston Crab Meat', 19, 8, '24 - 4 oz tins', 18.4, 123, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (41, 'Jack''s New England Clam Chowder', 19, 8, '12 - 12 oz cans', 9.65, 85, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (42, 'Singaporean Hokkien Fried Mee', 20, 5, '32 - 1 kg pkgs.', 14, 26, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (43, 'Ipoh Coffee', 20, 1, '16 - 500 g tins', 46, 17, 10, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (44, 'Gula Malacca', 20, 2, '20 - 2 kg bags', 19.45, 27, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (45, 'Rogede sild', 21, 8, '1k pkg.', 9.5, 5, 70, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (46, 'Spegesild', 21, 8, '4 - 450 g glasses', 12, 95, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (47, 'Zaanse koeken', 22, 3, '10 - 4 oz boxes', 9.5, 36, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (48, 'Chocolade', 22, 3, '10 pkgs.', 12.75, 15, 70, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (49, 'Maxilaku', 23, 3, '24 - 50 g pkgs.', 20, 10, 60, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (50, 'Valkoinen suklaa', 23, 3, '12 - 100 g bars', 16.25, 65, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (51, 'Manjimup Dried Apples', 24, 7, '50 - 300 g pkgs.', 53, 20, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (52, 'Filo Mix', 24, 5, '16 - 2 kg boxes', 7, 38, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (53, 'Perth Pasties', 24, 6, '48 pieces', 32.8, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (54, 'Tourti�re', 25, 6, '16 pies', 7.45, 21, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (55, 'P�t� chinois', 25, 6, '24 boxes x 2 pies', 24, 115, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (56, 'Gnocchi di nonna Alice', 26, 5, '24 - 250 g pkgs.', 38, 21, 10, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (57, 'Ravioli Angelo', 26, 5, '24 - 250 g pkgs.', 19.5, 36, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (58, 'Escargots de Bourgogne', 27, 8, '24 pieces', 13.25, 62, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (59, 'Raclette Courdavault', 28, 4, '5 kg pkg.', 55, 79, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (60, 'Camembert Pierrot', 28, 4, '15 - 300 g rounds', 34, 19, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (61, 'Sirop d''�rable', 29, 2, '24 - 500 ml bottles', 28.5, 113, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (62, 'Tarte au sucre', 29, 3, '48 pies', 49.3, 17, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (63, 'Vegie-spread', 7, 2, '15 - 625 g jars', 43.9, 24, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (64, 'Wimmers gute Semmelkn�del', 12, 5, '20 bags x 4 pieces', 33.25, 22, 80, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (65, 'Louisiana Fiery Hot Pepper Sauce', 2, 2, '32 - 8 oz bottles', 21.05, 76, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (66, 'Louisiana Hot Spiced Okra', 2, 2, '24 - 8 oz jars', 17, 4, 100, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (67, 'Laughing Lumberjack Lager', 16, 1, '24 - 12 oz bottles', 14, 52, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (68, 'Scottish Longbreads', 8, 3, '10 boxes x 8 pieces', 12.5, 6, 10, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (69, 'Gudbrandsdalsost', 15, 4, '10 kg pkg.', 36, 26, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (70, 'Outback Lager', 7, 1, '24 - 355 ml bottles', 15, 15, 10, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (71, 'Flotemysost', 15, 4, '10 - 500 g pkgs.', 21.5, 26, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (72, 'Mozzarella di Giovanni', 14, 4, '24 - 200 g pkgs.', 34.8, 14, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (73, 'R�d Kaviar', 17, 8, '24 - 150 g jars', 15, 101, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (74, 'Longlife Tofu', 4, 7, '5 kg pkg.', 10, 4, 20, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (75, 'Rh�nbr�u Klosterbier', 12, 1, '24 - 0.5 l bottles', 7.75, 125, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (76, 'Lakkalik��ri', 23, 1, '500 ml', 18, 57, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (77, 'Original Frankfurter gr�ne So�e', 12, 2, '12 boxes', 13, 32, 0, 15, 0 ) ;
-
-
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01581','Westboro',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01730','Bedford',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01833','Georgetow',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02116','Boston',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02139','Cambridge',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02184','Braintree',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02903','Providence',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('03049','Hollis',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('03801','Portsmouth',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('06897','Wilton',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('07960','Morristown',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('08837','Edison',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('10019','New York',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('10038','New York',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('11747','Mellvile',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('14450','Fairport',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('19428','Philadelphia',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('19713','Neward',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('20852','Rockville',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('27403','Greensboro',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('27511','Cary',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('29202','Columbia',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('30346','Atlanta',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('31406','Savannah',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('32859','Orlando',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('33607','Tampa',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('40222','Louisville',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('44122','Beachwood',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('45839','Findlay',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48075','Southfield',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48084','Troy',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48304','Bloomfield Hills',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('53404','Racine',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('55113','Roseville',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('55439','Minneapolis',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('60179','Hoffman Estates',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('60601','Chicago',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('72716','Bentonville',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('75234','Dallas',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('78759','Austin',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('80202','Denver',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('80909','Colorado Springs',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('85014','Phoenix',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('85251','Scottsdale',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('90405','Santa Monica',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('94025','Menlo Park',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('94105','San Francisco',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95008','Campbell',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95054','Santa Clara',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95060','Santa Cruz',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98004','Bellevue',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98052','Redmond',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98104','Seattle',2) ;
-
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '06897' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '19713' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01581' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01730' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01833' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02116' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02139' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02184' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '40222' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '30346' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '31406' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '32859' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '33607' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '20852' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27403' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27511' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '02903' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '07960' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '08837' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10019' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10038' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '11747' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '14450' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85014' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85251' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98004' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98052' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98104' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60179' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60601' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80202' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80909' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '90405' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94025' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94105' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95008' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95054' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95060' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '19428' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '44122' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '45839' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '53404' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03049' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03801' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48075' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48084' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48304' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55113' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55439' ) ;
-
-
-
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 11, 14, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 42, 9.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 72, 34.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 14, 18.6, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 51, 42.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 41, 7.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 51, 42.4, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 65, 16.8, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 22, 16.8, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 57, 15.6, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 65, 16.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 20, 64.8, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 33, 2, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 60, 27.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 31, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 39, 14.4, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 49, 16, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 24, 3.6, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 55, 19.2, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 74, 8, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 2, 15.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 16, 13.9, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 36, 15.2, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 59, 44, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 53, 26.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 77, 10.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 27, 35.1, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 39, 14.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 77, 10.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 2, 15.2, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 5, 17, 65, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 21, 8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 37, 20.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 41, 7.7, 16, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 57, 15.6, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 62, 39.4, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 70, 12, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 21, 8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 35, 14.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 5, 17, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 7, 24, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 56, 30.4, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 16, 13.9, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 24, 3.6, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 30, 20.7, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 74, 8, 36, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 2, 15.2, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 41, 7.7, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 17, 31.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 70, 12, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10266, 12, 30.4, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 40, 14.7, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 59, 44, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 76, 14.4, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 29, 99, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 72, 27.8, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 33, 2, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 72, 27.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 36, 15.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 43, 36.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10271, 33, 2, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 20, 64.8, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 31, 10, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 72, 27.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 10, 24.8, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 31, 10, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 33, 2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 40, 14.7, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 76, 14.4, 33, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 71, 17.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 72, 27.8, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 24, 3.6, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 59, 44, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 10, 24.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 13, 4.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 28, 36.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 62, 39.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 44, 15.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 59, 44, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 63, 35.1, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 73, 12, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10279, 17, 31.2, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 24, 3.6, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 55, 19.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 75, 6.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 19, 7.3, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 24, 3.6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 35, 14.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 30, 20.7, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 57, 15.6, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 15, 12.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 19, 7.3, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 60, 27.2, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 72, 27.8, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 27, 35.1, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 44, 15.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 60, 27.2, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 67, 11.2, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 1, 14.4, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 40, 14.7, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 53, 26.2, 36, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 35, 14.4, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 62, 39.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 16, 13.9, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 34, 11.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 46, 9.6, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 54, 5.9, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 68, 10, 3, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 3, 8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 64, 26.6, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 5, 17, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 29, 99, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 49, 16, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 77, 10.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 13, 4.8, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 44, 15.5, 24, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 51, 42.4, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10292, 20, 64.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 18, 50, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 24, 3.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 63, 35.1, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 75, 6.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 1, 14.4, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 17, 31.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 43, 36.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 60, 27.2, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 75, 6.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10295, 56, 30.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 11, 16.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 16, 13.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 69, 28.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 39, 14.4, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 72, 27.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 2, 15.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 36, 15.2, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 59, 44, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 62, 39.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 19, 7.3, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 70, 12, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 66, 13.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 68, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 40, 14.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 17, 31.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 28, 36.4, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 43, 36.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 40, 14.7, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 65, 16.8, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 68, 10, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 49, 16, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 59, 44, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 71, 17.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 18, 50, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 29, 99, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 39, 14.4, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 30, 20.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 53, 26.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 54, 5.9, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 62, 39.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 68, 10, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 69, 28.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 70, 12, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 4, 17.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 6, 20, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 42, 11.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 43, 36.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 71, 17.2, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 16, 13.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 62, 39.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 42, 11.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 69, 28.8, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 28, 36.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 43, 36.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 53, 26.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 75, 6.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10313, 36, 15.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 32, 25.6, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 58, 10.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 62, 39.4, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 34, 11.2, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 70, 12, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 41, 7.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 62, 39.4, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10317, 1, 14.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 41, 7.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 76, 14.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 17, 31.2, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 28, 36.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 76, 14.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10320, 71, 17.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10321, 35, 14.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10322, 52, 5.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 15, 12.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 25, 11.2, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 39, 14.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 35, 14.4, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 46, 9.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 59, 44, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 63, 35.1, 80, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 6, 20, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 13, 4.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 14, 18.6, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 31, 10, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 72, 27.8, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 4, 17.6, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 57, 15.6, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 75, 6.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 2, 15.2, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 11, 16.8, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 30, 20.7, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 58, 10.6, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 59, 44, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 65, 16.8, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 68, 10, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 19, 7.3, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 30, 20.7, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 56, 30.4, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 26, 24.9, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 72, 27.8, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10331, 54, 5.9, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 18, 50, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 42, 11.2, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 47, 7.6, 16, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 14, 18.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 21, 8, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 71, 17.2, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 52, 5.6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 68, 10, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 2, 15.2, 7, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 31, 10, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 51, 42.4, 48, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10336, 4, 17.6, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 23, 7.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 26, 24.9, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 36, 15.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 37, 20.8, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 72, 27.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 17, 31.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 30, 20.7, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 4, 17.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 17, 31.2, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 62, 39.4, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 18, 50, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 41, 7.7, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 43, 36.8, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 33, 2, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 59, 44, 9, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 2, 15.2, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 31, 10, 56, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 36, 15.2, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 55, 19.2, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 64, 26.6, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 68, 10, 4, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 76, 14.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 4, 17.6, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 8, 32, 70, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 8, 32, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 19, 7.3, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 42, 11.2, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 17, 31.2, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 25, 11.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 39, 14.4, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 40, 14.7, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 75, 6.2, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 23, 7.2, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10349, 54, 5.9, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 50, 13, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 69, 28.8, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 41, 7.7, 13, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 44, 15.5, 77, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 65, 16.8, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 24, 3.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 54, 5.9, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 11, 16.8, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 38, 210.8, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 1, 14.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 29, 99, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 24, 3.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 57, 15.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 31, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 55, 19.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 69, 28.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 10, 24.8, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 26, 24.9, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 60, 27.2, 8, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 24, 3.6, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 34, 11.2, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 36, 15.2, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 16, 13.9, 56, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 31, 10, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 60, 27.2, 80, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 28, 36.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 29, 99, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 38, 210.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 49, 16, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 54, 5.9, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 39, 14.4, 54, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 60, 27.2, 55, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 25, 11.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 51, 42.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 54, 5.9, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 31, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 75, 6.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 76, 14.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 69, 28.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 71, 17.2, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10365, 11, 16.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 65, 16.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 77, 10.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 34, 11.2, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 54, 5.9, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 65, 16.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 77, 10.4, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 21, 8, 5, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 28, 36.4, 13, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 57, 15.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 29, 99, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 56, 30.4, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 64, 26.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 74, 8, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10371, 36, 15.2, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 20, 64.8, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 38, 210.8, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 60, 27.2, 70, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 72, 27.8, 42, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 58, 10.6, 80, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 71, 17.2, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 31, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 58, 10.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 14, 18.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 54, 5.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10376, 31, 10, 42, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 28, 36.4, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 39, 14.4, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10378, 71, 17.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 41, 7.7, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 63, 35.1, 16, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 65, 16.8, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 30, 20.7, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 53, 26.2, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 60, 27.2, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 70, 12, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10381, 74, 8, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 5, 17, 32, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 18, 50, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 29, 99, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 33, 2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 74, 8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 13, 4.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 50, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 20, 64.8, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 60, 27.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 7, 24, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 60, 27.2, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 68, 10, 8, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 24, 3.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 34, 11.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 24, 3.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 28, 36.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 59, 44, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 71, 17.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 45, 7.6, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 52, 5.6, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 53, 26.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 10, 24.8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 55, 19.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 62, 39.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 70, 12, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 31, 10, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 35, 14.4, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 46, 9.6, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 72, 27.8, 24, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10391, 13, 4.8, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10392, 69, 28.8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 2, 15.2, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 14, 18.6, 42, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 25, 11.2, 7, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 26, 24.9, 70, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 31, 10, 32, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 13, 4.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 62, 39.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 46, 9.6, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 53, 26.2, 70, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 69, 28.8, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 23, 7.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 71, 17.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 72, 27.8, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 21, 8, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 51, 42.4, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 35, 14.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 68, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 71, 17.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 76, 14.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 77, 10.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 29, 99, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 35, 14.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 49, 16, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 30, 20.7, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 56, 30.4, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 65, 16.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 71, 17.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 23, 7.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 63, 35.1, 65, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 48, 10.2, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 26, 24.9, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 42, 11.2, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 49, 16, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10405, 3, 8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 1, 14.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 21, 8, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 28, 36.4, 42, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 36, 15.2, 5, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 40, 14.7, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 11, 16.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 69, 28.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 71, 17.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 37, 20.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 54, 5.9, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 62, 39.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 14, 18.6, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 21, 8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 33, 2, 49, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 59, 44, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 41, 7.7, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 44, 15.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 59, 44, 9, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10412, 14, 18.6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 1, 14.4, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 62, 39.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 76, 14.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 19, 7.3, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 33, 2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 17, 31.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 33, 2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 19, 7.3, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 53, 26.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 57, 15.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 38, 210.8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 46, 9.6, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 68, 10, 36, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 77, 10.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 2, 15.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 47, 7.6, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 61, 22.8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 74, 8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 60, 27.2, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 69, 28.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 9, 77.6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 13, 4.8, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 70, 12, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 73, 12, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 19, 7.3, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 26, 24.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 53, 26.2, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 77, 10.4, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10422, 26, 24.9, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 31, 10, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 59, 44, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 35, 14.4, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 38, 210.8, 49, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 68, 10, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 55, 19.2, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 76, 14.4, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 56, 30.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 64, 26.6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10427, 14, 18.6, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10428, 46, 9.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 50, 13, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 63, 35.1, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 17, 31.2, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 21, 8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 56, 30.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 59, 44, 70, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 17, 31.2, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 40, 14.7, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 47, 7.6, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 26, 24.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 54, 5.9, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10433, 56, 30.4, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 11, 16.8, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 76, 14.4, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 2, 15.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 22, 16.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 72, 27.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 46, 9.6, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 56, 30.4, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 64, 26.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 75, 6.2, 24, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10437, 53, 26.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 19, 7.3, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 34, 11.2, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 57, 15.6, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 12, 30.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 16, 13.9, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 64, 26.6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 74, 8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 2, 15.2, 45, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 16, 13.9, 49, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 29, 99, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 61, 22.8, 90, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10441, 27, 35.1, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 11, 16.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 54, 5.9, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 66, 13.6, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 11, 16.8, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 28, 36.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 17, 31.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 26, 24.9, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 35, 14.4, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 41, 7.7, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 39, 14.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 54, 5.9, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 19, 7.3, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 24, 3.6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 31, 10, 3, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 52, 5.6, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 19, 7.3, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 65, 16.8, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 71, 17.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 26, 24.9, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 40, 14.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 10, 24.8, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 52, 5.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 62, 39.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 10, 24.8, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 54, 5.9, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 65, 16.8, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 77, 10.4, 55, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 28, 36.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 44, 15.5, 100, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 48, 10.2, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 70, 12, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 16, 13.9, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 33, 2, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 46, 9.6, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 39, 14.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 53, 26.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 61, 22.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 71, 17.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 21, 8, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 49, 16, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10457, 59, 44, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 26, 24.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 28, 36.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 43, 36.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 56, 30.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 71, 17.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 7, 24, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 46, 9.6, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 72, 27.8, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 68, 10, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 75, 6.2, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 21, 8, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 30, 20.7, 28, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 55, 19.2, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 13, 4.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 23, 7.2, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 19, 7.3, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 42, 11.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 4, 17.6, 16, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 43, 36.8, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 56, 30.4, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 60, 27.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 24, 3.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 29, 99, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 40, 14.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 45, 7.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 50, 13, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 11, 16.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 46, 9.6, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 24, 3.6, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 25, 11.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 30, 20.7, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 43, 36.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 2, 15.2, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 16, 13.9, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 44, 15.5, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 18, 50, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 23, 7.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 64, 26.6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 7, 24, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 24, 3.6, 80, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 51, 42.4, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 33, 2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 71, 17.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 14, 18.6, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 28, 36.4, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 40, 14.7, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 75, 6.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 31, 10, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 66, 13.6, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 76, 14.4, 42, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 55, 19.2, 2, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 70, 12, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 1, 14.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 21, 8, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 39, 14.4, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10478, 10, 24.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 38, 210.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 53, 26.2, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 59, 44, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 64, 26.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 47, 7.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 59, 44, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 49, 16, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 60, 27.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10482, 40, 14.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 34, 11.2, 35, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 77, 10.4, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 21, 8, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 40, 14.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 51, 42.4, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 2, 15.2, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 3, 8, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 55, 19.2, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 70, 12, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 11, 16.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 51, 42.4, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 74, 8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 19, 7.3, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 26, 24.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 54, 5.9, 24, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 59, 44, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 73, 12, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 11, 16.8, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 16, 13.9, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 59, 44, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 68, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 75, 6.2, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 44, 15.5, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 77, 10.4, 7, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 25, 11.2, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 42, 11.2, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 65, 16.8, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 66, 13.6, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 69, 28.8, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10494, 56, 30.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 23, 7.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 41, 7.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 77, 10.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10496, 31, 10, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 56, 30.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 72, 27.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 77, 10.4, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 24, 4.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 40, 18.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 42, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 49, 20, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 15, 15.5, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 28, 45.6, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10501, 54, 7.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 45, 9.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 53, 32.8, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 67, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 14, 23.25, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 65, 21.05, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 2, 19, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 21, 10, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 53, 32.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 61, 28.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10505, 62, 49.3, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 25, 14, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 70, 15, 14, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 43, 46, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 48, 12.75, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 39, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10509, 28, 45.6, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 29, 123.79, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 75, 7.75, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 4, 22, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 7, 30, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 8, 40, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 24, 4.5, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 46, 12, 9, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 47, 9.5, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 60, 34, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 21, 10, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 32, 32, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 61, 28.5, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 20, 81, 39, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 28, 45.6, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 56, 38, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 65, 21.05, 39, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 75, 7.75, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 9, 97, 16, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 16, 17.45, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 27, 43.9, 120, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 33, 2.5, 16, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 60, 34, 84, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 18, 62.5, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 41, 9.65, 80, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 42, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 52, 7, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 59, 55, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 70, 15, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 24, 4.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 38, 263.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 44, 19.45, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 10, 31, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 56, 38, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 60, 34, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 24, 4.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 53, 32.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 35, 18, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 41, 9.65, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 68, 12.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 1, 18, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 8, 40, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 30, 25.89, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 40, 18.4, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 17, 39, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 20, 81, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 37, 26, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 41, 9.65, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 10, 31, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 30, 25.89, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 43, 46, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 54, 7.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 36, 19, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 40, 18.4, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 1, 18, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 56, 38, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 4, 22, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 36, 19, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 11, 21, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 33, 2.5, 8, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 72, 34.8, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 55, 24, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 69, 36, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 17, 39, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 43, 46, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 61, 28.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 76, 18, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10531, 59, 55, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 66, 17, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 4, 22, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 72, 34.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 73, 15, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 30, 25.89, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 40, 18.4, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 54, 7.45, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 11, 21, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 40, 18.4, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 57, 19.5, 5, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 59, 55, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 12, 38, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 60, 34, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 31, 12.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 51, 53, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 58, 13.25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 72, 34.8, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 73, 15, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 70, 15, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 72, 34.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 13, 6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 21, 10, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 33, 2.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 49, 20, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 3, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 26, 31.23, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 38, 263.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 68, 12.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 24, 4.5, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 38, 263.5, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 65, 21.05, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 71, 21.5, 9, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 11, 21, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 54, 7.45, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 12, 38, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 23, 9, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 28, 45.6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 67, 14, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10545, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 7, 30, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 35, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 62, 49.3, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 32, 32, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 36, 19, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 34, 14, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 41, 9.65, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 31, 12.5, 55, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 45, 9.5, 100, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 51, 53, 48, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 17, 39, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 19, 9.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 21, 10, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 61, 28.5, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 16, 17.45, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 35, 18, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 44, 19.45, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 69, 36, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 75, 7.75, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 16, 17.45, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 22, 21, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 31, 12.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 35, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 23, 9, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 77, 13, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 14, 23.25, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 19, 9.2, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 24, 4.5, 18, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 51, 53, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 56, 38, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10556, 72, 34.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 64, 33.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 47, 9.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 52, 7, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 53, 32.8, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 73, 15, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 41, 9.65, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 55, 24, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 30, 25.89, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 62, 49.3, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 44, 19.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 51, 53, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 33, 2.5, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 62, 49.3, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 36, 19, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 52, 7, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 17, 39, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 31, 12.5, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 55, 24, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 24, 4.5, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 64, 33.25, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 11, 21, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 18, 62.5, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 31, 12.5, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 51, 53, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 59, 55, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10568, 10, 31, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 31, 12.5, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 76, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 11, 21, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 56, 38, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 14, 23.25, 11, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 42, 14, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 16, 17.45, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 32, 32, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 40, 18.4, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 75, 7.75, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 17, 39, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 34, 14, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 53, 32.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 33, 2.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 40, 18.4, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 62, 49.3, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 64, 33.25, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 59, 55, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 63, 43.9, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 72, 34.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 1, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 44, 19.45, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 39, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 77, 13, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 35, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 57, 19.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 15, 15.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 75, 7.75, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 14, 23.25, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 41, 9.65, 9, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 65, 21.05, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10581, 75, 7.75, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 57, 19.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 76, 18, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 29, 123.79, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 60, 34, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 69, 36, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10584, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10585, 47, 9.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10586, 52, 7, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 26, 31.23, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 35, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 77, 13, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 18, 62.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 42, 14, 100, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10589, 35, 18, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 1, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 77, 13, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 3, 10, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 7, 30, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 54, 7.45, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 15, 15.5, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 26, 31.23, 5, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 20, 81, 21, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 69, 36, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 76, 18, 4, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 52, 7, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 58, 13.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 35, 18, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 61, 28.5, 120, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 69, 36, 65, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 56, 38, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 63, 43.9, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 75, 7.75, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 24, 4.5, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 57, 19.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 65, 21.05, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 27, 43.9, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 71, 21.5, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10599, 62, 49.3, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 54, 7.45, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 73, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 13, 6, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 59, 55, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10602, 77, 13, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 22, 21, 48, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 49, 20, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 48, 12.75, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 76, 18, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 59, 55, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 60, 34, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 4, 22, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 55, 24, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 62, 49.3, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 7, 30, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 17, 39, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 33, 2.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 40, 18.4, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 72, 34.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10608, 56, 38, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 1, 18, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 10, 31, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 21, 10, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10610, 36, 19, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 1, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 2, 19, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 10, 31, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 36, 19, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 49, 20, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 60, 34, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 76, 18, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 13, 6, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 75, 7.75, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 11, 21, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 21, 10, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 39, 18, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10615, 55, 24, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 38, 263.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 56, 38, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 70, 15, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10617, 59, 55, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 6, 25, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 56, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 68, 12.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 21, 10, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 22, 21, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 24, 4.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 52, 7, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 19, 9.2, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 23, 9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 70, 15, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 71, 21.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 68, 12.5, 18, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 14, 23.25, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 19, 9.2, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 21, 10, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 24, 4.5, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 35, 18, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 28, 45.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 29, 123.79, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 44, 19.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 14, 23.25, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 42, 14, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 60, 34, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 53, 32.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 60, 34, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 71, 21.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 62, 49.3, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 73, 15, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10628, 1, 18, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 29, 123.79, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 64, 33.25, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 55, 24, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 76, 18, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10631, 75, 7.75, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 2, 19, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 33, 2.5, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 12, 38, 36, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 13, 6, 13, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 26, 31.23, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 62, 49.3, 80, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 7, 30, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 18, 62.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 51, 53, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 75, 7.75, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 4, 22, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 5, 21.35, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 22, 21, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 4, 22, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 58, 13.25, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 50, 16.25, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 56, 38, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 45, 9.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 65, 21.05, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 72, 34.8, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10639, 18, 62.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 69, 36, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 70, 15, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 2, 19, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 40, 18.4, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 21, 10, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 61, 28.5, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 28, 45.6, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 39, 18, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 46, 12, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 18, 62.5, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 43, 46, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 46, 12, 21, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 18, 62.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 36, 19, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 1, 18, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 10, 31, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 71, 21.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 77, 13, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 19, 9.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 39, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 22, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 24, 4.5, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 72, 34.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 30, 25.89, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 53, 32.8, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 54, 7.45, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 19, 9.2, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 22, 21, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 30, 25.89, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 42, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 60, 34, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 4, 22, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 39, 18, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 54, 7.45, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10655, 41, 9.65, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 14, 23.25, 3, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 44, 19.45, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 47, 9.5, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 15, 15.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 41, 9.65, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 46, 12, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 47, 9.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 56, 38, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 60, 34, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 21, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 40, 18.4, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 60, 34, 55, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 77, 13, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 31, 12.5, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 40, 18.4, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 70, 15, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10660, 20, 81, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 39, 18, 3, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 58, 13.25, 49, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10662, 68, 12.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 40, 18.4, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 42, 14, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 51, 53, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 10, 31, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 56, 38, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 59, 55, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 29, 123.79, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 65, 21.05, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 69, 36, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 71, 21.5, 14, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 31, 12.5, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 55, 24, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 64, 33.25, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10669, 36, 19, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 23, 9, 32, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 46, 12, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 67, 14, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 73, 15, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 75, 7.75, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 16, 17.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 62, 49.3, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 65, 21.05, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 38, 263.5, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 71, 21.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 16, 17.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 42, 14, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 43, 46, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10674, 23, 9, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 14, 23.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 53, 32.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 58, 13.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 10, 31, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 19, 9.2, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 44, 19.45, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 26, 31.23, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 33, 2.5, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 12, 38, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 41, 9.65, 120, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 54, 7.45, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10679, 59, 55, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 16, 17.45, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 31, 12.5, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 42, 14, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 19, 9.2, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 21, 10, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 64, 33.25, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 66, 17, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 75, 7.75, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10683, 52, 7, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 40, 18.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 47, 9.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 60, 34, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 10, 31, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 41, 9.65, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 47, 9.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 17, 39, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 26, 31.23, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 9, 97, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 29, 123.79, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 36, 19, 6, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 10, 31, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 28, 45.6, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 34, 14, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10689, 1, 18, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 56, 38, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 77, 13, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 1, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 29, 123.79, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 43, 46, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 44, 19.45, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 62, 49.3, 48, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10692, 63, 43.9, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 9, 97, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 54, 7.45, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 69, 36, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 73, 15, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 7, 30, 90, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 59, 55, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 70, 15, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 8, 40, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 12, 38, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 17, 39, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 46, 12, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 19, 9.2, 7, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 35, 18, 9, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 58, 13.25, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 70, 15, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 17, 39, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 29, 123.79, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 65, 21.05, 65, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 70, 15, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10699, 47, 9.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 1, 18, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 34, 14, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 68, 12.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 71, 21.5, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 59, 55, 42, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 71, 21.5, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 76, 18, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 3, 10, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 76, 18, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 2, 19, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 59, 55, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 73, 15, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 4, 22, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 24, 4.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 48, 12.75, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 32, 32, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 16, 17.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 43, 46, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 59, 55, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 55, 24, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 57, 19.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 70, 15, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 5, 21.35, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 36, 19, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 8, 40, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 51, 53, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 60, 34, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 19, 9.2, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 47, 9.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 19, 9.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 41, 9.65, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 53, 32.8, 120, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 53, 32.8, 3, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 56, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 10, 31, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 26, 31.23, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 45, 9.5, 110, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 46, 12, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 2, 19, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 17, 39, 27, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 47, 9.5, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 56, 38, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 58, 13.25, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 10, 31, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 71, 21.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 21, 10, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 51, 53, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 61, 28.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 21, 10, 32, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 54, 7.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 69, 36, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 12, 38, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 16, 17.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 36, 19, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 62, 49.3, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 18, 62.5, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 30, 25.89, 3, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 54, 7.45, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 35, 18, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 71, 21.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10721, 44, 19.45, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 2, 19, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 31, 12.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 68, 12.5, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 75, 7.75, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10723, 26, 31.23, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 10, 31, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 61, 28.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 52, 7, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 55, 24, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 4, 22, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 11, 21, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 17, 39, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 56, 38, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 59, 55, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 40, 18.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 55, 24, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 1, 18, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 21, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 50, 16.25, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 16, 17.45, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 31, 12.5, 3, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 65, 21.05, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 21, 10, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 51, 53, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10732, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 14, 23.25, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 52, 7, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 6, 25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 61, 28.5, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 77, 13, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 65, 21.05, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 13, 6, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10738, 16, 17.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 36, 19, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 52, 7, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 28, 45.6, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 35, 18, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 45, 9.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 56, 38, 14, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10741, 2, 19, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 3, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 60, 34, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 72, 34.8, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10743, 46, 12, 28, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10744, 40, 18.4, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 18, 62.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 44, 19.45, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 59, 55, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 72, 34.8, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 13, 6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 42, 14, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 62, 49.3, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 69, 36, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 31, 12.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 41, 9.65, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 63, 43.9, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 69, 36, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 23, 9, 44, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 40, 18.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 56, 38, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 56, 38, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 59, 55, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 14, 23.25, 5, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 45, 9.5, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 59, 55, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 26, 31.23, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 30, 25.89, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 50, 16.25, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 73, 15, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 1, 18, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 69, 36, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 45, 9.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 74, 10, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10754, 40, 18.4, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 47, 9.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 56, 38, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 57, 19.5, 14, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 69, 36, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 18, 62.5, 21, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 36, 19, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 68, 12.5, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 69, 36, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 34, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 59, 55, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 62, 49.3, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 64, 33.25, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 26, 31.23, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 52, 7, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 70, 15, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10759, 32, 32, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 25, 14, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 27, 43.9, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 43, 46, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 25, 14, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 75, 7.75, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 39, 18, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 47, 9.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 51, 53, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 56, 38, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 21, 10, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 22, 21, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 3, 10, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 39, 18, 130, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10765, 65, 21.05, 80, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 2, 19, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 7, 30, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 68, 12.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10767, 42, 14, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 22, 21, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 31, 12.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 71, 21.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 41, 9.65, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 52, 7, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 61, 28.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 62, 49.3, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10770, 11, 21, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10771, 71, 21.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 29, 123.79, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 59, 55, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 17, 39, 33, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 31, 12.5, 70, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 75, 7.75, 7, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 31, 12.5, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 66, 17, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 10, 31, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 67, 14, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 31, 12.5, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 42, 14, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 45, 9.5, 27, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 51, 53, 120, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10777, 42, 14, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10778, 41, 9.65, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 16, 17.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 62, 49.3, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 70, 15, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 54, 7.45, 3, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 56, 38, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 74, 10, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10782, 31, 12.5, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 31, 12.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 38, 263.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 36, 19, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 39, 18, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 72, 34.8, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 10, 31, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 75, 7.75, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 8, 40, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 30, 25.89, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 75, 7.75, 42, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 2, 19, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 29, 123.79, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 75, 7.75, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 18, 62.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 35, 18, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 63, 43.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 68, 12.5, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 7, 30, 3, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 56, 38, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 29, 123.79, 14, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 2, 19, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 54, 7.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 68, 12.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 41, 9.65, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 52, 7, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 14, 23.25, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 54, 7.45, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 16, 17.45, 65, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 17, 39, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 26, 31.23, 21, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 44, 19.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 64, 33.25, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 69, 36, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10797, 11, 21, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 62, 49.3, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 72, 34.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 13, 6, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 24, 4.5, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 59, 55, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 11, 21, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 51, 53, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 54, 7.45, 7, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 17, 39, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 29, 123.79, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 30, 25.89, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 51, 53, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 55, 24, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 62, 49.3, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 19, 9.2, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 25, 14, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 59, 55, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 10, 31, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 28, 45.6, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 49, 20, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 34, 14, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 38, 263.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 2, 19, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 65, 21.05, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 74, 10, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10807, 40, 18.4, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 56, 38, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 76, 18, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10809, 52, 7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 13, 6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 25, 14, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 70, 15, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 19, 9.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 23, 9, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 40, 18.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 31, 12.5, 16, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 72, 34.8, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 77, 13, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 2, 19, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 46, 12, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 41, 9.65, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 43, 46, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 48, 12.75, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 61, 28.5, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10815, 33, 2.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 38, 263.5, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 26, 31.23, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 38, 263.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 40, 18.4, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 62, 49.3, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 32, 32, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 41, 9.65, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 43, 46, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10820, 56, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 35, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 51, 53, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 62, 49.3, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 70, 15, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 11, 21, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 57, 19.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 59, 55, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 77, 13, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 70, 15, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 26, 31.23, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 53, 32.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 31, 12.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 57, 19.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 10, 31, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 39, 18, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 20, 81, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 38, 263.5, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 2, 19, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 8, 40, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 60, 34, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 6, 25, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 39, 18, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 60, 34, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 68, 12.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 19, 9.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 35, 18, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 38, 263.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 43, 46, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 13, 6, 3, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 25, 14, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 44, 19.45, 16, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 64, 33.25, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 7, 30, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 31, 12.5, 9, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 53, 32.8, 9, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 29, 123.79, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 30, 25.89, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 59, 55, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 77, 13, 2, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 22, 21, 52, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 35, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 57, 19.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 60, 34, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 64, 33.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 13, 6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 40, 18.4, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 47, 9.5, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 76, 18, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 1, 18, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 18, 62.5, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 36, 19, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 58, 13.25, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 72, 34.8, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 25, 14, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 39, 18, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 10, 31, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 56, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 59, 55, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 43, 46, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 70, 15, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10843, 51, 53, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10844, 22, 21, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 23, 9, 70, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 35, 18, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 42, 14, 42, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 58, 13.25, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 64, 33.25, 48, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 4, 22, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 70, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 74, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 1, 18, 80, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 19, 9.2, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 37, 26, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 45, 9.5, 36, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 60, 34, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 71, 21.5, 55, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 5, 21.35, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 9, 97, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 3, 10, 49, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 26, 31.23, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 25, 14, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 33, 2.5, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 70, 15, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 2, 19, 5, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 25, 14, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 57, 19.5, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 59, 55, 42, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 2, 19, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 17, 39, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 62, 49.3, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10853, 18, 62.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 10, 31, 100, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 13, 6, 65, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 16, 17.45, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 31, 12.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 56, 38, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 42, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 3, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 26, 31.23, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 29, 123.79, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 7, 30, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 27, 43.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 70, 15, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 24, 4.5, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 54, 7.45, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 64, 33.25, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 51, 53, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 17, 39, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 18, 62.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 21, 10, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 33, 2.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 62, 49.3, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 11, 21, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 52, 7, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 1, 18, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 58, 13.25, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 35, 18, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 67, 14, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 38, 263.5, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 39, 18, 80, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 2, 19, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 24, 4.5, 6, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 30, 25.89, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10867, 53, 32.8, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 26, 31.23, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 35, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 49, 20, 42, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 1, 18, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 23, 9, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 35, 18, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 51, 53, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 6, 25, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 16, 17.45, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 17, 39, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 55, 24, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 64, 33.25, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 65, 21.05, 21, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 21, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 28, 45.6, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10874, 10, 31, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 19, 9.2, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 47, 9.5, 21, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 49, 20, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 46, 12, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 64, 33.25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 16, 17.45, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 18, 62.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10878, 20, 81, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 40, 18.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 65, 21.05, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 23, 9, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 61, 28.5, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 70, 15, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10881, 73, 15, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 42, 14, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 49, 20, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 54, 7.45, 32, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10883, 24, 4.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 21, 10, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 56, 38, 21, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 65, 21.05, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 24, 4.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 70, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 77, 13, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 10, 31, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 31, 12.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 77, 13, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10887, 25, 14, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 68, 12.5, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 11, 21, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 38, 263.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 17, 39, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 34, 14, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 41, 9.65, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10891, 30, 25.89, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10892, 59, 55, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 8, 40, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 24, 4.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 29, 123.79, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 30, 25.89, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 36, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 13, 6, 28, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 69, 36, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 75, 7.75, 120, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 24, 4.5, 110, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 39, 18, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 40, 18.4, 91, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 60, 34, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 45, 9.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 56, 38, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 29, 123.79, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 30, 25.89, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10898, 13, 6, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10899, 39, 18, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10900, 70, 15, 3, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 41, 9.65, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 71, 21.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 55, 24, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 62, 49.3, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 13, 6, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 65, 21.05, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 58, 13.25, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 62, 49.3, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10905, 1, 18, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10906, 61, 28.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10907, 75, 7.75, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 7, 30, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 52, 7, 14, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 7, 30, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 16, 17.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 41, 9.65, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 19, 9.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 49, 20, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 61, 28.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 1, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 17, 39, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 67, 14, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 11, 21, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 4, 22, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 33, 2.5, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 58, 13.25, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10914, 71, 21.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 17, 39, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 54, 7.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 16, 17.45, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 32, 32, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 57, 19.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 30, 25.89, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 60, 34, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 1, 18, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 60, 34, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 16, 17.45, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 25, 14, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 40, 18.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10920, 50, 16.25, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 35, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 63, 43.9, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 17, 39, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 24, 4.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 42, 14, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 43, 46, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 67, 14, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 10, 31, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 28, 45.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 75, 7.75, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 36, 19, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 52, 7, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 11, 21, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 19, 9.2, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 72, 34.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 20, 81, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 52, 7, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 47, 9.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 76, 18, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 21, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 75, 7.75, 49, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 21, 10, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 27, 43.9, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 55, 24, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 58, 13.25, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 13, 6, 42, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 57, 19.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 62, 49.3, 14, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 72, 34.8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 75, 7.75, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 53, 32.8, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 61, 28.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10934, 6, 25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 1, 18, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 18, 62.5, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 23, 9, 8, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10936, 36, 19, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 28, 45.6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 34, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 13, 6, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 43, 46, 24, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 60, 34, 49, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 71, 21.5, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 2, 19, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 67, 14, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 7, 30, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 13, 6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 31, 12.5, 44, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 62, 49.3, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 68, 12.5, 80, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 72, 34.8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10942, 49, 20, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 13, 6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 22, 21, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 46, 12, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 11, 21, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 44, 19.45, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 56, 38, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 13, 6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 31, 12.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 10, 31, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 24, 4.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 77, 13, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10947, 59, 55, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 50, 16.25, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 51, 53, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 55, 24, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 6, 25, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 10, 31, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 17, 39, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 62, 49.3, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10950, 4, 22, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 33, 2.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 41, 9.65, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 75, 7.75, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 6, 25, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 28, 45.6, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 20, 81, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 16, 17.45, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 31, 12.5, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 45, 9.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 60, 34, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10955, 75, 7.75, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 21, 10, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 47, 9.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 51, 53, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 30, 25.89, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 35, 18, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 64, 33.25, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 5, 21.35, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 7, 30, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 72, 34.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10959, 75, 7.75, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 24, 4.5, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 41, 9.65, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 52, 7, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 76, 18, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 7, 30, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 13, 6, 77, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 53, 32.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 69, 36, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 76, 18, 44, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10963, 60, 34, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 18, 62.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 38, 263.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 69, 36, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10965, 51, 53, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 37, 26, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 56, 38, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 62, 49.3, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 19, 9.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 49, 20, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 12, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 24, 4.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 64, 33.25, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10969, 46, 12, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10970, 52, 7, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10971, 29, 123.79, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 17, 39, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 33, 2.5, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 26, 31.23, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 41, 9.65, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 75, 7.75, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10974, 63, 43.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 8, 40, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 75, 7.75, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10976, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 39, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 47, 9.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 51, 53, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 63, 43.9, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 8, 40, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 21, 10, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 40, 18.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 44, 19.45, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 7, 30, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 12, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 24, 4.5, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 27, 43.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 31, 12.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 63, 43.9, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10980, 75, 7.75, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10981, 38, 263.5, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 7, 30, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 43, 46, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 13, 6, 84, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 57, 19.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 16, 17.45, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 36, 19, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 16, 17.45, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 18, 62.5, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 32, 32, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 11, 21, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 20, 81, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 7, 30, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 43, 46, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 72, 34.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 7, 30, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 62, 49.3, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 6, 25, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 41, 9.65, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 21, 10, 65, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 34, 14, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 55, 24, 65, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 61, 28.5, 66, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 2, 19, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 70, 15, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 76, 18, 90, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10992, 72, 34.8, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 29, 123.79, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 41, 9.65, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10994, 59, 55, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 60, 34, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10996, 42, 14, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 32, 32, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 46, 12, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 52, 7, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 24, 4.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 61, 28.5, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 74, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 75, 7.75, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 51, 53, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 77, 13, 21, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 4, 22, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 77, 13, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 7, 30, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 22, 21, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 46, 12, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 55, 24, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 13, 6, 56, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 35, 18, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 42, 14, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 55, 24, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 1, 18, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 40, 18.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 52, 7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 26, 31.23, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 76, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 1, 18, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 59, 55, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 1, 18, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 29, 123.79, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 8, 40, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 29, 123.79, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 42, 14, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 28, 45.6, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 34, 14, 90, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 71, 21.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 24, 4.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 36, 19, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 60, 34, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 7, 30, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 24, 4.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 58, 13.25, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 71, 21.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 60, 34, 36, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 71, 21.5, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 23, 9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 42, 14, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 45, 9.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 68, 12.5, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11014, 41, 9.65, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 77, 13, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 31, 12.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 36, 19, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 3, 10, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 59, 55, 110, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 70, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 12, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 18, 62.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 56, 38, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 46, 12, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 49, 20, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11020, 10, 31, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 2, 19, 11, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 20, 81, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 26, 31.23, 63, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 51, 53, 44, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 72, 34.8, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 19, 9.2, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 69, 36, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 7, 30, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 43, 46, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 26, 31.23, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 65, 21.05, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 71, 21.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 1, 18, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 13, 6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 18, 62.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 51, 53, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 62, 49.3, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 55, 24, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 59, 55, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 56, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 63, 43.9, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 2, 19, 100, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 5, 21.35, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 59, 55, 100, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 1, 18, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 13, 6, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 24, 4.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 64, 33.25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 71, 21.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 36, 19, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 38, 263.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 59, 55, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 53, 32.8, 70, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 69, 36, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 21, 10, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 44, 19.45, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 61, 28.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 1, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 35, 18, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 42, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 54, 7.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 13, 6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 59, 55, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11037, 70, 15, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 40, 18.4, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 52, 7, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 71, 21.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 35, 18, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 49, 20, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 57, 19.5, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11040, 21, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 2, 19, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 63, 43.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 44, 19.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 61, 28.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11043, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11044, 62, 49.3, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 33, 2.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 51, 53, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 12, 38, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 32, 32, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 35, 18, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 1, 18, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 5, 21.35, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11048, 68, 12.5, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 2, 19, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 12, 38, 4, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11050, 76, 18, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11051, 24, 4.5, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 43, 46, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 61, 28.5, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 18, 62.5, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 32, 32, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 64, 33.25, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 33, 2.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 67, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 24, 4.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 25, 14, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 57, 19.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 7, 30, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 55, 24, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 60, 34, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11057, 70, 15, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 21, 10, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 60, 34, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 61, 28.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 13, 6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 17, 39, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 60, 34, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 60, 34, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 77, 13, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11061, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 53, 32.8, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 70, 15, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 34, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 40, 18.4, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 41, 9.65, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 17, 39, 77, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 53, 32.8, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 55, 24, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 68, 12.5, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 30, 25.89, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 54, 7.45, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 16, 17.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 19, 9.2, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 34, 14, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11067, 41, 9.65, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 28, 45.6, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 43, 46, 36, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 77, 13, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11069, 39, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 1, 18, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 2, 19, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 16, 17.45, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 7, 30, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 13, 6, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 2, 19, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 41, 9.65, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 50, 16.25, 22, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 64, 33.25, 130, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11074, 16, 17.45, 14, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 2, 19, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 46, 12, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 76, 18, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 6, 25, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 14, 23.25, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 19, 9.2, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 2, 19, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 3, 10, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 4, 22, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 6, 25, 1, 0.02 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 7, 30, 1, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 8, 40, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 10, 31, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 12, 38, 2, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 13, 6, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 14, 23.25, 1, 0.03 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 16, 17.45, 2, 0.03 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 20, 81, 1, 0.04 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 23, 9, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 32, 32, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 39, 18, 2, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 41, 9.65, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 46, 12, 3, 0.02 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 52, 7, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 55, 24, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 60, 34, 2, 0.06 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 64, 33.25, 2, 0.03 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 66, 17, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 73, 15, 2, 0.01 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 75, 7.75, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 77, 13, 2, 0 ) ;
-
-INSERT INTO GHTDB.TYPES_SIMPLE (ID, T_NUMBER, T_LONG, T_FLOAT, T_VARCHAR, T_NVARCHAR, T_CHAR, T_NCHAR) VALUES ('0', 21, 'asdasd', 7.23157, 'heh', 'heh', 'heh', 'heh');
-INSERT INTO GHTDB.TYPES_EXTENDED (ID, T_RAW, T_LONGRAW, T_DATE, T_BLOB, T_CLOB, T_NCLOB) VALUES ('0', HexToRaw('a79d8798cb7987987a'), HexToRaw('a79d8798cb7987987a'), '02/02/02 02:02:02 PM', HexToRaw('a79d8798cb7987987a'), 'heh', 'heh');
-INSERT INTO GHTDB.TYPES_EXTENDED (ID, T_DATE) VALUES ('MIN', '01/01/01 12:00:00 AM');
-
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax,Picture ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545',10 ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax,Picture ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745',20 ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer  Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-/
-
-
-commit;
-
-exit
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql
deleted file mode 100755
index a5feb72a00b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/GHTDB.ORACLE.sql
+++ /dev/null
@@ -1,979 +0,0 @@
-DROP INDEX GHTDB.categoryname;
-DROP INDEX GHTDB.city;
-DROP INDEX GHTDB.companyname_1;
-DROP INDEX GHTDB.postalcode_2;
-DROP INDEX GHTDB.region;
-DROP INDEX GHTDB.lastname;
-DROP INDEX GHTDB.postalcode_1;
-DROP INDEX GHTDB.categoryid;
-DROP INDEX GHTDB.productname;
-DROP INDEX GHTDB.suppliersproducts;
-DROP INDEX GHTDB.companyname;
-DROP INDEX GHTDB.postalcode;
-
-DROP TABLE GHTDB.TYPES_SIMPLE;
-DROP TABLE GHTDB.TYPES_EXTENDED;
-DROP TABLE GHTDB.TYPES_SPECIFIC;
-DROP TABLE GHTDB.categories;
-DROP TABLE GHTDB.customercustomerdemo;
-DROP TABLE GHTDB.customerdemographics;
-DROP TABLE GHTDB.customers;
-DROP TABLE GHTDB.employees;
-DROP TABLE GHTDB.employeeterritories;
-DROP TABLE GHTDB.gh_emptytable;
-DROP TABLE GHTDB."Order Details";
-DROP TABLE GHTDB.orders;
-DROP TABLE GHTDB.products;
-DROP TABLE GHTDB.region;
-DROP TABLE GHTDB.Results;
-DROP TABLE GHTDB.shippers;
-DROP TABLE GHTDB.shoppingcart;
-DROP TABLE GHTDB.suppliers;
-DROP TABLE GHTDB.territories;
-
-DROP SEQUENCE GHTDB.s_463_1_reviews;
-DROP SEQUENCE GHTDB.s_464_1_shoppingcart;
-DROP SEQUENCE GHTDB.s_59_1_products;
-DROP SEQUENCE GHTDB.s_60_1_orders;
-DROP SEQUENCE GHTDB.s_62_1_suppliers;
-DROP SEQUENCE GHTDB.s_63_1_shippers;
-DROP SEQUENCE GHTDB.s_65_1_employees;
-DROP SEQUENCE GHTDB.s_68_1_categories;
-
-DROP USER GHTDB CASCADE;
-
-CREATE USER "GHTDB"
-    IDENTIFIED BY "GHTDB" DEFAULT TABLESPACE "USERS"
-    TEMPORARY TABLESPACE "TEMP" ;
-
-GRANT CONNECT, RESOURCE, CREATE TABLE  TO "GHTDB";
-
-CREATE OR REPLACE  PACKAGE "GHTDB"."GHTPKG"  AS
-	TYPE RCT1 IS REF CURSOR;
-	IDENTITY INTEGER;
-	
-	procedure ghsp_pkgAmbig(res out rct1);
-	procedure ghsp_inPkg(CustomerIdPrm IN CHAR, result OUT RCT1);
-END;
-/
-
-CREATE TABLE GHTDB.TYPES_SIMPLE (
-	ID CHAR(10) NULL,
-	T_NUMBER NUMBER(10) NULL, 
-	T_LONG LONG NULL, 
-	T_FLOAT FLOAT(10) NULL, 
-	T_VARCHAR VARCHAR2(10) NULL, 
-	T_NVARCHAR NVARCHAR2(10) NULL, 
-	T_CHAR CHAR(10) NULL,
-	T_NCHAR NCHAR(10) NULL
-)
-  TABLESPACE USERS
-/
-
-
-
-CREATE TABLE GHTDB.TYPES_EXTENDED (
-	ID CHAR(10) NULL,
-	T_RAW RAW(10) NULL, 
-	T_LONGRAW LONG RAW NULL, 
-	T_DATE DATE NULL, 
-	T_BLOB BLOB NULL, 
-	T_CLOB CLOB NULL, 
-	T_NCLOB NCLOB NULL
-)
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB.TYPES_SPECIFIC (
-	ID	CHAR(10) NULL,
-	T_ROWID ROWID NULL, 
-	T_UROWID UROWID NULL, 
-	T_BFILE BFILE NULL, 
-	T_XMLTYPE SYS.XMLTYPE NULL
-)
-  TABLESPACE USERS 
-/
-
-CREATE TABLE GHTDB.categories (
-  categoryid   NUMBER(10,0) NOT NULL,
-  categoryname VARCHAR2(30) NOT NULL,
-  description  CLOB         NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.categoryname
-  ON GHTDB.categories (
-    categoryname
-  )
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB.customercustomerdemo (
-  customerid     CHAR(10) NOT NULL,
-  customertypeid CHAR(20) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-ALTER TABLE GHTDB.customercustomerdemo
-  ADD CONSTRAINT pk_customercustomerdemo UNIQUE (
-    customerid,
-    customertypeid
-  )
-/
-
-CREATE TABLE GHTDB.customerdemographics (
-  customertypeid CHAR(20) NOT NULL,
-  customerdesc   CLOB     NULL
-)
-  TABLESPACE USERS
-/
-
-
-ALTER TABLE GHTDB.customerdemographics
-  ADD CONSTRAINT pk_customerdemographics UNIQUE (
-    customertypeid
-  )
-/
-
-CREATE TABLE GHTDB.customers (
-  customerid   CHAR(10)      NOT NULL,
-  companyname  VARCHAR2(80)  NOT NULL,
-  contactname  VARCHAR2(60)  NULL,
-  contacttitle VARCHAR2(60)  NULL,
-  address      VARCHAR2(120) NULL,
-  city         VARCHAR2(30)  NULL,
-  region       VARCHAR2(30)  NULL,
-  postalcode   VARCHAR2(20)  NULL,
-  country      VARCHAR2(30)  NULL,
-  phone        VARCHAR2(48)  NULL,
-  fax          VARCHAR2(48)  NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.city
-  ON GHTDB.customers (
-    city
-  )
-/
-
-CREATE INDEX GHTDB.companyname_1
-  ON GHTDB.customers (
-    companyname
-  )
-/
-
-CREATE INDEX GHTDB.postalcode_2
-  ON GHTDB.customers (
-    postalcode
-  )
-/
-
-CREATE INDEX GHTDB.region
-  ON GHTDB.customers (
-    region
-  )
-/
-
-ALTER TABLE GHTDB.customers
-  ADD CONSTRAINT uk_customers_customerid UNIQUE (
-    customerid
-  )
-/
-
-CREATE TABLE GHTDB.employees (
-  employeeid      NUMBER(10,0)  NOT NULL,
-  lastname        VARCHAR2(40)  NOT NULL,
-  firstname       VARCHAR2(20)  NOT NULL,
-  title           VARCHAR2(60)  NULL,
-  titleofcourtesy VARCHAR2(50)  NULL,
-  birthdate       DATE          NULL,
-  hiredate        DATE          NULL,
-  address         VARCHAR2(120) NULL,
-  city            VARCHAR2(30)  NULL,
-  region          VARCHAR2(30)  NULL,
-  postalcode      VARCHAR2(20)  NULL,
-  country         VARCHAR2(30)  NULL,
-  homephone       VARCHAR2(48)  NULL,
-  extension       VARCHAR2(8)   NULL,
-  notes           CLOB          NULL,
-  reportsto       NUMBER(10,0)  NULL,
-  photopath       VARCHAR2(510) NULL,
-  mycolumn        NUMBER(10,0)  NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.lastname
-  ON GHTDB.employees (
-    lastname
-  )
-  TABLESPACE USERS
-/
-
-CREATE INDEX GHTDB.postalcode_1
-  ON GHTDB.employees (
-    postalcode
-  )
-  TABLESPACE USERS
-/
-
-ALTER TABLE GHTDB.employees
-  ADD CONSTRAINT pk_employees UNIQUE (
-    employeeid
-  )
-/
-
-CREATE TABLE GHTDB.employeeterritories (
-  employeeid  NUMBER(10,0) NOT NULL,
-  territoryid VARCHAR2(40) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-
-CREATE TABLE GHTDB.gh_emptytable (
-  col1 INTEGER      NULL,
-  col2 VARCHAR2(50) NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB."Order Details" (
-  orderid   NUMBER(10,0) NOT NULL,
-  productid NUMBER(10,0) NOT NULL,
-  unitprice NUMBER(19,4) NOT NULL,
-  quantity  NUMBER(5,0)  NOT NULL,
-  discount  FLOAT(126)   NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.orders (
-  orderid        NUMBER(10,0)  NOT NULL,
-  customerid     NCHAR(5)      NULL,
-  employeeid     NUMBER(10,0)  NULL,
-  orderdate      DATE          NULL,
-  requireddate   DATE          NULL,
-  shippeddate    DATE          NULL,
-  shipvia        NUMBER(10,0)  NULL,
-  freight        NUMBER(19,4)  NULL,
-  shipname       NVARCHAR2(40) NULL,
-  shipaddress    NVARCHAR2(60) NULL,
-  shipcity       NVARCHAR2(15) NULL,
-  shipregion     NVARCHAR2(15) NULL,
-  shippostalcode NVARCHAR2(10) NULL,
-  shipcountry    NVARCHAR2(15) NULL
-)
-  TABLESPACE USERS
-/
-
-ALTER TABLE GHTDB.orders
-  ADD CONSTRAINT orders_uk11075049410018 UNIQUE (
-    orderid
-  )
-/
-
-ALTER TABLE GHTDB.orders
-  ADD CONSTRAINT orders_fk21075049699981 FOREIGN KEY (
-    orderid
-  ) REFERENCES GHTDB.orders (
-    orderid
-  )
-/
-
-CREATE TABLE GHTDB.products (
-  productid       NUMBER(10,0) NOT NULL,
-  productname     VARCHAR2(80) NOT NULL,
-  supplierid      NUMBER(10,0) NULL,
-  categoryid      NUMBER(10,0) NULL,
-  quantityperunit VARCHAR2(40) NULL,
-  unitprice       NUMBER(19,4) DEFAULT (0) NULL,
-  unitsinstock    NUMBER(5,0)  DEFAULT (0) NULL,
-  unitsonorder    NUMBER(5,0)  DEFAULT (0) NULL,
-  reorderlevel    NUMBER(5,0)  DEFAULT (0) NULL,
-  discontinued    NUMBER(1,0)  DEFAULT (0) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_products_unitprice CHECK (
-    UnitPrice >= 0
-  )
-/
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_reorderlevel CHECK (
-    ReorderLevel >= 0
-  )
-/
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_unitsinstock CHECK (
-    UnitsInStock >= 0
-  )
-/
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_unitsonorder CHECK (
-    UnitsOnOrder >= 0
-  )
-/
-
-CREATE INDEX GHTDB.categoryid
-  ON GHTDB.products (
-    categoryid
-  )
-/
-
-CREATE INDEX GHTDB.productname
-  ON GHTDB.products (
-    productname
-  )
-/
-
-CREATE INDEX GHTDB.suppliersproducts
-  ON GHTDB.products (
-    supplierid
-  )
-/
-
-CREATE TABLE GHTDB.region (
-  regionid          NUMBER(10,0) NOT NULL,
-  regiondescription CHAR(100)    NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.Results (
-  employeeid      NUMBER(10,0)  NOT NULL,
-  lastname        VARCHAR2(20)  NOT NULL,
-  firstname       VARCHAR2(10)  NOT NULL,
-  title           VARCHAR2(30)  NULL,
-  titleofcourtesy VARCHAR2(25)  NULL,
-  birthdate       DATE          NULL,
-  hiredate        DATE          NULL,
-  address         VARCHAR2(60)  NULL,
-  city            VARCHAR2(15)  NULL,
-  region          VARCHAR2(15)  NULL,
-  postalcode      VARCHAR2(10)  NULL,
-  country         VARCHAR2(15)  NULL,
-  homephone       VARCHAR2(24)  NULL,
-  extension       VARCHAR2(4)   NULL,
-  notes           CLOB          NULL,
-  reportsto       NUMBER(10,0)  NULL,
-  photopath       VARCHAR2(255) NULL,
-  mycolumn        NUMBER(10,0)  NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.shippers (
-  shipperid   NUMBER(10,0) NOT NULL,
-  companyname VARCHAR2(80) NOT NULL,
-  phone       VARCHAR2(48) NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.shoppingcart (
-  recordid    NUMBER(10,0)  NOT NULL,
-  cartid      VARCHAR2(100) NULL,
-  quantity    NUMBER(10,0)  DEFAULT (1) NOT NULL,
-  productid   NUMBER(10,0)  NOT NULL,
-  datecreated DATE          DEFAULT (SYSDATE) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.suppliers (
-  supplierid   NUMBER(10,0)  NOT NULL,
-  companyname  VARCHAR2(80)  NOT NULL,
-  contactname  VARCHAR2(60)  NULL,
-  contacttitle VARCHAR2(60)  NULL,
-  address      VARCHAR2(120) NULL,
-  city         VARCHAR2(30)  NULL,
-  region       VARCHAR2(30)  NULL,
-  postalcode   VARCHAR2(20)  NULL,
-  country      VARCHAR2(30)  NULL,
-  phone        VARCHAR2(48)  NULL,
-  fax          VARCHAR2(48)  NULL,
-  homepage     CLOB          NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.companyname
-  ON GHTDB.suppliers (
-    companyname
-  )
-  TABLESPACE USERS
-/
-
-CREATE INDEX GHTDB.postalcode
-  ON GHTDB.suppliers (
-    postalcode
-  )
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB.territories (
-  territoryid          VARCHAR2(40) NOT NULL,
-  territorydescription CHAR(100)    NOT NULL,
-  regionid             NUMBER(10,0) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE SEQUENCE GHTDB.s_463_1_reviews
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_464_1_shoppingcart
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_59_1_products
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_60_1_orders
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_62_1_suppliers
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_63_1_shippers
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_65_1_employees
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_68_1_categories
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_464_1_shoppingcart
-BEFORE INSERT
-ON GHTDB.shoppingcart
-FOR EACH ROW
-BEGIN
- IF (:new.RECORDID IS NULL) THEN
-  SELECT S_464_1_SHOPPINGCART.nextval
-  INTO :NEW.RECORDID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_59_1_products
-BEFORE INSERT
-ON GHTDB.products
-FOR EACH ROW
-BEGIN
- IF (:new.PRODUCTID IS NULL) THEN
-  SELECT S_59_1_PRODUCTS.nextval
-  INTO :NEW.PRODUCTID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_62_1_suppliers
-BEFORE INSERT
-ON GHTDB.suppliers
-FOR EACH ROW
-BEGIN
- IF (:new.SUPPLIERID IS NULL) THEN
-  SELECT S_62_1_SUPPLIERS.nextval
-  INTO :NEW.SUPPLIERID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_63_1_shippers
-BEFORE INSERT
-ON GHTDB.shippers
-FOR EACH ROW
-BEGIN
- IF (:new.SHIPPERID IS NULL) THEN
-  SELECT S_63_1_SHIPPERS.nextval
-  INTO :NEW.SHIPPERID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_68_1_categories
-BEFORE INSERT
-ON GHTDB.categories
-FOR EACH ROW
-BEGIN
- IF (:new.CATEGORYID IS NULL) THEN
-  SELECT S_68_1_CATEGORIES.nextval
-  INTO :NEW.CATEGORYID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE VIEW GHTDB.current_product_list (
-  productid,
-  productname
-) AS
-SELECT  Product_List.ProductID, Product_List.ProductName
- FROM Products Product_List
-	WHERE
-	(
-	(( Product_List.Discontinued ) = 0))
-/
-
-CREATE OR REPLACE VIEW GHTDB.customer_and_suppliers_by_cit (
-  city,
-  companyname,
-  contactname,
-  relationship
-) AS
-SELECT  City, CompanyName, ContactName, 'Customers' Relationship
- FROM Customers UNION SELECT  City, CompanyName, ContactName, 'Suppliers'
- FROM Suppliers
-/
-
-CREATE OR REPLACE VIEW GHTDB.products_above_average_price (
-  productname,
-  unitprice
-) AS
-SELECT  Products.ProductName, Products.UnitPrice
- FROM Products
-	WHERE Products.UnitPrice > (
-		SELECT  AVG(UnitPrice)
-		 FROM Products  )
-/
-
-CREATE OR REPLACE  PACKAGE BODY "GHTDB"."GHTPKG"  AS
-
---Procedure declerations:
-	procedure ghsp_pkgAmbig(res out rct1) is
-  begin
-	   --Return a value which indocates that the procedure 'ghsp_pkgAmbig' was called not from within GHTPKG.
-     declare IN_GHTPKG varchar2(4) := 'TRUE';
-     begin
-  	   open res for
-  	   select IN_GHTPKG as IN_PKG from dual;
-	   end;
-  end;
-
-  procedure ghsp_inPkg(CustomerIdPrm in char, result out rct1) is
-  begin
-  OPEN result FOR
-  SELECT * FROM Customers where CustomerId=CustomerIdPrm;
-  end;
-  
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_MULTIRECORDSETS" (
-    RCT_Employees OUT GHTPKG.RCT1,
-    RCT_Customers OUT GHTPKG.RCT1,
-    RCT_Orders OUT GHTPKG.RCT1
- )
- IS
- -- Declare cursor
-    m_RCT_Employees GHTPKG.RCT1;
-    m_RCT_Customers GHTPKG.RCT1;
-    m_RCT_Orders GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM Employees where EmployeeId in (1,2) ORDER BY EMPLOYEEID ASC;
-
-    OPEN m_RCT_Customers FOR
-    SELECT CustomerId, CompanyName,ContactName FROM Customers  where CustomerId in ('MORGK','NORTS') ORDER BY CustomerId ASC;
-    -- return empty result set
-    OPEN m_RCT_Orders FOR
-    SELECT OrderId, ShipAddress,ShipVia, ShipCity FROM Orders where OrderId=-1  ;
-
-    RCT_Employees := m_RCT_Employees;
-    RCT_Customers := m_RCT_Customers;
-    RCT_Orders := m_RCT_Orders;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_INOUT1" (
-INPARAM IN VARCHAR DEFAULT NULL,
-OUTPARAM OUT INTEGER 
-)
-AS
-L_INPARAM VARCHAR(30) := INPARAM;
-BEGIN
-OUTPARAM := 100;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_CREATETABLE"  AS
-Begin
-  --craete a temporary table
-  execute immediate 'Create global temporary Table ghtdb.temp_tbl (Col1 int,Col2 int)';
-  --insert values to the table
-  execute immediate 'insert into ghtdb.temp_tbl values (11,12)';
-  execute immediate 'insert into ghtdb.temp_tbl values (21,22)';
-  execute immediate 'insert into ghtdb.temp_tbl values (31,32)';
-  --execute select on the created table
-  execute immediate 'select col1 as Value1, col2 as Value2 from ghtdb.temp_tbl';
-  execute immediate 'drop table temp_tbl';
-end;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_REFCURSOR1" (
-    RCT_Employees OUT GHTPKG.RCT1
- )
- IS
-    m_RCT_Employees GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM GHTDB.Employees where EmployeeId = 1;
-
-    RCT_Employees := m_RCT_Employees;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_REFCURSOR2" (
-    IN_EMPLOYEEID INTEGER,
-    RCT_Employees OUT GHTPKG.RCT1
- )
- IS
-    m_RCT_Employees GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM GHTDB.Employees where EmployeeId = IN_EMPLOYEEID;
-
-    RCT_Employees := m_RCT_Employees;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_REFCURSOR3" (
-    IN_LASTNAME VARCHAR2,
-    RCT_Employees OUT GHTPKG.RCT1
- )
- IS
-    m_RCT_Employees GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM GHTDB.Employees where LastName = IN_LASTNAME;
-
-    RCT_Employees := m_RCT_Employees;
-END;
-/
-
-
-CREATE OR REPLACE PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_1 (
-T_NUMBER   IN NUMBER,
-T_LONG     IN LONG,
-T_FLOAT    IN FLOAT,
-T_VARCHAR  IN VARCHAR2,
-T_NVARCHAR IN NVARCHAR2,
-T_CHAR     IN CHAR,
-T_NCHAR    IN NCHAR,
-RESULT     OUT GHTPKG.RCT1
-)
-AS
-BEGIN
-OPEN RESULT FOR
-SELECT T_NUMBER AS T_NUMBER, T_LONG AS T_LONG, T_FLOAT AS T_FLOAT, T_VARCHAR AS T_VARCHAR, T_NVARCHAR AS T_NVARCHAR, T_CHAR AS T_CHAR, T_NCHAR AS T_NCHAR FROM DUAL;
-RETURN;
-END;
-/
-
-
-
-CREATE OR REPLACE PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_2 (
-T_NUMBER   IN OUT NUMBER,
-T_LONG     IN OUT LONG,
-T_FLOAT    IN OUT FLOAT,
-T_VARCHAR  IN OUT VARCHAR2,
-T_NVARCHAR IN OUT NVARCHAR2,
-T_CHAR     IN OUT CHAR,
-T_NCHAR    IN OUT NCHAR
-)
-AS
-BEGIN
-T_NUMBER := T_NUMBER * 2;
-T_LONG := UPPER(T_LONG);
-T_FLOAT := T_FLOAT * 2;
-T_VARCHAR := UPPER(T_VARCHAR);
-T_NVARCHAR := UPPER(T_NVARCHAR);
-T_CHAR := UPPER(T_CHAR);
-T_NCHAR := UPPER(T_NCHAR);
-END;
-/
-
-
-
-CREATE OR REPLACE PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_3 (
-ID1        IN CHAR,
-P_NUMBER   OUT NUMBER,
-P_LONG     OUT LONG,
-P_FLOAT    OUT FLOAT,
-P_VARCHAR  OUT VARCHAR2,
-P_NVARCHAR OUT NVARCHAR2,
-P_CHAR     OUT CHAR,
-P_NCHAR    OUT NCHAR
-)
-AS
-BEGIN
-SELECT T_NUMBER, T_LONG, T_FLOAT, T_VARCHAR, T_NVARCHAR, T_CHAR, T_NCHAR INTO P_NUMBER, P_LONG, P_FLOAT, P_VARCHAR, P_NVARCHAR, P_CHAR, P_NCHAR FROM TYPES_SIMPLE WHERE ID = ID1;
-RETURN;
-END;
-/
-
-
-
-CREATE OR REPLACE  PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_4  (
-ID1        IN CHAR,
-RESULT     OUT GHTPKG.RCT1,
-RESULT1    OUT GHTPKG.RCT1,
-RESULT2    OUT GHTPKG.RCT1
-)
-IS
-
-m_result  GHTPKG.RCT1;
-m_result1  GHTPKG.RCT1;
-m_result2  GHTPKG.RCT1;
-
-BEGIN
-
-insert into TYPES_SIMPLE(ID,T_NUMBER) values (ID1,50);
-
-OPEN m_result FOR
-SELECT * FROM TYPES_SIMPLE where ID = ID1;
-
-update TYPES_SIMPLE set T_NUMBER=60 where Id = ID1;
-
-OPEN m_result1 FOR
-SELECT * FROM TYPES_SIMPLE where ID = ID1;
-
-delete from TYPES_SIMPLE where ID = ID1;
-
-OPEN m_result2 FOR
-SELECT * FROM TYPES_SIMPLE where ID = ID1;
-
-RESULT := m_result;
-RESULT1 := m_result1;
-RESULT2 := m_result2;
-
-END;
-/
-
-
-
-CREATE OR REPLACE PROCEDURE   GHTDB.GHSP_TYPES_SIMPLE_5(
-RESULT     OUT GHTPKG.RCT1
-)AS
-
-BEGIN
-  DECLARE
-    T_NUMBER    NUMBER(10)    := 21;
-    T_LONG      LONG          := 'abcdefghijklmnopqrstuvwxyz1234567890~!@#$%^&*()_+-=[]\|;:,./<>? ';
-    T_FLOAT     FLOAT(10)     := 1.234;
-    T_VARCHAR   VARCHAR2(10)  := 'qwertasdfg';
-    T_NVARCHAR  NVARCHAR2(10) := 'qwertasdfg';
-    T_CHAR      CHAR(10)      := 'abcdefghij';
-    T_NCHAR     NCHAR(10)     := 'abcdefghij';
-
-  BEGIN
-  OPEN RESULT FOR
-  SELECT T_NUMBER,T_LONG, T_FLOAT, T_VARCHAR, T_NVARCHAR, T_CHAR, T_NCHAR FROM DUAL;
-  RETURN;
-  END;
-
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GHSP_PKGAMBIG"  (
- res out ghtpkg.rct1
-)
-as
-begin
-	 --Return a value which indocates that the procedure 'ghsp_pkgAmbig' was called not from within GHTPKG.
-   declare IN_GHTPKG varchar2(5) := 'FALSE';
-   begin
-  	 open res for
-	   select IN_GHTPKG as IN_PKG from dual;
-	 end;
-end;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_DUMMY"  (
- EmployeeIDPrm in NUMBER,
- result     OUT GHTPKG.RCT1
-)
-as
-begin
- OPEN result FOR
-  SELECT EMPLOYEEID,
-         LASTNAME, 
-         FIRSTNAME, 
-         TITLE, 
-         TITLEOFCOURTESY, 
-         BIRTHDATE, 
-         HIREDATE, 
-         ADDRESS, 
-         CITY, 
-         REGION, 
-         POSTALCODE, 
-         COUNTRY, 
-         HOMEPHONE, 
-         EXTENSION, 
-         REPORTSTO, 
-         PHOTOPATH, 
-         MYCOLUMN
-  FROM GHTDB.EMPLOYEES where EmployeeID > EmployeeIDPrm;
-RETURN;
-end;
-/
-
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.categories TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.current_product_list TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.customercustomerdemo TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.customerdemographics TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.customers TO PUBLIC;
-GRANT EXECUTE ON GHTDB.GH_MULTIRECORDSETS TO PUBLIC;
---GRANT EXECUTE ON GHTDB.custordersorders TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.employees TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.employeeterritories TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.products TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.products_above_average_price TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.region TO PUBLIC;
---GRANT EXECUTE ON salesbycategory TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.suppliers TO PUBLIC;
---GRANT EXECUTE ON ten_most_expensive_products TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.territories TO PUBLIC;
-
----------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------
-DROP TABLE GHTDB_EX.CUSTOMERS;
-DROP TABLE GHTDB_EX.categories;
-
-DROP USER GHTDB_EX CASCADE;
-
-CREATE USER "GHTDB_EX"
-    IDENTIFIED BY "GHTDB_EX" DEFAULT TABLESPACE "USERS"
-    TEMPORARY TABLESPACE "TEMP" ;
-
-GRANT CONNECT, RESOURCE TO "GHTDB_EX";
-
-CREATE OR REPLACE PACKAGE GHTDB_EX.GHTPKG
-AS
-	TYPE RCT1 IS REF CURSOR;
-	IDENTITY INTEGER;
-END;
-/
-
-CREATE TABLE GHTDB_EX.CUSTOMERS (
-  customerid   CHAR(10)      NOT NULL,
-  companyname  VARCHAR2(80)  NULL,
-  contactname  VARCHAR2(60)  NULL,
-  contacttitle VARCHAR2(60)  NULL,
-  address      VARCHAR2(120) NULL,
-  city         VARCHAR2(30)  NULL,
-  region       VARCHAR2(30)  NULL,
-  postalcode   VARCHAR2(20)  NULL,
-  country      VARCHAR2(30)  NULL,
-  phone        VARCHAR2(48)  NULL,
-  fax          VARCHAR2(48)  NULL,
-  picture      VARCHAR2(48)  NULL
-)
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB_EX.categories (
-  categoryid   VARCHAR2(20) NOT NULL,
-  categoryname VARCHAR2(30) NOT NULL,
-  description  CLOB         NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE OR REPLACE  PROCEDURE "GHTDB_EX"."GH_DUMMY"  
-    (CustomerIdPrm IN CHAR,
-result     OUT GHTPKG.RCT1)
-AS
-BEGIN
-OPEN result FOR
-SELECT * FROM Customers where CustomerID=CustomerIdPrm;
-RETURN;
-END;
-/
-
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB_EX.CUSTOMERS TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB_EX.CATEGORIES TO PUBLIC;
-GRANT EXECUTE ON GHTDB_EX.gh_dummy TO PUBLIC;
-
-
-
-COMMIT;
-
-exit
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ADONetTesterClass.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ADONetTesterClass.cs
deleted file mode 100755
index 738a772dcac..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ADONetTesterClass.cs
+++ /dev/null
@@ -1,1831 +0,0 @@
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Oren Gurfinkel   <oreng@mainsoft.com>
-//   Ofer Borstein
-// 
-// Copyright (c) 2004 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-using System.IO;
-using System.Collections;
-using MonoTests.System.Data.Utils.Data;
-using Sys = System;
-
-namespace MonoTests.System.Data.Utils {
-	public class ADONetTesterClass : GHTBase {
-		#region " Base Constructors "
-		protected ADONetTesterClass(Sys.IO.TextWriter Logger, bool LogOnSuccess) : base(Logger,LogOnSuccess){}
-		protected ADONetTesterClass(bool LogOnSuccess):base(Console.Out, LogOnSuccess){}
-		protected ADONetTesterClass():base(Console.Out, false){}
-
-		#endregion
-
-		private MonoTests.System.Data.Utils.DataBaseServer DBType ;
-
-
-		#region "-----------  Build Update Commands --------------"
-		protected void OracleDataAdapter_BuildUpdateCommands(ref Sys.Data.OracleClient.OracleDataAdapter oleDBda) {
-			Sys.Data.OracleClient.OracleConnection Conn = oleDBda.SelectCommand.Connection;
-
-			oleDBda.DeleteCommand = new Sys.Data.OracleClient.OracleCommand();
-			oleDBda.InsertCommand = new Sys.Data.OracleClient.OracleCommand();
-			oleDBda.UpdateCommand = new Sys.Data.OracleClient.OracleCommand();
-
-			oleDBda.DeleteCommand.Connection = Conn;
-			oleDBda.InsertCommand.Connection = Conn;
-			oleDBda.UpdateCommand.Connection = Conn;
-
-			oleDBda.DeleteCommand.Parameters.Add(new Sys.Data.OracleClient.OracleParameter("EmployeeID",Sys.Data.OracleClient.OracleType.Int32)) ;
-			oleDBda.DeleteCommand.Parameters["EmployeeID"].SourceVersion = DataRowVersion.Original;
-			oleDBda.DeleteCommand.Parameters["EmployeeID"].SourceColumn = "EmployeeID";
-
-			oleDBda.InsertCommand.Parameters.Add(new Sys.Data.OracleClient.OracleParameter("LastName",Sys.Data.OracleClient.OracleType.VarChar ,20));
-			oleDBda.InsertCommand.Parameters.Add(new Sys.Data.OracleClient.OracleParameter("FirstName",Sys.Data.OracleClient.OracleType.VarChar,10));
-			oleDBda.InsertCommand.Parameters.Add(new Sys.Data.OracleClient.OracleParameter("EmployeeID",Sys.Data.OracleClient.OracleType.Int32));
-			oleDBda.InsertCommand.Parameters["EmployeeID"].SourceColumn = "EmployeeID";
-			oleDBda.InsertCommand.Parameters["LastName"].SourceColumn = "LastName";
-			oleDBda.InsertCommand.Parameters["FirstName"].SourceColumn = "FirstName";
-
-			oleDBda.UpdateCommand.Parameters.Add(new Sys.Data.OracleClient.OracleParameter("Title",Sys.Data.OracleClient.OracleType.VarChar,30));
-			oleDBda.UpdateCommand.Parameters.Add(new Sys.Data.OracleClient.OracleParameter("EmployeeID",Sys.Data.OracleClient.OracleType.Int32));
-			oleDBda.UpdateCommand.Parameters["EmployeeID"].SourceColumn = "EmployeeID";
-			oleDBda.UpdateCommand.Parameters["Title"].SourceColumn = "Title";
-
-
-			//for Oracle, ODBC
-			string deleteSQL = "DELETE FROM Employees WHERE EmployeeID = :EmployeeID";
-			string insertSQL = "INSERT INTO Employees (EmployeeID, LastName, FirstName) VALUES (:EmployeeID, :LastName, :FirstName)";
-			string updateSQL = "UPDATE Employees SET Title = :Title WHERE EmployeeID = :EmployeeID";
-
-			oleDBda.DeleteCommand.CommandText = deleteSQL;
-			oleDBda.InsertCommand.CommandText = insertSQL;
-			oleDBda.UpdateCommand.CommandText = updateSQL;
-
-		}
-		
-		#endregion
-
-		#region "-----------  Sys.Data.Common.DBDataAdapter --------------"
-
-		#region " DBDataAdapter - Fill / Fill Schema "
-
-		protected void DbDataAdapter_Fill_Ds(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds,false);
-
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, this table will be addedd during the fill process
-			ds.AcceptChanges();
-	
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult);
-		
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_Fill_Dt(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds, false);
-
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, fill only one table
-
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			ds.AcceptChanges();
-		
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult.Tables["Table"]);
-
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		protected void DbDataAdapter_Fill_Ds_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds, false);
-
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, this table will be addedd during the fill process
-			ds.AcceptChanges();
-		
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult,dsResult.Tables[0].TableName );
-
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_Fill_Ds_Int_Int_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds, false);
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";	
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, this table will be addedd during the fill process
-			ds.AcceptChanges();
-		
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult,0,0,dsResult.Tables[0].TableName);
-			CompareResults_Fill(dsResult,dsExpected);
-		
-			dsResult = ds.Copy();
-			//modify expected dataset to match the expected result
-			for (int i=0; i < dsExpected.Tables[0].Rows.Count ; i++) {
-				if (i < 5 || i > 14) {
-					dsExpected.Tables[0].Rows[i]["Country"] = "NeverNeverLand";
-					dsExpected.Tables[0].Rows[i]["HomePhone"] = DBNull.Value; 
-				}
-			}
-			ResultRowsCount = dbDA.Fill(dsResult,5,10,dsResult.Tables[0].TableName);
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-
-		protected void DbDataAdapter_FillSchema_Ds_SchemaType(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult = new DataSet(); 
-			DataSet dsExpected = new DataSet();
-		
-			// create expected dataset to compare result to
-			ReadDBData_Fill(dbDA,ref dsExpected ,true);
-
-			//  Note:   When handling batch SQL statements that return multiple results, 
-			//	the implementation of FillSchema for the .NET Framework Data Provider for OLEDB 
-			//	retrieves schema information for only the first result. 
-			//	To retrieve schema information for multiple results, use Fill with the MissingSchemaAction set to AddWithKey
-			//			if (dbDA.GetType() == typeof(Sys.Data.OracleClient.OracleDataAdapter)) 
-			//				dsExpected.Tables.Remove(dsExpected.Tables[1]);
-
-			//execute FillSchema
-
-			//dsResult = dsExpected.Copy();
-			DataTable[] dtArr = dbDA.FillSchema(dsResult,SchemaType.Mapped );
-
-			//************  Fix .Net bug? (FillSchema method add AutoIncrement=true) *******************
-			dsResult.Tables[0].Columns["EmployeeID"].AutoIncrement = false;
-		
-			CompareResults_Fill(dsResult,dsExpected);
-
-			Exception exp = null;
-			try {
-				BeginCase("Check return value - Table[0]");
-				Compare(dtArr[0],dsResult.Tables[0] );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//			if (dbDA.GetType() != typeof(Sys.Data.OracleClient.OracleDataAdapter)) 
-			//				try
-			//				{
-			//					BeginCase("Check return value - Table[1]");
-			//					Compare(dtArr[1],dsResult.Tables[1]);
-			//				}
-			//				catch(Exception ex)	{exp = ex;}
-			//				finally	{EndCase(exp); exp = null;}
-	
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_FillSchema_Dt_SchemaType(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult = new DataSet(); 
-			DataSet dsExpected = new DataSet();
-		
-			// create expected dataset to compare result to
-			ReadDBData_Fill(dbDA,ref dsExpected ,true);
-
-			//dsExpected.Tables.Remove(dsExpected.Tables[1]);
-
-			//execute FillSchema
-
-			dsResult.Tables.Add("Table");
-			DataTable dt = dbDA.FillSchema(dsResult.Tables[0],SchemaType.Mapped );
-
-			//************  Fix .Net bug? (FillSchema method add AutoIncrement=true) *******************
-			dsResult.Tables[0].Columns["EmployeeID"].AutoIncrement = false;
-
-			CompareResults_Fill(dsResult,dsExpected);
-			Exception exp = null;
-			try {
-				BeginCase("Check return value - Table[0]");
-				Compare(dt,dsResult.Tables[0] );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_FillSchema_Ds_SchemaType_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult = new DataSet(); 
-			DataSet dsExpected = new DataSet();
-		
-			// create expected dataset to compare result to
-			ReadDBData_Fill(dbDA,ref dsExpected ,true);
-
-			//dsExpected.Tables.Remove(dsExpected.Tables[1]);
-
-			//execute FillSchema
-
-			dsResult.Tables.Add("Table");
-			DataTable[] dtArr = dbDA.FillSchema(dsResult,SchemaType.Mapped,dsResult.Tables[0].TableName);
-
-			//************  Fix .Net bug? (FillSchema method add AutoIncrement=true) *******************
-			dsResult.Tables[0].Columns["EmployeeID"].AutoIncrement = false;
-
-			CompareResults_Fill(dsResult,dsExpected);
-			Exception exp = null;
-			try {
-				BeginCase("Check return value - Table[0]");
-				Compare(dtArr[0],dsResult.Tables[0] );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-
-		private int ReadDBData_Fill(Sys.Data.Common.DbDataAdapter dbDA, ref DataSet ds, bool ReadSchemaOnly) {
-			int ExpectedRowsCount = 0;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IDataReader Idr;
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			ICmd.CommandText = "SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, Country, Extension, HomePhone  FROM Employees "  ;
-			IConn.Open();
-
-			//get db type
-			DBType = ConnectedDataProvider.GetDbType(((IDbDataAdapter)dbDA).SelectCommand.Connection.ConnectionString);
-
-			// Execute data Reader - Get Expected results
-			Idr = ICmd.ExecuteReader();
-
-			// create temp dataset to insert results
-			ExpectedRowsCount = DataReaderFill_Fill(ref ds,ref Idr,ReadSchemaOnly);
-			Idr.Close();
-			return ExpectedRowsCount;
-		}
-		private void CompareResults_Fill(DataSet dsResult,DataSet dsExpected ) {
-			Exception exp = null;
-
-			//			try
-			//			{
-			//				BeginCase("Compare Rows count");
-			//				// ???????   Fill return count for first table only    ??????
-			//				Compare(ExpectedRowsCount  ,ResultRowsCount );
-			//			}
-			//			catch(Exception ex)	{exp = ex;}
-			//			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("Compare data");
-				Compare(dsResult.GetXml() ,dsExpected.GetXml());
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("Compare schema");
-				Compare(dsResult.GetXmlSchema() ,dsExpected.GetXmlSchema());
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		private int DataReaderFill_Fill(ref DataSet dsExpected, ref IDataReader Idr,bool ReadSchemaOnly) {
-			bool blnNextResults;
-			int RowsAffected = 0;
-			object[] objArr = null;
-			DataTable SchemaTable = null;
-			do {
-				SchemaTable = Idr.GetSchemaTable();
-
-				//add new table with the right amount of columns, the first table must be named "Table"
-				if (dsExpected.Tables.Count == 0)
-					dsExpected.Tables.Add(new DataTable("Table"));
-				else
-					dsExpected.Tables.Add();
-				for (int i = 0 ; i < Idr.FieldCount; i++) {
-					dsExpected.Tables[dsExpected.Tables.Count-1].Columns.Add(new DataColumn(Idr.GetName(i),Idr.GetFieldType(i)));
-					if (ReadSchemaOnly) {	// add schema info
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].AllowDBNull = (bool)SchemaTable.Rows[i]["AllowDBNull"];
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].AutoIncrement = (bool)SchemaTable.Rows[i]["IsAutoIncrement"];
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].ReadOnly = (bool)SchemaTable.Rows[i]["IsReadOnly"];
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].Unique = (bool)SchemaTable.Rows[i]["IsUnique"];
-						if (dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].DataType == typeof(string))
-							dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].MaxLength = (int)SchemaTable.Rows[i]["ColumnSize"];
-					}
-				}
-
-				if (!ReadSchemaOnly) {
-					//array that holds the current rows values
-					objArr = new object[Idr.FieldCount];
-
-					//fill the new table
-					while (Idr.Read()) {
-						Idr.GetValues(objArr);
-						//update existing row, if no row is found - add it as new row
-						dsExpected.Tables[dsExpected.Tables.Count-1].LoadDataRow(objArr,false);
-						RowsAffected++;
-					}
-				}
-
-				//get next record set 
-				blnNextResults = Idr.NextResult(); 
-			} 
-			while (blnNextResults);
-
-			// add primary key, fill method will update existing rows instead of insert new ones
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-			//if (ReadSchemaOnly)	dsExpected.Tables[1].PrimaryKey = new DataColumn[] {dsExpected.Tables[1].Columns["CustomerID"]};
-			dsExpected.AcceptChanges();
-
-			return RowsAffected;
-		
-		}
-
-		#endregion
-
-		#region " DBDataAdapter - FillError "
-		private bool blnReadDBData_Fill = false;
-
-		protected void DbDataAdapter_FillError(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers ";
-			IConn.Open();
-
-			DataSet ds = new DataSet();
-			ds.Tables.Add(new DataTable("Customers"));
-			ds.Tables[0].Columns.Add("CustomerID",typeof(byte));
-        
-			//check FillError event
-			dbDA.FillError += new FillErrorEventHandler(dbDA_FillError);
-			blnReadDBData_Fill = false;
-			try {
-				BeginCase("FillError");
-				try {
-					dbDA.Fill(ds,"Customers");
-				}
-				catch (Exception ){};
-				Compare(blnReadDBData_Fill ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dbDA.FillError -= new FillErrorEventHandler(dbDA_FillError);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-		private void dbDA_FillError(object sender, FillErrorEventArgs args) {
-			blnReadDBData_Fill = true;
-			args.Continue = false;
-		}
-
-		#endregion
-
-		#region " DBDataAdapter - Update "
-		protected void DbDataAdapter_Update_Ds(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-		
-			//update expecteed dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-			//make changes to the DataBase (through the dataset)
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-			NumberOfAffectedRows = dbDA.Update(dsDB1);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Ds_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998).Delete();
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(dsDB1);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Ds_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-
-		
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-		}
-	
-
-		protected void DbDataAdapter_Update_Dt(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);			
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-
-			//update dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-		
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-			NumberOfAffectedRows = dbDA.Update(dsDB1.Tables[0]);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Dt_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998).Delete();
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(dsDB1.Tables[0]);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Dt_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-
-
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException.Tables[0]);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException.Tables[0]);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException.Tables[0]);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-		}
-
-
-		protected void DbDataAdapter_Update_Dr(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-
-			//update dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-		
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-		
-			DataRow[] drArr = new DataRow[dsDB1.Tables[0].Rows.Count] ;
-			dsDB1.Tables[0].Rows.CopyTo(drArr,0);
-			NumberOfAffectedRows = dbDA.Update(drArr);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Dr_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998)[1] = "Updated!";
-		
-			drArr = new DataRow[dsDB1.Tables[0].Rows.Count];
-			dsDB1.Tables[0].Rows.CopyTo(drArr,0);
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(drArr);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Dr_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-		
-			DataRow[] drArr = new DataRow[dsResultException.Tables[0].Rows.Count];
-		
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				dsResultException.Tables[0].Rows.CopyTo(drArr,0);
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(drArr);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				dsResultException.Tables[0].Rows.CopyTo(drArr,0);
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(drArr);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				dsResultException.Tables[0].Rows.CopyTo(drArr,0);
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(drArr);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-		}
-
-
-		protected void DbDataAdapter_Update_Ds_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-		
-			//update dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-		
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-			NumberOfAffectedRows = dbDA.Update(dsDB1,dsDB1.Tables[0].TableName);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Ds_Str_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998).Delete();
-
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(dsDB1,dsDB1.Tables[0].TableName);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Ds_Str_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-
-		
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException,dsResultException.Tables[0].TableName);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException,dsResultException.Tables[0].TableName);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException,dsResultException.Tables[0].TableName);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-		}
-
-		/*
-			* 
-			* insert/update the database with data that will be used in testings
-			* 
-			*/
-		protected void PrepareDataForTesting(string ConnectionString) {
-			int iExists = 0;
-			try {
-
-				//create database specific date value
-				string strBirthDateValue = "";
-				switch (ConnectedDataProvider.GetDbType(ConnectionString)) {
-					case DataBaseServer.DB2:
-						strBirthDateValue = "'1988-05-31-15.33.44'";
-						break;
-					case DataBaseServer.Oracle:
-						strBirthDateValue = "to_date('1988-05-31 15:33:44', 'yyyy-mm-dd HH24:mi:ss')";
-						break;
-					case DataBaseServer.PostgreSQL:
-						strBirthDateValue = "to_timestamp('1988-05-31 15:33:44', 'yyyy-mm-dd HH24:mi:ss')";
-						break;
-					case DataBaseServer.SQLServer:
-					case DataBaseServer.Sybase:
-						strBirthDateValue = "'1988-May-31 15:33:44'";
-						break;
-				}
-				OracleConnection con = new OracleConnection(ConnectionString);
-				try {
-					con.Open();
-				}
-				catch (Exception ex) {
-					throw new Exception("PrepareDataForTesting failed trying to connect to DB using Connection string:" + ConnectionString + "\nException:" +  ex.ToString(),ex);
-				}
-
-				OracleCommand cmd = new OracleCommand("",con);
-
-				//update / insert to table Employees
-				for (int i = 100; i <= 700; i +=100) {
-					cmd.CommandText = "select 1 from Employees where EmployeeID = " + i.ToString();
-					iExists =  Sys.Convert.ToInt32(cmd.ExecuteScalar());
-					if (iExists != 1) {
-						cmd.CommandText = "insert into Employees (EmployeeID, LastName, FirstName, Title, BirthDate) " + 
-							" Values (" + i.ToString() + 
-							",'Last" + i.ToString() 
-							+ "','First" + i.ToString() 
-							+ "', null, " 
-							+ strBirthDateValue + ")";
-						cmd.ExecuteNonQuery();
-					}
-					else {
-						cmd.CommandText = "update Employees set " 
-							+ " LastName = 'Last" + i.ToString() 
-							+ "', FirstName = 'First" + i.ToString() 
-							+ "', Title = null, BirthDate = " 
-							+ strBirthDateValue 
-							+ " where EmployeeID = " + i.ToString() ;
-						Log(cmd.CommandText);
-						cmd.ExecuteNonQuery();
-					}
-				}
-
-				//update / insert to table Customers
-				for (int i = 100; i <= 700; i +=100) {
-					cmd.CommandText = "select 1 from Customers where CustomerID = 'GH" + i.ToString() + "'";
-					iExists =  Sys.Convert.ToInt32(cmd.ExecuteScalar());
-					if (iExists != 1) {
-						cmd.CommandText = "insert into Customers (CustomerID , CompanyName, Phone) Values ('GH" + i.ToString() + "','Company" + i.ToString() + "','00-" + i.ToString() + i.ToString() + "')";
-						cmd.ExecuteNonQuery();
-					}
-					else {
-						cmd.CommandText = "update Customers set CompanyName = 'Company" + i.ToString() + "', Phone = '00-" + i.ToString() + i.ToString() + "' where CustomerID = 'GH" + i.ToString() + "'";
-						cmd.ExecuteNonQuery();
-					}
-				}
-
-				cmd.CommandText = "select 1 from Customers where CustomerID = 'GH200'";
-				iExists =  Sys.Convert.ToInt32(cmd.ExecuteScalar());
-				if (iExists != 1) {
-					cmd.CommandText = "insert into Customers (CustomerID , CompanyName) Values ('GH200','Company200')";
-					cmd.ExecuteNonQuery();
-				}
-				else {
-					cmd.CommandText = "update Customers set CompanyName = 'Company200' where CustomerID = 'GH200'";
-					cmd.ExecuteNonQuery();
-				}
-
-				con.Close();
-			}
-			catch (Exception ex) {
-				throw new Exception("PrepareDataForTesting failed with exception:" + ex.ToString(),ex);
-			}
-		}
-
-		/*
-		*	used to insert data to the database in order to check DataAdapter Update metods 
-		*/
-		protected DataSet PrepareDBData_Update(Sys.Data.Common.DbDataAdapter dbDA) {
-			return PrepareDBData_Update(dbDA,false); 
-
-		}
-		protected DataSet PrepareDBData_Update(Sys.Data.Common.DbDataAdapter dbDA,bool sqlConnectionString) {
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand;
-			ICmd.CommandText = "SELECT EmployeeID, LastName, FirstName, Title FROM Employees WHERE EmployeeID in (9991,9992,9993,9994,9995,9996)";  
-			IDbConnection IConn = ICmd.Connection; 
-			if (!sqlConnectionString) {
-				IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			IConn.Open();
-					
-			//Insert rows to be updated (insert,delete,update)
-			IDbCommand cmd;
-			if (sqlConnectionString) {
-				cmd = new Sys.Data.SqlClient.SqlCommand();
-				cmd.Connection = (Sys.Data.SqlClient.SqlConnection)IConn; 
-			}
-			else {
-				cmd = new Sys.Data.OracleClient.OracleCommand();
-				cmd.Connection = (Sys.Data.OracleClient.OracleConnection)IConn;
-			}
-
-
-			//run execute after each command because DB2 doesn't support multiple commands
-			cmd.CommandText =  "DELETE FROM Employees WHERE EmployeeID in (9991,9992,9993,9994,9995,9996,9997,9998)";
-			cmd.ExecuteNonQuery();
-
-			//only for SQL Server
-			DataBaseServer DBType =  ConnectedDataProvider.GetDbType(IConn.ConnectionString);
-
-			cmd.CommandText = "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9992, 'Ofer', 'Borshtein', 'delete')";
-			//if (DBType == DataBaseServer.SQLServer) cmd.CommandText = "SET IDENTITY_INSERT Employees ON;" + cmd.CommandText;
-			cmd.ExecuteNonQuery();
-			cmd.CommandText = "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9993, 'Ofer', 'Borshtein', 'Update')";
-			//if (DBType == DataBaseServer.SQLServer) cmd.CommandText = "SET IDENTITY_INSERT Employees ON;" + cmd.CommandText;
-			cmd.ExecuteNonQuery();
-			cmd.CommandText = "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9996, 'Ofer', 'Borshtein', 'Exp')";
-			//if (DBType == DataBaseServer.SQLServer) cmd.CommandText = "SET IDENTITY_INSERT Employees ON;" + cmd.CommandText;
-			cmd.ExecuteNonQuery();
-
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9991, 'Ofer', 'Borshtein', 'Insert'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9994, 'Ofer', 'Borshtein', 'Exp'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9995, 'Ofer', 'Borshtein', 'Exp'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9997, 'Ofer', 'Borshtein', 'delete'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9998, 'Ofer', 'Borshtein', 'delete'); ";
-
-			DataSet ds = new DataSet();
-			dbDA.Fill(ds);
-			ds.Tables[0].PrimaryKey = new DataColumn[] {ds.Tables[0].Columns["EmployeeID"]};
-			return ds;
-
-		}
-
-
-		private void CompareResults_Update(DataSet dsResult,DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-		
-			//----------------- Compare dsDB with dsExcepted -----------------
-			try {
-				BeginCase("Insert Row ");
-				Compare(dsResult.Tables[0].Rows.Find(9991) == null ,false );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("Update Row ");
-				Compare(dsResult.Tables[0].Rows.Find(9993)["Title"],"Jack the ripper");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			try {
-				BeginCase("Delete Row ");
-				Compare(dsResult.Tables[0].Rows.Find(9992) ,null);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}			
-
-		}
-
-		#endregion
-
-		protected void DBDataAdapter_DefaultSourceTableName() {
-			Exception exp = null;
-			try {
-				BeginCase("DefaultSourceTableName");
-				Compare(Sys.Data.Common.DbDataAdapter.DefaultSourceTableName , "Table");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		#endregion
-
-		#region "-----------  Sys.Data.Common.DataAdapter --------------"
-		protected void DataAdapter_AcceptChangesDuringFill(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			IConn.Open();
-
-			//get the total rows count
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-			DataSet ds = new DataSet();
-			dbDA.AcceptChangesDuringFill = false;
-
-        
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(ds);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-				
-
-			bool blnAcceptChanges = false;
-
-			foreach (DataRow dr in ds.Tables[0].Rows) {
-				if (dr.RowState != DataRowState.Added ) {
-					blnAcceptChanges = true;
-					break;
-				}
-			}
-			try {
-				BeginCase("AcceptChangesDuringFill - false");
-				Compare(blnAcceptChanges ,false );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ds.Reset();
-			dbDA.AcceptChangesDuringFill = true;
-			dbDA.Fill(ds);
-			blnAcceptChanges = false;            			
-			foreach (DataRow dr in ds.Tables[0].Rows) {
-				if (dr.RowState != DataRowState.Unchanged ) {
-					blnAcceptChanges = true;
-					break;
-				}
-			}
-			try {
-				BeginCase("AcceptChangesDuringFill - true");
-				Compare(blnAcceptChanges ,false );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-		}
-
-		protected void DataAdapter_ContinueUpdateOnError(Sys.Data.Common.DbDataAdapter dbDA) {
-			/*
-				!!!!!! Not working (TestName "ContinueUpdateOnError - true, check value 2")!!!!!
-				If ContinueUpdateOnError is set to true, no exception is thrown when an error occurs during the update of a row. 
-				The update of the row is skipped and the error information is placed in the RowError property of the row in error. 
-				The DataAdapter continues to update subsequent rows.
-				If ContinueUpdateOnError is set to false, an exception is thrown when an error occurs during the update of a row.
-			*/
-			Exception exp = null;
-
-	
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			IConn.Open();
-
-			//get the total rows count
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-
-			DataSet dsMem = new DataSet();	//Disconected dataset
-			DataSet dsDB = new DataSet();	//DataBase data
-			dbDA.AcceptChangesDuringFill = true;
-			//get data from DB
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(dsMem);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-
-			//update data with invalid information (Max. length for Phone is 24)
-			//					123456789012345678901234
-			string newValue1 = "Very Long String That Will Raise An Error Yep!";
-			string oldValue1 = dsMem.Tables[0].Rows[3]["Phone"].ToString();
-			string oldValue2 = dsMem.Tables[0].Rows[4]["Phone"].ToString();
-			string newValue2 = "03-1234";
-
-
-			dsMem.Tables[0].Rows[3]["Phone"] = newValue1;
-			dsMem.Tables[0].Rows[4]["Phone"] = newValue2;
-			dbDA.ContinueUpdateOnError = true;
-        
-			//will not throw exception
-			try {
-				BeginCase("ContinueUpdateOnError - true, check exception");
-				try {
-					dbDA.Update(dsMem);
-				}
-				catch(Exception ex){exp = ex;}
-				Compare(exp == null,true);
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			dbDA.Fill(dsDB); //get data from DB to check the update operation
-
-			try {
-				BeginCase("ContinueUpdateOnError - true, check RowError");
-				Compare(dsMem.Tables[0].Rows[3].RowError.Length > 0 , true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("ContinueUpdateOnError - true, check value 1");
-				Compare(dsDB.Tables[0].Rows[3]["Phone"] , oldValue1);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-
-			/*		- Test excluded, it is not working in .NET too!
-					//should continue the update
-					try
-					{
-						BeginCase("ContinueUpdateOnError - true, check value 2");
-						Compare(dsDB.Tables[0].Rows[4]["Phone"] , newValue2);  //--------- NOT WORKING !!! -----------
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-			*/
-			dsMem.Reset();
-			dsDB.Reset();
-			dbDA.Fill(dsMem);
-			dsMem.Tables[0].Rows[3]["Phone"] = newValue1 ;
-			dsMem.Tables[0].Rows[4]["Phone"] = newValue2;
-			dbDA.ContinueUpdateOnError = false;
-        
-			try {
-				BeginCase("ContinueUpdateOnError - false, check exception");
-				try {
-					dbDA.Update(dsMem);
-				}
-				catch(Exception ex){exp = ex;}
-				Compare(exp == null,false);
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			dbDA.Fill(dsDB); //get data from DB to check the update operation
-			try {
-				BeginCase("ContinueUpdateOnError - false,check RowError");
-				Compare(dsMem.Tables[0].Rows[3].RowError.Length > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try {
-				BeginCase("ContinueUpdateOnError - false,check value 1");
-				Compare(dsDB.Tables[0].Rows[3]["Phone"] , oldValue1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-
-			try {
-				BeginCase("ContinueUpdateOnError - false,check value 2");
-				Compare(dsDB.Tables[0].Rows[4]["Phone"] , oldValue2 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-		}
-		protected void DataAdapter_MissingMappingAction(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-
-//			IConn.Open();
-
-			//get the total rows count
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			IConn.Open();
-
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-
-			//init dataset
-			DataSet ds = new DataSet();
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(ds);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			//make dataset schema mismatch with DB
-			ds.Tables[0].Columns.Remove("Country");
-			ds.Tables[0].Clear();
-        
-			//--- Default value ---
-        
-			try {
-				BeginCase("MissingMappingAction Default value");
-				Compare(dbDA.MissingMappingAction , MissingMappingAction.Passthrough);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-			//--- MissingMappingAction.Error ---
-			ds.Tables[0].Clear();
-			dbDA.MissingMappingAction  = MissingMappingAction.Error ;
-			Exception ExMissingMappingAction = null;
-			try {
-				BeginCase("MissingMappingAction.Error");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingMappingAction = e;
-				}
-				Compare(ExMissingMappingAction.GetType() ,typeof(InvalidOperationException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Error, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count , 0 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Error, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//--- MissingMappingAction.Ignore ---
-			ds.Tables[0].Clear();
-			dbDA.MissingMappingAction  = MissingMappingAction.Ignore  ;
-			ExMissingMappingAction = null;
-			try {
-				BeginCase("MissingMappingAction.Ignore");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingMappingAction = e;
-				}
-				Compare(ExMissingMappingAction ,null);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Ignore, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count ,0);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Ignore, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//--- MissingMappingAction.Passthrough ---
-			ds.Tables[0].Clear();
-			dbDA.MissingMappingAction  = MissingMappingAction.Passthrough   ;
-			ExMissingMappingAction = null;
-			try {
-				BeginCase("MissingMappingAction.Passthrough");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingMappingAction = e;
-				}
-				Compare(ExMissingMappingAction ,null);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Passthrough, Row.Count > 0");
-				Compare(ds.Tables[0].Rows.Count >= 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Passthrough, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country") >= 0  ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-		protected void DataAdapter_MissingSchemaAction(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-//			IConn.Open();
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			IConn.Open();
-
-			//get the total rows count
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-			//get db type
-			DBType = ConnectedDataProvider.GetDbType(((IDbDataAdapter)dbDA).SelectCommand.Connection.ConnectionString);
-
-			//init dataset
-			DataSet ds = new DataSet();
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(ds);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//make dataset schema mismatch with DB
-			ds.Tables[0].Columns.Remove("Country");
-			ds.Tables[0].Clear();
-        
-
-			//--- Default value ---
-        
-			try {
-				BeginCase("MissingSchemaAction Default value");
-				Compare(dbDA.MissingSchemaAction, MissingSchemaAction.Add);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-			//--- MissingSchemaAction.Error ---
-			ds.Tables[0].Clear();
-			dbDA.MissingSchemaAction  = MissingSchemaAction.Error  ;
-			Exception ExMissingSchemaAction = null;
-			try {
-				BeginCase("MissingSchemaAction.Error");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingSchemaAction = e;
-				}
-				Compare(ExMissingSchemaAction.GetType() ,typeof(InvalidOperationException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Error, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count , 0 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Error, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//--- MissingSchemaAction.Ignore ---
-			try {
-				//catch any exception that might occure 
-				BeginCase("MissingSchemaAction.Ignore - invoke");
-				ds.Tables[0].Clear();
-				dbDA.MissingSchemaAction  = MissingSchemaAction.Ignore  ;
-				ExMissingSchemaAction = null;
-				dbDA.Fill(ds);
-				Compare(true ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Ignore, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Ignore, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-#if !KNOWN_BUG //BUG_NUM:1951
-			try {
-				BeginCase("MissingSchemaAction.Ignore, PrimaryKey");
-				Compare(ds.Tables[0].PrimaryKey.Length == 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-#endif
-
-			//--- MissingSchemaAction.Add ---
-			try {
-				//catch any exception that might occure 
-				BeginCase("MissingSchemaAction.Add - invoke");
-				ds.Tables[0].Clear();
-				dbDA.MissingSchemaAction  = MissingSchemaAction.Add   ;
-				ExMissingSchemaAction = null;
-				dbDA.Fill(ds);
-				Compare(true ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Add, Row.Count > 0");
-				Compare(ds.Tables[0].Rows.Count >= 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Add, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country") >= 0  ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-#if !KNOWN_BUG //BUG_NUM:1952
-			//DB2 don't return primary key
-			if (DBType != DataBaseServer.DB2) {
-				try {
-					BeginCase("MissingSchemaAction.AddWithKey, PrimaryKey");
-					Compare(ds.Tables[0].PrimaryKey.Length  ,0);
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-			}
-
-			//--- MissingSchemaAction.AddWithKey ---
-			try {
-				//catch any exception that might occure 
-				BeginCase("MissingSchemaAction.AddWithKey - invoke");
-				ds.Tables[0].Clear();
-				ds.Tables[0].Columns.Remove("Country");
-				dbDA.MissingSchemaAction  = MissingSchemaAction.AddWithKey    ;
-				ExMissingSchemaAction = null;
-				dbDA.Fill(ds);
-				Compare(true ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.AddWithKey, Row.Count > 0");
-				Compare(ds.Tables[0].Rows.Count >= 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.AddWithKey, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country") >= 0  ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//DB2 don't return primary key
-			if (DBType != DataBaseServer.DB2 &&
-				DBType != DataBaseServer.Oracle) {
-				try {
-					BeginCase("MissingSchemaAction.AddWithKey, PrimaryKey");
-					Compare(ds.Tables[0].PrimaryKey.Length > 0 ,true );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-			}
-#endif
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-		#endregion
-
-		public override void BeginTest(string testName) {
-			base.BeginTest (testName);
-			Log(String.Format("DataBase Type is {0}", ConnectedDataProvider.GetDbType()));
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
deleted file mode 100755
index 8e18db6d3d5..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Oren Gurfinkel   <oreng@mainsoft.com>
-//   Ofer Borstein
-// 
-// Copyright (c) 2004 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-using System.IO;
-using System.Collections;
-using Sys = System;
-using MonoTests.System.Data.Utils.Data;
-
-// Provide All Data required by the diffderent tests e.g.DataTable, DataRow ...
-namespace MonoTests.System.Data.Utils {
-	/// <summary>
-	/// Types of Database Servers that tests can be run on.
-	/// </summary>
-	public enum DataBaseServer {
-		SQLServer,
-		Oracle,
-		DB2,
-		Sybase,
-		PostgreSQL,
-		Unknown
-	}
-
-	public class ConnectedDataProvider {
-
-		#region Private
-		//A string containing all printable charachters.
-		private const string SAMPLE_STRING = "abcdefghijklmnopqrstuvwxyz1234567890~!@#$%^&*()_+-=[]\\|;:,./<>? ";
-		#endregion
-
-		#region Public
-		/// <summary>
-		/// Name of the table in the database, that contain columns of simple types.
-		/// </summary>
-		public const string SIMPLE_TYPES_TABLE_NAME = "TYPES_SIMPLE";
-		/// <summary>
-		/// Name of the table in the database, that contain columns of extended types.
-		/// </summary>
-		public const string EXTENDED_TYPES_TABLE_NAME = "TYPES_EXTENDED";
-		/// <summary>
-		/// Name of the table in the database, that contain columns of DB specific types.
-		/// </summary>
-		public const string SPECIFIC_TYPES_TABLE_NAME = "TYPES_SPECIFIC";
-		#endregion
-
-		public static string ConnectionString {
-			get {
-				return Sys.Configuration.ConfigurationSettings.AppSettings["ConnectionString"];
-			}
-		}
-
-		//	SQLClient does not allow to use the Provider token
-		//	since Provider is always the first parameter(in GHT framework),
-		//	we trim it.
-		public static string ConnectionStringSQLClient {
-			get {
-				return ConnectionString.Substring(ConnectionString.IndexOf(";"));
-			}
-		}
-	
-
-		/// <summary>
-		/// Resolves the type of DB server specified by the "ADOConString.txt" file.
-		/// </summary>
-		/// <returns>The type of DB server specified by the "ADOConString.txt" file.</returns>
-		public static DataBaseServer GetDbType() {
-			return ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString);
-		}
-		
-		/// <summary>
-		/// Resolves the type of DB server that the specified connection refers.
-		/// </summary>
-		/// <param name="OleCon">A valid connection object to a DataBase.</param>
-		/// <returns>The type of DB server that the specified connection refers to.</returns>
-		public static DataBaseServer GetDbType(Sys.Data.OracleClient.OracleConnection OleCon) {
-			return ConnectedDataProvider.GetDbType(OleCon.ConnectionString);
-		}
-
-		/// <summary>
-		/// Resolves the type of DB server that the specified connection string refers.
-		/// </summary>
-		/// <param name="ConnectionString">A valid connection string to a DataBase server.</param>
-		/// <returns>The type of DB server that the specified connection string refers to.</returns>
-		public static DataBaseServer GetDbType(string ConnectionString) {
-			return DataBaseServer.Oracle;
-		}
-
-		/// <summary>
-		/// Creates a DbTypeParametersCollection with default types and data for the TYPES_SIMPLE table.
-		/// </summary>
-		/// <returns>The initialized DbTypeParametersCollection</returns>
-		public static DbTypeParametersCollection GetSimpleDbTypesParameters() {
-			DbTypeParametersCollection row = new DbTypeParametersCollection(SIMPLE_TYPES_TABLE_NAME);
-			switch (ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString)) {
-					#region SQLServer
-				case MonoTests.System.Data.Utils.DataBaseServer.SQLServer:
-					row.Add("bit", true, 1);
-					row.Add("tinyint", (byte)25, 1);
-					row.Add("smallint", (Int16)77, 2);
-					row.Add("int", (Int32)2525, 4);
-					row.Add("bigint", (Int64)25251414, 8);
-					row.Add("decimal", 10M, 9);	//(Decimal)10
-					row.Add("numeric", 123123M, 9); //(Decimal)123123
-					row.Add("float", 17.1414257, 8);
-					row.Add("real", (float)0.71425, 4);
-					row.Add("char", "abcdefghij", 10);
-					row.Add("nchar", "klmnopqrst", 10);
-					row.Add("varchar", "qwertasdfg", 50);
-					row.Add("nvarchar", "qwertasdfg", 50);
-					break;
-					#endregion
-
-					#region Sybase
-				case MonoTests.System.Data.Utils.DataBaseServer.Sybase:
-					//row.Add("BIT", true, 1);
-					row.Add("TINYINT", (byte)25, 1);
-					row.Add("SMALLINT", (Int16)77, 2);
-					row.Add("INT", (Int32)2525, 4);
-					//row.Add("BIGINT", (Int64)25251414, 8);
-					row.Add("DECIMAL", 10M, 9);	//(Decimal)10
-					row.Add("NUMERIC", 123123M, 9); //(Decimal)123123
-					row.Add("FLOAT", 17.1414257, 8);
-					row.Add("REAL", (float)0.71425, 4);
-					row.Add("CHAR", "abcdefghij", 10);
-					row.Add("NCHAR", "klmnopqrst", 10);
-					row.Add("VARCHAR", "qwertasdfg", 50);
-					row.Add("NVARCHAR", "qwertasdfg", 50);
-					break;
-					#endregion
-
-					#region ORACLE
-				case MonoTests.System.Data.Utils.DataBaseServer.Oracle:
-					row.Add("NUMBER", 21M, 22);	//(Decimal)21
-					row.Add("LONG", SAMPLE_STRING, 2147483647);	//Default data type in .NET is system.String.
-					row.Add("FLOAT", 1.234, 22);
-					row.Add("VARCHAR", "qwertasdfg", 10);
-					row.Add("NVARCHAR", "qwertasdfg", 20);
-					row.Add("CHAR", "abcdefghij", 10);
-					row.Add("NCHAR", "abcdefghij", 10);
-					break;
-					#endregion
-
-					#region DB2
-				case MonoTests.System.Data.Utils.DataBaseServer.DB2:
-					row.Add("SMALLINT", (Int16)2, 2);
-					row.Add("INTEGER", 7777, 4);
-					row.Add("BIGINT", (Int64)21767267, 8);
-					row.Add("DECIMAL", 123M, 9); //(decimal)123
-					row.Add("REAL", (float)0.7, 4);
-					row.Add("DOUBLE", 1.7, 8);
-					row.Add("CHARACTER", "abcdefghij", 10);
-					row.Add("VARCHAR", "qwertasdfg", 10);
-					row.Add("LONGVARCHAR", SAMPLE_STRING, 32000);
-					break;
-					#endregion
-
-					#region PostgreSQL
-				case MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL:
-					
-					// PostgreSQL ODBC Type BOOL returns String with value "1" 
-					// so we don't run it on .NET
-					//					if (!GHTEnvironment.IsJavaRunTime())
-					//					{
-					//						row.Add("BOOL", "1", 1);
-					//					}
-					//					else
-					//					{
-					row.Add("BOOL", (bool)true, 1);
-					//					}
-
-					row.Add("INT2", (Int16)21, 2);
-					row.Add("INT4", (Int32)30000, 4);
-					row.Add("INT8", (Int64)30001, 8);
-					row.Add("NUMERIC", (decimal)100000M, 10); //(decimal)100000
-					row.Add("FLOAT4", (Single)7.23157, 4);
-					row.Add("FLOAT8", (Double)7.123456, 8);
-					row.Add("VARCHAR", "qwertasdfg", 10);
-					row.Add("CHAR", "abcdefghij", 10);
-					row.Add("NCHAR", "klmnopqrst", 10);
-					break;
-					#endregion
-			}
-			return row;
-		}
-		/// <summary>
-		/// Creates a DbTypeParametersCollection with default types and data for the TYPES_EXTENDED table.
-		/// </summary>
-		/// <returns>The initialized DbTypeParametersCollection</returns>
-		public static DbTypeParametersCollection GetExtendedDbTypesParameters() {
-			DbTypeParametersCollection row = new DbTypeParametersCollection(EXTENDED_TYPES_TABLE_NAME);
-			switch (ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString)) {
-					#region SQLServer
-				case MonoTests.System.Data.Utils.DataBaseServer.SQLServer:
-					row.Add("text", SAMPLE_STRING, 16);
-					row.Add("ntext", SAMPLE_STRING, 16);
-					row.Add("binary", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("varbinary", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("datetime", new DateTime(2004, 8, 9, 20, 30, 15, 500), 8);
-					row.Add("smalldatetime", new DateTime(2004, 8, 9, 20, 30, 00), 4);
-					break;
-					#endregion
-
-					#region Sybase
-				case MonoTests.System.Data.Utils.DataBaseServer.Sybase:
-					row.Add("TEXT", SAMPLE_STRING, 16);
-					//There is probably a bug in the jdbc driver , we've tried to insert this string using
-					//sybase command tool and it gave the same result (3850)
-					row.Add("NTEXT", SAMPLE_STRING.Trim() , 16);
-					row.Add("BINARY", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("VARBINARY", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("DATETIME", new DateTime(2004, 8, 9, 20, 30, 15, 500), 8);
-					row.Add("SMALLDATETIME", new DateTime(2004, 8, 9, 20, 30, 00), 4);
-					break;
-					#endregion
-
-					#region ORACLE
-				case MonoTests.System.Data.Utils.DataBaseServer.Oracle:
-					row.Add("RAW", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 10);
-					row.Add("LONGRAW", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													}, 100);
-					row.Add("DATE", new DateTime(2004, 8, 9, 20, 30, 15), 7);
-					
-					// The .NET Framework provides support for Oracle LOBs in the OracleClient namespace, but not in the Oracle namespace.
-					// Since Visual MainWin does not support the OracleClient namespace, a partial support for this important feature is provided in the Oracle namespace.
-					// See ms-help://MS.VSCC.2003/VMW.GH.1033/ghdoc/vmwdoc_ADONET_data_access_limitations_51.htm
-#if TARGET_JVM
-
-					row.Add("BLOB", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-												}, 4000);
-					row.Add("CLOB",	SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						, 4000);
-					row.Add("NCLOB", SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						, 4000);
-#endif
-					break;
-					#endregion
-
-					#region DB2
-				case MonoTests.System.Data.Utils.DataBaseServer.DB2:
-					row.Add("DATE", new DateTime(2004, 8, 9, 20, 30, 15, 500).Date);
-					row.Add("TIME", new TimeSpan(20, 30, 15));
-					row.Add("TIMESTAMP", new DateTime(2004, 8, 9, 20, 30, 15, 500));
-					row.Add("BLOB", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-												});
-					row.Add("CLOB", SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						);
-					row.Add("DBCLOB", SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						);
-					break;
-					#endregion
-
-					#region PostgreSQL
-				case MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL:
-					row.Add("BYTEA", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("DATE", new DateTime(2004, 8, 9));
-					row.Add("TEXT", "abcdefg", 16); 
-					row.Add("TIME", new Sys.TimeSpan(02,02,02));
-					row.Add("TIMESTAMP", new DateTime(2004, 8, 9, 20, 30, 15, 500), 8);
-					break;
-					#endregion
-
-			}
-			return row;
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParameter.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParameter.cs
deleted file mode 100755
index c215d0be47e..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParameter.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-namespace MonoTests.System.Data.Utils.Data
-{
-	/// <summary>
-	/// Represents a parameter type for use in tests of System.Data.
-	/// </summary>
-	public class DbTypeParameter
-	{
-		#region Members
-		//Name of the Database type of this parameter.
-		private string m_sDbTypeName;
-		//Value of this parameter.
-		private object m_oValue;
-		//Size of this parameter.
-		private int m_iSize;
-		//Indicates wheather the size of this DbTypeParameter was initialized.
-		private bool m_bIsSizeSet = false;
-		#endregion
-
-		#region Constructors
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public DbTypeParameter()
-		{
-		}
-
-		/// <summary>
-		/// Constructor, Initializes the DbTypeParameter's properties according to specified values.
-		/// </summary>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		public DbTypeParameter(string a_sTypeName, object a_oValue)
-		{
-			DbTypeName = a_sTypeName;
-			Value = a_oValue;
-		}
-		/// <summary>
-		/// Constructor, Initializes the DbTypeParameter's properties according to specified values.
-		/// </summary>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		/// <param name="a_iSize">Specifies the initial size for the DbTypeParameter.</param>
-		public DbTypeParameter(string a_sTypeName, object a_oValue, int a_iSize)
-		{
-			DbTypeName = a_sTypeName;
-			Value = a_oValue;
-			Size = a_iSize;
-		}
-		#endregion
-
-		#region Properties
-		public string DbColumnName
-		{
-			get
-			{
-				return string.Format("T_{0}", m_sDbTypeName);
-			}
-		}
-
-		public string ParameterName
-		{
-			get
-			{
-				return String.Format(":T_{0}", m_sDbTypeName);
-			}
-		}
-		public string DbTypeName
-		{
-			get
-			{
-				return m_sDbTypeName;
-			}
-			set
-			{
-				m_sDbTypeName = value;
-			}
-		}
-
-		public object Value
-		{
-			get
-			{
-				return m_oValue;
-			}
-			set
-			{
-				m_oValue = value;
-			}
-		}
-
-		public int Size
-		{
-			get
-			{
-				if (IsSizeSet)
-				{
-					return m_iSize;
-				}
-				else
-				{
-					throw new InvalidOperationException("DbTypeParameter size was not set.");
-				}
-			}
-			set
-			{
-				m_iSize = value;
-				m_bIsSizeSet = true;
-			}
-		}
-		public bool IsSizeSet
-		{
-			get
-			{
-				return m_bIsSizeSet;
-			}
-		}
-		public DbType DbType
-		{
-			get
-			{
-				return GetDefaultDbType(DbTypeName);
-			}
-		}
-		#endregion
-
-		#region Methods
-		public static DbType GetDefaultDbType(string dbTypeName)
-		{
-			switch (dbTypeName.ToUpper())
-			{
-				case "BIT":	//SQLServer.
-					return DbType.Boolean;
-				case "TINYINT":	//SQLServer.
-					return DbType.Byte;
-				case "SMALLINT":	//SQLServer & DB2.
-					return DbType.Int16;
-				case "INT":	//SQLServer.
-					return DbType.Int32;
-				case "INTEGER": //DB2
-					return DbType.Int32;
-				case "BIGINT":	//MSSQLServer &DB2
-					return DbType.Int64;
-				case "NUMERIC": //MSSQLServer.
-					return DbType.Decimal;
-				case "NUMBER": //Oracle.
-					return DbType.VarNumeric;
-			case "DECIMAL":	//MSSQLServer & DB2
-				return DbType.Decimal;
-				case "FLOAT":	//MSSQLServer & Oracle
-						return DbType.Double;
-				case "REAL": //MSSQLServer & DB2
-					return DbType.Single;
-				case "DOUBLE":
-					return DbType.Double;
-				case "CHAR":	//MSSQLServer & Oracle.
-					return DbType.AnsiStringFixedLength;
-				case "NCHAR": //MSSQLServer & Oracle.
-					return DbType.AnsiStringFixedLength;
-				case "VARCHAR": //MSSQLServer, Oracle & DB2.
-					return DbType.AnsiString;
-				case "NVARCHAR": //MSSQLServer & Oracle.
-					return DbType.AnsiString;
-				case "CHARACTER": //DB2
-					return DbType.AnsiStringFixedLength;
-				case "LONGVARCHAR": //DB2
-					return DbType.String;
-				case "LONG":	//Oracle.
-					return DbType.AnsiString;
-				default:
-					throw new ApplicationException(string.Format("Dont know the default DbType for {0}.", dbTypeName));
-			}
-		}
-		public object ApplyDefaultDataTransformation()
-		{
-			if (Value == DBNull.Value)
-			{
-				return DBNull.Value;
-			}
-			else if (Value.GetType() == typeof(bool))
-			{
-				return DefaultBooleanTransformation((bool)Value);
-			}
-			else if (Value.GetType() == typeof(byte))
-			{
-				return DefaultByteTransformation((byte)Value);
-			}
-			else if (Value.GetType() == typeof(Int16))
-			{
-				return DefaultInt16Transformation((Int16)Value);
-			}
-			else if (Value.GetType() == typeof(int))
-			{
-				return DefaultIntTransformation((int)Value);
-			}
-			else if (Value.GetType() == typeof(Int64))
-			{
-				return DefaultInt64Transformation((Int64)Value);
-			}
-			else if (Value.GetType() == typeof(decimal))
-			{
-				return DefaultDecimalTransformation((decimal)Value);
-			}
-			else if (Value.GetType() == typeof(double))
-			{
-				return DefaultDoubleTransformation((double)Value);
-			}
-			else if (Value.GetType() == typeof(float))
-			{
-				return DefaultFloatTransformation((float)Value);
-			}
-			else if (Value.GetType() == typeof(string))
-			{
-				return DefaultStringTransformation((string)Value);
-			}
-			else
-			{
-				throw new ApplicationException(string.Format("No default transformation for type {0}.", Value));
-			}
-		}
-		public static bool DefaultBooleanTransformation(bool val)
-		{
-			return !val;
-		}
-		public static byte DefaultByteTransformation(byte val)
-		{
-			return (byte)(val*2);;
-		}
-		public static Int16 DefaultInt16Transformation(Int16 val)
-		{
-			return (Int16)(val*2);
-		}
-		public static int DefaultIntTransformation(int val)
-		{
-			return (int)(val*2);;
-		}
-		public static Int64 DefaultInt64Transformation(Int64 val)
-		{
-			return (Int64)(val*2);;
-		}
-		public static decimal DefaultDecimalTransformation(decimal val)
-		{
-			return (decimal)(val*2);;
-		}
-		public static double DefaultDoubleTransformation(double val)
-		{
-			return (double)(val*2);;
-		}
-		public static float DefaultFloatTransformation(float val)
-		{
-			return (float)(val*2);;
-		}
-		public static string DefaultStringTransformation(string val)
-		{
-			return val.ToUpper();;
-		}
-		/// <summary>
-		/// Invalidates the size of this DbTypeParameter.
-		/// </summary>
-		public void InvalidateSize()
-		{
-			m_bIsSizeSet = false;
-		}
-		#endregion
-
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs
deleted file mode 100755
index 9e0068d21ef..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-using System.Data.SqlClient;
-using CollectionBase = System.Collections.CollectionBase;
-using Sys = System;
-
-namespace MonoTests.System.Data.Utils.Data
-{
-	/// <summary>
-	/// A collection of DbTypeParameters that matches the column of specific a database table
-	/// </summary>
-	public class DbTypeParametersCollection : CollectionBase
-	{
-		#region Constructors
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public DbTypeParametersCollection()
-		{
-		}
-
-		/// <summary>
-		/// Constructor.
-		/// Initializes a DbTypeParametersCollection with the specified TableName
-		/// </summary>
-		/// <param name="a_sTableName">Specifies the table name to set.</param>
-		public DbTypeParametersCollection(string a_sTableName)
-		{
-			m_sTableName = a_sTableName;
-		}
-		#endregion
-
-		#region Members
-		private string m_sTableName;
-		#endregion
-
-		#region Properties & Indexers
-		public string TableName
-		{
-			get
-			{
-				return m_sTableName;
-			}
-			set
-			{
-				m_sTableName = value;
-			}
-		}
-		/// <summary>
-		/// Gets or sets the DbTypeParameter at the specified index.
-		/// </summary>
-		/// <exception cref="ArgumentException">The column name specified by value.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public DbTypeParameter this[int a_iIndex]  
-		{
-			get  
-			{
-				return((DbTypeParameter)List[a_iIndex]);
-			}
-			set  
-			{
-				//Check that the collection does not already contain a DbTypeParameter with the same column name.
-				int l_iIndexOfValueColumnName = this.IndexOf(value.DbColumnName);
-				if (l_iIndexOfValueColumnName != -1 && l_iIndexOfValueColumnName != a_iIndex)
-				{
-					throw new ArgumentException("The column name specified by DbTypeParameter.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.", "value");
-				}
-				else
-				{
-					List[a_iIndex] = value;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the DbTypeParameter with the specified DBColumnName.
-		/// </summary>
-		/// <exception cref="ArgumentException">The column name specified by value.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public DbTypeParameter this[string a_sDBColumnName]  
-		{
-			get  
-			{
-				return this[IndexOf(a_sDBColumnName)];
-			}
-			set  
-			{
-				this[IndexOf(a_sDBColumnName)] = value;
-			}
-		}
-		/// <summary>
-		/// A textual string that conatins the Oracle place holder for parameter ('?') for each of the parameters.
-		/// </summary>
-		public  string UnnamedParameterPlaceHolderList {
-			get {
-				return GetParameterPlaceHolderList("?, ");
-			}
-		}
-		/// <summary>
-		/// A textual string that conatins the MSSQL place holder for parameter ('@parame_name') for each of the parameters.
-		/// </summary>
-		public string NamedParameterPlaceHolderList
-		{
-			get
-			{
-				return GetParameterPlaceHolderList("{0}, ");
-			}
-		}
-		/// <summary>
-		/// A string that contains a comma delimited list of all default column names for the parameters held by this collection.
-		/// </summary>
-		public string ColumnsList
-		{
-			get
-			{
-				Sys.Text.StringBuilder l_sbColumnsList = new Sys.Text.StringBuilder();;
-
-				foreach (DbTypeParameter l_oCurrent in this)
-				{
-					l_sbColumnsList.AppendFormat("{0}, ", l_oCurrent.DbColumnName);
-				}
-
-				//remove last ', ' from values list:
-				l_sbColumnsList.Remove(l_sbColumnsList.Length -2, 2);
-
-				return l_sbColumnsList.ToString();
-			}
-		}
-		/// <summary>
-		/// A string that contains a comma delimited list of all values of the parameters held by this collection.
-		/// </summary>
-		public string ValuesList
-		{
-			get
-			{
-				Sys.Text.StringBuilder l_sbValuesList = new Sys.Text.StringBuilder();
-				string l_sCurrentVal = string.Empty;
-				string l_sCurrentFormatting = string.Empty;
-
-				foreach (DbTypeParameter l_oCurrent in this)
-				{
-					//Handle types with string representation different then ToString().
-					l_sCurrentVal = (l_oCurrent.Value != DBNull.Value) ? l_oCurrent.Value.ToString() : "NULL";
-					if (l_oCurrent.Value is bool)
-					{
-						l_sCurrentVal = ((bool)l_oCurrent.Value) ? "1" : "0";
-					}
-
-                    //Set the correct foratting according to type.					
-					l_sCurrentFormatting = (l_oCurrent.Value is string) ? "'{0}', " : "{0}, ";
-					
-					//appent the textual representation.
-					l_sbValuesList.AppendFormat(l_sCurrentFormatting, l_sCurrentVal);
-				}
-
-				//remove last ', ' from values list:
-				l_sbValuesList.Remove(l_sbValuesList.Length -2, 2);
-
-				return l_sbValuesList.ToString();
-			}
-		}
-		#endregion
-		
-		#region Methods
-		#region Public
-		#region Sys.Collections.CollectionBase implementation
-		/// <summary>
-		/// Adds the specified DbTypeParameter to the DbTypeParametersCollection.
-		/// </summary>
-		/// <param name="a_oToAdd">The DbTypeParameter to add to the collection. </param>
-		/// <returns>The index of the new DbTypeParameter object.</returns>
-		/// <exception cref="ArgumentException">The column name specified by a_oToAdd.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public virtual int Add( DbTypeParameter a_oToAdd )  
-		{
-			if (this.Contains(a_oToAdd.DbColumnName))
-			{
-				throw new ArgumentException("The column name specified by DbTypeParameter.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.", "a_oToAdd");
-			}
-			return( List.Add( a_oToAdd ) );
-		}
-
-		/// <summary>
-		/// Adds a DbTypeParameter with the specified data to the DbTypeParametersCollection.
-		/// </summary>
-		/// <param name="a_sColumnName">Specifies the initial column name for the DbTypeParameter.</param>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		/// <returns>The index of the new DbTypeParameter object.</returns>
-		/// <exception cref="ArgumentException">The column name specified by a_sColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public virtual int Add(string a_sTypeName, object a_oValue)
-		{
-			DbTypeParameter l_oToAdd = new DbTypeParameter(a_sTypeName, a_oValue);
-			return this.Add(l_oToAdd);
-		}
-
-		/// <summary>
-		/// Adds a DbTypeParameter with the specified data to the DbTypeParametersCollection.
-		/// </summary>
-		/// <param name="a_sColumnName">Specifies the initial column name for the DbTypeParameter.</param>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		/// <param name="a_iSize">Specifies the initial size for the DbTypeParameter</param>
-		/// <returns>The index of the new DbTypeParameter object.</returns>
-		/// <exception cref="ArgumentException">The column name specified by a_sColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public virtual int Add(string a_sTypeName, object a_oValue, int a_iSize)
-		{
-			DbTypeParameter l_oToAdd = new DbTypeParameter(a_sTypeName, a_oValue, a_iSize);
-			return this.Add(l_oToAdd);
-		}
-
-		/// <summary>
-		/// Gets the location of the DbTypeParameter object in the collection.
-		/// </summary>
-		/// <param name="a_oToFind">The DbTypeParameter object to locate. </param>
-		/// <returns>The zero-based location of the DbTypeParameter in the collection, if found; otherwise, -1.</returns>
-		public virtual int IndexOf( DbTypeParameter a_oToFind)  
-		{
-			return( List.IndexOf( a_oToFind ) );
-		}
-
-		/// <summary>
-		/// Gets the location of the DbTypeParameter object in the collection.
-		/// </summary>
-		/// <param name="a_oToFind">The DbTypeParameter object to locate. </param>
-		/// <returns>The zero-based location of the DbTypeParameter in the collection, if found; otherwise, -1.</returns>
-		public virtual int IndexOf( string a_sColumnName )  
-		{
-			for (int i=0; i<List.Count; i++)
-			{
-				if (this[i].DbColumnName.ToUpper() == a_sColumnName.ToUpper())
-				{
-					return i;
-				}
-			}
-
-			//Didn't find such DbTypeParameter:
-			return-1;
-		}
-
-		/// <summary>
-		/// Determines whether the DbTypeParametersCollection contains a specific DbTypeParameter.
-		/// </summary>
-		/// <param name="a_oToFind">The DbTypeParameter to locate in the DbTypeParametersCollection</param>
-		/// <returns>true if the DbTypeParametersCollection contains the specified DbTypeParameter; otherwise, false.</returns>
-		public virtual bool Contains( DbTypeParameter a_oToFind )  
-		{
-			// If a_oToFind is not of type DbTypeParameter, this will return false.
-			return( List.Contains( a_oToFind ) );
-		}
-
-		/// <summary>
-		/// Determines whether the DbTypeParametersCollection contains a DbTypeParameter with specific column name (DBColumnName).
-		/// </summary>
-		/// <param name="a_sToFind">The column name to locate in the DbTypeParametersCollection</param>
-		/// <returns>true if the DbTypeParametersCollection contains a DbTypeParameter with specific column name; otherwise, false.</returns>
-		public virtual bool Contains( string a_sToFind )  
-		{
-			return (this.IndexOf(a_sToFind) > -1);
-		}
-
-		/// <summary>
-		/// Creates an array of OracleParameters based on the contents of this collection.
-		/// </summary>
-		/// <returns>An array of OracleParameters based on the contents of this collection</returns>
-		public virtual OracleParameter[] ToOracleParameterArray()
-		{
-			OracleParameter[] l_oParams = new OracleParameter[this.Count];
-			for (int i=0; i<this.Count; i++)
-			{
-				l_oParams[i] = new OracleParameter(this[i].ParameterName, this[i].Value);
-			}
-
-			return l_oParams;
-		}
-
-		/// <summary>
-		/// Creates an array of SqlParameters based on the contents of this collection.
-		/// </summary>
-		/// <returns>An array of SqlParameters based on the contents of this collection</returns>
-		public virtual SqlParameter[] ToSqlParameterArray()
-		{
-			SqlParameter[] l_oParams = new SqlParameter[this.Count];
-			for (int i=0; i<this.Count; i++)
-			{
-				l_oParams[i] = new SqlParameter(this[i].ParameterName, this[i].Value);
-			}
-
-			return l_oParams;
-		}
-
-		/// <summary>
-		/// Creates an array of objects based on the contents of this collection.
-		/// </summary>
-		/// <returns>An array of objects that contains all values of parameters in this collection</returns>
-		public virtual object[] ToValuesArray()
-		{
-			
-			object[] l_oParams = new object[this.Count];
-			for (int i=0; i<this.Count; i++)
-			{
-				l_oParams[i] = this[i].Value;
-			}
-
-			return l_oParams;
-		}
-		#endregion
-		#region Execute methods
-		/// <summary>
-		/// Builds and execute an INSERT command according to the DbTypeParameters in this collection, and the TableName property.
-		/// </summary>
-		/// <param name="a_sUniqueId">A unique identifier for the inserted row.</param>
-		/// <returns>The number of inserted rows (usually 1).</returns>
-		public virtual int ExecuteInsert(string a_sUniqueId)
-		{
-			int l_iRecordsInserted;
-			OracleCommand l_cmdInsert = new OracleCommand();
-			l_cmdInsert.Connection = new OracleConnection(ConnectedDataProvider.ConnectionString);
-			l_cmdInsert.CommandText = GetInsertCommandText(a_sUniqueId);
-			AddInsertCommandParameters(l_cmdInsert.Parameters);
-
-			try
-			{
-				if (l_cmdInsert.Connection.State != ConnectionState.Open)
-				{
-					l_cmdInsert.Connection.Open();
-				}
-//				Sys.Console.WriteLine(l_cmdInsert.CommandText);
-				l_iRecordsInserted = l_cmdInsert.ExecuteNonQuery();
-			}
-			finally
-			{
-				l_cmdInsert.Connection.Close();
-			}
-
-			return l_iRecordsInserted;
-		}
-
-		/// <summary>
-		/// Builds and executes an DELETE command according to the UniqueId parameter, and the TableName property.
-		/// </summary>
-		/// <param name="a_sUniqueId">The criteria for deleting.</param>
-		/// <returns>The number of deleted rows.</returns>
-		public virtual int ExecuteDelete(string a_sUniqueId)
-		{
-			return DbTypeParametersCollection.ExecuteDelete(this.TableName, a_sUniqueId);
-		}
-
-		/// <summary>
-		/// Builds and executes an DELETE command according to the given TableName & UniqueId parameters.
-		/// </summary>
-		/// <param name="a_sTableName">The table to delete from.</param>
-		/// <param name="a_sUniqueId">The criteria for deleting.</param>
-		/// <returns>The number of deleted rows.</returns>
-		public static int ExecuteDelete(string a_sTableName, string a_sUniqueId)
-		{
-#if !TARGET_JVM
-			return 0;
-#endif
-			int l_iRecordsDeleted;
-			OracleCommand l_cmdDelete = new OracleCommand();
-			l_cmdDelete.Connection = new OracleConnection(ConnectedDataProvider.ConnectionString);
-			l_cmdDelete.CommandText = String.Format("DELETE FROM {0} WHERE ID='{1}'", a_sTableName, a_sUniqueId);
-			try
-			{
-				if (l_cmdDelete.Connection.State != ConnectionState.Open)
-				{
-					l_cmdDelete.Connection.Open();
-				}
-
-				l_iRecordsDeleted = l_cmdDelete.ExecuteNonQuery();
-			}
-			finally
-			{
-				l_cmdDelete.Connection.Close();
-			}
-
-			return l_iRecordsDeleted;
-		}
-		
-		/// <summary>
-		/// Executes a select command that selects all columns specified by this collection,
-		/// from the table specified by this collections TableName property,
-		/// filtered by the given unique id.
-		/// The select command is executed using ExecuteReader.
-		/// </summary>
-		/// <param name="a_sUniqueId">The unique id to use as rows filter.</param>
-		/// <param name="a_oReader">Reader that holds the results of the select command.</param>
-		/// <param name="a_oConnection">A connection object that serves the reader a_oReader for retrivieng data.</param>
-		/// <remarks>
-		/// While the OracleDataReader is in use, the associated OracleConnection is open and busy serving the OracleDataReader.
-		/// While in this state, no other operations can be performed on the OracleConnection other than closing it.
-		/// This is the case until the Close method of the OracleDataReader is called.
-		/// It is the users responsibility to close the OracleConnection explicitly when it is no longer needed.
-		/// </remarks>
-		public virtual void ExecuteSelectReader(string a_sUniqueId, out OracleDataReader a_oReader, out OracleConnection a_oConnection)
-		{
-			OracleCommand l_cmdSelect = BuildSelectCommand(a_sUniqueId);
-			l_cmdSelect.Connection.Open();
-			a_oConnection = l_cmdSelect.Connection;
-			a_oReader = l_cmdSelect.ExecuteReader();
-		}
-		/// <summary>
-		/// Executes a select command that selects all columns specified by this collection,
-		/// from the table specified by this collections TableName property,
-		/// filtered by the given unique id.
-		/// The select command is executed using ExecuteScalar.
-		/// </summary>
-		/// <param name="a_sUniqueId">The unique id to use as rows filter.</param>
-		/// <returns>The first column of the first row in the result set, or a null reference if the result set is empty.</returns>
-		public virtual object ExecuteSelectScalar(string a_sUniqueId)
-		{
-			object l_oReturnValue = null;
-			OracleCommand l_cmdSelect = BuildSelectCommand(a_sUniqueId);
-
-			try
-			{
-				l_cmdSelect.Connection.Open();
-				l_oReturnValue = l_cmdSelect.ExecuteScalar();
-			}
-			finally
-			{
-				if (l_cmdSelect.Connection.State != ConnectionState.Closed)
-				{
-					l_cmdSelect.Connection.Close();
-				}
-			}
-
-			return l_oReturnValue;
-		}
-
-		#endregion
-		#endregion
-
-		#region Callbacks
-		//All these methods are callbacks, that ensure type safty of elements within the base.List.
-
-		protected override void OnInsert( int index, Object value )  
-		{
-			if ( value.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "value must be of type DbTypeParameter.", "value" );
-		}
-
-		protected override void OnRemove( int index, Object value )  
-		{
-			if ( value.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "value must be of type DbTypeParameter.", "value" );
-		}
-
-		protected override void OnSet( int index, Object oldValue, Object newValue )  
-		{
-			if ( newValue.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "newValue must be of type DbTypeParameter.", "newValue" );
-		}
-
-		protected override void OnValidate( Object value )  
-		{
-			if ( value.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "value must be of type DbTypeParameter." );
-		}
-		#endregion
-
-		#region Private
-		/// <summary>
-		/// Create a SQL text for an INSERT command with parameters ('?' notation).
-		/// The command uses the table specified in the TableName property, 
-		/// and uses the columns specified in this parameters collection.
-		/// </summary>
-		/// <param name="a_sUniqueId">The Unique id for the row to be inserted.</param>
-		private string GetInsertCommandText(string a_sUniqueId)
-		{
-			string l_sCmd = string.Empty;
-			string l_sColumnsList = ColumnsList;
-			string l_sValuesList = NamedParameterPlaceHolderList;
-
-			l_sCmd = String.Format("INSERT INTO {0} (ID, {1}) VALUES ('{2}', {3})", m_sTableName, l_sColumnsList, a_sUniqueId, l_sValuesList);
-            
-			return l_sCmd;
-		}
-
-		/// <summary>
-		/// Builds an OracleParametersCollection for an INSERT command, according to the DbTypeParameters in this collection.
-		/// </summary>
-		/// <param name="a_oParams">The OracleParameterCollection to be filled.</param>
-		private void AddInsertCommandParameters(OracleParameterCollection a_oParams)
-		{
-			foreach (DbTypeParameter l_oCurrent in this)
-			{
-				a_oParams.Add(l_oCurrent.ParameterName, l_oCurrent.Value);
-			}
-		}
-		/// <summary>
-		/// Create a command object for a SELECT command .
-		/// The command uses the table specified in the TableName property, 
-		/// and uses the columns specified in this parameters collection.
-		/// </summary>
-		/// <remarks>The ID column is not included in the selected columns of this command.</remarks>
-		/// <returns>An OracleCommand for selecting the columns specified in this collection, from the table specified in the TableName property. </returns>
-		private OracleCommand BuildSelectCommand(string a_sUniqueId)
-		{
-			string l_sColumnsList = ColumnsList;
-			string l_sCmdTxt;
-			OracleConnection l_oConnection = new OracleConnection(ConnectedDataProvider.ConnectionString);
-			OracleCommand l_cmdSelect = new OracleCommand();
-
-			//Build the command's text.
-			l_sCmdTxt = string.Format("SELECT {0} FROM {1} WHERE ID='{2}'", l_sColumnsList, this.TableName, a_sUniqueId);
-
-			//Build the command object.
-			l_cmdSelect.CommandText = l_sCmdTxt;
-			l_cmdSelect.Connection = l_oConnection;
-
-			return l_cmdSelect;
-		}
-
-		/// <summary>
-		/// Create a string that conatins a place holder for each of the parameters.
-		/// </summary>
-		/// <param name="a_sSormatting">The format for each parameter in the list (defined in String.Format())</param>
-		/// <returns>A string that conatins a place holder for each of the parameters.</returns>
-		private string GetParameterPlaceHolderList(string a_sSormatting)
-		{
-			Sys.Text.StringBuilder l_sbValuesList = new Sys.Text.StringBuilder();;
-
-			foreach (DbTypeParameter l_oCurrent in this)
-			{
-				l_sbValuesList.AppendFormat(a_sSormatting, l_oCurrent.ParameterName);
-			}
-
-			//remove last ', ' from values list:
-			l_sbValuesList.Remove(l_sbValuesList.Length -2, 2);
-
-			return l_sbValuesList.ToString();
-		}
-		#endregion
-
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/GHTBase.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/GHTBase.cs
deleted file mode 100755
index 24585c22c02..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/MonoTests.System.Data.Utils/GHTBase.cs
+++ /dev/null
@@ -1,486 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.Utils
-{
-	public class GHTBase
-	{
-		#region Constructors	
-		/// <summary>Constructor 
-		/// <param name="Logger">Custom TextWriter to log to</param>
-		/// <param name="LogOnSuccess">False to log only failed TestCases, True to log all</param>
-		/// </summary>
-		protected GHTBase(TextWriter Logger, bool LogOnSuccess)
-		{
-			this._logger = Logger;
-			this._logOnSuccess = LogOnSuccess;
-		}
-
-		/// <summary>Constructor, log to Console
-		/// <param name="LogOnSuccess">False to log only failed TestCases, True to log all</param>
-		/// </summary>
-		protected GHTBase(bool LogOnSuccess):this(Console.Out, LogOnSuccess){}
-
-		/// <summary>Constructor, log to Console only when Failed 
-		/// </summary>
-		protected GHTBase():this(Console.Out, false){}
-		#endregion
-
-		#region protected methods
-
-		public void GHTSetLogger(TextWriter Logger)
-		{
-			this._logger = Logger;
-		}
-		/// <summary>Begin Test which containes TestCases
-		/// <param name="testName">Test name, used on logs</param>
-		/// </summary>
-		public virtual void BeginTest(string testName)
-		{
-			//set test name
-			this._testName = testName;
-			//reset the Failure Counter and the TestCase Number
-			UniqueId.ResetCounters();
-
-			if(this._logOnSuccess == true)
-				Log(string.Format("*** Starting Test: [{0}] ***", this._testName));
-		}
-
-		/// <summary>Begin TestCase
-		/// <param name="Description">TestCase Description, used on logs</param>
-		/// </summary>
-		public void BeginCase(string Description)
-		{
-			//Previous TestCase must be ended before beginning a new one.
-			if (_testCase != null) throw new Exception("Previous Case not Ended");
-			//init the new TestCase with Unique TestCase Number and Description
-			_testCase = new UniqueId(Description);
-
-			if(this._logOnSuccess == true)
-				Log(string.Format("Starting Case: [{0}]", _testCase.ToString()));
-		}
-
-
-		/// <summary>Compare two objects (using Object.Equals)
-		/// </summary>
-		protected bool Compare(object a, object b)
-		{
-			Assert.AreEqual(b, a);
-			//signal that the Compare method has been called
-			this._testCase.CompareInvoked = true;
-			//a string that holds the description of the objects for log
-			string ObjectData;
-
-			//check if one of the objects is null
-			if  (a == null && b != null)
-			{
-				ObjectData = "Object a = null" + ", Object b.ToString() = '" + b.ToString() + "'(" + b.GetType().FullName + ")";
-				this._testCase.Success = false; //objects are different, TestCase Failed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//check if the other object is null
-			if  (a != null && b == null)
-			{
-				ObjectData = "Object a.ToString() = '" + a.ToString() + "'(" + a.GetType().FullName + "), Object b = null";
-				this._testCase.Success = false; //objects are different, TestCase Failed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//check if both objects are null
-			if ( (a == null && b == null) )
-			{
-				ObjectData = "Object a = null, Object b = null";
-				this._testCase.Success = true; //both objects are null, TestCase Succeed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			ObjectData = "Object a.ToString() = '" + a.ToString() + "'(" + a.GetType().FullName + "), Object b.ToString = '" + b.ToString() + "'(" + b.GetType().FullName + ")";
-			//use Object.Equals to compare the objects
-			this._testCase.Success = (a.Equals(b));
-			LogCompareResult(ObjectData);
-			return this._testCase.Success;
-		}
-
-		/// <summary>Compare two Object Arrays. 
-		/// <param name="a">First array.</param>
-		/// <param name="b">Second array.</param>
-		/// <param name="Sorted">Used to indicate if both arrays are sorted.</param>
-		/// </summary>
-		protected bool Compare(Array a, Array b)
-		{
-			Assert.AreEqual(b, a);
-			//signal that the Compare method has been called
-			this._testCase.CompareInvoked=true;
-			//a string that holds the description of the objects for log
-			string ObjectData;
-
-			//check if both objects are null
-			if ( (a == null && b == null) )
-			{
-				ObjectData = "Array a = null, Array b = null";
-				this._testCase.Success = true; //both objects are null, TestCase Succeed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//Check if one of the objects is null.
-			//(If both were null, we wouldn't have reached here).
-			if (a == null || b == null)
-			{
-				string aData = (a==null) ? "null" : "'" + a.ToString() + "' (" + a.GetType().FullName + ")";
-				string bData = (b==null) ? "null" : "'" +b.ToString() + "' (" + b.GetType().FullName + ")";
-				ObjectData = "Array a = "  + aData + ", Array b = " + bData;
-				this._testCase.Success = false; //objects are different, testCase Failed.
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//check if both arrays are of the same rank.
-			if (a.Rank != b.Rank)
-			{
-				this._testCase.Success = false;
-				ObjectData = string.Format("Array a.Rank = {0}, Array b.Rank = {1}", a.Rank, b.Rank);
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//Do not handle multi dimentional arrays.
-			if (a.Rank != 1)
-			{
-				this._testCase.Success = false;
-				ObjectData = "Multi-dimension array comparison is not supported";
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//Check if both arrays are of the same length.
-			if (a.Length != b.Length)
-			{
-				this._testCase.Success = false;
-				ObjectData = string.Format("Array a.Length = {0}, Array b.Length = {1}", a.Length, b.Length);
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			ObjectData = "Array a.ToString() = '" + a.ToString() + "'(" + a.GetType().FullName + ") Array b.ToString = '" + b.ToString() + "'(" + b.GetType().FullName + ")";
-
-			//Compare elements of the Array.
-			int iLength = a.Length;
-			for (int i=0; i<iLength; i++)
-			{
-				object aValue = a.GetValue(i);
-				object bValue = b.GetValue(i);
-
-				if (aValue == null && bValue == null)
-				{
-					continue;
-				}
-
-				if (aValue == null || bValue == null  ||  !aValue.Equals(bValue) )
-				{
-					string aData = (aValue==null) ? "null" : "'" + aValue.ToString() + "' (" + aValue.GetType().FullName + ")";
-					string bData = (bValue==null) ? "null" : "'" + bValue.ToString() + "' (" + bValue.GetType().FullName + ")";
-					ObjectData = string.Format("Array a[{0}] = {1}, Array b[{0}] = {2}", i, aData, bData);
-					this._testCase.Success = false; //objects are different, testCase Failed.
-					LogCompareResult(ObjectData);
-					return this._testCase.Success;
-				}
-			}
-
-
-			this._testCase.Success = true;
-			LogCompareResult(ObjectData);
-			return this._testCase.Success;
-		}
-	
-
-		/// <summary>
-		/// Intentionally fail a testcase, without calling the compare method.
-		/// </summary>
-		/// <param name="message">The reason for the failure.</param>
-		protected void Fail(string message)
-		{
-			this._testCase.CompareInvoked = true;
-			this._testCase.Success = false;
-			//Log(string.Format("TestCase \"{0}\" Failed: [{1}]", _testCase.ToString(), message));
-			Assert.Fail(message);
-		}
-
-		/// <summary>
-		/// Intentionally cause a testcase to pass, without calling the compare message.
-		/// </summary>
-		/// <param name="message">The reason for passing the test.</param>
-		protected void Pass(string message)
-		{
-			this._testCase.CompareInvoked = true;
-			this._testCase.Success = true;
-			if (this._logOnSuccess)
-			{
-				Log(string.Format("TestCase \"{0}\" Passed: [{1}]", _testCase.ToString(), message));
-			}
-		}
-
-		/// <summary>
-		/// Marks this testcase as success, but logs the reason for skipping regardless of _logOnSuccess value.
-		/// </summary>
-		/// <param name="message">The reason for skipping the test.</param>
-		protected void Skip(string message)
-		{
-			this._testCase.CompareInvoked = true;
-			this._testCase.Success = true;
-			Log(string.Format("TestCase \"{0}\" Skipped: [{1}]", _testCase.ToString(), message));
-		}
-
-		/// <summary>
-		/// Intentionally fail a testcase when an expected exception is not thrown.
-		/// </summary>
-		/// <param name="exceptionName">The name of the expected exception type.</param>
-		protected void ExpectedExceptionNotCaught(string exceptionName)
-		{
-			this.Fail(string.Format("Expected {0} was not caught.", exceptionName));
-		}
-
-		/// <summary>
-		/// Intentionally cause a testcase to pass, when an expected exception is thrown.
-		/// </summary>
-		/// <param name="ex"></param>
-		protected void ExpectedExceptionCaught(Exception ex)
-		{
-			this.Pass(string.Format("Expected {0} was caught.", ex.GetType().FullName));
-		}
-
-		/// <summary>End TestCase
-		/// <param name="ex">Exception object if exception occured during the TestCase, null if not</param>
-		/// </summary>
-		protected void EndCase(Exception ex)
-		{
-			//check if BeginCase was called. cannot end an unopen TestCase
-			if(_testCase == null)
-			{
-				throw new Exception("BeginCase was not called");
-			}
-			else
-			{
-				//if Exception occured during the test - log the error and faile the TestCase.
-				if(ex != null)
-				{
-					_testCase.Success=false;
-					Log(string.Format("TestCase: \"{0}\" Error: [Failed With Unexpected {1}: \n\t{2}]", _testCase.ToString(), ex.GetType().FullName, ex.Message + "\n" + ex.StackTrace ));
-					_testCase = null;
-					throw ex;
-				}
-				else
-				{                    
-					//check if Compare was called
-					if (_testCase.CompareInvoked == true)
-					{
-						if(this._logOnSuccess == true) Log(string.Format("Finished Case: [{0}] ", _testCase.ToString()));
-					}
-					else
-					{
-						//if compare was not called, log error message
-						Log(string.Format("TestCase \"{0}\" Warning: [TestCase didn't invoke the Compare mehtod] ", _testCase.ToString()));
-					}
-				}
-				//Terminate TestCase (set TestCase to null)
-				_testCase = null;
-			}
-		}
-
-
-		/// <summary>End Test
-		/// <param name="ex">Exception object if exception occured during the Test, null if not</param>
-		/// </summary>
-		public void EndTest(Exception ex)
-		{
-			//if all test cases succeeded but an exception occured - set exit code to -1
-			//if we wont set it to -1, the exit code will be 0 !!!
-			if (UniqueId.FailureCounter == 0 && ex != null) 
-			{
-				Environment.ExitCode = -1;
-			}
-			else
-			{
-				//set exitcode to the count of failed TestCases
-				Environment.ExitCode = UniqueId.FailureCounter;
-			}
-
-			//if exception occured - log error
-			if(ex != null)
-			{
-				Log(string.Format("Unexpected Exception accured in Test [{0}] - {1} \n {2}" , this._testName, ex.Message ,ex.StackTrace));
-			}
-			if(this._logOnSuccess)
-			{
-				Log(string.Format("*** Finished Test: [{0}] ***", this._testName));
-			}
-		}
-	
-
-		public int GHTGetExitCode()
-		{
-			return UniqueId.FailureCounter;
-		}
-
-		/// <summary>logger 
-		/// <param name="text">string message to log</param>
-		/// </summary>
-		protected void Log(string text)
-		{
-//			_loggerBuffer = _loggerBuffer + "\n" + "GHTBase:Logger - " + text;
-//			_logger.WriteLine("GHTBase:Logger - " + text);
-		}
-
-		//used to log the results from the compare methods
-		private void LogCompareResult(string ObjectData)
-		{
-			if(this._testCase.Success == false)
-			{
-				Log(string.Format("TeseCase \"{0}\" Error: [Failed while comparing(" + ObjectData + ")] ", _testCase.ToString() ));
-			}
-			else
-				if(this._logOnSuccess == true)
-				Log(string.Format("TestCase \"{0}\" Passed ", _testCase.ToString()));
-			
-		}
-
-		protected int TestCaseNumber
-		{
-			get
-			{
-				return _testCase.CaseNumber;
-			}
-		}
-		#endregion
-
-		#region private fields
-		
-		private TextWriter _logger;
-		public string _loggerBuffer; // a public clone string of the _logger (used in web tests)
-
-		private string _testName;
-		private UniqueId _testCase;
-		private bool _logOnSuccess;
-		#endregion
-		
-	}
-
-	//holds all the info on a TestCase
-	internal class UniqueId
-	{
-		//holds the unique name of the test case
-		//this name must be recieved from the test case itself
-		//when calling BeginCase.
-		//example: BeginCase("MyName")
-		private string _caseName;
-
-		//maintains the number generated for this test case
-		private static int _caseNumber;
-
-		//maintains the number of failed test case 
-		private static int _FailureCounter;
-		internal static int FailureCounter
-		{
-			get
-			{
-				return _FailureCounter;
-			}
-		}
-		
-		//indicate if the Compare method has been invoked AND containes compare objects message (ToString)
-		private bool _CompareInvoked;
-		internal bool CompareInvoked
-		{
-			get
-			{
-				return _CompareInvoked;
-			}
-			set
-			{
-				_CompareInvoked = value;
-			}
-		}
-
-
-		//reset the static counters when a new Test (not TestCase !!) begin
-		internal static void ResetCounters()
-		{
-			_FailureCounter = 0;
-			_caseNumber = 0;
-		}
-
-		//signal if a TestCase failed, if failed - increment the _FailureCounter
-		private bool _success;
-		internal bool Success
-		{
-			get
-			{
-				return this._success;
-			}
-			set
-			{
-				this._success = value;
-
-				if (value == false) 
-				{
-					_FailureCounter++;
-				}
-
-
-			}
-		}
-
-
-		//Ctor, Recieve the name for the test case
-		//generate a unique number and apply it to the test case
-		internal UniqueId(string Name)
-		{
-			this._caseName = Name;
-			//this._caseNumber = ++UniqueId._counter;
-			_caseNumber++;
-		}
-
-		internal int CaseNumber
-		{
-			get
-			{
-				return _caseNumber;
-			}
-		}
-
-		public override string ToString()
-		{
-			return string.Format("\"{0}\" #{1}", this._caseName, _caseNumber);
-		}
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/ChangeLog b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/ChangeLog
deleted file mode 100644
index 4080dc034d2..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2006-02-26  Konstantin Triger <kostat@mainsoft.com>

-

-        * OracleCommand_CommandType.cs: Port OleDb invocation style to that of OracleClient.
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandText.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandText.cs
deleted file mode 100755
index 49ded7acd19..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandText.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_CommandText : GHTBase
-	{
-		private Exception exp = null;
-		private OracleCommand cmd;
-		const string TEST_CASE_ID = "48341_";
-		public static void Main()
-		{
-			OracleCommand_CommandText tc = new OracleCommand_CommandText();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDBCommandText");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-			SetInConstractor();
-			SetByProperty();
-			UseSemiColonAsValue();
-			UseColonAsValue();
-			UseQuestionMarkAsValue();
-			UseExclamationMarkAsValue();
-			UseApostropheAsValue();
-			UseCommaAsValue();
-			UseDotAsValue();
-			UseAtAsValue();
-			UseQuoteAsValue();
-			UseDollarAsValue();
-			UsePercentAsValue();
-			UseHatAsValue();
-			UseAmpersnadAsValue();
-			UseStartAsValue();
-			UseParentesesAsValue();
-			UsePlusAsValue();
-			UseMinusAsValue();
-			UseUnderscoreAsValue();
-			UseSpaceAsValue();
-			UseEqualAsValue();
-			UseSlashAsValue();
-			UseBackSlashAsValue();
-			UseTildeAsValue();
-			UseNOTAsValue();
-			UseORAsValue();
-			UseANDAsValue();
-			UseSELECTAsValue();
-			UseFROMAsValue();
-			UseWHEREAsValue();
-			UseINSERTAsValue();
-			UseINTOAsValue();
-			UseVALUESAsValue();
-			UseDELETEAsValue();
-			UseUPDATEAsValue();
-			UseEXECAsValue();
-			UseQueryAsValue();
-		}
-		[Test] public void SetByProperty()
-		{
-			exp = null;
-			cmd = new OracleCommand();
-			cmd.CommandText = "SELECT * FROM Employees";
-			try
-			{
-				BeginCase("CommandText2");
-				Compare(cmd.CommandText, "SELECT * FROM Employees");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-		}
-
-		[Test] public void SetInConstractor()
-		{
-			exp = null;
-			cmd = new OracleCommand("SELECT * FROM Employees");
-			try
-			{
-				BeginCase("CommandText1");
-				Compare(cmd.CommandText, "SELECT * FROM Employees");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-		}
-		[Test] public void UseSemiColonAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ";");
-		}
-		[Test] public void UseColonAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ":");
-		}
-		[Test] public void UseQuestionMarkAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "?");
-		}
-		[Test] public void UseExclamationMarkAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "?");
-		}
-		[Test] public void UseApostropheAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "'");
-		}
-		[Test] public void UseCommaAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ",");
-		}
-		[Test] public void UseDotAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ".");
-		}
-		[Test] public void UseAtAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "@");
-		}
-		[Test] public void UseQuoteAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "\"");
-		}
-		[Test] public void UseDiezAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "#");
-		}
-		[Test] public void UseDollarAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "$");
-		}
-		[Test] public void UsePercentAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "%");
-		}
-		[Test] public void UseHatAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "^");
-		}
-		[Test] public void UseAmpersnadAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "&");
-		}
-		[Test] public void UseStartAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "*");
-		}
-		[Test] public void UseParentesesAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "(");
-			RunValueInColumnTest("T_VARCHAR", "()");
-			RunValueInColumnTest("T_VARCHAR", ")");
-			RunValueInColumnTest("T_VARCHAR", "{");
-			RunValueInColumnTest("T_VARCHAR", "{}");
-			RunValueInColumnTest("T_VARCHAR", "}");
-			RunValueInColumnTest("T_VARCHAR", "[");
-			RunValueInColumnTest("T_VARCHAR", "[]");
-			RunValueInColumnTest("T_VARCHAR", "]");
-			RunValueInColumnTest("T_VARCHAR", "<");
-			RunValueInColumnTest("T_VARCHAR", "<>");
-			RunValueInColumnTest("T_VARCHAR", ">");
-		}
-		[Test] public void UsePlusAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "+");
-		}
-		[Test] public void UseMinusAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "-");
-		}
-		[Test] public void UseUnderscoreAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "_");
-		}
-		[Test] public void UseSpaceAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", " ");
-		}
-		[Test] public void UseEqualAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "=");
-		}
-		[Test] public void UseSlashAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "\\");
-		}
-		[Test] public void UseBackSlashAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "/");
-		}
-		[Test] public void UseTildeAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "~");
-		}
-		[Test] public void UseNOTAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "NOT");
-		}
-		[Test] public void UseORAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "OR");
-		}
-		[Test] public void UseANDAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "AND");
-		}
-		[Test] public void UseSELECTAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "SELECT");
-		}
-		[Test] public void UseFROMAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "FROM");
-		}
-		[Test] public void UseWHEREAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "WHERE");
-		}
-		[Test] public void UseINSERTAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "INSERT");
-		}
-		[Test] public void UseINTOAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "INTO");
-		}
-		[Test] public void UseVALUESAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "VALUES");
-		}
-		[Test] public void UseDELETEAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "DELETE");
-		}
-		[Test] public void UseUPDATEAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "UPDATE");
-		}
-		[Test] public void UseEXECAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "EXEC");
-		}
-
-		[Test] public void UseQueryAsValue()
-		{
-			string columnName;
-			switch (ConnectedDataProvider.GetDbType())
-			{
-				case DataBaseServer.SQLServer:
-					columnName = "T_VARCHAR";
-					break;
-				case DataBaseServer.Oracle:
-					columnName = "T_LONG";
-					break;
-				case DataBaseServer.DB2:
-					columnName = "T_LONGVARCHAR";
-					break;
-				default:
-					columnName = "T_VARCHAR";
-					break;
-
-			}
-			RunValueInColumnTest(columnName, "SELECT * FROM TYPES_SIMPLE");
-		}
-
-		private void RunValueInColumnTest(string columnToTest, string valueToTest)
-		{
-			UnQuotedValueInColumn(columnToTest, valueToTest);
-			QuotedValueInColumn(columnToTest, valueToTest);
-		}
-		private void QuotedValueInColumn(string columnToTest, string valueToTest)
-		{
-			ValueInColumn(columnToTest, string.Format("'{0}'", valueToTest));
-		}
-		private void UnQuotedValueInColumn(string columnToTest, string valueToTest)
-		{
-			ValueInColumn(columnToTest, valueToTest);
-		}
-		private void ValueInColumn(string columnToTest, string valueToTest)
-		{
-			exp = null;
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			DbTypeParametersCollection row = ConnectedDataProvider.GetSimpleDbTypesParameters();
-			BeginCase(string.Format("Use {0} as value", valueToTest));
-			string rowId = TEST_CASE_ID + TestCaseNumber.ToString();
-			try
-			{
-				foreach(DbTypeParameter param in row)
-				{
-					param.Value = DBNull.Value;
-				}
-				row[columnToTest].Value = valueToTest;
-				Log("rowId:" + rowId + " columnToTest:" + columnToTest + " valueToTest:" + valueToTest);
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				rdr.Read();
-				int columnOrdinal = rdr.GetOrdinal(columnToTest);
-				//this.Log(valueToTest);
-				Compare(valueToTest, rdr.GetValue(columnOrdinal));
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-				row.ExecuteDelete(rowId);
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandTimeout.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandTimeout.cs
deleted file mode 100755
index b18ab465f03..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandTimeout.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleCommand_CommandTimeout : GHTBase
-{
-	public static void Main()
-	{
-		OracleCommand_CommandTimeout tc = new OracleCommand_CommandTimeout();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleCommand_CommandTimeout");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-#if !TARGET_JVM
-	[Category("NotWorking")]
-#endif
-	public void run()
-	{
-		OracleCommand cmd = new OracleCommand();
-		Assert.AreEqual( ((IDbCommand)cmd).CommandTimeout , 30);
-		((IDbCommand)cmd).CommandTimeout = 12;
-		Assert.AreEqual(((IDbCommand)cmd).CommandTimeout , 12);
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandType.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandType.cs
deleted file mode 100755
index fd41785cc0b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_CommandType.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-#if DAAB
-using Microsoft.ApplicationBlocks.Data;
-#endif
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_CommandType : ADONetTesterClass
-	{
-		OracleConnection	con;
-		// transaction is must on PostgreSQL
-		OracleTransaction tr;
-		OracleCommand cmd;
-		OracleDataReader dr = null;
-		DataBaseServer dbServerType;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-				tr = con.BeginTransaction();
-				cmd = new OracleCommand("", con, tr);
-				dbServerType = ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Assert.AreEqual("Setup", "Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleCommand_CommandType tc = new OracleCommand_CommandType();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_CommandType");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-		
-			OracleCommand cmd = new OracleCommand();
-			try
-			{
-				BeginCase("CommandType - default");
-				Assert.AreEqual(cmd.CommandType , CommandType.Text );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-#if NotWorking
-			try
-			{
-				BeginCase("CommandType - TableDirect");
-				cmd.CommandType = CommandType.TableDirect; 
-				Assert.AreEqual(cmd.CommandType , CommandType.TableDirect);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-#endif
-
-			try
-			{
-				BeginCase("CommandType - Text");
-				cmd.CommandType = CommandType.Text  ; 
-				Assert.AreEqual(cmd.CommandType , CommandType.Text);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			#region		---- CommandType.Text using Parameters.Add ---- 
-			try
-			{
-				BeginCase("CommandType.Text using Parameters.Add");
-
-				cmd = new OracleCommand();
-				cmd.Connection = con;
-				cmd.Transaction = tr;
-				cmd.CommandType = CommandType.Text;
-				cmd.CommandText = "call GH_REFCURSOR3(:IN_LASTNAME, :RCT_Employees)";
-
-				OracleParameter param1 = cmd.Parameters.Add("IN_LASTNAME", OracleType.VarChar,20);
-				param1.Direction = ParameterDirection.Input;
-				param1.Value = "Yavine"; 
-				cmd.Parameters.Add("RCT_Employees", OracleType.Cursor).Direction = ParameterDirection.Output;
-#if DAAB
-#if !JAVA
-				if ((dbServerType == DataBaseServer.PostgreSQL))
-				{
-					dr = PostgresOracleHelper.OLEDB4ODBCExecuteReader(cmd,true);
-				}
-				else
-#endif
-#endif
-				{
-					dr = cmd.ExecuteReader();
-				}
-
-				if (dr.HasRows)
-				{
-					dr.Read();
-					Assert.AreEqual(dr.GetValue(0).ToString(),"1");
-					Assert.AreEqual(dr.GetString(1),"Yavine");
-				}
-				else
-					Assert.AreEqual("error","HasRows=0");
-
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if (con != null)
-				{if (con.State == ConnectionState.Open) con.Close();}
-
-				EndCase(exp);
-				exp = null;
-			}
-			#endregion
-
-			CommandTypeSP_Manual_InOutParameters();
-
-			#region		---- ORACLE CommandType.StoredProcedure using DeriveParameters ---- 
-			if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.Oracle)
-			{
-				try
-				{
-					BeginCase("ORACLE CommandType.StoredProcedure using DeriveParameters");
-
-					con.Open();
-					cmd = new OracleCommand();
-					cmd.Connection = con;
-					cmd.Transaction = tr;
-					cmd.CommandType = CommandType.StoredProcedure;
-					cmd.CommandText = "GH_REFCURSOR3";
-
-					OracleCommandBuilder.DeriveParameters(cmd);
-					cmd.Parameters[0].Value = "Yavine"; 
-					//cmd.Parameters.RemoveAt(1); // the ORACLE DAAB trick is to remove the out parameter
-
-					dr = cmd.ExecuteReader();
-					if (dr.HasRows)
-					{
-						dr.Read();
-						Assert.AreEqual(dr.GetValue(0).ToString(),"1");
-						Assert.AreEqual(dr.GetString(1),"Yavine");
-					}
-					else
-						Assert.AreEqual("error","HasRows=0");
-
-				} 
-				catch(Exception ex)
-				{
-					exp = ex;
-				}
-				finally
-				{
-					if (dr != null)dr.Close();
-					if (con != null)
-					{if (con.State == ConnectionState.Open) con.Close();}
-
-					EndCase(exp);
-					exp = null;
-				}
-			}		
-			#endregion
-
-			#region CommandType.StoredProcedure in order to repreduce bug 4003
-			if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.SQLServer)
-			{
-				exp = null;
-				try
-				{
-					if (con.State == ConnectionState.Closed) con.Open();
-					BeginCase("Bug 4003");
-					OracleCommand cmd4003 = new OracleCommand("[mainsoft].[GH_DUMMY]",con);
-					cmd4003.CommandType = CommandType.StoredProcedure;
-					cmd4003.Parameters.Add("@EmployeeIDPrm","1");
-					cmd4003.ExecuteReader();
-					
-				}
-				catch (Exception ex)
-				{
-					exp=ex;
-				}
-				finally
-				{
-					if (con.State == ConnectionState.Open) con.Close();
-					EndCase(exp);
-				}
-
-			}
-
-			#endregion
-		}
-
-		#region		---- CommandType.StoredProcedure manual in out parameters ---- 
-		public void CommandTypeSP_Manual_InOutParameters()
-		{
-			Exception exp = null;
-			try
-			{
-				BeginCase("CommandType.StoredProcedure manual in out parameters");
-
-				if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL)
-				{
-					this.Log("CommandType.StoredProcedure manual in out parameters is not tested in oracle.");
-					return;
-				}
-
-				if (con.State != ConnectionState.Open)
-					con.Open();
-				cmd = new OracleCommand("", con, tr);
-				cmd.Connection = con;
-
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "GH_INOUT1";
-
-				//RETURN_VALUE for SQLServer
-				if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.SQLServer)
-				{
-					OracleParameter param0 = cmd.Parameters.Add("@RETURN_VALUE", OracleType.Int32);
-					param0.Direction = ParameterDirection.ReturnValue;
-				}
-
-				OracleParameter param1 = cmd.Parameters.Add("INPARAM", OracleType.VarChar,20);
-				param1.Direction = ParameterDirection.Input;
-				param1.Value = Convert.ToString("dummy"); 
-	
-				OracleParameter param2 = cmd.Parameters.Add("OUTPARAM", OracleType.Int32);//VarNumeric);
-				param2.Direction = ParameterDirection.Output;
-
-				int ret = cmd.ExecuteNonQuery();
-				int intReturn;
-				intReturn = Convert.ToInt32(cmd.Parameters["OUTPARAM"].Value);
-				Assert.AreEqual(intReturn,100);
-
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if (con != null)
-				{if (con.State == ConnectionState.Open) con.Close();}
-
-				EndCase(exp);
-				exp = null;
-			}
-		}
-		#endregion
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Connection.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Connection.cs
deleted file mode 100755
index f34abe78f55..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Connection.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_Connection : GHTBase
-	{
-		OracleCommand cmd;
-		OracleConnection con;
-
-		[SetUp]
-		public void SetUp()
-		{
-			cmd = new OracleCommand("SELECT * FROM Employees");
-			con = new OracleConnection();
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleCommand_Connection tc = new OracleCommand_Connection();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_Connection");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			try
-			{
-				BeginCase("Command Connection - set");
-				cmd.Connection = con;	
-				Compare(cmd.Connection ,con);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Command Connection - ctor");
-				cmd = new OracleCommand("",con);
-				Compare(cmd.Connection ,con);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Dispose.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Dispose.cs
deleted file mode 100755
index 7a2b2953dff..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Dispose.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleCommand_Dispose : GHTBase
-{
-	public static void Main()
-	{
-		OracleCommand_Dispose tc = new OracleCommand_Dispose();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleCommand_Dispose");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-	//problems from Synergy
-
-	//Ofer, 
-
-	//Take a look at #1. Test this to see if we have a problem in dispose. If we do, add a test for this to make sure we catch it in next rounds. 
-
-	//
-
-	//-----Original Message-----
-	//From: David Teplitchi [mailto:davidt@mainsoft.com] 
-	//Sent: Sunday, March 21, 2004 9:31 AM
-	//To: //Oved Yavine//
-	//Subject: 2 problems from Synergy
-
-
-	//Please check those 2 problems reported by Synergy and tell me what do you think.
-
-	//1) The following code works in dotnet but doesn//t work in j2ee.
-	//// Oracle Drivers
-	//OracleConnection Connect;
-	//OracleDataReader DbReader;
-	//OracleCommand DbCommand;
-	//IDataReader DR;
-	//string sSQL;
-	//int iField;
-	//bool bFound;
-	//try
-	//{
-	//Connect = new OracleConnection("Provider=\"MSDAORA.1\";User
-	//ID=COM;Password=SQL;Data Source=LLO1;HostName=WS10359;Port=1521");
-	//Connect.Open();
-	//sSQL = "SELECT * FROM PRODUCT WHERE PRO_SKU = //SKU_208//";
-	//DbCommand = new OracleCommand(sSQL, Connect);
-	//DbReader = DbCommand.ExecuteReader(CommandBehavior.SingleRow);
-	//DR = DbReader;
-	//DbCommand.Dispose(); // comment out
-	////DbCommand = null;
-	//bFound = DbReader.HasRows;
-	//DR.Read();
-	//// Get Column Ordinal
-	//iField = DR.GetOrdinal("PRO_DESCRIPTION");
-
-	//string sDesc = DR.GetString(iField);
-	//}
-	//catch(Exception e)
-	//{
-	//this.WriteErrorLog(e.Message);
-	//}
-	//i have identified the problem as being "DbCommand.Dispose()". If you comment this line out or make it 
-	//"DbCommand = null", then its okay. So this instruction doesnt work the same in both in .net and j2ee.
-
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		//OracleConnection  con = null;
-
-		//this test was added due to a request from Oved:
-		//this bug occur on all databases (SQL,Oracle,DB2)
-		OracleCommand DbCommand = null;
-		OracleConnection Connect = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		Connect.Open();
-		DbCommand = new OracleCommand("SELECT * FROM Customers", Connect);
-		OracleDataReader  DbReader  = DbCommand.ExecuteReader();
-
-		BeginCase("Check DataReader.IsClosed - before dispose");
-		try
-		{
-			Compare(DbReader.IsClosed,false); //.Net=false, GH=false
-		}
-		catch (Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-
-		BeginCase("Check DataReader.IsClosed - after dispose");
-		try
-		{
-			DbCommand.Dispose();
-			Compare(DbReader.IsClosed,false); //.Net=false, GH=true
-		}
-		catch (Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		if (Connect.State != ConnectionState.Closed)
-			Connect.Close();
-
-
-	}
-}
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteNonQuery.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteNonQuery.cs
deleted file mode 100755
index 7c10691c0f9..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteNonQuery.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_ExecuteNonQuery : GHTBase
-	{
-		OracleConnection con;
-		OracleCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				//prepare Data
-				OracleCommand cmdPrepare = new OracleCommand("", new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString));
-				cmdPrepare.Connection.Open();
-				cmdPrepare.CommandText = "DELETE FROM Employees WHERE EmployeeID = 99999";
-				cmdPrepare.ExecuteScalar();
-				cmdPrepare.Connection.Close();
-				cmdPrepare.Dispose();
-
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OracleCommand("", con);
-				con.Open();
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleCommand_ExecuteNonQuery tc = new OracleCommand_ExecuteNonQuery();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_ExecuteNonQuery");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-	
-			int intRecordsAffected = 0;
-
-			try
-			{
-				BeginCase("Execute Insert");
-				cmd.CommandText = "INSERT INTO Employees (EmployeeID,FirstName, LastName) VALUES (99999,'OferXYZ', 'Testing')";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected, 1);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check insert operation");
-				cmd.CommandText = "SELECT FirstName FROM Employees WHERE (EmployeeID = 99999)";
-				string  strFirstName = cmd.ExecuteScalar().ToString();
-				Compare(strFirstName, "OferXYZ");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Execute Select");
-				cmd.CommandText = "SELECT EmployeeID FROM Employees WHERE (EmployeeID = 99999)";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				
-				switch (ConnectedDataProvider.GetDbType())
-				{
-					case DataBaseServer.PostgreSQL:
-						// postgres odbc returns 1
-#if !JAVA
-						{
-							Compare(intRecordsAffected, 1);
-						}
-#else
-						{
-							Compare(intRecordsAffected, -1);
-						}
-#endif
-						break;
-					default:
-						Compare(intRecordsAffected, -1);
-						break;
-				}
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Execute UPDATE");
-				cmd.CommandText = "UPDATE Employees SET FirstName = 'OferABC', LastName = 'TestXYZ' WHERE (EmployeeID = 99999)";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected, 1);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("Check Update operation");
-				cmd.CommandText = "SELECT FirstName FROM Employees WHERE (EmployeeID = 99999)";
-				string  strFirstName = cmd.ExecuteScalar().ToString();
-				Compare(strFirstName, "OferABC");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Execute UPDATE");
-				cmd.CommandText = "DELETE FROM Employees WHERE (EmployeeID = 99999)";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected, 1);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check Delete operation");
-				cmd.CommandText = "SELECT FirstName FROM Employees WHERE (EmployeeID = 99999)";
-				object obj = cmd.ExecuteScalar();
-				Compare(obj==null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check OracleException - update with bad value");
-				cmd.CommandText = "UPDATE Employees SET BirthDate = 'bad value' WHERE (EmployeeID = 1)";
-				try
-				{
-					cmd.ExecuteNonQuery(); 
-				}
-				catch (OracleException ex)
-				{
-					exp = ex;
-				}
-				Compare(exp.GetType().FullName, typeof(OracleException).FullName);
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check OracleException - missing EmployeeID");
-				cmd.CommandText = "INSERT INTO Employees (FirstName, BirthDate) VALUES ('Dado', 'Ben David')";
-				try
-				{
-					cmd.ExecuteNonQuery(); 
-				}
-				catch (OracleException ex)
-				{
-					exp = ex;
-				}
-				Compare(exp.GetType().FullName, typeof(OracleException).FullName);
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteReader.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteReader.cs
deleted file mode 100755
index 74b7ab7161c..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteReader.cs
+++ /dev/null
@@ -1,423 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-#if DAAB
-using Microsoft.ApplicationBlocks;
-#endif
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_ExecuteReader : ADONetTesterClass
-	{
-		OracleConnection	con;
-		OracleCommand cmd;
-		
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OracleCommand("", con);
-				con.Open();
-				this.Pass("Setup.");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleCommand_ExecuteReader tc = new OracleCommand_ExecuteReader();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_ExecuteReader");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			bool RecordsExists = false;
-			OracleDataReader rdr =null;
-
-//			testBug3965();
-//			TestMultipleResultsets();
-//			TestCompoundVariable();
-
-			cmd.CommandText = "Select FirstName,City From Employees";
-			if (con.State != ConnectionState.Open)
-			{
-				con.Open();
-			}
-
-			try
-			{
-				BeginCase("check reader is null");
-				rdr = cmd.ExecuteReader();
-				Compare(rdr==null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp);
-				exp = null;
-			}
-
-			try
-			{
-				BeginCase("check reader.read");
-				rdr = cmd.ExecuteReader();
-				RecordsExists = rdr.Read();
-				Compare(RecordsExists ,true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-
-			try
-			{
-				BeginCase("execute reader again ");
-				rdr = cmd.ExecuteReader();
-				Compare(rdr==null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-
-			try
-			{
-				BeginCase("Test compound SQL statement");
-				//Build a compund SQL command.
-				string[] sqlStatements = new string[] {
-														  "INSERT INTO Categories (CategoryName, Description) VALUES('__TEST_RECORD__', 'Inserted')",
-														  "UPDATE Categories  SET Description='Updated' WHERE CategoryName='__TEST_RECORD__'",
-														  "DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'" ,
-				};
-				cmd.CommandText = CreateCompundSqlStatement(sqlStatements, ConnectedDataProvider.GetDbType());
-				rdr = cmd.ExecuteReader();
-				Compare(rdr.Read(), false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-
-
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.Oracle)
-			{
-				try
-				{
-					BeginCase("Check that in a compound SQL statement, resultsets are returned only for SELECT statements. (bug #3358)");
-					//prepare db:
-					OracleCommand prepare = new OracleCommand("DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'", con);
-					prepare.ExecuteNonQuery();
-
-
-					//Test body
-					int resultSetCount ;
-
-					//Build a compund SQL command that contains only one select statement.
-					string[] sqlStatements = new string[] {
-															  "INSERT INTO Categories (CategoryName, Description) VALUES('__TEST_RECORD__', 'Inserted')",
-															  "UPDATE Categories  SET Description='Updated' WHERE CategoryName='__TEST_RECORD__'",
-															  "DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'" ,
-															  "SELECT * FROM Categories "
-														  };
-					string insertCmdTxt = CreateCompundSqlStatement(sqlStatements, ConnectedDataProvider.GetDbType());
-					//this.Log(insertCmdTxt);
-					OracleCommand InsertCmd = new OracleCommand(insertCmdTxt, con);
-					rdr = InsertCmd.ExecuteReader();
-
-					//Count the number of result sets.
-					resultSetCount = 0;
-					do
-					{
-						resultSetCount++;
-					}while (rdr.NextResult());
-
-					//Test that there is only one result set.
-					Compare(resultSetCount, 1);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally
-				{
-					if (rdr != null) rdr.Close();
-					EndCase(exp); 
-					exp = null;
-					//cleanup db:
-					OracleCommand cleanup = new OracleCommand("DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'", con);
-					cleanup.ExecuteNonQuery();
-				}
-			}
-		}
-
-
-		//Create the compund sql statement according to the dbserver.
-		private string CreateCompundSqlStatement(string[] sqlStatements, DataBaseServer dbServer)
-		{
-			string beginStatement;
-			string endStatement;
-			string commandDelimiter;
-
-			GetDBSpecificSyntax(dbServer, out beginStatement, out endStatement, out commandDelimiter);
-
-			StringBuilder cmdBuilder = new StringBuilder();
-			cmdBuilder.Append(beginStatement);
-			cmdBuilder.Append(" ");
-			foreach (string statement in sqlStatements)
-			{
-				cmdBuilder.Append(statement);
-				cmdBuilder.Append(commandDelimiter);
-				cmdBuilder.Append(" ");
-			}
-			cmdBuilder.Append(endStatement);
-
-			return cmdBuilder.ToString();
-		}
-
-		private void GetDBSpecificSyntax(DataBaseServer dbServer, out string beginStatement, out string endStatement, out string commandDelimiter)
-		{
-			switch (dbServer)
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.PostgreSQL:
-					beginStatement = "";
-					endStatement = "";
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.Sybase:
-					beginStatement = "BEGIN";
-					endStatement = "END";
-					commandDelimiter = "";
-					break;
-				case DataBaseServer.Oracle:
-					beginStatement = "BEGIN";
-					endStatement = "END;";
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.DB2:
-					beginStatement = "BEGIN ATOMIC";
-					endStatement = "END";
-					commandDelimiter = ";";
-					break;
-
-				default:
-					this.Fail("Unknown DataBaseServer type");
-					throw new ApplicationException("Unknown DataBaseServer type");
-			}
-		}
-
-
-		[Test]
-		public void TestMultipleResultsets()
-		{
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle)
-			{
-				//In .NET there is a bug when calling a SP with multiple REFCURSORS, the workaround is to use OracleClient and not Oracle.
-				//In GH we are not bug complient in this issue, because there is no workaround (We do not support the OracleClient namespace.
-			    this.Log("Not testing multi result set Oracle on .NET");
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				// fail to work on .NET OLEDB
-				//reader = Microsoft.ApplicationBlocks.Data.PostgresOracleHelper.ADOExecuteReader(cmd1);
-				this.Log("Not testing PostgreSQL CommandType.StoredProcedure which return SETOF");
-				return;
-			}
-#endif
-
-			Exception exp = null;
-			BeginCase("Test multi result set from stored procedure");
-
-				
-			OracleDataReader reader = null;
-			OracleTransaction tr = null;
-
-			try
-			{
-				//Check SP with the structre : insert Select + update Select + delete Select
-				if (con.State != ConnectionState.Open)
-				{
-					con.Open();
-				}
-					
-				// transaction use was add for PostgreSQL
-				tr = con.BeginTransaction();
-				OracleCommand cmd1 = new OracleCommand("GHSP_TYPES_SIMPLE_4", con, tr);
-				cmd1.CommandType = CommandType.StoredProcedure;
-
-				OracleParameter param = new OracleParameter();
-				param.ParameterName = "ID1";
-				param.Value = string.Format("13268_{0}", this.TestCaseNumber);
-				param.OracleType = OracleType.VarChar;
-				cmd1.Parameters.Add(param);
-				cmd1.Parameters.Add(new OracleParameter("RESULT", OracleType.Cursor)).Direction = ParameterDirection.Output;
-				cmd1.Parameters.Add(new OracleParameter("RESULT1", OracleType.Cursor)).Direction = ParameterDirection.Output;
-				cmd1.Parameters.Add(new OracleParameter("RESULT2", OracleType.Cursor)).Direction = ParameterDirection.Output;
-
-
-				reader = cmd1.ExecuteReader();
-				
-				//Count the number of result sets.
-				int resultSetCount = 0;
-				//Count the number of the records
-				int recordCounter=0;
-
-				do
-				{
-					//this.Log(string.Format("resultSetCount:{0}",resultSetCount));
-				while (reader.Read())
-				{
-					recordCounter++;
-				}
-					//this.Log(string.Format("recordCounter:{0}",recordCounter));
-					if (resultSetCount != 2)
-					{
-						Compare(recordCounter,1); //Insert + update 
-					}
-					else
-					{
-						Compare(recordCounter,0); //Delete 
-					}
-
-					recordCounter=0;
-					resultSetCount++;
-				}while (reader.NextResult());
-
-				Compare(resultSetCount,3);
-			}
-			catch (Exception ex)
-			{
-				exp=ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				if (reader != null) reader.Close();
-				tr.Commit();
-				con.Close();
-			}
-		}
-		[Test]
-		public void TestCompoundVariable()
-		{
-			OracleDataReader rdr = null;
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				this.Log("not testing PostgreSQL");
-				return;
-			}
-
-			Exception exp = null;
-			try
-			{
-				BeginCase("Check sql statement that declares a local variable and uses it.");
-
-				if (con.State != ConnectionState.Open)
-				{
-					con.Open();
-				}
-
-				string sqlTxt = "";
-				switch (ConnectedDataProvider.GetDbType(cmd.Connection))
-				{
-					case DataBaseServer.SQLServer:
-						sqlTxt = "declare @var int; select @var=1;";
-						break;
-					case DataBaseServer.Sybase:
-						sqlTxt = "declare @var int select @var=1";
-						break;
-					case DataBaseServer.Oracle:
-						sqlTxt = "declare var int;begin var:=1;end;";
-						break;
-					case DataBaseServer.DB2:
-						sqlTxt = "begin atomic declare var integer; set var = 1; end";
-						break;
-					case DataBaseServer.PostgreSQL:
-						// we don't know how the heck to do this in PostgreSQL
-						sqlTxt = "";
-						break;
-					default:
-						throw new ApplicationException(string.Format("GHT: Unknown DataBaseServer '{0}'", ConnectedDataProvider.GetDbType(cmd.Connection)));
-				}
-				cmd.CommandText = sqlTxt;
-				rdr = cmd.ExecuteReader();
-				Compare(rdr.Read(), false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteScalar.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteScalar.cs
deleted file mode 100755
index 1c2aceff937..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_ExecuteScalar.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_ExecuteScalar : GHTBase
-	{
-		OracleConnection	con;
-		OracleCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-
-				//prepare Data
-				OracleCommand cmdPrepare = new OracleCommand("", con);
-				cmdPrepare.CommandText = "DELETE FROM Employees WHERE EmployeeID = 99999";
-				cmdPrepare.ExecuteNonQuery();
-				cmdPrepare.CommandText = "INSERT INTO Employees (EmployeeID, FirstName, LastName) VALUES (99999,'OferXYZ', 'Testing')";
-				cmdPrepare.ExecuteNonQuery();
-				cmdPrepare.Dispose();
-
-				cmd = new OracleCommand("", con);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleCommand_ExecuteScalar tc = new OracleCommand_ExecuteScalar();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_ExecuteScalar");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			object objResult = null;
-
-			cmd.CommandText="Select FirstName,City From Employees Where EmployeeID=-1";
-
-			try
-			{
-				BeginCase("Execute Scalar");
-				objResult = cmd.ExecuteScalar();
-				Compare(objResult==null,true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			cmd.CommandText="Select FirstName,City From Employees Where EmployeeID=99999 ";
-		
-			try
-			{
-				BeginCase("Execute Scalar");
-				objResult = cmd.ExecuteScalar();
-				Compare(objResult.ToString(), "OferXYZ");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("Execute Scalar again");
-				objResult = cmd.ExecuteScalar();
-				Compare(objResult.ToString(), "OferXYZ");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_New.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_New.cs
deleted file mode 100755
index a5fc0a85b28..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_New.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleCommand_New : GHTBase
-{
-	public static void Main()
-	{
-		OracleCommand_New tc = new OracleCommand_New();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleCommand_New");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleCommand cmd = null;
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString );
-		OracleTransaction tran;
-
-
-		try
-		{
-			BeginCase("OracleCommand New");
-			cmd = new OracleCommand();
-			Compare(cmd==null, false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OracleCommand - new CommandText");
-			cmd = new OracleCommand("Select * from Table");
-			Compare(cmd==null, false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OracleCommand CommandText");
-			Compare(cmd.CommandText , "Select * from Table");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OracleCommand - Connection");
-			cmd = new OracleCommand("Select * from Table",con);
-			Compare(cmd.Connection ,con);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con.Open();
-		tran = con.BeginTransaction();
-
-		try
-		{
-			BeginCase("OracleCommand - Transaction");
-			cmd = new OracleCommand("Select * from Table",con,tran);
-			Compare(cmd.Transaction ,tran);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		
-		if (con.State == ConnectionState.Open) con.Close();
-
-	}
-}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Parameters.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Parameters.cs
deleted file mode 100755
index 17b9ba3618b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Parameters.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_Parameters : ADONetTesterClass 
-	{
-		//Used to test GUID.
-		private const string TEST_GUID_STRING = "239A3C5E-8D41-11D1-B675-00C04FA3C554";
-
-		private Exception exp;
-		public static void Main()
-		{
-			OracleCommand_Parameters tc = new OracleCommand_Parameters();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_Parameters");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-
-			#region Simple Tests
-			//string str="";
-			string sql;
-			OracleConnection con = null;
-
-			sql = "UPDATE Employees SET Region = :Region, TitleOfCourtesy = :TitleOfCourtesy WHERE EmployeeID=1";
-			con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			
-			//not testing with DB2 provider
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.DB2) 
-			{
-
-				OracleCommand cmd = new OracleCommand(sql, con);
-				cmd.Parameters.Add(new OracleParameter(":Region", OracleType.VarChar));
-				cmd.Parameters.Add(new OracleParameter(":TitleOfCourtesy", OracleType.VarChar));
-
-				con.Open();
-				cmd.Parameters[":Region"].Value = "WA";
-				cmd.Parameters[":TitleOfCourtesy"].Value = "Mr";
-
-				//return the number of rows affected
-				int i = cmd.ExecuteNonQuery();
-
-				try
-				{
-					BeginCase("Check row count");
-					Compare(i, 1);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			}
-
-			if (con.State == ConnectionState.Open) con.Close();
-			#endregion
-			#region Test Parameter Types
-			#region General
-			TypesSubTests(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			TypesSubTests(ConnectedDataProvider.GetExtendedDbTypesParameters());
-			#endregion
-			#endregion
-		}
-
-		private void TypesSubTests(DbTypeParametersCollection typesToTest)
-		{
-			DbTypeParametersCollection currentlyTested = new DbTypeParametersCollection(typesToTest.TableName);
-			int affectedRows;
-			string rowId = string.Empty;
-
-			foreach (DbTypeParameter currentParamType in typesToTest)
-			{
-				try
-				{
-					BeginCase("Test INSERT with parameter of type: " + currentParamType.DbTypeName);
-					rowId = string.Format("13282_{0}", this.TestCaseNumber);
-					currentlyTested.Clear();
-					currentlyTested.Add(currentParamType);
-					affectedRows = currentlyTested.ExecuteInsert(rowId);
-					Compare(affectedRows, 1);
-				} 
-				catch(Exception ex)
-				{
-					exp = ex;
-				}
-				finally
-				{
-					EndCase(exp);
-					exp = null;
-					currentlyTested.ExecuteDelete(rowId);
-				}
-			}
-		}
-
-		//Test insertion of a GUID parameter on MSSQLServer.
-		[Test]
-		public void DoTestGUIDOnMSSQLServer()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer)
-				return;
-			DbTypeParametersCollection guidRow = new DbTypeParametersCollection(ConnectedDataProvider.SPECIFIC_TYPES_TABLE_NAME);
-			guidRow.Add("UNIQUEIDENTIFIER", new Guid(TEST_GUID_STRING));
-			TypesSubTests(guidRow);
-		}
-		//Test problems specific to the TIME type on DB2.
-		[Test]
-		public void DoTestTimeOnDB2()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2)
-				return;
-
-			OracleConnection conn = new OracleConnection(ConnectedDataProvider.ConnectionString);
-			string rowId = string .Empty;
-
-			try
-			{
-				BeginCase("Test INSERT to TIME column using only TimeOfDate part of DateTime");
-				rowId = "13282_" + this.TestCaseNumber.ToString();
-				OracleCommand cmd = new OracleCommand();
-				conn.Open();
-				cmd.Connection = conn;
-				cmd.CommandText = string.Format("INSERT INTO {0} (ID, T_TIME) VALUES ('{1}', ?)",ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME ,rowId);
-				cmd.Parameters.Add("time", DateTime.Now.TimeOfDay);
-				int affectedRows;
-				affectedRows = cmd.ExecuteNonQuery();
-				Compare(affectedRows, 1);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				DbTypeParametersCollection.ExecuteDelete(ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME, rowId);
-				conn.Close();
-			}
-
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void DoTestTimeOnDB2_bug3391()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2)
-				return;
-
-			OracleConnection conn = new OracleConnection(ConnectedDataProvider.ConnectionString);
-			string rowId = string .Empty;
-
-			try {
-				BeginCase("Test INSERT to TIME column using all of the DateTime");
-				rowId = "13282_" + this.TestCaseNumber.ToString();
-				OracleCommand cmd = new OracleCommand();
-				conn.Open();
-				cmd.Connection = conn;
-				cmd.CommandText = string.Format("INSERT INTO {0} (ID, T_TIME) VALUES ('{1}', ?)",ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME ,rowId);
-				cmd.Parameters.Add("time", DateTime.Now);
-				try {
-					cmd.ExecuteNonQuery();
-					ExpectedExceptionNotCaught("System.OracleException");
-				}
-				catch (OracleException ex) {
-					ExpectedExceptionCaught(ex);
-				}
-			}
-			catch (Exception ex) {
-				exp = ex;
-			}
-			finally {
-				EndCase(exp);
-				exp = null;
-				DbTypeParametersCollection.ExecuteDelete(ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME, rowId);
-				conn.Close();
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Prepare.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Prepare.cs
deleted file mode 100755
index ece2152f7bc..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Prepare.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommand_Prepare : GHTBase
-	{
-		public static void Main()
-		{
-			OracleCommand_Prepare tc = new OracleCommand_Prepare();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleCommand_Prepare");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			int intRecordsAffected = 0;
-
-			string sql = "Update Shippers Set CompanyName=:CompName Where ShipperID = 2";
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OracleCommand cmd = new OracleCommand("", con);
-			con.Open();
-
-
-			//get expected result
-			cmd.CommandText = "select count(*) from Shippers where ShipperID = 2";
-			int ExpectedRows = int.Parse(cmd.ExecuteScalar().ToString());
-
-			cmd.CommandText = sql;
-
-			//Currently not running on DB2: .Net-Failed, GH:Pass
-			//if (con.Provider.IndexOf("IBMDADB2") >= 0) return ;
-
-			cmd.Parameters.Add(new OracleParameter()); 
-			cmd.Parameters[0].ParameterName = "CompName";
-			cmd.Parameters[0].OracleType = OracleType.VarChar; //System.InvalidOperationException:
-			cmd.Parameters[0].Size = 20; //System.InvalidOperationException
-			cmd.Parameters[0].SourceColumn = "CompanyName";
-			cmd.Parameters[0].Value = "Comp1";
-
-			try
-			{
-				BeginCase("Prepare Exception - missing OracleType");
-				cmd.Prepare();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			cmd.Parameters[0].OracleType = OracleType.VarChar; 
-
-//			try
-//			{
-//				BeginCase("Prepare Exception - missing Size");
-//				try
-//				{
-//					cmd.Parameters[0].Size = 0;
-//					cmd.Prepare();
-//				}
-//				catch (Exception ex) {exp = ex;}
-//				Compare(exp.GetType().FullName, typeof(InvalidOperationException).FullName );
-//				exp=null;
-//			} 
-//			catch(Exception ex){exp = ex;}
-//			finally{EndCase(exp); exp = null;}
-//			cmd.Parameters[0].Size = 20;
-
-			try
-			{
-				BeginCase("Prepare Exception - missing Size");
-				try
-				{
-					con.Close();
-					cmd.Prepare();
-				}
-				catch (Exception ex) {exp = ex;}
-				Compare(exp.GetType().FullName, typeof(InvalidOperationException).FullName );
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			con.Open();
-
-			try
-			{
-				BeginCase("ExecuteNonQuery first time");
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected , ExpectedRows);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("ExecuteNonQuery second time, chage value");
-				cmd.Parameters[0].Value = "Comp2";
-				intRecordsAffected  = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected , ExpectedRows);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-	
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Transaction.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Transaction.cs
deleted file mode 100755
index 4bbcbbe2be2..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/OracleCommand_Transaction.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class TestId13266 : GHTBase
-{
-	public static void Main()
-	{
-		TestId13266 tc = new TestId13266();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleCommand_Transaction");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-
-		Exception exp = null;
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OracleTransaction txn = con.BeginTransaction();
-		OracleCommand cmd = new OracleCommand("Select * From Employees", con);
-
-		try
-		{
-			BeginCase("check Transaction property - default");
-			Compare(cmd.Transaction==null , true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		cmd.Transaction = txn;
-
-		try
-		{
-			BeginCase("check Transaction property");
-			Compare(cmd.Transaction , txn);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		
-		if (con.State == ConnectionState.Open) con.Close();
-
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommandBuilder/OracleCommandBuilder_DeriveParameters_O.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommandBuilder/OracleCommandBuilder_DeriveParameters_O.cs
deleted file mode 100755
index 5e32151cd7a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommandBuilder/OracleCommandBuilder_DeriveParameters_O.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleCommandBuilder_DeriveParameters_O : GHTBase
-	{
-		OracleConnection	con;
-		OracleCommand cmd;
-		Exception exp = null;
-
-		[SetUp]
-		public void SetUp()
-		{
-			exp=null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OracleConnection(ConnectedDataProvider.ConnectionString);
-				con.Open();
-				cmd = new OracleCommand("", con);
-				Compare("Setup", "Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleCommandBuilder_DeriveParameters_O tc = new OracleCommandBuilder_DeriveParameters_O();
-			try
-			{
-				tc.BeginTest("OracleCommandBuilder_DeriveParameters_O");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-
-		public void run()
-		{
-            RetrieveParameters();
-		}
-
-		[Test]
-		public void RetrieveParameters()
-		{
-			exp = null;
-
-			try
-			{
-				BeginCase("retrieve parameters");
-				
-				if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.DB2)
-				{
-					this.Skip("Not Implemented on DB2.");
-					return;
-				}
-
-				switch (ConnectedDataProvider.GetDbType(con))
-				{
-//					case MonoTests.Utils.DataBaseServer.PostgreSQL:
-//						cmd = new OracleCommand("GH_MULTIRECORDSETS('a','b','c')", con);
-//						break;
-					default:
-						cmd = new OracleCommand("GH_MultiRecordSets", con);
-						break;
-				}
-				
-				cmd.CommandType = CommandType.StoredProcedure;
-				OracleCommandBuilder.DeriveParameters(cmd);
-
-				switch (ConnectedDataProvider.GetDbType(con))
-				{
-					case DataBaseServer.SQLServer:
-					case DataBaseServer.Sybase:
-						Compare(cmd.Parameters.Count, 1);
-						Compare(cmd.Parameters[0].Direction, ParameterDirection.ReturnValue);
-						Compare(cmd.Parameters[0].ParameterName, "RETURN_VALUE");
-						break;
-				
-					case DataBaseServer.Oracle:
-						Compare(cmd.Parameters.Count, 3);
-						Compare(cmd.Parameters[0].Direction, ParameterDirection.Output);
-						Compare(cmd.Parameters[1].Direction, ParameterDirection.Output);
-						Compare(cmd.Parameters[2].Direction, ParameterDirection.Output);
-						Compare(cmd.Parameters[0].ParameterName, "RCT_EMPLOYEES");
-						break;
-
-					case DataBaseServer.PostgreSQL:
-						Compare(cmd.Parameters.Count, 1);
-						Compare(cmd.Parameters[0].Direction, ParameterDirection.ReturnValue);
-						Compare(cmd.Parameters[0].ParameterName, "returnValue");
-						break;
-
-					default:
-						throw new ApplicationException(string.Format("GHT: Test not implemented for DB type {0}", ConnectedDataProvider.GetDbType(con)));
-				}
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs
deleted file mode 100755
index 9c638e8252d..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/IDBConnection_For_Oracle.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	class IDBConnection_For_Oracle : GHTBase
-	{
-		string _ConnectionString = "";
-		[SetUp]
-		public void SetUp()
-		{
-			try
-			{
-				_ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			catch(Exception ex)
-			{
-				EndCase(ex);
-			}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			IDBConnection_For_Oracle tc = new IDBConnection_For_Oracle();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("IDBConnection_For_Oracle");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			IDbConnection ICon = new OracleConnection();
-
-			try
-			{
-				BeginCase("check IDbConnection is null");
-				Compare(ICon != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection type");
-				Compare(ICon.GetType().FullName ,typeof(OracleConnection).FullName);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			ICon = new OracleConnection(_ConnectionString);
-
-			try
-			{
-				BeginCase("check IDbConnection connection string");
-				Compare(ICon.ConnectionString ,_ConnectionString);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection ConnectionTimeout");
-				Compare(ICon.ConnectionTimeout ,15);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection state - closed");
-				Compare(ICon.State ,ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			ICon.Open();
-
-			try
-			{
-				BeginCase("check IDbConnection - open");
-				Compare(ICon.State ,ConnectionState.Open );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection CreateCommand");
-				IDbCommand cmd = ICon.CreateCommand();
-				Compare(cmd.GetType().FullName ,typeof(OracleCommand).FullName);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (ICon.State == ConnectionState.Open) ICon.Close();
-
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_BeginTransaction.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_BeginTransaction.cs
deleted file mode 100755
index 45f4def9bf2..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_BeginTransaction.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleConnection_BeginTransaction : ADONetTesterClass
-	{
-		Exception exp = null;
-		OracleConnection con = null;
-		OracleTransaction tran = null;
-
-		public static void Main()
-		{
-			OracleConnection_BeginTransaction tc = new OracleConnection_BeginTransaction();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleConnection_BeginTransaction");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[SetUp]
-		public void SetUp() {
-			con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-		}
-
-		[TearDown]
-		public void TearDown() {
-			if (con != null && con.State == ConnectionState.Open) con.Close();
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void TestBeginTransactionChaos() {
-
-			DataBaseServer dbType = ConnectedDataProvider.GetDbType(con);
-			// not supported on DB2 and Oracle and Sybase
-			if (dbType != DataBaseServer.Oracle && dbType != DataBaseServer.DB2 && dbType != DataBaseServer.Sybase) {
-				con.Close();
-				con.Open();
-				try {
-					BeginCase("BeginTransaction - IsolationLevel Chaos");
-					tran = con.BeginTransaction(IsolationLevel.Chaos);
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			}
-			/*	not supported by MSSQL,DB2,Oracle
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel Unspecified");
-					tran = con.BeginTransaction(IsolationLevel.Unspecified );
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			*/
-			
-		}
-
-		[Test]
-		public void run()
-		{
-			try
-			{
-				BeginCase("BeginTransaction");
-				tran = con.BeginTransaction();
-				Compare(tran == null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			con.Close();
-			con.Open();
-			try
-			{
-				BeginCase("BeginTransaction - IsolationLevel ReadCommitted");
-				tran = con.BeginTransaction(IsolationLevel.ReadCommitted);
-				Compare(tran == null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		
-			DataBaseServer dbType = ConnectedDataProvider.GetDbType(con);
-
-			//Not supported by JDBC driver for oracle
-			if (dbType != DataBaseServer.Oracle) 
-			{
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel ReadUncommitted");
-					tran = con.BeginTransaction(IsolationLevel.ReadUncommitted );
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel RepeatableRead");
-					tran = con.BeginTransaction(IsolationLevel.RepeatableRead);
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel Serializable");
-					tran = con.BeginTransaction(IsolationLevel.Serializable );
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ChangeDatabase.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ChangeDatabase.cs
deleted file mode 100755
index a93f6981e59..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ChangeDatabase.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_ChangeDatabase : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OracleConnection_ChangeDatabase tc = new OracleConnection_ChangeDatabase();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("NoName");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	[Category("NotWorking")]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-
-		//Currently not running on Oracle/DB2: .Net-Failed, GH:Pass
-		//not runnig on postgres because "The 'current catalog' property is not supported by the 'Mainsoft.JDBC.OLEDB.1' provider."
-		if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle  &&
-			ConnectedDataProvider.GetDbType(con) != DataBaseServer.DB2 && 
-			ConnectedDataProvider.GetDbType(con) != DataBaseServer.Sybase &&
-			ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL)
-		{
-			try
-			{
-				BeginCase("Change DataBase");
-				((IDbConnection)con).ChangeDatabase("GHTDB_EX");
-				Compare(((IDbConnection)con).Database , "GHTDB_EX");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check DataBase Changed ");
-				OracleCommand cmd = new OracleCommand("select count(*) from Customers", con);
-				object obj = cmd.ExecuteScalar();
-				Compare(obj != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Close.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Close.cs
deleted file mode 100755
index fc55a860018..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Close.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleConnection_Close : GHTBase
-	{
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			OracleConnection_Close tc = new OracleConnection_Close();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleConnection_Close");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			try
-			{
-				BeginCase("Close without open");
-				con.Close();
-				Compare(con.State , ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			con.Open();
-
-			try
-			{
-				BeginCase("Close after open");
-				con.Close();
-				Compare(con.State , ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			//An application can call Close more than one time. 
-			//No exception is generated.
-			try
-			{
-				BeginCase("Close again");
-				con.Close();
-				Compare(con.State , ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ConnectionString.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ConnectionString.cs
deleted file mode 100755
index 25ff1490e51..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ConnectionString.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OracleClient ;
-using System.Collections;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleConnection_ConnectionString : GHTBase
-	{
-		private Exception exp = null;
-		private OracleConnection con = new OracleConnection();
-
-		public static void Main()
-		{
-			OracleConnection_ConnectionString tc = new OracleConnection_ConnectionString();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleConnection_ConnectionString");
-
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-			SetConnectionString();
-			ConstractorWithConnectionString();
-			DB2MissingProperties();
-			TestCaseForBug3925();
-		}
-
-		#region Tests
-		[Test]
-		public void DB2MissingProperties()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2)
-			{
-				Log("The 'DB2MissingProperties' subtest did not ran because it is relevant only for runs on DB2." );
-				return;
-			}
-			string[] propsToUse;
-			string description;
-
-			//The complete list of properties is:
-			//Provider, Password, User ID, Data Source, HostName, Port, Location, retrieveMessagesFromServerOnGetMessage
-			
-			description = "Test connection string without 'retrieveMessagesFromServerOnGetMessage'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "HostName", "Port", "Location"};
-			DoTestWithSpecificProperties(propsToUse, description);
-
-			description = "Test connection string without 'HostName'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "Port", "Location", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-			
-			description = "Test connection string without 'Port'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "HostName", "Location", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-			
-			description = "Test connection string without 'Location'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "HostName", "Port", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-			
-			description = "Test connection string without 'HostName' & 'Port'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "Location", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-		}
-
-		void DoTestWithSpecificProperties(string[] propsToUse, string description)
-		{
-			try
-			{
-				BeginCase(description);
-				exp = null;
-				Hashtable connectionProps = GetConnectionStringProps(ConnectedDataProvider.ConnectionString);
-				string actualConString = CreateConStringWithProps(propsToUse, connectionProps);
-				con = new OracleConnection(actualConString);
-				con.Open();
-				Compare(con.State, ConnectionState.Open);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp=null;
-				if (con != null && con.State == ConnectionState.Open)
-				{
-					con.Close();
-				}
-			}
-		}
-
-		[Test]
-		public void ConstractorWithConnectionString()
-		{
-			con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			try
-			{
-				BeginCase("Constructor with ConnectionString");
-				Compare(con.ConnectionString, MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp); 
-				exp = null;
-			}
-		}
-
-		[Test]
-		public void SetConnectionString()
-		{
-			con.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			try
-			{
-				BeginCase("Set ConnectionString");
-				Compare(con.ConnectionString, MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp); 
-				exp = null;
-			}
-		}
-		[Test]
-#if !JAVA
-		[Category ("NotWorking")]
-#endif
-		public void TestCaseForBug3925()
-		{
-			exp=null;
-			try
-			{
-				BeginCase("Test Case for bug #3925");
-
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer)
-			{
-				Skip("This test currently runs only on SQLServer in java.");
-				return;
-			}
-				Hashtable conProps = GetConnectionStringProps(ConnectedDataProvider.ConnectionString);
-				string server = (string)conProps["Data Source"];
-				string user = (string)conProps["User Id"];
-				string password = (string)conProps["Password"];
-				string database = (string)conProps["Initial Catalog"];
-				string jdbcUrlTemplate = "JdbcDriverClassName=com.microsoft.jdbc.sqlserver.SQLServerDriver;JdbcURL=\"jdbc:microsoft:sqlserver://{0};User={1};Password={2};DatabaseName={3}\"";
-				string conStr = string.Format(jdbcUrlTemplate, server, user, password, database);
-				con = new OracleConnection(conStr);
-				con.Open();
-				Compare(ConnectionState.Open, con.State);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-		#endregion
-		#region Utilities
-		private string CreateConStringWithProps(string[] propsToUse, Hashtable connectionProps)
-		{
-			StringBuilder actualConStringBuilder = new StringBuilder();
-			foreach(string prop in propsToUse)
-			{
-				string propString = string.Format("{0}={1}", prop, connectionProps[prop]);
-				actualConStringBuilder.Append(propString);
-				actualConStringBuilder.Append(";");
-			}
-			return actualConStringBuilder.ToString();
-		}
-
-		private Hashtable GetConnectionStringProps(string connectionString)
-		{
-			string[] connectionStringProps = connectionString.Split(';');
-			Hashtable connectionProps = new Hashtable();
-			foreach(string prop in connectionStringProps)
-			{
-				string[] keyValue = prop.Split('=');
-				if (keyValue.Length == 2)
-				{
-					connectionProps.Add(keyValue[0], keyValue[1]);
-				}
-				else
-				{
-					connectionProps.Add(prop, prop);
-				}
-			}
-			return connectionProps;
-		}
-
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ConnectionTimeout.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ConnectionTimeout.cs
deleted file mode 100755
index 43c325ad29d..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_ConnectionTimeout.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_ConnectionTimeout : GHTBase
-{
-	public static void Main()
-	{
-		OracleConnection_ConnectionTimeout tc = new OracleConnection_ConnectionTimeout();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_ConnectionTimeout");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	[Category("NotWorking")]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString + ";Connect timeout=44");
-
-		try
-		{
-			BeginCase("ConnectionTimeout from Connection string");
-			Compare(((IDbConnection)con).ConnectionTimeout , 44);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		try
-		{
-			BeginCase("ConnectionTimeout default");
-			Compare(((IDbConnection)con).ConnectionTimeout , 15);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_CreateCommand.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_CreateCommand.cs
deleted file mode 100755
index 20238e8a50e..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_CreateCommand.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_CreateCommand : GHTBase
-{
-	public static void Main()
-	{
-		OracleConnection_CreateCommand tc = new OracleConnection_CreateCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_CreateCommand");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleConnection con = new OracleConnection();
-		OracleCommand cmd = null;
-		
-		try
-		{
-			BeginCase("CreateCommand");
-			cmd = con.CreateCommand();
-			Compare(cmd!=null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_DataSource.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_DataSource.cs
deleted file mode 100755
index 3ebb63e2089..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_DataSource.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_DataSource : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OracleConnection_DataSource tc = new OracleConnection_DataSource();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_DataSource");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		//test does not apply to ORACLE,DB2,Postgres
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.DB2) return;
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL) return;
-
-		//get the expected result from the connection string
-		string[] arrCon = con.ConnectionString.Split(';');
-		string result = null;
-		for (int i=0; i < arrCon.Length; i++)
-			if (arrCon[i].IndexOf("Data Source") >= 0) 
-			{
-				result = arrCon[i];
-				break;
-			}
-		result = result.Substring(result.IndexOf('=')+1).Trim();
-		try
-		{
-			BeginCase("check DataSource");
-			Compare(con.DataSource  , result);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Database.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Database.cs
deleted file mode 100755
index 1d8bc6b4689..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Database.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_Database : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OracleConnection_Database tc = new OracleConnection_Database();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_Database");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-        OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		//test does not apply to ORACLE,DB2,Sybase,Postgres
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.DB2) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.Sybase) return;
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL) return;
-
-		//get the expected result from the connection string
-		string[] arrCon = con.ConnectionString.Split(';');
-		string result = null;
-		for (int i=0; i < arrCon.Length; i++)
-			if (arrCon[i].IndexOf("Initial Catalog") >= 0) 
-			{
-				result = arrCon[i];
-				break;
-			}
-		result = result.Substring(result.IndexOf('=')+1).Trim();
-		try
-		{
-			BeginCase("check Database");
-			Compare(((IDbConnection)con).Database , result);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Equals.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Equals.cs
deleted file mode 100755
index 165f1087578..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Equals.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_Equals : GHTBase
-{
-	public static void Main()
-	{
-		OracleConnection_Equals tc = new OracleConnection_Equals();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_Equals");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleConnection con1 ,con2,con3;
-        
-		con1 = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString );
-		con3 = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString );
-
-		con2 = con1;
-        con1.Open ();
-
-		try
-		{
-			BeginCase("Equals 1");
-			Compare(con1.Equals(con2),true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Equals 2");
-			Compare(Equals(con2,con1),true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Equals 3");
-			Compare(con1.Equals(con3),false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con1.Close();
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_InfoMessage.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_InfoMessage.cs
deleted file mode 100755
index d4828cf1e51..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_InfoMessage.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Threading;
-using System.Data;
-using NUnit.Framework;
-using MonoTests.System.Data.Utils;
-
-using System.Data.OracleClient;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleConnection_InfoMessage : GHTBase
-	{
-		private int errorCounter=0;
-		public static void Main()
-		{
-			OracleConnection_InfoMessage tc = new OracleConnection_InfoMessage();
-			Exception exp = null;
-			try
-			{
-				// Every Test must begin with BeginTest
-				tc.BeginTest("OracleConnection_InfoMessage");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				// Every Test must End with EndTest
-				tc.EndTest(exp);
-			}
-		}
-
-		public void run()
-		{
-			Exception exp = null;
-
-			// Start Sub Test
-			try
-			{
-				test();
-				
-				
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				// Every Sub Test must end with EndCase
-				EndCase(exp);
-				exp = null;
-			}
-			// End Sub Test
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void test()
-		{
-			BeginCase("InfoMessage testing");
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			con.InfoMessage+=new OracleInfoMessageEventHandler(con_InfoMessage);
-			generateError(con);
-			con.Close();
-		}
-		private void generateError(OracleConnection con)
-		{
-			string errorString = string.Empty;
-			OracleCommand cmd = new OracleCommand(string.Empty,con); 
-
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-				{
-					cmd.CommandText  = "Raiserror ('A sample SQL informational message',10,1)";
-					break;
-				}
-				case DataBaseServer.Oracle:
-				case DataBaseServer.PostgreSQL:
-				{
-					cmd.CommandText = "GH_ERROR";
-					//cmd.CommandText = "print 'This is a warning.'";
-					//cmd.CommandText = "select   count(SUPPLIERID) from GHTDB.PRODUCTS";
-					cmd.CommandType = CommandType.StoredProcedure;
-					break;
-				}
-
-				case DataBaseServer.DB2:
-				{
-					cmd.CommandText = "SIGNAL SQLSTATE '99999' SET MESSAGE_TEXT ='Blah Blah';";
-					break;
-				}
-
-				default:
-				{
-					throw new NotImplementedException(string.Format("GHT: Test is not implemented for {0}", ConnectedDataProvider.GetDbType(con))); 
-				}
-			}
-
-			
-			//cmd.CommandType = CommandType.StoredProcedure;
-			
-				cmd.ExecuteNonQuery();
-		
-		
-		
-//				cmd.CommandText = "TestInfoMessage";
-//				cmd.CommandType = CommandType.StoredProcedure;
-
-			
-			if (errorCounter == 0)
-			{
-				Thread.Sleep(5000);	
-			}
-			Compare(errorCounter,1);
-		}
-
-		private void con_InfoMessage(object sender, OracleInfoMessageEventArgs e)
-		{
-			errorCounter++;
-		}
-
-		//Activate This Construntor to log All To Standard output
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_New.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_New.cs
deleted file mode 100755
index ed549e1402a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_New.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_New : GHTBase
-{
-	public static void Main()
-	{
-		OracleConnection_New tc = new OracleConnection_New();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_New");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleConnection con = null;
-		try
-		{
-			BeginCase("OracleConnection ctor");
-			con = new OracleConnection();
-			Compare(con != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OracleConnection ctor connection string");
-			con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			Compare(con != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OracleConnection check connection string");
-			Compare(con.ConnectionString  ,MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString  );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Open.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Open.cs
deleted file mode 100755
index 9112767a94b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_Open.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleConnection_Open : GHTBase
-	{
-		OracleConnection con = null;
-		string ConString = "";
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				ConString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleConnection_Open tc = new OracleConnection_Open();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleOpenConnection");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-      
-			BeginCase("Open Connection ");
-			try
-			{
-				con = new OracleConnection(ConString);
-				con.Open();
-				Compare(con.State , ConnectionState.Open);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (con != null) con.Close();
-				EndCase(exp);
-				exp = null;
-			}
-
-			BeginCase("Open Connection - garbage value");
-			try
-			{
-				con = new OracleConnection("xxx");
-				con.Open();
-			}
-			catch (ArgumentException ex)
-			{
-				ExpectedExceptionCaught(ex); 
-			}
-			catch 
-			{
-				ExpectedExceptionNotCaught("System.ArgumentException");
-			}
-			finally
-			{
-				if (con != null) con.Close();
-				EndCase(exp);
-				exp = null;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_State.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_State.cs
deleted file mode 100755
index 7f8c813f51c..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_State.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_State : GHTBase
-{
-	public static void Main()
-	{
-		OracleConnection_State tc = new OracleConnection_State();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("NoName");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-        
-		// ----------- reserved for future versions of the product ---------------
-		//Broken	The connection to the data source is broken. This can occur only after the connection has been opened. A connection in this state may be closed and then re-opened. (This value is reserved for future versions of the product).
-		//Connecting  The connection object is connecting to the data source. (This value is reserved for future versions of the product.) 2 
-		//Executing The connection object is executing a command. (This value is reserved for future versions of the product.) 4 
-		//Fetching  The connection object is retrieving data. (This value is reserved for future versions of the product.) 8 
-
-		//-------------- checking only the following: ----------------
-		//Closed  The connection is closed.  
-		//Open  The connection is open. 
-
-		try
-		{
-			BeginCase("ConnectionState Closed");
-			Compare(con.State ,ConnectionState.Closed );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ConnectionState Open");
-			con.Open();
-			Compare(con.State ,ConnectionState.Open  );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con.Close();
-
-		try
-		{
-			BeginCase("ConnectionState Closed after open");
-			Compare(con.State ,ConnectionState.Closed );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_StateChange.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_StateChange.cs
deleted file mode 100755
index b2e49d25f77..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleConnection/OracleConnection_StateChange.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleConnection_StateChange : GHTBase
-{
-	public static void Main()
-	{
-		OracleConnection_StateChange tc = new OracleConnection_StateChange();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleConnection_StateChange");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-
-	bool blnEventRaised = false;
-	ConnectionState OriginalState,CurrentState;
-
-	[Test]
-	public void run()
-	{
-		
-		Exception exp = null;
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-        
-		// ----------- reserved for future versions of the product ---------------
-		//Broken	The connection to the data source is broken. This can occur only after the connection has been opened. A connection in this state may be closed and then re-opened. (This value is reserved for future versions of the product).
-		//Connecting  The connection object is connecting to the data source. (This value is reserved for future versions of the product.) 2 
-		//Executing The connection object is executing a command. (This value is reserved for future versions of the product.) 4 
-		//Fetching  The connection object is retrieving data. (This value is reserved for future versions of the product.) 8 
-
-		//-------------- checking only the following: ----------------
-		//Closed  The connection is closed.  
-		//Open  The connection is open. 
-
-
-		//add event handler
-		con.StateChange +=new StateChangeEventHandler(con_StateChange);
-
-		con.Open();
-		try
-		{
-			BeginCase("ConnectionState Closed");
-			Compare(blnEventRaised,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OriginalState Closed");
-			Compare(OriginalState,ConnectionState.Closed );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("CurrentState Open");
-			Compare(CurrentState,ConnectionState.Open );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		blnEventRaised = false;
-		con.Close();
-		try
-		{
-			BeginCase("ConnectionState Open");
-			Compare(blnEventRaised,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OriginalState Open");
-			Compare(OriginalState,ConnectionState.Open );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("CurrentState Close");
-			Compare(CurrentState,ConnectionState.Closed  );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-
-	void con_StateChange(Object sender, StateChangeEventArgs e)
-	{
-		CurrentState = e.CurrentState ;
-		OriginalState = e.OriginalState ;
-		blnEventRaised = true;
-
-
-	}
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_AcceptChangesDuringFill.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_AcceptChangesDuringFill.cs
deleted file mode 100755
index 30499210710..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_AcceptChangesDuringFill.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_AcceptChangesDuringFill : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_AcceptChangesDuringFill tc = new OracleDataAdapter_AcceptChangesDuringFill();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_AcceptChangesDuringFill");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			DataAdapter_AcceptChangesDuringFill((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ContinueUpdateOnError.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ContinueUpdateOnError.cs
deleted file mode 100755
index acf4ccbfd57..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ContinueUpdateOnError.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_ContinueUpdateOnError : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_ContinueUpdateOnError tc = new OracleDataAdapter_ContinueUpdateOnError();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_ContinueUpdateOnError");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-
-			base.DataAdapter_ContinueUpdateOnError((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_DeleteCommand.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_DeleteCommand.cs
deleted file mode 100755
index 8ad5898ef6b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_DeleteCommand.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_DeleteCommand : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_DeleteCommand tc = new OracleDataAdapter_DeleteCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_DeleteCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-
-		OracleCommand Cmd = new OracleCommand();
-
-		oleDBda.DeleteCommand = Cmd;
-
-		try
-		{
-			BeginCase("DeleteCommand - Get");
-			Compare(oleDBda.DeleteCommand , Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Dispose.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Dispose.cs
deleted file mode 100755
index 428f09177c7..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Dispose.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_Dispose : GHTBase
-{
-	OracleConnection con;
-
-	OracleCommand cmdSelect;
-	OracleCommand cmdDelete;
-	OracleCommand cmdUpdate;
-	OracleCommand cmdInsert;
-
-	[SetUp]
-	public void SetUp() {
-		string sqlSelect = "Select * from Customers where CustomerID = 'ABC'";
-		con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		
-		cmdSelect = new OracleCommand(sqlSelect,con);
-		cmdDelete = new OracleCommand("",con);
-		cmdUpdate = new OracleCommand("",con);
-		cmdInsert = null;
-
-		con.Open();
-	}
-
-	[TearDown]
-	public void TearDown() {
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-
-	public static void Main()
-	{
-		OracleDataAdapter_Dispose tc = new OracleDataAdapter_Dispose();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_Dispose");
-			tc.SetUp();
-			tc.run();
-			tc.TearDown();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		DataSet ds = new DataSet();
-		
-
-		OracleDataAdapter da = new OracleDataAdapter(cmdSelect);
-		da.DeleteCommand = cmdDelete;
-		da.UpdateCommand = cmdUpdate;
-		da.InsertCommand = new OracleCommand("",con);
-
-		cmdInsert =	da.InsertCommand;
-
-		da.Fill(ds);
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter select command");
-			da.Dispose();
-			Compare(da.SelectCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter insert command");
-			Compare(da.InsertCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter Delete Command");
-			Compare(da.DeleteCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter update command");
-			Compare(da.UpdateCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-
-
-		try
-		{
-			BeginCase("Dispose - check select command object");
-			Compare(cmdSelect != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check delete command object");
-			Compare(cmdDelete  != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check insert command object");
-			Compare(cmdInsert != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check Update command object");
-			Compare(cmdUpdate != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdSelect.connection object");
-			Compare(cmdSelect.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdDelete.connection object");
-			Compare(cmdDelete.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdUpdate.connection object");
-			Compare(cmdUpdate.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdInsert.connection object");
-			Compare(cmdInsert.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check command connection state");
-			da.Dispose();
-			Compare(cmdSelect.Connection.State ,ConnectionState.Open);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillError.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillError.cs
deleted file mode 100755
index 18b7edfb3cf..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillError.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_FillError : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_FillError tc = new OracleDataAdapter_FillError();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_FillError");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.DbDataAdapter_FillError((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DS.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DS.cs
deleted file mode 100755
index b7868eefca7..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DS.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_FillSchema_DS : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_FillSchema_DS tc = new OracleDataAdapter_FillSchema_DS();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_FillSchema_DS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.DbDataAdapter_FillSchema_Ds_SchemaType((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DSS.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DSS.cs
deleted file mode 100755
index 868f16349ae..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DSS.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_FillSchema_DSS : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_FillSchema_DSS tc = new OracleDataAdapter_FillSchema_DSS();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_FillSchema_DSS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.DbDataAdapter_FillSchema_Ds_SchemaType_Str((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DsSt.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DsSt.cs
deleted file mode 100755
index a4a8ed2f49d..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DsSt.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_FillSchema_DsSt : ADONetTesterClass
-{
-	private Exception exp;
-	private string connectionString = ConnectedDataProvider.ConnectionString;
-
-	public static void Main()
-	{
-		OracleDataAdapter_FillSchema_DsSt tc = new OracleDataAdapter_FillSchema_DsSt();
-		Exception l_exp = null;
-		try
-		{
-			// Every Test must begin with BeginTest
-			tc.BeginTest("OracleDataAdapter_FillSchema_DsSt");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			l_exp = ex;
-		}
-		finally
-		{
-			// Every Test must End with EndTest
-			tc.EndTest(l_exp);
-		}
-	}
-
-	public void run()
-	{
-		TestLongSqlExpression();
-	}
-
-	//Test case for bug #4708
-	[Test(Description="Test case for bug #4708")]
-	public void TestLongSqlExpression()
-	{
-		BeginCase("Long SQL string cause java.lang.StackOverflowError (Test case for bug #4708)");
-
-		StringBuilder querySb = new StringBuilder();
-		querySb.Append("SELECT ");
-		querySb.Append("c.CustomerID as ci1, c.CustomerID as ci2, c.CustomerID as ci3, c.CustomerID as ci4, ");
-		querySb.Append("c.CompanyName as cn1, c.CompanyName as cn2, c.CompanyName as cn3, c.CompanyName as cn4, ");
-		querySb.Append("c.ContactName as cntn1, c.ContactName as cntn2, c.ContactName as cntn3, c.ContactName as cntn4, ");
-		querySb.Append("c.ContactTitle as ct1, c.ContactTitle as ct2, c.ContactTitle as ct3, c.ContactTitle as ct4, ");
-		querySb.Append("c.Address as ad1, c.Address as ad2, c.Address as ad3, c.Address as ad4, ");
-		querySb.Append("c.City as ct1, c.City as ct2, c.City as ct3, c.City as ct4, ");
-		querySb.Append("c.Region as rg1, c.Region as rg2, c.Region as rg3, c.Region as rg4, ");
-		querySb.Append("c.PostalCode as pc1, c.PostalCode as pc2, c.PostalCode as pc3, c.PostalCode as pc4, ");
-		querySb.Append("c.Country as co1, c.Country as co2, c.Country as co3, c.Country as co4, ");
-		querySb.Append("c.Phone as ph1, c.Phone as ph2, c.Phone as ph3, c.Phone as ph4, ");
-		querySb.Append("c.Fax as fx1, c.Fax as fx2, c.Fax as fx3, c.Fax as fx4 ");
-		querySb.Append("FROM Customers c");
-		OracleDataAdapter adapter = null;
-		DataSet schemaDs = new DataSet();
-		try
-		{
-			using(adapter = new OracleDataAdapter(querySb.ToString(), this.connectionString))
-			{
-				adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
-				adapter.FillSchema(schemaDs, SchemaType.Source);
-				Compare(schemaDs.Tables.Count, 1);
-			}
-		} 
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DtSch.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DtSch.cs
deleted file mode 100755
index 95d114ec553..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_FillSchema_DtSch.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_FillSchema_DtSch : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_FillSchema_DtSch tc = new OracleDataAdapter_FillSchema_DtSch();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_FillSchema_DtSch");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			//Exception exp = null;
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.DbDataAdapter_FillSchema_Dt_SchemaType((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_1.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_1.cs
deleted file mode 100755
index 3518217b952..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_1.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_1: ADONetTesterClass 
-	{
-		// transaction use was add for PostgreSQL
-		OracleTransaction tr;
-
-		OracleConnection con;
-		OracleCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				// prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				
-				con.Open();
-				// transaction use was add for PostgreSQL
-				tr = con.BeginTransaction();
-				
-				cmd = new OracleCommand("", con, tr);
-
-				Compare("Setup" ,"Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			// transaction use was add for PostgreSQL
-			tr.Commit();
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_1 tc = new OracleDataAdapter_Fill_1();
-			Exception exp = null;
-			try
-			{
-				// Every Test must begin with BeginTest
-				tc.BeginTest("OracleDataAdapter_Fill_1");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				// Every Test must End with EndTest
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle)
-			{
-				StringBuilder messageBuilder = new StringBuilder();
-				messageBuilder.Append("Test \"OracleDataAdapter_Fill_1\" Skipped when running in .NET against Oracle database:\n");
-				messageBuilder.Append("In .NET there is a bug when calling a SP with multiple REFCURSORS from oracle server, the workaround is to use OracleClient and not Oracle.\n");
-				messageBuilder.Append("In GH we are not bug complient in this issue, because there is no workaround - We do not support the OracleClient namespace.");
-				messageBuilder.Append(" (The java run is not skipped).");
-				Log(messageBuilder.ToString());
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				// fail to work on .NET OLEDB
-				this.Log("Not testing PostgreSQL CommandType.StoredProcedure which return SETOF");
-				return;
-			}
-#endif
-
-			cmd.CommandText = "GH_MULTIRECORDSETS";
-			cmd.Parameters.Add(new OracleParameter("RCT_Employees", OracleType.Cursor)).Direction = ParameterDirection.Output;
-			cmd.Parameters.Add(new OracleParameter("RCT_Customers", OracleType.Cursor)).Direction = ParameterDirection.Output;
-			cmd.Parameters.Add(new OracleParameter("RCT_Orders", OracleType.Cursor)).Direction = ParameterDirection.Output;
-			cmd.CommandType = CommandType.StoredProcedure;
-			OracleDataAdapter da = new OracleDataAdapter(cmd);
-			DataSet ds = new DataSet();
-
-			//execute the fill command
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Check table count");
-				Compare(ds.Tables.Count ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 0 rows count");
-				Compare(ds.Tables[0].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 0 Columns count");
-				Compare(ds.Tables[0].Columns.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 1 rows count");
-				Compare(ds.Tables[1].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 1 Columns count");
-				Compare(ds.Tables[1].Columns.Count ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 2 rows count");
-				Compare(ds.Tables[2].Rows.Count ,0);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 2 Columns count");
-				Compare(ds.Tables[2].Columns.Count ,4);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_2.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_2.cs
deleted file mode 100755
index 658309ae906..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_2.cs
+++ /dev/null
@@ -1,811 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-using NUnit.Framework;
-using MonoTests.System.Data.Utils;
-
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_2 : ADONetTesterClass 
-	{
-		private string nonUniqueId;
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_2 tc = new OracleDataAdapter_Fill_2();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Fill_2");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			
-			
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			//DoTestThis(con);
-			DoTestTypes1(con);
-			//Don't know how to access diffrent database
-			if ((ConnectedDataProvider.GetDbType(con) != DataBaseServer.DB2) && (ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL))
-			{ 
-				DoTestTypes2(con);
-				DoTestTypes3(con);
-			}
-			
-#if TARGET_JVM
-			DoTestTypes4(con);
-#endif
-		//	DoTestTypes5(con);   //Table direct --> multipe tables
-			DoTestTypes6(con);
-			
-			if ((ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle) && 
-				(ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL))
-			{
-				DoTestTypes7(con); //Diffrent owner
-				
-			}
-
-			DoTestTypes8(con); //Diffrent owner
-
-			//TBD!!
-			//DoTestTypes9(con);
-			
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL)
-			{
-				DoTestTypes10(con);
-			}
-
-			CallStoredProcedureInPackage(con);
-			StoredProcedurePackageambiguity_InsidePackage(con);
-			StoredProcedurePackageambiguity_OutsidePackage(con);
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		//[Test]
-		public void DoTestThis(OracleConnection con)
-		{
-			Exception exp = null;
-			OracleCommand cmd = new OracleCommand("GH_CREATETABLE", con);
-				cmd.CommandType = CommandType.StoredProcedure;
-				OracleDataAdapter da = new OracleDataAdapter(cmd);
-				DataSet ds = new DataSet();
-
-				try
-				{
-					BeginCase("Check effected rows after create table ddl in stored procedure.");
-					int RowsAffected;
-					RowsAffected = cmd.ExecuteNonQuery();
-					int ExpectedRowsAffected;
-					switch (ConnectedDataProvider.GetDbType(con))
-					{
-						case DataBaseServer.SQLServer:
-						case DataBaseServer.Sybase:
-							ExpectedRowsAffected = 3;
-							break;
-						case DataBaseServer.Oracle:
-							//In .NET the ExpectedRowsAffected is '1', where as in Java it is '-1', this gap is because of jdbc driver for oracle.
-							ExpectedRowsAffected = -1;
-
-							break;
-						case DataBaseServer.DB2:
-							ExpectedRowsAffected = -1;
-							break;
-						default:
-							string errMsg = string.Format("GHT: Test not implemented for DB type: {0}", ConnectedDataProvider.GetDbType(con));
-							throw new NotImplementedException(errMsg);
-					}
-					Compare(RowsAffected ,ExpectedRowsAffected);
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-		}
-
-
-		#region Select by full table name in the same catalog
-		//[Test]
-		public void DoTestTypes1(OracleConnection conn)
-		{
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-
-			string tableName = getDbObjectName("Employees",conn);
-			int expectedRowsCount = 8;
-
-			#region Select by full table name in the same catalog
-
-			string[] arr = new string[2];
-
-			arr[0] = "LastName";
-			arr[1] = "FirstName";
-
-			prepareTableForTest(conn,expectedRowsCount,"Employees","EmployeeID",arr);
-			comm.CommandText="select max(EmployeeID) from " + tableName;
-			// on some databases the max is on a field which is decimal
-			decimal maxEmployee = decimal.Parse(comm.ExecuteScalar().ToString()) - expectedRowsCount;
-
-			comm.CommandText = "SELECT EmployeeID FROM " + tableName + " where EmployeeID > " +  maxEmployee.ToString() ;
-			da.Fill(ds);
-
-			Exception exp = null;
-			try
-			{
-				BeginCase("Select by full table name in the same catalog");
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{cleanTableAfterTest(conn,"Employees","EmployeeID",Convert.ToInt32(maxEmployee));
-				EndCase(exp); exp = null;}
-
-			#endregion //Select by full table name in the same catalog
-
-		}
-
-		#endregion
-
-		#region Select by full table name in the different catalog
-		//[Test]
-		public void DoTestTypes2(OracleConnection conn)
-		{
-			BeginCase("Select by full table name in the different catalog");
-			nonUniqueId = "48951_" +  TestCaseNumber.ToString(); 
-			Exception exp=null;
-			string tableName = getDbObjectName("Customers",conn,"GHTDB_EX");
-			int expectedRowsCount = 5;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-
-			insertIntoStandatTable(conn,tableName,expectedRowsCount,"CustomerID");
-		
-			comm.CommandText = "SELECT * FROM " + tableName + " where CustomerID='" + nonUniqueId + "'" ;
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;
-			cleanStandatTable(conn,tableName,"CustomerID");
-			}
-		}
-		#endregion
-
-		#region Call stored procedure in the different catalog
-		//[Test]
-		public void DoTestTypes3(OracleConnection conn)
-		{
-			BeginCase("Call stored procedure in the different catalog");
-			nonUniqueId = "48951_" +  TestCaseNumber.ToString(); 
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-
-			string tableName = getDbObjectName("Customers",conn,"GHTDB_EX");
-			int expectedRowsCount = 5;
-
-			insertIntoStandatTable(conn,tableName,expectedRowsCount,"CustomerID");
-
-			comm.CommandType = CommandType.StoredProcedure;
-			comm.CommandText = getDbObjectName("GH_DUMMY",conn,"GHTDB_EX");
-
-			comm.Parameters.Add(new OracleParameter("CustomerIDPrm",OracleType.Char));
-			comm.Parameters.Add(new OracleParameter("result",OracleType.Cursor)).Direction = ParameterDirection.Output;
-
-			
-			comm.Parameters[0].Value = nonUniqueId;
-			ds.Tables.Clear();
-			
-
-			try
-			{
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;
-			cleanStandatTable(conn,tableName,"CustomerID"); }
-		}
-
-#endregion // Call stored procedure in the different catalog
-
-		#region Select using Table direct - single table
-		//[Test]
-		public void DoTestTypes4(OracleConnection conn)
-		{
-			
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			string tableName = getDbObjectName("Customers",conn);
-			//int expectedRowsCount = 5;
-
-			comm.CommandText = tableName;
-
-			comm.CommandType = CommandType.TableDirect;
-
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Select using Table direct - single table");
-				Compare(ds.Tables[0].Rows.Count > 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-#endregion // Select using Table direct - single table
-
-		#region Select using Table direct - multiple tables
-
-		//[Test]
-		public void DoTestTypes5(OracleConnection conn)
-		{
-
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.TableDirect;
-			comm.CommandText = "Categories;Employees";
-
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Select using Table direct - multiple tables");
-				int result =  + ds.Tables[1].Rows.Count + ds.Tables[2].Rows.Count;
-				Compare(ds.Tables[0].Rows.Count > 0  ,true );
-				Compare(ds.Tables[1].Rows.Count > 0  ,true );
-				Compare(ds.Tables[0].Rows.Count == ds.Tables[1].Rows.Count ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-#endregion // Select using Table direct - multiple tables
-
-
-		#region Test view
-
-		//[Test]
-		public void DoTestTypes6(OracleConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.Text;
-
-			switch (ConnectedDataProvider.GetDbType(conn))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-					comm.CommandText = "select * from [Current Product List]";
-					break;
-				case DataBaseServer.Oracle:
-				case DataBaseServer.PostgreSQL:
-					comm.CommandText = "select * from Current_Product_List";
-					break;
-				default:
-					comm.CommandText = "select * from DB2ADMIN.Current_Product_List";
-					break;
-			}
-
-
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Testing view");
-				Compare(ds.Tables[0].Rows.Count >0,true);
-				Compare(ds.Tables[0].Columns.Count,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-
-		}
-		#endregion
-
-		#region select table with diffrent owner - diffrent name
-
-		//[Test]
-		public void DoTestTypes7(OracleConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.Text;
-
-			//First change ownerShip
-
-			//chageOwnerShip(conn,"Categories","mainsoft");
-			comm.CommandText = "SELECT * FROM mainsoft.CategoriesNew";
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("select table with diffrent owner - diffrent name");
-				Compare(ds.Tables[0].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("select table with diffrent owner - diffrent name --> negetive");
-				ds.Tables.Clear();
-				comm.CommandText = "select * from " + getDbObjectName("CategoriesNew",conn);
-				da.Fill(ds);
-			}
-			catch (OracleException ex)
-			{
-				ExpectedExceptionCaught(ex);
-			}
-			catch 	{ExpectedExceptionNotCaught("OracleException"); }
-			finally	{EndCase(exp); exp = null;}
-
-			//Change back
-
-			//chageOwnerShip(conn,"mainsoft.Categories","dbo");
-		}
-
-		#endregion
-
-		#region select table with diffrent owner - same name
-
-		//[Test]
-		public void DoTestTypes8(OracleConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.Text;
-
-			//First change ownerShip
-
-			//chageOwnerShip(conn,"Categories","mainsoft");
-			comm.CommandText = "SELECT * FROM GHTDB_EX.Categories";
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Select table with diffrent owner same name");
-				Compare(ds.Tables[0].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-		}
-
-		#endregion
-
-		#region select table with diffrent owner - SP
-
-		//[Test]
-		public void DoTestTypes9(OracleConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			BeginCase("Select table with diffrent owner SP");
-			nonUniqueId = "48951" ;
-			int expectedRowsCount = 5;
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			string tableName = getDbObjectName("Employees",conn);
-			comm.CommandType = CommandType.StoredProcedure;
-
-			//insertIntoStandatTable(conn,tableName,5,"EmployeeID");
-			string[] arr = new string[2];
-			arr[0] = "LastName";
-			arr[1] = "FirstName";
-
-			int maxValue = prepareTableForTest(conn,expectedRowsCount,"Employees","EmployeeID",arr);
-
-			comm.Parameters.Add("CustomerIdPrm",maxValue.ToString()); 
-			comm.Parameters.Add(new OracleParameter("result",OracleType.Cursor)).Direction = ParameterDirection.Output;
-
-			
-			try
-			{
-				comm.CommandText = "GHTDB_EX.GH_DUMMY";
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;
-			cleanTableAfterTest (conn,"Employees","EmployeeID",maxValue); }
-
-		}
-
-		#endregion
-
-		#region select table with diffrent owner - and diffrent structure
-		//[Test]
-		public void DoTestTypes10(OracleConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			BeginCase("Select table with diffrent owner and diffrent structure");
-			nonUniqueId = "48951" ;
-			OracleCommand comm = new OracleCommand("",conn);
-			OracleDataAdapter da = new OracleDataAdapter();
-			da.SelectCommand = comm;
-			string tableName = getDbObjectName("Categories",conn);
-			comm.CommandType = CommandType.Text;
-			OracleDataReader reader = null;
-
-			try
-			{
-				comm.CommandText = "select CategoryID,CategoryName from " + tableName;
-				reader = comm.ExecuteReader();
-				//da.Fill(ds);
-			}
-			catch (Exception  ex) 
-			{
-				EndCase(ex);
-			}
-			finally
-			{
-				reader.Close();
-			}
-
-			comm.CommandText="select CategoryID,CategoryName  from  GHTDB_EX.Categories  where CategoryID = :a";
-
-			comm.Parameters.Add("a","10");
-			da.Fill(ds);
-
-			try
-			{
-				Compare(ds.Tables[0].Rows.Count ,1);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	
-			{
-				EndCase(exp); exp = null;}
-
-		}
-
-		#endregion
-
-		#region Oracle - use stored procedure inside package
-		//[Test(Description="Call a stored procedure which is defined within a package.")]
-		public void CallStoredProcedureInPackage(OracleConnection con)
-		{
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle)
-			{
-				//Packages exist only in oracle.
-				return;
-			}
-
-			Exception exp = null;
-			OracleDataReader rdr = null;
-			try
-			{
-				BeginCase("Call a stored procedure which is defined within a package.");
-				exp = null;
-				DataSet ds = new DataSet();
-				OracleDataAdapter da = new OracleDataAdapter();
-				OracleCommand cmd = new OracleCommand();
-				cmd.Connection = con;
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "ghtpkg.ghsp_inPkg";
-				cmd.Parameters.Add("CustomerIdPrm", "ALFKI");
-				cmd.Parameters.Add(new OracleParameter("result",OracleType.Cursor)).Direction = ParameterDirection.Output;
-				da.SelectCommand = cmd;
-
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows.Count, 1);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-			}
-		}
-		//[Test(Description="Call a stored procedure ghsp_pkgAmbig from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.")]
-		public void StoredProcedurePackageambiguity_InsidePackage(OracleConnection con)
-		{
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle)
-			{
-				//Packages exist only in oracle.
-				return;
-			}
-
-			Exception exp = null;
-			OracleDataReader rdr = null;
-			try
-			{
-				BeginCase("Call a stored procedure ghsp_pkgAmbig from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.");
-				exp = null;
-				DataSet ds = new DataSet();
-				OracleDataAdapter da = new OracleDataAdapter();
-				OracleCommand cmd = new OracleCommand();
-				cmd.Connection = con;
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "ghtpkg.ghsp_pkgAmbig";
-				cmd.Parameters.Add(new OracleParameter("res",OracleType.Cursor)).Direction = ParameterDirection.Output;
-				da.SelectCommand = cmd;
-
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows[0]["IN_PKG"], "TRUE");
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-			}
-		}
-		//[Test(Description="Call a stored procedure ghsp_pkgAmbig not from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.")]
-		public void StoredProcedurePackageambiguity_OutsidePackage(OracleConnection con)
-		{
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle)
-			{
-				//Packages exist only in oracle.
-				return;
-			}
-
-			Exception exp = null;
-			OracleDataReader rdr = null;
-			try
-			{
-				BeginCase("Call a stored procedure ghsp_pkgAmbig not from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.");
-				exp = null;
-				DataSet ds = new DataSet();
-				OracleDataAdapter da = new OracleDataAdapter();
-				OracleCommand cmd = new OracleCommand();
-				cmd.Connection = con;
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "ghsp_pkgAmbig";
-				cmd.Parameters.Add(new OracleParameter("res",OracleType.Cursor)).Direction = ParameterDirection.Output;
-				da.SelectCommand = cmd;
-
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows[0]["IN_PKG"], "FALSE");
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-			}
-		}
-		#endregion
-
-		private string getDbObjectName(string objectName,OracleConnection con)
-		{
-			return getDbObjectName(objectName,con,string.Empty);
-			
-		}
-		private string getDbObjectName(string objectName,OracleConnection con,string databaseName)
-		{
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-				{
-					if (databaseName == string.Empty)
-					{
-						return "GHTDB.dbo." + objectName;
-					}
-					else
-					{
-						return  databaseName +  ".dbo." + objectName;
-					}
-				}
-				case DataBaseServer.PostgreSQL:
-				{
-					return "public." + objectName.ToUpper();
-				}
-				case DataBaseServer.Oracle:
-				{
-					if (databaseName == string.Empty)
-					{
-						return "GHTDB." + objectName.ToUpper();
-					}
-					else
-					{
-						return  databaseName.ToUpper() + "." + objectName.ToUpper();
-					}
-					
-				}
-				case DataBaseServer.DB2: 
-				{
-					if (databaseName == string.Empty)
-					{
-						return   "DB2ADMIN." + objectName;
-					}
-					else
-					{
-						return  databaseName +  ".DB2ADMIN." + objectName;
-					}
-
-					
-
-				}
-				default:
-				{
-					throw new NotImplementedException();
-				}
-
-
-			}
-
-		}
-
-
-
-		/// <summary>
-		/// This method will prepare table for test
-		/// </summary>
-		private int prepareTableForTest(OracleConnection con,int recordsNumber,string baseTableName,string keyField
-			,params string[] otherNonNullableFieldsName)
-		{
-			string tableName = getDbObjectName(baseTableName,con);
-			OracleCommand cmd = new OracleCommand("select max(" + keyField + ") from " + tableName,con);
-			string str_ret = cmd.ExecuteScalar().ToString();
-//			Console.WriteLine("ExecuteScalar:" + str_ret);
-			// on some databases the max is on a field which is decimal
-			decimal maxRecord = decimal.Parse(str_ret);
-			int resultCount = Convert.ToInt32(maxRecord)+recordsNumber;
-			string sqlStmt = string.Empty;
-			string valueStmt = string.Empty;
-
-			//Constrcut the statemnet once : --> TODO://Move this logic to seperate method
-			for(int i=0;i<otherNonNullableFieldsName.Length;i++)
-			{
-				sqlStmt+= otherNonNullableFieldsName[i] + ",";
-				valueStmt+="'a',";
-			}
-
-			//Trim the last ","
-			if (otherNonNullableFieldsName.Length > 0)
-			{
-				sqlStmt =  sqlStmt.Remove(sqlStmt.Length-1,1);
-				sqlStmt = "," + sqlStmt;
-
-				valueStmt =  valueStmt.Remove(valueStmt.Length-1,1);
-				valueStmt = "," + valueStmt;
-			}
-				
-
-			for (int index=Convert.ToInt32(maxRecord)+1;index<=resultCount;index++)
-			{
-				cmd.CommandText="Insert into " + tableName + " (" + keyField + sqlStmt + ") values ("
-					+ index + valueStmt + ")";
-				cmd.ExecuteNonQuery();
-			}
-			return Convert.ToInt32(maxRecord);
-
-		}
-		private void cleanTableAfterTest(OracleConnection con,string baseTableName, string keyField, int recordNumber)
-		{
-			string tableName = getDbObjectName(baseTableName, con);
-			OracleCommand cmd = new OracleCommand("delete from " + tableName + " where " + keyField + " > " + recordNumber  ,con);
-			cmd.ExecuteNonQuery();
-
-		}
-
-		private void insertIntoStandatTable(OracleConnection con,string tableName,int recordsNumber,string keyField)
-		{
-			OracleCommand cmd = new OracleCommand("delete from " + tableName + " where  "  + keyField + "= '" + nonUniqueId + "'",con);
-			cmd.ExecuteNonQuery();
-
-			for (int index=0;index<recordsNumber;index++)
-			{
-				cmd.CommandText = "Insert into " + tableName + "(" + keyField + ") values ('" + nonUniqueId  + "')";
-				cmd.ExecuteNonQuery();
-			}
-		}
-		private void cleanStandatTable(OracleConnection con,string tableName,string keyField)
-		{
-			OracleCommand cmd = new OracleCommand("delete from " + tableName + " where " + keyField + " = '" + nonUniqueId + "'",con);
-			cmd.ExecuteNonQuery();
-
-		}
-
-		private void chageOwnerShip(OracleConnection con,string objectName,string newOwner)
-		{
-			OracleCommand cmd = new OracleCommand();
-			cmd.Connection = con;
-
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-				{
-					cmd.CommandType = CommandType.StoredProcedure;
-					cmd.CommandText = "[dbo].[sp_changeobjectowner]";
-					cmd.Parameters.Add("@objname",objectName);
-					cmd.Parameters.Add("@newowner",newOwner);
-					cmd.ExecuteNonQuery();
-					return;
-
-				}
-				default:
-				{
-					throw new NotImplementedException();
-				}
-			}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_3.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_3.cs
deleted file mode 100755
index 9c08ce1aa5f..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_3.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_3: ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_3 tc = new OracleDataAdapter_Fill_3();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Fill_3");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			//in DB2 when trying to fill an empty table - no table is loaded
-			OracleConnection conn = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("Select * from GH_EMPTYTABLE",conn);
-			
-			DataSet ds = new DataSet();
-			oleDBda.Fill(ds);
-        
-			try
-			{
-				BeginCase("Table count - fill with SP");
-				Compare(ds.Tables.Count ,1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//add for bug #2508 - OLEDBDataAdapter.Fill fills only the 1st result set, reported from an evaluation
-			if (ConnectedDataProvider.GetDbType(oleDBda.SelectCommand.Connection) == DataBaseServer.SQLServer)
-				//multiple commands can not be done with Oracle or DB2
-			{
-
-
-				//get excpected results
-				if (oleDBda.SelectCommand.Connection.State != ConnectionState.Open)
-				{
-					oleDBda.SelectCommand.Connection.Open();
-				}
-				OracleCommand cmd = new OracleCommand("",oleDBda.SelectCommand.Connection);
-				cmd.CommandText = "Select count(*) from Customers";
-				int TblResult0 = (int)cmd.ExecuteScalar();
-				cmd.CommandText = "Select count(*) from Categories";
-				int TblResult1 = (int)cmd.ExecuteScalar();
-				cmd.CommandText = "Select count(*) from Region";
-				int TblResult2 = (int)cmd.ExecuteScalar();
-				if (oleDBda.SelectCommand.Connection.State != ConnectionState.Closed)
-				{
-					oleDBda.SelectCommand.Connection.Close();
-				}
-
-
-				oleDBda.SelectCommand.CommandText = "Select * from Customers; " +
-					"Select * from Categories; " +
-					"Select * from Region";
-				ds = new DataSet();
-				oleDBda.Fill(ds);
-
-				try
-				{
-					BeginCase("Table count - Fill with query");
-					Compare(ds.Tables.Count ,3 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Table 0 rows count");
-					Compare(ds.Tables[0].Rows.Count ,TblResult0 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Table 1 rows count");
-					Compare(ds.Tables[1].Rows.Count ,TblResult1 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Table 2 rows count");
-					Compare(ds.Tables[2].Rows.Count ,TblResult2 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-			}
-
- 
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Ds.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Ds.cs
deleted file mode 100755
index 52c3a33293a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Ds.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_Ds : ADONetTesterClass
-	{
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_Ds tc = new OracleDataAdapter_Fill_Ds();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Fill_Ds");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-	
-			base.DbDataAdapter_Fill_Ds((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_DsStr.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_DsStr.cs
deleted file mode 100755
index b0a43be8caf..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_DsStr.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_DsStr : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_DsStr tc = new OracleDataAdapter_Fill_DsStr();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Fill_DsStr");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.DbDataAdapter_Fill_Ds_Str((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Ds_Int_Int_Str.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Ds_Int_Int_Str.cs
deleted file mode 100755
index be784ae2fab..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Ds_Int_Int_Str.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_Ds_Int_Int_Str  : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_Ds_Int_Int_Str tc = new OracleDataAdapter_Fill_Ds_Int_Int_Str();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Fill_DIIS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-	
-			base.DbDataAdapter_Fill_Ds_Int_Int_Str((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Dt.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Dt.cs
deleted file mode 100755
index f9f0f47f1a2..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Fill_Dt.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Fill_Dt : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Fill_Dt tc = new OracleDataAdapter_Fill_Dt();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Fill_Dt");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			//Exception exp = null;
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-	
-			base.DbDataAdapter_Fill_Dt((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_GetFillParameters.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_GetFillParameters.cs
deleted file mode 100755
index f8ffeaec21b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_GetFillParameters.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_GetFillParameters : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_GetFillParameters tc = new OracleDataAdapter_GetFillParameters();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_GetFillParameters");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		string selectSQL = "SELECT * FROM Employees WHERE EmployeeId = ? AND FirstName = ?";
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-		oleDBda.SelectCommand = new OracleCommand(selectSQL,new OracleConnection());
-
-		IDataParameter[] Idp = oleDBda.GetFillParameters();
-
-		try
-		{
-			BeginCase("Length");
-			Compare(Idp.Length  ,0);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-		
-		oleDBda.SelectCommand.Parameters.Add(new OracleParameter("@EmployeeId",DbType.Int32)) ;
-		oleDBda.SelectCommand.Parameters["@EmployeeId"].SourceColumn = "EmployeeId";
-		oleDBda.SelectCommand.Parameters.Add(new OracleParameter("@FirstName",OracleType.VarChar,10));
-
-		Idp = oleDBda.GetFillParameters();
-        
-		try
-		{
-			BeginCase("Parameter 0");
-			Compare(Idp[0] ,oleDBda.SelectCommand.Parameters[0]);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-		try
-		{
-			BeginCase("Parameter 1");
-			Compare(Idp[1] ,oleDBda.SelectCommand.Parameters[1]);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-	
-		
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_InsertCommand.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_InsertCommand.cs
deleted file mode 100755
index 8d5e1b67929..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_InsertCommand.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_InsertCommand : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_InsertCommand tc = new OracleDataAdapter_InsertCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_InsertCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-
-		OracleCommand Cmd = new OracleCommand();
-
-		oleDBda.InsertCommand = Cmd;
-
-		try
-		{
-			BeginCase("InsertCommand - Get");
-			Compare(oleDBda.InsertCommand, Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_MissingMappingAction.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_MissingMappingAction.cs
deleted file mode 100755
index f65c4e669f1..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_MissingMappingAction.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_MissingMappingAction : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_MissingMappingAction tc = new OracleDataAdapter_MissingMappingAction();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_MissingMappingAction");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.DataAdapter_MissingMappingAction((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_MissingSchemaAction.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_MissingSchemaAction.cs
deleted file mode 100755
index 51e6e702d00..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_MissingSchemaAction.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_MissingSchemaAction : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_MissingSchemaAction tc = new OracleDataAdapter_MissingSchemaAction();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_MissingSchemaAction");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-			base.DataAdapter_MissingSchemaAction((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_RowUpdated.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_RowUpdated.cs
deleted file mode 100755
index c253b0264e4..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_RowUpdated.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_RowUpdated : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_RowUpdated tc = new OracleDataAdapter_RowUpdated();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_RowUpdated");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		int EventCounter = 0;
-		DataRow drInsert,drDelete,drUpdate;
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.OracleDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			// --------- get data from DB -----------------
-			DataSet ds = base.PrepareDBData_Update((DbDataAdapter)oleDBda);
-
-
-			// add event handler
-			oleDBda.RowUpdated += new OracleRowUpdatedEventHandler(oleDBda_RowUpdated);
-			
-			//insert ,delete, update
-			drInsert = ds.Tables[0].NewRow();
-			drInsert.ItemArray = new object[] {9991,"Ofer","Borshtein","Insert"};
-			drDelete = ds.Tables[0].Rows.Find(9992);
-			drUpdate = ds.Tables[0].Rows.Find(9993);
-		
-			ds.Tables[0].Rows.Add(drInsert);
-			drDelete.Delete();
-			drUpdate["Title"] = "Jack the ripper"; 
-
-			//execute update to db, will raise events
-			oleDBda.Update(ds);
-
-			try
-			{
-				BeginCase("EventCounter ");
-				Compare(EventCounter ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			oleDBda.RowUpdated -= new OracleRowUpdatedEventHandler(oleDBda_RowUpdated);
-		
-			//close connection
-			if (  ((IDbDataAdapter)oleDBda).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)oleDBda).SelectCommand.Connection.Close();
-		}
-
-		private void oleDBda_RowUpdated(object sender, OracleRowUpdatedEventArgs e)
-		{
-			Exception exp = null;
-			switch (e.StatementType)
-			{
-				case StatementType.Insert: 
-					try
-					{
-						BeginCase("RowInsert");
-						Compare(drInsert ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Delete:
-					try
-					{
-						BeginCase("RowDelete");
-						Compare(drDelete ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Update:
-					try
-					{
-						BeginCase("RowUpdate");
-						Compare(drUpdate ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_RowUpdating.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_RowUpdating.cs
deleted file mode 100755
index e1cc763d7cf..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_RowUpdating.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_RowUpdating : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_RowUpdating tc = new OracleDataAdapter_RowUpdating();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_RowUpdating");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-
-		int EventCounter = 0;
-		DataRow drInsert,drDelete,drUpdate;
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.OracleDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			// --------- get data from DB -----------------
-			DataSet ds = base.PrepareDBData_Update((DbDataAdapter)oleDBda);
-			// add event handler
-			oleDBda.RowUpdating +=new OracleRowUpdatingEventHandler(oleDBda_RowUpdating);
-			
-			//insert ,delete, update
-			drInsert = ds.Tables[0].NewRow();
-			drInsert.ItemArray = new object[] {9991,"Ofer","Borshtein","Insert"};
-			drDelete = ds.Tables[0].Rows.Find(9992);
-			drUpdate = ds.Tables[0].Rows.Find(9993);
-		
-			ds.Tables[0].Rows.Add(drInsert);
-			drDelete.Delete();
-			drUpdate["Title"] = "Jack the ripper"; 
-
-			//execute update to db, will raise events
-			oleDBda.Update(ds);
-
-			try
-			{
-				BeginCase("EventCounter ");
-				Compare(EventCounter ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			oleDBda.RowUpdating -=new OracleRowUpdatingEventHandler(oleDBda_RowUpdating);
-				
-			//close connection
-			if (  ((IDbDataAdapter)oleDBda).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)oleDBda).SelectCommand.Connection.Close();
-		}
-
-		private void oleDBda_RowUpdating(object sender, OracleRowUpdatingEventArgs e)
-		{
-			Exception exp = null;
-			switch (e.StatementType)
-			{
-				case StatementType.Insert: 
-					try
-					{
-						BeginCase("RowInsert");
-						Compare(drInsert ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Delete:
-					try
-					{
-						BeginCase("RowDelete");
-						Compare(drDelete ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Update:
-					try
-					{
-						BeginCase("RowUpdate");
-						Compare(drUpdate ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_SelectCommand.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_SelectCommand.cs
deleted file mode 100755
index 51e0a51b752..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_SelectCommand.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_SelectCommand : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_SelectCommand tc = new OracleDataAdapter_SelectCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_SelectCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-
-		OracleCommand Cmd = new OracleCommand();
-
-		oleDBda.SelectCommand  = Cmd;
-
-		try
-		{
-			BeginCase("SelectCommand - Get");
-			Compare(oleDBda.SelectCommand, Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_TableMappings.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_TableMappings.cs
deleted file mode 100755
index 4bae7563f31..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_TableMappings.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_TableMappings : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_TableMappings tc = new OracleDataAdapter_TableMappings();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_TableMappings");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{ 
-			// open a transaction for PostgreSQL
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			DataAdapter_TableMappings((DbDataAdapter)oleDBda);
-		}
-		
-		public void DataAdapter_TableMappings(DbDataAdapter dbDA)
-		{
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			IConn.Open();
-			ICmd.Transaction = IConn.BeginTransaction();
-
-			//--- Default value ---
-        
-			try
-			{
-				BeginCase("TableMappings Default value");
-				Compare(dbDA.TableMappings.Count ,0);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//init dataset
-			DataSet ds = new DataSet();
-			ds.Tables.Add("CustTable");
-			ds.Tables.Add("EmplTable");
-
-			//load the tables
-			dbDA.TableMappings.Add("Table","CustTable");
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			dbDA.Fill(ds);
-
-			dbDA.TableMappings.Clear();
-			dbDA.TableMappings.Add("Table","EmplTable");
-			ICmd.CommandText = " SELECT EmployeeID, LastName, FirstName, Title FROM Employees where EmployeeID > 0";
-			dbDA.Fill(ds);
-
-			try
-			{
-				BeginCase("TableMappings.Count");
-				Compare(ds.Tables.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Customers rows count");
-				Compare(ds.Tables["CustTable"].Rows.Count > 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Employees rows count");
-				Compare(ds.Tables["EmplTable"].Rows.Count > 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Employees Columns");
-				Compare(ds.Tables["EmplTable"].Columns.IndexOf("EmployeeID") >= 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Customer Columns");
-				Compare(ds.Tables["CustTable"].Columns.IndexOf("CustomerID") >= 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//Another checking 
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2) {
-
-			BeginCase("Check table mappings with stored procedure of another owner");
-			try
-			{
-				DataSet ds1 = new DataSet();
-				ds1.Tables.Add("EmplTable");
-				dbDA.TableMappings.Clear();
-				dbDA.TableMappings.Add("Table","EmplTable");
-				ICmd.CommandType = CommandType.StoredProcedure;
-	
-				switch (ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString))
-				{
-					case MonoTests.System.Data.Utils.DataBaseServer.Oracle:
-						// On ORACLE, the Scheam is the user is the owner.
-						ICmd.CommandText = "GHTDB.GH_DUMMY";
-						break;
-					case MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL:
-						ICmd.CommandText = "public.gh_dummy";
-						break;
-					default:
-						ICmd.CommandText = "mainsoft.GH_DUMMY";
-						break;
-				}
-
-				// investigate the SP parameters
-				OracleCommandBuilder.DeriveParameters((OracleCommand)ICmd);
-				Compare(2,ICmd.Parameters.Count);
-
-				// add one numeric parameter, and Fill
-				ICmd.Parameters.Clear();
-				ICmd.Parameters.Add(new OracleParameter("EmployeeIDPrm",1));
-				((OracleCommand)ICmd).Parameters.Add(new OracleParameter("result",OracleType.Cursor)).Direction = ParameterDirection.Output;
-				dbDA.Fill(ds1);
-				Compare(ds1.Tables.Count,1);
-				Compare(ds1.Tables[0].Rows.Count >0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			}
-		
-
-			// 
-			((IDbDataAdapter)dbDA).SelectCommand.Transaction.Commit();
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ToString.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ToString.cs
deleted file mode 100755
index 3a9ef03991f..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ToString.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_ToString : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_ToString tc = new OracleDataAdapter_ToString();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_ToString");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-
-		try
-		{
-			BeginCase("ToString");
-			Compare(oleDBda.ToString(),typeof(OracleDataAdapter).ToString() );
-		} 
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_UpdateCommand.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_UpdateCommand.cs
deleted file mode 100755
index 2bb6d90c12f..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_UpdateCommand.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_UpdateCommand : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_UpdateCommand tc = new OracleDataAdapter_UpdateCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_UpdateCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-
-		OracleCommand Cmd = new OracleCommand();
-
-		oleDBda.UpdateCommand  = Cmd;
-
-		try
-		{
-			BeginCase("UpdateCommand - Get");
-			Compare(oleDBda.UpdateCommand , Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}	
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dr.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dr.cs
deleted file mode 100755
index 9c41e9f8919..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dr.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Update_Dr : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Update_Dr tc = new OracleDataAdapter_Update_Dr();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Update_Dr");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.OracleDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Dr((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Ds.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Ds.cs
deleted file mode 100755
index 085b6c2c3b1..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Ds.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Update_Ds :  ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Update_Ds tc = new OracleDataAdapter_Update_Ds();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Update_DS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.OracleDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Ds((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_DsStr.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_DsStr.cs
deleted file mode 100755
index 27be3733918..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_DsStr.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Update_DsStr : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Update_DsStr tc = new OracleDataAdapter_Update_DsStr();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Update_Ds_Str");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.OracleDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Ds_Str((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dt.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dt.cs
deleted file mode 100755
index b2937dadd54..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_Update_Dt.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataAdapter_Update_Dt : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataAdapter_Update_Dt tc = new OracleDataAdapter_Update_Dt();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataAdapter_Update_Dt");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OracleDataAdapter oleDBda = new OracleDataAdapter();
-			oleDBda.SelectCommand = new OracleCommand("",new OracleConnection());
-
-			base.OracleDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Dr((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor.cs
deleted file mode 100755
index 6969b182707..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_ctor : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_ctor tc = new OracleDataAdapter_ctor();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_ctor");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleDataAdapter oleDBda = new OracleDataAdapter();
-		        
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_O.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_O.cs
deleted file mode 100755
index c705bfcb77b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_O.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_ctor_O : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_ctor_O tc = new OracleDataAdapter_ctor_O();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_ctor_O");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleDataAdapter oleDBda = new OracleDataAdapter(new OracleCommand());
-		        
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_SO.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_SO.cs
deleted file mode 100755
index 79420469a9f..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_SO.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_ctor_SO : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_ctor_SO tc = new OracleDataAdapter_ctor_SO();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_ctor_SO");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleDataAdapter oleDBda = new OracleDataAdapter("Select * from Customers",new OracleConnection());
-		        
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_SS.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_SS.cs
deleted file mode 100755
index 99219249f5b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataAdapter/OracleDataAdapter_ctor_SS.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataAdapter_ctor_SS : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataAdapter_ctor_SS tc = new OracleDataAdapter_ctor_SS();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataAdapter_ctor_SS");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleDataAdapter oleDBda = new OracleDataAdapter("Select * from Customers",
-								MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Close.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Close.cs
deleted file mode 100755
index 739059e48e5..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Close.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_Close : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataReader_Close tc = new OracleDataReader_Close();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("DataReader.IsClosed");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OracleCommand cmd = new OracleCommand("Select * From Customers", con);
-		OracleDataReader rdr = cmd.ExecuteReader();
-
-		try
-		{
-			BeginCase("before closing");
-			Compare(rdr.IsClosed ,false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-
-		try
-		{
-			BeginCase("after closing");
-			rdr.Close();
-			Compare(rdr.IsClosed ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Depth.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Depth.cs
deleted file mode 100755
index ca263195a83..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Depth.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_Depth : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataReader_Depth tc = new OracleDataReader_Depth();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_Depth");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OracleCommand cmd = new OracleCommand("Select * From Customers", con);
-		OracleDataReader rdr = cmd.ExecuteReader();
-
-		try
-		{
-			BeginCase("Before execute");
-			Compare(rdr.Depth , 0);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-
-		try
-		{
-			BeginCase("After execute");
-			rdr.Read();
-			Compare(rdr.Depth , 0);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetBoolean.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetBoolean.cs
deleted file mode 100755
index 7d558a7ab92..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetBoolean.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetBoolean : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataReader_GetBoolean tc = new OracleDataReader_GetBoolean();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetBoolean");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-		
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-#if !JAVA
-			// PostgreSQL ODBC treats Type BOOL as String, so we don't run it on .NET
-			if ((ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL))
-			{
-				return; 
-			}
-#endif
-
-			//Do not test with oracle or DB2, because boolean does not exist in their types.
-			if ( (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) || (ConnectedDataProvider.GetDbType(con) == DataBaseServer.DB2) )
-			{
-				return; 
-			}
-
-			con.Open();
-			string fieldName = "t_bit";
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				fieldName ="t_bool";
-			}
-			
-			OracleCommand cmd = new OracleCommand("Select " + fieldName + " From TYPES_SIMPLE Where id = '0'",con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			try
-			{
-				BeginCase("GetBoolean true");
-				Boolean blnValue;
-				Compare(rdr.IsDBNull(0), false);
-				Compare("System.Boolean", rdr.GetValue(0).GetType().FullName);
-				blnValue = rdr.GetBoolean(0);
-				Compare(blnValue, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			rdr.Close();
-              
-			
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetByte_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetByte_I.cs
deleted file mode 100755
index d7dde680936..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetByte_I.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetByte_I : ADONetTesterClass
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OracleDataReader_GetByte_I tc = new OracleDataReader_GetByte_I();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetByte_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43967_" + this.testTypesInvocations.ToString();
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a byte.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(byte)) //The value in the result set should be a byte.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetByte() on a field of dbtype {0}", row[i].DbTypeName));
-								byte retByte = rdr.GetByte(i);
-								Compare(row[i].Value, retByte);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be byte. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetByte() on a field of dbtype {0}", row[i].DbTypeName));
-								byte retByte = rdr.GetByte(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetBytes_IIBII.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetBytes_IIBII.cs
deleted file mode 100755
index b0aeaeaa788..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetBytes_IIBII.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetBytes_IIBII : GHTBase
-	{
-		int testTypesInvocations;
-		Exception exp = null;
-		public static void Main()
-		{
-			OracleDataReader_GetBytes_IIBII tc = new OracleDataReader_GetBytes_IIBII();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetBytes_IIBII");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43966_" + this.testTypesInvocations.ToString();
-				OracleConnection con =null;
-				OracleDataReader rdr = null;
-
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a byte array.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(byte[])) //The value in the result set should be a byte array.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetBytes() on a field of dbtype {0}", row[i].DbTypeName));
-								byte[] origBytes = (byte[])row[i].Value;
-								byte[] retBytes = new byte[origBytes.Length];
-								rdr.GetBytes(i, 0, retBytes, 0, origBytes.Length);
-								Compare(origBytes, retBytes);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be byte array. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetBytes() on a field of dbtype {0}", row[i].DbTypeName));
-								byte[] retBytes = new byte[1];
-								rdr.GetBytes(i, 0, retBytes, 0, 1);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetChars.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetChars.cs
deleted file mode 100755
index 7155dcbe203..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetChars.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetChars : ADONetTesterClass 
-	{
-		OracleConnection con;
-		char [] Result;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Result = new char[100];
-				con.Open();
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_GetChars tc = new OracleDataReader_GetChars();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetChars");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			long rdrResults = 0;
-
-			OracleCommand cmd = new OracleCommand("Select LastName From Employees Where EmployeeID = 100", con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			//LastName should be "Last100"
-	
-			try
-			{
-				BeginCase("check result length");
-				rdrResults = rdr.GetChars(0, 0, Result, 0, Result.Length);
-				Compare(rdrResults,(long)"Last100".Length  );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check result - char[0]");
-				Compare(Result[0] ,'L');
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check result - char[last char index]");
-				Compare(Result["Last100".Length-1] ,'0');
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDataTypeName.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDataTypeName.cs
deleted file mode 100755
index 8d2ed3262da..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDataTypeName.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetDataTypeName : ADONetTesterClass
-	{
-		OracleConnection con;
-		OracleCommand cmd;
-		OracleDataReader rdr;
-		string typeName;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OracleCommand("Select EmployeeID From Employees Where FirstName = 'Oved'",  con);
-				cmd.CommandType = CommandType.Text;
-				con.Open();
-
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-
-				typeName = rdr.GetDataTypeName(0);
-				con.Close();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{EndCase(exp);}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_GetDataTypeName tc = new OracleDataReader_GetDataTypeName();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetDataTypeName");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			//make database specific test
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-					try
-					{
-						BeginCase("check type name");
-						Compare(typeName == "DBTYPE_I4" ,true);
-					} 
-					catch(Exception ex){exp = ex;}
-					finally{EndCase(exp); exp = null;}
-					break;
-				case DataBaseServer.Oracle:
-					try
-					{
-						BeginCase("check type name");
-						Compare(typeName == "DBTYPE_NUMERIC" || typeName == "NUMBER" ,true);
-					} 
-					catch(Exception ex){exp = ex;}
-					finally{EndCase(exp); exp = null;}
-					break;
-				case DataBaseServer.DB2:
-					try
-					{
-						BeginCase("check type name");
-						Compare(typeName == "DBTYPE_I4" || typeName == "INTEGER" ,true);
-					} 
-					catch(Exception ex){exp = ex;}
-					finally{EndCase(exp); exp = null;}
-					break;
-				case DataBaseServer.Unknown:
-					break;
-			}
-
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDateTime.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDateTime.cs
deleted file mode 100755
index d18e8130c38..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDateTime.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetDateTime : ADONetTesterClass
-	{
-		private OracleConnection con;
-		private OracleCommand cmd;
-		private OracleDataReader rdr;
-		Exception exp;
-
-		[SetUp]
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null && con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_GetDateTime tc = new OracleDataReader_GetDateTime();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetDateTime");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-			SimpleValue();
-			MinDate();
-		}
-
-		[Test]
-		public void SimpleValue()
-		{
-			try
-			{
-				BeginCase("check simple value");
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con.Open();
-				cmd = new OracleCommand("Select BirthDate From Employees where EmployeeID = 100", con);
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-				DateTime dt = rdr.GetDateTime(0); //will be 1988-May-31 15:33:44
-				Compare(dt,new DateTime(1988,5,31,15,33,44,00));
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp); 
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-				exp = null;
-			}
-		}
-
-		[Test]
-		public void MinDate()
-		{
-			BeginCase("Test Min date.");
-			exp = null;
-			string[] dateColumns;
-			DateTime[] expectedValues;
-			
-			InitMinDates(out dateColumns, out expectedValues);
-			try
-			{
-				con = new OracleConnection(ConnectedDataProvider.ConnectionString);
-				cmd = new OracleCommand();
-				cmd.Connection = con;
-				cmd.CommandText = BuildMinDateTimeSelectSql(dateColumns);
-				con.Open();
-				rdr = cmd.ExecuteReader();
-				Compare(true, rdr.HasRows);
-				bool b = rdr.Read();
-				for (int i=0; i<dateColumns.Length && i<expectedValues.Length; i++)
-				{
-					int j=-1;
-					j = rdr.GetOrdinal(dateColumns[i]);
-					//DateTime result = rdr.GetDateTime(j);
-					object result = rdr.GetValue(j);
-					Compare(result, expectedValues[i]);
-				}
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-		
-		private void InitMinDates(out string[] columns, out DateTime[] values)
-		{
-			switch(ConnectedDataProvider.GetDbType())
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-					columns = new string[] {"T_DATETIME", "T_SMALLDATETIME"};
-					values = new DateTime[] {new DateTime(1753, 01, 01,00, 00, 00),		//	01/01/1753 00:00:00.000
-																  new DateTime(1900, 01, 01,00, 00, 00)};		//	01/01/1900 00:00
-					break;
-				case DataBaseServer.Oracle:
-					columns = new string[] {"T_DATE"};
-					values = new DateTime[] {new DateTime(0001, 01, 01,00, 00, 00)}; //01-Jan-0001 12:00:00 AM
-					break;
-				case DataBaseServer.PostgreSQL:
-					columns = new string[] {"T_TIMESTAMP"};
-					values = new DateTime[] {new DateTime(1753, 01, 01,00, 00, 00)}; //01-Jan-1753 12:00:00 AM
-					break;
-				case DataBaseServer.DB2:
-					columns = new string[] {"T_DATE", "T_TIMESTAMP"};
-					values = new DateTime[] {new DateTime(0001, 01, 01),		//	1/1/0001
-																  new DateTime(0001, 01, 01, 00,00,00,0)};	//	1/1/0001 00:00:00.000
-					break;
-				default:
-					throw new ApplicationException(string.Format("GHT ERROR: Unknown DB server [{0}].",ConnectedDataProvider.GetDbType()));
-			}
-		}
-
-		private string BuildMinDateTimeSelectSql(string[] dateColumns)
-		{
-			StringBuilder sqlBuilder = new StringBuilder();
-			sqlBuilder.Append("SELECT ");
-			foreach(string col in dateColumns)
-			{
-				sqlBuilder.Append(col + ", ");
-			}
-			sqlBuilder.Remove(sqlBuilder.Length - 2, 2);
-			sqlBuilder.Append(" FROM TYPES_EXTENDED WHERE ID='MIN'");
-			return sqlBuilder.ToString();
-		}
-	}
-}
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDecimal_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDecimal_I.cs
deleted file mode 100755
index 216f332eec4..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDecimal_I.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_GetDecimal_I : ADONetTesterClass
-{
-	private int testTypesInvocations;
-	private Exception exp = null;
-
-	public static void Main()
-	{
-		OracleDataReader_GetDecimal_I tc = new OracleDataReader_GetDecimal_I();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_GetDecimal_I");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-	[Test]
-	public void run()
-	{
-		DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		DoTestTextualFieldsThatContainNumbers(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTextualFieldsThatContainNumbers(ConnectedDataProvider.GetExtendedDbTypesParameters());
-	}
-
-	public void DoTestTypes(DbTypeParametersCollection row)
-	{
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43968_" + this.testTypesInvocations.ToString();
-		OracleDataReader rdr = null;
-		OracleConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Decimal.
-				for (int i=0; i<row.Count; i++)
-				{
-					if (row[i].Value.GetType() == typeof(decimal) ||
-						row[i].Value.GetType() == typeof(double)) //The value in the result set should be a Decimal.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetDecimal() on a field of dbtype {0}", row[i].DbTypeName));
-							decimal retDecimal = rdr.GetDecimal(i);
-							Compare(row[i].Value, retDecimal);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-					else //The value in the result set should NOT be Decimal. In this case an Invalid case exception should be thrown.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetDecimal() on a field of dbtype {0}", row[i].DbTypeName));
-							decimal retDecimal = rdr.GetDecimal(i);
-							ExpectedExceptionNotCaught("InvalidCastException");
-						}
-						catch (InvalidCastException ex)
-						{
-							ExpectedExceptionCaught(ex);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-
-	public void DoTestTextualFieldsThatContainNumbers(DbTypeParametersCollection row)
-	{
-		//Leave only textual fields in the collection, and set their value to the string "10"
-		SetTextualFieldsWithNumericValues(ref row);
-		if (row.Count < 1)
-		{
-			return;
-		}
-
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43968_" + this.testTypesInvocations.ToString();
-		OracleDataReader rdr = null;
-		OracleConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Decimal.
-				//Because all the fields are textual, this should throw an InvalidCastException.
-				for (int i=0; i<row.Count; i++)
-				{
-					try
-					{
-						BeginCase(string.Format("Calling GetDecimal() on a textual field of dbtype {0} with value '{1}'", row[i].DbTypeName, row[i].Value));
-						decimal retDecimal = rdr.GetDecimal(i);
-						ExpectedExceptionNotCaught(typeof(InvalidCastException).FullName);
-					}
-					catch (InvalidCastException ex)
-					{
-						ExpectedExceptionCaught(ex);
-					}
-					catch (Exception ex)
-					{
-						exp = ex;
-					}
-					finally
-					{
-						EndCase(exp);
-						exp = null;
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-
-	private void SetTextualFieldsWithNumericValues(ref DbTypeParametersCollection row)
-	{
-		DbTypeParametersCollection newRow = new DbTypeParametersCollection(row.TableName);
-		
-		foreach (DbTypeParameter current in row)
-		{
-			if (current.Value is string)
-			{
-				newRow.Add(current.DbTypeName, "10");
-			}
-		}
-
-		row = newRow;
-	}
-}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDouble_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDouble_I.cs
deleted file mode 100755
index 7266c551356..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetDouble_I.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetDouble_I : GHTBase
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OracleDataReader_GetDouble_I tc = new OracleDataReader_GetDouble_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetDouble_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43969_" + this.testTypesInvocations.ToString();
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a double.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(double) ||
-							row[i].Value.GetType() == typeof(decimal)) //The value in the result set should be a double.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetDouble() on a field of dbtype {0}", row[i].DbTypeName));
-								double retDouble = rdr.GetDouble(i);
-								Compare(row[i].Value, retDouble);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be double. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetDouble() on a field of dbtype {0}", row[i].DbTypeName));
-								double retDouble = rdr.GetDouble(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-
-
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetFieldType.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetFieldType.cs
deleted file mode 100755
index dcd9aed4915..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetFieldType.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetFieldType : ADONetTesterClass
-	{
-		OracleConnection con;
-		OracleCommand cmd;
-		OracleDataReader rdr;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-				cmd = new OracleCommand("Select OrderID, CustomerID, OrderDate From Orders", con);
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{EndCase(exp);}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_GetFieldType tc = new OracleDataReader_GetFieldType();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetFieldType");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			try
-			{
-				BeginCase("check type string");
-				Compare(rdr.GetFieldType(1).FullName,typeof(string).FullName );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check type date");
-				Compare(rdr.GetFieldType(2).FullName,typeof(DateTime).FullName );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetFloat_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetFloat_I.cs
deleted file mode 100755
index c16473c947b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetFloat_I.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetFloat_I : ADONetTesterClass 
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OracleDataReader_GetFloat_I tc = new OracleDataReader_GetFloat_I();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetFloat_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43970_" + this.testTypesInvocations.ToString();
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a float.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(float) ||
-							row[i].Value.GetType() == typeof(double)  ||
-							row[i].Value.GetType() == typeof(decimal)) { //The value in the result set should be a float.
-							try
-							{
-								BeginCase(string.Format("Calling GetFloat() on a field of dbtype {0}", row[i].DbTypeName));
-								float retFloat = rdr.GetFloat(i);
-								Compare(row[i].Value, retFloat);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be float. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetFloat() on a field of dbtype {0}", row[i].DbTypeName));
-								float retFloat = rdr.GetFloat(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetGuiid_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetGuiid_I.cs
deleted file mode 100755
index bd20572f22c..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetGuiid_I.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetGuiid_I : ADONetTesterClass 
-	{
-
-		private const string GUID_COLUMN_NAME = "T_UNIQUEIDENTIFIER";
-		private const string GUID_TABLE_NAME = ConnectedDataProvider.SPECIFIC_TYPES_TABLE_NAME;
-		private const string TEST_GUID_STRING = "239A3C5E-8D41-11D1-B675-00C04FA3C554";
-
-		public static void Main()
-		{
-			OracleDataReader_GetGuiid_I tc = new OracleDataReader_GetGuiid_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetGuiid_I");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		
-		public void run()
-		{
-			
-		
-			TestUsingSQLTextOnly();
-			TestUsingParametersArray();
-		}
-
-		[Test]
-		public void TestUsingSQLTextOnly()
-		{
-			//Only apply to MSSQL
-			if ( (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer)) {
-				return;
-			}
-
-			Exception exp = null;
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			OracleCommand cmdDelete = null;
-			try
-			{
-				BeginCase("Test using SQL text only.");
-				string rowId = "43973_" + TestCaseNumber.ToString();
-				string insertText = string.Format("INSERT INTO {0} (ID, {1}) VALUES ('{2}', '{{{3}}}')", GUID_TABLE_NAME, GUID_COLUMN_NAME, rowId, TEST_GUID_STRING);
-				string selectText = string.Format("SELECT {0} FROM {1} WHERE ID='{2}'", GUID_COLUMN_NAME, GUID_TABLE_NAME, rowId);
-				string deleteText = string.Format("DELETE FROM {0} WHERE ID='{1}'", GUID_TABLE_NAME, rowId);
-				con = new OracleConnection(ConnectedDataProvider.ConnectionString);
-				OracleCommand cmdInsert = new OracleCommand(insertText, con);
-				OracleCommand cmdSelect = new OracleCommand(selectText, con);
-				cmdDelete = new OracleCommand(deleteText, con);
-
-				con.Open();
-				cmdInsert.ExecuteNonQuery();
-				rdr = cmdSelect.ExecuteReader();
-				rdr.Read();
-				Guid  guidValue = rdr.GetGuid (0);
-				Guid origGuid = new Guid(TEST_GUID_STRING);
-				Compare(guidValue, origGuid);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if (cmdDelete != null)
-				{
-					cmdDelete.ExecuteNonQuery();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-
-		[Test]
-		public void TestUsingParametersArray()
-		{
-			//Only apply to MSSQL
-			if ( (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer))
-			{
-				return;
-			}
-			Exception exp = null;
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			DbTypeParametersCollection row = new DbTypeParametersCollection(GUID_TABLE_NAME);
-			string rowId = string.Empty;
-			try
-			{
-				BeginCase("Test using parameters array");
-				rowId = "43973_" + TestCaseNumber.ToString();
-				row.Add("UNIQUEIDENTIFIER", new Guid(TEST_GUID_STRING));
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				rdr.Read();
-				Guid  guidValue = rdr.GetGuid (0);
-				Compare(guidValue, row[GUID_COLUMN_NAME].Value);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if (rowId != String.Empty)
-				{
-					row.ExecuteDelete(rowId);
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-				
-			}
-		}
-	}
-	
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt16.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt16.cs
deleted file mode 100755
index caf29225c1c..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt16.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_GetInt16 : ADONetTesterClass 
-{
-	private Exception exp = null;
-	private int testTypesInvocations;
-
-	public static void Main()
-	{
-		OracleDataReader_GetInt16 tc = new OracleDataReader_GetInt16();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_GetInt16_I");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			tc.exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(tc.exp);
-		}
-	}
-
-	[Test]
-	public void run()
-	{
-		DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-	}
-
-	public void DoTestTypes(DbTypeParametersCollection row)
-	{
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43971_" + this.testTypesInvocations.ToString();
-		OracleDataReader rdr = null;
-		OracleConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Int16.
-				for (int i=0; i<row.Count; i++)
-				{
-					if (row[i].Value.GetType() == typeof(Int16)) //The value in the result set should be a Int16.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt16() on a field of dbtype {0}", row[i].DbTypeName));
-							Int16 retInt16 = rdr.GetInt16(i);
-							Compare(row[i].Value, retInt16);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-					else //The value in the result set should NOT be Int16. In this case an Invalid case exception should be thrown.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt16() on a field of dbtype {0}", row[i].DbTypeName));
-							Int16 retInt16 = rdr.GetInt16(i);
-							ExpectedExceptionNotCaught("InvalidCastException");
-						}
-						catch (InvalidCastException ex)
-						{
-							ExpectedExceptionCaught(ex);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-}
-	
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt32_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt32_I.cs
deleted file mode 100755
index c562f31f0f5..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt32_I.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetInt32_I : ADONetTesterClass 
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OracleDataReader_GetInt32_I tc = new OracleDataReader_GetInt32_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetInt32_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "13286_" + this.testTypesInvocations.ToString();
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a Int32.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(Int32) ||
-							row[i].Value.GetType() == typeof(double) ||
-							row[i].Value.GetType() == typeof(decimal)) { //The value in the result set should be a Int32.
-							try
-							{
-								BeginCase(string.Format("Calling GetInt32() on a field of dbtype {0}", row[i].DbTypeName));
-								Int32 retInt32 = rdr.GetInt32(i);
-								Compare(Convert.ToInt32(row[i].Value), retInt32);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be Int32. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetInt32() on a field of dbtype {0}", row[i].DbTypeName));
-								Int32 retInt32 = rdr.GetInt32(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt64.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt64.cs
deleted file mode 100755
index e56cf151804..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetInt64.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_GetInt64 : ADONetTesterClass 
-{
-	private Exception exp = null;
-	private int testTypesInvocations;
-
-	public static void Main()
-	{
-		OracleDataReader_GetInt64 tc = new OracleDataReader_GetInt64();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_GetInt64_I");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			tc.exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(tc.exp);
-		}
-	}
-
-	[Test]
-	public void run()
-	{
-		DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-	}
-	public void DoTestTypes(DbTypeParametersCollection row)
-	{
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43972_" + this.testTypesInvocations.ToString();
-		OracleDataReader rdr = null;
-		OracleConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Int64.
-				for (int i=0; i<row.Count; i++)
-				{
-					if (row[i].Value.GetType() == typeof(Int64) ||
-						row[i].Value.GetType() == typeof(double) ||
-						row[i].Value.GetType() == typeof(decimal)) { //The value in the result set should be a Int64.
-						try
-						{
-							BeginCase(string.Format("Calling GetInt64() on a field of dbtype {0}", row[i].DbTypeName));
-							Int64 retInt64 = rdr.GetInt64(i);
-							Compare(Convert.ToInt64(row[i].Value), retInt64);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-					else //The value in the result set should NOT be Int64. In this case an Invalid case exception should be thrown.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt64() on a field of dbtype {0}", row[i].DbTypeName));
-							Int64 retInt64 = rdr.GetInt64(i);
-							ExpectedExceptionNotCaught("InvalidCastException");
-						}
-						catch (InvalidCastException ex)
-						{
-							ExpectedExceptionCaught(ex);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-
-
-}
-	
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetName_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetName_I.cs
deleted file mode 100755
index d747284760e..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetName_I.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_GetName_I : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataReader_GetName_I tc = new OracleDataReader_GetName_I();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_NextResult");
-				tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-#if !TARGET_JVM
-	[Category("NotWorking")]
-#endif
-	public void run()
-	{
-		Exception exp = null;
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		OracleCommand cmd = new OracleCommand("Customers",  con);
-		cmd.CommandType = CommandType.TableDirect;
-
-		con.Open();
-
-		OracleDataReader rdr = cmd.ExecuteReader();
-		rdr.Read();
-
-
-		try
-		{
-			BeginCase("GetName field 0");
-			string str = rdr.GetName(0);
-			Compare(str.ToUpper(),"CUSTOMERID" );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("GetName last field ");
-			string str = rdr.GetName(rdr.FieldCount -1);
-			Compare(str.ToUpper(),"FAX" );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetOrdinal.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetOrdinal.cs
deleted file mode 100755
index 31b317fba57..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetOrdinal.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetOrdinal : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleDataReader_GetOrdinal tc = new OracleDataReader_GetOrdinal();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetOrdinal");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OracleCommand cmd = new OracleCommand("Select * From Customers", con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-		
-
-			try
-			{
-				BeginCase("column REGION ordinal");
-				Compare(rdr.GetOrdinal("REGION"),6 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("column not exists");
-				try
-				{
-					int i = rdr.GetOrdinal("blabla");
-				}
-				catch (Exception ex) {exp=ex;}
-				Compare(exp.GetType().FullName,typeof(IndexOutOfRangeException).FullName);
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetSchemaTable.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetSchemaTable.cs
deleted file mode 100755
index 4c7f14839c0..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetSchemaTable.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-class TestId13294 : GHTBase
-{
-	public static void Main()
-	{
-		TestId13294 tc = new TestId13294();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_GetSchemaTable");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OracleCommand cmd = new OracleCommand("Select * From Orders", con);
-		OracleDataReader rdr = cmd.ExecuteReader();
-		DataTable tbl = rdr.GetSchemaTable();
-
-		//check that all the columns properties (according to .Net) exists (GH give more properties)
-
-		try
-		{
-			BeginCase("ColumnName");
-				Compare(tbl.Columns.Contains("ColumnName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ColumnOrdinal");
-			Compare(tbl.Columns.Contains("ColumnOrdinal"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ColumnSize");
-			Compare(tbl.Columns.Contains("ColumnSize"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("NumericPrecision");
-			Compare(tbl.Columns.Contains("NumericPrecision"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("NumericScale");
-			Compare(tbl.Columns.Contains("NumericScale"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("DataType");
-			Compare(tbl.Columns.Contains("DataType"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ProviderType");
-			Compare(tbl.Columns.Contains("ProviderType"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsLong");
-			Compare(tbl.Columns.Contains("IsLong"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("AllowDBNull");
-			Compare(tbl.Columns.Contains("AllowDBNull"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsReadOnly");
-			Compare(tbl.Columns.Contains("IsReadOnly"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsRowVersion");
-			Compare(tbl.Columns.Contains("IsRowVersion"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsUnique");
-			Compare(tbl.Columns.Contains("IsUnique"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsKey");
-			Compare(tbl.Columns.Contains("IsKey"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsAutoIncrement");
-			Compare(tbl.Columns.Contains("IsAutoIncrement"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("BaseSchemaName");
-			Compare(tbl.Columns.Contains("BaseSchemaName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("BaseTableName");
-			Compare(tbl.Columns.Contains("BaseTableName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("BaseColumnName");
-			Compare(tbl.Columns.Contains("BaseColumnName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-
-		if (con.State == ConnectionState.Open) con.Close();
-	
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetString_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetString_I.cs
deleted file mode 100755
index cdd7b41b238..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetString_I.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetString_I : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OracleDataReader_GetString_I tc = new OracleDataReader_GetString_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetString_I");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-		
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OracleCommand cmd = new OracleCommand("Select FirstName From Employees Where EmployeeID = 100", con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			try
-			{
-				BeginCase("check value");
-				string str = rdr.GetString(0);
-				Compare(str,"First100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetTimeSpan_I.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetTimeSpan_I.cs
deleted file mode 100755
index 4560e7ad59a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetTimeSpan_I.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetTimeSpan_I : ADONetTesterClass
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-//		public OracleDataReader_GetTimeSpan_I() : base(true)
-//		{
-//		}
-
-		public static void Main()
-		{
-			OracleDataReader_GetTimeSpan_I tc = new OracleDataReader_GetTimeSpan_I();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetTimeSpan_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43967_" + this.testTypesInvocations.ToString();
-			OracleDataReader rdr = null;
-			OracleConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a TimeSpan.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(TimeSpan)) //The value in the result set should be a TimeSpan.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetTimeSpan() on a field of dbtype {0}", row[i].DbTypeName));
-								TimeSpan retTimeSpan = rdr.GetTimeSpan(i);
-								Compare(row[i].Value, retTimeSpan);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be TimeSpan. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetTimeSpan() on a field of dbtype {0}", row[i].DbTypeName));
-								TimeSpan retTimeSpan = rdr.GetTimeSpan(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetValue.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetValue.cs
deleted file mode 100755
index bf1360596f6..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetValue.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetValue : ADONetTesterClass
-	{
-		Exception exp;
-		OracleConnection con;
-		char [] Result;
-
-		[SetUp]
-		public void SetUp()
-		{
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Result = new char[100];
-				con.Open();
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_GetValue tc = new OracleDataReader_GetValue();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetValue");
-				tc.SetUp();
-				tc.run();
-			}
-			catch (Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-				tc.TearDown();
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			TypesTests(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			TypesTests(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		[Test]
-		public void SimpleTest()
-		{
-			OracleDataReader rdr = null;
-			exp = null;
-			try
-			{
-				BeginCase("check value");
-				
-				OracleCommand cmd = new OracleCommand("Select LastName From Employees Where EmployeeID = 100", con);
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-
-				Object obj = rdr.GetValue(0); 
-				Compare(obj.ToString(), "Last100");
-			} 
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-				exp = null;
-			}
-		}
-		private void TypesTests(DbTypeParametersCollection typesToTest)
-		{
-			exp = null;
-
-			DbTypeParametersCollection currentlyTested = new DbTypeParametersCollection(typesToTest.TableName);
-			string rowId = "13289";
-			object dbValue;
-			OracleDataReader rdr = null;
-			OracleConnection selectCon = null;
-			DataBaseServer testedDbServer = ConnectedDataProvider.GetDbType();
-
-			foreach (DbTypeParameter currentParamType in typesToTest)
-			{
-				BeginCase("Test value of db type: " + currentParamType.DbTypeName);
-				//Prepare data:
-				rowId = string.Format("13289_{0}", this.TestCaseNumber);
-				currentlyTested.Clear();
-				currentlyTested.Add(currentParamType);
-				currentlyTested.ExecuteInsert(rowId);
-
-				try
-				{
-					currentlyTested.ExecuteSelectReader(rowId, out rdr, out selectCon);
-					rdr.Read();
-					dbValue = WorkaroundOracleCharsPaddingLimitation(testedDbServer, currentParamType, rdr.GetValue(0));
-					if (currentParamType.Value.GetType().IsArray)
-					{
-						Compare(dbValue as Array, currentParamType.Value as Array);
-					}
-					else
-					{
-						Compare(dbValue, currentParamType.Value);
-					}
-				} 
-				catch(Exception ex)
-				{
-					exp = ex;
-				}
-				finally
-				{
-					EndCase(exp);
-					exp = null;
-					if (rdr != null && !rdr.IsClosed)
-					{
-						rdr.Close();
-					}
-					if (selectCon != null && selectCon.State != ConnectionState.Closed)
-					{
-						selectCon.Close();
-					}
-					currentlyTested.ExecuteDelete(rowId);
-				}
-			}
-		}
-		/// <summary>
-		/// This is a workaround for the extra white spaces added in oracle to NCHAR & NVARCHAR values.
-		/// The problem is a documented GH limitation, see bug #3417.
-		/// The workaround is to trim the lemgth of the returned string to the specified length of the parameter/column.
-		/// </summary>
-		/// <param name="testedServer">The database server we are currently running on.</param>
-		/// <param name="val">The value returned from the database.</param>
-		/// <returns>The normalized value..</returns>
-		private object WorkaroundOracleCharsPaddingLimitation(DataBaseServer testedServer, DbTypeParameter currentParam, object val)
-		{
-			object origVal = val;
-			string dbTypeName = currentParam.DbTypeName.ToUpper();
-			if ( (testedServer == DataBaseServer.Oracle) && (dbTypeName == "CHAR" || dbTypeName == "NCHAR") )
-			{
-				val = ((string)val).Substring(0, currentParam.Size);
-				Log(string.Format("Worked around oracle chars padding limitation by triming '{0}' to '{1}'", origVal, val));
-			}
-			return val;
-		}
-
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetValues.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetValues.cs
deleted file mode 100755
index 4e08356b87a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_GetValues.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_GetValues : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OracleDataReader_GetValues tc = new OracleDataReader_GetValues();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_GetValues");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			int intValuesCount = 0;
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OracleCommand cmd = new OracleCommand("Select CustomerID, ContactName , CompanyName From Customers where CustomerID = 'GH100'", con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			object [] values = null;
-
-
-			//------ check big array
-			try
-			{
-				BeginCase("GetValues - bigger array - check count");
-				values = new object[50];
-				intValuesCount = rdr.GetValues(values);
-				Compare(intValuesCount ,3 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - bigger array - check CustomerID");
-				Compare(values[0].ToString().Trim() ,"GH100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - bigger array - check CompanyName");
-				Compare(values[2].ToString() ,"Company100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - bigger array - check DBNull");
-				Compare(values[3] == null ,true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			//------ check small array
-			try
-			{
-				BeginCase("GetValues - smaller array - check count");
-				values = new object[2];
-				intValuesCount = rdr.GetValues(values);
-				Compare(intValuesCount ,2 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - smaller array - check CustomerID");
-				Compare(values[0].ToString().Trim() ,"GH100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			//------ check exact array
-			try
-			{
-				BeginCase("GetValues - exact array - check count");
-				values = new object[3];
-				intValuesCount = rdr.GetValues(values);
-				Compare(intValuesCount ,3 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - exact array - check CustomerID");
-				Compare(values[0].ToString().Trim() ,"GH100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - exact array - check CompanyName");
-				Compare(values[2].ToString() ,"Company100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_HasRows.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_HasRows.cs
deleted file mode 100755
index 833a63d3785..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_HasRows.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-
-[TestFixture]
-public class OracleDataReader_HasRows : GHTBase
-{
-	Exception exp;
-
-	public static void Main()
-	{
-		OracleDataReader_HasRows tc = new OracleDataReader_HasRows();
-		tc.exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_HasRows");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			tc.exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(tc.exp);
-		}
-	}
-
-	public void run()
-	{
-		TestHasRowsTrue();
-		TestHasRowsFalse();
-	}
-
-	[Test]
-	public void TestHasRowsTrue()
-	{
-		BeginCase("Test HasRows = True");
-		exp = null;
-		string rowId = string.Format("43977_{0}", TestCaseNumber);
-		OracleConnection con = null;
-		OracleDataReader rdr = null;
-		try
-		{
-			DbTypeParametersCollection row = ConnectedDataProvider.GetSimpleDbTypesParameters();
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			Compare(rdr.HasRows, true);
-		}
-		catch (Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-
-	[Test]
-	public void TestHasRowsFalse()
-	{
-		BeginCase("Test HasRows = False");
-		exp = null;
-		string rowId = string.Format("43977_{0}", TestCaseNumber);
-		OracleConnection con = null;
-		OracleDataReader rdr = null;
-		try
-		{
-			DbTypeParametersCollection row = ConnectedDataProvider.GetSimpleDbTypesParameters();
-			row.ExecuteDelete(rowId);	//Make sure that a row with such ID does not exist.
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			Compare(rdr.HasRows, false);
-		}
-		catch (Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-}
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_IsDBNull.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_IsDBNull.cs
deleted file mode 100755
index 6a8c3eecf6a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_IsDBNull.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	class TestId13296 : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			TestId13296 tc = new TestId13296();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_IsDBNull");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OracleCommand cmd = new OracleCommand("Select EmployeeID,City From Employees where EmployeeID = 100  ", con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			try
-			{
-				BeginCase("IsDBNull value");
-				Compare(rdr.IsDBNull(1),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Item.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Item.cs
deleted file mode 100755
index 111a7111e8a..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Item.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_Item : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OracleDataReader_Item tc = new OracleDataReader_Item();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_Item");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-
-		//prepare data
-
-
-
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		OracleCommand cmd = new OracleCommand("select ProductID,ProductName,Discontinued from Products where ProductID=1", con);
-		con.Open();
-		OracleDataReader rdr =  cmd.ExecuteReader();
-
-		rdr.Read();
-		object obj = null;
-
-		switch (ConnectedDataProvider.GetDbType(con)) 
-		{
-			case DataBaseServer.DB2:
-			case DataBaseServer.SQLServer:
-			case DataBaseServer.PostgreSQL:
-				try
-				{
-					BeginCase("Column int - type");
-					obj = rdr["ProductID"];
-					Compare(obj.GetType().FullName , typeof(int).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-			case DataBaseServer.Oracle:
-			case DataBaseServer.Sybase:
-				try
-				{
-					BeginCase("Column Decimal - type");
-					obj = rdr["ProductID"];
-					Compare(obj.GetType().FullName , typeof(decimal).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-		}
-
-		try
-		{
-			BeginCase("Column int - value");
-			Compare(obj.ToString(),"1");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Column string - type");
-			obj = rdr["ProductName"];
-			Compare(obj.GetType().FullName , typeof(string).FullName);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Column string - value");
-			Compare(obj.ToString(),"Chai");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		switch (ConnectedDataProvider.GetDbType(con)) 
-		{
-			case DataBaseServer.DB2 :
-				try
-				{
-					BeginCase("Column Int16 - type");
-					obj = rdr["Discontinued"];
-					Compare(obj.GetType().FullName , typeof(Int16).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Column Int16 - value");
-					Compare(obj.ToString(),"0");
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-			case DataBaseServer.SQLServer :
-				try
-				{
-					BeginCase("Column bool - type");
-					obj = rdr["Discontinued"];
-					Compare(obj.GetType().FullName , typeof(bool).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Column bool - value");
-					Compare(obj.ToString().ToUpper(),"FALSE");
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-			case DataBaseServer.Oracle :
-				//Column type is Decimal - already tested
-				break;
-		}
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_NextResult.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_NextResult.cs
deleted file mode 100755
index ed913ea07cf..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_NextResult.cs
+++ /dev/null
@@ -1,664 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_NextResult : ADONetTesterClass 
-	{
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		Exception exp = null;
-
-		[SetUp]
-		public void SetUp() {
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-		}
-
-		[TearDown]
-		public void TearDown() {
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_NextResult tc = new OracleDataReader_NextResult();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_NextResult");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-
-
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			TestMultipleResultSetsWithSP();
-			TestMultipleResultSetsWithSQLText();
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-
-		[Test]
-		public void TestMultipleResultSetsWithSQLText()
-		{
-
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.Oracle)
-			{
-				this.Log("Multiple result sets by sql text is not tested in oracle.");
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.DB2)
-			{
-				this.Log("Multiple result sets using compound statement not supported at DB2.");
-				return;
-			}
-
-			bool NextResultExists = false;
-			OracleDataReader rdr = null;
-			OracleCommand cmd;
-			int TblResult0=-1;
-			int TblResult1=-1;
-			int TblResult2=-1;
-			try
-			{
-				BeginCase("Setup: Get expected results.");
-
-				//get excpected results
-				GetExcpectedResults(ref TblResult0, ref TblResult1, ref TblResult2);
-				this.Pass("Setup: Get expected results ended.");
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-
-
-			string cmdTxt = BuildCommandText();
-			cmd = new OracleCommand(cmdTxt, con);
-			cmd.CommandType = CommandType.Text;
-			rdr = cmd.ExecuteReader();
-			// -------------- ResultSet  1 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 1 exists");
-				Compare(rdr != null, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 1 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			int i = 1;
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 1 Data");
-				while (rdr.Read())
-				{
-					i++;
-				}
-				Compare(i, TblResult0);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 1 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "CUSTOMERID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			// -------------- ResultSet  2 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 2 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 2 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 2 Data");
-				i = 1;
-				while (rdr.Read())
-				{
-					i++;
-				}
-				Compare(i, TblResult1);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 2 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "CATEGORYID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			// -------------- ResultSet  3 ------------
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 3 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 3 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 3 Data");
-				i = 1;
-				while (rdr.Read())
-				{
-					i++;
-				}
-				Compare(i, TblResult2);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 3 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "REGIONID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check that resultset 4 does not exist.");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check that resultset 4 does not contain data.");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			if (!rdr.IsClosed)
-				rdr.Close();
-		}
-
-		[Test]
-		public void TestMultipleResultSetsWithSP()
-		{
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.Oracle)
-			{
-				this.Log("Not testing Stored procedures with multiple ref-cursors on Oracle with .NET due to bug in .NET (only the first ref-cursor is retrived).");
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				// fail to work on .NET OLEDB
-				this.Log("Not testing PostgreSQL CommandType.StoredProcedure which return SETOF");
-				return;
-			}
-#endif
-			
-			bool NextResultExists = false;
-			// transaction use was add for PostgreSQL
-			OracleTransaction tr = con.BeginTransaction();
-			OracleCommand cmd = new OracleCommand("GH_MULTIRECORDSETS", con, tr);
-			cmd.Parameters.Add(new OracleParameter("RCT_Employees", OracleType.Cursor)).Direction = ParameterDirection.Output;
-			cmd.Parameters.Add(new OracleParameter("RCT_Customers", OracleType.Cursor)).Direction = ParameterDirection.Output;
-			cmd.Parameters.Add(new OracleParameter("RCT_Orders", OracleType.Cursor)).Direction = ParameterDirection.Output;
-			cmd.CommandType = CommandType.StoredProcedure;
-			OracleDataReader rdr = cmd.ExecuteReader();
-
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 1 exists");
-				Compare(rdr != null, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 1 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 1 Data");
-				Compare(rdr.GetValue(1).ToString(), "Yavine");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 1 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "EMPLOYEEID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-
-			
-			// -------------- ResultSet  2 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 2 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 2 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 2 Data");
-				Compare(rdr.GetValue(1).ToString(), "Morgenstern Gesundkost");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 2 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "CUSTOMERID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-
-			// -------------- ResultSet  3 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 3 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 3 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 3 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "ORDERID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check that resultset 4 does not exist.");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check that resultset 4 does not contain data.");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-
-			//Cleanup:
-			if (!rdr.IsClosed)
-			{
-				rdr.Close();
-			}
-
-			// transaction use was add for PostgreSQL
-			tr.Commit();
-
-		}
-
-
-		#region "Private Utilities"
-		private string BuildCommandText()
-		{
-			string beginStatement;
-			string endStatement;
-			string commandDelimiter;
-			string[] commands = new string[] {"select * from Customers", "select * from Categories", "select * from Region"};
-
-			GetDBSpecificSyntax(ConnectedDataProvider.GetDbType(), out beginStatement, out endStatement, out commandDelimiter);
-
-			StringBuilder cmdBuilder = new StringBuilder();
-			cmdBuilder.Append(beginStatement);
-			cmdBuilder.Append(" ");
-			foreach (string statement in commands)
-			{
-				cmdBuilder.Append(statement);
-				cmdBuilder.Append(commandDelimiter);
-				cmdBuilder.Append(" ");
-			}
-			cmdBuilder.Append(endStatement);
-
-			return cmdBuilder.ToString();
-		}
-		private void GetDBSpecificSyntax(DataBaseServer dbServer, out string beginStatement, out string endStatement, out string commandDelimiter)
-		{
-			switch (dbServer)
-			{
-				case DataBaseServer.SQLServer:
-					beginStatement = "BEGIN";
-					endStatement = "END";
-					commandDelimiter = ";";
-					break;
-				case DataBaseServer.Sybase:
-					beginStatement = "BEGIN";
-					endStatement = "END";
-					commandDelimiter = "\r\n";
-					break;
-				case DataBaseServer.Oracle:
-					beginStatement = "BEGIN";
-					endStatement = "END;";
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.DB2:
-					{
-						beginStatement = "";
-						endStatement = "";
-					}
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.PostgreSQL:
-					beginStatement = "";
-					endStatement = "";
-					commandDelimiter = ";";
-					break;
-
-				default:
-					this.Fail("Unknown DataBaseServer type");
-					throw new ApplicationException("Unknown DataBaseServer type");
-			}
-		}
-		private void GetExcpectedResults(ref int TblResult0, ref int TblResult1, ref int TblResult2)
-		{
-			// get excpected results
-			
-			// transaction use was add for PostgreSQL
-			OracleTransaction tr = con.BeginTransaction();
-			OracleCommand cmd = new OracleCommand("", con,tr);
-			cmd.CommandText = "Select count(*) from Customers";
-			TblResult0 = Int32.Parse(cmd.ExecuteScalar().ToString());
-			cmd.CommandText = "Select count(*) from Categories";
-			TblResult1 = Int32.Parse(cmd.ExecuteScalar().ToString());
-			cmd.CommandText = "Select count(*) from Region";
-			TblResult2 = Int32.Parse(cmd.ExecuteScalar().ToString());
-			tr.Commit();
-		}
-
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Read.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Read.cs
deleted file mode 100755
index c2bfa8b79d7..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_Read.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_Read : ADONetTesterClass 
-	{
-		OracleConnection con;
-		OracleCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OracleCommand("", con);
-				con.Open();
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null && con.State != ConnectionState.Closed)
-				con.Close();
-		}
-
-		public static void Main()
-		{
-			OracleDataReader_Read tc = new OracleDataReader_Read();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleDataReader_Read");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			cmd.CommandText = "Select EmployeeID, LastName, FirstName, Title, BirthDate From Employees where EmployeeID in (100,200) order by EmployeeID asc";
-			OracleDataReader rdr = cmd.ExecuteReader();
-
-			try
-			{
-				BeginCase("first row");
-				bool read = rdr.Read();
-				Compare(read, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("first row - value");
-				object obj = rdr.GetValue(0);
-				Compare(obj.ToString(), "100");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("Second row");
-				bool read = rdr.Read();
-				Compare(read, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Second row - value");
-				object obj = rdr.GetValue(0);
-				Compare(obj.ToString(), "200");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("End of data");
-				bool read = rdr.Read();
-				Compare(read, false);
-				rdr.Close();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Read return false");
-				cmd.CommandText= "select * from Orders where OrderID=-909";
-				rdr = cmd.ExecuteReader();
-				Compare(rdr.Read(),false);
-				rdr.Close();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_RecordsAffected.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_RecordsAffected.cs
deleted file mode 100755
index 01ce6def63b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_RecordsAffected.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleDataReader_RecordsAffected  : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OracleDataReader_RecordsAffected tc = new OracleDataReader_RecordsAffected();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("RecordsAffected");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			int intRecordsAffected = 0;
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OracleCommand cmd = new OracleCommand("Update Employees set Title = 'title' where EmployeeID = 100", con);
-			OracleDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-			intRecordsAffected = rdr.RecordsAffected;
-
-			try
-			{
-				BeginCase("RecordsAffected");
-				Compare(intRecordsAffected,1 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
-
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_ctor.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_ctor.cs
deleted file mode 100755
index e1c09c5f474..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleDataReader/OracleDataReader_ctor.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleDataReader_ctor : GHTBase
-{
-	public static void Main()
-	{
-		OracleDataReader_ctor tc = new OracleDataReader_ctor();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleDataReader_ctor");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-#if !TARGET_JVM
-	[Category("NotWorking")]
-#endif
-	public void run()
-	{
-		Exception exp = null;
-		OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OracleCommand cmd = new OracleCommand("Select * From Orders", con);
-		OracleDataReader rdr = cmd.ExecuteReader();
-
-		//change a connection's state without closing the datareader (should fail
-		try
-		{
-			BeginCase("InvalidOperationException");
-			try
-			{
-				((IDbConnection)con).ChangeDatabase("msdb");
-				ExpectedExceptionNotCaught(typeof(InvalidOperationException).FullName);
-			}
-			catch (InvalidOperationException ex) 
-			{
-				ExpectedExceptionCaught(ex);
-			}
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor.cs
deleted file mode 100755
index facbb97c8c5..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleParameter_ctor : GHTBase
-{
-	public static void Main()
-	{
-		OracleParameter_ctor tc = new OracleParameter_ctor();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleParameter_ctor");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleParameter param = new OracleParameter();
-
-		try
-		{
-			BeginCase("ctor");
-			Compare(param != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SO.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SO.cs
deleted file mode 100755
index 552500647fe..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SO.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleParameter_ctor_SO : GHTBase
-{
-	public static void Main()
-	{
-		OracleParameter_ctor_SO tc = new OracleParameter_ctor_SO();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleParameter_ctor_SO");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleParameter param = new OracleParameter("myParam",10);
-
-		try
-		{
-			BeginCase("ctor");
-			Compare(param != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("name");
-			Compare(param.ParameterName ,"myParam");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("value");
-			Compare(param.Value, 10);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOIPBBBSDO.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOIPBBBSDO.cs
deleted file mode 100755
index 19a3be5c3df..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOIPBBBSDO.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleParameter_ctor_SOIPBBBSDO : GHTBase
-{
-	public static void Main()
-	{
-		OracleParameter_ctor_SOIPBBBSDO tc = new OracleParameter_ctor_SOIPBBBSDO();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleParameter_ctor_SOIPBBBSDO");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OracleParameter param = new OracleParameter("myParam",		//param name
-												OracleType.Double,	//type
-												5,					//size
-												ParameterDirection.Input, //direction
-												true,				//nillbale
-												1,					//precision 
-												1,					//scale	
-												"Column1",			//source column
-												DataRowVersion.Current, //datarow version
-												590.456);			//value
-		try
-		{
-			BeginCase("ParameterName");
-			Compare(param.ParameterName , "myParam");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OracleType");
-			Compare(param.OracleType ,OracleType.Double );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Size");
-			Compare(param.Size  , 5);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("ParameterDirection");
-			Compare(param.Direction  , ParameterDirection.Input );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("IsNullable");
-			Compare(param.IsNullable , true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Precision");
-			Compare(param.Precision , (byte)1);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Scale");
-			Compare(param.Scale  , (byte)1);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("SourceColumn");
-			Compare(param.SourceColumn  ,"Column1");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("SourceVersion");
-			Compare(param.SourceVersion ,DataRowVersion.Current );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Value");
-			Compare(param.Value  ,590.456);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype.cs
deleted file mode 100755
index 5b268987632..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-#if DAAB
-using Microsoft.ApplicationBlocks;
-#endif
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleParameter_ctor_SOtype : ADONetTesterClass
-{
-	private Exception exp;
-	// transaction use was add for PostgreSQL
-	OracleTransaction tr;
-
-	public static void Main()
-	{
-		OracleParameter_ctor_SOtype tc = new OracleParameter_ctor_SOtype();
-		tc.exp = null;
-		try
-		{
-			tc.BeginTest("OracleParameter_ctor_SOtype on " + ConnectedDataProvider.GetDbType().ToString());
-			tc.run();
-		}
-		catch(Exception ex){tc.exp = ex;}
-		finally	{tc.EndTest(tc.exp);}
-	}
-
-	public void run()
-	{
-		Log(string.Format("DB Server={0}.", ConnectedDataProvider.GetDbType()));
-		AllTypes();
-		SimpleTypesWithDBNull();
-	}
-
-	[Test]
-	public void AllTypes()
-	{
-		exp = null;
-		OracleParameter param = null;
-
-		foreach (OracleType dbtype in Enum.GetValues(typeof(OracleType)))
-		{
-
-			param = new OracleParameter("myParam",dbtype);
-
-			try
-			{
-				BeginCase("ctor " + dbtype.ToString());
-				Compare(param != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("name " + dbtype.ToString());
-				Compare(param.ParameterName ,"myParam");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-
-	[Test]
-//#if !TARGET_JVM
-//	[Category("NotWorking")]
-//#endif
-	public void SimpleTypesWithDBNull()
-	{
-		OracleConnection con=null;
-		OracleCommand cmd=null;
-		OracleDataReader rdr=null;
-		try
-		{
-			exp = null;
-			BeginCase("Test simple types with DBNull");
-
-			string connectionString = ConnectedDataProvider.ConnectionString;
-			con = new	OracleConnection(connectionString);
-			cmd = new OracleCommand();
-			con.Open();
-			// transaction use was add for PostgreSQL
-			tr = con.BeginTransaction();
-			
-			cmd = new OracleCommand("", con, tr);
-			cmd.CommandText = "GHSP_TYPES_SIMPLE_1";
-			cmd.CommandType = CommandType.StoredProcedure;
-
-			AddSimpleTypesNullParams(cmd);
-			cmd.Parameters.Add(new OracleParameter("result",OracleType.Cursor)).Direction = ParameterDirection.Output;
-
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-#if DAAB
-
-				rdr = Microsoft.ApplicationBlocks.Data.PostgresOracleHelper.OLEDB4ODBCExecuteReader(cmd,true);
-#endif
-
-			}
-			else
-#endif
-			{
-
-				rdr = cmd.ExecuteReader();
-			}
-
-			rdr.Read();
-			for (int i=0; i<rdr.FieldCount; i++)
-			{
-				Compare(DBNull.Value, rdr.GetValue(i));
-			}
-			rdr.Close();
-		}
-		catch (Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			if(rdr != null && !rdr.IsClosed)
-			{
-				rdr.Close();
-			}
-			if (con != null && con.State == ConnectionState.Open)
-			{
-				con.Close();
-			}
-			exp=null;
-		}
-	}
-
-	private void AddSimpleTypesNullParams(OracleCommand cmd)
-	{
-		OracleParameter tmpParam;
-		tmpParam = new OracleParameter("T_NUMBER", OracleType.Number);
-		cmd.Parameters.Add(tmpParam);
-		tmpParam = new OracleParameter("T_LONG", OracleType.LongVarChar);
-		cmd.Parameters.Add(tmpParam);
-		tmpParam = new OracleParameter("T_FLOAT", OracleType.Float);
-		cmd.Parameters.Add(tmpParam);
-		tmpParam = new OracleParameter("T_VARCHAR", OracleType.VarChar);
-		cmd.Parameters.Add(tmpParam);
-		tmpParam = new OracleParameter("T_NVARCHAR", OracleType.NVarChar);
-		cmd.Parameters.Add(tmpParam);
-		tmpParam = new OracleParameter("T_CHAR", OracleType.Char);
-		cmd.Parameters.Add(tmpParam);
-		tmpParam = new OracleParameter("T_NCHAR", OracleType.NChar);
-		cmd.Parameters.Add(tmpParam);
-
-		foreach (OracleParameter current in cmd.Parameters)
-		{
-			current.Value = DBNull.Value;
-		}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtypeI.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtypeI.cs
deleted file mode 100755
index 24177c784b1..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtypeI.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleParameter_ctor_SOtypeI : GHTBase
-{
-	public static void Main()
-	{
-		OracleParameter_ctor_SOtypeI tc = new OracleParameter_ctor_SOtypeI();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleParameter_ctor_SOtypeI");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleParameter param = null;
-
-		foreach (OracleType dbtype in Enum.GetValues(typeof(OracleType)))
-		{
-
-			param = new OracleParameter("myParam",dbtype,5);
-
-			try
-			{
-				BeginCase("ctor " + dbtype.ToString());
-				Compare(param != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("name " + dbtype.ToString());
-				Compare(param.ParameterName ,"myParam");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("size " + dbtype.ToString());
-				Compare(param.Size ,5);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-
-		try
-		{
-			BeginCase("ctor - illegal size ");
-			try
-			{
-				param = new OracleParameter("myParam",OracleType.Int32 ,-5);
-			}
-			catch (Exception ex) {exp = ex;}
-			Compare(exp.GetType().FullName , typeof(ArgumentException).FullName );
-			exp=null;
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype_IS.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype_IS.cs
deleted file mode 100755
index 2f4a06609c5..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameter/OracleParameter_ctor_SOtype_IS.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-[TestFixture]
-public class OracleParameter_ctor_SOtype_IS : GHTBase
-{
-	public static void Main()
-	{
-		OracleParameter_ctor_SOtype_IS tc = new OracleParameter_ctor_SOtype_IS();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OracleParameter_ctor_SOtypeIS");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OracleParameter param = null;
-
-		param = new OracleParameter("myParam",OracleType.Int32 ,5,"myColumn");
-
-		try
-		{
-			BeginCase("ctor ");
-			Compare(param != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("name ");
-			Compare(param.ParameterName ,"myParam");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("size ");
-			Compare(param.Size ,5);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("size ");
-			Compare(param.SourceColumn  ,"myColumn");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Add.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Add.cs
deleted file mode 100755
index 502c6ebb492..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Add.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleParameterCollection_Add : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleParameterCollection_Add tc = new OracleParameterCollection_Add();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleParameterCollection_Add");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-
-			OracleCommand cmd = new OracleCommand();
-			OracleParameter param = cmd.Parameters.Add(new OracleParameter("MyParam", "abcd"));
-
-			try
-			{
-				BeginCase("check value");
-				Compare(param.Value ,"abcd" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			param = cmd.Parameters.Add("MyParam", OracleType.VarChar, 50);
-			try
-			{
-				BeginCase("check parameter type");
-				Compare(param.GetType().FullName ,typeof(OracleParameter).FullName  );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check parameter name");
-				Compare(param.ParameterName ,"MyParam" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Contains.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Contains.cs
deleted file mode 100755
index 53534e8f8df..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Contains.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleParameterCollection_Contains : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleParameterCollection_Contains tc = new OracleParameterCollection_Contains();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleParameterCollection_Contains");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleCommand cmd = new OracleCommand();
-			OracleParameter param = new OracleParameter();
-			cmd.Parameters.Add(param);
-			cmd.Parameters.Add(new OracleParameter("MyParam", 12));
-
-			try
-			{
-				BeginCase("Check contains - 1");
-				Compare(cmd.Parameters.Contains(param),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check contains - 2");
-				Compare(cmd.Parameters.Contains("MyParam"),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check contains - 3");
-				Compare(cmd.Parameters.Contains("abcd"),false );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check contains - 4");
-				Compare(cmd.Parameters.Contains(" MyParam"),false );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-        
-			try
-			{
-				BeginCase("Check contains - 5");
-				cmd.Parameters.Add(new OracleParameter("MyParam", 12));
-				Compare(cmd.Parameters.Contains("MyParam"),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-        
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Count.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Count.cs
deleted file mode 100755
index b1f9047863f..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleParameterCollection/OracleParameterCollection_Count.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleParameterCollection_Count : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleParameterCollection_Count tc = new OracleParameterCollection_Count();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleParameterCollection_Count");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-	
-			OracleCommand cmd = new OracleCommand();
-
-			try
-			{
-				BeginCase("Count - empty");
-				Compare(cmd.Parameters.Count ,0 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			cmd.Parameters.Add(new OracleParameter("MyParam", "abcd"));
-			try
-			{
-				BeginCase("Count - add");
-				Compare(cmd.Parameters.Count ,1 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			cmd.Parameters.Clear();
-
-			try
-			{
-				BeginCase("Count - clear");
-				Compare(cmd.Parameters.Count ,0 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-        
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Begin.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Begin.cs
deleted file mode 100755
index da60a25426c..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Begin.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleTransaction_Begin : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleTransaction_Begin tc = new OracleTransaction_Begin();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleTransaction_Begin");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-
-			Exception exp = null;
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			/*********************************************************
-			 * OLEDB Provider for SQL Server does not allow nested transactions
-			 * http://support.microsoft.com/kb/177138/EN-US/
-			 * http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q316872&
-			*/
-			if ((ConnectedDataProvider.GetDbType(con) == DataBaseServer.SQLServer) ||
-				(ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) ||
-				(ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL) ||
-				(ConnectedDataProvider.GetDbType(con) == DataBaseServer.DB2))
-			{
-				Log(string.Format("Test skipped, nested transactions are not supported in {0}", ConnectedDataProvider.GetDbType(con)));
-				return;
-			}
-
-			// How To Implement Nested Transactions with Oracle
-			// http://support.microsoft.com/kb/187289/EN-US/
-
-			OracleTransaction txnOuter = null;
-			OracleTransaction txnInner = null;
-		
-			try
-			{
-				BeginCase("Check Outer Transaction Isoloation Level");
-			
-				txnOuter = con.BeginTransaction();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check Inner Transaction Isoloation Level");
-				Compare(txnOuter.IsolationLevel,IsolationLevel.RepeatableRead);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Commit.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Commit.cs
deleted file mode 100755
index 8c3c485f2d2..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Commit.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleTransaction_Commit : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleTransaction_Commit tc = new OracleTransaction_Commit();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleTransaction_Commit");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			// ORACLE does not support transactions with savepoints 
-			// http://support.microsoft.com/kb/187289/EN-US/
-			if (ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString) == DataBaseServer.Oracle) return;
-			if (ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString) == DataBaseServer.PostgreSQL) return;
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			//prepare command for checking database
-			OracleConnection conSelect = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			conSelect.Open();
-			OracleCommand cmdSelect = new OracleCommand("Select Title From Employees where EmployeeID in (100,200)", conSelect);
-
-			OracleTransaction txn = con.BeginTransaction();
-
-			//prepare first transaction
-			OracleCommand cmd1 = new OracleCommand("Update Employees Set Title = 'New Value1' Where EmployeeID = 100",con);
-			cmd1.Transaction = txn;
-		
-			//prepare a second transaction
-			OracleCommand cmd2 = new OracleCommand("Update Employees Set Title = 'New Value2' Where EmployeeID = 200",con);
-			cmd2.Transaction = txn;
-
-			try
-			{
-				BeginCase("one transaction - After commiting transaction");
-				cmd1.ExecuteNonQuery();
-				txn.Commit();
-				string Result = cmdSelect.ExecuteScalar().ToString();
-				Compare(Result,"New Value1" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			conSelect.Close();
-
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			conSelect.Open();
-
-			txn = con.BeginTransaction();
-			cmd1.Transaction = txn;
-			cmd2.Transaction = txn;
-			cmd1.ExecuteNonQuery();
-			cmd2.ExecuteNonQuery();
-			txn.Commit();
-			OracleDataReader rdr = cmdSelect.ExecuteReader();
-
-			try
-			{
-				BeginCase("two transaction - check first transaction");
-				rdr.Read();
-				Compare(rdr.GetString(0),"New Value1" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("two transaction - check second transaction");
-				rdr.Read();
-				Compare(rdr.GetString(0),"New Value2" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-			if (conSelect.State == ConnectionState.Open) conSelect.Close();
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Connection.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Connection.cs
deleted file mode 100755
index c5a1a5814cc..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Connection.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleTransaction_Connection : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleTransaction_Connection tc = new OracleTransaction_Connection();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleTransaction_Connection");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OracleTransaction txn = con.BeginTransaction();
-
-			try
-			{
-				BeginCase("check connection");
-				Compare(txn.Connection,con);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			//check exception - using a command with the same connection as the transaction
-			OracleCommand cmd = new OracleCommand("Select * from Employees",con);
-
-			//Execute requires the command to have a transaction object when the connection assigned to the command is in a pending local transaction.  
-			//The Transaction property of the command has not been initialized.
-			try
-			{
-				BeginCase("Command that uses the transaction connection - exception");
-				try
-				{
-					cmd.ExecuteNonQuery();
-				}
-				catch (Exception ex){exp=ex;}
-				Compare(exp.GetType().FullName ,typeof(InvalidOperationException).FullName);
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_IsolationLevel.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_IsolationLevel.cs
deleted file mode 100755
index e0dd4631502..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_IsolationLevel.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleTransaction_IsolationLevel : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleTransaction_IsolationLevel tc = new OracleTransaction_IsolationLevel();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleTransaction_IsolationLevel");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void IsolationLevelChaos() {
-			Exception exp = null;
-
-
-			MonoTests.System.Data.Utils.DataBaseServer dbServer = ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OracleTransaction txn = null;
-
-			//supported only in SQLServer
-			if (dbServer == MonoTests.System.Data.Utils.DataBaseServer.SQLServer) {
-				try {
-					BeginCase("IsolationLevel = Chaos");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.Chaos);
-					Compare(txn.IsolationLevel,IsolationLevel.Chaos);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			Exception exp = null;
-
-
-			MonoTests.System.Data.Utils.DataBaseServer dbServer = ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OracleTransaction txn = null;
-		
-			try
-			{
-				BeginCase("IsolationLevel = ReadCommitted");
-				con.Open();
-				txn=con.BeginTransaction();
-				Compare(txn.IsolationLevel,IsolationLevel.ReadCommitted);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-
-			//not supported in Oracle
-			if (dbServer != MonoTests.System.Data.Utils.DataBaseServer.Oracle) 
-			{
-				try
-				{
-					BeginCase("IsolationLevel = ReadUncommitted");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.ReadUncommitted );
-					Compare(txn.IsolationLevel,IsolationLevel.ReadUncommitted);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-
-			//not supported in Oracle
-			if (dbServer != MonoTests.System.Data.Utils.DataBaseServer.Oracle) 
-			{
-				try
-				{
-					BeginCase("IsolationLevel = RepeatableRead");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.RepeatableRead);
-					Compare(txn.IsolationLevel,IsolationLevel.RepeatableRead);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-
-			try
-			{
-				BeginCase("IsolationLevel = Serializable");
-				con.Open();
-				txn=con.BeginTransaction(IsolationLevel.Serializable);
-				Compare(txn.IsolationLevel,IsolationLevel.Serializable);
-				txn.Rollback();
-				txn=con.BeginTransaction();
-				txn.Rollback();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-
-			// not supported in DB2,MSSQL,Oracle,sybase and guess what... Postgres.
-			if (dbServer != MonoTests.System.Data.Utils.DataBaseServer.DB2 
-				&& dbServer != MonoTests.System.Data.Utils.DataBaseServer.SQLServer
-				&& dbServer != MonoTests.System.Data.Utils.DataBaseServer.Oracle 
-				&& dbServer != DataBaseServer.PostgreSQL
-				&& dbServer != MonoTests.System.Data.Utils.DataBaseServer.Sybase ) 
-			{
-				try
-				{
-					BeginCase("IsolationLevel = Unspecified");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.Unspecified );
-					Compare(txn.IsolationLevel,IsolationLevel.Unspecified );
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Rollback.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Rollback.cs
deleted file mode 100755
index 3091ba24b37..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_Rollback.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleTransaction_Rollback : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleTransaction_Rollback tc = new OracleTransaction_Rollback();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleTransaction_Rollback");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			OracleConnection con = null;
-			OracleTransaction txn;
-			Exception exp = null;
-			try
-			{
-				BeginCase("OracleTransaction Rollback");
-
-				//
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				string Result = "";
-				con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-				txn = con.BeginTransaction();
-				OracleCommand cmd = new OracleCommand("Update Employees Set LastName = 'StamLastName' Where EmployeeID = 100", con, txn);
-				cmd.ExecuteNonQuery();
-				txn.Rollback();
-
-				//
-				//
-				cmd = new OracleCommand("Select LastName From Employees Where EmployeeID = 100", con);
-				Result = cmd.ExecuteScalar().ToString();
-				Compare(Result,"Last100" );
-				this.Log(Result);
-
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_ctor.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_ctor.cs
deleted file mode 100755
index 3720147379b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleTransaction/OracleTransaction_ctor.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleTransaction_ctor : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OracleTransaction_ctor tc = new OracleTransaction_ctor();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleTransaction_ctor");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OracleConnection con = new OracleConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OracleTransaction txn = null;
-
-			try
-			{
-				BeginCase("BeginTransaction - connection close");
-				try
-				{
-					txn = con.BeginTransaction();
-				}
-				catch (Exception ex) {exp = ex;}
-				Compare(exp.GetType().FullName ,typeof(InvalidOperationException).FullName );
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			con.Open();
-
-			try
-			{
-				BeginCase("BeginTransaction - connection close");
-				txn = con.BeginTransaction();
-				Compare(txn == null,false );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}   
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleType/OracleType_Date.cs b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleType/OracleType_Date.cs
deleted file mode 100755
index 236adc8d687..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleType/OracleType_Date.cs
+++ /dev/null
@@ -1,545 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OracleClient ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OracleClient
-{
-	[TestFixture]
-	public class OracleType_Date : GHTBase
-	{
-		private string dateColumnName;
-		private string dateTableName;
-
-		private OracleConnection	con;
-		private OracleDataReader	dr	=	null;
-
-		private DateTime TestedDate1;
-		private DateTime RetDate;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				dateTableName = ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME;
-
-				dateColumnName = "T_DATE";
-
-				con = new OracleConnection(ConnectedDataProvider.ConnectionString);
-				con.Open();
-				Compare("Setup", "Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OracleType_Date tc = new OracleType_Date();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OracleType_Date");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			OracleCommand cmd = new OracleCommand();
-			string rowId = "54416_";
-
-			try
-			{
-				// clean the test table
-				cmd = new OracleCommand(string.Format("DELETE FROM {0} WHERE ID like '54416_%'", dateTableName));
-				cmd.Connection = con;
-				cmd.ExecuteNonQuery();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-
-			#region		---- testing parameterized query with a simple date ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a simple date");
-				rowId = "54416_" + TestCaseNumber.ToString();
-
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values ('{2}', :date1)", dateTableName, dateColumnName, rowId));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2001, 1, 13);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				// checking that value returned correctly;
-				cmd.CommandText = string.Format("select {0} from {1} where ID='{2}'", dateColumnName, dateTableName, rowId);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-
-				Compare(TestedDate1,RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a 1753 date min  ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a 1753 date min");
-				rowId = "54416_" + TestCaseNumber.ToString();
-
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(1753, 1, 1); 
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				this.Log(cmd.CommandText);
-				cmd.ExecuteNonQuery();
-
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				this.Log(cmd.CommandText);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1.Date, RetDate.Date);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a future date ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a future date");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a future date ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a future date");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 12, 13, 14);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part of 00:00 ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part of 00:00");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 0, 0, 0);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText =string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part of 23:59:59 ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part of 23:59:59");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 23, 59, 59);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText =string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				cmd.Parameters.Clear();
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part of AM ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part of AM");
-				string str = string.Empty; //This is an addional test ,passing GH mechnizim 
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				//TestedDate1 = new DateTime(2500, 1, 13, 11, 0, 0);
-				TestedDate1 = new DateTime(1988,5,31,15,33,44,00);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				cmd.Parameters.Clear();
-				
-				//TODO:add also treat for other db
-				if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.SQLServer || ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.Sybase)
-				{
-					cmd.CommandText = string.Format("select CONVERT(varchar,{0},120) from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-					str = cmd.ExecuteScalar().ToString();
-					Compare(TestedDate1, Convert.ToDateTime(str));
-				}
-				//' checking that value returned correctly
-				cmd.CommandText =string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar().ToString());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing a where clause using a date ---- 
-			try
-			{
-				BeginCase("testing a where clause using a date");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 11, 0, 0);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd = new OracleCommand(string.Format("select {0} from {1} where ID='{2}' and {0}= :date1", dateColumnName, dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing a where clause using a rage of dates ---- 
-			try
-			{
-				BeginCase("testing a where clause using a rage of dates");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID, {1}) values('{2}', :date1)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2007, 12, 31, 11, 59, 59);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd = new OracleCommand(string.Format("select {0} from {1} where ID='{2}' and {0} >:date1 and {0} <:date2", dateColumnName, dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1.AddSeconds(-1);
-				cmd.Parameters.Add(new OracleParameter("date2", OracleType.DateTime)).Value = TestedDate1.AddSeconds(+1);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing a set statement ---- 
-			try
-			{
-				BeginCase("testing a set statement");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OracleCommand(string.Format("insert into {0} (ID) values('{1}')", dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.ExecuteNonQuery();
-				cmd = new OracleCommand(string.Format("update {0} set {1} = :date1 where ID='{2}'", dateTableName, dateColumnName, rowId));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 1, 2, 3);
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-
-				//' checking that value returned correctly
-				cmd = new OracleCommand(string.Format("select {0} from {1} where ID='{2}' and {0}= :date1", dateColumnName, dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.Parameters.Add(new OracleParameter("date1", OracleType.DateTime)).Value = TestedDate1;
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-		}
-
-		/// <summary>
-		/// Deletes a row from the date table, according to its ID.
-		/// </summary>
-		/// <param name="rowId">Id of the row to delete.</param>
-		private void CleanTestRow(string rowId)
-		{
-			OracleCommand deleteCmd = new OracleCommand(string.Format("DELETE FROM {0} WHERE ID = '{1}'", dateTableName, rowId), con);
-			deleteCmd.ExecuteNonQuery();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt
deleted file mode 100755
index 9623eb3a00b..00000000000
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-To run unit test the following should be prepared:
-
-1. nunit-console.exe.config should contain an ConnectionString setting, i.e.:
-
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-<appSettings>
-    <add key="ConnectionString" value="User ID=ghtdb;Password=ghtdb;Data Source=xp050" />
-  </appSettings>
-</configuration>
-
-2. A target db should be prepared with the relevant structure, following are the instruction for each supported database.
-
-in order to create the testing database, on ORACLE, run:
-Run the scripts with a user wich have administrator permissions. (by default user:system, password:mainsoft).
-
-sqlplus "user/password@database_sid" @GHTDB.ORACLE.sql
-sqlplus "user/password@database_sid" @GHTDB.Data.ORACLE.sql
-
-for example 
-sqlplus "system/mainsoft@rafim" @GHTDB.ORACLE.sql
-sqlplus "system/mainsoft@rafim" @GHTDB.Data.ORACLE.sql
-
diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
index 614aabd547e..6e58bfa9eda 100644
--- a/mcs/class/System.Data/ChangeLog
+++ b/mcs/class/System.Data/ChangeLog
@@ -1,22 +1,3 @@
-2006-02-19  Konstantin Triger <kostat@mainsoft.com>
-
-	* TARGET_JVM: added JDBC provider generic adapter mechanism.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* System.Data.dll.sources: remove
-	System.Data/DataAdapterException.cs, and add
-	System.Data.Common/SupportedJoinOperators.cs.
-
-	* System.Data.dll.sources: remove
-	System.Data/AdapterMappingException.cs.
-
-	* System.Data.dll.sources: remove IDbAsyncConnection.cs,
-	IDbAsyncCommand.cs, IGetTypedData.cs, ISetTypedData.cs,
-	IDataReader2.cs, IDataSources.cs, IDbExecutionContext.cs,
-	IDataRecord2.cs, IDataUpdatableRecord.cs, and
-	DbDataUpdatableRecord.cs from the build.
-
 2006-01-02	Boris Kirzner <borisk@mainsoft.com>
 	* System.Data_test.dll.sources: added new tests.
 
diff --git a/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/IKeyMapper.cs b/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/IKeyMapper.cs
deleted file mode 100755
index 8d39064a3ff..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/IKeyMapper.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace Mainsoft.Data.Configuration
-{
-	public interface IConnectionStringDictionary : IDictionary
-	{
-		string GetConnectionStringKey (string key);
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/KeyMapperBase.cs b/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/KeyMapperBase.cs
deleted file mode 100755
index f4fff365862..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/KeyMapperBase.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text;
-using System.Globalization;
-
-namespace Mainsoft.Data.Configuration
-{
-	public class ConnectionStringDictionary: IConnectionStringDictionary
-	{
-		#region Fields
-
-		private readonly IDictionary _dictionary;
-		private readonly NameValueCollection _mapping;
-		private readonly NameValueCollection _actualKeys;
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public ConnectionStringDictionary(string connectionString, NameValueCollection defaultMapping)
-		{
-			_actualKeys = new NameValueCollection();
-			_dictionary = Parse (connectionString);
-			_mapping = defaultMapping;
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		public object this [object key]
-		{
-			get { 
-
-				if (!(key is String))
-					throw new ArgumentException("key is not string");
-
-				string skey = (string)key;
-
-				skey = GetConnectionStringKey(skey);
-				if (skey == null)
-					return null;
-
-				return _dictionary[skey];
-			}
-
-			set {
-				if (!(key is String))
-					throw new ArgumentException("key is not string");
-
-				string skey = (string)key;
-
-				skey = GetConnectionStringKey(skey);
-				if (skey == null)
-					skey = (string)key;
-
-				_dictionary[skey] = value;
-			}
-		}
-		#endregion // Properties
-
-		#region Methods
-
-		public string GetConnectionStringKey (string key)
-		{
-			string cached = _actualKeys [key];
-			if (cached != null)
-				return cached;
-
-			if (_mapping != null)
-			for(int i = 0, c = _mapping.Keys.Count; i < c; i++) {
-				if (string.Compare(key, _mapping.Keys[i], true,
-					CultureInfo.InvariantCulture) == 0) {
-					string[] values = _mapping.GetValues(i);
-					for(int j = 0; j < values.Length; j++) {
-						string actualKey = values[j];
-						if (_dictionary.Contains (actualKey)) {
-							_actualKeys.Add (key, actualKey);
-							return actualKey;
-						}
-					}
-				}
-			}
-
-			if (_dictionary.Contains(key))
-				return key;
-
-			return null;
-		}
-
-		public static IDictionary Parse (string connectionString)
-		{
-			IDictionary userParameters = CollectionsUtil.CreateCaseInsensitiveHashtable();
-
-			if (connectionString == null || connectionString.Length == 0) {
-				return userParameters;
-			}
-			//connectionString += ";";
-
-			bool inQuote = false;
-			bool inDQuote = false;
-			bool inName = true;
-
-			string name = String.Empty;
-			string value = String.Empty;
-			StringBuilder sb = new StringBuilder (connectionString.Length);
-
-			for (int i = 0; i < connectionString.Length; i ++) {
-				char c = connectionString [i];
-				char peek;
-				if (i == connectionString.Length - 1)
-					peek = '\0';
-				else
-					peek = connectionString [i + 1];
-
-				switch (c) {
-					case '\'':
-						if (inDQuote)
-							sb.Append (c);
-						else if (peek == c) {
-							sb.Append(c);
-							i ++;
-						}
-						else
-							inQuote = !inQuote;
-						break;
-					case '"':
-						if (inQuote)
-							sb.Append(c);
-						else if (peek == c) {
-							sb.Append(c);
-							i ++;
-						}
-						else
-							inDQuote = !inDQuote;
-						break;
-					case ';':
-						if (inDQuote || inQuote)
-							sb.Append(c);
-						else {
-							if (name != null && name.Length > 0) {
-								value = sb.ToString();
-								userParameters [name.Trim()] = value.Trim();
-							}
-							inName = true;
-							name = String.Empty;
-							value = String.Empty;
-							sb.Length = 0;
-						}
-						break;
-					case '=':
-						if (inDQuote || inQuote || !inName)
-							sb.Append (c);
-						else if (peek == c) {
-							sb.Append (c);
-							i += 1;
-						}
-						else {
-							name = sb.ToString();
-							sb.Length = 0;
-							inName = false;
-						}
-						break;
-					case ' ':
-						if (inQuote || inDQuote)
-							sb.Append(c);
-						else if (sb.Length > 0 && peek != ';')
-							sb.Append(c);
-						break;
-					default:
-						sb.Append(c);
-						break;
-				}
-			}
-
-			if (inDQuote || inQuote)
-				throw new ArgumentException("connectionString");
-
-			if (name != null && name.Length > 0) {
-				value = sb.ToString();
-				userParameters [name.Trim()] = value.Trim();
-			}
-
-			return userParameters;
-		}
-
-
-		#endregion // Methods
-
-		#region IDictionary Members
-
-		public bool IsFixedSize
-		{
-			get { return _dictionary.IsFixedSize; }
-		}
-
-		public bool IsReadOnly
-		{
-			get { return _dictionary.IsReadOnly; }
-		}
-
-		public ICollection Keys
-		{
-			get { 
-				return _dictionary.Keys; 
-			}
-		}
-
-		public ICollection Values
-		{
-			get { return _dictionary.Values; }
-		}
-
-		public void Add (object key, object value)
-		{
-			_dictionary.Add ((string)key, (string)value);
-		}
-
-		public void Clear ()
-		{
-			_dictionary.Clear ();
-		}
-
-		public bool Contains (object key)
-		{
-			return _dictionary.Contains (key);
-		}
-
-		public IDictionaryEnumerator GetEnumerator ()
-		{
-			return _dictionary.GetEnumerator ();
-		}
-
-		public void Remove (object key)
-		{
-			_dictionary.Remove ((string)key);
-		}
-
-		#endregion // IDictionary Members
-
-		#region IEnumerable Members
-
-		IEnumerator IEnumerable.GetEnumerator () 
-		{
-			return _dictionary.GetEnumerator ();
-		}
-
-		#endregion // IEnumerable Members
-
-		#region ICollection Members
-
-		public bool IsSynchronized 
-		{
-			get { return ((ICollection)_dictionary).IsSynchronized; }
-		}
-
-		public int Count 
-		{
-			get { return _dictionary.Count;	}
-		}
-
-		public void CopyTo (Array array, int index) 
-		{
-			_dictionary.CopyTo (array, index);
-		}
-
-		public object SyncRoot 
-		{
-			get {return ((ICollection)_dictionary).SyncRoot; }
-		}
-
-		#endregion // ICollection Members
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/ProvidersSectionHandler.cs b/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/ProvidersSectionHandler.cs
deleted file mode 100755
index 17f6513e1ab..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Configuration.jvm/ProvidersSectionHandler.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Configuration;
-using System.Xml;
-using System.Collections;
-using System.Collections.Specialized;
-
-namespace Mainsoft.Data.Configuration
-{
-	class ProvidersSectionHandler : IConfigurationSectionHandler
-	{
-		public virtual object Create (object parent, object configContext, XmlNode section) {
-			if (section.Attributes != null && section.Attributes.Count != 0)
-				ThrowException ("Unrecognized attribute", section);
-
-			ArrayList providers = new ArrayList();
-			
-			XmlNodeList providerElements = section.SelectNodes ("provider");
-			foreach (XmlNode child in providerElements) {
-				XmlNodeType ntype = child.NodeType;
-				if (ntype == XmlNodeType.Whitespace || ntype == XmlNodeType.Comment)
-					continue;
-
-				if (ntype != XmlNodeType.Element)
-					ThrowException ("Only elements allowed", child);
-
-				object parentProvider = null;
-				XmlAttribute extends = child.Attributes["parent"];
-				if (extends != null) {
-					string super = extends.Value;
-					string sectionName = super.Substring(0, super.IndexOf('#'));
-					string id = super.Substring(sectionName.Length+1);
-					IList supers = (IList) ConfigurationSettings.GetConfig(sectionName);
-					for (int i = 0; i < supers.Count; i++) {
-						Hashtable ht = (Hashtable)supers[i];
-						string curId = (string)ht["id"];
-						if (String.CompareOrdinal(id,curId) == 0) {
-							parentProvider = ht;
-							break;
-						}
-					}
-					child.Attributes.Remove(extends);
-				}
-
-				DictionarySectionHandler handler = new DictionarySectionHandler();
-				Hashtable col = (Hashtable) handler.Create (parentProvider, null, child);
-				providers.Add(col);
-			}	
-			if (parent != null && parent is ICollection)
-				providers.AddRange((ICollection)parent);
-
-			return providers;
-		}
-		
-		static internal void ThrowException (string msg, XmlNode node) 
-		{
-			if (node != null && node.Name != String.Empty)
-				msg = msg + " (node name: " + node.Name + ") ";
-			throw new ConfigurationException (msg, node);
-		}
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog
deleted file mode 100644
index f1a2336b322..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2006-02-26  Konstantin Triger <kostat@mainsoft.com>
-
-	* OleDbSqlServerProvider.cs: set default empty Database.
-	* GenericProvider.cs: throw ArgumentException if url parameter is missing.
\ No newline at end of file
diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/GenericProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/GenericProvider.cs
deleted file mode 100755
index 091e9388fc8..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/GenericProvider.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data.Common;
-using System.Data.Configuration;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using Mainsoft.Data.Configuration;
-
-using java.sql;
-using javax.sql;
-using javax.naming;
-
-namespace Mainsoft.Data.Jdbc.Providers
-{
-	public class GenericProvider : IConnectionProvider
-	{
-		#region JdbcUrlConnector
-
-		sealed class JdbcUrlConnector {
-			#region Consts
-
-			private static readonly Regex JdbcUrlPatternRegex= new Regex (@"\$\{(?<VALUE>[^$\{\}]*)\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
-
-			#endregion // Consts
-
-			#region Fields
-
-			readonly IConnectionStringDictionary _keyMapper;
-			readonly GenericProvider			_provider;
-			readonly ArrayList _excludedKeys = new ArrayList();
-
-			#endregion // Fields
-
-			#region Constructors
-
-			internal JdbcUrlConnector (GenericProvider provider, IConnectionStringDictionary keyMapper) {
-				_provider = provider;
-				_keyMapper = keyMapper;
-			}
-
-			#endregion // Constructors
-
-
-			#region Methods 
-
-			internal Connection Connection {
-				get {
-					string url = (string)_keyMapper["JdbcURL"];
-					if (url == null) {
-						string jdbcUrlPattern = (string)_provider.ProviderInfo [ConfigurationConsts.JdbcUrlPattern];
-						if (jdbcUrlPattern == null || jdbcUrlPattern.Length == 0) {
-							//throw ExceptionHelper.JdbcUrlPatternNotFound ((string)_provider.ProviderInfo [ConfigurationConsts.Name]);
-							object [] args = new object [] {_provider.ProviderInfo [ConfigurationConsts.Name]};
-							throw new ArgumentException (String.Format("Provider '{0}' is not configured with valid JDBC URL pattern.",args));
-						}
-						MatchEvaluator evaluator = new MatchEvaluator (ReplaceEvaluator);
-						url = JdbcUrlPatternRegex.Replace (jdbcUrlPattern, evaluator);
-					}
-
-					java.util.Properties properties = new java.util.Properties ();
-
-					string user = (string)_keyMapper ["user"];
-					if (user != null) {
-						_excludedKeys.Add ("user");
-						properties.put ("user", user);
-					}
-
-					// TBD : what happens if password is not specified (should use empty pwd?)
-					string password = (string)_keyMapper ["password"];
-					if (password != null) {
-						_excludedKeys.Add ("password"); 
-						properties.put ("password", password);
-					}
-
-					if (_provider._excludedKeys != null)
-						_excludedKeys.AddRange(_provider._excludedKeys);
-
-					for (int i = 0; i < _excludedKeys.Count; i++)
-						_excludedKeys[i] = _keyMapper.GetConnectionStringKey((string)_excludedKeys[i]);
-
-					foreach(string key in _keyMapper.Keys)
-						if (!_excludedKeys.Contains (key))
-							properties.put (key, _keyMapper [key]);
-
-					ActivateJdbcDriver ();
-
-					// TBD : add DriverManager.setLoginTimeout	
-					return DriverManager.getConnection (url, properties);
-				}
-			}
-
-			private string ReplaceEvaluator (Match m) {
-				Group g = m.Groups["VALUE"];
-
-				if (!g.Success)
-					return String.Empty;
-
-				string usedKey = g.Value.Trim();
-
-				string value = (string)_keyMapper [usedKey];
-				if (value == null)
-					throw new ArgumentException(
-						String.Format("Missing parameter {0}", g.Value),
-						"ConnectionString");
-
-				_excludedKeys.Add(usedKey);
-				return value;
-			}
-
-			private void ActivateJdbcDriver () {
-				string driver = (string) _keyMapper["JdbcDriverClassName"];
-				if (driver == null)
-					driver = (string) _provider.ProviderInfo [ConfigurationConsts.JdbcDriverClassName];
-
-				if (driver != null && driver.Length != 0) {
-					try {
-						java.lang.Class.forName (driver).newInstance ();
-					}
-					catch (java.lang.ClassNotFoundException e) {
-						throw new TypeLoadException (e.Message, e);
-					}
-					catch (java.lang.InstantiationException e) {
-						throw new MemberAccessException (e.Message, e);
-					}
-					catch (java.lang.IllegalAccessException e) {
-						throw new MissingMethodException (e.Message, e);
-					}
-				}
-			}
-
-			#endregion // Methods
-		}
-
-		#endregion // JdbcUrlBuilder
-
-		#region DataSourceCache
-
-		private sealed class DataSourceCache : AbstractDbMetaDataCache {
-			internal DataSource GetDataSource(string dataSourceName,string namingProviderUrl,string namingFactoryInitial) {
-				Hashtable cache = Cache;
-
-				DataSource ds = cache[dataSourceName] as DataSource;
-
-				if (ds != null) {
-					return ds;
-				}
-
-				Context ctx = null;
-				
-				java.util.Properties properties = new java.util.Properties();
-
-				if ((namingProviderUrl != null) && (namingProviderUrl.Length > 0)) {
-					properties.put("java.naming.provider.url",namingProviderUrl);
-				}
-				
-				if ((namingFactoryInitial != null) && (namingFactoryInitial.Length > 0)) {
-					properties.put("java.naming.factory.initial",namingFactoryInitial);
-				}
-
-				ctx = new InitialContext(properties);
- 
-				try {
-					ds = (DataSource)ctx.lookup(dataSourceName);
-				}
-				catch(javax.naming.NameNotFoundException e) {
-					// possible that is a Tomcat bug,
-					// so try to lookup for jndi datasource with "java:comp/env/" appended
-					ds = (DataSource)ctx.lookup("java:comp/env/" + dataSourceName);
-				}
-
-				cache[dataSourceName] = ds;
-				return ds;
-			}
-		}
-
-		#endregion // DatasourceCache
-
-		#region Fields
-
-		private static DataSourceCache _dataSourceCache = new DataSourceCache();
-
-		private readonly IDictionary _providerInfo;
-		private readonly NameValueCollection _keyMapping;
-		private readonly string[] _excludedKeys;
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public GenericProvider(IDictionary providerInfo)
-		{
-			_providerInfo = providerInfo;
-			_keyMapping = new NameValueCollection ();
-			
-			// create key mappings collection
-			string keyMappingsStr = (string)_providerInfo [ConfigurationConsts.KeyMapping];
-			if (keyMappingsStr != null) {
-				string [] keyMappings = keyMappingsStr.Split (ConfigurationConsts.SemicolonArr);
-				foreach (string keyMapping in keyMappings) {
-					if (keyMapping.Length == 0)
-						continue;
-					int equalsIndex = keyMapping.IndexOf ('=');
-					string key = keyMapping.Substring (0,equalsIndex).Trim();
-					string [] mappings = keyMapping.Substring (equalsIndex + 1).Trim().Split (ConfigurationConsts.CommaArr);
-					foreach (string mapping in mappings)
-						_keyMapping.Add (key, mapping.Trim());
-				}
-			}
-
-			string keyMappingExcludesStr = (string) _providerInfo [ConfigurationConsts.KeyMappingExcludes];
-			if (keyMappingExcludesStr != null) {
-				_excludedKeys = keyMappingExcludesStr.Split (ConfigurationConsts.CommaArr);
-				for (int i = 0; i < _excludedKeys.Length; i++)
-					_excludedKeys[i] = _excludedKeys[i].Trim();
-			}
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		protected IDictionary ProviderInfo
-		{
-			get { return _providerInfo; }
-		}
-
-		#endregion // Properties
-
-		#region Methods
-
-		public virtual Connection GetConnection (IConnectionStringDictionary conectionStringBuilder)
-		{	
-			string dataSourceJndi = (string)conectionStringBuilder["jndi-datasource-name"];
-
-			if (dataSourceJndi != null && dataSourceJndi.Length > 0) {
-
-				string namingProviderUrl = (string)conectionStringBuilder["naming-provider-url"];
-				string namingFactoryInitial = (string)conectionStringBuilder["naming-factory-initial"];
-				DataSource ds = _dataSourceCache.GetDataSource(dataSourceJndi,namingProviderUrl,namingFactoryInitial);
-				return ds.getConnection();
-			}
-
-			JdbcUrlConnector connector = new JdbcUrlConnector (this, conectionStringBuilder);
-			return connector.Connection;
-		}
-			
-		public virtual IConnectionStringDictionary GetConnectionStringBuilder (string connectionString)
-		{
-			return new ConnectionStringDictionary(connectionString, _keyMapping);
-		}
-
-		#endregion // Methods
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/IProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/IProvider.cs
deleted file mode 100755
index 22f8069da20..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/IProvider.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using Mainsoft.Data.Configuration;
-
-using java.sql;
-
-namespace Mainsoft.Data.Jdbc.Providers
-{
-	sealed class ConfigurationConsts {
-		#region Constructors
-
-		ConfigurationConsts() {			
-		}
-
-		#endregion // Constructors
-
-		#region Consts
-
-		public const string Name = "Provider";
-		public const string KeyMapping = "keyMapping";
-		public const string KeyMappingExcludes = "keyExclude";
-		public const string JdbcUrlPattern = "url";
-		public const string JdbcDriverClassName = "driverClassName";
-		public const string ProviderType = "type";
-
-		public static readonly char [] SemicolonArr = new char [] { ';' };
-		public static readonly char [] CommaArr = new char [] { ',' };
-
-		#endregion // Consts
-
-	}
-
-	public interface IConnectionProvider
-	{
-		Connection GetConnection (IConnectionStringDictionary connectionStringBuilder);
-		IConnectionStringDictionary GetConnectionStringBuilder (string connectionString);
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbDB2Provider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbDB2Provider.cs
deleted file mode 100755
index 93089a58c85..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbDB2Provider.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using Mainsoft.Data.Configuration;
-
-namespace Mainsoft.Data.Jdbc.Providers {
-	public class OleDbDB2Provider : GenericProvider {
-		#region Consts
-
-		private const string Port = "port";
-		private const string Hostname = "hostname";
-		private const string Location = "location";
-
-		#endregion //Consts
-
-		#region Fields
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public OleDbDB2Provider (IDictionary providerInfo) : base (providerInfo) {
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		#endregion // Properties
-
-		#region Methods
-
-		public override IConnectionStringDictionary GetConnectionStringBuilder (string connectionString) {
-			IConnectionStringDictionary connectionStringBuilder = base.GetConnectionStringBuilder (connectionString);
-
-			string hostname = (string)connectionStringBuilder[Hostname];
-			string port = null;
-			if (hostname == null || hostname.Length == 0) {
-				string location = (string)connectionStringBuilder[Location];
-				if (location != null) {
-					int semicolumnIndex = location.IndexOf(':');
-					if (semicolumnIndex != -1) {
-						hostname = location.Substring(0,semicolumnIndex);
-						port = location.Substring(semicolumnIndex + 1);
-					}
-					else
-						hostname = location;
-
-					if (hostname != null)
-						connectionStringBuilder.Add(Hostname, hostname);
-
-					if (port != null)
-						connectionStringBuilder[Port] = port;
-				}
-			}
-
-			port = (string) connectionStringBuilder [Port];
-			if (port == null || port.Length == 0) {
-				port = (string) ProviderInfo [Port];
-				connectionStringBuilder.Add (Port, port);
-			}
-			
-			return connectionStringBuilder;
-		}
-
-		#endregion //Methods
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs
deleted file mode 100755
index 4f134991be4..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using Mainsoft.Data.Configuration;
-
-namespace Mainsoft.Data.Jdbc.Providers
-{
-	public class OleDbOracleProvider : GenericProvider
-	{
-		#region Consts
-
-		private const string Port = "Port";
-
-		#endregion //Consts
-
-		#region Fields
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public OleDbOracleProvider (IDictionary providerInfo) : base (providerInfo)
-		{
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		#endregion // Properties
-
-		#region Methods
-
-		public override IConnectionStringDictionary GetConnectionStringBuilder (string connectionString)
-		{
-			IConnectionStringDictionary conectionStringBuilder = base.GetConnectionStringBuilder (connectionString);
-
-			string port = (string) conectionStringBuilder [Port];
-			if (port == null || port.Length == 0) {
-				port = (string) ProviderInfo [Port];
-				conectionStringBuilder.Add (Port, port);
-			}
-			
-			return conectionStringBuilder;
-		}
-
-		#endregion //Methods
-	}
-}
diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
deleted file mode 100755
index 73c5bbe067b..00000000000
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnection
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	Boris Kirzner <borisk@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Data.Common;
-using System.Data.Configuration;
-using Mainsoft.Data.Configuration;
-
-using java.net;
-
-namespace Mainsoft.Data.Jdbc.Providers
-{
-	public class OleDbSqlServerProvider : GenericProvider
-	{
-		#region Consts
-
-		private const string Port = "Port";
-		private const string Database = "Database";
-		private const string ServerName = "ServerName";
-		private const string DefaultInstanceName = "MSSQLSERVER";
-		private const string Timeout = "Timeout";
-		private const int DefaultTimeout = 15;
-
-		#endregion //Consts
-
-		#region Fields
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public OleDbSqlServerProvider (IDictionary providerInfo) : base (providerInfo)
-		{
-		}
-
-		#endregion // Constructors
-
-		#region Properties
-
-		#endregion // Properties
-
-		#region Methods
-
-		public override IConnectionStringDictionary GetConnectionStringBuilder (string connectionString)
-		{
-			//TBD: should wrap the IConnectionStringDictionary
-			IConnectionStringDictionary conectionStringBuilder = base.GetConnectionStringBuilder (connectionString);
-			if (!conectionStringBuilder.Contains("jndi-datasource-name")) {
-
-				string database = (string) conectionStringBuilder [Database];
-				if (database == null)
-					conectionStringBuilder.Add (Database, String.Empty);
-
-				string port = (string) conectionStringBuilder [Port];
-				if (port == null || port.Length == 0) {
-					port = GetMSSqlPort (GetInstanceName (conectionStringBuilder), GetDataSource (conectionStringBuilder), GetTimeout (conectionStringBuilder));
-					conectionStringBuilder.Add (Port, port);
-				}
-			}
-
-			return conectionStringBuilder;
-		}
-
-		static string GetMSSqlPort(string instanceName, string dataSource, int timeout) {
-			string port = String.Empty;
-			try {
-				DatagramSocket socket = new DatagramSocket();
-
-				// send request
-				sbyte[] buf = new sbyte[] {2};
-				InetAddress address = InetAddress.getByName(dataSource);
-				DatagramPacket packet = new DatagramPacket(buf, buf.Length, address, 1434);
-				socket.send(packet);
-				sbyte[] recbuf = new sbyte[1024];
-				packet = new DatagramPacket(recbuf, recbuf.Length, packet.getAddress(), packet.getPort());
-
-				// try to receive from socket while increasing timeouts in geometric progression
-				int iterationTimeout = 1;
-				int totalTimeout = 0;
-				for(;;) {
-					socket.setSoTimeout(iterationTimeout);
-					try {
-						socket.receive(packet);
-						break;
-					}
-					catch (SocketTimeoutException e) {
-						totalTimeout += iterationTimeout;
-						iterationTimeout *= 2;
-						if (totalTimeout >= timeout*1000) {
-							throw new java.sql.SQLException(
-								String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1433).", dataSource)
-								);
-						}
-					}
-				}
-				sbyte[] rcvdSbytes = packet.getData();
-				char[] rcvdChars = new char[rcvdSbytes.Length];
-				for(int i=0; i < rcvdSbytes.Length; i++) {
-					rcvdChars[i] = (char)rcvdSbytes[i];
-				}
-				String received = new String(rcvdChars);
-
-				java.util.StringTokenizer st = new java.util.StringTokenizer(received, ";");
-				String prev = "";
-				bool instanceReached = instanceName == null || instanceName.Length == 0;
-				while (st.hasMoreTokens()) {
-					if (!instanceReached) {
-						if (prev.Trim().Equals("InstanceName")) {
-							if (String.Compare(instanceName,st.nextToken().Trim(),true) == 0) {
-								instanceReached = true;
-							}
-						}
-					}
-					else {
-						if (prev.Trim().Equals("tcp")) {
-							port = st.nextToken().Trim();
-							//ensure we got a valid int
-							java.lang.Integer.parseInt(port);
-							break;
-						}
-					}
-					prev = st.nextToken();
-				}
-				socket.close();
-
-				if (!instanceReached)
-					throw new java.sql.SQLException(
-						String.Format ("Specified SQL Server '{0}\\{1}' not found.", dataSource, instanceName)
-						);
-				return port;
-
-			}
-			catch (java.sql.SQLException) {
-				throw;
-			}
-			catch (Exception e) {
-				throw new java.sql.SQLException(e.Message);
-			}
-		}
-
-		// TBD : refactor GetInstanceName and GetDataSource to single method
-		private string GetInstanceName (IDictionary keyMapper)
-		{
-			string dataSource = (string) keyMapper [ServerName];
-			string instanceName = String.Empty;
-			int instanceIdx;
-			if ((instanceIdx = dataSource.IndexOf ("\\")) == -1) 
-				// no named instance specified - use a default name
-				return DefaultInstanceName;
-			else 
-				// get named instance name
-				return dataSource.Substring (instanceIdx + 1);
-		}
-
-		private string GetDataSource (IDictionary keyMapper)
-		{
-			string dataSource = (string) keyMapper [ServerName];
-			int instanceIdx;
-			if ((instanceIdx = dataSource.IndexOf ("\\")) != -1)
-				// throw out named instance name
-				dataSource = dataSource.Substring (0,instanceIdx);
-
-			if (dataSource != null && dataSource.StartsWith ("(") && dataSource.EndsWith (")"))					
-				dataSource = dataSource.Substring (1,dataSource.Length - 2);
-
-			if (String.Empty.Equals (dataSource) || (String.Compare ("local",dataSource,true) == 0)) 
-				dataSource = "localhost";
-
-			return dataSource;
-		}
-
-		private int GetTimeout (IDictionary keyMapper)
-		{
-			string timeoutStr = (string) keyMapper [Timeout];
-			if ((timeoutStr != null) && (timeoutStr.Length != 0)) {
-				try {
-					return Convert.ToInt32(timeoutStr);
-				}
-				catch(FormatException e) {
-					throw ExceptionHelper.InvalidValueForKey("connect timeout");
-				}
-				catch (OverflowException e) {
-					throw ExceptionHelper.InvalidValueForKey("connect timeout");
-				}
-			}
-			return DefaultTimeout;
-		}
-
-		#endregion // Methods
-	}
-}
diff --git a/mcs/class/System.Data/Microsoft.SqlServer.Server/ChangeLog b/mcs/class/System.Data/Microsoft.SqlServer.Server/ChangeLog
index 31ebd427820..340ef86994d 100644
--- a/mcs/class/System.Data/Microsoft.SqlServer.Server/ChangeLog
+++ b/mcs/class/System.Data/Microsoft.SqlServer.Server/ChangeLog
@@ -1,8 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* InvalidUdtException.cs: fix namespace typo, and mark all ctors
-	as internal (since none are public in corcompare.)
-
 2005-09-02 Umadevi S <sumadevi@novell.com>
 	* Added SqlTriggerContext.cs,SqlProcedureAttribute.cs,SqlTriggerAttribute.cs
 
diff --git a/mcs/class/System.Data/Microsoft.SqlServer.Server/InvalidUdtException.cs b/mcs/class/System.Data/Microsoft.SqlServer.Server/InvalidUdtException.cs
index 643252fbb41..92ad9af24b6 100644
--- a/mcs/class/System.Data/Microsoft.SqlServer.Server/InvalidUdtException.cs
+++ b/mcs/class/System.Data/Microsoft.SqlServer.Server/InvalidUdtException.cs
@@ -36,26 +36,25 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Microsoft.SqlServer.Server {
-	[Serializable]
+namespace Micrsoft.SqlServer.Server {
 	public sealed class InvalidUdtException : SystemException
 	{
 		#region constructors 
 		
 		[MonoTODO]
-		internal InvalidUdtException ()
+		public InvalidUdtException ()
 		{}
 		
 		[MonoTODO]
-		internal InvalidUdtException (string message)	
+		public InvalidUdtException (string message)	
 		{}
 
 		[MonoTODO]
-		internal InvalidUdtException (string message, Exception innerException)
+		public InvalidUdtException (string message, Exception innerException)
 		{}
 
 		[MonoTODO]
-		internal InvalidUdtException (Type t, string reason)
+		public InvalidUdtException (Type t, string reason)
 		{}
 
 		#endregion
diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs
index 2f7e35f2693..ffb3e1e44db 100644
--- a/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs
+++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs
@@ -196,7 +196,7 @@ namespace Mono.Data.SqlExpressions {
 			return res;
 		}
 
-		public override void ResetExpression ()
+		public override Void ResetExpression ()
 		{
 			if (table != null)
 				InvalidateCache (table, null);
diff --git a/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs b/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
index c12cb34c49a..3d3b0adb43f 100644
--- a/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
+++ b/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
@@ -35,8 +35,8 @@
 namespace System.Data.Common {
 	public enum CatalogLocation 
 	{
-		End = 2,
-		Start = 1
+		End,
+		Start
 	}
 }
 
diff --git a/mcs/class/System.Data/System.Data.Common/ChangeLog b/mcs/class/System.Data/System.Data.Common/ChangeLog
index 6f16c2a223c..0dae35564ed 100644
--- a/mcs/class/System.Data/System.Data.Common/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Common/ChangeLog
@@ -1,68 +1,3 @@
-2006-02-22  Senganal T <tsenganal@novell.com>
-
-	* DbDataAdapter.cs :
-		- FillTable : Move BeginLoadData, EndLoadData outside the loop. Also,
-		move EndLoadData outsidet try,catch block. FillError is only for errors
-		occuring during loading the data into datatable.
-	* Key.cs :
-		- Set Default value of RowStateFilter to (CurrentRos | OriginalRows).
-		- ContainsVersion : If RowStateFilter is set to default value, return true
-		for Modified Rows as they can contain Default/Original versions.
-
-2006-02-18  Raja R Harinath  <harinath@gmail.com>
-
-	* DbConnectionStringBuilder.cs (ICollection.CopyTo): Use
-	_dictionary, not 'this' in cast.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DbDataAdapter.cs: more 2.0 cleanup.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DataAdapter.cs, DataColumnMappingCollection.cs,
-	DataColumnMapping.cs, DataTableMappingCollection.cs,
-	DataTableMapping.cs, DbCommandBuilder.cs,
-	DbConnectionStringBuilder.cs, DbParameterCollection.cs,
-	DbParameter.cs: pretty major attribute work.
-	
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DbProviderFactory.cs: remove two methods.  and mark the
-	DbProviderSupportedClasses ctor as internal since it's not part of
-	the public api.
-
-	* DbTable.cs: remove this class from 2.0 build.. leave it for the
-	JVM build, I guess?
-
-	* RowUpdatingEventArgs.cs: this class isn't abstract in 2.0.
-
-	* RowUpdatedEventArgs.cs: this class isn't abstract in 2.0.
-
-	* SupportedJoinOperators.cs: new 2.0 enum.
-
-	* CatalogLocation.cs: fix enum values.
-
-	* GroupByBehavior.cs: same.
-
-	* IdentifierCase.cs: same.
-
-	* SchemaTableColumn.cs: class is static, not sealed.  and add
-	missing elements.
-	
-	* SchemaTableOptionalColumn.cs: same.
-	
-	* DbDataReader.cs: oops, add back in VisibleFieldCount (i missed
-	it in the corcompare output), add EditorBrowsable attributes all
-	over the place, and fix some method signatures.
-
-	* DbDataUpdatableRecord.cs: remove this 2.0 file.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DbDataReader.cs: remove VisibleFieldCount attribute, and remove
-	IDataReader2 and IDataRecord2 interfaces.
-	
 2006-02-13  Senganal T  <tsenganal@novell.com>
 
 	* DbDataAdapter.cs :
@@ -75,7 +10,6 @@
 			AddWithKey
 
 2006-01-31  Senganal T  <tsenganal@novell.com>
-
 	* DbDataAdapter.cs :
 		- Corrected an error in the prev checkin.. Fixes #77415
 
diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
index 32b1957f0b8..7c1e7771427 100644
--- a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
@@ -40,11 +40,7 @@ namespace System.Data.Common
 	/// <summary>
 	/// Represents a set of data commands and a database connection that are used to fill the DataSet and update the data source.
 	/// </summary>
-	public
-#if !NET_2_0
-	abstract
-#endif
-	class DataAdapter : Component, IDataAdapter
+	public abstract class DataAdapter : Component, IDataAdapter
 	{
 		#region Fields
 
@@ -92,9 +88,7 @@ namespace System.Data.Common
 		#region Properties
 
 		[DataCategory ("Fill")]
-#if !NET_2_0
 		[DataSysDescription ("Whether or not Fill will call DataRow.AcceptChanges.")]
-#endif
 		[DefaultValue (true)]
 		public bool AcceptChangesDuringFill {
 			get { return acceptChangesDuringFill; }
@@ -102,7 +96,6 @@ namespace System.Data.Common
 		}
 
 #if NET_2_0
-		[DefaultValue (true)]
 		public bool AcceptChangesDuringUpdate {
 			get { return acceptChangesDuringUpdate; }
 			set { acceptChangesDuringUpdate = value; }
@@ -110,9 +103,7 @@ namespace System.Data.Common
 #endif
 
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescription ("Whether or not to continue to the next DataRow when the Update events, RowUpdating and RowUpdated, Status is UpdateStatus.ErrorsOccurred.")]
-#endif
 		[DefaultValue (false)]
 		public bool ContinueUpdateOnError {
 			get { return continueUpdateOnError; }
@@ -120,7 +111,6 @@ namespace System.Data.Common
 		}
 
 #if NET_2_0
-		[RefreshProperties (RefreshProperties.All)]
 		public LoadOption FillLoadOption {
 			get { return fillLoadOption; }
 			set { fillLoadOption = value; }
@@ -132,9 +122,7 @@ namespace System.Data.Common
 		}
 
 		[DataCategory ("Mapping")]
-#if !NET_2_0
 		[DataSysDescription ("The action taken when a table or column in the TableMappings is missing.")]
-#endif
 		[DefaultValue (MissingMappingAction.Passthrough)]
 		public MissingMappingAction MissingMappingAction {
 			get { return missingMappingAction; }
@@ -146,9 +134,7 @@ namespace System.Data.Common
 		}
 
 		[DataCategory ("Mapping")]
-#if !NET_2_0
 		[DataSysDescription ("The action taken when a table or column in the DataSet is missing.")]
-#endif
 		[DefaultValue (MissingSchemaAction.Add)]
 		public MissingSchemaAction MissingSchemaAction {
 			get { return missingSchemaAction; }
@@ -160,7 +146,6 @@ namespace System.Data.Common
 		}
 
 #if NET_2_0
-		[DefaultValue (false)]
 		public virtual bool ReturnProviderSpecificTypes {
 			get { return returnProviderSpecificTypes; }
 			set { returnProviderSpecificTypes = value; }
@@ -168,9 +153,7 @@ namespace System.Data.Common
 #endif
 
 		[DataCategory ("Mapping")]
-#if !NET_2_0
 		[DataSysDescription ("How to map source table to DataSet table.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		public DataTableMappingCollection TableMappings {
 			get { return tableMappings; }
@@ -209,21 +192,10 @@ namespace System.Data.Common
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
-		protected virtual bool ShouldSerializeTableMappings ()
-		{
-			throw new NotImplementedException ();
-		}
-
+		public abstract int Fill (DataSet dataSet);
 
 #if NET_2_0
 		[MonoTODO]
-		public virtual int Fill (DataSet dataSet)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
 		protected virtual int Fill (DataTable dataTable, IDataReader dataReader)
 		{
 			throw new NotImplementedException ();
@@ -242,30 +214,37 @@ namespace System.Data.Common
 		}
 
 		[MonoTODO]
-		protected virtual DataTable FillSchema (DataTable dataTable, SchemaType schemaType, IDataReader dataReader)
+		public static int FillDataSet (IDataReader dataReader, LoadOption fillLoadOption, DataSet dataSet)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		protected virtual DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType, string srcTable, IDataReader dataReader)
+		public static int FillDataTable (IDataReader dataReader, LoadOption fillLoadOption, DataTable[] dataTables)
 		{
 			throw new NotImplementedException ();
 		}
+#endif
+
+		public abstract DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType);
 
+#if NET_2_0
 		[MonoTODO]
-		public virtual DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType)
+		protected virtual DataTable FillSchema (DataTable dataTable, SchemaType schemaType, IDataReader dataReader)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
-		public virtual IDataParameter[] GetFillParameters ()
+		protected virtual DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType, string srcTable, IDataReader dataReader)
 		{
 			throw new NotImplementedException ();
 		}
+#endif
 
+		public abstract IDataParameter[] GetFillParameters ();
+
+#if NET_2_0
 		[MonoTODO]
 		protected bool HasTableMappings ()
 		{
@@ -280,37 +259,31 @@ namespace System.Data.Common
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public void ResetFillLoadOption ()
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual bool ShouldSerializeAcceptChangesDuringFill ()
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual bool ShouldSerializeFillLoadOption ()
 		{
 			throw new NotImplementedException ();
 		}
+#endif
 
 		[MonoTODO]
-		public virtual int Update (DataSet dataSet)
+		protected virtual bool ShouldSerializeTableMappings ()
 		{
 			throw new NotImplementedException ();
 		}
-#else
-		public abstract int Fill (DataSet dataSet);
-		public abstract DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType);
-		public abstract IDataParameter[] GetFillParameters ();
+
 		public abstract int Update (DataSet dataSet);
-#endif
 
 		#endregion
 		
diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
index 974e1fc43a2..52d940f4200 100644
--- a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
@@ -64,18 +64,14 @@ namespace System.Data.Common {
 
 		#region Properties
 
-#if !NET_2_0
 		[DataSysDescription ("DataColumn.ColumnName")]
-#endif
 		[DefaultValue ("")]
 		public string DataSetColumn {
 			get { return dataSetColumn; }
 			set { dataSetColumn = value; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Source column name - case sensitive.")]
-#endif
 		[DefaultValue ("")]
 		public string SourceColumn {
 			get { return sourceColumn; }
@@ -100,7 +96,6 @@ namespace System.Data.Common {
 
 #if NET_2_0
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
 		public static DataColumn GetDataColumnBySchemaAction (string sourceColumn, string dataSetColumn, DataTable dataTable, Type dataType, MissingSchemaAction schemaAction)
 		{
 			throw new NotImplementedException ();
diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
index 79f60b6ef47..f3d260cf23d 100644
--- a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
@@ -62,18 +62,14 @@ namespace System.Data.Common {
 		#region Properties
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The number of items in the collection")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public int Count {
 			get { return list.Count; }
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The specified DataColumnMapping object.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DataColumnMapping this [int index] {
 			get { return (DataColumnMapping)(list[index]); }
@@ -86,9 +82,7 @@ namespace System.Data.Common {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
                 [DataSysDescription ("The specified DataColumnMapping object.")]
-#endif
                 [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DataColumnMapping this [string sourceColumn] {
 			get {
@@ -224,7 +218,6 @@ namespace System.Data.Common {
 
 #if NET_2_0
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
 		public static DataColumn GetDataColumn (DataColumnMappingCollection columnMappings, string sourceColumn, Type dataType, DataTable dataTable, MissingMappingAction mappingAction, MissingSchemaAction schemaAction)
 		{
 			throw new NotImplementedException ();
diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs
index 879c18f1ab8..45669b83e79 100644
--- a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs
@@ -73,17 +73,13 @@ namespace System.Data.Common {
 
 		#region Properties
 
-#if !NET_2_0
 		[DataSysDescription ("Individual columns mappings when this table mapping is matched.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		public DataColumnMappingCollection ColumnMappings {
 			get { return columnMappings; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("DataTable.TableName")]
-#endif
 		[DefaultValue ("")]
 		public string DataSetTable {
 			get { return dataSetTable; } 
@@ -94,9 +90,7 @@ namespace System.Data.Common {
 			get { return ColumnMappings; }
 		}
 	
-#if !NET_2_0
 		[DataSysDescription ("The DataTableMapping source table name. This name is case sensitive.")]
-#endif
 		[DefaultValue ("")]
 		public string SourceTable {
 			get { return sourceTable; }
diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs
index 3e06e344ff1..1011123f5f4 100644
--- a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs
@@ -63,18 +63,14 @@ namespace System.Data.Common {
 		#region Properties
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The number of items in the collection")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public int Count {
 			get { return mappings.Count; }
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The specified DataTableMapping object")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DataTableMapping this [int index] {
 			get { return (DataTableMapping)(mappings[index]); }
@@ -87,9 +83,7 @@ namespace System.Data.Common {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The specified DataTableMapping object")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DataTableMapping this [string sourceTable] {
 			get { return (DataTableMapping) sourceTables[sourceTable]; }
diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
index 6ca52ca58a0..4a8b3a5bd34 100644
--- a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
@@ -50,50 +50,48 @@ namespace System.Data.Common {
 		#region Properties
 
 		[MonoTODO]
-		[DefaultValue (CatalogLocation.Start)]
 		public virtual CatalogLocation CatalogLocation {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
-		[DefaultValue (".")]
 		public virtual string CatalogSeparator {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
-		[DefaultValue (ConflictOption.CompareAllSearchableValues)]
 		public virtual ConflictOption ConflictOption {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
 		public DbDataAdapter DataAdapter {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
-		[DefaultValue ("")]
 		public virtual string QuotePrefix {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
-		[DefaultValue ("")]
 		public virtual string QuoteSuffix {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
-		[DefaultValue (".")]
+		public SchemaLocation SchemaLocation {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
 		public virtual string SchemaSeparator {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
diff --git a/mcs/class/System.Data/System.Data.Common/DbConnectionStringBuilder.cs b/mcs/class/System.Data/System.Data.Common/DbConnectionStringBuilder.cs
index 8aefdc7c1c6..6d480abbf07 100644
--- a/mcs/class/System.Data/System.Data.Common/DbConnectionStringBuilder.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbConnectionStringBuilder.cs
@@ -40,7 +40,12 @@ using System.Data.Common;
 namespace System.Data.Common
 {
 
-        public class DbConnectionStringBuilder : IDictionary, ICollection, IEnumerable, ICustomTypeDescriptor
+        [CLSCompliant (true)]
+        public class DbConnectionStringBuilder : IDictionary, ICollection, IEnumerable,
+                IDictionary<string, object>,
+                ICollection<KeyValuePair<string, object>>,
+                IEnumerable<KeyValuePair<string, object>>,
+                ICustomTypeDescriptor
         {
                 #region Fields
                 Dictionary<string, object> _dictionary = null;
@@ -65,17 +70,11 @@ namespace System.Data.Common
                 #endregion // Constructors
 
                 #region Properties
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		[Browsable (false)]
-		[DesignOnly (true)]
                 public bool BrowsableConnectionString
                 {
                         get { throw new NotImplementedException (); }
                         set { throw new NotImplementedException (); }
                 }
-
-		[RefreshProperties (RefreshProperties.All)]
                 public string ConnectionString
                 {
                         get
@@ -103,26 +102,21 @@ namespace System.Data.Common
 				}
 			}
                 }
-
-		[Browsable (false)]
                 public virtual int Count
                 {
                         get { return _dictionary.Count; }
                 }
 
-		[Browsable (false)]
                 public virtual bool IsFixedSize
                 {
                         get { return false; }
                 }
 
-		[Browsable (false)]
                 public bool IsReadOnly
                 {
                         get { throw new NotImplementedException (); }
                 }
 
-		[Browsable (false)]
                 public virtual object this [string keyword]
                 {
                         get
@@ -134,11 +128,19 @@ namespace System.Data.Common
                         }
                         set { Add (keyword, value); }
                 }
-
-		[Browsable (false)]
                 public virtual ICollection Keys
                 {
-                        get { return _dictionary.Keys; }
+                        get { return (ICollection) ( (IDictionary <string, object>)_dictionary).Keys; }
+                }
+
+                ICollection<string> IDictionary<string, object>.Keys
+                {
+                        get { return (ICollection<string>) ( (IDictionary<string, object>) _dictionary).Keys; }
+                }
+
+                ICollection<object> IDictionary<string, object>.Values
+                {
+                        get { return (ICollection<object>) ( (IDictionary<string, object>)_dictionary).Values; }
                 }
 
                 bool ICollection.IsSynchronized
@@ -157,10 +159,9 @@ namespace System.Data.Common
                         set { this [(string) keyword] = value; }
                 }
 
-		[Browsable (false)]
                 public virtual ICollection Values
                 {
-                        get { return _dictionary.Values; }
+                        get { return (ICollection) ( (IDictionary<string, object>)_dictionary).Values; }
                 }
 
                 #endregion // Properties
@@ -179,13 +180,6 @@ namespace System.Data.Common
 
                 }
 
-		[MonoTODO]
-		public static void AppendKeyValuePair(StringBuilder builder, string keyword, string value,
-						      bool useOdbcRules)
-		{
-			throw new NotImplementedException ();
-		}
-
                 public static void AppendKeyValuePair (StringBuilder builder, string keyword, string value)
                 {
                         if (builder.Length > 0) {
@@ -228,30 +222,65 @@ namespace System.Data.Common
                         return ret;
                 }
 
-		[MonoTODO]
-		protected virtual void GetProperties(Hashtable propertyDescriptors)
-		{
-			throw new NotImplementedException ();
-		}
-
                 public virtual bool Remove (string keyword)
                 {
                         return _dictionary.Remove (keyword);
                 }
 
+                [Obsolete ("Do not use. Please use the Remove method.")]
+                public virtual void Reset (string keyword)
+                {
+                        throw new NotImplementedException ();
+                }
+
                 public virtual bool ShouldSerialize (string keyword)
                 {
                         throw new NotImplementedException ();
                 }
 
+                void ICollection<KeyValuePair<string, object>>.Add (KeyValuePair<string, object> keyValuePair)
+                {
+                        Add (keyValuePair.Key, keyValuePair.Value);
+                }
+
+                bool ICollection<KeyValuePair<string, object>>.Contains (KeyValuePair<string, object> keyValuePair)
+                {
+                        return ContainsKey (keyValuePair.Key);
+                }
+
+                void ICollection<KeyValuePair<string, object>>.CopyTo (KeyValuePair<string, object> [] array, int index)
+                {
+                        if (index + Count > array.Length)
+                                throw new ArgumentException ("The destination does not have enough length!");
+                        foreach (KeyValuePair<string, object> keyValue in this) {
+                                array [index++] = keyValue;
+                        }
+                }
+
+                bool ICollection<KeyValuePair<string, object>>.Remove (KeyValuePair<string, object> keyValuePair)
+                {
+                        return Remove (keyValuePair.Key);
+                }
+
+                IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator ()
+                {
+                        return _dictionary.GetEnumerator ();
+                }
+
                 void ICollection.CopyTo (Array array, int index)
                 {
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			KeyValuePair<string, object> [] arr = array as KeyValuePair<string, object> [];
-			if (arr == null)
-				throw new ArgumentException ("Target array type is not compatible with the type of items in the collection");
-			((ICollection<KeyValuePair<string, object>>) _dictionary).CopyTo (arr, index);
+
+                        KeyValuePair <string, object> [] arr = null;
+                        try {
+                                arr = (KeyValuePair<string, object> []) array;
+                        } catch (InvalidCastException e) {
+                                throw new ArgumentException (
+                                                             "Target array type is not compatible with the type of items in the collection."
+                                                             );
+                        }
+                        ICollection<KeyValuePair<string, object>> ptr = (ICollection<KeyValuePair<string, object>>) this;
+                        ptr.CopyTo (arr, index);
+
                 }
 
                 void IDictionary.Add (object keyword, object value)
diff --git a/mcs/class/System.Data/System.Data.Common/DbConvert.cs b/mcs/class/System.Data/System.Data.Common/DbConvert.cs
new file mode 100644
index 00000000000..d88969edc76
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DbConvert.cs
@@ -0,0 +1,330 @@
+//

+// System.Data.Common.DbConvert

+//

+// Author:

+//   Boris Kirzner (borisk@mainsoft.com)

+//

+

+using System;

+

+using java.io;

+using java.sql;

+

+namespace System.Data.Common

+{

+	internal class DbConvert

+	{

+		#region Fields

+

+		const long JAVA_MIN_MILLIS_UTC = -62135769600000L; // java.sql.Timestamp.valueOf("0001-01-01 00:00:00.000000000").getTime() at Greenwich time zone.

+		static readonly long TIMEZONE_RAW_OFFSET;

+		// .NET milliseconds value of DateTime(1582,1,1,0,0,0,0).Ticks/TimeSpan.TicksPerMillisecond			

+		const long CLR_MILLIS_1582 = 49891507200000L;

+		const long MILLIS_PER_TWO_DAYS = 2 * TimeSpan.TicksPerDay / TimeSpan.TicksPerMillisecond; // 172800000L;

+		internal static readonly java.util.TimeZone DEFAULT_TIME_ZONE;

+

+		#endregion // Fields

+

+		#region Methods

+

+		static DbConvert()

+		{

+			DEFAULT_TIME_ZONE = java.util.SimpleTimeZone.getDefault();			

+			TIMEZONE_RAW_OFFSET = (long)DEFAULT_TIME_ZONE.getRawOffset();						

+		}

+

+		// The diff between .Net and Java goes as the following:

+		//  * at 1582: java has 10 days less than .net

+		//  * below 1500 (exept 1200,800,400) : each 100'th year java adds 1 day over .net. 

+		// Current implementation compatible with .net in 1-99 and since 1582. In 100-1582 we're not compatible with .Ner nor with Java

+

+		internal static long JavaMillisToClrMillis(long javaMillis)

+		{

+			return JavaMillisToClrMillisUTC(javaMillis) + TIMEZONE_RAW_OFFSET;

+		}

+

+		internal static long JavaMillisToClrMillisUTC(long javaMillis) {

+			long clrMillis = javaMillis - JAVA_MIN_MILLIS_UTC;

+			if (clrMillis > CLR_MILLIS_1582) {

+				clrMillis -= MILLIS_PER_TWO_DAYS;

+			}

+			return clrMillis;

+		}

+

+		internal static long ClrMillisToJavaMillis(long clrMillis)

+		{

+			return ClrMillisToJavaMillisUTC(clrMillis) - TIMEZONE_RAW_OFFSET;

+		}

+

+		internal static long ClrMillisToJavaMillisUTC(long clrMillis) {

+			long javaMillis = clrMillis + JAVA_MIN_MILLIS_UTC;

+			if (clrMillis > CLR_MILLIS_1582) {

+				javaMillis += MILLIS_PER_TWO_DAYS;

+			}

+			return javaMillis;

+		}

+

+		internal static java.sql.Time ClrTicksToJavaTime(long ticks) {

+			return new Time((ticks / TimeSpan.TicksPerMillisecond)

+				- DEFAULT_TIME_ZONE.getRawOffset());

+		}

+

+		internal static java.sql.Date ClrTicksToJavaDate(long ticks) {

+			java.sql.Date d = new java.sql.Date(0);

+			ClrTicksToJavaDate(d, ticks);

+			return d;

+		}

+

+		internal static java.sql.Timestamp ClrTicksToJavaTimestamp(long ticks)

+		{

+			java.sql.Timestamp ts = new java.sql.Timestamp(0);

+			ClrTicksToJavaDate(ts, ticks);

+

+//			int nanos = (int)(ticks % TimeSpan.TicksPerMillisecond) * 100;

+//			ts.setNanos(javaTimestamp.getNanos() + nanos);

+

+			return ts;

+		}

+

+		internal static void ClrTicksToJavaDate(java.util.Date d, long ticks) {

+			long millis = ClrMillisToJavaMillis(ticks / TimeSpan.TicksPerMillisecond);

+

+			d.setTime(millis);

+			if (DEFAULT_TIME_ZONE.inDaylightTime(d)) {

+				millis -= DEFAULT_TIME_ZONE.getDSTSavings();

+				d.setTime(millis);

+			}

+		}

+		

+		internal static long JavaTimestampToClrTicks(java.sql.Timestamp ts)

+		{

+			long ticks = JavaDateToClrTicks(ts);

+			// Extra ticks, for dbs that can save them. 

+			// We do not use it, since .net does not saves ticks for fractial milliseconds

+			// long ticksLessThanMilliseconds = (ts.getNanos()*100) % TimeSpan.TicksPerMillisecond;

+			// ticks += ticksLessThanMilliseconds;

+			

+			return ticks;

+		}

+

+		internal static long JavaDateToClrTicks(java.util.Date d) {

+			long millis = JavaMillisToClrMillis(d.getTime());

+			if (DEFAULT_TIME_ZONE.inDaylightTime(d)) {

+				millis += DEFAULT_TIME_ZONE.getDSTSavings();

+			}

+			return millis * TimeSpan.TicksPerMillisecond;

+		}

+

+		internal static long JavaTimeToClrTicks(java.sql.Time t) {

+			return (t.getTime() + DEFAULT_TIME_ZONE.getRawOffset())

+				* TimeSpan.TicksPerMillisecond;

+		}

+

+		internal protected static Type JavaSqlTypeToClrType(int sqlTypeValue)

+		{

+			DbTypes.JavaSqlTypes sqlType = (DbTypes.JavaSqlTypes)sqlTypeValue;

+

+			switch (sqlType) {

+				case DbTypes.JavaSqlTypes.ARRAY : return typeof (java.sql.Array);

+				case DbTypes.JavaSqlTypes.BIGINT : return DbTypes.TypeOfInt64;

+				case DbTypes.JavaSqlTypes.BINARY : return DbTypes.TypeOfByteArray;

+				case DbTypes.JavaSqlTypes.BIT : return DbTypes.TypeOfBoolean;

+				case DbTypes.JavaSqlTypes.BLOB : return DbTypes.TypeOfByteArray;

+				case DbTypes.JavaSqlTypes.BOOLEAN : return DbTypes.TypeOfBoolean;

+				case DbTypes.JavaSqlTypes.CHAR : return DbTypes.TypeOfString;

+				case DbTypes.JavaSqlTypes.CLOB : return DbTypes.TypeOfString;

+//				case DbTypes.JavaSqlTypes.DATALINK :

+				case DbTypes.JavaSqlTypes.DATE : return DbTypes.TypeOfDateTime;

+				case DbTypes.JavaSqlTypes.DECIMAL : return DbTypes.TypeOfDecimal;

+//				case DbTypes.JavaSqlTypes.DISTINCT :

+				case DbTypes.JavaSqlTypes.DOUBLE : return DbTypes.TypeOfDouble;

+				case DbTypes.JavaSqlTypes.FLOAT : return DbTypes.TypeOfDouble;

+				case DbTypes.JavaSqlTypes.INTEGER : return DbTypes.TypeOfInt32;

+//				case DbTypes.JavaSqlTypes.JAVA_OBJECT :

+				case DbTypes.JavaSqlTypes.LONGVARBINARY : return DbTypes.TypeOfByteArray;

+				case DbTypes.JavaSqlTypes.LONGVARCHAR : return DbTypes.TypeOfString;

+				case DbTypes.JavaSqlTypes.NULL : return null;

+				case DbTypes.JavaSqlTypes.NUMERIC : return DbTypes.TypeOfDecimal;

+//				case DbTypes.JavaSqlTypes.OTHER :

+				case DbTypes.JavaSqlTypes.REAL : return DbTypes.TypeOfSingle;

+				case DbTypes.JavaSqlTypes.REF : return typeof (java.sql.Ref);

+				case DbTypes.JavaSqlTypes.SMALLINT : return DbTypes.TypeOfInt16;

+				case DbTypes.JavaSqlTypes.STRUCT : return typeof (java.sql.Struct);

+				case DbTypes.JavaSqlTypes.TIME : return DbTypes.TypeOfTimespan;

+				case DbTypes.JavaSqlTypes.TIMESTAMP : return DbTypes.TypeOfDateTime;

+				case DbTypes.JavaSqlTypes.TINYINT : return DbTypes.TypeOfByte;

+				case DbTypes.JavaSqlTypes.VARBINARY : return DbTypes.TypeOfByteArray;

+				case DbTypes.JavaSqlTypes.VARCHAR : return DbTypes.TypeOfString;

+				default : return DbTypes.TypeOfObject;

+			}

+

+		}

+

+

+		internal protected static object JavaResultSetToClrWrapper(CallableStatement results,int columnIndex,DbTypes.JavaSqlTypes javaSqlType,int maxLength ,ResultSetMetaData resultsMetaData)

+		{

+			object returnValue = null;	

+			sbyte[] sbyteArray;

+			long milliseconds;

+			long ticks;

+			string s;

+			columnIndex++; //jdbc style

+			switch (javaSqlType) {

+				case DbTypes.JavaSqlTypes.ARRAY :

+					returnValue = results.getArray(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.BIGINT :

+					returnValue = results.getLong(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.BINARY :

+				case DbTypes.JavaSqlTypes.VARBINARY :

+				case DbTypes.JavaSqlTypes.LONGVARBINARY :

+					// FIXME : comsider using maxLength

+					sbyteArray = results.getBytes(columnIndex);

+					if (sbyteArray != null) {

+						returnValue = vmw.common.TypeUtils.ToByteArray(sbyteArray);

+					}

+					break;

+				case DbTypes.JavaSqlTypes.BIT :

+					returnValue = results.getBoolean(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.BLOB :

+					// FIXME : comsider using maxLength

+					java.sql.Blob blob = results.getBlob(columnIndex);

+					if (blob != null) {

+						InputStream input = blob.getBinaryStream();					

+						if (input == null) {

+							returnValue = new byte[0];

+						}

+						else {

+							long length = blob.length();

+							byte[] byteValue = new byte[length];

+							sbyte[] sbyteValue = vmw.common.TypeUtils.ToSByteArray(byteValue);

+							input.read(sbyteValue);

+							returnValue = byteValue;

+						}

+					}

+					break;	

+				case DbTypes.JavaSqlTypes.CHAR :						

+					if (resultsMetaData != null && "uniqueidentifier".Equals(resultsMetaData.getColumnTypeName(columnIndex))) {

+						returnValue = new Guid(results.getString(columnIndex));

+					}

+					else {

+						// Oracle Jdbc driver returns extra trailing 0 chars for NCHAR columns, so we threat this at parameter.Size level

+						s = results.getString(columnIndex);

+						if ((s != null) && (maxLength < s.Length)) {

+							s = s.Substring(0,maxLength);

+						}

+						returnValue = s;

+					}

+					break;

+				case DbTypes.JavaSqlTypes.CLOB :

+					// FIXME : comsider using maxLength

+					java.sql.Clob clob = results.getClob(columnIndex);

+					if (clob != null) {

+						java.io.Reader reader = clob.getCharacterStream();					

+						if (reader == null) {

+							returnValue = String.Empty;

+						}

+						else {

+							long length = clob.length();

+							char[] charValue = new char[length];

+							reader.read(charValue);

+							returnValue = new string(charValue);

+						}

+					}

+					break;		

+				case DbTypes.JavaSqlTypes.TIME :

+					Time t = results.getTime(columnIndex);

+					if (t != null) {

+						returnValue = new TimeSpan(JavaTimeToClrTicks(t));

+					}

+					break;	

+				case DbTypes.JavaSqlTypes.DATE :

+					Date d = results.getDate(columnIndex);

+					if (d != null) {

+						returnValue = new DateTime(JavaDateToClrTicks(d));

+					}

+					break;

+				case DbTypes.JavaSqlTypes.TIMESTAMP :				

+					Timestamp ts = results.getTimestamp(columnIndex);

+					if (ts != null) {

+						returnValue = new DateTime(JavaTimestampToClrTicks(ts));

+					}

+					break;		

+				case DbTypes.JavaSqlTypes.DECIMAL :

+				case DbTypes.JavaSqlTypes.NUMERIC :

+					// java.sql.Types.NUMERIC (2), columnTypeName NUMBER, columnClassName java.math.BigDecimal 

+					// therefore we rely on scale

+					if (resultsMetaData != null &&  resultsMetaData.getScale(columnIndex) == -127) {

+						// Oracle db type FLOAT

+						returnValue = results.getDouble(columnIndex);

+					}

+					else {

+						java.math.BigDecimal bigDecimal = results.getBigDecimal(columnIndex);

+						if (bigDecimal != null) {

+							returnValue = vmw.common.PrimitiveTypeUtils.BigDecimalToDecimal(bigDecimal);

+						}

+					}

+					break;		

+				case DbTypes.JavaSqlTypes.DISTINCT :

+					returnValue = results.getObject(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.DOUBLE :

+					returnValue = results.getDouble(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.FLOAT :

+					//float f = results.getFloat(columnIndex);

+					returnValue = results.getDouble(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.INTEGER :

+					returnValue = results.getInt(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.JAVA_OBJECT :

+					returnValue = results.getObject(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.LONGVARCHAR :

+					returnValue = results.getString(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.NULL :

+					returnValue = DBNull.Value;

+					break;

+				case DbTypes.JavaSqlTypes.OTHER :

+					returnValue = results.getObject(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.REAL :

+					returnValue = results.getFloat(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.REF :

+					returnValue = results.getRef(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.SMALLINT :

+					returnValue = results.getShort(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.STRUCT :

+					returnValue = results.getObject(columnIndex);

+					break;

+				case DbTypes.JavaSqlTypes.TINYINT :

+					returnValue = Convert.ToByte(results.getByte(columnIndex));

+					break;

+				case DbTypes.JavaSqlTypes.VARCHAR :

+					s = results.getString(columnIndex);

+					if ((s != null) && (maxLength < s.Length)) {

+						s = s.Substring(0,maxLength);

+					}

+					returnValue = s;

+					break;

+				default :

+					returnValue = results.getObject(columnIndex);

+					break;

+			}

+				

+			if (results.wasNull() || results == null) {

+				return DBNull.Value;

+			}                

+			return  returnValue;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
index 87b5f355a11..e021bc32356 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
@@ -69,6 +69,20 @@ namespace System.Data.Common {
 		#region Properties
 
 #if NET_2_0
+		[MonoTODO]
+		protected virtual IDbConnection BaseConnection {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		public IDbConnection Connection { 
+			get { return BaseConnection; }
+			set { BaseConnection = value; }
+		}
+#endif
+
+
+#if NET_2_0
 		protected internal CommandBehavior FillCommandBehavior {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
@@ -78,6 +92,17 @@ namespace System.Data.Common {
 
 #if NET_2_0
 		[MonoTODO]
+		protected virtual IDbCommand this [[Optional] StatementType statementType] {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		protected virtual DbProviderFactory ProviderFactory {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
 		IDbCommand IDbDataAdapter.SelectCommand {
 			get { return ((IDbDataAdapter) this).SelectCommand; }
 			set { throw new NotImplementedException(); }
@@ -102,39 +127,36 @@ namespace System.Data.Common {
 		}
 		
 		[MonoTODO]
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand SelectCommand {
 			get { return (DbCommand) ((IDbDataAdapter) this).SelectCommand; }
 			set { throw new NotImplementedException(); }
 		}
 
 		[MonoTODO]
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand DeleteCommand {
 			get { return (DbCommand) ((IDbDataAdapter) this).DeleteCommand; }
 			set { throw new NotImplementedException(); }
 		}
 
 		[MonoTODO]
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand InsertCommand {
 			get { return (DbCommand) ((IDbDataAdapter) this).InsertCommand; }
 			set { throw new NotImplementedException(); }
 		}
 
 		[MonoTODO]
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand UpdateCommand {
 			get { return (DbCommand) ((IDbDataAdapter) this).UpdateCommand; }
 			set { throw new NotImplementedException(); }
 		}
 
 		[MonoTODO]
-		[DefaultValue (1)]
+		public IDbTransaction Transaction {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
 		public int UpdateBatchSize {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
@@ -173,40 +195,16 @@ namespace System.Data.Common {
 		#region Methods
 
 #if NET_2_0
-		protected virtual RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command,
-									     StatementType statementType,
-									     DataTableMapping tableMapping)
-		{
-			return new RowUpdatedEventArgs (dataRow, command, statementType, tableMapping);
-		}
-
-		protected virtual RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command,
-									       StatementType statementType,
-									       DataTableMapping tableMapping)
-		{
-			return new RowUpdatingEventArgs (dataRow, command, statementType, tableMapping);
-		}
-
 		[MonoTODO]
-		protected virtual void OnRowUpdated (RowUpdatedEventArgs value)
+		public virtual void BeginInit ()
 		{
+			throw new NotImplementedException ();
 		}
+#endif
 
-		[MonoTODO]
-		protected virtual void OnRowUpdating (RowUpdatingEventArgs value)
-		{
-		}
-#else
-		protected abstract RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command,
-									      StatementType statementType,
-									      DataTableMapping tableMapping);
-		protected abstract RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command,
-										StatementType statementType,
-										DataTableMapping tableMapping);
+		protected abstract RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping);
+		protected abstract RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping);
 
-		protected abstract void OnRowUpdated (RowUpdatedEventArgs value);
-		protected abstract void OnRowUpdating (RowUpdatingEventArgs value);
-#endif
 		private FillErrorEventArgs CreateFillErrorEvent (DataTable dataTable, object[] values, Exception e)
 		{
 			FillErrorEventArgs args = new FillErrorEventArgs (dataTable, values);
@@ -238,6 +236,14 @@ namespace System.Data.Common {
 			}
 		}
 
+#if NET_2_0
+		[MonoTODO]
+		public virtual void EndInit ()
+		{
+			throw new NotImplementedException ();
+		}
+#endif
+
 		public override int Fill (DataSet dataSet)
 		{
 			return Fill (dataSet, 0, 0, DefaultSourceTableName, ((IDbDataAdapter) this).SelectCommand, CommandBehavior.Default);
@@ -259,7 +265,7 @@ namespace System.Data.Common {
 #if NET_2_0
 		protected override int Fill (DataTable dataTable, IDataReader dataReader) 
 #else
-		protected virtual int Fill (DataTable dataTable, IDataReader dataReader) 
+			protected virtual int Fill (DataTable dataTable, IDataReader dataReader) 
 #endif
 		{
 			if (dataReader.FieldCount == 0) {
@@ -408,12 +414,13 @@ namespace System.Data.Common {
 				dataReader.Read ();
 			}
 
-			dataTable.BeginLoadData ();
 			while (dataReader.Read () && (maxRecords == 0 || (counter - counterStart) < maxRecords)) {
 				try {
+					dataTable.BeginLoadData ();
 					dataTable.LoadDataRow (dataReader, sortedMapping, length, AcceptChangesDuringFill);
+					dataTable.EndLoadData ();
 					counter++;
-				}
+				} 
 				catch (Exception e) {
 					object[] readerArray = new object[dataReader.FieldCount];
 					object[] tableArray = new object[mapping.Length];
@@ -427,22 +434,20 @@ namespace System.Data.Common {
 					}
 					FillErrorEventArgs args = CreateFillErrorEvent (dataTable, tableArray, e);
 					OnFillError (args);
-
-					// if args.Continue is not set to true or if a handler is not set, rethrow the error..
-					if(!args.Continue)
-						throw e;
+					if(!args.Continue) {
+						return false;
+					}
 				}
 			}
-			dataTable.EndLoadData ();
 			return true;
 		}
 
 #if NET_2_0
-		/// <summary>
-		///     Fills the given datatable using values from reader. if a value 
-		///     for a column is  null, that will be filled with default value. 
-		/// </summary>
-		/// <returns>No. of rows affected </returns>
+                /// <summary>
+                ///     Fills the given datatable using values from reader. if a value 
+                ///     for a column is  null, that will be filled with default value. 
+                /// </summary>
+                /// <returns>No. of rows affected </returns>
 		internal static int FillFromReader (DataTable table,
                                                     IDataReader reader,
                                                     int start, 
@@ -580,6 +585,20 @@ namespace System.Data.Common {
 			return (DataTable[]) output.ToArray (typeof (DataTable));
 		}
 
+#if NET_2_0
+		[MonoTODO]
+		public DataSet GetDataSet ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataTable GetDataTable ()
+		{
+			throw new NotImplementedException ();
+		}
+#endif
+
 		private string SetupSchema (SchemaType schemaType, string sourceTableName)
 		{
 			DataTableMapping tableMapping = null;
@@ -743,7 +762,7 @@ namespace System.Data.Common {
 									if (!allowDBNull)
 										col.AllowDBNull = false;
 								}
-								
+
 								// This might not be set by all DataProviders
 								bool isHidden = false;
 								if (schemaTable.Columns.Contains ("IsHidden")) {
@@ -756,6 +775,7 @@ namespace System.Data.Common {
 									if (allowDBNull)
 										createPrimaryKey = false;
 								}
+
 							}
 							// add the ordinal of the column as a key and the index of the column in the datareader as a value.
 							mapping[col.Ordinal] = readerIndex++;
@@ -1129,6 +1149,9 @@ namespace System.Data.Common {
 		}
 #endif
 
+		protected abstract void OnRowUpdated (RowUpdatedEventArgs value);
+		protected abstract void OnRowUpdating (RowUpdatingEventArgs value);
+		
 		#endregion // Methods
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
index 342950e3d5a..03a35de427c 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
@@ -33,11 +33,10 @@
 #if NET_2_0 || TARGET_JVM
 
 using System.Collections;
-using System.ComponentModel;
 using System.Data;
 
 namespace System.Data.Common {
-	public abstract class DbDataReader : MarshalByRefObject, IDataReader, IDataRecord, IDisposable, IEnumerable
+	public abstract class DbDataReader : MarshalByRefObject, IDataReader, IDataReader2, IDataRecord, IDataRecord2, IDisposable, IEnumerable
 	{
 		#region Constructors
 
@@ -56,13 +55,10 @@ namespace System.Data.Common {
 		public abstract object this [int index] { get; }
 		public abstract object this [string name] { get; }
 		public abstract int RecordsAffected { get; }
-
 #if NET_2_0
-		[MonoTODO]
-		public virtual int VisibleFieldCount {
-			get { throw new NotImplementedException ();}
-		}
+		public abstract int VisibleFieldCount { get; }
 #endif
+
 		#endregion // Properties
 
 		#region Methods
@@ -73,9 +69,7 @@ namespace System.Data.Common {
 		public abstract long GetBytes (int i, long fieldOffset, byte[] buffer, int bufferOffset, int length);
 		public abstract char GetChar (int i);
 		public abstract long GetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length);
-
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public void Dispose ()
+		public virtual void Dispose ()
 		{
 			Dispose (true);	
 		}
@@ -87,7 +81,6 @@ namespace System.Data.Common {
 		}
 #if NET_2_0
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public DbDataReader GetData (int i)
 		{
 			throw new NotImplementedException ();
@@ -98,10 +91,7 @@ namespace System.Data.Common {
 		public abstract DateTime GetDateTime (int i);
 		public abstract decimal GetDecimal (int i);
 		public abstract double GetDouble (int i);
-
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract IEnumerator GetEnumerator ();
-
 		public abstract Type GetFieldType (int i);
 		public abstract float GetFloat (int i);
 		public abstract Guid GetGuid (int i);
@@ -113,28 +103,25 @@ namespace System.Data.Common {
 
 #if NET_2_0
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual Type GetProviderSpecificFieldType (int i)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual object GetProviderSpecificValue (int i)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual int GetProviderSpecificValues (object[] values)
 		{
 			throw new NotImplementedException ();
 		}
 	
 		[MonoTODO]
-		protected virtual DbDataReader GetDbDataReader (int ordinal)
+		public virtual int GetDbDataReader (int ordinal)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs b/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs
new file mode 100644
index 00000000000..d931dbcdfd0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs
@@ -0,0 +1,401 @@
+//
+// System.Data.Common.DbDataUpdatableRecord.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System.ComponentModel;
+
+namespace System.Data.Common {
+	public class DbDataUpdatableRecord : IDataUpdatableRecord, IDataRecord, ISetTypedData, ICustomTypeDescriptor, IGetTypedData
+	{
+		#region Properties
+
+		[MonoTODO]
+		public virtual int FieldCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object this [string x] {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object this [int x] {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual bool Updatable {
+			get { throw new NotImplementedException (); }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+
+		[MonoTODO]
+		public virtual bool GetBoolean (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual byte GetByte (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual long GetBytes (int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual char GetChar (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual long GetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual IDataReader GetData (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetDataTypeName (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual DateTime GetDateTime (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual decimal GetDecimal (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual double GetDouble (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual Type GetFieldType (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual float GetFloat (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual Guid GetGuid (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual short GetInt16 (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int GetInt32 (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual long GetInt64 (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetName (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual object GetObjectRef (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int GetOrdinal (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetString (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual object GetValue (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int GetValues (object[] values)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		AttributeCollection ICustomTypeDescriptor.GetAttributes ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		string ICustomTypeDescriptor.GetClassName ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		string ICustomTypeDescriptor.GetComponentName ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		TypeConverter ICustomTypeDescriptor.GetConverter ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		EventDescriptor ICustomTypeDescriptor.GetDefaultEvent ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		object ICustomTypeDescriptor.GetEditor (Type editorBaseType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		EventDescriptorCollection ICustomTypeDescriptor.GetEvents ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		EventDescriptorCollection ICustomTypeDescriptor.GetEvents (Attribute[] attributes)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties (Attribute[] attributes)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		object ICustomTypeDescriptor.GetPropertyOwner (PropertyDescriptor pd)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		int IDataUpdatableRecord.SetValues (object[] values)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual bool IsDBNull (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual bool IsSetAsDefault (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetBoolean (int i, bool value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetByte (int i, byte value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetBytes (int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetChar (int i, char value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetDateTime (int i, DateTime value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetDecimal (int i, decimal value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetDefault (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetDouble (int i, double value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetFloat (int i, float value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetGuid (int i, Guid value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetInt16 (int i, short value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetInt32 (int i, int value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetInt64 (int i, long value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetObjectRef (int i, object o)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetString (int i, string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetValue (int i, object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int SetValues (int i, object[] value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data.Common/DbParameter.cs b/mcs/class/System.Data/System.Data.Common/DbParameter.cs
index 9edd9ad34cf..ba3352def50 100644
--- a/mcs/class/System.Data/System.Data.Common/DbParameter.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbParameter.cs
@@ -31,7 +31,6 @@
 //
 
 #if NET_2_0 || TARGET_JVM
-using System.ComponentModel;
 
 namespace System.Data.Common {
 	public abstract class DbParameter : MarshalByRefObject, IDbDataParameter, IDataParameter
@@ -47,46 +46,25 @@ namespace System.Data.Common {
 
 		#region Properties
 
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[RefreshProperties (RefreshProperties.All)]
 		public abstract DbType DbType { get; set; }
-
-		[DefaultValue (ParameterDirection.Input)]
-		[RefreshProperties (RefreshProperties.All)]
 		public abstract ParameterDirection Direction { get; set; }
-
-		[DefaultValue ("")]
 		public abstract string ParameterName { get; set; }
 		public abstract byte Precision { get; set; }
 		public abstract byte Scale { get; set; }
 		public abstract int Size { get; set; }
-
-		[DefaultValue (null)]
-		[RefreshProperties (RefreshProperties.All)]
 		public abstract object Value { get; set; }
-
-		[Browsable (false)]
-		[DesignOnly (true)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract bool IsNullable { get; set; }
-
-		[DefaultValue ("")]
 		public abstract string SourceColumn { get; set; }
-
-		[RefreshProperties (RefreshProperties.All)]
-		[DefaultValue (false)]
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
-		public abstract bool SourceColumnNullMapping { get; set; }
-
-		[DefaultValue (DataRowVersion.Current)]
 		public abstract DataRowVersion SourceVersion { get; set; }
 
 		#endregion // Properties
 
 		#region Methods
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
+
+#if NET_2_0
+		public abstract bool SourceColumnNullMapping { get; set; }
 		public abstract void ResetDbType ();
+#endif
 		#endregion // Methods
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs b/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
index a8abdac36ba..c946ef382d4 100644
--- a/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
@@ -33,7 +33,6 @@
 #if NET_2_0 || TARGET_JVM
 
 using System.Collections;
-using System.ComponentModel;
 using System.Runtime.InteropServices;
 
 namespace System.Data.Common {
@@ -50,8 +49,6 @@ namespace System.Data.Common {
 
 		#region Properties
 
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public abstract int Count { get; }
 
 		object IDataParameterCollection.this [string parameterName] {
@@ -64,19 +61,8 @@ namespace System.Data.Common {
 			set { this [index] = (DbParameter) value; }
 		}
 
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract bool IsFixedSize { get; }
-
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract bool IsReadOnly { get; }
-
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract bool IsSynchronized { get; }
 
 		public DbParameter this [string parameterName] { 
@@ -85,19 +71,16 @@ namespace System.Data.Common {
 				return this [index];
 			}
 			set { 
-				int index = IndexOf (parameterName);
+                int index = IndexOf (parameterName);
 				this [index] = value;
 			}
 		}
 
-		public DbParameter this [int index] { 
+		public DbParameter this [[Optional] int index] { 
 			get { return GetParameter (index); }
 			set { SetParameter (index,value); }
 		}
 
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract object SyncRoot { get; } 
 
 		#endregion // Properties
@@ -117,10 +100,7 @@ namespace System.Data.Common {
 		public abstract bool Contains (object value);
 		public abstract bool Contains (string value);
 		public abstract void CopyTo (Array ar, int index);
-
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract IEnumerator GetEnumerator ();
-
 		protected abstract DbParameter GetParameter (int index);
 		public abstract int IndexOf (object value);
 		public abstract int IndexOf (string parameterName);
diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
index 302199516ec..44b7454e832 100644
--- a/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
@@ -46,7 +46,7 @@ namespace System.Data.Common {
 		}
 
 		[MonoTODO]
-		internal DbProviderFactory (DbProviderSupportedClasses supportedClasses)
+		protected DbProviderFactory (DbProviderSupportedClasses supportedClasses)
 		{
 		}
 
@@ -75,6 +75,12 @@ namespace System.Data.Common {
 		}
 
 		[MonoTODO]
+		protected virtual DbCommandSet CreateCommandSet ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
 		public virtual DbConnection CreateConnection ()
 		{
 			throw new NotImplementedException ();
@@ -93,6 +99,12 @@ namespace System.Data.Common {
 		}
 
 		[MonoTODO]
+		public virtual DbTable CreateDbTable ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
 		public virtual DbParameter CreateParameter ()
 		{
 			throw new NotImplementedException ();
diff --git a/mcs/class/System.Data/System.Data.Common/DbTable.cs b/mcs/class/System.Data/System.Data.Common/DbTable.cs
index e07c0bf3747..b4ae7dfb28d 100644
--- a/mcs/class/System.Data/System.Data.Common/DbTable.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbTable.cs
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if TARGET_JVM
+#if NET_2_0 || TARGET_JVM
 
 using System.ComponentModel;
 
diff --git a/mcs/class/System.Data/System.Data.Common/DbTypes.cs b/mcs/class/System.Data/System.Data.Common/DbTypes.cs
index d3873aee4f9..e08b2b12452 100644
--- a/mcs/class/System.Data/System.Data.Common/DbTypes.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbTypes.cs
@@ -4,6 +4,47 @@ namespace System.Data.Common
 {

 	internal class DbTypes

 	{

+#if TARGET_JVM

+		#region java.sql.Types constants

+

+		internal enum JavaSqlTypes {

+			ARRAY = 2003 ,

+			BIGINT = -5, 

+			BINARY = -2 ,

+			BIT = -7 ,

+			BLOB = 2004, 

+			BOOLEAN = 16, 

+			CHAR = 1, 

+			CLOB = 2005, 

+			DATALINK = 70, 

+			DATE = 91, 

+			DECIMAL = 3, 

+			DISTINCT = 2001, 

+			DOUBLE = 8, 

+			FLOAT = 6, 

+			INTEGER = 4, 

+			JAVA_OBJECT = 2000, 

+			LONGVARBINARY = -4,

+			LONGVARCHAR = -1, 

+			NULL = 0, 

+			NUMERIC = 2 ,

+			OTHER = 1111 ,

+			REAL = 7 ,

+			REF = 2006 ,

+			SMALLINT = 5,

+			STRUCT = 2002, 

+			TIME = 92, 

+			TIMESTAMP = 93, 

+			TINYINT = -6, 

+			VARBINARY = -3, 

+			VARCHAR = 12,

+//			NOTSET = int.MinValue

+		}

+

+

+		#endregion // java.sql.Types constants

+#endif

+

 		#region .Net types constants

 

 		internal static readonly Type TypeOfBoolean = typeof(Boolean);

diff --git a/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs b/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs
index 829de6bbd3c..a533529c801 100644
--- a/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs
+++ b/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs
@@ -35,11 +35,11 @@
 namespace System.Data.Common {
 	public enum GroupByBehavior 
 	{
-		ExactMatch = 4,
-		MustContainAll = 3,
-		NotSupported = 1,
-		Unknown = 0,
-		Unrelated = 2
+		ExactMatch,
+		MustContainAll,
+		NotSupported,
+		Unknown,
+		Unrelated
 	}
 }
 
diff --git a/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs b/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs
index 53dc2e4bb44..126504a5e8c 100644
--- a/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs
+++ b/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs
@@ -35,9 +35,9 @@
 namespace System.Data.Common {
 	public enum IdentifierCase 
 	{
-		Insensitive = 1,
-		Sensitive = 2,
-		Unknown = 0
+		Insensitive,
+		Sensitive,
+		Unknown
 	}
 }
 
diff --git a/mcs/class/System.Data/System.Data.Common/Key.cs b/mcs/class/System.Data/System.Data.Common/Key.cs
index 362860a28ee..4c1d26a2d2b 100644
--- a/mcs/class/System.Data/System.Data.Common/Key.cs
+++ b/mcs/class/System.Data/System.Data.Common/Key.cs
@@ -47,7 +47,6 @@ namespace System.Data.Common
 		//	and always uses the _current version

 		//so need a temp row for Eval calls

 		DataRow _tmpRow;

-		static DataViewRowState DefaultRowStateFilter = (DataViewRowState.CurrentRows | DataViewRowState.OriginalRows);

 

 		#endregion //Fields

 

@@ -70,11 +69,13 @@ namespace System.Data.Common
 				}

 			}

 

-			if (rowState != DataViewRowState.None)

+			if (rowState != DataViewRowState.None) {

 				_rowStateFilter = rowState;

-			else

+			}

+			else {

 				// FIXME : what is the correct value ?

-				_rowStateFilter = DefaultRowStateFilter;

+				_rowStateFilter = DataViewRowState.CurrentRows;

+			}

 		}

 

 		#endregion // Constructors

@@ -165,59 +166,77 @@ namespace System.Data.Common
 		internal bool ContainsVersion (DataRowState state, DataRowVersion version)

 		{

 			switch (state) {

-				case DataRowState.Unchanged:

-					if ((_rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None)

+				case DataRowState.Unchanged: {

+					if ((_rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {

 						return ((version & DataRowVersion.Default) != 0);

+					}

+

 					break;

-				case DataRowState.Added:

-					if ((_rowStateFilter & DataViewRowState.Added) != DataViewRowState.None)

+				}

+				case DataRowState.Added: {

+					if ((_rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {

 						return ((version & DataRowVersion.Default) != 0);

+					}

+

 					break;

-				case DataRowState.Deleted:

-					if ((_rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None)

+				}

+				case DataRowState.Deleted: {

+					if ((_rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {

 						return (version == DataRowVersion.Original);

+					}

+

 					break;

+				}

 				default:

-					// If _rowStateFilter has the default value, return true

-					if (_rowStateFilter ==  DefaultRowStateFilter)

-						return true;

-					if ((_rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None)

+					if ((_rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {

 						return ((version & DataRowVersion.Default) != 0);

-					if ((_rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None)

+					}

+					else if ((_rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {

 						return (version == DataRowVersion.Original);

+					}

+

 					break;

 			}

 

-			return false;

+            return false;

 		}

 

 		internal static int GetRecord(DataRow row, DataViewRowState rowStateFilter)

 		{

 			switch (row.RowState) {

 				case DataRowState.Unchanged: {

-					if ((rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None)

+					if ((rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {

 						return row.Proposed >= 0 ? row.Proposed : row.Current;

+					}

+

 					break;

 				}

 				case DataRowState.Added: {

-					if ((rowStateFilter & DataViewRowState.Added) != DataViewRowState.None)

+					if ((rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {

 						return row.Proposed >= 0 ? row.Proposed : row.Current;

+					}

+

 					break;

 				}

 				case DataRowState.Deleted: {

-					if ((rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None)

+					if ((rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {

 						return row.Original;

+					}

+

 					break;

 				}

 				default:

-					if ((rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None)

+					if ((rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {

 						return row.Proposed >= 0 ? row.Proposed : row.Current;

-					if ((rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None)

+					}

+					else if ((rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {

 						return row.Original;

+					}

+

 					break;

 			}

 

-			return -1;

+            return -1;

 		}

 

 		/// <summary>

diff --git a/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs b/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs
index 2e6717abb50..dcfbd026cdd 100644
--- a/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs
+++ b/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs
@@ -35,11 +35,7 @@
 using System.Data;
 
 namespace System.Data.Common {
-	public
-#if !NET_2_0
-	abstract
-#endif
-	class RowUpdatedEventArgs : EventArgs
+	public abstract class RowUpdatedEventArgs : EventArgs
 	{
 		#region Fields
 
@@ -56,12 +52,7 @@ namespace System.Data.Common {
 		#region Constructors
 
 		[MonoTODO]
-#if NET_2_0
-		public
-#else
-		protected
-#endif
-		RowUpdatedEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		protected RowUpdatedEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
 		{
 			this.dataRow = dataRow;
 			this.command = command;
diff --git a/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs b/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs
index 64214f583ed..6fab80c8128 100644
--- a/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs
+++ b/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs
@@ -33,11 +33,7 @@
 //
 
 namespace System.Data.Common {
-	public
-#if !NET_2_0
-	abstract
-#endif
-	class RowUpdatingEventArgs : EventArgs
+	public abstract class RowUpdatingEventArgs : EventArgs
 	{
 		#region Fields
 
@@ -53,12 +49,7 @@ namespace System.Data.Common {
 
 		#region Constructors
 
-#if NET_2_0
-		public
-#else
-		protected
-#endif
-		RowUpdatingEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		protected RowUpdatingEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
 		{
 			this.dataRow = dataRow;
 			this.command = command;
diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs
index 20a842e58a9..455797b8eee 100644
--- a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs
+++ b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs
@@ -33,7 +33,7 @@
 #if NET_2_0
 
 namespace System.Data.Common {
-	public static class SchemaTableColumn 
+	public sealed class SchemaTableColumn 
 	{
 		#region Fields
 			public static readonly string AllowDBNull = "AllowDBNull";
@@ -49,7 +49,6 @@ namespace System.Data.Common {
 			public static readonly string IsKey = "IsKey";
 			public static readonly string IsLong = "IsLong";
 			public static readonly string IsUnique = "IsUnique";
-			public static readonly string NonVersionedProviderType = "NonVersionedProviderType";
 			public static readonly string NumericPrecision = "NumericPrecision";
 			public static readonly string NumericScale = "NumericScale";
 			public static readonly string ProviderType = "ProviderType";
diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs
index 2b9ab1900bc..4362f54f7c7 100644
--- a/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs
+++ b/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs
@@ -33,25 +33,17 @@
 #if NET_2_0
 
 namespace System.Data.Common {
-	public static class SchemaTableOptionalColumn 
+	public sealed class SchemaTableOptionalColumn 
 	{
 		#region Fields
-			public static readonly string AutoIncrementSeed = "AutoIncrementSeed";
-			public static readonly string AutoIncrementStep = "AutoIncrementStep";
 			public static readonly string BaseCatalogName = "BaseCatalogName";
-			public static readonly string BaseColumnNamespace = "BaseColumnNamespace";
 			public static readonly string BaseServerName = "BaseServerName";
-			public static readonly string BaseTableNamespace = "BaseTableNamespace";
-			public static readonly string ColumnMapping = "ColumnMapping";
-			public static readonly string DefaultValue = "DefaultValue";
-			public static readonly string Expression = "Expression";
 			public static readonly string IsAutoIncrement = "IsAutoIncrement";
 			public static readonly string IsHidden = "IsHidden";
 			public static readonly string IsReadOnly = "IsReadOnly";
 			public static readonly string IsRowVersion = "IsRowVersion";
 			public static readonly string ProviderSpecificDataType = "ProviderSpecificDataType";
 
-
 		#endregion // Fields
 	}
 }
diff --git a/mcs/class/System.Data/System.Data.Common/SupportedJoinOperators.cs b/mcs/class/System.Data/System.Data.Common/SupportedJoinOperators.cs
deleted file mode 100644
index c15ecb43ca7..00000000000
--- a/mcs/class/System.Data/System.Data.Common/SupportedJoinOperators.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// System.Data.Common.SupportedJoinOperators.cs
-//
-// Author:
-//   Chris Toshok (toshok@ximian.com)
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Data.Common {
-
-	[Flags]
-	public enum SupportedJoinOperators
-	{
-		None = 0,
-		Inner = 1 << 0,
-		LeftOuter = 1 << 1,
-		RightOuter = 1 << 2,
-		FullOuter = 1 << 3
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Data/System.Data.Odbc/ChangeLog b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
index cf25e4a072e..8b2d5aa442b 100644
--- a/mcs/class/System.Data/System.Data.Odbc/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* OdbcDataReader.cs: remove VisibleFieldCount property.
-
 2005-11-21  Senganal T <tsenganal@novell.com>
 
 	* OdbcTransaction.cs
diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
index 6d64c948eff..58276201d5e 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
@@ -108,6 +108,12 @@ namespace System.Data.Odbc
                 
 #if NET_2_0
                 [MonoTODO]
+                public override int VisibleFieldCount
+                {
+                        get { throw new NotImplementedException (); }
+                }
+
+                [MonoTODO]
                 protected override bool IsValidRow 
                 {
                         get { throw new NotImplementedException (); }
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
index e7f163593ba..266b89ee4b2 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommand.cs
@@ -44,7 +44,7 @@ using java.sql;
 

 namespace System.Data.OleDb

 {

-	public sealed class OleDbCommand : AbstractDbCommand

+	public sealed class OleDbCommand : AbstractDbCommand, IDbCommand, ICloneable

 	{

 

 		#region Fields

@@ -126,7 +126,10 @@ namespace System.Data.OleDb
 		public new OleDbParameterCollection Parameters

 		{

 			get { 

-				return (OleDbParameterCollection)base.Parameters; 

+				if (_parameters == null) {

+					_parameters = CreateParameterCollection(this);

+				}

+				return (OleDbParameterCollection)_parameters; 

 			}

 		}

 

@@ -136,7 +139,7 @@ namespace System.Data.OleDb
 			set { base.Transaction = (DbTransaction)value; }

 		}

 

-		protected internal sealed override ResultSet CurrentResultSet

+		internal override ResultSet CurrentResultSet

 		{

 			get { 

 				try {

@@ -148,7 +151,7 @@ namespace System.Data.OleDb
 					return CurrentRefCursor;

 				}

 				catch(SQLException e) {

-					throw CreateException(e);

+					throw new Exception(e.Message, e);

 				}

 			}

 		}

@@ -160,7 +163,7 @@ namespace System.Data.OleDb
 					NextRefCursor();

 				}

 				if (_currentRefCursor == null && _currentParameterIndex < InternalParameters.Count) {

-					_currentRefCursor = (ResultSet)((CallableStatement)Statement).getObject(_currentParameterIndex + 1);

+					_currentRefCursor = (ResultSet)((CallableStatement)_statement).getObject(_currentParameterIndex + 1);

 				}

 				return _currentRefCursor;

 			}

@@ -185,7 +188,7 @@ namespace System.Data.OleDb
 			return (OleDbParameter)CreateParameterInternal();

 		} 

 

-		protected sealed override void CheckParameters()

+		protected override void CheckParameters()

 		{

 			for(int i = 0; i < Parameters.Count; i++) {

 				OleDbParameter parameter = (OleDbParameter)Parameters[i];

@@ -201,20 +204,20 @@ namespace System.Data.OleDb
 			}

 		}

 

-		protected sealed override DbParameter CreateParameterInternal()

+		protected override DbParameter CreateParameterInternal()

 		{

 			return new OleDbParameter();

 		}

 

-		protected sealed override DbParameterCollection CreateParameterCollection(AbstractDbCommand parent)

+		protected override DbParameterCollection CreateParameterCollection(AbstractDbCommand parent)

 		{

 			return new OleDbParameterCollection((OleDbCommand)parent);

 		}

 

-		public override object Clone() {

-			OleDbCommand clone = (OleDbCommand)base.Clone();

-			clone._currentParameterIndex = 0;

-			clone._currentRefCursor = null;

+		public object Clone()

+		{

+			OleDbCommand clone = new OleDbCommand();

+			CopyTo(clone);

 			return clone;

 		}

 

@@ -226,7 +229,7 @@ namespace System.Data.OleDb
 

 		protected override void BindOutputParameter(AbstractDbParameter parameter, int parameterIndex)

 		{

-			CallableStatement callableStatement = ((CallableStatement)Statement);

+			CallableStatement callableStatement = ((CallableStatement)_statement);

 			if (((OleDbParameter)parameter).IsOracleRefCursor) {

 				callableStatement.registerOutParameter(++parameterIndex, _oracleRefCursor);

 			}

@@ -240,7 +243,7 @@ namespace System.Data.OleDb
 			return ((OleDbParameter)parameter).IsOracleRefCursor;

 		}

 

-		protected internal override bool NextResultSet()

+		internal override bool NextResultSet()

 		{

 			try { 

 				bool hasMoreResults = base.NextResultSet();

@@ -269,12 +272,12 @@ namespace System.Data.OleDb
 			return false;

 		}

 

-		protected sealed override DbDataReader CreateReader()

+		protected override DbDataReader CreateReader()

 		{

 			return new OleDbDataReader(this);

 		}

 

-		protected internal sealed override SystemException CreateException(SQLException e)

+		protected override SystemException CreateException(SQLException e)

 		{

 			return new OleDbException(e,Connection);		

 		}

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
index ea34fd84a8a..320fc657c6c 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbCommandBuilder.cs
@@ -37,14 +37,13 @@
 using System.ComponentModel;

 using System.Data;

 using System.Data.Common;

-using System.Data.ProviderBase;

 

 namespace System.Data.OleDb

 {

 	/// <summary>

 	/// Provides a means of automatically generating single-table commands used to reconcile changes made to a DataSet with the associated database. This class cannot be inherited.

 	/// </summary>

-	public sealed class OleDbCommandBuilder : AbstractDbCommandBuilder

+	public sealed class OleDbCommandBuilder : Component

 	{

 		#region Fields

 

@@ -106,7 +105,10 @@ namespace System.Data.OleDb
 

 		public static void DeriveParameters (OleDbCommand command) 

 		{

-			DeriveParameters((AbstractDbCommand)command);

+			if (command.Connection.State != ConnectionState.Open) {

+				throw new InvalidOperationException("DeriveParameters requires an open and available Connection. The connection's current state is Closed.");

+			}

+			command.DeriveParameters ();

 		}

 

 		[MonoTODO]

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
index e4d60fd1bbc..36242a23350 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
@@ -1,32 +1,32 @@
 //

 // System.Data.OleDb.OleDbConnection

-//

-// Authors:

-//	Konstantin Triger <kostat@mainsoft.com>

-//	Boris Kirzner <borisk@mainsoft.com>

-//	

-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//
+// Authors:
+//	Konstantin Triger <kostat@mainsoft.com>
+//	Boris Kirzner <borisk@mainsoft.com>
+//	
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //

 

 

@@ -34,21 +34,25 @@
 using System.Data;

 using System.Data.Common;

 using System.Collections;

-using System.Data.ProviderBase;

-using System.Globalization;

 

 using java.sql;

 

-using System.Configuration;

-using Mainsoft.Data.Configuration;

-using Mainsoft.Data.Jdbc.Providers;

-

 namespace System.Data.OleDb

 {

-	public sealed class OleDbConnection : AbstractDBConnection {

+	public sealed class OleDbConnection : AbstractDBConnection, System.ICloneable

+	{

 		#region Fields 

 

-		static readonly IList _providers = (IList) ConfigurationSettings.GetConfig("Mainsoft.Data.Configuration/OleDbProviders");

+		protected static Hashtable _skippedUserParameters = new Hashtable(new CaseInsensitiveHashCodeProvider(),new CaseInsensitiveComparer());

+

+		private static readonly object _lockObjectStringManager = new object();

+		//private static DbStringManager _stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.OleDbStrings");

+

+		private static readonly string[] _resourceIgnoredKeys = new string[] {"CON_PROVIDER","CON_DATA_SOURCE","CON_DATABASE",

+																			  "CON_PASSWORD","CON_USER_ID","CON_TIMEOUT",

+																			  "CON_SERVER_NAME","CON_PORT","CON_SERVICE_NAME",

+																			  "CON_JNDI_NAME","CON_JNDI_PROVIDER","CON_JNDI_FACTORY",

+																			  "JDBC_DRIVER","JDBC_URL","DB2_CON_LOCATION" };

 

 		#endregion //Fields

 

@@ -61,47 +65,141 @@ namespace System.Data.OleDb
 		

 		#region Constructors

 

-		public OleDbConnection() : this(null) {

+		public OleDbConnection() : this(null)

+		{

 		}

 

-		public OleDbConnection(String connectionString) : base(connectionString) {			

+		public OleDbConnection(String connectionString) : base(connectionString)

+		{			

 		}

 

 		#endregion // Constructors

 

 		#region Properties

 

-		public String Provider {

+		protected override string[] ResourceIgnoredKeys

+		{

+			get { return _resourceIgnoredKeys; }

+		}

+

+		public String Provider

+		{

+			get { return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_PROVIDER")); }

+		}

+

+		protected override Hashtable SkippedUserParameters

+		{

+			get { return _skippedUserParameters; }

+		}

+

+		protected override string ServerName

+		{

+			get { 

+				if (ProviderType == PROVIDER_TYPE.IBMDADB2 || ProviderType == PROVIDER_TYPE.MSDAORA) {

+					string host = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_SERVER_NAME"));

+

+					if (!String.Empty.Equals(host)) {

+						return host;

+					}

+

+					if (ProviderType == PROVIDER_TYPE.IBMDADB2) {

+						string location = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("DB2_CON_LOCATION"));

+

+						if (!String.Empty.Equals(location)) {

+							int semicolumnIndex = location.IndexOf(':');

+							if (semicolumnIndex != -1) {

+								return location.Substring(0,semicolumnIndex);

+							}

+							else {

+								return location;

+							}

+						}

+					}

+

+				}

+				return base.ServerName; 

+			}

+		}

+

+		protected override string CatalogName

+		{

+			get { 

+				switch (ProviderType) {

+					case PROVIDER_TYPE.IBMDADB2:

+					case PROVIDER_TYPE.MSDAORA:

+						return DataSource;

+				}

+				return base.CatalogName;

+			}

+		}

+

+		protected override string Port

+		{

 			get {

-				IDictionary conDict = ConnectionStringBuilder;

-				string provider = (string)conDict["Provider"];

-				if (provider == null || provider.Length == 0)

-					throw ExceptionHelper.OleDbNoProviderSpecified();

+				string port = ConnectionStringHelper.FindValue(UserParameters, StringManager.GetStringArray("CON_PORT"));

+				switch (ProviderType) {

+					case PROVIDER_TYPE.MSDAORA :

+						if (String.Empty.Equals(port)) {

+							return StringManager.GetString("ORA_CON_PORT");

+						}

+						return port;

+					case PROVIDER_TYPE.IBMDADB2 :

+						if (String.Empty.Equals(port)) {

+							string location = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("DB2_CON_LOCATION"));

+

+							if (!String.Empty.Equals(location)) {

+								int semicolumnIndex = location.IndexOf(':');

+								if (semicolumnIndex != -1) {

+									return location.Substring(semicolumnIndex + 1);

+								}

+							}

+							return StringManager.GetString("DB2_CON_PORT");

+						}

+						return port;

+				}

+				return base.Port;

+			}

+		}

 

-				return provider;

+		protected override string JdbcDriverName

+		{

+			get {

+				JDBC_MODE jdbcMode = JdbcMode;

+				switch (jdbcMode) {

+					case JDBC_MODE.DATA_SOURCE_MODE :

+						return base.JdbcDriverName;

+					case JDBC_MODE.JDBC_DRIVER_MODE :

+						return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("JDBC_DRIVER"));

+					case JDBC_MODE.PROVIDER_MODE:

+						switch (ProviderType) {

+							case PROVIDER_TYPE.SQLOLEDB :

+								return StringManager.GetString("SQL_JDBC_DRIVER");

+							case PROVIDER_TYPE.MSDAORA :

+								return StringManager.GetString("ORA_JDBC_DRIVER");

+							case PROVIDER_TYPE.IBMDADB2 :

+								return StringManager.GetString("DB2_JDBC_DRIVER");

+						}

+						break;

+				};

+				return base.JdbcDriverName;

 			}

 		}

 

-		protected override IConnectionProvider GetConnectionProvider() {

-			IDictionary conProviderDict = ConnectionStringDictionary.Parse(ConnectionString);

-			string providerName = (string)conProviderDict["Provider"];

-

-			for (int i = 0; i < _providers.Count; i++) {

-				IDictionary providerInfo = (IDictionary) _providers[i];

-					

-				string curProvider = (string)providerInfo["Provider"];

-				if (String.Compare(providerName, curProvider, true, CultureInfo.InvariantCulture) == 0) {

-					string providerType = (string) providerInfo [ConfigurationConsts.ProviderType];

-					if (providerType == null || providerType.Length == 0)

-						return new GenericProvider (providerInfo); 

-					else {

-						Type t = Type.GetType (providerType);

-						return (IConnectionProvider) Activator.CreateInstance (t , new object[] {providerInfo});

+		protected override DbStringManager StringManager

+		{

+			get {

+				object stringManager = AppDomain.CurrentDomain.GetData("System.Data.OleDbConnection.stringManager");

+				if (stringManager == null) {

+					lock(_lockObjectStringManager) {

+						stringManager = AppDomain.CurrentDomain.GetData("System.Data.OleDbConnection.stringManager");

+						if (stringManager != null)

+							return (DbStringManager)stringManager;

+						stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.OleDbStrings");

+						AppDomain.CurrentDomain.SetData("System.Data.OleDbConnection.stringManager", stringManager);

 					}

 				}

+				return (DbStringManager)stringManager;

 			}

-

-			return new GenericProvider (conProviderDict);

 		}

 

 		#endregion // Properties

@@ -131,12 +229,25 @@ namespace System.Data.OleDb
 			return CreateCommand();

 		}

 

-		protected sealed override SystemException CreateException(SQLException e)

+

+		protected internal override void CopyTo(AbstractDBConnection target)

+		{

+			base.CopyTo(target);

+		}

+

+		public object Clone()

+		{

+			OleDbConnection clone = new OleDbConnection();

+			CopyTo(clone);

+			return clone;

+		}

+

+		protected override SystemException CreateException(SQLException e)

 		{

 			return new OleDbException(e,this);		

 		}

 

-		protected sealed override SystemException CreateException(string message)

+		protected override SystemException CreateException(string message)

 		{

 			return new OleDbException(message, null, this);	

 		}

@@ -183,19 +294,75 @@ namespace System.Data.OleDb
 			return schemaTable;

 		}

 

+		protected internal override void ValidateConnectionString(string connectionString)

+		{

+			base.ValidateConnectionString(connectionString);

+

+			JDBC_MODE currentJdbcMode = JdbcMode;

+			

+			if (currentJdbcMode == JDBC_MODE.NONE) {

+				string provider = StringManager.GetString("CON_PROVIDER");

+

+				if (String.Empty.Equals(provider)) {

+					throw ExceptionHelper.OleDbNoProviderSpecified();

+				}

+			}

+		}

+

+		protected override string BuildJdbcUrl()

+		{

+			switch (JdbcMode) {

+				case JDBC_MODE.PROVIDER_MODE :

+				switch (ProviderType) {

+					case PROVIDER_TYPE.IBMDADB2:

+						return BuildDb2Url();

+					case PROVIDER_TYPE.MSDAORA:

+						return BuildOracleUrl();

+					case PROVIDER_TYPE.SQLOLEDB:

+						return BuildMsSqlUrl();

+				}

+				break;

+			}

+			return base.BuildJdbcUrl();

+		}

+

 		public static void ReleaseObjectPool()

 		{

 			// since we're using connection pool from app servet, this is by design

 			//throw new NotImplementedException();

 		}

 

-		protected internal sealed override void OnSqlWarning(SQLWarning warning)

+		internal override void OnSqlWarning(SQLWarning warning)

 		{

 			OleDbErrorCollection col = new OleDbErrorCollection(warning, this);

 			OnOleDbInfoMessage(new OleDbInfoMessageEventArgs(col));

 		}

 

-		protected internal sealed override void OnStateChanged(ConnectionState orig, ConnectionState current)

+		internal override Connection GetConnectionFromProvider()

+		{

+			if ((ProviderType == PROVIDER_TYPE.MSDAORA) && 

+				("true").Equals(StringManager.GetString("ORA_CONNECTION_POOLING_ENABLED","false"))) {

+				ActivateJdbcDriver(JdbcDriverName);

+				return OleDbConnectionFactory.GetConnection(ProviderType,JdbcUrl,User,Password,ConnectionTimeout);

+			}

+			else {

+				return base.GetConnectionFromProvider();

+			}

+		}

+

+		private String BuildDb2Url()

+		{

+			return StringManager.GetString("DB2_JDBC_URL") //jdbc:db2://

+				+ ServerName + ":" + Port + "/" + CatalogName;

+		}

+

+		private String BuildOracleUrl()

+		{

+			return StringManager.GetString("ORA_JDBC_URL") //"jdbc:oracle:thin:@"

+				+ ServerName + ":" + Port + ":" + CatalogName;

+		}

+        

+		internal override void OnStateChanged(ConnectionState orig, ConnectionState current)

 		{

 			if(StateChange != null) {

 				StateChange(this, new StateChangeEventArgs(orig, current));

@@ -212,14 +379,14 @@ namespace System.Data.OleDb
 			}

 		}

 

-		private void OnOleDbInfoMessage (OleDbInfoMessageEventArgs value)

-		{

-			if (InfoMessage != null) {

-				InfoMessage (this, value);

-			}

+		private void OnOleDbInfoMessage (OleDbInfoMessageEventArgs value)
+		{
+			if (InfoMessage != null) {
+				InfoMessage (this, value);
+			}
 		}

 

 		#endregion // Methods

 

 	}

-}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
index 622fef17997..c13d380a0bc 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs
@@ -34,7 +34,6 @@
 using System;

 using System.Data;

 using System.Data.Common;

-using System.Data.ProviderBase;

 using System.Reflection;

 using System.Collections;

 

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
index eb2e9798abf..41ad6da8d84 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConvert.cs
@@ -1,39 +1,38 @@
 //

 // System.Data.OleDb.OleDbConvert

-//

-// Authors:

-//	Konstantin Triger <kostat@mainsoft.com>

-//	Boris Kirzner <borisk@mainsoft.com>

-//	

-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//
+// Authors:
+//	Konstantin Triger <kostat@mainsoft.com>
+//	Boris Kirzner <borisk@mainsoft.com>
+//	
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //

 

 

 using System;

 using System.Collections;

 using System.Data.Common;

-using System.Data.ProviderBase;

 

 using java.sql;

 

@@ -105,38 +104,38 @@ namespace System.Data.OleDb
 

 		internal static OleDbType JdbcTypeToOleDbType(int jdbcType)

 		{

-			switch ((JavaSqlTypes)jdbcType) {

-				case JavaSqlTypes.ARRAY: return OleDbType.Binary;

-				case JavaSqlTypes.BIGINT: return OleDbType.BigInt;

-				case JavaSqlTypes.BINARY: return OleDbType.Binary;

-				case JavaSqlTypes.BIT: return OleDbType.Boolean;

-				case JavaSqlTypes.BLOB: return OleDbType.Binary;

-				case JavaSqlTypes.BOOLEAN: return OleDbType.Boolean;

-				case JavaSqlTypes.CHAR: return OleDbType.Char;

-				case JavaSqlTypes.CLOB: return OleDbType.LongVarWChar;

-				case JavaSqlTypes.DATALINK: return OleDbType.IUnknown;

-				case JavaSqlTypes.DATE: return OleDbType.DBDate;

-				case JavaSqlTypes.DECIMAL: return OleDbType.Decimal;

-				case JavaSqlTypes.DISTINCT: return OleDbType.IUnknown; 

-				case JavaSqlTypes.DOUBLE: return OleDbType.Double;

-				case JavaSqlTypes.FLOAT: return OleDbType.Double;

-				case JavaSqlTypes.INTEGER: return OleDbType.Integer;

-				case JavaSqlTypes.JAVA_OBJECT: return OleDbType.IUnknown;

-				case JavaSqlTypes.LONGVARBINARY: return OleDbType.LongVarBinary;

-				case JavaSqlTypes.LONGVARCHAR: return OleDbType.LongVarWChar;

-				case JavaSqlTypes.NULL: return OleDbType.Empty;

-				case JavaSqlTypes.NUMERIC: return OleDbType.Numeric;

+			switch ((DbTypes.JavaSqlTypes)jdbcType) {

+				case DbTypes.JavaSqlTypes.ARRAY: return OleDbType.Binary;

+				case DbTypes.JavaSqlTypes.BIGINT: return OleDbType.BigInt;

+				case DbTypes.JavaSqlTypes.BINARY: return OleDbType.Binary;

+				case DbTypes.JavaSqlTypes.BIT: return OleDbType.Boolean;

+				case DbTypes.JavaSqlTypes.BLOB: return OleDbType.Binary;

+				case DbTypes.JavaSqlTypes.BOOLEAN: return OleDbType.Boolean;

+				case DbTypes.JavaSqlTypes.CHAR: return OleDbType.Char;

+				case DbTypes.JavaSqlTypes.CLOB: return OleDbType.LongVarWChar;

+				case DbTypes.JavaSqlTypes.DATALINK: return OleDbType.IUnknown;

+				case DbTypes.JavaSqlTypes.DATE: return OleDbType.DBDate;

+				case DbTypes.JavaSqlTypes.DECIMAL: return OleDbType.Decimal;

+				case DbTypes.JavaSqlTypes.DISTINCT: return OleDbType.IUnknown; 

+				case DbTypes.JavaSqlTypes.DOUBLE: return OleDbType.Double;

+				case DbTypes.JavaSqlTypes.FLOAT: return OleDbType.Double;

+				case DbTypes.JavaSqlTypes.INTEGER: return OleDbType.Integer;

+				case DbTypes.JavaSqlTypes.JAVA_OBJECT: return OleDbType.IUnknown;

+				case DbTypes.JavaSqlTypes.LONGVARBINARY: return OleDbType.LongVarBinary;

+				case DbTypes.JavaSqlTypes.LONGVARCHAR: return OleDbType.LongVarWChar;

+				case DbTypes.JavaSqlTypes.NULL: return OleDbType.Empty;

+				case DbTypes.JavaSqlTypes.NUMERIC: return OleDbType.Numeric;

 				default:

-				case JavaSqlTypes.OTHER: return OleDbType.IUnknown;

-				case JavaSqlTypes.REAL: return OleDbType.Single;

-				case JavaSqlTypes.REF: return OleDbType.IUnknown;

-				case JavaSqlTypes.SMALLINT: return OleDbType.SmallInt;

-				case JavaSqlTypes.STRUCT: return OleDbType.IUnknown;

-				case JavaSqlTypes.TIME: return OleDbType.DBTime;

-				case JavaSqlTypes.TIMESTAMP: return OleDbType.DBTimeStamp;

-				case JavaSqlTypes.TINYINT: return OleDbType.TinyInt;

-				case JavaSqlTypes.VARBINARY: return OleDbType.VarBinary;

-				case JavaSqlTypes.VARCHAR: return OleDbType.VarChar;

+				case DbTypes.JavaSqlTypes.OTHER: return OleDbType.IUnknown;

+				case DbTypes.JavaSqlTypes.REAL: return OleDbType.Single;

+				case DbTypes.JavaSqlTypes.REF: return OleDbType.IUnknown;

+				case DbTypes.JavaSqlTypes.SMALLINT: return OleDbType.SmallInt;

+				case DbTypes.JavaSqlTypes.STRUCT: return OleDbType.IUnknown;

+				case DbTypes.JavaSqlTypes.TIME: return OleDbType.DBTime;

+				case DbTypes.JavaSqlTypes.TIMESTAMP: return OleDbType.DBTimeStamp;

+				case DbTypes.JavaSqlTypes.TINYINT: return OleDbType.TinyInt;

+				case DbTypes.JavaSqlTypes.VARBINARY: return OleDbType.VarBinary;

+				case DbTypes.JavaSqlTypes.VARCHAR: return OleDbType.VarChar;

 			}

 		}

 

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
index 24d9dbebc40..8cccc1b6e29 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbDataReader.cs
@@ -52,12 +52,12 @@ namespace System.Data.OleDb
 

 		#region Methods

 

-		protected sealed override SystemException CreateException(string message, SQLException e)

+		protected override SystemException CreateException(string message, SQLException e)

 		{

 			return new OleDbException(message,e, (OleDbConnection)_command.Connection);		

 		}

 

-		protected sealed override SystemException CreateException(java.io.IOException e)

+		protected override SystemException CreateException(java.io.IOException e)

 		{

 			return new OleDbException(e, (OleDbConnection)_command.Connection);		

 		}

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
index 904d2b67309..eae36d37a34 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
@@ -137,7 +137,7 @@ namespace System.Data.OleDb
             }

         }

 

-		protected internal sealed override bool IsSpecial {

+		internal override bool IsSpecial {

 			get {

 				return (Direction == ParameterDirection.Output) && IsOracleRefCursor;

 			}

@@ -170,7 +170,7 @@ namespace System.Data.OleDb
             return clone;

         }

 

-		protected internal sealed override object ConvertValue(object value)

+		internal override object ConvertValue(object value)

 		{

 			// can not convert null or DbNull to other types

 			if (value == null || value == DBNull.Value) {

@@ -194,7 +194,7 @@ namespace System.Data.OleDb
 			return convertedValue;

 		}

 

-		protected internal sealed override void SetParameterName(ResultSet res)

+		internal override void SetParameterName(ResultSet res)

 		{

 			ParameterName = res.getString("COLUMN_NAME");

 

@@ -203,7 +203,7 @@ namespace System.Data.OleDb
 			}

 		}

 

-		protected internal sealed override void SetParameterDbType(ResultSet res)

+		internal override void SetParameterDbType(ResultSet res)

 		{

 			int jdbcType = res.getInt("DATA_TYPE");			

 			// FIXME : is that correct?

@@ -226,17 +226,17 @@ namespace System.Data.OleDb
 				}

 			}

 			OleDbType = OleDbConvert.JdbcTypeToOleDbType(jdbcType);

-			JdbcType = jdbcType;

+			JdbcType = (DbTypes.JavaSqlTypes)jdbcType;

 		}

 

-		protected internal sealed override void SetSpecialFeatures(ResultSet res)

+		internal override void SetSpecialFeatures(ResultSet res)

 		{

 			IsOracleRefCursor = (res.getString("TYPE_NAME") == "REF CURSOR");

 		}

 

-		protected internal sealed override int JdbcTypeFromProviderType()

+		internal override DbTypes.JavaSqlTypes JdbcTypeFromProviderType()

 		{

-			return OleDbConvert.OleDbTypeToJdbcType(OleDbType);

+			return (DbTypes.JavaSqlTypes)OleDbConvert.OleDbTypeToJdbcType(OleDbType);

 		}

 

 		#endregion // Methods

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
index 9699011e0c7..8c4efd3d069 100644
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbTransaction.cs
@@ -34,7 +34,6 @@ namespace System.Data.OleDb
 {

 

     using System.Data.Common;

-	using System.Data.ProviderBase;

     using System.Data;

 

     public class OleDbTransaction : AbstractTransaction

diff --git a/mcs/class/System.Data/System.Data.OleDb/ChangeLog b/mcs/class/System.Data/System.Data.OleDb/ChangeLog
index 780a4a19087..6bb7b321d28 100644
--- a/mcs/class/System.Data/System.Data.OleDb/ChangeLog
+++ b/mcs/class/System.Data/System.Data.OleDb/ChangeLog
@@ -1,13 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* OleDbDataAdapter.cs, OleDbCommand.cs, OleDbParameter.cs,
-	OleDbCommandBuilder.cs, OleDbConnection.cs: remove
-	DataSysDescriptions for >= 2.0.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* OleDbCommand.cs: remove extra using System.Data.  fixes warning.
-
 2005-10-04  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* OleDbDataReader.cs: Added a call to GC.SuppressFinalize in Dispose
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
index da3d6394b43..bed0b6aeb55 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
@@ -40,6 +40,7 @@ using System.Runtime.InteropServices;
 
 #if NET_2_0
 using System.Data.ProviderBase;
+using System.Data;
 #endif
 
 namespace System.Data.OleDb
@@ -112,9 +113,7 @@ namespace System.Data.OleDb
 	
 		[DataCategory ("Data")]
 		[DefaultValue ("")]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Command text to execute.")]
-#endif
                 [EditorAttribute ("Microsoft.VSDesigner.Data.ADO.Design.OleDbCommandTextEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
 		public string CommandText 
@@ -127,9 +126,7 @@ namespace System.Data.OleDb
 			}
 		}
 
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Time to wait for command to execute.")]
-#endif
 		[DefaultValue (30)]
 		public int CommandTimeout {
 			get {
@@ -142,9 +139,7 @@ namespace System.Data.OleDb
 
 		[DataCategory ("Data")]
                 [DefaultValue ("Text")]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("How to interpret the CommandText.")]
-#endif
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
 		public CommandType CommandType { 
 			get {
@@ -156,9 +151,7 @@ namespace System.Data.OleDb
 		}
 
 		[DataCategory ("Behavior")]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Connection used by the command.")]
-#endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public OleDbConnection Connection { 
@@ -183,9 +176,7 @@ namespace System.Data.OleDb
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("The parameters collection.")]
-#endif
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
 		public OleDbParameterCollection Parameters {
 			get {
@@ -194,9 +185,7 @@ namespace System.Data.OleDb
 		}
 		
 		[BrowsableAttribute (false)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("The transaction used by the command.")]
-#endif
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		public OleDbTransaction Transaction {
 			get {
@@ -209,9 +198,7 @@ namespace System.Data.OleDb
 
 		[DataCategory ("Behavior")]
 		[DefaultValue (UpdateRowSource.Both)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("When used by a DataAdapter.Update, how command results are applied to the current DataRow.")]
-#endif
 		public UpdateRowSource UpdatedRowSource { 
 			[MonoTODO]
 			get {
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
index 412b6041775..c86e1a06250 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
@@ -70,9 +70,7 @@ namespace System.Data.OleDb
 
 		#region Properties
 
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("The DataAdapter for which to automatically generate OleDbCommands")]
-#endif
 		[DefaultValue (null)]
 		public OleDbDataAdapter DataAdapter {
 			get {
@@ -84,9 +82,7 @@ namespace System.Data.OleDb
 		}
 
 		[BrowsableAttribute (false)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("The prefix string wrapped around sql objects")]
-#endif
                 [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		public string QuotePrefix {
 			get {
@@ -98,9 +94,7 @@ namespace System.Data.OleDb
 		}
 
 		[BrowsableAttribute (false)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("The suffix string wrapped around sql objects")]
-#endif
                 [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		public string QuoteSuffix {
 			get {
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
index c32d842061a..7ee3e9cceb8 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
@@ -71,9 +71,7 @@ namespace System.Data.OleDb
 		
 		[DataCategory ("Data")]
 		[DefaultValue ("")]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Information used to connect to a Data Source.")]
-#endif
 		[EditorAttribute ("Microsoft.VSDesigner.Data.ADO.Design.OleDbConnectionStringEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		[RecommendedAsConfigurableAttribute (true)]
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
@@ -87,9 +85,7 @@ namespace System.Data.OleDb
 		}
 
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Current connection timeout value, 'Connect Timeout=X' in the ConnectionString.")]
-#endif
 		public int ConnectionTimeout {
 			get {
 				return connectionTimeout;
@@ -97,9 +93,7 @@ namespace System.Data.OleDb
 		}
 
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Current data source catalog value, 'Initial Catalog=X' in the connection string.")]
-#endif
 		public string Database { 
 			get {
 				if (gdaConnection != IntPtr.Zero
@@ -112,9 +106,7 @@ namespace System.Data.OleDb
 		}
 
 	        [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Current data source, 'Data Source=X' in the connection string.")]
-#endif
 	 	public string DataSource {
 			get {
 				if (gdaConnection != IntPtr.Zero
@@ -127,9 +119,7 @@ namespace System.Data.OleDb
 		}
 
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Current OLE DB provider progid, 'Provider=X' in the connection string.")]
-#endif
 		public string Provider {
 			get {
 				if (gdaConnection != IntPtr.Zero
@@ -142,9 +132,7 @@ namespace System.Data.OleDb
 		}
 
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Version of the product accessed by the OLE DB Provider.")]
-#endif
 		[BrowsableAttribute (false)]
 		public string ServerVersion {
 			get {
@@ -158,9 +146,7 @@ namespace System.Data.OleDb
 		}
 
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("The ConnectionState indicating whether the connection is open or closed.")]
-#endif
                 [BrowsableAttribute (false)]
 		public ConnectionState State
 		{
@@ -331,15 +317,11 @@ namespace System.Data.OleDb
 
 		#region Events and Delegates
 
-#if !NET_2_0
                 [DataSysDescription ("Event triggered when messages arrive from the DataSource.")]
-#endif
                 [DataCategory ("DataCategory_InfoMessage")]
 		public event OleDbInfoMessageEventHandler InfoMessage;
 
-#if !NET_2_0
 		[DataSysDescription ("Event triggered when the connection changes state.")]
-#endif
                 [DataCategory ("DataCategory_StateChange")]
 		public event StateChangeEventHandler StateChange;
 
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs
index 42bb7cf292f..754452cfa1f 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs
@@ -86,9 +86,7 @@ namespace System.Data.OleDb
 		
 		[DefaultValue (null)]
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Used during Update for deleted rows in DataSet.")]
-#endif
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public OleDbCommand DeleteCommand {
 			get {
@@ -101,9 +99,7 @@ namespace System.Data.OleDb
 
 		[DefaultValue (null)]
 		[DataCategory ("Update")]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Used during Update for new rows in DataSet.")]
-#endif
                 [EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public OleDbCommand InsertCommand {
 			get {
@@ -116,9 +112,7 @@ namespace System.Data.OleDb
 
 		[DefaultValue (null)]
 		[DataCategory ("Fill")]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Used during Fill/FillSchema.")]
-#endif
                 [EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public OleDbCommand SelectCommand {
 			get {
@@ -131,9 +125,7 @@ namespace System.Data.OleDb
 
 		[DefaultValue (null)]
 		[DataCategory ("Update")]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Used during Update for modified rows in DataSet.")]
-#endif
                 [EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public OleDbCommand UpdateCommand {
 			get {
@@ -259,15 +251,11 @@ namespace System.Data.OleDb
 
 		#region Events and Delegates
 
-#if !NET_2_0
 		[DataSysDescription ("Event triggered before every DataRow during Update.")]
-#endif
                 [DataCategory ("DataCategory_Update")]
 		public event OleDbRowUpdatedEventHandler RowUpdated;
 
-#if !NET_2_0
 		[DataSysDescription ("Event triggered after every DataRow during Update.")]
-#endif
                 [DataCategory ("DataCategory_Update")]
 		public event OleDbRowUpdatingEventHandler RowUpdating;
 
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
index 4ea1ff07675..360212695ab 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
@@ -119,9 +119,7 @@ namespace System.Data.OleDb
 		#region Properties
 
 		[BrowsableAttribute (false)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("The parameter generic type.")]
-#endif
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		[DataCategory ("DataCategory_Data")]
@@ -133,9 +131,7 @@ namespace System.Data.OleDb
 			}
 		}
 		
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Input, output, or bidirectional parameter.")]
-#endif
 		[DefaultValue (ParameterDirection.Input)]
 		[DataCategory ("DataCategory_Data")]
 		public ParameterDirection Direction {
@@ -144,9 +140,7 @@ namespace System.Data.OleDb
 		}
 		
 		[BrowsableAttribute (false)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("a design-time property used for strongly typed code-generation.")]
-#endif
 		[DesignOnlyAttribute (true)]
                 [EditorBrowsableAttribute (EditorBrowsableState.Advanced)]
 		[DefaultValue (false)]
@@ -156,9 +150,7 @@ namespace System.Data.OleDb
 		}
 
 		[DefaultValue (OleDbType.VarWChar)]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("The parameter native type.")]
-#endif
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
 		[DataCategory ("DataCategory_Data")]
 		public OleDbType OleDbType {
@@ -170,18 +162,14 @@ namespace System.Data.OleDb
 		}
 		
 		[DefaultValue ("")]
-#if !NET_2_0
 		[DataSysDescriptionAttribute ("Name of the parameter.")]
-#endif
 		public string ParameterName {
 			get { return name; }
 			set { name = value; }
 		}
 
 		[DefaultValue (0)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("For decimal, numeric, varnumeric DBTypes.")]
-#endif
 		[DataCategory ("DataCategory_Data")]
 		public byte Precision {
 			get { return precision; }
@@ -189,9 +177,7 @@ namespace System.Data.OleDb
 		}
 		
 		[DefaultValue (0)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("For decimal, numeric, varnumeric DBTypes.")]
-#endif
 		[DataCategory ("DataCategory_Data")]
 		public byte Scale {
 			get { return scale; }
@@ -200,9 +186,7 @@ namespace System.Data.OleDb
 		
 
 		[DefaultValue (0)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Size of variable length data types (string & arrays).")]
-#endif
 		[DataCategory ("DataCategory_Data")]
 		public int Size {
 			get { return size; }
@@ -210,9 +194,7 @@ namespace System.Data.OleDb
 		}
 
 		[DefaultValue ("")]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("When used by a DataAdapter.Update, the source column name that is used to find the DataSetColumn name in the ColumnMappings. This is to copy a value between the parameter and a datarow.")]
-#endif
 		[DataCategory ("DataCategory_Data")]
 		public string SourceColumn {
 			get { return sourceColumn; }
@@ -220,9 +202,7 @@ namespace System.Data.OleDb
 		}
 		
 		[DefaultValue (DataRowVersion.Current)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("When used by a DataAdapter.Update (UpdateCommand only), the version of the DataRow value that is used to update the data source.")]
-#endif
 		[DataCategory ("DataCategory_Data")]
 		public DataRowVersion SourceVersion {
 			get { return sourceVersion; }
@@ -230,9 +210,7 @@ namespace System.Data.OleDb
 		}
 		
 		[DefaultValue (null)]
-#if !NET_2_0
                 [DataSysDescriptionAttribute ("Value of the parameter.")]
-#endif
 		[TypeConverter (typeof (StringConverter))]
 		[DataCategory ("DataCategory_Data")]
 		public object Value {
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
index 196af517d23..1d2ddfd9169 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
@@ -46,7 +46,7 @@ using java.util.regex;
 

 namespace System.Data.ProviderBase

 {

-	public abstract class AbstractDbCommand : DbCommandBase, ICloneable

+	public abstract class AbstractDbCommand : DbCommandBase

 	{

 		#region ProcedureColumnCache
 
@@ -101,12 +101,12 @@ namespace System.Data.ProviderBase
 

 		#region Fields

 

-		private DbParameterCollection _parameters;

-		private java.sql.Statement _statement;

-		private AbstractDBConnection _connection;

-		private AbstractTransaction _transaction;

+		protected DbParameterCollection _parameters;

+		protected java.sql.Statement _statement;

+		protected AbstractDBConnection _connection;

+		protected AbstractTransaction _transaction;

 		private bool _isCommandPrepared;

-		private CommandBehavior _behavior;

+		protected CommandBehavior _behavior;

 		private ArrayList _internalParameters;

 		string _javaCommandText;

 		private int _recordsAffected;

@@ -116,7 +116,7 @@ namespace System.Data.ProviderBase
 		private bool _hasResultSet;

 		private bool _explicitPrepare;

 

-		static ProcedureColumnCache _procedureColumnCache = new ProcedureColumnCache();

+		internal static ProcedureColumnCache _procedureColumnCache = new ProcedureColumnCache();

 

 		#endregion // Fields

 

@@ -230,7 +230,7 @@ namespace System.Data.ProviderBase
 

 		// AbstractDbCommand acts as IEnumerator over JDBC statement

 		// AbstractDbCommand.CurrentResultSet corresponds to IEnumerator.Current

-		protected internal virtual ResultSet CurrentResultSet

+		internal virtual ResultSet CurrentResultSet

 		{

 			get { 

 				try {

@@ -245,7 +245,7 @@ namespace System.Data.ProviderBase
 			}

 		}

 

-		protected internal java.sql.Statement Statement

+		internal java.sql.Statement JdbcStatement

 		{

 			get { return _statement; }

 		}

@@ -275,7 +275,25 @@ namespace System.Data.ProviderBase
 

 		protected abstract DbParameterCollection CreateParameterCollection(AbstractDbCommand parent);

 

-		protected internal abstract SystemException CreateException(SQLException e);

+		protected abstract SystemException CreateException(SQLException e);

+

+		protected internal void CopyTo(AbstractDbCommand target)

+		{

+			target._behavior = _behavior;

+			target.CommandText = CommandText;

+			target.CommandTimeout = CommandTimeout;

+			target.CommandType = CommandType;

+			target._connection = _connection;

+			target._transaction = _transaction;

+			target.UpdatedRowSource = UpdatedRowSource;

+

+			if (Parameters != null && Parameters.Count > 0) {

+				target._parameters = CreateParameterCollection(target);

+				for(int i=0 ; i < Parameters.Count; i++) {

+					target.Parameters.Add(((AbstractDbParameter)Parameters[i]).Clone());

+				}

+			}

+		}

 

 		public override void Cancel()

 		{

@@ -295,12 +313,25 @@ namespace System.Data.ProviderBase
 			return false;

 		}

 

-		protected sealed override DbParameter CreateDbParameter()

+		protected override DbParameter CreateDbParameter()

 		{

 			return CreateParameterInternal();

 		}

 

-		internal ArrayList DeriveParameters(string procedureName, bool throwIfNotExist)

+		internal void DeriveParameters ()

+		{

+			if(CommandType != CommandType.StoredProcedure) {

+				throw ExceptionHelper.DeriveParametersNotSupported(this.GetType(),CommandType);

+			}

+

+			ArrayList parameters = DeriveParameters(CommandText, true);

+			Parameters.Clear();

+			foreach (AbstractDbParameter param in parameters) {

+				Parameters.Add(param.Clone());

+			}

+		}

+

+		protected ArrayList DeriveParameters(string procedureName, bool throwIfNotExist)

 		{

 			try {

 				ArrayList col = _procedureColumnCache.GetProcedureColumns((AbstractDBConnection)Connection, procedureName, this);

@@ -923,13 +954,13 @@ namespace System.Data.ProviderBase
 			parameterIndex++; 

 			PreparedStatement preparedStatement = ((PreparedStatement)_statement);

 

-			switch ((DbConvert.JavaSqlTypes)parameter.JdbcType) {

-				case DbConvert.JavaSqlTypes.DATALINK:

-				case DbConvert.JavaSqlTypes.DISTINCT:

-				case DbConvert.JavaSqlTypes.JAVA_OBJECT:

-				case DbConvert.JavaSqlTypes.OTHER:

-				case DbConvert.JavaSqlTypes.REF:

-				case DbConvert.JavaSqlTypes.STRUCT: {

+			switch (parameter.JdbcType) {

+				case DbTypes.JavaSqlTypes.DATALINK:

+				case DbTypes.JavaSqlTypes.DISTINCT:

+				case DbTypes.JavaSqlTypes.JAVA_OBJECT:

+				case DbTypes.JavaSqlTypes.OTHER:

+				case DbTypes.JavaSqlTypes.REF:

+				case DbTypes.JavaSqlTypes.STRUCT: {

 					preparedStatement.setObject(parameterIndex, value, (int)parameter.JdbcType);

 					return;

 				}

@@ -964,21 +995,21 @@ namespace System.Data.ProviderBase
 				preparedStatement.setString(parameterIndex, ((char)value).ToString());

 			}

 			else if (value is DateTime) {

-				switch ((DbConvert.JavaSqlTypes)parameter.JdbcType) {

+				switch (parameter.JdbcType) {

 					default:

-					case DbConvert.JavaSqlTypes.TIMESTAMP:

+					case DbTypes.JavaSqlTypes.TIMESTAMP:

 						preparedStatement.setTimestamp(parameterIndex,DbConvert.ClrTicksToJavaTimestamp(((DateTime)value).Ticks));

 						break;

-					case DbConvert.JavaSqlTypes.TIME:

+					case DbTypes.JavaSqlTypes.TIME:

 						preparedStatement.setTime(parameterIndex,DbConvert.ClrTicksToJavaTime(((DateTime)value).Ticks));

 						break;

-					case DbConvert.JavaSqlTypes.DATE:

+					case DbTypes.JavaSqlTypes.DATE:

 						preparedStatement.setDate(parameterIndex,DbConvert.ClrTicksToJavaDate(((DateTime)value).Ticks));

 						break;

 				}

 			}

 			else if (value is TimeSpan) {

-				if (parameter.JdbcType == (int)DbConvert.JavaSqlTypes.TIMESTAMP)

+				if (parameter.JdbcType == DbTypes.JavaSqlTypes.TIMESTAMP)

 					preparedStatement.setTimestamp(parameterIndex,DbConvert.ClrTicksToJavaTimestamp(((TimeSpan)value).Ticks));

 				else

 					preparedStatement.setTime(parameterIndex,DbConvert.ClrTicksToJavaTime(((TimeSpan)value).Ticks));

@@ -1063,7 +1094,7 @@ namespace System.Data.ProviderBase
 //				// suppress error : ms driver for sql server does not implement getParameterMetaData

 //				// suppress exception : ms driver for sql server does not implement getParameterMetaData

 //			}

-			DbConvert.JavaSqlTypes javaSqlType = (DbConvert.JavaSqlTypes)((AbstractDbParameter)parameter).JdbcType;

+			DbTypes.JavaSqlTypes javaSqlType = (DbTypes.JavaSqlTypes)((AbstractDbParameter)parameter).JdbcType;

 			try {

 				parameter.Value = DbConvert.JavaResultSetToClrWrapper(callableStatement,index,javaSqlType,parameter.Size,parameterMetadataWrapper);

 			}

@@ -1074,7 +1105,7 @@ namespace System.Data.ProviderBase
 

 		// AbstractDbCommand acts as IEnumerator over JDBC statement

 		// AbstractDbCommand.NextResultSet corresponds to IEnumerator.MoveNext

-		protected internal virtual bool NextResultSet()

+		internal virtual bool NextResultSet()

 		{

 			if (!_hasResultSet)

 				return false;

@@ -1165,30 +1196,5 @@ namespace System.Data.ProviderBase
 		}

 

 		#endregion // Methods

-

-		#region ICloneable Members

-

-		public virtual object Clone() {

-			AbstractDbCommand target = (AbstractDbCommand)MemberwiseClone();

-			target._statement = null;

-			target._isCommandPrepared = false;

-			target._internalParameters = null;

-			target._javaCommandText = null;

-			target._recordsAffected = -1;

-			target._currentResultSet = null;

-			target._currentReader = null;

-			target._nullParametersInPrepare = false;

-			target._hasResultSet = false;

-			target._explicitPrepare = false;

-			if (Parameters != null && Parameters.Count > 0) {

-				target._parameters = CreateParameterCollection(target);

-				for(int i=0 ; i < Parameters.Count; i++) {

-					target.Parameters.Add(((AbstractDbParameter)Parameters[i]).Clone());

-				}

-			}

-			return target;

-		}

-

-		#endregion

 	}

 }

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
index f079faf9fc4..f2c55510fbe 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
@@ -1,32 +1,32 @@
 //

 // System.Data.Common.AbstractDBConnection

-//

-// Authors:

-//	Konstantin Triger <kostat@mainsoft.com>

-//	Boris Kirzner <borisk@mainsoft.com>

-//	

-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//
+// Authors:
+//	Konstantin Triger <kostat@mainsoft.com>
+//	Boris Kirzner <borisk@mainsoft.com>
+//	
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //

 

 

@@ -38,18 +38,15 @@ using System.Collections;
 using System.Collections.Specialized;

 using System.Text;

 using System.Text.RegularExpressions;

-using Mainsoft.Data.Jdbc.Providers;

-using System.Data.Common;

 

 using java.sql;

 using javax.sql;

 using javax.naming;

+// can not use java.util here - it manes ArrayList an ambiguous reference

 

-using Mainsoft.Data.Configuration;

-

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

-	public abstract class AbstractDBConnection : DbConnection, ICloneable

+	public abstract class AbstractDBConnection : DbConnection

 	{

 		#region ObjectNamesHelper

 

@@ -106,18 +103,210 @@ namespace System.Data.ProviderBase
 		}

 

 		#endregion // ObjectNamesHelper

+

+		#region ConnectionStringHelper

+

+		internal sealed class ConnectionStringHelper

+		{

+			internal static string FindValue(NameValueCollection collection, string[] keys)

+			{

+				if (collection == null || keys == null || keys.Length == 0) {

+					return String.Empty;

+				}

+

+				for(int i=0; i < keys.Length; i++) {

+					string value = FindValue(collection,keys[i]);

+					if (!String.Empty.Equals(value)) {

+						return value;

+					}

+				}

+				return String.Empty;

+			}

+

+			internal static string FindValue(NameValueCollection collection, string key)

+			{

+				if (collection == null) {

+					return String.Empty;

+				}

+

+				string value = collection[key];

+				return (value != null) ? value : String.Empty;

+			}

+

+			internal static void UpdateValue(NameValueCollection collection,string[] keys,string value)

+			{

+				for(int i=0; i < keys.Length; i++) {

+					if (collection[keys[i]] != null) {

+						collection[keys[i]] = value;

+					}

+				}

+			}

+

+			internal static void AddValue(NameValueCollection collection,string[] keys,string value)

+			{

+				for(int i=0; i < keys.Length; i++) {

+					collection[keys[i]] = value;

+				}

+			}

+

+			/**

+			* Parses connection string and builds NameValueCollection 

+			* for all keys.

+			*/ 

+			internal static NameValueCollection BuildUserParameters (string connectionString)

+			{

+				NameValueCollection userParameters = new NameValueCollection();

+

+				if (connectionString == null || connectionString.Length == 0) {

+					return userParameters;

+				}

+				connectionString += ";";

+

+				bool inQuote = false;

+				bool inDQuote = false;

+				bool inName = true;

+

+				string name = String.Empty;

+				string value = String.Empty;

+				StringBuilder sb = new StringBuilder ();

+

+				for (int i = 0; i < connectionString.Length; i += 1) {

+					char c = connectionString [i];

+					char peek;

+					if (i == connectionString.Length - 1)

+						peek = '\0';

+					else

+						peek = connectionString [i + 1];

+

+					switch (c) {

+						case '\'':

+							if (inDQuote)

+								sb.Append (c);

+							else if (peek.Equals(c)) {

+								sb.Append(c);

+								i += 1;

+							}

+							else

+								inQuote = !inQuote;

+							break;

+						case '"':

+							if (inQuote)

+								sb.Append(c);

+							else if (peek.Equals(c)) {

+								sb.Append(c);

+								i += 1;

+							}

+							else

+								inDQuote = !inDQuote;

+							break;

+						case ';':

+							if (inDQuote || inQuote)

+								sb.Append(c);

+							else {

+								if (name != String.Empty && name != null) {

+									value = sb.ToString();

+									userParameters [name.Trim()] = value.Trim();

+								}

+								inName = true;

+								name = String.Empty;

+								value = String.Empty;

+								sb = new StringBuilder();

+							}

+							break;

+						case '=':

+							if (inDQuote || inQuote || !inName)

+								sb.Append (c);

+							else if (peek.Equals(c)) {

+								sb.Append (c);

+								i += 1;

+							}

+							else {

+								name = sb.ToString();

+								sb = new StringBuilder();

+								inName = false;

+							}

+							break;

+						case ' ':

+							if (inQuote || inDQuote)

+								sb.Append(c);

+							else if (sb.Length > 0 && !peek.Equals(';'))

+								sb.Append(c);

+							break;

+						default:

+							sb.Append(c);

+							break;

+					}

+				}

+				return userParameters;

+			}

+		}

+

+		#endregion // ConnectionStringHelper

+

+		#region DataSourceCache

+

+		private sealed class DataSourceCache : AbstractDbMetaDataCache

+		{

+			internal DataSource GetDataSource(string dataSourceName,string namingProviderUrl,string namingFactoryInitial)

+			{

+				Hashtable cache = Cache;

+

+				DataSource ds = cache[dataSourceName] as DataSource;

+

+				if (ds != null) {

+					return ds;

+				}

+

+				Context ctx = null;

+				

+				java.util.Properties properties = new java.util.Properties();

+

+				if ((namingProviderUrl != null) && (namingProviderUrl.Length > 0)) {

+					properties.put("java.naming.provider.url",namingProviderUrl);

+				}

+				

+				if ((namingFactoryInitial != null) && (namingFactoryInitial.Length > 0)) {

+					properties.put("java.naming.factory.initial",namingFactoryInitial);

+				}

+

+				ctx = new InitialContext(properties);

+ 

+				try {

+					ds = (DataSource)ctx.lookup(dataSourceName);

+				}

+				catch(javax.naming.NameNotFoundException e) {

+					// possible that is a Tomcat bug,

+					// so try to lookup for jndi datasource with "java:comp/env/" appended

+					ds = (DataSource)ctx.lookup("java:comp/env/" + dataSourceName);

+				}

+

+				cache[dataSourceName] = ds;

+				return ds;

+			}

+		}

+

+		#endregion // DatasourceCache

+

+		#region Declarations

+

+		protected internal enum JDBC_MODE { NONE, DATA_SOURCE_MODE, JDBC_DRIVER_MODE, PROVIDER_MODE }

+		protected internal enum PROVIDER_TYPE { NONE, SQLOLEDB, MSDAORA, IBMDADB2 }

+

+		#endregion // Declarations

 		

 		#region Fields

 

+		private static DataSourceCache _dataSourceCache = new DataSourceCache();

 		private const int DEFAULT_TIMEOUT = 15;

 

 		private Connection _jdbcConnnection;

 		private ConnectionState _internalState;

 		private object _internalStateSync = new object();

 

-		private string _connectionString = String.Empty;

-		IConnectionStringDictionary _connectionStringBuilder;

-		IConnectionProvider			_connectionProvider;

+		private NameValueCollection _userParameters;

+

+		protected string _connectionString = String.Empty;

+		protected string _jdbcUrl;		

 

 		private ArrayList _referencedObjects = new ArrayList();	

 		private ObjectNameResolver[] _syntaxPatterns;

@@ -129,6 +318,7 @@ namespace System.Data.ProviderBase
 		public AbstractDBConnection(string connectionString)

 		{

 			_connectionString = connectionString;

+			InitializeSkippedUserParameters();

 		}

 

 		#endregion // Constructors

@@ -143,23 +333,23 @@ namespace System.Data.ProviderBase
 					throw ExceptionHelper.NotAllowedWhileConnectionOpen("ConnectionString",_internalState);

 				}					

 				_connectionString = value;

-				_connectionProvider = null;

-				_connectionStringBuilder = null;

+				_userParameters = null;

+				_jdbcUrl = null;

 			}

 		}

 

 		public override int ConnectionTimeout

 		{

 			get {

-				string timeoutStr = (string)ConnectionStringBuilder["TIMEOUT"];

-				if (timeoutStr != null && timeoutStr.Length > 0) {

+				string timeoutStr = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_TIMEOUT"));

+				if (!String.Empty.Equals(timeoutStr)) {

 					try {

 						return Convert.ToInt32(timeoutStr);

 					}

-					catch(FormatException) {

+					catch(FormatException e) {

 						throw ExceptionHelper.InvalidValueForKey("connect timeout");

 					}

-					catch (OverflowException) {

+					catch (OverflowException e) {

 						throw ExceptionHelper.InvalidValueForKey("connect timeout");

 					}

 				}

@@ -169,12 +359,7 @@ namespace System.Data.ProviderBase
 

 		public override String Database

 		{

-			get { 

-				if ((State & ConnectionState.Open) != 0)

-					return JdbcConnection.getCatalog();

-

-				return (string)ConnectionStringBuilder["CATALOG"];

-			}

+			get { return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_DATABASE")); }

 		}

 

 		public override ConnectionState State

@@ -304,62 +489,204 @@ namespace System.Data.ProviderBase
 			}

 		}

 

-		public override string DataSource

+		protected virtual PROVIDER_TYPE ProviderType

 		{

 			get {

-				return (string)ConnectionStringBuilder["SERVERNAME"];

+				if (JdbcMode != JDBC_MODE.PROVIDER_MODE) {

+					return PROVIDER_TYPE.NONE;

+				}

+				

+				string providerStr = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_PROVIDER")).ToUpper();

+				if (providerStr.StartsWith("SQLOLEDB")) {

+					return PROVIDER_TYPE.SQLOLEDB;

+				}

+				else if (providerStr.StartsWith("MSDAORA")) {

+					return PROVIDER_TYPE.MSDAORA;

+				}

+				else if (providerStr.StartsWith("IBMDADB2")) {

+					return PROVIDER_TYPE.IBMDADB2;

+				}

+				return PROVIDER_TYPE.NONE;

 			}

 		}

 

-		internal ConnectionState InternalState

+		protected internal virtual JDBC_MODE JdbcMode

 		{

-			get	{ return _internalState; }

+			get { 

+				string[] conJndiNameStr = StringManager.GetStringArray("CON_JNDI_NAME");

+				if ( !String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,conJndiNameStr))) {

+					return JDBC_MODE.DATA_SOURCE_MODE;

+				}

+

+				string[] jdbcDriverStr = StringManager.GetStringArray("JDBC_DRIVER");

+				string[] jdbcUrlStr = StringManager.GetStringArray("JDBC_URL");

+				bool jdbcDriverSpecified = !String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,jdbcDriverStr));

+				bool jdbcUrlSpecified = !String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,jdbcUrlStr));

+

+				if (jdbcDriverSpecified && jdbcUrlSpecified) {

+					return JDBC_MODE.JDBC_DRIVER_MODE;

+				}

+

+				string[] providerStr = StringManager.GetStringArray("CON_PROVIDER");

+				if (!String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,providerStr))) {

+					return JDBC_MODE.PROVIDER_MODE;

+				}

+				

+				return JDBC_MODE.NONE;

+			}

+		}

+

+		protected virtual string JdbcDriverName

+		{

+			get { return String.Empty; }

 		}

 

+		protected abstract DbStringManager StringManager

+		{

+			get;

+		}

 

-		protected internal Connection JdbcConnection

+		protected virtual string ServerName

 		{

-			get { return _jdbcConnnection; }

-			set { _jdbcConnnection = value; }

+			get { return DataSource; }

 		}

 

-		internal ObjectNameResolver[] SyntaxPatterns

+		protected virtual string CatalogName

+		{

+			get { return Database; }

+		}

+

+		protected virtual string Port

 		{

 			get {

-				if (_syntaxPatterns == null) {

-					_syntaxPatterns = ObjectNamesHelper.GetSyntaxPatterns(this);

+				string port = ConnectionStringHelper.FindValue(UserParameters, StringManager.GetStringArray("CON_PORT"));

+				switch (ProviderType) {

+					case PROVIDER_TYPE.SQLOLEDB : 

+						if (String.Empty.Equals(port)) {

+							try {

+								port = DbPortResolver.getMSSqlPort(this).ToString();

+							}

+							catch (SQLException e) {

+								throw CreateException(e);

+							}

+						}

+

+						ConnectionStringHelper.AddValue(UserParameters,StringManager.GetStringArray("CON_PORT"),port);

+						break;

 				}

-				return _syntaxPatterns;

+				return port;

 			}

 		}

 

-		protected internal IConnectionProvider ConnectionProvider { 

+		public override string DataSource

+		{

 			get {

-				try {

-					if (_connectionProvider == null)

-						_connectionProvider = GetConnectionProvider();

+				string dataSource = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_DATA_SOURCE"));

+

+				if (ProviderType == PROVIDER_TYPE.SQLOLEDB) {

+					int instanceIdx;

+					if ((instanceIdx = dataSource.IndexOf("\\")) != -1) {

+						// throw out named instance name

+						dataSource = dataSource.Substring(0,instanceIdx);

+					}

+

+					if (dataSource != null && dataSource.StartsWith("(") && dataSource.EndsWith(")")) {						

+						dataSource = dataSource.Substring(1,dataSource.Length - 2);

+					}

 

-					return _connectionProvider;

+					if(String.Empty.Equals(dataSource) || (String.Compare("local",dataSource,true) == 0)) {

+						dataSource = "localhost";

+					}

 				}

-				catch(SQLException exp) {

-					throw CreateException(exp);

+				return dataSource;

+			}

+		}

+

+		internal string InstanceName

+		{

+			get {

+				string dataSource = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_DATA_SOURCE"));

+				string instanceName = String.Empty;

+				if (ProviderType == PROVIDER_TYPE.SQLOLEDB) {

+					int instanceIdx;

+					if ((instanceIdx = dataSource.IndexOf("\\")) == -1) {

+						// no named instance specified - use a default name

+						instanceName = StringManager.GetString("SQL_DEFAULT_INSTANCE_NAME");

+					}

+					else {

+						// get named instance name

+						instanceName = dataSource.Substring(instanceIdx + 1);

+					}

 				}

+				return instanceName;

 			}

 		}

-		protected internal IConnectionStringDictionary ConnectionStringBuilder {

+

+		protected virtual string User

+		{

+			get { return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_USER_ID")); }

+		}

+

+		protected virtual string Password

+		{

+			get { return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_PASSWORD")); }

+		}

+

+		protected NameValueCollection UserParameters

+		{

 			get {

-				try {

-					if (_connectionStringBuilder == null)

-						_connectionStringBuilder = ConnectionProvider.GetConnectionStringBuilder(ConnectionString);

+				if (_userParameters == null) {

+					_userParameters = ConnectionStringHelper.BuildUserParameters(ConnectionString);

+				}

+				return _userParameters;

+			}

+		}

 

-					return _connectionStringBuilder;

+		internal String JdbcUrl 

+		{

+			get { 

+				if ( UserParameters == null) {

+					return String.Empty;

 				}

-				catch(SQLException exp) {

-					throw CreateException(exp);

+

+				if (_jdbcUrl == null) {

+					_jdbcUrl = BuildJdbcUrl();

 				}

+				return _jdbcUrl;

+			}

+		}

+

+		internal ConnectionState InternalState

+		{

+			get	{ return _internalState; }

+		}

+

+

+		protected internal Connection JdbcConnection

+		{

+			get { return _jdbcConnnection; }

+			set { _jdbcConnnection = value; }

+		}

+

+		protected virtual string[] ResourceIgnoredKeys

+		{

+			get { return new string[0]; }

+		}

+

+		protected virtual Hashtable SkippedUserParameters

+		{

+			get { return new Hashtable(new CaseInsensitiveHashCodeProvider(),new CaseInsensitiveComparer()); }

+		}

+

+		internal ObjectNameResolver[] SyntaxPatterns

+		{

+			get {

+				if (_syntaxPatterns == null) {

+					_syntaxPatterns = ObjectNamesHelper.GetSyntaxPatterns(this);

+				}

+				return _syntaxPatterns;

 			}

 		}

-		protected abstract IConnectionProvider GetConnectionProvider();

 

 		#endregion // Properties

 

@@ -367,9 +694,9 @@ namespace System.Data.ProviderBase
 			// since WS also does not permits dynamically change of login timeout and tomcat does no implements - do not do it at all

 			//ds.setLoginTimeout(ConnectionTimeout);

 

-		protected internal abstract void OnSqlWarning(SQLWarning warning);

+		internal abstract void OnSqlWarning(SQLWarning warning);

 

-		protected internal abstract void OnStateChanged(ConnectionState orig, ConnectionState current);

+		internal abstract void OnStateChanged(ConnectionState orig, ConnectionState current);

 

 		protected abstract SystemException CreateException(SQLException e);

 

@@ -380,25 +707,35 @@ namespace System.Data.ProviderBase
 			try {

 				ClearReferences();

 				if (JdbcConnection != null && !JdbcConnection.isClosed()) {

-					if (!JdbcConnection.getAutoCommit())

-						JdbcConnection.rollback();

 					JdbcConnection.close();

 				}

 			}

+			catch (SQLException e) {

+				// suppress exception

+				JdbcConnection = null;

+#if DEBUG

+				Console.WriteLine("Exception catched at Conection.Close() : {0}\n{1}\n{2}",e.GetType().FullName,e.Message,e.StackTrace);

+#endif

+			}

 			catch (Exception e) {

 				// suppress exception

+				JdbcConnection = null;

 #if DEBUG

 				Console.WriteLine("Exception catched at Conection.Close() : {0}\n{1}\n{2}",e.GetType().FullName,e.Message,e.StackTrace);

 #endif

 			}

 			finally {

-				JdbcConnection = null;

 				lock(_internalStateSync) {

 					_internalState = ConnectionState.Closed;

 				}

 			}

 		}

 

+		protected internal virtual void CopyTo(AbstractDBConnection target)

+		{

+			target._connectionString = _connectionString;

+		}

+

 		internal protected virtual void OnSqlException(SQLException exp)

 		{

 			throw CreateException(exp);

@@ -461,9 +798,20 @@ namespace System.Data.ProviderBase
 				if (JdbcConnection != null && !JdbcConnection.isClosed()) {

 					throw ExceptionHelper.ConnectionAlreadyOpen(_internalState);

 				}

-

-				JdbcConnection = ConnectionProvider.GetConnection (ConnectionStringBuilder);

-

+	

+				switch(JdbcMode) {

+					case JDBC_MODE.DATA_SOURCE_MODE :

+						JdbcConnection = GetConnectionFromDataSource();

+						break;

+

+					case JDBC_MODE.JDBC_DRIVER_MODE:

+						JdbcConnection = GetConnectionFromJdbcDriver();

+						break;

+

+					case JDBC_MODE.PROVIDER_MODE : 					

+						JdbcConnection = GetConnectionFromProvider();

+						break;

+				}

 				IsOpened = true;

 

 				OnStateChanged(ConnectionState.Closed, ConnectionState.Open);

@@ -486,7 +834,7 @@ namespace System.Data.ProviderBase
 				ClearReferences();

 				Connection con = JdbcConnection;				

 				con.setCatalog(database);

-//				ConnectionStringHelper.UpdateValue(UserParameters,StringManager.GetStringArray("CON_DATABASE"),database);

+				ConnectionStringHelper.UpdateValue(UserParameters,StringManager.GetStringArray("CON_DATABASE"),database);

 			}

 			catch (SQLWarning warning) {

 				OnSqlWarning(warning);

@@ -547,6 +895,79 @@ namespace System.Data.ProviderBase
 			base.Dispose(disposing);

 		}

 

+		protected internal virtual void ValidateConnectionString(string connectionString)

+		{

+			JDBC_MODE currentJdbcMode = JdbcMode;

+			

+			if (currentJdbcMode == JDBC_MODE.NONE) {

+				string[] jdbcDriverStr = StringManager.GetStringArray("JDBC_DRIVER");

+				string[] jdbcUrlStr = StringManager.GetStringArray("JDBC_URL");

+				bool jdbcDriverSpecified = !String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,jdbcDriverStr));

+				bool jdbcUrlSpecified = !String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,jdbcUrlStr));

+

+				if (jdbcDriverSpecified ^ jdbcUrlSpecified) {

+					throw new ArgumentException("Invalid format of connection string. If you want to use third-party JDBC driver, the format is: \"JdbcDriverClassName=<jdbc driver class name>;JdbcURL=<jdbc url>\"");

+				}				

+			}

+		}

+

+		protected virtual string BuildJdbcUrl()

+		{

+			switch (JdbcMode) {

+				case JDBC_MODE.JDBC_DRIVER_MODE :

+					return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("JDBC_URL"));

+				default :

+					return String.Empty;

+			}

+		}

+

+		protected java.util.Properties BuildProperties()

+		{

+			java.util.Properties properties = new java.util.Properties();

+

+			string user = User;

+			if (user != null && user.Length > 0)

+				properties.put("user", user);

+			string password = Password;

+			if (user != null && user.Length > 0)

+				properties.put("password", password);

+

+			string[] userKeys = UserParameters.AllKeys;

+

+			for(int i=0; i < userKeys.Length; i++) {

+				string userKey = userKeys[i];

+				string userParameter = UserParameters[userKey];

+				if (!SkipUserParameter(userKey)) {

+					properties.put(userKey,userParameter);

+				}

+			}

+			return properties;

+		}

+

+		protected virtual bool SkipUserParameter(string parameterName)

+		{

+			if (SkippedUserParameters.Count == 0) {

+				// skipped parameters not initialized - skip all

+				return true;

+			}

+

+			return SkippedUserParameters.Contains(parameterName);

+		}

+

+		protected virtual void InitializeSkippedUserParameters()

+		{

+			if (SkippedUserParameters.Count > 0) {

+				return;

+			}

+

+			for(int i=0; i < ResourceIgnoredKeys.Length; i++) {

+				string[] userKeys = StringManager.GetStringArray(ResourceIgnoredKeys[i]);

+				for(int j=0; j < userKeys.Length; j++) {

+					SkippedUserParameters.Add(userKeys[j],userKeys[j]);

+				}

+			}

+		}

+ 

 		internal void ValidateBeginTransaction()

 		{

 			if (State != ConnectionState.Open) {

@@ -558,6 +979,48 @@ namespace System.Data.ProviderBase
 			}

 		}

 

+		internal virtual Connection GetConnectionFromProvider()

+		{

+			ActivateJdbcDriver(JdbcDriverName);

+			DriverManager.setLoginTimeout(ConnectionTimeout);

+			java.util.Properties properties = BuildProperties();

+			return DriverManager.getConnection (JdbcUrl, properties);

+		}

+

+		internal Connection GetConnectionFromDataSource()

+		{

+			string dataSourceJndi = ConnectionStringHelper.FindValue(UserParameters, StringManager.GetStringArray("CON_JNDI_NAME"));

+			string namingProviderUrl = ConnectionStringHelper.FindValue(UserParameters, StringManager.GetStringArray("CON_JNDI_PROVIDER"));

+			string namingFactoryInitial = ConnectionStringHelper.FindValue(UserParameters, StringManager.GetStringArray("CON_JNDI_FACTORY"));

+			DataSource ds = _dataSourceCache.GetDataSource(dataSourceJndi,namingProviderUrl,namingFactoryInitial);

+			try {

+				ds.setLoginTimeout(ConnectionTimeout);

+			}

+			catch (java.lang.Exception) {

+				// WebSphere does not allows dynamicall change of login timeout

+				// setLoginTimeout is not supported yet

+				// in Tomcat data source.

+				// In this case we work wthout timeout.

+			}

+			return ds.getConnection();

+		}

+

+		internal virtual Connection GetConnectionFromJdbcDriver()

+		{

+			string[] jdbcDriverStr = StringManager.GetStringArray("JDBC_DRIVER");

+			string[] jdbcUrlStr = StringManager.GetStringArray("JDBC_URL");

+		

+			string jdbcDriverName = ConnectionStringHelper.FindValue(UserParameters,jdbcDriverStr);

+			string jdbcUrl = ConnectionStringHelper.FindValue(UserParameters,jdbcUrlStr);

+

+			ActivateJdbcDriver(jdbcDriverName);

+			DriverManager.setLoginTimeout(ConnectionTimeout);

+

+			java.util.Properties properties = BuildProperties();

+

+			return DriverManager.getConnection(jdbcUrl,properties);

+		}

+

 		internal ArrayList GetProcedureColumns(String procedureString, AbstractDbCommand command)

 		{

 			ArrayList col = new ArrayList();

@@ -688,20 +1151,30 @@ namespace System.Data.ProviderBase
 			return col;

 		}

 

-		#endregion // Methods	

-

-		#region ICloneable Members

+		protected static void ActivateJdbcDriver(string driver)

+		{

+			if(driver != null) {

+				try {

+					java.lang.Class.forName(driver).newInstance();

+				}

+				catch (java.lang.ClassNotFoundException e) {

+					throw new TypeLoadException(e.Message);

+				}

+				catch (java.lang.InstantiationException e) {

+					throw new MemberAccessException(e.Message);

+				}

+                catch (java.lang.IllegalAccessException e) {

+					throw new MissingMethodException(e.Message);

+				}

+			}

+		}

 

-		public virtual object Clone() {

-			AbstractDBConnection con  = (AbstractDBConnection)MemberwiseClone();

-			con._internalState = ConnectionState.Closed;

-			con._internalStateSync = new object();

-			con._jdbcConnnection = null;

-			con._referencedObjects = new ArrayList();

-			con._syntaxPatterns = null;

-			return con;

+		protected String BuildMsSqlUrl()

+		{

+			return StringManager.GetString("SQL_JDBC_URL") //"jdbc:microsoft:sqlserver://"

+				+ ServerName + ":" + Port + ";DatabaseName=" + CatalogName;

 		}

 

-		#endregion

+		#endregion // Methods	

 	}

-}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs
index 0c117bf6da6..677cef8e06c 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBParameter.cs
@@ -45,7 +45,7 @@ namespace System.Data.ProviderBase
 		protected byte _precision;

 		protected byte _scale;

 		protected DataRowVersion _sourceVersion;

-		private int _jdbcType;

+		private DbTypes.JavaSqlTypes _jdbcType;

 		protected bool _isDbTypeSet = false;

 		protected bool _isJdbcTypeSet = false;

 		object _convertedValue;

@@ -81,7 +81,7 @@ namespace System.Data.ProviderBase
 			set { _sourceVersion = value; }

 		}
 
-		protected internal int JdbcType
+		internal DbTypes.JavaSqlTypes JdbcType
 		{
 			get { 
 				if (!_isJdbcTypeSet) {
@@ -95,7 +95,7 @@ namespace System.Data.ProviderBase
 			}
 		}
 		
-		protected internal bool IsJdbcTypeSet
+		internal bool IsJdbcTypeSet
 		{
 			get { 
 				return _isJdbcTypeSet; 
@@ -111,7 +111,7 @@ namespace System.Data.ProviderBase
 			get { return _isDbTypeSet; }
 		}
 
-		protected internal virtual bool IsSpecial {
+		internal virtual bool IsSpecial {
 			get {
 				return false;
 			}
@@ -150,33 +150,21 @@ namespace System.Data.ProviderBase
 			}
 		}
 
-		//DbParameter overrides
-
-		public override bool SourceColumnNullMapping {

-			get {

-				throw new NotImplementedException();

-			}

-			set {

-				throw new NotImplementedException();

-			}

-		}

-
-
 		#endregion // Properties
 
 		#region Methods
 
-		protected internal abstract void SetParameterName(ResultSet res);

+		internal abstract void SetParameterName(ResultSet res);

 

-		protected internal abstract void SetParameterDbType(ResultSet res);

+		internal abstract void SetParameterDbType(ResultSet res);

 

-		protected internal abstract void SetSpecialFeatures(ResultSet res);
+		internal abstract void SetSpecialFeatures(ResultSet res);
 		
 		public abstract object Clone();
 
-		protected internal abstract int JdbcTypeFromProviderType();
+		internal abstract DbTypes.JavaSqlTypes JdbcTypeFromProviderType();
 
-		protected internal abstract object ConvertValue(object value);
+		internal abstract object ConvertValue(object value);
 
 		internal void SetParameterPrecisionAndScale(ResultSet res)
 		{
@@ -214,12 +202,6 @@ namespace System.Data.ProviderBase
 			t._jdbcType = _jdbcType;

 		}
 
-		//DbParameter overrides
-
-		public override void ResetDbType() {

-			throw new NotImplementedException();

-		}
-
 		#endregion // Methods

     }

 }

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs
index 69ee3b78b0d..004d67bee56 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDataReader.cs
@@ -1,44 +1,44 @@
 //

 // System.Data.Common.AbstractDataReader

-//

-// Authors:

-//	Konstantin Triger <kostat@mainsoft.com>

-//	Boris Kirzner <borisk@mainsoft.com>

-//	

-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//
+// Authors:
+//	Konstantin Triger <kostat@mainsoft.com>
+//	Boris Kirzner <borisk@mainsoft.com>
+//	
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //

 

 

 using System;

 using System.Data;

 using System.Collections;

-using System.Data.Common;

+using System.Data.ProviderBase;

 

 using java.io;

 using java.sql;

 

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

 	public abstract class AbstractDataReader : DbDataReaderBase, ISafeDataRecord {

 

@@ -200,8 +200,8 @@ namespace System.Data.ProviderBase
 							if (resultSet.next()) {

 								_readerState = (ReaderState.HasRows | ReaderState.FirstRed);

 								ResultSetMetaData rsMetaData = ResultsMetaData;

-								DbConvert.JavaSqlTypes javaSqlType = (DbConvert.JavaSqlTypes)rsMetaData.getColumnType(1);

-								if (javaSqlType == DbConvert.JavaSqlTypes.OTHER) {

+								DbTypes.JavaSqlTypes javaSqlType = (DbTypes.JavaSqlTypes)rsMetaData.getColumnType(1);

+								if (javaSqlType == DbTypes.JavaSqlTypes.OTHER) {

 									object value = GetValue(0);

 									if (value != null && value is ResultSet) {

 										_resultsMetaData = null;

@@ -264,7 +264,7 @@ namespace System.Data.ProviderBase
 				return _readerCache;

 			}

 		}

-

+
 		public override bool IsClosed {

 			get { return _isClosed; }

 		}

@@ -496,11 +496,6 @@ namespace System.Data.ProviderBase
 

 		public override DateTime GetDateTime(int columnIndex)

 		{

-			return GetDateTimeUnsafe(columnIndex);

-		}

-

-		DateTime GetDateTimeUnsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((DateTimeReaderCacheContainer)ReaderCache[columnIndex]).GetDateTime();

 		}

@@ -508,7 +503,7 @@ namespace System.Data.ProviderBase
 		public DateTime GetDateTimeSafe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is DateTimeReaderCacheContainer) {

-				return GetDateTimeUnsafe(columnIndex);

+				return GetDateTime(columnIndex);

 			}

 			else {

 				return Convert.ToDateTime(GetValue(columnIndex));

@@ -529,11 +524,6 @@ namespace System.Data.ProviderBase
 

 		public override decimal GetDecimal(int columnIndex)

 		{

-			return GetDecimalUnsafe(columnIndex);

-		}

-

-		decimal GetDecimalUnsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((DecimalReaderCacheContainer)ReaderCache[columnIndex]).GetDecimal();

 		}

@@ -541,7 +531,7 @@ namespace System.Data.ProviderBase
 		public decimal GetDecimalSafe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is DecimalReaderCacheContainer) {

-				return GetDecimalUnsafe(columnIndex);

+				return GetDecimal(columnIndex);

 			}

 			else {

 				return Convert.ToDecimal(GetValue(columnIndex));

@@ -550,11 +540,6 @@ namespace System.Data.ProviderBase
 

 		public override double GetDouble(int columnIndex)

 		{

-			return GetDoubleUnsafe(columnIndex);

-		}

-

-		double GetDoubleUnsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((DoubleReaderCacheContainer)ReaderCache[columnIndex]).GetDouble();

 		}

@@ -562,7 +547,7 @@ namespace System.Data.ProviderBase
 		public double GetDoubleSafe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is DoubleReaderCacheContainer) {

-				return GetDoubleUnsafe(columnIndex);

+				return GetDouble(columnIndex);

 			}

 			else {

 				return Convert.ToDouble(GetValue(columnIndex));

@@ -571,11 +556,6 @@ namespace System.Data.ProviderBase
 

 		public override float GetFloat(int columnIndex)

 		{

-			return GetFloatUnsafe(columnIndex);

-		}

-

-		float GetFloatUnsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((FloatReaderCacheContainer)ReaderCache[columnIndex]).GetFloat();

 		}

@@ -583,7 +563,7 @@ namespace System.Data.ProviderBase
 		public float GetFloatSafe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is FloatReaderCacheContainer) {

-				return GetFloatUnsafe(columnIndex);

+				return GetFloat(columnIndex);

 			}

 			else {

 				return Convert.ToSingle(GetValue(columnIndex));

@@ -592,11 +572,6 @@ namespace System.Data.ProviderBase
 

 		public override short GetInt16(int columnIndex)

 		{

-			return GetInt16Unsafe(columnIndex);

-		}

-

-		short GetInt16Unsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((Int16ReaderCacheContainer)ReaderCache[columnIndex]).GetInt16();

 		}

@@ -604,7 +579,7 @@ namespace System.Data.ProviderBase
 		public short GetInt16Safe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is Int16ReaderCacheContainer) {

-				return GetInt16Unsafe(columnIndex);

+				return GetInt16(columnIndex);

 			}

 			else {

 				return Convert.ToInt16(GetValue(columnIndex));

@@ -613,11 +588,6 @@ namespace System.Data.ProviderBase
 

 		public override int GetInt32(int columnIndex)

 		{

-			return GetInt32Unsafe(columnIndex);

-		}

-

-		int GetInt32Unsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((Int32ReaderCacheContainer)ReaderCache[columnIndex]).GetInt32();

 		}

@@ -625,7 +595,7 @@ namespace System.Data.ProviderBase
 		public int GetInt32Safe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is Int32ReaderCacheContainer) {

-				return GetInt32Unsafe(columnIndex);

+				return GetInt32(columnIndex);

 			}

 			else {

 				return Convert.ToInt32(GetValue(columnIndex));

@@ -634,11 +604,6 @@ namespace System.Data.ProviderBase
 

 		public override long GetInt64(int columnIndex)

 		{

-			return GetInt64Unsafe(columnIndex);

-		}

-

-		long GetInt64Unsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((Int64ReaderCacheContainer)ReaderCache[columnIndex]).GetInt64();

 		}

@@ -646,7 +611,7 @@ namespace System.Data.ProviderBase
 		public long GetInt64Safe(int columnIndex)

 		{

 			if (ReaderCache[columnIndex] is Int64ReaderCacheContainer) {

-				return GetInt64Unsafe(columnIndex);

+				return GetInt64(columnIndex);

 			}

 			else {

 				return Convert.ToInt64(GetValue(columnIndex));

@@ -682,18 +647,13 @@ namespace System.Data.ProviderBase
 

 		public override string GetString(int columnIndex)

 		{

-			return GetStringUnsafe(columnIndex);

-		}

-

-		string GetStringUnsafe(int columnIndex)

-		{

 			FillReaderCache(columnIndex);

 			return ((StringReaderCacheContainer)ReaderCache[columnIndex]).GetString();

 		}

 

 		public string GetStringSafe(int columnIndex) {

 			if (ReaderCache[columnIndex] is StringReaderCacheContainer) {

-				return GetStringUnsafe(columnIndex);

+				return GetString(columnIndex);

 			}

 			else {

 				return Convert.ToString(GetValue(columnIndex));

@@ -748,26 +708,26 @@ namespace System.Data.ProviderBase
 			try {

 				IReaderCacheContainer[] readerCache = new IReaderCacheContainer[FieldCount];

 				for(int i=0; i < readerCache.Length; i++) {

-					DbConvert.JavaSqlTypes javaSqlType = (DbConvert.JavaSqlTypes) ResultsMetaData.getColumnType(i + 1);

+					DbTypes.JavaSqlTypes javaSqlType = (DbTypes.JavaSqlTypes) ResultsMetaData.getColumnType(i + 1);

 					switch (javaSqlType) {

-						case DbConvert.JavaSqlTypes.ARRAY :

+						case DbTypes.JavaSqlTypes.ARRAY :

 							readerCache[i] = new ArrayReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.BIGINT :

+						case DbTypes.JavaSqlTypes.BIGINT :

 							readerCache[i] = new Int64ReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.BINARY :

-						case DbConvert.JavaSqlTypes.VARBINARY :

-						case DbConvert.JavaSqlTypes.LONGVARBINARY :

+						case DbTypes.JavaSqlTypes.BINARY :

+						case DbTypes.JavaSqlTypes.VARBINARY :

+						case DbTypes.JavaSqlTypes.LONGVARBINARY :

 							readerCache[i] = new BytesReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.BIT :

+						case DbTypes.JavaSqlTypes.BIT :

 							readerCache[i] = new BooleanReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.BLOB :

+						case DbTypes.JavaSqlTypes.BLOB :

 							readerCache[i] = new BlobReaderCacheContainer();

 							break;	

-						case DbConvert.JavaSqlTypes.CHAR :						

+						case DbTypes.JavaSqlTypes.CHAR :						

 							if ("uniqueidentifier".Equals(ResultsMetaData.getColumnTypeName(i + 1))) {

 								readerCache[i] = new GuidReaderCacheContainer();

 							}

@@ -775,13 +735,13 @@ namespace System.Data.ProviderBase
 								readerCache[i] = new StringReaderCacheContainer();

 							}

 							break;

-						case DbConvert.JavaSqlTypes.CLOB :

+						case DbTypes.JavaSqlTypes.CLOB :

 							readerCache[i] = new ClobReaderCacheContainer();

 							break;		

-						case DbConvert.JavaSqlTypes.TIME :

+						case DbTypes.JavaSqlTypes.TIME :

 							readerCache[i] = new TimeSpanReaderCacheContainer();

 							break;	

-						case DbConvert.JavaSqlTypes.DATE :

+						case DbTypes.JavaSqlTypes.DATE :

 							AbstractDBConnection conn = (AbstractDBConnection)((ICloneable)_command.Connection);

 							string driverName = conn.JdbcConnection.getMetaData().getDriverName();

 

@@ -790,12 +750,12 @@ namespace System.Data.ProviderBase
 								break;

 							}

 							else

-								goto case DbConvert.JavaSqlTypes.TIMESTAMP;

-						case DbConvert.JavaSqlTypes.TIMESTAMP :				

+								goto case DbTypes.JavaSqlTypes.TIMESTAMP;

+						case DbTypes.JavaSqlTypes.TIMESTAMP :				

 							readerCache[i] = new TimestampReaderCacheContainer();

 							break;		

-						case DbConvert.JavaSqlTypes.DECIMAL :

-						case DbConvert.JavaSqlTypes.NUMERIC :

+						case DbTypes.JavaSqlTypes.DECIMAL :

+						case DbTypes.JavaSqlTypes.NUMERIC :

 							// jdbc driver for oracle identitfies both FLOAT and NUMBEr columns as 

 							// java.sql.Types.NUMERIC (2), columnTypeName NUMBER, columnClassName java.math.BigDecimal 

 							// therefore we relay on scale

@@ -808,36 +768,36 @@ namespace System.Data.ProviderBase
 								readerCache[i] = new DecimalReaderCacheContainer();

 							}

 							break;		

-						case DbConvert.JavaSqlTypes.DOUBLE :

-						case DbConvert.JavaSqlTypes.FLOAT :

+						case DbTypes.JavaSqlTypes.DOUBLE :

+						case DbTypes.JavaSqlTypes.FLOAT :

 							readerCache[i] = new DoubleReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.INTEGER :

+						case DbTypes.JavaSqlTypes.INTEGER :

 							readerCache[i] = new Int32ReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.LONGVARCHAR :

-						case DbConvert.JavaSqlTypes.VARCHAR :

+						case DbTypes.JavaSqlTypes.LONGVARCHAR :

+						case DbTypes.JavaSqlTypes.VARCHAR :

 							readerCache[i] = new StringReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.NULL :

+						case DbTypes.JavaSqlTypes.NULL :

 							readerCache[i] = new NullReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.REAL :

+						case DbTypes.JavaSqlTypes.REAL :

 							readerCache[i] = new FloatReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.REF :

+						case DbTypes.JavaSqlTypes.REF :

 							readerCache[i] = new RefReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.SMALLINT :

+						case DbTypes.JavaSqlTypes.SMALLINT :

 							readerCache[i] = new Int16ReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.TINYINT :

+						case DbTypes.JavaSqlTypes.TINYINT :

 							readerCache[i] = new ByteReaderCacheContainer();

 							break;

-						case DbConvert.JavaSqlTypes.DISTINCT :

-						case DbConvert.JavaSqlTypes.JAVA_OBJECT :

-						case DbConvert.JavaSqlTypes.OTHER :

-						case DbConvert.JavaSqlTypes.STRUCT :

+						case DbTypes.JavaSqlTypes.DISTINCT :

+						case DbTypes.JavaSqlTypes.JAVA_OBJECT :

+						case DbTypes.JavaSqlTypes.OTHER :

+						case DbTypes.JavaSqlTypes.STRUCT :

 						default :

 							readerCache[i] = new ObjectReaderCacheContainer();

 							break;

@@ -852,11 +812,6 @@ namespace System.Data.ProviderBase
 			}

 		}

 

-		protected bool IsNumeric(int columnIndex)

-		{

-			return ReaderCache[columnIndex].IsNumeric();

-		}

-

 		public override bool IsDBNull(int columnIndex)

 		{

 			FillReaderCache(columnIndex);

@@ -888,7 +843,7 @@ namespace System.Data.ProviderBase
 			ResultSetMetaData metaData;			

 			if (Behavior == CommandBehavior.SchemaOnly) {

 				try {

-					metaData = ((PreparedStatement)_command.Statement).getMetaData();

+					metaData = ((PreparedStatement)_command.JdbcStatement).getMetaData();

 				}

 				catch(SQLException e) {

 					throw CreateException("CommandBehaviour.SchemaOnly is not supported by the JDBC driver.",e);

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbCommandBuilder.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbCommandBuilder.cs
deleted file mode 100755
index 300e9cdd828..00000000000
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbCommandBuilder.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// System.Data.ProviderBase.AbstractDbCommand
-//
-// Authors:
-//	Konstantin Triger <kostat@mainsoft.com>
-//	
-// (C) 2006 Mainsoft Corporation (http://www.mainsoft.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Text;
-
-namespace System.Data.ProviderBase {
-	public abstract class AbstractDbCommandBuilder : DbCommandBuilder {
-		protected override void ApplyParameterInfo(DbParameter parameter, DataRow row, StatementType statementType, bool whereClause) {
-			throw new NotImplementedException();
-		}
-
-		protected override string GetParameterName(int parameterOrdinal) {
-			throw new NotImplementedException();
-		}
-
-		protected override string GetParameterName(String parameterName) {
-			throw new NotImplementedException();
-		}
-
-		protected override string GetParameterPlaceholder(int parameterOrdinal) {
-			return "?";
-		}
-
-		protected override void SetRowUpdatingHandler(DbDataAdapter adapter) {
-			throw new NotImplementedException();
-		}
-
-		protected static void DeriveParameters (AbstractDbCommand command) {
-			if (command.Connection.State != ConnectionState.Open) {
-				throw new InvalidOperationException("DeriveParameters requires an open and available Connection. The connection's current state is Closed.");
-			}
-			
-			if(command.CommandType != CommandType.StoredProcedure) {
-				throw ExceptionHelper.DeriveParametersNotSupported(command.GetType(),command.CommandType);
-			}
-
-			ArrayList parameters = command.DeriveParameters(command.CommandText, true);
-			command.Parameters.Clear();
-			foreach (AbstractDbParameter param in parameters) {
-				command.Parameters.Add(param.Clone());
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbErrorCollection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbErrorCollection.cs
index 5e7fc681f47..5509039e7c9 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbErrorCollection.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbErrorCollection.cs
@@ -41,7 +41,7 @@ namespace System.Data.ProviderBase {
 	public abstract class AbstractDbErrorCollection : ICollection, IEnumerable {

 		private ArrayList _list;

 

-		protected AbstractDbErrorCollection(SQLException e, AbstractDBConnection connection) {

+		internal AbstractDbErrorCollection(SQLException e, AbstractDBConnection connection) {

 			_list = new ArrayList();

 

 			while(e != null) {

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs
index 2d40171c8ac..de3d640016b 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs
@@ -95,7 +95,7 @@ namespace System.Data.ProviderBase
 			base.RemoveAt(parameterName);

         }

 

-		protected internal void OnSchemaChanging()

+		internal void OnSchemaChanging()

         {

             if (_parent != null) {

                 _parent.OnSchemaChanging();

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs
index 92020adc57a..60e93a619aa 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractTransaction.cs
@@ -29,9 +29,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //

 

-using System.Data.Common;

 

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

 

     using java.sql;

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
index eb03bf14829..41c0feebe98 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
@@ -1,9 +1,3 @@
-2006-02-26  Konstantin Triger <kostat@mainsoft.com>
-
-	* AbstractDataReader.cs: Prevent recursion when GetXXX is overriden and GetXXXSafe is called.
-	* ReaderCache.cs: Added IsNumeric to cache containers.
-	* AbstractDBCommand.cs, regex.cs: Refactoring.
-
 2006-05-01 Konstantin Triger <kostat@mainsoft.com
 
 	*      AbstractDataReader.cs, ReaderCache.cs: use stream interfaces
diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbConvert.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbConvert.cs
deleted file mode 100644
index 7b62cbe9295..00000000000
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbConvert.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-//

-// System.Data.Common.DbConvert

-//

-// Author:

-//   Boris Kirzner (borisk@mainsoft.com)

-//

-

-using System;

-using System.Data.Common;

-

-using java.io;

-using java.sql;

-

-namespace System.Data.ProviderBase

-{

-	public abstract class DbConvert

-	{

-		#region Fields

-

-		const long JAVA_MIN_MILLIS_UTC = -62135769600000L; // java.sql.Timestamp.valueOf("0001-01-01 00:00:00.000000000").getTime() at Greenwich time zone.

-		static readonly long TIMEZONE_RAW_OFFSET;

-		// .NET milliseconds value of DateTime(1582,1,1,0,0,0,0).Ticks/TimeSpan.TicksPerMillisecond			

-		const long CLR_MILLIS_1582 = 49891507200000L;

-		const long MILLIS_PER_TWO_DAYS = 2 * TimeSpan.TicksPerDay / TimeSpan.TicksPerMillisecond; // 172800000L;

-		internal static readonly java.util.TimeZone DEFAULT_TIME_ZONE;

-

-		#endregion // Fields

-

-		#region java.sql.Types constants

-

-		internal enum JavaSqlTypes {

-			ARRAY = 2003 ,

-			BIGINT = -5, 

-			BINARY = -2 ,

-			BIT = -7 ,

-			BLOB = 2004, 

-			BOOLEAN = 16, 

-			CHAR = 1, 

-			CLOB = 2005, 

-			DATALINK = 70, 

-			DATE = 91, 

-			DECIMAL = 3, 

-			DISTINCT = 2001, 

-			DOUBLE = 8, 

-			FLOAT = 6, 

-			INTEGER = 4, 

-			JAVA_OBJECT = 2000, 

-			LONGVARBINARY = -4,

-			LONGVARCHAR = -1, 

-			NULL = 0, 

-			NUMERIC = 2 ,

-			OTHER = 1111 ,

-			REAL = 7 ,

-			REF = 2006 ,

-			SMALLINT = 5,

-			STRUCT = 2002, 

-			TIME = 92, 

-			TIMESTAMP = 93, 

-			TINYINT = -6, 

-			VARBINARY = -3, 

-			VARCHAR = 12,

-			//			NOTSET = int.MinValue

-		}

-

-

-		#endregion // java.sql.Types constants

-

-		#region Methods

-

-		static DbConvert()

-		{

-			DEFAULT_TIME_ZONE = java.util.SimpleTimeZone.getDefault();			

-			TIMEZONE_RAW_OFFSET = (long)DEFAULT_TIME_ZONE.getRawOffset();						

-		}

-

-		// The diff between .Net and Java goes as the following:

-		//  * at 1582: java has 10 days less than .net

-		//  * below 1500 (exept 1200,800,400) : each 100'th year java adds 1 day over .net. 

-		// Current implementation compatible with .net in 1-99 and since 1582. In 100-1582 we're not compatible with .Ner nor with Java

-

-		internal static long JavaMillisToClrMillis(long javaMillis)

-		{

-			return JavaMillisToClrMillisUTC(javaMillis) + TIMEZONE_RAW_OFFSET;

-		}

-

-		internal static long JavaMillisToClrMillisUTC(long javaMillis) {

-			long clrMillis = javaMillis - JAVA_MIN_MILLIS_UTC;

-			if (clrMillis > CLR_MILLIS_1582) {

-				clrMillis -= MILLIS_PER_TWO_DAYS;

-			}

-			return clrMillis;

-		}

-

-		internal static long ClrMillisToJavaMillis(long clrMillis)

-		{

-			return ClrMillisToJavaMillisUTC(clrMillis) - TIMEZONE_RAW_OFFSET;

-		}

-

-		internal static long ClrMillisToJavaMillisUTC(long clrMillis) {

-			long javaMillis = clrMillis + JAVA_MIN_MILLIS_UTC;

-			if (clrMillis > CLR_MILLIS_1582) {

-				javaMillis += MILLIS_PER_TWO_DAYS;

-			}

-			return javaMillis;

-		}

-

-		internal static java.sql.Time ClrTicksToJavaTime(long ticks) {

-			return new Time((ticks / TimeSpan.TicksPerMillisecond)

-				- DEFAULT_TIME_ZONE.getRawOffset());

-		}

-

-		internal static java.sql.Date ClrTicksToJavaDate(long ticks) {

-			java.sql.Date d = new java.sql.Date(0);

-			ClrTicksToJavaDate(d, ticks);

-			return d;

-		}

-

-		internal static java.sql.Timestamp ClrTicksToJavaTimestamp(long ticks)

-		{

-			java.sql.Timestamp ts = new java.sql.Timestamp(0);

-			ClrTicksToJavaDate(ts, ticks);

-

-//			int nanos = (int)(ticks % TimeSpan.TicksPerMillisecond) * 100;

-//			ts.setNanos(javaTimestamp.getNanos() + nanos);

-

-			return ts;

-		}

-

-		internal static void ClrTicksToJavaDate(java.util.Date d, long ticks) {

-			long millis = ClrMillisToJavaMillis(ticks / TimeSpan.TicksPerMillisecond);

-

-			d.setTime(millis);

-			if (DEFAULT_TIME_ZONE.inDaylightTime(d)) {

-				millis -= DEFAULT_TIME_ZONE.getDSTSavings();

-				d.setTime(millis);

-			}

-		}

-		

-		internal static long JavaTimestampToClrTicks(java.sql.Timestamp ts)

-		{

-			long ticks = JavaDateToClrTicks(ts);

-			// Extra ticks, for dbs that can save them. 

-			// We do not use it, since .net does not saves ticks for fractial milliseconds

-			// long ticksLessThanMilliseconds = (ts.getNanos()*100) % TimeSpan.TicksPerMillisecond;

-			// ticks += ticksLessThanMilliseconds;

-			

-			return ticks;

-		}

-

-		internal static long JavaDateToClrTicks(java.util.Date d) {

-			long millis = JavaMillisToClrMillis(d.getTime());

-			if (DEFAULT_TIME_ZONE.inDaylightTime(d)) {

-				millis += DEFAULT_TIME_ZONE.getDSTSavings();

-			}

-			return millis * TimeSpan.TicksPerMillisecond;

-		}

-

-		internal static long JavaTimeToClrTicks(java.sql.Time t) {

-			return (t.getTime() + DEFAULT_TIME_ZONE.getRawOffset())

-				* TimeSpan.TicksPerMillisecond;

-		}

-

-		internal static Type JavaSqlTypeToClrType(int sqlTypeValue)

-		{

-			JavaSqlTypes sqlType = (JavaSqlTypes)sqlTypeValue;

-

-			switch (sqlType) {

-				case JavaSqlTypes.ARRAY : return typeof (java.sql.Array);

-				case JavaSqlTypes.BIGINT : return DbTypes.TypeOfInt64;

-				case JavaSqlTypes.BINARY : return DbTypes.TypeOfByteArray;

-				case JavaSqlTypes.BIT : return DbTypes.TypeOfBoolean;

-				case JavaSqlTypes.BLOB : return DbTypes.TypeOfByteArray;

-				case JavaSqlTypes.BOOLEAN : return DbTypes.TypeOfBoolean;

-				case JavaSqlTypes.CHAR : return DbTypes.TypeOfString;

-				case JavaSqlTypes.CLOB : return DbTypes.TypeOfString;

-//				case JavaSqlTypes.DATALINK :

-				case JavaSqlTypes.DATE : return DbTypes.TypeOfDateTime;

-				case JavaSqlTypes.DECIMAL : return DbTypes.TypeOfDecimal;

-//				case JavaSqlTypes.DISTINCT :

-				case JavaSqlTypes.DOUBLE : return DbTypes.TypeOfDouble;

-				case JavaSqlTypes.FLOAT : return DbTypes.TypeOfDouble;

-				case JavaSqlTypes.INTEGER : return DbTypes.TypeOfInt32;

-//				case JavaSqlTypes.JAVA_OBJECT :

-				case JavaSqlTypes.LONGVARBINARY : return DbTypes.TypeOfByteArray;

-				case JavaSqlTypes.LONGVARCHAR : return DbTypes.TypeOfString;

-				case JavaSqlTypes.NULL : return null;

-				case JavaSqlTypes.NUMERIC : return DbTypes.TypeOfDecimal;

-//				case JavaSqlTypes.OTHER :

-				case JavaSqlTypes.REAL : return DbTypes.TypeOfSingle;

-				case JavaSqlTypes.REF : return typeof (java.sql.Ref);

-				case JavaSqlTypes.SMALLINT : return DbTypes.TypeOfInt16;

-				case JavaSqlTypes.STRUCT : return typeof (java.sql.Struct);

-				case JavaSqlTypes.TIME : return DbTypes.TypeOfTimespan;

-				case JavaSqlTypes.TIMESTAMP : return DbTypes.TypeOfDateTime;

-				case JavaSqlTypes.TINYINT : return DbTypes.TypeOfByte;

-				case JavaSqlTypes.VARBINARY : return DbTypes.TypeOfByteArray;

-				case JavaSqlTypes.VARCHAR : return DbTypes.TypeOfString;

-				default : return DbTypes.TypeOfObject;

-			}

-

-		}

-

-

-		internal static object JavaResultSetToClrWrapper(CallableStatement results,int columnIndex,JavaSqlTypes javaSqlType,int maxLength ,ResultSetMetaData resultsMetaData)

-		{

-			object returnValue = null;	

-			sbyte[] sbyteArray;

-			long milliseconds;

-			long ticks;

-			string s;

-			columnIndex++; //jdbc style

-			switch (javaSqlType) {

-				case JavaSqlTypes.ARRAY :

-					returnValue = results.getArray(columnIndex);

-					break;

-				case JavaSqlTypes.BIGINT :

-					returnValue = results.getLong(columnIndex);

-					break;

-				case JavaSqlTypes.BINARY :

-				case JavaSqlTypes.VARBINARY :

-				case JavaSqlTypes.LONGVARBINARY :

-					// FIXME : comsider using maxLength

-					sbyteArray = results.getBytes(columnIndex);

-					if (sbyteArray != null) {

-						returnValue = vmw.common.TypeUtils.ToByteArray(sbyteArray);

-					}

-					break;

-				case JavaSqlTypes.BIT :

-					returnValue = results.getBoolean(columnIndex);

-					break;

-				case JavaSqlTypes.BLOB :

-					// FIXME : comsider using maxLength

-					java.sql.Blob blob = results.getBlob(columnIndex);

-					if (blob != null) {

-						InputStream input = blob.getBinaryStream();					

-						if (input == null) {

-							returnValue = new byte[0];

-						}

-						else {

-							long length = blob.length();

-							byte[] byteValue = new byte[length];

-							sbyte[] sbyteValue = vmw.common.TypeUtils.ToSByteArray(byteValue);

-							input.read(sbyteValue);

-							returnValue = byteValue;

-						}

-					}

-					break;	

-				case JavaSqlTypes.CHAR :						

-					if (resultsMetaData != null && "uniqueidentifier".Equals(resultsMetaData.getColumnTypeName(columnIndex))) {

-						returnValue = new Guid(results.getString(columnIndex));

-					}

-					else {

-						// Oracle Jdbc driver returns extra trailing 0 chars for NCHAR columns, so we threat this at parameter.Size level

-						s = results.getString(columnIndex);

-						if ((s != null) && (maxLength < s.Length)) {

-							s = s.Substring(0,maxLength);

-						}

-						returnValue = s;

-					}

-					break;

-				case JavaSqlTypes.CLOB :

-					// FIXME : comsider using maxLength

-					java.sql.Clob clob = results.getClob(columnIndex);

-					if (clob != null) {

-						java.io.Reader reader = clob.getCharacterStream();					

-						if (reader == null) {

-							returnValue = String.Empty;

-						}

-						else {

-							long length = clob.length();

-							char[] charValue = new char[length];

-							reader.read(charValue);

-							returnValue = new string(charValue);

-						}

-					}

-					break;		

-				case JavaSqlTypes.TIME :

-					Time t = results.getTime(columnIndex);

-					if (t != null) {

-						returnValue = new TimeSpan(JavaTimeToClrTicks(t));

-					}

-					break;	

-				case JavaSqlTypes.DATE :

-					Date d = results.getDate(columnIndex);

-					if (d != null) {

-						returnValue = new DateTime(JavaDateToClrTicks(d));

-					}

-					break;

-				case JavaSqlTypes.TIMESTAMP :				

-					Timestamp ts = results.getTimestamp(columnIndex);

-					if (ts != null) {

-						returnValue = new DateTime(JavaTimestampToClrTicks(ts));

-					}

-					break;		

-				case JavaSqlTypes.DECIMAL :

-				case JavaSqlTypes.NUMERIC :

-					// java.sql.Types.NUMERIC (2), columnTypeName NUMBER, columnClassName java.math.BigDecimal 

-					// therefore we rely on scale

-					if (resultsMetaData != null &&  resultsMetaData.getScale(columnIndex) == -127) {

-						// Oracle db type FLOAT

-						returnValue = results.getDouble(columnIndex);

-					}

-					else {

-						java.math.BigDecimal bigDecimal = results.getBigDecimal(columnIndex);

-						if (bigDecimal != null) {

-							returnValue = vmw.common.PrimitiveTypeUtils.BigDecimalToDecimal(bigDecimal);

-						}

-					}

-					break;		

-				case JavaSqlTypes.DISTINCT :

-					returnValue = results.getObject(columnIndex);

-					break;

-				case JavaSqlTypes.DOUBLE :

-					returnValue = results.getDouble(columnIndex);

-					break;

-				case JavaSqlTypes.FLOAT :

-					//float f = results.getFloat(columnIndex);

-					returnValue = results.getDouble(columnIndex);

-					break;

-				case JavaSqlTypes.INTEGER :

-					returnValue = results.getInt(columnIndex);

-					break;

-				case JavaSqlTypes.JAVA_OBJECT :

-					returnValue = results.getObject(columnIndex);

-					break;

-				case JavaSqlTypes.LONGVARCHAR :

-					returnValue = results.getString(columnIndex);

-					break;

-				case JavaSqlTypes.NULL :

-					returnValue = DBNull.Value;

-					break;

-				case JavaSqlTypes.OTHER :

-					returnValue = results.getObject(columnIndex);

-					break;

-				case JavaSqlTypes.REAL :

-					returnValue = results.getFloat(columnIndex);

-					break;

-				case JavaSqlTypes.REF :

-					returnValue = results.getRef(columnIndex);

-					break;

-				case JavaSqlTypes.SMALLINT :

-					returnValue = results.getShort(columnIndex);

-					break;

-				case JavaSqlTypes.STRUCT :

-					returnValue = results.getObject(columnIndex);

-					break;

-				case JavaSqlTypes.TINYINT :

-					returnValue = Convert.ToByte(results.getByte(columnIndex));

-					break;

-				case JavaSqlTypes.VARCHAR :

-					s = results.getString(columnIndex);

-					if ((s != null) && (maxLength < s.Length)) {

-						s = s.Substring(0,maxLength);

-					}

-					returnValue = s;

-					break;

-				default :

-					returnValue = results.getObject(columnIndex);

-					break;

-			}

-				

-			if (results.wasNull() || results == null) {

-				return DBNull.Value;

-			}                

-			return  returnValue;

-		}

-

-		#endregion // Methods

-	}

-}

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
index c7b7ef41ed6..e4383230429 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
@@ -34,7 +34,7 @@ using System;
 

 using java.net;

 

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

 	internal sealed  class DbPortResolver

 	{

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbStringManager.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbStringManager.cs
index 6e124b5e6f5..4068ffcdd31 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbStringManager.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbStringManager.cs
@@ -33,7 +33,7 @@
 using System.Resources;

 using System.Reflection;

 

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

 	public class DbStringManager

 	{

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ParameterMetadataWrapper.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ParameterMetadataWrapper.cs
index 45ee1b084c6..7d1e335a211 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ParameterMetadataWrapper.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ParameterMetadataWrapper.cs
@@ -33,7 +33,7 @@ using System;
 

 using java.sql;

 

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

 	public class ParameterMetadataWrapper : java.sql.ResultSetMetaData

 	{

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs
index 57923ff39e4..02462a13d6b 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs
@@ -32,13 +32,12 @@
 using System;

 using java.sql;

 

-namespace System.Data.ProviderBase

+namespace System.Data.Common

 {

 	public interface IReaderCacheContainer

 	{

 		void Fetch(ResultSet rs, int columnIndex, bool isSequential);

 		bool IsNull();

-		bool IsNumeric();

 		object GetValue();

 	}

 

@@ -57,10 +56,6 @@ namespace System.Data.ProviderBase
 			FetchInternal(rs, columnIndex);

 		}

 

-		public virtual bool IsNumeric() {

-			return false;

-		}

-

 		public abstract object GetValue();		

 

 		public void Fetch(ResultSet rs, int columnIndex, bool isSequential)

@@ -117,11 +112,6 @@ namespace System.Data.ProviderBase
 			_l = rs.getLong(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

-

 		public override object GetValue()

 		{

 			return _l;

@@ -197,10 +187,6 @@ namespace System.Data.ProviderBase
 			_b = rs.getBoolean(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _b;

@@ -484,10 +470,6 @@ namespace System.Data.ProviderBase
 			}

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _d;

@@ -517,10 +499,6 @@ namespace System.Data.ProviderBase
 			_d = rs.getDouble(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _d;

@@ -550,10 +528,6 @@ namespace System.Data.ProviderBase
 			_i = rs.getInt(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _i;

@@ -662,10 +636,6 @@ namespace System.Data.ProviderBase
 			_f = rs.getFloat(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _f;

@@ -719,10 +689,6 @@ namespace System.Data.ProviderBase
 			_s = rs.getShort(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _s;

@@ -752,10 +718,6 @@ namespace System.Data.ProviderBase
 			_b = (byte)rs.getByte(columnIndex);

 		}

 

-		public override bool IsNumeric() {

-			return true;

-		}

-

 		public override object GetValue()

 		{

 			return _b;

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs
index 7727f2dccf2..faae67d14f4 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/regex.cs
@@ -51,9 +51,9 @@ namespace System.Data.ProviderBase {
 		}

 	}

 	public class SimpleCapture {

-		readonly int _index;

-		readonly int _length;

-		readonly string _input;

+		int _index;

+		int _length;

+		string _input;

 

 		protected SimpleCapture(int index, int length, string input) {

 			_index = index;

@@ -87,15 +87,15 @@ namespace System.Data.ProviderBase {
 	}

 

 	public class SimpleMatch : SimpleCapture {

-		readonly bool _success;

-		readonly SimpleRegex _regex;

-		readonly int _total;

-		readonly int _skip;

+		bool _success;

+		SimpleRegex _regex;

+		int _total;

+		int _skip;

 

-		public SimpleMatch(SimpleRegex regex, int total, bool success, int index, int length, string input)

+		protected internal SimpleMatch(SimpleRegex regex, int total, bool success, int index, int length, string input)

 			: this(regex, total, success, index, length, 0, input) {}

 

-		public SimpleMatch(SimpleRegex regex, int total, bool success, int index, int length, int skip, string input)

+		protected internal SimpleMatch(SimpleRegex regex, int total, bool success, int index, int length, int skip, string input)

 			: base(index, length, input) {

 			_success = success;

 			_regex = regex;

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog b/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog
index 883b6a2da7d..565962d4bb7 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog
+++ b/mcs/class/System.Data/System.Data.ProviderBase/ChangeLog
@@ -1,8 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DbDataReaderBase.cs: Switch to the (bool) form of Dispose to
-	override, as the no-arg form isn't virtual.
-
 2005-11-21 Senganal T <tsenganal@novell.com>
 	
 	* DbParameterCollectionBase.cs 
diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
index a8e8d2079bf..7bd921979f4 100644
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs
@@ -135,10 +135,9 @@ namespace System.Data.ProviderBase {
 			throw new NotImplementedException ();
 		}
 
-		protected override void Dispose (bool disposing)
+		public override void Dispose ()
 		{
-			if (disposing)
-				Close ();
+			Close ();
 		}
 
 		[MonoTODO]
diff --git a/mcs/class/System.Data/System.Data.Sql/ChangeLog b/mcs/class/System.Data/System.Data.Sql/ChangeLog
index 8f2b3e72181..0f0689cd305 100644
--- a/mcs/class/System.Data/System.Data.Sql/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Sql/ChangeLog
@@ -1,12 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* SqlNotificationRequest.cs: class is sealed, and s/id/userData
-	and s/service/options.
-
-	* SqlDataSourceEnumerator.cs: ctor is private (for use with
-	Instance property, which is currently not implemented.)  Also,
-	remove set_Instance.
-
 2005-09-02 Umadevi S <sumadevi@novell.com>
 	* Removed Files
 	SerializationHelper.cs,DataAccessKind.cs,SerializationVersion.cs,Format.cs,
diff --git a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs
index c3f3e82e22a..a1c155dadd8 100644
--- a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs
+++ b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs
@@ -38,19 +38,12 @@ using System.Data.Common;
 namespace System.Data.Sql {
 	public sealed class SqlDataSourceEnumerator : DbDataSourceEnumerator
 	{
-		#region Constructors
-
-		private SqlDataSourceEnumerator ()
-		{
-		}
-
-		#endregion // Constructors
-
 		#region Properties
 
 		[MonoTODO]
 		public static SqlDataSourceEnumerator Instance { 
 			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
 		}
 
 		#endregion // Properties
diff --git a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs
index 4adfd7dcdaf..d17f7a7f8ea 100644
--- a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs
+++ b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs
@@ -35,12 +35,12 @@
 using System;
 
 namespace System.Data.Sql {
-	public sealed class SqlNotificationRequest 
+	public class SqlNotificationRequest 
 	{
 		#region Fields
 
-		string userData;
-		string options;
+		string id;
+		string service;
 		int timeout;
 
 		#endregion // Fields
@@ -54,15 +54,15 @@ namespace System.Data.Sql {
 		}
 
 		[MonoTODO]
-		public SqlNotificationRequest (string userData, string options, int timeout)
+		public SqlNotificationRequest (string id, string service, int timeout)
 		{
-			if (options == null)
+			if (service == null)
 				throw new ArgumentNullException ();
 			if (timeout < 0)
 				throw new ArgumentOutOfRangeException ();
 
-			UserData = userData;
-			Options = options;
+			Id = id;
+			Service = service;
 			Timeout = timeout;
 		}
 
@@ -70,14 +70,14 @@ namespace System.Data.Sql {
 
 		#region Properties
 
-		public string UserData {
-			get { return userData; }
-			set { userData = value; }
+		public string Id {
+			get { return id; }
+			set { id = value; }
 		}
 
-		public string Options {
-			get { return options; }
-			set { options = value; }
+		public string Service {
+			get { return service; }
+			set { service = value; }
 		}
 
 		public int Timeout {
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
index a9ff349fb59..9ee689d4f60 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommand.cs
@@ -41,7 +41,7 @@ using java.sql;
 
 namespace System.Data.SqlClient
 {
-	public class SqlCommand : AbstractDbCommand
+	public class SqlCommand : AbstractDbCommand, IDbCommand, IDisposable, ICloneable
 	{
 		#region Fields
 
@@ -92,7 +92,10 @@ namespace System.Data.SqlClient
 		public new SqlParameterCollection Parameters

 		{

 			get { 

-				return (SqlParameterCollection)base.Parameters; 

+				if (_parameters == null) {

+					_parameters = CreateParameterCollection(this);

+				}

+				return (SqlParameterCollection)_parameters; 

 			}

 		}
 
@@ -134,7 +137,7 @@ namespace System.Data.SqlClient
 			return (SqlParameter)CreateParameterInternal();

 		}

 

-		protected sealed override void CheckParameters()

+		protected override void CheckParameters()

 		{

 			// do nothing

 		}

@@ -168,22 +171,29 @@ namespace System.Data.SqlClient
 			return null; 

 		}

 

-		protected sealed override DbParameter CreateParameterInternal()

+		protected override DbParameter CreateParameterInternal()

 		{

 			return new SqlParameter();

 		}

 

-		protected sealed override DbDataReader CreateReader()

+		protected override DbDataReader CreateReader()

 		{

 			return new SqlDataReader(this);

 		}

 

-		protected sealed override DbParameterCollection CreateParameterCollection(AbstractDbCommand parent)

+		protected override DbParameterCollection CreateParameterCollection(AbstractDbCommand parent)

 		{

 			return new SqlParameterCollection((SqlCommand)parent);

 		}

 

-		protected internal sealed override SystemException CreateException(SQLException e)
+		public object Clone()

+		{

+			SqlCommand clone = new SqlCommand();

+			CopyTo(clone);

+			return clone;

+		}

+

+		protected override SystemException CreateException(SQLException e)
 		{

 			return new SqlException(e, Connection);		

 		}
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs
index 43d07267668..6e0d8a76a6d 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlCommandBuilder.cs
@@ -35,10 +35,9 @@ using System.ComponentModel;
 using System.Data;

 using System.Data.Common;

 using System.Text;

-using System.Data.ProviderBase;

 

 namespace System.Data.SqlClient {

-	public sealed class SqlCommandBuilder : AbstractDbCommandBuilder

+	public sealed class SqlCommandBuilder : Component

 	{

 		#region Fields

 

@@ -365,7 +364,10 @@ namespace System.Data.SqlClient {
 

 		public static void DeriveParameters (SqlCommand command)

 		{

-			DeriveParameters((AbstractDbCommand)command);

+			if (command.Connection.State != ConnectionState.Open) {

+				throw new InvalidOperationException("DeriveParameters requires an open and available Connection. The connection's current state is Closed.");

+			}

+			command.DeriveParameters ();

 		}

 

 		protected override void Dispose (bool disposing)

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
index 2558a011120..0e0f3e3e5e7 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
@@ -1,70 +1,62 @@
 //

 // System.Data.SqlClient.SqlConnection

-//

-// Authors:

-//	Konstantin Triger <kostat@mainsoft.com>

-//	Boris Kirzner <borisk@mainsoft.com>

-//	

-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//
+// Authors:
+//	Konstantin Triger <kostat@mainsoft.com>
+//	Boris Kirzner <borisk@mainsoft.com>
+//	
+// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //

 

 using System.Data;

 using System.Data.Common;

 using System.Collections;

-using System.Data.ProviderBase;

 

 using java.sql;

 

-using System.Configuration;

-using Mainsoft.Data.Configuration;

-using Mainsoft.Data.Jdbc.Providers;

-

 namespace System.Data.SqlClient

 {

-	public class SqlConnection : AbstractDBConnection

+	public class SqlConnection : AbstractDBConnection, IDbConnection, System.ICloneable

 	{

 		#region Fields

 

 		private const int DEFAULT_PACKET_SIZE = 8192;

 

-		static readonly IConnectionProvider _connectionProvider;

+		protected static Hashtable _skippedUserParameters = new Hashtable(new CaseInsensitiveHashCodeProvider(),new CaseInsensitiveComparer());

+

+		private static readonly object _lockObjectStringManager = new object();

+		//private static DbStringManager _stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");

+

+		private static readonly string[] _resourceIgnoredKeys = new string[] {"CON_DATA_SOURCE","CON_DATABASE",

+																			  "CON_PASSWORD","CON_USER_ID","CON_TIMEOUT",

+																			  "CON_JNDI_NAME","CON_JNDI_PROVIDER","CON_JNDI_FACTORY",

+																			  "CON_WORKSTATION_ID","CON_PACKET_SIZE"};

 

 		#endregion // Fields

 

 		#region Constructors

 

-		static SqlConnection() {

-			IDictionary providerInfo = (IDictionary)((IList) ConfigurationSettings.GetConfig("Mainsoft.Data.Configuration/SqlClientProvider"))[0];

-			string providerType = (string) providerInfo [ConfigurationConsts.ProviderType];

-			if (providerType == null || providerType.Length == 0)

-				_connectionProvider = new GenericProvider (providerInfo); 

-			else {

-				Type t = Type.GetType (providerType);

-				_connectionProvider = (IConnectionProvider) Activator.CreateInstance (t , new object[] {providerInfo});

-			}

-		}

-

 		public SqlConnection() : this(null)

 		{

 		}

@@ -77,12 +69,12 @@ namespace System.Data.SqlClient
 

 		#region Events

 

-		[DataCategory ("InfoMessage")]

-		[DataSysDescription ("Event triggered when messages arrive from the DataSource.")]

-		public event SqlInfoMessageEventHandler InfoMessage;

-

-		[DataCategory ("StateChange")]

-		[DataSysDescription ("Event triggered when the connection changes state.")]

+		[DataCategory ("InfoMessage")]
+		[DataSysDescription ("Event triggered when messages arrive from the DataSource.")]
+		public event SqlInfoMessageEventHandler InfoMessage;
+
+		[DataCategory ("StateChange")]
+		[DataSysDescription ("Event triggered when the connection changes state.")]
 		public event StateChangeEventHandler StateChange;

 

 		#endregion // Events

@@ -91,14 +83,30 @@ namespace System.Data.SqlClient
 

 		public string WorkstationId

 		{

-			get { return (string)ConnectionStringBuilder["workstation id"]; }

+			get { return ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_WORKSTATION_ID")); }

+		}

+

+		protected override string JdbcDriverName

+		{

+			get { return StringManager.GetString("JDBC_DRIVER"); }

+		}

+

+		protected internal override JDBC_MODE JdbcMode

+		{

+			get {

+				string[] conJndiNameStr = StringManager.GetStringArray("CON_JNDI_NAME");

+				if (!String.Empty.Equals(ConnectionStringHelper.FindValue(UserParameters,conJndiNameStr))) {

+					return JDBC_MODE.DATA_SOURCE_MODE;

+				}

+				return JDBC_MODE.PROVIDER_MODE; 

+			}

 		}

 

 		public int PacketSize

 		{

 			get { 

-				string packetSize = (string)ConnectionStringBuilder["Packet Size"];

-				if (packetSize == null || packetSize.Length == 0) {

+				string packetSize = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_PACKET_SIZE"));				

+				if (String.Empty.Equals(packetSize)) {

 					return DEFAULT_PACKET_SIZE;

 				}				

 				try {

@@ -113,14 +121,55 @@ namespace System.Data.SqlClient
 			}

 		}

 

-		protected override IConnectionProvider GetConnectionProvider() {

-			return _connectionProvider;

+		protected override string[] ResourceIgnoredKeys

+		{

+			get { return _resourceIgnoredKeys; }

+		}

+

+		protected override Hashtable SkippedUserParameters

+		{

+			get { return _skippedUserParameters; }

+		}

+

+		protected override PROVIDER_TYPE ProviderType

+		{

+			get {

+				if (JdbcMode != JDBC_MODE.PROVIDER_MODE) {

+					return PROVIDER_TYPE.NONE;

+				}

+				return PROVIDER_TYPE.SQLOLEDB;

+			}

+		}

+

+		protected override DbStringManager StringManager

+		{

+			get {

+				const string stringManagerName = "System.Data.OleDbConnection.stringManager";

+				object stringManager = AppDomain.CurrentDomain.GetData(stringManagerName);

+				if (stringManager == null) {

+					lock(_lockObjectStringManager) {

+						stringManager = AppDomain.CurrentDomain.GetData(stringManagerName);

+						if (stringManager != null)

+							return (DbStringManager)stringManager;

+						stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");

+						AppDomain.CurrentDomain.SetData(stringManagerName, stringManager);

+					}

+				}

+				return (DbStringManager)stringManager;

+			}

 		}

 

 		#endregion // Properties

 

 		#region Methods

 

+		protected internal override void ValidateConnectionString(string connectionString)

+		{

+			base.ValidateConnectionString(connectionString);

+

+			// FIXME : validate packet size

+		}

+

 		protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) {

 			return BeginTransaction(isolationLevel);

 		}

@@ -154,30 +203,42 @@ namespace System.Data.SqlClient
 			return CreateCommand();

 		}

 

-		protected internal sealed override void OnSqlWarning(SQLWarning warning)

+		internal override void OnSqlWarning(SQLWarning warning)

 		{

 			SqlErrorCollection col = new SqlErrorCollection(warning, this);

 			OnSqlInfoMessage(new SqlInfoMessageEventArgs(col));

 		}

 

-		protected sealed override SystemException CreateException(SQLException e)

+		protected internal override void CopyTo(AbstractDBConnection target)

 		{

-			return new SqlException(e, this);		

+			base.CopyTo(target);

 		}

 

-		protected sealed override SystemException CreateException(string message)

+		public object Clone()

 		{

-			return new SqlException(message, null, this);		

+			SqlConnection clone = new SqlConnection();

+			CopyTo(clone);

+			return clone;

 		}

 

-		private void OnSqlInfoMessage (SqlInfoMessageEventArgs value)

+		protected override SystemException CreateException(SQLException e)
 		{

-			if (InfoMessage != null) {

-				InfoMessage (this, value);

-			}

+			return new SqlException(e, this);		

+		}

+

+		protected override SystemException CreateException(string message)
+		{

+			return new SqlException(message, null, this);		

 		}

 

-		protected internal sealed override void OnStateChanged(ConnectionState orig, ConnectionState current)

+		private void OnSqlInfoMessage (SqlInfoMessageEventArgs value)
+		{
+			if (InfoMessage != null) {
+				InfoMessage (this, value);
+			}
+		}
+
+		internal override void OnStateChanged(ConnectionState orig, ConnectionState current)

 		{

 			if(StateChange != null) {

 				StateChange(this, new StateChangeEventArgs(orig, current));

@@ -194,7 +255,16 @@ namespace System.Data.SqlClient
 			}

 		}

 

+		protected override string BuildJdbcUrl()

+		{

+			switch (JdbcMode) {

+				case JDBC_MODE.PROVIDER_MODE :

+					return BuildMsSqlUrl();

+			}

+			return base.BuildJdbcUrl();

+		}

+

 		#endregion // Methods

         

 	}

-}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs
index 3772eacbc5e..68e0009c5bc 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConvert.cs
@@ -32,7 +32,6 @@
 

 using System;

 using System.Data.Common;

-using System.Data.ProviderBase;

 

 using java.sql;

 

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs
index 84a677aff47..1a0815bf947 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlDataReader.cs
@@ -30,13 +30,12 @@
 //
 
 using System.Data.SqlTypes;
-using System.Data.ProviderBase;
 
 using java.sql;
 
 namespace System.Data.SqlClient
 {
-    public class SqlDataReader : AbstractDataReader
+    public class SqlDataReader : System.Data.Common.AbstractDataReader
     {
 
 		#region Constructors
@@ -53,12 +52,12 @@ namespace System.Data.SqlClient
 
 		#region Methods
 
-		protected sealed override SystemException CreateException(string message, SQLException e)

+		protected override SystemException CreateException(string message, SQLException e)

 		{

 			return new SqlException(message, e, (SqlConnection)_command.Connection);		

 		}

 

-		protected sealed override SystemException CreateException(java.io.IOException e)

+		protected override SystemException CreateException(java.io.IOException e)

 		{

 			return new SqlException(e, (SqlConnection)_command.Connection);

 		}

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs
index c21d56ee9db..e0dbf807c2a 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlErrorCollection.cs
@@ -60,7 +60,7 @@ namespace System.Data.SqlClient
             }

         }

 

-		protected override AbstractDbError CreateDbError(java.sql.SQLException e, AbstractDBConnection connection) {

+		protected override AbstractDbError CreateDbError(java.sql.SQLException e, System.Data.Common.AbstractDBConnection connection) {

 			return new SqlError(e, connection);

 		}

 

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs
index f620e4bf23d..ad7a32d9bee 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlParameter.cs
@@ -199,7 +199,7 @@ namespace System.Data.SqlClient
             return clone;
 		}
 
-		protected internal sealed override object ConvertValue(object value)

+		internal override object ConvertValue(object value)

 		{

 			// can not convert null or DbNull to other types

 			if (value == null || value == DBNull.Value) {

@@ -210,7 +210,7 @@ namespace System.Data.SqlClient
 			return convertedValue;

 		}
 
-		protected internal sealed override void SetParameterName(ResultSet res)

+		internal override void SetParameterName(ResultSet res)

 		{

 			string name = res.getString("COLUMN_NAME");

 			if (name != null && name.Length > 0 && name[0] != '@')

@@ -218,21 +218,21 @@ namespace System.Data.SqlClient
 			ParameterName = name;

 		}

 

-		protected internal sealed override void SetParameterDbType(ResultSet res)

+		internal override void SetParameterDbType(ResultSet res)

 		{

 			int dataType = res.getInt("DATA_TYPE");

 			SqlDbType = SqlConvert.JdbcTypeToSqlDbType(dataType);

-			JdbcType = dataType;

+			JdbcType = (DbTypes.JavaSqlTypes) dataType;

 		}

 

-		protected internal sealed override void SetSpecialFeatures(ResultSet res)

+		internal override void SetSpecialFeatures(ResultSet res)

 		{

 			// do nothing

 		}
 
-		protected internal sealed override int JdbcTypeFromProviderType()

+		internal override DbTypes.JavaSqlTypes JdbcTypeFromProviderType()

 		{

-			return SqlConvert.SqlDbTypeToJdbcType(SqlDbType);

+			return (DbTypes.JavaSqlTypes)SqlConvert.SqlDbTypeToJdbcType(SqlDbType);

 		}
 
 		#endregion // Methods  

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs
index 82183f8a3fc..b8be7939eb9 100644
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlTransaction.cs
@@ -32,14 +32,13 @@
 namespace System.Data.SqlClient
 {
     using System.Data;
-	using System.Data.ProviderBase;
     /*
     * Current Limitations:
     * 1. Rollback(String savePoint) - not implemented.
     * 2. Save(String) - not implemented.
     */
 
-    public sealed class SqlTransaction : AbstractTransaction
+    public sealed class SqlTransaction : System.Data.Common.AbstractTransaction
     {
     
 
diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index f650f0c4f98..cc33e9b9943 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,22 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* SqlCommand.cs, SqlCommandBuilder.cs, SqlConnection.cs,
-	SqlDataAdapter.cs: remove DataSysDescription attributes for >= 2.0
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* SqlDataReader.cs: remove VisibleFieldCount property.
-
-2006-02-10  Senganal T  <tsenganal@novell.com>
-	* SqlDataReader.cs :
-		- GetBytes : Read binary/blob/clob data sequentially when
-		CommandBehavior is set to SequentialAcccess
-		- GetChars : Read String/clob data sequentially when CommandBehavior
-		is set to SequentialAccess
-	* SqlCommand.cs :
-		- ExecuteReader : set SequentialAccess property on TDS
-		- CloseDataReader : Reset the command behavior
-
 2006-01-27  Senganal T  <tsenganal@novell.com>
 
 	* SqlCommandBuilder.cs :
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
index 08464f30ddd..cf8d775363a 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
@@ -127,9 +127,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Command text to execute.")]
-#endif
 		[DefaultValue ("")]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.SQL.Design.SqlCommandTextEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		[RefreshProperties (RefreshProperties.All)]
@@ -146,9 +144,7 @@ namespace System.Data.SqlClient {
 			}
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Time to wait for command to execute.")]
-#endif
 		[DefaultValue (30)]
 		public 
 #if NET_2_0
@@ -164,9 +160,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("How to interpret the CommandText.")]
-#endif
 		[DefaultValue (CommandType.Text)]
 		[RefreshProperties (RefreshProperties.All)]
 		public 
@@ -187,9 +181,7 @@ namespace System.Data.SqlClient {
 
 		[DataCategory ("Behavior")]
 		[DefaultValue (null)]
-#if !NET_2_0
 		[DataSysDescription ("Connection used by the command.")]
-#endif
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]		
                 public 
 #if NET_2_0
@@ -218,9 +210,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("The parameters collection.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		public 
 #if NET_2_0
@@ -257,9 +247,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The transaction used by the command.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public new SqlTransaction Transaction {
 			get { return transaction; }
@@ -267,9 +255,7 @@ namespace System.Data.SqlClient {
 		}	
 
 		[DataCategory ("Behavior")]
-#if !NET_2_0
 		[DataSysDescription ("When used by a DataAdapter.Update, how command results are applied to the current DataRow.")]
-#endif
 		[DefaultValue (UpdateRowSource.Both)]
 		public 
 #if NET_2_0
@@ -305,10 +291,6 @@ namespace System.Data.SqlClient {
 
 			if ((behavior & CommandBehavior.CloseConnection) != 0)
 				Connection.Close ();
-
-			// Reset the behavior
-			behavior = CommandBehavior.Default;
-			Tds.SequentialAccess = false;
 		}
 
 		public new SqlParameter CreateParameter () 
@@ -413,8 +395,6 @@ namespace System.Data.SqlClient {
 			ValidateCommand ("ExecuteReader");
 			try {
                                 this.behavior = behavior;
-				if ((behavior & CommandBehavior.SequentialAccess) != 0)
-					Tds.SequentialAccess = true;
 				Execute (behavior, true);
                                 Connection.DataReader = new SqlDataReader (this);
 			}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
index d181d1b6f68..8cff35e31b2 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
@@ -85,9 +85,7 @@ namespace System.Data.SqlClient {
 
 		#region Properties
 
-#if !NET_2_0
 		[DataSysDescription ("The DataAdapter for which to automatically generate SqlCommands")]
-#endif
 		[DefaultValue (null)]
 		public new SqlDataAdapter DataAdapter {
 			get { return adapter; }
@@ -107,9 +105,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The character used in a text command as the opening quote for quoting identifiers that contain special characters.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -125,9 +121,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The character used in a text command as the closing quote for quoting identifiers that contain special characters. ")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
index d2e02467594..1c9cd9d272f 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
@@ -138,9 +138,7 @@ namespace System.Data.SqlClient {
 		#region Properties
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Information used to connect to a DataSource, such as 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.")]
-#endif
 		[DefaultValue ("")]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.SQL.Design.SqlConnectionStringEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		[RecommendedAsConfigurable (true)]	
@@ -159,9 +157,7 @@ namespace System.Data.SqlClient {
 			}
 		}
 	
-#if !NET_2_0
 		[DataSysDescription ("Current connection timeout value, 'Connect Timeout=X' in the ConnectionString.")]	
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -172,9 +168,7 @@ namespace System.Data.SqlClient {
 			get { return connectionTimeout; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Current SQL Server database, 'Initial Catalog=X' in the connection string.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -193,9 +187,7 @@ namespace System.Data.SqlClient {
 			set { dataReader = value; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Current SqlServer that the connection is opened to, 'Data Source=X' in the connection string. ")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -205,9 +197,7 @@ namespace System.Data.SqlClient {
 			get { return dataSource; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Network packet size, 'Packet Size=x' in the connection string.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public int PacketSize {
 			get {	
@@ -218,9 +208,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("Version of the SQL Server accessed by the SqlConnection.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -236,9 +224,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[Browsable (false)]
-#if !NET_2_0
 		[DataSysDescription ("The ConnectionState indicating whether the connection is open or closed.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -257,9 +243,7 @@ namespace System.Data.SqlClient {
 			set { transaction = value; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Workstation Id, 'Workstation ID=x' in the connection string.")]
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public string WorkstationId {
 			get { return parms.Hostname; }
@@ -275,15 +259,11 @@ namespace System.Data.SqlClient {
 		#region Events
 
 		[DataCategory ("InfoMessage")]
-#if !NET_2_0
 		[DataSysDescription ("Event triggered when messages arrive from the DataSource.")]
-#endif
 		public event SqlInfoMessageEventHandler InfoMessage;
 
 		[DataCategory ("StateChange")]
-#if !NET_2_0
 		[DataSysDescription ("Event triggered when the connection changes state.")]
-#endif
 		public 
 #if NET_2_0
 		override
@@ -983,9 +963,7 @@ namespace System.Data.SqlClient {
 
                 #region Properties Net 2
 
-#if !NET_2_0
                 [DataSysDescription ("Enable Asynchronous processing, 'Asynchrouse Processing=true/false' in the ConnectionString.")]	
-#endif
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		internal bool AsyncProcessing  {
 			get { return async; }
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
index af6a176a852..c524f70db32 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
@@ -84,9 +84,7 @@ namespace System.Data.SqlClient {
 		#region Properties
 
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescription ("Used during Update for deleted rows in DataSet.")]
-#endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public new SqlCommand DeleteCommand {
@@ -95,9 +93,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescription ("Used during Update for new rows in DataSet.")]
-#endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public new SqlCommand InsertCommand {
@@ -106,9 +102,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[DataCategory ("Fill")]
-#if !NET_2_0
 		[DataSysDescription ("Used during Fill/FillSchema.")]
-#endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public new SqlCommand SelectCommand {
@@ -117,9 +111,7 @@ namespace System.Data.SqlClient {
 		}
 
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescription ("Used during Update for modified rows in DataSet.")]
-#endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
 		public new SqlCommand UpdateCommand {
@@ -211,15 +203,11 @@ namespace System.Data.SqlClient {
 		#region Events and Delegates
 
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescription ("Event triggered before every DataRow during Update.")]
-#endif
 		public event SqlRowUpdatedEventHandler RowUpdated;
 
 		[DataCategory ("Update")]
-#if !NET_2_0
 		[DataSysDescription ("Event triggered after every DataRow during Update.")]
-#endif
 		public event SqlRowUpdatingEventHandler RowUpdating;
 
 		#endregion // Events and Delegates
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
index d3d563b1a40..da09582db66 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
@@ -36,7 +36,6 @@
 
 using Mono.Data.Tds.Protocol;
 using System;
-using System.Text;
 using System.Collections;
 using System.ComponentModel;
 using System.Data;
@@ -263,15 +262,6 @@ namespace System.Data.SqlClient {
 #endif // NET_2_0
                 long GetBytes (int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
 		{
-			if ((command.CommandBehavior & CommandBehavior.SequentialAccess) != 0) {
-				long len = ((Tds)command.Tds).GetSequentialColumnValue (i, dataIndex, buffer, bufferIndex, length);
-				if (len == -1)
-					throw new InvalidCastException ("Invalid attempt to GetBytes on column "
-							+ "'" + command.Tds.Columns[i]["ColumnName"] + "'." + "The GetBytes function"
-							+ " can only be used on columns of type Text, NText, or Image");
-				return len;
-			}
-
 			object value = GetValue (i);
 			if (!(value is byte [])) {
 				if (value is DBNull) throw new SqlNullValueException ();
@@ -279,16 +269,16 @@ namespace System.Data.SqlClient {
 			}
 			
 			if ( buffer == null )
-				return ((byte []) value).Length; // Return length of data
-
-			// Copy data into buffer
-			int availLen = (int) ( ( (byte []) value).Length - dataIndex);
-			if (availLen < length)
-				length = availLen;
-			Array.Copy ((byte []) value, (int) dataIndex, buffer, bufferIndex, length);
-			return length; // return actual read count
+                                return ((byte []) value).Length; // Return length of data
+                        
+                        // Copy data into buffer
+                        int availLen = (int) ( ( (byte []) value).Length - dataIndex);
+                        if (availLen < length)
+                                length = availLen;
+                        Array.Copy ((byte []) value, (int) dataIndex, buffer, bufferIndex, length);
+                        return length; // return actual read count
 		}
-
+                                                                                                    
 		[EditorBrowsableAttribute (EditorBrowsableState.Never)]
 		public 
 #if NET_2_0
@@ -310,46 +300,8 @@ namespace System.Data.SqlClient {
 #endif // NET_2_0
                 long GetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length)
 		{
-			if ((command.CommandBehavior & CommandBehavior.SequentialAccess) != 0) {
-				Encoding encoding = null;
-				byte mul = 1;
-				TdsColumnType colType = (TdsColumnType) command.Tds.Columns[i]["ColumnType"];
-				switch (colType) {
-					case TdsColumnType.Text :
-					case TdsColumnType.VarChar:
-					case TdsColumnType.Char:
-					case TdsColumnType.BigVarChar:
-						encoding = Encoding.ASCII;
-						break;
-					case TdsColumnType.NText :
-					case TdsColumnType.NVarChar:
-					case TdsColumnType.NChar:
-						encoding = Encoding.Unicode;
-						mul = 2 ;
-						break;
-					default :
-						return -1;
-				}
-
-				long count = 0;
-				if (buffer == null) {
-					count = GetBytes (i,0,(byte[]) null,0,0);
-					return (count/mul);
-				}
-
-				length *= mul;
-				byte[] arr = new byte [length];
-				count = GetBytes (i, dataIndex, arr, 0, length);
-				if (count == -1)
-					throw new InvalidCastException ("Specified cast is not valid");
-
-				Char[] val = encoding.GetChars (arr, 0, (int)count);
-				val.CopyTo (buffer, bufferIndex);
-				return val.Length;
-			}
-
-			char [] valueBuffer;
 			object value = GetValue (i);
+			char [] valueBuffer;
 			
 			if (value is char[])
 				valueBuffer = (char[])value;
@@ -981,13 +933,8 @@ namespace System.Data.SqlClient {
 #endif // NET_2_0
                 object GetValue (int i)
 		{
-			if (i < 0 || i >= command.Tds.Columns.Count)
+			if (i < 0 || i >= command.Tds.ColumnValues.Count)
 				throw new IndexOutOfRangeException ();
-
-			if ((command.CommandBehavior & CommandBehavior.SequentialAccess) != 0) {
-				return ((Tds)command.Tds).GetSequentialColumnValue (i);
-			}
-
 			return command.Tds.ColumnValues [i];
 		}
 
@@ -1120,6 +1067,12 @@ namespace System.Data.SqlClient {
                 {
                         throw new NotImplementedException ();                        
                 }
+                
+                [MonoTODO]
+                public override int VisibleFieldCount 
+                {
+                        get {throw new NotImplementedException ();}
+                }
 
 #endif // NET_2_0
 
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
index 3a9f2d5a981..e2f0f137534 100644
--- a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
@@ -1,8 +1,3 @@
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* StorageState.cs: correct namespace, and remove "Delayed"
-	element.
-
 2006-02-03  Senganal T <tseganal@novell.com>
 
 	* SqlString.cs : 
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/StorageState.cs b/mcs/class/System.Data/System.Data.SqlTypes/StorageState.cs
index d04cc75108b..1139c17e161 100644
--- a/mcs/class/System.Data/System.Data.SqlTypes/StorageState.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/StorageState.cs
@@ -29,10 +29,11 @@
    
 #if NET_2_0
 
-namespace System.Data.SqlTypes {
+namespace System.Data.Sql {
 	public enum StorageState
 	{
 		Buffer = 0,
+		Delayed = 3,
 		Stream = 1,
 		UnmanagedBuffer = 2
 	}
diff --git a/mcs/class/System.Data/System.Data.dll.sources b/mcs/class/System.Data/System.Data.dll.sources
index cbecfbd158f..c39f3c17cf2 100644
--- a/mcs/class/System.Data/System.Data.dll.sources
+++ b/mcs/class/System.Data/System.Data.dll.sources
@@ -2,6 +2,7 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs.in
 ../../build/common/Locale.cs
 System.Data/AcceptRejectRule.cs
+System.Data/AdapterMappingException.cs
 System.Data/ColumnTypeConverter.cs
 System.Data/CommandBehavior.cs
 System.Data/CommandType.cs
@@ -13,6 +14,7 @@ System.Data/ConstraintCollection.cs
 System.Data/ConstraintConverter.cs
 System.Data/ConstraintException.cs
 System.Data/CustomDataClassGenerator.cs
+System.Data/DataAdapterException.cs
 System.Data/DataCategoryAttribute.cs
 System.Data/DataColumn.cs
 System.Data/DataColumnChangeEventArgs.cs
@@ -66,17 +68,26 @@ System.Data/IDataAdapter.cs
 System.Data/IDataParameter.cs
 System.Data/IDataParameterCollection.cs
 System.Data/IDataReader.cs
+System.Data/IDataReader2.cs
 System.Data/IDataRecord.cs
+System.Data/IDataRecord2.cs
+System.Data/IDataSources.cs
+System.Data/IDataUpdatableRecord.cs
+System.Data/IDbAsyncCommand.cs
+System.Data/IDbAsyncConnection.cs
 System.Data/IDbCommand.cs
 System.Data/IDbConnection.cs
 System.Data/IDbDataAdapter.cs
 System.Data/IDbDataParameter.cs
+System.Data/IDbExecutionContext.cs
 System.Data/IDbTransaction.cs
+System.Data/IGetTypedData.cs
 System.Data/InRowChangingEventException.cs
 System.Data/InternalDataCollectionBase.cs
 System.Data/InvalidConstraintException.cs
 System.Data/InvalidExpressionException.cs
 System.Data/ISafeDataRecord.cs
+System.Data/ISetTypedData.cs
 System.Data/IsolationLevel.cs
 System.Data/ITableMapping.cs
 System.Data/ITableMappingCollection.cs
@@ -150,6 +161,7 @@ System.Data.Common/DbDataPermission.cs
 System.Data.Common/DbDataReader.cs
 System.Data.Common/DbDataRecord.cs
 System.Data.Common/DbDataSourceEnumerator.cs
+System.Data.Common/DbDataUpdatableRecord.cs
 System.Data.Common/DbEnumerator.cs
 System.Data.Common/DbException.cs
 System.Data.Common/DbMetaDataCollectionNames.cs
@@ -179,7 +191,6 @@ System.Data.Common/SchemaInfo.cs
 System.Data.Common/SchemaLocation.cs
 System.Data.Common/SchemaTableColumn.cs
 System.Data.Common/SchemaTableOptionalColumn.cs
-System.Data.Common/SupportedJoinOperators.cs
 System.Data.OleDb/libgda.cs
 System.Data.OleDb/OleDbParameterConverter.cs
 System.Data.OleDb/OleDbCommand.cs
diff --git a/mcs/class/System.Data/System.Data.vmwcsproj b/mcs/class/System.Data/System.Data.vmwcsproj
index d619ed39a0b..4f38d8c0ba1 100644
--- a/mcs/class/System.Data/System.Data.vmwcsproj
+++ b/mcs/class/System.Data/System.Data.vmwcsproj
@@ -18,16 +18,8 @@
 			<Include>

 				<File RelPath="Assembly\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="Assembly\Consts.cs.in" Link="..\..\build\common\Consts.cs.in" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assembly\Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assembly\MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Configuration.jvm\IKeyMapper.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Configuration.jvm\KeyMapperBase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Configuration.jvm\ProvidersSectionHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\GenericProvider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\IProvider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\OleDbDB2Provider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\OleDbOracleProvider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\OleDbSqlServerProvider.cs" SubType="Code" BuildAction="Compile"/>

+<File RelPath="Assembly\Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>

+ <File RelPath="Assembly\MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="Mono.Data.SqlExpressions\Aggregation.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="Mono.Data.SqlExpressions\ArithmeticExpressions.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="Mono.Data.SqlExpressions\BooleanExpressions.cs" SubType="Code" BuildAction="Compile"/>

@@ -43,6 +35,7 @@
 				<File RelPath="Mono.Data.SqlExpressions\StringFunctions.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="Mono.Data.SqlExpressions\Tokenizer.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\AcceptRejectRule.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\AdapterMappingException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\ColumnTypeConverter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\CommandBehavior.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\CommandType.cs" SubType="Code" BuildAction="Compile"/>

@@ -54,6 +47,7 @@
 				<File RelPath="System.Data\ConstraintConverter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\ConstraintException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\CustomDataClassGenerator.cs" SubType="Code" BuildAction="None"/>

+				<File RelPath="System.Data\DataAdapterException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\DataCategoryAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\DataColumn.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data\DataColumnChangeEventArgs.cs" SubType="Code" BuildAction="Compile"/>

@@ -103,17 +97,26 @@
 				<File RelPath="System.Data\IDataParameter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDataParameterCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDataReader.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDataReader2.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDataRecord.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDataRecord2.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDataSources.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDataUpdatableRecord.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDbAsyncCommand.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDbAsyncConnection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDbCommand.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDbConnection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDbDataAdapter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDbDataParameter.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IDbExecutionContext.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IDbTransaction.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\IGetTypedData.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\InRowChangingEventException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\InternalDataCollectionBase.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\InvalidConstraintException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\InvalidExpressionException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\ISafeDataRecord.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data\ISetTypedData.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\IsolationLevel.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\ITableMapping.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data\ITableMappingCollection.cs" SubType="Code" BuildAction="Compile"/>

@@ -182,12 +185,14 @@
 				<File RelPath="System.Data.Common\DbCommandSet.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbConnection.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbConnectionString.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.Common\DbConvert.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbDataAdapter.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbDataPermission.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbDataPermissionAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbDataReader.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbDataRecord.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbDataSourceEnumerator.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.Common\DbDataUpdatableRecord.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbEnumerator.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbMetaDataCache.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbParameter.cs" SubType="Code" BuildAction="Compile"/>

@@ -197,6 +202,7 @@
 				<File RelPath="System.Data.Common\DbProviderFactoriesConfigurationHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbProviderFactory.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbProviderSupportedClasses.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.Common\DbTable.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbTransaction.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\DbTypes.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.Common\ExceptionHelper.cs" SubType="Code" BuildAction="Compile"/>

@@ -220,6 +226,7 @@
 				<File RelPath="System.Data.OleDb.jvm\OleDbCommand.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.OleDb.jvm\OleDbCommandBuilder.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.OleDb.jvm\OleDbConnection.cs" SubType="Component" BuildAction="Compile"/>

+				<File RelPath="System.Data.OleDb.jvm\OleDbConnectionFactory.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.OleDb.jvm\OleDbConvert.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader.cs" SubType="Code" BuildAction="Compile"/>

@@ -254,7 +261,6 @@
 				<File RelPath="System.Data.ProviderBase\DbReferenceCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDataReader.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDBCommand.cs" SubType="Component" BuildAction="Compile"/>

-				<File RelPath="System.Data.ProviderBase.jvm\AbstractDBCommandBuilder.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDBConnection.cs" SubType="Component" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDbError.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDbErrorCollection.cs" SubType="Code" BuildAction="Compile"/>

@@ -262,10 +268,13 @@
 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDBParameter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractDbParameterCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\AbstractTransaction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.ProviderBase.jvm\DbConvert.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.ProviderBase.jvm\DbPortResolver.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.ProviderBase.jvm\DbStringManager.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.ProviderBase.jvm\OleDbStrings.resx" BuildAction="EmbeddedResource"/>

 				<File RelPath="System.Data.ProviderBase.jvm\ParameterMetadataWrapper.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\ReaderCache.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.ProviderBase.jvm\regex.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.ProviderBase.jvm\SqlClientStrings.resx" BuildAction="EmbeddedResource"/>

 				<File RelPath="System.Data.SqlClient.jvm\ISqlNotificationReceiver.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\MetaType.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\SqlClientPermission.cs" SubType="Code" BuildAction="Compile"/>

@@ -287,8 +296,8 @@
 				<File RelPath="System.Data.SqlClient.jvm\SqlInfoMessageEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\SqlParameter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\SqlParameterCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.SqlClient.jvm\SqlParameterConverter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.SqlClient.jvm\SqlResultSet.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Data.SqlClient.jvm\SqlParameterConverter.cs" BuildAction="Compile"/>

+				<File RelPath="System.Data.SqlClient.jvm\SqlResultSet.cs" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\SqlRowUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\SqlRowUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Data.SqlClient.jvm\SqlRowUpdatingEventArgs.cs" SubType="Code" BuildAction="Compile"/>

diff --git a/mcs/class/System.Data/System.Data/AdapterMappingException.cs b/mcs/class/System.Data/System.Data/AdapterMappingException.cs
new file mode 100644
index 00000000000..4bdaf96424c
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/AdapterMappingException.cs
@@ -0,0 +1,67 @@
+//
+// System.Data.AdapterMappingException.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+	public class AdapterMappingException : InvalidOperationException
+	{
+		#region Constructors
+
+		public AdapterMappingException ()
+			: base (Locale.GetText ("An AdapterMappingException has occurred."))
+		{
+		}
+
+		public AdapterMappingException (string s)
+			: base (s)
+		{
+		}
+
+		public AdapterMappingException (string s, Exception innerException)
+			: base (s, innerException)
+		{
+		}
+
+		public AdapterMappingException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		#endregion // Constructors
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index b90eb1eac03..89943a3ba9d 100644
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,117 +1,14 @@
 2006-02-24  Senganal T  <tsenganal@novell.com>
 
- 	* UniqueConstraint.cs :
- 		- ChildConstraint : Added. Simplifies verifying if constraints are
- 		related.
- 		- CanRemoveFromCollection : Fixed the check to verify if constraints is
- 		linked to a ForeignKeyConstraint. Fixes #77630
- 	* ForeignKeyConstraint.cs :
- 		- _validateRemoveParentConstraint : Removed. Not used anymore
- 		- ParentConstraint : Added. Simplifies verifying if constraints are
-
-2006-02-22  Senganal T  <tsenganal@novell.com>
-
-	* DataRow.cs 
-		- RejectChanges : Do not remove Row from Indexes when state is Deleted.
-		- CheckChildRows : When checking for the ChildRows, use the current value
-		and not the original value.
-
-2006-02-18  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* CustomDataClassGenerator.cs : Patch by Marek Habersack. xsd now
-	  outputs AutoIncrement, AutoIncrementSeed, AutoIncrementStep and
-	  ReadOnly properties. This fixes bug #77576.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* System.Data/DataSet.cs, System.Data/DataView.cs,
-	System.Data/ForeignKeyConstraint.cs,
-	System.Data/DataViewManager.cs, System.Data/DataRow.cs,
-	System.Data/DataSysDescriptionAttribute.cs,
-	System.Data/UniqueConstraint.cs, System.Data/DataTable.cs,
-	System.Data/DataRelation.cs: lots of attribute work, removing
-	DataSysDescription atributes (and marking the class obsolete) for
-	2.0.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DataAdapterException.cs: remove this file.
-	
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DataTableReader.cs: Switch to the (bool) form of Dispose to
-	override, as the no-arg form isn't virtual.
-
-	* Constraint.cs: #ifdef out more DataSysDescriptions.
-
-	* ConstraintException.cs: add ..ctor (string, Exception) for 2.0.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* DataColumn.cs: #ifdef all the DataSysDescriptions !NET_2_0.
-
-	* AdapterMappingException.cs: nuke this file.
-
-	* IDbAsyncConnection.cs, IDbAsyncCommand.cs, IGetTypedData.cs,
-	ISetTypedData.cs, IDataReader2.cs, IDataSources.cs,
-	IDbExecutionContext.cs, IDataRecord2.cs, IDataUpdatableRecord.cs:
-	remove these 2.0 files.
-
-2006-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* ConstraintCollection.cs: in 2.0, class is not serializable and
-	is sealed.  make all the "virtuals" #if !NET_2_0 as well.
-
-	* Constraint.cs: not serializable in 2.0.
-
-	* DataColumnCollection.cs: in 2.0, class is not serializable and
-	is sealed.  make all the "virtuals" #if !NET_2_0 as well.
-
-	* DataRelationCollection.cs: not serializable in 2.0.
-
-	* DataRelation.cs: not serializable in 2.0.
-
-	* DataRowBuilder.cs: class is sealed in 2.0.
-
-	* DataRowCollection.cs: in 2.0, class is not serialized and is
-	sealed.  Also, Add isn't virtual in 2.0 (as the class is sealed).
-
-	* DataRow.cs: not serializable in 2.0.
-
-	* DataSet.cs: remove some DataSysDescriptions from the 2.0 build,
-	and s/GetDataReader/CreateDataReader.
-
-	* DataTableCollection.cs: in 2.0, class is not serializable and is
-	sealed.  make all the "virtuals" #if !NET_2_0 as well.
-
-	* DataTableReader.cs: remove VisibleFieldCount property.
-
-	* DataViewSettingCollection.cs: not serializable in 2.0.
-
-	* DataViewSetting.cs: not serializable in 2.0.
-
-	* ForeignKeyConstraint.cs: serializable in 2.0.
-
-	* OperationAbortedException.cs: class is sealed and serializable.
-
-	* PropertyCollection.cs: serializable in 2.0.
-
-	* StatementCompletedEventArgs.cs: class is sealed.
-
-	* UniqueConstraint.cs: not serializable in 2.0.
-
-2006-02-16  Senganal T  <tsenganal@novell.com>
-
-	* XmlSchemaWriter :
-		WriteDataSetElement : Add an annotation element if exists.
-		WriteDataRelationAnnotation : New. Write a DataRelation as an annotation.
-		WriteConstraints : Write ForeignKeyConstraint even when not associated with
-			a DataRelation and add a "ConstraintOnly=true" attribute for such constraints.
-	* XmlConstants.cs : Add a new constant - ConstraintOnly
-	* XmlSchemaImporter.cs :
-		- ConstraintStructure : Add field ,IsConstraintOnly, to distinguish if a foreignkeyconstraint
-			is related to relation or not.
-		- GenerateRelation : Handle the case when parentkey and childkey contain multiple columnnames.
+	* UniqueConstraint.cs :
+		- ChildConstraint : Added. Simplifies verifying if constraints are
+		related.
+		- CanRemoveFromCollection : Fixed the check to verify if constraints is
+		linked to a ForeignKeyConstraint. Fixes #77630
+	* ForeignKeyConstraint.cs :
+		- _validateRemoveParentConstraint : Removed. Not used anymore
+		- ParentConstraint : Added. Simplifies verifying if constraints are
+		related.
 
 2006-02-11  Senganal T  <tsenganal@novell.com>
 	
diff --git a/mcs/class/System.Data/System.Data/Constraint.cs b/mcs/class/System.Data/System.Data/Constraint.cs
index d3630d038b0..7fed9017c01 100644
--- a/mcs/class/System.Data/System.Data/Constraint.cs
+++ b/mcs/class/System.Data/System.Data/Constraint.cs
@@ -46,9 +46,7 @@ namespace System.Data {
 	internal delegate void DelegateConstraintNameChange (object sender, string newName);
 
 	[DefaultProperty ("ConstraintName")]	
-#if !NET_2_0
 	[Serializable]
-#endif
 	[TypeConverterAttribute (typeof (ConstraintConverter))]
 	public abstract class Constraint 
 	{
@@ -81,9 +79,7 @@ namespace System.Data {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the name of this constraint.")]
-#endif
 		[DefaultValue ("")]
 		public virtual string ConstraintName {
 			get{ return _constraintName == null ? "" : _constraintName; } 
@@ -99,16 +95,12 @@ namespace System.Data {
 
 		[Browsable (false)]
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("The collection that holds custom user information.")]
-#endif
 		public PropertyCollection ExtendedProperties {
 			get { return _properties; }
 		}
 
-#if !NET_2_0
 		[DataSysDescription ("Indicates the table of this constraint.")]
-#endif
 		public abstract DataTable Table {
 			get;
 		}
diff --git a/mcs/class/System.Data/System.Data/ConstraintCollection.cs b/mcs/class/System.Data/System.Data/ConstraintCollection.cs
index cfbf36c7733..8450de85617 100644
--- a/mcs/class/System.Data/System.Data/ConstraintCollection.cs
+++ b/mcs/class/System.Data/System.Data/ConstraintCollection.cs
@@ -47,14 +47,8 @@ namespace System.Data {
 	/// </summary>
 	[DefaultEvent ("CollectionChanged")]
 	[EditorAttribute("Microsoft.VSDesigner.Data.Design.ConstraintsCollectionEditor, "+Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+Consts.AssemblySystem_Drawing )]
-#if !NET_2_0
 	[Serializable]
-#endif
-	public
-#if NET_2_0
-	sealed
-#endif
-	class ConstraintCollection : InternalDataCollectionBase 
+	public class ConstraintCollection : InternalDataCollectionBase 
 	{
 		//private bool beginInit = false;
 		
@@ -82,11 +76,7 @@ namespace System.Data {
 			}
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		Constraint this[string name] {
+		public virtual Constraint this[string name] {
 			get {
 				//If the name is not found we just return null
 				int index = IndexOf(name); //case insensitive
@@ -95,11 +85,7 @@ namespace System.Data {
 			}
 		}
 		
-		public
-#if !NET_2_0
-		virtual
-#endif
-		Constraint this[int index] {
+		public virtual Constraint this[int index] {
 			get {
 				if (index < 0 || index >= List.Count)
 					throw new IndexOutOfRangeException();
@@ -228,11 +214,7 @@ namespace System.Data {
 			OnCollectionChanged( new CollectionChangeEventArgs( CollectionChangeAction.Add, this) );
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		Constraint Add(string name, DataColumn column, bool primaryKey) 
+		public virtual Constraint Add(string name, DataColumn column, bool primaryKey) 
 		{
 
 			UniqueConstraint uc = new UniqueConstraint(name, column, primaryKey);
@@ -241,11 +223,7 @@ namespace System.Data {
 			return uc;
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		Constraint Add(string name, DataColumn primaryKeyColumn,
+		public virtual Constraint Add(string name, DataColumn primaryKeyColumn,
 			DataColumn foreignKeyColumn) 
 		{
 			ForeignKeyConstraint fc = new ForeignKeyConstraint(name, primaryKeyColumn, 
@@ -255,11 +233,7 @@ namespace System.Data {
 			return fc;
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		Constraint Add(string name, DataColumn[] columns, bool primaryKey) 
+		public virtual Constraint Add(string name, DataColumn[] columns, bool primaryKey) 
 		{
 			UniqueConstraint uc = new UniqueConstraint(name, columns, primaryKey);
 			Add(uc);
@@ -267,11 +241,7 @@ namespace System.Data {
 			return uc;
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		Constraint Add(string name, DataColumn[] primaryKeyColumns,
+		public virtual Constraint Add(string name, DataColumn[] primaryKeyColumns,
 			DataColumn[] foreignKeyColumns) 
 		{
 			ForeignKeyConstraint fc = new ForeignKeyConstraint(name, primaryKeyColumns, 
@@ -367,11 +337,7 @@ namespace System.Data {
 			return List.IndexOf(constraint);
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		int IndexOf(string constraintName) 
+		public virtual int IndexOf(string constraintName) 
 		{
 			//LAMESPEC: Spec doesn't say case insensitive
 			//it should to be consistant with the other 
@@ -431,11 +397,7 @@ namespace System.Data {
 			}
 		}
 
-		protected
-#if !NET_2_0
-		virtual
-#endif
-		void OnCollectionChanged( CollectionChangeEventArgs ccevent) 
+		protected virtual void OnCollectionChanged( CollectionChangeEventArgs ccevent) 
 		{
 			if (null != CollectionChanged)
 			{
diff --git a/mcs/class/System.Data/System.Data/ConstraintException.cs b/mcs/class/System.Data/System.Data/ConstraintException.cs
index 23618f590b7..ace1fd7e44b 100644
--- a/mcs/class/System.Data/System.Data/ConstraintException.cs
+++ b/mcs/class/System.Data/System.Data/ConstraintException.cs
@@ -47,12 +47,6 @@ namespace System.Data {
 		{
 		}
 
-#if NET_2_0
-		public ConstraintException (string message, Exception innerException)
-			: base (message, innerException)
-		{
-		}
-#endif
 		protected ConstraintException (SerializationInfo info, StreamingContext context)
 			: base (info, context)
 		{
diff --git a/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs b/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs
index defdd0764aa..5adf0c34ff8 100644
--- a/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs
+++ b/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs
@@ -1018,24 +1018,12 @@ namespace System.Data
 			CodeMemberMethod m = new CodeMemberMethod ();
 			m.Name = "InitializeFields";
 			m.Attributes = MemberAttributes.Assembly;
-
-			string colRef;
 			foreach (DataColumn col in dt.Columns) {
-				colRef = String.Format("__column{0}", opts.TableColName (col.ColumnName, gen));
-
-				m.Statements.Add (Let (FieldRef (colRef), IndexerRef (PropRef ("Columns"), Const (col.ColumnName))));
+				m.Statements.Add (Let (FieldRef ("__column" + opts.TableColName (col.ColumnName, gen)), IndexerRef (PropRef ("Columns"), Const (col.ColumnName))));
 				if (!col.AllowDBNull)
-					m.Statements.Add (Let (FieldRef (PropRef (colRef), "AllowDBNull"), Const (col.AllowDBNull)));
+					m.Statements.Add (Let (FieldRef (PropRef ("__column" + opts.TableColName (col.ColumnName, gen)), "AllowDBNull"), Const (col.AllowDBNull)));
 				if (col.DefaultValue != null && col.DefaultValue.GetType() != typeof(System.DBNull))
-					m.Statements.Add (Let (FieldRef (PropRef (colRef), "DefaultValue"), Const (col.DefaultValue)));
-				if (col.AutoIncrement)
-					m.Statements.Add (Let (FieldRef (PropRef (colRef), "AutoIncrement"), Const (col.AutoIncrement)));
-				if (col.AutoIncrementSeed != 0)
-					m.Statements.Add (Let (FieldRef (PropRef (colRef), "AutoIncrementSeed"), Const (col.AutoIncrementSeed)));
-				if (col.AutoIncrementStep != 1)
-					m.Statements.Add (Let (FieldRef (PropRef (colRef), "AutoIncrementStep"), Const (col.AutoIncrementStep)));
-				if (col.ReadOnly)
-					m.Statements.Add (Let (FieldRef (PropRef (colRef), "ReadOnly"), Const (col.ReadOnly)));
+					m.Statements.Add (Let (FieldRef (PropRef ("__column" + opts.TableColName (col.ColumnName, gen)), "DefaultValue"), Const (col.DefaultValue)));
 			}
 			return m;
 		}
@@ -1367,8 +1355,7 @@ namespace System.Data
 		private CodeMemberProperty CreateRowParentRowProperty (DataTable dt, DataRelation rel)
 		{
 			CodeMemberProperty p = new CodeMemberProperty ();
-			p.Name = opts.TableMemberName (rel.ParentTable.TableName, gen) + "Row" +
-				(rel.ParentTable.TableName == rel.ChildTable.TableName ? "Parent" : String.Empty);
+			p.Name = opts.TableMemberName (rel.ParentTable.TableName, gen) + "Row";
 			p.Attributes = MemberAttributes.Public;
 			p.Type = TypeRef (opts.RowName (rel.ParentTable.TableName, gen));
 			p.GetStatements.Add (Return (Cast (p.Type, MethodInvoke (
diff --git a/mcs/class/System.Data/System.Data/DataAdapterException.cs b/mcs/class/System.Data/System.Data/DataAdapterException.cs
new file mode 100644
index 00000000000..c200be1db97
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataAdapterException.cs
@@ -0,0 +1,67 @@
+//
+// System.Data.DataAdapterException.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+	public class DataAdapterException : InvalidOperationException
+	{
+		#region Constructors
+
+		public DataAdapterException ()
+			: base (Locale.GetText ("A DataAdapterException has occurred."))
+		{
+		}
+
+		public DataAdapterException (string s)
+			: base (s)
+		{
+		}
+
+		public DataAdapterException (string s, Exception innerException)
+			: base (s, innerException)
+		{
+		}
+
+		public DataAdapterException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		#endregion // Constructors
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/DataColumn.cs b/mcs/class/System.Data/System.Data/DataColumn.cs
index 214f802c8be..aaba0607f91 100644
--- a/mcs/class/System.Data/System.Data/DataColumn.cs
+++ b/mcs/class/System.Data/System.Data/DataColumn.cs
@@ -158,9 +158,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether null values are allowed in this column.")]

-#endif

 		[DefaultValue (true)]

 		public bool AllowDBNull

 		{

@@ -212,9 +210,7 @@ namespace System.Data {
 		///		when added to the columns collection, is equal to the default value.

 		///	</remarks>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether the column automatically increments itself for new rows added to the table.  The type of this column must be Int16, Int32, or Int64.")]

-#endif

 		[DefaultValue (false)]

 		[RefreshProperties (RefreshProperties.All)]

 		public bool AutoIncrement

@@ -254,9 +250,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the starting value for an AutoIncrement column.")]

-#endif

 		[DefaultValue (0)]

 		public long AutoIncrementSeed

 		{

@@ -270,9 +264,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the increment used by an AutoIncrement column.")]

-#endif

 		[DefaultValue (1)]

 		public long AutoIncrementStep

 		{

@@ -317,9 +309,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the default user-interface caption for this column.")]

-#endif

 		public string Caption 

 		{

 			get {

@@ -335,10 +325,7 @@ namespace System.Data {
 				_caption = value;

 			}

 		}

-

-#if !NET_2_0

 		[DataSysDescription ("Indicates how this column persists in XML: as an attribute, element, simple content node, or nothing.")]

-#endif

 		[DefaultValue (MappingType.Element)]

 		public virtual MappingType ColumnMapping

 		{

@@ -351,9 +338,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the name used to look up this column in the Columns collection of a DataTable.")]

-#endif

 		[RefreshProperties (RefreshProperties.All)]

 		[DefaultValue ("")]

 		public string ColumnName

@@ -393,9 +378,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the type of data stored in this column.")]

-#endif

 		[DefaultValue (typeof (string))]

 		[RefreshProperties (RefreshProperties.All)]

 		[TypeConverterAttribute (typeof (ColumnTypeConverter))] 

@@ -445,9 +428,7 @@ namespace System.Data {
 		/// <exception cref="System.InvalidCastException"></exception>

 		/// <exception cref="System.ArgumentException"></exception>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the default column value used when adding new rows to the table.")]

-#endif

 		[TypeConverterAttribute (typeof (System.Data.DefaultValueTypeConverter))]

 		public object DefaultValue

 		{

@@ -491,9 +472,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the value that this column computes for each row based on other columns instead of taking user input.")]

-#endif

 		[DefaultValue ("")]

 		[RefreshProperties (RefreshProperties.All)]

 		public string Expression

@@ -555,9 +534,7 @@ namespace System.Data {
 

 		[Browsable (false)]

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds custom user information.")]

-#endif

 		public PropertyCollection ExtendedProperties

 		{

 			get {

@@ -566,9 +543,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the maximum length of the value this column allows. ")]

-#endif

 		[DefaultValue (-1)]

 		public int MaxLength

 		{

@@ -586,9 +561,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the XML uri for elements or attributes stored in this column.")]

-#endif

 		public string Namespace

 		{

 			get {

@@ -610,9 +583,7 @@ namespace System.Data {
 		//Need a good way to set the Ordinal when the column is added to a columnCollection.

 		[Browsable (false)]

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the index of this column in the Columns collection.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

 		public int Ordinal

 		{

@@ -628,9 +599,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the Prefix used for this DataColumn in xml representation.")]

-#endif

 		[DefaultValue ("")]

 		public string Prefix

 		{

@@ -645,9 +614,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether this column allows changes once a row has been added to the table.")]

-#endif

 		[DefaultValue (false)]

 		public bool ReadOnly

 		{

@@ -661,9 +628,7 @@ namespace System.Data {
 

 		[Browsable (false)]

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Returns the DataTable to which this column belongs.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]	

 		public DataTable Table

 		{

@@ -673,9 +638,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether this column should restrict its values in the rows of the table to be unique.")]

-#endif

 		[DefaultValue (false)]

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

                 public bool Unique 

diff --git a/mcs/class/System.Data/System.Data/DataColumnCollection.cs b/mcs/class/System.Data/System.Data/DataColumnCollection.cs
index 67029adfde2..4d3c9a08f3f 100644
--- a/mcs/class/System.Data/System.Data/DataColumnCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataColumnCollection.cs
@@ -42,15 +42,9 @@ using System.ComponentModel;
 namespace System.Data {
 	[Editor ("Microsoft.VSDesigner.Data.Design.ColumnsCollectionEditor, " + Consts.AssemblyMicrosoft_VSDesigner,
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-#if !NET_2_0
 	[Serializable]
-#endif
 	[DefaultEvent ("CollectionChanged")]
-	public
-#if NET_2_0
-	sealed
-#endif
-	class DataColumnCollection : InternalDataCollectionBase
+	public class DataColumnCollection : InternalDataCollectionBase
 	{
 		//This hashtable maps between column name to DataColumn object.
 		private Hashtable columnFromName = new Hashtable();
@@ -73,11 +67,7 @@ namespace System.Data {
 		/// <summary>
 		/// Gets the DataColumn from the collection at the specified index.
 		/// </summary>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataColumn this[int index]
+		public virtual DataColumn this[int index]
 		{
 			get
 			{
@@ -91,11 +81,7 @@ namespace System.Data {
 		/// <summary>
 		/// Gets the DataColumn from the collection with the specified name.
 		/// </summary>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataColumn this[string name]
+		public virtual DataColumn this[string name]
 		{
 			get
 			{
@@ -146,11 +132,7 @@ namespace System.Data {
 		/// Creates and adds a DataColumn object to the DataColumnCollection.
 		/// </summary>
 		/// <returns></returns>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataColumn Add()
+		public virtual DataColumn Add()
 		{
 			string defaultName = GetNextDefaultColumnName ();
 			DataColumn column = new DataColumn (defaultName);
@@ -269,11 +251,7 @@ namespace System.Data {
 		/// </summary>
 		/// <param name="columnName">The name of the column.</param>
 		/// <returns>The newly created DataColumn.</returns>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataColumn Add(string columnName)
+		public virtual DataColumn Add(string columnName)
 		{
 			if (columnName == null || columnName == String.Empty)
 			{
@@ -291,11 +269,7 @@ namespace System.Data {
 		/// <param name="columnName">The ColumnName to use when cretaing the column.</param>
 		/// <param name="type">The DataType of the new column.</param>
 		/// <returns>The newly created DataColumn.</returns>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataColumn Add(string columnName, Type type)
+		public virtual DataColumn Add(string columnName, Type type)
 		{
 			if (columnName == null || columnName == "")
 			{
@@ -314,11 +288,7 @@ namespace System.Data {
 		/// <param name="type">The DataType of the new column.</param>
 		/// <param name="expression">The expression to assign to the Expression property.</param>
 		/// <returns>The newly created DataColumn.</returns>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataColumn Add(string columnName, Type type, string expression)
+		public virtual DataColumn Add(string columnName, Type type, string expression)
 		{
 			if (columnName == null || columnName == "")
 			{
@@ -453,11 +423,7 @@ namespace System.Data {
 		/// </summary>
 		/// <param name="column">The name of the column to return.</param>
 		/// <returns>The index of the column specified by column if it is found; otherwise, -1.</returns>
-		public
-#if !NET_2_0
-		virtual
-#endif
-		int IndexOf(DataColumn column)
+		public virtual int IndexOf(DataColumn column)
 		{
 			if (column == null)
 				return -1;
@@ -485,11 +451,7 @@ namespace System.Data {
 		/// Raises the OnCollectionChanged event.
 		/// </summary>
 		/// <param name="ccevent">A CollectionChangeEventArgs that contains the event data.</param>
-		protected
-#if !NET_2_0
-		virtual
-#endif
-		void OnCollectionChanged(CollectionChangeEventArgs ccevent)
+		protected virtual void OnCollectionChanged(CollectionChangeEventArgs ccevent)
 		{
 			parentTable.ResetPropertyDescriptorsCache();
 			if (CollectionChanged != null) 
@@ -502,11 +464,7 @@ namespace System.Data {
 		/// Raises the OnCollectionChanging event.
 		/// </summary>
 		/// <param name="ccevent">A CollectionChangeEventArgs that contains the event data.</param>
-		protected internal
-#if !NET_2_0
-		virtual
-#endif
-		void OnCollectionChanging(CollectionChangeEventArgs ccevent)
+		protected internal virtual void OnCollectionChanging(CollectionChangeEventArgs ccevent)
 		{
 			if (CollectionChanged != null) 
 			{
diff --git a/mcs/class/System.Data/System.Data/DataRelation.cs b/mcs/class/System.Data/System.Data/DataRelation.cs
index cda06f43494..c0d5c9b6755 100644
--- a/mcs/class/System.Data/System.Data/DataRelation.cs
+++ b/mcs/class/System.Data/System.Data/DataRelation.cs
@@ -47,9 +47,7 @@ namespace System.Data
 	[Editor ("Microsoft.VSDesigner.Data.Design.DataRelationEditor, " + Consts.AssemblyMicrosoft_VSDesigner,
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 	[DefaultProperty ("RelationName")]
-#if !NET_2_0
 	[Serializable]
-#endif
 	[MonoTODO]
 	[TypeConverterAttribute (typeof (RelationshipConverter))]	
 	public class DataRelation {
@@ -129,9 +127,7 @@ namespace System.Data
 		#region Properties
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the child columns of this relation.")]
-#endif
 		public virtual DataColumn[] ChildColumns {
 			get {
 				return childColumns;
@@ -164,9 +160,7 @@ namespace System.Data
 
 		[Browsable (false)]
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("The collection that holds custom user information.")]
-#endif
 		public PropertyCollection ExtendedProperties {
 			get {
 				if (extendedProperties == null)
@@ -176,9 +170,7 @@ namespace System.Data
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates whether relations are nested.")]
-#endif
 		[DefaultValue (false)]
 		public virtual bool Nested {
 			get {
@@ -191,9 +183,7 @@ namespace System.Data
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the parent columns of this relation.")]
-#endif
 		public virtual DataColumn[] ParentColumns {
 			get {
 				return parentColumns;
@@ -221,9 +211,7 @@ namespace System.Data
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("The name used to look up this relation in the Relations collection of a DataSet.")]
-#endif
 		[DefaultValue ("")]
 		public virtual string RelationName {
 			get {
diff --git a/mcs/class/System.Data/System.Data/DataRelationCollection.cs b/mcs/class/System.Data/System.Data/DataRelationCollection.cs
index 10d5416a7a7..daf6bb92849 100644
--- a/mcs/class/System.Data/System.Data/DataRelationCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataRelationCollection.cs
@@ -47,9 +47,7 @@ namespace System.Data {
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 	[DefaultEvent ("CollectionChanged")]
 	[DefaultProperty ("Table")]
-#if !NET_2_0
 	[Serializable]
-#endif
 	public abstract class DataRelationCollection : InternalDataCollectionBase
 	{
 		/// <summary>
diff --git a/mcs/class/System.Data/System.Data/DataRow.cs b/mcs/class/System.Data/System.Data/DataRow.cs
index d7a78843974..18956b7e9e2 100644
--- a/mcs/class/System.Data/System.Data/DataRow.cs
+++ b/mcs/class/System.Data/System.Data/DataRow.cs
@@ -42,17 +42,12 @@ using System.Data.Common;
 using System.Collections;
 using System.Globalization;
 using System.Xml;
-#if NET_2_0
-using System.ComponentModel;
-#endif
 
 namespace System.Data {
 	/// <summary>
 	/// Represents a row of data in a DataTable.
 	/// </summary>
-#if !NET_2_0
 	[Serializable]
-#endif
 	public class DataRow
 	{
 		#region Fields
@@ -591,14 +586,14 @@ namespace System.Data {
 					return;
 			case DataRowState.Added:
 			case DataRowState.Modified:
-				int original = Original;
-				DataRowState oldState = RowState;
+					int original = Original;
+					DataRowState oldState = RowState;
                                 if (Original >= 0) {
                                         Table.RecordCache.DisposeRecord(Original);
                                 }
                                 Original = Current;
-				foreach (Index index in Table.Indexes)
-					index.Update(this, original, DataRowVersion.Original, oldState);
+					foreach (Index index in Table.Indexes)
+						index.Update(this, original, DataRowVersion.Original, oldState);
 				break;
 			case DataRowState.Deleted:
 				Table.DeleteRowFromIndexes(this);
@@ -615,9 +610,6 @@ namespace System.Data {
 		/// <summary>
 		/// Begins an edit operation on a DataRow object.
 		/// </summary>
-#if NET_2_0
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
-#endif
 		public void BeginEdit () 
 		{
 			if (_inChangingEvent)
@@ -638,9 +630,6 @@ namespace System.Data {
 		/// <summary>
 		/// Cancels the current edit on the row.
 		/// </summary>
-#if NET_2_0
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
-#endif
 		public void CancelEdit () 
 		{
 			 if (_inChangingEvent) {
@@ -654,7 +643,7 @@ namespace System.Data {
 				Proposed = -1;
 
 				foreach(Index index in Table.Indexes)
-					index.Update(this,oldRecord, DataRowVersion.Proposed, oldState);
+					index.Update(this,oldRecord, DataRowVersion.Proposed, oldState);					
 			}
 		}
 
@@ -695,8 +684,9 @@ namespace System.Data {
 			if (Current >= 0) {
 				int current = Current;
 				DataRowState oldState = RowState;
-				if (Current != Original)
+				if (Current != Original) {
 					_table.RecordCache.DisposeRecord(Current);
+				}
 				Current = -1;
 				foreach(Index index in Table.Indexes)
 					index.Update(this, current, DataRowVersion.Current, oldState);
@@ -768,7 +758,7 @@ namespace System.Data {
 								// change only the values in the key columns
 								// set the childcolumn value to the new parent row value
 									for (int k = 0; k < fkc.Columns.Length; k++)
-										if (!fkc.RelatedColumns [k].DataContainer [Current].Equals (fkc.RelatedColumns [k].DataContainer [Proposed]))
+										if (!fkc.RelatedColumns [k].DataContainer [Original].Equals (fkc.RelatedColumns [k].DataContainer [Proposed]))
 											childRows[j][fkc.Columns[k]] = this[fkc.RelatedColumns[k], DataRowVersion.Proposed];
 
 									break;
@@ -833,9 +823,6 @@ namespace System.Data {
 		/// <summary>
 		/// Ends the edit occurring on the row.
 		/// </summary>
-#if NET_2_0
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
-#endif
 		public void EndEdit () 
 		{
 			if (_inChangingEvent)
@@ -1339,6 +1326,7 @@ namespace System.Data {
 				break;
 			case DataRowState.Deleted:
 				CheckChildRows (DataRowAction.Rollback);
+				Table.DeleteRowFromIndexes(this);
 				Current = Original;
 				break;
 			}
diff --git a/mcs/class/System.Data/System.Data/DataRowBuilder.cs b/mcs/class/System.Data/System.Data/DataRowBuilder.cs
index e0eb41730c0..1e4ac3355c1 100644
--- a/mcs/class/System.Data/System.Data/DataRowBuilder.cs
+++ b/mcs/class/System.Data/System.Data/DataRowBuilder.cs
@@ -42,11 +42,7 @@ namespace System.Data
 	/// constructing DataTable and DataRow.
 	/// </summary>
 
-	public
-#if NET_2_0
-	sealed
-#endif
-	class DataRowBuilder 
+	public class DataRowBuilder 
 	{
 		#region Fields
 		
diff --git a/mcs/class/System.Data/System.Data/DataRowCollection.cs b/mcs/class/System.Data/System.Data/DataRowCollection.cs
index 9b8a5d1ff64..e890833cb46 100644
--- a/mcs/class/System.Data/System.Data/DataRowCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataRowCollection.cs
@@ -44,14 +44,8 @@ namespace System.Data
 	/// Collection of DataRows in a DataTable
 	/// </summary>
 
-#if !NET_2_0
 	[Serializable]
-#endif
-	public
-#if NET_2_0
-	sealed
-#endif
-	class DataRowCollection : InternalDataCollectionBase 
+	public class DataRowCollection : InternalDataCollectionBase 
 	{
 		private DataTable table;
 		
@@ -123,7 +117,7 @@ namespace System.Data
 		/// Creates a row using specified values and adds it to the DataRowCollection.
 		/// </summary>
 #if NET_2_0
-		public DataRow Add (params object[] values) 
+		public virtual DataRow Add (params object[] values) 
 #else
 		public virtual DataRow Add (object[] values) 
 #endif
diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index e4b0aa63d2c..3062226127b 100644
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -55,10 +55,7 @@ namespace System.Data {
 	[ToolboxItem ("Microsoft.VSDesigner.Data.VS.DataSetToolboxItem, " + Consts.AssemblyMicrosoft_VSDesigner)]

 	[DefaultProperty ("DataSetName")]

 	[DesignerAttribute ("Microsoft.VSDesigner.Data.VS.DataSetDesigner, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.IDesigner")]

-#if NET_2_0

-	[XmlSchemaProvider ("GetDataSetSchema")]

-	[XmlRootAttribute ("DataSet")]

-#endif

+

 	[Serializable]

 	public class DataSet : MarshalByValueComponent, IListSource, 

 		ISupportInitialize, ISerializable, IXmlSerializable 

@@ -102,9 +99,7 @@ namespace System.Data {
 		#region Public Properties

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether comparing strings within the DataSet is case sensitive.")]

-#endif

 		[DefaultValue (false)]

 		public bool CaseSensitive {

 			get {

@@ -128,18 +123,14 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The name of this DataSet.")]

-#endif

 		[DefaultValue ("")]

 		public string DataSetName {

 			get { return dataSetName; } 

 			set { dataSetName = value; }

 		}

 

-#if !NET_2_0

 		[DataSysDescription ("Indicates a custom \"view\" of the data contained by the DataSet. This view allows filtering, searching, and navigating through the custom data view.")]

-#endif

 		[Browsable (false)]

 		public DataViewManager DefaultViewManager {

 			get {

@@ -149,9 +140,7 @@ namespace System.Data {
 			} 

 		}

 

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether constraint rules are to be followed.")]

-#endif

 		[DefaultValue (true)]

 		public bool EnforceConstraints {

 			get { return enforceConstraints; } 

@@ -162,17 +151,13 @@ namespace System.Data {
 

 		[Browsable (false)]

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds custom user information.")]

-#endif

 		public PropertyCollection ExtendedProperties {

 			get { return properties; }

 		}

 

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Indicates that the DataSet has errors.")]

-#endif

 		public bool HasErrors {

 			[MonoTODO]

 			get {

@@ -185,9 +170,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates a locale under which to compare strings within the DataSet.")]

-#endif

 		public CultureInfo Locale {

 			get {

 				return locale;

@@ -285,9 +268,7 @@ namespace System.Data {
 		}

 		

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the XML uri namespace for the root element pointed at by this DataSet.")]

-#endif

 		[DefaultValue ("")]

 		public string Namespace {

 			get { return _namespace; } 

@@ -302,9 +283,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the prefix of the namespace used for this DataSet.")]

-#endif

 		[DefaultValue ("")]

 		public string Prefix {

 			get { return prefix; } 

@@ -328,9 +307,7 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds the relations for this DatSet.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]

 		public DataRelationCollection Relations {

 			get {

@@ -353,17 +330,13 @@ namespace System.Data {
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds the tables for this DataSet.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]

 		public DataTableCollection Tables {

 			get { return tableCollection; }

 		}

 

 #if NET_2_0

-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

-		[Browsable (false)]

 		public virtual SchemaSerializationMode SchemaSerializationMode {

 

 			get {

@@ -588,13 +561,13 @@ namespace System.Data {
 

 #if NET_2_0

 		[MonoTODO]

-		public DataTableReader CreateDataReader (DataTable[] dataTables)

+		public DataTableReader GetDataReader (DataTable[] dataTables)

 		{

 			throw new NotImplementedException ();

 		}

 

 		[MonoTODO]

-		public DataTableReader CreateDataReader ()

+		public DataTableReader GetDataReader ()

 		{

 			throw new NotImplementedException ();

 		}

@@ -1124,9 +1097,7 @@ namespace System.Data {
 		#region Public Events

 

 		[DataCategory ("Action")]

-#if !NET_2_0

 		[DataSysDescription ("Occurs when it is not possible to merge schemas for two tables with the same name.")]

-#endif

 		public event MergeFailedEventHandler MergeFailed;

 

 		#endregion // Public Events

diff --git a/mcs/class/System.Data/System.Data/DataSysDescriptionAttribute.cs b/mcs/class/System.Data/System.Data/DataSysDescriptionAttribute.cs
index f860bc1cbae..fea06cf6d37 100644
--- a/mcs/class/System.Data/System.Data/DataSysDescriptionAttribute.cs
+++ b/mcs/class/System.Data/System.Data/DataSysDescriptionAttribute.cs
@@ -34,9 +34,6 @@ using System;
 using System.ComponentModel;
 
 namespace System.Data {
-#if NET_2_0
-	[Obsolete ("DataSysDescriptionAttribute has been deprecated")]
-#endif
 	[AttributeUsage (AttributeTargets.All)]
 	public class DataSysDescriptionAttribute : DescriptionAttribute
 	{
@@ -48,9 +45,6 @@ namespace System.Data {
 
 		#region Constructors
 
-#if NET_2_0
-		[Obsolete ("DataSysDescriptionAttribute has been deprecated")]
-#endif
 		public DataSysDescriptionAttribute (string description)
 			: base (description)
 		{
diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs
index fd8fdfe48a5..f5fe56a194f 100644
--- a/mcs/class/System.Data/System.Data/DataTable.cs
+++ b/mcs/class/System.Data/System.Data/DataTable.cs
@@ -187,9 +187,7 @@ namespace System.Data {
 		/// <summary>

 		/// Indicates whether string comparisons within the table are case-sensitive.

 		/// </summary>

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether comparing strings within the table is case sensitive.")]	

-#endif

 		public bool CaseSensitive {

 			get { 

 				if (_virginCaseSensitive && dataSet != null)

@@ -251,9 +249,7 @@ namespace System.Data {
 		/// Gets the collection of child relations for this DataTable.

 		/// </summary>

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Returns the child relations for this table.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

 		public DataRelationCollection ChildRelations {

 			get {

@@ -265,9 +261,7 @@ namespace System.Data {
 		/// Gets the collection of columns that belong to this table.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds the columns for this table.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]

 		public DataColumnCollection Columns {

 			get { return _columnCollection; }

@@ -277,9 +271,7 @@ namespace System.Data {
 		/// Gets the collection of constraints maintained by this table.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds the constraints for this table.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]

 		public ConstraintCollection Constraints {

 			get { return _constraintCollection; }

@@ -289,9 +281,7 @@ namespace System.Data {
 		/// Gets the DataSet that this table belongs to.

 		/// </summary>

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the DataSet to which this table belongs.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

 		public DataSet DataSet {

 			get { return dataSet; }

@@ -305,9 +295,7 @@ namespace System.Data {
 		/// </summary>

 		[MonoTODO]	

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("This is the default DataView for the table.")]

-#endif

 		public DataView DefaultView {

 			get {

 				if (_defaultView == null) {

@@ -330,9 +318,7 @@ namespace System.Data {
 		/// a value used to represent this table in the user interface.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The expression used to compute the data-bound value of this row.")]	

-#endif

 		[DefaultValue ("")]

 		public string DisplayExpression {

 			get { return _displayExpression == null ? "" : _displayExpression; }

@@ -344,9 +330,7 @@ namespace System.Data {
 		/// </summary>

 		[Browsable (false)]

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("The collection that holds custom user information.")]

-#endif

 		public PropertyCollection ExtendedProperties {

 			get { return _extendedProperties; }

 		}

@@ -357,9 +341,7 @@ namespace System.Data {
 		/// which the table belongs.

 		/// </summary>

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Returns whether the table has errors.")]

-#endif

 		public bool HasErrors {

 			get { 

 				// we can not use the _hasError flag because we do not know when to turn it off!

@@ -376,9 +358,7 @@ namespace System.Data {
 		/// Gets or sets the locale information used to 

 		/// compare strings within the table.

 		/// </summary>

-#if !NET_2_0

 		[DataSysDescription ("Indicates a locale under which to compare strings within the table.")]

-#endif

 		public CultureInfo Locale {

 			get { 

 				// if the locale is null, we check for the DataSet locale

@@ -404,9 +384,7 @@ namespace System.Data {
 		/// Gets or sets the initial starting size for this table.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates an initial starting size for this table.")]

-#endif

 		[DefaultValue (50)]

 		public int MinimumCapacity {

 			get { return _minimumCapacity; }

@@ -418,9 +396,7 @@ namespace System.Data {
 		/// of the data stored in the DataTable.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the XML uri namespace for the elements contained in this table.")]

-#endif

 		public string Namespace {

 			get

 			{

@@ -442,9 +418,7 @@ namespace System.Data {
 		/// this DataTable.

 		/// </summary>

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Returns the parent relations for this table.")]

-#endif

 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

 		public DataRelationCollection ParentRelations {

 			get {	

@@ -457,9 +431,7 @@ namespace System.Data {
 		///  of the data stored in the DataTable.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the Prefix of the namespace used for this table in XML representation.")]

-#endif

 		[DefaultValue ("")]

 		public string Prefix {

 			get { return _prefix == null ? "" : _prefix; }

@@ -478,9 +450,7 @@ namespace System.Data {
 		/// primary keys for the data table.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the column(s) that represent the primary key for this table.")]

-#endif

 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.PrimaryKeyEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]

 		[TypeConverterAttribute ("System.Data.PrimaryKeyTypeConverter, " + Consts.AssemblySystem_Data)]

 		public DataColumn[] PrimaryKey {

@@ -552,9 +522,7 @@ namespace System.Data {
 		/// Gets the collection of_rows that belong to this table.

 		/// </summary>

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the collection that holds the rows of data for this table.")]	

-#endif

 		public DataRowCollection Rows {

 			get { return _rows; }

 		}

@@ -574,9 +542,7 @@ namespace System.Data {
 		/// Gets or sets the name of the the DataTable.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the name used to look up this table in the Tables collection of a DataSet.")]

-#endif

 		[DefaultValue ("")]	

 		[RefreshProperties (RefreshProperties.All)]

 		public string TableName {

@@ -1889,9 +1855,7 @@ namespace System.Data {
 		/// the specified DataColumn in a DataRow.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("Occurs when a value has been changed for this column.")]

-#endif

 		public event DataColumnChangeEventHandler ColumnChanged;

 

 		/// <summary>

@@ -1899,45 +1863,35 @@ namespace System.Data {
 		/// DataColumn in a DataRow.

 		/// </summary>

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Occurs when a value has been submitted for this column.  The user can modify the proposed value and should throw an exception to cancel the edit.")]

-#endif

 		public event DataColumnChangeEventHandler ColumnChanging;

 

 		/// <summary>

 		/// Occurs after a DataRow has been changed successfully.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("Occurs after a row in the table has been successfully edited.")]

-#endif

 		public event DataRowChangeEventHandler RowChanged;

 

 		/// <summary>

 		/// Occurs when a DataRow is changing.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("Occurs when the row is being changed so that the event handler can modify or cancel the change. The user can modify values in the row and should throw an  exception to cancel the edit.")]

-#endif

 		public event DataRowChangeEventHandler RowChanging;

 

 		/// <summary>

 		/// Occurs after a row in the table has been deleted.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("Occurs after a row in the table has been successfully deleted.")] 

-#endif

 		public event DataRowChangeEventHandler RowDeleted;

 

 		/// <summary>

 		/// Occurs before a row in the table is about to be deleted.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("Occurs when a row in the table marked for deletion.  Throw an exception to cancel the deletion.")]

-#endif

 		public event DataRowChangeEventHandler RowDeleting;

 

 #if NET_2_0

@@ -1945,9 +1899,7 @@ namespace System.Data {
 		/// Occurs after the Clear method is called on the datatable.

 		/// </summary>

 		[DataCategory ("Data")]	

-#if !NET_2_0

 		[DataSysDescription ("Occurs when the rows in a table is cleared . Throw an exception to cancel the deletion.")]

-#endif

 		public event DataTableClearEventHandler TableCleared;

 #endif // NET_2_0

 

diff --git a/mcs/class/System.Data/System.Data/DataTableCollection.cs b/mcs/class/System.Data/System.Data/DataTableCollection.cs
index 1c9811b52e9..99e3f028337 100644
--- a/mcs/class/System.Data/System.Data/DataTableCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataTableCollection.cs
@@ -45,14 +45,8 @@ namespace System.Data {
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 	[DefaultEvent ("CollectionChanged")]
 	[ListBindable (false)]
-#if !NET_2_0
 	[Serializable]
-#endif
-	public
-#if NET_2_0
-	sealed
-#endif
-	class DataTableCollection : InternalDataCollectionBase
+	public class DataTableCollection : InternalDataCollectionBase
 	{
 		DataSet dataSet;
 		
@@ -98,22 +92,14 @@ namespace System.Data {
 	
 		#region Methods	
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataTable Add () 
+		public virtual DataTable Add () 
 		{
 			DataTable Table = new DataTable ();
 			Add (Table);
 			return Table;
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		void Add (DataTable table) 
+		public virtual void Add (DataTable table) 
 		{
 			OnCollectionChanging (new CollectionChangeEventArgs (CollectionChangeAction.Add, table));
 			// check if the reference is a null reference
@@ -149,11 +135,7 @@ namespace System.Data {
 			OnCollectionChanged (new CollectionChangeEventArgs (CollectionChangeAction.Add, table));
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		DataTable Add (string name) 
+		public virtual DataTable Add (string name) 
 		{
 			DataTable table = new DataTable (name);
 			this.Add (table);
@@ -161,7 +143,7 @@ namespace System.Data {
 		}
 
 #if NET_2_0
-		public DataTable Add (string name, string tbNamespace)
+		public virtual DataTable Add (string name, string tbNamespace)
 		{
 			DataTable table = new DataTable (name, tbNamespace);
 			this.Add (table);
@@ -195,20 +177,12 @@ namespace System.Data {
 			return (-1 != IndexOf (name, false));
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		int IndexOf (DataTable table) 
+		public virtual int IndexOf (DataTable table) 
 		{
 			return List.IndexOf (table);
 		}
 
-		public
-#if !NET_2_0
-		virtual
-#endif
-		int IndexOf (string name) 
+		public virtual int IndexOf (string name) 
 		{
 			return IndexOf (name, false);
 		}
@@ -240,21 +214,13 @@ namespace System.Data {
 
 		#region Protected methods
 
-		protected internal
-#if !NET_2_0
-		virtual
-#endif
-		void OnCollectionChanging (CollectionChangeEventArgs Args)
+		protected internal virtual void OnCollectionChanging (CollectionChangeEventArgs Args)
 		{
 			if (CollectionChanging != null)
 				CollectionChanging (this, Args);
 		}
 
-		protected
-#if !NET_2_0
-		virtual
-#endif
-		void OnCollectionChanged (CollectionChangeEventArgs Args)
+		protected virtual void OnCollectionChanged (CollectionChangeEventArgs Args)
 		{
 			if (CollectionChanged != null)
 				CollectionChanged (this, Args);
diff --git a/mcs/class/System.Data/System.Data/DataTableReader.cs b/mcs/class/System.Data/System.Data/DataTableReader.cs
index 4f177dcdb91..7f97a76243c 100644
--- a/mcs/class/System.Data/System.Data/DataTableReader.cs
+++ b/mcs/class/System.Data/System.Data/DataTableReader.cs
@@ -135,6 +135,10 @@ namespace System.Data {
                         get { return 0; }
                 }
                 
+                public override int VisibleFieldCount {
+                        get { return CurrentTable.Columns.Count; }
+                }
+
                 #endregion // Properties
 
                 #region Methods
@@ -166,10 +170,9 @@ namespace System.Data {
                         _closed = true;
                 }
                 
-                protected override void Dispose (bool disposing)
+                public override void Dispose ()
                 {
-                        if (disposing)
-				Close ();
+                        Close ();
                 }
                 
                 public override bool GetBoolean (int i)
diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs
index 4b592b981cb..7e9942b470b 100644
--- a/mcs/class/System.Data/System.Data/DataView.cs
+++ b/mcs/class/System.Data/System.Data/DataView.cs
@@ -116,9 +116,7 @@ namespace System.Data
 		#region PublicProperties

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether this DataView and the user interface associated with it allows deletes.")]

-#endif

 		[DefaultValue (true)]

 		public bool AllowDelete {

 			get {

@@ -130,9 +128,7 @@ namespace System.Data
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether this DataView and the user interface associated with it allows edits.")]

-#endif

 		[DefaultValue (true)]

 		public bool AllowEdit {

 			get {

@@ -144,9 +140,7 @@ namespace System.Data
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether this DataView and the user interface associated with it allows new rows to be added.")]

-#endif

 		[DefaultValue (true)]

 		public bool AllowNew {

 			get {

@@ -159,9 +153,7 @@ namespace System.Data
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether to use the default sort if the Sort property is not set.")]

-#endif

 		[DefaultValue (false)]

 		[RefreshProperties (RefreshProperties.All)]

 		public bool ApplyDefaultSort {

@@ -187,9 +179,7 @@ namespace System.Data
 		// get the count of rows in the DataView after RowFilter 

 		// and RowStateFilter have been applied

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Returns the number of items currently in this view.")]

-#endif

 		public int Count {

 			[MonoTODO]

 			get {

@@ -198,9 +188,7 @@ namespace System.Data
 		}

 

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("This returns a pointer to back to the DataViewManager that owns this DataSet (if any).")]

-#endif

 		public DataViewManager DataViewManager {

 			[MonoTODO]

 			get {

@@ -223,9 +211,7 @@ namespace System.Data
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates an expression used to filter the data returned by this DataView.")]

-#endif

 		[DefaultValue ("")]

 		public virtual string RowFilter {

 			get { return rowFilter; }

@@ -255,9 +241,7 @@ namespace System.Data
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the versions of data returned by this DataView.")]

-#endif

 		[DefaultValue (DataViewRowState.CurrentRows)]

 		public DataViewRowState RowStateFilter {

 			get { return rowState; }

@@ -279,9 +263,7 @@ namespace System.Data
 		}

 

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the order in which data is returned by this DataView.")]

-#endif

 		[DefaultValue ("")]

 		public string Sort {

 			get { 

@@ -322,9 +304,7 @@ namespace System.Data
 

 		[TypeConverter (typeof (DataTableTypeConverter))]

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates the table this DataView uses to get data.")]

-#endif

 		[DefaultValue (null)]

 		[RefreshProperties (RefreshProperties.All)]

 		public DataTable Table {

@@ -544,15 +524,11 @@ namespace System.Data
 		#endregion // PublicMethods

 		

 		[DataCategory ("Data")]

-#if !NET_2_0

 		[DataSysDescription ("Indicates that the data returned by this DataView has somehow changed.")]

-#endif

 		public event ListChangedEventHandler ListChanged;

 

 		[Browsable (false)]

-#if !NET_2_0

 		[DataSysDescription ("Indicates whether the view is open.  ")]

-#endif

 		protected bool IsOpen {

 			get { return isOpen; }

 		}

diff --git a/mcs/class/System.Data/System.Data/DataViewManager.cs b/mcs/class/System.Data/System.Data/DataViewManager.cs
index 775bb85103f..4e7e2cb3b04 100644
--- a/mcs/class/System.Data/System.Data/DataViewManager.cs
+++ b/mcs/class/System.Data/System.Data/DataViewManager.cs
@@ -75,9 +75,7 @@ namespace System.Data
 

 		#region Properties

 

-#if !NET_2_0

 		[DataSysDescription ("Indicates the source of data for this DataViewManager.")]

-#endif

 		[DefaultValue (null)]

 		public DataSet DataSet {

 			get { return dataSet; }

@@ -100,9 +98,7 @@ namespace System.Data
 			}

 		}

 

-#if !NET_2_0

 		[DataSysDescription ("Indicates the sorting/filtering/state settings for any table in the corresponding DataSet.")]

-#endif

                 [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]

 		public DataViewSettingCollection DataViewSettings {

 			get { return settings; }

diff --git a/mcs/class/System.Data/System.Data/DataViewSetting.cs b/mcs/class/System.Data/System.Data/DataViewSetting.cs
index f3f048fcfe5..0f2a6e54077 100644
--- a/mcs/class/System.Data/System.Data/DataViewSetting.cs
+++ b/mcs/class/System.Data/System.Data/DataViewSetting.cs
@@ -42,9 +42,7 @@ namespace System.Data
 	/// Represents the default settings for ApplyDefaultSort, DataViewManager, RowFilter, RowStateFilter, Sort, and Table for DataViews created from the DataViewManager.
 	/// </summary>
 	[TypeConverterAttribute (typeof (ExpandableObjectConverter))]
-#if !NET_2_0
 	[Serializable]
-#endif
 	public class DataViewSetting
 	{
 		#region Fields
diff --git a/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs b/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs
index fceb62fad2c..1afb837199f 100644
--- a/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs
@@ -45,9 +45,7 @@ namespace System.Data {
 	/// </summary>
 	[Editor ("Microsoft.VSDesigner.Data.Design.DataViewSettingsCollectionEditor, " + Consts.AssemblyMicrosoft_VSDesigner,
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-#if !NET_2_0
 	[Serializable]
-#endif
 	public class DataViewSettingCollection : ICollection, IEnumerable 
 	{
 		#region Fields
diff --git a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
index 7962e73cc15..ccf8102e4d5 100644
--- a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
+++ b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
@@ -42,9 +42,7 @@ namespace System.Data {
 	[Editor ("Microsoft.VSDesigner.Data.Design.ForeignKeyConstraintEditor, " + Consts.AssemblyMicrosoft_VSDesigner,
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 	[DefaultProperty ("ConstraintName")]
-#if !NET_2_0
 	[Serializable]
-#endif
 	public class ForeignKeyConstraint : Constraint 
 	{
 		private UniqueConstraint _parentUniqueConstraint;
@@ -305,9 +303,7 @@ namespace System.Data {
 		#region Properties
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("For accept and reject changes, indicates what kind of cascading should take place across this relation.")]
-#endif
 		[DefaultValue (AcceptRejectRule.None)]
 		public virtual AcceptRejectRule AcceptRejectRule {
 			get { return _acceptRejectRule; }
@@ -315,18 +311,14 @@ namespace System.Data {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the child columns of this constraint.")]
-#endif
 		[ReadOnly (true)]
 		public virtual DataColumn[] Columns {
 			get { return _childColumns; }
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("For deletions, indicates what kind of cascading should take place across this relation.")]
-#endif
 		[DefaultValue (Rule.Cascade)]
 		public virtual Rule DeleteRule {
 			get { return _deleteRule; }
@@ -334,9 +326,7 @@ namespace System.Data {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("For updates, indicates what kind of cascading should take place across this relation.")]
-#endif
 		[DefaultValue (Rule.Cascade)]
 		public virtual Rule UpdateRule {
 			get { return _updateRule; }
@@ -344,18 +334,14 @@ namespace System.Data {
 		}
 
 		[DataCategory ("Data")]	
-#if !NET_2_0
 		[DataSysDescription ("Indicates the parent columns of this constraint.")]
-#endif
 		[ReadOnly (true)]
 		public virtual DataColumn[] RelatedColumns {
 			get { return _parentColumns; }
 		}
 
 		[DataCategory ("Data")]	
-#if !NET_2_0
 		[DataSysDescription ("Indicates the child table of this constraint.")]
-#endif
 		[ReadOnly (true)]
 		public virtual DataTable RelatedTable {
 			get {
@@ -368,9 +354,7 @@ namespace System.Data {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the table of this constraint.")]
-#endif
 		[ReadOnly (true)]
 		public override DataTable Table {
 			get {
diff --git a/mcs/class/System.Data/System.Data/IDataReader2.cs b/mcs/class/System.Data/System.Data/IDataReader2.cs
new file mode 100644
index 00000000000..42b12bef974
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataReader2.cs
@@ -0,0 +1,46 @@
+//
+// System.Data.IDataReader2.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0 || TARGET_JVM
+
+namespace System.Data {
+	public interface IDataReader2
+	{
+		#region Properties
+#if NET_2_0
+		bool HasRows { get; }
+#endif
+		#endregion // Properties
+	}
+}
+
+#endif
diff --git a/mcs/class/System.Data/System.Data/IDataRecord2.cs b/mcs/class/System.Data/System.Data/IDataRecord2.cs
new file mode 100644
index 00000000000..dad99921648
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataRecord2.cs
@@ -0,0 +1,57 @@
+//
+// System.Data.IDataReader2.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0 || TARGET_JVM
+
+namespace System.Data {
+	public interface IDataRecord2
+	{
+		#region Properties
+
+#if NET_2_0
+		int VisibleFieldCount { get; }
+#endif
+		#endregion // Properties
+
+		#region Methods
+#if NET_2_0
+		Type GetProviderSpecificFieldType (int i);
+		object GetProviderSpecificValue (int i);
+		int GetProviderSpecificValues (object[] values);
+#endif
+		#endregion // Methods
+	}
+}
+
+#endif
+
+
diff --git a/mcs/class/System.Data/System.Data/IDataSources.cs b/mcs/class/System.Data/System.Data/IDataSources.cs
new file mode 100644
index 00000000000..aa897d13de6
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataSources.cs
@@ -0,0 +1,57 @@
+//
+// System.Data.IDataSources.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface IDataSources
+	{
+		#region Properties
+
+		int Count { get; }
+		object this [string name] { get; }
+
+		#endregion // Properties
+
+		#region Methods
+
+		void Add (string name, IDbConnection connection);
+		void Add (string name, IDbTransaction transaction);
+		void Clear ();
+		bool Contains (string name);
+		void Remove (string name);
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs b/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs
new file mode 100644
index 00000000000..a05835d3a57
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs
@@ -0,0 +1,52 @@
+//
+// System.Data.IDataUpdatableRecord.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface IDataUpdatableRecord
+	{
+		#region Properties
+
+		bool Updatable { get; }
+
+		#endregion // Properties
+
+		#region Methods
+
+		int SetValues (object[] values);
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs b/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs
new file mode 100644
index 00000000000..66a411ffd78
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs
@@ -0,0 +1,49 @@
+//
+// System.Data.IDbAsyncCommand.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface IDbAsyncCommand
+	{
+		#region Methods
+
+		IAsyncResult BeginExecuteNonQuery (AsyncCallback callback, object stateObject);
+		IAsyncResult BeginExecuteReader (AsyncCallback callback, object stateObject, CommandBehavior behavior);
+		int EndExecuteNonQuery (IAsyncResult result);
+		IDataReader EndExecuteReader (IAsyncResult result);
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs b/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs
new file mode 100644
index 00000000000..fb1885ec8a6
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs
@@ -0,0 +1,47 @@
+//
+// System.Data.IDbAsyncConnection.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface IDbAsyncConnection
+	{
+		#region Methods
+
+		IAsyncResult BeginOpen (AsyncCallback callback, object stateObject);
+		void EndOpen (IAsyncResult result);
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/IDbExecutionContext.cs b/mcs/class/System.Data/System.Data/IDbExecutionContext.cs
new file mode 100644
index 00000000000..7be2995ef05
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbExecutionContext.cs
@@ -0,0 +1,67 @@
+//
+// System.Data.IDbExecutionContext.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface IDbExecutionContext
+	{
+		#region Properties
+
+		IDbConnection Connection { get; set; }
+		int ConnectionTimeOut { get; set; }
+		IDbTransaction Transaction { get; set; }
+
+		#endregion // Properties
+
+		#region Methods
+
+		IAsyncResult BeginExecuteNonQuery (AsyncCallback callback, object stateObject);
+		IAsyncResult BeginExecuteReader (AsyncCallback callback, object stateObject, CommandBehavior behavior);
+		IAsyncResult BeginExecuteScalar (AsyncCallback callback, object stateObject);
+
+		void Cancel ();
+
+		int EndExecuteNonQuery (IAsyncResult result);
+		IDataReader EndExecuteReader (IAsyncResult result);
+		object EndExecuteScalar (IAsyncResult result);
+
+		int ExecuteNonQuery ();
+		IDataReader ExecuteReader ();
+		IDataReader ExecuteReader (CommandBehavior behavior);
+		object ExecuteScalar ();
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/IGetTypedData.cs b/mcs/class/System.Data/System.Data/IGetTypedData.cs
new file mode 100644
index 00000000000..4e3457425c2
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IGetTypedData.cs
@@ -0,0 +1,63 @@
+//
+// System.Data.IGetTypedData.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface IGetTypedData
+	{
+		#region Methods
+
+		bool GetBoolean (int i);
+		byte GetByte (int i);
+		long GetBytes (int i, long fieldOffset, byte[] buffer, int bufferOffset, int length);
+		char GetChar (int i);
+		long GetChars (int i, long fieldOffset, char[] buffer, int bufferOffset, int length);
+		DateTime GetDateTime (int i);
+		decimal GetDecimal (int i);
+		double GetDouble (int i);
+		float GetFloat (int i);
+		Guid GetGuid (int i);
+		short GetInt16 (int i);
+		int GetInt32 (int i);
+		long GetInt64 (int i);
+		object GetObjectRef (int i);
+		string GetString (int i);
+		object GetValue (int i);
+		bool IsDBNull (int i);
+		bool IsSetAsDefault (int i);
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/ISetTypedData.cs b/mcs/class/System.Data/System.Data/ISetTypedData.cs
new file mode 100644
index 00000000000..a8465d8aec3
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ISetTypedData.cs
@@ -0,0 +1,61 @@
+//
+// System.Data.ISetTypedData.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2003
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public interface ISetTypedData
+	{
+		#region Methods
+
+		void SetBoolean (int i, bool value);
+		void SetByte (int i, byte value);
+		void SetBytes (int i, long fieldOffset, byte[] buffer, int bufferOffset, int length);
+		void SetChar (int i, char value);
+		void SetChars (int i, long fieldOffset, char[] buffer, int bufferOffset, int length);
+		void SetDateTime (int i, DateTime value);
+		void SetDecimal (int i, decimal value);
+		void SetDouble (int i, double value);
+		void SetFloat (int i, float value);
+		void SetGuid (int i, Guid value);
+		void SetInt16 (int i, short value);
+		void SetInt32 (int i, int value);
+		void SetInt64 (int i, long value);
+		void SetObjectRef (int i, object o);
+		void SetString (int i, string value);
+		void SetValue (int i, object value);
+
+		#endregion // Methods
+	}
+}
+
+#endif // NET_2_0
diff --git a/mcs/class/System.Data/System.Data/OperationAbortedException.cs b/mcs/class/System.Data/System.Data/OperationAbortedException.cs
index 382482b7460..dd4c073f932 100644
--- a/mcs/class/System.Data/System.Data/OperationAbortedException.cs
+++ b/mcs/class/System.Data/System.Data/OperationAbortedException.cs
@@ -36,8 +36,7 @@ using System.Globalization;
 using System.Runtime.Serialization;
 
 namespace System.Data {
-	[Serializable]
-	public sealed class OperationAbortedException : SystemException
+	public class OperationAbortedException : SystemException
 	{
 		#region Constructors
 
diff --git a/mcs/class/System.Data/System.Data/PropertyCollection.cs b/mcs/class/System.Data/System.Data/PropertyCollection.cs
index f90246b2eff..4a8467d4a29 100644
--- a/mcs/class/System.Data/System.Data/PropertyCollection.cs
+++ b/mcs/class/System.Data/System.Data/PropertyCollection.cs
@@ -43,9 +43,6 @@ namespace System.Data
 	/// DataColumn, DataSet, or DataTable class can
 	/// retrieve a PropertyCollection.
 	/// </summary>
-#if NET_2_0
-	[Serializable]
-#endif
 	public class PropertyCollection : Hashtable {
 		public PropertyCollection() {
 		}
diff --git a/mcs/class/System.Data/System.Data/RelatedDataView.cs b/mcs/class/System.Data/System.Data/RelatedDataView.cs
index 11cda548ec5..0ca2248d086 100644
--- a/mcs/class/System.Data/System.Data/RelatedDataView.cs
+++ b/mcs/class/System.Data/System.Data/RelatedDataView.cs
@@ -108,9 +108,9 @@ namespace System.Data
 			IExpression filter = base.FilterExpression;

 			return filter != null ? filter.DependsOn(other) : false;

 		}

-		

-		void IExpression.ResetExpression()
-		{
+

+		public void ResetExpression ()

+		{

 		}

 

 		#endregion

diff --git a/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs b/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs
index b366aab78e5..74413c33407 100644
--- a/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs
+++ b/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs
@@ -33,7 +33,7 @@
 #if NET_2_0
 
 namespace System.Data {
-	public sealed class StatementCompletedEventArgs : EventArgs
+	public class StatementCompletedEventArgs : EventArgs
 	{
 		#region Fields
 
diff --git a/mcs/class/System.Data/System.Data/UniqueConstraint.cs b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
index b9760ad4cb9..fb7c88b34ba 100644
--- a/mcs/class/System.Data/System.Data/UniqueConstraint.cs
+++ b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
@@ -43,9 +43,7 @@ namespace System.Data {
 	[Editor ("Microsoft.VSDesigner.Data.Design.UniqueConstraintEditor, " + Consts.AssemblyMicrosoft_VSDesigner,
 		 "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 	[DefaultProperty ("ConstraintName")]
-#if !NET_2_0
 	[Serializable]
-#endif
 	public class UniqueConstraint : Constraint 
 	{
 		private bool _isPrimaryKey = false;
@@ -309,18 +307,14 @@ namespace System.Data {
 		#region Properties
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the columns of this constraint.")]
-#endif
 		[ReadOnly (true)]
 		public virtual DataColumn[] Columns {
 			get { return _dataColumns; }
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates if this constraint is a primary key.")]
-#endif
 		public bool IsPrimaryKey {
 			get { 
 				if (Table == null || (!_belongsToCollection)) {
@@ -331,9 +325,7 @@ namespace System.Data {
 		}
 
 		[DataCategory ("Data")]
-#if !NET_2_0
 		[DataSysDescription ("Indicates the table of this constraint.")]
-#endif
 		[ReadOnly (true)]
 		public override DataTable Table {
 			get { return _dataTable; }
diff --git a/mcs/class/System.Data/System.Data/XmlConstants.cs b/mcs/class/System.Data/System.Data/XmlConstants.cs
index b4fdd903cc6..403caa3bfc5 100644
--- a/mcs/class/System.Data/System.Data/XmlConstants.cs
+++ b/mcs/class/System.Data/System.Data/XmlConstants.cs
@@ -94,7 +94,6 @@ internal class XmlConstants
 	public const string Locale = "Locale";
 	public const string Ordinal = "Ordinal";
 	public const string IsNested = "IsNested";
-	public const string ConstraintOnly = "ConstraintOnly";
 	public const string RelationName = "RelationName";
 	public const string ConstraintName = "ConstraintName";
 	public const string PrimaryKey = "PrimaryKey";
diff --git a/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs b/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
index 23c3e28e9e6..03c577da6fc 100644
--- a/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
+++ b/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
@@ -254,18 +254,16 @@ namespace System.Data
 		public readonly bool IsPrimaryKey;
 		public readonly string ReferName;
 		public readonly bool IsNested;
-		public readonly bool IsConstraintOnly;
 
-		public ConstraintStructure (string tname, string [] cols, bool [] isAttr, string cname, bool isPK, string refName, bool isNested, bool isConstraintOnly)
+		public ConstraintStructure (string tname, string [] cols, bool [] isAttr, string cname, bool isPK, string refName, bool isNested)
 		{
 			TableName = tname;
 			Columns = cols;
 			IsAttribute = isAttr;
-			ConstraintName = XmlConvert.DecodeName (cname);
+			ConstraintName = cname;
 			IsPrimaryKey = isPK;
 			ReferName = refName;
 			IsNested = isNested;
-			IsConstraintOnly = isConstraintOnly;
 		}
 	}
 
@@ -583,38 +581,20 @@ el.ElementType != schemaAnyType)
 		{
 			DataTable ptab = dataset.Tables [rs.ParentTableName];
 			DataTable ctab = dataset.Tables [rs.ChildTableName];
+			DataColumn pcol = ptab.Columns [rs.ParentColumnName];
+			DataColumn ccol = ctab.Columns [rs.ChildColumnName];
+
+			if (ccol == null) {
+				ccol = new DataColumn ();
+				ccol.ColumnName = pcol.ColumnName;
+				ccol.Namespace = String.Empty; // don't copy
+				ccol.ColumnMapping = MappingType.Hidden;
+				ccol.DataType = pcol.DataType;
+				ctab.Columns.Add (ccol);
+			}
 
-			DataRelation rel ;
 			string name = rs.ExplicitName != null ? rs.ExplicitName : XmlConvert.DecodeName (ptab.TableName) + '_' + XmlConvert.DecodeName (ctab.TableName);
-
-			// Annotation Relations belonging to a DataSet can contain multiple colnames
-			// in parentkey and childkey.
-			if (datasetElement != null) {
-				String[] pcolnames = rs.ParentColumnName.Split (null);
-				String[] ccolnames = rs.ChildColumnName.Split (null);
-
-				DataColumn[] pcol = new DataColumn [pcolnames.Length];
-				for (int i=0; i<pcol.Length; ++i)
-					pcol [i] = ptab.Columns [XmlConvert.DecodeName (pcolnames [i])];
-
-				DataColumn[] ccol = new DataColumn [ccolnames.Length];
-				for (int i=0; i < ccol.Length; ++i)
-					ccol [i] = ctab.Columns [XmlConvert.DecodeName (ccolnames [i])];
-
-				rel = new DataRelation (name, pcol, ccol, rs.CreateConstraint);
-			} else {
-				DataColumn pcol = ptab.Columns [XmlConvert.DecodeName (rs.ParentColumnName)];
-				DataColumn ccol = ctab.Columns [XmlConvert.DecodeName (rs.ChildColumnName)];
-				if (ccol == null) {
-					ccol = new DataColumn ();
-					ccol.ColumnName = pcol.ColumnName;
-					ccol.Namespace = String.Empty; // don't copy
-					ccol.ColumnMapping = MappingType.Hidden;
-					ccol.DataType = pcol.DataType;
-					ctab.Columns.Add (ccol);
-				}
-				rel = new DataRelation (name, pcol, ccol, rs.CreateConstraint);
-			}
+			DataRelation rel = new DataRelation (name, pcol, ccol, rs.CreateConstraint);
 			rel.Nested = rs.IsNested;
 			if (rs.CreateConstraint)
 				rel.ParentTable.PrimaryKey = rel.ParentColumns;
@@ -959,7 +939,7 @@ el.ElementType != schemaAnyType)
 			}
 			reservedConstraints.Add (ic,
 				new ConstraintStructure (tableName, cols,
-					isAttrSpec, constraintName, isPK, null, false, false));
+					isAttrSpec, constraintName, isPK, null, false));
 		}
 
 		private void ProcessSelfIdentity (ConstraintStructure c)
@@ -1018,7 +998,6 @@ el.ElementType != schemaAnyType)
 			}
 			string constraintName = keyref.Name;
 			bool isNested = false;
-			bool isConstraintOnly = false;
 			if (keyref.UnhandledAttributes != null) {
 				foreach (XmlAttribute attr in keyref.UnhandledAttributes) {
 					if (attr.NamespaceURI != XmlConstants.MsdataNamespace)
@@ -1031,17 +1010,13 @@ el.ElementType != schemaAnyType)
 						if (attr.Value == "true")
 							isNested = true;
 						break;
-					case XmlConstants.ConstraintOnly:
-						if (attr.Value == "true")
-							isConstraintOnly = true;
-						break;
 					}
 				}
 			}
 
 			reservedConstraints.Add (keyref, new ConstraintStructure (
 				tableName, cols, isAttrSpec, constraintName,
-				false, keyref.Refer.Name, isNested, isConstraintOnly));
+				false, keyref.Refer.Name, isNested));
 		}
 
 		private void ProcessRelationIdentity (XmlSchemaElement element, ConstraintStructure c)
@@ -1072,16 +1047,13 @@ el.ElementType != schemaAnyType)
 			// generate the FK.
 			ForeignKeyConstraint fkc = new ForeignKeyConstraint(c.ConstraintName, uniq.Columns, cols);
 			dt.Constraints.Add (fkc);
+			// generate the relation.
+			DataRelation rel = new DataRelation (c.ConstraintName, uniq.Columns, cols, false);
+			rel.Nested = c.IsNested;
+			rel.SetParentKeyConstraint (uniq);
+			rel.SetChildKeyConstraint (fkc);
 
-			if (!c.IsConstraintOnly) {
-				// generate the relation.
-				DataRelation rel = new DataRelation (c.ConstraintName, uniq.Columns, cols, false);
-				rel.Nested = c.IsNested;
-				rel.SetParentKeyConstraint (uniq);
-				rel.SetChildKeyConstraint (fkc);
-
-				dataset.Relations.Add (rel);
-			}
+			dataset.Relations.Add (rel);
 		}
 
 		// get the unique constraint for the relation.
@@ -1137,11 +1109,9 @@ el.ElementType != schemaAnyType)
 			string fkn = el.GetAttribute ("childkey", XmlConstants.MsdataNamespace);
 
 			RelationStructure rel = new RelationStructure ();
-			rel.ExplicitName = XmlConvert.DecodeName (name);
-			rel.ParentTableName = XmlConvert.DecodeName (ptn);
-			rel.ChildTableName = XmlConvert.DecodeName (ctn);
-			// ColumnNames will be decoded wherever they are used as they can
-			// contain 'space' separated list of column-names.
+			rel.ExplicitName = name;
+			rel.ParentTableName = ptn;
+			rel.ChildTableName = ctn;
 			rel.ParentColumnName = pkn;
 			rel.ChildColumnName = fkn;
 			rel.IsNested = nested;
diff --git a/mcs/class/System.Data/System.Data/XmlSchemaWriter.cs b/mcs/class/System.Data/System.Data/XmlSchemaWriter.cs
index b3f35248b87..6d11f041e70 100644
--- a/mcs/class/System.Data/System.Data/XmlSchemaWriter.cs
+++ b/mcs/class/System.Data/System.Data/XmlSchemaWriter.cs
@@ -78,8 +78,6 @@ namespace System.Data
 		ArrayList globalTypeTables = new ArrayList ();
 		Hashtable additionalNamespaces = new Hashtable ();
 
-		ArrayList annotation = new ArrayList ();
-
 		public string ConstraintPrefix {
 			get { return ds.Namespace != String.Empty ? XmlConstants.TnsPrefix + ':' : String.Empty; }
 		}
@@ -215,61 +213,9 @@ namespace System.Data
 			WriteConstraints (); // DataSet constraints
 
 			w.WriteEndElement (); // element
-
-			if (annotation.Count > 0) {
-				w.WriteStartElement ("xs", "annotation", xmlnsxs);
-				w.WriteStartElement ("xs", "appinfo", xmlnsxs);
-
-				foreach (object o in annotation) {
-					if (!(o is DataRelation))
-						continue;
-					WriteDataRelationAnnotation ((DataRelation)o);	
-				}
-				w.WriteEndElement ();
-				w.WriteEndElement ();
-			}
 		}
 
-		private void WriteDataRelationAnnotation (DataRelation rel) 
-		{
-			String colnames = String.Empty;
-			w.WriteStartElement (XmlConstants.MsdataPrefix, "Relationship",
-				 XmlConstants.MsdataNamespace);
-
-			w.WriteAttributeString ("name", XmlConvert.EncodeName (rel.RelationName));
-
-			w.WriteAttributeString (
-					XmlConstants.MsdataPrefix,
-					"parent",
-					XmlConstants.MsdataNamespace,
-					XmlConvert.EncodeLocalName (rel.ParentTable.TableName));
-
-			w.WriteAttributeString (
-					XmlConstants.MsdataPrefix,
-					"child",
-					XmlConstants.MsdataNamespace,
-					XmlConvert.EncodeLocalName (rel.ChildTable.TableName));
-
-			colnames = String.Empty;
-			foreach (DataColumn col in rel.ParentColumns)
-				colnames += XmlConvert.EncodeLocalName (col.ColumnName) + " ";
-			w.WriteAttributeString (
-					XmlConstants.MsdataPrefix,
-					"parentkey",
-					XmlConstants.MsdataNamespace,
-					colnames.TrimEnd ());
-
-			colnames = String.Empty;
-			foreach (DataColumn col in rel.ChildColumns)
-				colnames += XmlConvert.EncodeLocalName (col.ColumnName) + " ";
-			w.WriteAttributeString (
-					XmlConstants.MsdataPrefix,
-					"childkey",
-					XmlConstants.MsdataNamespace,
-					colnames.TrimEnd ());
-
-			w.WriteEndElement ();
-		}
+		// Relation based Constraints
 
 		private void WriteConstraints ()
 		{
@@ -280,30 +226,17 @@ namespace System.Data
 				foreach (Constraint c in table.Constraints) {
 					UniqueConstraint u =
 						c as UniqueConstraint;
-					if (u != null) {
+					if (u != null)
 						AddUniqueConstraints (u, names);
-						continue;
-					}
-
-					ForeignKeyConstraint fk = c as ForeignKeyConstraint;
-					if (fk != null && (relations == null || !(relations.Contains (fk.ConstraintName)))) {
-						DataRelation rel = new DataRelation (fk.ConstraintName,
-										fk.RelatedColumns, fk.Columns);
-						AddForeignKeys (rel, names, true);
-						continue;
-					}
 				}
 			}
 
 			// Add all foriegn key constraints.
 			if (relations != null)
-				foreach (DataRelation rel in relations) {
-					if (rel.ParentKeyConstraint == null || rel.ChildKeyConstraint == null) {
-						annotation.Add (rel);
-						continue;
-					}
-					AddForeignKeys (rel, names,false);
-				}
+				foreach (DataRelation rel in relations)
+					if (rel.ParentKeyConstraint != null &&
+						rel.ChildKeyConstraint != null)
+						AddForeignKeys (rel, names);
 		}
 
 		// Add unique constaraints to the schema.
@@ -321,7 +254,7 @@ namespace System.Data
 			string name;
 			if (!names.Contains (uniq.ConstraintName)) {
 				name = uniq.ConstraintName;
-				w.WriteAttributeString ("name", XmlConvert.EncodeName (name));
+				w.WriteAttributeString ("name", name);
 			}
 			// otherwise generate new constraint name for the
 			// XmlSchemaUnique element.
@@ -367,7 +300,7 @@ namespace System.Data
 		}
 
 		// Add the foriegn keys to the schema.
-		private void AddForeignKeys (DataRelation rel, ArrayList names, bool isConstraintOnly)
+		private void AddForeignKeys (DataRelation rel, ArrayList names)
 		{
 			// Do nothing if it contains hidden relation
 			foreach (DataColumn col in rel.ParentColumns)
@@ -380,20 +313,8 @@ namespace System.Data
 			w.WriteStartElement ("xs", "keyref", xmlnsxs);
 			w.WriteAttributeString ("name", XmlConvert.EncodeLocalName (rel.RelationName));
 
-			//ForeignKeyConstraint fkConst = rel.ChildKeyConstraint;
-			UniqueConstraint uqConst = null; 
-
-			if (isConstraintOnly) {
-				foreach (Constraint c in rel.ParentTable.Constraints) {
-					uqConst = c as UniqueConstraint;
-					if (uqConst == null)
-						continue;
-					if (uqConst.Columns == rel.ParentColumns)
-						break;
-				}
-			} 
-			else
-				uqConst = rel.ParentKeyConstraint;
+			ForeignKeyConstraint fkConst = rel.ChildKeyConstraint;
+			UniqueConstraint uqConst = rel.ParentKeyConstraint;
 
 			string concatName = XmlConvert.EncodeLocalName (rel.ParentTable.TableName) + "_" + uqConst.ConstraintName;
 			// first try to find the concatenated name. If we didn't find it - use constraint name.
@@ -409,12 +330,7 @@ namespace System.Data
 				w.WriteEndAttribute ();
 			}
 
-			if (isConstraintOnly)
-				w.WriteAttributeString ( XmlConstants.MsdataPrefix,
-					XmlConstants.ConstraintOnly,
-					XmlConstants.MsdataNamespace,
-					"true");
-			else if (rel.Nested)
+			if (rel.Nested)
 				w.WriteAttributeString (
 					XmlConstants.MsdataPrefix,
 					XmlConstants.IsNested,
diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog
index 5cfe29d57e1..d0d41be42a2 100644
--- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog
+++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-10  Senganal T  <tsenganal@novell.com>
-	
-	* DataReaderTest : Corrected a failing testcase.
-
 2006-01-27  Senganal T  <tsenganal@novell.com>
 	
 	* DataReaderTest : Corrected a failing testcase.
diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs
index a5b60dad368..7d29dcb77f0 100644
--- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs
@@ -183,7 +183,7 @@ namespace MonoTests.System.Data
 						Assert.Fail ("#2 No test data");
 					// for null value, length in bytes should return 0
 					if (reader.Read ()) 
-						Assert.AreEqual (0, reader.GetBytes (0, 0, null, 0, 0), 
+						Assert.AreEqual (-1, reader.GetBytes (0, 0, null, 0, 0), 
 								 "#3 on null value, it should return -1");
 					else
 						Assert.Fail ("#4 No test data");
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.J2EE.sln b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.J2EE.sln
deleted file mode 100755
index e78c94c7bc9..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.J2EE.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OleDb.Tests.J2EE", "System.Data.OleDb.Tests.J2EE.vmwcsproj", "{D5887372-DC7D-47E1-8CAA-B348643412ED}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Debug_Java = Debug_Java

-		Debug-Strong = Debug-Strong

-		Release = Release

-		Release_Java = Release_Java

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Debug.ActiveCfg = Debug|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Debug.Build.0 = Debug|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Debug_Java.Build.0 = Debug_Java|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Debug-Strong.ActiveCfg = Debug|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Debug-Strong.Build.0 = Debug|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Release.ActiveCfg = Release_Java|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Release.Build.0 = Release_Java|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Release_Java.ActiveCfg = Release_Java|.NET

-		{D5887372-DC7D-47E1-8CAA-B348643412ED}.Release_Java.Build.0 = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.ActiveCfg = Debug|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.Build.0 = Debug|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.Build.0 = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests.J2EE.vmwcsproj b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests.J2EE.vmwcsproj
deleted file mode 100755
index 6ba0757bc3f..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.Tests.J2EE.vmwcsproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{D5887372-DC7D-47E1-8CAA-B348643412ED}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OleDb.Tests" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OleDb.Tests" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="System.Data.OleDb.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\MonoTests.System.Data.Utils\DataProvider.cs" Link="..\System.Data.Test.Utils\DataProvider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\MonoTests.System.Data.Utils\GHTBase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_CommandText.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_CommandTimeout.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_CommandType.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_Connection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_Dispose.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_ExecuteNonQuery.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_ExecuteReader.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_ExecuteScalar.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_New.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_Parameters.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_Prepare.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommand\OleDbCommand_Transaction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbCommandBuilder\OleDbCommandBuilder_DeriveParameters_O.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\IDBConnection_For_OleDb.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_BeginTransaction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_ChangeDatabase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_Close.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_ConnectionString.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_ConnectionTimeout.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_CreateCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_Database.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_DataSource.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_Equals.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_GetOleDbSchemaTable.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_InfoMessage.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_New.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_Open.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_Provider.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_State.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbConnection\OleDbConnection_StateChange.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_AcceptChangesDuringFill.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_ContinueUpdateOnError.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_ctor_O.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_ctor_SS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_DeleteCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Dispose.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_1.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_2.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_3.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_Ds.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_Ds_Int_Int_Str.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_DsStr.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Fill_Dt.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_FillError.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_FillSchema_DS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_FillSchema_DSS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_FillSchema_DsSt.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_FillSchema_DtSch.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_GetFillParameters.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_InsertCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_MissingMappingAction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_MissingSchemaAction.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_RowUpdated.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_RowUpdating.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_SelectCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_TableMappings.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_ToString.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Update_Dr.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Update_Ds.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Update_DsStr.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_Update_Dt.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataAdapter\OleDbDataAdapter_UpdateCommand.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_Close.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_Depth.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetBoolean.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetByte_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetBytes_IIBII.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetChars.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetDataTypeName.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetDateTime.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetDecimal_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetDouble_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetFieldType.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetFloat_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetGuiid_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetInt16.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetInt32_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetInt64.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetName_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetOrdinal.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetSchemaTable.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetString_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetTimeSpan_I.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetValue.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_GetValues.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_HasRows.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_IsDBNull.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_Item.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_NextResult.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_Read.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbDataReader\OleDbDataReader_RecordsAffected.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbLiteral\OleDbLiteral.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameter\OleDbParameter_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameter\OleDbParameter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameter\OleDbParameter_ctor_SOIPBBBSDO.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameter\OleDbParameter_ctor_SOtype.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameter\OleDbParameter_ctor_SOtype_IS.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameter\OleDbParameter_ctor_SOtypeI.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameterCollection\OleDbParameterCollection_Add.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameterCollection\OleDbParameterCollection_Contains.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbParameterCollection\OleDbParameterCollection_Count.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbTransaction\OleDbTransaction_Begin.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbTransaction\OleDbTransaction_Commit.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbTransaction\OleDbTransaction_Connection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbTransaction\OleDbTransaction_ctor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbTransaction\OleDbTransaction_IsolationLevel.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbTransaction\OleDbTransaction_Rollback.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbType\OleDbType.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Data.OleDb.jvm\OleDbType\OleDbType_Date.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties REFS.JarPath.system="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.rt="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" project.JDKType="1.5.0_05"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\cygwin1\monobuild1\mcs\nunit20\nunit-console\bin\Debug_Java\nunit-console.exe" Prop2007="" Prop2008="" Prop2009="/wait C:\cygwin1\monobuild1\mcs\class\System.Data\Test\ProviderTests\bin\Debug\System.Data.OleDb.Tests.dll" Prop2010="C:\cygwin1\monobuild1\mcs\class\System.Data\Test\ProviderTests\bin\Debug" Prop2011="-1" Prop2012="-1" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.CreateDB.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.CreateDB.sql
deleted file mode 100755
index dca84a19713..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.CreateDB.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP DATABASE "GHTDB";
-CREATE DATABASE "GHTDB"
-  WITH OWNER = postgres
-       ENCODING = 'UNICODE'
-       TABLESPACE = pg_default;
-
-DROP DATABASE "GHTDBEX";
-CREATE DATABASE "GHTDBEX"
-  WITH OWNER = postgres
-       ENCODING = 'UNICODE'
-       TABLESPACE = pg_default;
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.MSSQL.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.MSSQL.sql
deleted file mode 100755
index 9335cc901c4..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.MSSQL.sql
+++ /dev/null
@@ -1,3465 +0,0 @@
-USE GHTDB
-
-SET IDENTITY_INSERT CATEGORIES ON
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (1, 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (3, 'Confections', 'Desserts, candies, and sweet breads' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (4, 'Dairy Products', 'Cheeses' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (5, 'Grains/Cereals', 'Breads, crackers, pasta, and cereal' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (6, 'Meat/Poultry', 'Prepared meats' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (7, 'Produce', 'Dried fruit and bean curd' ) 
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (8, 'Seafood', 'Seaweed and fish' ) 
-SET IDENTITY_INSERT CATEGORIES OFF
-GO
-
-
-INSERT INTO mainsoft.CATEGORIESNew (  CategoryName, Description ) VALUES ('Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) 
-INSERT INTO mainsoft.CATEGORIESNew (  CategoryName, Description ) VALUES ('Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) 
-
-INSERT INTO mainsoft.CATEGORIES (  CategoryID,CategoryName, Description,picture ) VALUES ('10','Beverages', 'Soft drinks, coffees, teas, beers, and ales',10 ) 
-INSERT INTO mainsoft.CATEGORIES (  CategoryID,CategoryName, Description,picture  ) VALUES ('20','Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings',20 ) 
-
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) 
-GO
-
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (1, 'Yavine', 'Oved', 'Sales Representative', 'Mr', '12/8/1948 12:00:00 AM', '5/1/1992 12:00:00 AM', '507 - 20th Ave. E.Apt. 2A', 'Seattle', 'WA', '98122', 'USA', '(206) 555-9857', '5467', 'Education includes a BA in psychology from Colorado State University in 1970.  She also completed "The Art of the Cold Call."  Nancy is a member of Toastmasters International.', 1, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (2, 'Fuller', 'Andrew', 'Vice President, Sales', 'Dr.', '2/19/1952 12:00:00 AM', '8/14/1992 12:00:00 AM', '908 W. Capital Way', 'Tacoma', 'WA', '98401', 'USA', '(206) 555-9482', '3457', 'Andrew received his BTS commercial in 1974 and a Ph.D. in international marketing from the University of Dallas in 1981.  He is fluent in French and Italian and reads German.  He joined the company as a sales representative, was promoted to sales manager in January 1992 and to vice president of sales in March 1993.  Andrew is a member of the Sales Management Roundtable, the Seattle Chamber of Commerce, and the Pacific Rim Importers Association.', 1, 'http://accweb/emmployees/fuller.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (3, 'Leverling', 'Janet', 'Sales Representative', 'Ms.', '8/30/1963 12:00:00 AM', '4/1/1992 12:00:00 AM', '722 Moss Bay Blvd.', 'Kirkland', 'WA', '98033', 'USA', '(206) 555-3412', '3355', 'Janet has a BS degree in chemistry from Boston College (1984).  She has also completed a certificate program in food retailing management.  Janet was hired as a sales associate in 1991 and promoted to sales representative in February 1992.', 2, 'http://accweb/emmployees/leverling.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (4, 'Peacock', 'Margaret', 'Sales Representative', 'Mrs.', '9/19/1937 12:00:00 AM', '5/3/1993 12:00:00 AM', '4110 Old Redmond Rd.', 'Redmond', 'WA', '98052', 'USA', '(206) 555-8122', '5176', 'Margaret holds a BA in English literature from Concordia College (1958) and an MA from the American Institute of Culinary Arts (1966).  She was assigned to the London office temporarily from July through November 1992.', 2, 'http://accweb/emmployees/peacock.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (5, 'Buchanan', 'Steven', 'Sales Manager', 'Mr.', '3/4/1955 12:00:00 AM', '10/17/1993 12:00:00 AM', '14 Garrett Hill', 'London', NULL, 'SW1 8JR', 'UK', '(71) 555-4848', '3453', 'Steven Buchanan graduated from St. Andrews University, Scotland, with a BSC degree in 1976.  Upon joining the company as a sales representative in 1992, he spent 6 months in an orientation program at the Seattle office and then returned to his permanent post in London.  He was promoted to sales manager in March 1993.  Mr. Buchanan has completed the courses "Successful Telemarketing" and "International Sales Management."  He is fluent in French.', 2, 'http://accweb/emmployees/buchanan.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (6, 'Suyama', 'Michael', 'Sales Representative', 'Mr.', '7/2/1963 12:00:00 AM', '10/17/1993 12:00:00 AM', 'Coventry HouseMiner Rd.', 'London', NULL, 'EC2 7JR', 'UK', '(71) 555-7773', '428', 'Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses "Multi-Cultural Selling" and "Time Management for the Sales Professional."  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.', 5, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (7, 'King', 'Robert', 'Sales Representative', 'Mr.', '5/29/1960 12:00:00 AM', '1/2/1994 12:00:00 AM', 'Edgeham HollowWinchester Way', 'London', NULL, 'RG1 9SP', 'UK', '(71) 555-5598', '465', 'Robert King served in the Peace Corps and traveled extensively before completing his degree in English at the University of Michigan in 1992, the year he joined the company.  After completing a course entitled "Selling in Europe," he was transferred to the London office in March 1993.', 5, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (8, 'Callahan', 'Laura', 'Inside Sales Coordinator', 'Ms.', '1/9/1958 12:00:00 AM', '3/5/1994 12:00:00 AM', '4726 - 11th Ave. N.E.', 'Seattle', 'WA', '98105', 'USA', '(206) 555-1189', '2344', 'Laura received a BA in psychology from the University of Washington.  She has also completed a course in business French.  She reads and writes French.', 2, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9, 'Dodsworth', 'Anne', 'Sales Representative', 'Ms.', '1/27/1966 12:00:00 AM', '11/15/1994 12:00:00 AM', '7 Houndstooth Rd.', 'London', NULL, 'WG2 7LT', 'UK', '(71) 555-4444', '452', 'Anne has a BA degree in English from St. Lawrence College.  She is fluent in French and German.', 5, 'http://accweb/emmployees/davolio.bmp' ) 
-GO
-
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (1, 'Eastern                                           ' ) 
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (2, 'Western                                           ' ) 
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (3, 'Northern                                          ' ) 
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (4, 'Southern                                          ' ) 
-GO
-
-INSERT INTO Territories Values ('01581','Westboro',1)
-INSERT INTO Territories Values ('01730','Bedford',1)
-INSERT INTO Territories Values ('01833','Georgetow',1)
-INSERT INTO Territories Values ('02116','Boston',1)
-INSERT INTO Territories Values ('02139','Cambridge',1)
-INSERT INTO Territories Values ('02184','Braintree',1)
-INSERT INTO Territories Values ('02903','Providence',1)
-INSERT INTO Territories Values ('03049','Hollis',3)
-INSERT INTO Territories Values ('03801','Portsmouth',3)
-INSERT INTO Territories Values ('06897','Wilton',1)
-INSERT INTO Territories Values ('07960','Morristown',1)
-INSERT INTO Territories Values ('08837','Edison',1)
-INSERT INTO Territories Values ('10019','New York',1)
-INSERT INTO Territories Values ('10038','New York',1)
-INSERT INTO Territories Values ('11747','Mellvile',1)
-INSERT INTO Territories Values ('14450','Fairport',1)
-INSERT INTO Territories Values ('19428','Philadelphia',3)
-INSERT INTO Territories Values ('19713','Neward',1)
-INSERT INTO Territories Values ('20852','Rockville',1)
-INSERT INTO Territories Values ('27403','Greensboro',1)
-INSERT INTO Territories Values ('27511','Cary',1)
-INSERT INTO Territories Values ('29202','Columbia',4)
-INSERT INTO Territories Values ('30346','Atlanta',4)
-INSERT INTO Territories Values ('31406','Savannah',4)
-INSERT INTO Territories Values ('32859','Orlando',4)
-INSERT INTO Territories Values ('33607','Tampa',4)
-INSERT INTO Territories Values ('40222','Louisville',1)
-INSERT INTO Territories Values ('44122','Beachwood',3)
-INSERT INTO Territories Values ('45839','Findlay',3)
-INSERT INTO Territories Values ('48075','Southfield',3)
-INSERT INTO Territories Values ('48084','Troy',3)
-INSERT INTO Territories Values ('48304','Bloomfield Hills',3)
-INSERT INTO Territories Values ('53404','Racine',3)
-INSERT INTO Territories Values ('55113','Roseville',3)
-INSERT INTO Territories Values ('55439','Minneapolis',3)
-INSERT INTO Territories Values ('60179','Hoffman Estates',2)
-INSERT INTO Territories Values ('60601','Chicago',2)
-INSERT INTO Territories Values ('72716','Bentonville',4)
-INSERT INTO Territories Values ('75234','Dallas',4)
-INSERT INTO Territories Values ('78759','Austin',4)
-INSERT INTO Territories Values ('80202','Denver',2)
-INSERT INTO Territories Values ('80909','Colorado Springs',2)
-INSERT INTO Territories Values ('85014','Phoenix',2)
-INSERT INTO Territories Values ('85251','Scottsdale',2)
-INSERT INTO Territories Values ('90405','Santa Monica',2)
-INSERT INTO Territories Values ('94025','Menlo Park',2)
-INSERT INTO Territories Values ('94105','San Francisco',2)
-INSERT INTO Territories Values ('95008','Campbell',2)
-INSERT INTO Territories Values ('95054','Santa Clara',2)
-INSERT INTO Territories Values ('95060','Santa Cruz',2)
-INSERT INTO Territories Values ('98004','Bellevue',2)
-INSERT INTO Territories Values ('98052','Redmond',2)
-INSERT INTO Territories Values ('98104','Seattle',2)
-GO
-
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '06897' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '19713' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01581' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01730' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01833' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02116' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02139' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02184' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '40222' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '30346' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '31406' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '32859' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '33607' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '20852' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27403' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27511' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '02903' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '07960' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '08837' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10019' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10038' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '11747' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '14450' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85014' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85251' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98004' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98052' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98104' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60179' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60601' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80202' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80909' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '90405' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94025' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94105' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95008' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95054' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95060' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '19428' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '44122' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '45839' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '53404' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03049' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03801' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48075' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48084' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48304' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55113' ) 
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55439' ) 
-GO
-
-SET IDENTITY_INSERT SHIPPERS ON
-INSERT INTO SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (1, 'Speedy Express', '(503) 555-9831' ) 
-INSERT INTO SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (2, 'Comp2', '(503) 555-3199' ) 
-INSERT INTO SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (3, 'Federal Shipping', '(503) 555-9931' ) 
-SET IDENTITY_INSERT SHIPPERS OFF
-GO
-
-SET IDENTITY_INSERT ORDERS ON
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10248, 'VINET', 5, '7/4/1996 12:00:00 AM', '8/1/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 3, 255.39, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10249, 'TOMSP', 6, '7/5/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/10/1996 12:00:00 AM', 1, 11.61, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10250, 'HANAR', 4, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/12/1996 12:00:00 AM', 2, 65.83, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10251, 'VICTE', 3, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 1, 41.34, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10252, 'SUPRD', 4, '7/9/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', '7/11/1996 12:00:00 AM', 2, 51.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10253, 'HANAR', 3, '7/10/1996 12:00:00 AM', '7/24/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 2, 58.17, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10254, 'CHOPS', 5, '7/11/1996 12:00:00 AM', '8/8/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 2, 22.98, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10255, 'RICSU', 9, '7/12/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 3, 148.33, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10256, 'WELLI', 3, '7/15/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', '7/17/1996 12:00:00 AM', 2, 13.97, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10257, 'HILAA', 4, '7/16/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', '7/22/1996 12:00:00 AM', 3, 81.91, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10258, 'ERNSH', 1, '7/17/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 1, 140.51, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10259, 'CENTC', 4, '7/18/1996 12:00:00 AM', '8/15/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 3.25, 'Centro comercial Moctezuma', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10260, 'OTTIK', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/29/1996 12:00:00 AM', 1, 55.09, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10261, 'QUEDE', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/30/1996 12:00:00 AM', 2, 3.05, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10262, 'RATTC', 8, '7/22/1996 12:00:00 AM', '8/19/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 48.29, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10263, 'ERNSH', 9, '7/23/1996 12:00:00 AM', '8/20/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 146.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10264, 'FOLKO', 6, '7/24/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 3.67, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10265, 'BLONP', 2, '7/25/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 1, 55.28, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10266, 'WARTH', 3, '7/26/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 25.73, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10267, 'FRANK', 4, '7/29/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 1, 208.58, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10268, 'GROSR', 8, '7/30/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 3, 66.29, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10269, 'WHITC', 5, '7/31/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 4.56, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10270, 'WARTH', 1, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 1, 136.54, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10271, 'SPLIR', 6, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 2, 4.54, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10272, 'RATTC', 6, '8/2/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 2, 98.03, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10273, 'QUICK', 3, '8/5/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 3, 76.07, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10274, 'VINET', 6, '8/6/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 1, 6.01, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10275, 'MAGAA', 1, '8/7/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 26.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10276, 'TORTU', 8, '8/8/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', 3, 13.84, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10277, 'MORGK', 2, '8/9/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', 3, 125.77, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10278, 'BERGS', 8, '8/12/1996 12:00:00 AM', '9/9/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 92.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10279, 'LEHMS', 8, '8/13/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 25.83, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10280, 'BERGS', 2, '8/14/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', 1, 8.98, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10281, 'ROMEY', 4, '8/14/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 2.94, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10282, 'ROMEY', 4, '8/15/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 12.69, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10283, 'LILAS', 3, '8/16/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 84.81, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10284, 'LEHMS', 4, '8/19/1996 12:00:00 AM', '9/16/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', 1, 76.56, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10285, 'QUICK', 1, '8/20/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', 2, 76.83, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10286, 'QUICK', 8, '8/21/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 3, 229.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10287, 'RICAR', 8, '8/22/1996 12:00:00 AM', '9/19/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 12.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10288, 'REGGC', 4, '8/23/1996 12:00:00 AM', '9/20/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 7.45, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10289, 'BSBEV', 7, '8/26/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 22.77, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10290, 'COMMI', 8, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 79.7, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10291, 'QUEDE', 6, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', 2, 6.4, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10292, 'TRADH', 1, '8/28/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', 2, 1.35, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10293, 'TORTU', 1, '8/29/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 3, 21.18, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10294, 'RATTC', 4, '8/30/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', '9/5/1996 12:00:00 AM', 2, 147.26, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10295, 'VINET', 2, '9/2/1996 12:00:00 AM', '9/30/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 1.15, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10296, 'LILAS', 6, '9/3/1996 12:00:00 AM', '10/1/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 1, 0.12, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10297, 'BLONP', 5, '9/4/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 5.74, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10298, 'HUNGO', 6, '9/5/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 2, 168.22, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10299, 'RICAR', 4, '9/6/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', 2, 29.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10300, 'MAGAA', 2, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 17.68, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10301, 'WANDK', 8, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 45.08, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10302, 'SUPRD', 4, '9/10/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 2, 6.27, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10303, 'GODOS', 7, '9/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 107.83, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10304, 'TORTU', 1, '9/12/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 63.79, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10305, 'OLDWO', 8, '9/13/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 3, 257.62, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10306, 'ROMEY', 1, '9/16/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', 3, 7.56, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10307, 'LONEP', 2, '9/17/1996 12:00:00 AM', '10/15/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', 2, 0.56, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10308, 'ANATR', 7, '9/18/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', 3, 1.61, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10309, 'HUNGO', 3, '9/19/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 1, 47.3, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10310, 'THEBI', 8, '9/20/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', 2, 17.52, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10311, 'DUMON', 1, '9/20/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', 3, 24.69, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10312, 'WANDK', 2, '9/23/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 40.26, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10313, 'QUICK', 2, '9/24/1996 12:00:00 AM', '10/22/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 1.96, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10314, 'RATTC', 1, '9/25/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 74.16, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10315, 'ISLAT', 4, '9/26/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 41.76, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10316, 'RATTC', 1, '9/27/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', 3, 150.15, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10317, 'LONEP', 6, '9/30/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 12.69, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10318, 'ISLAT', 8, '10/1/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 4.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10319, 'TORTU', 7, '10/2/1996 12:00:00 AM', '10/30/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 3, 64.5, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10320, 'WARTH', 5, '10/3/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', 3, 34.57, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10321, 'ISLAT', 3, '10/3/1996 12:00:00 AM', '10/31/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 2, 3.43, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10322, 'PERIC', 7, '10/4/1996 12:00:00 AM', '11/1/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 3, 0.4, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10323, 'KOENE', 4, '10/7/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 4.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10324, 'SAVEA', 9, '10/8/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 214.27, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10325, 'KOENE', 1, '10/9/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 3, 64.86, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10326, 'BOLID', 4, '10/10/1996 12:00:00 AM', '11/7/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 2, 77.92, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10327, 'FOLKO', 2, '10/11/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 63.36, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10328, 'FURIB', 4, '10/14/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', 3, 87.03, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10329, 'SPLIR', 4, '10/15/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 2, 191.67, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10330, 'LILAS', 3, '10/16/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 1, 12.75, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10331, 'BONAP', 9, '10/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 1, 10.19, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10332, 'MEREP', 3, '10/17/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 2, 52.84, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10333, 'WARTH', 5, '10/18/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 3, 0.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10334, 'VICTE', 8, '10/21/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 2, 8.56, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10335, 'HUNGO', 7, '10/22/1996 12:00:00 AM', '11/19/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', 2, 42.11, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10336, 'PRINI', 7, '10/23/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 2, 15.51, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10337, 'FRANK', 4, '10/24/1996 12:00:00 AM', '11/21/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 108.26, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10338, 'OLDWO', 4, '10/25/1996 12:00:00 AM', '11/22/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 84.21, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10339, 'MEREP', 2, '10/28/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 15.66, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10340, 'BONAP', 1, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 166.31, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10341, 'SIMOB', 7, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 3, 26.78, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10342, 'FRANK', 4, '10/30/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 54.83, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10343, 'LEHMS', 4, '10/31/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '11/6/1996 12:00:00 AM', 1, 110.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10344, 'WHITC', 4, '11/1/1996 12:00:00 AM', '11/29/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 2, 23.29, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10345, 'QUICK', 2, '11/4/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', 2, 249.06, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10346, 'RATTC', 3, '11/5/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 142.08, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10347, 'FAMIA', 4, '11/6/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 3.1, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10348, 'WANDK', 4, '11/7/1996 12:00:00 AM', '12/5/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 2, 0.78, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10349, 'SPLIR', 7, '11/8/1996 12:00:00 AM', '12/6/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 1, 8.63, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10350, 'LAMAI', 6, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 64.19, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10351, 'ERNSH', 1, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 162.33, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10352, 'FURIB', 3, '11/12/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', 3, 1.3, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10353, 'PICCO', 7, '11/13/1996 12:00:00 AM', '12/11/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', 3, 360.63, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10354, 'PERIC', 8, '11/14/1996 12:00:00 AM', '12/12/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 3, 53.8, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10355, 'AROUT', 6, '11/15/1996 12:00:00 AM', '12/13/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 41.95, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10356, 'WANDK', 6, '11/18/1996 12:00:00 AM', '12/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 2, 36.71, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10357, 'LILAS', 1, '11/19/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 34.88, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10358, 'LAMAI', 5, '11/20/1996 12:00:00 AM', '12/18/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 1, 19.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10359, 'SEVES', 5, '11/21/1996 12:00:00 AM', '12/19/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', 3, 288.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10360, 'BLONP', 4, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 131.7, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10361, 'QUICK', 1, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 183.17, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10362, 'BONAP', 3, '11/25/1996 12:00:00 AM', '12/23/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', 1, 96.04, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10363, 'DRACD', 4, '11/26/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', 3, 30.54, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10364, 'EASTC', 1, '11/26/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/4/1996 12:00:00 AM', 1, 71.97, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10365, 'ANTON', 3, '11/27/1996 12:00:00 AM', '12/25/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 22, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10366, 'GALED', 8, '11/28/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/30/1996 12:00:00 AM', 2, 10.14, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10367, 'VAFFE', 7, '11/28/1996 12:00:00 AM', '12/26/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 13.55, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10368, 'ERNSH', 2, '11/29/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 101.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10369, 'SPLIR', 8, '12/2/1996 12:00:00 AM', '12/30/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 195.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10370, 'CHOPS', 6, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', 2, 1.17, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10371, 'LAMAI', 1, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', 1, 0.45, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10372, 'QUEEN', 5, '12/4/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 890.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10373, 'HUNGO', 4, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/11/1996 12:00:00 AM', 3, 124.12, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10374, 'WOLZA', 1, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 3, 3.94, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10375, 'HUNGC', 3, '12/6/1996 12:00:00 AM', '1/3/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 20.12, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10376, 'MEREP', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 2, 20.39, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10377, 'SEVES', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 22.21, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10378, 'FOLKO', 5, '12/10/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/19/1996 12:00:00 AM', 3, 5.44, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10379, 'QUEDE', 2, '12/11/1996 12:00:00 AM', '1/8/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 1, 45.03, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10380, 'HUNGO', 8, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 35.03, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10381, 'LILAS', 3, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 7.99, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10382, 'ERNSH', 4, '12/13/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '12/16/1996 12:00:00 AM', 1, 94.77, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10383, 'AROUT', 8, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/18/1996 12:00:00 AM', 3, 34.24, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10384, 'BERGS', 3, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 3, 168.64, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10385, 'SPLIR', 1, '12/17/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '12/23/1996 12:00:00 AM', 2, 30.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10386, 'FAMIA', 9, '12/18/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/25/1996 12:00:00 AM', 3, 13.99, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10387, 'SANTG', 1, '12/18/1996 12:00:00 AM', '1/15/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 2, 93.63, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10388, 'SEVES', 2, '12/19/1996 12:00:00 AM', '1/16/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 1, 34.86, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10389, 'BOTTM', 4, '12/20/1996 12:00:00 AM', '1/17/1997 12:00:00 AM', '12/24/1996 12:00:00 AM', 2, 47.42, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10390, 'ERNSH', 6, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/26/1996 12:00:00 AM', 1, 126.38, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10391, 'DRACD', 3, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/31/1996 12:00:00 AM', 3, 5.45, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10392, 'PICCO', 2, '12/24/1996 12:00:00 AM', '1/21/1997 12:00:00 AM', '1/1/1997 12:00:00 AM', 3, 122.46, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10393, 'SAVEA', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 126.56, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10394, 'HUNGC', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 30.34, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10395, 'HILAA', 6, '12/26/1996 12:00:00 AM', '1/23/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 1, 184.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10396, 'FRANK', 1, '12/27/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '1/6/1997 12:00:00 AM', 3, 135.35, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10397, 'PRINI', 5, '12/27/1996 12:00:00 AM', '1/24/1997 12:00:00 AM', '1/2/1997 12:00:00 AM', 1, 60.26, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10398, 'SAVEA', 2, '12/30/1996 12:00:00 AM', '1/27/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 89.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10399, 'VAFFE', 8, '12/31/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 3, 27.36, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10400, 'EASTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 83.93, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10401, 'RATTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 1, 12.51, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10402, 'ERNSH', 8, '1/2/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 2, 67.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10403, 'ERNSH', 4, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 73.79, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10404, 'MAGAA', 2, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 1, 155.97, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10405, 'LINOD', 1, '1/6/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', '1/22/1997 12:00:00 AM', 1, 34.82, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10406, 'QUEEN', 7, '1/7/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/13/1997 12:00:00 AM', 1, 108.04, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10407, 'OTTIK', 2, '1/7/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 91.48, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10408, 'FOLIG', 8, '1/8/1997 12:00:00 AM', '2/5/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 11.26, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10409, 'OCEAN', 3, '1/9/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 29.83, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10410, 'BOTTM', 3, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 3, 2.4, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10411, 'BOTTM', 9, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/21/1997 12:00:00 AM', 3, 23.65, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10412, 'WARTH', 8, '1/13/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 2, 3.77, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10413, 'LAMAI', 3, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 2, 95.66, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10414, 'FAMIA', 2, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/17/1997 12:00:00 AM', 3, 21.48, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10415, 'HUNGC', 3, '1/15/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 0.2, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10416, 'WARTH', 8, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 3, 22.72, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10417, 'SIMOB', 4, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/28/1997 12:00:00 AM', 3, 70.29, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10418, 'QUICK', 4, '1/17/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 17.55, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10419, 'RICSU', 4, '1/20/1997 12:00:00 AM', '2/17/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 137.35, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10420, 'WELLI', 3, '1/21/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 44.12, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10421, 'QUEDE', 8, '1/21/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 99.23, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10422, 'FRANS', 2, '1/22/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', 1, 3.02, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10423, 'GOURL', 6, '1/23/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 3, 24.5, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10424, 'MEREP', 7, '1/23/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 2, 370.61, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10425, 'LAMAI', 6, '1/24/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 7.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10426, 'GALED', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', 1, 18.69, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10427, 'PICCO', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 31.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10428, 'REGGC', 7, '1/28/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', 1, 11.09, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10429, 'HUNGO', 3, '1/29/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 56.63, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10430, 'ERNSH', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', 1, 458.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10431, 'BOTTM', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 44.17, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10432, 'SPLIR', 3, '1/31/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 4.34, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10433, 'PRINI', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 73.83, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10434, 'FOLKO', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', 2, 17.92, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10435, 'CONSH', 8, '2/4/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 9.21, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10436, 'BLONP', 3, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', 2, 156.66, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10437, 'WARTH', 8, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', 1, 19.97, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10438, 'TOMSP', 3, '2/6/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 8.24, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10439, 'MEREP', 6, '2/7/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', 3, 4.07, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10440, 'SAVEA', 4, '2/10/1997 12:00:00 AM', '3/10/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 86.53, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10441, 'OLDWO', 3, '2/10/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 73.02, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10442, 'ERNSH', 3, '2/11/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', 2, 47.94, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10443, 'REGGC', 8, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 1, 13.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10444, 'BERGS', 3, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', 3, 3.5, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10445, 'BERGS', 3, '2/13/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', 1, 9.3, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10446, 'TOMSP', 6, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', 1, 14.68, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10447, 'RICAR', 4, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', 2, 68.66, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10448, 'RANCH', 4, '2/17/1997 12:00:00 AM', '3/17/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 2, 38.82, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10449, 'BLONP', 3, '2/18/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/27/1997 12:00:00 AM', 2, 53.3, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10450, 'VICTE', 8, '2/19/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 7.23, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10451, 'QUICK', 4, '2/19/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 189.09, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10452, 'SAVEA', 8, '2/20/1997 12:00:00 AM', '3/20/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 1, 140.26, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10453, 'AROUT', 1, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 2, 25.36, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10454, 'LAMAI', 4, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', 3, 2.74, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10455, 'WARTH', 8, '2/24/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 180.45, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10456, 'KOENE', 8, '2/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 8.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10457, 'KOENE', 2, '2/25/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 11.57, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10458, 'SUPRD', 7, '2/26/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 147.06, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10459, 'VICTE', 4, '2/27/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 25.09, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10460, 'FOLKO', 8, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 16.27, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10461, 'LILAS', 1, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', 3, 148.61, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10462, 'CONSH', 2, '3/3/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 1, 6.17, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10463, 'SUPRD', 5, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', 3, 14.78, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10464, 'FURIB', 4, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 89, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10465, 'VAFFE', 1, '3/5/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 3, 145.04, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10466, 'COMMI', 4, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', 1, 11.93, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10467, 'MAGAA', 8, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 4.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10468, 'KOENE', 3, '3/7/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 44.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10469, 'WHITC', 1, '3/10/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 1, 60.18, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10470, 'BONAP', 4, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 64.56, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10471, 'BSBEV', 2, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 3, 45.59, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10472, 'SEVES', 8, '3/12/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', 1, 4.2, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10473, 'ISLAT', 1, '3/13/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 16.37, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10474, 'PERIC', 5, '3/13/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 2, 83.49, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10475, 'SUPRD', 9, '3/14/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', 1, 68.52, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10476, 'HILAA', 8, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 3, 4.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10477, 'PRINI', 5, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 13.02, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10478, 'VICTE', 2, '3/18/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', 3, 4.81, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10479, 'RATTC', 3, '3/19/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 708.95, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10480, 'FOLIG', 6, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 2, 1.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10481, 'RICAR', 8, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 64.33, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10482, 'LAZYK', 1, '3/21/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 7.48, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10483, 'WHITC', 7, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', 2, 15.28, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10484, 'BSBEV', 3, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', 3, 6.88, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10485, 'LINOD', 4, '3/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', 2, 64.45, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10486, 'HILAA', 1, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 30.53, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10487, 'QUEEN', 2, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', 2, 71.07, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10488, 'FRANK', 8, '3/27/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 4.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10489, 'PICCO', 6, '3/28/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 5.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10490, 'HILAA', 7, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', 2, 210.19, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10491, 'FURIB', 8, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', 3, 16.96, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10492, 'BOTTM', 3, '4/1/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 1, 62.89, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10493, 'LAMAI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 10.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10494, 'COMMI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 65.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10495, 'LAUGB', 3, '4/3/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 3, 4.65, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10496, 'TRADH', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 2, 46.77, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10497, 'LEHMS', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 1, 36.21, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10498, 'HILAA', 8, '4/7/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 2, 29.75, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10499, 'LILAS', 4, '4/8/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 102.02, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10500, 'LAMAI', 6, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', 1, 42.68, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10501, 'BLAUS', 9, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 3, 8.85, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10502, 'PERIC', 2, '4/10/1997 12:00:00 AM', '5/8/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 69.32, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10503, 'HUNGO', 6, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 16.74, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10504, 'WHITC', 4, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', 3, 59.13, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10505, 'MEREP', 3, '4/14/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 7.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10506, 'KOENE', 9, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 21.19, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10507, 'ANTON', 7, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '4/22/1997 12:00:00 AM', 1, 47.45, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10508, 'OTTIK', 1, '4/16/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', 2, 4.99, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10509, 'BLAUS', 4, '4/17/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 0.15, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10510, 'SAVEA', 6, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 3, 367.63, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10511, 'BONAP', 4, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 350.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10512, 'FAMIA', 7, '4/21/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', 2, 3.53, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10513, 'WANDK', 7, '4/22/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 1, 105.65, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10514, 'ERNSH', 3, '4/22/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 2, 789.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10515, 'QUICK', 2, '4/23/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 1, 204.47, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10516, 'HUNGO', 2, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 62.78, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10517, 'NORTS', 3, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 3, 32.07, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10518, 'TORTU', 4, '4/25/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', 2, 218.15, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10519, 'CHOPS', 6, '4/28/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 91.76, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10520, 'SANTG', 7, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 1, 13.37, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10521, 'CACTU', 8, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 17.22, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10522, 'LEHMS', 4, '4/30/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', 1, 45.33, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10523, 'SEVES', 7, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 2, 77.63, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10524, 'BERGS', 1, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 2, 244.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10525, 'BONAP', 1, '5/2/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 11.06, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10526, 'WARTH', 4, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', 2, 58.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10527, 'QUICK', 7, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 1, 41.9, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10528, 'GREAL', 6, '5/6/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 3.35, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10529, 'MAISD', 5, '5/7/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 66.69, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10530, 'PICCO', 3, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 2, 339.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10531, 'OCEAN', 7, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 8.12, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10532, 'EASTC', 7, '5/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 3, 74.46, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10533, 'FOLKO', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', 1, 188.04, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10534, 'LEHMS', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', 2, 27.94, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10535, 'ANTON', 4, '5/13/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/21/1997 12:00:00 AM', 1, 15.64, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10536, 'LEHMS', 3, '5/14/1997 12:00:00 AM', '6/11/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 58.88, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10537, 'RICSU', 1, '5/14/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 78.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10538, 'BSBEV', 9, '5/15/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 3, 4.87, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10539, 'BSBEV', 6, '5/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 3, 12.36, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10540, 'QUICK', 3, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 3, 1007.64, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10541, 'HANAR', 2, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', 1, 68.65, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10542, 'KOENE', 1, '5/20/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', 3, 10.95, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10543, 'LILAS', 8, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 48.17, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10544, 'LONEP', 4, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 24.91, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10545, 'LAZYK', 8, '5/22/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', 2, 11.92, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10546, 'VICTE', 1, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', 3, 194.72, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10547, 'SEVES', 3, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 178.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10548, 'TOMSP', 3, '5/26/1997 12:00:00 AM', '6/23/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 1.43, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10549, 'QUICK', 5, '5/27/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 171.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10550, 'GODOS', 7, '5/28/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 4.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10551, 'FURIB', 4, '5/28/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 72.95, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10552, 'HILAA', 2, '5/29/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 1, 83.22, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10553, 'WARTH', 2, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', 2, 149.49, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10554, 'OTTIK', 4, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 3, 120.97, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10555, 'SAVEA', 6, '6/2/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', 3, 252.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10556, 'SIMOB', 2, '6/3/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 9.8, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10557, 'LEHMS', 9, '6/3/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 96.72, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10558, 'AROUT', 1, '6/4/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', 2, 72.97, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10559, 'BLONP', 6, '6/5/1997 12:00:00 AM', '7/3/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 8.05, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10560, 'FRANK', 8, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 1, 36.65, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10561, 'FOLKO', 2, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 2, 242.21, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10562, 'REGGC', 1, '6/9/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', 1, 22.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10563, 'RICAR', 2, '6/10/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '6/24/1997 12:00:00 AM', 2, 60.43, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10564, 'RATTC', 4, '6/10/1997 12:00:00 AM', '7/8/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', 3, 13.75, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10565, 'MEREP', 8, '6/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 2, 7.15, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10566, 'BLONP', 9, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 1, 88.4, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10567, 'HUNGO', 1, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', 1, 33.97, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10568, 'GALED', 3, '6/13/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 3, 6.54, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10569, 'RATTC', 5, '6/16/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', 1, 58.98, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10570, 'MEREP', 3, '6/17/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', 3, 188.99, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10571, 'ERNSH', 8, '6/17/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 3, 26.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10572, 'BERGS', 3, '6/18/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', 2, 116.43, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10573, 'ANTON', 7, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', 3, 84.84, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10574, 'TRAIH', 4, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 37.6, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10575, 'MORGK', 5, '6/20/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 1, 127.34, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10576, 'TORTU', 3, '6/23/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 3, 18.56, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10577, 'TRAIH', 9, '6/23/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 25.41, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10578, 'BSBEV', 4, '6/24/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 3, 29.6, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10579, 'LETSS', 1, '6/25/1997 12:00:00 AM', '7/23/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 13.73, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10580, 'OTTIK', 4, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/1/1997 12:00:00 AM', 3, 75.89, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10581, 'FAMIA', 3, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', 1, 3.01, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10582, 'BLAUS', 3, '6/27/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 27.71, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10583, 'WARTH', 2, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 7.28, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10584, 'BLONP', 4, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 1, 59.14, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10585, 'WELLI', 7, '7/1/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 1, 13.41, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10586, 'REGGC', 9, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 0.48, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10587, 'QUEDE', 1, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 62.52, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10588, 'QUICK', 2, '7/3/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 3, 194.67, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10589, 'GREAL', 8, '7/4/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 4.42, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10590, 'MEREP', 4, '7/7/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 3, 44.77, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10591, 'VAFFE', 1, '7/7/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 55.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10592, 'LEHMS', 3, '7/8/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 32.1, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10593, 'LEHMS', 7, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', 2, 174.2, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10594, 'OLDWO', 3, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 2, 5.24, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10595, 'ERNSH', 2, '7/10/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 1, 96.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10596, 'WHITC', 8, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 1, 16.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10597, 'PICCO', 7, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 35.12, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10598, 'RATTC', 1, '7/14/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 44.42, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10599, 'BSBEV', 6, '7/15/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 3, 29.98, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10600, 'HUNGC', 4, '7/16/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 1, 45.13, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10601, 'HILAA', 7, '7/16/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 1, 58.3, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10602, 'VAFFE', 8, '7/17/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 2, 2.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10603, 'SAVEA', 8, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 2, 48.77, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10604, 'FURIB', 1, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 1, 7.46, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10605, 'MEREP', 1, '7/21/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 2, 379.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10606, 'TRADH', 4, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', 3, 79.4, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10607, 'SAVEA', 5, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 1, 200.24, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10608, 'TOMSP', 4, '7/23/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 27.79, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10609, 'DUMON', 7, '7/24/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', 2, 1.85, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10610, 'LAMAI', 8, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 1, 26.78, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10611, 'WOLZA', 6, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 80.65, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10612, 'SAVEA', 1, '7/28/1997 12:00:00 AM', '8/25/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 544.08, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10613, 'HILAA', 4, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 8.11, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10614, 'BLAUS', 8, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 3, 1.93, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10615, 'WILMK', 2, '7/30/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 3, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10616, 'GREAL', 1, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', 2, 116.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10617, 'GREAL', 4, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', 2, 18.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10618, 'MEREP', 1, '8/1/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 1, 154.68, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10619, 'MEREP', 3, '8/4/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', 3, 91.05, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10620, 'LAUGB', 2, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 3, 0.94, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10621, 'ISLAT', 4, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 2, 23.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10622, 'RICAR', 4, '8/6/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 3, 50.97, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10623, 'FRANK', 8, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 2, 97.18, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10624, 'THECR', 4, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 94.8, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10625, 'ANATR', 3, '8/8/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 1, 43.9, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10626, 'BERGS', 1, '8/11/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 2, 138.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10627, 'SAVEA', 8, '8/11/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 107.46, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10628, 'BLONP', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 30.36, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10629, 'GODOS', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 85.46, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10630, 'KOENE', 1, '8/13/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 32.35, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10631, 'LAMAI', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', 1, 0.87, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10632, 'WANDK', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 1, 41.38, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10633, 'ERNSH', 7, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', 3, 477.9, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10634, 'FOLIG', 4, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 487.38, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10635, 'MAGAA', 8, '8/18/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 47.46, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10636, 'WARTH', 4, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 1.15, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10637, 'QUEEN', 6, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 201.29, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10638, 'LINOD', 3, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 1, 158.44, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10639, 'SANTG', 7, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', 3, 38.64, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10640, 'WANDK', 4, '8/21/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', 1, 23.55, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10641, 'HILAA', 4, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 2, 179.61, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10642, 'SIMOB', 7, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', 3, 41.89, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10643, 'ALFKI', 6, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 29.46, 'Alfreds Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10644, 'WELLI', 3, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 2, 0.14, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10645, 'HANAR', 4, '8/26/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 12.41, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10646, 'HUNGO', 9, '8/27/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 142.33, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10647, 'QUEDE', 4, '8/27/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 2, 45.54, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10648, 'RICAR', 5, '8/28/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', 2, 14.25, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10649, 'MAISD', 5, '8/28/1997 12:00:00 AM', '9/25/1997 12:00:00 AM', '8/29/1997 12:00:00 AM', 3, 6.2, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10650, 'FAMIA', 5, '8/29/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 176.81, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10651, 'WANDK', 8, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 20.6, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10652, 'GOURL', 4, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 2, 7.14, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10653, 'FRANK', 1, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 93.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10654, 'BERGS', 5, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 1, 55.26, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10655, 'REGGC', 1, '9/3/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 4.41, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10656, 'GREAL', 6, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 1, 57.15, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10657, 'SAVEA', 2, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 2, 352.69, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10658, 'QUICK', 4, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 1, 364.15, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10659, 'QUEEN', 7, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 2, 105.81, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10660, 'HUNGC', 8, '9/8/1997 12:00:00 AM', '10/6/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 1, 111.29, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10661, 'HUNGO', 7, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 3, 17.55, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10662, 'LONEP', 3, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 2, 1.28, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10663, 'BONAP', 2, '9/10/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 113.15, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10664, 'FURIB', 1, '9/10/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 3, 1.27, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10665, 'LONEP', 1, '9/11/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', 2, 26.31, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10666, 'RICSU', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 2, 232.42, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10667, 'ERNSH', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 78.09, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10668, 'WANDK', 1, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 47.22, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10669, 'SIMOB', 2, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 1, 24.39, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10670, 'FRANK', 4, '9/16/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 1, 203.48, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10671, 'FRANR', 1, '9/17/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', 1, 30.34, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10672, 'BERGS', 9, '9/17/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 2, 95.75, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10673, 'WILMK', 2, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 22.76, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10674, 'ISLAT', 4, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 2, 0.9, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10675, 'FRANK', 5, '9/19/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 31.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10676, 'TORTU', 2, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', 2, 2.01, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10677, 'ANTON', 1, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 3, 4.03, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10678, 'SAVEA', 7, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 3, 388.98, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10679, 'BLONP', 8, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 27.94, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10680, 'OLDWO', 1, '9/24/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 1, 26.61, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10681, 'GREAL', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 76.13, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10682, 'ANTON', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 2, 36.13, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10683, 'DUMON', 2, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 1, 4.4, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10684, 'OTTIK', 3, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 1, 145.63, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10685, 'GOURL', 4, '9/29/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 33.75, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10686, 'PICCO', 2, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', 1, 96.5, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10687, 'HUNGO', 9, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', 2, 296.43, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10688, 'VAFFE', 4, '10/1/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 299.09, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10689, 'BERGS', 1, '10/1/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 13.42, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10690, 'HANAR', 1, '10/2/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 1, 15.8, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10691, 'QUICK', 2, '10/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', 2, 810.05, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10692, 'ALFKI', 4, '10/3/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 2, 61.02, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10693, 'WHITC', 3, '10/6/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', 3, 139.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10694, 'QUICK', 8, '10/6/1997 12:00:00 AM', '11/3/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', 3, 398.36, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10695, 'WILMK', 7, '10/7/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 16.72, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10696, 'WHITC', 8, '10/8/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 3, 102.55, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10697, 'LINOD', 3, '10/8/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 45.52, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10698, 'ERNSH', 4, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', 1, 272.47, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10699, 'MORGK', 3, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 3, 0.58, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10700, 'SAVEA', 3, '10/10/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 1, 65.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10701, 'HUNGO', 6, '10/13/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 3, 220.31, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10702, 'ALFKI', 4, '10/13/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 1, 23.94, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10703, 'FOLKO', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', 2, 152.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10704, 'QUEEN', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 4.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10705, 'HILAA', 9, '10/15/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 3.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10706, 'OLDWO', 8, '10/16/1997 12:00:00 AM', '11/13/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 3, 135.63, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10707, 'AROUT', 4, '10/16/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 3, 21.74, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10708, 'THEBI', 6, '10/17/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 2.96, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10709, 'GOURL', 1, '10/17/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '11/20/1997 12:00:00 AM', 3, 210.8, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10710, 'FRANS', 1, '10/20/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 1, 4.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10711, 'SAVEA', 5, '10/21/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 52.41, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10712, 'HUNGO', 3, '10/21/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 1, 89.93, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10713, 'SAVEA', 1, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', 1, 167.05, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10714, 'SAVEA', 5, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 3, 24.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10715, 'BONAP', 3, '10/23/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 1, 63.2, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10716, 'RANCH', 4, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 2, 22.57, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10717, 'FRANK', 1, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 59.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10718, 'KOENE', 1, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 3, 170.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10719, 'LETSS', 8, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 51.44, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10720, 'QUEDE', 8, '10/28/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 9.53, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10721, 'QUICK', 5, '10/29/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 3, 48.92, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10722, 'SAVEA', 8, '10/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/4/1997 12:00:00 AM', 1, 74.58, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10723, 'WHITC', 3, '10/30/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 1, 21.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10724, 'MEREP', 8, '10/30/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 57.75, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10725, 'FAMIA', 4, '10/31/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 3, 10.83, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10726, 'EASTC', 4, '11/3/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 16.56, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10727, 'REGGC', 2, '11/3/1997 12:00:00 AM', '12/1/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 89.9, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10728, 'QUEEN', 4, '11/4/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', 2, 58.33, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10729, 'LINOD', 8, '11/4/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 3, 141.06, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10730, 'BONAP', 5, '11/5/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 20.12, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10731, 'CHOPS', 7, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 96.65, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10732, 'BONAP', 3, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 16.97, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10733, 'BERGS', 1, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/10/1997 12:00:00 AM', 3, 110.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10734, 'GOURL', 2, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', 3, 1.63, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10735, 'LETSS', 6, '11/10/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 45.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10736, 'HUNGO', 9, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 44.1, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10737, 'VINET', 2, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 7.79, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10738, 'SPECD', 2, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 1, 2.91, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10739, 'VINET', 3, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', 3, 11.08, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10740, 'WHITC', 4, '11/13/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 2, 81.88, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10741, 'AROUT', 4, '11/14/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 10.96, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10742, 'BOTTM', 3, '11/14/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 243.73, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10743, 'AROUT', 1, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10744, 'VAFFE', 6, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 69.19, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10745, 'QUICK', 9, '11/18/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 3.52, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10746, 'CHOPS', 1, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 3, 31.43, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10747, 'PICCO', 6, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', 1, 117.33, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10748, 'SAVEA', 3, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 1, 232.55, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10749, 'ISLAT', 4, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 61.53, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10750, 'WARTH', 9, '11/21/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 79.3, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10751, 'RICSU', 3, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', 3, 130.79, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10752, 'NORTS', 2, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 3, 1.39, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10753, 'FRANS', 3, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 7.7, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10754, 'MAGAA', 6, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 3, 2.38, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10755, 'BONAP', 4, '11/26/1997 12:00:00 AM', '12/24/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 2, 16.71, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10756, 'SPLIR', 8, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', 2, 73.21, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10757, 'SAVEA', 6, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', 1, 8.19, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10758, 'RICSU', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', 3, 138.17, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10759, 'ANATR', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 3, 11.99, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10760, 'MAISD', 4, '12/1/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', 1, 155.64, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10761, 'RATTC', 5, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 2, 18.66, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10762, 'FOLKO', 3, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 328.74, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10763, 'FOLIG', 3, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 37.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10764, 'ERNSH', 6, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 145.45, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10765, 'QUICK', 3, '12/4/1997 12:00:00 AM', '1/1/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 3, 42.74, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10766, 'OTTIK', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 157.55, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10767, 'SUPRD', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 3, 1.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10768, 'AROUT', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 2, 146.32, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10769, 'VAFFE', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 65.06, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10770, 'HANAR', 8, '12/9/1997 12:00:00 AM', '1/6/1998 12:00:00 AM', '12/17/1997 12:00:00 AM', 3, 5.32, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10771, 'ERNSH', 9, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 11.19, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10772, 'LEHMS', 3, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 91.28, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10773, 'ERNSH', 1, '12/11/1997 12:00:00 AM', '1/8/1998 12:00:00 AM', '12/16/1997 12:00:00 AM', 3, 96.43, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10774, 'FOLKO', 4, '12/11/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 48.2, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10775, 'THECR', 7, '12/12/1997 12:00:00 AM', '1/9/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 20.25, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10776, 'ERNSH', 1, '12/15/1997 12:00:00 AM', '1/12/1998 12:00:00 AM', '12/18/1997 12:00:00 AM', 3, 351.53, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10777, 'GOURL', 7, '12/15/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 3.01, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10778, 'BERGS', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 1, 6.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10779, 'MORGK', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 2, 58.13, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10780, 'LILAS', 2, '12/16/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', 1, 42.13, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10781, 'WARTH', 2, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 3, 73.16, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10782, 'CACTU', 9, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 1.1, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10783, 'HANAR', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 124.98, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10784, 'MAGAA', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 70.09, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10785, 'GROSR', 1, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 3, 1.51, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10786, 'QUEEN', 8, '12/19/1997 12:00:00 AM', '1/16/1998 12:00:00 AM', '12/23/1997 12:00:00 AM', 1, 110.87, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10787, 'LAMAI', 2, '12/19/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 249.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10788, 'QUICK', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 42.7, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10789, 'FOLIG', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 100.6, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10790, 'GOURL', 6, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 28.23, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10791, 'FRANK', 6, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/1/1998 12:00:00 AM', 2, 16.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10792, 'WOLZA', 1, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 3, 23.79, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10793, 'AROUT', 3, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 3, 4.52, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10794, 'QUEDE', 6, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 1, 21.49, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10795, 'ERNSH', 8, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', 2, 126.66, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10796, 'HILAA', 3, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 26.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10797, 'DRACD', 7, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 33.35, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10798, 'ISLAT', 2, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 1, 2.33, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10799, 'KOENE', 9, '12/26/1997 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 30.76, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10800, 'SEVES', 1, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 137.44, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10801, 'BOLID', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 97.09, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10802, 'SIMOB', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 257.26, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10803, 'WELLI', 4, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/6/1998 12:00:00 AM', 1, 55.23, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10804, 'SEVES', 6, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 2, 27.33, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10805, 'THEBI', 2, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 237.34, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10806, 'VICTE', 3, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 22.11, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10807, 'FRANS', 4, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.36, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10808, 'OLDWO', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 45.53, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10809, 'WELLI', 7, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 1, 4.87, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10810, 'LAUGB', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 3, 4.33, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10811, 'LINOD', 8, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 1, 31.22, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10812, 'REGGC', 5, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 1, 59.78, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10813, 'RICAR', 1, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 1, 47.38, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10814, 'VICTE', 3, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 130.94, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10815, 'SAVEA', 2, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 14.62, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10816, 'GREAL', 4, '1/6/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 2, 719.78, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10817, 'KOENE', 3, '1/6/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 306.07, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10818, 'MAGAA', 7, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 3, 65.48, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10819, 'CACTU', 2, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 19.76, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10820, 'RATTC', 3, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 37.52, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10821, 'SPLIR', 1, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/15/1998 12:00:00 AM', 1, 36.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10822, 'TRAIH', 6, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 7, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10823, 'LILAS', 5, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 163.97, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10824, 'FOLKO', 8, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.23, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10825, 'DRACD', 1, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 79.25, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10826, 'BLONP', 6, '1/12/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 1, 7.09, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10827, 'BONAP', 1, '1/12/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 63.54, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10828, 'RANCH', 9, '1/13/1998 12:00:00 AM', '1/27/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 90.85, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10829, 'ISLAT', 9, '1/13/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 1, 154.72, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10830, 'TRADH', 4, '1/13/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 81.83, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10831, 'SANTG', 3, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 72.19, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10832, 'LAMAI', 2, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 43.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10833, 'OTTIK', 6, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 71.49, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10834, 'TRADH', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 3, 29.78, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10835, 'ALFKI', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 3, 69.53, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10836, 'ERNSH', 7, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 1, 411.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10837, 'BERGS', 9, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 13.32, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10838, 'LINOD', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 59.28, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10839, 'TRADH', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/22/1998 12:00:00 AM', 3, 35.43, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10840, 'LINOD', 4, '1/19/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 2, 2.71, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10841, 'SUPRD', 5, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 424.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10842, 'TORTU', 1, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 3, 54.42, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10843, 'VICTE', 4, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 9.26, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10844, 'PICCO', 8, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 25.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10845, 'QUICK', 8, '1/21/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 212.98, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10846, 'SUPRD', 2, '1/22/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 56.46, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10847, 'SAVEA', 4, '1/22/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 3, 487.57, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10848, 'CONSH', 7, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 38.24, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10849, 'KOENE', 9, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 2, 0.56, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10850, 'VICTE', 1, '1/23/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 49.19, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10851, 'RICAR', 5, '1/26/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 1, 160.55, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10852, 'RATTC', 8, '1/26/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 174.05, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10853, 'BLAUS', 9, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 2, 53.83, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10854, 'ERNSH', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', 2, 100.22, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10855, 'OLDWO', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 170.97, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10856, 'ANTON', 3, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 58.43, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10857, 'BERGS', 8, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 188.85, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10858, 'LACOR', 2, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 1, 52.51, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10859, 'FRANK', 1, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 76.1, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10860, 'FRANR', 3, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 3, 19.26, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10861, 'WHITC', 4, '1/30/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 14.93, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10862, 'LEHMS', 8, '1/30/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 53.23, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10863, 'HILAA', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 30.26, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10864, 'AROUT', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 3.04, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10865, 'QUICK', 2, '2/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 348.14, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10866, 'BERGS', 5, '2/3/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 109.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10867, 'LONEP', 6, '2/3/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 1, 1.93, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10868, 'QUEEN', 7, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 191.27, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10869, 'SEVES', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 143.28, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10870, 'WOLZA', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 3, 12.04, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10871, 'BONAP', 9, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 112.27, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10872, 'GODOS', 5, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 175.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10873, 'WILMK', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 0.82, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10874, 'GODOS', 5, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 2, 19.58, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10875, 'BERGS', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 2, 32.37, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10876, 'BONAP', 7, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 60.42, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10877, 'RICAR', 1, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 1, 38.06, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10878, 'QUICK', 4, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 46.69, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10879, 'WILMK', 3, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 8.5, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10880, 'FOLKO', 7, '2/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 88.01, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10881, 'CACTU', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 2.84, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10882, 'SAVEA', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 23.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10883, 'LONEP', 8, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 0.53, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10884, 'LETSS', 4, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 2, 90.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10885, 'SUPRD', 6, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 3, 5.64, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10886, 'HANAR', 1, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 4.99, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10887, 'GALED', 8, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 3, 1.25, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10888, 'GODOS', 1, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 51.87, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10889, 'RATTC', 9, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 3, 280.61, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10890, 'DUMON', 7, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 32.76, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10891, 'LEHMS', 7, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 20.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10892, 'MAISD', 4, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 120.27, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10893, 'KOENE', 9, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 2, 77.78, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10894, 'SAVEA', 1, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 1, 116.13, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10895, 'ERNSH', 3, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 1, 162.75, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10896, 'MAISD', 7, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 32.45, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10897, 'HUNGO', 3, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', 2, 603.54, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10898, 'OCEAN', 4, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 1.27, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10899, 'LILAS', 5, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 3, 1.21, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10900, 'WELLI', 1, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 1.66, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10901, 'HILAA', 4, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 1, 62.09, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10902, 'FOLKO', 1, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 1, 44.15, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10903, 'HANAR', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 36.71, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10904, 'WHITC', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 162.95, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10905, 'WELLI', 9, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 13.72, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10906, 'WOLZA', 4, '2/25/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 3, 26.29, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10907, 'SPECD', 6, '2/25/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 9.19, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10908, 'REGGC', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 32.96, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10909, 'SANTG', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', 2, 53.05, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10910, 'WILMK', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 38.11, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10911, 'GODOS', 3, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 1, 38.19, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10912, 'HUNGO', 2, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 580.91, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10913, 'QUEEN', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 1, 33.05, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10914, 'QUEEN', 6, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 21.19, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10915, 'TORTU', 2, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 2, 3.51, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10916, 'RANCH', 1, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 63.77, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10917, 'ROMEY', 4, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 2, 8.29, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10918, 'BOTTM', 3, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 48.83, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10919, 'LINOD', 2, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 19.8, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10920, 'AROUT', 4, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 29.61, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10921, 'VAFFE', 1, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 1, 176.48, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10922, 'HANAR', 5, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 3, 62.74, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10923, 'LAMAI', 7, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 68.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10924, 'BERGS', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 2, 151.52, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10925, 'HANAR', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 1, 2.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10926, 'ANATR', 4, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 39.92, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10927, 'LACOR', 4, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 19.79, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10928, 'GALED', 1, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 1.36, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10929, 'FRANK', 6, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 1, 33.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10930, 'SUPRD', 4, '3/6/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 15.55, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10931, 'RICSU', 4, '3/6/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 13.6, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10932, 'BONAP', 8, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 134.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10933, 'ISLAT', 6, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 3, 54.15, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10934, 'LEHMS', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 3, 32.01, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10935, 'WELLI', 4, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 47.59, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10936, 'GREAL', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 33.68, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10937, 'CACTU', 7, '3/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 31.51, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10938, 'QUICK', 3, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 31.89, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10939, 'MAGAA', 2, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 2, 76.33, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10940, 'BONAP', 8, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 3, 19.77, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10941, 'SAVEA', 7, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 400.81, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10942, 'REGGC', 9, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 17.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10943, 'BSBEV', 4, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 2.17, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10944, 'BOTTM', 6, '3/12/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 52.92, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10945, 'MORGK', 4, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 10.22, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10946, 'VAFFE', 1, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 27.2, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10947, 'BSBEV', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 3.26, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10948, 'GODOS', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 3, 23.39, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10949, 'BOTTM', 2, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', 3, 74.44, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10950, 'MAGAA', 1, '3/16/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 2.5, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10951, 'RICSU', 9, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 2, 30.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10952, 'ALFKI', 1, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 40.42, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10953, 'AROUT', 9, '3/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10954, 'LINOD', 5, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 1, 27.91, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10955, 'FOLKO', 8, '3/17/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 3.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10956, 'BLAUS', 6, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 44.65, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10957, 'HILAA', 8, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 105.36, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10958, 'OCEAN', 7, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 49.56, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10959, 'GOURL', 6, '3/18/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 4.98, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10960, 'HILAA', 3, '3/19/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 2.08, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10961, 'QUEEN', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 1, 104.47, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10962, 'QUICK', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 275.79, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10963, 'FURIB', 9, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 3, 2.7, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10964, 'SPECD', 3, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 2, 87.38, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10965, 'OLDWO', 6, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 3, 144.38, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10966, 'CHOPS', 4, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 27.19, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10967, 'TOMSP', 2, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 62.22, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10968, 'ERNSH', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', 3, 74.6, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10969, 'COMMI', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 2, 0.21, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10970, 'BOLID', 9, '3/24/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 1, 16.16, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10971, 'FRANR', 2, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 121.82, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10972, 'LACOR', 4, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 2, 0.02, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10973, 'LACOR', 6, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 15.17, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10974, 'SPLIR', 3, '3/25/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 12.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10975, 'BOTTM', 1, '3/25/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 32.27, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10976, 'HILAA', 1, '3/25/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 1, 37.97, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10977, 'FOLKO', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 208.5, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10978, 'MAISD', 9, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 2, 32.82, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10979, 'ERNSH', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', 2, 353.07, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10980, 'FOLKO', 4, '3/27/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 1, 1.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10981, 'HANAR', 1, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 193.37, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10982, 'BOTTM', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 14.01, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10983, 'SAVEA', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 2, 657.54, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10984, 'SAVEA', 1, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 211.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10985, 'HUNGO', 2, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 91.51, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10986, 'OCEAN', 8, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 217.86, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10987, 'EASTC', 8, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 1, 185.48, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10988, 'RATTC', 3, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 61.14, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10989, 'QUEDE', 2, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 34.76, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10990, 'ERNSH', 2, '4/1/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 3, 117.61, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10991, 'QUICK', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 1, 38.51, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10992, 'THEBI', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 4.27, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10993, 'FOLKO', 7, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 8.81, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10994, 'VAFFE', 2, '4/2/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', 3, 65.53, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10995, 'PERIC', 1, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 3, 46, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10996, 'QUICK', 4, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 1.12, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10997, 'LILAS', 8, '4/3/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 73.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10998, 'WOLZA', 8, '4/3/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 2, 20.31, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10999, 'OTTIK', 6, '4/3/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 96.35, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11000, 'RATTC', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 3, 55.12, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11001, 'FOLKO', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 2, 197.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11002, 'SAVEA', 4, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 1, 141.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11003, 'THECR', 3, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 3, 14.91, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11004, 'MAISD', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 44.84, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11005, 'WILMK', 2, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11006, 'GREAL', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 2, 25.19, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11007, 'PRINI', 8, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 202.24, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11008, 'ERNSH', 7, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', NULL, 3, 79.46, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11009, 'GODOS', 2, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 59.11, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11010, 'REGGC', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 28.71, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11011, 'ALFKI', 3, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 1, 1.21, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11012, 'FRANK', 1, '4/9/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 3, 242.95, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11013, 'ROMEY', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 32.99, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11014, 'LINOD', 2, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 3, 23.6, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11015, 'SANTG', 2, '4/10/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 4.62, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11016, 'AROUT', 9, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 33.8, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11017, 'ERNSH', 9, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 754.26, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11018, 'LONEP', 4, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 11.65, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11019, 'RANCH', 6, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', NULL, 3, 3.17, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11020, 'OTTIK', 2, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 43.3, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11021, 'QUICK', 3, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 1, 297.18, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11022, 'HANAR', 9, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 6.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11023, 'BSBEV', 1, '4/14/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 123.83, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11024, 'EASTC', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 74.36, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11025, 'WARTH', 6, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 3, 29.17, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11026, 'FRANS', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 1, 47.09, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11027, 'BOTTM', 1, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 52.52, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11028, 'KOENE', 2, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 1, 29.59, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11029, 'CHOPS', 4, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 47.84, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11030, 'SAVEA', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 2, 830.75, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11031, 'SAVEA', 6, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 227.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11032, 'WHITC', 2, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 606.19, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11033, 'RICSU', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 84.74, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11034, 'OLDWO', 8, '4/20/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 40.32, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11035, 'SUPRD', 2, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 0.17, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11036, 'DRACD', 8, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 3, 149.47, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11037, 'GODOS', 7, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 3.2, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11038, 'SUPRD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 2, 29.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11039, 'LINOD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', NULL, 2, 65, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11040, 'GREAL', 4, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', NULL, 3, 18.84, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11041, 'CHOPS', 3, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 2, 48.22, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11042, 'COMMI', 2, '4/22/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 29.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11043, 'SPECD', 5, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 8.8, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11044, 'WOLZA', 4, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 8.72, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11045, 'BOTTM', 6, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', NULL, 2, 70.58, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11046, 'WANDK', 8, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 71.64, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11047, 'EASTC', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 46.62, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11048, 'BOTTM', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 3, 24.12, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11049, 'GOURL', 3, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 8.34, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11050, 'FOLKO', 8, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 59.41, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11051, 'LAMAI', 7, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', NULL, 3, 2.79, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11052, 'HANAR', 3, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 67.26, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11053, 'PICCO', 2, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 53.05, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11054, 'CACTU', 8, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', NULL, 1, 0.33, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11055, 'HILAA', 7, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 120.92, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11056, 'EASTC', 8, '4/28/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 2, 278.96, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11057, 'NORTS', 3, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 4.13, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11058, 'BLAUS', 9, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', NULL, 3, 31.14, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11059, 'RICAR', 2, '4/29/1998 12:00:00 AM', '6/10/1998 12:00:00 AM', NULL, 2, 85.8, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11060, 'FRANS', 2, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 10.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11061, 'GREAL', 4, '4/30/1998 12:00:00 AM', '6/11/1998 12:00:00 AM', NULL, 3, 14.01, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11062, 'REGGC', 4, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', NULL, 2, 29.93, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11063, 'HUNGO', 3, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 81.73, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11064, 'SAVEA', 1, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 30.09, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11065, 'LILAS', 8, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', NULL, 1, 12.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11066, 'WHITC', 7, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 44.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11067, 'DRACD', 1, '5/4/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 7.98, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11068, 'QUEEN', 8, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', NULL, 2, 81.75, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11069, 'TORTU', 1, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 15.67, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11070, 'LEHMS', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 136, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11071, 'LILAS', 1, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 0.93, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11072, 'ERNSH', 4, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 258.64, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11073, 'PERIC', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 24.95, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11074, 'SIMOB', 7, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 18.44, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11075, 'RICSU', 8, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 6.19, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11076, 'BONAP', 4, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 38.28, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11077, 'RATTC', 1, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 8.53, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-SET IDENTITY_INSERT ORDERS OFF
-GO
-
-SET IDENTITY_INSERT SUPPLIERS ON
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (1, 'Exotic Liquids', 'Charlotte Cooper', 'Purchasing Manager', '49 Gilbert St.', 'London', NULL, 'EC1 4SD', 'UK', '(171) 555-2222', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (2, 'New Orleans Cajun Delights', 'Shelley Burke', 'Order Administrator', 'P.O. Box 78934', 'New Orleans', 'LA', '70117', 'USA', '(100) 555-4822', NULL, '#CAJUN.HTM#' ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (3, 'Grandma Kelly''s Homestead', 'Regina Murphy', 'Sales Representative', '707 Oxford Rd.', 'Ann Arbor', 'MI', '48104', 'USA', '(313) 555-5735', '(313) 555-3349', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (4, 'Tokyo Traders', 'Yoshi Nagase', 'Marketing Manager', '9-8 Sekimai Musashino-shi', 'Tokyo', NULL, '100', 'Japan', '(03) 3555-5011', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (5, 'Cooperativa de Quesos ''Las Cabras''', 'Antonio del Valle Saavedra', 'Export Administrator', 'Calle del Rosal 4', 'Oviedo', 'Asturias', '33007', 'Spain', '(98) 598 76 54', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (6, 'Mayumi''s', 'Mayumi Ohno', 'Marketing Representative', '92 Setsuko Chuo-ku', 'Osaka', NULL, '545', 'Japan', '(06) 431-7877', NULL, 'Mayumi''s (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/mayumi.htm#' ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (7, 'Pavlova, Ltd.', 'Ian Devling', 'Marketing Manager', '74 Rose St. Moonie Ponds', 'Melbourne', 'Victoria', '3058', 'Australia', '(03) 444-2343', '(03) 444-6588', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (8, 'Specialty Biscuits, Ltd.', 'Peter Wilson', 'Sales Representative', '29 King''s Way', 'Manchester', NULL, 'M14 GSD', 'UK', '(161) 555-4448', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (9, 'PB Kn�ckebr�d AB', 'Lars Peterson', 'Sales Agent', 'Kaloadagatan 13', 'G�teborg', NULL, 'S-345 67', 'Sweden', '031-987 65 43', '031-987 65 91', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (10, 'Refrescos Americanas LTDA', 'Carlos Diaz', 'Marketing Manager', 'Av. das Americanas 12.890', 'Sao Paulo', NULL, '5442', 'Brazil', '(11) 555 4640', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (11, 'Heli S��waren GmbH & Co. KG', 'Petra Winkler', 'Sales Manager', 'Tiergartenstra�e 5', 'Berlin', NULL, '10785', 'Germany', '(010) 9984510', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (12, 'Plutzer Lebensmittelgro�m�rkte AG', 'Martin Bein', 'International Marketing Mgr.', 'Bogenallee 51', 'Frankfurt', NULL, '60439', 'Germany', '(069) 992755', NULL, 'Plutzer (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/plutzer.htm#' ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (13, 'Nord-Ost-Fisch Handelsgesellschaft mbH', 'Sven Petersen', 'Coordinator Foreign Markets', 'Frahmredder 112a', 'Cuxhaven', NULL, '27478', 'Germany', '(04721) 8713', '(04721) 8714', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (14, 'Formaggi Fortini s.r.l.', 'Elio Rossi', 'Sales Representative', 'Viale Dante, 75', 'Ravenna', NULL, '48100', 'Italy', '(0544) 60323', '(0544) 60603', '#FORMAGGI.HTM#' ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (15, 'Norske Meierier', 'Beate Vileid', 'Marketing Manager', 'Hatlevegen 5', 'Sandvika', NULL, '1320', 'Norway', '(0)2-953010', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (16, 'Bigfoot Breweries', 'Cheryl Saylor', 'Regional Account Rep.', '3400 - 8th Avenue Suite 210', 'Bend', 'OR', '97101', 'USA', '(503) 555-9931', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (17, 'Svensk Sj�f�da AB', 'Michael Bj�rn', 'Sales Representative', 'Brovallav�gen 231', 'Stockholm', NULL, 'S-123 45', 'Sweden', '08-123 45 67', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (18, 'Aux joyeux eccl�siastiques', 'Guyl�ne Nodier', 'Sales Manager', '203, Rue des Francs-Bourgeois', 'Paris', NULL, '75004', 'France', '(1) 03.83.00.68', '(1) 03.83.00.62', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (19, 'New England Seafood Cannery', 'Robb Merchant', 'Wholesale Account Agent', 'Order Processing Dept. 2100 Paul Revere Blvd.', 'Boston', 'MA', '02134', 'USA', '(617) 555-3267', '(617) 555-3389', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (20, 'Leka Trading', 'Chandra Leka', 'Owner', '471 Serangoon Loop, Suite #402', 'Singapore', NULL, '0512', 'Singapore', '555-8787', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (21, 'Lyngbysild', 'Niels Petersen', 'Sales Manager', 'Lyngbysild Fiskebakken 10', 'Lyngby', NULL, '2800', 'Denmark', '43844108', '43844115', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (22, 'Zaanse Snoepfabriek', 'Dirk Luchte', 'Accounting Manager', 'Verkoop Rijnweg 22', 'Zaandam', NULL, '9999 ZZ', 'Netherlands', '(12345) 1212', '(12345) 1210', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (23, 'Karkki Oy', 'Anne Heikkonen', 'Product Manager', 'Valtakatu 12', 'Lappeenranta', NULL, '53120', 'Finland', '(953) 10956', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (24, 'G''day, Mate', 'Wendy Mackenzie', 'Sales Representative', '170 Prince Edward Parade Hunter''s Hill', 'Sydney', 'NSW', '2042', 'Australia', '(02) 555-5914', '(02) 555-4873', 'G''day Mate (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/gdaymate.htm#' ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (25, 'Ma Maison', 'Jean-Guy Lauzon', 'Marketing Manager', '2960 Rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-9022', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (26, 'Pasta Buttini s.r.l.', 'Giovanni Giudici', 'Order Administrator', 'Via dei Gelsomini, 153', 'Salerno', NULL, '84100', 'Italy', '(089) 6547665', '(089) 6547667', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (27, 'Escargots Nouveaux', 'Marie Delamare', 'Sales Manager', '22, rue H. Voiron', 'Montceau', NULL, '71300', 'France', '85.57.00.07', NULL, NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (28, 'Gai p�turage', 'Eliane Noz', 'Sales Representative', 'Bat. B 3, rue des Alpes', 'Annecy', NULL, '74000', 'France', '38.76.98.06', '38.76.98.58', NULL ) 
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (29, 'For�ts d''�rables', 'Chantal Goulet', 'Accounting Manager', '148 rue Chasseur', 'Ste-Hyacinthe', 'Qu�bec', 'J2S 7S8', 'Canada', '(514) 555-2955', '(514) 555-2921', NULL ) 
-SET IDENTITY_INSERT SUPPLIERS OFF
-GO
-
-
-SET IDENTITY_INSERT PRODUCTS ON
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (1, 'Chai', 1, 1, '10 boxes x 20 bags', 18, 520, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (2, 'Chang', 1, 1, '24 - 12 oz bottles', 19, 522, 40, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (3, 'Aniseed Syrup', 1, 2, '12 - 550 ml bottles', 10, 13, 70, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (4, 'Chef Anton''s Cajun Seasoning', 2, 2, '48 - 6 oz jars', 22, 53, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (5, 'Chef Anton''s Gumbo Mix', 2, 2, '36 boxes', 21.35, 0, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (6, 'Grandma''s Boysenberry Spread', 3, 2, '12 - 8 oz jars', 25, 120, 0, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (7, 'Uncle Bob''s Organic Dried Pears', 3, 7, '12 - 1 lb pkgs.', 30, 15, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (8, 'Northwoods Cranberry Sauce', 3, 2, '12 - 12 oz jars', 40, 6, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (9, 'Mishi Kobe Niku', 4, 6, '18 - 500 g pkgs.', 97, 29, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (10, 'Ikura', 4, 8, '12 - 200 ml jars', 31, 31, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (11, 'Queso Cabrales', 5, 4, '1 kg pkg.', 21, 22, 30, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (12, 'Queso Manchego La Pastora', 5, 4, '10 - 500 g pkgs.', 38, 86, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (13, 'Konbu', 6, 8, '2 kg box', 6, 24, 0, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (14, 'Tofu', 6, 7, '40 - 100 g pkgs.', 23.25, 35, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (15, 'Genen Shouyu', 6, 2, '24 - 250 ml bottles', 15.5, 39, 0, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (16, 'Pavlova', 7, 3, '32 - 500 g boxes', 17.45, 29, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (17, 'Alice Mutton', 7, 6, '20 - 1 kg tins', 39, 0, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (18, 'Carnarvon Tigers', 7, 8, '16 kg pkg.', 62.5, 42, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (19, 'Teatime Chocolate Biscuits', 8, 3, '10 boxes x 12 pieces', 9.2, 25, 0, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (20, 'Sir Rodney''s Marmalade', 8, 3, '30 gift boxes', 81, 40, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (21, 'Sir Rodney''s Scones', 8, 3, '24 pkgs. x 4 pieces', 10, 3, 40, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (22, 'Gustaf''s Kn�ckebr�d', 9, 5, '24 - 500 g pkgs.', 21, 104, 0, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (23, 'Tunnbr�d', 9, 5, '12 - 250 g pkgs.', 9, 61, 0, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (24, 'Guaran� Fant�stica', 10, 1, '12 - 355 ml cans', 4.5, 20, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (25, 'NuNuCa Nu�-Nougat-Creme', 11, 3, '20 - 450 g glasses', 14, 76, 0, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (26, 'Gumb�r Gummib�rchen', 11, 3, '100 - 250 g bags', 31.23, 15, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (27, 'Schoggi Schokolade', 11, 3, '100 - 100 g pieces', 43.9, 49, 0, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (28, 'R�ssle Sauerkraut', 12, 7, '25 - 825 g cans', 45.6, 26, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (29, 'Th�ringer Rostbratwurst', 12, 6, '50 bags x 30 sausgs.', 123.79, 0, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (30, 'Nord-Ost Matjeshering', 13, 8, '10 - 200 g glasses', 25.89, 10, 0, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (31, 'Gorgonzola Telino', 14, 4, '12 - 100 g pkgs', 12.5, 0, 70, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (32, 'Mascarpone Fabioli', 14, 4, '24 - 200 g pkgs.', 32, 9, 40, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (33, 'Geitost', 15, 4, '500 g', 2.5, 112, 0, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (34, 'Sasquatch Ale', 16, 1, '24 - 12 oz bottles', 14, 111, 0, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (35, 'Steeleye Stout', 16, 1, '24 - 12 oz bottles', 18, 20, 0, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (36, 'Inlagd Sill', 17, 8, '24 - 250 g  jars', 19, 112, 0, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (37, 'Gravad lax', 17, 8, '12 - 500 g pkgs.', 26, 11, 50, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (38, 'C�te de Blaye', 18, 1, '12 - 75 cl bottles', 263.5, 17, 0, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (39, 'Chartreuse verte', 18, 1, '750 cc per bottle', 18, 69, 0, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (40, 'Boston Crab Meat', 19, 8, '24 - 4 oz tins', 18.4, 123, 0, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (41, 'Jack''s New England Clam Chowder', 19, 8, '12 - 12 oz cans', 9.65, 85, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (42, 'Singaporean Hokkien Fried Mee', 20, 5, '32 - 1 kg pkgs.', 14, 26, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (43, 'Ipoh Coffee', 20, 1, '16 - 500 g tins', 46, 17, 10, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (44, 'Gula Malacca', 20, 2, '20 - 2 kg bags', 19.45, 27, 0, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (45, 'Rogede sild', 21, 8, '1k pkg.', 9.5, 5, 70, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (46, 'Spegesild', 21, 8, '4 - 450 g glasses', 12, 95, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (47, 'Zaanse koeken', 22, 3, '10 - 4 oz boxes', 9.5, 36, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (48, 'Chocolade', 22, 3, '10 pkgs.', 12.75, 15, 70, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (49, 'Maxilaku', 23, 3, '24 - 50 g pkgs.', 20, 10, 60, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (50, 'Valkoinen suklaa', 23, 3, '12 - 100 g bars', 16.25, 65, 0, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (51, 'Manjimup Dried Apples', 24, 7, '50 - 300 g pkgs.', 53, 20, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (52, 'Filo Mix', 24, 5, '16 - 2 kg boxes', 7, 38, 0, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (53, 'Perth Pasties', 24, 6, '48 pieces', 32.8, 0, 0, 0, 1 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (54, 'Tourti�re', 25, 6, '16 pies', 7.45, 21, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (55, 'P�t� chinois', 25, 6, '24 boxes x 2 pies', 24, 115, 0, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (56, 'Gnocchi di nonna Alice', 26, 5, '24 - 250 g pkgs.', 38, 21, 10, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (57, 'Ravioli Angelo', 26, 5, '24 - 250 g pkgs.', 19.5, 36, 0, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (58, 'Escargots de Bourgogne', 27, 8, '24 pieces', 13.25, 62, 0, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (59, 'Raclette Courdavault', 28, 4, '5 kg pkg.', 55, 79, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (60, 'Camembert Pierrot', 28, 4, '15 - 300 g rounds', 34, 19, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (61, 'Sirop d''�rable', 29, 2, '24 - 500 ml bottles', 28.5, 113, 0, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (62, 'Tarte au sucre', 29, 3, '48 pies', 49.3, 17, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (63, 'Vegie-spread', 7, 2, '15 - 625 g jars', 43.9, 24, 0, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (64, 'Wimmers gute Semmelkn�del', 12, 5, '20 bags x 4 pieces', 33.25, 22, 80, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (65, 'Louisiana Fiery Hot Pepper Sauce', 2, 2, '32 - 8 oz bottles', 21.05, 76, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (66, 'Louisiana Hot Spiced Okra', 2, 2, '24 - 8 oz jars', 17, 4, 100, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (67, 'Laughing Lumberjack Lager', 16, 1, '24 - 12 oz bottles', 14, 52, 0, 10, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (68, 'Scottish Longbreads', 8, 3, '10 boxes x 8 pieces', 12.5, 6, 10, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (69, 'Gudbrandsdalsost', 15, 4, '10 kg pkg.', 36, 26, 0, 15, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (70, 'Outback Lager', 7, 1, '24 - 355 ml bottles', 15, 15, 10, 30, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (71, 'Flotemysost', 15, 4, '10 - 500 g pkgs.', 21.5, 26, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (72, 'Mozzarella di Giovanni', 14, 4, '24 - 200 g pkgs.', 34.8, 14, 0, 0, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (73, 'R�d Kaviar', 17, 8, '24 - 150 g jars', 15, 101, 0, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (74, 'Longlife Tofu', 4, 7, '5 kg pkg.', 10, 4, 20, 5, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (75, 'Rh�nbr�u Klosterbier', 12, 1, '24 - 0.5 l bottles', 7.75, 125, 0, 25, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (76, 'Lakkalik��ri', 23, 1, '500 ml', 18, 57, 0, 20, 0 ) 
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (77, 'Original Frankfurter gr�ne So�e', 12, 2, '12 boxes', 13, 32, 0, 15, 0 ) 
-SET IDENTITY_INSERT PRODUCTS OFF
-GO
-
-
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 11, 14, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 42, 9.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 72, 34.8, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 14, 18.6, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 51, 42.4, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 41, 7.7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 51, 42.4, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 65, 16.8, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 22, 16.8, 6, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 57, 15.6, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 65, 16.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 20, 64.8, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 33, 2, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 60, 27.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 31, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 39, 14.4, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 49, 16, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 24, 3.6, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 55, 19.2, 21, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 74, 8, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 2, 15.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 16, 13.9, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 36, 15.2, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 59, 44, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 53, 26.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 77, 10.4, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 27, 35.1, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 39, 14.4, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 77, 10.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 2, 15.2, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 5, 17, 65, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 32, 25.6, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 21, 8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 37, 20.8, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 41, 7.7, 16, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 57, 15.6, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 62, 39.4, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 70, 12, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 21, 8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 35, 14.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 5, 17, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 7, 24, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 56, 30.4, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 16, 13.9, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 24, 3.6, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 30, 20.7, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 74, 8, 36, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 2, 15.2, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 41, 7.7, 25, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 17, 31.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 70, 12, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10266, 12, 30.4, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 40, 14.7, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 59, 44, 70, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 76, 14.4, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 29, 99, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 72, 27.8, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 33, 2, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 72, 27.8, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 36, 15.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 43, 36.8, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10271, 33, 2, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 20, 64.8, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 31, 10, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 72, 27.8, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 10, 24.8, 24, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 31, 10, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 33, 2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 40, 14.7, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 76, 14.4, 33, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 71, 17.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 72, 27.8, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 24, 3.6, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 59, 44, 6, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 10, 24.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 13, 4.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 28, 36.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 62, 39.4, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 44, 15.5, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 59, 44, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 63, 35.1, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 73, 12, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10279, 17, 31.2, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 24, 3.6, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 55, 19.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 75, 6.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 19, 7.3, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 24, 3.6, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 35, 14.4, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 30, 20.7, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 57, 15.6, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 15, 12.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 19, 7.3, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 60, 27.2, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 72, 27.8, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 27, 35.1, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 44, 15.5, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 60, 27.2, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 67, 11.2, 5, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 1, 14.4, 45, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 40, 14.7, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 53, 26.2, 36, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 35, 14.4, 100, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 62, 39.4, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 16, 13.9, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 34, 11.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 46, 9.6, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 54, 5.9, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 68, 10, 3, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 3, 8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 64, 26.6, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 5, 17, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 29, 99, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 49, 16, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 77, 10.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 13, 4.8, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 44, 15.5, 24, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 51, 42.4, 2, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10292, 20, 64.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 18, 50, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 24, 3.6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 63, 35.1, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 75, 6.2, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 1, 14.4, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 17, 31.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 43, 36.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 60, 27.2, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 75, 6.2, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10295, 56, 30.4, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 11, 16.8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 16, 13.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 69, 28.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 39, 14.4, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 72, 27.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 2, 15.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 36, 15.2, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 59, 44, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 62, 39.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 19, 7.3, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 70, 12, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 66, 13.6, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 68, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 40, 14.7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 56, 30.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 17, 31.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 28, 36.4, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 43, 36.8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 40, 14.7, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 65, 16.8, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 68, 10, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 49, 16, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 59, 44, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 71, 17.2, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 18, 50, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 29, 99, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 39, 14.4, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 30, 20.7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 53, 26.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 54, 5.9, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 62, 39.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 68, 10, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 69, 28.8, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 70, 12, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 4, 17.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 6, 20, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 42, 11.2, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 43, 36.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 71, 17.2, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 16, 13.9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 62, 39.4, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 42, 11.2, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 69, 28.8, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 28, 36.4, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 43, 36.8, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 53, 26.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 75, 6.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10313, 36, 15.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 32, 25.6, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 58, 10.6, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 62, 39.4, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 34, 11.2, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 70, 12, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 41, 7.7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 62, 39.4, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10317, 1, 14.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 41, 7.7, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 76, 14.4, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 17, 31.2, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 28, 36.4, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 76, 14.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10320, 71, 17.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10321, 35, 14.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10322, 52, 5.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 15, 12.4, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 25, 11.2, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 39, 14.4, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 16, 13.9, 21, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 35, 14.4, 70, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 46, 9.6, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 59, 44, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 63, 35.1, 80, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 6, 20, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 13, 4.8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 14, 18.6, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 31, 10, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 72, 27.8, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 4, 17.6, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 57, 15.6, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 75, 6.2, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 2, 15.2, 25, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 11, 16.8, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 30, 20.7, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 58, 10.6, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 59, 44, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 65, 16.8, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 68, 10, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 19, 7.3, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 30, 20.7, 8, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 38, 210.8, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 56, 30.4, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 26, 24.9, 50, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 72, 27.8, 25, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10331, 54, 5.9, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 18, 50, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 42, 11.2, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 47, 7.6, 16, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 14, 18.6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 21, 8, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 71, 17.2, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 52, 5.6, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 68, 10, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 2, 15.2, 7, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 31, 10, 25, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 32, 25.6, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 51, 42.4, 48, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10336, 4, 17.6, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 23, 7.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 26, 24.9, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 36, 15.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 37, 20.8, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 72, 27.8, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 17, 31.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 30, 20.7, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 4, 17.6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 17, 31.2, 70, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 62, 39.4, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 18, 50, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 41, 7.7, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 43, 36.8, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 33, 2, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 59, 44, 9, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 2, 15.2, 24, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 31, 10, 56, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 36, 15.2, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 55, 19.2, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 64, 26.6, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 68, 10, 4, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 76, 14.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 4, 17.6, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 8, 32, 70, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 8, 32, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 19, 7.3, 80, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 42, 11.2, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 17, 31.2, 36, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 56, 30.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 25, 11.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 39, 14.4, 50, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 40, 14.7, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 75, 6.2, 6, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 1, 14.4, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 23, 7.2, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10349, 54, 5.9, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 50, 13, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 69, 28.8, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 38, 210.8, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 41, 7.7, 13, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 44, 15.5, 77, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 65, 16.8, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 24, 3.6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 54, 5.9, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 11, 16.8, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 38, 210.8, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 1, 14.4, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 29, 99, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 24, 3.6, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 57, 15.6, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 31, 10, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 55, 19.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 69, 28.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 10, 24.8, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 26, 24.9, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 60, 27.2, 8, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 24, 3.6, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 34, 11.2, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 36, 15.2, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 16, 13.9, 56, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 31, 10, 70, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 60, 27.2, 80, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 28, 36.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 29, 99, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 38, 210.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 49, 16, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 54, 5.9, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 39, 14.4, 54, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 60, 27.2, 55, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 25, 11.2, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 51, 42.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 54, 5.9, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 31, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 75, 6.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 76, 14.4, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 69, 28.8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 71, 17.2, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10365, 11, 16.8, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 65, 16.8, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 77, 10.4, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 34, 11.2, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 54, 5.9, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 65, 16.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 77, 10.4, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 21, 8, 5, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 28, 36.4, 13, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 57, 15.6, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 64, 26.6, 35, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 29, 99, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 56, 30.4, 18, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 1, 14.4, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 64, 26.6, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 74, 8, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10371, 36, 15.2, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 20, 64.8, 12, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 38, 210.8, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 60, 27.2, 70, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 72, 27.8, 42, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 58, 10.6, 80, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 71, 17.2, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 31, 10, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 58, 10.6, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 14, 18.6, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 54, 5.9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10376, 31, 10, 42, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 28, 36.4, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 39, 14.4, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10378, 71, 17.2, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 41, 7.7, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 63, 35.1, 16, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 65, 16.8, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 30, 20.7, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 53, 26.2, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 60, 27.2, 6, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 70, 12, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10381, 74, 8, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 5, 17, 32, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 18, 50, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 29, 99, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 33, 2, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 74, 8, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 13, 4.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 50, 13, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 56, 30.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 20, 64.8, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 60, 27.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 7, 24, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 60, 27.2, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 68, 10, 8, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 24, 3.6, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 34, 11.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 24, 3.6, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 28, 36.4, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 59, 44, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 71, 17.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 45, 7.6, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 52, 5.6, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 53, 26.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 10, 24.8, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 55, 19.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 62, 39.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 70, 12, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 31, 10, 60, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 35, 14.4, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 46, 9.6, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 72, 27.8, 24, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10391, 13, 4.8, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10392, 69, 28.8, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 2, 15.2, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 14, 18.6, 42, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 25, 11.2, 7, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 26, 24.9, 70, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 31, 10, 32, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 13, 4.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 62, 39.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 46, 9.6, 28, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 53, 26.2, 70, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 69, 28.8, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 23, 7.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 71, 17.2, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 72, 27.8, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 21, 8, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 51, 42.4, 18, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 35, 14.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 55, 19.2, 120, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 68, 10, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 71, 17.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 76, 14.4, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 77, 10.4, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 29, 99, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 35, 14.4, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 49, 16, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 30, 20.7, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 56, 30.4, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 65, 16.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 71, 17.2, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 23, 7.2, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 63, 35.1, 65, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 16, 13.9, 21, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 48, 10.2, 70, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 26, 24.9, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 42, 11.2, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 49, 16, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10405, 3, 8, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 1, 14.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 21, 8, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 28, 36.4, 42, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 36, 15.2, 5, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 40, 14.7, 2, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 11, 16.8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 69, 28.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 71, 17.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 37, 20.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 54, 5.9, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 62, 39.4, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 14, 18.6, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 21, 8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 33, 2, 49, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 59, 44, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 41, 7.7, 25, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 44, 15.5, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 59, 44, 9, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10412, 14, 18.6, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 1, 14.4, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 62, 39.4, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 76, 14.4, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 19, 7.3, 18, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 33, 2, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 17, 31.2, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 33, 2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 19, 7.3, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 53, 26.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 57, 15.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 38, 210.8, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 46, 9.6, 2, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 68, 10, 36, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 77, 10.4, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 2, 15.2, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 47, 7.6, 55, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 61, 22.8, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 74, 8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 60, 27.2, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 69, 28.8, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 9, 77.6, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 13, 4.8, 2, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 70, 12, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 73, 12, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 19, 7.3, 4, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 26, 24.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 53, 26.2, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 77, 10.4, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10422, 26, 24.9, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 31, 10, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 59, 44, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 35, 14.4, 60, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 38, 210.8, 49, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 68, 10, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 55, 19.2, 10, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 76, 14.4, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 56, 30.4, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 64, 26.6, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10427, 14, 18.6, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10428, 46, 9.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 50, 13, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 63, 35.1, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 17, 31.2, 45, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 21, 8, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 56, 30.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 59, 44, 70, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 17, 31.2, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 40, 14.7, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 47, 7.6, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 26, 24.9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 54, 5.9, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10433, 56, 30.4, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 11, 16.8, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 76, 14.4, 18, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 2, 15.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 22, 16.8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 72, 27.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 46, 9.6, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 56, 30.4, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 64, 26.6, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 75, 6.2, 24, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10437, 53, 26.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 19, 7.3, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 34, 11.2, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 57, 15.6, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 12, 30.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 16, 13.9, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 64, 26.6, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 74, 8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 2, 15.2, 45, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 16, 13.9, 49, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 29, 99, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 61, 22.8, 90, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10441, 27, 35.1, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 11, 16.8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 54, 5.9, 80, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 66, 13.6, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 11, 16.8, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 28, 36.4, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 17, 31.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 26, 24.9, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 35, 14.4, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 41, 7.7, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 39, 14.4, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 54, 5.9, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 19, 7.3, 12, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 24, 3.6, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 31, 10, 3, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 52, 5.6, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 19, 7.3, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 65, 16.8, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 71, 17.2, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 26, 24.9, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 40, 14.7, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 10, 24.8, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 52, 5.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 62, 39.4, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 10, 24.8, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 54, 5.9, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 55, 19.2, 120, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 64, 26.6, 35, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 65, 16.8, 28, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 77, 10.4, 55, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 28, 36.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 44, 15.5, 100, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 48, 10.2, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 70, 12, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 16, 13.9, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 33, 2, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 46, 9.6, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 39, 14.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 53, 26.2, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 61, 22.8, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 71, 17.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 21, 8, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 49, 16, 21, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10457, 59, 44, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 26, 24.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 28, 36.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 43, 36.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 56, 30.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 71, 17.2, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 7, 24, 16, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 46, 9.6, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 72, 27.8, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 68, 10, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 75, 6.2, 4, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 21, 8, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 30, 20.7, 28, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 55, 19.2, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 13, 4.8, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 23, 7.2, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 19, 7.3, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 42, 11.2, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 4, 17.6, 16, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 43, 36.8, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 56, 30.4, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 60, 27.2, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 24, 3.6, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 29, 99, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 40, 14.7, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 45, 7.6, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 50, 13, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 11, 16.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 46, 9.6, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 24, 3.6, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 25, 11.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 30, 20.7, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 43, 36.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 2, 15.2, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 16, 13.9, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 44, 15.5, 2, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 18, 50, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 23, 7.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 64, 26.6, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 7, 24, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 56, 30.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 24, 3.6, 80, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 51, 42.4, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 33, 2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 71, 17.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 14, 18.6, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 28, 36.4, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 40, 14.7, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 75, 6.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 31, 10, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 66, 13.6, 60, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 76, 14.4, 42, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 55, 19.2, 2, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 70, 12, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 1, 14.4, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 21, 8, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 39, 14.4, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10478, 10, 24.8, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 38, 210.8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 53, 26.2, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 59, 44, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 64, 26.6, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 47, 7.6, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 59, 44, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 49, 16, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 60, 27.2, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10482, 40, 14.7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 34, 11.2, 35, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 77, 10.4, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 21, 8, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 40, 14.7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 51, 42.4, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 2, 15.2, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 3, 8, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 55, 19.2, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 70, 12, 60, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 11, 16.8, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 51, 42.4, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 74, 8, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 19, 7.3, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 26, 24.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 54, 5.9, 24, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 59, 44, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 73, 12, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 11, 16.8, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 16, 13.9, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 59, 44, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 68, 10, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 75, 6.2, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 44, 15.5, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 77, 10.4, 7, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 25, 11.2, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 42, 11.2, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 65, 16.8, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 66, 13.6, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 69, 28.8, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10494, 56, 30.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 23, 7.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 41, 7.7, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 77, 10.4, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10496, 31, 10, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 56, 30.4, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 72, 27.8, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 77, 10.4, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 24, 4.5, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 40, 18.4, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 42, 14, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 28, 45.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 49, 20, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 15, 15.5, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 28, 45.6, 8, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10501, 54, 7.45, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 45, 9.5, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 53, 32.8, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 67, 14, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 14, 23.25, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 65, 21.05, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 2, 19, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 21, 10, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 53, 32.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 61, 28.5, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10505, 62, 49.3, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 25, 14, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 70, 15, 14, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 43, 46, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 48, 12.75, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 13, 6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 39, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10509, 28, 45.6, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 29, 123.79, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 75, 7.75, 36, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 4, 22, 50, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 7, 30, 50, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 8, 40, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 24, 4.5, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 46, 12, 9, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 47, 9.5, 6, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 60, 34, 12, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 21, 10, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 32, 32, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 61, 28.5, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 20, 81, 39, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 28, 45.6, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 56, 38, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 65, 21.05, 39, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 75, 7.75, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 9, 97, 16, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 16, 17.45, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 27, 43.9, 120, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 33, 2.5, 16, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 60, 34, 84, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 18, 62.5, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 41, 9.65, 80, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 42, 14, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 52, 7, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 59, 55, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 70, 15, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 24, 4.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 38, 263.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 44, 19.45, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 10, 31, 16, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 56, 38, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 60, 34, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 24, 4.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 53, 32.8, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 35, 18, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 41, 9.65, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 68, 12.5, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 1, 18, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 8, 40, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 30, 25.89, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 40, 18.4, 25, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 17, 39, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 20, 81, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 37, 26, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 41, 9.65, 6, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 10, 31, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 30, 25.89, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 43, 46, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 54, 7.45, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 36, 19, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 40, 18.4, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 1, 18, 8, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 13, 6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 56, 38, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 4, 22, 50, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 36, 19, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 11, 21, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 33, 2.5, 8, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 72, 34.8, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 55, 24, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 68, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 69, 36, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 17, 39, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 43, 46, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 61, 28.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 76, 18, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10531, 59, 55, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 30, 25.89, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 66, 17, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 4, 22, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 72, 34.8, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 73, 15, 24, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 30, 25.89, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 40, 18.4, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 54, 7.45, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 11, 21, 50, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 40, 18.4, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 57, 19.5, 5, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 59, 55, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 12, 38, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 31, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 33, 2.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 60, 34, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 31, 12.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 51, 53, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 58, 13.25, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 72, 34.8, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 73, 15, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 70, 15, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 72, 34.8, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 13, 6, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 21, 10, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 33, 2.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 49, 20, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 3, 10, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 26, 31.23, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 38, 263.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 68, 12.5, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 24, 4.5, 35, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 38, 263.5, 4, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 65, 21.05, 36, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 71, 21.5, 9, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 11, 21, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 54, 7.45, 24, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 12, 38, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 23, 9, 70, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 28, 45.6, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 67, 14, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10545, 11, 21, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 7, 30, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 35, 18, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 62, 49.3, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 32, 32, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 36, 19, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 34, 14, 10, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 41, 9.65, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 31, 12.5, 55, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 45, 9.5, 100, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 51, 53, 48, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 17, 39, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 19, 9.2, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 21, 10, 6, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 61, 28.5, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 16, 17.45, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 35, 18, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 44, 19.45, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 69, 36, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 75, 7.75, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 11, 21, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 16, 17.45, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 22, 21, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 31, 12.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 35, 18, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 16, 17.45, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 23, 9, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 62, 49.3, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 77, 13, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 14, 23.25, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 19, 9.2, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 24, 4.5, 18, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 51, 53, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 56, 38, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10556, 72, 34.8, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 64, 33.25, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 75, 7.75, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 47, 9.5, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 51, 53, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 52, 7, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 53, 32.8, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 73, 15, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 41, 9.65, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 55, 24, 18, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 30, 25.89, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 62, 49.3, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 44, 19.45, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 51, 53, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 33, 2.5, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 62, 49.3, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 36, 19, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 52, 7, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 17, 39, 16, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 31, 12.5, 6, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 55, 24, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 24, 4.5, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 64, 33.25, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 11, 21, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 18, 62.5, 18, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 76, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 31, 12.5, 60, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 51, 53, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 59, 55, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10568, 10, 31, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 31, 12.5, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 76, 18, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 11, 21, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 56, 38, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 14, 23.25, 11, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 42, 14, 28, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 16, 17.45, 12, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 32, 32, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 40, 18.4, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 75, 7.75, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 17, 39, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 34, 14, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 53, 32.8, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 33, 2.5, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 40, 18.4, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 62, 49.3, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 64, 33.25, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 59, 55, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 63, 43.9, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 72, 34.8, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 76, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 1, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 31, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 44, 19.45, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 39, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 75, 7.75, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 77, 13, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 35, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 57, 19.5, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 15, 15.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 75, 7.75, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 14, 23.25, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 41, 9.65, 9, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 65, 21.05, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10581, 75, 7.75, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 57, 19.5, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 76, 18, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 29, 123.79, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 60, 34, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 69, 36, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10584, 31, 12.5, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10585, 47, 9.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10586, 52, 7, 4, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 26, 31.23, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 35, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 77, 13, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 18, 62.5, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 42, 14, 100, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10589, 35, 18, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 1, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 77, 13, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 3, 10, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 7, 30, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 54, 7.45, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 15, 15.5, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 26, 31.23, 5, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 20, 81, 21, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 69, 36, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 76, 18, 4, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 52, 7, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 58, 13.25, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 35, 18, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 61, 28.5, 120, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 69, 36, 65, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 56, 38, 5, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 63, 43.9, 24, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 75, 7.75, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 24, 4.5, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 57, 19.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 65, 21.05, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 27, 43.9, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 71, 21.5, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10599, 62, 49.3, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 54, 7.45, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 73, 15, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 13, 6, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 59, 55, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10602, 77, 13, 5, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 22, 21, 48, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 49, 20, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 48, 12.75, 6, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 76, 18, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 16, 17.45, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 59, 55, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 60, 34, 70, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 71, 21.5, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 4, 22, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 55, 24, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 62, 49.3, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 7, 30, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 17, 39, 100, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 33, 2.5, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 40, 18.4, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 72, 34.8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10608, 56, 38, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 1, 18, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 10, 31, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 21, 10, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10610, 36, 19, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 1, 18, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 2, 19, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 60, 34, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 10, 31, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 36, 19, 55, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 49, 20, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 60, 34, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 76, 18, 80, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 13, 6, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 75, 7.75, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 11, 21, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 21, 10, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 39, 18, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10615, 55, 24, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 38, 263.5, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 56, 38, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 70, 15, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 71, 21.5, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10617, 59, 55, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 6, 25, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 56, 38, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 68, 12.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 21, 10, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 22, 21, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 24, 4.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 52, 7, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 19, 9.2, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 23, 9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 70, 15, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 71, 21.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 2, 19, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 68, 12.5, 18, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 14, 23.25, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 19, 9.2, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 21, 10, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 24, 4.5, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 35, 18, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 28, 45.6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 29, 123.79, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 44, 19.45, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 14, 23.25, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 42, 14, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 60, 34, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 53, 32.8, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 60, 34, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 71, 21.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 62, 49.3, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 73, 15, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10628, 1, 18, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 29, 123.79, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 64, 33.25, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 55, 24, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 76, 18, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10631, 75, 7.75, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 2, 19, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 33, 2.5, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 12, 38, 36, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 13, 6, 13, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 26, 31.23, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 62, 49.3, 80, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 7, 30, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 18, 62.5, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 51, 53, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 75, 7.75, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 4, 22, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 5, 21.35, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 22, 21, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 4, 22, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 58, 13.25, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 11, 21, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 50, 16.25, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 56, 38, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 45, 9.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 65, 21.05, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 72, 34.8, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10639, 18, 62.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 69, 36, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 70, 15, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 2, 19, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 40, 18.4, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 21, 10, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 61, 28.5, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 28, 45.6, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 39, 18, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 46, 12, 2, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 18, 62.5, 4, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 43, 46, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 46, 12, 21, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 18, 62.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 36, 19, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 1, 18, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 10, 31, 18, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 71, 21.5, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 77, 13, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 19, 9.2, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 39, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 22, 21, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 24, 4.5, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 28, 45.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 72, 34.8, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 30, 25.89, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 53, 32.8, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 54, 7.45, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 19, 9.2, 12, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 22, 21, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 30, 25.89, 2, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 42, 14, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 16, 17.45, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 60, 34, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 4, 22, 12, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 39, 18, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 54, 7.45, 6, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10655, 41, 9.65, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 14, 23.25, 3, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 44, 19.45, 28, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 47, 9.5, 6, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 15, 15.5, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 41, 9.65, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 46, 12, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 47, 9.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 56, 38, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 60, 34, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 21, 10, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 40, 18.4, 70, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 60, 34, 55, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 77, 13, 70, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 31, 12.5, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 40, 18.4, 24, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 70, 15, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10660, 20, 81, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 39, 18, 3, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 58, 13.25, 49, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10662, 68, 12.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 40, 18.4, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 42, 14, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 51, 53, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 10, 31, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 56, 38, 12, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 65, 21.05, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 51, 53, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 59, 55, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 76, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 29, 123.79, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 65, 21.05, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 69, 36, 45, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 71, 21.5, 14, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 31, 12.5, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 55, 24, 4, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 64, 33.25, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10669, 36, 19, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 23, 9, 32, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 46, 12, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 67, 14, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 73, 15, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 75, 7.75, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 16, 17.45, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 62, 49.3, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 65, 21.05, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 38, 263.5, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 71, 21.5, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 16, 17.45, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 42, 14, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 43, 46, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10674, 23, 9, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 14, 23.25, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 53, 32.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 58, 13.25, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 10, 31, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 19, 9.2, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 44, 19.45, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 26, 31.23, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 33, 2.5, 8, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 12, 38, 100, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 33, 2.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 41, 9.65, 120, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 54, 7.45, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10679, 59, 55, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 16, 17.45, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 31, 12.5, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 42, 14, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 19, 9.2, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 21, 10, 12, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 64, 33.25, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 33, 2.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 66, 17, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 75, 7.75, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10683, 52, 7, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 40, 18.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 47, 9.5, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 60, 34, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 10, 31, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 41, 9.65, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 47, 9.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 17, 39, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 26, 31.23, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 9, 97, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 29, 123.79, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 36, 19, 6, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 10, 31, 18, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 28, 45.6, 60, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 34, 14, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10689, 1, 18, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 56, 38, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 77, 13, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 1, 18, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 29, 123.79, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 43, 46, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 44, 19.45, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 62, 49.3, 48, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10692, 63, 43.9, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 9, 97, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 54, 7.45, 60, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 69, 36, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 73, 15, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 7, 30, 90, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 59, 55, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 70, 15, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 8, 40, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 12, 38, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 24, 4.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 17, 39, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 46, 12, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 19, 9.2, 7, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 35, 18, 9, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 58, 13.25, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 70, 15, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 11, 21, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 17, 39, 8, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 29, 123.79, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 65, 21.05, 65, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 70, 15, 8, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10699, 47, 9.5, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 1, 18, 5, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 34, 14, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 68, 12.5, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 71, 21.5, 60, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 59, 55, 42, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 71, 21.5, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 76, 18, 35, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 3, 10, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 76, 18, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 2, 19, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 59, 55, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 73, 15, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 4, 22, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 24, 4.5, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 48, 12.75, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 31, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 32, 32, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 16, 17.45, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 43, 46, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 59, 55, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 55, 24, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 57, 19.5, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 70, 15, 28, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 5, 21.35, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 36, 19, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 8, 40, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 51, 53, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 60, 34, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 19, 9.2, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 47, 9.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 19, 9.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 41, 9.65, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 53, 32.8, 120, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 53, 32.8, 3, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 56, 38, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 10, 31, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 26, 31.23, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 45, 9.5, 110, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 46, 12, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 2, 19, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 17, 39, 27, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 47, 9.5, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 56, 38, 18, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 58, 13.25, 12, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 10, 31, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 71, 21.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 21, 10, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 51, 53, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 61, 28.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 21, 10, 32, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 54, 7.45, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 69, 36, 25, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 12, 38, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 16, 17.45, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 36, 19, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 62, 49.3, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 18, 62.5, 12, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 30, 25.89, 3, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 54, 7.45, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 35, 18, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 71, 21.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10721, 44, 19.45, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 2, 19, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 31, 12.5, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 68, 12.5, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 75, 7.75, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10723, 26, 31.23, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 10, 31, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 61, 28.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 41, 9.65, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 52, 7, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 55, 24, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 4, 22, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 11, 21, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 17, 39, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 56, 38, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 59, 55, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 30, 25.89, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 40, 18.4, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 55, 24, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 60, 34, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 1, 18, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 21, 10, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 50, 16.25, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 16, 17.45, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 31, 12.5, 3, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 65, 21.05, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 21, 10, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 51, 53, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10732, 76, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 14, 23.25, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 28, 45.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 52, 7, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 6, 25, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 30, 25.89, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 76, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 61, 28.5, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 77, 13, 2, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 65, 21.05, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 75, 7.75, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 13, 6, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 41, 9.65, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10738, 16, 17.45, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 36, 19, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 52, 7, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 28, 45.6, 5, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 35, 18, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 45, 9.5, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 56, 38, 14, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10741, 2, 19, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 3, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 60, 34, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 72, 34.8, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10743, 46, 12, 28, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10744, 40, 18.4, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 18, 62.5, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 44, 19.45, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 59, 55, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 72, 34.8, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 13, 6, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 42, 14, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 62, 49.3, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 69, 36, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 31, 12.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 41, 9.65, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 63, 43.9, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 69, 36, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 23, 9, 44, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 40, 18.4, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 56, 38, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 56, 38, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 59, 55, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 76, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 14, 23.25, 5, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 45, 9.5, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 59, 55, 25, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 26, 31.23, 12, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 30, 25.89, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 50, 16.25, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 73, 15, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 1, 18, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 69, 36, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 45, 9.5, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 74, 10, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10754, 40, 18.4, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 47, 9.5, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 56, 38, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 57, 19.5, 14, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 69, 36, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 18, 62.5, 21, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 36, 19, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 68, 12.5, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 69, 36, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 34, 14, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 59, 55, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 62, 49.3, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 64, 33.25, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 26, 31.23, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 52, 7, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 70, 15, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10759, 32, 32, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 25, 14, 12, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 27, 43.9, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 43, 46, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 25, 14, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 75, 7.75, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 39, 18, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 47, 9.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 51, 53, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 56, 38, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 21, 10, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 22, 21, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 24, 4.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 3, 10, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 39, 18, 130, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10765, 65, 21.05, 80, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 2, 19, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 7, 30, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 68, 12.5, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10767, 42, 14, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 22, 21, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 31, 12.5, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 60, 34, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 71, 21.5, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 41, 9.65, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 52, 7, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 61, 28.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 62, 49.3, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10770, 11, 21, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10771, 71, 21.5, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 29, 123.79, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 59, 55, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 17, 39, 33, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 31, 12.5, 70, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 75, 7.75, 7, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 31, 12.5, 2, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 66, 17, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 10, 31, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 67, 14, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 31, 12.5, 16, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 42, 14, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 45, 9.5, 27, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 51, 53, 120, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10777, 42, 14, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10778, 41, 9.65, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 16, 17.45, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 62, 49.3, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 70, 15, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 77, 13, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 54, 7.45, 3, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 56, 38, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 74, 10, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10782, 31, 12.5, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 31, 12.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 38, 263.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 36, 19, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 39, 18, 2, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 72, 34.8, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 10, 31, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 75, 7.75, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 8, 40, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 30, 25.89, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 75, 7.75, 42, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 2, 19, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 29, 123.79, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 19, 9.2, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 75, 7.75, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 18, 62.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 35, 18, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 63, 43.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 68, 12.5, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 7, 30, 3, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 56, 38, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 29, 123.79, 14, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 41, 9.65, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 2, 19, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 54, 7.45, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 68, 12.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 41, 9.65, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 52, 7, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 14, 23.25, 15, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 54, 7.45, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 16, 17.45, 65, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 17, 39, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 26, 31.23, 21, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 44, 19.45, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 64, 33.25, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 69, 36, 24, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10797, 11, 21, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 62, 49.3, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 72, 34.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 13, 6, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 24, 4.5, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 59, 55, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 11, 21, 50, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 51, 53, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 54, 7.45, 7, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 17, 39, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 29, 123.79, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 30, 25.89, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 51, 53, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 55, 24, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 62, 49.3, 5, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 19, 9.2, 24, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 25, 14, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 59, 55, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 10, 31, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 28, 45.6, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 49, 20, 4, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 34, 14, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 38, 263.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 2, 19, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 65, 21.05, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 74, 10, 15, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10807, 40, 18.4, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 56, 38, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 76, 18, 50, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10809, 52, 7, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 13, 6, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 25, 14, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 70, 15, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 19, 9.2, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 23, 9, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 40, 18.4, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 31, 12.5, 16, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 72, 34.8, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 77, 13, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 2, 19, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 46, 12, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 41, 9.65, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 43, 46, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 48, 12.75, 8, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 61, 28.5, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10815, 33, 2.5, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 38, 263.5, 30, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 62, 49.3, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 26, 31.23, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 38, 263.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 40, 18.4, 60, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 62, 49.3, 25, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 32, 32, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 41, 9.65, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 43, 46, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 75, 7.75, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10820, 56, 38, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 35, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 51, 53, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 62, 49.3, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 70, 15, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 11, 21, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 57, 19.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 59, 55, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 77, 13, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 41, 9.65, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 70, 15, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 26, 31.23, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 53, 32.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 31, 12.5, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 57, 19.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 10, 31, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 39, 18, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 20, 81, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 38, 263.5, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 2, 19, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 8, 40, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 13, 6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 60, 34, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 6, 25, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 39, 18, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 60, 34, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 68, 12.5, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 19, 9.2, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 35, 18, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 38, 263.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 43, 46, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 13, 6, 3, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 25, 14, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 44, 19.45, 16, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 64, 33.25, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 7, 30, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 31, 12.5, 9, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 53, 32.8, 9, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 29, 123.79, 8, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 30, 25.89, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 59, 55, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 77, 13, 2, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 22, 21, 52, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 35, 18, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 57, 19.5, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 60, 34, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 64, 33.25, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 13, 6, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 40, 18.4, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 47, 9.5, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 76, 18, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 1, 18, 4, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 18, 62.5, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 36, 19, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 58, 13.25, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 72, 34.8, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 25, 14, 6, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 39, 18, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 10, 31, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 56, 38, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 59, 55, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 77, 13, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 11, 21, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 43, 46, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 68, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 70, 15, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10843, 51, 53, 4, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10844, 22, 21, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 23, 9, 70, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 35, 18, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 42, 14, 42, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 58, 13.25, 60, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 64, 33.25, 48, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 4, 22, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 70, 15, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 74, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 1, 18, 80, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 19, 9.2, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 37, 26, 60, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 45, 9.5, 36, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 60, 34, 45, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 71, 21.5, 55, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 5, 21.35, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 9, 97, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 3, 10, 49, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 26, 31.23, 18, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 25, 14, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 33, 2.5, 4, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 70, 15, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 2, 19, 5, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 25, 14, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 57, 19.5, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 59, 55, 42, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 2, 19, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 17, 39, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 62, 49.3, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10853, 18, 62.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 10, 31, 100, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 13, 6, 65, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 16, 17.45, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 31, 12.5, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 56, 38, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 65, 21.05, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 2, 19, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 42, 14, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 3, 10, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 26, 31.23, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 29, 123.79, 10, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 7, 30, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 27, 43.9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 70, 15, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 24, 4.5, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 54, 7.45, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 64, 33.25, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 51, 53, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 76, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 17, 39, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 18, 62.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 21, 10, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 33, 2.5, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 62, 49.3, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 11, 21, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 52, 7, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 1, 18, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 58, 13.25, 12, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 35, 18, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 67, 14, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 38, 263.5, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 39, 18, 80, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 2, 19, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 24, 4.5, 6, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 30, 25.89, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10867, 53, 32.8, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 26, 31.23, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 35, 18, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 49, 20, 42, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 1, 18, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 11, 21, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 23, 9, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 68, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 35, 18, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 51, 53, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 6, 25, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 16, 17.45, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 17, 39, 16, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 55, 24, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 62, 49.3, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 64, 33.25, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 65, 21.05, 21, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 21, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 28, 45.6, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10874, 10, 31, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 19, 9.2, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 47, 9.5, 21, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 49, 20, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 46, 12, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 64, 33.25, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 16, 17.45, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 18, 62.5, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10878, 20, 81, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 40, 18.4, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 65, 21.05, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 76, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 23, 9, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 61, 28.5, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 70, 15, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10881, 73, 15, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 42, 14, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 49, 20, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 54, 7.45, 32, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10883, 24, 4.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 21, 10, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 56, 38, 21, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 65, 21.05, 12, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 2, 19, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 24, 4.5, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 70, 15, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 77, 13, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 10, 31, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 31, 12.5, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 77, 13, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10887, 25, 14, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 2, 19, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 68, 12.5, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 11, 21, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 38, 263.5, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 17, 39, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 34, 14, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 41, 9.65, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10891, 30, 25.89, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10892, 59, 55, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 8, 40, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 24, 4.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 29, 123.79, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 30, 25.89, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 36, 19, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 13, 6, 28, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 69, 36, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 75, 7.75, 120, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 24, 4.5, 110, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 39, 18, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 40, 18.4, 91, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 60, 34, 100, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 45, 9.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 56, 38, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 29, 123.79, 80, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 30, 25.89, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10898, 13, 6, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10899, 39, 18, 8, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10900, 70, 15, 3, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 41, 9.65, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 71, 21.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 55, 24, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 62, 49.3, 6, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 13, 6, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 65, 21.05, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 68, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 58, 13.25, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 62, 49.3, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10905, 1, 18, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10906, 61, 28.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10907, 75, 7.75, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 7, 30, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 52, 7, 14, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 7, 30, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 16, 17.45, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 41, 9.65, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 19, 9.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 49, 20, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 61, 28.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 1, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 17, 39, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 67, 14, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 11, 21, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 29, 123.79, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 4, 22, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 33, 2.5, 40, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 58, 13.25, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10914, 71, 21.5, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 17, 39, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 33, 2.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 54, 7.45, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 16, 17.45, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 32, 32, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 57, 19.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 30, 25.89, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 60, 34, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 1, 18, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 60, 34, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 16, 17.45, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 25, 14, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 40, 18.4, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10920, 50, 16.25, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 35, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 63, 43.9, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 17, 39, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 24, 4.5, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 42, 14, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 43, 46, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 67, 14, 24, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 10, 31, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 28, 45.6, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 75, 7.75, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 36, 19, 25, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 52, 7, 12, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 11, 21, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 13, 6, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 19, 9.2, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 72, 34.8, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 20, 81, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 52, 7, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 76, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 47, 9.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 76, 18, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 21, 10, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 75, 7.75, 49, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 77, 13, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 21, 10, 36, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 27, 43.9, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 55, 24, 25, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 58, 13.25, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 13, 6, 42, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 57, 19.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 16, 17.45, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 62, 49.3, 14, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 72, 34.8, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 75, 7.75, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 53, 32.8, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 61, 28.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10934, 6, 25, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 1, 18, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 18, 62.5, 4, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 23, 9, 8, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10936, 36, 19, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 28, 45.6, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 34, 14, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 13, 6, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 43, 46, 24, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 60, 34, 49, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 71, 21.5, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 2, 19, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 67, 14, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 7, 30, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 13, 6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 31, 12.5, 44, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 62, 49.3, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 68, 12.5, 80, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 72, 34.8, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10942, 49, 20, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 13, 6, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 22, 21, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 46, 12, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 11, 21, 5, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 44, 19.45, 18, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 56, 38, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 13, 6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 31, 12.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 10, 31, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 24, 4.5, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 77, 13, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10947, 59, 55, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 50, 16.25, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 51, 53, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 55, 24, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 6, 25, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 10, 31, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 17, 39, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 62, 49.3, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10950, 4, 22, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 33, 2.5, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 41, 9.65, 6, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 75, 7.75, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 6, 25, 16, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 28, 45.6, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 20, 81, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 31, 12.5, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 16, 17.45, 28, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 31, 12.5, 25, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 45, 9.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 60, 34, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10955, 75, 7.75, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 21, 10, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 47, 9.5, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 51, 53, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 30, 25.89, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 35, 18, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 64, 33.25, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 5, 21.35, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 7, 30, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 72, 34.8, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10959, 75, 7.75, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 24, 4.5, 10, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 41, 9.65, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 52, 7, 6, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 76, 18, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 7, 30, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 13, 6, 77, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 53, 32.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 69, 36, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 76, 18, 44, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10963, 60, 34, 2, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 18, 62.5, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 38, 263.5, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 69, 36, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10965, 51, 53, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 37, 26, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 56, 38, 12, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 62, 49.3, 12, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 19, 9.2, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 49, 20, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 12, 38, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 24, 4.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 64, 33.25, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10969, 46, 12, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10970, 52, 7, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10971, 29, 123.79, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 17, 39, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 33, 2.5, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 26, 31.23, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 41, 9.65, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 75, 7.75, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10974, 63, 43.9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 8, 40, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 75, 7.75, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10976, 28, 45.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 39, 18, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 47, 9.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 51, 53, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 63, 43.9, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 8, 40, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 21, 10, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 40, 18.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 44, 19.45, 6, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 7, 30, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 12, 38, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 24, 4.5, 80, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 27, 43.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 31, 12.5, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 63, 43.9, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10980, 75, 7.75, 40, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10981, 38, 263.5, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 7, 30, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 43, 46, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 13, 6, 84, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 57, 19.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 16, 17.45, 55, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 24, 4.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 36, 19, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 16, 17.45, 36, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 18, 62.5, 8, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 32, 32, 35, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 11, 21, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 20, 81, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 76, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 77, 13, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 7, 30, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 43, 46, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 72, 34.8, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 7, 30, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 62, 49.3, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 6, 25, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 11, 21, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 41, 9.65, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 21, 10, 65, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 34, 14, 60, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 55, 24, 65, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 61, 28.5, 66, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 2, 19, 50, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 70, 15, 20, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 76, 18, 90, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10992, 72, 34.8, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 29, 123.79, 50, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 41, 9.65, 35, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10994, 59, 55, 18, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 51, 53, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 60, 34, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10996, 42, 14, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 32, 32, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 46, 12, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 52, 7, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 24, 4.5, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 61, 28.5, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 74, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 75, 7.75, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 41, 9.65, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 51, 53, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 77, 13, 21, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 4, 22, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 24, 4.5, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 77, 13, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 7, 30, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 22, 21, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 46, 12, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 55, 24, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 13, 6, 56, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 35, 18, 15, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 42, 14, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 55, 24, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 1, 18, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 40, 18.4, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 52, 7, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 26, 31.23, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 76, 18, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 1, 18, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 59, 55, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 1, 18, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 29, 123.79, 2, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 8, 40, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 29, 123.79, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 42, 14, 14, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 28, 45.6, 70, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 34, 14, 90, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 71, 21.5, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 24, 4.5, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 36, 19, 18, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 60, 34, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 7, 30, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 24, 4.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 58, 13.25, 40, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 71, 21.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 19, 9.2, 50, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 60, 34, 36, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 71, 21.5, 60, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 23, 9, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 42, 14, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 45, 9.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 68, 12.5, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11014, 41, 9.65, 28, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 30, 25.89, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 77, 13, 18, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 31, 12.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 36, 19, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 3, 10, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 59, 55, 110, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 70, 15, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 12, 38, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 18, 62.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 56, 38, 5, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 46, 12, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 49, 20, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11020, 10, 31, 24, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 2, 19, 11, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 20, 81, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 26, 31.23, 63, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 51, 53, 44, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 72, 34.8, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 19, 9.2, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 69, 36, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 7, 30, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 43, 46, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 26, 31.23, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 33, 2.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 65, 21.05, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 71, 21.5, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 1, 18, 10, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 13, 6, 20, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 18, 62.5, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 51, 53, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 24, 4.5, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 62, 49.3, 21, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 55, 24, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 59, 55, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 56, 38, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 63, 43.9, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 2, 19, 100, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 5, 21.35, 70, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 29, 123.79, 60, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 59, 55, 100, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 1, 18, 45, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 13, 6, 80, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 24, 4.5, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 64, 33.25, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 71, 21.5, 16, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 36, 19, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 38, 263.5, 25, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 59, 55, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 53, 32.8, 70, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 69, 36, 36, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 21, 10, 15, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 44, 19.45, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 61, 28.5, 6, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 1, 18, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 35, 18, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 42, 14, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 54, 7.45, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 13, 6, 7, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 59, 55, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11037, 70, 15, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 40, 18.4, 5, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 52, 7, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 71, 21.5, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 28, 45.6, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 35, 18, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 49, 20, 60, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 57, 19.5, 28, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11040, 21, 10, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 2, 19, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 63, 43.9, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 44, 19.45, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 61, 28.5, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11043, 11, 21, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11044, 62, 49.3, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 33, 2.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 51, 53, 24, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 12, 38, 20, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 32, 32, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 35, 18, 18, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 1, 18, 25, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 5, 21.35, 30, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11048, 68, 12.5, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 2, 19, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 12, 38, 4, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11050, 76, 18, 50, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11051, 24, 4.5, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 43, 46, 30, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 61, 28.5, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 18, 62.5, 35, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 32, 32, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 64, 33.25, 25, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 33, 2.5, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 67, 14, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 24, 4.5, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 25, 14, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 51, 53, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 57, 19.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 7, 30, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 55, 24, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 60, 34, 50, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11057, 70, 15, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 21, 10, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 60, 34, 21, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 61, 28.5, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 13, 6, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 17, 39, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 60, 34, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 60, 34, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 77, 13, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11061, 60, 34, 15, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 53, 32.8, 10, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 70, 15, 12, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 34, 14, 30, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 40, 18.4, 40, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 41, 9.65, 30, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 17, 39, 77, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 41, 9.65, 12, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 53, 32.8, 25, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 55, 24, 4, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 68, 12.5, 55, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 30, 25.89, 4, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 54, 7.45, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 16, 17.45, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 19, 9.2, 42, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 34, 14, 35, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11067, 41, 9.65, 9, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 28, 45.6, 8, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 43, 46, 36, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 77, 13, 28, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11069, 39, 18, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 1, 18, 40, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 2, 19, 20, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 16, 17.45, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 31, 12.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 7, 30, 15, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 13, 6, 10, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 2, 19, 8, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 41, 9.65, 40, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 50, 16.25, 22, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 64, 33.25, 130, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 11, 21, 10, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 24, 4.5, 20, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11074, 16, 17.45, 14, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 2, 19, 10, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 46, 12, 30, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 76, 18, 2, 0.15 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 6, 25, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 14, 23.25, 20, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 19, 9.2, 10, 0.25 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 2, 19, 24, 0.2 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 3, 10, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 4, 22, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 6, 25, 1, 0.02 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 7, 30, 1, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 8, 40, 2, 0.1 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 10, 31, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 12, 38, 2, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 13, 6, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 14, 23.25, 1, 0.03 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 16, 17.45, 2, 0.03 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 20, 81, 1, 0.04 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 23, 9, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 32, 32, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 39, 18, 2, 0.05 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 41, 9.65, 3, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 46, 12, 3, 0.02 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 52, 7, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 55, 24, 2, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 60, 34, 2, 0.06 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 64, 33.25, 2, 0.03 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 66, 17, 1, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 73, 15, 2, 0.01 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 75, 7.75, 4, 0 ) 
-INSERT INTO [ORDER DETAILS] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 77, 13, 2, 0 ) 
-GO
-
-INSERT INTO TYPES_SIMPLE (ID, T_BIT, T_TINYINT, T_SMALLINT, T_INT, T_BIGINT, T_DECIMAL, T_NUMERIC, T_FLOAT, T_REAL, T_CHAR, T_NCHAR, T_VARCHAR, T_NVARCHAR) VALUES ('0', 1, 25, 77, 2525, 25251414, 10.17, 123123.25, 17.1414257, .71425, 'g', 'h', 'heh', 'heh')
-INSERT INTO TYPES_EXTENDED (ID, T_TEXT, T_NTEXT, T_BINARY, T_VARBINARY, T_DATETIME, T_SMALLDATETIME) VALUES ('0', 'heh', 'heh', 0x8764278687265872, 0x3847653746587877, '02/02/02 02:02:02', '02/02/02 02:02:02')
-INSERT INTO TYPES_EXTENDED(ID, T_DATETIME, T_SMALLDATETIME) VALUES('MIN', '1753-01-01 00:00:00.000', '1900-01-01 00:00:00')
-INSERT INTO TYPES_SPECIFIC (ID, T_SMALLMONEY, T_MONEY, T_IMAGE, T_UNIQUEIDENTIFIER, T_SQL_VARIANT, T_TIMESTAMP) VALUES ('0', 123.14, 123.14, 0x23754274572377, '{239A3C5E-8D41-11D1-B675-00C04FA3C554}', 123, NULL)
-GO
-
-use [GHTDB_EX]
-GO
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci?n 2222', 'M?xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer?a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M?xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk?p', 'Christina Berglund', 'Order Administrator', 'Berguvsv?gen  8', 'Lule?', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p?re et fils', 'Fr?d?rique Citeaux', 'Marketing Manager', '24, place Kl?ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B?lido Comidas preparadas', 'Mart?n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M?xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com?rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus?adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or?s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc?', 'Assistant Sales Agent', '184, chauss?e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f? HB', 'Maria Larsson', 'Owner', '?kergatan 24', 'Br?cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M?nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer?a del gastr?nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu?a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T?pica', 'Jos? Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr? Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5? Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa?o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern?ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist?bal', 'T?chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K?niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz?lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol?var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M?re Paillarde', 'Jean Fresni?re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr?al', 'Qu?bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc?ano Atl?ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K?seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K?ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp?cialit?s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl?sicas', 'Guillermo Fern?ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M?xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa?de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del?cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L?cia Carvalho', 'Marketing Assistant', 'Alameda dos Can?rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra?e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti?rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen?ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V?a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant? Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb?ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp?cialit?s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr?mes d?lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit?ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M?nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M?xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi??o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In?s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '?rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M?ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) 
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) 
-GO
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.PostgreSQL.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.PostgreSQL.sql
deleted file mode 100755
index bf430d65a52..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.PostgreSQL.sql
+++ /dev/null
@@ -1,3337 +0,0 @@
-set client_encoding = LATIN1;
-
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (3, 'Confections', 'Desserts, candies, and sweet breads' ) ;
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (4, 'Dairy Products', 'Cheeses' ) ;
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (5, 'Grains/Cereals', 'Breads, crackers, pasta, and cereal' ) ;
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (6, 'Meat/Poultry', 'Prepared meats' ) ;
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (7, 'Produce', 'Dried fruit and bean curd' ) ;
-INSERT INTO CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (8, 'Seafood', 'Seaweed and fish' ) ;
-
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (1, 'Yavine', 'Oved', 'Sales Representative', 'Mr', '12/8/1948 12:00:00 AM', '5/1/1992 12:00:00 AM', '507 - 20th Ave. E.Apt. 2A', 'Seattle', 'WA', '98122', 'USA', '(206) 555-9857', '5467', 'Education includes a BA in psychology from Colorado State University in 1970.  She also completed "The Art of the Cold Call."  Nancy is a member of Toastmasters International.', 1, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (2, 'Fuller', 'Andrew', 'Vice President, Sales', 'Dr.', '2/19/1952 12:00:00 AM', '8/14/1992 12:00:00 AM', '908 W. Capital Way', 'Tacoma', 'WA', '98401', 'USA', '(206) 555-9482', '3457', 'Andrew received his BTS commercial in 1974 and a Ph.D. in international marketing from the University of Dallas in 1981.  He is fluent in French and Italian and reads German.  He joined the company as a sales representative, was promoted to sales manager in January 1992 and to vice president of sales in March 1993.  Andrew is a member of the Sales Management Roundtable, the Seattle Chamber of Commerce, and the Pacific Rim Importers Association.', 1, 'http://accweb/emmployees/fuller.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (3, 'Leverling', 'Janet', 'Sales Representative', 'Ms.', '8/30/1963 12:00:00 AM', '4/1/1992 12:00:00 AM', '722 Moss Bay Blvd.', 'Kirkland', 'WA', '98033', 'USA', '(206) 555-3412', '3355', 'Janet has a BS degree in chemistry from Boston College (1984).  She has also completed a certificate program in food retailing management.  Janet was hired as a sales associate in 1991 and promoted to sales representative in February 1992.', 2, 'http://accweb/emmployees/leverling.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (4, 'Peacock', 'Margaret', 'Sales Representative', 'Mrs.', '9/19/1937 12:00:00 AM', '5/3/1993 12:00:00 AM', '4110 Old Redmond Rd.', 'Redmond', 'WA', '98052', 'USA', '(206) 555-8122', '5176', 'Margaret holds a BA in English literature from Concordia College (1958) and an MA from the American Institute of Culinary Arts (1966).  She was assigned to the London office temporarily from July through November 1992.', 2, 'http://accweb/emmployees/peacock.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (5, 'Buchanan', 'Steven', 'Sales Manager', 'Mr.', '3/4/1955 12:00:00 AM', '10/17/1993 12:00:00 AM', '14 Garrett Hill', 'London', NULL, 'SW1 8JR', 'UK', '(71) 555-4848', '3453', 'Steven Buchanan graduated from St. Andrews University, Scotland, with a BSC degree in 1976.  Upon joining the company as a sales representative in 1992, he spent 6 months in an orientation program at the Seattle office and then returned to his permanent post in London.  He was promoted to sales manager in March 1993.  Mr. Buchanan has completed the courses "Successful Telemarketing" and "International Sales Management."  He is fluent in French.', 2, 'http://accweb/emmployees/buchanan.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (6, 'Suyama', 'Michael', 'Sales Representative', 'Mr.', '7/2/1963 12:00:00 AM', '10/17/1993 12:00:00 AM', 'Coventry HouseMiner Rd.', 'London', NULL, 'EC2 7JR', 'UK', '(71) 555-7773', '428', 'Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses "Multi-Cultural Selling" and "Time Management for the Sales Professional."  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (7, 'King', 'Robert', 'Sales Representative', 'Mr.', '5/29/1960 12:00:00 AM', '1/2/1994 12:00:00 AM', 'Edgeham HollowWinchester Way', 'London', NULL, 'RG1 9SP', 'UK', '(71) 555-5598', '465', 'Robert King served in the Peace Corps and traveled extensively before completing his degree in English at the University of Michigan in 1992, the year he joined the company.  After completing a course entitled "Selling in Europe," he was transferred to the London office in March 1993.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (8, 'Callahan', 'Laura', 'Inside Sales Coordinator', 'Ms.', '1/9/1958 12:00:00 AM', '3/5/1994 12:00:00 AM', '4726 - 11th Ave. N.E.', 'Seattle', 'WA', '98105', 'USA', '(206) 555-1189', '2344', 'Laura received a BA in psychology from the University of Washington.  She has also completed a course in business French.  She reads and writes French.', 2, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9, 'Dodsworth', 'Anne', 'Sales Representative', 'Ms.', '1/27/1966 12:00:00 AM', '11/15/1994 12:00:00 AM', '7 Houndstooth Rd.', 'London', NULL, 'WG2 7LT', 'UK', '(71) 555-4444', '452', 'Anne has a BA degree in English from St. Lawrence College.  She is fluent in French and German.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (1, 'Eastern                                           ' ) ;
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (2, 'Western                                           ' ) ;
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (3, 'Northern                                          ' ) ;
-INSERT INTO REGION ( RegionID, RegionDescription ) VALUES (4, 'Southern                                          ' ) ;
-
-
-INSERT INTO SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (1, 'Speedy Express', '(503) 555-9831' ) ;
-INSERT INTO SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (2, 'Comp2', '(503) 555-3199' ) ;
-INSERT INTO SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (3, 'Federal Shipping', '(503) 555-9931' ) ;
-
-
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10248, 'VINET', 5, '7/4/1996 12:00:00 AM', '8/1/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 3, 255.39, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10249, 'TOMSP', 6, '7/5/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/10/1996 12:00:00 AM', 1, 11.61, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10250, 'HANAR', 4, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/12/1996 12:00:00 AM', 2, 65.83, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10251, 'VICTE', 3, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 1, 41.34, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10252, 'SUPRD', 4, '7/9/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', '7/11/1996 12:00:00 AM', 2, 51.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10253, 'HANAR', 3, '7/10/1996 12:00:00 AM', '7/24/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 2, 58.17, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10254, 'CHOPS', 5, '7/11/1996 12:00:00 AM', '8/8/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 2, 22.98, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10255, 'RICSU', 9, '7/12/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 3, 148.33, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10256, 'WELLI', 3, '7/15/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', '7/17/1996 12:00:00 AM', 2, 13.97, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10257, 'HILAA', 4, '7/16/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', '7/22/1996 12:00:00 AM', 3, 81.91, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10258, 'ERNSH', 1, '7/17/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 1, 140.51, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10259, 'CENTC', 4, '7/18/1996 12:00:00 AM', '8/15/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 3.25, 'Centro comercial Moctezuma', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10260, 'OTTIK', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/29/1996 12:00:00 AM', 1, 55.09, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10261, 'QUEDE', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/30/1996 12:00:00 AM', 2, 3.05, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10262, 'RATTC', 8, '7/22/1996 12:00:00 AM', '8/19/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 48.29, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10263, 'ERNSH', 9, '7/23/1996 12:00:00 AM', '8/20/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 146.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10264, 'FOLKO', 6, '7/24/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 3.67, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10265, 'BLONP', 2, '7/25/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 1, 55.28, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10266, 'WARTH', 3, '7/26/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 25.73, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10267, 'FRANK', 4, '7/29/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 1, 208.58, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10268, 'GROSR', 8, '7/30/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 3, 66.29, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10269, 'WHITC', 5, '7/31/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 4.56, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10270, 'WARTH', 1, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 1, 136.54, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10271, 'SPLIR', 6, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 2, 4.54, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10272, 'RATTC', 6, '8/2/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 2, 98.03, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10273, 'QUICK', 3, '8/5/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 3, 76.07, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10274, 'VINET', 6, '8/6/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 1, 6.01, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10275, 'MAGAA', 1, '8/7/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 26.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10276, 'TORTU', 8, '8/8/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', 3, 13.84, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10277, 'MORGK', 2, '8/9/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', 3, 125.77, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10278, 'BERGS', 8, '8/12/1996 12:00:00 AM', '9/9/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 92.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10279, 'LEHMS', 8, '8/13/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 25.83, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10280, 'BERGS', 2, '8/14/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', 1, 8.98, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10281, 'ROMEY', 4, '8/14/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 2.94, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10282, 'ROMEY', 4, '8/15/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 12.69, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10283, 'LILAS', 3, '8/16/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 84.81, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10284, 'LEHMS', 4, '8/19/1996 12:00:00 AM', '9/16/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', 1, 76.56, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10285, 'QUICK', 1, '8/20/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', 2, 76.83, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10286, 'QUICK', 8, '8/21/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 3, 229.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10287, 'RICAR', 8, '8/22/1996 12:00:00 AM', '9/19/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 12.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10288, 'REGGC', 4, '8/23/1996 12:00:00 AM', '9/20/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 7.45, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10289, 'BSBEV', 7, '8/26/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 22.77, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10290, 'COMMI', 8, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 79.7, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10291, 'QUEDE', 6, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', 2, 6.4, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10292, 'TRADH', 1, '8/28/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', 2, 1.35, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10293, 'TORTU', 1, '8/29/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 3, 21.18, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10294, 'RATTC', 4, '8/30/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', '9/5/1996 12:00:00 AM', 2, 147.26, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10295, 'VINET', 2, '9/2/1996 12:00:00 AM', '9/30/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 1.15, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10296, 'LILAS', 6, '9/3/1996 12:00:00 AM', '10/1/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 1, 0.12, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10297, 'BLONP', 5, '9/4/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 5.74, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10298, 'HUNGO', 6, '9/5/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 2, 168.22, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10299, 'RICAR', 4, '9/6/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', 2, 29.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10300, 'MAGAA', 2, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 17.68, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10301, 'WANDK', 8, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 45.08, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10302, 'SUPRD', 4, '9/10/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 2, 6.27, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10303, 'GODOS', 7, '9/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 107.83, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10304, 'TORTU', 1, '9/12/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 63.79, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10305, 'OLDWO', 8, '9/13/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 3, 257.62, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10306, 'ROMEY', 1, '9/16/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', 3, 7.56, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10307, 'LONEP', 2, '9/17/1996 12:00:00 AM', '10/15/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', 2, 0.56, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10308, 'ANATR', 7, '9/18/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', 3, 1.61, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10309, 'HUNGO', 3, '9/19/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 1, 47.3, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10310, 'THEBI', 8, '9/20/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', 2, 17.52, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10311, 'DUMON', 1, '9/20/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', 3, 24.69, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10312, 'WANDK', 2, '9/23/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 40.26, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10313, 'QUICK', 2, '9/24/1996 12:00:00 AM', '10/22/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 1.96, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10314, 'RATTC', 1, '9/25/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 74.16, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10315, 'ISLAT', 4, '9/26/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 41.76, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10316, 'RATTC', 1, '9/27/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', 3, 150.15, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10317, 'LONEP', 6, '9/30/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 12.69, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10318, 'ISLAT', 8, '10/1/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 4.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10319, 'TORTU', 7, '10/2/1996 12:00:00 AM', '10/30/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 3, 64.5, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10320, 'WARTH', 5, '10/3/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', 3, 34.57, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10321, 'ISLAT', 3, '10/3/1996 12:00:00 AM', '10/31/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 2, 3.43, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10322, 'PERIC', 7, '10/4/1996 12:00:00 AM', '11/1/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 3, 0.4, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10323, 'KOENE', 4, '10/7/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 4.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10324, 'SAVEA', 9, '10/8/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 214.27, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10325, 'KOENE', 1, '10/9/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 3, 64.86, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10326, 'BOLID', 4, '10/10/1996 12:00:00 AM', '11/7/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 2, 77.92, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10327, 'FOLKO', 2, '10/11/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 63.36, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10328, 'FURIB', 4, '10/14/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', 3, 87.03, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10329, 'SPLIR', 4, '10/15/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 2, 191.67, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10330, 'LILAS', 3, '10/16/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 1, 12.75, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10331, 'BONAP', 9, '10/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 1, 10.19, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10332, 'MEREP', 3, '10/17/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 2, 52.84, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10333, 'WARTH', 5, '10/18/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 3, 0.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10334, 'VICTE', 8, '10/21/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 2, 8.56, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10335, 'HUNGO', 7, '10/22/1996 12:00:00 AM', '11/19/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', 2, 42.11, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10336, 'PRINI', 7, '10/23/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 2, 15.51, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10337, 'FRANK', 4, '10/24/1996 12:00:00 AM', '11/21/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 108.26, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10338, 'OLDWO', 4, '10/25/1996 12:00:00 AM', '11/22/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 84.21, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10339, 'MEREP', 2, '10/28/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 15.66, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10340, 'BONAP', 1, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 166.31, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10341, 'SIMOB', 7, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 3, 26.78, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10342, 'FRANK', 4, '10/30/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 54.83, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10343, 'LEHMS', 4, '10/31/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '11/6/1996 12:00:00 AM', 1, 110.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10344, 'WHITC', 4, '11/1/1996 12:00:00 AM', '11/29/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 2, 23.29, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10345, 'QUICK', 2, '11/4/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', 2, 249.06, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10346, 'RATTC', 3, '11/5/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 142.08, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10347, 'FAMIA', 4, '11/6/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 3.1, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10348, 'WANDK', 4, '11/7/1996 12:00:00 AM', '12/5/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 2, 0.78, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10349, 'SPLIR', 7, '11/8/1996 12:00:00 AM', '12/6/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 1, 8.63, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10350, 'LAMAI', 6, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 64.19, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10351, 'ERNSH', 1, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 162.33, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10352, 'FURIB', 3, '11/12/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', 3, 1.3, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10353, 'PICCO', 7, '11/13/1996 12:00:00 AM', '12/11/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', 3, 360.63, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10354, 'PERIC', 8, '11/14/1996 12:00:00 AM', '12/12/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 3, 53.8, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10355, 'AROUT', 6, '11/15/1996 12:00:00 AM', '12/13/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 41.95, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10356, 'WANDK', 6, '11/18/1996 12:00:00 AM', '12/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 2, 36.71, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10357, 'LILAS', 1, '11/19/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 34.88, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10358, 'LAMAI', 5, '11/20/1996 12:00:00 AM', '12/18/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 1, 19.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10359, 'SEVES', 5, '11/21/1996 12:00:00 AM', '12/19/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', 3, 288.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10360, 'BLONP', 4, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 131.7, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10361, 'QUICK', 1, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 183.17, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10362, 'BONAP', 3, '11/25/1996 12:00:00 AM', '12/23/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', 1, 96.04, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10363, 'DRACD', 4, '11/26/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', 3, 30.54, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10364, 'EASTC', 1, '11/26/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/4/1996 12:00:00 AM', 1, 71.97, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10365, 'ANTON', 3, '11/27/1996 12:00:00 AM', '12/25/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 22, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10366, 'GALED', 8, '11/28/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/30/1996 12:00:00 AM', 2, 10.14, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10367, 'VAFFE', 7, '11/28/1996 12:00:00 AM', '12/26/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 13.55, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10368, 'ERNSH', 2, '11/29/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 101.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10369, 'SPLIR', 8, '12/2/1996 12:00:00 AM', '12/30/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 195.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10370, 'CHOPS', 6, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', 2, 1.17, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10371, 'LAMAI', 1, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', 1, 0.45, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10372, 'QUEEN', 5, '12/4/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 890.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10373, 'HUNGO', 4, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/11/1996 12:00:00 AM', 3, 124.12, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10374, 'WOLZA', 1, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 3, 3.94, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10375, 'HUNGC', 3, '12/6/1996 12:00:00 AM', '1/3/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 20.12, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10376, 'MEREP', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 2, 20.39, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10377, 'SEVES', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 22.21, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10378, 'FOLKO', 5, '12/10/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/19/1996 12:00:00 AM', 3, 5.44, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10379, 'QUEDE', 2, '12/11/1996 12:00:00 AM', '1/8/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 1, 45.03, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10380, 'HUNGO', 8, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 35.03, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10381, 'LILAS', 3, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 7.99, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10382, 'ERNSH', 4, '12/13/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '12/16/1996 12:00:00 AM', 1, 94.77, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10383, 'AROUT', 8, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/18/1996 12:00:00 AM', 3, 34.24, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10384, 'BERGS', 3, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 3, 168.64, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10385, 'SPLIR', 1, '12/17/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '12/23/1996 12:00:00 AM', 2, 30.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10386, 'FAMIA', 9, '12/18/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/25/1996 12:00:00 AM', 3, 13.99, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10387, 'SANTG', 1, '12/18/1996 12:00:00 AM', '1/15/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 2, 93.63, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10388, 'SEVES', 2, '12/19/1996 12:00:00 AM', '1/16/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 1, 34.86, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10389, 'BOTTM', 4, '12/20/1996 12:00:00 AM', '1/17/1997 12:00:00 AM', '12/24/1996 12:00:00 AM', 2, 47.42, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10390, 'ERNSH', 6, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/26/1996 12:00:00 AM', 1, 126.38, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10391, 'DRACD', 3, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/31/1996 12:00:00 AM', 3, 5.45, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10392, 'PICCO', 2, '12/24/1996 12:00:00 AM', '1/21/1997 12:00:00 AM', '1/1/1997 12:00:00 AM', 3, 122.46, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10393, 'SAVEA', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 126.56, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10394, 'HUNGC', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 30.34, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10395, 'HILAA', 6, '12/26/1996 12:00:00 AM', '1/23/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 1, 184.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10396, 'FRANK', 1, '12/27/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '1/6/1997 12:00:00 AM', 3, 135.35, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10397, 'PRINI', 5, '12/27/1996 12:00:00 AM', '1/24/1997 12:00:00 AM', '1/2/1997 12:00:00 AM', 1, 60.26, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10398, 'SAVEA', 2, '12/30/1996 12:00:00 AM', '1/27/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 89.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10399, 'VAFFE', 8, '12/31/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 3, 27.36, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10400, 'EASTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 83.93, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10401, 'RATTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 1, 12.51, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10402, 'ERNSH', 8, '1/2/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 2, 67.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10403, 'ERNSH', 4, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 73.79, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10404, 'MAGAA', 2, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 1, 155.97, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10405, 'LINOD', 1, '1/6/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', '1/22/1997 12:00:00 AM', 1, 34.82, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10406, 'QUEEN', 7, '1/7/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/13/1997 12:00:00 AM', 1, 108.04, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10407, 'OTTIK', 2, '1/7/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 91.48, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10408, 'FOLIG', 8, '1/8/1997 12:00:00 AM', '2/5/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 11.26, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10409, 'OCEAN', 3, '1/9/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 29.83, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10410, 'BOTTM', 3, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 3, 2.4, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10411, 'BOTTM', 9, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/21/1997 12:00:00 AM', 3, 23.65, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10412, 'WARTH', 8, '1/13/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 2, 3.77, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10413, 'LAMAI', 3, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 2, 95.66, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10414, 'FAMIA', 2, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/17/1997 12:00:00 AM', 3, 21.48, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10415, 'HUNGC', 3, '1/15/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 0.2, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10416, 'WARTH', 8, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 3, 22.72, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10417, 'SIMOB', 4, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/28/1997 12:00:00 AM', 3, 70.29, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10418, 'QUICK', 4, '1/17/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 17.55, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10419, 'RICSU', 4, '1/20/1997 12:00:00 AM', '2/17/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 137.35, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10420, 'WELLI', 3, '1/21/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 44.12, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10421, 'QUEDE', 8, '1/21/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 99.23, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10422, 'FRANS', 2, '1/22/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', 1, 3.02, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10423, 'GOURL', 6, '1/23/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 3, 24.5, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10424, 'MEREP', 7, '1/23/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 2, 370.61, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10425, 'LAMAI', 6, '1/24/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 7.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10426, 'GALED', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', 1, 18.69, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10427, 'PICCO', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 31.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10428, 'REGGC', 7, '1/28/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', 1, 11.09, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10429, 'HUNGO', 3, '1/29/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 56.63, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10430, 'ERNSH', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', 1, 458.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10431, 'BOTTM', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 44.17, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10432, 'SPLIR', 3, '1/31/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 4.34, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10433, 'PRINI', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 73.83, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10434, 'FOLKO', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', 2, 17.92, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10435, 'CONSH', 8, '2/4/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 9.21, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10436, 'BLONP', 3, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', 2, 156.66, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10437, 'WARTH', 8, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', 1, 19.97, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10438, 'TOMSP', 3, '2/6/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 8.24, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10439, 'MEREP', 6, '2/7/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', 3, 4.07, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10440, 'SAVEA', 4, '2/10/1997 12:00:00 AM', '3/10/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 86.53, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10441, 'OLDWO', 3, '2/10/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 73.02, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10442, 'ERNSH', 3, '2/11/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', 2, 47.94, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10443, 'REGGC', 8, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 1, 13.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10444, 'BERGS', 3, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', 3, 3.5, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10445, 'BERGS', 3, '2/13/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', 1, 9.3, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10446, 'TOMSP', 6, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', 1, 14.68, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10447, 'RICAR', 4, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', 2, 68.66, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10448, 'RANCH', 4, '2/17/1997 12:00:00 AM', '3/17/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 2, 38.82, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10449, 'BLONP', 3, '2/18/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/27/1997 12:00:00 AM', 2, 53.3, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10450, 'VICTE', 8, '2/19/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 7.23, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10451, 'QUICK', 4, '2/19/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 189.09, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10452, 'SAVEA', 8, '2/20/1997 12:00:00 AM', '3/20/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 1, 140.26, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10453, 'AROUT', 1, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 2, 25.36, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10454, 'LAMAI', 4, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', 3, 2.74, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10455, 'WARTH', 8, '2/24/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 180.45, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10456, 'KOENE', 8, '2/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 8.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10457, 'KOENE', 2, '2/25/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 11.57, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10458, 'SUPRD', 7, '2/26/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 147.06, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10459, 'VICTE', 4, '2/27/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 25.09, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10460, 'FOLKO', 8, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 16.27, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10461, 'LILAS', 1, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', 3, 148.61, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10462, 'CONSH', 2, '3/3/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 1, 6.17, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10463, 'SUPRD', 5, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', 3, 14.78, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10464, 'FURIB', 4, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 89, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10465, 'VAFFE', 1, '3/5/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 3, 145.04, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10466, 'COMMI', 4, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', 1, 11.93, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10467, 'MAGAA', 8, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 4.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10468, 'KOENE', 3, '3/7/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 44.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10469, 'WHITC', 1, '3/10/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 1, 60.18, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10470, 'BONAP', 4, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 64.56, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10471, 'BSBEV', 2, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 3, 45.59, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10472, 'SEVES', 8, '3/12/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', 1, 4.2, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10473, 'ISLAT', 1, '3/13/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 16.37, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10474, 'PERIC', 5, '3/13/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 2, 83.49, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10475, 'SUPRD', 9, '3/14/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', 1, 68.52, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10476, 'HILAA', 8, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 3, 4.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10477, 'PRINI', 5, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 13.02, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10478, 'VICTE', 2, '3/18/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', 3, 4.81, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10479, 'RATTC', 3, '3/19/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 708.95, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10480, 'FOLIG', 6, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 2, 1.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10481, 'RICAR', 8, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 64.33, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10482, 'LAZYK', 1, '3/21/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 7.48, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10483, 'WHITC', 7, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', 2, 15.28, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10484, 'BSBEV', 3, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', 3, 6.88, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10485, 'LINOD', 4, '3/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', 2, 64.45, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10486, 'HILAA', 1, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 30.53, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10487, 'QUEEN', 2, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', 2, 71.07, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10488, 'FRANK', 8, '3/27/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 4.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10489, 'PICCO', 6, '3/28/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 5.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10490, 'HILAA', 7, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', 2, 210.19, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10491, 'FURIB', 8, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', 3, 16.96, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10492, 'BOTTM', 3, '4/1/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 1, 62.89, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10493, 'LAMAI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 10.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10494, 'COMMI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 65.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10495, 'LAUGB', 3, '4/3/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 3, 4.65, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10496, 'TRADH', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 2, 46.77, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10497, 'LEHMS', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 1, 36.21, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10498, 'HILAA', 8, '4/7/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 2, 29.75, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10499, 'LILAS', 4, '4/8/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 102.02, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10500, 'LAMAI', 6, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', 1, 42.68, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10501, 'BLAUS', 9, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 3, 8.85, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10502, 'PERIC', 2, '4/10/1997 12:00:00 AM', '5/8/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 69.32, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10503, 'HUNGO', 6, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 16.74, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10504, 'WHITC', 4, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', 3, 59.13, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10505, 'MEREP', 3, '4/14/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 7.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10506, 'KOENE', 9, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 21.19, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10507, 'ANTON', 7, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '4/22/1997 12:00:00 AM', 1, 47.45, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10508, 'OTTIK', 1, '4/16/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', 2, 4.99, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10509, 'BLAUS', 4, '4/17/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 0.15, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10510, 'SAVEA', 6, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 3, 367.63, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10511, 'BONAP', 4, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 350.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10512, 'FAMIA', 7, '4/21/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', 2, 3.53, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10513, 'WANDK', 7, '4/22/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 1, 105.65, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10514, 'ERNSH', 3, '4/22/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 2, 789.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10515, 'QUICK', 2, '4/23/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 1, 204.47, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10516, 'HUNGO', 2, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 62.78, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10517, 'NORTS', 3, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 3, 32.07, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10518, 'TORTU', 4, '4/25/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', 2, 218.15, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10519, 'CHOPS', 6, '4/28/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 91.76, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10520, 'SANTG', 7, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 1, 13.37, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10521, 'CACTU', 8, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 17.22, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10522, 'LEHMS', 4, '4/30/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', 1, 45.33, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10523, 'SEVES', 7, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 2, 77.63, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10524, 'BERGS', 1, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 2, 244.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10525, 'BONAP', 1, '5/2/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 11.06, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10526, 'WARTH', 4, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', 2, 58.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10527, 'QUICK', 7, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 1, 41.9, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10528, 'GREAL', 6, '5/6/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 3.35, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10529, 'MAISD', 5, '5/7/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 66.69, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10530, 'PICCO', 3, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 2, 339.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10531, 'OCEAN', 7, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 8.12, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10532, 'EASTC', 7, '5/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 3, 74.46, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10533, 'FOLKO', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', 1, 188.04, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10534, 'LEHMS', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', 2, 27.94, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10535, 'ANTON', 4, '5/13/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/21/1997 12:00:00 AM', 1, 15.64, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10536, 'LEHMS', 3, '5/14/1997 12:00:00 AM', '6/11/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 58.88, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10537, 'RICSU', 1, '5/14/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 78.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10538, 'BSBEV', 9, '5/15/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 3, 4.87, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10539, 'BSBEV', 6, '5/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 3, 12.36, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10540, 'QUICK', 3, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 3, 1007.64, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10541, 'HANAR', 2, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', 1, 68.65, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10542, 'KOENE', 1, '5/20/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', 3, 10.95, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10543, 'LILAS', 8, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 48.17, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10544, 'LONEP', 4, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 24.91, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10545, 'LAZYK', 8, '5/22/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', 2, 11.92, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10546, 'VICTE', 1, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', 3, 194.72, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10547, 'SEVES', 3, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 178.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10548, 'TOMSP', 3, '5/26/1997 12:00:00 AM', '6/23/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 1.43, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10549, 'QUICK', 5, '5/27/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 171.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10550, 'GODOS', 7, '5/28/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 4.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10551, 'FURIB', 4, '5/28/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 72.95, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10552, 'HILAA', 2, '5/29/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 1, 83.22, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10553, 'WARTH', 2, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', 2, 149.49, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10554, 'OTTIK', 4, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 3, 120.97, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10555, 'SAVEA', 6, '6/2/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', 3, 252.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10556, 'SIMOB', 2, '6/3/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 9.8, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10557, 'LEHMS', 9, '6/3/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 96.72, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10558, 'AROUT', 1, '6/4/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', 2, 72.97, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10559, 'BLONP', 6, '6/5/1997 12:00:00 AM', '7/3/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 8.05, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10560, 'FRANK', 8, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 1, 36.65, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10561, 'FOLKO', 2, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 2, 242.21, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10562, 'REGGC', 1, '6/9/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', 1, 22.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10563, 'RICAR', 2, '6/10/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '6/24/1997 12:00:00 AM', 2, 60.43, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10564, 'RATTC', 4, '6/10/1997 12:00:00 AM', '7/8/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', 3, 13.75, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10565, 'MEREP', 8, '6/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 2, 7.15, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10566, 'BLONP', 9, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 1, 88.4, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10567, 'HUNGO', 1, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', 1, 33.97, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10568, 'GALED', 3, '6/13/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 3, 6.54, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10569, 'RATTC', 5, '6/16/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', 1, 58.98, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10570, 'MEREP', 3, '6/17/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', 3, 188.99, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10571, 'ERNSH', 8, '6/17/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 3, 26.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10572, 'BERGS', 3, '6/18/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', 2, 116.43, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10573, 'ANTON', 7, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', 3, 84.84, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10574, 'TRAIH', 4, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 37.6, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10575, 'MORGK', 5, '6/20/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 1, 127.34, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10576, 'TORTU', 3, '6/23/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 3, 18.56, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10577, 'TRAIH', 9, '6/23/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 25.41, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10578, 'BSBEV', 4, '6/24/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 3, 29.6, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10579, 'LETSS', 1, '6/25/1997 12:00:00 AM', '7/23/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 13.73, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10580, 'OTTIK', 4, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/1/1997 12:00:00 AM', 3, 75.89, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10581, 'FAMIA', 3, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', 1, 3.01, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10582, 'BLAUS', 3, '6/27/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 27.71, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10583, 'WARTH', 2, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 7.28, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10584, 'BLONP', 4, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 1, 59.14, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10585, 'WELLI', 7, '7/1/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 1, 13.41, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10586, 'REGGC', 9, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 0.48, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10587, 'QUEDE', 1, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 62.52, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10588, 'QUICK', 2, '7/3/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 3, 194.67, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10589, 'GREAL', 8, '7/4/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 4.42, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10590, 'MEREP', 4, '7/7/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 3, 44.77, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10591, 'VAFFE', 1, '7/7/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 55.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10592, 'LEHMS', 3, '7/8/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 32.1, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10593, 'LEHMS', 7, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', 2, 174.2, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10594, 'OLDWO', 3, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 2, 5.24, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10595, 'ERNSH', 2, '7/10/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 1, 96.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10596, 'WHITC', 8, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 1, 16.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10597, 'PICCO', 7, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 35.12, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10598, 'RATTC', 1, '7/14/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 44.42, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10599, 'BSBEV', 6, '7/15/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 3, 29.98, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10600, 'HUNGC', 4, '7/16/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 1, 45.13, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10601, 'HILAA', 7, '7/16/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 1, 58.3, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10602, 'VAFFE', 8, '7/17/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 2, 2.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10603, 'SAVEA', 8, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 2, 48.77, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10604, 'FURIB', 1, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 1, 7.46, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10605, 'MEREP', 1, '7/21/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 2, 379.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10606, 'TRADH', 4, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', 3, 79.4, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10607, 'SAVEA', 5, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 1, 200.24, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10608, 'TOMSP', 4, '7/23/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 27.79, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10609, 'DUMON', 7, '7/24/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', 2, 1.85, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10610, 'LAMAI', 8, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 1, 26.78, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10611, 'WOLZA', 6, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 80.65, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10612, 'SAVEA', 1, '7/28/1997 12:00:00 AM', '8/25/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 544.08, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10613, 'HILAA', 4, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 8.11, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10614, 'BLAUS', 8, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 3, 1.93, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10615, 'WILMK', 2, '7/30/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 3, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10616, 'GREAL', 1, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', 2, 116.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10617, 'GREAL', 4, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', 2, 18.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10618, 'MEREP', 1, '8/1/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 1, 154.68, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10619, 'MEREP', 3, '8/4/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', 3, 91.05, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10620, 'LAUGB', 2, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 3, 0.94, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10621, 'ISLAT', 4, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 2, 23.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10622, 'RICAR', 4, '8/6/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 3, 50.97, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10623, 'FRANK', 8, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 2, 97.18, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10624, 'THECR', 4, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 94.8, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10625, 'ANATR', 3, '8/8/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 1, 43.9, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10626, 'BERGS', 1, '8/11/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 2, 138.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10627, 'SAVEA', 8, '8/11/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 107.46, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10628, 'BLONP', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 30.36, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10629, 'GODOS', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 85.46, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10630, 'KOENE', 1, '8/13/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 32.35, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10631, 'LAMAI', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', 1, 0.87, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10632, 'WANDK', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 1, 41.38, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10633, 'ERNSH', 7, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', 3, 477.9, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10634, 'FOLIG', 4, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 487.38, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10635, 'MAGAA', 8, '8/18/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 47.46, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10636, 'WARTH', 4, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 1.15, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10637, 'QUEEN', 6, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 201.29, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10638, 'LINOD', 3, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 1, 158.44, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10639, 'SANTG', 7, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', 3, 38.64, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10640, 'WANDK', 4, '8/21/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', 1, 23.55, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10641, 'HILAA', 4, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 2, 179.61, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10642, 'SIMOB', 7, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', 3, 41.89, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10643, 'ALFKI', 6, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 29.46, 'Alfreds Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10644, 'WELLI', 3, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 2, 0.14, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10645, 'HANAR', 4, '8/26/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 12.41, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10646, 'HUNGO', 9, '8/27/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 142.33, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10647, 'QUEDE', 4, '8/27/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 2, 45.54, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10648, 'RICAR', 5, '8/28/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', 2, 14.25, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10649, 'MAISD', 5, '8/28/1997 12:00:00 AM', '9/25/1997 12:00:00 AM', '8/29/1997 12:00:00 AM', 3, 6.2, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10650, 'FAMIA', 5, '8/29/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 176.81, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10651, 'WANDK', 8, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 20.6, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10652, 'GOURL', 4, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 2, 7.14, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10653, 'FRANK', 1, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 93.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10654, 'BERGS', 5, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 1, 55.26, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10655, 'REGGC', 1, '9/3/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 4.41, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10656, 'GREAL', 6, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 1, 57.15, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10657, 'SAVEA', 2, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 2, 352.69, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10658, 'QUICK', 4, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 1, 364.15, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10659, 'QUEEN', 7, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 2, 105.81, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10660, 'HUNGC', 8, '9/8/1997 12:00:00 AM', '10/6/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 1, 111.29, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10661, 'HUNGO', 7, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 3, 17.55, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10662, 'LONEP', 3, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 2, 1.28, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10663, 'BONAP', 2, '9/10/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 113.15, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10664, 'FURIB', 1, '9/10/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 3, 1.27, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10665, 'LONEP', 1, '9/11/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', 2, 26.31, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10666, 'RICSU', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 2, 232.42, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10667, 'ERNSH', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 78.09, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10668, 'WANDK', 1, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 47.22, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10669, 'SIMOB', 2, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 1, 24.39, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10670, 'FRANK', 4, '9/16/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 1, 203.48, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10671, 'FRANR', 1, '9/17/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', 1, 30.34, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10672, 'BERGS', 9, '9/17/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 2, 95.75, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10673, 'WILMK', 2, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 22.76, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10674, 'ISLAT', 4, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 2, 0.9, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10675, 'FRANK', 5, '9/19/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 31.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10676, 'TORTU', 2, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', 2, 2.01, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10677, 'ANTON', 1, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 3, 4.03, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10678, 'SAVEA', 7, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 3, 388.98, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10679, 'BLONP', 8, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 27.94, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10680, 'OLDWO', 1, '9/24/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 1, 26.61, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10681, 'GREAL', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 76.13, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10682, 'ANTON', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 2, 36.13, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10683, 'DUMON', 2, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 1, 4.4, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10684, 'OTTIK', 3, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 1, 145.63, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10685, 'GOURL', 4, '9/29/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 33.75, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10686, 'PICCO', 2, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', 1, 96.5, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10687, 'HUNGO', 9, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', 2, 296.43, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10688, 'VAFFE', 4, '10/1/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 299.09, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10689, 'BERGS', 1, '10/1/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 13.42, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10690, 'HANAR', 1, '10/2/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 1, 15.8, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10691, 'QUICK', 2, '10/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', 2, 810.05, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10692, 'ALFKI', 4, '10/3/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 2, 61.02, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10693, 'WHITC', 3, '10/6/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', 3, 139.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10694, 'QUICK', 8, '10/6/1997 12:00:00 AM', '11/3/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', 3, 398.36, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10695, 'WILMK', 7, '10/7/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 16.72, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10696, 'WHITC', 8, '10/8/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 3, 102.55, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10697, 'LINOD', 3, '10/8/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 45.52, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10698, 'ERNSH', 4, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', 1, 272.47, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10699, 'MORGK', 3, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 3, 0.58, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10700, 'SAVEA', 3, '10/10/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 1, 65.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10701, 'HUNGO', 6, '10/13/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 3, 220.31, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10702, 'ALFKI', 4, '10/13/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 1, 23.94, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10703, 'FOLKO', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', 2, 152.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10704, 'QUEEN', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 4.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10705, 'HILAA', 9, '10/15/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 3.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10706, 'OLDWO', 8, '10/16/1997 12:00:00 AM', '11/13/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 3, 135.63, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10707, 'AROUT', 4, '10/16/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 3, 21.74, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10708, 'THEBI', 6, '10/17/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 2.96, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10709, 'GOURL', 1, '10/17/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '11/20/1997 12:00:00 AM', 3, 210.8, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10710, 'FRANS', 1, '10/20/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 1, 4.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10711, 'SAVEA', 5, '10/21/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 52.41, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10712, 'HUNGO', 3, '10/21/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 1, 89.93, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10713, 'SAVEA', 1, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', 1, 167.05, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10714, 'SAVEA', 5, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 3, 24.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10715, 'BONAP', 3, '10/23/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 1, 63.2, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10716, 'RANCH', 4, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 2, 22.57, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10717, 'FRANK', 1, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 59.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10718, 'KOENE', 1, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 3, 170.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10719, 'LETSS', 8, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 51.44, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10720, 'QUEDE', 8, '10/28/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 9.53, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10721, 'QUICK', 5, '10/29/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 3, 48.92, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10722, 'SAVEA', 8, '10/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/4/1997 12:00:00 AM', 1, 74.58, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10723, 'WHITC', 3, '10/30/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 1, 21.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10724, 'MEREP', 8, '10/30/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 57.75, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10725, 'FAMIA', 4, '10/31/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 3, 10.83, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10726, 'EASTC', 4, '11/3/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 16.56, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10727, 'REGGC', 2, '11/3/1997 12:00:00 AM', '12/1/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 89.9, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10728, 'QUEEN', 4, '11/4/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', 2, 58.33, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10729, 'LINOD', 8, '11/4/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 3, 141.06, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10730, 'BONAP', 5, '11/5/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 20.12, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10731, 'CHOPS', 7, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 96.65, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10732, 'BONAP', 3, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 16.97, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10733, 'BERGS', 1, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/10/1997 12:00:00 AM', 3, 110.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10734, 'GOURL', 2, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', 3, 1.63, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10735, 'LETSS', 6, '11/10/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 45.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10736, 'HUNGO', 9, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 44.1, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10737, 'VINET', 2, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 7.79, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10738, 'SPECD', 2, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 1, 2.91, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10739, 'VINET', 3, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', 3, 11.08, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10740, 'WHITC', 4, '11/13/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 2, 81.88, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10741, 'AROUT', 4, '11/14/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 10.96, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10742, 'BOTTM', 3, '11/14/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 243.73, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10743, 'AROUT', 1, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10744, 'VAFFE', 6, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 69.19, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10745, 'QUICK', 9, '11/18/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 3.52, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10746, 'CHOPS', 1, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 3, 31.43, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10747, 'PICCO', 6, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', 1, 117.33, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10748, 'SAVEA', 3, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 1, 232.55, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10749, 'ISLAT', 4, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 61.53, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10750, 'WARTH', 9, '11/21/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 79.3, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10751, 'RICSU', 3, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', 3, 130.79, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10752, 'NORTS', 2, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 3, 1.39, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10753, 'FRANS', 3, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 7.7, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10754, 'MAGAA', 6, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 3, 2.38, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10755, 'BONAP', 4, '11/26/1997 12:00:00 AM', '12/24/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 2, 16.71, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10756, 'SPLIR', 8, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', 2, 73.21, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10757, 'SAVEA', 6, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', 1, 8.19, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10758, 'RICSU', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', 3, 138.17, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10759, 'ANATR', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 3, 11.99, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10760, 'MAISD', 4, '12/1/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', 1, 155.64, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10761, 'RATTC', 5, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 2, 18.66, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10762, 'FOLKO', 3, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 328.74, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10763, 'FOLIG', 3, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 37.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10764, 'ERNSH', 6, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 145.45, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10765, 'QUICK', 3, '12/4/1997 12:00:00 AM', '1/1/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 3, 42.74, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10766, 'OTTIK', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 157.55, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10767, 'SUPRD', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 3, 1.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10768, 'AROUT', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 2, 146.32, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10769, 'VAFFE', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 65.06, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10770, 'HANAR', 8, '12/9/1997 12:00:00 AM', '1/6/1998 12:00:00 AM', '12/17/1997 12:00:00 AM', 3, 5.32, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10771, 'ERNSH', 9, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 11.19, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10772, 'LEHMS', 3, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 91.28, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10773, 'ERNSH', 1, '12/11/1997 12:00:00 AM', '1/8/1998 12:00:00 AM', '12/16/1997 12:00:00 AM', 3, 96.43, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10774, 'FOLKO', 4, '12/11/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 48.2, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10775, 'THECR', 7, '12/12/1997 12:00:00 AM', '1/9/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 20.25, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10776, 'ERNSH', 1, '12/15/1997 12:00:00 AM', '1/12/1998 12:00:00 AM', '12/18/1997 12:00:00 AM', 3, 351.53, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10777, 'GOURL', 7, '12/15/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 3.01, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10778, 'BERGS', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 1, 6.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10779, 'MORGK', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 2, 58.13, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10780, 'LILAS', 2, '12/16/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', 1, 42.13, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10781, 'WARTH', 2, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 3, 73.16, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10782, 'CACTU', 9, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 1.1, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10783, 'HANAR', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 124.98, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10784, 'MAGAA', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 70.09, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10785, 'GROSR', 1, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 3, 1.51, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10786, 'QUEEN', 8, '12/19/1997 12:00:00 AM', '1/16/1998 12:00:00 AM', '12/23/1997 12:00:00 AM', 1, 110.87, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10787, 'LAMAI', 2, '12/19/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 249.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10788, 'QUICK', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 42.7, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10789, 'FOLIG', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 100.6, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10790, 'GOURL', 6, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 28.23, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10791, 'FRANK', 6, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/1/1998 12:00:00 AM', 2, 16.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10792, 'WOLZA', 1, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 3, 23.79, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10793, 'AROUT', 3, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 3, 4.52, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10794, 'QUEDE', 6, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 1, 21.49, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10795, 'ERNSH', 8, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', 2, 126.66, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10796, 'HILAA', 3, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 26.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10797, 'DRACD', 7, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 33.35, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10798, 'ISLAT', 2, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 1, 2.33, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10799, 'KOENE', 9, '12/26/1997 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 30.76, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10800, 'SEVES', 1, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 137.44, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10801, 'BOLID', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 97.09, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10802, 'SIMOB', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 257.26, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10803, 'WELLI', 4, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/6/1998 12:00:00 AM', 1, 55.23, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10804, 'SEVES', 6, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 2, 27.33, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10805, 'THEBI', 2, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 237.34, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10806, 'VICTE', 3, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 22.11, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10807, 'FRANS', 4, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.36, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10808, 'OLDWO', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 45.53, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10809, 'WELLI', 7, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 1, 4.87, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10810, 'LAUGB', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 3, 4.33, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10811, 'LINOD', 8, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 1, 31.22, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10812, 'REGGC', 5, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 1, 59.78, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10813, 'RICAR', 1, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 1, 47.38, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10814, 'VICTE', 3, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 130.94, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10815, 'SAVEA', 2, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 14.62, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10816, 'GREAL', 4, '1/6/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 2, 719.78, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10817, 'KOENE', 3, '1/6/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 306.07, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10818, 'MAGAA', 7, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 3, 65.48, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10819, 'CACTU', 2, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 19.76, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10820, 'RATTC', 3, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 37.52, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10821, 'SPLIR', 1, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/15/1998 12:00:00 AM', 1, 36.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10822, 'TRAIH', 6, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 7, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10823, 'LILAS', 5, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 163.97, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10824, 'FOLKO', 8, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.23, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10825, 'DRACD', 1, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 79.25, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10826, 'BLONP', 6, '1/12/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 1, 7.09, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10827, 'BONAP', 1, '1/12/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 63.54, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10828, 'RANCH', 9, '1/13/1998 12:00:00 AM', '1/27/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 90.85, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10829, 'ISLAT', 9, '1/13/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 1, 154.72, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10830, 'TRADH', 4, '1/13/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 81.83, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10831, 'SANTG', 3, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 72.19, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10832, 'LAMAI', 2, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 43.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10833, 'OTTIK', 6, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 71.49, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10834, 'TRADH', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 3, 29.78, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10835, 'ALFKI', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 3, 69.53, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10836, 'ERNSH', 7, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 1, 411.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10837, 'BERGS', 9, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 13.32, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10838, 'LINOD', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 59.28, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10839, 'TRADH', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/22/1998 12:00:00 AM', 3, 35.43, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10840, 'LINOD', 4, '1/19/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 2, 2.71, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10841, 'SUPRD', 5, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 424.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10842, 'TORTU', 1, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 3, 54.42, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10843, 'VICTE', 4, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 9.26, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10844, 'PICCO', 8, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 25.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10845, 'QUICK', 8, '1/21/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 212.98, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10846, 'SUPRD', 2, '1/22/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 56.46, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10847, 'SAVEA', 4, '1/22/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 3, 487.57, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10848, 'CONSH', 7, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 38.24, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10849, 'KOENE', 9, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 2, 0.56, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10850, 'VICTE', 1, '1/23/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 49.19, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10851, 'RICAR', 5, '1/26/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 1, 160.55, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10852, 'RATTC', 8, '1/26/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 174.05, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10853, 'BLAUS', 9, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 2, 53.83, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10854, 'ERNSH', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', 2, 100.22, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10855, 'OLDWO', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 170.97, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10856, 'ANTON', 3, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 58.43, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10857, 'BERGS', 8, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 188.85, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10858, 'LACOR', 2, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 1, 52.51, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10859, 'FRANK', 1, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 76.1, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10860, 'FRANR', 3, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 3, 19.26, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10861, 'WHITC', 4, '1/30/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 14.93, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10862, 'LEHMS', 8, '1/30/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 53.23, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10863, 'HILAA', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 30.26, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10864, 'AROUT', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 3.04, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10865, 'QUICK', 2, '2/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 348.14, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10866, 'BERGS', 5, '2/3/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 109.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10867, 'LONEP', 6, '2/3/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 1, 1.93, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10868, 'QUEEN', 7, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 191.27, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10869, 'SEVES', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 143.28, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10870, 'WOLZA', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 3, 12.04, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10871, 'BONAP', 9, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 112.27, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10872, 'GODOS', 5, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 175.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10873, 'WILMK', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 0.82, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10874, 'GODOS', 5, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 2, 19.58, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10875, 'BERGS', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 2, 32.37, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10876, 'BONAP', 7, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 60.42, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10877, 'RICAR', 1, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 1, 38.06, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10878, 'QUICK', 4, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 46.69, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10879, 'WILMK', 3, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 8.5, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10880, 'FOLKO', 7, '2/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 88.01, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10881, 'CACTU', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 2.84, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10882, 'SAVEA', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 23.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10883, 'LONEP', 8, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 0.53, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10884, 'LETSS', 4, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 2, 90.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10885, 'SUPRD', 6, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 3, 5.64, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10886, 'HANAR', 1, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 4.99, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10887, 'GALED', 8, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 3, 1.25, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10888, 'GODOS', 1, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 51.87, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10889, 'RATTC', 9, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 3, 280.61, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10890, 'DUMON', 7, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 32.76, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10891, 'LEHMS', 7, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 20.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10892, 'MAISD', 4, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 120.27, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10893, 'KOENE', 9, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 2, 77.78, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10894, 'SAVEA', 1, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 1, 116.13, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10895, 'ERNSH', 3, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 1, 162.75, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10896, 'MAISD', 7, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 32.45, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10897, 'HUNGO', 3, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', 2, 603.54, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10898, 'OCEAN', 4, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 1.27, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10899, 'LILAS', 5, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 3, 1.21, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10900, 'WELLI', 1, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 1.66, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10901, 'HILAA', 4, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 1, 62.09, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10902, 'FOLKO', 1, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 1, 44.15, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10903, 'HANAR', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 36.71, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10904, 'WHITC', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 162.95, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10905, 'WELLI', 9, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 13.72, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10906, 'WOLZA', 4, '2/25/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 3, 26.29, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10907, 'SPECD', 6, '2/25/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 9.19, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10908, 'REGGC', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 32.96, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10909, 'SANTG', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', 2, 53.05, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10910, 'WILMK', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 38.11, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10911, 'GODOS', 3, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 1, 38.19, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10912, 'HUNGO', 2, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 580.91, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10913, 'QUEEN', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 1, 33.05, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10914, 'QUEEN', 6, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 21.19, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10915, 'TORTU', 2, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 2, 3.51, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10916, 'RANCH', 1, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 63.77, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10917, 'ROMEY', 4, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 2, 8.29, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10918, 'BOTTM', 3, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 48.83, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10919, 'LINOD', 2, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 19.8, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10920, 'AROUT', 4, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 29.61, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10921, 'VAFFE', 1, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 1, 176.48, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10922, 'HANAR', 5, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 3, 62.74, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10923, 'LAMAI', 7, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 68.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10924, 'BERGS', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 2, 151.52, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10925, 'HANAR', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 1, 2.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10926, 'ANATR', 4, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 39.92, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10927, 'LACOR', 4, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 19.79, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10928, 'GALED', 1, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 1.36, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10929, 'FRANK', 6, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 1, 33.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10930, 'SUPRD', 4, '3/6/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 15.55, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10931, 'RICSU', 4, '3/6/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 13.6, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10932, 'BONAP', 8, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 134.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10933, 'ISLAT', 6, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 3, 54.15, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10934, 'LEHMS', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 3, 32.01, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10935, 'WELLI', 4, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 47.59, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10936, 'GREAL', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 33.68, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10937, 'CACTU', 7, '3/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 31.51, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10938, 'QUICK', 3, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 31.89, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10939, 'MAGAA', 2, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 2, 76.33, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10940, 'BONAP', 8, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 3, 19.77, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10941, 'SAVEA', 7, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 400.81, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10942, 'REGGC', 9, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 17.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10943, 'BSBEV', 4, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 2.17, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10944, 'BOTTM', 6, '3/12/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 52.92, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10945, 'MORGK', 4, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 10.22, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10946, 'VAFFE', 1, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 27.2, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10947, 'BSBEV', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 3.26, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10948, 'GODOS', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 3, 23.39, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10949, 'BOTTM', 2, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', 3, 74.44, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10950, 'MAGAA', 1, '3/16/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 2.5, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10951, 'RICSU', 9, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 2, 30.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10952, 'ALFKI', 1, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 40.42, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10953, 'AROUT', 9, '3/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10954, 'LINOD', 5, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 1, 27.91, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10955, 'FOLKO', 8, '3/17/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 3.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10956, 'BLAUS', 6, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 44.65, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10957, 'HILAA', 8, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 105.36, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10958, 'OCEAN', 7, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 49.56, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10959, 'GOURL', 6, '3/18/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 4.98, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10960, 'HILAA', 3, '3/19/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 2.08, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10961, 'QUEEN', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 1, 104.47, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10962, 'QUICK', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 275.79, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10963, 'FURIB', 9, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 3, 2.7, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10964, 'SPECD', 3, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 2, 87.38, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10965, 'OLDWO', 6, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 3, 144.38, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10966, 'CHOPS', 4, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 27.19, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10967, 'TOMSP', 2, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 62.22, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10968, 'ERNSH', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', 3, 74.6, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10969, 'COMMI', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 2, 0.21, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10970, 'BOLID', 9, '3/24/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 1, 16.16, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10971, 'FRANR', 2, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 121.82, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10972, 'LACOR', 4, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 2, 0.02, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10973, 'LACOR', 6, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 15.17, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10974, 'SPLIR', 3, '3/25/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 12.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10975, 'BOTTM', 1, '3/25/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 32.27, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10976, 'HILAA', 1, '3/25/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 1, 37.97, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10977, 'FOLKO', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 208.5, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10978, 'MAISD', 9, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 2, 32.82, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10979, 'ERNSH', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', 2, 353.07, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10980, 'FOLKO', 4, '3/27/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 1, 1.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10981, 'HANAR', 1, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 193.37, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10982, 'BOTTM', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 14.01, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10983, 'SAVEA', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 2, 657.54, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10984, 'SAVEA', 1, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 211.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10985, 'HUNGO', 2, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 91.51, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10986, 'OCEAN', 8, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 217.86, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10987, 'EASTC', 8, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 1, 185.48, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10988, 'RATTC', 3, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 61.14, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10989, 'QUEDE', 2, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 34.76, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10990, 'ERNSH', 2, '4/1/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 3, 117.61, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10991, 'QUICK', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 1, 38.51, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10992, 'THEBI', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 4.27, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10993, 'FOLKO', 7, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 8.81, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10994, 'VAFFE', 2, '4/2/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', 3, 65.53, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10995, 'PERIC', 1, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 3, 46, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10996, 'QUICK', 4, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 1.12, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10997, 'LILAS', 8, '4/3/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 73.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10998, 'WOLZA', 8, '4/3/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 2, 20.31, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10999, 'OTTIK', 6, '4/3/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 96.35, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11000, 'RATTC', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 3, 55.12, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11001, 'FOLKO', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 2, 197.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11002, 'SAVEA', 4, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 1, 141.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11003, 'THECR', 3, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 3, 14.91, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11004, 'MAISD', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 44.84, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11005, 'WILMK', 2, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11006, 'GREAL', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 2, 25.19, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11007, 'PRINI', 8, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 202.24, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11008, 'ERNSH', 7, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', NULL, 3, 79.46, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11009, 'GODOS', 2, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 59.11, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11010, 'REGGC', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 28.71, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11011, 'ALFKI', 3, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 1, 1.21, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11012, 'FRANK', 1, '4/9/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 3, 242.95, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11013, 'ROMEY', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 32.99, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11014, 'LINOD', 2, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 3, 23.6, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11015, 'SANTG', 2, '4/10/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 4.62, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11016, 'AROUT', 9, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 33.8, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11017, 'ERNSH', 9, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 754.26, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11018, 'LONEP', 4, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 11.65, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11019, 'RANCH', 6, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', NULL, 3, 3.17, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11020, 'OTTIK', 2, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 43.3, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11021, 'QUICK', 3, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 1, 297.18, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11022, 'HANAR', 9, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 6.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11023, 'BSBEV', 1, '4/14/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 123.83, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11024, 'EASTC', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 74.36, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11025, 'WARTH', 6, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 3, 29.17, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11026, 'FRANS', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 1, 47.09, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11027, 'BOTTM', 1, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 52.52, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11028, 'KOENE', 2, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 1, 29.59, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11029, 'CHOPS', 4, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 47.84, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11030, 'SAVEA', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 2, 830.75, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11031, 'SAVEA', 6, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 227.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11032, 'WHITC', 2, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 606.19, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11033, 'RICSU', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 84.74, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11034, 'OLDWO', 8, '4/20/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 40.32, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11035, 'SUPRD', 2, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 0.17, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11036, 'DRACD', 8, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 3, 149.47, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11037, 'GODOS', 7, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 3.2, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11038, 'SUPRD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 2, 29.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11039, 'LINOD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', NULL, 2, 65, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11040, 'GREAL', 4, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', NULL, 3, 18.84, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11041, 'CHOPS', 3, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 2, 48.22, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11042, 'COMMI', 2, '4/22/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 29.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11043, 'SPECD', 5, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 8.8, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11044, 'WOLZA', 4, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 8.72, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11045, 'BOTTM', 6, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', NULL, 2, 70.58, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11046, 'WANDK', 8, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 71.64, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11047, 'EASTC', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 46.62, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11048, 'BOTTM', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 3, 24.12, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11049, 'GOURL', 3, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 8.34, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11050, 'FOLKO', 8, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 59.41, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11051, 'LAMAI', 7, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', NULL, 3, 2.79, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11052, 'HANAR', 3, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 67.26, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11053, 'PICCO', 2, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 53.05, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11054, 'CACTU', 8, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', NULL, 1, 0.33, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11055, 'HILAA', 7, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 120.92, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11056, 'EASTC', 8, '4/28/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 2, 278.96, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11057, 'NORTS', 3, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 4.13, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11058, 'BLAUS', 9, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', NULL, 3, 31.14, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11059, 'RICAR', 2, '4/29/1998 12:00:00 AM', '6/10/1998 12:00:00 AM', NULL, 2, 85.8, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11060, 'FRANS', 2, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 10.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11061, 'GREAL', 4, '4/30/1998 12:00:00 AM', '6/11/1998 12:00:00 AM', NULL, 3, 14.01, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11062, 'REGGC', 4, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', NULL, 2, 29.93, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11063, 'HUNGO', 3, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 81.73, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11064, 'SAVEA', 1, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 30.09, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11065, 'LILAS', 8, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', NULL, 1, 12.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11066, 'WHITC', 7, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 44.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11067, 'DRACD', 1, '5/4/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 7.98, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11068, 'QUEEN', 8, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', NULL, 2, 81.75, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11069, 'TORTU', 1, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 15.67, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11070, 'LEHMS', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 136, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11071, 'LILAS', 1, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 0.93, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11072, 'ERNSH', 4, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 258.64, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11073, 'PERIC', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 24.95, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11074, 'SIMOB', 7, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 18.44, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11075, 'RICSU', 8, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 6.19, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11076, 'BONAP', 4, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 38.28, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11077, 'RATTC', 1, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 8.53, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (1, 'Exotic Liquids', 'Charlotte Cooper', 'Purchasing Manager', '49 Gilbert St.', 'London', NULL, 'EC1 4SD', 'UK', '(171) 555-2222', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (2, 'New Orleans Cajun Delights', 'Shelley Burke', 'Order Administrator', 'P.O. Box 78934', 'New Orleans', 'LA', '70117', 'USA', '(100) 555-4822', NULL, '#CAJUN.HTM#' ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (3, 'Grandma Kelly''s Homestead', 'Regina Murphy', 'Sales Representative', '707 Oxford Rd.', 'Ann Arbor', 'MI', '48104', 'USA', '(313) 555-5735', '(313) 555-3349', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (4, 'Tokyo Traders', 'Yoshi Nagase', 'Marketing Manager', '9-8 Sekimai Musashino-shi', 'Tokyo', NULL, '100', 'Japan', '(03) 3555-5011', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (5, 'Cooperativa de Quesos ''Las Cabras''', 'Antonio del Valle Saavedra', 'Export Administrator', 'Calle del Rosal 4', 'Oviedo', 'Asturias', '33007', 'Spain', '(98) 598 76 54', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (6, 'Mayumi''s', 'Mayumi Ohno', 'Marketing Representative', '92 Setsuko Chuo-ku', 'Osaka', NULL, '545', 'Japan', '(06) 431-7877', NULL, 'Mayumi''s (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/mayumi.htm#' ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (7, 'Pavlova, Ltd.', 'Ian Devling', 'Marketing Manager', '74 Rose St. Moonie Ponds', 'Melbourne', 'Victoria', '3058', 'Australia', '(03) 444-2343', '(03) 444-6588', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (8, 'Specialty Biscuits, Ltd.', 'Peter Wilson', 'Sales Representative', '29 King''s Way', 'Manchester', NULL, 'M14 GSD', 'UK', '(161) 555-4448', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (9, 'PB Kn�ckebr�d AB', 'Lars Peterson', 'Sales Agent', 'Kaloadagatan 13', 'G�teborg', NULL, 'S-345 67', 'Sweden', '031-987 65 43', '031-987 65 91', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (10, 'Refrescos Americanas LTDA', 'Carlos Diaz', 'Marketing Manager', 'Av. das Americanas 12.890', 'Sao Paulo', NULL, '5442', 'Brazil', '(11) 555 4640', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (11, 'Heli S��waren GmbH & Co. KG', 'Petra Winkler', 'Sales Manager', 'Tiergartenstra�e 5', 'Berlin', NULL, '10785', 'Germany', '(010) 9984510', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (12, 'Plutzer Lebensmittelgro�m�rkte AG', 'Martin Bein', 'International Marketing Mgr.', 'Bogenallee 51', 'Frankfurt', NULL, '60439', 'Germany', '(069) 992755', NULL, 'Plutzer (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/plutzer.htm#' ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (13, 'Nord-Ost-Fisch Handelsgesellschaft mbH', 'Sven Petersen', 'Coordinator Foreign Markets', 'Frahmredder 112a', 'Cuxhaven', NULL, '27478', 'Germany', '(04721) 8713', '(04721) 8714', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (14, 'Formaggi Fortini s.r.l.', 'Elio Rossi', 'Sales Representative', 'Viale Dante, 75', 'Ravenna', NULL, '48100', 'Italy', '(0544) 60323', '(0544) 60603', '#FORMAGGI.HTM#' ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (15, 'Norske Meierier', 'Beate Vileid', 'Marketing Manager', 'Hatlevegen 5', 'Sandvika', NULL, '1320', 'Norway', '(0)2-953010', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (16, 'Bigfoot Breweries', 'Cheryl Saylor', 'Regional Account Rep.', '3400 - 8th Avenue Suite 210', 'Bend', 'OR', '97101', 'USA', '(503) 555-9931', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (17, 'Svensk Sj�f�da AB', 'Michael Bj�rn', 'Sales Representative', 'Brovallav�gen 231', 'Stockholm', NULL, 'S-123 45', 'Sweden', '08-123 45 67', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (18, 'Aux joyeux eccl�siastiques', 'Guyl�ne Nodier', 'Sales Manager', '203, Rue des Francs-Bourgeois', 'Paris', NULL, '75004', 'France', '(1) 03.83.00.68', '(1) 03.83.00.62', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (19, 'New England Seafood Cannery', 'Robb Merchant', 'Wholesale Account Agent', 'Order Processing Dept. 2100 Paul Revere Blvd.', 'Boston', 'MA', '02134', 'USA', '(617) 555-3267', '(617) 555-3389', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (20, 'Leka Trading', 'Chandra Leka', 'Owner', '471 Serangoon Loop, Suite #402', 'Singapore', NULL, '0512', 'Singapore', '555-8787', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (21, 'Lyngbysild', 'Niels Petersen', 'Sales Manager', 'Lyngbysild Fiskebakken 10', 'Lyngby', NULL, '2800', 'Denmark', '43844108', '43844115', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (22, 'Zaanse Snoepfabriek', 'Dirk Luchte', 'Accounting Manager', 'Verkoop Rijnweg 22', 'Zaandam', NULL, '9999 ZZ', 'Netherlands', '(12345) 1212', '(12345) 1210', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (23, 'Karkki Oy', 'Anne Heikkonen', 'Product Manager', 'Valtakatu 12', 'Lappeenranta', NULL, '53120', 'Finland', '(953) 10956', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (24, 'G''day, Mate', 'Wendy Mackenzie', 'Sales Representative', '170 Prince Edward Parade Hunter''s Hill', 'Sydney', 'NSW', '2042', 'Australia', '(02) 555-5914', '(02) 555-4873', 'G''day Mate (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/gdaymate.htm#' ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (25, 'Ma Maison', 'Jean-Guy Lauzon', 'Marketing Manager', '2960 Rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-9022', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (26, 'Pasta Buttini s.r.l.', 'Giovanni Giudici', 'Order Administrator', 'Via dei Gelsomini, 153', 'Salerno', NULL, '84100', 'Italy', '(089) 6547665', '(089) 6547667', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (27, 'Escargots Nouveaux', 'Marie Delamare', 'Sales Manager', '22, rue H. Voiron', 'Montceau', NULL, '71300', 'France', '85.57.00.07', NULL, NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (28, 'Gai p�turage', 'Eliane Noz', 'Sales Representative', 'Bat. B 3, rue des Alpes', 'Annecy', NULL, '74000', 'France', '38.76.98.06', '38.76.98.58', NULL ) ;
-INSERT INTO SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (29, 'For�ts d''�rables', 'Chantal Goulet', 'Accounting Manager', '148 rue Chasseur', 'Ste-Hyacinthe', 'Qu�bec', 'J2S 7S8', 'Canada', '(514) 555-2955', '(514) 555-2921', NULL ) ;
-
-
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (1, 'Chai', 1, 1, '10 boxes x 20 bags', 18, 520, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (2, 'Chang', 1, 1, '24 - 12 oz bottles', 19, 522, 40, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (3, 'Aniseed Syrup', 1, 2, '12 - 550 ml bottles', 10, 13, 70, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (4, 'Chef Anton''s Cajun Seasoning', 2, 2, '48 - 6 oz jars', 22, 53, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (5, 'Chef Anton''s Gumbo Mix', 2, 2, '36 boxes', 21.35, 0, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (6, 'Grandma''s Boysenberry Spread', 3, 2, '12 - 8 oz jars', 25, 120, 0, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (7, 'Uncle Bob''s Organic Dried Pears', 3, 7, '12 - 1 lb pkgs.', 30, 15, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (8, 'Northwoods Cranberry Sauce', 3, 2, '12 - 12 oz jars', 40, 6, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (9, 'Mishi Kobe Niku', 4, 6, '18 - 500 g pkgs.', 97, 29, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (10, 'Ikura', 4, 8, '12 - 200 ml jars', 31, 31, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (11, 'Queso Cabrales', 5, 4, '1 kg pkg.', 21, 22, 30, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (12, 'Queso Manchego La Pastora', 5, 4, '10 - 500 g pkgs.', 38, 86, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (13, 'Konbu', 6, 8, '2 kg box', 6, 24, 0, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (14, 'Tofu', 6, 7, '40 - 100 g pkgs.', 23.25, 35, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (15, 'Genen Shouyu', 6, 2, '24 - 250 ml bottles', 15.5, 39, 0, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (16, 'Pavlova', 7, 3, '32 - 500 g boxes', 17.45, 29, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (17, 'Alice Mutton', 7, 6, '20 - 1 kg tins', 39, 0, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (18, 'Carnarvon Tigers', 7, 8, '16 kg pkg.', 62.5, 42, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (19, 'Teatime Chocolate Biscuits', 8, 3, '10 boxes x 12 pieces', 9.2, 25, 0, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (20, 'Sir Rodney''s Marmalade', 8, 3, '30 gift boxes', 81, 40, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (21, 'Sir Rodney''s Scones', 8, 3, '24 pkgs. x 4 pieces', 10, 3, 40, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (22, 'Gustaf''s Kn�ckebr�d', 9, 5, '24 - 500 g pkgs.', 21, 104, 0, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (23, 'Tunnbr�d', 9, 5, '12 - 250 g pkgs.', 9, 61, 0, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (24, 'Guaran� Fant�stica', 10, 1, '12 - 355 ml cans', 4.5, 20, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (25, 'NuNuCa Nu�-Nougat-Creme', 11, 3, '20 - 450 g glasses', 14, 76, 0, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (26, 'Gumb�r Gummib�rchen', 11, 3, '100 - 250 g bags', 31.23, 15, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (27, 'Schoggi Schokolade', 11, 3, '100 - 100 g pieces', 43.9, 49, 0, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (28, 'R�ssle Sauerkraut', 12, 7, '25 - 825 g cans', 45.6, 26, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (29, 'Th�ringer Rostbratwurst', 12, 6, '50 bags x 30 sausgs.', 123.79, 0, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (30, 'Nord-Ost Matjeshering', 13, 8, '10 - 200 g glasses', 25.89, 10, 0, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (31, 'Gorgonzola Telino', 14, 4, '12 - 100 g pkgs', 12.5, 0, 70, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (32, 'Mascarpone Fabioli', 14, 4, '24 - 200 g pkgs.', 32, 9, 40, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (33, 'Geitost', 15, 4, '500 g', 2.5, 112, 0, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (34, 'Sasquatch Ale', 16, 1, '24 - 12 oz bottles', 14, 111, 0, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (35, 'Steeleye Stout', 16, 1, '24 - 12 oz bottles', 18, 20, 0, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (36, 'Inlagd Sill', 17, 8, '24 - 250 g  jars', 19, 112, 0, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (37, 'Gravad lax', 17, 8, '12 - 500 g pkgs.', 26, 11, 50, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (38, 'C�te de Blaye', 18, 1, '12 - 75 cl bottles', 263.5, 17, 0, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (39, 'Chartreuse verte', 18, 1, '750 cc per bottle', 18, 69, 0, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (40, 'Boston Crab Meat', 19, 8, '24 - 4 oz tins', 18.4, 123, 0, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (41, 'Jack''s New England Clam Chowder', 19, 8, '12 - 12 oz cans', 9.65, 85, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (42, 'Singaporean Hokkien Fried Mee', 20, 5, '32 - 1 kg pkgs.', 14, 26, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (43, 'Ipoh Coffee', 20, 1, '16 - 500 g tins', 46, 17, 10, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (44, 'Gula Malacca', 20, 2, '20 - 2 kg bags', 19.45, 27, 0, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (45, 'Rogede sild', 21, 8, '1k pkg.', 9.5, 5, 70, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (46, 'Spegesild', 21, 8, '4 - 450 g glasses', 12, 95, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (47, 'Zaanse koeken', 22, 3, '10 - 4 oz boxes', 9.5, 36, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (48, 'Chocolade', 22, 3, '10 pkgs.', 12.75, 15, 70, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (49, 'Maxilaku', 23, 3, '24 - 50 g pkgs.', 20, 10, 60, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (50, 'Valkoinen suklaa', 23, 3, '12 - 100 g bars', 16.25, 65, 0, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (51, 'Manjimup Dried Apples', 24, 7, '50 - 300 g pkgs.', 53, 20, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (52, 'Filo Mix', 24, 5, '16 - 2 kg boxes', 7, 38, 0, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (53, 'Perth Pasties', 24, 6, '48 pieces', 32.8, 0, 0, 0, 1 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (54, 'Tourti�re', 25, 6, '16 pies', 7.45, 21, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (55, 'P�t� chinois', 25, 6, '24 boxes x 2 pies', 24, 115, 0, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (56, 'Gnocchi di nonna Alice', 26, 5, '24 - 250 g pkgs.', 38, 21, 10, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (57, 'Ravioli Angelo', 26, 5, '24 - 250 g pkgs.', 19.5, 36, 0, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (58, 'Escargots de Bourgogne', 27, 8, '24 pieces', 13.25, 62, 0, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (59, 'Raclette Courdavault', 28, 4, '5 kg pkg.', 55, 79, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (60, 'Camembert Pierrot', 28, 4, '15 - 300 g rounds', 34, 19, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (61, 'Sirop d''�rable', 29, 2, '24 - 500 ml bottles', 28.5, 113, 0, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (62, 'Tarte au sucre', 29, 3, '48 pies', 49.3, 17, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (63, 'Vegie-spread', 7, 2, '15 - 625 g jars', 43.9, 24, 0, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (64, 'Wimmers gute Semmelkn�del', 12, 5, '20 bags x 4 pieces', 33.25, 22, 80, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (65, 'Louisiana Fiery Hot Pepper Sauce', 2, 2, '32 - 8 oz bottles', 21.05, 76, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (66, 'Louisiana Hot Spiced Okra', 2, 2, '24 - 8 oz jars', 17, 4, 100, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (67, 'Laughing Lumberjack Lager', 16, 1, '24 - 12 oz bottles', 14, 52, 0, 10, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (68, 'Scottish Longbreads', 8, 3, '10 boxes x 8 pieces', 12.5, 6, 10, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (69, 'Gudbrandsdalsost', 15, 4, '10 kg pkg.', 36, 26, 0, 15, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (70, 'Outback Lager', 7, 1, '24 - 355 ml bottles', 15, 15, 10, 30, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (71, 'Flotemysost', 15, 4, '10 - 500 g pkgs.', 21.5, 26, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (72, 'Mozzarella di Giovanni', 14, 4, '24 - 200 g pkgs.', 34.8, 14, 0, 0, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (73, 'R�d Kaviar', 17, 8, '24 - 150 g jars', 15, 101, 0, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (74, 'Longlife Tofu', 4, 7, '5 kg pkg.', 10, 4, 20, 5, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (75, 'Rh�nbr�u Klosterbier', 12, 1, '24 - 0.5 l bottles', 7.75, 125, 0, 25, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (76, 'Lakkalik��ri', 23, 1, '500 ml', 18, 57, 0, 20, 0 ) ;
-INSERT INTO PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (77, 'Original Frankfurter gr�ne So�e', 12, 2, '12 boxes', 13, 32, 0, 15, 0 ) ;
-
-
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01581','Westboro',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01730','Bedford',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01833','Georgetow',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02116','Boston',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02139','Cambridge',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02184','Braintree',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02903','Providence',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('03049','Hollis',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('03801','Portsmouth',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('06897','Wilton',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('07960','Morristown',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('08837','Edison',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('10019','New York',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('10038','New York',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('11747','Mellvile',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('14450','Fairport',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('19428','Philadelphia',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('19713','Neward',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('20852','Rockville',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('27403','Greensboro',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('27511','Cary',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('29202','Columbia',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('30346','Atlanta',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('31406','Savannah',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('32859','Orlando',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('33607','Tampa',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('40222','Louisville',1) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('44122','Beachwood',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('45839','Findlay',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48075','Southfield',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48084','Troy',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48304','Bloomfield Hills',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('53404','Racine',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('55113','Roseville',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('55439','Minneapolis',3) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('60179','Hoffman Estates',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('60601','Chicago',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('72716','Bentonville',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('75234','Dallas',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('78759','Austin',4) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('80202','Denver',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('80909','Colorado Springs',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('85014','Phoenix',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('85251','Scottsdale',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('90405','Santa Monica',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('94025','Menlo Park',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('94105','San Francisco',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95008','Campbell',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95054','Santa Clara',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95060','Santa Cruz',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98004','Bellevue',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98052','Redmond',2) ;
-INSERT INTO TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98104','Seattle',2) ;
-
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '06897' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '19713' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01581' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01730' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01833' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02116' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02139' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02184' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '40222' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '30346' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '31406' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '32859' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '33607' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '20852' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27403' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27511' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '02903' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '07960' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '08837' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10019' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10038' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '11747' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '14450' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85014' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85251' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98004' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98052' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98104' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60179' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60601' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80202' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80909' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '90405' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94025' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94105' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95008' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95054' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95060' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '19428' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '44122' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '45839' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '53404' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03049' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03801' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48075' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48084' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48304' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55113' ) ;
-INSERT INTO EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55439' ) ;
-
-
-
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 11, 14, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 42, 9.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 72, 34.8, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 14, 18.6, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 51, 42.4, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 41, 7.7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 51, 42.4, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 65, 16.8, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 22, 16.8, 6, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 57, 15.6, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 65, 16.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 20, 64.8, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 33, 2, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 60, 27.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 31, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 39, 14.4, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 49, 16, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 24, 3.6, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 55, 19.2, 21, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 74, 8, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 2, 15.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 16, 13.9, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 36, 15.2, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 59, 44, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 53, 26.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 77, 10.4, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 27, 35.1, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 39, 14.4, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 77, 10.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 2, 15.2, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 5, 17, 65, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 21, 8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 37, 20.8, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 41, 7.7, 16, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 57, 15.6, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 62, 39.4, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 70, 12, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 21, 8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 35, 14.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 5, 17, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 7, 24, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 56, 30.4, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 16, 13.9, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 24, 3.6, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 30, 20.7, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 74, 8, 36, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 2, 15.2, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 41, 7.7, 25, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 17, 31.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 70, 12, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10266, 12, 30.4, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 40, 14.7, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 59, 44, 70, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 76, 14.4, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 29, 99, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 72, 27.8, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 33, 2, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 72, 27.8, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 36, 15.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 43, 36.8, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10271, 33, 2, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 20, 64.8, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 31, 10, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 72, 27.8, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 10, 24.8, 24, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 31, 10, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 33, 2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 40, 14.7, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 76, 14.4, 33, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 71, 17.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 72, 27.8, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 24, 3.6, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 59, 44, 6, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 10, 24.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 13, 4.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 28, 36.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 62, 39.4, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 44, 15.5, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 59, 44, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 63, 35.1, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 73, 12, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10279, 17, 31.2, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 24, 3.6, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 55, 19.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 75, 6.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 19, 7.3, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 24, 3.6, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 35, 14.4, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 30, 20.7, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 57, 15.6, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 15, 12.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 19, 7.3, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 60, 27.2, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 72, 27.8, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 27, 35.1, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 44, 15.5, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 60, 27.2, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 67, 11.2, 5, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 1, 14.4, 45, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 40, 14.7, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 53, 26.2, 36, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 35, 14.4, 100, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 62, 39.4, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 16, 13.9, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 34, 11.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 46, 9.6, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 54, 5.9, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 68, 10, 3, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 3, 8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 64, 26.6, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 5, 17, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 29, 99, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 49, 16, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 77, 10.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 13, 4.8, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 44, 15.5, 24, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 51, 42.4, 2, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10292, 20, 64.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 18, 50, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 24, 3.6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 63, 35.1, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 75, 6.2, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 1, 14.4, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 17, 31.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 43, 36.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 60, 27.2, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 75, 6.2, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10295, 56, 30.4, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 11, 16.8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 16, 13.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 69, 28.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 39, 14.4, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 72, 27.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 2, 15.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 36, 15.2, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 59, 44, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 62, 39.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 19, 7.3, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 70, 12, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 66, 13.6, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 68, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 40, 14.7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 56, 30.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 17, 31.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 28, 36.4, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 43, 36.8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 40, 14.7, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 65, 16.8, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 68, 10, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 49, 16, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 59, 44, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 71, 17.2, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 18, 50, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 29, 99, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 39, 14.4, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 30, 20.7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 53, 26.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 54, 5.9, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 62, 39.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 68, 10, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 69, 28.8, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 70, 12, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 4, 17.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 6, 20, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 42, 11.2, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 43, 36.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 71, 17.2, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 16, 13.9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 62, 39.4, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 42, 11.2, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 69, 28.8, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 28, 36.4, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 43, 36.8, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 53, 26.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 75, 6.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10313, 36, 15.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 32, 25.6, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 58, 10.6, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 62, 39.4, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 34, 11.2, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 70, 12, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 41, 7.7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 62, 39.4, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10317, 1, 14.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 41, 7.7, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 76, 14.4, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 17, 31.2, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 28, 36.4, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 76, 14.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10320, 71, 17.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10321, 35, 14.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10322, 52, 5.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 15, 12.4, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 25, 11.2, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 39, 14.4, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 35, 14.4, 70, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 46, 9.6, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 59, 44, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 63, 35.1, 80, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 6, 20, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 13, 4.8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 14, 18.6, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 31, 10, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 72, 27.8, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 4, 17.6, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 57, 15.6, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 75, 6.2, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 2, 15.2, 25, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 11, 16.8, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 30, 20.7, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 58, 10.6, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 59, 44, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 65, 16.8, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 68, 10, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 19, 7.3, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 30, 20.7, 8, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 56, 30.4, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 26, 24.9, 50, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 72, 27.8, 25, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10331, 54, 5.9, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 18, 50, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 42, 11.2, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 47, 7.6, 16, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 14, 18.6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 21, 8, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 71, 17.2, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 52, 5.6, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 68, 10, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 2, 15.2, 7, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 31, 10, 25, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 51, 42.4, 48, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10336, 4, 17.6, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 23, 7.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 26, 24.9, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 36, 15.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 37, 20.8, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 72, 27.8, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 17, 31.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 30, 20.7, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 4, 17.6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 17, 31.2, 70, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 62, 39.4, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 18, 50, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 41, 7.7, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 43, 36.8, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 33, 2, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 59, 44, 9, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 2, 15.2, 24, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 31, 10, 56, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 36, 15.2, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 55, 19.2, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 64, 26.6, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 68, 10, 4, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 76, 14.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 4, 17.6, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 8, 32, 70, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 8, 32, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 19, 7.3, 80, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 42, 11.2, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 17, 31.2, 36, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 56, 30.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 25, 11.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 39, 14.4, 50, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 40, 14.7, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 75, 6.2, 6, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 23, 7.2, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10349, 54, 5.9, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 50, 13, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 69, 28.8, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 41, 7.7, 13, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 44, 15.5, 77, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 65, 16.8, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 24, 3.6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 54, 5.9, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 11, 16.8, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 38, 210.8, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 1, 14.4, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 29, 99, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 24, 3.6, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 57, 15.6, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 31, 10, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 55, 19.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 69, 28.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 10, 24.8, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 26, 24.9, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 60, 27.2, 8, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 24, 3.6, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 34, 11.2, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 36, 15.2, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 16, 13.9, 56, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 31, 10, 70, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 60, 27.2, 80, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 28, 36.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 29, 99, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 38, 210.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 49, 16, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 54, 5.9, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 39, 14.4, 54, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 60, 27.2, 55, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 25, 11.2, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 51, 42.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 54, 5.9, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 31, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 75, 6.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 76, 14.4, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 69, 28.8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 71, 17.2, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10365, 11, 16.8, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 65, 16.8, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 77, 10.4, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 34, 11.2, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 54, 5.9, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 65, 16.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 77, 10.4, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 21, 8, 5, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 28, 36.4, 13, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 57, 15.6, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 29, 99, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 56, 30.4, 18, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 64, 26.6, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 74, 8, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10371, 36, 15.2, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 20, 64.8, 12, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 38, 210.8, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 60, 27.2, 70, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 72, 27.8, 42, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 58, 10.6, 80, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 71, 17.2, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 31, 10, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 58, 10.6, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 14, 18.6, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 54, 5.9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10376, 31, 10, 42, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 28, 36.4, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 39, 14.4, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10378, 71, 17.2, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 41, 7.7, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 63, 35.1, 16, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 65, 16.8, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 30, 20.7, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 53, 26.2, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 60, 27.2, 6, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 70, 12, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10381, 74, 8, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 5, 17, 32, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 18, 50, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 29, 99, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 33, 2, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 74, 8, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 13, 4.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 50, 13, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 56, 30.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 20, 64.8, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 60, 27.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 7, 24, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 60, 27.2, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 68, 10, 8, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 24, 3.6, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 34, 11.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 24, 3.6, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 28, 36.4, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 59, 44, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 71, 17.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 45, 7.6, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 52, 5.6, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 53, 26.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 10, 24.8, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 55, 19.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 62, 39.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 70, 12, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 31, 10, 60, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 35, 14.4, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 46, 9.6, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 72, 27.8, 24, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10391, 13, 4.8, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10392, 69, 28.8, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 2, 15.2, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 14, 18.6, 42, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 25, 11.2, 7, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 26, 24.9, 70, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 31, 10, 32, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 13, 4.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 62, 39.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 46, 9.6, 28, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 53, 26.2, 70, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 69, 28.8, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 23, 7.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 71, 17.2, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 72, 27.8, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 21, 8, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 51, 42.4, 18, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 35, 14.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 68, 10, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 71, 17.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 76, 14.4, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 77, 10.4, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 29, 99, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 35, 14.4, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 49, 16, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 30, 20.7, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 56, 30.4, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 65, 16.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 71, 17.2, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 23, 7.2, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 63, 35.1, 65, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 48, 10.2, 70, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 26, 24.9, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 42, 11.2, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 49, 16, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10405, 3, 8, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 1, 14.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 21, 8, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 28, 36.4, 42, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 36, 15.2, 5, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 40, 14.7, 2, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 11, 16.8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 69, 28.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 71, 17.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 37, 20.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 54, 5.9, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 62, 39.4, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 14, 18.6, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 21, 8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 33, 2, 49, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 59, 44, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 41, 7.7, 25, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 44, 15.5, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 59, 44, 9, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10412, 14, 18.6, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 1, 14.4, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 62, 39.4, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 76, 14.4, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 19, 7.3, 18, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 33, 2, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 17, 31.2, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 33, 2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 19, 7.3, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 53, 26.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 57, 15.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 38, 210.8, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 46, 9.6, 2, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 68, 10, 36, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 77, 10.4, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 2, 15.2, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 47, 7.6, 55, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 61, 22.8, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 74, 8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 60, 27.2, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 69, 28.8, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 9, 77.6, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 13, 4.8, 2, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 70, 12, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 73, 12, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 19, 7.3, 4, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 26, 24.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 53, 26.2, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 77, 10.4, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10422, 26, 24.9, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 31, 10, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 59, 44, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 35, 14.4, 60, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 38, 210.8, 49, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 68, 10, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 55, 19.2, 10, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 76, 14.4, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 56, 30.4, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 64, 26.6, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10427, 14, 18.6, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10428, 46, 9.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 50, 13, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 63, 35.1, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 17, 31.2, 45, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 21, 8, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 56, 30.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 59, 44, 70, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 17, 31.2, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 40, 14.7, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 47, 7.6, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 26, 24.9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 54, 5.9, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10433, 56, 30.4, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 11, 16.8, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 76, 14.4, 18, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 2, 15.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 22, 16.8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 72, 27.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 46, 9.6, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 56, 30.4, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 64, 26.6, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 75, 6.2, 24, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10437, 53, 26.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 19, 7.3, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 34, 11.2, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 57, 15.6, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 12, 30.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 16, 13.9, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 64, 26.6, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 74, 8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 2, 15.2, 45, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 16, 13.9, 49, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 29, 99, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 61, 22.8, 90, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10441, 27, 35.1, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 11, 16.8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 54, 5.9, 80, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 66, 13.6, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 11, 16.8, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 28, 36.4, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 17, 31.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 26, 24.9, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 35, 14.4, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 41, 7.7, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 39, 14.4, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 54, 5.9, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 19, 7.3, 12, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 24, 3.6, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 31, 10, 3, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 52, 5.6, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 19, 7.3, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 65, 16.8, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 71, 17.2, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 26, 24.9, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 40, 14.7, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 10, 24.8, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 52, 5.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 62, 39.4, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 10, 24.8, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 54, 5.9, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 65, 16.8, 28, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 77, 10.4, 55, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 28, 36.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 44, 15.5, 100, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 48, 10.2, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 70, 12, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 16, 13.9, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 33, 2, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 46, 9.6, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 39, 14.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 53, 26.2, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 61, 22.8, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 71, 17.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 21, 8, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 49, 16, 21, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10457, 59, 44, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 26, 24.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 28, 36.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 43, 36.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 56, 30.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 71, 17.2, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 7, 24, 16, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 46, 9.6, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 72, 27.8, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 68, 10, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 75, 6.2, 4, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 21, 8, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 30, 20.7, 28, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 55, 19.2, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 13, 4.8, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 23, 7.2, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 19, 7.3, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 42, 11.2, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 4, 17.6, 16, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 43, 36.8, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 56, 30.4, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 60, 27.2, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 24, 3.6, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 29, 99, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 40, 14.7, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 45, 7.6, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 50, 13, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 11, 16.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 46, 9.6, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 24, 3.6, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 25, 11.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 30, 20.7, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 43, 36.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 2, 15.2, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 16, 13.9, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 44, 15.5, 2, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 18, 50, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 23, 7.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 64, 26.6, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 7, 24, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 56, 30.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 24, 3.6, 80, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 51, 42.4, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 33, 2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 71, 17.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 14, 18.6, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 28, 36.4, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 40, 14.7, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 75, 6.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 31, 10, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 66, 13.6, 60, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 76, 14.4, 42, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 55, 19.2, 2, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 70, 12, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 1, 14.4, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 21, 8, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 39, 14.4, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10478, 10, 24.8, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 38, 210.8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 53, 26.2, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 59, 44, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 64, 26.6, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 47, 7.6, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 59, 44, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 49, 16, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 60, 27.2, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10482, 40, 14.7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 34, 11.2, 35, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 77, 10.4, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 21, 8, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 40, 14.7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 51, 42.4, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 2, 15.2, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 3, 8, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 55, 19.2, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 70, 12, 60, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 11, 16.8, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 51, 42.4, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 74, 8, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 19, 7.3, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 26, 24.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 54, 5.9, 24, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 59, 44, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 73, 12, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 11, 16.8, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 16, 13.9, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 59, 44, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 68, 10, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 75, 6.2, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 44, 15.5, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 77, 10.4, 7, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 25, 11.2, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 42, 11.2, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 65, 16.8, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 66, 13.6, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 69, 28.8, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10494, 56, 30.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 23, 7.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 41, 7.7, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 77, 10.4, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10496, 31, 10, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 56, 30.4, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 72, 27.8, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 77, 10.4, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 24, 4.5, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 40, 18.4, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 42, 14, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 28, 45.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 49, 20, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 15, 15.5, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 28, 45.6, 8, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10501, 54, 7.45, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 45, 9.5, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 53, 32.8, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 67, 14, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 14, 23.25, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 65, 21.05, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 2, 19, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 21, 10, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 53, 32.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 61, 28.5, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10505, 62, 49.3, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 25, 14, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 70, 15, 14, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 43, 46, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 48, 12.75, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 13, 6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 39, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10509, 28, 45.6, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 29, 123.79, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 75, 7.75, 36, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 4, 22, 50, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 7, 30, 50, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 8, 40, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 24, 4.5, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 46, 12, 9, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 47, 9.5, 6, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 60, 34, 12, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 21, 10, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 32, 32, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 61, 28.5, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 20, 81, 39, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 28, 45.6, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 56, 38, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 65, 21.05, 39, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 75, 7.75, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 9, 97, 16, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 16, 17.45, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 27, 43.9, 120, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 33, 2.5, 16, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 60, 34, 84, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 18, 62.5, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 41, 9.65, 80, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 42, 14, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 52, 7, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 59, 55, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 70, 15, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 24, 4.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 38, 263.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 44, 19.45, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 10, 31, 16, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 56, 38, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 60, 34, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 24, 4.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 53, 32.8, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 35, 18, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 41, 9.65, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 68, 12.5, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 1, 18, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 8, 40, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 30, 25.89, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 40, 18.4, 25, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 17, 39, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 20, 81, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 37, 26, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 41, 9.65, 6, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 10, 31, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 30, 25.89, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 43, 46, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 54, 7.45, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 36, 19, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 40, 18.4, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 1, 18, 8, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 13, 6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 56, 38, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 4, 22, 50, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 36, 19, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 11, 21, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 33, 2.5, 8, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 72, 34.8, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 55, 24, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 68, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 69, 36, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 17, 39, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 43, 46, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 61, 28.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 76, 18, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10531, 59, 55, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 30, 25.89, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 66, 17, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 4, 22, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 72, 34.8, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 73, 15, 24, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 30, 25.89, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 40, 18.4, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 54, 7.45, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 11, 21, 50, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 40, 18.4, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 57, 19.5, 5, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 59, 55, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 12, 38, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 31, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 33, 2.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 60, 34, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 31, 12.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 51, 53, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 58, 13.25, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 72, 34.8, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 73, 15, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 70, 15, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 72, 34.8, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 13, 6, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 21, 10, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 33, 2.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 49, 20, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 3, 10, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 26, 31.23, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 38, 263.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 68, 12.5, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 24, 4.5, 35, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 38, 263.5, 4, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 65, 21.05, 36, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 71, 21.5, 9, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 11, 21, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 54, 7.45, 24, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 12, 38, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 23, 9, 70, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 28, 45.6, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 67, 14, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10545, 11, 21, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 7, 30, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 35, 18, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 62, 49.3, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 32, 32, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 36, 19, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 34, 14, 10, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 41, 9.65, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 31, 12.5, 55, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 45, 9.5, 100, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 51, 53, 48, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 17, 39, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 19, 9.2, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 21, 10, 6, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 61, 28.5, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 16, 17.45, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 35, 18, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 44, 19.45, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 69, 36, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 75, 7.75, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 11, 21, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 16, 17.45, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 22, 21, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 31, 12.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 35, 18, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 23, 9, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 77, 13, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 14, 23.25, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 19, 9.2, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 24, 4.5, 18, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 51, 53, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 56, 38, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10556, 72, 34.8, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 64, 33.25, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 75, 7.75, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 47, 9.5, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 51, 53, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 52, 7, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 53, 32.8, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 73, 15, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 41, 9.65, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 55, 24, 18, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 30, 25.89, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 62, 49.3, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 44, 19.45, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 51, 53, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 33, 2.5, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 62, 49.3, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 36, 19, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 52, 7, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 17, 39, 16, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 31, 12.5, 6, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 55, 24, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 24, 4.5, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 64, 33.25, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 11, 21, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 18, 62.5, 18, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 76, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 31, 12.5, 60, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 51, 53, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 59, 55, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10568, 10, 31, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 31, 12.5, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 76, 18, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 11, 21, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 56, 38, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 14, 23.25, 11, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 42, 14, 28, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 16, 17.45, 12, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 32, 32, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 40, 18.4, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 75, 7.75, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 17, 39, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 34, 14, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 53, 32.8, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 33, 2.5, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 40, 18.4, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 62, 49.3, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 64, 33.25, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 59, 55, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 63, 43.9, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 72, 34.8, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 76, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 1, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 31, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 44, 19.45, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 39, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 75, 7.75, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 77, 13, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 35, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 57, 19.5, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 15, 15.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 75, 7.75, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 14, 23.25, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 41, 9.65, 9, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 65, 21.05, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10581, 75, 7.75, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 57, 19.5, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 76, 18, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 29, 123.79, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 60, 34, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 69, 36, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10584, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10585, 47, 9.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10586, 52, 7, 4, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 26, 31.23, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 35, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 77, 13, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 18, 62.5, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 42, 14, 100, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10589, 35, 18, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 1, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 77, 13, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 3, 10, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 7, 30, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 54, 7.45, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 15, 15.5, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 26, 31.23, 5, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 20, 81, 21, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 69, 36, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 76, 18, 4, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 52, 7, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 58, 13.25, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 35, 18, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 61, 28.5, 120, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 69, 36, 65, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 56, 38, 5, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 63, 43.9, 24, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 75, 7.75, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 24, 4.5, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 57, 19.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 65, 21.05, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 27, 43.9, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 71, 21.5, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10599, 62, 49.3, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 54, 7.45, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 73, 15, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 13, 6, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 59, 55, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10602, 77, 13, 5, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 22, 21, 48, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 49, 20, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 48, 12.75, 6, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 76, 18, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 59, 55, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 60, 34, 70, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 4, 22, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 55, 24, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 62, 49.3, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 7, 30, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 17, 39, 100, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 33, 2.5, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 40, 18.4, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 72, 34.8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10608, 56, 38, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 1, 18, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 10, 31, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 21, 10, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10610, 36, 19, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 1, 18, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 2, 19, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 60, 34, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 10, 31, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 36, 19, 55, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 49, 20, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 60, 34, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 76, 18, 80, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 13, 6, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 75, 7.75, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 11, 21, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 21, 10, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 39, 18, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10615, 55, 24, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 38, 263.5, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 56, 38, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 70, 15, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10617, 59, 55, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 6, 25, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 56, 38, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 68, 12.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 21, 10, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 22, 21, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 24, 4.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 52, 7, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 19, 9.2, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 23, 9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 70, 15, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 71, 21.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 2, 19, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 68, 12.5, 18, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 14, 23.25, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 19, 9.2, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 21, 10, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 24, 4.5, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 35, 18, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 28, 45.6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 29, 123.79, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 44, 19.45, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 14, 23.25, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 42, 14, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 60, 34, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 53, 32.8, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 60, 34, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 71, 21.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 62, 49.3, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 73, 15, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10628, 1, 18, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 29, 123.79, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 64, 33.25, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 55, 24, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 76, 18, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10631, 75, 7.75, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 2, 19, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 33, 2.5, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 12, 38, 36, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 13, 6, 13, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 26, 31.23, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 62, 49.3, 80, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 7, 30, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 18, 62.5, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 51, 53, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 75, 7.75, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 4, 22, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 5, 21.35, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 22, 21, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 4, 22, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 58, 13.25, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 11, 21, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 50, 16.25, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 56, 38, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 45, 9.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 65, 21.05, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 72, 34.8, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10639, 18, 62.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 69, 36, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 70, 15, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 2, 19, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 40, 18.4, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 21, 10, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 61, 28.5, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 28, 45.6, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 39, 18, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 46, 12, 2, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 18, 62.5, 4, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 43, 46, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 46, 12, 21, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 18, 62.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 36, 19, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 1, 18, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 10, 31, 18, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 71, 21.5, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 77, 13, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 19, 9.2, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 39, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 22, 21, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 24, 4.5, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 28, 45.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 72, 34.8, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 30, 25.89, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 53, 32.8, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 54, 7.45, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 19, 9.2, 12, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 22, 21, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 30, 25.89, 2, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 42, 14, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 60, 34, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 4, 22, 12, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 39, 18, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 54, 7.45, 6, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10655, 41, 9.65, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 14, 23.25, 3, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 44, 19.45, 28, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 47, 9.5, 6, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 15, 15.5, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 41, 9.65, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 46, 12, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 47, 9.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 56, 38, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 60, 34, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 21, 10, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 40, 18.4, 70, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 60, 34, 55, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 77, 13, 70, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 31, 12.5, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 40, 18.4, 24, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 70, 15, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10660, 20, 81, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 39, 18, 3, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 58, 13.25, 49, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10662, 68, 12.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 40, 18.4, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 42, 14, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 51, 53, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 10, 31, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 56, 38, 12, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 51, 53, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 59, 55, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 76, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 29, 123.79, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 65, 21.05, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 69, 36, 45, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 71, 21.5, 14, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 31, 12.5, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 55, 24, 4, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 64, 33.25, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10669, 36, 19, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 23, 9, 32, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 46, 12, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 67, 14, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 73, 15, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 75, 7.75, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 16, 17.45, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 62, 49.3, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 65, 21.05, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 38, 263.5, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 71, 21.5, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 16, 17.45, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 42, 14, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 43, 46, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10674, 23, 9, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 14, 23.25, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 53, 32.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 58, 13.25, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 10, 31, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 19, 9.2, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 44, 19.45, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 26, 31.23, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 33, 2.5, 8, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 12, 38, 100, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 33, 2.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 41, 9.65, 120, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 54, 7.45, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10679, 59, 55, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 16, 17.45, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 31, 12.5, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 42, 14, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 19, 9.2, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 21, 10, 12, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 64, 33.25, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 33, 2.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 66, 17, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 75, 7.75, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10683, 52, 7, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 40, 18.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 47, 9.5, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 60, 34, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 10, 31, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 41, 9.65, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 47, 9.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 17, 39, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 26, 31.23, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 9, 97, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 29, 123.79, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 36, 19, 6, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 10, 31, 18, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 28, 45.6, 60, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 34, 14, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10689, 1, 18, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 56, 38, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 77, 13, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 1, 18, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 29, 123.79, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 43, 46, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 44, 19.45, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 62, 49.3, 48, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10692, 63, 43.9, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 9, 97, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 54, 7.45, 60, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 69, 36, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 73, 15, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 7, 30, 90, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 59, 55, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 70, 15, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 8, 40, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 12, 38, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 24, 4.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 17, 39, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 46, 12, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 19, 9.2, 7, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 35, 18, 9, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 58, 13.25, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 70, 15, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 11, 21, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 17, 39, 8, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 29, 123.79, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 65, 21.05, 65, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 70, 15, 8, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10699, 47, 9.5, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 1, 18, 5, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 34, 14, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 68, 12.5, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 71, 21.5, 60, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 59, 55, 42, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 71, 21.5, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 76, 18, 35, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 3, 10, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 76, 18, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 2, 19, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 59, 55, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 73, 15, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 4, 22, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 24, 4.5, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 48, 12.75, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 31, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 32, 32, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 16, 17.45, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 43, 46, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 59, 55, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 55, 24, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 57, 19.5, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 70, 15, 28, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 5, 21.35, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 36, 19, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 8, 40, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 51, 53, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 60, 34, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 19, 9.2, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 47, 9.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 19, 9.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 41, 9.65, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 53, 32.8, 120, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 53, 32.8, 3, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 56, 38, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 10, 31, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 26, 31.23, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 45, 9.5, 110, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 46, 12, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 2, 19, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 17, 39, 27, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 47, 9.5, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 56, 38, 18, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 58, 13.25, 12, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 10, 31, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 71, 21.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 21, 10, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 51, 53, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 61, 28.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 21, 10, 32, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 54, 7.45, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 69, 36, 25, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 12, 38, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 16, 17.45, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 36, 19, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 62, 49.3, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 18, 62.5, 12, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 30, 25.89, 3, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 54, 7.45, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 35, 18, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 71, 21.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10721, 44, 19.45, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 2, 19, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 31, 12.5, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 68, 12.5, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 75, 7.75, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10723, 26, 31.23, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 10, 31, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 61, 28.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 41, 9.65, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 52, 7, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 55, 24, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 4, 22, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 11, 21, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 17, 39, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 56, 38, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 59, 55, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 30, 25.89, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 40, 18.4, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 55, 24, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 60, 34, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 1, 18, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 21, 10, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 50, 16.25, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 16, 17.45, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 31, 12.5, 3, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 65, 21.05, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 21, 10, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 51, 53, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10732, 76, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 14, 23.25, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 28, 45.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 52, 7, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 6, 25, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 30, 25.89, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 76, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 61, 28.5, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 77, 13, 2, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 65, 21.05, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 75, 7.75, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 13, 6, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 41, 9.65, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10738, 16, 17.45, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 36, 19, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 52, 7, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 28, 45.6, 5, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 35, 18, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 45, 9.5, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 56, 38, 14, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10741, 2, 19, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 3, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 60, 34, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 72, 34.8, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10743, 46, 12, 28, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10744, 40, 18.4, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 18, 62.5, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 44, 19.45, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 59, 55, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 72, 34.8, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 13, 6, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 42, 14, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 62, 49.3, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 69, 36, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 31, 12.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 41, 9.65, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 63, 43.9, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 69, 36, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 23, 9, 44, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 40, 18.4, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 56, 38, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 56, 38, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 59, 55, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 76, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 14, 23.25, 5, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 45, 9.5, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 59, 55, 25, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 26, 31.23, 12, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 30, 25.89, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 50, 16.25, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 73, 15, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 1, 18, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 69, 36, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 45, 9.5, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 74, 10, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10754, 40, 18.4, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 47, 9.5, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 56, 38, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 57, 19.5, 14, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 69, 36, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 18, 62.5, 21, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 36, 19, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 68, 12.5, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 69, 36, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 34, 14, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 59, 55, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 62, 49.3, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 64, 33.25, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 26, 31.23, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 52, 7, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 70, 15, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10759, 32, 32, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 25, 14, 12, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 27, 43.9, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 43, 46, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 25, 14, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 75, 7.75, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 39, 18, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 47, 9.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 51, 53, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 56, 38, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 21, 10, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 22, 21, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 24, 4.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 3, 10, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 39, 18, 130, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10765, 65, 21.05, 80, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 2, 19, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 7, 30, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 68, 12.5, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10767, 42, 14, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 22, 21, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 31, 12.5, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 60, 34, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 71, 21.5, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 41, 9.65, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 52, 7, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 61, 28.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 62, 49.3, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10770, 11, 21, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10771, 71, 21.5, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 29, 123.79, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 59, 55, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 17, 39, 33, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 31, 12.5, 70, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 75, 7.75, 7, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 31, 12.5, 2, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 66, 17, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 10, 31, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 67, 14, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 31, 12.5, 16, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 42, 14, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 45, 9.5, 27, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 51, 53, 120, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10777, 42, 14, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10778, 41, 9.65, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 16, 17.45, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 62, 49.3, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 70, 15, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 77, 13, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 54, 7.45, 3, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 56, 38, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 74, 10, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10782, 31, 12.5, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 31, 12.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 38, 263.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 36, 19, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 39, 18, 2, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 72, 34.8, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 10, 31, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 75, 7.75, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 8, 40, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 30, 25.89, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 75, 7.75, 42, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 2, 19, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 29, 123.79, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 75, 7.75, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 18, 62.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 35, 18, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 63, 43.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 68, 12.5, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 7, 30, 3, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 56, 38, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 29, 123.79, 14, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 2, 19, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 54, 7.45, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 68, 12.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 41, 9.65, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 52, 7, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 14, 23.25, 15, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 54, 7.45, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 16, 17.45, 65, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 17, 39, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 26, 31.23, 21, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 44, 19.45, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 64, 33.25, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 69, 36, 24, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10797, 11, 21, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 62, 49.3, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 72, 34.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 13, 6, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 24, 4.5, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 59, 55, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 11, 21, 50, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 51, 53, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 54, 7.45, 7, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 17, 39, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 29, 123.79, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 30, 25.89, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 51, 53, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 55, 24, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 62, 49.3, 5, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 19, 9.2, 24, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 25, 14, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 59, 55, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 10, 31, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 28, 45.6, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 49, 20, 4, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 34, 14, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 38, 263.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 2, 19, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 65, 21.05, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 74, 10, 15, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10807, 40, 18.4, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 56, 38, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 76, 18, 50, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10809, 52, 7, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 13, 6, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 25, 14, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 70, 15, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 19, 9.2, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 23, 9, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 40, 18.4, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 31, 12.5, 16, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 72, 34.8, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 77, 13, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 2, 19, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 46, 12, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 41, 9.65, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 43, 46, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 48, 12.75, 8, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 61, 28.5, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10815, 33, 2.5, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 38, 263.5, 30, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 26, 31.23, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 38, 263.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 40, 18.4, 60, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 62, 49.3, 25, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 32, 32, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 41, 9.65, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 43, 46, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 75, 7.75, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10820, 56, 38, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 35, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 51, 53, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 62, 49.3, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 70, 15, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 11, 21, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 57, 19.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 59, 55, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 77, 13, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 41, 9.65, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 70, 15, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 26, 31.23, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 53, 32.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 31, 12.5, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 57, 19.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 10, 31, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 39, 18, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 20, 81, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 38, 263.5, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 2, 19, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 8, 40, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 13, 6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 60, 34, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 6, 25, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 39, 18, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 60, 34, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 68, 12.5, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 19, 9.2, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 35, 18, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 38, 263.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 43, 46, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 13, 6, 3, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 25, 14, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 44, 19.45, 16, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 64, 33.25, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 7, 30, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 31, 12.5, 9, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 53, 32.8, 9, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 29, 123.79, 8, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 30, 25.89, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 59, 55, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 77, 13, 2, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 22, 21, 52, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 35, 18, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 57, 19.5, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 60, 34, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 64, 33.25, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 13, 6, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 40, 18.4, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 47, 9.5, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 76, 18, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 1, 18, 4, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 18, 62.5, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 36, 19, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 58, 13.25, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 72, 34.8, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 25, 14, 6, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 39, 18, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 10, 31, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 56, 38, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 59, 55, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 77, 13, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 11, 21, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 43, 46, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 68, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 70, 15, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10843, 51, 53, 4, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10844, 22, 21, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 23, 9, 70, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 35, 18, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 42, 14, 42, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 58, 13.25, 60, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 64, 33.25, 48, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 4, 22, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 70, 15, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 74, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 1, 18, 80, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 19, 9.2, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 37, 26, 60, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 45, 9.5, 36, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 60, 34, 45, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 71, 21.5, 55, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 5, 21.35, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 9, 97, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 3, 10, 49, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 26, 31.23, 18, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 25, 14, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 33, 2.5, 4, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 70, 15, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 2, 19, 5, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 25, 14, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 57, 19.5, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 59, 55, 42, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 2, 19, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 17, 39, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 62, 49.3, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10853, 18, 62.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 10, 31, 100, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 13, 6, 65, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 16, 17.45, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 31, 12.5, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 56, 38, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 2, 19, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 42, 14, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 3, 10, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 26, 31.23, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 29, 123.79, 10, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 7, 30, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 27, 43.9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 70, 15, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 24, 4.5, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 54, 7.45, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 64, 33.25, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 51, 53, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 76, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 17, 39, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 18, 62.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 21, 10, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 33, 2.5, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 62, 49.3, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 11, 21, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 52, 7, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 1, 18, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 58, 13.25, 12, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 35, 18, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 67, 14, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 38, 263.5, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 39, 18, 80, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 2, 19, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 24, 4.5, 6, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 30, 25.89, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10867, 53, 32.8, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 26, 31.23, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 35, 18, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 49, 20, 42, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 1, 18, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 11, 21, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 23, 9, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 68, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 35, 18, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 51, 53, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 6, 25, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 16, 17.45, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 17, 39, 16, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 55, 24, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 64, 33.25, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 65, 21.05, 21, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 21, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 28, 45.6, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10874, 10, 31, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 19, 9.2, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 47, 9.5, 21, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 49, 20, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 46, 12, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 64, 33.25, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 16, 17.45, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 18, 62.5, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10878, 20, 81, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 40, 18.4, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 65, 21.05, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 76, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 23, 9, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 61, 28.5, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 70, 15, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10881, 73, 15, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 42, 14, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 49, 20, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 54, 7.45, 32, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10883, 24, 4.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 21, 10, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 56, 38, 21, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 65, 21.05, 12, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 2, 19, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 24, 4.5, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 70, 15, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 77, 13, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 10, 31, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 31, 12.5, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 77, 13, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10887, 25, 14, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 2, 19, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 68, 12.5, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 11, 21, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 38, 263.5, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 17, 39, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 34, 14, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 41, 9.65, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10891, 30, 25.89, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10892, 59, 55, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 8, 40, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 24, 4.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 29, 123.79, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 30, 25.89, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 36, 19, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 13, 6, 28, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 69, 36, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 75, 7.75, 120, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 24, 4.5, 110, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 39, 18, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 40, 18.4, 91, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 60, 34, 100, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 45, 9.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 56, 38, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 29, 123.79, 80, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 30, 25.89, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10898, 13, 6, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10899, 39, 18, 8, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10900, 70, 15, 3, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 41, 9.65, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 71, 21.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 55, 24, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 62, 49.3, 6, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 13, 6, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 65, 21.05, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 68, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 58, 13.25, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 62, 49.3, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10905, 1, 18, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10906, 61, 28.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10907, 75, 7.75, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 7, 30, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 52, 7, 14, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 7, 30, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 16, 17.45, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 41, 9.65, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 19, 9.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 49, 20, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 61, 28.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 1, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 17, 39, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 67, 14, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 11, 21, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 4, 22, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 33, 2.5, 40, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 58, 13.25, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10914, 71, 21.5, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 17, 39, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 33, 2.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 54, 7.45, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 16, 17.45, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 32, 32, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 57, 19.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 30, 25.89, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 60, 34, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 1, 18, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 60, 34, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 16, 17.45, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 25, 14, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 40, 18.4, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10920, 50, 16.25, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 35, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 63, 43.9, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 17, 39, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 24, 4.5, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 42, 14, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 43, 46, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 67, 14, 24, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 10, 31, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 28, 45.6, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 75, 7.75, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 36, 19, 25, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 52, 7, 12, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 11, 21, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 13, 6, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 19, 9.2, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 72, 34.8, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 20, 81, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 52, 7, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 76, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 47, 9.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 76, 18, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 21, 10, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 75, 7.75, 49, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 77, 13, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 21, 10, 36, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 27, 43.9, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 55, 24, 25, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 58, 13.25, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 13, 6, 42, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 57, 19.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 62, 49.3, 14, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 72, 34.8, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 75, 7.75, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 53, 32.8, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 61, 28.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10934, 6, 25, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 1, 18, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 18, 62.5, 4, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 23, 9, 8, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10936, 36, 19, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 28, 45.6, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 34, 14, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 13, 6, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 43, 46, 24, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 60, 34, 49, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 71, 21.5, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 2, 19, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 67, 14, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 7, 30, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 13, 6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 31, 12.5, 44, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 62, 49.3, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 68, 12.5, 80, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 72, 34.8, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10942, 49, 20, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 13, 6, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 22, 21, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 46, 12, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 11, 21, 5, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 44, 19.45, 18, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 56, 38, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 13, 6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 31, 12.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 10, 31, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 24, 4.5, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 77, 13, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10947, 59, 55, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 50, 16.25, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 51, 53, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 55, 24, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 6, 25, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 10, 31, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 17, 39, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 62, 49.3, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10950, 4, 22, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 33, 2.5, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 41, 9.65, 6, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 75, 7.75, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 6, 25, 16, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 28, 45.6, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 20, 81, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 16, 17.45, 28, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 31, 12.5, 25, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 45, 9.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 60, 34, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10955, 75, 7.75, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 21, 10, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 47, 9.5, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 51, 53, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 30, 25.89, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 35, 18, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 64, 33.25, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 5, 21.35, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 7, 30, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 72, 34.8, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10959, 75, 7.75, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 24, 4.5, 10, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 41, 9.65, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 52, 7, 6, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 76, 18, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 7, 30, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 13, 6, 77, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 53, 32.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 69, 36, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 76, 18, 44, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10963, 60, 34, 2, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 18, 62.5, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 38, 263.5, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 69, 36, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10965, 51, 53, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 37, 26, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 56, 38, 12, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 62, 49.3, 12, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 19, 9.2, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 49, 20, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 12, 38, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 24, 4.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 64, 33.25, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10969, 46, 12, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10970, 52, 7, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10971, 29, 123.79, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 17, 39, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 33, 2.5, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 26, 31.23, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 41, 9.65, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 75, 7.75, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10974, 63, 43.9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 8, 40, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 75, 7.75, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10976, 28, 45.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 39, 18, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 47, 9.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 51, 53, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 63, 43.9, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 8, 40, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 21, 10, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 40, 18.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 44, 19.45, 6, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 7, 30, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 12, 38, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 24, 4.5, 80, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 27, 43.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 31, 12.5, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 63, 43.9, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10980, 75, 7.75, 40, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10981, 38, 263.5, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 7, 30, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 43, 46, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 13, 6, 84, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 57, 19.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 16, 17.45, 55, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 24, 4.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 36, 19, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 16, 17.45, 36, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 18, 62.5, 8, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 32, 32, 35, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 11, 21, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 20, 81, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 76, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 77, 13, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 7, 30, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 43, 46, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 72, 34.8, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 7, 30, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 62, 49.3, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 6, 25, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 11, 21, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 41, 9.65, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 21, 10, 65, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 34, 14, 60, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 55, 24, 65, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 61, 28.5, 66, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 2, 19, 50, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 70, 15, 20, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 76, 18, 90, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10992, 72, 34.8, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 29, 123.79, 50, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 41, 9.65, 35, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10994, 59, 55, 18, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 51, 53, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 60, 34, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10996, 42, 14, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 32, 32, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 46, 12, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 52, 7, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 24, 4.5, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 61, 28.5, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 74, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 75, 7.75, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 51, 53, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 77, 13, 21, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 4, 22, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 77, 13, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 7, 30, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 22, 21, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 46, 12, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 55, 24, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 13, 6, 56, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 35, 18, 15, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 42, 14, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 55, 24, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 1, 18, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 40, 18.4, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 52, 7, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 26, 31.23, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 76, 18, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 1, 18, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 59, 55, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 1, 18, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 29, 123.79, 2, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 8, 40, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 29, 123.79, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 42, 14, 14, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 28, 45.6, 70, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 34, 14, 90, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 71, 21.5, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 24, 4.5, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 36, 19, 18, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 60, 34, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 7, 30, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 24, 4.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 58, 13.25, 40, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 71, 21.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 60, 34, 36, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 71, 21.5, 60, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 23, 9, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 42, 14, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 45, 9.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 68, 12.5, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11014, 41, 9.65, 28, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 30, 25.89, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 77, 13, 18, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 31, 12.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 36, 19, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 3, 10, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 59, 55, 110, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 70, 15, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 12, 38, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 18, 62.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 56, 38, 5, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 46, 12, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 49, 20, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11020, 10, 31, 24, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 2, 19, 11, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 20, 81, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 26, 31.23, 63, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 51, 53, 44, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 72, 34.8, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 19, 9.2, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 69, 36, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 7, 30, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 43, 46, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 26, 31.23, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 33, 2.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 65, 21.05, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 71, 21.5, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 1, 18, 10, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 13, 6, 20, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 18, 62.5, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 51, 53, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 62, 49.3, 21, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 55, 24, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 59, 55, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 56, 38, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 63, 43.9, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 2, 19, 100, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 5, 21.35, 70, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 59, 55, 100, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 1, 18, 45, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 13, 6, 80, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 24, 4.5, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 64, 33.25, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 71, 21.5, 16, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 36, 19, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 38, 263.5, 25, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 59, 55, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 53, 32.8, 70, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 69, 36, 36, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 21, 10, 15, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 44, 19.45, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 61, 28.5, 6, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 1, 18, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 35, 18, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 42, 14, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 54, 7.45, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 13, 6, 7, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 59, 55, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11037, 70, 15, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 40, 18.4, 5, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 52, 7, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 71, 21.5, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 28, 45.6, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 35, 18, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 49, 20, 60, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 57, 19.5, 28, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11040, 21, 10, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 2, 19, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 63, 43.9, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 44, 19.45, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 61, 28.5, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11043, 11, 21, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11044, 62, 49.3, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 33, 2.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 51, 53, 24, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 12, 38, 20, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 32, 32, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 35, 18, 18, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 1, 18, 25, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 5, 21.35, 30, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11048, 68, 12.5, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 2, 19, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 12, 38, 4, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11050, 76, 18, 50, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11051, 24, 4.5, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 43, 46, 30, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 61, 28.5, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 18, 62.5, 35, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 32, 32, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 64, 33.25, 25, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 33, 2.5, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 67, 14, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 24, 4.5, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 25, 14, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 51, 53, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 57, 19.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 7, 30, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 55, 24, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 60, 34, 50, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11057, 70, 15, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 21, 10, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 60, 34, 21, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 61, 28.5, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 13, 6, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 17, 39, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 60, 34, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 60, 34, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 77, 13, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11061, 60, 34, 15, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 53, 32.8, 10, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 70, 15, 12, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 34, 14, 30, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 40, 18.4, 40, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 41, 9.65, 30, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 17, 39, 77, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 41, 9.65, 12, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 53, 32.8, 25, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 55, 24, 4, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 68, 12.5, 55, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 30, 25.89, 4, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 54, 7.45, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 16, 17.45, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 19, 9.2, 42, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 34, 14, 35, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11067, 41, 9.65, 9, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 28, 45.6, 8, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 43, 46, 36, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 77, 13, 28, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11069, 39, 18, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 1, 18, 40, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 2, 19, 20, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 16, 17.45, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 31, 12.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 7, 30, 15, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 13, 6, 10, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 2, 19, 8, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 41, 9.65, 40, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 50, 16.25, 22, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 64, 33.25, 130, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 11, 21, 10, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 24, 4.5, 20, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11074, 16, 17.45, 14, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 2, 19, 10, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 46, 12, 30, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 76, 18, 2, 0.15 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 6, 25, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 14, 23.25, 20, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 19, 9.2, 10, 0.25 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 2, 19, 24, 0.2 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 3, 10, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 4, 22, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 6, 25, 1, 0.02 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 7, 30, 1, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 8, 40, 2, 0.1 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 10, 31, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 12, 38, 2, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 13, 6, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 14, 23.25, 1, 0.03 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 16, 17.45, 2, 0.03 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 20, 81, 1, 0.04 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 23, 9, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 32, 32, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 39, 18, 2, 0.05 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 41, 9.65, 3, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 46, 12, 3, 0.02 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 52, 7, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 55, 24, 2, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 60, 34, 2, 0.06 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 64, 33.25, 2, 0.03 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 66, 17, 1, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 73, 15, 2, 0.01 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 75, 7.75, 4, 0 ) ;
-INSERT INTO "Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 77, 13, 2, 0 ) ;
- 
-INSERT INTO TYPES_SIMPLE (ID, t_bool, T_INT2, T_INT4, t_int8, T_NUMERIC, T_FLOAT4, T_FLOAT8, T_VARCHAR, T_CHAR, T_NCHAR) VALUES ('0', true, 21, 30000, 30001, 100000, 7.23157, 7.123456, 'qwertasdfg', 'abcdefghij', 'klmnopqrst');
-insert into TYPES_EXTENDED (id , t_bytea ,  t_date , t_text ,  t_time ,  t_timestamp ) values ('0' ,  '\\001\\002\\000'::bytea ,  '02/02/02' , 'abcd', '02/02/02 02:02:02' , '02/02/02 02:02:02' );
-INSERT INTO TYPES_EXTENDED (id, t_timestamp) VALUES ('MIN', '01/01/1753 12:00:00 AM');
-
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.SYBASE.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.SYBASE.sql
deleted file mode 100755
index 9851a163ec7..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DATA.SYBASE.sql
+++ /dev/null
@@ -1,3385 +0,0 @@
-USE GHTDB
-GO
-
-sp_configure "procedure cache", 12000 
-GO
-
-SET IDENTITY_INSERT Categories ON
-GO
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (1, 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (3, 'Confections', 'Desserts, candies, and sweet breads' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (4, 'Dairy Products', 'Cheeses' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (5, 'Grains/Cereals', 'Breads, crackers, pasta, and cereal' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (6, 'Meat/Poultry', 'Prepared meats' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (7, 'Produce', 'Dried fruit and bean curd' ) 
-INSERT INTO Categories ( CategoryID, CategoryName, Description ) VALUES (8, 'Seafood', 'Seaweed and fish' ) 
-SET IDENTITY_INSERT Categories OFF
-GO
-
-INSERT INTO mainsoft.CategoriesNew (  CategoryName, Description ) VALUES ('Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) 
-INSERT INTO mainsoft.CategoriesNew (  CategoryName, Description ) VALUES ('Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) 
-
-INSERT INTO mainsoft.Categories ( CategoryID, CategoryName, Description,Picture ) VALUES ('10', 'Beverages', 'Soft drinks, coffees, teas, beers, and ales',10 ) 
-INSERT INTO mainsoft.Categories ( CategoryID, CategoryName, Description,Picture  ) VALUES ('20', 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings',20 ) 
-GO
-
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) 
-INSERT INTO Customers ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) 
-GO
-
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (1, 'Yavine', 'Oved', 'Sales Representative', 'Mr', '12/8/1948 12:00:00 AM', '5/1/1992 12:00:00 AM', '507 - 20th Ave. E.Apt. 2A', 'Seattle', 'WA', '98122', 'USA', '(206) 555-9857', '5467', 'Education includes a BA in psychology from Colorado State University in 1970.  She also completed "The Art of the Cold Call."  Nancy is a member of Toastmasters International.', 1, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (2, 'Fuller', 'Andrew', 'Vice President, Sales', 'Dr.', '2/19/1952 12:00:00 AM', '8/14/1992 12:00:00 AM', '908 W. Capital Way', 'Tacoma', 'WA', '98401', 'USA', '(206) 555-9482', '3457', 'Andrew received his BTS commercial in 1974 and a Ph.D. in international marketing from the University of Dallas in 1981.  He is fluent in French and Italian and reads German.  He joined the company as a sales representative, was promoted to sales manager in January 1992 and to vice president of sales in March 1993.  Andrew is a member of the Sales Management Roundtable, the Seattle Chamber of Commerce, and the Pacific Rim Importers Association.', 1, 'http://accweb/emmployees/fuller.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (3, 'Leverling', 'Janet', 'Sales Representative', 'Ms.', '8/30/1963 12:00:00 AM', '4/1/1992 12:00:00 AM', '722 Moss Bay Blvd.', 'Kirkland', 'WA', '98033', 'USA', '(206) 555-3412', '3355', 'Janet has a BS degree in chemistry from Boston College (1984).  She has also completed a certificate program in food retailing management.  Janet was hired as a sales associate in 1991 and promoted to sales representative in February 1992.', 2, 'http://accweb/emmployees/leverling.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (4, 'Peacock', 'Margaret', 'Sales Representative', 'Mrs.', '9/19/1937 12:00:00 AM', '5/3/1993 12:00:00 AM', '4110 Old Redmond Rd.', 'Redmond', 'WA', '98052', 'USA', '(206) 555-8122', '5176', 'Margaret holds a BA in English literature from Concordia College (1958) and an MA from the American Institute of Culinary Arts (1966).  She was assigned to the London office temporarily from July through November 1992.', 2, 'http://accweb/emmployees/peacock.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (5, 'Buchanan', 'Steven', 'Sales Manager', 'Mr.', '3/4/1955 12:00:00 AM', '10/17/1993 12:00:00 AM', '14 Garrett Hill', 'London', NULL, 'SW1 8JR', 'UK', '(71) 555-4848', '3453', 'Steven Buchanan graduated from St. Andrews University, Scotland, with a BSC degree in 1976.  Upon joining the company as a sales representative in 1992, he spent 6 months in an orientation program at the Seattle office and then returned to his permanent post in London.  He was promoted to sales manager in March 1993.  Mr. Buchanan has completed the courses "Successful Telemarketing" and "International Sales Management."  He is fluent in French.', 2, 'http://accweb/emmployees/buchanan.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (6, 'Suyama', 'Michael', 'Sales Representative', 'Mr.', '7/2/1963 12:00:00 AM', '10/17/1993 12:00:00 AM', 'Coventry HouseMiner Rd.', 'London', NULL, 'EC2 7JR', 'UK', '(71) 555-7773', '428', 'Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses "Multi-Cultural Selling" and "Time Management for the Sales Professional."  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.', 5, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (7, 'King', 'Robert', 'Sales Representative', 'Mr.', '5/29/1960 12:00:00 AM', '1/2/1994 12:00:00 AM', 'Edgeham HollowWinchester Way', 'London', NULL, 'RG1 9SP', 'UK', '(71) 555-5598', '465', 'Robert King served in the Peace Corps and traveled extensively before completing his degree in English at the University of Michigan in 1992, the year he joined the company.  After completing a course entitled "Selling in Europe," he was transferred to the London office in March 1993.', 5, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (8, 'Callahan', 'Laura', 'Inside Sales Coordinator', 'Ms.', '1/9/1958 12:00:00 AM', '3/5/1994 12:00:00 AM', '4726 - 11th Ave. N.E.', 'Seattle', 'WA', '98105', 'USA', '(206) 555-1189', '2344', 'Laura received a BA in psychology from the University of Washington.  She has also completed a course in business French.  She reads and writes French.', 2, 'http://accweb/emmployees/davolio.bmp' ) 
-INSERT INTO Employees ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9, 'Dodsworth', 'Anne', 'Sales Representative', 'Ms.', '1/27/1966 12:00:00 AM', '11/15/1994 12:00:00 AM', '7 Houndstooth Rd.', 'London', NULL, 'WG2 7LT', 'UK', '(71) 555-4444', '452', 'Anne has a BA degree in English from St. Lawrence College.  She is fluent in French and German.', 5, 'http://accweb/emmployees/davolio.bmp' ) 
-GO
-
-INSERT INTO Region ( RegionID, RegionDescription ) VALUES (1, 'Eastern                                           ' ) 
-INSERT INTO Region ( RegionID, RegionDescription ) VALUES (2, 'Western                                           ' ) 
-INSERT INTO Region ( RegionID, RegionDescription ) VALUES (3, 'Northern                                          ' ) 
-INSERT INTO Region ( RegionID, RegionDescription ) VALUES (4, 'Southern                                          ' ) 
-GO
-
-INSERT INTO Territories Values ('01581','Westboro',1)
-INSERT INTO Territories Values ('01730','Bedford',1)
-INSERT INTO Territories Values ('01833','Georgetow',1)
-INSERT INTO Territories Values ('02116','Boston',1)
-INSERT INTO Territories Values ('02139','Cambridge',1)
-INSERT INTO Territories Values ('02184','Braintree',1)
-INSERT INTO Territories Values ('02903','Providence',1)
-INSERT INTO Territories Values ('03049','Hollis',3)
-INSERT INTO Territories Values ('03801','Portsmouth',3)
-INSERT INTO Territories Values ('06897','Wilton',1)
-INSERT INTO Territories Values ('07960','Morristown',1)
-INSERT INTO Territories Values ('08837','Edison',1)
-INSERT INTO Territories Values ('10019','New York',1)
-INSERT INTO Territories Values ('10038','New York',1)
-INSERT INTO Territories Values ('11747','Mellvile',1)
-INSERT INTO Territories Values ('14450','Fairport',1)
-INSERT INTO Territories Values ('19428','Philadelphia',3)
-INSERT INTO Territories Values ('19713','Neward',1)
-INSERT INTO Territories Values ('20852','Rockville',1)
-INSERT INTO Territories Values ('27403','Greensboro',1)
-INSERT INTO Territories Values ('27511','Cary',1)
-INSERT INTO Territories Values ('29202','Columbia',4)
-INSERT INTO Territories Values ('30346','Atlanta',4)
-INSERT INTO Territories Values ('31406','Savannah',4)
-INSERT INTO Territories Values ('32859','Orlando',4)
-INSERT INTO Territories Values ('33607','Tampa',4)
-INSERT INTO Territories Values ('40222','Louisville',1)
-INSERT INTO Territories Values ('44122','Beachwood',3)
-INSERT INTO Territories Values ('45839','Findlay',3)
-INSERT INTO Territories Values ('48075','Southfield',3)
-INSERT INTO Territories Values ('48084','Troy',3)
-INSERT INTO Territories Values ('48304','Bloomfield Hills',3)
-INSERT INTO Territories Values ('53404','Racine',3)
-INSERT INTO Territories Values ('55113','Roseville',3)
-INSERT INTO Territories Values ('55439','Minneapolis',3)
-INSERT INTO Territories Values ('60179','Hoffman Estates',2)
-INSERT INTO Territories Values ('60601','Chicago',2)
-INSERT INTO Territories Values ('72716','Bentonville',4)
-INSERT INTO Territories Values ('75234','Dallas',4)
-INSERT INTO Territories Values ('78759','Austin',4)
-INSERT INTO Territories Values ('80202','Denver',2)
-INSERT INTO Territories Values ('80909','Colorado Springs',2)
-INSERT INTO Territories Values ('85014','Phoenix',2)
-INSERT INTO Territories Values ('85251','Scottsdale',2)
-INSERT INTO Territories Values ('90405','Santa Monica',2)
-INSERT INTO Territories Values ('94025','Menlo Park',2)
-INSERT INTO Territories Values ('94105','San Francisco',2)
-INSERT INTO Territories Values ('95008','Campbell',2)
-INSERT INTO Territories Values ('95054','Santa Clara',2)
-INSERT INTO Territories Values ('95060','Santa Cruz',2)
-INSERT INTO Territories Values ('98004','Bellevue',2)
-INSERT INTO Territories Values ('98052','Redmond',2)
-INSERT INTO Territories Values ('98104','Seattle',2)
-GO
-
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (1, '06897' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (1, '19713' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '01581' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '01730' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '01833' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '02116' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '02139' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '02184' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (2, '40222' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (3, '30346' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (3, '31406' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (3, '32859' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (3, '33607' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (4, '20852' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (4, '27403' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (4, '27511' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '02903' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '07960' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '08837' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '10019' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '10038' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '11747' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (5, '14450' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (6, '85014' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (6, '85251' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (6, '98004' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (6, '98052' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (6, '98104' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '60179' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '60601' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '80202' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '80909' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '90405' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '94025' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '94105' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '95008' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '95054' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (7, '95060' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (8, '19428' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (8, '44122' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (8, '45839' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (8, '53404' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '03049' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '03801' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '48075' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '48084' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '48304' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '55113' ) 
-INSERT INTO EmployeeTerritories ( EmployeeID, TerritoryID ) VALUES (9, '55439' ) 
-GO
-
-SET IDENTITY_INSERT Shippers ON
-go
-INSERT INTO Shippers ( ShipperID, CompanyName, Phone ) VALUES (1, 'Speedy Express', '(503) 555-9831' ) 
-INSERT INTO Shippers ( ShipperID, CompanyName, Phone ) VALUES (2, 'Comp2', '(503) 555-3199' ) 
-INSERT INTO Shippers ( ShipperID, CompanyName, Phone ) VALUES (3, 'Federal Shipping', '(503) 555-9931' ) 
-SET IDENTITY_INSERT Shippers OFF
-GO
-
-SET IDENTITY_INSERT Orders ON
-go
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10248, 'VINET', 5, '7/4/1996 12:00:00 AM', '8/1/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 3, 255.39, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10249, 'TOMSP', 6, '7/5/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/10/1996 12:00:00 AM', 1, 11.61, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10250, 'HANAR', 4, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/12/1996 12:00:00 AM', 2, 65.83, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10251, 'VICTE', 3, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 1, 41.34, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10252, 'SUPRD', 4, '7/9/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', '7/11/1996 12:00:00 AM', 2, 51.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10253, 'HANAR', 3, '7/10/1996 12:00:00 AM', '7/24/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 2, 58.17, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10254, 'CHOPS', 5, '7/11/1996 12:00:00 AM', '8/8/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 2, 22.98, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10255, 'RICSU', 9, '7/12/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 3, 148.33, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10256, 'WELLI', 3, '7/15/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', '7/17/1996 12:00:00 AM', 2, 13.97, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10257, 'HILAA', 4, '7/16/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', '7/22/1996 12:00:00 AM', 3, 81.91, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10258, 'ERNSH', 1, '7/17/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 1, 140.51, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10259, 'CENTC', 4, '7/18/1996 12:00:00 AM', '8/15/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 3.25, 'Centro comercial Moctezuma', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10260, 'OTTIK', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/29/1996 12:00:00 AM', 1, 55.09, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10261, 'QUEDE', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/30/1996 12:00:00 AM', 2, 3.05, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10262, 'RATTC', 8, '7/22/1996 12:00:00 AM', '8/19/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 48.29, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10263, 'ERNSH', 9, '7/23/1996 12:00:00 AM', '8/20/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 146.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10264, 'FOLKO', 6, '7/24/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 3.67, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10265, 'BLONP', 2, '7/25/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 1, 55.28, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10266, 'WARTH', 3, '7/26/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 25.73, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10267, 'FRANK', 4, '7/29/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 1, 208.58, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10268, 'GROSR', 8, '7/30/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 3, 66.29, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10269, 'WHITC', 5, '7/31/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 4.56, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10270, 'WARTH', 1, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 1, 136.54, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10271, 'SPLIR', 6, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 2, 4.54, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10272, 'RATTC', 6, '8/2/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 2, 98.03, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10273, 'QUICK', 3, '8/5/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 3, 76.07, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10274, 'VINET', 6, '8/6/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 1, 6.01, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10275, 'MAGAA', 1, '8/7/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 26.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10276, 'TORTU', 8, '8/8/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', 3, 13.84, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10277, 'MORGK', 2, '8/9/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', 3, 125.77, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10278, 'BERGS', 8, '8/12/1996 12:00:00 AM', '9/9/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 92.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10279, 'LEHMS', 8, '8/13/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 25.83, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10280, 'BERGS', 2, '8/14/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', 1, 8.98, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10281, 'ROMEY', 4, '8/14/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 2.94, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10282, 'ROMEY', 4, '8/15/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 12.69, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10283, 'LILAS', 3, '8/16/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 84.81, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10284, 'LEHMS', 4, '8/19/1996 12:00:00 AM', '9/16/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', 1, 76.56, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10285, 'QUICK', 1, '8/20/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', 2, 76.83, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10286, 'QUICK', 8, '8/21/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 3, 229.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10287, 'RICAR', 8, '8/22/1996 12:00:00 AM', '9/19/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 12.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10288, 'REGGC', 4, '8/23/1996 12:00:00 AM', '9/20/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 7.45, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10289, 'BSBEV', 7, '8/26/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 22.77, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10290, 'COMMI', 8, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 79.7, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10291, 'QUEDE', 6, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', 2, 6.4, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10292, 'TRADH', 1, '8/28/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', 2, 1.35, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10293, 'TORTU', 1, '8/29/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 3, 21.18, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10294, 'RATTC', 4, '8/30/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', '9/5/1996 12:00:00 AM', 2, 147.26, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10295, 'VINET', 2, '9/2/1996 12:00:00 AM', '9/30/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 1.15, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10296, 'LILAS', 6, '9/3/1996 12:00:00 AM', '10/1/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 1, 0.12, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10297, 'BLONP', 5, '9/4/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 5.74, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10298, 'HUNGO', 6, '9/5/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 2, 168.22, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10299, 'RICAR', 4, '9/6/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', 2, 29.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10300, 'MAGAA', 2, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 17.68, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10301, 'WANDK', 8, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 45.08, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10302, 'SUPRD', 4, '9/10/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 2, 6.27, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10303, 'GODOS', 7, '9/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 107.83, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10304, 'TORTU', 1, '9/12/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 63.79, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10305, 'OLDWO', 8, '9/13/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 3, 257.62, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10306, 'ROMEY', 1, '9/16/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', 3, 7.56, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10307, 'LONEP', 2, '9/17/1996 12:00:00 AM', '10/15/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', 2, 0.56, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10308, 'ANATR', 7, '9/18/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', 3, 1.61, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10309, 'HUNGO', 3, '9/19/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 1, 47.3, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10310, 'THEBI', 8, '9/20/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', 2, 17.52, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10311, 'DUMON', 1, '9/20/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', 3, 24.69, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10312, 'WANDK', 2, '9/23/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 40.26, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10313, 'QUICK', 2, '9/24/1996 12:00:00 AM', '10/22/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 1.96, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10314, 'RATTC', 1, '9/25/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 74.16, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10315, 'ISLAT', 4, '9/26/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 41.76, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10316, 'RATTC', 1, '9/27/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', 3, 150.15, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10317, 'LONEP', 6, '9/30/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 12.69, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10318, 'ISLAT', 8, '10/1/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 4.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10319, 'TORTU', 7, '10/2/1996 12:00:00 AM', '10/30/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 3, 64.5, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10320, 'WARTH', 5, '10/3/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', 3, 34.57, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10321, 'ISLAT', 3, '10/3/1996 12:00:00 AM', '10/31/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 2, 3.43, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10322, 'PERIC', 7, '10/4/1996 12:00:00 AM', '11/1/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 3, 0.4, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10323, 'KOENE', 4, '10/7/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 4.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10324, 'SAVEA', 9, '10/8/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 214.27, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10325, 'KOENE', 1, '10/9/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 3, 64.86, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10326, 'BOLID', 4, '10/10/1996 12:00:00 AM', '11/7/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 2, 77.92, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10327, 'FOLKO', 2, '10/11/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 63.36, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10328, 'FURIB', 4, '10/14/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', 3, 87.03, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10329, 'SPLIR', 4, '10/15/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 2, 191.67, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10330, 'LILAS', 3, '10/16/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 1, 12.75, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10331, 'BONAP', 9, '10/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 1, 10.19, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10332, 'MEREP', 3, '10/17/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 2, 52.84, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10333, 'WARTH', 5, '10/18/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 3, 0.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10334, 'VICTE', 8, '10/21/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 2, 8.56, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10335, 'HUNGO', 7, '10/22/1996 12:00:00 AM', '11/19/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', 2, 42.11, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10336, 'PRINI', 7, '10/23/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 2, 15.51, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10337, 'FRANK', 4, '10/24/1996 12:00:00 AM', '11/21/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 108.26, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10338, 'OLDWO', 4, '10/25/1996 12:00:00 AM', '11/22/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 84.21, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10339, 'MEREP', 2, '10/28/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 15.66, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10340, 'BONAP', 1, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 166.31, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10341, 'SIMOB', 7, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 3, 26.78, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10342, 'FRANK', 4, '10/30/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 54.83, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10343, 'LEHMS', 4, '10/31/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '11/6/1996 12:00:00 AM', 1, 110.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10344, 'WHITC', 4, '11/1/1996 12:00:00 AM', '11/29/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 2, 23.29, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10345, 'QUICK', 2, '11/4/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', 2, 249.06, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10346, 'RATTC', 3, '11/5/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 142.08, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10347, 'FAMIA', 4, '11/6/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 3.1, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10348, 'WANDK', 4, '11/7/1996 12:00:00 AM', '12/5/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 2, 0.78, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10349, 'SPLIR', 7, '11/8/1996 12:00:00 AM', '12/6/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 1, 8.63, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10350, 'LAMAI', 6, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 64.19, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10351, 'ERNSH', 1, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 162.33, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10352, 'FURIB', 3, '11/12/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', 3, 1.3, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10353, 'PICCO', 7, '11/13/1996 12:00:00 AM', '12/11/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', 3, 360.63, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10354, 'PERIC', 8, '11/14/1996 12:00:00 AM', '12/12/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 3, 53.8, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10355, 'AROUT', 6, '11/15/1996 12:00:00 AM', '12/13/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 41.95, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10356, 'WANDK', 6, '11/18/1996 12:00:00 AM', '12/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 2, 36.71, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10357, 'LILAS', 1, '11/19/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 34.88, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10358, 'LAMAI', 5, '11/20/1996 12:00:00 AM', '12/18/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 1, 19.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10359, 'SEVES', 5, '11/21/1996 12:00:00 AM', '12/19/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', 3, 288.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10360, 'BLONP', 4, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 131.7, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10361, 'QUICK', 1, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 183.17, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10362, 'BONAP', 3, '11/25/1996 12:00:00 AM', '12/23/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', 1, 96.04, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10363, 'DRACD', 4, '11/26/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', 3, 30.54, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10364, 'EASTC', 1, '11/26/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/4/1996 12:00:00 AM', 1, 71.97, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10365, 'ANTON', 3, '11/27/1996 12:00:00 AM', '12/25/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 22, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10366, 'GALED', 8, '11/28/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/30/1996 12:00:00 AM', 2, 10.14, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10367, 'VAFFE', 7, '11/28/1996 12:00:00 AM', '12/26/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 13.55, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10368, 'ERNSH', 2, '11/29/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 101.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10369, 'SPLIR', 8, '12/2/1996 12:00:00 AM', '12/30/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 195.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10370, 'CHOPS', 6, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', 2, 1.17, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10371, 'LAMAI', 1, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', 1, 0.45, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10372, 'QUEEN', 5, '12/4/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 890.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10373, 'HUNGO', 4, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/11/1996 12:00:00 AM', 3, 124.12, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10374, 'WOLZA', 1, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 3, 3.94, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10375, 'HUNGC', 3, '12/6/1996 12:00:00 AM', '1/3/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 20.12, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10376, 'MEREP', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 2, 20.39, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10377, 'SEVES', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 22.21, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10378, 'FOLKO', 5, '12/10/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/19/1996 12:00:00 AM', 3, 5.44, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10379, 'QUEDE', 2, '12/11/1996 12:00:00 AM', '1/8/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 1, 45.03, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10380, 'HUNGO', 8, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 35.03, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10381, 'LILAS', 3, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 7.99, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10382, 'ERNSH', 4, '12/13/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '12/16/1996 12:00:00 AM', 1, 94.77, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10383, 'AROUT', 8, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/18/1996 12:00:00 AM', 3, 34.24, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10384, 'BERGS', 3, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 3, 168.64, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10385, 'SPLIR', 1, '12/17/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '12/23/1996 12:00:00 AM', 2, 30.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10386, 'FAMIA', 9, '12/18/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/25/1996 12:00:00 AM', 3, 13.99, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10387, 'SANTG', 1, '12/18/1996 12:00:00 AM', '1/15/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 2, 93.63, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10388, 'SEVES', 2, '12/19/1996 12:00:00 AM', '1/16/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 1, 34.86, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10389, 'BOTTM', 4, '12/20/1996 12:00:00 AM', '1/17/1997 12:00:00 AM', '12/24/1996 12:00:00 AM', 2, 47.42, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10390, 'ERNSH', 6, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/26/1996 12:00:00 AM', 1, 126.38, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10391, 'DRACD', 3, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/31/1996 12:00:00 AM', 3, 5.45, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10392, 'PICCO', 2, '12/24/1996 12:00:00 AM', '1/21/1997 12:00:00 AM', '1/1/1997 12:00:00 AM', 3, 122.46, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10393, 'SAVEA', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 126.56, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10394, 'HUNGC', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 30.34, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10395, 'HILAA', 6, '12/26/1996 12:00:00 AM', '1/23/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 1, 184.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10396, 'FRANK', 1, '12/27/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '1/6/1997 12:00:00 AM', 3, 135.35, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10397, 'PRINI', 5, '12/27/1996 12:00:00 AM', '1/24/1997 12:00:00 AM', '1/2/1997 12:00:00 AM', 1, 60.26, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10398, 'SAVEA', 2, '12/30/1996 12:00:00 AM', '1/27/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 89.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10399, 'VAFFE', 8, '12/31/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 3, 27.36, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10400, 'EASTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 83.93, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10401, 'RATTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 1, 12.51, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10402, 'ERNSH', 8, '1/2/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 2, 67.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10403, 'ERNSH', 4, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 73.79, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10404, 'MAGAA', 2, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 1, 155.97, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10405, 'LINOD', 1, '1/6/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', '1/22/1997 12:00:00 AM', 1, 34.82, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10406, 'QUEEN', 7, '1/7/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/13/1997 12:00:00 AM', 1, 108.04, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10407, 'OTTIK', 2, '1/7/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 91.48, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10408, 'FOLIG', 8, '1/8/1997 12:00:00 AM', '2/5/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 11.26, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10409, 'OCEAN', 3, '1/9/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 29.83, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10410, 'BOTTM', 3, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 3, 2.4, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10411, 'BOTTM', 9, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/21/1997 12:00:00 AM', 3, 23.65, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10412, 'WARTH', 8, '1/13/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 2, 3.77, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10413, 'LAMAI', 3, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 2, 95.66, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10414, 'FAMIA', 2, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/17/1997 12:00:00 AM', 3, 21.48, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10415, 'HUNGC', 3, '1/15/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 0.2, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10416, 'WARTH', 8, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 3, 22.72, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10417, 'SIMOB', 4, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/28/1997 12:00:00 AM', 3, 70.29, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10418, 'QUICK', 4, '1/17/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 17.55, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10419, 'RICSU', 4, '1/20/1997 12:00:00 AM', '2/17/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 137.35, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10420, 'WELLI', 3, '1/21/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 44.12, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10421, 'QUEDE', 8, '1/21/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 99.23, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10422, 'FRANS', 2, '1/22/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', 1, 3.02, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10423, 'GOURL', 6, '1/23/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 3, 24.5, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10424, 'MEREP', 7, '1/23/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 2, 370.61, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10425, 'LAMAI', 6, '1/24/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 7.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10426, 'GALED', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', 1, 18.69, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10427, 'PICCO', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 31.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10428, 'REGGC', 7, '1/28/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', 1, 11.09, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10429, 'HUNGO', 3, '1/29/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 56.63, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10430, 'ERNSH', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', 1, 458.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10431, 'BOTTM', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 44.17, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10432, 'SPLIR', 3, '1/31/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 4.34, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10433, 'PRINI', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 73.83, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10434, 'FOLKO', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', 2, 17.92, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10435, 'CONSH', 8, '2/4/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 9.21, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10436, 'BLONP', 3, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', 2, 156.66, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10437, 'WARTH', 8, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', 1, 19.97, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10438, 'TOMSP', 3, '2/6/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 8.24, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10439, 'MEREP', 6, '2/7/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', 3, 4.07, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10440, 'SAVEA', 4, '2/10/1997 12:00:00 AM', '3/10/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 86.53, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10441, 'OLDWO', 3, '2/10/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 73.02, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10442, 'ERNSH', 3, '2/11/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', 2, 47.94, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10443, 'REGGC', 8, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 1, 13.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10444, 'BERGS', 3, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', 3, 3.5, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10445, 'BERGS', 3, '2/13/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', 1, 9.3, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10446, 'TOMSP', 6, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', 1, 14.68, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10447, 'RICAR', 4, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', 2, 68.66, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10448, 'RANCH', 4, '2/17/1997 12:00:00 AM', '3/17/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 2, 38.82, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10449, 'BLONP', 3, '2/18/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/27/1997 12:00:00 AM', 2, 53.3, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10450, 'VICTE', 8, '2/19/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 7.23, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10451, 'QUICK', 4, '2/19/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 189.09, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10452, 'SAVEA', 8, '2/20/1997 12:00:00 AM', '3/20/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 1, 140.26, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10453, 'AROUT', 1, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 2, 25.36, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10454, 'LAMAI', 4, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', 3, 2.74, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10455, 'WARTH', 8, '2/24/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 180.45, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10456, 'KOENE', 8, '2/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 8.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10457, 'KOENE', 2, '2/25/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 11.57, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10458, 'SUPRD', 7, '2/26/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 147.06, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10459, 'VICTE', 4, '2/27/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 25.09, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10460, 'FOLKO', 8, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 16.27, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10461, 'LILAS', 1, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', 3, 148.61, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10462, 'CONSH', 2, '3/3/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 1, 6.17, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10463, 'SUPRD', 5, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', 3, 14.78, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10464, 'FURIB', 4, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 89, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10465, 'VAFFE', 1, '3/5/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 3, 145.04, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10466, 'COMMI', 4, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', 1, 11.93, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10467, 'MAGAA', 8, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 4.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10468, 'KOENE', 3, '3/7/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 44.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10469, 'WHITC', 1, '3/10/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 1, 60.18, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10470, 'BONAP', 4, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 64.56, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10471, 'BSBEV', 2, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 3, 45.59, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10472, 'SEVES', 8, '3/12/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', 1, 4.2, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10473, 'ISLAT', 1, '3/13/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 16.37, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10474, 'PERIC', 5, '3/13/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 2, 83.49, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10475, 'SUPRD', 9, '3/14/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', 1, 68.52, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10476, 'HILAA', 8, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 3, 4.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10477, 'PRINI', 5, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 13.02, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10478, 'VICTE', 2, '3/18/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', 3, 4.81, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10479, 'RATTC', 3, '3/19/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 708.95, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10480, 'FOLIG', 6, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 2, 1.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10481, 'RICAR', 8, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 64.33, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10482, 'LAZYK', 1, '3/21/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 7.48, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10483, 'WHITC', 7, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', 2, 15.28, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10484, 'BSBEV', 3, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', 3, 6.88, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10485, 'LINOD', 4, '3/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', 2, 64.45, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10486, 'HILAA', 1, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 30.53, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10487, 'QUEEN', 2, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', 2, 71.07, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10488, 'FRANK', 8, '3/27/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 4.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10489, 'PICCO', 6, '3/28/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 5.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10490, 'HILAA', 7, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', 2, 210.19, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10491, 'FURIB', 8, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', 3, 16.96, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10492, 'BOTTM', 3, '4/1/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 1, 62.89, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10493, 'LAMAI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 10.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10494, 'COMMI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 65.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10495, 'LAUGB', 3, '4/3/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 3, 4.65, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10496, 'TRADH', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 2, 46.77, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10497, 'LEHMS', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 1, 36.21, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10498, 'HILAA', 8, '4/7/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 2, 29.75, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10499, 'LILAS', 4, '4/8/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 102.02, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10500, 'LAMAI', 6, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', 1, 42.68, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10501, 'BLAUS', 9, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 3, 8.85, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10502, 'PERIC', 2, '4/10/1997 12:00:00 AM', '5/8/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 69.32, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10503, 'HUNGO', 6, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 16.74, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10504, 'WHITC', 4, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', 3, 59.13, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10505, 'MEREP', 3, '4/14/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 7.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10506, 'KOENE', 9, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 21.19, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10507, 'ANTON', 7, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '4/22/1997 12:00:00 AM', 1, 47.45, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10508, 'OTTIK', 1, '4/16/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', 2, 4.99, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10509, 'BLAUS', 4, '4/17/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 0.15, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10510, 'SAVEA', 6, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 3, 367.63, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10511, 'BONAP', 4, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 350.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10512, 'FAMIA', 7, '4/21/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', 2, 3.53, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10513, 'WANDK', 7, '4/22/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 1, 105.65, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10514, 'ERNSH', 3, '4/22/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 2, 789.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10515, 'QUICK', 2, '4/23/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 1, 204.47, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10516, 'HUNGO', 2, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 62.78, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10517, 'NORTS', 3, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 3, 32.07, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10518, 'TORTU', 4, '4/25/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', 2, 218.15, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10519, 'CHOPS', 6, '4/28/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 91.76, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10520, 'SANTG', 7, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 1, 13.37, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10521, 'CACTU', 8, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 17.22, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10522, 'LEHMS', 4, '4/30/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', 1, 45.33, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10523, 'SEVES', 7, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 2, 77.63, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10524, 'BERGS', 1, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 2, 244.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10525, 'BONAP', 1, '5/2/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 11.06, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10526, 'WARTH', 4, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', 2, 58.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10527, 'QUICK', 7, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 1, 41.9, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10528, 'GREAL', 6, '5/6/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 3.35, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10529, 'MAISD', 5, '5/7/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 66.69, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10530, 'PICCO', 3, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 2, 339.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10531, 'OCEAN', 7, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 8.12, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10532, 'EASTC', 7, '5/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 3, 74.46, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10533, 'FOLKO', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', 1, 188.04, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10534, 'LEHMS', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', 2, 27.94, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10535, 'ANTON', 4, '5/13/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/21/1997 12:00:00 AM', 1, 15.64, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10536, 'LEHMS', 3, '5/14/1997 12:00:00 AM', '6/11/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 58.88, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10537, 'RICSU', 1, '5/14/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 78.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10538, 'BSBEV', 9, '5/15/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 3, 4.87, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10539, 'BSBEV', 6, '5/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 3, 12.36, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10540, 'QUICK', 3, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 3, 1007.64, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10541, 'HANAR', 2, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', 1, 68.65, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10542, 'KOENE', 1, '5/20/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', 3, 10.95, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10543, 'LILAS', 8, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 48.17, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10544, 'LONEP', 4, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 24.91, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10545, 'LAZYK', 8, '5/22/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', 2, 11.92, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10546, 'VICTE', 1, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', 3, 194.72, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10547, 'SEVES', 3, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 178.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10548, 'TOMSP', 3, '5/26/1997 12:00:00 AM', '6/23/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 1.43, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10549, 'QUICK', 5, '5/27/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 171.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10550, 'GODOS', 7, '5/28/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 4.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10551, 'FURIB', 4, '5/28/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 72.95, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10552, 'HILAA', 2, '5/29/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 1, 83.22, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10553, 'WARTH', 2, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', 2, 149.49, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10554, 'OTTIK', 4, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 3, 120.97, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10555, 'SAVEA', 6, '6/2/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', 3, 252.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10556, 'SIMOB', 2, '6/3/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 9.8, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10557, 'LEHMS', 9, '6/3/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 96.72, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10558, 'AROUT', 1, '6/4/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', 2, 72.97, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10559, 'BLONP', 6, '6/5/1997 12:00:00 AM', '7/3/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 8.05, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10560, 'FRANK', 8, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 1, 36.65, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10561, 'FOLKO', 2, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 2, 242.21, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10562, 'REGGC', 1, '6/9/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', 1, 22.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10563, 'RICAR', 2, '6/10/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '6/24/1997 12:00:00 AM', 2, 60.43, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10564, 'RATTC', 4, '6/10/1997 12:00:00 AM', '7/8/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', 3, 13.75, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10565, 'MEREP', 8, '6/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 2, 7.15, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10566, 'BLONP', 9, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 1, 88.4, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10567, 'HUNGO', 1, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', 1, 33.97, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10568, 'GALED', 3, '6/13/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 3, 6.54, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10569, 'RATTC', 5, '6/16/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', 1, 58.98, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10570, 'MEREP', 3, '6/17/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', 3, 188.99, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10571, 'ERNSH', 8, '6/17/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 3, 26.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10572, 'BERGS', 3, '6/18/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', 2, 116.43, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10573, 'ANTON', 7, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', 3, 84.84, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10574, 'TRAIH', 4, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 37.6, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10575, 'MORGK', 5, '6/20/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 1, 127.34, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10576, 'TORTU', 3, '6/23/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 3, 18.56, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10577, 'TRAIH', 9, '6/23/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 25.41, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10578, 'BSBEV', 4, '6/24/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 3, 29.6, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10579, 'LETSS', 1, '6/25/1997 12:00:00 AM', '7/23/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 13.73, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10580, 'OTTIK', 4, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/1/1997 12:00:00 AM', 3, 75.89, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10581, 'FAMIA', 3, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', 1, 3.01, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10582, 'BLAUS', 3, '6/27/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 27.71, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10583, 'WARTH', 2, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 7.28, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10584, 'BLONP', 4, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 1, 59.14, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10585, 'WELLI', 7, '7/1/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 1, 13.41, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10586, 'REGGC', 9, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 0.48, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10587, 'QUEDE', 1, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 62.52, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10588, 'QUICK', 2, '7/3/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 3, 194.67, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10589, 'GREAL', 8, '7/4/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 4.42, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10590, 'MEREP', 4, '7/7/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 3, 44.77, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10591, 'VAFFE', 1, '7/7/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 55.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10592, 'LEHMS', 3, '7/8/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 32.1, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10593, 'LEHMS', 7, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', 2, 174.2, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10594, 'OLDWO', 3, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 2, 5.24, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10595, 'ERNSH', 2, '7/10/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 1, 96.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10596, 'WHITC', 8, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 1, 16.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10597, 'PICCO', 7, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 35.12, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10598, 'RATTC', 1, '7/14/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 44.42, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10599, 'BSBEV', 6, '7/15/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 3, 29.98, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10600, 'HUNGC', 4, '7/16/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 1, 45.13, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10601, 'HILAA', 7, '7/16/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 1, 58.3, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10602, 'VAFFE', 8, '7/17/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 2, 2.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10603, 'SAVEA', 8, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 2, 48.77, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10604, 'FURIB', 1, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 1, 7.46, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10605, 'MEREP', 1, '7/21/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 2, 379.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10606, 'TRADH', 4, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', 3, 79.4, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10607, 'SAVEA', 5, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 1, 200.24, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10608, 'TOMSP', 4, '7/23/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 27.79, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10609, 'DUMON', 7, '7/24/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', 2, 1.85, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10610, 'LAMAI', 8, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 1, 26.78, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10611, 'WOLZA', 6, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 80.65, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10612, 'SAVEA', 1, '7/28/1997 12:00:00 AM', '8/25/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 544.08, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10613, 'HILAA', 4, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 8.11, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10614, 'BLAUS', 8, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 3, 1.93, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10615, 'WILMK', 2, '7/30/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 3, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10616, 'GREAL', 1, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', 2, 116.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10617, 'GREAL', 4, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', 2, 18.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10618, 'MEREP', 1, '8/1/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 1, 154.68, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10619, 'MEREP', 3, '8/4/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', 3, 91.05, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10620, 'LAUGB', 2, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 3, 0.94, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10621, 'ISLAT', 4, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 2, 23.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10622, 'RICAR', 4, '8/6/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 3, 50.97, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10623, 'FRANK', 8, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 2, 97.18, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10624, 'THECR', 4, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 94.8, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10625, 'ANATR', 3, '8/8/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 1, 43.9, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10626, 'BERGS', 1, '8/11/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 2, 138.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10627, 'SAVEA', 8, '8/11/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 107.46, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10628, 'BLONP', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 30.36, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10629, 'GODOS', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 85.46, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10630, 'KOENE', 1, '8/13/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 32.35, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10631, 'LAMAI', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', 1, 0.87, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10632, 'WANDK', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 1, 41.38, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10633, 'ERNSH', 7, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', 3, 477.9, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10634, 'FOLIG', 4, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 487.38, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10635, 'MAGAA', 8, '8/18/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 47.46, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10636, 'WARTH', 4, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 1.15, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10637, 'QUEEN', 6, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 201.29, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10638, 'LINOD', 3, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 1, 158.44, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10639, 'SANTG', 7, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', 3, 38.64, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10640, 'WANDK', 4, '8/21/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', 1, 23.55, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10641, 'HILAA', 4, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 2, 179.61, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10642, 'SIMOB', 7, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', 3, 41.89, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10643, 'ALFKI', 6, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 29.46, 'Alfreds Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10644, 'WELLI', 3, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 2, 0.14, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10645, 'HANAR', 4, '8/26/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 12.41, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10646, 'HUNGO', 9, '8/27/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 142.33, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10647, 'QUEDE', 4, '8/27/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 2, 45.54, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10648, 'RICAR', 5, '8/28/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', 2, 14.25, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10649, 'MAISD', 5, '8/28/1997 12:00:00 AM', '9/25/1997 12:00:00 AM', '8/29/1997 12:00:00 AM', 3, 6.2, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10650, 'FAMIA', 5, '8/29/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 176.81, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10651, 'WANDK', 8, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 20.6, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10652, 'GOURL', 4, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 2, 7.14, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10653, 'FRANK', 1, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 93.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10654, 'BERGS', 5, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 1, 55.26, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10655, 'REGGC', 1, '9/3/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 4.41, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10656, 'GREAL', 6, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 1, 57.15, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10657, 'SAVEA', 2, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 2, 352.69, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10658, 'QUICK', 4, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 1, 364.15, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10659, 'QUEEN', 7, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 2, 105.81, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10660, 'HUNGC', 8, '9/8/1997 12:00:00 AM', '10/6/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 1, 111.29, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10661, 'HUNGO', 7, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 3, 17.55, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10662, 'LONEP', 3, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 2, 1.28, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10663, 'BONAP', 2, '9/10/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 113.15, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10664, 'FURIB', 1, '9/10/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 3, 1.27, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10665, 'LONEP', 1, '9/11/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', 2, 26.31, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10666, 'RICSU', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 2, 232.42, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10667, 'ERNSH', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 78.09, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10668, 'WANDK', 1, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 47.22, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10669, 'SIMOB', 2, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 1, 24.39, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10670, 'FRANK', 4, '9/16/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 1, 203.48, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10671, 'FRANR', 1, '9/17/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', 1, 30.34, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10672, 'BERGS', 9, '9/17/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 2, 95.75, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10673, 'WILMK', 2, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 22.76, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10674, 'ISLAT', 4, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 2, 0.9, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10675, 'FRANK', 5, '9/19/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 31.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10676, 'TORTU', 2, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', 2, 2.01, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10677, 'ANTON', 1, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 3, 4.03, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10678, 'SAVEA', 7, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 3, 388.98, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10679, 'BLONP', 8, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 27.94, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10680, 'OLDWO', 1, '9/24/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 1, 26.61, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10681, 'GREAL', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 76.13, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10682, 'ANTON', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 2, 36.13, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10683, 'DUMON', 2, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 1, 4.4, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10684, 'OTTIK', 3, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 1, 145.63, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10685, 'GOURL', 4, '9/29/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 33.75, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10686, 'PICCO', 2, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', 1, 96.5, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10687, 'HUNGO', 9, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', 2, 296.43, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10688, 'VAFFE', 4, '10/1/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 299.09, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10689, 'BERGS', 1, '10/1/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 13.42, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10690, 'HANAR', 1, '10/2/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 1, 15.8, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10691, 'QUICK', 2, '10/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', 2, 810.05, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10692, 'ALFKI', 4, '10/3/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 2, 61.02, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10693, 'WHITC', 3, '10/6/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', 3, 139.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10694, 'QUICK', 8, '10/6/1997 12:00:00 AM', '11/3/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', 3, 398.36, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10695, 'WILMK', 7, '10/7/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 16.72, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10696, 'WHITC', 8, '10/8/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 3, 102.55, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10697, 'LINOD', 3, '10/8/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 45.52, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10698, 'ERNSH', 4, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', 1, 272.47, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10699, 'MORGK', 3, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 3, 0.58, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10700, 'SAVEA', 3, '10/10/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 1, 65.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10701, 'HUNGO', 6, '10/13/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 3, 220.31, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10702, 'ALFKI', 4, '10/13/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 1, 23.94, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10703, 'FOLKO', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', 2, 152.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10704, 'QUEEN', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 4.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10705, 'HILAA', 9, '10/15/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 3.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10706, 'OLDWO', 8, '10/16/1997 12:00:00 AM', '11/13/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 3, 135.63, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10707, 'AROUT', 4, '10/16/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 3, 21.74, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10708, 'THEBI', 6, '10/17/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 2.96, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10709, 'GOURL', 1, '10/17/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '11/20/1997 12:00:00 AM', 3, 210.8, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10710, 'FRANS', 1, '10/20/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 1, 4.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10711, 'SAVEA', 5, '10/21/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 52.41, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10712, 'HUNGO', 3, '10/21/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 1, 89.93, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10713, 'SAVEA', 1, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', 1, 167.05, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10714, 'SAVEA', 5, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 3, 24.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10715, 'BONAP', 3, '10/23/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 1, 63.2, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10716, 'RANCH', 4, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 2, 22.57, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10717, 'FRANK', 1, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 59.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10718, 'KOENE', 1, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 3, 170.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10719, 'LETSS', 8, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 51.44, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10720, 'QUEDE', 8, '10/28/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 9.53, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10721, 'QUICK', 5, '10/29/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 3, 48.92, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10722, 'SAVEA', 8, '10/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/4/1997 12:00:00 AM', 1, 74.58, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10723, 'WHITC', 3, '10/30/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 1, 21.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10724, 'MEREP', 8, '10/30/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 57.75, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10725, 'FAMIA', 4, '10/31/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 3, 10.83, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10726, 'EASTC', 4, '11/3/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 16.56, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10727, 'REGGC', 2, '11/3/1997 12:00:00 AM', '12/1/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 89.9, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10728, 'QUEEN', 4, '11/4/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', 2, 58.33, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10729, 'LINOD', 8, '11/4/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 3, 141.06, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10730, 'BONAP', 5, '11/5/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 20.12, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10731, 'CHOPS', 7, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 96.65, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10732, 'BONAP', 3, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 16.97, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10733, 'BERGS', 1, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/10/1997 12:00:00 AM', 3, 110.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10734, 'GOURL', 2, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', 3, 1.63, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10735, 'LETSS', 6, '11/10/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 45.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10736, 'HUNGO', 9, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 44.1, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10737, 'VINET', 2, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 7.79, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10738, 'SPECD', 2, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 1, 2.91, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10739, 'VINET', 3, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', 3, 11.08, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10740, 'WHITC', 4, '11/13/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 2, 81.88, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10741, 'AROUT', 4, '11/14/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 10.96, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10742, 'BOTTM', 3, '11/14/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 243.73, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10743, 'AROUT', 1, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10744, 'VAFFE', 6, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 69.19, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10745, 'QUICK', 9, '11/18/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 3.52, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10746, 'CHOPS', 1, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 3, 31.43, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10747, 'PICCO', 6, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', 1, 117.33, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10748, 'SAVEA', 3, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 1, 232.55, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10749, 'ISLAT', 4, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 61.53, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10750, 'WARTH', 9, '11/21/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 79.3, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10751, 'RICSU', 3, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', 3, 130.79, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10752, 'NORTS', 2, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 3, 1.39, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10753, 'FRANS', 3, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 7.7, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10754, 'MAGAA', 6, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 3, 2.38, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10755, 'BONAP', 4, '11/26/1997 12:00:00 AM', '12/24/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 2, 16.71, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10756, 'SPLIR', 8, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', 2, 73.21, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10757, 'SAVEA', 6, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', 1, 8.19, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10758, 'RICSU', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', 3, 138.17, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10759, 'ANATR', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 3, 11.99, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10760, 'MAISD', 4, '12/1/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', 1, 155.64, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10761, 'RATTC', 5, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 2, 18.66, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10762, 'FOLKO', 3, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 328.74, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10763, 'FOLIG', 3, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 37.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10764, 'ERNSH', 6, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 145.45, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10765, 'QUICK', 3, '12/4/1997 12:00:00 AM', '1/1/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 3, 42.74, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10766, 'OTTIK', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 157.55, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10767, 'SUPRD', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 3, 1.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10768, 'AROUT', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 2, 146.32, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10769, 'VAFFE', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 65.06, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10770, 'HANAR', 8, '12/9/1997 12:00:00 AM', '1/6/1998 12:00:00 AM', '12/17/1997 12:00:00 AM', 3, 5.32, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10771, 'ERNSH', 9, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 11.19, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10772, 'LEHMS', 3, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 91.28, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10773, 'ERNSH', 1, '12/11/1997 12:00:00 AM', '1/8/1998 12:00:00 AM', '12/16/1997 12:00:00 AM', 3, 96.43, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10774, 'FOLKO', 4, '12/11/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 48.2, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10775, 'THECR', 7, '12/12/1997 12:00:00 AM', '1/9/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 20.25, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10776, 'ERNSH', 1, '12/15/1997 12:00:00 AM', '1/12/1998 12:00:00 AM', '12/18/1997 12:00:00 AM', 3, 351.53, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10777, 'GOURL', 7, '12/15/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 3.01, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10778, 'BERGS', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 1, 6.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10779, 'MORGK', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 2, 58.13, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10780, 'LILAS', 2, '12/16/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', 1, 42.13, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10781, 'WARTH', 2, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 3, 73.16, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10782, 'CACTU', 9, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 1.1, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10783, 'HANAR', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 124.98, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10784, 'MAGAA', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 70.09, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10785, 'GROSR', 1, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 3, 1.51, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10786, 'QUEEN', 8, '12/19/1997 12:00:00 AM', '1/16/1998 12:00:00 AM', '12/23/1997 12:00:00 AM', 1, 110.87, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10787, 'LAMAI', 2, '12/19/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 249.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10788, 'QUICK', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 42.7, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10789, 'FOLIG', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 100.6, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10790, 'GOURL', 6, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 28.23, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10791, 'FRANK', 6, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/1/1998 12:00:00 AM', 2, 16.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10792, 'WOLZA', 1, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 3, 23.79, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10793, 'AROUT', 3, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 3, 4.52, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10794, 'QUEDE', 6, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 1, 21.49, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10795, 'ERNSH', 8, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', 2, 126.66, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10796, 'HILAA', 3, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 26.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10797, 'DRACD', 7, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 33.35, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10798, 'ISLAT', 2, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 1, 2.33, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10799, 'KOENE', 9, '12/26/1997 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 30.76, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10800, 'SEVES', 1, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 137.44, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10801, 'BOLID', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 97.09, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10802, 'SIMOB', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 257.26, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10803, 'WELLI', 4, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/6/1998 12:00:00 AM', 1, 55.23, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10804, 'SEVES', 6, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 2, 27.33, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10805, 'THEBI', 2, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 237.34, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10806, 'VICTE', 3, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 22.11, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10807, 'FRANS', 4, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.36, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10808, 'OLDWO', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 45.53, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10809, 'WELLI', 7, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 1, 4.87, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10810, 'LAUGB', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 3, 4.33, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10811, 'LINOD', 8, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 1, 31.22, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10812, 'REGGC', 5, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 1, 59.78, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10813, 'RICAR', 1, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 1, 47.38, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10814, 'VICTE', 3, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 130.94, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10815, 'SAVEA', 2, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 14.62, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10816, 'GREAL', 4, '1/6/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 2, 719.78, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10817, 'KOENE', 3, '1/6/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 306.07, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10818, 'MAGAA', 7, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 3, 65.48, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10819, 'CACTU', 2, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 19.76, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10820, 'RATTC', 3, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 37.52, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10821, 'SPLIR', 1, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/15/1998 12:00:00 AM', 1, 36.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10822, 'TRAIH', 6, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 7, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10823, 'LILAS', 5, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 163.97, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10824, 'FOLKO', 8, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.23, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10825, 'DRACD', 1, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 79.25, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10826, 'BLONP', 6, '1/12/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 1, 7.09, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10827, 'BONAP', 1, '1/12/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 63.54, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10828, 'RANCH', 9, '1/13/1998 12:00:00 AM', '1/27/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 90.85, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10829, 'ISLAT', 9, '1/13/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 1, 154.72, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10830, 'TRADH', 4, '1/13/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 81.83, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10831, 'SANTG', 3, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 72.19, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10832, 'LAMAI', 2, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 43.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10833, 'OTTIK', 6, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 71.49, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10834, 'TRADH', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 3, 29.78, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10835, 'ALFKI', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 3, 69.53, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10836, 'ERNSH', 7, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 1, 411.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10837, 'BERGS', 9, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 13.32, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10838, 'LINOD', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 59.28, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10839, 'TRADH', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/22/1998 12:00:00 AM', 3, 35.43, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10840, 'LINOD', 4, '1/19/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 2, 2.71, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10841, 'SUPRD', 5, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 424.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10842, 'TORTU', 1, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 3, 54.42, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10843, 'VICTE', 4, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 9.26, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10844, 'PICCO', 8, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 25.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10845, 'QUICK', 8, '1/21/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 212.98, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10846, 'SUPRD', 2, '1/22/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 56.46, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10847, 'SAVEA', 4, '1/22/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 3, 487.57, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10848, 'CONSH', 7, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 38.24, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10849, 'KOENE', 9, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 2, 0.56, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10850, 'VICTE', 1, '1/23/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 49.19, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10851, 'RICAR', 5, '1/26/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 1, 160.55, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10852, 'RATTC', 8, '1/26/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 174.05, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10853, 'BLAUS', 9, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 2, 53.83, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10854, 'ERNSH', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', 2, 100.22, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10855, 'OLDWO', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 170.97, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10856, 'ANTON', 3, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 58.43, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10857, 'BERGS', 8, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 188.85, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10858, 'LACOR', 2, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 1, 52.51, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10859, 'FRANK', 1, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 76.1, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10860, 'FRANR', 3, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 3, 19.26, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10861, 'WHITC', 4, '1/30/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 14.93, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10862, 'LEHMS', 8, '1/30/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 53.23, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10863, 'HILAA', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 30.26, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10864, 'AROUT', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 3.04, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10865, 'QUICK', 2, '2/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 348.14, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10866, 'BERGS', 5, '2/3/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 109.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10867, 'LONEP', 6, '2/3/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 1, 1.93, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10868, 'QUEEN', 7, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 191.27, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10869, 'SEVES', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 143.28, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10870, 'WOLZA', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 3, 12.04, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10871, 'BONAP', 9, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 112.27, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10872, 'GODOS', 5, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 175.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10873, 'WILMK', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 0.82, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10874, 'GODOS', 5, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 2, 19.58, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10875, 'BERGS', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 2, 32.37, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10876, 'BONAP', 7, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 60.42, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10877, 'RICAR', 1, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 1, 38.06, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10878, 'QUICK', 4, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 46.69, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10879, 'WILMK', 3, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 8.5, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10880, 'FOLKO', 7, '2/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 88.01, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10881, 'CACTU', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 2.84, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10882, 'SAVEA', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 23.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10883, 'LONEP', 8, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 0.53, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10884, 'LETSS', 4, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 2, 90.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10885, 'SUPRD', 6, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 3, 5.64, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10886, 'HANAR', 1, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 4.99, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10887, 'GALED', 8, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 3, 1.25, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10888, 'GODOS', 1, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 51.87, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10889, 'RATTC', 9, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 3, 280.61, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10890, 'DUMON', 7, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 32.76, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10891, 'LEHMS', 7, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 20.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10892, 'MAISD', 4, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 120.27, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10893, 'KOENE', 9, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 2, 77.78, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10894, 'SAVEA', 1, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 1, 116.13, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10895, 'ERNSH', 3, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 1, 162.75, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10896, 'MAISD', 7, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 32.45, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10897, 'HUNGO', 3, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', 2, 603.54, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10898, 'OCEAN', 4, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 1.27, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10899, 'LILAS', 5, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 3, 1.21, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10900, 'WELLI', 1, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 1.66, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10901, 'HILAA', 4, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 1, 62.09, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10902, 'FOLKO', 1, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 1, 44.15, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10903, 'HANAR', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 36.71, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10904, 'WHITC', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 162.95, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10905, 'WELLI', 9, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 13.72, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10906, 'WOLZA', 4, '2/25/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 3, 26.29, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10907, 'SPECD', 6, '2/25/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 9.19, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10908, 'REGGC', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 32.96, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10909, 'SANTG', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', 2, 53.05, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10910, 'WILMK', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 38.11, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10911, 'GODOS', 3, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 1, 38.19, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10912, 'HUNGO', 2, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 580.91, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10913, 'QUEEN', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 1, 33.05, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10914, 'QUEEN', 6, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 21.19, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10915, 'TORTU', 2, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 2, 3.51, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10916, 'RANCH', 1, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 63.77, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10917, 'ROMEY', 4, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 2, 8.29, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10918, 'BOTTM', 3, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 48.83, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10919, 'LINOD', 2, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 19.8, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10920, 'AROUT', 4, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 29.61, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10921, 'VAFFE', 1, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 1, 176.48, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10922, 'HANAR', 5, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 3, 62.74, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10923, 'LAMAI', 7, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 68.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10924, 'BERGS', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 2, 151.52, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10925, 'HANAR', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 1, 2.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10926, 'ANATR', 4, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 39.92, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10927, 'LACOR', 4, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 19.79, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10928, 'GALED', 1, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 1.36, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10929, 'FRANK', 6, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 1, 33.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10930, 'SUPRD', 4, '3/6/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 15.55, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10931, 'RICSU', 4, '3/6/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 13.6, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10932, 'BONAP', 8, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 134.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10933, 'ISLAT', 6, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 3, 54.15, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10934, 'LEHMS', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 3, 32.01, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10935, 'WELLI', 4, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 47.59, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10936, 'GREAL', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 33.68, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10937, 'CACTU', 7, '3/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 31.51, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10938, 'QUICK', 3, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 31.89, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10939, 'MAGAA', 2, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 2, 76.33, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10940, 'BONAP', 8, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 3, 19.77, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10941, 'SAVEA', 7, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 400.81, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10942, 'REGGC', 9, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 17.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10943, 'BSBEV', 4, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 2.17, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10944, 'BOTTM', 6, '3/12/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 52.92, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10945, 'MORGK', 4, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 10.22, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10946, 'VAFFE', 1, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 27.2, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10947, 'BSBEV', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 3.26, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10948, 'GODOS', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 3, 23.39, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10949, 'BOTTM', 2, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', 3, 74.44, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10950, 'MAGAA', 1, '3/16/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 2.5, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10951, 'RICSU', 9, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 2, 30.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10952, 'ALFKI', 1, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 40.42, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10953, 'AROUT', 9, '3/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10954, 'LINOD', 5, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 1, 27.91, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10955, 'FOLKO', 8, '3/17/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 3.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10956, 'BLAUS', 6, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 44.65, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10957, 'HILAA', 8, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 105.36, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10958, 'OCEAN', 7, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 49.56, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10959, 'GOURL', 6, '3/18/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 4.98, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10960, 'HILAA', 3, '3/19/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 2.08, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10961, 'QUEEN', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 1, 104.47, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10962, 'QUICK', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 275.79, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10963, 'FURIB', 9, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 3, 2.7, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10964, 'SPECD', 3, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 2, 87.38, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10965, 'OLDWO', 6, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 3, 144.38, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10966, 'CHOPS', 4, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 27.19, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10967, 'TOMSP', 2, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 62.22, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10968, 'ERNSH', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', 3, 74.6, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10969, 'COMMI', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 2, 0.21, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10970, 'BOLID', 9, '3/24/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 1, 16.16, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10971, 'FRANR', 2, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 121.82, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10972, 'LACOR', 4, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 2, 0.02, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10973, 'LACOR', 6, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 15.17, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10974, 'SPLIR', 3, '3/25/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 12.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10975, 'BOTTM', 1, '3/25/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 32.27, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10976, 'HILAA', 1, '3/25/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 1, 37.97, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10977, 'FOLKO', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 208.5, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10978, 'MAISD', 9, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 2, 32.82, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10979, 'ERNSH', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', 2, 353.07, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10980, 'FOLKO', 4, '3/27/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 1, 1.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10981, 'HANAR', 1, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 193.37, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10982, 'BOTTM', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 14.01, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10983, 'SAVEA', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 2, 657.54, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10984, 'SAVEA', 1, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 211.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10985, 'HUNGO', 2, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 91.51, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10986, 'OCEAN', 8, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 217.86, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10987, 'EASTC', 8, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 1, 185.48, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10988, 'RATTC', 3, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 61.14, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10989, 'QUEDE', 2, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 34.76, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10990, 'ERNSH', 2, '4/1/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 3, 117.61, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10991, 'QUICK', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 1, 38.51, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10992, 'THEBI', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 4.27, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10993, 'FOLKO', 7, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 8.81, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10994, 'VAFFE', 2, '4/2/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', 3, 65.53, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10995, 'PERIC', 1, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 3, 46, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10996, 'QUICK', 4, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 1.12, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10997, 'LILAS', 8, '4/3/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 73.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10998, 'WOLZA', 8, '4/3/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 2, 20.31, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10999, 'OTTIK', 6, '4/3/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 96.35, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11000, 'RATTC', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 3, 55.12, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11001, 'FOLKO', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 2, 197.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11002, 'SAVEA', 4, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 1, 141.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11003, 'THECR', 3, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 3, 14.91, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11004, 'MAISD', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 44.84, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11005, 'WILMK', 2, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11006, 'GREAL', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 2, 25.19, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11007, 'PRINI', 8, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 202.24, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11008, 'ERNSH', 7, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', NULL, 3, 79.46, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11009, 'GODOS', 2, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 59.11, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11010, 'REGGC', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 28.71, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11011, 'ALFKI', 3, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 1, 1.21, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11012, 'FRANK', 1, '4/9/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 3, 242.95, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11013, 'ROMEY', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 32.99, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11014, 'LINOD', 2, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 3, 23.6, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11015, 'SANTG', 2, '4/10/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 4.62, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11016, 'AROUT', 9, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 33.8, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11017, 'ERNSH', 9, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 754.26, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11018, 'LONEP', 4, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 11.65, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11019, 'RANCH', 6, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', NULL, 3, 3.17, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11020, 'OTTIK', 2, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 43.3, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11021, 'QUICK', 3, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 1, 297.18, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11022, 'HANAR', 9, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 6.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11023, 'BSBEV', 1, '4/14/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 123.83, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11024, 'EASTC', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 74.36, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11025, 'WARTH', 6, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 3, 29.17, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11026, 'FRANS', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 1, 47.09, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11027, 'BOTTM', 1, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 52.52, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11028, 'KOENE', 2, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 1, 29.59, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11029, 'CHOPS', 4, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 47.84, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11030, 'SAVEA', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 2, 830.75, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11031, 'SAVEA', 6, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 227.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11032, 'WHITC', 2, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 606.19, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11033, 'RICSU', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 84.74, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11034, 'OLDWO', 8, '4/20/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 40.32, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11035, 'SUPRD', 2, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 0.17, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11036, 'DRACD', 8, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 3, 149.47, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11037, 'GODOS', 7, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 3.2, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11038, 'SUPRD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 2, 29.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11039, 'LINOD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', NULL, 2, 65, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11040, 'GREAL', 4, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', NULL, 3, 18.84, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11041, 'CHOPS', 3, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 2, 48.22, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11042, 'COMMI', 2, '4/22/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 29.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11043, 'SPECD', 5, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 8.8, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11044, 'WOLZA', 4, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 8.72, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11045, 'BOTTM', 6, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', NULL, 2, 70.58, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11046, 'WANDK', 8, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 71.64, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11047, 'EASTC', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 46.62, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11048, 'BOTTM', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 3, 24.12, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11049, 'GOURL', 3, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 8.34, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11050, 'FOLKO', 8, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 59.41, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11051, 'LAMAI', 7, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', NULL, 3, 2.79, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11052, 'HANAR', 3, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 67.26, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11053, 'PICCO', 2, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 53.05, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11054, 'CACTU', 8, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', NULL, 1, 0.33, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11055, 'HILAA', 7, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 120.92, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11056, 'EASTC', 8, '4/28/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 2, 278.96, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11057, 'NORTS', 3, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 4.13, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11058, 'BLAUS', 9, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', NULL, 3, 31.14, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11059, 'RICAR', 2, '4/29/1998 12:00:00 AM', '6/10/1998 12:00:00 AM', NULL, 2, 85.8, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11060, 'FRANS', 2, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 10.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11061, 'GREAL', 4, '4/30/1998 12:00:00 AM', '6/11/1998 12:00:00 AM', NULL, 3, 14.01, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11062, 'REGGC', 4, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', NULL, 2, 29.93, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11063, 'HUNGO', 3, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 81.73, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11064, 'SAVEA', 1, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 30.09, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11065, 'LILAS', 8, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', NULL, 1, 12.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11066, 'WHITC', 7, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 44.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11067, 'DRACD', 1, '5/4/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 7.98, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11068, 'QUEEN', 8, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', NULL, 2, 81.75, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11069, 'TORTU', 1, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 15.67, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11070, 'LEHMS', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 136, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11071, 'LILAS', 1, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 0.93, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11072, 'ERNSH', 4, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 258.64, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11073, 'PERIC', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 24.95, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11074, 'SIMOB', 7, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 18.44, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11075, 'RICSU', 8, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 6.19, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11076, 'BONAP', 4, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 38.28, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) 
-INSERT INTO Orders ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11077, 'RATTC', 1, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 8.53, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) 
-GO
-SET IDENTITY_INSERT Orders OFF
-GO
-
-
-SET IDENTITY_INSERT Suppliers ON
-GO
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (1, 'Exotic Liquids', 'Charlotte Cooper', 'Purchasing Manager', '49 Gilbert St.', 'London', NULL, 'EC1 4SD', 'UK', '(171) 555-2222', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (2, 'New Orleans Cajun Delights', 'Shelley Burke', 'Order Administrator', 'P.O. Box 78934', 'New Orleans', 'LA', '70117', 'USA', '(100) 555-4822', NULL, '#CAJUN.HTM#' ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (3, 'Grandma Kelly''s Homestead', 'Regina Murphy', 'Sales Representative', '707 Oxford Rd.', 'Ann Arbor', 'MI', '48104', 'USA', '(313) 555-5735', '(313) 555-3349', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (4, 'Tokyo Traders', 'Yoshi Nagase', 'Marketing Manager', '9-8 Sekimai Musashino-shi', 'Tokyo', NULL, '100', 'Japan', '(03) 3555-5011', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (5, 'Cooperativa de Quesos ''Las Cabras''', 'Antonio del Valle Saavedra', 'Export Administrator', 'Calle del Rosal 4', 'Oviedo', 'Asturias', '33007', 'Spain', '(98) 598 76 54', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (6, 'Mayumi''s', 'Mayumi Ohno', 'Marketing Representative', '92 Setsuko Chuo-ku', 'Osaka', NULL, '545', 'Japan', '(06) 431-7877', NULL, 'Mayumi''s (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/mayumi.htm#' ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (7, 'Pavlova, Ltd.', 'Ian Devling', 'Marketing Manager', '74 Rose St. Moonie Ponds', 'Melbourne', 'Victoria', '3058', 'Australia', '(03) 444-2343', '(03) 444-6588', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (8, 'Specialty Biscuits, Ltd.', 'Peter Wilson', 'Sales Representative', '29 King''s Way', 'Manchester', NULL, 'M14 GSD', 'UK', '(161) 555-4448', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (9, 'PB Kn�ckebr�d AB', 'Lars Peterson', 'Sales Agent', 'Kaloadagatan 13', 'G�teborg', NULL, 'S-345 67', 'Sweden', '031-987 65 43', '031-987 65 91', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (10, 'Refrescos Americanas LTDA', 'Carlos Diaz', 'Marketing Manager', 'Av. das Americanas 12.890', 'Sao Paulo', NULL, '5442', 'Brazil', '(11) 555 4640', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (11, 'Heli S��waren GmbH & Co. KG', 'Petra Winkler', 'Sales Manager', 'Tiergartenstra�e 5', 'Berlin', NULL, '10785', 'Germany', '(010) 9984510', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (12, 'Plutzer Lebensmittelgro�m�rkte AG', 'Martin Bein', 'International Marketing Mgr.', 'Bogenallee 51', 'Frankfurt', NULL, '60439', 'Germany', '(069) 992755', NULL, 'Plutzer (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/plutzer.htm#' ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (13, 'Nord-Ost-Fisch Handelsgesellschaft mbH', 'Sven Petersen', 'Coordinator Foreign Markets', 'Frahmredder 112a', 'Cuxhaven', NULL, '27478', 'Germany', '(04721) 8713', '(04721) 8714', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (14, 'Formaggi Fortini s.r.l.', 'Elio Rossi', 'Sales Representative', 'Viale Dante, 75', 'Ravenna', NULL, '48100', 'Italy', '(0544) 60323', '(0544) 60603', '#FORMAGGI.HTM#' ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (15, 'Norske Meierier', 'Beate Vileid', 'Marketing Manager', 'Hatlevegen 5', 'Sandvika', NULL, '1320', 'Norway', '(0)2-953010', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (16, 'Bigfoot Breweries', 'Cheryl Saylor', 'Regional Account Rep.', '3400 - 8th Avenue Suite 210', 'Bend', 'OR', '97101', 'USA', '(503) 555-9931', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (17, 'Svensk Sj�f�da AB', 'Michael Bj�rn', 'Sales Representative', 'Brovallav�gen 231', 'Stockholm', NULL, 'S-123 45', 'Sweden', '08-123 45 67', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (18, 'Aux joyeux eccl�siastiques', 'Guyl�ne Nodier', 'Sales Manager', '203, Rue des Francs-Bourgeois', 'Paris', NULL, '75004', 'France', '(1) 03.83.00.68', '(1) 03.83.00.62', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (19, 'New England Seafood Cannery', 'Robb Merchant', 'Wholesale Account Agent', 'Order Processing Dept. 2100 Paul Revere Blvd.', 'Boston', 'MA', '02134', 'USA', '(617) 555-3267', '(617) 555-3389', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (20, 'Leka Trading', 'Chandra Leka', 'Owner', '471 Serangoon Loop, Suite #402', 'Singapore', NULL, '0512', 'Singapore', '555-8787', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (21, 'Lyngbysild', 'Niels Petersen', 'Sales Manager', 'Lyngbysild Fiskebakken 10', 'Lyngby', NULL, '2800', 'Denmark', '43844108', '43844115', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (22, 'Zaanse Snoepfabriek', 'Dirk Luchte', 'Accounting Manager', 'Verkoop Rijnweg 22', 'Zaandam', NULL, '9999 ZZ', 'Netherlands', '(12345) 1212', '(12345) 1210', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (23, 'Karkki Oy', 'Anne Heikkonen', 'Product Manager', 'Valtakatu 12', 'Lappeenranta', NULL, '53120', 'Finland', '(953) 10956', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (24, 'G''day, Mate', 'Wendy Mackenzie', 'Sales Representative', '170 Prince Edward Parade Hunter''s Hill', 'Sydney', 'NSW', '2042', 'Australia', '(02) 555-5914', '(02) 555-4873', 'G''day Mate (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/gdaymate.htm#' ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (25, 'Ma Maison', 'Jean-Guy Lauzon', 'Marketing Manager', '2960 Rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-9022', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (26, 'Pasta Buttini s.r.l.', 'Giovanni Giudici', 'Order Administrator', 'Via dei Gelsomini, 153', 'Salerno', NULL, '84100', 'Italy', '(089) 6547665', '(089) 6547667', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (27, 'Escargots Nouveaux', 'Marie Delamare', 'Sales Manager', '22, rue H. Voiron', 'Montceau', NULL, '71300', 'France', '85.57.00.07', NULL, NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (28, 'Gai p�turage', 'Eliane Noz', 'Sales Representative', 'Bat. B 3, rue des Alpes', 'Annecy', NULL, '74000', 'France', '38.76.98.06', '38.76.98.58', NULL ) 
-INSERT INTO Suppliers ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (29, 'For�ts d''�rables', 'Chantal Goulet', 'Accounting Manager', '148 rue Chasseur', 'Ste-Hyacinthe', 'Qu�bec', 'J2S 7S8', 'Canada', '(514) 555-2955', '(514) 555-2921', NULL ) 
-SET IDENTITY_INSERT Suppliers OFF
-GO
-
-SET IDENTITY_INSERT Products ON
-go
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (1, 'Chai', 1, 1, '10 boxes x 20 bags', 18, 520, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (2, 'Chang', 1, 1, '24 - 12 oz bottles', 19, 522, 40, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (3, 'Aniseed Syrup', 1, 2, '12 - 550 ml bottles', 10, 13, 70, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (4, 'Chef Anton''s Cajun Seasoning', 2, 2, '48 - 6 oz jars', 22, 53, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (5, 'Chef Anton''s Gumbo Mix', 2, 2, '36 boxes', 21.35, 0, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (6, 'Grandma''s Boysenberry Spread', 3, 2, '12 - 8 oz jars', 25, 120, 0, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (7, 'Uncle Bob''s Organic Dried Pears', 3, 7, '12 - 1 lb pkgs.', 30, 15, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (8, 'Northwoods Cranberry Sauce', 3, 2, '12 - 12 oz jars', 40, 6, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (9, 'Mishi Kobe Niku', 4, 6, '18 - 500 g pkgs.', 97, 29, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (10, 'Ikura', 4, 8, '12 - 200 ml jars', 31, 31, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (11, 'Queso Cabrales', 5, 4, '1 kg pkg.', 21, 22, 30, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (12, 'Queso Manchego La Pastora', 5, 4, '10 - 500 g pkgs.', 38, 86, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (13, 'Konbu', 6, 8, '2 kg box', 6, 24, 0, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (14, 'Tofu', 6, 7, '40 - 100 g pkgs.', 23.25, 35, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (15, 'Genen Shouyu', 6, 2, '24 - 250 ml bottles', 15.5, 39, 0, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (16, 'Pavlova', 7, 3, '32 - 500 g boxes', 17.45, 29, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (17, 'Alice Mutton', 7, 6, '20 - 1 kg tins', 39, 0, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (18, 'Carnarvon Tigers', 7, 8, '16 kg pkg.', 62.5, 42, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (19, 'Teatime Chocolate Biscuits', 8, 3, '10 boxes x 12 pieces', 9.2, 25, 0, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (20, 'Sir Rodney''s Marmalade', 8, 3, '30 gift boxes', 81, 40, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (21, 'Sir Rodney''s Scones', 8, 3, '24 pkgs. x 4 pieces', 10, 3, 40, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (22, 'Gustaf''s Kn�ckebr�d', 9, 5, '24 - 500 g pkgs.', 21, 104, 0, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (23, 'Tunnbr�d', 9, 5, '12 - 250 g pkgs.', 9, 61, 0, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (24, 'Guaran� Fant�stica', 10, 1, '12 - 355 ml cans', 4.5, 20, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (25, 'NuNuCa Nu�-Nougat-Creme', 11, 3, '20 - 450 g glasses', 14, 76, 0, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (26, 'Gumb�r Gummib�rchen', 11, 3, '100 - 250 g bags', 31.23, 15, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (27, 'Schoggi Schokolade', 11, 3, '100 - 100 g pieces', 43.9, 49, 0, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (28, 'R�ssle Sauerkraut', 12, 7, '25 - 825 g cans', 45.6, 26, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (29, 'Th�ringer Rostbratwurst', 12, 6, '50 bags x 30 sausgs.', 123.79, 0, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (30, 'Nord-Ost Matjeshering', 13, 8, '10 - 200 g glasses', 25.89, 10, 0, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (31, 'Gorgonzola Telino', 14, 4, '12 - 100 g pkgs', 12.5, 0, 70, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (32, 'Mascarpone Fabioli', 14, 4, '24 - 200 g pkgs.', 32, 9, 40, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (33, 'Geitost', 15, 4, '500 g', 2.5, 112, 0, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (34, 'Sasquatch Ale', 16, 1, '24 - 12 oz bottles', 14, 111, 0, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (35, 'Steeleye Stout', 16, 1, '24 - 12 oz bottles', 18, 20, 0, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (36, 'Inlagd Sill', 17, 8, '24 - 250 g  jars', 19, 112, 0, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (37, 'Gravad lax', 17, 8, '12 - 500 g pkgs.', 26, 11, 50, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (38, 'C�te de Blaye', 18, 1, '12 - 75 cl bottles', 263.5, 17, 0, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (39, 'Chartreuse verte', 18, 1, '750 cc per bottle', 18, 69, 0, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (40, 'Boston Crab Meat', 19, 8, '24 - 4 oz tins', 18.4, 123, 0, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (41, 'Jack''s New England Clam Chowder', 19, 8, '12 - 12 oz cans', 9.65, 85, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (42, 'Singaporean Hokkien Fried Mee', 20, 5, '32 - 1 kg pkgs.', 14, 26, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (43, 'Ipoh Coffee', 20, 1, '16 - 500 g tins', 46, 17, 10, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (44, 'Gula Malacca', 20, 2, '20 - 2 kg bags', 19.45, 27, 0, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (45, 'Rogede sild', 21, 8, '1k pkg.', 9.5, 5, 70, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (46, 'Spegesild', 21, 8, '4 - 450 g glasses', 12, 95, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (47, 'Zaanse koeken', 22, 3, '10 - 4 oz boxes', 9.5, 36, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (48, 'Chocolade', 22, 3, '10 pkgs.', 12.75, 15, 70, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (49, 'Maxilaku', 23, 3, '24 - 50 g pkgs.', 20, 10, 60, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (50, 'Valkoinen suklaa', 23, 3, '12 - 100 g bars', 16.25, 65, 0, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (51, 'Manjimup Dried Apples', 24, 7, '50 - 300 g pkgs.', 53, 20, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (52, 'Filo Mix', 24, 5, '16 - 2 kg boxes', 7, 38, 0, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (53, 'Perth Pasties', 24, 6, '48 pieces', 32.8, 0, 0, 0, 1 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (54, 'Tourti�re', 25, 6, '16 pies', 7.45, 21, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (55, 'P�t� chinois', 25, 6, '24 boxes x 2 pies', 24, 115, 0, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (56, 'Gnocchi di nonna Alice', 26, 5, '24 - 250 g pkgs.', 38, 21, 10, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (57, 'Ravioli Angelo', 26, 5, '24 - 250 g pkgs.', 19.5, 36, 0, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (58, 'Escargots de Bourgogne', 27, 8, '24 pieces', 13.25, 62, 0, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (59, 'Raclette Courdavault', 28, 4, '5 kg pkg.', 55, 79, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (60, 'Camembert Pierrot', 28, 4, '15 - 300 g rounds', 34, 19, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (61, 'Sirop d''�rable', 29, 2, '24 - 500 ml bottles', 28.5, 113, 0, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (62, 'Tarte au sucre', 29, 3, '48 pies', 49.3, 17, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (63, 'Vegie-spread', 7, 2, '15 - 625 g jars', 43.9, 24, 0, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (64, 'Wimmers gute Semmelkn�del', 12, 5, '20 bags x 4 pieces', 33.25, 22, 80, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (65, 'Louisiana Fiery Hot Pepper Sauce', 2, 2, '32 - 8 oz bottles', 21.05, 76, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (66, 'Louisiana Hot Spiced Okra', 2, 2, '24 - 8 oz jars', 17, 4, 100, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (67, 'Laughing Lumberjack Lager', 16, 1, '24 - 12 oz bottles', 14, 52, 0, 10, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (68, 'Scottish Longbreads', 8, 3, '10 boxes x 8 pieces', 12.5, 6, 10, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (69, 'Gudbrandsdalsost', 15, 4, '10 kg pkg.', 36, 26, 0, 15, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (70, 'Outback Lager', 7, 1, '24 - 355 ml bottles', 15, 15, 10, 30, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (71, 'Flotemysost', 15, 4, '10 - 500 g pkgs.', 21.5, 26, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (72, 'Mozzarella di Giovanni', 14, 4, '24 - 200 g pkgs.', 34.8, 14, 0, 0, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (73, 'R�d Kaviar', 17, 8, '24 - 150 g jars', 15, 101, 0, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (74, 'Longlife Tofu', 4, 7, '5 kg pkg.', 10, 4, 20, 5, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (75, 'Rh�nbr�u Klosterbier', 12, 1, '24 - 0.5 l bottles', 7.75, 125, 0, 25, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (76, 'Lakkalik��ri', 23, 1, '500 ml', 18, 57, 0, 20, 0 ) 
-INSERT INTO Products ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (77, 'Original Frankfurter gr�ne So�e', 12, 2, '12 boxes', 13, 32, 0, 15, 0 ) 
-SET IDENTITY_INSERT Products OFF
-GO
-
-
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 11, 14, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 42, 9.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 72, 34.8, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 14, 18.6, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 51, 42.4, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 41, 7.7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 51, 42.4, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 65, 16.8, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 22, 16.8, 6, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 57, 15.6, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 65, 16.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 20, 64.8, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 33, 2, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 60, 27.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 31, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 39, 14.4, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 49, 16, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 24, 3.6, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 55, 19.2, 21, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 74, 8, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 2, 15.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 16, 13.9, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 36, 15.2, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 59, 44, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 53, 26.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 77, 10.4, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 27, 35.1, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 39, 14.4, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 77, 10.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 2, 15.2, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 5, 17, 65, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 32, 25.6, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 21, 8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 37, 20.8, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 41, 7.7, 16, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 57, 15.6, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 62, 39.4, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 70, 12, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 21, 8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 35, 14.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 5, 17, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 7, 24, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 56, 30.4, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 16, 13.9, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 24, 3.6, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 30, 20.7, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 74, 8, 36, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 2, 15.2, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 41, 7.7, 25, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 17, 31.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 70, 12, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10266, 12, 30.4, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 40, 14.7, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 59, 44, 70, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 76, 14.4, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 29, 99, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 72, 27.8, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 33, 2, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 72, 27.8, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 36, 15.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 43, 36.8, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10271, 33, 2, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 20, 64.8, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 31, 10, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 72, 27.8, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 10, 24.8, 24, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 31, 10, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 33, 2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 40, 14.7, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 76, 14.4, 33, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 71, 17.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 72, 27.8, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 24, 3.6, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 59, 44, 6, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 10, 24.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 13, 4.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 28, 36.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 62, 39.4, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 44, 15.5, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 59, 44, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 63, 35.1, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 73, 12, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10279, 17, 31.2, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 24, 3.6, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 55, 19.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 75, 6.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 19, 7.3, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 24, 3.6, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 35, 14.4, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 30, 20.7, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 57, 15.6, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 15, 12.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 19, 7.3, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 60, 27.2, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 72, 27.8, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 27, 35.1, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 44, 15.5, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 60, 27.2, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 67, 11.2, 5, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 1, 14.4, 45, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 40, 14.7, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 53, 26.2, 36, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 35, 14.4, 100, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 62, 39.4, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 16, 13.9, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 34, 11.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 46, 9.6, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 54, 5.9, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 68, 10, 3, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 3, 8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 64, 26.6, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 5, 17, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 29, 99, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 49, 16, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 77, 10.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 13, 4.8, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 44, 15.5, 24, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 51, 42.4, 2, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10292, 20, 64.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 18, 50, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 24, 3.6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 63, 35.1, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 75, 6.2, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 1, 14.4, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 17, 31.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 43, 36.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 60, 27.2, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 75, 6.2, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10295, 56, 30.4, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 11, 16.8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 16, 13.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 69, 28.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 39, 14.4, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 72, 27.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 2, 15.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 36, 15.2, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 59, 44, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 62, 39.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 19, 7.3, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 70, 12, 20, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 66, 13.6, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 68, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 40, 14.7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 56, 30.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 17, 31.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 28, 36.4, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 43, 36.8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 40, 14.7, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 65, 16.8, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 68, 10, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 49, 16, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 59, 44, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 71, 17.2, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 18, 50, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 29, 99, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 39, 14.4, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 30, 20.7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 53, 26.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 54, 5.9, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 62, 39.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 68, 10, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 69, 28.8, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 70, 12, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 4, 17.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 6, 20, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 42, 11.2, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 43, 36.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 71, 17.2, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 16, 13.9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 62, 39.4, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 42, 11.2, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 69, 28.8, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 28, 36.4, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 43, 36.8, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 53, 26.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 75, 6.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10313, 36, 15.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 32, 25.6, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 58, 10.6, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 62, 39.4, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 34, 11.2, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 70, 12, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 41, 7.7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 62, 39.4, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10317, 1, 14.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 41, 7.7, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 76, 14.4, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 17, 31.2, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 28, 36.4, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 76, 14.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10320, 71, 17.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10321, 35, 14.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10322, 52, 5.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 15, 12.4, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 25, 11.2, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 39, 14.4, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 16, 13.9, 21, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 35, 14.4, 70, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 46, 9.6, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 59, 44, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 63, 35.1, 80, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 6, 20, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 13, 4.8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 14, 18.6, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 31, 10, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 72, 27.8, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 4, 17.6, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 57, 15.6, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 75, 6.2, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 2, 15.2, 25, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 11, 16.8, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 30, 20.7, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 58, 10.6, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 59, 44, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 65, 16.8, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 68, 10, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 19, 7.3, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 30, 20.7, 8, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 38, 210.8, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 56, 30.4, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 26, 24.9, 50, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 72, 27.8, 25, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10331, 54, 5.9, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 18, 50, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 42, 11.2, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 47, 7.6, 16, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 14, 18.6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 21, 8, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 71, 17.2, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 52, 5.6, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 68, 10, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 2, 15.2, 7, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 31, 10, 25, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 32, 25.6, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 51, 42.4, 48, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10336, 4, 17.6, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 23, 7.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 26, 24.9, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 36, 15.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 37, 20.8, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 72, 27.8, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 17, 31.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 30, 20.7, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 4, 17.6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 17, 31.2, 70, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 62, 39.4, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 18, 50, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 41, 7.7, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 43, 36.8, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 33, 2, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 59, 44, 9, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 2, 15.2, 24, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 31, 10, 56, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 36, 15.2, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 55, 19.2, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 64, 26.6, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 68, 10, 4, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 76, 14.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 4, 17.6, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 8, 32, 70, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 8, 32, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 19, 7.3, 80, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 42, 11.2, 9, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 17, 31.2, 36, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 56, 30.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 25, 11.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 39, 14.4, 50, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 40, 14.7, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 75, 6.2, 6, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 1, 14.4, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 23, 7.2, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10349, 54, 5.9, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 50, 13, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 69, 28.8, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 38, 210.8, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 41, 7.7, 13, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 44, 15.5, 77, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 65, 16.8, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 24, 3.6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 54, 5.9, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 11, 16.8, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 38, 210.8, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 1, 14.4, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 29, 99, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 24, 3.6, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 57, 15.6, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 31, 10, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 55, 19.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 69, 28.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 10, 24.8, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 26, 24.9, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 60, 27.2, 8, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 24, 3.6, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 34, 11.2, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 36, 15.2, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 16, 13.9, 56, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 31, 10, 70, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 60, 27.2, 80, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 28, 36.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 29, 99, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 38, 210.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 49, 16, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 54, 5.9, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 39, 14.4, 54, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 60, 27.2, 55, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 25, 11.2, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 51, 42.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 54, 5.9, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 31, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 75, 6.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 76, 14.4, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 69, 28.8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 71, 17.2, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10365, 11, 16.8, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 65, 16.8, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 77, 10.4, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 34, 11.2, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 54, 5.9, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 65, 16.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 77, 10.4, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 21, 8, 5, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 28, 36.4, 13, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 57, 15.6, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 64, 26.6, 35, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 29, 99, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 56, 30.4, 18, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 1, 14.4, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 64, 26.6, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 74, 8, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10371, 36, 15.2, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 20, 64.8, 12, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 38, 210.8, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 60, 27.2, 70, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 72, 27.8, 42, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 58, 10.6, 80, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 71, 17.2, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 31, 10, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 58, 10.6, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 14, 18.6, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 54, 5.9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10376, 31, 10, 42, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 28, 36.4, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 39, 14.4, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10378, 71, 17.2, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 41, 7.7, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 63, 35.1, 16, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 65, 16.8, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 30, 20.7, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 53, 26.2, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 60, 27.2, 6, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 70, 12, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10381, 74, 8, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 5, 17, 32, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 18, 50, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 29, 99, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 33, 2, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 74, 8, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 13, 4.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 50, 13, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 56, 30.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 20, 64.8, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 60, 27.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 7, 24, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 60, 27.2, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 68, 10, 8, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 24, 3.6, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 34, 11.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 24, 3.6, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 28, 36.4, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 59, 44, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 71, 17.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 45, 7.6, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 52, 5.6, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 53, 26.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 10, 24.8, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 55, 19.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 62, 39.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 70, 12, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 31, 10, 60, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 35, 14.4, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 46, 9.6, 45, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 72, 27.8, 24, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10391, 13, 4.8, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10392, 69, 28.8, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 2, 15.2, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 14, 18.6, 42, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 25, 11.2, 7, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 26, 24.9, 70, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 31, 10, 32, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 13, 4.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 62, 39.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 46, 9.6, 28, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 53, 26.2, 70, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 69, 28.8, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 23, 7.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 71, 17.2, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 72, 27.8, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 21, 8, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 51, 42.4, 18, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 35, 14.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 55, 19.2, 120, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 68, 10, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 71, 17.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 76, 14.4, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 77, 10.4, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 29, 99, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 35, 14.4, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 49, 16, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 30, 20.7, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 56, 30.4, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 65, 16.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 71, 17.2, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 23, 7.2, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 63, 35.1, 65, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 16, 13.9, 21, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 48, 10.2, 70, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 26, 24.9, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 42, 11.2, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 49, 16, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10405, 3, 8, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 1, 14.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 21, 8, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 28, 36.4, 42, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 36, 15.2, 5, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 40, 14.7, 2, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 11, 16.8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 69, 28.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 71, 17.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 37, 20.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 54, 5.9, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 62, 39.4, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 14, 18.6, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 21, 8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 33, 2, 49, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 59, 44, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 41, 7.7, 25, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 44, 15.5, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 59, 44, 9, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10412, 14, 18.6, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 1, 14.4, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 62, 39.4, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 76, 14.4, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 19, 7.3, 18, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 33, 2, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 17, 31.2, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 33, 2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 19, 7.3, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 53, 26.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 57, 15.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 38, 210.8, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 46, 9.6, 2, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 68, 10, 36, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 77, 10.4, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 2, 15.2, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 47, 7.6, 55, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 61, 22.8, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 74, 8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 60, 27.2, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 69, 28.8, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 9, 77.6, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 13, 4.8, 2, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 70, 12, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 73, 12, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 19, 7.3, 4, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 26, 24.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 53, 26.2, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 77, 10.4, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10422, 26, 24.9, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 31, 10, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 59, 44, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 35, 14.4, 60, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 38, 210.8, 49, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 68, 10, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 55, 19.2, 10, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 76, 14.4, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 56, 30.4, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 64, 26.6, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10427, 14, 18.6, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10428, 46, 9.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 50, 13, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 63, 35.1, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 17, 31.2, 45, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 21, 8, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 56, 30.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 59, 44, 70, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 17, 31.2, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 40, 14.7, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 47, 7.6, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 26, 24.9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 54, 5.9, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10433, 56, 30.4, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 11, 16.8, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 76, 14.4, 18, 0.15 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 2, 15.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 22, 16.8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 72, 27.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 46, 9.6, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 56, 30.4, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 64, 26.6, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 75, 6.2, 24, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10437, 53, 26.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 19, 7.3, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 34, 11.2, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 57, 15.6, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 12, 30.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 16, 13.9, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 64, 26.6, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 74, 8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 2, 15.2, 45, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 16, 13.9, 49, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 29, 99, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 61, 22.8, 90, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10441, 27, 35.1, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 11, 16.8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 54, 5.9, 80, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 66, 13.6, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 11, 16.8, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 28, 36.4, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 17, 31.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 26, 24.9, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 35, 14.4, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 41, 7.7, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 39, 14.4, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 54, 5.9, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 19, 7.3, 12, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 24, 3.6, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 31, 10, 3, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 52, 5.6, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 19, 7.3, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 65, 16.8, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 71, 17.2, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 26, 24.9, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 40, 14.7, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 10, 24.8, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 52, 5.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 62, 39.4, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 10, 24.8, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 54, 5.9, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 55, 19.2, 120, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 64, 26.6, 35, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 65, 16.8, 28, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 77, 10.4, 55, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 28, 36.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 44, 15.5, 100, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 48, 10.2, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 70, 12, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 16, 13.9, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 33, 2, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 46, 9.6, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 39, 14.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 53, 26.2, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 61, 22.8, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 71, 17.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 21, 8, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 49, 16, 21, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10457, 59, 44, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 26, 24.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 28, 36.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 43, 36.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 56, 30.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 71, 17.2, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 7, 24, 16, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 46, 9.6, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 72, 27.8, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 68, 10, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 75, 6.2, 4, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 21, 8, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 30, 20.7, 28, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 55, 19.2, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 13, 4.8, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 23, 7.2, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 19, 7.3, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 42, 11.2, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 4, 17.6, 16, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 43, 36.8, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 56, 30.4, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 60, 27.2, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 24, 3.6, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 29, 99, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 40, 14.7, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 45, 7.6, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 50, 13, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 11, 16.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 46, 9.6, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 24, 3.6, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 25, 11.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 30, 20.7, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 43, 36.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 2, 15.2, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 16, 13.9, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 44, 15.5, 2, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 18, 50, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 23, 7.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 64, 26.6, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 7, 24, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 56, 30.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 24, 3.6, 80, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 51, 42.4, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 33, 2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 71, 17.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 14, 18.6, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 28, 36.4, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 40, 14.7, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 75, 6.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 31, 10, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 66, 13.6, 60, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 76, 14.4, 42, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 55, 19.2, 2, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 70, 12, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 1, 14.4, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 21, 8, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 39, 14.4, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10478, 10, 24.8, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 38, 210.8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 53, 26.2, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 59, 44, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 64, 26.6, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 47, 7.6, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 59, 44, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 49, 16, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 60, 27.2, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10482, 40, 14.7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 34, 11.2, 35, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 77, 10.4, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 21, 8, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 40, 14.7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 51, 42.4, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 2, 15.2, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 3, 8, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 55, 19.2, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 70, 12, 60, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 11, 16.8, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 51, 42.4, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 74, 8, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 19, 7.3, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 26, 24.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 54, 5.9, 24, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 59, 44, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 73, 12, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 11, 16.8, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 16, 13.9, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 59, 44, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 68, 10, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 75, 6.2, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 44, 15.5, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 77, 10.4, 7, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 25, 11.2, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 42, 11.2, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 65, 16.8, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 66, 13.6, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 69, 28.8, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10494, 56, 30.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 23, 7.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 41, 7.7, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 77, 10.4, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10496, 31, 10, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 56, 30.4, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 72, 27.8, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 77, 10.4, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 24, 4.5, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 40, 18.4, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 42, 14, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 28, 45.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 49, 20, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 15, 15.5, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 28, 45.6, 8, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10501, 54, 7.45, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 45, 9.5, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 53, 32.8, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 67, 14, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 14, 23.25, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 65, 21.05, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 2, 19, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 21, 10, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 53, 32.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 61, 28.5, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10505, 62, 49.3, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 25, 14, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 70, 15, 14, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 43, 46, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 48, 12.75, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 13, 6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 39, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10509, 28, 45.6, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 29, 123.79, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 75, 7.75, 36, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 4, 22, 50, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 7, 30, 50, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 8, 40, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 24, 4.5, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 46, 12, 9, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 47, 9.5, 6, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 60, 34, 12, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 21, 10, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 32, 32, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 61, 28.5, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 20, 81, 39, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 28, 45.6, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 56, 38, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 65, 21.05, 39, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 75, 7.75, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 9, 97, 16, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 16, 17.45, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 27, 43.9, 120, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 33, 2.5, 16, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 60, 34, 84, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 18, 62.5, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 41, 9.65, 80, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 42, 14, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 52, 7, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 59, 55, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 70, 15, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 24, 4.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 38, 263.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 44, 19.45, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 10, 31, 16, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 56, 38, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 60, 34, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 24, 4.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 53, 32.8, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 35, 18, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 41, 9.65, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 68, 12.5, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 1, 18, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 8, 40, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 30, 25.89, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 40, 18.4, 25, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 17, 39, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 20, 81, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 37, 26, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 41, 9.65, 6, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 10, 31, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 30, 25.89, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 43, 46, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 54, 7.45, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 36, 19, 30, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 40, 18.4, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 1, 18, 8, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 13, 6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 56, 38, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 4, 22, 50, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 36, 19, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 11, 21, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 33, 2.5, 8, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 72, 34.8, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 55, 24, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 68, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 69, 36, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 17, 39, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 43, 46, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 61, 28.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 76, 18, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10531, 59, 55, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 30, 25.89, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 66, 17, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 4, 22, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 72, 34.8, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 73, 15, 24, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 30, 25.89, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 40, 18.4, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 54, 7.45, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 11, 21, 50, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 40, 18.4, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 57, 19.5, 5, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 59, 55, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 12, 38, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 31, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 33, 2.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 60, 34, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 31, 12.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 51, 53, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 58, 13.25, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 72, 34.8, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 73, 15, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 70, 15, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 72, 34.8, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 13, 6, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 21, 10, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 33, 2.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 49, 20, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 3, 10, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 26, 31.23, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 38, 263.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 68, 12.5, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 24, 4.5, 35, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 38, 263.5, 4, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 65, 21.05, 36, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 71, 21.5, 9, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 11, 21, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 54, 7.45, 24, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 12, 38, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 23, 9, 70, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 28, 45.6, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 67, 14, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10545, 11, 21, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 7, 30, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 35, 18, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 62, 49.3, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 32, 32, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 36, 19, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 34, 14, 10, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 41, 9.65, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 31, 12.5, 55, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 45, 9.5, 100, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 51, 53, 48, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 17, 39, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 19, 9.2, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 21, 10, 6, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 61, 28.5, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 16, 17.45, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 35, 18, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 44, 19.45, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 69, 36, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 75, 7.75, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 11, 21, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 16, 17.45, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 22, 21, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 31, 12.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 35, 18, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 16, 17.45, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 23, 9, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 62, 49.3, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 77, 13, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 14, 23.25, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 19, 9.2, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 24, 4.5, 18, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 51, 53, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 56, 38, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10556, 72, 34.8, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 64, 33.25, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 75, 7.75, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 47, 9.5, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 51, 53, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 52, 7, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 53, 32.8, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 73, 15, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 41, 9.65, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 55, 24, 18, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 30, 25.89, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 62, 49.3, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 44, 19.45, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 51, 53, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 33, 2.5, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 62, 49.3, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 36, 19, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 52, 7, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 17, 39, 16, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 31, 12.5, 6, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 55, 24, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 24, 4.5, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 64, 33.25, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 11, 21, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 18, 62.5, 18, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 76, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 31, 12.5, 60, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 51, 53, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 59, 55, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10568, 10, 31, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 31, 12.5, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 76, 18, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 11, 21, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 56, 38, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 14, 23.25, 11, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 42, 14, 28, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 16, 17.45, 12, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 32, 32, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 40, 18.4, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 75, 7.75, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 17, 39, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 34, 14, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 53, 32.8, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 33, 2.5, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 40, 18.4, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 62, 49.3, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 64, 33.25, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 59, 55, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 63, 43.9, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 72, 34.8, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 76, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 1, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 31, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 44, 19.45, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 39, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 75, 7.75, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 77, 13, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 35, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 57, 19.5, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 15, 15.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 75, 7.75, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 14, 23.25, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 41, 9.65, 9, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 65, 21.05, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10581, 75, 7.75, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 57, 19.5, 4, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 76, 18, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 29, 123.79, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 60, 34, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 69, 36, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10584, 31, 12.5, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10585, 47, 9.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10586, 52, 7, 4, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 26, 31.23, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 35, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 77, 13, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 18, 62.5, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 42, 14, 100, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10589, 35, 18, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 1, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 77, 13, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 3, 10, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 7, 30, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 54, 7.45, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 15, 15.5, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 26, 31.23, 5, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 20, 81, 21, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 69, 36, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 76, 18, 4, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 52, 7, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 58, 13.25, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 35, 18, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 61, 28.5, 120, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 69, 36, 65, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 56, 38, 5, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 63, 43.9, 24, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 75, 7.75, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 24, 4.5, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 57, 19.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 65, 21.05, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 27, 43.9, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 71, 21.5, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10599, 62, 49.3, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 54, 7.45, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 73, 15, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 13, 6, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 59, 55, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10602, 77, 13, 5, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 22, 21, 48, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 49, 20, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 48, 12.75, 6, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 76, 18, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 16, 17.45, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 59, 55, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 60, 34, 70, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 71, 21.5, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 4, 22, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 55, 24, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 62, 49.3, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 7, 30, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 17, 39, 100, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 33, 2.5, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 40, 18.4, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 72, 34.8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10608, 56, 38, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 1, 18, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 10, 31, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 21, 10, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10610, 36, 19, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 1, 18, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 2, 19, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 60, 34, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 10, 31, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 36, 19, 55, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 49, 20, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 60, 34, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 76, 18, 80, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 13, 6, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 75, 7.75, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 11, 21, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 21, 10, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 39, 18, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10615, 55, 24, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 38, 263.5, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 56, 38, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 70, 15, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 71, 21.5, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10617, 59, 55, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 6, 25, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 56, 38, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 68, 12.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 21, 10, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 22, 21, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 24, 4.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 52, 7, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 19, 9.2, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 23, 9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 70, 15, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 71, 21.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 2, 19, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 68, 12.5, 18, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 14, 23.25, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 19, 9.2, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 21, 10, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 24, 4.5, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 35, 18, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 28, 45.6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 29, 123.79, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 44, 19.45, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 14, 23.25, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 42, 14, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 60, 34, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 53, 32.8, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 60, 34, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 71, 21.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 62, 49.3, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 73, 15, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10628, 1, 18, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 29, 123.79, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 64, 33.25, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 55, 24, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 76, 18, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10631, 75, 7.75, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 2, 19, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 33, 2.5, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 12, 38, 36, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 13, 6, 13, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 26, 31.23, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 62, 49.3, 80, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 7, 30, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 18, 62.5, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 51, 53, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 75, 7.75, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 4, 22, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 5, 21.35, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 22, 21, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 4, 22, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 58, 13.25, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 11, 21, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 50, 16.25, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 56, 38, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 45, 9.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 65, 21.05, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 72, 34.8, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10639, 18, 62.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 69, 36, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 70, 15, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 2, 19, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 40, 18.4, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 21, 10, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 61, 28.5, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 28, 45.6, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 39, 18, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 46, 12, 2, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 18, 62.5, 4, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 43, 46, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 46, 12, 21, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 18, 62.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 36, 19, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 1, 18, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 10, 31, 18, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 71, 21.5, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 77, 13, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 19, 9.2, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 39, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 22, 21, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 24, 4.5, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 28, 45.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 72, 34.8, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 30, 25.89, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 53, 32.8, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 54, 7.45, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 19, 9.2, 12, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 22, 21, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 30, 25.89, 2, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 42, 14, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 16, 17.45, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 60, 34, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 4, 22, 12, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 39, 18, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 54, 7.45, 6, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10655, 41, 9.65, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 14, 23.25, 3, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 44, 19.45, 28, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 47, 9.5, 6, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 15, 15.5, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 41, 9.65, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 46, 12, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 47, 9.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 56, 38, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 60, 34, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 21, 10, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 40, 18.4, 70, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 60, 34, 55, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 77, 13, 70, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 31, 12.5, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 40, 18.4, 24, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 70, 15, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10660, 20, 81, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 39, 18, 3, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 58, 13.25, 49, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10662, 68, 12.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 40, 18.4, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 42, 14, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 51, 53, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 10, 31, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 56, 38, 12, 0.15 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 65, 21.05, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 51, 53, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 59, 55, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 76, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 29, 123.79, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 65, 21.05, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 69, 36, 45, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 71, 21.5, 14, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 31, 12.5, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 55, 24, 4, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 64, 33.25, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10669, 36, 19, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 23, 9, 32, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 46, 12, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 67, 14, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 73, 15, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 75, 7.75, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 16, 17.45, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 62, 49.3, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 65, 21.05, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 38, 263.5, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 71, 21.5, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 16, 17.45, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 42, 14, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 43, 46, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10674, 23, 9, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 14, 23.25, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 53, 32.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 58, 13.25, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 10, 31, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 19, 9.2, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 44, 19.45, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 26, 31.23, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 33, 2.5, 8, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 12, 38, 100, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 33, 2.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 41, 9.65, 120, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 54, 7.45, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10679, 59, 55, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 16, 17.45, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 31, 12.5, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 42, 14, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 19, 9.2, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 21, 10, 12, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 64, 33.25, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 33, 2.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 66, 17, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 75, 7.75, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10683, 52, 7, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 40, 18.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 47, 9.5, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 60, 34, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 10, 31, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 41, 9.65, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 47, 9.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 17, 39, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 26, 31.23, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 9, 97, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 29, 123.79, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 36, 19, 6, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 10, 31, 18, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 28, 45.6, 60, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 34, 14, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10689, 1, 18, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 56, 38, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 77, 13, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 1, 18, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 29, 123.79, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 43, 46, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 44, 19.45, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 62, 49.3, 48, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10692, 63, 43.9, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 9, 97, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 54, 7.45, 60, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 69, 36, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 73, 15, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 7, 30, 90, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 59, 55, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 70, 15, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 8, 40, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 12, 38, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 24, 4.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 17, 39, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 46, 12, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 19, 9.2, 7, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 35, 18, 9, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 58, 13.25, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 70, 15, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 11, 21, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 17, 39, 8, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 29, 123.79, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 65, 21.05, 65, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 70, 15, 8, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10699, 47, 9.5, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 1, 18, 5, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 34, 14, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 68, 12.5, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 71, 21.5, 60, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 59, 55, 42, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 71, 21.5, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 76, 18, 35, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 3, 10, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 76, 18, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 2, 19, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 59, 55, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 73, 15, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 4, 22, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 24, 4.5, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 48, 12.75, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 31, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 32, 32, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 16, 17.45, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 43, 46, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 59, 55, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 55, 24, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 57, 19.5, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 70, 15, 28, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 5, 21.35, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 36, 19, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 8, 40, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 51, 53, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 60, 34, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 19, 9.2, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 47, 9.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 19, 9.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 41, 9.65, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 53, 32.8, 120, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 53, 32.8, 3, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 56, 38, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 10, 31, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 26, 31.23, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 45, 9.5, 110, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 46, 12, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 2, 19, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 17, 39, 27, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 47, 9.5, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 56, 38, 18, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 58, 13.25, 12, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 10, 31, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 71, 21.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 21, 10, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 51, 53, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 61, 28.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 21, 10, 32, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 54, 7.45, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 69, 36, 25, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 12, 38, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 16, 17.45, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 36, 19, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 62, 49.3, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 18, 62.5, 12, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 30, 25.89, 3, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 54, 7.45, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 35, 18, 21, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 71, 21.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10721, 44, 19.45, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 2, 19, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 31, 12.5, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 68, 12.5, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 75, 7.75, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10723, 26, 31.23, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 10, 31, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 61, 28.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 41, 9.65, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 52, 7, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 55, 24, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 4, 22, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 11, 21, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 17, 39, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 56, 38, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 59, 55, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 30, 25.89, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 40, 18.4, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 55, 24, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 60, 34, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 1, 18, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 21, 10, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 50, 16.25, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 16, 17.45, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 31, 12.5, 3, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 65, 21.05, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 21, 10, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 51, 53, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10732, 76, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 14, 23.25, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 28, 45.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 52, 7, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 6, 25, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 30, 25.89, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 76, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 61, 28.5, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 77, 13, 2, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 65, 21.05, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 75, 7.75, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 13, 6, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 41, 9.65, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10738, 16, 17.45, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 36, 19, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 52, 7, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 28, 45.6, 5, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 35, 18, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 45, 9.5, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 56, 38, 14, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10741, 2, 19, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 3, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 60, 34, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 72, 34.8, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10743, 46, 12, 28, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10744, 40, 18.4, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 18, 62.5, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 44, 19.45, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 59, 55, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 72, 34.8, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 13, 6, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 42, 14, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 62, 49.3, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 69, 36, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 31, 12.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 41, 9.65, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 63, 43.9, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 69, 36, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 23, 9, 44, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 40, 18.4, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 56, 38, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 56, 38, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 59, 55, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 76, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 14, 23.25, 5, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 45, 9.5, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 59, 55, 25, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 26, 31.23, 12, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 30, 25.89, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 50, 16.25, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 73, 15, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 1, 18, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 69, 36, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 45, 9.5, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 74, 10, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10754, 40, 18.4, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 47, 9.5, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 56, 38, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 57, 19.5, 14, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 69, 36, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 18, 62.5, 21, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 36, 19, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 68, 12.5, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 69, 36, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 34, 14, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 59, 55, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 62, 49.3, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 64, 33.25, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 26, 31.23, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 52, 7, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 70, 15, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10759, 32, 32, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 25, 14, 12, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 27, 43.9, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 43, 46, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 25, 14, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 75, 7.75, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 39, 18, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 47, 9.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 51, 53, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 56, 38, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 21, 10, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 22, 21, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 24, 4.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 3, 10, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 39, 18, 130, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10765, 65, 21.05, 80, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 2, 19, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 7, 30, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 68, 12.5, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10767, 42, 14, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 22, 21, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 31, 12.5, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 60, 34, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 71, 21.5, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 41, 9.65, 30, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 52, 7, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 61, 28.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 62, 49.3, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10770, 11, 21, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10771, 71, 21.5, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 29, 123.79, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 59, 55, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 17, 39, 33, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 31, 12.5, 70, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 75, 7.75, 7, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 31, 12.5, 2, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 66, 17, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 10, 31, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 67, 14, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 31, 12.5, 16, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 42, 14, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 45, 9.5, 27, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 51, 53, 120, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10777, 42, 14, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10778, 41, 9.65, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 16, 17.45, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 62, 49.3, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 70, 15, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 77, 13, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 54, 7.45, 3, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 56, 38, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 74, 10, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10782, 31, 12.5, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 31, 12.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 38, 263.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 36, 19, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 39, 18, 2, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 72, 34.8, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 10, 31, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 75, 7.75, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 8, 40, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 30, 25.89, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 75, 7.75, 42, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 2, 19, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 29, 123.79, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 19, 9.2, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 75, 7.75, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 18, 62.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 35, 18, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 63, 43.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 68, 12.5, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 7, 30, 3, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 56, 38, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 29, 123.79, 14, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 41, 9.65, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 2, 19, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 54, 7.45, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 68, 12.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 41, 9.65, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 52, 7, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 14, 23.25, 15, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 54, 7.45, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 16, 17.45, 65, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 17, 39, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 26, 31.23, 21, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 44, 19.45, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 64, 33.25, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 69, 36, 24, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10797, 11, 21, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 62, 49.3, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 72, 34.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 13, 6, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 24, 4.5, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 59, 55, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 11, 21, 50, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 51, 53, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 54, 7.45, 7, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 17, 39, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 29, 123.79, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 30, 25.89, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 51, 53, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 55, 24, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 62, 49.3, 5, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 19, 9.2, 24, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 25, 14, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 59, 55, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 10, 31, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 28, 45.6, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 49, 20, 4, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 34, 14, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 38, 263.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 2, 19, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 65, 21.05, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 74, 10, 15, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10807, 40, 18.4, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 56, 38, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 76, 18, 50, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10809, 52, 7, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 13, 6, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 25, 14, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 70, 15, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 19, 9.2, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 23, 9, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 40, 18.4, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 31, 12.5, 16, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 72, 34.8, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 77, 13, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 2, 19, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 46, 12, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 41, 9.65, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 43, 46, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 48, 12.75, 8, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 61, 28.5, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10815, 33, 2.5, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 38, 263.5, 30, 0.05 )
-go 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 62, 49.3, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 26, 31.23, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 38, 263.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 40, 18.4, 60, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 62, 49.3, 25, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 32, 32, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 41, 9.65, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 43, 46, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 75, 7.75, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10820, 56, 38, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 35, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 51, 53, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 62, 49.3, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 70, 15, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 11, 21, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 57, 19.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 59, 55, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 77, 13, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 41, 9.65, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 70, 15, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 26, 31.23, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 53, 32.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 31, 12.5, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 57, 19.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 10, 31, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 39, 18, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 20, 81, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 38, 263.5, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 2, 19, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 8, 40, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 13, 6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 60, 34, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 6, 25, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 39, 18, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 60, 34, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 68, 12.5, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 19, 9.2, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 35, 18, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 38, 263.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 43, 46, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 13, 6, 3, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 25, 14, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 44, 19.45, 16, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 64, 33.25, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 7, 30, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 31, 12.5, 9, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 53, 32.8, 9, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 29, 123.79, 8, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 30, 25.89, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 59, 55, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 77, 13, 2, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 22, 21, 52, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 35, 18, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 57, 19.5, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 60, 34, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 64, 33.25, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 13, 6, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 40, 18.4, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 47, 9.5, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 76, 18, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 1, 18, 4, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 18, 62.5, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 36, 19, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 58, 13.25, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 72, 34.8, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 25, 14, 6, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 39, 18, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 10, 31, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 56, 38, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 59, 55, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 77, 13, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 11, 21, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 43, 46, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 68, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 70, 15, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10843, 51, 53, 4, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10844, 22, 21, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 23, 9, 70, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 35, 18, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 42, 14, 42, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 58, 13.25, 60, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 64, 33.25, 48, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 4, 22, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 70, 15, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 74, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 1, 18, 80, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 19, 9.2, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 37, 26, 60, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 45, 9.5, 36, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 60, 34, 45, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 71, 21.5, 55, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 5, 21.35, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 9, 97, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 3, 10, 49, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 26, 31.23, 18, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 25, 14, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 33, 2.5, 4, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 70, 15, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 2, 19, 5, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 25, 14, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 57, 19.5, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 59, 55, 42, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 2, 19, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 17, 39, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 62, 49.3, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10853, 18, 62.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 10, 31, 100, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 13, 6, 65, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 16, 17.45, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 31, 12.5, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 56, 38, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 65, 21.05, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 2, 19, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 42, 14, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 3, 10, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 26, 31.23, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 29, 123.79, 10, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 7, 30, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 27, 43.9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 70, 15, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 24, 4.5, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 54, 7.45, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 64, 33.25, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 51, 53, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 76, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 17, 39, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 18, 62.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 21, 10, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 33, 2.5, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 62, 49.3, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 11, 21, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 52, 7, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 1, 18, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 58, 13.25, 12, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 35, 18, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 67, 14, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 38, 263.5, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 39, 18, 80, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 2, 19, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 24, 4.5, 6, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 30, 25.89, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10867, 53, 32.8, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 26, 31.23, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 35, 18, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 49, 20, 42, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 1, 18, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 11, 21, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 23, 9, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 68, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 35, 18, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 51, 53, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 6, 25, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 16, 17.45, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 17, 39, 16, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 55, 24, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 62, 49.3, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 64, 33.25, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 65, 21.05, 21, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 21, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 28, 45.6, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10874, 10, 31, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 19, 9.2, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 47, 9.5, 21, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 49, 20, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 46, 12, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 64, 33.25, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 16, 17.45, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 18, 62.5, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10878, 20, 81, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 40, 18.4, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 65, 21.05, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 76, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 23, 9, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 61, 28.5, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 70, 15, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10881, 73, 15, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 42, 14, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 49, 20, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 54, 7.45, 32, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10883, 24, 4.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 21, 10, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 56, 38, 21, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 65, 21.05, 12, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 2, 19, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 24, 4.5, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 70, 15, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 77, 13, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 10, 31, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 31, 12.5, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 77, 13, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10887, 25, 14, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 2, 19, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 68, 12.5, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 11, 21, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 38, 263.5, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 17, 39, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 34, 14, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 41, 9.65, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10891, 30, 25.89, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10892, 59, 55, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 8, 40, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 24, 4.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 29, 123.79, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 30, 25.89, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 36, 19, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 13, 6, 28, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 69, 36, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 75, 7.75, 120, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 24, 4.5, 110, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 39, 18, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 40, 18.4, 91, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 60, 34, 100, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 45, 9.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 56, 38, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 29, 123.79, 80, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 30, 25.89, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10898, 13, 6, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10899, 39, 18, 8, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10900, 70, 15, 3, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 41, 9.65, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 71, 21.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 55, 24, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 62, 49.3, 6, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 13, 6, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 65, 21.05, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 68, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 58, 13.25, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 62, 49.3, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10905, 1, 18, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10906, 61, 28.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10907, 75, 7.75, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 7, 30, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 52, 7, 14, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 7, 30, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 16, 17.45, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 41, 9.65, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 19, 9.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 49, 20, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 61, 28.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 1, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 17, 39, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 67, 14, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 11, 21, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 29, 123.79, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 4, 22, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 33, 2.5, 40, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 58, 13.25, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10914, 71, 21.5, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 17, 39, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 33, 2.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 54, 7.45, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 16, 17.45, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 32, 32, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 57, 19.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 30, 25.89, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 60, 34, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 1, 18, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 60, 34, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 16, 17.45, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 25, 14, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 40, 18.4, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10920, 50, 16.25, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 35, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 63, 43.9, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 17, 39, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 24, 4.5, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 42, 14, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 43, 46, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 67, 14, 24, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 10, 31, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 28, 45.6, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 75, 7.75, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 36, 19, 25, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 52, 7, 12, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 11, 21, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 13, 6, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 19, 9.2, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 72, 34.8, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 20, 81, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 52, 7, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 76, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 47, 9.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 76, 18, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 21, 10, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 75, 7.75, 49, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 77, 13, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 21, 10, 36, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 27, 43.9, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 55, 24, 25, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 58, 13.25, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 13, 6, 42, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 57, 19.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 16, 17.45, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 62, 49.3, 14, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 72, 34.8, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 75, 7.75, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 53, 32.8, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 61, 28.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10934, 6, 25, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 1, 18, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 18, 62.5, 4, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 23, 9, 8, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10936, 36, 19, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 28, 45.6, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 34, 14, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 13, 6, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 43, 46, 24, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 60, 34, 49, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 71, 21.5, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 2, 19, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 67, 14, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 7, 30, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 13, 6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 31, 12.5, 44, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 62, 49.3, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 68, 12.5, 80, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 72, 34.8, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10942, 49, 20, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 13, 6, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 22, 21, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 46, 12, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 11, 21, 5, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 44, 19.45, 18, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 56, 38, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 13, 6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 31, 12.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 10, 31, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 24, 4.5, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 77, 13, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10947, 59, 55, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 50, 16.25, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 51, 53, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 55, 24, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 6, 25, 12, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 10, 31, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 17, 39, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 62, 49.3, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10950, 4, 22, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 33, 2.5, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 41, 9.65, 6, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 75, 7.75, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 6, 25, 16, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 28, 45.6, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 20, 81, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 31, 12.5, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 16, 17.45, 28, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 31, 12.5, 25, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 45, 9.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 60, 34, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10955, 75, 7.75, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 21, 10, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 47, 9.5, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 51, 53, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 30, 25.89, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 35, 18, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 64, 33.25, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 5, 21.35, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 7, 30, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 72, 34.8, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10959, 75, 7.75, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 24, 4.5, 10, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 41, 9.65, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 52, 7, 6, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 76, 18, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 7, 30, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 13, 6, 77, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 53, 32.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 69, 36, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 76, 18, 44, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10963, 60, 34, 2, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 18, 62.5, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 38, 263.5, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 69, 36, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10965, 51, 53, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 37, 26, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 56, 38, 12, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 62, 49.3, 12, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 19, 9.2, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 49, 20, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 12, 38, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 24, 4.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 64, 33.25, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10969, 46, 12, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10970, 52, 7, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10971, 29, 123.79, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 17, 39, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 33, 2.5, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 26, 31.23, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 41, 9.65, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 75, 7.75, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10974, 63, 43.9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 8, 40, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 75, 7.75, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10976, 28, 45.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 39, 18, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 47, 9.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 51, 53, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 63, 43.9, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 8, 40, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 21, 10, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 40, 18.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 44, 19.45, 6, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 7, 30, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 12, 38, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 24, 4.5, 80, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 27, 43.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 31, 12.5, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 63, 43.9, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10980, 75, 7.75, 40, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10981, 38, 263.5, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 7, 30, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 43, 46, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 13, 6, 84, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 57, 19.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 16, 17.45, 55, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 24, 4.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 36, 19, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 16, 17.45, 36, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 18, 62.5, 8, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 32, 32, 35, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 11, 21, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 20, 81, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 76, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 77, 13, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 7, 30, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 43, 46, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 72, 34.8, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 7, 30, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 62, 49.3, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 6, 25, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 11, 21, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 41, 9.65, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 21, 10, 65, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 34, 14, 60, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 55, 24, 65, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 61, 28.5, 66, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 2, 19, 50, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 70, 15, 20, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 76, 18, 90, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10992, 72, 34.8, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 29, 123.79, 50, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 41, 9.65, 35, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10994, 59, 55, 18, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 51, 53, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 60, 34, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10996, 42, 14, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 32, 32, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 46, 12, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 52, 7, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 24, 4.5, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 61, 28.5, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 74, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 75, 7.75, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 41, 9.65, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 51, 53, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 77, 13, 21, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 4, 22, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 24, 4.5, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 77, 13, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 7, 30, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 22, 21, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 46, 12, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 55, 24, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 13, 6, 56, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 35, 18, 15, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 42, 14, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 55, 24, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 1, 18, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 40, 18.4, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 52, 7, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 26, 31.23, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 76, 18, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 1, 18, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 59, 55, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 1, 18, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 29, 123.79, 2, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 8, 40, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 29, 123.79, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 42, 14, 14, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 28, 45.6, 70, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 34, 14, 90, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 71, 21.5, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 24, 4.5, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 36, 19, 18, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 60, 34, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 7, 30, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 24, 4.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 58, 13.25, 40, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 71, 21.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 19, 9.2, 50, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 60, 34, 36, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 71, 21.5, 60, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 23, 9, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 42, 14, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 45, 9.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 68, 12.5, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11014, 41, 9.65, 28, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 30, 25.89, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 77, 13, 18, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 31, 12.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 36, 19, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 3, 10, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 59, 55, 110, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 70, 15, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 12, 38, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 18, 62.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 56, 38, 5, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 46, 12, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 49, 20, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11020, 10, 31, 24, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 2, 19, 11, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 20, 81, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 26, 31.23, 63, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 51, 53, 44, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 72, 34.8, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 19, 9.2, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 69, 36, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 7, 30, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 43, 46, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 26, 31.23, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 33, 2.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 65, 21.05, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 71, 21.5, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 1, 18, 10, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 13, 6, 20, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 18, 62.5, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 51, 53, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 24, 4.5, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 62, 49.3, 21, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 55, 24, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 59, 55, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 56, 38, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 63, 43.9, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 2, 19, 100, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 5, 21.35, 70, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 29, 123.79, 60, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 59, 55, 100, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 1, 18, 45, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 13, 6, 80, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 24, 4.5, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 64, 33.25, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 71, 21.5, 16, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 36, 19, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 38, 263.5, 25, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 59, 55, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 53, 32.8, 70, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 69, 36, 36, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 21, 10, 15, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 44, 19.45, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 61, 28.5, 6, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 1, 18, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 35, 18, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 42, 14, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 54, 7.45, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 13, 6, 7, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 59, 55, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11037, 70, 15, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 40, 18.4, 5, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 52, 7, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 71, 21.5, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 28, 45.6, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 35, 18, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 49, 20, 60, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 57, 19.5, 28, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11040, 21, 10, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 2, 19, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 63, 43.9, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 44, 19.45, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 61, 28.5, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11043, 11, 21, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11044, 62, 49.3, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 33, 2.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 51, 53, 24, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 12, 38, 20, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 32, 32, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 35, 18, 18, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 1, 18, 25, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 5, 21.35, 30, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11048, 68, 12.5, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 2, 19, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 12, 38, 4, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11050, 76, 18, 50, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11051, 24, 4.5, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 43, 46, 30, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 61, 28.5, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 18, 62.5, 35, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 32, 32, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 64, 33.25, 25, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 33, 2.5, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 67, 14, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 24, 4.5, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 25, 14, 15, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 51, 53, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 57, 19.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 7, 30, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 55, 24, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 60, 34, 50, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11057, 70, 15, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 21, 10, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 60, 34, 21, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 61, 28.5, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 13, 6, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 17, 39, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 60, 34, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 60, 34, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 77, 13, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11061, 60, 34, 15, 0 ) 
-go
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 53, 32.8, 10, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 70, 15, 12, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 34, 14, 30, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 40, 18.4, 40, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 41, 9.65, 30, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 17, 39, 77, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 41, 9.65, 12, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 53, 32.8, 25, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 55, 24, 4, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 68, 12.5, 55, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 30, 25.89, 4, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 54, 7.45, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 16, 17.45, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 19, 9.2, 42, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 34, 14, 35, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11067, 41, 9.65, 9, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 28, 45.6, 8, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 43, 46, 36, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 77, 13, 28, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11069, 39, 18, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 1, 18, 40, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 2, 19, 20, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 16, 17.45, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 31, 12.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 7, 30, 15, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 13, 6, 10, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 2, 19, 8, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 41, 9.65, 40, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 50, 16.25, 22, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 64, 33.25, 130, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 11, 21, 10, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 24, 4.5, 20, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11074, 16, 17.45, 14, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 2, 19, 10, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 46, 12, 30, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 76, 18, 2, 0.15 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 6, 25, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 14, 23.25, 20, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 19, 9.2, 10, 0.25 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 2, 19, 24, 0.2 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 3, 10, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 4, 22, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 6, 25, 1, 0.02 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 7, 30, 1, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 8, 40, 2, 0.1 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 10, 31, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 12, 38, 2, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 13, 6, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 14, 23.25, 1, 0.03 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 16, 17.45, 2, 0.03 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 20, 81, 1, 0.04 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 23, 9, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 32, 32, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 39, 18, 2, 0.05 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 41, 9.65, 3, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 46, 12, 3, 0.02 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 52, 7, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 55, 24, 2, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 60, 34, 2, 0.06 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 64, 33.25, 2, 0.03 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 66, 17, 1, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 73, 15, 2, 0.01 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 75, 7.75, 4, 0 ) 
-INSERT INTO [Order Details] ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 77, 13, 2, 0 ) 
-GO
-
-INSERT INTO TYPES_SIMPLE (ID, T_BIT, T_TINYINT, T_SMALLINT, T_INT,T_DECIMAL, T_NUMERIC, T_FLOAT, T_REAL, T_CHAR, T_NCHAR, T_VARCHAR, T_NVARCHAR) VALUES ('0', 1, 25, 77, 2525,10, 123123.25, 17.1414257, .71425, 'g', 'h', 'heh', 'heh')
-INSERT INTO TYPES_EXTENDED (ID, T_TEXT, T_NTEXT, T_BINARY, T_VARBINARY, T_DATETIME, T_SMALLDATETIME) VALUES ('0', 'heh', 'heh', 0x8764278687265872, 0x3847653746587877, '02/02/02 02:02:02', '02/02/02 02:02:02')
-INSERT INTO TYPES_EXTENDED(ID, T_DATETIME, T_SMALLDATETIME) VALUES('MIN', '1753-01-01 00:00:00.000', '1900-01-01 00:00:00')
---INSERT INTO TYPES_SPECIFIC (ID, T_SMALLMONEY, T_MONEY, T_IMAGE, T_UNIQUEIDENTIFIER, T_SQL_VARIANT, T_TIMESTAMP) VALUES ('0', 123.14, 123.14, 0x23754274572377, '{239A3C5E-8D41-11D1-B675-00C04FA3C554}', 123, NULL)
-GO
-
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DB2.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DB2.sql
deleted file mode 100755
index aa301f0f3c1..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.DB2.sql
+++ /dev/null
@@ -1,883 +0,0 @@
--- This CLP file was created using DB2LOOK Version 8.2
--- Timestamp: 10/04/2004 06:10:49 PM
--- Database Name: GHTDB             
--- Database Manager Version: DB2/NT Version 8.2.0          
--- Database Codepage: 1208
--- Database Collating Sequence is: BINARY
-
-DROP DATABASE GHTDB;
-create database ghtdb USING CODESET UTF8 TERRITORY US;
-
-CONNECT TO GHTDB;
---Create temp tablespace
-create user temporary tablespace ght_tempspace managed by system using ('GHT_TEMPSPACE');
-
-
--- Mimic tablespace
-
-ALTER TABLESPACE SYSCATSPACE
-      PREFETCHSIZE 16
-      OVERHEAD 24.100000
-      TRANSFERRATE 0.900000;
-
-
-ALTER TABLESPACE TEMPSPACE1
-      PREFETCHSIZE 16
-      OVERHEAD 24.100000
-      TRANSFERRATE 0.900000;
-
-
-ALTER TABLESPACE USERSPACE1
-      PREFETCHSIZE 16
-      OVERHEAD 24.100000
-      TRANSFERRATE 0.900000;
-
----------------------------------
--- DDL Statements for distinct types and/or Abstract Data Types
----------------------------------
-
-
-CREATE DISTINCT TYPE "DB2ADMIN"."BIGINT1" AS "SYSIBM  ".DECIMAL(19)
-	 WITH COMPARISONS;
-
-------------------------------------------------
--- DDL Statements for types tables
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."TYPES_SIMPLE"  (
- 
- 		  "ID" CHAR(10)  ,
-
-		  "T_SMALLINT" SMALLINT   , 
-		  
-		  "T_INTEGER" INTEGER   , 
-		  
-		  "T_BIGINT" BIGINT   , 
-
-		  "T_DECIMAL" DECIMAL(5,0)   , 
-		  
-		  "T_REAL" REAL   , 
-
-		  "T_DOUBLE" DOUBLE   , 
-
-		  "T_CHARACTER" CHAR(10)   , 
-
-		  "T_VARCHAR" VARCHAR(10)   , 
-		  
-		  "T_LONGVARCHAR" LONG VARCHAR   ) IN "USERSPACE1" ; 
-
-
-
-
-
-
-
- CREATE TABLE "DB2ADMIN"."TYPES_EXTENDED"  (
- 		  "ID" CHAR(10)  ,
-
-		  "T_DATE" DATE   , 
-		  
-		  "T_TIME" TIME   , 
-
-		  "T_TIMESTAMP" TIMESTAMP   , 
-
-		  "T_BLOB" BLOB(1048576) LOGGED  COMPACT   , 
-
-		  "T_CLOB" CLOB(1048576) LOGGED  COMPACT   , 
-
-		  "T_DBCLOB" DBCLOB(1048576) LOGGED  COMPACT   ) IN "USERSPACE1" ; 
-
-
-
-
-
-
-
-
-
- CREATE TABLE "DB2ADMIN"."TYPES_SPECIFIC"  (
-
- 		  "ID" CHAR(10)  ,
-
-		  "T_GRAPHIC" GRAPHIC(10)   , 
-
-		  "T_VARGRAPHIC" VARGRAPHIC(10)   ,
-
-		  "T_LONGVARGRAPHIC" LONG VARGRAPHIC   ) IN "USERSPACE1" ; 
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."CATEGORIES"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."CATEGORIES"  (
-		  "CATEGORYID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (  
-		    START WITH +1  
-		    INCREMENT BY +1  
-		    MINVALUE +1  
-		    MAXVALUE +2147483647  
-		    NO CYCLE  
-		    CACHE 20  
-		    NO ORDER ) , 
-		  "CATEGORYNAME" VARCHAR(15) NOT NULL , 
-		  "DESCRIPTION" DBCLOB(1073741823) NOT LOGGED NOT COMPACT )   
-		 IN "USERSPACE1" ; 
-
- CREATE TABLE "MAINSOFT"."CATEGORIESNEW"  (
-		  "CATEGORYID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (  
-		    START WITH +1  
-		    INCREMENT BY +1  
-		    MINVALUE +1  
-		    MAXVALUE +2147483647  
-		    NO CYCLE  
-		    CACHE 20  
-		    NO ORDER ) , 
-		  "CATEGORYNAME" VARCHAR(15) NOT NULL , 
-		  "DESCRIPTION" DBCLOB(1073741823) NOT LOGGED NOT COMPACT )   
-		 IN "USERSPACE1" ;
-
- CREATE TABLE "MAINSOFT"."CATEGORIES"  (
-		  "CATEGORYID" VARCHAR(10) NOT NULL , 
- 
-		  "CATEGORYNAME" VARCHAR(15) NOT NULL , 
-		  "DESCRIPTION" DBCLOB(1073741823) NOT LOGGED NOT COMPACT)
-		 IN "USERSPACE1" ;
-
-
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CATEGORIES"
-
-CREATE INDEX "DB2ADMIN"."CATEGORYNAME" ON "DB2ADMIN"."CATEGORIES" 
-		("CATEGORYNAME" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CATEGORIES"
-
-CREATE INDEX "DB2ADMIN"."PK_CATEGORIES" ON "DB2ADMIN"."CATEGORIES" 
-		("CATEGORYID" ASC)
-		CLUSTER ;
-
--- DDL Statements for primary key on Table "DB2ADMIN"."CATEGORIES"
-
-ALTER TABLE "DB2ADMIN"."CATEGORIES" 
-	ADD CONSTRAINT "SQL040118121530460" PRIMARY KEY
-		("CATEGORYID");
-
-
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."CUSTOMERCUSTOMERDEMO"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."CUSTOMERCUSTOMERDEMO"  (
-		  "CUSTOMERID" CHAR(5) NOT NULL , 
-		  "CUSTOMERTYPEID" CHAR(10) NOT NULL )   
-		 IN "USERSPACE1" ; 
-
--- DDL Statements for primary key on Table "DB2ADMIN"."CUSTOMERCUSTOMERDEMO"
-
-ALTER TABLE "DB2ADMIN"."CUSTOMERCUSTOMERDEMO" 
-	ADD CONSTRAINT "PK_CUSTOMERCUSTOME" PRIMARY KEY
-		("CUSTOMERID",
-		 "CUSTOMERTYPEID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."CUSTOMERDEMOGRAPHICS"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."CUSTOMERDEMOGRAPHICS"  (
-		  "CUSTOMERTYPEID" CHAR(10) NOT NULL , 
-		  "CUSTOMERDESC" DBCLOB(1073741823) NOT LOGGED NOT COMPACT )   
-		 IN "USERSPACE1" ; 
-
--- DDL Statements for primary key on Table "DB2ADMIN"."CUSTOMERDEMOGRAPHICS"
-
-ALTER TABLE "DB2ADMIN"."CUSTOMERDEMOGRAPHICS" 
-	ADD CONSTRAINT "PK_CUSTOMERDEMOGRA" PRIMARY KEY
-		("CUSTOMERTYPEID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."CUSTOMERS"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."CUSTOMERS"  (
-		  "CUSTOMERID" CHAR(5) NOT NULL , 
-		  "COMPANYNAME" VARCHAR(40) NOT NULL , 
-		  "CONTACTNAME" VARCHAR(30) , 
-		  "CONTACTTITLE" VARCHAR(30) , 
-		  "ADDRESS" VARCHAR(60) , 
-		  "CITY" VARCHAR(15) , 
-		  "REGION" VARCHAR(15) , 
-		  "POSTALCODE" VARCHAR(10) , 
-		  "COUNTRY" VARCHAR(15) , 
-		  "PHONE" VARCHAR(24) , 
-		  "FAX" VARCHAR(24) )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-CREATE INDEX "DB2ADMIN"."CITY" ON "DB2ADMIN"."CUSTOMERS" 
-		("CITY" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-CREATE INDEX "DB2ADMIN"."COMPANYNAME" ON "DB2ADMIN"."CUSTOMERS" 
-		("COMPANYNAME" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-CREATE INDEX "DB2ADMIN"."PK_CUSTOMERS" ON "DB2ADMIN"."CUSTOMERS" 
-		("CUSTOMERID" ASC)
-		CLUSTER ;
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-CREATE INDEX "DB2ADMIN"."POSTALCODE" ON "DB2ADMIN"."CUSTOMERS" 
-		("POSTALCODE" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-CREATE INDEX "DB2ADMIN"."REGION" ON "DB2ADMIN"."CUSTOMERS" 
-		("REGION" ASC);
-
-
-
--- DDL Statements for unique constraints on Table "DB2ADMIN"."CUSTOMERS"
-ALTER TABLE "DB2ADMIN"."CUSTOMERS" ADD CONSTRAINT "UK_CUSTOMERID" UNIQUE ("CUSTOMERID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."EMPLOYEETERRITORIES"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."EMPLOYEETERRITORIES"  (
-		  "EMPLOYEEID" INTEGER NOT NULL , 
-		  "TERRITORYID" VARCHAR(20) NOT NULL )   
-		 IN "USERSPACE1" ; 
-
--- DDL Statements for primary key on Table "DB2ADMIN"."EMPLOYEETERRITORIES"
-
-ALTER TABLE "DB2ADMIN"."EMPLOYEETERRITORIES" 
-	ADD CONSTRAINT "PK_EMPLOYEETERRITO" PRIMARY KEY
-		("EMPLOYEEID",
-		 "TERRITORYID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."SHIPPERS"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."SHIPPERS"  (
-		  "SHIPPERID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (  
-		    START WITH +1  
-		    INCREMENT BY +1  
-		    MINVALUE +1  
-		    MAXVALUE +2147483647  
-		    NO CYCLE  
-		    CACHE 20  
-		    NO ORDER ) , 
-		  "COMPANYNAME" VARCHAR(40) NOT NULL , 
-		  "PHONE" VARCHAR(24) )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."SHIPPERS"
-
-CREATE INDEX "DB2ADMIN"."PK_SHIPPERS" ON "DB2ADMIN"."SHIPPERS" 
-		("SHIPPERID" ASC)
-		CLUSTER ;
-
-
--- DDL Statements for primary key on Table "DB2ADMIN"."SHIPPERS"
-ALTER TABLE "DB2ADMIN"."SHIPPERS" ADD CONSTRAINT "SQL040118121538100" PRIMARY KEY ("SHIPPERID");
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."ORDERS"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."ORDERS"  (
-		  "ORDERID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (  
-		    START WITH +1  
-		    INCREMENT BY +1  
-		    MINVALUE +1  
-		    MAXVALUE +2147483647  
-		    NO CYCLE  
-		    CACHE 20  
-		    NO ORDER ) , 
-		  "CUSTOMERID" CHAR(5) , 
-		  "EMPLOYEEID" INTEGER , 
-		  "ORDERDATE" DATE , 
-		  "REQUIREDDATE" DATE , 
-		  "SHIPPEDDATE" DATE , 
-		  "SHIPVIA" INTEGER , 
-		  "FREIGHT" DECIMAL(19,4) WITH DEFAULT 0 , 
-		  "SHIPNAME" VARCHAR(40) , 
-		  "SHIPADDRESS" VARCHAR(60) , 
-		  "SHIPCITY" VARCHAR(15) , 
-		  "SHIPREGION" VARCHAR(15) , 
-		  "SHIPPOSTALCODE" VARCHAR(10) , 
-		  "SHIPCOUNTRY" VARCHAR(15) )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."CUSTOMERID" ON "DB2ADMIN"."ORDERS" 
-		("CUSTOMERID" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."EMPLOYEEID" ON "DB2ADMIN"."ORDERS" 
-		("EMPLOYEEID" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."ORDERDATE" ON "DB2ADMIN"."ORDERS" 
-		("ORDERDATE" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."PK_ORDERS" ON "DB2ADMIN"."ORDERS" 
-		("ORDERID" ASC)
-		CLUSTER ;
-
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."SHIPPEDDATE" ON "DB2ADMIN"."ORDERS" 
-		("SHIPPEDDATE" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."SHIPPERSORDERS" ON "DB2ADMIN"."ORDERS" 
-		("SHIPVIA" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."ORDERS"
-
-CREATE INDEX "DB2ADMIN"."SHIPPOSTALCODE" ON "DB2ADMIN"."ORDERS" 
-		("SHIPPOSTALCODE" ASC);
-
-
--- DDL Statements for primary key on Table "DB2ADMIN"."ORDERS"
-ALTER TABLE "DB2ADMIN"."ORDERS" ADD CONSTRAINT "SQL040118121536160" PRIMARY KEY	("ORDERID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."PRODUCTS"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."PRODUCTS"  (
-		  "PRODUCTID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (  
-		    START WITH +1  
-		    INCREMENT BY +1  
-		    MINVALUE +1  
-		    MAXVALUE +2147483647  
-		    NO CYCLE  
-		    CACHE 20  
-		    NO ORDER ) , 
-		  "PRODUCTNAME" VARCHAR(40) NOT NULL , 
-		  "SUPPLIERID" INTEGER , 
-		  "CATEGORYID" INTEGER , 
-		  "QUANTITYPERUNIT" VARCHAR(20) , 
-		  "UNITPRICE" DECIMAL(19,4) WITH DEFAULT 0 , 
-		  "UNITSINSTOCK" SMALLINT WITH DEFAULT 0 , 
-		  "UNITSONORDER" SMALLINT WITH DEFAULT 0 , 
-		  "REORDERLEVEL" SMALLINT WITH DEFAULT 0 , 
-		  "DISCONTINUED" SMALLINT NOT NULL WITH DEFAULT 0 )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."PRODUCTS"
-
-CREATE INDEX "DB2ADMIN"."CATEGORIESPRODUCTS" ON "DB2ADMIN"."PRODUCTS" 
-		("CATEGORYID" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."PRODUCTS"
-
-CREATE INDEX "DB2ADMIN"."PK_PRODUCTS" ON "DB2ADMIN"."PRODUCTS" 
-		("PRODUCTID" ASC)
-		CLUSTER ;
-
--- DDL Statements for indexes on Table "DB2ADMIN"."PRODUCTS"
-
-CREATE INDEX "DB2ADMIN"."PRODUCTNAME" ON "DB2ADMIN"."PRODUCTS" 
-		("PRODUCTNAME" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."PRODUCTS"
-
-CREATE INDEX "DB2ADMIN"."SUPPLIERID" ON "DB2ADMIN"."PRODUCTS" 
-		("SUPPLIERID" ASC);
-
-
--- DDL Statements for primary key on Table "DB2ADMIN"."PRODUCTS"
-ALTER TABLE "DB2ADMIN"."PRODUCTS" ADD CONSTRAINT "SQL040118121537130" PRIMARY KEY ("PRODUCTID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."REGION"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."REGION"  (
-		  "REGIONID" INTEGER NOT NULL , 
-		  "REGIONDESCRIPTION" CHAR(50) NOT NULL )   
-		 IN "USERSPACE1" ; 
-
-
--- DDL Statements for unique constraints on Table "DB2ADMIN"."REGION"
-
-ALTER TABLE "DB2ADMIN"."REGION" 
-	ADD CONSTRAINT "UK_REGION" UNIQUE
-		("REGIONID");
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."SUPPLIERS"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."SUPPLIERS"  (
-		  "SUPPLIERID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (  
-		    START WITH +1  
-		    INCREMENT BY +1  
-		    MINVALUE +1  
-		    MAXVALUE +2147483647  
-		    NO CYCLE  
-		    CACHE 20  
-		    NO ORDER ) , 
-		  "COMPANYNAME" VARCHAR(40) NOT NULL , 
-		  "CONTACTNAME" VARCHAR(30) , 
-		  "CONTACTTITLE" VARCHAR(30) , 
-		  "ADDRESS" VARCHAR(60) , 
-		  "CITY" VARCHAR(15) , 
-		  "REGION" VARCHAR(15) , 
-		  "POSTALCODE" VARCHAR(10) , 
-		  "COUNTRY" VARCHAR(15) , 
-		  "PHONE" VARCHAR(24) , 
-		  "FAX" VARCHAR(24) , 
-		  "HOMEPAGE" DBCLOB(1073741823) NOT LOGGED NOT COMPACT )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."SUPPLIERS"
-
-CREATE INDEX "DB2ADMIN"."COMPANYNAME1" ON "DB2ADMIN"."SUPPLIERS" 
-		("COMPANYNAME" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."SUPPLIERS"
-
-CREATE INDEX "DB2ADMIN"."PK_SUPPLIERS" ON "DB2ADMIN"."SUPPLIERS" 
-		("SUPPLIERID" ASC)
-		CLUSTER ;
-
--- DDL Statements for indexes on Table "DB2ADMIN"."SUPPLIERS"
-
-CREATE INDEX "DB2ADMIN"."POSTALCODE2" ON "DB2ADMIN"."SUPPLIERS" 
-		("POSTALCODE" ASC);
-
-
--- DDL Statements for primary key on Table "DB2ADMIN"."SUPPLIERS"
-ALTER TABLE "DB2ADMIN"."SUPPLIERS" ADD CONSTRAINT "SQL040118121538820" PRIMARY KEY ("SUPPLIERID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."TERRITORIES"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."TERRITORIES"  (
-		  "TERRITORYID" VARCHAR(20) NOT NULL , 
-		  "TERRITORYDESCRIPTION" CHAR(50) NOT NULL , 
-		  "REGIONID" INTEGER NOT NULL )   
-		 IN "USERSPACE1" ; 
-
--- DDL Statements for primary key on Table "DB2ADMIN"."TERRITORIES"
-
-ALTER TABLE "DB2ADMIN"."TERRITORIES" 
-	ADD CONSTRAINT "PK_TERRITORIES" PRIMARY KEY
-		("TERRITORYID");
-
-
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."EMPLOYEES"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."EMPLOYEES"  (
-		  "EMPLOYEEID" INTEGER NOT NULL , 
-		  "LASTNAME" VARCHAR(20) NOT NULL , 
-		  "FIRSTNAME" VARCHAR(10) NOT NULL , 
-		  "TITLE" VARCHAR(30) , 
-		  "TITLEOFCOURTESY" VARCHAR(25) , 
-		  "BIRTHDATE" TIMESTAMP , 
-		  "HIREDATE" TIMESTAMP , 
-		  "ADDRESS" VARCHAR(60) , 
-		  "CITY" VARCHAR(15) , 
-		  "REGION" VARCHAR(15) , 
-		  "POSTALCODE" VARCHAR(10) , 
-		  "COUNTRY" VARCHAR(15) , 
-		  "HOMEPHONE" VARCHAR(24) , 
-		  "EXTENSION" VARCHAR(4) , 
-		  "NOTES" DBCLOB(1073741823) NOT LOGGED NOT COMPACT , 
-		  "REPORTSTO" INTEGER , 
-		  "PHOTOPATH" VARCHAR(255) , 
-		  "MYCOLUMN" INTEGER )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."EMPLOYEES"
-
-CREATE INDEX "DB2ADMIN"."LASTNAME" ON "DB2ADMIN"."EMPLOYEES" 
-		("LASTNAME" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."EMPLOYEES"
-
-CREATE INDEX "DB2ADMIN"."PK_EMPLOYEES" ON "DB2ADMIN"."EMPLOYEES" 
-		("EMPLOYEEID" ASC)
-		CLUSTER ;
-
-
--- DDL Statements for primary key on Table "DB2ADMIN"."EMPLOYEES"
-ALTER TABLE "DB2ADMIN"."EMPLOYEES" ADD CONSTRAINT "SQL040126121512760" PRIMARY KEY ("EMPLOYEEID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."Order Details"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."Order Details"  (
-		  "ORDERID" INTEGER NOT NULL , 
-		  "PRODUCTID" INTEGER NOT NULL , 
-		  "UNITPRICE" DECIMAL(19,4) NOT NULL WITH DEFAULT 0 , 
-		  "QUANTITY" SMALLINT NOT NULL WITH DEFAULT 1 , 
-		  "DISCOUNT" REAL NOT NULL WITH DEFAULT 0 )   
-		 IN "USERSPACE1" ; 
--- DDL Statements for indexes on Table "DB2ADMIN"."Order Details"
-
-CREATE INDEX "DB2ADMIN"."ORDERID" ON "DB2ADMIN"."Order Details" 
-		("ORDERID" ASC);
-
--- DDL Statements for indexes on Table "DB2ADMIN"."Order Details"
-
-CREATE INDEX "DB2ADMIN"."PK_ORDER_DETAILS" ON "DB2ADMIN"."Order Details" 
-		("ORDERID" ASC,
-		 "PRODUCTID" ASC)
-		CLUSTER ;
-
--- DDL Statements for indexes on Table "DB2ADMIN"."Order Details"
-
-CREATE INDEX "DB2ADMIN"."PRODUCTID" ON "DB2ADMIN"."Order Details" 
-		("PRODUCTID" ASC);
-
-
--- DDL Statements for primary key on Table "DB2ADMIN"."Order Details"
-ALTER TABLE "DB2ADMIN"."Order Details" ADD CONSTRAINT "SQL040127121002770" PRIMARY KEY ("ORDERID", "PRODUCTID");
-
-
-
-------------------------------------------------
--- DDL Statements for table "DB2ADMIN"."GH_EMPTYTABLE"
-------------------------------------------------
- 
- CREATE TABLE "DB2ADMIN"."GH_EMPTYTABLE"  (
-		  "COL1" INTEGER , 
-		  "COL2" VARCHAR(50) )   
-		 IN "USERSPACE1" ; 
-
-
-
-
-
-
-
-
--- DDL Statements for foreign keys on Table "DB2ADMIN"."CUSTOMERCUSTOMERDEMO"
-
-ALTER TABLE "DB2ADMIN"."CUSTOMERCUSTOMERDEMO" 
-	ADD CONSTRAINT "SQL040118143112730" FOREIGN KEY
-		("CUSTOMERTYPEID")
-	REFERENCES "DB2ADMIN"."CUSTOMERDEMOGRAPHICS"
-		("CUSTOMERTYPEID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for foreign keys on Table "DB2ADMIN"."EMPLOYEETERRITORIES"
-
-ALTER TABLE "DB2ADMIN"."EMPLOYEETERRITORIES" 
-	ADD CONSTRAINT "SQL040118143112790" FOREIGN KEY
-		("TERRITORYID")
-	REFERENCES "DB2ADMIN"."TERRITORIES"
-		("TERRITORYID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for foreign keys on Table "DB2ADMIN"."ORDERS"
-
-ALTER TABLE "DB2ADMIN"."ORDERS" 
-	ADD CONSTRAINT "SQL040127151054370" FOREIGN KEY
-		("SHIPVIA")
-	REFERENCES "DB2ADMIN"."SHIPPERS"
-		("SHIPPERID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for foreign keys on Table "DB2ADMIN"."PRODUCTS"
-
-ALTER TABLE "DB2ADMIN"."PRODUCTS" 
-	ADD CONSTRAINT "SQL040127151054430" FOREIGN KEY
-		("CATEGORYID")
-	REFERENCES "DB2ADMIN"."CATEGORIES"
-		("CATEGORYID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
-ALTER TABLE "DB2ADMIN"."PRODUCTS" 
-	ADD CONSTRAINT "SQL040127151054460" FOREIGN KEY
-		("SUPPLIERID")
-	REFERENCES "DB2ADMIN"."SUPPLIERS"
-		("SUPPLIERID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."PRODUCTS"
-
-ALTER TABLE "DB2ADMIN"."PRODUCTS" 
-	ADD CONSTRAINT "CK_PRODUCTS_UNITPR" CHECK 
-		(UNITPRICE >= 0)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."PRODUCTS"
-
-ALTER TABLE "DB2ADMIN"."PRODUCTS" 
-	ADD CONSTRAINT "CK_REORDERLEVEL" CHECK 
-		(REORDERLEVEL >= 0)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."PRODUCTS"
-
-ALTER TABLE "DB2ADMIN"."PRODUCTS" 
-	ADD CONSTRAINT "CK_UNITSINSTOCK" CHECK 
-		(UNITSINSTOCK >= 0)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."PRODUCTS"
-
-ALTER TABLE "DB2ADMIN"."PRODUCTS" 
-	ADD CONSTRAINT "CK_UNITSONORDER" CHECK 
-		(UNITSONORDER >= 0)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for foreign keys on Table "DB2ADMIN"."EMPLOYEES"
-
-ALTER TABLE "DB2ADMIN"."EMPLOYEES" 
-	ADD CONSTRAINT "SQL040126121642680" FOREIGN KEY
-		("REPORTSTO")
-	REFERENCES "DB2ADMIN"."EMPLOYEES"
-		("EMPLOYEEID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for foreign keys on Table "DB2ADMIN"."Order Details"
-
-ALTER TABLE "DB2ADMIN"."Order Details" 
-	ADD CONSTRAINT "SQL040127151054020" FOREIGN KEY
-		("ORDERID")
-	REFERENCES "DB2ADMIN"."ORDERS"
-		("ORDERID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
-ALTER TABLE "DB2ADMIN"."Order Details" 
-	ADD CONSTRAINT "SQL040127151054350" FOREIGN KEY
-		("PRODUCTID")
-	REFERENCES "DB2ADMIN"."PRODUCTS"
-		("PRODUCTID")
-	ON DELETE NO ACTION
-	ON UPDATE NO ACTION
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."Order Details"
-
-ALTER TABLE "DB2ADMIN"."Order Details" 
-	ADD CONSTRAINT "CK_DISCOUNT" CHECK 
-		(DISCOUNT >= 0 AND DISCOUNT <= 1)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."Order Details"
-
-ALTER TABLE "DB2ADMIN"."Order Details" 
-	ADD CONSTRAINT "CK_QUANTITY" CHECK 
-		(QUANTITY > 0)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
--- DDL Statements for check constraints on Table "DB2ADMIN"."Order Details"
-
-ALTER TABLE "DB2ADMIN"."Order Details" 
-	ADD CONSTRAINT "CK_UNITPRICE" CHECK 
-		(UNITPRICE >= 0)
-	ENFORCED
-	ENABLE QUERY OPTIMIZATION;
-
-CREATE view DB2ADMIN.CURRENT_PRODUCT_LIST AS SELECT PRODUCTS.ProductName,PRODUCTS.UnitPrice 
-FROM DB2ADMIN.PRODUCTS AS PRODUCTS 
-where PRODUCTS.UnitPrice > (select AVG(DB2ADMIN.PRODUCTS.UnitPrice) from DB2ADMIN.PRODUCTS);
-
-
---------------------------------------------------------
--- Database and Database Manager configuration parameters
---------------------------------------------------------
-
-UPDATE DBM CFG USING cpuspeed 3.306410e-007;
-UPDATE DBM CFG USING intra_parallel NO;
-UPDATE DBM CFG USING federated YES;
-UPDATE DBM CFG USING fed_noauth NO;
-
-UPDATE DB CFG FOR GHTDB USING locklist 25;
-UPDATE DB CFG FOR GHTDB USING dft_degree 1;
-UPDATE DB CFG FOR GHTDB USING maxlocks 22;
-UPDATE DB CFG FOR GHTDB USING avg_appls 1;
-UPDATE DB CFG FOR GHTDB USING stmtheap 2048;
-UPDATE DB CFG FOR GHTDB USING dft_queryopt 5;
-
----------------------------------
--- Environment Variables settings
----------------------------------
-
-
---COMMIT WORK;
-
----CONNECT RESET;
-
---TERMINATE;
--- USER is: 
--- Specified SCHEMA is: DB2ADMIN
--- The db2look utility will consider only the specified tables 
--- Creating DDL for table(s)
-
--- Schema name is ignored for the Federated Section
-;
-
-COMMIT WORK;
-CONNECT RESET;
----------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------
-DROP DATABASE GHTDB_EX;
-create database ghtdb_EX USING CODESET UTF8 TERRITORY US;
-
-CONNECT TO GHTDB_EX;
- 
-
- CREATE TABLE "DB2ADMIN"."CUSTOMERS"  (
-
-		  "CUSTOMERID" CHAR(10) NOT NULL , 
-
-		  "COMPANYNAME" VARCHAR(40) NOT NULL , 
-
-		  "CONTACTNAME" VARCHAR(30) , 
-
-		  "CONTACTTITLE" VARCHAR(30) , 
-
-		  "ADDRESS" VARCHAR(60) , 
-
-		  "CITY" VARCHAR(15) , 
-
-		  "REGION" VARCHAR(15) , 
-
-		  "POSTALCODE" VARCHAR(10) , 
-
-		  "COUNTRY" VARCHAR(15) , 
-
-		  "PHONE" VARCHAR(24) , 
-
-		  "FAX" VARCHAR(24) )   
-
-		 IN "USERSPACE1" ; 
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-
-
-CREATE INDEX "DB2ADMIN"."CITY" ON "DB2ADMIN"."CUSTOMERS" 
-
-		("CITY" ASC);
-
-
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-
-
-CREATE INDEX "DB2ADMIN"."COMPANYNAME" ON "DB2ADMIN"."CUSTOMERS" 
-
-		("COMPANYNAME" ASC);
-
-
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-
-
-CREATE INDEX "DB2ADMIN"."PK_CUSTOMERS" ON "DB2ADMIN"."CUSTOMERS" 
-
-		("CUSTOMERID" ASC)
-
-		CLUSTER ;
-
-
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-
-
-CREATE INDEX "DB2ADMIN"."POSTALCODE" ON "DB2ADMIN"."CUSTOMERS" 
-
-		("POSTALCODE" ASC);
-
-
-
--- DDL Statements for indexes on Table "DB2ADMIN"."CUSTOMERS"
-
-
-
-CREATE INDEX "DB2ADMIN"."REGION" ON "DB2ADMIN"."CUSTOMERS" 
-
-		("REGION" ASC);
-
-
-
-
-
-
-
--- DDL Statements for unique constraints on Table "DB2ADMIN"."CUSTOMERS"
-
-ALTER TABLE "DB2ADMIN"."CUSTOMERS" ADD CONSTRAINT "UK_CUSTOMERID" UNIQUE ("CUSTOMERID");
-
-
-
-
-COMMIT WORK;
-CONNECT RESET;
-TERMINATE;
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.Data.DB2.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.Data.DB2.sql
deleted file mode 100755
index 2217e5e08ff..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.Data.DB2.sql
+++ /dev/null
@@ -1,3459 +0,0 @@
-CONNECT TO GHTDB;
-
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (1, 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (3, 'Confections', 'Desserts, candies, and sweet breads' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (4, 'Dairy Products', 'Cheeses' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (5, 'Grains/Cereals', 'Breads, crackers, pasta, and cereal' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (6, 'Meat/Poultry', 'Prepared meats' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (7, 'Produce', 'Dried fruit and bean curd' ) ;
-INSERT INTO DB2ADMIN.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (8, 'Seafood', 'Seaweed and fish' ) ;
-
-INSERT INTO MAINSOFT.CATEGORIESNEW ( CategoryID, CategoryName, Description ) VALUES (1, 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) ;
-INSERT INTO MAINSOFT.CATEGORIESNEW ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-
-INSERT INTO MAINSOFT.CATEGORIES ( CategoryID, CategoryName, Description) VALUES ('10', 'Beverages', 'Soft drinks, coffees, teas, beers, and ales') ;
-INSERT INTO MAINSOFT.CATEGORIES ( CategoryID, CategoryName, Description) VALUES ('20', 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings') ;
-
-
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (1, 'Yavine', 'Oved', 'Sales Representative', 'Mr', '1948-12-8-00.00.00.000000', '1992-5-1-00.00.00.000000', '507 - 20th Ave. E.Apt. 2A', 'Seattle', 'WA', '98122', 'USA', '(206) 555-9857', '5467', 'Education includes a BA in psychology from Colorado State University in 1970.  She also completed "The Art of the Cold Call."  Nancy is a member of Toastmasters International.', NULL, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (2, 'Fuller', 'Andrew', 'Vice President, Sales', 'Dr.', '1952-2-19-00.00.00.000000', '1992-8-14-00.00.00.000000', '908 W. Capital Way', 'Tacoma', 'WA', '98401', 'USA', '(206) 555-9482', '3457', 'Andrew received his BTS commercial in 1974 and a Ph.D. in international marketing from the University of Dallas in 1981.  He is fluent in French and Italian and reads German.  He joined the company as a sales representative, was promoted to sales manager in January 1992 and to vice president of sales in March 1993.  Andrew is a member of the Sales Management Roundtable, the Seattle Chamber of Commerce, and the Pacific Rim Importers Association.', NULL, 'http://accweb/emmployees/fuller.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (3, 'Leverling', 'Janet', 'Sales Representative', 'Ms.', '1963-8-30-00.00.00.000000', '1992-4-1-00.00.00.000000', '722 Moss Bay Blvd.', 'Kirkland', 'WA', '98033', 'USA', '(206) 555-3412', '3355', 'Janet has a BS degree in chemistry from Boston College (1984).  She has also completed a certificate program in food retailing management.  Janet was hired as a sales associate in 1991 and promoted to sales representative in February 1992.', 2, 'http://accweb/emmployees/leverling.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (4, 'Peacock', 'Margaret', 'Sales Representative', 'Mrs.', '1937-9-19-00.00.00.000000', '1993-5-3-00.00.00.000000', '4110 Old Redmond Rd.', 'Redmond', 'WA', '98052', 'USA', '(206) 555-8122', '5176', 'Margaret holds a BA in English literature from Concordia College (1958) and an MA from the American Institute of Culinary Arts (1966).  She was assigned to the London office temporarily from July through November 1992.', 2, 'http://accweb/emmployees/peacock.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (5, 'Buchanan', 'Steven', 'Sales Manager', 'Mr.', '1955-3-4-00.00.00.000000', '1993-10-17-00.00.00.000000', '14 Garrett Hill', 'London', NULL, 'SW1 8JR', 'UK', '(71) 555-4848', '3453', 'Steven Buchanan graduated from St. Andrews University, Scotland, with a BSC degree in 1976.  Upon joining the company as a sales representative in 1992, he spent 6 months in an orientation program at the Seattle office and then returned to his permanent post in London.  He was promoted to sales manager in March 1993.  Mr. Buchanan has completed the courses "Successful Telemarketing" and "International Sales Management."  He is fluent in French.', 2, 'http://accweb/emmployees/buchanan.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (6, 'Suyama', 'Michael', 'Sales Representative', 'Mr.', '1963-7-2-00.00.00.000000', '1993-10-17-00.00.00.000000', 'Coventry House Miner Rd.', 'London', NULL, 'EC2 7JR', 'UK', '(71) 555-7773', '428', 'Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses "Multi-Cultural Selling" and "Time Management for the Sales Professional."  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (7, 'King', 'Robert', 'Sales Representative', 'Mr.', '1960-5-29-00.00.00.000000', '1994-1-2-00.00.00.000000', 'Edgeham Hollow Winchester Way', 'London', NULL, 'RG1 9SP', 'UK', '(71) 555-5598', '465', 'Robert King served in the Peace Corps and traveled extensively before completing his degree in English at the University of Michigan in 1992, the year he joined the company.  After completing a course entitled "Selling in Europe," he was transferred to the London office in March 1993.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (8, 'Callahan', 'Laura', 'Inside Sales Coordinator', 'Ms.', '1958-1-9-00.00.00.000000', '1994-3-5-00.00.00.000000', '4726 - 11th Ave. N.E.', 'Seattle', 'WA', '98105', 'USA', '(206) 555-1189', '2344', 'Laura received a BA in psychology from the University of Washington.  She has also completed a course in business French.  She reads and writes French.', 2, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9, 'Dodsworth', 'Anne', 'Sales Representative', 'Ms.', '1966-1-27-00.00.00.000000', '1994-11-15-00.00.00.000000', '7 Houndstooth Rd.', 'London', NULL, 'WG2 7LT', 'UK', '(71) 555-4444', '452', 'Anne has a BA degree in English from St. Lawrence College.  She is fluent in French and German.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (100, 'Last100', 'First100', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (200, 'Last200', 'First200', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (300, 'Last300', 'First300', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (400, 'Last400', 'First400', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (500, 'Last500', 'First500', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (600, 'Last600', 'First600', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (700, 'Last700', 'First700', NULL, NULL, '1988-5-31-00.00.00.000000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9991, 'Ofer', 'Borshtein', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9993, 'Ofer', 'Borshtein', 'Jack the ripper', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9996, 'Ofer', 'Borshtein', 'Exp', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-INSERT INTO DB2ADMIN.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (99999, 'Testing', 'OferXYZ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ;
-
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('01581', 'Westboro                                          ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('01730', 'Bedford                                           ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('01833', 'Georgetow                                         ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('02116', 'Boston                                            ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('02139', 'Cambridge                                         ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('02184', 'Braintree                                         ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('02903', 'Providence                                        ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('03049', 'Hollis                                            ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('03801', 'Portsmouth                                        ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('06897', 'Wilton                                            ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('07960', 'Morristown                                        ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('08837', 'Edison                                            ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('10019', 'New York                                          ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('10038', 'New York                                          ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('11747', 'Mellvile                                          ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('14450', 'Fairport                                          ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('19428', 'Philadelphia                                      ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('19713', 'Neward                                            ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('20852', 'Rockville                                         ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('27403', 'Greensboro                                        ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('27511', 'Cary                                              ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('29202', 'Columbia                                          ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('30346', 'Atlanta                                           ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('31406', 'Savannah                                          ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('32859', 'Orlando                                           ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('33607', 'Tampa                                             ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('40222', 'Louisville                                        ', 1 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('44122', 'Beachwood                                         ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('45839', 'Findlay                                           ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('48075', 'Southfield                                        ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('48084', 'Troy                                              ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('48304', 'Bloomfield Hills                                  ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('53404', 'Racine                                            ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('55113', 'Roseville                                         ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('55439', 'Minneapolis                                       ', 3 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('60179', 'Hoffman Estates                                   ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('60601', 'Chicago                                           ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('72716', 'Bentonville                                       ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('75234', 'Dallas                                            ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('78759', 'Austin                                            ', 4 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('80202', 'Denver                                            ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('80909', 'Colorado Springs                                  ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('85014', 'Phoenix                                           ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('85251', 'Scottsdale                                        ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('90405', 'Santa Monica                                      ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('94025', 'Menlo Park                                        ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('94105', 'San Francisco                                     ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('95008', 'Campbell                                          ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('95054', 'Santa Clara                                       ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('95060', 'Santa Cruz                                        ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('98004', 'Bellevue                                          ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('98052', 'Redmond                                           ', 2 ) ;
-INSERT INTO DB2ADMIN.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES ('98104', 'Seattle                                           ', 2 ) ;
-
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '06897' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '19713' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01581' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01730' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01833' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02116' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02139' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02184' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '40222' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '30346' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '31406' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '32859' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '33607' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '20852' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27403' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27511' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '02903' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '07960' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '08837' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10019' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10038' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '11747' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '14450' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85014' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85251' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98004' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98052' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98104' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60179' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60601' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80202' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80909' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '90405' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94025' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94105' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95008' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95054' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95060' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '19428' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '44122' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '45839' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '53404' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03049' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03801' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48075' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48084' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48304' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55113' ) ;
-INSERT INTO DB2ADMIN.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55439' ) ;
-
-INSERT INTO DB2ADMIN.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (1, 'Speedy Express', '(503) 555-9831' ) ;
-INSERT INTO DB2ADMIN.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (2, 'Comp2', '(503) 555-3199' ) ;
-INSERT INTO DB2ADMIN.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (3, 'Federal Shipping', '(503) 555-9931' ) ;
-
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10248, 'VINET', 5, '7/4/1996', '8/1/1996', '7/16/1996', 3, 255.39, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10249, 'TOMSP', 6, '7/5/1996', '8/16/1996', '7/10/1996', 1, 11.61, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10250, 'HANAR', 4, '7/8/1996', '8/5/1996', '7/12/1996', 2, 65.83, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10251, 'VICTE', 3, '7/8/1996', '8/5/1996', '7/15/1996', 1, 41.34, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10252, 'SUPRD', 4, '7/9/1996', '8/6/1996', '7/11/1996', 2, 51.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10253, 'HANAR', 3, '7/10/1996', '7/24/1996', '7/16/1996', 2, 58.17, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10254, 'CHOPS', 5, '7/11/1996', '8/8/1996', '7/23/1996', 2, 22.98, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10255, 'RICSU', 9, '7/12/1996', '8/9/1996', '7/15/1996', 3, 148.33, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10256, 'WELLI', 3, '7/15/1996', '8/12/1996', '7/17/1996', 2, 13.97, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10257, 'HILAA', 4, '7/16/1996', '8/13/1996', '7/22/1996', 3, 81.91, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10258, 'ERNSH', 1, '7/17/1996', '8/14/1996', '7/23/1996', 1, 140.51, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10259, 'CENTC', 4, '7/18/1996', '8/15/1996', '7/25/1996', 3, 3.25, 'Centro comercial Moctezuma', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10260, 'OTTIK', 4, '7/19/1996', '8/16/1996', '7/29/1996', 1, 55.09, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10261, 'QUEDE', 4, '7/19/1996', '8/16/1996', '7/30/1996', 2, 3.05, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10262, 'RATTC', 8, '7/22/1996', '8/19/1996', '7/25/1996', 3, 48.29, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10263, 'ERNSH', 9, '7/23/1996', '8/20/1996', '7/31/1996', 3, 146.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10264, 'FOLKO', 6, '7/24/1996', '8/21/1996', '8/23/1996', 3, 3.67, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10265, 'BLONP', 2, '7/25/1996', '8/22/1996', '8/12/1996', 1, 55.28, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10266, 'WARTH', 3, '7/26/1996', '9/6/1996', '7/31/1996', 3, 25.73, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10267, 'FRANK', 4, '7/29/1996', '8/26/1996', '8/6/1996', 1, 208.58, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10268, 'GROSR', 8, '7/30/1996', '8/27/1996', '8/2/1996', 3, 66.29, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10269, 'WHITC', 5, '7/31/1996', '8/14/1996', '8/9/1996', 1, 4.56, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10270, 'WARTH', 1, '8/1/1996', '8/29/1996', '8/2/1996', 1, 136.54, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10271, 'SPLIR', 6, '8/1/1996', '8/29/1996', '8/30/1996', 2, 4.54, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10272, 'RATTC', 6, '8/2/1996', '8/30/1996', '8/6/1996', 2, 98.03, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10273, 'QUICK', 3, '8/5/1996', '9/2/1996', '8/12/1996', 3, 76.07, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10274, 'VINET', 6, '8/6/1996', '9/3/1996', '8/16/1996', 1, 6.01, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10275, 'MAGAA', 1, '8/7/1996', '9/4/1996', '8/9/1996', 1, 26.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10276, 'TORTU', 8, '8/8/1996', '8/22/1996', '8/14/1996', 3, 13.84, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10277, 'MORGK', 2, '8/9/1996', '9/6/1996', '8/13/1996', 3, 125.77, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10278, 'BERGS', 8, '8/12/1996', '9/9/1996', '8/16/1996', 2, 92.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10279, 'LEHMS', 8, '8/13/1996', '9/10/1996', '8/16/1996', 2, 25.83, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10280, 'BERGS', 2, '8/14/1996', '9/11/1996', '9/12/1996', 1, 8.98, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10281, 'ROMEY', 4, '8/14/1996', '8/28/1996', '8/21/1996', 1, 2.94, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10282, 'ROMEY', 4, '8/15/1996', '9/12/1996', '8/21/1996', 1, 12.69, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10283, 'LILAS', 3, '8/16/1996', '9/13/1996', '8/23/1996', 3, 84.81, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10284, 'LEHMS', 4, '8/19/1996', '9/16/1996', '8/27/1996', 1, 76.56, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10285, 'QUICK', 1, '8/20/1996', '9/17/1996', '8/26/1996', 2, 76.83, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10286, 'QUICK', 8, '8/21/1996', '9/18/1996', '8/30/1996', 3, 229.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10287, 'RICAR', 8, '8/22/1996', '9/19/1996', '8/28/1996', 3, 12.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10288, 'REGGC', 4, '8/23/1996', '9/20/1996', '9/3/1996', 1, 7.45, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10289, 'BSBEV', 7, '8/26/1996', '9/23/1996', '8/28/1996', 3, 22.77, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10290, 'COMMI', 8, '8/27/1996', '9/24/1996', '9/3/1996', 1, 79.7, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10291, 'QUEDE', 6, '8/27/1996', '9/24/1996', '9/4/1996', 2, 6.4, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10292, 'TRADH', 1, '8/28/1996', '9/25/1996', '9/2/1996', 2, 1.35, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10293, 'TORTU', 1, '8/29/1996', '9/26/1996', '9/11/1996', 3, 21.18, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10294, 'RATTC', 4, '8/30/1996', '9/27/1996', '9/5/1996', 2, 147.26, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10295, 'VINET', 2, '9/2/1996', '9/30/1996', '9/10/1996', 2, 1.15, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10296, 'LILAS', 6, '9/3/1996', '10/1/1996', '9/11/1996', 1, 0.12, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10297, 'BLONP', 5, '9/4/1996', '10/16/1996', '9/10/1996', 2, 5.74, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10298, 'HUNGO', 6, '9/5/1996', '10/3/1996', '9/11/1996', 2, 168.22, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10299, 'RICAR', 4, '9/6/1996', '10/4/1996', '9/13/1996', 2, 29.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10300, 'MAGAA', 2, '9/9/1996', '10/7/1996', '9/18/1996', 2, 17.68, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10301, 'WANDK', 8, '9/9/1996', '10/7/1996', '9/17/1996', 2, 45.08, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10302, 'SUPRD', 4, '9/10/1996', '10/8/1996', '10/9/1996', 2, 6.27, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10303, 'GODOS', 7, '9/11/1996', '10/9/1996', '9/18/1996', 2, 107.83, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10304, 'TORTU', 1, '9/12/1996', '10/10/1996', '9/17/1996', 2, 63.79, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10305, 'OLDWO', 8, '9/13/1996', '10/11/1996', '10/9/1996', 3, 257.62, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10306, 'ROMEY', 1, '9/16/1996', '10/14/1996', '9/23/1996', 3, 7.56, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10307, 'LONEP', 2, '9/17/1996', '10/15/1996', '9/25/1996', 2, 0.56, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10308, 'ANATR', 7, '9/18/1996', '10/16/1996', '9/24/1996', 3, 1.61, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10309, 'HUNGO', 3, '9/19/1996', '10/17/1996', '10/23/1996', 1, 47.3, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10310, 'THEBI', 8, '9/20/1996', '10/18/1996', '9/27/1996', 2, 17.52, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10311, 'DUMON', 1, '9/20/1996', '10/4/1996', '9/26/1996', 3, 24.69, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10312, 'WANDK', 2, '9/23/1996', '10/21/1996', '10/3/1996', 2, 40.26, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10313, 'QUICK', 2, '9/24/1996', '10/22/1996', '10/4/1996', 2, 1.96, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10314, 'RATTC', 1, '9/25/1996', '10/23/1996', '10/4/1996', 2, 74.16, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10315, 'ISLAT', 4, '9/26/1996', '10/24/1996', '10/3/1996', 2, 41.76, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10316, 'RATTC', 1, '9/27/1996', '10/25/1996', '10/8/1996', 3, 150.15, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10317, 'LONEP', 6, '9/30/1996', '10/28/1996', '10/10/1996', 1, 12.69, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10318, 'ISLAT', 8, '10/1/1996', '10/29/1996', '10/4/1996', 2, 4.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10319, 'TORTU', 7, '10/2/1996', '10/30/1996', '10/11/1996', 3, 64.5, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10320, 'WARTH', 5, '10/3/1996', '10/17/1996', '10/18/1996', 3, 34.57, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10321, 'ISLAT', 3, '10/3/1996', '10/31/1996', '10/11/1996', 2, 3.43, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10322, 'PERIC', 7, '10/4/1996', '11/1/1996', '10/23/1996', 3, 0.4, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10323, 'KOENE', 4, '10/7/1996', '11/4/1996', '10/14/1996', 1, 4.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10324, 'SAVEA', 9, '10/8/1996', '11/5/1996', '10/10/1996', 1, 214.27, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10325, 'KOENE', 1, '10/9/1996', '10/23/1996', '10/14/1996', 3, 64.86, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10326, 'BOLID', 4, '10/10/1996', '11/7/1996', '10/14/1996', 2, 77.92, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10327, 'FOLKO', 2, '10/11/1996', '11/8/1996', '10/14/1996', 1, 63.36, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10328, 'FURIB', 4, '10/14/1996', '11/11/1996', '10/17/1996', 3, 87.03, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10329, 'SPLIR', 4, '10/15/1996', '11/26/1996', '10/23/1996', 2, 191.67, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10330, 'LILAS', 3, '10/16/1996', '11/13/1996', '10/28/1996', 1, 12.75, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10331, 'BONAP', 9, '10/16/1996', '11/27/1996', '10/21/1996', 1, 10.19, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10332, 'MEREP', 3, '10/17/1996', '11/28/1996', '10/21/1996', 2, 52.84, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10333, 'WARTH', 5, '10/18/1996', '11/15/1996', '10/25/1996', 3, 0.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10334, 'VICTE', 8, '10/21/1996', '11/18/1996', '10/28/1996', 2, 8.56, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10335, 'HUNGO', 7, '10/22/1996', '11/19/1996', '10/24/1996', 2, 42.11, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10336, 'PRINI', 7, '10/23/1996', '11/20/1996', '10/25/1996', 2, 15.51, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10337, 'FRANK', 4, '10/24/1996', '11/21/1996', '10/29/1996', 3, 108.26, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10338, 'OLDWO', 4, '10/25/1996', '11/22/1996', '10/29/1996', 3, 84.21, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10339, 'MEREP', 2, '10/28/1996', '11/25/1996', '11/4/1996', 2, 15.66, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10340, 'BONAP', 1, '10/29/1996', '11/26/1996', '11/8/1996', 3, 166.31, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10341, 'SIMOB', 7, '10/29/1996', '11/26/1996', '11/5/1996', 3, 26.78, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10342, 'FRANK', 4, '10/30/1996', '11/13/1996', '11/4/1996', 2, 54.83, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10343, 'LEHMS', 4, '10/31/1996', '11/28/1996', '11/6/1996', 1, 110.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10344, 'WHITC', 4, '11/1/1996', '11/29/1996', '11/5/1996', 2, 23.29, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10345, 'QUICK', 2, '11/4/1996', '12/2/1996', '11/11/1996', 2, 249.06, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10346, 'RATTC', 3, '11/5/1996', '12/17/1996', '11/8/1996', 3, 142.08, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10347, 'FAMIA', 4, '11/6/1996', '12/4/1996', '11/8/1996', 3, 3.1, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10348, 'WANDK', 4, '11/7/1996', '12/5/1996', '11/15/1996', 2, 0.78, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10349, 'SPLIR', 7, '11/8/1996', '12/6/1996', '11/15/1996', 1, 8.63, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10350, 'LAMAI', 6, '11/11/1996', '12/9/1996', '12/3/1996', 2, 64.19, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10351, 'ERNSH', 1, '11/11/1996', '12/9/1996', '11/20/1996', 1, 162.33, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10352, 'FURIB', 3, '11/12/1996', '11/26/1996', '11/18/1996', 3, 1.3, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10353, 'PICCO', 7, '11/13/1996', '12/11/1996', '11/25/1996', 3, 360.63, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10354, 'PERIC', 8, '11/14/1996', '12/12/1996', '11/20/1996', 3, 53.8, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10355, 'AROUT', 6, '11/15/1996', '12/13/1996', '11/20/1996', 1, 41.95, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10356, 'WANDK', 6, '11/18/1996', '12/16/1996', '11/27/1996', 2, 36.71, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10357, 'LILAS', 1, '11/19/1996', '12/17/1996', '12/2/1996', 3, 34.88, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10358, 'LAMAI', 5, '11/20/1996', '12/18/1996', '11/27/1996', 1, 19.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10359, 'SEVES', 5, '11/21/1996', '12/19/1996', '11/26/1996', 3, 288.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10360, 'BLONP', 4, '11/22/1996', '12/20/1996', '12/2/1996', 3, 131.7, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10361, 'QUICK', 1, '11/22/1996', '12/20/1996', '12/3/1996', 2, 183.17, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10362, 'BONAP', 3, '11/25/1996', '12/23/1996', '11/28/1996', 1, 96.04, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10363, 'DRACD', 4, '11/26/1996', '12/24/1996', '12/4/1996', 3, 30.54, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10364, 'EASTC', 1, '11/26/1996', '1/7/1997', '12/4/1996', 1, 71.97, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10365, 'ANTON', 3, '11/27/1996', '12/25/1996', '12/2/1996', 2, 22, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10366, 'GALED', 8, '11/28/1996', '1/9/1997', '12/30/1996', 2, 10.14, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10367, 'VAFFE', 7, '11/28/1996', '12/26/1996', '12/2/1996', 3, 13.55, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10368, 'ERNSH', 2, '11/29/1996', '12/27/1996', '12/2/1996', 2, 101.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10369, 'SPLIR', 8, '12/2/1996', '12/30/1996', '12/9/1996', 2, 195.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10370, 'CHOPS', 6, '12/3/1996', '12/31/1996', '12/27/1996', 2, 1.17, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10371, 'LAMAI', 1, '12/3/1996', '12/31/1996', '12/24/1996', 1, 0.45, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10372, 'QUEEN', 5, '12/4/1996', '1/1/1997', '12/9/1996', 2, 890.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10373, 'HUNGO', 4, '12/5/1996', '1/2/1997', '12/11/1996', 3, 124.12, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10374, 'WOLZA', 1, '12/5/1996', '1/2/1997', '12/9/1996', 3, 3.94, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10375, 'HUNGC', 3, '12/6/1996', '1/3/1997', '12/9/1996', 2, 20.12, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10376, 'MEREP', 1, '12/9/1996', '1/6/1997', '12/13/1996', 2, 20.39, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10377, 'SEVES', 1, '12/9/1996', '1/6/1997', '12/13/1996', 3, 22.21, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10378, 'FOLKO', 5, '12/10/1996', '1/7/1997', '12/19/1996', 3, 5.44, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10379, 'QUEDE', 2, '12/11/1996', '1/8/1997', '12/13/1996', 1, 45.03, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10380, 'HUNGO', 8, '12/12/1996', '1/9/1997', '1/16/1997', 3, 35.03, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10381, 'LILAS', 3, '12/12/1996', '1/9/1997', '12/13/1996', 3, 7.99, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10382, 'ERNSH', 4, '12/13/1996', '1/10/1997', '12/16/1996', 1, 94.77, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10383, 'AROUT', 8, '12/16/1996', '1/13/1997', '12/18/1996', 3, 34.24, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10384, 'BERGS', 3, '12/16/1996', '1/13/1997', '12/20/1996', 3, 168.64, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10385, 'SPLIR', 1, '12/17/1996', '1/14/1997', '12/23/1996', 2, 30.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10386, 'FAMIA', 9, '12/18/1996', '1/1/1997', '12/25/1996', 3, 13.99, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10387, 'SANTG', 1, '12/18/1996', '1/15/1997', '12/20/1996', 2, 93.63, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10388, 'SEVES', 2, '12/19/1996', '1/16/1997', '12/20/1996', 1, 34.86, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10389, 'BOTTM', 4, '12/20/1996', '1/17/1997', '12/24/1996', 2, 47.42, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10390, 'ERNSH', 6, '12/23/1996', '1/20/1997', '12/26/1996', 1, 126.38, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10391, 'DRACD', 3, '12/23/1996', '1/20/1997', '12/31/1996', 3, 5.45, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10392, 'PICCO', 2, '12/24/1996', '1/21/1997', '1/1/1997', 3, 122.46, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10393, 'SAVEA', 1, '12/25/1996', '1/22/1997', '1/3/1997', 3, 126.56, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10394, 'HUNGC', 1, '12/25/1996', '1/22/1997', '1/3/1997', 3, 30.34, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10395, 'HILAA', 6, '12/26/1996', '1/23/1997', '1/3/1997', 1, 184.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10396, 'FRANK', 1, '12/27/1996', '1/10/1997', '1/6/1997', 3, 135.35, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10397, 'PRINI', 5, '12/27/1996', '1/24/1997', '1/2/1997', 1, 60.26, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10398, 'SAVEA', 2, '12/30/1996', '1/27/1997', '1/9/1997', 3, 89.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10399, 'VAFFE', 8, '12/31/1996', '1/14/1997', '1/8/1997', 3, 27.36, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10400, 'EASTC', 1, '1/1/1997', '1/29/1997', '1/16/1997', 3, 83.93, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10401, 'RATTC', 1, '1/1/1997', '1/29/1997', '1/10/1997', 1, 12.51, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10402, 'ERNSH', 8, '1/2/1997', '2/13/1997', '1/10/1997', 2, 67.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10403, 'ERNSH', 4, '1/3/1997', '1/31/1997', '1/9/1997', 3, 73.79, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10404, 'MAGAA', 2, '1/3/1997', '1/31/1997', '1/8/1997', 1, 155.97, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10405, 'LINOD', 1, '1/6/1997', '2/3/1997', '1/22/1997', 1, 34.82, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10406, 'QUEEN', 7, '1/7/1997', '2/18/1997', '1/13/1997', 1, 108.04, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10407, 'OTTIK', 2, '1/7/1997', '2/4/1997', '1/30/1997', 2, 91.48, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10408, 'FOLIG', 8, '1/8/1997', '2/5/1997', '1/14/1997', 1, 11.26, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10409, 'OCEAN', 3, '1/9/1997', '2/6/1997', '1/14/1997', 1, 29.83, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10410, 'BOTTM', 3, '1/10/1997', '2/7/1997', '1/15/1997', 3, 2.4, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10411, 'BOTTM', 9, '1/10/1997', '2/7/1997', '1/21/1997', 3, 23.65, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10412, 'WARTH', 8, '1/13/1997', '2/10/1997', '1/15/1997', 2, 3.77, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10413, 'LAMAI', 3, '1/14/1997', '2/11/1997', '1/16/1997', 2, 95.66, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10414, 'FAMIA', 2, '1/14/1997', '2/11/1997', '1/17/1997', 3, 21.48, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10415, 'HUNGC', 3, '1/15/1997', '2/12/1997', '1/24/1997', 1, 0.2, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10416, 'WARTH', 8, '1/16/1997', '2/13/1997', '1/27/1997', 3, 22.72, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10417, 'SIMOB', 4, '1/16/1997', '2/13/1997', '1/28/1997', 3, 70.29, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10418, 'QUICK', 4, '1/17/1997', '2/14/1997', '1/24/1997', 1, 17.55, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10419, 'RICSU', 4, '1/20/1997', '2/17/1997', '1/30/1997', 2, 137.35, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10420, 'WELLI', 3, '1/21/1997', '2/18/1997', '1/27/1997', 1, 44.12, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10421, 'QUEDE', 8, '1/21/1997', '3/4/1997', '1/27/1997', 1, 99.23, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10422, 'FRANS', 2, '1/22/1997', '2/19/1997', '1/31/1997', 1, 3.02, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10423, 'GOURL', 6, '1/23/1997', '2/6/1997', '2/24/1997', 3, 24.5, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10424, 'MEREP', 7, '1/23/1997', '2/20/1997', '1/27/1997', 2, 370.61, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10425, 'LAMAI', 6, '1/24/1997', '2/21/1997', '2/14/1997', 2, 7.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10426, 'GALED', 4, '1/27/1997', '2/24/1997', '2/6/1997', 1, 18.69, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10427, 'PICCO', 4, '1/27/1997', '2/24/1997', '3/3/1997', 2, 31.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10428, 'REGGC', 7, '1/28/1997', '2/25/1997', '2/4/1997', 1, 11.09, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10429, 'HUNGO', 3, '1/29/1997', '3/12/1997', '2/7/1997', 2, 56.63, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10430, 'ERNSH', 4, '1/30/1997', '2/13/1997', '2/3/1997', 1, 458.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10431, 'BOTTM', 4, '1/30/1997', '2/13/1997', '2/7/1997', 2, 44.17, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10432, 'SPLIR', 3, '1/31/1997', '2/14/1997', '2/7/1997', 2, 4.34, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10433, 'PRINI', 3, '2/3/1997', '3/3/1997', '3/4/1997', 3, 73.83, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10434, 'FOLKO', 3, '2/3/1997', '3/3/1997', '2/13/1997', 2, 17.92, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10435, 'CONSH', 8, '2/4/1997', '3/18/1997', '2/7/1997', 2, 9.21, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10436, 'BLONP', 3, '2/5/1997', '3/5/1997', '2/11/1997', 2, 156.66, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10437, 'WARTH', 8, '2/5/1997', '3/5/1997', '2/12/1997', 1, 19.97, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10438, 'TOMSP', 3, '2/6/1997', '3/6/1997', '2/14/1997', 2, 8.24, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10439, 'MEREP', 6, '2/7/1997', '3/7/1997', '2/10/1997', 3, 4.07, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10440, 'SAVEA', 4, '2/10/1997', '3/10/1997', '2/28/1997', 2, 86.53, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10441, 'OLDWO', 3, '2/10/1997', '3/24/1997', '3/14/1997', 2, 73.02, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10442, 'ERNSH', 3, '2/11/1997', '3/11/1997', '2/18/1997', 2, 47.94, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10443, 'REGGC', 8, '2/12/1997', '3/12/1997', '2/14/1997', 1, 13.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10444, 'BERGS', 3, '2/12/1997', '3/12/1997', '2/21/1997', 3, 3.5, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10445, 'BERGS', 3, '2/13/1997', '3/13/1997', '2/20/1997', 1, 9.3, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10446, 'TOMSP', 6, '2/14/1997', '3/14/1997', '2/19/1997', 1, 14.68, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10447, 'RICAR', 4, '2/14/1997', '3/14/1997', '3/7/1997', 2, 68.66, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10448, 'RANCH', 4, '2/17/1997', '3/17/1997', '2/24/1997', 2, 38.82, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10449, 'BLONP', 3, '2/18/1997', '3/18/1997', '2/27/1997', 2, 53.3, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10450, 'VICTE', 8, '2/19/1997', '3/19/1997', '3/11/1997', 2, 7.23, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10451, 'QUICK', 4, '2/19/1997', '3/5/1997', '3/12/1997', 3, 189.09, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10452, 'SAVEA', 8, '2/20/1997', '3/20/1997', '2/26/1997', 1, 140.26, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10453, 'AROUT', 1, '2/21/1997', '3/21/1997', '2/26/1997', 2, 25.36, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10454, 'LAMAI', 4, '2/21/1997', '3/21/1997', '2/25/1997', 3, 2.74, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10455, 'WARTH', 8, '2/24/1997', '4/7/1997', '3/3/1997', 2, 180.45, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10456, 'KOENE', 8, '2/25/1997', '4/8/1997', '2/28/1997', 2, 8.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10457, 'KOENE', 2, '2/25/1997', '3/25/1997', '3/3/1997', 1, 11.57, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10458, 'SUPRD', 7, '2/26/1997', '3/26/1997', '3/4/1997', 3, 147.06, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10459, 'VICTE', 4, '2/27/1997', '3/27/1997', '2/28/1997', 2, 25.09, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10460, 'FOLKO', 8, '2/28/1997', '3/28/1997', '3/3/1997', 1, 16.27, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10461, 'LILAS', 1, '2/28/1997', '3/28/1997', '3/5/1997', 3, 148.61, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10462, 'CONSH', 2, '3/3/1997', '3/31/1997', '3/18/1997', 1, 6.17, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10463, 'SUPRD', 5, '3/4/1997', '4/1/1997', '3/6/1997', 3, 14.78, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10464, 'FURIB', 4, '3/4/1997', '4/1/1997', '3/14/1997', 2, 89, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10465, 'VAFFE', 1, '3/5/1997', '4/2/1997', '3/14/1997', 3, 145.04, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10466, 'COMMI', 4, '3/6/1997', '4/3/1997', '3/13/1997', 1, 11.93, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10467, 'MAGAA', 8, '3/6/1997', '4/3/1997', '3/11/1997', 2, 4.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10468, 'KOENE', 3, '3/7/1997', '4/4/1997', '3/12/1997', 3, 44.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10469, 'WHITC', 1, '3/10/1997', '4/7/1997', '3/14/1997', 1, 60.18, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10470, 'BONAP', 4, '3/11/1997', '4/8/1997', '3/14/1997', 2, 64.56, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10471, 'BSBEV', 2, '3/11/1997', '4/8/1997', '3/18/1997', 3, 45.59, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10472, 'SEVES', 8, '3/12/1997', '4/9/1997', '3/19/1997', 1, 4.2, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10473, 'ISLAT', 1, '3/13/1997', '3/27/1997', '3/21/1997', 3, 16.37, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10474, 'PERIC', 5, '3/13/1997', '4/10/1997', '3/21/1997', 2, 83.49, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10475, 'SUPRD', 9, '3/14/1997', '4/11/1997', '4/4/1997', 1, 68.52, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10476, 'HILAA', 8, '3/17/1997', '4/14/1997', '3/24/1997', 3, 4.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10477, 'PRINI', 5, '3/17/1997', '4/14/1997', '3/25/1997', 2, 13.02, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10478, 'VICTE', 2, '3/18/1997', '4/1/1997', '3/26/1997', 3, 4.81, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10479, 'RATTC', 3, '3/19/1997', '4/16/1997', '3/21/1997', 3, 708.95, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10480, 'FOLIG', 6, '3/20/1997', '4/17/1997', '3/24/1997', 2, 1.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10481, 'RICAR', 8, '3/20/1997', '4/17/1997', '3/25/1997', 2, 64.33, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10482, 'LAZYK', 1, '3/21/1997', '4/18/1997', '4/10/1997', 3, 7.48, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10483, 'WHITC', 7, '3/24/1997', '4/21/1997', '4/25/1997', 2, 15.28, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10484, 'BSBEV', 3, '3/24/1997', '4/21/1997', '4/1/1997', 3, 6.88, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10485, 'LINOD', 4, '3/25/1997', '4/8/1997', '3/31/1997', 2, 64.45, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10486, 'HILAA', 1, '3/26/1997', '4/23/1997', '4/2/1997', 2, 30.53, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10487, 'QUEEN', 2, '3/26/1997', '4/23/1997', '3/28/1997', 2, 71.07, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10488, 'FRANK', 8, '3/27/1997', '4/24/1997', '4/2/1997', 2, 4.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10489, 'PICCO', 6, '3/28/1997', '4/25/1997', '4/9/1997', 2, 5.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10490, 'HILAA', 7, '3/31/1997', '4/28/1997', '4/3/1997', 2, 210.19, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10491, 'FURIB', 8, '3/31/1997', '4/28/1997', '4/8/1997', 3, 16.96, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10492, 'BOTTM', 3, '4/1/1997', '4/29/1997', '4/11/1997', 1, 62.89, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10493, 'LAMAI', 4, '4/2/1997', '4/30/1997', '4/10/1997', 3, 10.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10494, 'COMMI', 4, '4/2/1997', '4/30/1997', '4/9/1997', 2, 65.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10495, 'LAUGB', 3, '4/3/1997', '5/1/1997', '4/11/1997', 3, 4.65, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10496, 'TRADH', 7, '4/4/1997', '5/2/1997', '4/7/1997', 2, 46.77, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10497, 'LEHMS', 7, '4/4/1997', '5/2/1997', '4/7/1997', 1, 36.21, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10498, 'HILAA', 8, '4/7/1997', '5/5/1997', '4/11/1997', 2, 29.75, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10499, 'LILAS', 4, '4/8/1997', '5/6/1997', '4/16/1997', 2, 102.02, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10500, 'LAMAI', 6, '4/9/1997', '5/7/1997', '4/17/1997', 1, 42.68, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10501, 'BLAUS', 9, '4/9/1997', '5/7/1997', '4/16/1997', 3, 8.85, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10502, 'PERIC', 2, '4/10/1997', '5/8/1997', '4/29/1997', 1, 69.32, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10503, 'HUNGO', 6, '4/11/1997', '5/9/1997', '4/16/1997', 2, 16.74, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10504, 'WHITC', 4, '4/11/1997', '5/9/1997', '4/18/1997', 3, 59.13, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10505, 'MEREP', 3, '4/14/1997', '5/12/1997', '4/21/1997', 3, 7.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10506, 'KOENE', 9, '4/15/1997', '5/13/1997', '5/2/1997', 2, 21.19, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10507, 'ANTON', 7, '4/15/1997', '5/13/1997', '4/22/1997', 1, 47.45, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10508, 'OTTIK', 1, '4/16/1997', '5/14/1997', '5/13/1997', 2, 4.99, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10509, 'BLAUS', 4, '4/17/1997', '5/15/1997', '4/29/1997', 1, 0.15, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10510, 'SAVEA', 6, '4/18/1997', '5/16/1997', '4/28/1997', 3, 367.63, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10511, 'BONAP', 4, '4/18/1997', '5/16/1997', '4/21/1997', 3, 350.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10512, 'FAMIA', 7, '4/21/1997', '5/19/1997', '4/24/1997', 2, 3.53, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10513, 'WANDK', 7, '4/22/1997', '6/3/1997', '4/28/1997', 1, 105.65, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10514, 'ERNSH', 3, '4/22/1997', '5/20/1997', '5/16/1997', 2, 789.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10515, 'QUICK', 2, '4/23/1997', '5/7/1997', '5/23/1997', 1, 204.47, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10516, 'HUNGO', 2, '4/24/1997', '5/22/1997', '5/1/1997', 3, 62.78, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10517, 'NORTS', 3, '4/24/1997', '5/22/1997', '4/29/1997', 3, 32.07, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10518, 'TORTU', 4, '4/25/1997', '5/9/1997', '5/5/1997', 2, 218.15, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10519, 'CHOPS', 6, '4/28/1997', '5/26/1997', '5/1/1997', 3, 91.76, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10520, 'SANTG', 7, '4/29/1997', '5/27/1997', '5/1/1997', 1, 13.37, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10521, 'CACTU', 8, '4/29/1997', '5/27/1997', '5/2/1997', 2, 17.22, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10522, 'LEHMS', 4, '4/30/1997', '5/28/1997', '5/6/1997', 1, 45.33, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10523, 'SEVES', 7, '5/1/1997', '5/29/1997', '5/30/1997', 2, 77.63, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10524, 'BERGS', 1, '5/1/1997', '5/29/1997', '5/7/1997', 2, 244.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10525, 'BONAP', 1, '5/2/1997', '5/30/1997', '5/23/1997', 2, 11.06, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10526, 'WARTH', 4, '5/5/1997', '6/2/1997', '5/15/1997', 2, 58.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10527, 'QUICK', 7, '5/5/1997', '6/2/1997', '5/7/1997', 1, 41.9, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10528, 'GREAL', 6, '5/6/1997', '5/20/1997', '5/9/1997', 2, 3.35, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10529, 'MAISD', 5, '5/7/1997', '6/4/1997', '5/9/1997', 2, 66.69, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10530, 'PICCO', 3, '5/8/1997', '6/5/1997', '5/12/1997', 2, 339.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10531, 'OCEAN', 7, '5/8/1997', '6/5/1997', '5/19/1997', 1, 8.12, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10532, 'EASTC', 7, '5/9/1997', '6/6/1997', '5/12/1997', 3, 74.46, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10533, 'FOLKO', 8, '5/12/1997', '6/9/1997', '5/22/1997', 1, 188.04, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10534, 'LEHMS', 8, '5/12/1997', '6/9/1997', '5/14/1997', 2, 27.94, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10535, 'ANTON', 4, '5/13/1997', '6/10/1997', '5/21/1997', 1, 15.64, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10536, 'LEHMS', 3, '5/14/1997', '6/11/1997', '6/6/1997', 2, 58.88, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10537, 'RICSU', 1, '5/14/1997', '5/28/1997', '5/19/1997', 1, 78.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10538, 'BSBEV', 9, '5/15/1997', '6/12/1997', '5/16/1997', 3, 4.87, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10539, 'BSBEV', 6, '5/16/1997', '6/13/1997', '5/23/1997', 3, 12.36, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10540, 'QUICK', 3, '5/19/1997', '6/16/1997', '6/13/1997', 3, 1007.64, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10541, 'HANAR', 2, '5/19/1997', '6/16/1997', '5/29/1997', 1, 68.65, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10542, 'KOENE', 1, '5/20/1997', '6/17/1997', '5/26/1997', 3, 10.95, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10543, 'LILAS', 8, '5/21/1997', '6/18/1997', '5/23/1997', 2, 48.17, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10544, 'LONEP', 4, '5/21/1997', '6/18/1997', '5/30/1997', 1, 24.91, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10545, 'LAZYK', 8, '5/22/1997', '6/19/1997', '6/26/1997', 2, 11.92, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10546, 'VICTE', 1, '5/23/1997', '6/20/1997', '5/27/1997', 3, 194.72, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10547, 'SEVES', 3, '5/23/1997', '6/20/1997', '6/2/1997', 2, 178.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10548, 'TOMSP', 3, '5/26/1997', '6/23/1997', '6/2/1997', 2, 1.43, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10549, 'QUICK', 5, '5/27/1997', '6/10/1997', '5/30/1997', 1, 171.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10550, 'GODOS', 7, '5/28/1997', '6/25/1997', '6/6/1997', 3, 4.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10551, 'FURIB', 4, '5/28/1997', '7/9/1997', '6/6/1997', 3, 72.95, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10552, 'HILAA', 2, '5/29/1997', '6/26/1997', '6/5/1997', 1, 83.22, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10553, 'WARTH', 2, '5/30/1997', '6/27/1997', '6/3/1997', 2, 149.49, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10554, 'OTTIK', 4, '5/30/1997', '6/27/1997', '6/5/1997', 3, 120.97, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10555, 'SAVEA', 6, '6/2/1997', '6/30/1997', '6/4/1997', 3, 252.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10556, 'SIMOB', 2, '6/3/1997', '7/15/1997', '6/13/1997', 1, 9.8, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10557, 'LEHMS', 9, '6/3/1997', '6/17/1997', '6/6/1997', 2, 96.72, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10558, 'AROUT', 1, '6/4/1997', '7/2/1997', '6/10/1997', 2, 72.97, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10559, 'BLONP', 6, '6/5/1997', '7/3/1997', '6/13/1997', 1, 8.05, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10560, 'FRANK', 8, '6/6/1997', '7/4/1997', '6/9/1997', 1, 36.65, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10561, 'FOLKO', 2, '6/6/1997', '7/4/1997', '6/9/1997', 2, 242.21, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10562, 'REGGC', 1, '6/9/1997', '7/7/1997', '6/12/1997', 1, 22.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10563, 'RICAR', 2, '6/10/1997', '7/22/1997', '6/24/1997', 2, 60.43, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10564, 'RATTC', 4, '6/10/1997', '7/8/1997', '6/16/1997', 3, 13.75, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10565, 'MEREP', 8, '6/11/1997', '7/9/1997', '6/18/1997', 2, 7.15, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10566, 'BLONP', 9, '6/12/1997', '7/10/1997', '6/18/1997', 1, 88.4, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10567, 'HUNGO', 1, '6/12/1997', '7/10/1997', '6/17/1997', 1, 33.97, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10568, 'GALED', 3, '6/13/1997', '7/11/1997', '7/9/1997', 3, 6.54, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10569, 'RATTC', 5, '6/16/1997', '7/14/1997', '7/11/1997', 1, 58.98, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10570, 'MEREP', 3, '6/17/1997', '7/15/1997', '6/19/1997', 3, 188.99, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10571, 'ERNSH', 8, '6/17/1997', '7/29/1997', '7/4/1997', 3, 26.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10572, 'BERGS', 3, '6/18/1997', '7/16/1997', '6/25/1997', 2, 116.43, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10573, 'ANTON', 7, '6/19/1997', '7/17/1997', '6/20/1997', 3, 84.84, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10574, 'TRAIH', 4, '6/19/1997', '7/17/1997', '6/30/1997', 2, 37.6, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10575, 'MORGK', 5, '6/20/1997', '7/4/1997', '6/30/1997', 1, 127.34, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10576, 'TORTU', 3, '6/23/1997', '7/7/1997', '6/30/1997', 3, 18.56, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10577, 'TRAIH', 9, '6/23/1997', '8/4/1997', '6/30/1997', 2, 25.41, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10578, 'BSBEV', 4, '6/24/1997', '7/22/1997', '7/25/1997', 3, 29.6, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10579, 'LETSS', 1, '6/25/1997', '7/23/1997', '7/4/1997', 2, 13.73, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10580, 'OTTIK', 4, '6/26/1997', '7/24/1997', '7/1/1997', 3, 75.89, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10581, 'FAMIA', 3, '6/26/1997', '7/24/1997', '7/2/1997', 1, 3.01, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10582, 'BLAUS', 3, '6/27/1997', '7/25/1997', '7/14/1997', 2, 27.71, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10583, 'WARTH', 2, '6/30/1997', '7/28/1997', '7/4/1997', 2, 7.28, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10584, 'BLONP', 4, '6/30/1997', '7/28/1997', '7/4/1997', 1, 59.14, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10585, 'WELLI', 7, '7/1/1997', '7/29/1997', '7/10/1997', 1, 13.41, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10586, 'REGGC', 9, '7/2/1997', '7/30/1997', '7/9/1997', 1, 0.48, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10587, 'QUEDE', 1, '7/2/1997', '7/30/1997', '7/9/1997', 1, 62.52, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10588, 'QUICK', 2, '7/3/1997', '7/31/1997', '7/10/1997', 3, 194.67, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10589, 'GREAL', 8, '7/4/1997', '8/1/1997', '7/14/1997', 2, 4.42, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10590, 'MEREP', 4, '7/7/1997', '8/4/1997', '7/14/1997', 3, 44.77, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10591, 'VAFFE', 1, '7/7/1997', '7/21/1997', '7/16/1997', 1, 55.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10592, 'LEHMS', 3, '7/8/1997', '8/5/1997', '7/16/1997', 1, 32.1, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10593, 'LEHMS', 7, '7/9/1997', '8/6/1997', '8/13/1997', 2, 174.2, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10594, 'OLDWO', 3, '7/9/1997', '8/6/1997', '7/16/1997', 2, 5.24, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10595, 'ERNSH', 2, '7/10/1997', '8/7/1997', '7/14/1997', 1, 96.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10596, 'WHITC', 8, '7/11/1997', '8/8/1997', '8/12/1997', 1, 16.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10597, 'PICCO', 7, '7/11/1997', '8/8/1997', '7/18/1997', 3, 35.12, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10598, 'RATTC', 1, '7/14/1997', '8/11/1997', '7/18/1997', 3, 44.42, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10599, 'BSBEV', 6, '7/15/1997', '8/26/1997', '7/21/1997', 3, 29.98, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10600, 'HUNGC', 4, '7/16/1997', '8/13/1997', '7/21/1997', 1, 45.13, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10601, 'HILAA', 7, '7/16/1997', '8/27/1997', '7/22/1997', 1, 58.3, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10602, 'VAFFE', 8, '7/17/1997', '8/14/1997', '7/22/1997', 2, 2.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10603, 'SAVEA', 8, '7/18/1997', '8/15/1997', '8/8/1997', 2, 48.77, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10604, 'FURIB', 1, '7/18/1997', '8/15/1997', '7/29/1997', 1, 7.46, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10605, 'MEREP', 1, '7/21/1997', '8/18/1997', '7/29/1997', 2, 379.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10606, 'TRADH', 4, '7/22/1997', '8/19/1997', '7/31/1997', 3, 79.4, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10607, 'SAVEA', 5, '7/22/1997', '8/19/1997', '7/25/1997', 1, 200.24, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10608, 'TOMSP', 4, '7/23/1997', '8/20/1997', '8/1/1997', 2, 27.79, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10609, 'DUMON', 7, '7/24/1997', '8/21/1997', '7/30/1997', 2, 1.85, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10610, 'LAMAI', 8, '7/25/1997', '8/22/1997', '8/6/1997', 1, 26.78, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10611, 'WOLZA', 6, '7/25/1997', '8/22/1997', '8/1/1997', 2, 80.65, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10612, 'SAVEA', 1, '7/28/1997', '8/25/1997', '8/1/1997', 2, 544.08, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10613, 'HILAA', 4, '7/29/1997', '8/26/1997', '8/1/1997', 2, 8.11, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10614, 'BLAUS', 8, '7/29/1997', '8/26/1997', '8/1/1997', 3, 1.93, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10615, 'WILMK', 2, '7/30/1997', '8/27/1997', '8/6/1997', 3, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10616, 'GREAL', 1, '7/31/1997', '8/28/1997', '8/5/1997', 2, 116.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10617, 'GREAL', 4, '7/31/1997', '8/28/1997', '8/4/1997', 2, 18.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10618, 'MEREP', 1, '8/1/1997', '9/12/1997', '8/8/1997', 1, 154.68, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10619, 'MEREP', 3, '8/4/1997', '9/1/1997', '8/7/1997', 3, 91.05, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10620, 'LAUGB', 2, '8/5/1997', '9/2/1997', '8/14/1997', 3, 0.94, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10621, 'ISLAT', 4, '8/5/1997', '9/2/1997', '8/11/1997', 2, 23.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10622, 'RICAR', 4, '8/6/1997', '9/3/1997', '8/11/1997', 3, 50.97, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10623, 'FRANK', 8, '8/7/1997', '9/4/1997', '8/12/1997', 2, 97.18, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10624, 'THECR', 4, '8/7/1997', '9/4/1997', '8/19/1997', 2, 94.8, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10625, 'ANATR', 3, '8/8/1997', '9/5/1997', '8/14/1997', 1, 43.9, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10626, 'BERGS', 1, '8/11/1997', '9/8/1997', '8/20/1997', 2, 138.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10627, 'SAVEA', 8, '8/11/1997', '9/22/1997', '8/21/1997', 3, 107.46, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10628, 'BLONP', 4, '8/12/1997', '9/9/1997', '8/20/1997', 3, 30.36, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10629, 'GODOS', 4, '8/12/1997', '9/9/1997', '8/20/1997', 3, 85.46, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10630, 'KOENE', 1, '8/13/1997', '9/10/1997', '8/19/1997', 2, 32.35, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10631, 'LAMAI', 8, '8/14/1997', '9/11/1997', '8/15/1997', 1, 0.87, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10632, 'WANDK', 8, '8/14/1997', '9/11/1997', '8/19/1997', 1, 41.38, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10633, 'ERNSH', 7, '8/15/1997', '9/12/1997', '8/18/1997', 3, 477.9, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10634, 'FOLIG', 4, '8/15/1997', '9/12/1997', '8/21/1997', 3, 487.38, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10635, 'MAGAA', 8, '8/18/1997', '9/15/1997', '8/21/1997', 3, 47.46, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10636, 'WARTH', 4, '8/19/1997', '9/16/1997', '8/26/1997', 1, 1.15, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10637, 'QUEEN', 6, '8/19/1997', '9/16/1997', '8/26/1997', 1, 201.29, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10638, 'LINOD', 3, '8/20/1997', '9/17/1997', '9/1/1997', 1, 158.44, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10639, 'SANTG', 7, '8/20/1997', '9/17/1997', '8/27/1997', 3, 38.64, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10640, 'WANDK', 4, '8/21/1997', '9/18/1997', '8/28/1997', 1, 23.55, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10641, 'HILAA', 4, '8/22/1997', '9/19/1997', '8/26/1997', 2, 179.61, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10642, 'SIMOB', 7, '8/22/1997', '9/19/1997', '9/5/1997', 3, 41.89, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10643, 'ALFKI', 6, '8/25/1997', '9/22/1997', '9/2/1997', 1, 29.46, 'Alfreds Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10644, 'WELLI', 3, '8/25/1997', '9/22/1997', '9/1/1997', 2, 0.14, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10645, 'HANAR', 4, '8/26/1997', '9/23/1997', '9/2/1997', 1, 12.41, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10646, 'HUNGO', 9, '8/27/1997', '10/8/1997', '9/3/1997', 3, 142.33, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10647, 'QUEDE', 4, '8/27/1997', '9/10/1997', '9/3/1997', 2, 45.54, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10648, 'RICAR', 5, '8/28/1997', '10/9/1997', '9/9/1997', 2, 14.25, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10649, 'MAISD', 5, '8/28/1997', '9/25/1997', '8/29/1997', 3, 6.2, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10650, 'FAMIA', 5, '8/29/1997', '9/26/1997', '9/3/1997', 3, 176.81, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10651, 'WANDK', 8, '9/1/1997', '9/29/1997', '9/11/1997', 2, 20.6, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10652, 'GOURL', 4, '9/1/1997', '9/29/1997', '9/8/1997', 2, 7.14, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10653, 'FRANK', 1, '9/2/1997', '9/30/1997', '9/19/1997', 1, 93.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10654, 'BERGS', 5, '9/2/1997', '9/30/1997', '9/11/1997', 1, 55.26, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10655, 'REGGC', 1, '9/3/1997', '10/1/1997', '9/11/1997', 2, 4.41, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10656, 'GREAL', 6, '9/4/1997', '10/2/1997', '9/10/1997', 1, 57.15, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10657, 'SAVEA', 2, '9/4/1997', '10/2/1997', '9/15/1997', 2, 352.69, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10658, 'QUICK', 4, '9/5/1997', '10/3/1997', '9/8/1997', 1, 364.15, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10659, 'QUEEN', 7, '9/5/1997', '10/3/1997', '9/10/1997', 2, 105.81, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10660, 'HUNGC', 8, '9/8/1997', '10/6/1997', '10/15/1997', 1, 111.29, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10661, 'HUNGO', 7, '9/9/1997', '10/7/1997', '9/15/1997', 3, 17.55, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10662, 'LONEP', 3, '9/9/1997', '10/7/1997', '9/18/1997', 2, 1.28, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10663, 'BONAP', 2, '9/10/1997', '9/24/1997', '10/3/1997', 2, 113.15, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10664, 'FURIB', 1, '9/10/1997', '10/8/1997', '9/19/1997', 3, 1.27, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10665, 'LONEP', 1, '9/11/1997', '10/9/1997', '9/17/1997', 2, 26.31, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10666, 'RICSU', 7, '9/12/1997', '10/10/1997', '9/22/1997', 2, 232.42, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10667, 'ERNSH', 7, '9/12/1997', '10/10/1997', '9/19/1997', 1, 78.09, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10668, 'WANDK', 1, '9/15/1997', '10/13/1997', '9/23/1997', 2, 47.22, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10669, 'SIMOB', 2, '9/15/1997', '10/13/1997', '9/22/1997', 1, 24.39, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10670, 'FRANK', 4, '9/16/1997', '10/14/1997', '9/18/1997', 1, 203.48, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10671, 'FRANR', 1, '9/17/1997', '10/15/1997', '9/24/1997', 1, 30.34, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10672, 'BERGS', 9, '9/17/1997', '10/1/1997', '9/26/1997', 2, 95.75, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10673, 'WILMK', 2, '9/18/1997', '10/16/1997', '9/19/1997', 1, 22.76, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10674, 'ISLAT', 4, '9/18/1997', '10/16/1997', '9/30/1997', 2, 0.9, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10675, 'FRANK', 5, '9/19/1997', '10/17/1997', '9/23/1997', 2, 31.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10676, 'TORTU', 2, '9/22/1997', '10/20/1997', '9/29/1997', 2, 2.01, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10677, 'ANTON', 1, '9/22/1997', '10/20/1997', '9/26/1997', 3, 4.03, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10678, 'SAVEA', 7, '9/23/1997', '10/21/1997', '10/16/1997', 3, 388.98, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10679, 'BLONP', 8, '9/23/1997', '10/21/1997', '9/30/1997', 3, 27.94, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10680, 'OLDWO', 1, '9/24/1997', '10/22/1997', '9/26/1997', 1, 26.61, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10681, 'GREAL', 3, '9/25/1997', '10/23/1997', '9/30/1997', 3, 76.13, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10682, 'ANTON', 3, '9/25/1997', '10/23/1997', '10/1/1997', 2, 36.13, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10683, 'DUMON', 2, '9/26/1997', '10/24/1997', '10/1/1997', 1, 4.4, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10684, 'OTTIK', 3, '9/26/1997', '10/24/1997', '9/30/1997', 1, 145.63, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10685, 'GOURL', 4, '9/29/1997', '10/13/1997', '10/3/1997', 2, 33.75, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10686, 'PICCO', 2, '9/30/1997', '10/28/1997', '10/8/1997', 1, 96.5, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10687, 'HUNGO', 9, '9/30/1997', '10/28/1997', '10/30/1997', 2, 296.43, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10688, 'VAFFE', 4, '10/1/1997', '10/15/1997', '10/7/1997', 2, 299.09, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10689, 'BERGS', 1, '10/1/1997', '10/29/1997', '10/7/1997', 2, 13.42, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10690, 'HANAR', 1, '10/2/1997', '10/30/1997', '10/3/1997', 1, 15.8, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10691, 'QUICK', 2, '10/3/1997', '11/14/1997', '10/22/1997', 2, 810.05, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10692, 'ALFKI', 4, '10/3/1997', '10/31/1997', '10/13/1997', 2, 61.02, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10693, 'WHITC', 3, '10/6/1997', '10/20/1997', '10/10/1997', 3, 139.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10694, 'QUICK', 8, '10/6/1997', '11/3/1997', '10/9/1997', 3, 398.36, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10695, 'WILMK', 7, '10/7/1997', '11/18/1997', '10/14/1997', 1, 16.72, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10696, 'WHITC', 8, '10/8/1997', '11/19/1997', '10/14/1997', 3, 102.55, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10697, 'LINOD', 3, '10/8/1997', '11/5/1997', '10/14/1997', 1, 45.52, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10698, 'ERNSH', 4, '10/9/1997', '11/6/1997', '10/17/1997', 1, 272.47, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10699, 'MORGK', 3, '10/9/1997', '11/6/1997', '10/13/1997', 3, 0.58, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10700, 'SAVEA', 3, '10/10/1997', '11/7/1997', '10/16/1997', 1, 65.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10701, 'HUNGO', 6, '10/13/1997', '10/27/1997', '10/15/1997', 3, 220.31, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10702, 'ALFKI', 4, '10/13/1997', '11/24/1997', '10/21/1997', 1, 23.94, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10703, 'FOLKO', 6, '10/14/1997', '11/11/1997', '10/20/1997', 2, 152.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10704, 'QUEEN', 6, '10/14/1997', '11/11/1997', '11/7/1997', 1, 4.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10705, 'HILAA', 9, '10/15/1997', '11/12/1997', '11/18/1997', 2, 3.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10706, 'OLDWO', 8, '10/16/1997', '11/13/1997', '10/21/1997', 3, 135.63, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10707, 'AROUT', 4, '10/16/1997', '10/30/1997', '10/23/1997', 3, 21.74, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10708, 'THEBI', 6, '10/17/1997', '11/28/1997', '11/5/1997', 2, 2.96, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10709, 'GOURL', 1, '10/17/1997', '11/14/1997', '11/20/1997', 3, 210.8, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10710, 'FRANS', 1, '10/20/1997', '11/17/1997', '10/23/1997', 1, 4.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10711, 'SAVEA', 5, '10/21/1997', '12/2/1997', '10/29/1997', 2, 52.41, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10712, 'HUNGO', 3, '10/21/1997', '11/18/1997', '10/31/1997', 1, 89.93, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10713, 'SAVEA', 1, '10/22/1997', '11/19/1997', '10/24/1997', 1, 167.05, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10714, 'SAVEA', 5, '10/22/1997', '11/19/1997', '10/27/1997', 3, 24.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10715, 'BONAP', 3, '10/23/1997', '11/6/1997', '10/29/1997', 1, 63.2, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10716, 'RANCH', 4, '10/24/1997', '11/21/1997', '10/27/1997', 2, 22.57, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10717, 'FRANK', 1, '10/24/1997', '11/21/1997', '10/29/1997', 2, 59.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10718, 'KOENE', 1, '10/27/1997', '11/24/1997', '10/29/1997', 3, 170.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10719, 'LETSS', 8, '10/27/1997', '11/24/1997', '11/5/1997', 2, 51.44, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10720, 'QUEDE', 8, '10/28/1997', '11/11/1997', '11/5/1997', 2, 9.53, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10721, 'QUICK', 5, '10/29/1997', '11/26/1997', '10/31/1997', 3, 48.92, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10722, 'SAVEA', 8, '10/29/1997', '12/10/1997', '11/4/1997', 1, 74.58, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10723, 'WHITC', 3, '10/30/1997', '11/27/1997', '11/25/1997', 1, 21.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10724, 'MEREP', 8, '10/30/1997', '12/11/1997', '11/5/1997', 2, 57.75, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10725, 'FAMIA', 4, '10/31/1997', '11/28/1997', '11/5/1997', 3, 10.83, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10726, 'EASTC', 4, '11/3/1997', '11/17/1997', '12/5/1997', 1, 16.56, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10727, 'REGGC', 2, '11/3/1997', '12/1/1997', '12/5/1997', 1, 89.9, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10728, 'QUEEN', 4, '11/4/1997', '12/2/1997', '11/11/1997', 2, 58.33, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10729, 'LINOD', 8, '11/4/1997', '12/16/1997', '11/14/1997', 3, 141.06, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10730, 'BONAP', 5, '11/5/1997', '12/3/1997', '11/14/1997', 1, 20.12, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10731, 'CHOPS', 7, '11/6/1997', '12/4/1997', '11/14/1997', 1, 96.65, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10732, 'BONAP', 3, '11/6/1997', '12/4/1997', '11/7/1997', 1, 16.97, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10733, 'BERGS', 1, '11/7/1997', '12/5/1997', '11/10/1997', 3, 110.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10734, 'GOURL', 2, '11/7/1997', '12/5/1997', '11/12/1997', 3, 1.63, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10735, 'LETSS', 6, '11/10/1997', '12/8/1997', '11/21/1997', 2, 45.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10736, 'HUNGO', 9, '11/11/1997', '12/9/1997', '11/21/1997', 2, 44.1, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10737, 'VINET', 2, '11/11/1997', '12/9/1997', '11/18/1997', 2, 7.79, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10738, 'SPECD', 2, '11/12/1997', '12/10/1997', '11/18/1997', 1, 2.91, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10739, 'VINET', 3, '11/12/1997', '12/10/1997', '11/17/1997', 3, 11.08, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10740, 'WHITC', 4, '11/13/1997', '12/11/1997', '11/25/1997', 2, 81.88, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10741, 'AROUT', 4, '11/14/1997', '11/28/1997', '11/18/1997', 3, 10.96, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10742, 'BOTTM', 3, '11/14/1997', '12/12/1997', '11/18/1997', 3, 243.73, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10743, 'AROUT', 1, '11/17/1997', '12/15/1997', '11/21/1997', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10744, 'VAFFE', 6, '11/17/1997', '12/15/1997', '11/24/1997', 1, 69.19, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10745, 'QUICK', 9, '11/18/1997', '12/16/1997', '11/27/1997', 1, 3.52, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10746, 'CHOPS', 1, '11/19/1997', '12/17/1997', '11/21/1997', 3, 31.43, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10747, 'PICCO', 6, '11/19/1997', '12/17/1997', '11/26/1997', 1, 117.33, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10748, 'SAVEA', 3, '11/20/1997', '12/18/1997', '11/28/1997', 1, 232.55, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10749, 'ISLAT', 4, '11/20/1997', '12/18/1997', '12/19/1997', 2, 61.53, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10750, 'WARTH', 9, '11/21/1997', '12/19/1997', '11/24/1997', 1, 79.3, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10751, 'RICSU', 3, '11/24/1997', '12/22/1997', '12/3/1997', 3, 130.79, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10752, 'NORTS', 2, '11/24/1997', '12/22/1997', '11/28/1997', 3, 1.39, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10753, 'FRANS', 3, '11/25/1997', '12/23/1997', '11/27/1997', 1, 7.7, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10754, 'MAGAA', 6, '11/25/1997', '12/23/1997', '11/27/1997', 3, 2.38, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10755, 'BONAP', 4, '11/26/1997', '12/24/1997', '11/28/1997', 2, 16.71, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10756, 'SPLIR', 8, '11/27/1997', '12/25/1997', '12/2/1997', 2, 73.21, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10757, 'SAVEA', 6, '11/27/1997', '12/25/1997', '12/15/1997', 1, 8.19, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10758, 'RICSU', 3, '11/28/1997', '12/26/1997', '12/4/1997', 3, 138.17, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10759, 'ANATR', 3, '11/28/1997', '12/26/1997', '12/12/1997', 3, 11.99, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10760, 'MAISD', 4, '12/1/1997', '12/29/1997', '12/10/1997', 1, 155.64, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10761, 'RATTC', 5, '12/2/1997', '12/30/1997', '12/8/1997', 2, 18.66, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10762, 'FOLKO', 3, '12/2/1997', '12/30/1997', '12/9/1997', 1, 328.74, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10763, 'FOLIG', 3, '12/3/1997', '12/31/1997', '12/8/1997', 3, 37.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10764, 'ERNSH', 6, '12/3/1997', '12/31/1997', '12/8/1997', 3, 145.45, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10765, 'QUICK', 3, '12/4/1997', '1/1/1998', '12/9/1997', 3, 42.74, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10766, 'OTTIK', 4, '12/5/1997', '1/2/1998', '12/9/1997', 1, 157.55, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10767, 'SUPRD', 4, '12/5/1997', '1/2/1998', '12/15/1997', 3, 1.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10768, 'AROUT', 3, '12/8/1997', '1/5/1998', '12/15/1997', 2, 146.32, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10769, 'VAFFE', 3, '12/8/1997', '1/5/1998', '12/12/1997', 1, 65.06, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10770, 'HANAR', 8, '12/9/1997', '1/6/1998', '12/17/1997', 3, 5.32, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10771, 'ERNSH', 9, '12/10/1997', '1/7/1998', '1/2/1998', 2, 11.19, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10772, 'LEHMS', 3, '12/10/1997', '1/7/1998', '12/19/1997', 2, 91.28, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10773, 'ERNSH', 1, '12/11/1997', '1/8/1998', '12/16/1997', 3, 96.43, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10774, 'FOLKO', 4, '12/11/1997', '12/25/1997', '12/12/1997', 1, 48.2, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10775, 'THECR', 7, '12/12/1997', '1/9/1998', '12/26/1997', 1, 20.25, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10776, 'ERNSH', 1, '12/15/1997', '1/12/1998', '12/18/1997', 3, 351.53, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10777, 'GOURL', 7, '12/15/1997', '12/29/1997', '1/21/1998', 2, 3.01, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10778, 'BERGS', 3, '12/16/1997', '1/13/1998', '12/24/1997', 1, 6.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10779, 'MORGK', 3, '12/16/1997', '1/13/1998', '1/14/1998', 2, 58.13, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10780, 'LILAS', 2, '12/16/1997', '12/30/1997', '12/25/1997', 1, 42.13, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10781, 'WARTH', 2, '12/17/1997', '1/14/1998', '12/19/1997', 3, 73.16, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10782, 'CACTU', 9, '12/17/1997', '1/14/1998', '12/22/1997', 3, 1.1, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10783, 'HANAR', 4, '12/18/1997', '1/15/1998', '12/19/1997', 2, 124.98, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10784, 'MAGAA', 4, '12/18/1997', '1/15/1998', '12/22/1997', 3, 70.09, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10785, 'GROSR', 1, '12/18/1997', '1/15/1998', '12/24/1997', 3, 1.51, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10786, 'QUEEN', 8, '12/19/1997', '1/16/1998', '12/23/1997', 1, 110.87, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10787, 'LAMAI', 2, '12/19/1997', '1/2/1998', '12/26/1997', 1, 249.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10788, 'QUICK', 1, '12/22/1997', '1/19/1998', '1/19/1998', 2, 42.7, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10789, 'FOLIG', 1, '12/22/1997', '1/19/1998', '12/31/1997', 2, 100.6, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10790, 'GOURL', 6, '12/22/1997', '1/19/1998', '12/26/1997', 1, 28.23, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10791, 'FRANK', 6, '12/23/1997', '1/20/1998', '1/1/1998', 2, 16.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10792, 'WOLZA', 1, '12/23/1997', '1/20/1998', '12/31/1997', 3, 23.79, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10793, 'AROUT', 3, '12/24/1997', '1/21/1998', '1/8/1998', 3, 4.52, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10794, 'QUEDE', 6, '12/24/1997', '1/21/1998', '1/2/1998', 1, 21.49, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10795, 'ERNSH', 8, '12/24/1997', '1/21/1998', '1/20/1998', 2, 126.66, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10796, 'HILAA', 3, '12/25/1997', '1/22/1998', '1/14/1998', 1, 26.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10797, 'DRACD', 7, '12/25/1997', '1/22/1998', '1/5/1998', 2, 33.35, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10798, 'ISLAT', 2, '12/26/1997', '1/23/1998', '1/5/1998', 1, 2.33, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10799, 'KOENE', 9, '12/26/1997', '2/6/1998', '1/5/1998', 3, 30.76, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10800, 'SEVES', 1, '12/26/1997', '1/23/1998', '1/5/1998', 3, 137.44, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10801, 'BOLID', 4, '12/29/1997', '1/26/1998', '12/31/1997', 2, 97.09, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10802, 'SIMOB', 4, '12/29/1997', '1/26/1998', '1/2/1998', 2, 257.26, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10803, 'WELLI', 4, '12/30/1997', '1/27/1998', '1/6/1998', 1, 55.23, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10804, 'SEVES', 6, '12/30/1997', '1/27/1998', '1/7/1998', 2, 27.33, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10805, 'THEBI', 2, '12/30/1997', '1/27/1998', '1/9/1998', 3, 237.34, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10806, 'VICTE', 3, '12/31/1997', '1/28/1998', '1/5/1998', 2, 22.11, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10807, 'FRANS', 4, '12/31/1997', '1/28/1998', '1/30/1998', 1, 1.36, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10808, 'OLDWO', 2, '1/1/1998', '1/29/1998', '1/9/1998', 3, 45.53, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10809, 'WELLI', 7, '1/1/1998', '1/29/1998', '1/7/1998', 1, 4.87, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10810, 'LAUGB', 2, '1/1/1998', '1/29/1998', '1/7/1998', 3, 4.33, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10811, 'LINOD', 8, '1/2/1998', '1/30/1998', '1/8/1998', 1, 31.22, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10812, 'REGGC', 5, '1/2/1998', '1/30/1998', '1/12/1998', 1, 59.78, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10813, 'RICAR', 1, '1/5/1998', '2/2/1998', '1/9/1998', 1, 47.38, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10814, 'VICTE', 3, '1/5/1998', '2/2/1998', '1/14/1998', 3, 130.94, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10815, 'SAVEA', 2, '1/5/1998', '2/2/1998', '1/14/1998', 3, 14.62, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10816, 'GREAL', 4, '1/6/1998', '2/3/1998', '2/4/1998', 2, 719.78, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10817, 'KOENE', 3, '1/6/1998', '1/20/1998', '1/13/1998', 2, 306.07, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10818, 'MAGAA', 7, '1/7/1998', '2/4/1998', '1/12/1998', 3, 65.48, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10819, 'CACTU', 2, '1/7/1998', '2/4/1998', '1/16/1998', 3, 19.76, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10820, 'RATTC', 3, '1/7/1998', '2/4/1998', '1/13/1998', 2, 37.52, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10821, 'SPLIR', 1, '1/8/1998', '2/5/1998', '1/15/1998', 1, 36.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10822, 'TRAIH', 6, '1/8/1998', '2/5/1998', '1/16/1998', 3, 7, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10823, 'LILAS', 5, '1/9/1998', '2/6/1998', '1/13/1998', 2, 163.97, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10824, 'FOLKO', 8, '1/9/1998', '2/6/1998', '1/30/1998', 1, 1.23, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10825, 'DRACD', 1, '1/9/1998', '2/6/1998', '1/14/1998', 1, 79.25, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10826, 'BLONP', 6, '1/12/1998', '2/9/1998', '2/6/1998', 1, 7.09, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10827, 'BONAP', 1, '1/12/1998', '1/26/1998', '2/6/1998', 2, 63.54, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10828, 'RANCH', 9, '1/13/1998', '1/27/1998', '2/4/1998', 1, 90.85, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10829, 'ISLAT', 9, '1/13/1998', '2/10/1998', '1/23/1998', 1, 154.72, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10830, 'TRADH', 4, '1/13/1998', '2/24/1998', '1/21/1998', 2, 81.83, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10831, 'SANTG', 3, '1/14/1998', '2/11/1998', '1/23/1998', 2, 72.19, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10832, 'LAMAI', 2, '1/14/1998', '2/11/1998', '1/19/1998', 2, 43.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10833, 'OTTIK', 6, '1/15/1998', '2/12/1998', '1/23/1998', 2, 71.49, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10834, 'TRADH', 1, '1/15/1998', '2/12/1998', '1/19/1998', 3, 29.78, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10835, 'ALFKI', 1, '1/15/1998', '2/12/1998', '1/21/1998', 3, 69.53, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10836, 'ERNSH', 7, '1/16/1998', '2/13/1998', '1/21/1998', 1, 411.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10837, 'BERGS', 9, '1/16/1998', '2/13/1998', '1/23/1998', 3, 13.32, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10838, 'LINOD', 3, '1/19/1998', '2/16/1998', '1/23/1998', 3, 59.28, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10839, 'TRADH', 3, '1/19/1998', '2/16/1998', '1/22/1998', 3, 35.43, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10840, 'LINOD', 4, '1/19/1998', '3/2/1998', '2/16/1998', 2, 2.71, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10841, 'SUPRD', 5, '1/20/1998', '2/17/1998', '1/29/1998', 2, 424.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10842, 'TORTU', 1, '1/20/1998', '2/17/1998', '1/29/1998', 3, 54.42, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10843, 'VICTE', 4, '1/21/1998', '2/18/1998', '1/26/1998', 2, 9.26, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10844, 'PICCO', 8, '1/21/1998', '2/18/1998', '1/26/1998', 2, 25.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10845, 'QUICK', 8, '1/21/1998', '2/4/1998', '1/30/1998', 1, 212.98, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10846, 'SUPRD', 2, '1/22/1998', '3/5/1998', '1/23/1998', 3, 56.46, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10847, 'SAVEA', 4, '1/22/1998', '2/5/1998', '2/10/1998', 3, 487.57, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10848, 'CONSH', 7, '1/23/1998', '2/20/1998', '1/29/1998', 2, 38.24, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10849, 'KOENE', 9, '1/23/1998', '2/20/1998', '1/30/1998', 2, 0.56, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10850, 'VICTE', 1, '1/23/1998', '3/6/1998', '1/30/1998', 1, 49.19, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10851, 'RICAR', 5, '1/26/1998', '2/23/1998', '2/2/1998', 1, 160.55, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10852, 'RATTC', 8, '1/26/1998', '2/9/1998', '1/30/1998', 1, 174.05, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10853, 'BLAUS', 9, '1/27/1998', '2/24/1998', '2/3/1998', 2, 53.83, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10854, 'ERNSH', 3, '1/27/1998', '2/24/1998', '2/5/1998', 2, 100.22, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10855, 'OLDWO', 3, '1/27/1998', '2/24/1998', '2/4/1998', 1, 170.97, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10856, 'ANTON', 3, '1/28/1998', '2/25/1998', '2/10/1998', 2, 58.43, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10857, 'BERGS', 8, '1/28/1998', '2/25/1998', '2/6/1998', 2, 188.85, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10858, 'LACOR', 2, '1/29/1998', '2/26/1998', '2/3/1998', 1, 52.51, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10859, 'FRANK', 1, '1/29/1998', '2/26/1998', '2/2/1998', 2, 76.1, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10860, 'FRANR', 3, '1/29/1998', '2/26/1998', '2/4/1998', 3, 19.26, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10861, 'WHITC', 4, '1/30/1998', '2/27/1998', '2/17/1998', 2, 14.93, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10862, 'LEHMS', 8, '1/30/1998', '3/13/1998', '2/2/1998', 2, 53.23, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10863, 'HILAA', 4, '2/2/1998', '3/2/1998', '2/17/1998', 2, 30.26, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10864, 'AROUT', 4, '2/2/1998', '3/2/1998', '2/9/1998', 2, 3.04, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10865, 'QUICK', 2, '2/2/1998', '2/16/1998', '2/12/1998', 1, 348.14, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10866, 'BERGS', 5, '2/3/1998', '3/3/1998', '2/12/1998', 1, 109.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10867, 'LONEP', 6, '2/3/1998', '3/17/1998', '2/11/1998', 1, 1.93, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10868, 'QUEEN', 7, '2/4/1998', '3/4/1998', '2/23/1998', 2, 191.27, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10869, 'SEVES', 5, '2/4/1998', '3/4/1998', '2/9/1998', 1, 143.28, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10870, 'WOLZA', 5, '2/4/1998', '3/4/1998', '2/13/1998', 3, 12.04, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10871, 'BONAP', 9, '2/5/1998', '3/5/1998', '2/10/1998', 2, 112.27, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10872, 'GODOS', 5, '2/5/1998', '3/5/1998', '2/9/1998', 2, 175.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10873, 'WILMK', 4, '2/6/1998', '3/6/1998', '2/9/1998', 1, 0.82, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10874, 'GODOS', 5, '2/6/1998', '3/6/1998', '2/11/1998', 2, 19.58, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10875, 'BERGS', 4, '2/6/1998', '3/6/1998', '3/3/1998', 2, 32.37, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10876, 'BONAP', 7, '2/9/1998', '3/9/1998', '2/12/1998', 3, 60.42, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10877, 'RICAR', 1, '2/9/1998', '3/9/1998', '2/19/1998', 1, 38.06, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10878, 'QUICK', 4, '2/10/1998', '3/10/1998', '2/12/1998', 1, 46.69, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10879, 'WILMK', 3, '2/10/1998', '3/10/1998', '2/12/1998', 3, 8.5, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10880, 'FOLKO', 7, '2/10/1998', '3/24/1998', '2/18/1998', 1, 88.01, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10881, 'CACTU', 4, '2/11/1998', '3/11/1998', '2/18/1998', 1, 2.84, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10882, 'SAVEA', 4, '2/11/1998', '3/11/1998', '2/20/1998', 3, 23.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10883, 'LONEP', 8, '2/12/1998', '3/12/1998', '2/20/1998', 3, 0.53, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10884, 'LETSS', 4, '2/12/1998', '3/12/1998', '2/13/1998', 2, 90.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10885, 'SUPRD', 6, '2/12/1998', '3/12/1998', '2/18/1998', 3, 5.64, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10886, 'HANAR', 1, '2/13/1998', '3/13/1998', '3/2/1998', 1, 4.99, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10887, 'GALED', 8, '2/13/1998', '3/13/1998', '2/16/1998', 3, 1.25, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10888, 'GODOS', 1, '2/16/1998', '3/16/1998', '2/23/1998', 2, 51.87, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10889, 'RATTC', 9, '2/16/1998', '3/16/1998', '2/23/1998', 3, 280.61, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10890, 'DUMON', 7, '2/16/1998', '3/16/1998', '2/18/1998', 1, 32.76, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10891, 'LEHMS', 7, '2/17/1998', '3/17/1998', '2/19/1998', 2, 20.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10892, 'MAISD', 4, '2/17/1998', '3/17/1998', '2/19/1998', 2, 120.27, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10893, 'KOENE', 9, '2/18/1998', '3/18/1998', '2/20/1998', 2, 77.78, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10894, 'SAVEA', 1, '2/18/1998', '3/18/1998', '2/20/1998', 1, 116.13, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10895, 'ERNSH', 3, '2/18/1998', '3/18/1998', '2/23/1998', 1, 162.75, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10896, 'MAISD', 7, '2/19/1998', '3/19/1998', '2/27/1998', 3, 32.45, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10897, 'HUNGO', 3, '2/19/1998', '3/19/1998', '2/25/1998', 2, 603.54, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10898, 'OCEAN', 4, '2/20/1998', '3/20/1998', '3/6/1998', 2, 1.27, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10899, 'LILAS', 5, '2/20/1998', '3/20/1998', '2/26/1998', 3, 1.21, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10900, 'WELLI', 1, '2/20/1998', '3/20/1998', '3/4/1998', 2, 1.66, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10901, 'HILAA', 4, '2/23/1998', '3/23/1998', '2/26/1998', 1, 62.09, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10902, 'FOLKO', 1, '2/23/1998', '3/23/1998', '3/3/1998', 1, 44.15, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10903, 'HANAR', 3, '2/24/1998', '3/24/1998', '3/4/1998', 3, 36.71, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10904, 'WHITC', 3, '2/24/1998', '3/24/1998', '2/27/1998', 3, 162.95, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10905, 'WELLI', 9, '2/24/1998', '3/24/1998', '3/6/1998', 2, 13.72, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10906, 'WOLZA', 4, '2/25/1998', '3/11/1998', '3/3/1998', 3, 26.29, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10907, 'SPECD', 6, '2/25/1998', '3/25/1998', '2/27/1998', 3, 9.19, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10908, 'REGGC', 4, '2/26/1998', '3/26/1998', '3/6/1998', 2, 32.96, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10909, 'SANTG', 1, '2/26/1998', '3/26/1998', '3/10/1998', 2, 53.05, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10910, 'WILMK', 1, '2/26/1998', '3/26/1998', '3/4/1998', 3, 38.11, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10911, 'GODOS', 3, '2/26/1998', '3/26/1998', '3/5/1998', 1, 38.19, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10912, 'HUNGO', 2, '2/26/1998', '3/26/1998', '3/18/1998', 2, 580.91, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10913, 'QUEEN', 4, '2/26/1998', '3/26/1998', '3/4/1998', 1, 33.05, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10914, 'QUEEN', 6, '2/27/1998', '3/27/1998', '3/2/1998', 1, 21.19, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10915, 'TORTU', 2, '2/27/1998', '3/27/1998', '3/2/1998', 2, 3.51, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10916, 'RANCH', 1, '2/27/1998', '3/27/1998', '3/9/1998', 2, 63.77, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10917, 'ROMEY', 4, '3/2/1998', '3/30/1998', '3/11/1998', 2, 8.29, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10918, 'BOTTM', 3, '3/2/1998', '3/30/1998', '3/11/1998', 3, 48.83, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10919, 'LINOD', 2, '3/2/1998', '3/30/1998', '3/4/1998', 2, 19.8, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10920, 'AROUT', 4, '3/3/1998', '3/31/1998', '3/9/1998', 2, 29.61, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10921, 'VAFFE', 1, '3/3/1998', '4/14/1998', '3/9/1998', 1, 176.48, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10922, 'HANAR', 5, '3/3/1998', '3/31/1998', '3/5/1998', 3, 62.74, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10923, 'LAMAI', 7, '3/3/1998', '4/14/1998', '3/13/1998', 3, 68.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10924, 'BERGS', 3, '3/4/1998', '4/1/1998', '4/8/1998', 2, 151.52, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10925, 'HANAR', 3, '3/4/1998', '4/1/1998', '3/13/1998', 1, 2.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10926, 'ANATR', 4, '3/4/1998', '4/1/1998', '3/11/1998', 3, 39.92, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10927, 'LACOR', 4, '3/5/1998', '4/2/1998', '4/8/1998', 1, 19.79, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10928, 'GALED', 1, '3/5/1998', '4/2/1998', '3/18/1998', 1, 1.36, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10929, 'FRANK', 6, '3/5/1998', '4/2/1998', '3/12/1998', 1, 33.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10930, 'SUPRD', 4, '3/6/1998', '4/17/1998', '3/18/1998', 3, 15.55, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10931, 'RICSU', 4, '3/6/1998', '3/20/1998', '3/19/1998', 2, 13.6, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10932, 'BONAP', 8, '3/6/1998', '4/3/1998', '3/24/1998', 1, 134.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10933, 'ISLAT', 6, '3/6/1998', '4/3/1998', '3/16/1998', 3, 54.15, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10934, 'LEHMS', 3, '3/9/1998', '4/6/1998', '3/12/1998', 3, 32.01, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10935, 'WELLI', 4, '3/9/1998', '4/6/1998', '3/18/1998', 3, 47.59, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10936, 'GREAL', 3, '3/9/1998', '4/6/1998', '3/18/1998', 2, 33.68, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10937, 'CACTU', 7, '3/10/1998', '3/24/1998', '3/13/1998', 3, 31.51, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10938, 'QUICK', 3, '3/10/1998', '4/7/1998', '3/16/1998', 2, 31.89, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10939, 'MAGAA', 2, '3/10/1998', '4/7/1998', '3/13/1998', 2, 76.33, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10940, 'BONAP', 8, '3/11/1998', '4/8/1998', '3/23/1998', 3, 19.77, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10941, 'SAVEA', 7, '3/11/1998', '4/8/1998', '3/20/1998', 2, 400.81, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10942, 'REGGC', 9, '3/11/1998', '4/8/1998', '3/18/1998', 3, 17.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10943, 'BSBEV', 4, '3/11/1998', '4/8/1998', '3/19/1998', 2, 2.17, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10944, 'BOTTM', 6, '3/12/1998', '3/26/1998', '3/13/1998', 3, 52.92, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10945, 'MORGK', 4, '3/12/1998', '4/9/1998', '3/18/1998', 1, 10.22, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10946, 'VAFFE', 1, '3/12/1998', '4/9/1998', '3/19/1998', 2, 27.2, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10947, 'BSBEV', 3, '3/13/1998', '4/10/1998', '3/16/1998', 2, 3.26, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10948, 'GODOS', 3, '3/13/1998', '4/10/1998', '3/19/1998', 3, 23.39, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10949, 'BOTTM', 2, '3/13/1998', '4/10/1998', '3/17/1998', 3, 74.44, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10950, 'MAGAA', 1, '3/16/1998', '4/13/1998', '3/23/1998', 2, 2.5, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10951, 'RICSU', 9, '3/16/1998', '4/27/1998', '4/7/1998', 2, 30.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10952, 'ALFKI', 1, '3/16/1998', '4/27/1998', '3/24/1998', 1, 40.42, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10953, 'AROUT', 9, '3/16/1998', '3/30/1998', '3/25/1998', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10954, 'LINOD', 5, '3/17/1998', '4/28/1998', '3/20/1998', 1, 27.91, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10955, 'FOLKO', 8, '3/17/1998', '4/14/1998', '3/20/1998', 2, 3.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10956, 'BLAUS', 6, '3/17/1998', '4/28/1998', '3/20/1998', 2, 44.65, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10957, 'HILAA', 8, '3/18/1998', '4/15/1998', '3/27/1998', 3, 105.36, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10958, 'OCEAN', 7, '3/18/1998', '4/15/1998', '3/27/1998', 2, 49.56, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10959, 'GOURL', 6, '3/18/1998', '4/29/1998', '3/23/1998', 2, 4.98, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10960, 'HILAA', 3, '3/19/1998', '4/2/1998', '4/8/1998', 1, 2.08, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10961, 'QUEEN', 8, '3/19/1998', '4/16/1998', '3/30/1998', 1, 104.47, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10962, 'QUICK', 8, '3/19/1998', '4/16/1998', '3/23/1998', 2, 275.79, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10963, 'FURIB', 9, '3/19/1998', '4/16/1998', '3/26/1998', 3, 2.7, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10964, 'SPECD', 3, '3/20/1998', '4/17/1998', '3/24/1998', 2, 87.38, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10965, 'OLDWO', 6, '3/20/1998', '4/17/1998', '3/30/1998', 3, 144.38, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10966, 'CHOPS', 4, '3/20/1998', '4/17/1998', '4/8/1998', 1, 27.19, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10967, 'TOMSP', 2, '3/23/1998', '4/20/1998', '4/2/1998', 2, 62.22, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10968, 'ERNSH', 1, '3/23/1998', '4/20/1998', '4/1/1998', 3, 74.6, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10969, 'COMMI', 1, '3/23/1998', '4/20/1998', '3/30/1998', 2, 0.21, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10970, 'BOLID', 9, '3/24/1998', '4/7/1998', '4/24/1998', 1, 16.16, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10971, 'FRANR', 2, '3/24/1998', '4/21/1998', '4/2/1998', 2, 121.82, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10972, 'LACOR', 4, '3/24/1998', '4/21/1998', '3/26/1998', 2, 0.02, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10973, 'LACOR', 6, '3/24/1998', '4/21/1998', '3/27/1998', 2, 15.17, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10974, 'SPLIR', 3, '3/25/1998', '4/8/1998', '4/3/1998', 3, 12.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10975, 'BOTTM', 1, '3/25/1998', '4/22/1998', '3/27/1998', 3, 32.27, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10976, 'HILAA', 1, '3/25/1998', '5/6/1998', '4/3/1998', 1, 37.97, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10977, 'FOLKO', 8, '3/26/1998', '4/23/1998', '4/10/1998', 3, 208.5, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10978, 'MAISD', 9, '3/26/1998', '4/23/1998', '4/23/1998', 2, 32.82, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10979, 'ERNSH', 8, '3/26/1998', '4/23/1998', '3/31/1998', 2, 353.07, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10980, 'FOLKO', 4, '3/27/1998', '5/8/1998', '4/17/1998', 1, 1.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10981, 'HANAR', 1, '3/27/1998', '4/24/1998', '4/2/1998', 2, 193.37, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10982, 'BOTTM', 2, '3/27/1998', '4/24/1998', '4/8/1998', 1, 14.01, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10983, 'SAVEA', 2, '3/27/1998', '4/24/1998', '4/6/1998', 2, 657.54, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10984, 'SAVEA', 1, '3/30/1998', '4/27/1998', '4/3/1998', 3, 211.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10985, 'HUNGO', 2, '3/30/1998', '4/27/1998', '4/2/1998', 1, 91.51, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10986, 'OCEAN', 8, '3/30/1998', '4/27/1998', '4/21/1998', 2, 217.86, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10987, 'EASTC', 8, '3/31/1998', '4/28/1998', '4/6/1998', 1, 185.48, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10988, 'RATTC', 3, '3/31/1998', '4/28/1998', '4/10/1998', 2, 61.14, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10989, 'QUEDE', 2, '3/31/1998', '4/28/1998', '4/2/1998', 1, 34.76, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10990, 'ERNSH', 2, '4/1/1998', '5/13/1998', '4/7/1998', 3, 117.61, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10991, 'QUICK', 1, '4/1/1998', '4/29/1998', '4/7/1998', 1, 38.51, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10992, 'THEBI', 1, '4/1/1998', '4/29/1998', '4/3/1998', 3, 4.27, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10993, 'FOLKO', 7, '4/1/1998', '4/29/1998', '4/10/1998', 3, 8.81, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10994, 'VAFFE', 2, '4/2/1998', '4/16/1998', '4/9/1998', 3, 65.53, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10995, 'PERIC', 1, '4/2/1998', '4/30/1998', '4/6/1998', 3, 46, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10996, 'QUICK', 4, '4/2/1998', '4/30/1998', '4/10/1998', 2, 1.12, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10997, 'LILAS', 8, '4/3/1998', '5/15/1998', '4/13/1998', 2, 73.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10998, 'WOLZA', 8, '4/3/1998', '4/17/1998', '4/17/1998', 2, 20.31, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10999, 'OTTIK', 6, '4/3/1998', '5/1/1998', '4/10/1998', 2, 96.35, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11000, 'RATTC', 2, '4/6/1998', '5/4/1998', '4/14/1998', 3, 55.12, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11001, 'FOLKO', 2, '4/6/1998', '5/4/1998', '4/14/1998', 2, 197.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11002, 'SAVEA', 4, '4/6/1998', '5/4/1998', '4/16/1998', 1, 141.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11003, 'THECR', 3, '4/6/1998', '5/4/1998', '4/8/1998', 3, 14.91, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11004, 'MAISD', 3, '4/7/1998', '5/5/1998', '4/20/1998', 1, 44.84, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11005, 'WILMK', 2, '4/7/1998', '5/5/1998', '4/10/1998', 1, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11006, 'GREAL', 3, '4/7/1998', '5/5/1998', '4/15/1998', 2, 25.19, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11007, 'PRINI', 8, '4/8/1998', '5/6/1998', '4/13/1998', 2, 202.24, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11008, 'ERNSH', 7, '4/8/1998', '5/6/1998', NULL, 3, 79.46, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11009, 'GODOS', 2, '4/8/1998', '5/6/1998', '4/10/1998', 1, 59.11, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11010, 'REGGC', 2, '4/9/1998', '5/7/1998', '4/21/1998', 2, 28.71, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11011, 'ALFKI', 3, '4/9/1998', '5/7/1998', '4/13/1998', 1, 1.21, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11012, 'FRANK', 1, '4/9/1998', '4/23/1998', '4/17/1998', 3, 242.95, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11013, 'ROMEY', 2, '4/9/1998', '5/7/1998', '4/10/1998', 1, 32.99, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11014, 'LINOD', 2, '4/10/1998', '5/8/1998', '4/15/1998', 3, 23.6, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11015, 'SANTG', 2, '4/10/1998', '4/24/1998', '4/20/1998', 2, 4.62, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11016, 'AROUT', 9, '4/10/1998', '5/8/1998', '4/13/1998', 2, 33.8, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11017, 'ERNSH', 9, '4/13/1998', '5/11/1998', '4/20/1998', 2, 754.26, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11018, 'LONEP', 4, '4/13/1998', '5/11/1998', '4/16/1998', 2, 11.65, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11019, 'RANCH', 6, '4/13/1998', '5/11/1998', NULL, 3, 3.17, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11020, 'OTTIK', 2, '4/14/1998', '5/12/1998', '4/16/1998', 2, 43.3, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11021, 'QUICK', 3, '4/14/1998', '5/12/1998', '4/21/1998', 1, 297.18, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11022, 'HANAR', 9, '4/14/1998', '5/12/1998', '5/4/1998', 2, 6.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11023, 'BSBEV', 1, '4/14/1998', '4/28/1998', '4/24/1998', 2, 123.83, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11024, 'EASTC', 4, '4/15/1998', '5/13/1998', '4/20/1998', 1, 74.36, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11025, 'WARTH', 6, '4/15/1998', '5/13/1998', '4/24/1998', 3, 29.17, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11026, 'FRANS', 4, '4/15/1998', '5/13/1998', '4/28/1998', 1, 47.09, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11027, 'BOTTM', 1, '4/16/1998', '5/14/1998', '4/20/1998', 1, 52.52, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11028, 'KOENE', 2, '4/16/1998', '5/14/1998', '4/22/1998', 1, 29.59, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11029, 'CHOPS', 4, '4/16/1998', '5/14/1998', '4/27/1998', 1, 47.84, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11030, 'SAVEA', 7, '4/17/1998', '5/15/1998', '4/27/1998', 2, 830.75, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11031, 'SAVEA', 6, '4/17/1998', '5/15/1998', '4/24/1998', 2, 227.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11032, 'WHITC', 2, '4/17/1998', '5/15/1998', '4/23/1998', 3, 606.19, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11033, 'RICSU', 7, '4/17/1998', '5/15/1998', '4/23/1998', 3, 84.74, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11034, 'OLDWO', 8, '4/20/1998', '6/1/1998', '4/27/1998', 1, 40.32, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11035, 'SUPRD', 2, '4/20/1998', '5/18/1998', '4/24/1998', 2, 0.17, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11036, 'DRACD', 8, '4/20/1998', '5/18/1998', '4/22/1998', 3, 149.47, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11037, 'GODOS', 7, '4/21/1998', '5/19/1998', '4/27/1998', 1, 3.2, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11038, 'SUPRD', 1, '4/21/1998', '5/19/1998', '4/30/1998', 2, 29.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11039, 'LINOD', 1, '4/21/1998', '5/19/1998', NULL, 2, 65, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11040, 'GREAL', 4, '4/22/1998', '5/20/1998', NULL, 3, 18.84, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11041, 'CHOPS', 3, '4/22/1998', '5/20/1998', '4/28/1998', 2, 48.22, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11042, 'COMMI', 2, '4/22/1998', '5/6/1998', '5/1/1998', 1, 29.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11043, 'SPECD', 5, '4/22/1998', '5/20/1998', '4/29/1998', 2, 8.8, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11044, 'WOLZA', 4, '4/23/1998', '5/21/1998', '5/1/1998', 1, 8.72, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11045, 'BOTTM', 6, '4/23/1998', '5/21/1998', NULL, 2, 70.58, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11046, 'WANDK', 8, '4/23/1998', '5/21/1998', '4/24/1998', 2, 71.64, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11047, 'EASTC', 7, '4/24/1998', '5/22/1998', '5/1/1998', 3, 46.62, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11048, 'BOTTM', 7, '4/24/1998', '5/22/1998', '4/30/1998', 3, 24.12, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11049, 'GOURL', 3, '4/24/1998', '5/22/1998', '5/4/1998', 1, 8.34, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11050, 'FOLKO', 8, '4/27/1998', '5/25/1998', '5/5/1998', 2, 59.41, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11051, 'LAMAI', 7, '4/27/1998', '5/25/1998', NULL, 3, 2.79, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11052, 'HANAR', 3, '4/27/1998', '5/25/1998', '5/1/1998', 1, 67.26, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11053, 'PICCO', 2, '4/27/1998', '5/25/1998', '4/29/1998', 2, 53.05, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11054, 'CACTU', 8, '4/28/1998', '5/26/1998', NULL, 1, 0.33, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11055, 'HILAA', 7, '4/28/1998', '5/26/1998', '5/5/1998', 2, 120.92, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11056, 'EASTC', 8, '4/28/1998', '5/12/1998', '5/1/1998', 2, 278.96, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11057, 'NORTS', 3, '4/29/1998', '5/27/1998', '5/1/1998', 3, 4.13, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11058, 'BLAUS', 9, '4/29/1998', '5/27/1998', NULL, 3, 31.14, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11059, 'RICAR', 2, '4/29/1998', '6/10/1998', NULL, 2, 85.8, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11060, 'FRANS', 2, '4/30/1998', '5/28/1998', '5/4/1998', 2, 10.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11061, 'GREAL', 4, '4/30/1998', '6/11/1998', NULL, 3, 14.01, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11062, 'REGGC', 4, '4/30/1998', '5/28/1998', NULL, 2, 29.93, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11063, 'HUNGO', 3, '4/30/1998', '5/28/1998', '5/6/1998', 2, 81.73, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11064, 'SAVEA', 1, '5/1/1998', '5/29/1998', '5/4/1998', 1, 30.09, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11065, 'LILAS', 8, '5/1/1998', '5/29/1998', NULL, 1, 12.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11066, 'WHITC', 7, '5/1/1998', '5/29/1998', '5/4/1998', 2, 44.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11067, 'DRACD', 1, '5/4/1998', '5/18/1998', '5/6/1998', 2, 7.98, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11068, 'QUEEN', 8, '5/4/1998', '6/1/1998', NULL, 2, 81.75, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11069, 'TORTU', 1, '5/4/1998', '6/1/1998', '5/6/1998', 2, 15.67, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11070, 'LEHMS', 2, '5/5/1998', '6/2/1998', NULL, 1, 136, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11071, 'LILAS', 1, '5/5/1998', '6/2/1998', NULL, 1, 0.93, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11072, 'ERNSH', 4, '5/5/1998', '6/2/1998', NULL, 2, 258.64, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11073, 'PERIC', 2, '5/5/1998', '6/2/1998', NULL, 2, 24.95, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11074, 'SIMOB', 7, '5/6/1998', '6/3/1998', NULL, 2, 18.44, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11075, 'RICSU', 8, '5/6/1998', '6/3/1998', NULL, 2, 6.19, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11076, 'BONAP', 4, '5/6/1998', '6/3/1998', NULL, 2, 38.28, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO DB2ADMIN.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11077, 'RATTC', 1, '5/6/1998', '6/3/1998', NULL, 2, 8.53, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (1, 'Exotic Liquids', 'Charlotte Cooper', 'Purchasing Manager', '49 Gilbert St.', 'London', NULL, 'EC1 4SD', 'UK', '(171) 555-2222', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (2, 'New Orleans Cajun Delights', 'Shelley Burke', 'Order Administrator', 'P.O. Box 78934', 'New Orleans', 'LA', '70117', 'USA', '(100) 555-4822', NULL, '#CAJUN.HTM#' ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (3, 'Grandma Kelly''s Homestead', 'Regina Murphy', 'Sales Representative', '707 Oxford Rd.', 'Ann Arbor', 'MI', '48104', 'USA', '(313) 555-5735', '(313) 555-3349', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (4, 'Tokyo Traders', 'Yoshi Nagase', 'Marketing Manager', '9-8 Sekimai Musashino-shi', 'Tokyo', NULL, '100', 'Japan', '(03) 3555-5011', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (5, 'Cooperativa de Quesos ''Las Cabras''', 'Antonio del Valle Saavedra', 'Export Administrator', 'Calle del Rosal 4', 'Oviedo', 'Asturias', '33007', 'Spain', '(98) 598 76 54', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (6, 'Mayumi''s', 'Mayumi Ohno', 'Marketing Representative', '92 Setsuko Chuo-ku', 'Osaka', NULL, '545', 'Japan', '(06) 431-7877', NULL, 'Mayumi''s (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/mayumi.htm#' ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (7, 'Pavlova, Ltd.', 'Ian Devling', 'Marketing Manager', '74 Rose St. Moonie Ponds', 'Melbourne', 'Victoria', '3058', 'Australia', '(03) 444-2343', '(03) 444-6588', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (8, 'Specialty Biscuits, Ltd.', 'Peter Wilson', 'Sales Representative', '29 King''s Way', 'Manchester', NULL, 'M14 GSD', 'UK', '(161) 555-4448', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (9, 'PB Kn�ckebr�d AB', 'Lars Peterson', 'Sales Agent', 'Kaloadagatan 13', 'G�teborg', NULL, 'S-345 67', 'Sweden', '031-987 65 43', '031-987 65 91', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (10, 'Refrescos Americanas LTDA', 'Carlos Diaz', 'Marketing Manager', 'Av. das Americanas 12.890', 'Sao Paulo', NULL, '5442', 'Brazil', '(11) 555 4640', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (11, 'Heli S��waren GmbH & Co. KG', 'Petra Winkler', 'Sales Manager', 'Tiergartenstra�e 5', 'Berlin', NULL, '10785', 'Germany', '(010) 9984510', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (12, 'Plutzer Lebensmittelgro�m�rkte AG', 'Martin Bein', 'International Marketing Mgr.', 'Bogenallee 51', 'Frankfurt', NULL, '60439', 'Germany', '(069) 992755', NULL, 'Plutzer (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/plutzer.htm#' ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (13, 'Nord-Ost-Fisch Handelsgesellschaft mbH', 'Sven Petersen', 'Coordinator Foreign Markets', 'Frahmredder 112a', 'Cuxhaven', NULL, '27478', 'Germany', '(04721) 8713', '(04721) 8714', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (14, 'Formaggi Fortini s.r.l.', 'Elio Rossi', 'Sales Representative', 'Viale Dante, 75', 'Ravenna', NULL, '48100', 'Italy', '(0544) 60323', '(0544) 60603', '#FORMAGGI.HTM#' ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (15, 'Norske Meierier', 'Beate Vileid', 'Marketing Manager', 'Hatlevegen 5', 'Sandvika', NULL, '1320', 'Norway', '(0)2-953010', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (16, 'Bigfoot Breweries', 'Cheryl Saylor', 'Regional Account Rep.', '3400 - 8th Avenue Suite 210', 'Bend', 'OR', '97101', 'USA', '(503) 555-9931', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (17, 'Svensk Sj�f�da AB', 'Michael Bj�rn', 'Sales Representative', 'Brovallav�gen 231', 'Stockholm', NULL, 'S-123 45', 'Sweden', '08-123 45 67', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (18, 'Aux joyeux eccl�siastiques', 'Guyl�ne Nodier', 'Sales Manager', '203, Rue des Francs-Bourgeois', 'Paris', NULL, '75004', 'France', '(1) 03.83.00.68', '(1) 03.83.00.62', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (19, 'New England Seafood Cannery', 'Robb Merchant', 'Wholesale Account Agent', 'Order Processing Dept. 2100 Paul Revere Blvd.', 'Boston', 'MA', '02134', 'USA', '(617) 555-3267', '(617) 555-3389', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (20, 'Leka Trading', 'Chandra Leka', 'Owner', '471 Serangoon Loop, Suite #402', 'Singapore', NULL, '0512', 'Singapore', '555-8787', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (21, 'Lyngbysild', 'Niels Petersen', 'Sales Manager', 'Lyngbysild Fiskebakken 10', 'Lyngby', NULL, '2800', 'Denmark', '43844108', '43844115', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (22, 'Zaanse Snoepfabriek', 'Dirk Luchte', 'Accounting Manager', 'Verkoop Rijnweg 22', 'Zaandam', NULL, '9999 ZZ', 'Netherlands', '(12345) 1212', '(12345) 1210', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (23, 'Karkki Oy', 'Anne Heikkonen', 'Product Manager', 'Valtakatu 12', 'Lappeenranta', NULL, '53120', 'Finland', '(953) 10956', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (24, 'G''day, Mate', 'Wendy Mackenzie', 'Sales Representative', '170 Prince Edward Parade Hunter''s Hill', 'Sydney', 'NSW', '2042', 'Australia', '(02) 555-5914', '(02) 555-4873', 'G''day Mate (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/gdaymate.htm#' ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (25, 'Ma Maison', 'Jean-Guy Lauzon', 'Marketing Manager', '2960 Rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-9022', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (26, 'Pasta Buttini s.r.l.', 'Giovanni Giudici', 'Order Administrator', 'Via dei Gelsomini, 153', 'Salerno', NULL, '84100', 'Italy', '(089) 6547665', '(089) 6547667', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (27, 'Escargots Nouveaux', 'Marie Delamare', 'Sales Manager', '22, rue H. Voiron', 'Montceau', NULL, '71300', 'France', '85.57.00.07', NULL, NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (28, 'Gai p�turage', 'Eliane Noz', 'Sales Representative', 'Bat. B 3, rue des Alpes', 'Annecy', NULL, '74000', 'France', '38.76.98.06', '38.76.98.58', NULL ) ;
-INSERT INTO DB2ADMIN.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (29, 'For�ts d''�rables', 'Chantal Goulet', 'Accounting Manager', '148 rue Chasseur', 'Ste-Hyacinthe', 'Qu�bec', 'J2S 7S8', 'Canada', '(514) 555-2955', '(514) 555-2921', NULL ) ;
-
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (1, 'Chai', 1, 1, '10 boxes x 20 bags', 18, 520, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (2, 'Chang', 1, 1, '24 - 12 oz bottles', 19, 522, 40, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (3, 'Aniseed Syrup', 1, 2, '12 - 550 ml bottles', 10, 13, 70, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (4, 'Chef Anton''s Cajun Seasoning', 2, 2, '48 - 6 oz jars', 22, 53, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (5, 'Chef Anton''s Gumbo Mix', 2, 2, '36 boxes', 21.35, 0, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (6, 'Grandma''s Boysenberry Spread', 3, 2, '12 - 8 oz jars', 25, 120, 0, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (7, 'Uncle Bob''s Organic Dried Pears', 3, 7, '12 - 1 lb pkgs.', 30, 15, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (8, 'Northwoods Cranberry Sauce', 3, 2, '12 - 12 oz jars', 40, 6, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (9, 'Mishi Kobe Niku', 4, 6, '18 - 500 g pkgs.', 97, 29, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (10, 'Ikura', 4, 8, '12 - 200 ml jars', 31, 31, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (11, 'Queso Cabrales', 5, 4, '1 kg pkg.', 21, 22, 30, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (12, 'Queso Manchego La Pastora', 5, 4, '10 - 500 g pkgs.', 38, 86, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (13, 'Konbu', 6, 8, '2 kg box', 6, 24, 0, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (14, 'Tofu', 6, 7, '40 - 100 g pkgs.', 23.25, 35, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (15, 'Genen Shouyu', 6, 2, '24 - 250 ml bottles', 15.5, 39, 0, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (16, 'Pavlova', 7, 3, '32 - 500 g boxes', 17.45, 29, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (17, 'Alice Mutton', 7, 6, '20 - 1 kg tins', 39, 0, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (18, 'Carnarvon Tigers', 7, 8, '16 kg pkg.', 62.5, 42, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (19, 'Teatime Chocolate Biscuits', 8, 3, '10 boxes x 12 pieces', 9.2, 25, 0, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (20, 'Sir Rodney''s Marmalade', 8, 3, '30 gift boxes', 81, 40, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (21, 'Sir Rodney''s Scones', 8, 3, '24 pkgs. x 4 pieces', 10, 3, 40, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (22, 'Gustaf''s Kn�ckebr�d', 9, 5, '24 - 500 g pkgs.', 21, 104, 0, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (23, 'Tunnbr�d', 9, 5, '12 - 250 g pkgs.', 9, 61, 0, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (24, 'Guaran� Fant�stica', 10, 1, '12 - 355 ml cans', 4.5, 20, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (25, 'NuNuCa Nu�-Nougat-Creme', 11, 3, '20 - 450 g glasses', 14, 76, 0, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (26, 'Gumb�r Gummib�rchen', 11, 3, '100 - 250 g bags', 31.23, 15, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (27, 'Schoggi Schokolade', 11, 3, '100 - 100 g pieces', 43.9, 49, 0, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (28, 'R�ssle Sauerkraut', 12, 7, '25 - 825 g cans', 45.6, 26, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (29, 'Th�ringer Rostbratwurst', 12, 6, '50 bags x 30 sausgs.', 123.79, 0, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (30, 'Nord-Ost Matjeshering', 13, 8, '10 - 200 g glasses', 25.89, 10, 0, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (31, 'Gorgonzola Telino', 14, 4, '12 - 100 g pkgs', 12.5, 0, 70, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (32, 'Mascarpone Fabioli', 14, 4, '24 - 200 g pkgs.', 32, 9, 40, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (33, 'Geitost', 15, 4, '500 g', 2.5, 112, 0, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (34, 'Sasquatch Ale', 16, 1, '24 - 12 oz bottles', 14, 111, 0, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (35, 'Steeleye Stout', 16, 1, '24 - 12 oz bottles', 18, 20, 0, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (36, 'Inlagd Sill', 17, 8, '24 - 250 g  jars', 19, 112, 0, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (37, 'Gravad lax', 17, 8, '12 - 500 g pkgs.', 26, 11, 50, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (38, 'C�te de Blaye', 18, 1, '12 - 75 cl bottles', 263.5, 17, 0, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (39, 'Chartreuse verte', 18, 1, '750 cc per bottle', 18, 69, 0, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (40, 'Boston Crab Meat', 19, 8, '24 - 4 oz tins', 18.4, 123, 0, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (41, 'Jack''s New England Clam Chowder', 19, 8, '12 - 12 oz cans', 9.65, 85, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (42, 'Singaporean Hokkien Fried Mee', 20, 5, '32 - 1 kg pkgs.', 14, 26, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (43, 'Ipoh Coffee', 20, 1, '16 - 500 g tins', 46, 17, 10, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (44, 'Gula Malacca', 20, 2, '20 - 2 kg bags', 19.45, 27, 0, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (45, 'Rogede sild', 21, 8, '1k pkg.', 9.5, 5, 70, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (46, 'Spegesild', 21, 8, '4 - 450 g glasses', 12, 95, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (47, 'Zaanse koeken', 22, 3, '10 - 4 oz boxes', 9.5, 36, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (48, 'Chocolade', 22, 3, '10 pkgs.', 12.75, 15, 70, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (49, 'Maxilaku', 23, 3, '24 - 50 g pkgs.', 20, 10, 60, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (50, 'Valkoinen suklaa', 23, 3, '12 - 100 g bars', 16.25, 65, 0, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (51, 'Manjimup Dried Apples', 24, 7, '50 - 300 g pkgs.', 53, 20, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (52, 'Filo Mix', 24, 5, '16 - 2 kg boxes', 7, 38, 0, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (53, 'Perth Pasties', 24, 6, '48 pieces', 32.8, 0, 0, 0, 1 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (54, 'Tourti�re', 25, 6, '16 pies', 7.45, 21, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (55, 'P�t� chinois', 25, 6, '24 boxes x 2 pies', 24, 115, 0, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (56, 'Gnocchi di nonna Alice', 26, 5, '24 - 250 g pkgs.', 38, 21, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (57, 'Ravioli Angelo', 26, 5, '24 - 250 g pkgs.', 19.5, 36, 0, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (58, 'Escargots de Bourgogne', 27, 8, '24 pieces', 13.25, 62, 0, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (59, 'Raclette Courdavault', 28, 4, '5 kg pkg.', 55, 79, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (60, 'Camembert Pierrot', 28, 4, '15 - 300 g rounds', 34, 19, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (61, 'Sirop d''�rable', 29, 2, '24 - 500 ml bottles', 28.5, 113, 0, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (62, 'Tarte au sucre', 29, 3, '48 pies', 49.3, 17, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (63, 'Vegie-spread', 7, 2, '15 - 625 g jars', 43.9, 24, 0, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (64, 'Wimmers gute Semmelkn�del', 12, 5, '20 bags x 4 pieces', 33.25, 22, 80, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (65, 'Louisiana Fiery Hot Pepper Sauce', 2, 2, '32 - 8 oz bottles', 21.05, 76, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (66, 'Louisiana Hot Spiced Okra', 2, 2, '24 - 8 oz jars', 17, 4, 100, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (67, 'Laughing Lumberjack Lager', 16, 1, '24 - 12 oz bottles', 14, 52, 0, 10, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (68, 'Scottish Longbreads', 8, 3, '10 boxes x 8 pieces', 12.5, 6, 10, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (69, 'Gudbrandsdalsost', 15, 4, '10 kg pkg.', 36, 26, 0, 15, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (70, 'Outback Lager', 7, 1, '24 - 355 ml bottles', 15, 15, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (71, 'Flotemysost', 15, 4, '10 - 500 g pkgs.', 21.5, 26, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (72, 'Mozzarella di Giovanni', 14, 4, '24 - 200 g pkgs.', 34.8, 14, 0, 0, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (73, 'R�d Kaviar', 17, 8, '24 - 150 g jars', 15, 101, 0, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (74, 'Longlife Tofu', 4, 7, '5 kg pkg.', 10, 4, 20, 5, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (75, 'Rh�nbr�u Klosterbier', 12, 1, '24 - 0.5 l bottles', 7.75, 125, 0, 25, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (76, 'Lakkalik��ri', 23, 1, '500 ml', 18, 57, 0, 20, 0 ) ;
-INSERT INTO DB2ADMIN.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (77, 'Original Frankfurter gr�ne So�e', 12, 2, '12 boxes', 13, 32, 0, 15, 0 ) ;
-
-INSERT INTO DB2ADMIN.REGION ( RegionID, RegionDescription ) VALUES (1, 'Eastern                                           ' ) ;
-INSERT INTO DB2ADMIN.REGION ( RegionID, RegionDescription ) VALUES (2, 'Western                                           ' ) ;
-INSERT INTO DB2ADMIN.REGION ( RegionID, RegionDescription ) VALUES (3, 'Northern                                          ' ) ;
-INSERT INTO DB2ADMIN.REGION ( RegionID, RegionDescription ) VALUES (4, 'Southern                                          ' ) ;
-
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 11, 14, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 42, 9.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 72, 34.8, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 14, 18.6, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 51, 42.4, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 41, 7.7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 51, 42.4, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 65, 16.8, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 22, 16.8, 6, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 57, 15.6, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 65, 16.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 20, 64.8, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 33, 2, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 60, 27.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 31, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 39, 14.4, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 49, 16, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 24, 3.6, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 55, 19.2, 21, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 74, 8, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 2, 15.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 16, 13.9, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 36, 15.2, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 59, 44, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 53, 26.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 77, 10.4, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 27, 35.1, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 39, 14.4, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 77, 10.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 2, 15.2, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 5, 17, 65, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 21, 8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 37, 20.8, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 41, 7.7, 16, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 57, 15.6, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 62, 39.4, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 70, 12, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 21, 8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 35, 14.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 5, 17, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 7, 24, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 56, 30.4, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 16, 13.9, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 24, 3.6, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 30, 20.7, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 74, 8, 36, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 2, 15.2, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 41, 7.7, 25, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 17, 31.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 70, 12, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10266, 12, 30.4, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 40, 14.7, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 59, 44, 70, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 76, 14.4, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 29, 99, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 72, 27.8, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 33, 2, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 72, 27.8, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 36, 15.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 43, 36.8, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10271, 33, 2, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 20, 64.8, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 31, 10, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 72, 27.8, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 10, 24.8, 24, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 31, 10, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 33, 2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 40, 14.7, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 76, 14.4, 33, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 71, 17.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 72, 27.8, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 24, 3.6, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 59, 44, 6, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 10, 24.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 13, 4.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 28, 36.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 62, 39.4, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 44, 15.5, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 59, 44, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 63, 35.1, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 73, 12, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10279, 17, 31.2, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 24, 3.6, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 55, 19.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 75, 6.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 19, 7.3, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 24, 3.6, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 35, 14.4, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 30, 20.7, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 57, 15.6, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 15, 12.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 19, 7.3, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 60, 27.2, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 72, 27.8, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 27, 35.1, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 44, 15.5, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 60, 27.2, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 67, 11.2, 5, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 1, 14.4, 45, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 40, 14.7, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 53, 26.2, 36, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 35, 14.4, 100, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 62, 39.4, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 16, 13.9, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 34, 11.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 46, 9.6, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 54, 5.9, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 68, 10, 3, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 3, 8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 64, 26.6, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 5, 17, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 29, 99, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 49, 16, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 77, 10.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 13, 4.8, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 44, 15.5, 24, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 51, 42.4, 2, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10292, 20, 64.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 18, 50, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 24, 3.6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 63, 35.1, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 75, 6.2, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 1, 14.4, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 17, 31.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 43, 36.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 60, 27.2, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 75, 6.2, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10295, 56, 30.4, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 11, 16.8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 16, 13.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 69, 28.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 39, 14.4, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 72, 27.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 2, 15.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 36, 15.2, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 59, 44, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 62, 39.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 19, 7.3, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 70, 12, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 66, 13.6, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 68, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 40, 14.7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 56, 30.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 17, 31.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 28, 36.4, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 43, 36.8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 40, 14.7, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 65, 16.8, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 68, 10, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 49, 16, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 59, 44, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 71, 17.2, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 18, 50, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 29, 99, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 39, 14.4, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 30, 20.7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 53, 26.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 54, 5.9, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 62, 39.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 68, 10, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 69, 28.8, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 70, 12, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 4, 17.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 6, 20, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 42, 11.2, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 43, 36.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 71, 17.2, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 16, 13.9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 62, 39.4, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 42, 11.2, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 69, 28.8, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 28, 36.4, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 43, 36.8, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 53, 26.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 75, 6.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10313, 36, 15.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 32, 25.6, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 58, 10.6, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 62, 39.4, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 34, 11.2, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 70, 12, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 41, 7.7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 62, 39.4, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10317, 1, 14.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 41, 7.7, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 76, 14.4, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 17, 31.2, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 28, 36.4, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 76, 14.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10320, 71, 17.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10321, 35, 14.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10322, 52, 5.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 15, 12.4, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 25, 11.2, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 39, 14.4, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 35, 14.4, 70, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 46, 9.6, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 59, 44, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 63, 35.1, 80, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 6, 20, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 13, 4.8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 14, 18.6, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 31, 10, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 72, 27.8, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 4, 17.6, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 57, 15.6, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 75, 6.2, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 2, 15.2, 25, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 11, 16.8, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 30, 20.7, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 58, 10.6, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 59, 44, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 65, 16.8, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 68, 10, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 19, 7.3, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 30, 20.7, 8, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 56, 30.4, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 26, 24.9, 50, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 72, 27.8, 25, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10331, 54, 5.9, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 18, 50, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 42, 11.2, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 47, 7.6, 16, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 14, 18.6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 21, 8, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 71, 17.2, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 52, 5.6, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 68, 10, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 2, 15.2, 7, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 31, 10, 25, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 51, 42.4, 48, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10336, 4, 17.6, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 23, 7.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 26, 24.9, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 36, 15.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 37, 20.8, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 72, 27.8, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 17, 31.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 30, 20.7, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 4, 17.6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 17, 31.2, 70, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 62, 39.4, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 18, 50, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 41, 7.7, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 43, 36.8, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 33, 2, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 59, 44, 9, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 2, 15.2, 24, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 31, 10, 56, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 36, 15.2, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 55, 19.2, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 64, 26.6, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 68, 10, 4, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 76, 14.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 4, 17.6, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 8, 32, 70, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 8, 32, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 19, 7.3, 80, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 42, 11.2, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 17, 31.2, 36, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 56, 30.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 25, 11.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 39, 14.4, 50, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 40, 14.7, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 75, 6.2, 6, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 23, 7.2, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10349, 54, 5.9, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 50, 13, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 69, 28.8, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 41, 7.7, 13, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 44, 15.5, 77, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 65, 16.8, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 24, 3.6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 54, 5.9, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 11, 16.8, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 38, 210.8, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 1, 14.4, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 29, 99, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 24, 3.6, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 57, 15.6, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 31, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 55, 19.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 69, 28.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 10, 24.8, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 26, 24.9, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 60, 27.2, 8, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 24, 3.6, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 34, 11.2, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 36, 15.2, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 16, 13.9, 56, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 31, 10, 70, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 60, 27.2, 80, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 28, 36.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 29, 99, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 38, 210.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 49, 16, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 54, 5.9, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 39, 14.4, 54, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 60, 27.2, 55, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 25, 11.2, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 51, 42.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 54, 5.9, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 31, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 75, 6.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 76, 14.4, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 69, 28.8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 71, 17.2, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10365, 11, 16.8, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 65, 16.8, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 77, 10.4, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 34, 11.2, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 54, 5.9, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 65, 16.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 77, 10.4, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 21, 8, 5, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 28, 36.4, 13, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 57, 15.6, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 29, 99, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 56, 30.4, 18, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 64, 26.6, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 74, 8, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10371, 36, 15.2, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 20, 64.8, 12, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 38, 210.8, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 60, 27.2, 70, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 72, 27.8, 42, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 58, 10.6, 80, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 71, 17.2, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 31, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 58, 10.6, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 14, 18.6, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 54, 5.9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10376, 31, 10, 42, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 28, 36.4, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 39, 14.4, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10378, 71, 17.2, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 41, 7.7, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 63, 35.1, 16, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 65, 16.8, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 30, 20.7, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 53, 26.2, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 60, 27.2, 6, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 70, 12, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10381, 74, 8, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 5, 17, 32, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 18, 50, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 29, 99, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 33, 2, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 74, 8, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 13, 4.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 50, 13, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 56, 30.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 20, 64.8, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 60, 27.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 7, 24, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 60, 27.2, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 68, 10, 8, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 24, 3.6, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 34, 11.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 24, 3.6, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 28, 36.4, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 59, 44, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 71, 17.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 45, 7.6, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 52, 5.6, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 53, 26.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 10, 24.8, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 55, 19.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 62, 39.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 70, 12, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 31, 10, 60, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 35, 14.4, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 46, 9.6, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 72, 27.8, 24, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10391, 13, 4.8, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10392, 69, 28.8, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 2, 15.2, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 14, 18.6, 42, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 25, 11.2, 7, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 26, 24.9, 70, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 31, 10, 32, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 13, 4.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 62, 39.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 46, 9.6, 28, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 53, 26.2, 70, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 69, 28.8, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 23, 7.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 71, 17.2, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 72, 27.8, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 21, 8, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 51, 42.4, 18, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 35, 14.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 68, 10, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 71, 17.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 76, 14.4, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 77, 10.4, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 29, 99, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 35, 14.4, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 49, 16, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 30, 20.7, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 56, 30.4, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 65, 16.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 71, 17.2, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 23, 7.2, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 63, 35.1, 65, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 48, 10.2, 70, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 26, 24.9, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 42, 11.2, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 49, 16, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10405, 3, 8, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 1, 14.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 21, 8, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 28, 36.4, 42, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 36, 15.2, 5, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 40, 14.7, 2, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 11, 16.8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 69, 28.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 71, 17.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 37, 20.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 54, 5.9, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 62, 39.4, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 14, 18.6, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 21, 8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 33, 2, 49, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 59, 44, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 41, 7.7, 25, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 44, 15.5, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 59, 44, 9, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10412, 14, 18.6, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 1, 14.4, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 62, 39.4, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 76, 14.4, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 19, 7.3, 18, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 33, 2, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 17, 31.2, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 33, 2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 19, 7.3, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 53, 26.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 57, 15.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 38, 210.8, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 46, 9.6, 2, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 68, 10, 36, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 77, 10.4, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 2, 15.2, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 47, 7.6, 55, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 61, 22.8, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 74, 8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 60, 27.2, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 69, 28.8, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 9, 77.6, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 13, 4.8, 2, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 70, 12, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 73, 12, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 19, 7.3, 4, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 26, 24.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 53, 26.2, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 77, 10.4, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10422, 26, 24.9, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 31, 10, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 59, 44, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 35, 14.4, 60, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 38, 210.8, 49, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 68, 10, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 55, 19.2, 10, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 76, 14.4, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 56, 30.4, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 64, 26.6, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10427, 14, 18.6, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10428, 46, 9.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 50, 13, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 63, 35.1, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 17, 31.2, 45, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 21, 8, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 56, 30.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 59, 44, 70, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 17, 31.2, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 40, 14.7, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 47, 7.6, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 26, 24.9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 54, 5.9, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10433, 56, 30.4, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 11, 16.8, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 76, 14.4, 18, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 2, 15.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 22, 16.8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 72, 27.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 46, 9.6, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 56, 30.4, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 64, 26.6, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 75, 6.2, 24, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10437, 53, 26.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 19, 7.3, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 34, 11.2, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 57, 15.6, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 12, 30.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 16, 13.9, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 64, 26.6, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 74, 8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 2, 15.2, 45, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 16, 13.9, 49, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 29, 99, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 61, 22.8, 90, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10441, 27, 35.1, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 11, 16.8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 54, 5.9, 80, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 66, 13.6, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 11, 16.8, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 28, 36.4, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 17, 31.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 26, 24.9, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 35, 14.4, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 41, 7.7, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 39, 14.4, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 54, 5.9, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 19, 7.3, 12, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 24, 3.6, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 31, 10, 3, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 52, 5.6, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 19, 7.3, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 65, 16.8, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 71, 17.2, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 26, 24.9, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 40, 14.7, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 10, 24.8, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 52, 5.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 62, 39.4, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 10, 24.8, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 54, 5.9, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 65, 16.8, 28, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 77, 10.4, 55, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 28, 36.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 44, 15.5, 100, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 48, 10.2, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 70, 12, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 16, 13.9, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 33, 2, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 46, 9.6, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 39, 14.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 53, 26.2, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 61, 22.8, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 71, 17.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 21, 8, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 49, 16, 21, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10457, 59, 44, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 26, 24.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 28, 36.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 43, 36.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 56, 30.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 71, 17.2, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 7, 24, 16, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 46, 9.6, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 72, 27.8, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 68, 10, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 75, 6.2, 4, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 21, 8, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 30, 20.7, 28, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 55, 19.2, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 13, 4.8, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 23, 7.2, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 19, 7.3, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 42, 11.2, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 4, 17.6, 16, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 43, 36.8, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 56, 30.4, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 60, 27.2, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 24, 3.6, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 29, 99, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 40, 14.7, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 45, 7.6, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 50, 13, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 11, 16.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 46, 9.6, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 24, 3.6, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 25, 11.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 30, 20.7, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 43, 36.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 2, 15.2, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 16, 13.9, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 44, 15.5, 2, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 18, 50, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 23, 7.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 64, 26.6, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 7, 24, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 56, 30.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 24, 3.6, 80, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 51, 42.4, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 33, 2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 71, 17.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 14, 18.6, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 28, 36.4, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 40, 14.7, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 75, 6.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 31, 10, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 66, 13.6, 60, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 76, 14.4, 42, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 55, 19.2, 2, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 70, 12, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 1, 14.4, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 21, 8, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 39, 14.4, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10478, 10, 24.8, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 38, 210.8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 53, 26.2, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 59, 44, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 64, 26.6, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 47, 7.6, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 59, 44, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 49, 16, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 60, 27.2, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10482, 40, 14.7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 34, 11.2, 35, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 77, 10.4, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 21, 8, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 40, 14.7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 51, 42.4, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 2, 15.2, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 3, 8, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 55, 19.2, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 70, 12, 60, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 11, 16.8, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 51, 42.4, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 74, 8, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 19, 7.3, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 26, 24.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 54, 5.9, 24, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 59, 44, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 73, 12, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 11, 16.8, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 16, 13.9, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 59, 44, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 68, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 75, 6.2, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 44, 15.5, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 77, 10.4, 7, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 25, 11.2, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 42, 11.2, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 65, 16.8, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 66, 13.6, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 69, 28.8, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10494, 56, 30.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 23, 7.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 41, 7.7, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 77, 10.4, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10496, 31, 10, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 56, 30.4, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 72, 27.8, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 77, 10.4, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 24, 4.5, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 40, 18.4, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 42, 14, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 28, 45.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 49, 20, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 15, 15.5, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 28, 45.6, 8, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10501, 54, 7.45, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 45, 9.5, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 53, 32.8, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 67, 14, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 14, 23.25, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 65, 21.05, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 2, 19, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 21, 10, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 53, 32.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 61, 28.5, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10505, 62, 49.3, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 25, 14, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 70, 15, 14, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 43, 46, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 48, 12.75, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 13, 6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 39, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10509, 28, 45.6, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 29, 123.79, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 75, 7.75, 36, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 4, 22, 50, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 7, 30, 50, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 8, 40, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 24, 4.5, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 46, 12, 9, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 47, 9.5, 6, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 60, 34, 12, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 21, 10, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 32, 32, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 61, 28.5, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 20, 81, 39, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 28, 45.6, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 56, 38, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 65, 21.05, 39, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 75, 7.75, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 9, 97, 16, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 16, 17.45, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 27, 43.9, 120, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 33, 2.5, 16, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 60, 34, 84, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 18, 62.5, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 41, 9.65, 80, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 42, 14, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 52, 7, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 59, 55, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 70, 15, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 24, 4.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 38, 263.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 44, 19.45, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 10, 31, 16, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 56, 38, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 60, 34, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 24, 4.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 53, 32.8, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 35, 18, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 41, 9.65, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 68, 12.5, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 1, 18, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 8, 40, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 30, 25.89, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 40, 18.4, 25, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 17, 39, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 20, 81, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 37, 26, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 41, 9.65, 6, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 10, 31, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 30, 25.89, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 43, 46, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 54, 7.45, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 36, 19, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 40, 18.4, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 1, 18, 8, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 13, 6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 56, 38, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 4, 22, 50, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 36, 19, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 11, 21, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 33, 2.5, 8, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 72, 34.8, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 55, 24, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 68, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 69, 36, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 17, 39, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 43, 46, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 61, 28.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 76, 18, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10531, 59, 55, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 30, 25.89, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 66, 17, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 4, 22, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 72, 34.8, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 73, 15, 24, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 30, 25.89, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 40, 18.4, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 54, 7.45, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 11, 21, 50, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 40, 18.4, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 57, 19.5, 5, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 59, 55, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 12, 38, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 31, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 33, 2.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 60, 34, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 31, 12.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 51, 53, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 58, 13.25, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 72, 34.8, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 73, 15, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 70, 15, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 72, 34.8, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 13, 6, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 21, 10, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 33, 2.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 49, 20, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 3, 10, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 26, 31.23, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 38, 263.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 68, 12.5, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 24, 4.5, 35, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 38, 263.5, 4, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 65, 21.05, 36, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 71, 21.5, 9, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 11, 21, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 54, 7.45, 24, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 12, 38, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 23, 9, 70, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 28, 45.6, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 67, 14, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10545, 11, 21, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 7, 30, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 35, 18, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 62, 49.3, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 32, 32, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 36, 19, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 34, 14, 10, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 41, 9.65, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 31, 12.5, 55, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 45, 9.5, 100, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 51, 53, 48, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 17, 39, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 19, 9.2, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 21, 10, 6, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 61, 28.5, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 16, 17.45, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 35, 18, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 44, 19.45, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 69, 36, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 75, 7.75, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 11, 21, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 16, 17.45, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 22, 21, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 31, 12.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 35, 18, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 23, 9, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 77, 13, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 14, 23.25, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 19, 9.2, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 24, 4.5, 18, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 51, 53, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 56, 38, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10556, 72, 34.8, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 64, 33.25, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 75, 7.75, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 47, 9.5, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 51, 53, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 52, 7, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 53, 32.8, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 73, 15, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 41, 9.65, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 55, 24, 18, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 30, 25.89, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 62, 49.3, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 44, 19.45, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 51, 53, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 33, 2.5, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 62, 49.3, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 36, 19, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 52, 7, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 17, 39, 16, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 31, 12.5, 6, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 55, 24, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 24, 4.5, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 64, 33.25, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 11, 21, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 18, 62.5, 18, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 76, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 31, 12.5, 60, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 51, 53, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 59, 55, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10568, 10, 31, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 31, 12.5, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 76, 18, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 11, 21, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 56, 38, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 14, 23.25, 11, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 42, 14, 28, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 16, 17.45, 12, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 32, 32, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 40, 18.4, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 75, 7.75, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 17, 39, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 34, 14, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 53, 32.8, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 33, 2.5, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 40, 18.4, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 62, 49.3, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 64, 33.25, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 59, 55, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 63, 43.9, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 72, 34.8, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 76, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 1, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 31, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 44, 19.45, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 39, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 75, 7.75, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 77, 13, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 35, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 57, 19.5, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 15, 15.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 75, 7.75, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 14, 23.25, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 41, 9.65, 9, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 65, 21.05, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10581, 75, 7.75, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 57, 19.5, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 76, 18, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 29, 123.79, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 60, 34, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 69, 36, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10584, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10585, 47, 9.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10586, 52, 7, 4, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 26, 31.23, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 35, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 77, 13, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 18, 62.5, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 42, 14, 100, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10589, 35, 18, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 1, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 77, 13, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 3, 10, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 7, 30, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 54, 7.45, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 15, 15.5, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 26, 31.23, 5, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 20, 81, 21, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 69, 36, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 76, 18, 4, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 52, 7, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 58, 13.25, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 35, 18, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 61, 28.5, 120, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 69, 36, 65, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 56, 38, 5, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 63, 43.9, 24, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 75, 7.75, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 24, 4.5, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 57, 19.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 65, 21.05, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 27, 43.9, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 71, 21.5, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10599, 62, 49.3, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 54, 7.45, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 73, 15, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 13, 6, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 59, 55, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10602, 77, 13, 5, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 22, 21, 48, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 49, 20, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 48, 12.75, 6, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 76, 18, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 59, 55, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 60, 34, 70, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 4, 22, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 55, 24, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 62, 49.3, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 7, 30, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 17, 39, 100, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 33, 2.5, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 40, 18.4, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 72, 34.8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10608, 56, 38, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 1, 18, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 10, 31, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 21, 10, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10610, 36, 19, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 1, 18, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 2, 19, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 60, 34, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 10, 31, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 36, 19, 55, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 49, 20, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 60, 34, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 76, 18, 80, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 13, 6, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 75, 7.75, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 11, 21, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 21, 10, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 39, 18, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10615, 55, 24, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 38, 263.5, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 56, 38, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 70, 15, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10617, 59, 55, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 6, 25, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 56, 38, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 68, 12.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 21, 10, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 22, 21, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 24, 4.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 52, 7, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 19, 9.2, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 23, 9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 70, 15, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 71, 21.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 2, 19, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 68, 12.5, 18, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 14, 23.25, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 19, 9.2, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 21, 10, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 24, 4.5, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 35, 18, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 28, 45.6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 29, 123.79, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 44, 19.45, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 14, 23.25, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 42, 14, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 60, 34, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 53, 32.8, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 60, 34, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 71, 21.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 62, 49.3, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 73, 15, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10628, 1, 18, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 29, 123.79, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 64, 33.25, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 55, 24, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 76, 18, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10631, 75, 7.75, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 2, 19, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 33, 2.5, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 12, 38, 36, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 13, 6, 13, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 26, 31.23, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 62, 49.3, 80, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 7, 30, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 18, 62.5, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 51, 53, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 75, 7.75, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 4, 22, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 5, 21.35, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 22, 21, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 4, 22, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 58, 13.25, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 11, 21, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 50, 16.25, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 56, 38, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 45, 9.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 65, 21.05, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 72, 34.8, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10639, 18, 62.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 69, 36, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 70, 15, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 2, 19, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 40, 18.4, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 21, 10, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 61, 28.5, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 28, 45.6, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 39, 18, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 46, 12, 2, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 18, 62.5, 4, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 43, 46, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 46, 12, 21, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 18, 62.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 36, 19, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 1, 18, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 10, 31, 18, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 71, 21.5, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 77, 13, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 19, 9.2, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 39, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 22, 21, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 24, 4.5, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 28, 45.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 72, 34.8, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 30, 25.89, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 53, 32.8, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 54, 7.45, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 19, 9.2, 12, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 22, 21, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 30, 25.89, 2, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 42, 14, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 60, 34, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 4, 22, 12, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 39, 18, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 54, 7.45, 6, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10655, 41, 9.65, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 14, 23.25, 3, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 44, 19.45, 28, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 47, 9.5, 6, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 15, 15.5, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 41, 9.65, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 46, 12, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 47, 9.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 56, 38, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 60, 34, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 21, 10, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 40, 18.4, 70, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 60, 34, 55, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 77, 13, 70, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 31, 12.5, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 40, 18.4, 24, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 70, 15, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10660, 20, 81, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 39, 18, 3, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 58, 13.25, 49, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10662, 68, 12.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 40, 18.4, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 42, 14, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 51, 53, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 10, 31, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 56, 38, 12, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 51, 53, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 59, 55, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 76, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 29, 123.79, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 65, 21.05, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 69, 36, 45, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 71, 21.5, 14, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 31, 12.5, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 55, 24, 4, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 64, 33.25, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10669, 36, 19, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 23, 9, 32, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 46, 12, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 67, 14, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 73, 15, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 75, 7.75, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 16, 17.45, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 62, 49.3, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 65, 21.05, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 38, 263.5, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 71, 21.5, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 16, 17.45, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 42, 14, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 43, 46, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10674, 23, 9, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 14, 23.25, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 53, 32.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 58, 13.25, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 10, 31, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 19, 9.2, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 44, 19.45, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 26, 31.23, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 33, 2.5, 8, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 12, 38, 100, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 33, 2.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 41, 9.65, 120, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 54, 7.45, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10679, 59, 55, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 16, 17.45, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 31, 12.5, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 42, 14, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 19, 9.2, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 21, 10, 12, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 64, 33.25, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 33, 2.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 66, 17, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 75, 7.75, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10683, 52, 7, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 40, 18.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 47, 9.5, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 60, 34, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 10, 31, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 41, 9.65, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 47, 9.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 17, 39, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 26, 31.23, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 9, 97, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 29, 123.79, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 36, 19, 6, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 10, 31, 18, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 28, 45.6, 60, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 34, 14, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10689, 1, 18, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 56, 38, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 77, 13, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 1, 18, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 29, 123.79, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 43, 46, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 44, 19.45, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 62, 49.3, 48, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10692, 63, 43.9, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 9, 97, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 54, 7.45, 60, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 69, 36, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 73, 15, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 7, 30, 90, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 59, 55, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 70, 15, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 8, 40, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 12, 38, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 24, 4.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 17, 39, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 46, 12, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 19, 9.2, 7, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 35, 18, 9, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 58, 13.25, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 70, 15, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 11, 21, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 17, 39, 8, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 29, 123.79, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 65, 21.05, 65, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 70, 15, 8, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10699, 47, 9.5, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 1, 18, 5, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 34, 14, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 68, 12.5, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 71, 21.5, 60, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 59, 55, 42, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 71, 21.5, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 76, 18, 35, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 3, 10, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 76, 18, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 2, 19, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 59, 55, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 73, 15, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 4, 22, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 24, 4.5, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 48, 12.75, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 31, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 32, 32, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 16, 17.45, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 43, 46, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 59, 55, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 55, 24, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 57, 19.5, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 70, 15, 28, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 5, 21.35, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 36, 19, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 8, 40, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 51, 53, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 60, 34, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 19, 9.2, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 47, 9.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 19, 9.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 41, 9.65, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 53, 32.8, 120, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 53, 32.8, 3, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 56, 38, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 10, 31, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 26, 31.23, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 45, 9.5, 110, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 46, 12, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 2, 19, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 17, 39, 27, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 47, 9.5, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 56, 38, 18, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 58, 13.25, 12, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 10, 31, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 71, 21.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 21, 10, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 51, 53, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 61, 28.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 21, 10, 32, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 54, 7.45, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 69, 36, 25, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 12, 38, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 16, 17.45, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 36, 19, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 62, 49.3, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 18, 62.5, 12, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 30, 25.89, 3, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 54, 7.45, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 35, 18, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 71, 21.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10721, 44, 19.45, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 2, 19, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 31, 12.5, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 68, 12.5, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 75, 7.75, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10723, 26, 31.23, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 10, 31, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 61, 28.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 41, 9.65, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 52, 7, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 55, 24, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 4, 22, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 11, 21, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 17, 39, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 56, 38, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 59, 55, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 30, 25.89, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 40, 18.4, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 55, 24, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 60, 34, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 1, 18, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 21, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 50, 16.25, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 16, 17.45, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 31, 12.5, 3, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 65, 21.05, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 21, 10, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 51, 53, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10732, 76, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 14, 23.25, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 28, 45.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 52, 7, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 6, 25, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 30, 25.89, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 76, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 61, 28.5, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 77, 13, 2, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 65, 21.05, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 75, 7.75, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 13, 6, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 41, 9.65, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10738, 16, 17.45, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 36, 19, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 52, 7, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 28, 45.6, 5, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 35, 18, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 45, 9.5, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 56, 38, 14, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10741, 2, 19, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 3, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 60, 34, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 72, 34.8, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10743, 46, 12, 28, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10744, 40, 18.4, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 18, 62.5, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 44, 19.45, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 59, 55, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 72, 34.8, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 13, 6, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 42, 14, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 62, 49.3, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 69, 36, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 31, 12.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 41, 9.65, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 63, 43.9, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 69, 36, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 23, 9, 44, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 40, 18.4, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 56, 38, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 56, 38, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 59, 55, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 76, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 14, 23.25, 5, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 45, 9.5, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 59, 55, 25, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 26, 31.23, 12, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 30, 25.89, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 50, 16.25, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 73, 15, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 1, 18, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 69, 36, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 45, 9.5, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 74, 10, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10754, 40, 18.4, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 47, 9.5, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 56, 38, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 57, 19.5, 14, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 69, 36, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 18, 62.5, 21, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 36, 19, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 68, 12.5, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 69, 36, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 34, 14, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 59, 55, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 62, 49.3, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 64, 33.25, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 26, 31.23, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 52, 7, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 70, 15, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10759, 32, 32, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 25, 14, 12, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 27, 43.9, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 43, 46, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 25, 14, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 75, 7.75, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 39, 18, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 47, 9.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 51, 53, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 56, 38, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 21, 10, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 22, 21, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 24, 4.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 3, 10, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 39, 18, 130, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10765, 65, 21.05, 80, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 2, 19, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 7, 30, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 68, 12.5, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10767, 42, 14, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 22, 21, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 31, 12.5, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 60, 34, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 71, 21.5, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 41, 9.65, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 52, 7, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 61, 28.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 62, 49.3, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10770, 11, 21, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10771, 71, 21.5, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 29, 123.79, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 59, 55, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 17, 39, 33, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 31, 12.5, 70, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 75, 7.75, 7, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 31, 12.5, 2, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 66, 17, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 10, 31, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 67, 14, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 31, 12.5, 16, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 42, 14, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 45, 9.5, 27, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 51, 53, 120, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10777, 42, 14, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10778, 41, 9.65, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 16, 17.45, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 62, 49.3, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 70, 15, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 77, 13, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 54, 7.45, 3, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 56, 38, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 74, 10, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10782, 31, 12.5, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 31, 12.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 38, 263.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 36, 19, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 39, 18, 2, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 72, 34.8, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 10, 31, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 75, 7.75, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 8, 40, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 30, 25.89, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 75, 7.75, 42, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 2, 19, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 29, 123.79, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 75, 7.75, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 18, 62.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 35, 18, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 63, 43.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 68, 12.5, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 7, 30, 3, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 56, 38, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 29, 123.79, 14, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 2, 19, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 54, 7.45, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 68, 12.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 41, 9.65, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 52, 7, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 14, 23.25, 15, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 54, 7.45, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 16, 17.45, 65, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 17, 39, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 26, 31.23, 21, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 44, 19.45, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 64, 33.25, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 69, 36, 24, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10797, 11, 21, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 62, 49.3, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 72, 34.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 13, 6, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 24, 4.5, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 59, 55, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 11, 21, 50, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 51, 53, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 54, 7.45, 7, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 17, 39, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 29, 123.79, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 30, 25.89, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 51, 53, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 55, 24, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 62, 49.3, 5, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 19, 9.2, 24, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 25, 14, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 59, 55, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 10, 31, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 28, 45.6, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 49, 20, 4, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 34, 14, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 38, 263.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 2, 19, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 65, 21.05, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 74, 10, 15, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10807, 40, 18.4, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 56, 38, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 76, 18, 50, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10809, 52, 7, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 13, 6, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 25, 14, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 70, 15, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 19, 9.2, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 23, 9, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 40, 18.4, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 31, 12.5, 16, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 72, 34.8, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 77, 13, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 2, 19, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 46, 12, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 41, 9.65, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 43, 46, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 48, 12.75, 8, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 61, 28.5, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10815, 33, 2.5, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 38, 263.5, 30, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 26, 31.23, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 38, 263.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 40, 18.4, 60, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 62, 49.3, 25, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 32, 32, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 41, 9.65, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 43, 46, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 75, 7.75, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10820, 56, 38, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 35, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 51, 53, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 62, 49.3, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 70, 15, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 11, 21, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 57, 19.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 59, 55, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 77, 13, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 41, 9.65, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 70, 15, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 26, 31.23, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 53, 32.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 31, 12.5, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 57, 19.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 10, 31, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 39, 18, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 20, 81, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 38, 263.5, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 2, 19, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 8, 40, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 13, 6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 60, 34, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 6, 25, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 39, 18, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 60, 34, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 68, 12.5, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 19, 9.2, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 35, 18, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 38, 263.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 43, 46, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 13, 6, 3, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 25, 14, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 44, 19.45, 16, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 64, 33.25, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 7, 30, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 31, 12.5, 9, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 53, 32.8, 9, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 29, 123.79, 8, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 30, 25.89, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 59, 55, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 77, 13, 2, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 22, 21, 52, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 35, 18, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 57, 19.5, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 60, 34, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 64, 33.25, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 13, 6, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 40, 18.4, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 47, 9.5, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 76, 18, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 1, 18, 4, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 18, 62.5, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 36, 19, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 58, 13.25, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 72, 34.8, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 25, 14, 6, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 39, 18, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 10, 31, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 56, 38, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 59, 55, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 77, 13, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 11, 21, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 43, 46, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 68, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 70, 15, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10843, 51, 53, 4, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10844, 22, 21, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 23, 9, 70, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 35, 18, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 42, 14, 42, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 58, 13.25, 60, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 64, 33.25, 48, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 4, 22, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 70, 15, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 74, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 1, 18, 80, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 19, 9.2, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 37, 26, 60, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 45, 9.5, 36, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 60, 34, 45, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 71, 21.5, 55, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 5, 21.35, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 9, 97, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 3, 10, 49, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 26, 31.23, 18, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 25, 14, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 33, 2.5, 4, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 70, 15, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 2, 19, 5, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 25, 14, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 57, 19.5, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 59, 55, 42, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 2, 19, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 17, 39, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 62, 49.3, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10853, 18, 62.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 10, 31, 100, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 13, 6, 65, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 16, 17.45, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 31, 12.5, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 56, 38, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 2, 19, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 42, 14, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 3, 10, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 26, 31.23, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 29, 123.79, 10, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 7, 30, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 27, 43.9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 70, 15, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 24, 4.5, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 54, 7.45, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 64, 33.25, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 51, 53, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 76, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 17, 39, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 18, 62.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 21, 10, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 33, 2.5, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 62, 49.3, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 11, 21, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 52, 7, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 1, 18, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 58, 13.25, 12, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 35, 18, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 67, 14, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 38, 263.5, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 39, 18, 80, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 2, 19, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 24, 4.5, 6, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 30, 25.89, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10867, 53, 32.8, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 26, 31.23, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 35, 18, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 49, 20, 42, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 1, 18, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 11, 21, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 23, 9, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 68, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 35, 18, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 51, 53, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 6, 25, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 16, 17.45, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 17, 39, 16, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 55, 24, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 64, 33.25, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 65, 21.05, 21, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 21, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 28, 45.6, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10874, 10, 31, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 19, 9.2, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 47, 9.5, 21, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 49, 20, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 46, 12, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 64, 33.25, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 16, 17.45, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 18, 62.5, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10878, 20, 81, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 40, 18.4, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 65, 21.05, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 76, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 23, 9, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 61, 28.5, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 70, 15, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10881, 73, 15, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 42, 14, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 49, 20, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 54, 7.45, 32, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10883, 24, 4.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 21, 10, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 56, 38, 21, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 65, 21.05, 12, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 2, 19, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 24, 4.5, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 70, 15, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 77, 13, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 10, 31, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 31, 12.5, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 77, 13, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10887, 25, 14, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 2, 19, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 68, 12.5, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 11, 21, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 38, 263.5, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 17, 39, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 34, 14, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 41, 9.65, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10891, 30, 25.89, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10892, 59, 55, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 8, 40, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 24, 4.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 29, 123.79, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 30, 25.89, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 36, 19, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 13, 6, 28, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 69, 36, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 75, 7.75, 120, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 24, 4.5, 110, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 39, 18, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 40, 18.4, 91, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 60, 34, 100, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 45, 9.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 56, 38, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 29, 123.79, 80, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 30, 25.89, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10898, 13, 6, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10899, 39, 18, 8, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10900, 70, 15, 3, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 41, 9.65, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 71, 21.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 55, 24, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 62, 49.3, 6, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 13, 6, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 65, 21.05, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 68, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 58, 13.25, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 62, 49.3, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10905, 1, 18, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10906, 61, 28.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10907, 75, 7.75, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 7, 30, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 52, 7, 14, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 7, 30, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 16, 17.45, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 41, 9.65, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 19, 9.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 49, 20, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 61, 28.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 1, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 17, 39, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 67, 14, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 11, 21, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 4, 22, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 33, 2.5, 40, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 58, 13.25, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10914, 71, 21.5, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 17, 39, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 33, 2.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 54, 7.45, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 16, 17.45, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 32, 32, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 57, 19.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 30, 25.89, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 60, 34, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 1, 18, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 60, 34, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 16, 17.45, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 25, 14, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 40, 18.4, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10920, 50, 16.25, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 35, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 63, 43.9, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 17, 39, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 24, 4.5, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 42, 14, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 43, 46, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 67, 14, 24, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 10, 31, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 28, 45.6, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 75, 7.75, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 36, 19, 25, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 52, 7, 12, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 11, 21, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 13, 6, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 19, 9.2, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 72, 34.8, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 20, 81, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 52, 7, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 76, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 47, 9.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 76, 18, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 21, 10, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 75, 7.75, 49, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 77, 13, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 21, 10, 36, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 27, 43.9, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 55, 24, 25, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 58, 13.25, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 13, 6, 42, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 57, 19.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 62, 49.3, 14, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 72, 34.8, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 75, 7.75, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 53, 32.8, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 61, 28.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10934, 6, 25, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 1, 18, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 18, 62.5, 4, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 23, 9, 8, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10936, 36, 19, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 28, 45.6, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 34, 14, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 13, 6, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 43, 46, 24, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 60, 34, 49, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 71, 21.5, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 2, 19, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 67, 14, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 7, 30, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 13, 6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 31, 12.5, 44, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 62, 49.3, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 68, 12.5, 80, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 72, 34.8, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10942, 49, 20, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 13, 6, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 22, 21, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 46, 12, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 11, 21, 5, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 44, 19.45, 18, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 56, 38, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 13, 6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 31, 12.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 10, 31, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 24, 4.5, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 77, 13, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10947, 59, 55, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 50, 16.25, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 51, 53, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 55, 24, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 6, 25, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 10, 31, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 17, 39, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 62, 49.3, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10950, 4, 22, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 33, 2.5, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 41, 9.65, 6, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 75, 7.75, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 6, 25, 16, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 28, 45.6, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 20, 81, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 16, 17.45, 28, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 31, 12.5, 25, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 45, 9.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 60, 34, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10955, 75, 7.75, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 21, 10, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 47, 9.5, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 51, 53, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 30, 25.89, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 35, 18, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 64, 33.25, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 5, 21.35, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 7, 30, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 72, 34.8, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10959, 75, 7.75, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 24, 4.5, 10, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 41, 9.65, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 52, 7, 6, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 76, 18, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 7, 30, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 13, 6, 77, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 53, 32.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 69, 36, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 76, 18, 44, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10963, 60, 34, 2, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 18, 62.5, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 38, 263.5, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 69, 36, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10965, 51, 53, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 37, 26, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 56, 38, 12, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 62, 49.3, 12, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 19, 9.2, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 49, 20, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 12, 38, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 24, 4.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 64, 33.25, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10969, 46, 12, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10970, 52, 7, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10971, 29, 123.79, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 17, 39, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 33, 2.5, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 26, 31.23, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 41, 9.65, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 75, 7.75, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10974, 63, 43.9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 8, 40, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 75, 7.75, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10976, 28, 45.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 39, 18, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 47, 9.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 51, 53, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 63, 43.9, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 8, 40, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 21, 10, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 40, 18.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 44, 19.45, 6, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 7, 30, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 12, 38, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 24, 4.5, 80, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 27, 43.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 31, 12.5, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 63, 43.9, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10980, 75, 7.75, 40, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10981, 38, 263.5, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 7, 30, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 43, 46, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 13, 6, 84, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 57, 19.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 16, 17.45, 55, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 24, 4.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 36, 19, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 16, 17.45, 36, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 18, 62.5, 8, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 32, 32, 35, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 11, 21, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 20, 81, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 76, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 77, 13, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 7, 30, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 43, 46, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 72, 34.8, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 7, 30, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 62, 49.3, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 6, 25, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 11, 21, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 41, 9.65, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 21, 10, 65, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 34, 14, 60, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 55, 24, 65, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 61, 28.5, 66, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 2, 19, 50, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 70, 15, 20, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 76, 18, 90, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10992, 72, 34.8, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 29, 123.79, 50, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 41, 9.65, 35, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10994, 59, 55, 18, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 51, 53, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 60, 34, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10996, 42, 14, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 32, 32, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 46, 12, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 52, 7, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 24, 4.5, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 61, 28.5, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 74, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 75, 7.75, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 51, 53, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 77, 13, 21, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 4, 22, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 77, 13, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 7, 30, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 22, 21, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 46, 12, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 55, 24, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 13, 6, 56, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 35, 18, 15, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 42, 14, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 55, 24, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 1, 18, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 40, 18.4, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 52, 7, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 26, 31.23, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 76, 18, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 1, 18, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 59, 55, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 1, 18, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 29, 123.79, 2, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 8, 40, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 29, 123.79, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 42, 14, 14, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 28, 45.6, 70, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 34, 14, 90, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 71, 21.5, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 24, 4.5, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 36, 19, 18, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 60, 34, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 7, 30, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 24, 4.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 58, 13.25, 40, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 71, 21.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 60, 34, 36, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 71, 21.5, 60, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 23, 9, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 42, 14, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 45, 9.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 68, 12.5, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11014, 41, 9.65, 28, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 30, 25.89, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 77, 13, 18, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 31, 12.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 36, 19, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 3, 10, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 59, 55, 110, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 70, 15, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 12, 38, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 18, 62.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 56, 38, 5, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 46, 12, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 49, 20, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11020, 10, 31, 24, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 2, 19, 11, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 20, 81, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 26, 31.23, 63, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 51, 53, 44, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 72, 34.8, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 19, 9.2, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 69, 36, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 7, 30, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 43, 46, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 26, 31.23, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 33, 2.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 65, 21.05, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 71, 21.5, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 1, 18, 10, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 13, 6, 20, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 18, 62.5, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 51, 53, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 62, 49.3, 21, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 55, 24, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 59, 55, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 56, 38, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 63, 43.9, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 2, 19, 100, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 5, 21.35, 70, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 59, 55, 100, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 1, 18, 45, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 13, 6, 80, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 24, 4.5, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 64, 33.25, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 71, 21.5, 16, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 36, 19, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 38, 263.5, 25, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 59, 55, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 53, 32.8, 70, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 69, 36, 36, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 21, 10, 15, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 44, 19.45, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 61, 28.5, 6, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 1, 18, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 35, 18, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 42, 14, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 54, 7.45, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 13, 6, 7, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 59, 55, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11037, 70, 15, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 40, 18.4, 5, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 52, 7, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 71, 21.5, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 28, 45.6, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 35, 18, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 49, 20, 60, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 57, 19.5, 28, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11040, 21, 10, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 2, 19, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 63, 43.9, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 44, 19.45, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 61, 28.5, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11043, 11, 21, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11044, 62, 49.3, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 33, 2.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 51, 53, 24, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 12, 38, 20, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 32, 32, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 35, 18, 18, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 1, 18, 25, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 5, 21.35, 30, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11048, 68, 12.5, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 2, 19, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 12, 38, 4, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11050, 76, 18, 50, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11051, 24, 4.5, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 43, 46, 30, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 61, 28.5, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 18, 62.5, 35, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 32, 32, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 64, 33.25, 25, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 33, 2.5, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 67, 14, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 24, 4.5, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 25, 14, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 51, 53, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 57, 19.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 7, 30, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 55, 24, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 60, 34, 50, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11057, 70, 15, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 21, 10, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 60, 34, 21, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 61, 28.5, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 13, 6, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 17, 39, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 60, 34, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 60, 34, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 77, 13, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11061, 60, 34, 15, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 53, 32.8, 10, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 70, 15, 12, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 34, 14, 30, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 40, 18.4, 40, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 41, 9.65, 30, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 17, 39, 77, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 41, 9.65, 12, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 53, 32.8, 25, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 55, 24, 4, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 68, 12.5, 55, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 30, 25.89, 4, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 54, 7.45, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 16, 17.45, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 19, 9.2, 42, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 34, 14, 35, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11067, 41, 9.65, 9, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 28, 45.6, 8, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 43, 46, 36, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 77, 13, 28, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11069, 39, 18, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 1, 18, 40, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 2, 19, 20, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 16, 17.45, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 31, 12.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 7, 30, 15, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 13, 6, 10, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 2, 19, 8, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 41, 9.65, 40, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 50, 16.25, 22, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 64, 33.25, 130, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 11, 21, 10, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 24, 4.5, 20, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11074, 16, 17.45, 14, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 2, 19, 10, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 46, 12, 30, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 76, 18, 2, 0.15 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 6, 25, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 14, 23.25, 20, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 19, 9.2, 10, 0.25 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 2, 19, 24, 0.2 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 3, 10, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 4, 22, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 6, 25, 1, 0.02 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 7, 30, 1, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 8, 40, 2, 0.1 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 10, 31, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 12, 38, 2, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 13, 6, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 14, 23.25, 1, 0.03 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 16, 17.45, 2, 0.03 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 20, 81, 1, 0.04 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 23, 9, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 32, 32, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 39, 18, 2, 0.05 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 41, 9.65, 3, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 46, 12, 3, 0.02 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 52, 7, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 55, 24, 2, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 60, 34, 2, 0.06 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 64, 33.25, 2, 0.03 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 66, 17, 1, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 73, 15, 2, 0.01 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 75, 7.75, 4, 0 ) ;
-INSERT INTO DB2ADMIN."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 77, 13, 2, 0 ) ;
-
-INSERT INTO DB2ADMIN.TYPES_SIMPLE (ID, T_SMALLINT, T_INTEGER, T_BIGINT, T_DECIMAL, T_REAL, T_DOUBLE, T_CHARACTER, T_VARCHAR, T_LONGVARCHAR) VALUES ('0', 2, 7777, 21767267, 1.2, 0.7, 1.7, 'heh', 'heh', 'heh') ;
-
-INSERT INTO DB2ADMIN.TYPES_EXTENDED (ID, T_DATE, T_TIME, T_TIMESTAMP, T_BLOB, T_CLOB, T_DBCLOB) VALUES ('0', '2004-09-08-20.30.15.50000', '2004-09-08-20.30.15.50000', '2004-09-08-20.30.15.50000', BLOB(x'123412341234'), 'asdfasdfasdfasdf', 'asdfasdfasdfasdfasdf') ;
-INSERT INTO DB2ADMIN.TYPES_EXTENDED (ID, T_DATE, T_TIME, T_TIMESTAMP) VALUES ('MIN', '0001-01-01', '00:00:00', '0001-01-01 00:00:00.0');
-
-
-COMMIT WORK;
-CONNECT RESET;
-
-CONNECT TO GHTDB_EX;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO DB2ADMIN.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-
-
-COMMIT WORK;
-CONNECT RESET;
-TERMINATE;
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.Data.ORACLE.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.Data.ORACLE.sql
deleted file mode 100755
index eb663d32a51..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.Data.ORACLE.sql
+++ /dev/null
@@ -1,3447 +0,0 @@
-SET DEFINE ~
-alter session set nls_date_format='MM/DD/YYYY hh:mi:ss PM';
-
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (1, 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (2, 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (3, 'Confections', 'Desserts, candies, and sweet breads' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (4, 'Dairy Products', 'Cheeses' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (5, 'Grains/Cereals', 'Breads, crackers, pasta, and cereal' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (6, 'Meat/Poultry', 'Prepared meats' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (7, 'Produce', 'Dried fruit and bean curd' ) ;
-INSERT INTO GHTDB.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES (8, 'Seafood', 'Seaweed and fish' ) ;
-
-INSERT INTO GHTDB_EX.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES ('10', 'Beverages', 'Soft drinks, coffees, teas, beers, and ales' ) ;
-INSERT INTO GHTDB_EX.CATEGORIES ( CategoryID, CategoryName, Description ) VALUES ('20', 'Condiments', 'Sweet and savory sauces, relishes, spreads, and seasonings' ) ;
-
-
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer & Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO GHTDB.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (1, 'Yavine', 'Oved', 'Sales Representative', 'Mr', '12/8/1948 12:00:00 AM', '5/1/1992 12:00:00 AM', '507 - 20th Ave. E.Apt. 2A', 'Seattle', 'WA', '98122', 'USA', '(206) 555-9857', '5467', 'Education includes a BA in psychology from Colorado State University in 1970.  She also completed "The Art of the Cold Call."  Nancy is a member of Toastmasters International.', 1, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (2, 'Fuller', 'Andrew', 'Vice President, Sales', 'Dr.', '2/19/1952 12:00:00 AM', '8/14/1992 12:00:00 AM', '908 W. Capital Way', 'Tacoma', 'WA', '98401', 'USA', '(206) 555-9482', '3457', 'Andrew received his BTS commercial in 1974 and a Ph.D. in international marketing from the University of Dallas in 1981.  He is fluent in French and Italian and reads German.  He joined the company as a sales representative, was promoted to sales manager in January 1992 and to vice president of sales in March 1993.  Andrew is a member of the Sales Management Roundtable, the Seattle Chamber of Commerce, and the Pacific Rim Importers Association.', 1, 'http://accweb/emmployees/fuller.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (3, 'Leverling', 'Janet', 'Sales Representative', 'Ms.', '8/30/1963 12:00:00 AM', '4/1/1992 12:00:00 AM', '722 Moss Bay Blvd.', 'Kirkland', 'WA', '98033', 'USA', '(206) 555-3412', '3355', 'Janet has a BS degree in chemistry from Boston College (1984).  She has also completed a certificate program in food retailing management.  Janet was hired as a sales associate in 1991 and promoted to sales representative in February 1992.', 2, 'http://accweb/emmployees/leverling.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (4, 'Peacock', 'Margaret', 'Sales Representative', 'Mrs.', '9/19/1937 12:00:00 AM', '5/3/1993 12:00:00 AM', '4110 Old Redmond Rd.', 'Redmond', 'WA', '98052', 'USA', '(206) 555-8122', '5176', 'Margaret holds a BA in English literature from Concordia College (1958) and an MA from the American Institute of Culinary Arts (1966).  She was assigned to the London office temporarily from July through November 1992.', 2, 'http://accweb/emmployees/peacock.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (5, 'Buchanan', 'Steven', 'Sales Manager', 'Mr.', '3/4/1955 12:00:00 AM', '10/17/1993 12:00:00 AM', '14 Garrett Hill', 'London', NULL, 'SW1 8JR', 'UK', '(71) 555-4848', '3453', 'Steven Buchanan graduated from St. Andrews University, Scotland, with a BSC degree in 1976.  Upon joining the company as a sales representative in 1992, he spent 6 months in an orientation program at the Seattle office and then returned to his permanent post in London.  He was promoted to sales manager in March 1993.  Mr. Buchanan has completed the courses "Successful Telemarketing" and "International Sales Management."  He is fluent in French.', 2, 'http://accweb/emmployees/buchanan.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (6, 'Suyama', 'Michael', 'Sales Representative', 'Mr.', '7/2/1963 12:00:00 AM', '10/17/1993 12:00:00 AM', 'Coventry HouseMiner Rd.', 'London', NULL, 'EC2 7JR', 'UK', '(71) 555-7773', '428', 'Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses "Multi-Cultural Selling" and "Time Management for the Sales Professional."  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (7, 'King', 'Robert', 'Sales Representative', 'Mr.', '5/29/1960 12:00:00 AM', '1/2/1994 12:00:00 AM', 'Edgeham HollowWinchester Way', 'London', NULL, 'RG1 9SP', 'UK', '(71) 555-5598', '465', 'Robert King served in the Peace Corps and traveled extensively before completing his degree in English at the University of Michigan in 1992, the year he joined the company.  After completing a course entitled "Selling in Europe," he was transferred to the London office in March 1993.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (8, 'Callahan', 'Laura', 'Inside Sales Coordinator', 'Ms.', '1/9/1958 12:00:00 AM', '3/5/1994 12:00:00 AM', '4726 - 11th Ave. N.E.', 'Seattle', 'WA', '98105', 'USA', '(206) 555-1189', '2344', 'Laura received a BA in psychology from the University of Washington.  She has also completed a course in business French.  She reads and writes French.', 2, 'http://accweb/emmployees/davolio.bmp' ) ;
-INSERT INTO GHTDB.EMPLOYEES ( EmployeeID, LastName, FirstName, Title, TitleOfCourtesy, BirthDate, HireDate, Address, City, Region, PostalCode, Country, HomePhone, Extension, Notes, ReportsTo, PhotoPath ) VALUES (9, 'Dodsworth', 'Anne', 'Sales Representative', 'Ms.', '1/27/1966 12:00:00 AM', '11/15/1994 12:00:00 AM', '7 Houndstooth Rd.', 'London', NULL, 'WG2 7LT', 'UK', '(71) 555-4444', '452', 'Anne has a BA degree in English from St. Lawrence College.  She is fluent in French and German.', 5, 'http://accweb/emmployees/davolio.bmp' ) ;
-
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (1, 'Eastern                                           ' ) ;
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (2, 'Western                                           ' ) ;
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (3, 'Northern                                          ' ) ;
-INSERT INTO GHTDB.REGION ( RegionID, RegionDescription ) VALUES (4, 'Southern                                          ' ) ;
-
-
-INSERT INTO GHTDB.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (1, 'Speedy Express', '(503) 555-9831' ) ;
-INSERT INTO GHTDB.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (2, 'Comp2', '(503) 555-3199' ) ;
-INSERT INTO GHTDB.SHIPPERS ( ShipperID, CompanyName, Phone ) VALUES (3, 'Federal Shipping', '(503) 555-9931' ) ;
-
-
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10248, 'VINET', 5, '7/4/1996 12:00:00 AM', '8/1/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 3, 255.39, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10249, 'TOMSP', 6, '7/5/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/10/1996 12:00:00 AM', 1, 11.61, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10250, 'HANAR', 4, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/12/1996 12:00:00 AM', 2, 65.83, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10251, 'VICTE', 3, '7/8/1996 12:00:00 AM', '8/5/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 1, 41.34, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10252, 'SUPRD', 4, '7/9/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', '7/11/1996 12:00:00 AM', 2, 51.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10253, 'HANAR', 3, '7/10/1996 12:00:00 AM', '7/24/1996 12:00:00 AM', '7/16/1996 12:00:00 AM', 2, 58.17, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10254, 'CHOPS', 5, '7/11/1996 12:00:00 AM', '8/8/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 2, 22.98, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10255, 'RICSU', 9, '7/12/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', '7/15/1996 12:00:00 AM', 3, 148.33, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10256, 'WELLI', 3, '7/15/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', '7/17/1996 12:00:00 AM', 2, 13.97, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10257, 'HILAA', 4, '7/16/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', '7/22/1996 12:00:00 AM', 3, 81.91, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10258, 'ERNSH', 1, '7/17/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '7/23/1996 12:00:00 AM', 1, 140.51, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10259, 'CENTC', 4, '7/18/1996 12:00:00 AM', '8/15/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 3.25, 'Centro comercial Moctezuma', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10260, 'OTTIK', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/29/1996 12:00:00 AM', 1, 55.09, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10261, 'QUEDE', 4, '7/19/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', '7/30/1996 12:00:00 AM', 2, 3.05, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10262, 'RATTC', 8, '7/22/1996 12:00:00 AM', '8/19/1996 12:00:00 AM', '7/25/1996 12:00:00 AM', 3, 48.29, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10263, 'ERNSH', 9, '7/23/1996 12:00:00 AM', '8/20/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 146.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10264, 'FOLKO', 6, '7/24/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 3.67, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10265, 'BLONP', 2, '7/25/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 1, 55.28, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10266, 'WARTH', 3, '7/26/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '7/31/1996 12:00:00 AM', 3, 25.73, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10267, 'FRANK', 4, '7/29/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 1, 208.58, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10268, 'GROSR', 8, '7/30/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 3, 66.29, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10269, 'WHITC', 5, '7/31/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 4.56, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10270, 'WARTH', 1, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/2/1996 12:00:00 AM', 1, 136.54, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10271, 'SPLIR', 6, '8/1/1996 12:00:00 AM', '8/29/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 2, 4.54, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10272, 'RATTC', 6, '8/2/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', '8/6/1996 12:00:00 AM', 2, 98.03, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10273, 'QUICK', 3, '8/5/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', '8/12/1996 12:00:00 AM', 3, 76.07, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10274, 'VINET', 6, '8/6/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 1, 6.01, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10275, 'MAGAA', 1, '8/7/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', '8/9/1996 12:00:00 AM', 1, 26.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10276, 'TORTU', 8, '8/8/1996 12:00:00 AM', '8/22/1996 12:00:00 AM', '8/14/1996 12:00:00 AM', 3, 13.84, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10277, 'MORGK', 2, '8/9/1996 12:00:00 AM', '9/6/1996 12:00:00 AM', '8/13/1996 12:00:00 AM', 3, 125.77, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10278, 'BERGS', 8, '8/12/1996 12:00:00 AM', '9/9/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 92.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10279, 'LEHMS', 8, '8/13/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', '8/16/1996 12:00:00 AM', 2, 25.83, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10280, 'BERGS', 2, '8/14/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', 1, 8.98, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10281, 'ROMEY', 4, '8/14/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 2.94, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10282, 'ROMEY', 4, '8/15/1996 12:00:00 AM', '9/12/1996 12:00:00 AM', '8/21/1996 12:00:00 AM', 1, 12.69, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10283, 'LILAS', 3, '8/16/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', '8/23/1996 12:00:00 AM', 3, 84.81, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10284, 'LEHMS', 4, '8/19/1996 12:00:00 AM', '9/16/1996 12:00:00 AM', '8/27/1996 12:00:00 AM', 1, 76.56, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10285, 'QUICK', 1, '8/20/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', '8/26/1996 12:00:00 AM', 2, 76.83, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10286, 'QUICK', 8, '8/21/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', '8/30/1996 12:00:00 AM', 3, 229.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10287, 'RICAR', 8, '8/22/1996 12:00:00 AM', '9/19/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 12.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10288, 'REGGC', 4, '8/23/1996 12:00:00 AM', '9/20/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 7.45, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10289, 'BSBEV', 7, '8/26/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', '8/28/1996 12:00:00 AM', 3, 22.77, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10290, 'COMMI', 8, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/3/1996 12:00:00 AM', 1, 79.7, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10291, 'QUEDE', 6, '8/27/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', '9/4/1996 12:00:00 AM', 2, 6.4, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10292, 'TRADH', 1, '8/28/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', '9/2/1996 12:00:00 AM', 2, 1.35, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10293, 'TORTU', 1, '8/29/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 3, 21.18, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10294, 'RATTC', 4, '8/30/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', '9/5/1996 12:00:00 AM', 2, 147.26, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10295, 'VINET', 2, '9/2/1996 12:00:00 AM', '9/30/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 1.15, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10296, 'LILAS', 6, '9/3/1996 12:00:00 AM', '10/1/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 1, 0.12, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10297, 'BLONP', 5, '9/4/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/10/1996 12:00:00 AM', 2, 5.74, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10298, 'HUNGO', 6, '9/5/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', '9/11/1996 12:00:00 AM', 2, 168.22, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10299, 'RICAR', 4, '9/6/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/13/1996 12:00:00 AM', 2, 29.76, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10300, 'MAGAA', 2, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 17.68, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10301, 'WANDK', 8, '9/9/1996 12:00:00 AM', '10/7/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 45.08, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10302, 'SUPRD', 4, '9/10/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 2, 6.27, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10303, 'GODOS', 7, '9/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', '9/18/1996 12:00:00 AM', 2, 107.83, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10304, 'TORTU', 1, '9/12/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', '9/17/1996 12:00:00 AM', 2, 63.79, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10305, 'OLDWO', 8, '9/13/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', '10/9/1996 12:00:00 AM', 3, 257.62, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10306, 'ROMEY', 1, '9/16/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', '9/23/1996 12:00:00 AM', 3, 7.56, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10307, 'LONEP', 2, '9/17/1996 12:00:00 AM', '10/15/1996 12:00:00 AM', '9/25/1996 12:00:00 AM', 2, 0.56, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10308, 'ANATR', 7, '9/18/1996 12:00:00 AM', '10/16/1996 12:00:00 AM', '9/24/1996 12:00:00 AM', 3, 1.61, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10309, 'HUNGO', 3, '9/19/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 1, 47.3, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10310, 'THEBI', 8, '9/20/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', '9/27/1996 12:00:00 AM', 2, 17.52, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10311, 'DUMON', 1, '9/20/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', '9/26/1996 12:00:00 AM', 3, 24.69, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10312, 'WANDK', 2, '9/23/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 40.26, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10313, 'QUICK', 2, '9/24/1996 12:00:00 AM', '10/22/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 1.96, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10314, 'RATTC', 1, '9/25/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 74.16, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10315, 'ISLAT', 4, '9/26/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', '10/3/1996 12:00:00 AM', 2, 41.76, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10316, 'RATTC', 1, '9/27/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', '10/8/1996 12:00:00 AM', 3, 150.15, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10317, 'LONEP', 6, '9/30/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 12.69, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10318, 'ISLAT', 8, '10/1/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', '10/4/1996 12:00:00 AM', 2, 4.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10319, 'TORTU', 7, '10/2/1996 12:00:00 AM', '10/30/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 3, 64.5, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10320, 'WARTH', 5, '10/3/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', '10/18/1996 12:00:00 AM', 3, 34.57, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10321, 'ISLAT', 3, '10/3/1996 12:00:00 AM', '10/31/1996 12:00:00 AM', '10/11/1996 12:00:00 AM', 2, 3.43, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10322, 'PERIC', 7, '10/4/1996 12:00:00 AM', '11/1/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 3, 0.4, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10323, 'KOENE', 4, '10/7/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 4.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10324, 'SAVEA', 9, '10/8/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', '10/10/1996 12:00:00 AM', 1, 214.27, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10325, 'KOENE', 1, '10/9/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 3, 64.86, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10326, 'BOLID', 4, '10/10/1996 12:00:00 AM', '11/7/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 2, 77.92, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10327, 'FOLKO', 2, '10/11/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', '10/14/1996 12:00:00 AM', 1, 63.36, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10328, 'FURIB', 4, '10/14/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', '10/17/1996 12:00:00 AM', 3, 87.03, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10329, 'SPLIR', 4, '10/15/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '10/23/1996 12:00:00 AM', 2, 191.67, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10330, 'LILAS', 3, '10/16/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 1, 12.75, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10331, 'BONAP', 9, '10/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 1, 10.19, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10332, 'MEREP', 3, '10/17/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '10/21/1996 12:00:00 AM', 2, 52.84, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10333, 'WARTH', 5, '10/18/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 3, 0.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10334, 'VICTE', 8, '10/21/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', '10/28/1996 12:00:00 AM', 2, 8.56, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10335, 'HUNGO', 7, '10/22/1996 12:00:00 AM', '11/19/1996 12:00:00 AM', '10/24/1996 12:00:00 AM', 2, 42.11, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10336, 'PRINI', 7, '10/23/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', '10/25/1996 12:00:00 AM', 2, 15.51, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10337, 'FRANK', 4, '10/24/1996 12:00:00 AM', '11/21/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 108.26, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10338, 'OLDWO', 4, '10/25/1996 12:00:00 AM', '11/22/1996 12:00:00 AM', '10/29/1996 12:00:00 AM', 3, 84.21, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10339, 'MEREP', 2, '10/28/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 15.66, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10340, 'BONAP', 1, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 166.31, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10341, 'SIMOB', 7, '10/29/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 3, 26.78, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10342, 'FRANK', 4, '10/30/1996 12:00:00 AM', '11/13/1996 12:00:00 AM', '11/4/1996 12:00:00 AM', 2, 54.83, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10343, 'LEHMS', 4, '10/31/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', '11/6/1996 12:00:00 AM', 1, 110.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10344, 'WHITC', 4, '11/1/1996 12:00:00 AM', '11/29/1996 12:00:00 AM', '11/5/1996 12:00:00 AM', 2, 23.29, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10345, 'QUICK', 2, '11/4/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', '11/11/1996 12:00:00 AM', 2, 249.06, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10346, 'RATTC', 3, '11/5/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 142.08, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10347, 'FAMIA', 4, '11/6/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', '11/8/1996 12:00:00 AM', 3, 3.1, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10348, 'WANDK', 4, '11/7/1996 12:00:00 AM', '12/5/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 2, 0.78, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10349, 'SPLIR', 7, '11/8/1996 12:00:00 AM', '12/6/1996 12:00:00 AM', '11/15/1996 12:00:00 AM', 1, 8.63, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10350, 'LAMAI', 6, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 64.19, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10351, 'ERNSH', 1, '11/11/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 162.33, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10352, 'FURIB', 3, '11/12/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', '11/18/1996 12:00:00 AM', 3, 1.3, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10353, 'PICCO', 7, '11/13/1996 12:00:00 AM', '12/11/1996 12:00:00 AM', '11/25/1996 12:00:00 AM', 3, 360.63, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10354, 'PERIC', 8, '11/14/1996 12:00:00 AM', '12/12/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 3, 53.8, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10355, 'AROUT', 6, '11/15/1996 12:00:00 AM', '12/13/1996 12:00:00 AM', '11/20/1996 12:00:00 AM', 1, 41.95, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10356, 'WANDK', 6, '11/18/1996 12:00:00 AM', '12/16/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 2, 36.71, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10357, 'LILAS', 1, '11/19/1996 12:00:00 AM', '12/17/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 34.88, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10358, 'LAMAI', 5, '11/20/1996 12:00:00 AM', '12/18/1996 12:00:00 AM', '11/27/1996 12:00:00 AM', 1, 19.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10359, 'SEVES', 5, '11/21/1996 12:00:00 AM', '12/19/1996 12:00:00 AM', '11/26/1996 12:00:00 AM', 3, 288.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10360, 'BLONP', 4, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 131.7, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10361, 'QUICK', 1, '11/22/1996 12:00:00 AM', '12/20/1996 12:00:00 AM', '12/3/1996 12:00:00 AM', 2, 183.17, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10362, 'BONAP', 3, '11/25/1996 12:00:00 AM', '12/23/1996 12:00:00 AM', '11/28/1996 12:00:00 AM', 1, 96.04, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10363, 'DRACD', 4, '11/26/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', '12/4/1996 12:00:00 AM', 3, 30.54, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10364, 'EASTC', 1, '11/26/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/4/1996 12:00:00 AM', 1, 71.97, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10365, 'ANTON', 3, '11/27/1996 12:00:00 AM', '12/25/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 22, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10366, 'GALED', 8, '11/28/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/30/1996 12:00:00 AM', 2, 10.14, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10367, 'VAFFE', 7, '11/28/1996 12:00:00 AM', '12/26/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 3, 13.55, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10368, 'ERNSH', 2, '11/29/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', '12/2/1996 12:00:00 AM', 2, 101.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10369, 'SPLIR', 8, '12/2/1996 12:00:00 AM', '12/30/1996 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 195.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10370, 'CHOPS', 6, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/27/1996 12:00:00 AM', 2, 1.17, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10371, 'LAMAI', 1, '12/3/1996 12:00:00 AM', '12/31/1996 12:00:00 AM', '12/24/1996 12:00:00 AM', 1, 0.45, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10372, 'QUEEN', 5, '12/4/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 890.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10373, 'HUNGO', 4, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/11/1996 12:00:00 AM', 3, 124.12, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10374, 'WOLZA', 1, '12/5/1996 12:00:00 AM', '1/2/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 3, 3.94, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10375, 'HUNGC', 3, '12/6/1996 12:00:00 AM', '1/3/1997 12:00:00 AM', '12/9/1996 12:00:00 AM', 2, 20.12, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10376, 'MEREP', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 2, 20.39, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10377, 'SEVES', 1, '12/9/1996 12:00:00 AM', '1/6/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 22.21, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10378, 'FOLKO', 5, '12/10/1996 12:00:00 AM', '1/7/1997 12:00:00 AM', '12/19/1996 12:00:00 AM', 3, 5.44, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10379, 'QUEDE', 2, '12/11/1996 12:00:00 AM', '1/8/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 1, 45.03, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10380, 'HUNGO', 8, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 35.03, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10381, 'LILAS', 3, '12/12/1996 12:00:00 AM', '1/9/1997 12:00:00 AM', '12/13/1996 12:00:00 AM', 3, 7.99, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10382, 'ERNSH', 4, '12/13/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '12/16/1996 12:00:00 AM', 1, 94.77, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10383, 'AROUT', 8, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/18/1996 12:00:00 AM', 3, 34.24, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10384, 'BERGS', 3, '12/16/1996 12:00:00 AM', '1/13/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 3, 168.64, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10385, 'SPLIR', 1, '12/17/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '12/23/1996 12:00:00 AM', 2, 30.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10386, 'FAMIA', 9, '12/18/1996 12:00:00 AM', '1/1/1997 12:00:00 AM', '12/25/1996 12:00:00 AM', 3, 13.99, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10387, 'SANTG', 1, '12/18/1996 12:00:00 AM', '1/15/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 2, 93.63, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10388, 'SEVES', 2, '12/19/1996 12:00:00 AM', '1/16/1997 12:00:00 AM', '12/20/1996 12:00:00 AM', 1, 34.86, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10389, 'BOTTM', 4, '12/20/1996 12:00:00 AM', '1/17/1997 12:00:00 AM', '12/24/1996 12:00:00 AM', 2, 47.42, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10390, 'ERNSH', 6, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/26/1996 12:00:00 AM', 1, 126.38, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10391, 'DRACD', 3, '12/23/1996 12:00:00 AM', '1/20/1997 12:00:00 AM', '12/31/1996 12:00:00 AM', 3, 5.45, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10392, 'PICCO', 2, '12/24/1996 12:00:00 AM', '1/21/1997 12:00:00 AM', '1/1/1997 12:00:00 AM', 3, 122.46, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10393, 'SAVEA', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 126.56, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10394, 'HUNGC', 1, '12/25/1996 12:00:00 AM', '1/22/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 3, 30.34, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10395, 'HILAA', 6, '12/26/1996 12:00:00 AM', '1/23/1997 12:00:00 AM', '1/3/1997 12:00:00 AM', 1, 184.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10396, 'FRANK', 1, '12/27/1996 12:00:00 AM', '1/10/1997 12:00:00 AM', '1/6/1997 12:00:00 AM', 3, 135.35, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10397, 'PRINI', 5, '12/27/1996 12:00:00 AM', '1/24/1997 12:00:00 AM', '1/2/1997 12:00:00 AM', 1, 60.26, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10398, 'SAVEA', 2, '12/30/1996 12:00:00 AM', '1/27/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 89.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10399, 'VAFFE', 8, '12/31/1996 12:00:00 AM', '1/14/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 3, 27.36, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10400, 'EASTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 3, 83.93, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10401, 'RATTC', 1, '1/1/1997 12:00:00 AM', '1/29/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 1, 12.51, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10402, 'ERNSH', 8, '1/2/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/10/1997 12:00:00 AM', 2, 67.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10403, 'ERNSH', 4, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/9/1997 12:00:00 AM', 3, 73.79, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10404, 'MAGAA', 2, '1/3/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', '1/8/1997 12:00:00 AM', 1, 155.97, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10405, 'LINOD', 1, '1/6/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', '1/22/1997 12:00:00 AM', 1, 34.82, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10406, 'QUEEN', 7, '1/7/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/13/1997 12:00:00 AM', 1, 108.04, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10407, 'OTTIK', 2, '1/7/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 91.48, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10408, 'FOLIG', 8, '1/8/1997 12:00:00 AM', '2/5/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 11.26, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10409, 'OCEAN', 3, '1/9/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '1/14/1997 12:00:00 AM', 1, 29.83, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10410, 'BOTTM', 3, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 3, 2.4, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10411, 'BOTTM', 9, '1/10/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', '1/21/1997 12:00:00 AM', 3, 23.65, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10412, 'WARTH', 8, '1/13/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', '1/15/1997 12:00:00 AM', 2, 3.77, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10413, 'LAMAI', 3, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/16/1997 12:00:00 AM', 2, 95.66, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10414, 'FAMIA', 2, '1/14/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', '1/17/1997 12:00:00 AM', 3, 21.48, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10415, 'HUNGC', 3, '1/15/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 0.2, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10416, 'WARTH', 8, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 3, 22.72, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10417, 'SIMOB', 4, '1/16/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '1/28/1997 12:00:00 AM', 3, 70.29, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10418, 'QUICK', 4, '1/17/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '1/24/1997 12:00:00 AM', 1, 17.55, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10419, 'RICSU', 4, '1/20/1997 12:00:00 AM', '2/17/1997 12:00:00 AM', '1/30/1997 12:00:00 AM', 2, 137.35, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10420, 'WELLI', 3, '1/21/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 44.12, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10421, 'QUEDE', 8, '1/21/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 1, 99.23, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10422, 'FRANS', 2, '1/22/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', '1/31/1997 12:00:00 AM', 1, 3.02, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10423, 'GOURL', 6, '1/23/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 3, 24.5, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10424, 'MEREP', 7, '1/23/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', '1/27/1997 12:00:00 AM', 2, 370.61, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10425, 'LAMAI', 6, '1/24/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 7.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10426, 'GALED', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '2/6/1997 12:00:00 AM', 1, 18.69, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10427, 'PICCO', 4, '1/27/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 31.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10428, 'REGGC', 7, '1/28/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', '2/4/1997 12:00:00 AM', 1, 11.09, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10429, 'HUNGO', 3, '1/29/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 56.63, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10430, 'ERNSH', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/3/1997 12:00:00 AM', 1, 458.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10431, 'BOTTM', 4, '1/30/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 44.17, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10432, 'SPLIR', 3, '1/31/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 4.34, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10433, 'PRINI', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 73.83, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10434, 'FOLKO', 3, '2/3/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', '2/13/1997 12:00:00 AM', 2, 17.92, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10435, 'CONSH', 8, '2/4/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/7/1997 12:00:00 AM', 2, 9.21, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10436, 'BLONP', 3, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/11/1997 12:00:00 AM', 2, 156.66, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10437, 'WARTH', 8, '2/5/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '2/12/1997 12:00:00 AM', 1, 19.97, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10438, 'TOMSP', 3, '2/6/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 2, 8.24, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10439, 'MEREP', 6, '2/7/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', '2/10/1997 12:00:00 AM', 3, 4.07, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10440, 'SAVEA', 4, '2/10/1997 12:00:00 AM', '3/10/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 86.53, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10441, 'OLDWO', 3, '2/10/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 73.02, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10442, 'ERNSH', 3, '2/11/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', '2/18/1997 12:00:00 AM', 2, 47.94, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10443, 'REGGC', 8, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/14/1997 12:00:00 AM', 1, 13.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10444, 'BERGS', 3, '2/12/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', '2/21/1997 12:00:00 AM', 3, 3.5, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10445, 'BERGS', 3, '2/13/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', '2/20/1997 12:00:00 AM', 1, 9.3, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10446, 'TOMSP', 6, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '2/19/1997 12:00:00 AM', 1, 14.68, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10447, 'RICAR', 4, '2/14/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', '3/7/1997 12:00:00 AM', 2, 68.66, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10448, 'RANCH', 4, '2/17/1997 12:00:00 AM', '3/17/1997 12:00:00 AM', '2/24/1997 12:00:00 AM', 2, 38.82, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10449, 'BLONP', 3, '2/18/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', '2/27/1997 12:00:00 AM', 2, 53.3, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10450, 'VICTE', 8, '2/19/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 7.23, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10451, 'QUICK', 4, '2/19/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 189.09, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10452, 'SAVEA', 8, '2/20/1997 12:00:00 AM', '3/20/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 1, 140.26, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10453, 'AROUT', 1, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/26/1997 12:00:00 AM', 2, 25.36, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10454, 'LAMAI', 4, '2/21/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', '2/25/1997 12:00:00 AM', 3, 2.74, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10455, 'WARTH', 8, '2/24/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 2, 180.45, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10456, 'KOENE', 8, '2/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 8.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10457, 'KOENE', 2, '2/25/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 11.57, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10458, 'SUPRD', 7, '2/26/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', '3/4/1997 12:00:00 AM', 3, 147.06, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10459, 'VICTE', 4, '2/27/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '2/28/1997 12:00:00 AM', 2, 25.09, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10460, 'FOLKO', 8, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/3/1997 12:00:00 AM', 1, 16.27, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10461, 'LILAS', 1, '2/28/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', '3/5/1997 12:00:00 AM', 3, 148.61, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10462, 'CONSH', 2, '3/3/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 1, 6.17, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10463, 'SUPRD', 5, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/6/1997 12:00:00 AM', 3, 14.78, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10464, 'FURIB', 4, '3/4/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 89, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10465, 'VAFFE', 1, '3/5/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 3, 145.04, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10466, 'COMMI', 4, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/13/1997 12:00:00 AM', 1, 11.93, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10467, 'MAGAA', 8, '3/6/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', '3/11/1997 12:00:00 AM', 2, 4.93, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10468, 'KOENE', 3, '3/7/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', '3/12/1997 12:00:00 AM', 3, 44.12, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10469, 'WHITC', 1, '3/10/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 1, 60.18, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10470, 'BONAP', 4, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/14/1997 12:00:00 AM', 2, 64.56, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10471, 'BSBEV', 2, '3/11/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/18/1997 12:00:00 AM', 3, 45.59, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10472, 'SEVES', 8, '3/12/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', '3/19/1997 12:00:00 AM', 1, 4.2, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10473, 'ISLAT', 1, '3/13/1997 12:00:00 AM', '3/27/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 16.37, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10474, 'PERIC', 5, '3/13/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 2, 83.49, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10475, 'SUPRD', 9, '3/14/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', '4/4/1997 12:00:00 AM', 1, 68.52, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10476, 'HILAA', 8, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 3, 4.41, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10477, 'PRINI', 5, '3/17/1997 12:00:00 AM', '4/14/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 13.02, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10478, 'VICTE', 2, '3/18/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', '3/26/1997 12:00:00 AM', 3, 4.81, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10479, 'RATTC', 3, '3/19/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', '3/21/1997 12:00:00 AM', 3, 708.95, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10480, 'FOLIG', 6, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/24/1997 12:00:00 AM', 2, 1.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10481, 'RICAR', 8, '3/20/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', '3/25/1997 12:00:00 AM', 2, 64.33, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10482, 'LAZYK', 1, '3/21/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 7.48, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10483, 'WHITC', 7, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', 2, 15.28, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10484, 'BSBEV', 3, '3/24/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', '4/1/1997 12:00:00 AM', 3, 6.88, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10485, 'LINOD', 4, '3/25/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', '3/31/1997 12:00:00 AM', 2, 64.45, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10486, 'HILAA', 1, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 30.53, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10487, 'QUEEN', 2, '3/26/1997 12:00:00 AM', '4/23/1997 12:00:00 AM', '3/28/1997 12:00:00 AM', 2, 71.07, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10488, 'FRANK', 8, '3/27/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', '4/2/1997 12:00:00 AM', 2, 4.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10489, 'PICCO', 6, '3/28/1997 12:00:00 AM', '4/25/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 5.29, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10490, 'HILAA', 7, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/3/1997 12:00:00 AM', 2, 210.19, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10491, 'FURIB', 8, '3/31/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', '4/8/1997 12:00:00 AM', 3, 16.96, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10492, 'BOTTM', 3, '4/1/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 1, 62.89, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10493, 'LAMAI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/10/1997 12:00:00 AM', 3, 10.64, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10494, 'COMMI', 4, '4/2/1997 12:00:00 AM', '4/30/1997 12:00:00 AM', '4/9/1997 12:00:00 AM', 2, 65.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10495, 'LAUGB', 3, '4/3/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 3, 4.65, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10496, 'TRADH', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 2, 46.77, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10497, 'LEHMS', 7, '4/4/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', '4/7/1997 12:00:00 AM', 1, 36.21, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10498, 'HILAA', 8, '4/7/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', '4/11/1997 12:00:00 AM', 2, 29.75, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10499, 'LILAS', 4, '4/8/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 102.02, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10500, 'LAMAI', 6, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/17/1997 12:00:00 AM', 1, 42.68, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10501, 'BLAUS', 9, '4/9/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 3, 8.85, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10502, 'PERIC', 2, '4/10/1997 12:00:00 AM', '5/8/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 69.32, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10503, 'HUNGO', 6, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/16/1997 12:00:00 AM', 2, 16.74, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10504, 'WHITC', 4, '4/11/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '4/18/1997 12:00:00 AM', 3, 59.13, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10505, 'MEREP', 3, '4/14/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 7.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10506, 'KOENE', 9, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 21.19, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10507, 'ANTON', 7, '4/15/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', '4/22/1997 12:00:00 AM', 1, 47.45, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10508, 'OTTIK', 1, '4/16/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', '5/13/1997 12:00:00 AM', 2, 4.99, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10509, 'BLAUS', 4, '4/17/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 1, 0.15, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10510, 'SAVEA', 6, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 3, 367.63, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10511, 'BONAP', 4, '4/18/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', '4/21/1997 12:00:00 AM', 3, 350.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10512, 'FAMIA', 7, '4/21/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', '4/24/1997 12:00:00 AM', 2, 3.53, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10513, 'WANDK', 7, '4/22/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', '4/28/1997 12:00:00 AM', 1, 105.65, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10514, 'ERNSH', 3, '4/22/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 2, 789.95, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10515, 'QUICK', 2, '4/23/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 1, 204.47, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10516, 'HUNGO', 2, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 62.78, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10517, 'NORTS', 3, '4/24/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', '4/29/1997 12:00:00 AM', 3, 32.07, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10518, 'TORTU', 4, '4/25/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', '5/5/1997 12:00:00 AM', 2, 218.15, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10519, 'CHOPS', 6, '4/28/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 3, 91.76, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10520, 'SANTG', 7, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/1/1997 12:00:00 AM', 1, 13.37, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10521, 'CACTU', 8, '4/29/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', '5/2/1997 12:00:00 AM', 2, 17.22, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10522, 'LEHMS', 4, '4/30/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/6/1997 12:00:00 AM', 1, 45.33, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10523, 'SEVES', 7, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 2, 77.63, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10524, 'BERGS', 1, '5/1/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 2, 244.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10525, 'BONAP', 1, '5/2/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 11.06, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10526, 'WARTH', 4, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/15/1997 12:00:00 AM', 2, 58.59, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10527, 'QUICK', 7, '5/5/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', '5/7/1997 12:00:00 AM', 1, 41.9, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10528, 'GREAL', 6, '5/6/1997 12:00:00 AM', '5/20/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 3.35, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10529, 'MAISD', 5, '5/7/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', '5/9/1997 12:00:00 AM', 2, 66.69, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10530, 'PICCO', 3, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 2, 339.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10531, 'OCEAN', 7, '5/8/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 8.12, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10532, 'EASTC', 7, '5/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', '5/12/1997 12:00:00 AM', 3, 74.46, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10533, 'FOLKO', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/22/1997 12:00:00 AM', 1, 188.04, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10534, 'LEHMS', 8, '5/12/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', '5/14/1997 12:00:00 AM', 2, 27.94, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10535, 'ANTON', 4, '5/13/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/21/1997 12:00:00 AM', 1, 15.64, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10536, 'LEHMS', 3, '5/14/1997 12:00:00 AM', '6/11/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 58.88, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10537, 'RICSU', 1, '5/14/1997 12:00:00 AM', '5/28/1997 12:00:00 AM', '5/19/1997 12:00:00 AM', 1, 78.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10538, 'BSBEV', 9, '5/15/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', '5/16/1997 12:00:00 AM', 3, 4.87, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10539, 'BSBEV', 6, '5/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 3, 12.36, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10540, 'QUICK', 3, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 3, 1007.64, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10541, 'HANAR', 2, '5/19/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', '5/29/1997 12:00:00 AM', 1, 68.65, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10542, 'KOENE', 1, '5/20/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '5/26/1997 12:00:00 AM', 3, 10.95, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10543, 'LILAS', 8, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/23/1997 12:00:00 AM', 2, 48.17, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10544, 'LONEP', 4, '5/21/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 24.91, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10545, 'LAZYK', 8, '5/22/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', 2, 11.92, 'Lazy K Kountry Store', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10546, 'VICTE', 1, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '5/27/1997 12:00:00 AM', 3, 194.72, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10547, 'SEVES', 3, '5/23/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 178.43, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10548, 'TOMSP', 3, '5/26/1997 12:00:00 AM', '6/23/1997 12:00:00 AM', '6/2/1997 12:00:00 AM', 2, 1.43, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10549, 'QUICK', 5, '5/27/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', '5/30/1997 12:00:00 AM', 1, 171.24, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10550, 'GODOS', 7, '5/28/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 4.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10551, 'FURIB', 4, '5/28/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 3, 72.95, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10552, 'HILAA', 2, '5/29/1997 12:00:00 AM', '6/26/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 1, 83.22, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10553, 'WARTH', 2, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/3/1997 12:00:00 AM', 2, 149.49, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10554, 'OTTIK', 4, '5/30/1997 12:00:00 AM', '6/27/1997 12:00:00 AM', '6/5/1997 12:00:00 AM', 3, 120.97, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10555, 'SAVEA', 6, '6/2/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', '6/4/1997 12:00:00 AM', 3, 252.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10556, 'SIMOB', 2, '6/3/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 9.8, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10557, 'LEHMS', 9, '6/3/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', '6/6/1997 12:00:00 AM', 2, 96.72, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10558, 'AROUT', 1, '6/4/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', '6/10/1997 12:00:00 AM', 2, 72.97, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10559, 'BLONP', 6, '6/5/1997 12:00:00 AM', '7/3/1997 12:00:00 AM', '6/13/1997 12:00:00 AM', 1, 8.05, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10560, 'FRANK', 8, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 1, 36.65, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10561, 'FOLKO', 2, '6/6/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/9/1997 12:00:00 AM', 2, 242.21, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10562, 'REGGC', 1, '6/9/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/12/1997 12:00:00 AM', 1, 22.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10563, 'RICAR', 2, '6/10/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '6/24/1997 12:00:00 AM', 2, 60.43, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10564, 'RATTC', 4, '6/10/1997 12:00:00 AM', '7/8/1997 12:00:00 AM', '6/16/1997 12:00:00 AM', 3, 13.75, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10565, 'MEREP', 8, '6/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 2, 7.15, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10566, 'BLONP', 9, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/18/1997 12:00:00 AM', 1, 88.4, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10567, 'HUNGO', 1, '6/12/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', '6/17/1997 12:00:00 AM', 1, 33.97, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10568, 'GALED', 3, '6/13/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 3, 6.54, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10569, 'RATTC', 5, '6/16/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', '7/11/1997 12:00:00 AM', 1, 58.98, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10570, 'MEREP', 3, '6/17/1997 12:00:00 AM', '7/15/1997 12:00:00 AM', '6/19/1997 12:00:00 AM', 3, 188.99, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10571, 'ERNSH', 8, '6/17/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 3, 26.06, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10572, 'BERGS', 3, '6/18/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', '6/25/1997 12:00:00 AM', 2, 116.43, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10573, 'ANTON', 7, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/20/1997 12:00:00 AM', 3, 84.84, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10574, 'TRAIH', 4, '6/19/1997 12:00:00 AM', '7/17/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 37.6, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10575, 'MORGK', 5, '6/20/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 1, 127.34, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10576, 'TORTU', 3, '6/23/1997 12:00:00 AM', '7/7/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 3, 18.56, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10577, 'TRAIH', 9, '6/23/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '6/30/1997 12:00:00 AM', 2, 25.41, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10578, 'BSBEV', 4, '6/24/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 3, 29.6, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10579, 'LETSS', 1, '6/25/1997 12:00:00 AM', '7/23/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 13.73, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10580, 'OTTIK', 4, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/1/1997 12:00:00 AM', 3, 75.89, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10581, 'FAMIA', 3, '6/26/1997 12:00:00 AM', '7/24/1997 12:00:00 AM', '7/2/1997 12:00:00 AM', 1, 3.01, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10582, 'BLAUS', 3, '6/27/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 27.71, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10583, 'WARTH', 2, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 2, 7.28, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10584, 'BLONP', 4, '6/30/1997 12:00:00 AM', '7/28/1997 12:00:00 AM', '7/4/1997 12:00:00 AM', 1, 59.14, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10585, 'WELLI', 7, '7/1/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 1, 13.41, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10586, 'REGGC', 9, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 0.48, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10587, 'QUEDE', 1, '7/2/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', '7/9/1997 12:00:00 AM', 1, 62.52, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10588, 'QUICK', 2, '7/3/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', '7/10/1997 12:00:00 AM', 3, 194.67, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10589, 'GREAL', 8, '7/4/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 2, 4.42, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10590, 'MEREP', 4, '7/7/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 3, 44.77, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10591, 'VAFFE', 1, '7/7/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 55.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10592, 'LEHMS', 3, '7/8/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 1, 32.1, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10593, 'LEHMS', 7, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', 2, 174.2, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10594, 'OLDWO', 3, '7/9/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', '7/16/1997 12:00:00 AM', 2, 5.24, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10595, 'ERNSH', 2, '7/10/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', '7/14/1997 12:00:00 AM', 1, 96.78, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10596, 'WHITC', 8, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 1, 16.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10597, 'PICCO', 7, '7/11/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 35.12, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10598, 'RATTC', 1, '7/14/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', '7/18/1997 12:00:00 AM', 3, 44.42, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10599, 'BSBEV', 6, '7/15/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 3, 29.98, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10600, 'HUNGC', 4, '7/16/1997 12:00:00 AM', '8/13/1997 12:00:00 AM', '7/21/1997 12:00:00 AM', 1, 45.13, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10601, 'HILAA', 7, '7/16/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 1, 58.3, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10602, 'VAFFE', 8, '7/17/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', '7/22/1997 12:00:00 AM', 2, 2.92, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10603, 'SAVEA', 8, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 2, 48.77, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10604, 'FURIB', 1, '7/18/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 1, 7.46, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10605, 'MEREP', 1, '7/21/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', '7/29/1997 12:00:00 AM', 2, 379.13, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10606, 'TRADH', 4, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/31/1997 12:00:00 AM', 3, 79.4, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10607, 'SAVEA', 5, '7/22/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', '7/25/1997 12:00:00 AM', 1, 200.24, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10608, 'TOMSP', 4, '7/23/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 27.79, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10609, 'DUMON', 7, '7/24/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', '7/30/1997 12:00:00 AM', 2, 1.85, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10610, 'LAMAI', 8, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 1, 26.78, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10611, 'WOLZA', 6, '7/25/1997 12:00:00 AM', '8/22/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 80.65, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10612, 'SAVEA', 1, '7/28/1997 12:00:00 AM', '8/25/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 544.08, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10613, 'HILAA', 4, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 2, 8.11, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10614, 'BLAUS', 8, '7/29/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', '8/1/1997 12:00:00 AM', 3, 1.93, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10615, 'WILMK', 2, '7/30/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', '8/6/1997 12:00:00 AM', 3, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10616, 'GREAL', 1, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/5/1997 12:00:00 AM', 2, 116.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10617, 'GREAL', 4, '7/31/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', '8/4/1997 12:00:00 AM', 2, 18.53, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10618, 'MEREP', 1, '8/1/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/8/1997 12:00:00 AM', 1, 154.68, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10619, 'MEREP', 3, '8/4/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', '8/7/1997 12:00:00 AM', 3, 91.05, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10620, 'LAUGB', 2, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 3, 0.94, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10621, 'ISLAT', 4, '8/5/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 2, 23.73, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10622, 'RICAR', 4, '8/6/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', '8/11/1997 12:00:00 AM', 3, 50.97, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10623, 'FRANK', 8, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/12/1997 12:00:00 AM', 2, 97.18, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10624, 'THECR', 4, '8/7/1997 12:00:00 AM', '9/4/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 94.8, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10625, 'ANATR', 3, '8/8/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', '8/14/1997 12:00:00 AM', 1, 43.9, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10626, 'BERGS', 1, '8/11/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 2, 138.69, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10627, 'SAVEA', 8, '8/11/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 107.46, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10628, 'BLONP', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 30.36, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10629, 'GODOS', 4, '8/12/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', '8/20/1997 12:00:00 AM', 3, 85.46, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10630, 'KOENE', 1, '8/13/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 2, 32.35, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10631, 'LAMAI', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/15/1997 12:00:00 AM', 1, 0.87, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10632, 'WANDK', 8, '8/14/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', '8/19/1997 12:00:00 AM', 1, 41.38, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10633, 'ERNSH', 7, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/18/1997 12:00:00 AM', 3, 477.9, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10634, 'FOLIG', 4, '8/15/1997 12:00:00 AM', '9/12/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 487.38, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10635, 'MAGAA', 8, '8/18/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', '8/21/1997 12:00:00 AM', 3, 47.46, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10636, 'WARTH', 4, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 1.15, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10637, 'QUEEN', 6, '8/19/1997 12:00:00 AM', '9/16/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 1, 201.29, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10638, 'LINOD', 3, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 1, 158.44, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10639, 'SANTG', 7, '8/20/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', '8/27/1997 12:00:00 AM', 3, 38.64, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10640, 'WANDK', 4, '8/21/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', '8/28/1997 12:00:00 AM', 1, 23.55, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10641, 'HILAA', 4, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '8/26/1997 12:00:00 AM', 2, 179.61, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10642, 'SIMOB', 7, '8/22/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', '9/5/1997 12:00:00 AM', 3, 41.89, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10643, 'ALFKI', 6, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 29.46, 'Alfreds Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10644, 'WELLI', 3, '8/25/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', '9/1/1997 12:00:00 AM', 2, 0.14, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10645, 'HANAR', 4, '8/26/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', '9/2/1997 12:00:00 AM', 1, 12.41, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10646, 'HUNGO', 9, '8/27/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 142.33, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10647, 'QUEDE', 4, '8/27/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 2, 45.54, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10648, 'RICAR', 5, '8/28/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/9/1997 12:00:00 AM', 2, 14.25, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10649, 'MAISD', 5, '8/28/1997 12:00:00 AM', '9/25/1997 12:00:00 AM', '8/29/1997 12:00:00 AM', 3, 6.2, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10650, 'FAMIA', 5, '8/29/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', '9/3/1997 12:00:00 AM', 3, 176.81, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10651, 'WANDK', 8, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 20.6, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10652, 'GOURL', 4, '9/1/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 2, 7.14, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10653, 'FRANK', 1, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 93.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10654, 'BERGS', 5, '9/2/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 1, 55.26, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10655, 'REGGC', 1, '9/3/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/11/1997 12:00:00 AM', 2, 4.41, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10656, 'GREAL', 6, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 1, 57.15, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10657, 'SAVEA', 2, '9/4/1997 12:00:00 AM', '10/2/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 2, 352.69, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10658, 'QUICK', 4, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/8/1997 12:00:00 AM', 1, 364.15, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10659, 'QUEEN', 7, '9/5/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', '9/10/1997 12:00:00 AM', 2, 105.81, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10660, 'HUNGC', 8, '9/8/1997 12:00:00 AM', '10/6/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 1, 111.29, 'Hungry Coyote Import Store', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10661, 'HUNGO', 7, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/15/1997 12:00:00 AM', 3, 17.55, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10662, 'LONEP', 3, '9/9/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 2, 1.28, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10663, 'BONAP', 2, '9/10/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 113.15, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10664, 'FURIB', 1, '9/10/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 3, 1.27, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10665, 'LONEP', 1, '9/11/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', '9/17/1997 12:00:00 AM', 2, 26.31, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10666, 'RICSU', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 2, 232.42, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10667, 'ERNSH', 7, '9/12/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 78.09, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10668, 'WANDK', 1, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 47.22, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10669, 'SIMOB', 2, '9/15/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '9/22/1997 12:00:00 AM', 1, 24.39, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10670, 'FRANK', 4, '9/16/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', '9/18/1997 12:00:00 AM', 1, 203.48, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10671, 'FRANR', 1, '9/17/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '9/24/1997 12:00:00 AM', 1, 30.34, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10672, 'BERGS', 9, '9/17/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 2, 95.75, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10673, 'WILMK', 2, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/19/1997 12:00:00 AM', 1, 22.76, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10674, 'ISLAT', 4, '9/18/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 2, 0.9, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10675, 'FRANK', 5, '9/19/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', '9/23/1997 12:00:00 AM', 2, 31.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10676, 'TORTU', 2, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/29/1997 12:00:00 AM', 2, 2.01, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10677, 'ANTON', 1, '9/22/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 3, 4.03, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10678, 'SAVEA', 7, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 3, 388.98, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10679, 'BLONP', 8, '9/23/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 27.94, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10680, 'OLDWO', 1, '9/24/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', '9/26/1997 12:00:00 AM', 1, 26.61, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10681, 'GREAL', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 3, 76.13, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10682, 'ANTON', 3, '9/25/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 2, 36.13, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10683, 'DUMON', 2, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '10/1/1997 12:00:00 AM', 1, 4.4, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10684, 'OTTIK', 3, '9/26/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', '9/30/1997 12:00:00 AM', 1, 145.63, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10685, 'GOURL', 4, '9/29/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 2, 33.75, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10686, 'PICCO', 2, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/8/1997 12:00:00 AM', 1, 96.5, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10687, 'HUNGO', 9, '9/30/1997 12:00:00 AM', '10/28/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', 2, 296.43, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10688, 'VAFFE', 4, '10/1/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 299.09, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10689, 'BERGS', 1, '10/1/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', '10/7/1997 12:00:00 AM', 2, 13.42, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10690, 'HANAR', 1, '10/2/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/3/1997 12:00:00 AM', 1, 15.8, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10691, 'QUICK', 2, '10/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '10/22/1997 12:00:00 AM', 2, 810.05, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10692, 'ALFKI', 4, '10/3/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 2, 61.02, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10693, 'WHITC', 3, '10/6/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', '10/10/1997 12:00:00 AM', 3, 139.34, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10694, 'QUICK', 8, '10/6/1997 12:00:00 AM', '11/3/1997 12:00:00 AM', '10/9/1997 12:00:00 AM', 3, 398.36, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10695, 'WILMK', 7, '10/7/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 16.72, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10696, 'WHITC', 8, '10/8/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 3, 102.55, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10697, 'LINOD', 3, '10/8/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', '10/14/1997 12:00:00 AM', 1, 45.52, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10698, 'ERNSH', 4, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/17/1997 12:00:00 AM', 1, 272.47, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10699, 'MORGK', 3, '10/9/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/13/1997 12:00:00 AM', 3, 0.58, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10700, 'SAVEA', 3, '10/10/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', '10/16/1997 12:00:00 AM', 1, 65.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10701, 'HUNGO', 6, '10/13/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', '10/15/1997 12:00:00 AM', 3, 220.31, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10702, 'ALFKI', 4, '10/13/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 1, 23.94, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10703, 'FOLKO', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '10/20/1997 12:00:00 AM', 2, 152.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10704, 'QUEEN', 6, '10/14/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 4.78, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10705, 'HILAA', 9, '10/15/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 3.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10706, 'OLDWO', 8, '10/16/1997 12:00:00 AM', '11/13/1997 12:00:00 AM', '10/21/1997 12:00:00 AM', 3, 135.63, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10707, 'AROUT', 4, '10/16/1997 12:00:00 AM', '10/30/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 3, 21.74, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10708, 'THEBI', 6, '10/17/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 2.96, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10709, 'GOURL', 1, '10/17/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', '11/20/1997 12:00:00 AM', 3, 210.8, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10710, 'FRANS', 1, '10/20/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '10/23/1997 12:00:00 AM', 1, 4.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10711, 'SAVEA', 5, '10/21/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 52.41, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10712, 'HUNGO', 3, '10/21/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 1, 89.93, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10713, 'SAVEA', 1, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/24/1997 12:00:00 AM', 1, 167.05, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10714, 'SAVEA', 5, '10/22/1997 12:00:00 AM', '11/19/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 3, 24.49, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10715, 'BONAP', 3, '10/23/1997 12:00:00 AM', '11/6/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 1, 63.2, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10716, 'RANCH', 4, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/27/1997 12:00:00 AM', 2, 22.57, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10717, 'FRANK', 1, '10/24/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 2, 59.25, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10718, 'KOENE', 1, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '10/29/1997 12:00:00 AM', 3, 170.88, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10719, 'LETSS', 8, '10/27/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 51.44, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10720, 'QUEDE', 8, '10/28/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 9.53, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10721, 'QUICK', 5, '10/29/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', '10/31/1997 12:00:00 AM', 3, 48.92, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10722, 'SAVEA', 8, '10/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/4/1997 12:00:00 AM', 1, 74.58, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10723, 'WHITC', 3, '10/30/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 1, 21.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10724, 'MEREP', 8, '10/30/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 2, 57.75, 'M�re Paillarde', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10725, 'FAMIA', 4, '10/31/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/5/1997 12:00:00 AM', 3, 10.83, 'Familia Arquibaldo', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10726, 'EASTC', 4, '11/3/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 16.56, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10727, 'REGGC', 2, '11/3/1997 12:00:00 AM', '12/1/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', 1, 89.9, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10728, 'QUEEN', 4, '11/4/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', '11/11/1997 12:00:00 AM', 2, 58.33, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10729, 'LINOD', 8, '11/4/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 3, 141.06, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10730, 'BONAP', 5, '11/5/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 20.12, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10731, 'CHOPS', 7, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/14/1997 12:00:00 AM', 1, 96.65, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10732, 'BONAP', 3, '11/6/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', '11/7/1997 12:00:00 AM', 1, 16.97, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10733, 'BERGS', 1, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/10/1997 12:00:00 AM', 3, 110.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10734, 'GOURL', 2, '11/7/1997 12:00:00 AM', '12/5/1997 12:00:00 AM', '11/12/1997 12:00:00 AM', 3, 1.63, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10735, 'LETSS', 6, '11/10/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 45.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10736, 'HUNGO', 9, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 44.1, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10737, 'VINET', 2, '11/11/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 2, 7.79, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10738, 'SPECD', 2, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 1, 2.91, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10739, 'VINET', 3, '11/12/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', '11/17/1997 12:00:00 AM', 3, 11.08, 'Vins et alcools Chevalier', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10740, 'WHITC', 4, '11/13/1997 12:00:00 AM', '12/11/1997 12:00:00 AM', '11/25/1997 12:00:00 AM', 2, 81.88, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10741, 'AROUT', 4, '11/14/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 10.96, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10742, 'BOTTM', 3, '11/14/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', '11/18/1997 12:00:00 AM', 3, 243.73, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10743, 'AROUT', 1, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10744, 'VAFFE', 6, '11/17/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 69.19, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10745, 'QUICK', 9, '11/18/1997 12:00:00 AM', '12/16/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 3.52, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10746, 'CHOPS', 1, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/21/1997 12:00:00 AM', 3, 31.43, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10747, 'PICCO', 6, '11/19/1997 12:00:00 AM', '12/17/1997 12:00:00 AM', '11/26/1997 12:00:00 AM', 1, 117.33, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10748, 'SAVEA', 3, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 1, 232.55, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10749, 'ISLAT', 4, '11/20/1997 12:00:00 AM', '12/18/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 61.53, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10750, 'WARTH', 9, '11/21/1997 12:00:00 AM', '12/19/1997 12:00:00 AM', '11/24/1997 12:00:00 AM', 1, 79.3, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10751, 'RICSU', 3, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '12/3/1997 12:00:00 AM', 3, 130.79, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10752, 'NORTS', 2, '11/24/1997 12:00:00 AM', '12/22/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 3, 1.39, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10753, 'FRANS', 3, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 1, 7.7, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10754, 'MAGAA', 6, '11/25/1997 12:00:00 AM', '12/23/1997 12:00:00 AM', '11/27/1997 12:00:00 AM', 3, 2.38, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10755, 'BONAP', 4, '11/26/1997 12:00:00 AM', '12/24/1997 12:00:00 AM', '11/28/1997 12:00:00 AM', 2, 16.71, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10756, 'SPLIR', 8, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/2/1997 12:00:00 AM', 2, 73.21, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10757, 'SAVEA', 6, '11/27/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/15/1997 12:00:00 AM', 1, 8.19, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10758, 'RICSU', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/4/1997 12:00:00 AM', 3, 138.17, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10759, 'ANATR', 3, '11/28/1997 12:00:00 AM', '12/26/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 3, 11.99, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10760, 'MAISD', 4, '12/1/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '12/10/1997 12:00:00 AM', 1, 155.64, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10761, 'RATTC', 5, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 2, 18.66, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10762, 'FOLKO', 3, '12/2/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 328.74, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10763, 'FOLIG', 3, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 37.35, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10764, 'ERNSH', 6, '12/3/1997 12:00:00 AM', '12/31/1997 12:00:00 AM', '12/8/1997 12:00:00 AM', 3, 145.45, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10765, 'QUICK', 3, '12/4/1997 12:00:00 AM', '1/1/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 3, 42.74, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10766, 'OTTIK', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/9/1997 12:00:00 AM', 1, 157.55, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10767, 'SUPRD', 4, '12/5/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 3, 1.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10768, 'AROUT', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/15/1997 12:00:00 AM', 2, 146.32, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10769, 'VAFFE', 3, '12/8/1997 12:00:00 AM', '1/5/1998 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 65.06, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10770, 'HANAR', 8, '12/9/1997 12:00:00 AM', '1/6/1998 12:00:00 AM', '12/17/1997 12:00:00 AM', 3, 5.32, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10771, 'ERNSH', 9, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 11.19, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10772, 'LEHMS', 3, '12/10/1997 12:00:00 AM', '1/7/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 91.28, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10773, 'ERNSH', 1, '12/11/1997 12:00:00 AM', '1/8/1998 12:00:00 AM', '12/16/1997 12:00:00 AM', 3, 96.43, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10774, 'FOLKO', 4, '12/11/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', '12/12/1997 12:00:00 AM', 1, 48.2, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10775, 'THECR', 7, '12/12/1997 12:00:00 AM', '1/9/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 20.25, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10776, 'ERNSH', 1, '12/15/1997 12:00:00 AM', '1/12/1998 12:00:00 AM', '12/18/1997 12:00:00 AM', 3, 351.53, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10777, 'GOURL', 7, '12/15/1997 12:00:00 AM', '12/29/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 3.01, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10778, 'BERGS', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 1, 6.79, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10779, 'MORGK', 3, '12/16/1997 12:00:00 AM', '1/13/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 2, 58.13, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10780, 'LILAS', 2, '12/16/1997 12:00:00 AM', '12/30/1997 12:00:00 AM', '12/25/1997 12:00:00 AM', 1, 42.13, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10781, 'WARTH', 2, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 3, 73.16, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10782, 'CACTU', 9, '12/17/1997 12:00:00 AM', '1/14/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 1.1, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10783, 'HANAR', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/19/1997 12:00:00 AM', 2, 124.98, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10784, 'MAGAA', 4, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/22/1997 12:00:00 AM', 3, 70.09, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10785, 'GROSR', 1, '12/18/1997 12:00:00 AM', '1/15/1998 12:00:00 AM', '12/24/1997 12:00:00 AM', 3, 1.51, 'GROSELLA-Restaurante', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10786, 'QUEEN', 8, '12/19/1997 12:00:00 AM', '1/16/1998 12:00:00 AM', '12/23/1997 12:00:00 AM', 1, 110.87, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10787, 'LAMAI', 2, '12/19/1997 12:00:00 AM', '1/2/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 249.93, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10788, 'QUICK', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 42.7, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10789, 'FOLIG', 1, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 100.6, 'Folies gourmandes', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10790, 'GOURL', 6, '12/22/1997 12:00:00 AM', '1/19/1998 12:00:00 AM', '12/26/1997 12:00:00 AM', 1, 28.23, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10791, 'FRANK', 6, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/1/1998 12:00:00 AM', 2, 16.85, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10792, 'WOLZA', 1, '12/23/1997 12:00:00 AM', '1/20/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 3, 23.79, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10793, 'AROUT', 3, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 3, 4.52, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10794, 'QUEDE', 6, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 1, 21.49, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10795, 'ERNSH', 8, '12/24/1997 12:00:00 AM', '1/21/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', 2, 126.66, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10796, 'HILAA', 3, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 26.52, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10797, 'DRACD', 7, '12/25/1997 12:00:00 AM', '1/22/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 33.35, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10798, 'ISLAT', 2, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 1, 2.33, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10799, 'KOENE', 9, '12/26/1997 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 30.76, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10800, 'SEVES', 1, '12/26/1997 12:00:00 AM', '1/23/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 3, 137.44, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10801, 'BOLID', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '12/31/1997 12:00:00 AM', 2, 97.09, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10802, 'SIMOB', 4, '12/29/1997 12:00:00 AM', '1/26/1998 12:00:00 AM', '1/2/1998 12:00:00 AM', 2, 257.26, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10803, 'WELLI', 4, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/6/1998 12:00:00 AM', 1, 55.23, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10804, 'SEVES', 6, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 2, 27.33, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10805, 'THEBI', 2, '12/30/1997 12:00:00 AM', '1/27/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 237.34, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10806, 'VICTE', 3, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/5/1998 12:00:00 AM', 2, 22.11, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10807, 'FRANS', 4, '12/31/1997 12:00:00 AM', '1/28/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.36, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10808, 'OLDWO', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 3, 45.53, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10809, 'WELLI', 7, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 1, 4.87, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10810, 'LAUGB', 2, '1/1/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', '1/7/1998 12:00:00 AM', 3, 4.33, 'Laughing Bacchus Wine Cellars', '2319 Elm St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10811, 'LINOD', 8, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/8/1998 12:00:00 AM', 1, 31.22, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10812, 'REGGC', 5, '1/2/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 1, 59.78, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10813, 'RICAR', 1, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/9/1998 12:00:00 AM', 1, 47.38, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10814, 'VICTE', 3, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 130.94, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10815, 'SAVEA', 2, '1/5/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 3, 14.62, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10816, 'GREAL', 4, '1/6/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 2, 719.78, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10817, 'KOENE', 3, '1/6/1998 12:00:00 AM', '1/20/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 306.07, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10818, 'MAGAA', 7, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/12/1998 12:00:00 AM', 3, 65.48, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10819, 'CACTU', 2, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 19.76, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10820, 'RATTC', 3, '1/7/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 37.52, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10821, 'SPLIR', 1, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/15/1998 12:00:00 AM', 1, 36.68, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10822, 'TRAIH', 6, '1/8/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '1/16/1998 12:00:00 AM', 3, 7, 'Trail''s Head Gourmet Provisioners', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10823, 'LILAS', 5, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/13/1998 12:00:00 AM', 2, 163.97, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10824, 'FOLKO', 8, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 1.23, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10825, 'DRACD', 1, '1/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', '1/14/1998 12:00:00 AM', 1, 79.25, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10826, 'BLONP', 6, '1/12/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 1, 7.09, 'Blondel p�re et fils', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10827, 'BONAP', 1, '1/12/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 63.54, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10828, 'RANCH', 9, '1/13/1998 12:00:00 AM', '1/27/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 90.85, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10829, 'ISLAT', 9, '1/13/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 1, 154.72, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10830, 'TRADH', 4, '1/13/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 2, 81.83, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10831, 'SANTG', 3, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 72.19, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10832, 'LAMAI', 2, '1/14/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 2, 43.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10833, 'OTTIK', 6, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 2, 71.49, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10834, 'TRADH', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/19/1998 12:00:00 AM', 3, 29.78, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10835, 'ALFKI', 1, '1/15/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 3, 69.53, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10836, 'ERNSH', 7, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/21/1998 12:00:00 AM', 1, 411.88, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10837, 'BERGS', 9, '1/16/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 13.32, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10838, 'LINOD', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 59.28, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10839, 'TRADH', 3, '1/19/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '1/22/1998 12:00:00 AM', 3, 35.43, 'Tradi�ao Hipermercados', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10840, 'LINOD', 4, '1/19/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 2, 2.71, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10841, 'SUPRD', 5, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 424.3, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10842, 'TORTU', 1, '1/20/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 3, 54.42, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10843, 'VICTE', 4, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 9.26, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10844, 'PICCO', 8, '1/21/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', '1/26/1998 12:00:00 AM', 2, 25.22, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10845, 'QUICK', 8, '1/21/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 212.98, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10846, 'SUPRD', 2, '1/22/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '1/23/1998 12:00:00 AM', 3, 56.46, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10847, 'SAVEA', 4, '1/22/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 3, 487.57, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10848, 'CONSH', 7, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/29/1998 12:00:00 AM', 2, 38.24, 'Consolidated Holdings', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10849, 'KOENE', 9, '1/23/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 2, 0.56, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10850, 'VICTE', 1, '1/23/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 49.19, 'Victuailles en stock', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10851, 'RICAR', 5, '1/26/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 1, 160.55, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10852, 'RATTC', 8, '1/26/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', '1/30/1998 12:00:00 AM', 1, 174.05, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10853, 'BLAUS', 9, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 2, 53.83, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10854, 'ERNSH', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/5/1998 12:00:00 AM', 2, 100.22, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10855, 'OLDWO', 3, '1/27/1998 12:00:00 AM', '2/24/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 1, 170.97, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10856, 'ANTON', 3, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 58.43, 'Antonio Moreno Taquer�a', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10857, 'BERGS', 8, '1/28/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', '2/6/1998 12:00:00 AM', 2, 188.85, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10858, 'LACOR', 2, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/3/1998 12:00:00 AM', 1, 52.51, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10859, 'FRANK', 1, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 76.1, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10860, 'FRANR', 3, '1/29/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', '2/4/1998 12:00:00 AM', 3, 19.26, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10861, 'WHITC', 4, '1/30/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 14.93, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10862, 'LEHMS', 8, '1/30/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/2/1998 12:00:00 AM', 2, 53.23, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10863, 'HILAA', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/17/1998 12:00:00 AM', 2, 30.26, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10864, 'AROUT', 4, '2/2/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 3.04, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10865, 'QUICK', 2, '2/2/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 348.14, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10866, 'BERGS', 5, '2/3/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 109.11, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10867, 'LONEP', 6, '2/3/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 1, 1.93, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10868, 'QUEEN', 7, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 191.27, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10869, 'SEVES', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 143.28, 'Seven Seas Imports', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10870, 'WOLZA', 5, '2/4/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 3, 12.04, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10871, 'BONAP', 9, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/10/1998 12:00:00 AM', 2, 112.27, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10872, 'GODOS', 5, '2/5/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 2, 175.32, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10873, 'WILMK', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/9/1998 12:00:00 AM', 1, 0.82, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10874, 'GODOS', 5, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '2/11/1998 12:00:00 AM', 2, 19.58, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10875, 'BERGS', 4, '2/6/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 2, 32.37, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10876, 'BONAP', 7, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 60.42, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10877, 'RICAR', 1, '2/9/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 1, 38.06, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10878, 'QUICK', 4, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 1, 46.69, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10879, 'WILMK', 3, '2/10/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', '2/12/1998 12:00:00 AM', 3, 8.5, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10880, 'FOLKO', 7, '2/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 88.01, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10881, 'CACTU', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 2.84, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10882, 'SAVEA', 4, '2/11/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 23.1, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10883, 'LONEP', 8, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 3, 0.53, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10884, 'LETSS', 4, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/13/1998 12:00:00 AM', 2, 90.97, 'Let''s Stop N Shop', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10885, 'SUPRD', 6, '2/12/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 3, 5.64, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10886, 'HANAR', 1, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 4.99, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10887, 'GALED', 8, '2/13/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', '2/16/1998 12:00:00 AM', 3, 1.25, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10888, 'GODOS', 1, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 2, 51.87, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10889, 'RATTC', 9, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 3, 280.61, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10890, 'DUMON', 7, '2/16/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', '2/18/1998 12:00:00 AM', 1, 32.76, 'Du monde entier', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10891, 'LEHMS', 7, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 20.37, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10892, 'MAISD', 4, '2/17/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', '2/19/1998 12:00:00 AM', 2, 120.27, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10893, 'KOENE', 9, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 2, 77.78, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10894, 'SAVEA', 1, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/20/1998 12:00:00 AM', 1, 116.13, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10895, 'ERNSH', 3, '2/18/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', '2/23/1998 12:00:00 AM', 1, 162.75, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10896, 'MAISD', 7, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 32.45, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10897, 'HUNGO', 3, '2/19/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', '2/25/1998 12:00:00 AM', 2, 603.54, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10898, 'OCEAN', 4, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 1.27, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10899, 'LILAS', 5, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 3, 1.21, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10900, 'WELLI', 1, '2/20/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 1.66, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10901, 'HILAA', 4, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '2/26/1998 12:00:00 AM', 1, 62.09, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10902, 'FOLKO', 1, '2/23/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 1, 44.15, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10903, 'HANAR', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 36.71, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10904, 'WHITC', 3, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 162.95, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10905, 'WELLI', 9, '2/24/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 13.72, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10906, 'WOLZA', 4, '2/25/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', '3/3/1998 12:00:00 AM', 3, 26.29, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10907, 'SPECD', 6, '2/25/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', '2/27/1998 12:00:00 AM', 3, 9.19, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10908, 'REGGC', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/6/1998 12:00:00 AM', 2, 32.96, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10909, 'SANTG', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/10/1998 12:00:00 AM', 2, 53.05, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10910, 'WILMK', 1, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 3, 38.11, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10911, 'GODOS', 3, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 1, 38.19, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10912, 'HUNGO', 2, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 580.91, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10913, 'QUEEN', 4, '2/26/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 1, 33.05, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10914, 'QUEEN', 6, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 1, 21.19, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10915, 'TORTU', 2, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/2/1998 12:00:00 AM', 2, 3.51, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10916, 'RANCH', 1, '2/27/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 63.77, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10917, 'ROMEY', 4, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 2, 8.29, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10918, 'BOTTM', 3, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 48.83, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10919, 'LINOD', 2, '3/2/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/4/1998 12:00:00 AM', 2, 19.8, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10920, 'AROUT', 4, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 2, 29.61, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10921, 'VAFFE', 1, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/9/1998 12:00:00 AM', 1, 176.48, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10922, 'HANAR', 5, '3/3/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', '3/5/1998 12:00:00 AM', 3, 62.74, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10923, 'LAMAI', 7, '3/3/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 68.26, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10924, 'BERGS', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 2, 151.52, 'Berglunds snabbk�p', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10925, 'HANAR', 3, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 1, 2.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10926, 'ANATR', 4, '3/4/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', '3/11/1998 12:00:00 AM', 3, 39.92, 'Ana Trujillo Emparedados y helados', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10927, 'LACOR', 4, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 19.79, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10928, 'GALED', 1, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 1.36, 'Galer�a del gastron�mo', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '8022', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10929, 'FRANK', 6, '3/5/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 1, 33.93, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10930, 'SUPRD', 4, '3/6/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 15.55, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10931, 'RICSU', 4, '3/6/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 13.6, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10932, 'BONAP', 8, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 134.64, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10933, 'ISLAT', 6, '3/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 3, 54.15, 'Island Trading', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10934, 'LEHMS', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/12/1998 12:00:00 AM', 3, 32.01, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10935, 'WELLI', 4, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 47.59, 'Wellington Importadora', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10936, 'GREAL', 3, '3/9/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 2, 33.68, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10937, 'CACTU', 7, '3/10/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 31.51, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10938, 'QUICK', 3, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 31.89, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10939, 'MAGAA', 2, '3/10/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 2, 76.33, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10940, 'BONAP', 8, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 3, 19.77, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10941, 'SAVEA', 7, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 400.81, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10942, 'REGGC', 9, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 3, 17.95, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10943, 'BSBEV', 4, '3/11/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 2.17, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10944, 'BOTTM', 6, '3/12/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', '3/13/1998 12:00:00 AM', 3, 52.92, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10945, 'MORGK', 4, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/18/1998 12:00:00 AM', 1, 10.22, 'Morgenstern Gesundkost', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10946, 'VAFFE', 1, '3/12/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 2, 27.2, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10947, 'BSBEV', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/16/1998 12:00:00 AM', 2, 3.26, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10948, 'GODOS', 3, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/19/1998 12:00:00 AM', 3, 23.39, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10949, 'BOTTM', 2, '3/13/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', '3/17/1998 12:00:00 AM', 3, 74.44, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10950, 'MAGAA', 1, '3/16/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 2.5, 'Magazzini Alimentari Riuniti', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10951, 'RICSU', 9, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 2, 30.85, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10952, 'ALFKI', 1, '3/16/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 1, 40.42, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10953, 'AROUT', 9, '3/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', '3/25/1998 12:00:00 AM', 2, 23.72, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10954, 'LINOD', 5, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 1, 27.91, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10955, 'FOLKO', 8, '3/17/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 3.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10956, 'BLAUS', 6, '3/17/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '3/20/1998 12:00:00 AM', 2, 44.65, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10957, 'HILAA', 8, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 105.36, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10958, 'OCEAN', 7, '3/18/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 49.56, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10959, 'GOURL', 6, '3/18/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 4.98, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10960, 'HILAA', 3, '3/19/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 2.08, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10961, 'QUEEN', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 1, 104.47, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10962, 'QUICK', 8, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/23/1998 12:00:00 AM', 2, 275.79, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10963, 'FURIB', 9, '3/19/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 3, 2.7, 'Furia Bacalhau e Frutos do Mar', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10964, 'SPECD', 3, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/24/1998 12:00:00 AM', 2, 87.38, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10965, 'OLDWO', 6, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 3, 144.38, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10966, 'CHOPS', 4, '3/20/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 27.19, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10967, 'TOMSP', 2, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 62.22, 'Toms Spezialit�ten', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10968, 'ERNSH', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '4/1/1998 12:00:00 AM', 3, 74.6, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10969, 'COMMI', 1, '3/23/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', '3/30/1998 12:00:00 AM', 2, 0.21, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10970, 'BOLID', 9, '3/24/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 1, 16.16, 'B�lido Comidas preparadas', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10971, 'FRANR', 2, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 121.82, 'France restauration', '54, rue Royale', 'Nantes', NULL, '44000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10972, 'LACOR', 4, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/26/1998 12:00:00 AM', 2, 0.02, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10973, 'LACOR', 6, '3/24/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 2, 15.17, 'La corne d''abondance', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10974, 'SPLIR', 3, '3/25/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 12.96, 'Split Rail Beer & Ale', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10975, 'BOTTM', 1, '3/25/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', '3/27/1998 12:00:00 AM', 3, 32.27, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10976, 'HILAA', 1, '3/25/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 1, 37.97, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10977, 'FOLKO', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 208.5, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10978, 'MAISD', 9, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 2, 32.82, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10979, 'ERNSH', 8, '3/26/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '3/31/1998 12:00:00 AM', 2, 353.07, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10980, 'FOLKO', 4, '3/27/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 1, 1.26, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10981, 'HANAR', 1, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 2, 193.37, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10982, 'BOTTM', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 1, 14.01, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10983, 'SAVEA', 2, '3/27/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 2, 657.54, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10984, 'SAVEA', 1, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 211.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10985, 'HUNGO', 2, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 91.51, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10986, 'OCEAN', 8, '3/30/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 217.86, 'Oc�ano Atl�ntico Ltda.', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10987, 'EASTC', 8, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 1, 185.48, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10988, 'RATTC', 3, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 61.14, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10989, 'QUEDE', 2, '3/31/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/2/1998 12:00:00 AM', 1, 34.76, 'Que Del�cia', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10990, 'ERNSH', 2, '4/1/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 3, 117.61, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10991, 'QUICK', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/7/1998 12:00:00 AM', 1, 38.51, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10992, 'THEBI', 1, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/3/1998 12:00:00 AM', 3, 4.27, 'The Big Cheese', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10993, 'FOLKO', 7, '4/1/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 3, 8.81, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10994, 'VAFFE', 2, '4/2/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', '4/9/1998 12:00:00 AM', 3, 65.53, 'Vaffeljernet', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10995, 'PERIC', 1, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/6/1998 12:00:00 AM', 3, 46, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10996, 'QUICK', 4, '4/2/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 1.12, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10997, 'LILAS', 8, '4/3/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 73.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10998, 'WOLZA', 8, '4/3/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 2, 20.31, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (10999, 'OTTIK', 6, '4/3/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 2, 96.35, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11000, 'RATTC', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 3, 55.12, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11001, 'FOLKO', 2, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/14/1998 12:00:00 AM', 2, 197.3, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11002, 'SAVEA', 4, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 1, 141.16, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11003, 'THECR', 3, '4/6/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', '4/8/1998 12:00:00 AM', 3, 14.91, 'The Cracker Box', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11004, 'MAISD', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 44.84, 'Maison Dewey', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11005, 'WILMK', 2, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 0.75, 'Wilman Kala', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11006, 'GREAL', 3, '4/7/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 2, 25.19, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11007, 'PRINI', 8, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 202.24, 'Princesa Isabel Vinhos', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11008, 'ERNSH', 7, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', NULL, 3, 79.46, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11009, 'GODOS', 2, '4/8/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 59.11, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11010, 'REGGC', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 2, 28.71, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11011, 'ALFKI', 3, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 1, 1.21, 'Alfred''s Futterkiste', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11012, 'FRANK', 1, '4/9/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', '4/17/1998 12:00:00 AM', 3, 242.95, 'Frankenversand', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11013, 'ROMEY', 2, '4/9/1998 12:00:00 AM', '5/7/1998 12:00:00 AM', '4/10/1998 12:00:00 AM', 1, 32.99, 'Romero y tomillo', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11014, 'LINOD', 2, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/15/1998 12:00:00 AM', 3, 23.6, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11015, 'SANTG', 2, '4/10/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 4.62, 'Sant� Gourmet', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11016, 'AROUT', 9, '4/10/1998 12:00:00 AM', '5/8/1998 12:00:00 AM', '4/13/1998 12:00:00 AM', 2, 33.8, 'Around the Horn', 'Brook Farm Stratford St. Mary', 'Colchester', 'Essex', 'CO7 6JX', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11017, 'ERNSH', 9, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 2, 754.26, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11018, 'LONEP', 4, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 11.65, 'Lonesome Pine Restaurant', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11019, 'RANCH', 6, '4/13/1998 12:00:00 AM', '5/11/1998 12:00:00 AM', NULL, 3, 3.17, 'Rancho grande', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11020, 'OTTIK', 2, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/16/1998 12:00:00 AM', 2, 43.3, 'Ottilies K�seladen', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11021, 'QUICK', 3, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '4/21/1998 12:00:00 AM', 1, 297.18, 'QUICK-Stop', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11022, 'HANAR', 9, '4/14/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 6.27, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11023, 'BSBEV', 1, '4/14/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 123.83, 'B''s Beverages', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11024, 'EASTC', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 74.36, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11025, 'WARTH', 6, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 3, 29.17, 'Wartian Herkku', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11026, 'FRANS', 4, '4/15/1998 12:00:00 AM', '5/13/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 1, 47.09, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11027, 'BOTTM', 1, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/20/1998 12:00:00 AM', 1, 52.52, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11028, 'KOENE', 2, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 1, 29.59, 'K�niglich Essen', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11029, 'CHOPS', 4, '4/16/1998 12:00:00 AM', '5/14/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 47.84, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11030, 'SAVEA', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 2, 830.75, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11031, 'SAVEA', 6, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 227.22, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11032, 'WHITC', 2, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 606.19, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11033, 'RICSU', 7, '4/17/1998 12:00:00 AM', '5/15/1998 12:00:00 AM', '4/23/1998 12:00:00 AM', 3, 84.74, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11034, 'OLDWO', 8, '4/20/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 40.32, 'Old World Delicatessen', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11035, 'SUPRD', 2, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 0.17, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11036, 'DRACD', 8, '4/20/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '4/22/1998 12:00:00 AM', 3, 149.47, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11037, 'GODOS', 7, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/27/1998 12:00:00 AM', 1, 3.2, 'Godos Cocina T�pica', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11038, 'SUPRD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 2, 29.59, 'Supr�mes d�lices', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11039, 'LINOD', 1, '4/21/1998 12:00:00 AM', '5/19/1998 12:00:00 AM', NULL, 2, 65, 'LINO-Delicateses', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11040, 'GREAL', 4, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', NULL, 3, 18.84, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11041, 'CHOPS', 3, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/28/1998 12:00:00 AM', 2, 48.22, 'Chop-suey Chinese', 'Hauptstr. 31', 'Bern', NULL, '3012', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11042, 'COMMI', 2, '4/22/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 29.99, 'Com�rcio Mineiro', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11043, 'SPECD', 5, '4/22/1998 12:00:00 AM', '5/20/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 8.8, 'Sp�cialit�s du monde', '25, rue Lauriston', 'Paris', NULL, '75016', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11044, 'WOLZA', 4, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 8.72, 'Wolski Zajazd', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11045, 'BOTTM', 6, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', NULL, 2, 70.58, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11046, 'WANDK', 8, '4/23/1998 12:00:00 AM', '5/21/1998 12:00:00 AM', '4/24/1998 12:00:00 AM', 2, 71.64, 'Die Wandernde Kuh', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11047, 'EASTC', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 46.62, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11048, 'BOTTM', 7, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '4/30/1998 12:00:00 AM', 3, 24.12, 'Bottom-Dollar Markets', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11049, 'GOURL', 3, '4/24/1998 12:00:00 AM', '5/22/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 8.34, 'Gourmet Lanchonetes', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11050, 'FOLKO', 8, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 59.41, 'Folk och f� HB', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11051, 'LAMAI', 7, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', NULL, 3, 2.79, 'La maison d''Asie', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11052, 'HANAR', 3, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 1, 67.26, 'Hanari Carnes', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11053, 'PICCO', 2, '4/27/1998 12:00:00 AM', '5/25/1998 12:00:00 AM', '4/29/1998 12:00:00 AM', 2, 53.05, 'Piccolo und mehr', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11054, 'CACTU', 8, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', NULL, 1, 0.33, 'Cactus Comidas para llevar', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11055, 'HILAA', 7, '4/28/1998 12:00:00 AM', '5/26/1998 12:00:00 AM', '5/5/1998 12:00:00 AM', 2, 120.92, 'HILARION-Abastos', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11056, 'EASTC', 8, '4/28/1998 12:00:00 AM', '5/12/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 2, 278.96, 'Eastern Connection', '35 King George', 'London', NULL, 'WX3 6FW', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11057, 'NORTS', 3, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', '5/1/1998 12:00:00 AM', 3, 4.13, 'North/South', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11058, 'BLAUS', 9, '4/29/1998 12:00:00 AM', '5/27/1998 12:00:00 AM', NULL, 3, 31.14, 'Blauer See Delikatessen', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11059, 'RICAR', 2, '4/29/1998 12:00:00 AM', '6/10/1998 12:00:00 AM', NULL, 2, 85.8, 'Ricardo Adocicados', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11060, 'FRANS', 2, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 10.98, 'Franchi S.p.A.', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11061, 'GREAL', 4, '4/30/1998 12:00:00 AM', '6/11/1998 12:00:00 AM', NULL, 3, 14.01, 'Great Lakes Food Market', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11062, 'REGGC', 4, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', NULL, 2, 29.93, 'Reggiani Caseifici', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11063, 'HUNGO', 3, '4/30/1998 12:00:00 AM', '5/28/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 81.73, 'Hungry Owl All-Night Grocers', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11064, 'SAVEA', 1, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 1, 30.09, 'Save-a-lot Markets', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11065, 'LILAS', 8, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', NULL, 1, 12.91, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11066, 'WHITC', 7, '5/1/1998 12:00:00 AM', '5/29/1998 12:00:00 AM', '5/4/1998 12:00:00 AM', 2, 44.72, 'White Clover Markets', '1029 - 12th Ave. S.', 'Seattle', 'WA', '98124', 'USA' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11067, 'DRACD', 1, '5/4/1998 12:00:00 AM', '5/18/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 7.98, 'Drachenblut Delikatessen', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11068, 'QUEEN', 8, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', NULL, 2, 81.75, 'Queen Cozinha', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11069, 'TORTU', 1, '5/4/1998 12:00:00 AM', '6/1/1998 12:00:00 AM', '5/6/1998 12:00:00 AM', 2, 15.67, 'Tortuga Restaurante', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11070, 'LEHMS', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 136, 'Lehmanns Marktstand', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11071, 'LILAS', 1, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 1, 0.93, 'LILA-Supermercado', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11072, 'ERNSH', 4, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 258.64, 'Ernst Handel', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11073, 'PERIC', 2, '5/5/1998 12:00:00 AM', '6/2/1998 12:00:00 AM', NULL, 2, 24.95, 'Pericles Comidas cl�sicas', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11074, 'SIMOB', 7, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 18.44, 'Simons bistro', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11075, 'RICSU', 8, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 6.19, 'Richter Supermarkt', 'Starenweg 5', 'Gen�ve', NULL, '1204', 'Switzerland' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11076, 'BONAP', 4, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 38.28, 'Bon app''', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France' ) ;
-INSERT INTO GHTDB.ORDERS ( OrderID, CustomerID, EmployeeID, OrderDate, RequiredDate, ShippedDate, ShipVia, Freight, ShipName, ShipAddress, ShipCity, ShipRegion, ShipPostalCode, ShipCountry ) VALUES (11077, 'RATTC', 1, '5/6/1998 12:00:00 AM', '6/3/1998 12:00:00 AM', NULL, 2, 8.53, 'Rattlesnake Canyon Grocery', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA' ) ;
-
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (1, 'Exotic Liquids', 'Charlotte Cooper', 'Purchasing Manager', '49 Gilbert St.', 'London', NULL, 'EC1 4SD', 'UK', '(171) 555-2222', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (2, 'New Orleans Cajun Delights', 'Shelley Burke', 'Order Administrator', 'P.O. Box 78934', 'New Orleans', 'LA', '70117', 'USA', '(100) 555-4822', NULL, '#CAJUN.HTM#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (3, 'Grandma Kelly''s Homestead', 'Regina Murphy', 'Sales Representative', '707 Oxford Rd.', 'Ann Arbor', 'MI', '48104', 'USA', '(313) 555-5735', '(313) 555-3349', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (4, 'Tokyo Traders', 'Yoshi Nagase', 'Marketing Manager', '9-8 Sekimai Musashino-shi', 'Tokyo', NULL, '100', 'Japan', '(03) 3555-5011', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (5, 'Cooperativa de Quesos ''Las Cabras''', 'Antonio del Valle Saavedra', 'Export Administrator', 'Calle del Rosal 4', 'Oviedo', 'Asturias', '33007', 'Spain', '(98) 598 76 54', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (6, 'Mayumi''s', 'Mayumi Ohno', 'Marketing Representative', '92 Setsuko Chuo-ku', 'Osaka', NULL, '545', 'Japan', '(06) 431-7877', NULL, 'Mayumi''s (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/mayumi.htm#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (7, 'Pavlova, Ltd.', 'Ian Devling', 'Marketing Manager', '74 Rose St. Moonie Ponds', 'Melbourne', 'Victoria', '3058', 'Australia', '(03) 444-2343', '(03) 444-6588', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (8, 'Specialty Biscuits, Ltd.', 'Peter Wilson', 'Sales Representative', '29 King''s Way', 'Manchester', NULL, 'M14 GSD', 'UK', '(161) 555-4448', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (9, 'PB Kn�ckebr�d AB', 'Lars Peterson', 'Sales Agent', 'Kaloadagatan 13', 'G�teborg', NULL, 'S-345 67', 'Sweden', '031-987 65 43', '031-987 65 91', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (10, 'Refrescos Americanas LTDA', 'Carlos Diaz', 'Marketing Manager', 'Av. das Americanas 12.890', 'Sao Paulo', NULL, '5442', 'Brazil', '(11) 555 4640', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (11, 'Heli S��waren GmbH & Co. KG', 'Petra Winkler', 'Sales Manager', 'Tiergartenstra�e 5', 'Berlin', NULL, '10785', 'Germany', '(010) 9984510', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (12, 'Plutzer Lebensmittelgro�m�rkte AG', 'Martin Bein', 'International Marketing Mgr.', 'Bogenallee 51', 'Frankfurt', NULL, '60439', 'Germany', '(069) 992755', NULL, 'Plutzer (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/plutzer.htm#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (13, 'Nord-Ost-Fisch Handelsgesellschaft mbH', 'Sven Petersen', 'Coordinator Foreign Markets', 'Frahmredder 112a', 'Cuxhaven', NULL, '27478', 'Germany', '(04721) 8713', '(04721) 8714', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (14, 'Formaggi Fortini s.r.l.', 'Elio Rossi', 'Sales Representative', 'Viale Dante, 75', 'Ravenna', NULL, '48100', 'Italy', '(0544) 60323', '(0544) 60603', '#FORMAGGI.HTM#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (15, 'Norske Meierier', 'Beate Vileid', 'Marketing Manager', 'Hatlevegen 5', 'Sandvika', NULL, '1320', 'Norway', '(0)2-953010', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (16, 'Bigfoot Breweries', 'Cheryl Saylor', 'Regional Account Rep.', '3400 - 8th Avenue Suite 210', 'Bend', 'OR', '97101', 'USA', '(503) 555-9931', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (17, 'Svensk Sj�f�da AB', 'Michael Bj�rn', 'Sales Representative', 'Brovallav�gen 231', 'Stockholm', NULL, 'S-123 45', 'Sweden', '08-123 45 67', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (18, 'Aux joyeux eccl�siastiques', 'Guyl�ne Nodier', 'Sales Manager', '203, Rue des Francs-Bourgeois', 'Paris', NULL, '75004', 'France', '(1) 03.83.00.68', '(1) 03.83.00.62', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (19, 'New England Seafood Cannery', 'Robb Merchant', 'Wholesale Account Agent', 'Order Processing Dept. 2100 Paul Revere Blvd.', 'Boston', 'MA', '02134', 'USA', '(617) 555-3267', '(617) 555-3389', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (20, 'Leka Trading', 'Chandra Leka', 'Owner', '471 Serangoon Loop, Suite #402', 'Singapore', NULL, '0512', 'Singapore', '555-8787', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (21, 'Lyngbysild', 'Niels Petersen', 'Sales Manager', 'Lyngbysild Fiskebakken 10', 'Lyngby', NULL, '2800', 'Denmark', '43844108', '43844115', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (22, 'Zaanse Snoepfabriek', 'Dirk Luchte', 'Accounting Manager', 'Verkoop Rijnweg 22', 'Zaandam', NULL, '9999 ZZ', 'Netherlands', '(12345) 1212', '(12345) 1210', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (23, 'Karkki Oy', 'Anne Heikkonen', 'Product Manager', 'Valtakatu 12', 'Lappeenranta', NULL, '53120', 'Finland', '(953) 10956', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (24, 'G''day, Mate', 'Wendy Mackenzie', 'Sales Representative', '170 Prince Edward Parade Hunter''s Hill', 'Sydney', 'NSW', '2042', 'Australia', '(02) 555-5914', '(02) 555-4873', 'G''day Mate (on the World Wide Web)#http://www.microsoft.com/accessdev/sampleapps/gdaymate.htm#' ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (25, 'Ma Maison', 'Jean-Guy Lauzon', 'Marketing Manager', '2960 Rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-9022', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (26, 'Pasta Buttini s.r.l.', 'Giovanni Giudici', 'Order Administrator', 'Via dei Gelsomini, 153', 'Salerno', NULL, '84100', 'Italy', '(089) 6547665', '(089) 6547667', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (27, 'Escargots Nouveaux', 'Marie Delamare', 'Sales Manager', '22, rue H. Voiron', 'Montceau', NULL, '71300', 'France', '85.57.00.07', NULL, NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (28, 'Gai p�turage', 'Eliane Noz', 'Sales Representative', 'Bat. B 3, rue des Alpes', 'Annecy', NULL, '74000', 'France', '38.76.98.06', '38.76.98.58', NULL ) ;
-INSERT INTO GHTDB.SUPPLIERS ( SupplierID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax, HomePage ) VALUES (29, 'For�ts d''�rables', 'Chantal Goulet', 'Accounting Manager', '148 rue Chasseur', 'Ste-Hyacinthe', 'Qu�bec', 'J2S 7S8', 'Canada', '(514) 555-2955', '(514) 555-2921', NULL ) ;
-
-
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (1, 'Chai', 1, 1, '10 boxes x 20 bags', 18, 520, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (2, 'Chang', 1, 1, '24 - 12 oz bottles', 19, 522, 40, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (3, 'Aniseed Syrup', 1, 2, '12 - 550 ml bottles', 10, 13, 70, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (4, 'Chef Anton''s Cajun Seasoning', 2, 2, '48 - 6 oz jars', 22, 53, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (5, 'Chef Anton''s Gumbo Mix', 2, 2, '36 boxes', 21.35, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (6, 'Grandma''s Boysenberry Spread', 3, 2, '12 - 8 oz jars', 25, 120, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (7, 'Uncle Bob''s Organic Dried Pears', 3, 7, '12 - 1 lb pkgs.', 30, 15, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (8, 'Northwoods Cranberry Sauce', 3, 2, '12 - 12 oz jars', 40, 6, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (9, 'Mishi Kobe Niku', 4, 6, '18 - 500 g pkgs.', 97, 29, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (10, 'Ikura', 4, 8, '12 - 200 ml jars', 31, 31, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (11, 'Queso Cabrales', 5, 4, '1 kg pkg.', 21, 22, 30, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (12, 'Queso Manchego La Pastora', 5, 4, '10 - 500 g pkgs.', 38, 86, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (13, 'Konbu', 6, 8, '2 kg box', 6, 24, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (14, 'Tofu', 6, 7, '40 - 100 g pkgs.', 23.25, 35, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (15, 'Genen Shouyu', 6, 2, '24 - 250 ml bottles', 15.5, 39, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (16, 'Pavlova', 7, 3, '32 - 500 g boxes', 17.45, 29, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (17, 'Alice Mutton', 7, 6, '20 - 1 kg tins', 39, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (18, 'Carnarvon Tigers', 7, 8, '16 kg pkg.', 62.5, 42, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (19, 'Teatime Chocolate Biscuits', 8, 3, '10 boxes x 12 pieces', 9.2, 25, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (20, 'Sir Rodney''s Marmalade', 8, 3, '30 gift boxes', 81, 40, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (21, 'Sir Rodney''s Scones', 8, 3, '24 pkgs. x 4 pieces', 10, 3, 40, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (22, 'Gustaf''s Kn�ckebr�d', 9, 5, '24 - 500 g pkgs.', 21, 104, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (23, 'Tunnbr�d', 9, 5, '12 - 250 g pkgs.', 9, 61, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (24, 'Guaran� Fant�stica', 10, 1, '12 - 355 ml cans', 4.5, 20, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (25, 'NuNuCa Nu�-Nougat-Creme', 11, 3, '20 - 450 g glasses', 14, 76, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (26, 'Gumb�r Gummib�rchen', 11, 3, '100 - 250 g bags', 31.23, 15, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (27, 'Schoggi Schokolade', 11, 3, '100 - 100 g pieces', 43.9, 49, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (28, 'R�ssle Sauerkraut', 12, 7, '25 - 825 g cans', 45.6, 26, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (29, 'Th�ringer Rostbratwurst', 12, 6, '50 bags x 30 sausgs.', 123.79, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (30, 'Nord-Ost Matjeshering', 13, 8, '10 - 200 g glasses', 25.89, 10, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (31, 'Gorgonzola Telino', 14, 4, '12 - 100 g pkgs', 12.5, 0, 70, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (32, 'Mascarpone Fabioli', 14, 4, '24 - 200 g pkgs.', 32, 9, 40, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (33, 'Geitost', 15, 4, '500 g', 2.5, 112, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (34, 'Sasquatch Ale', 16, 1, '24 - 12 oz bottles', 14, 111, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (35, 'Steeleye Stout', 16, 1, '24 - 12 oz bottles', 18, 20, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (36, 'Inlagd Sill', 17, 8, '24 - 250 g  jars', 19, 112, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (37, 'Gravad lax', 17, 8, '12 - 500 g pkgs.', 26, 11, 50, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (38, 'C�te de Blaye', 18, 1, '12 - 75 cl bottles', 263.5, 17, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (39, 'Chartreuse verte', 18, 1, '750 cc per bottle', 18, 69, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (40, 'Boston Crab Meat', 19, 8, '24 - 4 oz tins', 18.4, 123, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (41, 'Jack''s New England Clam Chowder', 19, 8, '12 - 12 oz cans', 9.65, 85, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (42, 'Singaporean Hokkien Fried Mee', 20, 5, '32 - 1 kg pkgs.', 14, 26, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (43, 'Ipoh Coffee', 20, 1, '16 - 500 g tins', 46, 17, 10, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (44, 'Gula Malacca', 20, 2, '20 - 2 kg bags', 19.45, 27, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (45, 'Rogede sild', 21, 8, '1k pkg.', 9.5, 5, 70, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (46, 'Spegesild', 21, 8, '4 - 450 g glasses', 12, 95, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (47, 'Zaanse koeken', 22, 3, '10 - 4 oz boxes', 9.5, 36, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (48, 'Chocolade', 22, 3, '10 pkgs.', 12.75, 15, 70, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (49, 'Maxilaku', 23, 3, '24 - 50 g pkgs.', 20, 10, 60, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (50, 'Valkoinen suklaa', 23, 3, '12 - 100 g bars', 16.25, 65, 0, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (51, 'Manjimup Dried Apples', 24, 7, '50 - 300 g pkgs.', 53, 20, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (52, 'Filo Mix', 24, 5, '16 - 2 kg boxes', 7, 38, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (53, 'Perth Pasties', 24, 6, '48 pieces', 32.8, 0, 0, 0, 1 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (54, 'Tourti�re', 25, 6, '16 pies', 7.45, 21, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (55, 'P�t� chinois', 25, 6, '24 boxes x 2 pies', 24, 115, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (56, 'Gnocchi di nonna Alice', 26, 5, '24 - 250 g pkgs.', 38, 21, 10, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (57, 'Ravioli Angelo', 26, 5, '24 - 250 g pkgs.', 19.5, 36, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (58, 'Escargots de Bourgogne', 27, 8, '24 pieces', 13.25, 62, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (59, 'Raclette Courdavault', 28, 4, '5 kg pkg.', 55, 79, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (60, 'Camembert Pierrot', 28, 4, '15 - 300 g rounds', 34, 19, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (61, 'Sirop d''�rable', 29, 2, '24 - 500 ml bottles', 28.5, 113, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (62, 'Tarte au sucre', 29, 3, '48 pies', 49.3, 17, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (63, 'Vegie-spread', 7, 2, '15 - 625 g jars', 43.9, 24, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (64, 'Wimmers gute Semmelkn�del', 12, 5, '20 bags x 4 pieces', 33.25, 22, 80, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (65, 'Louisiana Fiery Hot Pepper Sauce', 2, 2, '32 - 8 oz bottles', 21.05, 76, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (66, 'Louisiana Hot Spiced Okra', 2, 2, '24 - 8 oz jars', 17, 4, 100, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (67, 'Laughing Lumberjack Lager', 16, 1, '24 - 12 oz bottles', 14, 52, 0, 10, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (68, 'Scottish Longbreads', 8, 3, '10 boxes x 8 pieces', 12.5, 6, 10, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (69, 'Gudbrandsdalsost', 15, 4, '10 kg pkg.', 36, 26, 0, 15, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (70, 'Outback Lager', 7, 1, '24 - 355 ml bottles', 15, 15, 10, 30, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (71, 'Flotemysost', 15, 4, '10 - 500 g pkgs.', 21.5, 26, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (72, 'Mozzarella di Giovanni', 14, 4, '24 - 200 g pkgs.', 34.8, 14, 0, 0, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (73, 'R�d Kaviar', 17, 8, '24 - 150 g jars', 15, 101, 0, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (74, 'Longlife Tofu', 4, 7, '5 kg pkg.', 10, 4, 20, 5, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (75, 'Rh�nbr�u Klosterbier', 12, 1, '24 - 0.5 l bottles', 7.75, 125, 0, 25, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (76, 'Lakkalik��ri', 23, 1, '500 ml', 18, 57, 0, 20, 0 ) ;
-INSERT INTO GHTDB.PRODUCTS ( ProductID, ProductName, SupplierID, CategoryID, QuantityPerUnit, UnitPrice, UnitsInStock, UnitsOnOrder, ReorderLevel, Discontinued ) VALUES (77, 'Original Frankfurter gr�ne So�e', 12, 2, '12 boxes', 13, 32, 0, 15, 0 ) ;
-
-
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01581','Westboro',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01730','Bedford',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('01833','Georgetow',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02116','Boston',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02139','Cambridge',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02184','Braintree',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('02903','Providence',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('03049','Hollis',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('03801','Portsmouth',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('06897','Wilton',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('07960','Morristown',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('08837','Edison',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('10019','New York',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('10038','New York',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('11747','Mellvile',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('14450','Fairport',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('19428','Philadelphia',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('19713','Neward',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('20852','Rockville',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('27403','Greensboro',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('27511','Cary',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('29202','Columbia',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('30346','Atlanta',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('31406','Savannah',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('32859','Orlando',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('33607','Tampa',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('40222','Louisville',1) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('44122','Beachwood',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('45839','Findlay',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48075','Southfield',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48084','Troy',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('48304','Bloomfield Hills',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('53404','Racine',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('55113','Roseville',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('55439','Minneapolis',3) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('60179','Hoffman Estates',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('60601','Chicago',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('72716','Bentonville',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('75234','Dallas',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('78759','Austin',4) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('80202','Denver',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('80909','Colorado Springs',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('85014','Phoenix',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('85251','Scottsdale',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('90405','Santa Monica',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('94025','Menlo Park',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('94105','San Francisco',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95008','Campbell',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95054','Santa Clara',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('95060','Santa Cruz',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98004','Bellevue',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98052','Redmond',2) ;
-INSERT INTO GHTDB.TERRITORIES ( TerritoryID, TerritoryDescription, RegionID ) VALUES  ('98104','Seattle',2) ;
-
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '06897' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (1, '19713' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01581' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01730' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '01833' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02116' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02139' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '02184' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (2, '40222' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '30346' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '31406' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '32859' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (3, '33607' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '20852' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27403' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (4, '27511' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '02903' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '07960' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '08837' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10019' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '10038' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '11747' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (5, '14450' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85014' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '85251' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98004' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98052' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (6, '98104' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60179' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '60601' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80202' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '80909' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '90405' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94025' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '94105' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95008' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95054' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (7, '95060' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '19428' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '44122' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '45839' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (8, '53404' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03049' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '03801' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48075' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48084' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '48304' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55113' ) ;
-INSERT INTO GHTDB.EMPLOYEETERRITORIES ( EmployeeID, TerritoryID ) VALUES (9, '55439' ) ;
-
-
-
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 11, 14, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 42, 9.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10248, 72, 34.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 14, 18.6, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10249, 51, 42.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 41, 7.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 51, 42.4, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10250, 65, 16.8, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 22, 16.8, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 57, 15.6, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10251, 65, 16.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 20, 64.8, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 33, 2, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10252, 60, 27.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 31, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 39, 14.4, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10253, 49, 16, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 24, 3.6, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 55, 19.2, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10254, 74, 8, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 2, 15.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 16, 13.9, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 36, 15.2, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10255, 59, 44, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 53, 26.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10256, 77, 10.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 27, 35.1, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 39, 14.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10257, 77, 10.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 2, 15.2, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 5, 17, 65, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10258, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 21, 8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10259, 37, 20.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 41, 7.7, 16, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 57, 15.6, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 62, 39.4, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10260, 70, 12, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 21, 8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10261, 35, 14.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 5, 17, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 7, 24, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10262, 56, 30.4, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 16, 13.9, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 24, 3.6, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 30, 20.7, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10263, 74, 8, 36, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 2, 15.2, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10264, 41, 7.7, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 17, 31.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10265, 70, 12, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10266, 12, 30.4, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 40, 14.7, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 59, 44, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10267, 76, 14.4, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 29, 99, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10268, 72, 27.8, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 33, 2, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10269, 72, 27.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 36, 15.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10270, 43, 36.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10271, 33, 2, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 20, 64.8, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 31, 10, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10272, 72, 27.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 10, 24.8, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 31, 10, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 33, 2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 40, 14.7, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10273, 76, 14.4, 33, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 71, 17.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10274, 72, 27.8, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 24, 3.6, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10275, 59, 44, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 10, 24.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10276, 13, 4.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 28, 36.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10277, 62, 39.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 44, 15.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 59, 44, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 63, 35.1, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10278, 73, 12, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10279, 17, 31.2, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 24, 3.6, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 55, 19.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10280, 75, 6.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 19, 7.3, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 24, 3.6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10281, 35, 14.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 30, 20.7, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10282, 57, 15.6, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 15, 12.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 19, 7.3, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 60, 27.2, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10283, 72, 27.8, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 27, 35.1, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 44, 15.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 60, 27.2, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10284, 67, 11.2, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 1, 14.4, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 40, 14.7, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10285, 53, 26.2, 36, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 35, 14.4, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10286, 62, 39.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 16, 13.9, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 34, 11.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10287, 46, 9.6, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 54, 5.9, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10288, 68, 10, 3, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 3, 8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10289, 64, 26.6, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 5, 17, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 29, 99, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 49, 16, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10290, 77, 10.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 13, 4.8, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 44, 15.5, 24, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10291, 51, 42.4, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10292, 20, 64.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 18, 50, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 24, 3.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 63, 35.1, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10293, 75, 6.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 1, 14.4, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 17, 31.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 43, 36.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 60, 27.2, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10294, 75, 6.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10295, 56, 30.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 11, 16.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 16, 13.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10296, 69, 28.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 39, 14.4, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10297, 72, 27.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 2, 15.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 36, 15.2, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 59, 44, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10298, 62, 39.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 19, 7.3, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10299, 70, 12, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 66, 13.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10300, 68, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 40, 14.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10301, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 17, 31.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 28, 36.4, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10302, 43, 36.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 40, 14.7, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 65, 16.8, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10303, 68, 10, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 49, 16, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 59, 44, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10304, 71, 17.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 18, 50, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 29, 99, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10305, 39, 14.4, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 30, 20.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 53, 26.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10306, 54, 5.9, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 62, 39.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10307, 68, 10, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 69, 28.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10308, 70, 12, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 4, 17.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 6, 20, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 42, 11.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 43, 36.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10309, 71, 17.2, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 16, 13.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10310, 62, 39.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 42, 11.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10311, 69, 28.8, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 28, 36.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 43, 36.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 53, 26.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10312, 75, 6.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10313, 36, 15.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 32, 25.6, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 58, 10.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10314, 62, 39.4, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 34, 11.2, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10315, 70, 12, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 41, 7.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10316, 62, 39.4, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10317, 1, 14.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 41, 7.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10318, 76, 14.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 17, 31.2, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 28, 36.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10319, 76, 14.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10320, 71, 17.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10321, 35, 14.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10322, 52, 5.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 15, 12.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 25, 11.2, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10323, 39, 14.4, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 35, 14.4, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 46, 9.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 59, 44, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10324, 63, 35.1, 80, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 6, 20, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 13, 4.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 14, 18.6, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 31, 10, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10325, 72, 27.8, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 4, 17.6, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 57, 15.6, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10326, 75, 6.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 2, 15.2, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 11, 16.8, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 30, 20.7, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10327, 58, 10.6, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 59, 44, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 65, 16.8, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10328, 68, 10, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 19, 7.3, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 30, 20.7, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10329, 56, 30.4, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 26, 24.9, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10330, 72, 27.8, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10331, 54, 5.9, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 18, 50, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 42, 11.2, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10332, 47, 7.6, 16, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 14, 18.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 21, 8, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10333, 71, 17.2, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 52, 5.6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10334, 68, 10, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 2, 15.2, 7, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 31, 10, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 32, 25.6, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10335, 51, 42.4, 48, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10336, 4, 17.6, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 23, 7.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 26, 24.9, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 36, 15.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 37, 20.8, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10337, 72, 27.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 17, 31.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10338, 30, 20.7, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 4, 17.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 17, 31.2, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10339, 62, 39.4, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 18, 50, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 41, 7.7, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10340, 43, 36.8, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 33, 2, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10341, 59, 44, 9, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 2, 15.2, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 31, 10, 56, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 36, 15.2, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10342, 55, 19.2, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 64, 26.6, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 68, 10, 4, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10343, 76, 14.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 4, 17.6, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10344, 8, 32, 70, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 8, 32, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 19, 7.3, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10345, 42, 11.2, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 17, 31.2, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10346, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 25, 11.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 39, 14.4, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 40, 14.7, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10347, 75, 6.2, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10348, 23, 7.2, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10349, 54, 5.9, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 50, 13, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10350, 69, 28.8, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 38, 210.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 41, 7.7, 13, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 44, 15.5, 77, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10351, 65, 16.8, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 24, 3.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10352, 54, 5.9, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 11, 16.8, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10353, 38, 210.8, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 1, 14.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10354, 29, 99, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 24, 3.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10355, 57, 15.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 31, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 55, 19.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10356, 69, 28.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 10, 24.8, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 26, 24.9, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10357, 60, 27.2, 8, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 24, 3.6, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 34, 11.2, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10358, 36, 15.2, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 16, 13.9, 56, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 31, 10, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10359, 60, 27.2, 80, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 28, 36.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 29, 99, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 38, 210.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 49, 16, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10360, 54, 5.9, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 39, 14.4, 54, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10361, 60, 27.2, 55, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 25, 11.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 51, 42.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10362, 54, 5.9, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 31, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 75, 6.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10363, 76, 14.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 69, 28.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10364, 71, 17.2, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10365, 11, 16.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 65, 16.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10366, 77, 10.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 34, 11.2, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 54, 5.9, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 65, 16.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10367, 77, 10.4, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 21, 8, 5, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 28, 36.4, 13, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 57, 15.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10368, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 29, 99, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10369, 56, 30.4, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 1, 14.4, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 64, 26.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10370, 74, 8, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10371, 36, 15.2, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 20, 64.8, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 38, 210.8, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 60, 27.2, 70, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10372, 72, 27.8, 42, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 58, 10.6, 80, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10373, 71, 17.2, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 31, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10374, 58, 10.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 14, 18.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10375, 54, 5.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10376, 31, 10, 42, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 28, 36.4, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10377, 39, 14.4, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10378, 71, 17.2, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 41, 7.7, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 63, 35.1, 16, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10379, 65, 16.8, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 30, 20.7, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 53, 26.2, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 60, 27.2, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10380, 70, 12, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10381, 74, 8, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 5, 17, 32, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 18, 50, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 29, 99, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 33, 2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10382, 74, 8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 13, 4.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 50, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10383, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 20, 64.8, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10384, 60, 27.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 7, 24, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 60, 27.2, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10385, 68, 10, 8, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 24, 3.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10386, 34, 11.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 24, 3.6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 28, 36.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 59, 44, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10387, 71, 17.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 45, 7.6, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 52, 5.6, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10388, 53, 26.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 10, 24.8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 55, 19.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 62, 39.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10389, 70, 12, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 31, 10, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 35, 14.4, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 46, 9.6, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10390, 72, 27.8, 24, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10391, 13, 4.8, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10392, 69, 28.8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 2, 15.2, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 14, 18.6, 42, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 25, 11.2, 7, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 26, 24.9, 70, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10393, 31, 10, 32, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 13, 4.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10394, 62, 39.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 46, 9.6, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 53, 26.2, 70, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10395, 69, 28.8, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 23, 7.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 71, 17.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10396, 72, 27.8, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 21, 8, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10397, 51, 42.4, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 35, 14.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10398, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 68, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 71, 17.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 76, 14.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10399, 77, 10.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 29, 99, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 35, 14.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10400, 49, 16, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 30, 20.7, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 56, 30.4, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 65, 16.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10401, 71, 17.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 23, 7.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10402, 63, 35.1, 65, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 16, 13.9, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10403, 48, 10.2, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 26, 24.9, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 42, 11.2, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10404, 49, 16, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10405, 3, 8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 1, 14.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 21, 8, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 28, 36.4, 42, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 36, 15.2, 5, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10406, 40, 14.7, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 11, 16.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 69, 28.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10407, 71, 17.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 37, 20.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 54, 5.9, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10408, 62, 39.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 14, 18.6, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10409, 21, 8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 33, 2, 49, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10410, 59, 44, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 41, 7.7, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 44, 15.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10411, 59, 44, 9, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10412, 14, 18.6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 1, 14.4, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 62, 39.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10413, 76, 14.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 19, 7.3, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10414, 33, 2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 17, 31.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10415, 33, 2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 19, 7.3, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 53, 26.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10416, 57, 15.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 38, 210.8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 46, 9.6, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 68, 10, 36, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10417, 77, 10.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 2, 15.2, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 47, 7.6, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 61, 22.8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10418, 74, 8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 60, 27.2, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10419, 69, 28.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 9, 77.6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 13, 4.8, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 70, 12, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10420, 73, 12, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 19, 7.3, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 26, 24.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 53, 26.2, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10421, 77, 10.4, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10422, 26, 24.9, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 31, 10, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10423, 59, 44, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 35, 14.4, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 38, 210.8, 49, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10424, 68, 10, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 55, 19.2, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10425, 76, 14.4, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 56, 30.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10426, 64, 26.6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10427, 14, 18.6, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10428, 46, 9.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 50, 13, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10429, 63, 35.1, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 17, 31.2, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 21, 8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 56, 30.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10430, 59, 44, 70, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 17, 31.2, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 40, 14.7, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10431, 47, 7.6, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 26, 24.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10432, 54, 5.9, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10433, 56, 30.4, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 11, 16.8, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10434, 76, 14.4, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 2, 15.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 22, 16.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10435, 72, 27.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 46, 9.6, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 56, 30.4, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 64, 26.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10436, 75, 6.2, 24, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10437, 53, 26.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 19, 7.3, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 34, 11.2, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10438, 57, 15.6, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 12, 30.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 16, 13.9, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 64, 26.6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10439, 74, 8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 2, 15.2, 45, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 16, 13.9, 49, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 29, 99, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10440, 61, 22.8, 90, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10441, 27, 35.1, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 11, 16.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 54, 5.9, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10442, 66, 13.6, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 11, 16.8, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10443, 28, 36.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 17, 31.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 26, 24.9, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 35, 14.4, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10444, 41, 7.7, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 39, 14.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10445, 54, 5.9, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 19, 7.3, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 24, 3.6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 31, 10, 3, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10446, 52, 5.6, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 19, 7.3, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 65, 16.8, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10447, 71, 17.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 26, 24.9, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10448, 40, 14.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 10, 24.8, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 52, 5.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10449, 62, 39.4, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 10, 24.8, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10450, 54, 5.9, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 55, 19.2, 120, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 64, 26.6, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 65, 16.8, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10451, 77, 10.4, 55, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 28, 36.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10452, 44, 15.5, 100, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 48, 10.2, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10453, 70, 12, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 16, 13.9, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 33, 2, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10454, 46, 9.6, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 39, 14.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 53, 26.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 61, 22.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10455, 71, 17.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 21, 8, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10456, 49, 16, 21, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10457, 59, 44, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 26, 24.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 28, 36.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 43, 36.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 56, 30.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10458, 71, 17.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 7, 24, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 46, 9.6, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10459, 72, 27.8, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 68, 10, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10460, 75, 6.2, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 21, 8, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 30, 20.7, 28, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10461, 55, 19.2, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 13, 4.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10462, 23, 7.2, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 19, 7.3, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10463, 42, 11.2, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 4, 17.6, 16, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 43, 36.8, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 56, 30.4, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10464, 60, 27.2, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 24, 3.6, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 29, 99, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 40, 14.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 45, 7.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10465, 50, 13, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 11, 16.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10466, 46, 9.6, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 24, 3.6, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10467, 25, 11.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 30, 20.7, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10468, 43, 36.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 2, 15.2, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 16, 13.9, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10469, 44, 15.5, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 18, 50, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 23, 7.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10470, 64, 26.6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 7, 24, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10471, 56, 30.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 24, 3.6, 80, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10472, 51, 42.4, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 33, 2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10473, 71, 17.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 14, 18.6, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 28, 36.4, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 40, 14.7, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10474, 75, 6.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 31, 10, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 66, 13.6, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10475, 76, 14.4, 42, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 55, 19.2, 2, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10476, 70, 12, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 1, 14.4, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 21, 8, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10477, 39, 14.4, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10478, 10, 24.8, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 38, 210.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 53, 26.2, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 59, 44, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10479, 64, 26.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 47, 7.6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10480, 59, 44, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 49, 16, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10481, 60, 27.2, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10482, 40, 14.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 34, 11.2, 35, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10483, 77, 10.4, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 21, 8, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 40, 14.7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10484, 51, 42.4, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 2, 15.2, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 3, 8, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 55, 19.2, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10485, 70, 12, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 11, 16.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 51, 42.4, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10486, 74, 8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 19, 7.3, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 26, 24.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10487, 54, 5.9, 24, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 59, 44, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10488, 73, 12, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 11, 16.8, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10489, 16, 13.9, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 59, 44, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 68, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10490, 75, 6.2, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 44, 15.5, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10491, 77, 10.4, 7, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 25, 11.2, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10492, 42, 11.2, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 65, 16.8, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 66, 13.6, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10493, 69, 28.8, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10494, 56, 30.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 23, 7.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 41, 7.7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10495, 77, 10.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10496, 31, 10, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 56, 30.4, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 72, 27.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10497, 77, 10.4, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 24, 4.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 40, 18.4, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10498, 42, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10499, 49, 20, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 15, 15.5, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10500, 28, 45.6, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10501, 54, 7.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 45, 9.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 53, 32.8, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10502, 67, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 14, 23.25, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10503, 65, 21.05, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 2, 19, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 21, 10, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 53, 32.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10504, 61, 28.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10505, 62, 49.3, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 25, 14, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10506, 70, 15, 14, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 43, 46, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10507, 48, 12.75, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10508, 39, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10509, 28, 45.6, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 29, 123.79, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10510, 75, 7.75, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 4, 22, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 7, 30, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10511, 8, 40, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 24, 4.5, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 46, 12, 9, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 47, 9.5, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10512, 60, 34, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 21, 10, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 32, 32, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10513, 61, 28.5, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 20, 81, 39, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 28, 45.6, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 56, 38, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 65, 21.05, 39, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10514, 75, 7.75, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 9, 97, 16, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 16, 17.45, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 27, 43.9, 120, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 33, 2.5, 16, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10515, 60, 34, 84, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 18, 62.5, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 41, 9.65, 80, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10516, 42, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 52, 7, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 59, 55, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10517, 70, 15, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 24, 4.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 38, 263.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10518, 44, 19.45, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 10, 31, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 56, 38, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10519, 60, 34, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 24, 4.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10520, 53, 32.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 35, 18, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 41, 9.65, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10521, 68, 12.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 1, 18, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 8, 40, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 30, 25.89, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10522, 40, 18.4, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 17, 39, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 20, 81, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 37, 26, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10523, 41, 9.65, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 10, 31, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 30, 25.89, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 43, 46, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10524, 54, 7.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 36, 19, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10525, 40, 18.4, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 1, 18, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10526, 56, 38, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 4, 22, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10527, 36, 19, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 11, 21, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 33, 2.5, 8, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10528, 72, 34.8, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 55, 24, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10529, 69, 36, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 17, 39, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 43, 46, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 61, 28.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10530, 76, 18, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10531, 59, 55, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10532, 66, 17, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 4, 22, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 72, 34.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10533, 73, 15, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 30, 25.89, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 40, 18.4, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10534, 54, 7.45, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 11, 21, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 40, 18.4, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 57, 19.5, 5, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10535, 59, 55, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 12, 38, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10536, 60, 34, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 31, 12.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 51, 53, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 58, 13.25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 72, 34.8, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10537, 73, 15, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 70, 15, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10538, 72, 34.8, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 13, 6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 21, 10, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 33, 2.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10539, 49, 20, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 3, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 26, 31.23, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 38, 263.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10540, 68, 12.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 24, 4.5, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 38, 263.5, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 65, 21.05, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10541, 71, 21.5, 9, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 11, 21, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10542, 54, 7.45, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 12, 38, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10543, 23, 9, 70, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 28, 45.6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10544, 67, 14, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10545, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 7, 30, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 35, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10546, 62, 49.3, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 32, 32, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10547, 36, 19, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 34, 14, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10548, 41, 9.65, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 31, 12.5, 55, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 45, 9.5, 100, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10549, 51, 53, 48, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 17, 39, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 19, 9.2, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 21, 10, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10550, 61, 28.5, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 16, 17.45, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 35, 18, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10551, 44, 19.45, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 69, 36, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10552, 75, 7.75, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 16, 17.45, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 22, 21, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 31, 12.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10553, 35, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 23, 9, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10554, 77, 13, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 14, 23.25, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 19, 9.2, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 24, 4.5, 18, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 51, 53, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10555, 56, 38, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10556, 72, 34.8, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 64, 33.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10557, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 47, 9.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 52, 7, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 53, 32.8, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10558, 73, 15, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 41, 9.65, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10559, 55, 24, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 30, 25.89, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10560, 62, 49.3, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 44, 19.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10561, 51, 53, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 33, 2.5, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10562, 62, 49.3, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 36, 19, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10563, 52, 7, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 17, 39, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 31, 12.5, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10564, 55, 24, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 24, 4.5, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10565, 64, 33.25, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 11, 21, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 18, 62.5, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10566, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 31, 12.5, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 51, 53, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10567, 59, 55, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10568, 10, 31, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 31, 12.5, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10569, 76, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 11, 21, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10570, 56, 38, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 14, 23.25, 11, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10571, 42, 14, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 16, 17.45, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 32, 32, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 40, 18.4, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10572, 75, 7.75, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 17, 39, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 34, 14, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10573, 53, 32.8, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 33, 2.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 40, 18.4, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 62, 49.3, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10574, 64, 33.25, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 59, 55, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 63, 43.9, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 72, 34.8, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10575, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 1, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10576, 44, 19.45, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 39, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10577, 77, 13, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 35, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10578, 57, 19.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 15, 15.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10579, 75, 7.75, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 14, 23.25, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 41, 9.65, 9, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10580, 65, 21.05, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10581, 75, 7.75, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 57, 19.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10582, 76, 18, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 29, 123.79, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 60, 34, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10583, 69, 36, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10584, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10585, 47, 9.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10586, 52, 7, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 26, 31.23, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 35, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10587, 77, 13, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 18, 62.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10588, 42, 14, 100, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10589, 35, 18, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 1, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10590, 77, 13, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 3, 10, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 7, 30, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10591, 54, 7.45, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 15, 15.5, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10592, 26, 31.23, 5, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 20, 81, 21, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 69, 36, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10593, 76, 18, 4, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 52, 7, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10594, 58, 13.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 35, 18, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 61, 28.5, 120, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10595, 69, 36, 65, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 56, 38, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 63, 43.9, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10596, 75, 7.75, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 24, 4.5, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 57, 19.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10597, 65, 21.05, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 27, 43.9, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10598, 71, 21.5, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10599, 62, 49.3, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 54, 7.45, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10600, 73, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 13, 6, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10601, 59, 55, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10602, 77, 13, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 22, 21, 48, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10603, 49, 20, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 48, 12.75, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10604, 76, 18, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 16, 17.45, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 59, 55, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 60, 34, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10605, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 4, 22, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 55, 24, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10606, 62, 49.3, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 7, 30, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 17, 39, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 33, 2.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 40, 18.4, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10607, 72, 34.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10608, 56, 38, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 1, 18, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 10, 31, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10609, 21, 10, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10610, 36, 19, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 1, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 2, 19, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10611, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 10, 31, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 36, 19, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 49, 20, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 60, 34, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10612, 76, 18, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 13, 6, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10613, 75, 7.75, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 11, 21, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 21, 10, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10614, 39, 18, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10615, 55, 24, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 38, 263.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 56, 38, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 70, 15, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10616, 71, 21.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10617, 59, 55, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 6, 25, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 56, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10618, 68, 12.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 21, 10, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10619, 22, 21, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 24, 4.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10620, 52, 7, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 19, 9.2, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 23, 9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 70, 15, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10621, 71, 21.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10622, 68, 12.5, 18, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 14, 23.25, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 19, 9.2, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 21, 10, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 24, 4.5, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10623, 35, 18, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 28, 45.6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 29, 123.79, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10624, 44, 19.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 14, 23.25, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 42, 14, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10625, 60, 34, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 53, 32.8, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 60, 34, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10626, 71, 21.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 62, 49.3, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10627, 73, 15, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10628, 1, 18, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 29, 123.79, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10629, 64, 33.25, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 55, 24, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10630, 76, 18, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10631, 75, 7.75, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 2, 19, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10632, 33, 2.5, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 12, 38, 36, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 13, 6, 13, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 26, 31.23, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10633, 62, 49.3, 80, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 7, 30, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 18, 62.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 51, 53, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10634, 75, 7.75, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 4, 22, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 5, 21.35, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10635, 22, 21, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 4, 22, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10636, 58, 13.25, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 50, 16.25, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10637, 56, 38, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 45, 9.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 65, 21.05, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10638, 72, 34.8, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10639, 18, 62.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 69, 36, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10640, 70, 15, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 2, 19, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10641, 40, 18.4, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 21, 10, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10642, 61, 28.5, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 28, 45.6, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 39, 18, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10643, 46, 12, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 18, 62.5, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 43, 46, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10644, 46, 12, 21, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 18, 62.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10645, 36, 19, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 1, 18, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 10, 31, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 71, 21.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10646, 77, 13, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 19, 9.2, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10647, 39, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 22, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10648, 24, 4.5, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10649, 72, 34.8, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 30, 25.89, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 53, 32.8, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10650, 54, 7.45, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 19, 9.2, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10651, 22, 21, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 30, 25.89, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10652, 42, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10653, 60, 34, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 4, 22, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 39, 18, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10654, 54, 7.45, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10655, 41, 9.65, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 14, 23.25, 3, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 44, 19.45, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10656, 47, 9.5, 6, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 15, 15.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 41, 9.65, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 46, 12, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 47, 9.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 56, 38, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10657, 60, 34, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 21, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 40, 18.4, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 60, 34, 55, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10658, 77, 13, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 31, 12.5, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 40, 18.4, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10659, 70, 15, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10660, 20, 81, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 39, 18, 3, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10661, 58, 13.25, 49, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10662, 68, 12.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 40, 18.4, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 42, 14, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10663, 51, 53, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 10, 31, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 56, 38, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10664, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 59, 55, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10665, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 29, 123.79, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10666, 65, 21.05, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 69, 36, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10667, 71, 21.5, 14, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 31, 12.5, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 55, 24, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10668, 64, 33.25, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10669, 36, 19, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 23, 9, 32, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 46, 12, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 67, 14, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 73, 15, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10670, 75, 7.75, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 16, 17.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 62, 49.3, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10671, 65, 21.05, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 38, 263.5, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10672, 71, 21.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 16, 17.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 42, 14, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10673, 43, 46, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10674, 23, 9, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 14, 23.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 53, 32.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10675, 58, 13.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 10, 31, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 19, 9.2, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10676, 44, 19.45, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 26, 31.23, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10677, 33, 2.5, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 12, 38, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 41, 9.65, 120, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10678, 54, 7.45, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10679, 59, 55, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 16, 17.45, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 31, 12.5, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10680, 42, 14, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 19, 9.2, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 21, 10, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10681, 64, 33.25, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 66, 17, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10682, 75, 7.75, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10683, 52, 7, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 40, 18.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 47, 9.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10684, 60, 34, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 10, 31, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 41, 9.65, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10685, 47, 9.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 17, 39, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10686, 26, 31.23, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 9, 97, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 29, 123.79, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10687, 36, 19, 6, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 10, 31, 18, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 28, 45.6, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10688, 34, 14, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10689, 1, 18, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 56, 38, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10690, 77, 13, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 1, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 29, 123.79, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 43, 46, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 44, 19.45, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10691, 62, 49.3, 48, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10692, 63, 43.9, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 9, 97, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 54, 7.45, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 69, 36, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10693, 73, 15, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 7, 30, 90, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 59, 55, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10694, 70, 15, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 8, 40, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 12, 38, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10695, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 17, 39, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10696, 46, 12, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 19, 9.2, 7, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 35, 18, 9, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 58, 13.25, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10697, 70, 15, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 17, 39, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 29, 123.79, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 65, 21.05, 65, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10698, 70, 15, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10699, 47, 9.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 1, 18, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 34, 14, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 68, 12.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10700, 71, 21.5, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 59, 55, 42, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 71, 21.5, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10701, 76, 18, 35, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 3, 10, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10702, 76, 18, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 2, 19, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 59, 55, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10703, 73, 15, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 4, 22, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 24, 4.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10704, 48, 12.75, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10705, 32, 32, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 16, 17.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 43, 46, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10706, 59, 55, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 55, 24, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 57, 19.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10707, 70, 15, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 5, 21.35, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10708, 36, 19, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 8, 40, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 51, 53, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10709, 60, 34, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 19, 9.2, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10710, 47, 9.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 19, 9.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 41, 9.65, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10711, 53, 32.8, 120, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 53, 32.8, 3, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10712, 56, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 10, 31, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 26, 31.23, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 45, 9.5, 110, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10713, 46, 12, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 2, 19, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 17, 39, 27, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 47, 9.5, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 56, 38, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10714, 58, 13.25, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 10, 31, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10715, 71, 21.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 21, 10, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 51, 53, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10716, 61, 28.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 21, 10, 32, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 54, 7.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10717, 69, 36, 25, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 12, 38, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 16, 17.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 36, 19, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10718, 62, 49.3, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 18, 62.5, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 30, 25.89, 3, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10719, 54, 7.45, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 35, 18, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10720, 71, 21.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10721, 44, 19.45, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 2, 19, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 31, 12.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 68, 12.5, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10722, 75, 7.75, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10723, 26, 31.23, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 10, 31, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10724, 61, 28.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 52, 7, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10725, 55, 24, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 4, 22, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10726, 11, 21, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 17, 39, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 56, 38, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10727, 59, 55, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 40, 18.4, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 55, 24, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10728, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 1, 18, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 21, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10729, 50, 16.25, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 16, 17.45, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 31, 12.5, 3, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10730, 65, 21.05, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 21, 10, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10731, 51, 53, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10732, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 14, 23.25, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10733, 52, 7, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 6, 25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10734, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 61, 28.5, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10735, 77, 13, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 65, 21.05, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10736, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 13, 6, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10737, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10738, 16, 17.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 36, 19, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10739, 52, 7, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 28, 45.6, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 35, 18, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 45, 9.5, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10740, 56, 38, 14, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10741, 2, 19, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 3, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 60, 34, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10742, 72, 34.8, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10743, 46, 12, 28, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10744, 40, 18.4, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 18, 62.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 44, 19.45, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 59, 55, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10745, 72, 34.8, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 13, 6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 42, 14, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 62, 49.3, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10746, 69, 36, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 31, 12.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 41, 9.65, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 63, 43.9, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10747, 69, 36, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 23, 9, 44, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 40, 18.4, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10748, 56, 38, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 56, 38, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 59, 55, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10749, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 14, 23.25, 5, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 45, 9.5, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10750, 59, 55, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 26, 31.23, 12, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 30, 25.89, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 50, 16.25, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10751, 73, 15, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 1, 18, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10752, 69, 36, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 45, 9.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10753, 74, 10, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10754, 40, 18.4, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 47, 9.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 56, 38, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 57, 19.5, 14, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10755, 69, 36, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 18, 62.5, 21, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 36, 19, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 68, 12.5, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10756, 69, 36, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 34, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 59, 55, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 62, 49.3, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10757, 64, 33.25, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 26, 31.23, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 52, 7, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10758, 70, 15, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10759, 32, 32, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 25, 14, 12, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 27, 43.9, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10760, 43, 46, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 25, 14, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10761, 75, 7.75, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 39, 18, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 47, 9.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 51, 53, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10762, 56, 38, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 21, 10, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 22, 21, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10763, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 3, 10, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10764, 39, 18, 130, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10765, 65, 21.05, 80, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 2, 19, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 7, 30, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10766, 68, 12.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10767, 42, 14, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 22, 21, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 31, 12.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10768, 71, 21.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 41, 9.65, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 52, 7, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 61, 28.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10769, 62, 49.3, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10770, 11, 21, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10771, 71, 21.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 29, 123.79, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10772, 59, 55, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 17, 39, 33, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 31, 12.5, 70, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10773, 75, 7.75, 7, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 31, 12.5, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10774, 66, 17, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 10, 31, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10775, 67, 14, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 31, 12.5, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 42, 14, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 45, 9.5, 27, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10776, 51, 53, 120, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10777, 42, 14, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10778, 41, 9.65, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 16, 17.45, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10779, 62, 49.3, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 70, 15, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10780, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 54, 7.45, 3, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 56, 38, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10781, 74, 10, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10782, 31, 12.5, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 31, 12.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10783, 38, 263.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 36, 19, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 39, 18, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10784, 72, 34.8, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 10, 31, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10785, 75, 7.75, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 8, 40, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 30, 25.89, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10786, 75, 7.75, 42, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 2, 19, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10787, 29, 123.79, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10788, 75, 7.75, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 18, 62.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 35, 18, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 63, 43.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10789, 68, 12.5, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 7, 30, 3, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10790, 56, 38, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 29, 123.79, 14, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10791, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 2, 19, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 54, 7.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10792, 68, 12.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 41, 9.65, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10793, 52, 7, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 14, 23.25, 15, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10794, 54, 7.45, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 16, 17.45, 65, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10795, 17, 39, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 26, 31.23, 21, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 44, 19.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 64, 33.25, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10796, 69, 36, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10797, 11, 21, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 62, 49.3, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10798, 72, 34.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 13, 6, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 24, 4.5, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10799, 59, 55, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 11, 21, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 51, 53, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10800, 54, 7.45, 7, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 17, 39, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10801, 29, 123.79, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 30, 25.89, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 51, 53, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 55, 24, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10802, 62, 49.3, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 19, 9.2, 24, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 25, 14, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10803, 59, 55, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 10, 31, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 28, 45.6, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10804, 49, 20, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 34, 14, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10805, 38, 263.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 2, 19, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 65, 21.05, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10806, 74, 10, 15, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10807, 40, 18.4, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 56, 38, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10808, 76, 18, 50, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10809, 52, 7, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 13, 6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 25, 14, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10810, 70, 15, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 19, 9.2, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 23, 9, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10811, 40, 18.4, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 31, 12.5, 16, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 72, 34.8, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10812, 77, 13, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 2, 19, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10813, 46, 12, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 41, 9.65, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 43, 46, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 48, 12.75, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10814, 61, 28.5, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10815, 33, 2.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 38, 263.5, 30, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10816, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 26, 31.23, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 38, 263.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 40, 18.4, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10817, 62, 49.3, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 32, 32, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10818, 41, 9.65, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 43, 46, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10819, 75, 7.75, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10820, 56, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 35, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10821, 51, 53, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 62, 49.3, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10822, 70, 15, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 11, 21, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 57, 19.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 59, 55, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10823, 77, 13, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10824, 70, 15, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 26, 31.23, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10825, 53, 32.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 31, 12.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10826, 57, 19.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 10, 31, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10827, 39, 18, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 20, 81, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10828, 38, 263.5, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 2, 19, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 8, 40, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10829, 60, 34, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 6, 25, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 39, 18, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 60, 34, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10830, 68, 12.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 19, 9.2, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 35, 18, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 38, 263.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10831, 43, 46, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 13, 6, 3, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 25, 14, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 44, 19.45, 16, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10832, 64, 33.25, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 7, 30, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 31, 12.5, 9, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10833, 53, 32.8, 9, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 29, 123.79, 8, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10834, 30, 25.89, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 59, 55, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10835, 77, 13, 2, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 22, 21, 52, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 35, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 57, 19.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 60, 34, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10836, 64, 33.25, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 13, 6, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 40, 18.4, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 47, 9.5, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10837, 76, 18, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 1, 18, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 18, 62.5, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10838, 36, 19, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 58, 13.25, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10839, 72, 34.8, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 25, 14, 6, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10840, 39, 18, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 10, 31, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 56, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 59, 55, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10841, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 43, 46, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10842, 70, 15, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10843, 51, 53, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10844, 22, 21, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 23, 9, 70, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 35, 18, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 42, 14, 42, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 58, 13.25, 60, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10845, 64, 33.25, 48, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 4, 22, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 70, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10846, 74, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 1, 18, 80, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 19, 9.2, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 37, 26, 60, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 45, 9.5, 36, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 60, 34, 45, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10847, 71, 21.5, 55, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 5, 21.35, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10848, 9, 97, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 3, 10, 49, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10849, 26, 31.23, 18, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 25, 14, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 33, 2.5, 4, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10850, 70, 15, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 2, 19, 5, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 25, 14, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 57, 19.5, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10851, 59, 55, 42, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 2, 19, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 17, 39, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10852, 62, 49.3, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10853, 18, 62.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 10, 31, 100, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10854, 13, 6, 65, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 16, 17.45, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 31, 12.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 56, 38, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10855, 65, 21.05, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10856, 42, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 3, 10, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 26, 31.23, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10857, 29, 123.79, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 7, 30, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 27, 43.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10858, 70, 15, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 24, 4.5, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 54, 7.45, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10859, 64, 33.25, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 51, 53, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10860, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 17, 39, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 18, 62.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 21, 10, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 33, 2.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10861, 62, 49.3, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 11, 21, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10862, 52, 7, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 1, 18, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10863, 58, 13.25, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 35, 18, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10864, 67, 14, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 38, 263.5, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10865, 39, 18, 80, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 2, 19, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 24, 4.5, 6, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10866, 30, 25.89, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10867, 53, 32.8, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 26, 31.23, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 35, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10868, 49, 20, 42, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 1, 18, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 23, 9, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10869, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 35, 18, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10870, 51, 53, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 6, 25, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 16, 17.45, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10871, 17, 39, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 55, 24, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 62, 49.3, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 64, 33.25, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10872, 65, 21.05, 21, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 21, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10873, 28, 45.6, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10874, 10, 31, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 19, 9.2, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 47, 9.5, 21, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10875, 49, 20, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 46, 12, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10876, 64, 33.25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 16, 17.45, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10877, 18, 62.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10878, 20, 81, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 40, 18.4, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 65, 21.05, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10879, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 23, 9, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 61, 28.5, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10880, 70, 15, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10881, 73, 15, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 42, 14, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 49, 20, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10882, 54, 7.45, 32, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10883, 24, 4.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 21, 10, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 56, 38, 21, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10884, 65, 21.05, 12, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 24, 4.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 70, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10885, 77, 13, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 10, 31, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 31, 12.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10886, 77, 13, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10887, 25, 14, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 2, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10888, 68, 12.5, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 11, 21, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10889, 38, 263.5, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 17, 39, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 34, 14, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10890, 41, 9.65, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10891, 30, 25.89, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10892, 59, 55, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 8, 40, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 24, 4.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 29, 123.79, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 30, 25.89, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10893, 36, 19, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 13, 6, 28, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 69, 36, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10894, 75, 7.75, 120, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 24, 4.5, 110, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 39, 18, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 40, 18.4, 91, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10895, 60, 34, 100, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 45, 9.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10896, 56, 38, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 29, 123.79, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10897, 30, 25.89, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10898, 13, 6, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10899, 39, 18, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10900, 70, 15, 3, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 41, 9.65, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10901, 71, 21.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 55, 24, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10902, 62, 49.3, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 13, 6, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 65, 21.05, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10903, 68, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 58, 13.25, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10904, 62, 49.3, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10905, 1, 18, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10906, 61, 28.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10907, 75, 7.75, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 7, 30, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10908, 52, 7, 14, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 7, 30, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 16, 17.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10909, 41, 9.65, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 19, 9.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 49, 20, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10910, 61, 28.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 1, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 17, 39, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10911, 67, 14, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 11, 21, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10912, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 4, 22, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 33, 2.5, 40, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10913, 58, 13.25, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10914, 71, 21.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 17, 39, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10915, 54, 7.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 16, 17.45, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 32, 32, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10916, 57, 19.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 30, 25.89, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10917, 60, 34, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 1, 18, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10918, 60, 34, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 16, 17.45, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 25, 14, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10919, 40, 18.4, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10920, 50, 16.25, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 35, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10921, 63, 43.9, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 17, 39, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10922, 24, 4.5, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 42, 14, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 43, 46, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10923, 67, 14, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 10, 31, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 28, 45.6, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10924, 75, 7.75, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 36, 19, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10925, 52, 7, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 11, 21, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 13, 6, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 19, 9.2, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10926, 72, 34.8, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 20, 81, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 52, 7, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10927, 76, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 47, 9.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10928, 76, 18, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 21, 10, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 75, 7.75, 49, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10929, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 21, 10, 36, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 27, 43.9, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 55, 24, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10930, 58, 13.25, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 13, 6, 42, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10931, 57, 19.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 16, 17.45, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 62, 49.3, 14, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 72, 34.8, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10932, 75, 7.75, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 53, 32.8, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10933, 61, 28.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10934, 6, 25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 1, 18, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 18, 62.5, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10935, 23, 9, 8, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10936, 36, 19, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 28, 45.6, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10937, 34, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 13, 6, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 43, 46, 24, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 60, 34, 49, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10938, 71, 21.5, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 2, 19, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10939, 67, 14, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 7, 30, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10940, 13, 6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 31, 12.5, 44, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 62, 49.3, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 68, 12.5, 80, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10941, 72, 34.8, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10942, 49, 20, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 13, 6, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 22, 21, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10943, 46, 12, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 11, 21, 5, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 44, 19.45, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10944, 56, 38, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 13, 6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10945, 31, 12.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 10, 31, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 24, 4.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10946, 77, 13, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10947, 59, 55, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 50, 16.25, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 51, 53, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10948, 55, 24, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 6, 25, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 10, 31, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 17, 39, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10949, 62, 49.3, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10950, 4, 22, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 33, 2.5, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 41, 9.65, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10951, 75, 7.75, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 6, 25, 16, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10952, 28, 45.6, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 20, 81, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10953, 31, 12.5, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 16, 17.45, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 31, 12.5, 25, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 45, 9.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10954, 60, 34, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10955, 75, 7.75, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 21, 10, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 47, 9.5, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10956, 51, 53, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 30, 25.89, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 35, 18, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10957, 64, 33.25, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 5, 21.35, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 7, 30, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10958, 72, 34.8, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10959, 75, 7.75, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 24, 4.5, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10960, 41, 9.65, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 52, 7, 6, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10961, 76, 18, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 7, 30, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 13, 6, 77, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 53, 32.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 69, 36, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10962, 76, 18, 44, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10963, 60, 34, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 18, 62.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 38, 263.5, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10964, 69, 36, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10965, 51, 53, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 37, 26, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 56, 38, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10966, 62, 49.3, 12, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 19, 9.2, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10967, 49, 20, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 12, 38, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 24, 4.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10968, 64, 33.25, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10969, 46, 12, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10970, 52, 7, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10971, 29, 123.79, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 17, 39, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10972, 33, 2.5, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 26, 31.23, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 41, 9.65, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10973, 75, 7.75, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10974, 63, 43.9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 8, 40, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10975, 75, 7.75, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10976, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 39, 18, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 47, 9.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 51, 53, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10977, 63, 43.9, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 8, 40, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 21, 10, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 40, 18.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10978, 44, 19.45, 6, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 7, 30, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 12, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 24, 4.5, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 27, 43.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 31, 12.5, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10979, 63, 43.9, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10980, 75, 7.75, 40, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10981, 38, 263.5, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 7, 30, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10982, 43, 46, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 13, 6, 84, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10983, 57, 19.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 16, 17.45, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10984, 36, 19, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 16, 17.45, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 18, 62.5, 8, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10985, 32, 32, 35, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 11, 21, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 20, 81, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 76, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10986, 77, 13, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 7, 30, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 43, 46, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10987, 72, 34.8, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 7, 30, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10988, 62, 49.3, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 6, 25, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 11, 21, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10989, 41, 9.65, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 21, 10, 65, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 34, 14, 60, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 55, 24, 65, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10990, 61, 28.5, 66, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 2, 19, 50, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 70, 15, 20, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10991, 76, 18, 90, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10992, 72, 34.8, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 29, 123.79, 50, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10993, 41, 9.65, 35, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10994, 59, 55, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10995, 60, 34, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10996, 42, 14, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 32, 32, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 46, 12, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10997, 52, 7, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 24, 4.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 61, 28.5, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 74, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10998, 75, 7.75, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 41, 9.65, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 51, 53, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (10999, 77, 13, 21, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 4, 22, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11000, 77, 13, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 7, 30, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 22, 21, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 46, 12, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11001, 55, 24, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 13, 6, 56, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 35, 18, 15, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 42, 14, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11002, 55, 24, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 1, 18, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 40, 18.4, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11003, 52, 7, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 26, 31.23, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11004, 76, 18, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 1, 18, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11005, 59, 55, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 1, 18, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11006, 29, 123.79, 2, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 8, 40, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 29, 123.79, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11007, 42, 14, 14, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 28, 45.6, 70, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 34, 14, 90, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11008, 71, 21.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 24, 4.5, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 36, 19, 18, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11009, 60, 34, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 7, 30, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11010, 24, 4.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 58, 13.25, 40, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11011, 71, 21.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 19, 9.2, 50, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 60, 34, 36, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11012, 71, 21.5, 60, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 23, 9, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 42, 14, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 45, 9.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11013, 68, 12.5, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11014, 41, 9.65, 28, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 30, 25.89, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11015, 77, 13, 18, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 31, 12.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11016, 36, 19, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 3, 10, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 59, 55, 110, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11017, 70, 15, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 12, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 18, 62.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11018, 56, 38, 5, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 46, 12, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11019, 49, 20, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11020, 10, 31, 24, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 2, 19, 11, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 20, 81, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 26, 31.23, 63, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 51, 53, 44, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11021, 72, 34.8, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 19, 9.2, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11022, 69, 36, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 7, 30, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11023, 43, 46, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 26, 31.23, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 33, 2.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 65, 21.05, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11024, 71, 21.5, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 1, 18, 10, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11025, 13, 6, 20, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 18, 62.5, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11026, 51, 53, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 24, 4.5, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11027, 62, 49.3, 21, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 55, 24, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11028, 59, 55, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 56, 38, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11029, 63, 43.9, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 2, 19, 100, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 5, 21.35, 70, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 29, 123.79, 60, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11030, 59, 55, 100, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 1, 18, 45, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 13, 6, 80, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 24, 4.5, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 64, 33.25, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11031, 71, 21.5, 16, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 36, 19, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 38, 263.5, 25, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11032, 59, 55, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 53, 32.8, 70, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11033, 69, 36, 36, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 21, 10, 15, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 44, 19.45, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11034, 61, 28.5, 6, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 1, 18, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 35, 18, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 42, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11035, 54, 7.45, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 13, 6, 7, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11036, 59, 55, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11037, 70, 15, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 40, 18.4, 5, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 52, 7, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11038, 71, 21.5, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 28, 45.6, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 35, 18, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 49, 20, 60, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11039, 57, 19.5, 28, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11040, 21, 10, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 2, 19, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11041, 63, 43.9, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 44, 19.45, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11042, 61, 28.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11043, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11044, 62, 49.3, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 33, 2.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11045, 51, 53, 24, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 12, 38, 20, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 32, 32, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11046, 35, 18, 18, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 1, 18, 25, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11047, 5, 21.35, 30, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11048, 68, 12.5, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 2, 19, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11049, 12, 38, 4, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11050, 76, 18, 50, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11051, 24, 4.5, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 43, 46, 30, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11052, 61, 28.5, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 18, 62.5, 35, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 32, 32, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11053, 64, 33.25, 25, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 33, 2.5, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11054, 67, 14, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 24, 4.5, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 25, 14, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 51, 53, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11055, 57, 19.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 7, 30, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 55, 24, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11056, 60, 34, 50, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11057, 70, 15, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 21, 10, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 60, 34, 21, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11058, 61, 28.5, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 13, 6, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 17, 39, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11059, 60, 34, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 60, 34, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11060, 77, 13, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11061, 60, 34, 15, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 53, 32.8, 10, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11062, 70, 15, 12, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 34, 14, 30, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 40, 18.4, 40, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11063, 41, 9.65, 30, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 17, 39, 77, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 41, 9.65, 12, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 53, 32.8, 25, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 55, 24, 4, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11064, 68, 12.5, 55, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 30, 25.89, 4, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11065, 54, 7.45, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 16, 17.45, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 19, 9.2, 42, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11066, 34, 14, 35, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11067, 41, 9.65, 9, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 28, 45.6, 8, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 43, 46, 36, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11068, 77, 13, 28, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11069, 39, 18, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 1, 18, 40, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 2, 19, 20, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 16, 17.45, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11070, 31, 12.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 7, 30, 15, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11071, 13, 6, 10, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 2, 19, 8, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 41, 9.65, 40, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 50, 16.25, 22, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11072, 64, 33.25, 130, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 11, 21, 10, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11073, 24, 4.5, 20, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11074, 16, 17.45, 14, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 2, 19, 10, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 46, 12, 30, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11075, 76, 18, 2, 0.15 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 6, 25, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 14, 23.25, 20, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11076, 19, 9.2, 10, 0.25 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 2, 19, 24, 0.2 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 3, 10, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 4, 22, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 6, 25, 1, 0.02 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 7, 30, 1, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 8, 40, 2, 0.1 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 10, 31, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 12, 38, 2, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 13, 6, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 14, 23.25, 1, 0.03 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 16, 17.45, 2, 0.03 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 20, 81, 1, 0.04 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 23, 9, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 32, 32, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 39, 18, 2, 0.05 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 41, 9.65, 3, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 46, 12, 3, 0.02 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 52, 7, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 55, 24, 2, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 60, 34, 2, 0.06 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 64, 33.25, 2, 0.03 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 66, 17, 1, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 73, 15, 2, 0.01 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 75, 7.75, 4, 0 ) ;
-INSERT INTO GHTDB."Order Details" ( OrderID, ProductID, UnitPrice, Quantity, Discount ) VALUES (11077, 77, 13, 2, 0 ) ;
-
-INSERT INTO GHTDB.TYPES_SIMPLE (ID, T_NUMBER, T_LONG, T_FLOAT, T_VARCHAR, T_NVARCHAR, T_CHAR, T_NCHAR) VALUES ('0', 21, 'asdasd', 7.23157, 'heh', 'heh', 'heh', 'heh');
-INSERT INTO GHTDB.TYPES_EXTENDED (ID, T_RAW, T_LONGRAW, T_DATE, T_BLOB, T_CLOB, T_NCLOB) VALUES ('0', HexToRaw('a79d8798cb7987987a'), HexToRaw('a79d8798cb7987987a'), '02/02/02 02:02:02 PM', HexToRaw('a79d8798cb7987987a'), 'heh', 'heh');
-INSERT INTO GHTDB.TYPES_EXTENDED (ID, T_DATE) VALUES ('MIN', '01/01/01 12:00:00 AM');
-
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax,Picture ) VALUES ('ALFKI', 'Alfreds Futterkiste', 'Maria Anders', 'Sales Representative', 'Obere Str. 57', 'Berlin', NULL, '12209', 'Germany', '030-0074321', '030-0076545',10 ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax,Picture ) VALUES ('ANATR', 'Ana Trujillo Emparedados y helados', 'Ana Trujillo', 'Owner', 'Avda. de la Constituci�n 2222', 'M�xico D.F.', NULL, '05021', 'Mexico', '(5) 555-4729', '(5) 555-3745',20 ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ANTON', 'Antonio Moreno Taquer�a', 'Antonio Moreno', 'Owner', 'Mataderos  2312', 'M�xico D.F.', NULL, '05023', 'Mexico', '(5) 555-3932', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('AROUT', 'Around the Horn', 'Thomas Hardy', 'Sales Representative', '120 Hanover Sq.', 'London', NULL, 'WA1 1DP', 'UK', '(171) 555-7788', '(171) 555-6750' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BERGS', 'Berglunds snabbk�p', 'Christina Berglund', 'Order Administrator', 'Berguvsv�gen  8', 'Lule�', NULL, 'S-958 22', 'Sweden', '0921-12 34 65', '0921-12 34 67' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLAUS', 'Blauer See Delikatessen', 'Hanna Moos', 'Sales Representative', 'Forsterstr. 57', 'Mannheim', NULL, '68306', 'Germany', '0621-08460', '0621-08924' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BLONP', 'Blondesddsl p�re et fils', 'Fr�d�rique Citeaux', 'Marketing Manager', '24, place Kl�ber', 'Strasbourg', NULL, '67000', 'France', '88.60.15.31', '88.60.15.32' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOLID', 'B�lido Comidas preparadas', 'Mart�n Sommer', 'Owner', 'C/ Araquil, 67', 'Madrid', NULL, '28023', 'Spain', '(91) 555 22 82', '(91) 555 91 99' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BONAP', 'Bon app''', 'Laurence Lebihan', 'Owner', '12, rue des Bouchers', 'Marseille', NULL, '13008', 'France', '91.24.45.40', '91.24.45.41' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BOTTM', 'Bottom-Dollar Markets', 'Elizabeth Lincoln', 'Accounting Manager', '23 Tsawassen Blvd.', 'Tsawassen', 'BC', 'T2F 8M4', 'Canada', '(604) 555-4729', '(604) 555-3745' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('BSBEV', 'B''s Beverages', 'Victoria Ashworth', 'Sales Representative', 'Fauntleroy Circus', 'London', NULL, 'EC2 5NT', 'UK', '(171) 555-1212', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CACTU', 'Cactus Comidas para llevar', 'Patricio Simpson', 'Sales Agent', 'Cerrito 333', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5555', '(1) 135-4892' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CENTC', 'Centro comercial Moctezuma', 'Francisco Chang', 'Marketing Manager', 'Sierras de Granada 9993', 'M�xico D.F.', NULL, '05022', 'Mexico', '(5) 555-3392', '(5) 555-7293' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CHOPS', 'Chop-suey Chinese', 'Yang Wang', 'Owner', 'Hauptstr. 29', 'Bern', NULL, '3012', 'Switzerland', '0452-076545', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('COMMI', 'Com�rcio Mineiro', 'Pedro Afonso', 'Sales Associate', 'Av. dos Lus�adas, 23', 'Sao Paulo', 'SP', '05432-043', 'Brazil', '(11) 555-7647', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('CONSH', 'Consolidated Holdings', 'Elizabeth Brown', 'Sales Representative', 'Berkeley Gardens 12  Brewery', 'London', NULL, 'WX1 6LT', 'UK', '(171) 555-2282', '(171) 555-9199' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DRACD', 'Drachenblut Delikatessen', 'Sven Ottlieb', 'Order Administrator', 'Walserweg 21', 'Aachen', NULL, '52066', 'Germany', '0241-039123', '0241-059428' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('DUMON', 'Du monde entier', 'Janine Labrune', 'Owner', '67, rue des Cinquante Otages', 'Nantes', NULL, '44000', 'France', '40.67.88.88', '40.67.89.89' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('EASTC', 'Eastern Connection', 'Ann Devon', 'Sales Agent', '35 King George', 'London', NULL, 'WX3 6FW', 'UK', '(171) 555-0297', '(171) 555-3373' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ERNSH', 'Ernst Handel', 'Roland Mendel', 'Sales Manager', 'Kirchgasse 6', 'Graz', NULL, '8010', 'Austria', '7675-3425', '7675-3426' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FAMIA', 'Familia Arquibaldo', 'Aria Cruz', 'Marketing Assistant', 'Rua Or�s, 92', 'Sao Paulo', 'SP', '05442-030', 'Brazil', '(11) 555-9857', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FISSA', 'FISSA Fabrica Inter. Salchichas S.A.', 'Diego Roel', 'Accounting Manager', 'C/ Moralzarzal, 86', 'Madrid', NULL, '28034', 'Spain', '(91) 555 94 44', '(91) 555 55 93' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLIG', 'Folies gourmandes', 'Martine Ranc�', 'Assistant Sales Agent', '184, chauss�e de Tournai', 'Lille', NULL, '59000', 'France', '20.16.10.16', '20.16.10.17' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FOLKO', 'Folk och f� HB', 'Maria Larsson', 'Owner', '�kergatan 24', 'Br�cke', NULL, 'S-844 67', 'Sweden', '0695-34 67 21', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANK', 'Frankenversand', 'Peter Franken', 'Marketing Manager', 'Berliner Platz 43', 'M�nchen', NULL, '80805', 'Germany', '089-0877310', '089-0877451' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANR', 'France restauration', 'Carine Schmitt', 'Marketing Manager', '54, rue Royale', 'Nantes', NULL, '44000', 'France', '40.32.21.21', '40.32.21.20' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FRANS', 'Franchi S.p.A.', 'Paolo Accorti', 'Sales Representative', 'Via Monte Bianco 34', 'Torino', NULL, '10100', 'Italy', '011-4988260', '011-4988261' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('FURIB', 'Furia Bacalhau e Frutos do Mar', 'Lino Rodriguez', 'Sales Manager', 'Jardim das rosas n. 32', 'Lisboa', NULL, '1675', 'Portugal', '(1) 354-2534', '(1) 354-2535' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GALED', 'Galer�a del gastr�nomo', 'Eduardo Saavedra', 'Marketing Manager', 'Rambla de Catalu�a, 23', 'Barcelona', NULL, '08022', 'Spain', '(93) 203 4560', '(93) 203 4561' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH100', 'Company100', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-100100', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH200', 'Company200', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-200200', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH300', 'Company300', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-300300', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH400', 'Company400', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-400400', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH500', 'Company500', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-500500', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH600', 'Company600', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-600600', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GH700', 'Company700', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '00-700700', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GODOS', 'Godos Cocina T�pica', 'Jos� Pedro Freyre', 'Sales Manager', 'C/ Romero, 33', 'Sevilla', NULL, '41101', 'Spain', '(95) 555 82 82', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GOURL', 'Gourmet Lanchonetes', 'Andr� Fonseca', 'Sales Associate', 'Av. Brasil, 442', 'Campinas', 'SP', '04876-786', 'Brazil', '(11) 555-9482', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GREAL', 'Great Lakes Food Market', 'Howard Snyder', 'Marketing Manager', '2732 Baker Blvd.', 'Eugene', 'OR', '97403', 'USA', '(503) 555-7555', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('GROSR', 'GROSELLA-Restaurante', 'Manuel Pereira', 'Owner', '5� Ave. Los Palos Grandes', 'Caracas', 'DF', '1081', 'Venezuela', '(2) 283-2951', '(2) 283-3397' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HANAR', 'Hanari Carnes', 'Mario Pontes', 'Accounting Manager', 'Rua do Pa�o, 67', 'Rio de Janeiro', 'RJ', '05454-876', 'Brazil', '(21) 555-0091', '(21) 555-8765' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HILAA', 'HILARION-Abastos', 'Carlos Hern�ndez', 'Sales Representative', 'Carrera 22 con Ave. Carlos Soublette #8-35', 'San Crist�bal', 'T�chira', '5022', 'Venezuela', '(5) 555-1340', '(5) 555-1948' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGC', 'Hungry Coyote Import Store', 'Yoshi Latimer', 'Sales Representative', 'City Center Plaza 516 Main St.', 'Elgin', 'OR', '97827', 'USA', '(503) 555-6874', '(503) 555-2376' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('HUNGO', 'Hungry Owl All-Night Grocers', 'Patricia McKenna', 'Sales Associate', '8 Johnstown Road', 'Cork', 'Co. Cork', NULL, 'Ireland', '2967 542', '2967 3333' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ISLAT', 'Island Trading', 'Helen Bennett', 'Marketing Manager', 'Garden House Crowther Way', 'Cowes', 'Isle of Wight', 'PO31 7PJ', 'UK', '(198) 555-8888', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('KOENE', 'K�niglich Essen', 'Philip Cramer', 'Sales Associate', 'Maubelstr. 90', 'Brandenburg', NULL, '14776', 'Germany', '0555-09876', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LACOR', 'La corne d''abondance', 'Daniel Tonini', 'Sales Representative', '67, avenue de l''Europe', 'Versailles', NULL, '78000', 'France', '30.59.84.10', '30.59.85.11' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAMAI', 'La maison d''Asie', 'Annette Roulet', 'Sales Manager', '1 rue Alsace-Lorraine', 'Toulouse', NULL, '31000', 'France', '61.77.61.10', '61.77.61.11' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAUGB', 'Laughing Bacchus Wine Cellars', 'Yoshi Tannamuri', 'Marketing Assistant', '1900 Oak St.', 'Vancouver', 'BC', 'V3F 2K1', 'Canada', '(604) 555-3392', '(604) 555-7293' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LAZYK', 'Lazy K Kountry Store', 'John Steel', 'Marketing Manager', '12 Orchestra Terrace', 'Walla Walla', 'WA', '99362', 'USA', '(509) 555-7969', '(509) 555-6221' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LEHMS', 'Lehmanns Marktstand', 'Renate Messner', 'Sales Representative', 'Magazinweg 7', 'Frankfurt a.M.', NULL, '60528', 'Germany', '069-0245984', '069-0245874' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LETSS', 'Let''s Stop N Shop', 'Jaime Yorres', 'Owner', '87 Polk St. Suite 5', 'San Francisco', 'CA', '94117', 'USA', '(415) 555-5938', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LILAS', 'LILA-Supermercado', 'Carlos Gonz�lez', 'Accounting Manager', 'Carrera 52 con Ave. Bol�var #65-98 Llano Largo', 'Barquisimeto', 'Lara', '3508', 'Venezuela', '(9) 331-6954', '(9) 331-7256' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LINOD', 'LINO-Delicateses', 'Felipe Izquierdo', 'Owner', 'Ave. 5 de Mayo Porlamar', 'I. de Margarita', 'Nueva Esparta', '4980', 'Venezuela', '(8) 34-56-12', '(8) 34-93-93' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('LONEP', 'Lonesome Pine Restaurant', 'Fran Wilson', 'Sales Manager', '89 Chiaroscuro Rd.', 'Portland', 'OR', '97219', 'USA', '(503) 555-9573', '(503) 555-9646' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAGAA', 'Magazzini Alimentari Riuniti', 'Giovanni Rovelli', 'Marketing Manager', 'Via Ludovico il Moro 22', 'Bergamo', NULL, '24100', 'Italy', '035-640230', '035-640231' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MAISD', 'Maison Dewey', 'Catherine Dewey', 'Sales Agent', 'Rue Joseph-Bens 532', 'Bruxelles', NULL, 'B-1180', 'Belgium', '(02) 201 24 67', '(02) 201 24 68' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MEREP', 'M�re Paillarde', 'Jean Fresni�re', 'Marketing Assistant', '43 rue St. Laurent', 'Montr�al', 'Qu�bec', 'H1J 1C3', 'Canada', '(514) 555-8054', '(514) 555-8055' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('MORGK', 'Morgenstern Gesundkost', 'Alexander Feuer', 'Marketing Assistant', 'Heerstr. 22', 'Leipzig', NULL, '04179', 'Germany', '0342-023176', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('NORTS', 'North/South', 'Simon Crowther', 'Sales Associate', 'South House 300 Queensbridge', 'London', NULL, 'SW7 1RZ', 'UK', '(171) 555-7733', '(171) 555-2530' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OCEAN', 'Oc�ano Atl�ntico Ltda.', 'Yvonne Moncada', 'Sales Agent', 'Ing. Gustavo Moncada 8585 Piso 20-A', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 135-5333', '(1) 135-5535' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OLDWO', 'Old World Delicatessen', 'Rene Phillips', 'Sales Representative', '2743 Bering St.', 'Anchorage', 'AK', '99508', 'USA', '(907) 555-7584', '(907) 555-2880' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('OTTIK', 'Ottilies K�seladen', 'Henriette Pfalzheim', 'Owner', 'Mehrheimerstr. 369', 'K�ln', NULL, '50739', 'Germany', '0221-0644327', '0221-0765721' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PARIS', 'Paris sp�cialit�s', 'Marie Bertrand', 'Owner', '265, boulevard Charonne', 'Paris', NULL, '75012', 'France', '(1) 42.34.22.66', '(1) 42.34.22.77' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PERIC', 'Pericles Comidas cl�sicas', 'Guillermo Fern�ndez', 'Sales Representative', 'Calle Dr. Jorge Cash 321', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 552-3745', '(5) 545-3745' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PICCO', 'Piccolo und mehr', 'Georg Pipps', 'Sales Manager', 'Geislweg 14', 'Salzburg', NULL, '5020', 'Austria', '6562-9722', '6562-9723' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('PRINI', 'Princesa Isabel Vinhos', 'Isabel de Castro', 'Sales Representative', 'Estrada da sa�de n. 58', 'Lisboa', NULL, '1756', 'Portugal', '(1) 356-5634', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEDE', 'Que Del�cia', 'Bernardo Batista', 'Accounting Manager', 'Rua da Panificadora, 12', 'Rio de Janeiro', 'RJ', '02389-673', 'Brazil', '(21) 555-4252', '(21) 555-4545' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUEEN', 'Queen Cozinha', 'L�cia Carvalho', 'Marketing Assistant', 'Alameda dos Can�rios, 891', 'Sao Paulo', 'SP', '05487-020', 'Brazil', '(11) 555-1189', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('QUICK', 'QUICK-Stop', 'Horst Kloss', 'Accounting Manager', 'Taucherstra�e 10', 'Cunewalde', NULL, '01307', 'Germany', '0372-035188', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RANCH', 'Rancho grande', 'Sergio Guti�rrez', 'Sales Representative', 'Av. del Libertador 900', 'Buenos Aires', NULL, '1010', 'Argentina', '(1) 123-5555', '(1) 123-5556' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RATTC', 'Rattlesnake Canyon Grocery', 'Paula Wilson', 'Assistant Sales Representative', '2817 Milton Dr.', 'Albuquerque', 'NM', '87110', 'USA', '(505) 555-5939', '(505) 555-3620' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('REGGC', 'Reggiani Caseifici', 'Maurizio Moroni', 'Sales Associate', 'Strada Provinciale 124', 'Reggio Emilia', NULL, '42100', 'Italy', '0522-556721', '0522-556722' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICAR', 'Ricardo Adocicados', 'Janete Limeira', 'Assistant Sales Agent', 'Av. Copacabana, 267', 'Rio de Janeiro', 'RJ', '02389-890', 'Brazil', '(21) 555-3412', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('RICSU', 'Richter Supermarkt', 'Michael Holz', 'Sales Manager', 'Grenzacherweg 237', 'Gen�ve', NULL, '1203', 'Switzerland', '0897-034214', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('ROMEY', 'Romero y tomillo', 'Alejandra Camino', 'Accounting Manager', 'Gran V�a, 1', 'Madrid', NULL, '28001', 'Spain', '(91) 745 6200', '(91) 745 6210' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SANTG', 'Sant� Gourmet', 'Jonas Bergulfsen', 'Owner', 'Erling Skakkes gate 78', 'Stavern', NULL, '4110', 'Norway', '07-98 92 35', '07-98 92 47' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SAVEA', 'Save-a-lot Markets', 'Jose Pavarotti', 'Sales Representative', '187 Suffolk Ln.', 'Boise', 'ID', '83720', 'USA', '(208) 555-8097', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SEVES', 'Seven Seas Imports', 'Hari Kumar', 'Sales Manager', '90 Wadhurst Rd.', 'London', NULL, 'OX15 4NB', 'UK', '(171) 555-1717', '(171) 555-5646' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SIMOB', 'Simons bistro', 'Jytte Petersen', 'Owner', 'Vinb�ltet 34', 'Kobenhavn', NULL, '1734', 'Denmark', '31 12 34 56', '31 13 35 57' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPECD', 'Sp�cialit�s du monde', 'Dominique Perrier', 'Marketing Manager', '25, rue Lauriston', 'Paris', NULL, '75016', 'France', '(1) 47.55.60.10', '(1) 47.55.60.20' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SPLIR', 'Split Rail Beer  Ale', 'Art Braunschweiger', 'Sales Manager', 'P.O. Box 555', 'Lander', 'WY', '82520', 'USA', '(307) 555-4680', '(307) 555-6525' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('SUPRD', 'Supr�mes d�lices', 'Pascale Cartrain', 'Accounting Manager', 'Boulevard Tirou, 255', 'Charleroi', NULL, 'B-6000', 'Belgium', '(071) 23 67 22 20', '(071) 23 67 22 21' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THEBI', 'The Big Cheese', 'Liz Nixon', 'Marketing Manager', '89 Jefferson Way Suite 2', 'Portland', 'OR', '97201', 'USA', '(503) 555-3612', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('THECR', 'The Cracker Box', 'Liu Wong', 'Marketing Assistant', '55 Grizzly Peak Rd.', 'Butte', 'MT', '59801', 'USA', '(406) 555-5834', '(406) 555-8083' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TOMSP', 'Toms Spezialit�ten', 'Karin Josephs', 'Marketing Manager', 'Luisenstr. 48', 'M�nster', NULL, '44087', 'Germany', '0251-031259', '0251-035695' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TORTU', 'Tortuga Restaurante', 'Miguel Angel Paolino', 'Owner', 'Avda. Azteca 123', 'M�xico D.F.', NULL, '05033', 'Mexico', '(5) 555-2933', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRADH', 'Tradi��o Hipermercados', 'Anabela Domingues', 'Sales Representative', 'Av. In�s de Castro, 414', 'Sao Paulo', 'SP', '05634-030', 'Brazil', '(11) 555-2167', '(11) 555-2168' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('TRAIH', 'Trail''s Head Gourmet Provisioners', 'Helvetius Nagy', 'Sales Associate', '722 DaVinci Blvd.', 'Kirkland', 'WA', '98034', 'USA', '(206) 555-8257', '(206) 555-2174' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VAFFE', 'Vaffeljernet', 'Palle Ibsen', 'Sales Manager', 'Smagsloget 45', '�rhus', NULL, '8200', 'Denmark', '86 21 32 43', '86 22 33 44' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VICTE', 'Victuailles en stock', 'Mary Saveley', 'Sales Agent', '2, rue du Commerce', 'Lyon', NULL, '69004', 'France', '78.32.54.86', '78.32.54.87' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('VINET', 'Vins et alcools Chevalier', 'Paul Henriot', 'Accounting Manager', '59 rue de l''Abbaye', 'Reims', NULL, '51100', 'France', '26.47.15.10', '26.47.15.11' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WANDK', 'Die Wandernde Kuh', 'Rita M�ller', 'Sales Representative', 'Adenauerallee 900', 'Stuttgart', NULL, '70563', 'Germany', '0711-020361', '0711-035428' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WARTH', 'Wartian Herkku', 'Pirkko Koskitalo', 'Accounting Manager', 'Torikatu 38', 'Oulu', NULL, '90110', 'Finland', '981-443655', '981-443655' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WELLI', 'Wellington Importadora', 'Paula Parente', 'Sales Manager', 'Rua do Mercado, 12', 'Resende', 'SP', '08737-363', 'Brazil', '(14) 555-8122', NULL ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WHITC', 'White Clover Markets', 'Karl Jablonski', 'Owner', '305 - 14th Ave. S. Suite 3B', 'Seattle', 'WA', '98128', 'USA', '(206) 555-4112', '(206) 555-4115' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WILMK', 'Wilman Kala', 'Matti Karttunen', 'Owner/Marketing Assistant', 'Keskuskatu 45', 'Helsinki', NULL, '21240', 'Finland', '90-224 8858', '90-224 8858' ) ;
-INSERT INTO GHTDB_EX.CUSTOMERS ( CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax ) VALUES ('WOLZA', 'Wolski  Zajazd', 'Zbyszek Piestrzeniewicz', 'Owner', 'ul. Filtrowa 68', 'Warszawa', NULL, '01-012', 'Poland', '(26) 642-7012', '(26) 642-7012' ) ;
-/
-
-
-commit;
-
-exit
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.MSSQL.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.MSSQL.sql
deleted file mode 100755
index d68ec894932..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.MSSQL.sql
+++ /dev/null
@@ -1,1640 +0,0 @@
-IF EXISTS (SELECT name FROM master.dbo.sysdatabases WHERE name = N'GHTDB')
-	DROP DATABASE [GHTDB]
-GO
-
-CREATE DATABASE [GHTDB]  ON (NAME = N'GHTDB_dat', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL\data\GHTDB.mdf' , SIZE = 6, FILEGROWTH = 10%) LOG ON (NAME = N'GHTDB_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL\data\GHTDB.ldf' , SIZE = 2, FILEGROWTH = 10%)
- COLLATE SQL_Latin1_General_CP1_CI_AS
-GO
-
-exec sp_dboption N'GHTDB', N'autoclose', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'bulkcopy', N'true'
-GO
-
-exec sp_dboption N'GHTDB', N'trunc. log', N'true'
-GO
-
-exec sp_dboption N'GHTDB', N'torn page detection', N'true'
-GO
-
-exec sp_dboption N'GHTDB', N'read only', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'dbo use', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'single', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'autoshrink', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'ANSI null default', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'recursive triggers', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'ANSI nulls', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'concat null yields null', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'cursor close on commit', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'default to local cursor', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'quoted identifier', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'ANSI warnings', N'false'
-GO
-
-exec sp_dboption N'GHTDB', N'auto create statistics', N'true'
-GO
-
-exec sp_dboption N'GHTDB', N'auto update statistics', N'true'
-GO
-
-if( ( (@@microsoftversion / power(2, 24) = 8) and (@@microsoftversion & 0xffff >= 724) ) or ( (@@microsoftversion / power(2, 24) = 7) and (@@microsoftversion & 0xffff >= 1082) ) )
-	exec sp_dboption N'GHTDB', N'db chaining', N'false'
-GO
-
-use [GHTDB]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Products_Categories]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Products] DROP CONSTRAINT FK_Products_Categories
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_CustomerCustomerDemo]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[CustomerCustomerDemo] DROP CONSTRAINT FK_CustomerCustomerDemo
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_CustomerCustomerDemo_Customers]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[CustomerCustomerDemo] DROP CONSTRAINT FK_CustomerCustomerDemo_Customers
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Orders_Customers]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Orders] DROP CONSTRAINT FK_Orders_Customers
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Employees_Employees]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Employees] DROP CONSTRAINT FK_Employees_Employees
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_EmployeeTerritories_Employees]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[EmployeeTerritories] DROP CONSTRAINT FK_EmployeeTerritories_Employees
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Orders_Employees]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Orders] DROP CONSTRAINT FK_Orders_Employees
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Order_Details_Orders]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Order Details] DROP CONSTRAINT FK_Order_Details_Orders
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Order_Details_Products]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Order Details] DROP CONSTRAINT FK_Order_Details_Products
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Territories_Region]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Territories] DROP CONSTRAINT FK_Territories_Region
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Orders_Shippers]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Orders] DROP CONSTRAINT FK_Orders_Shippers
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_Products_Suppliers]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[Products] DROP CONSTRAINT FK_Products_Suppliers
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[FK_EmployeeTerritories_Territories]') and OBJECTPROPERTY(id, N'IsForeignKey') = 1)
-ALTER TABLE [dbo].[EmployeeTerritories] DROP CONSTRAINT FK_EmployeeTerritories_Territories
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[CustOrderHist]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[CustOrderHist]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[CustOrdersDetail]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[CustOrdersDetail]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[CustOrdersOrders]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[CustOrdersOrders]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Employee Sales by Country]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[Employee Sales by Country]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_CreateTable]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_CreateTable]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_MultiRecordSets]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_MultiRecordSets]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_INOUT1]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_INOUT1]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_REFCURSOR1]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_REFCURSOR1]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_REFCURSOR2]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_REFCURSOR2]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_REFCURSOR3]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_REFCURSOR3]
-GO
-
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Sales by Year]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[Sales by Year]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[SalesByCategory]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[SalesByCategory]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Ten Most Expensive Products]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[Ten Most Expensive Products]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Category Sales for 1997]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Category Sales for 1997]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Sales Totals by Amount]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Sales Totals by Amount]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Sales by Category]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Sales by Category]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Summary of Sales by Quarter]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Summary of Sales by Quarter]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Summary of Sales by Year]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Summary of Sales by Year]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Invoices]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Invoices]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Order Details Extended]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Order Details Extended]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Order Subtotals]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Order Subtotals]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Product Sales for 1997]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Product Sales for 1997]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Alphabetical list of products]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Alphabetical list of products]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Current Product List]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Current Product List]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Orders Qry]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Orders Qry]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Products Above Average Price]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Products Above Average Price]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Products by Category]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Products by Category]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Quarterly Orders]') and OBJECTPROPERTY(id, N'IsView') = 1)
-drop view [dbo].[Quarterly Orders]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Categories]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Categories]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[CustomerCustomerDemo]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[CustomerCustomerDemo]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[CustomerDemographics]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[CustomerDemographics]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Customers]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Customers]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[EmployeeTerritories]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[EmployeeTerritories]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Employees]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Employees]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_EMPTYTABLE]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[GH_EMPTYTABLE]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Order Details]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Order Details]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Orders]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Orders]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Products]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Products]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Region]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Region]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Shippers]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Shippers]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Suppliers]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Suppliers]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Territories]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Territories]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Types_Simple]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Types_Simple]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Types_Extended]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Types_Extended]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Types_Specific]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Types_Specific]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GHSP_TYPES_SIMPLE_1]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GHSP_TYPES_SIMPLE_1]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GHSP_TYPES_SIMPLE_2]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GHSP_TYPES_SIMPLE_2]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GHSP_TYPES_SIMPLE_3]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GHSP_TYPES_SIMPLE_3]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GHSP_TYPES_SIMPLE_4]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GHSP_TYPES_SIMPLE_4]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GHSP_TYPES_SIMPLE_5]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GHSP_TYPES_SIMPLE_5]
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-
-CREATE TABLE [dbo].[TYPES_SIMPLE] (
--- ID
-	[ID] char(10) NULL,
-	[T_BIT] [bit] NULL ,
--- integer
-	[T_TINYINT] [tinyint] NULL ,
-	[T_SMALLINT] [smallint] NULL ,
-	[T_INT] [int] NULL ,
-	[T_BIGINT] [bigint] NULL ,
--- float
-	[T_DECIMAL] [decimal](18, 0) NULL ,
-	[T_NUMERIC] [numeric](18, 0) NULL ,
-	[T_FLOAT] [float] NULL ,
-	[T_REAL] [real] NULL ,
--- text
-	[T_CHAR] [char] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[T_NCHAR] [nchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[T_VARCHAR] [varchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[T_NVARCHAR] [nvarchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[TYPES_EXTENDED] (
--- ID
-	[ID] char(10) NULL,
--- Text
-	[T_TEXT] [text] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[T_NTEXT] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
--- Binary
-	[T_BINARY] [binary] (50) NULL ,
-	[T_VARBINARY] [varbinary] (50) NULL ,
---Time
-	[T_DATETIME] [datetime] NULL ,
-	[T_SMALLDATETIME] [smalldatetime] NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-CREATE TABLE [dbo].[TYPES_SPECIFIC] (
--- ID
-	[ID] char(10) NULL,
-	[T_SMALLMONEY] [smallmoney] NULL ,
-	[T_MONEY] [money] NULL ,
-	[T_IMAGE] [image] NULL ,
-	[T_UNIQUEIDENTIFIER] [uniqueidentifier] NULL ,
-	[T_SQL_VARIANT] [sql_variant] NULL ,
-	[T_TIMESTAMP] [timestamp] NULL
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Categories] (
-	[CategoryID] [int] IDENTITY (1, 1) NOT NULL ,
-	[CategoryName] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[Description] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Picture] [image] NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[CustomerCustomerDemo] (
-	[CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[CustomerTypeID] [nchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[CustomerDemographics] (
-	[CustomerTypeID] [nchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[CustomerDesc] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Customers] (
-	[CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[CompanyName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[ContactName] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ContactTitle] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Address] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[City] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Region] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[PostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Country] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Phone] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Fax] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[EmployeeTerritories] (
-	[EmployeeID] [int] NOT NULL ,
-	[TerritoryID] [nvarchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Employees] (
-	[EmployeeID] [int] NOT NULL ,
-	[LastName] [nvarchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[FirstName] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[Title] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[TitleOfCourtesy] [nvarchar] (25) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[BirthDate] [datetime] NULL ,
-	[HireDate] [datetime] NULL ,
-	[Address] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[City] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Region] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[PostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Country] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[HomePhone] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Extension] [nvarchar] (4) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Photo] [image] NULL ,
-	[Notes] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ReportsTo] [int] NULL ,
-	[PhotoPath] [nvarchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[GH_EMPTYTABLE] (
-	[Col1] [int] NULL ,
-	[Col2] [varchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Order Details] (
-	[OrderID] [int] NOT NULL ,
-	[ProductID] [int] NOT NULL ,
-	[UnitPrice] [money] NOT NULL ,
-	[Quantity] [smallint] NOT NULL ,
-	[Discount] [real] NOT NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Orders] (
-	[OrderID] [int] IDENTITY (1, 1) NOT NULL ,
-	[CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[EmployeeID] [int] NULL ,
-	[OrderDate] [datetime] NULL ,
-	[RequiredDate] [datetime] NULL ,
-	[ShippedDate] [datetime] NULL ,
-	[ShipVia] [int] NULL ,
-	[Freight] [money] NULL ,
-	[ShipName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ShipAddress] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ShipCity] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ShipRegion] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ShipPostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ShipCountry] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Products] (
-	[ProductID] [int] IDENTITY (1, 1) NOT NULL ,
-	[ProductName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[SupplierID] [int] NULL ,
-	[CategoryID] [int] NULL ,
-	[QuantityPerUnit] [nvarchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[UnitPrice] [money] NULL ,
-	[UnitsInStock] [smallint] NULL ,
-	[UnitsOnOrder] [smallint] NULL ,
-	[ReorderLevel] [smallint] NULL ,
-	[Discontinued] [bit] NOT NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Region] (
-	[RegionID] [int] NOT NULL ,
-	[RegionDescription] [nchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Shippers] (
-	[ShipperID] [int] IDENTITY (1, 1) NOT NULL ,
-	[CompanyName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[Phone] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Suppliers] (
-	[SupplierID] [int] IDENTITY (1, 1) NOT NULL ,
-	[CompanyName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[ContactName] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ContactTitle] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Address] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[City] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Region] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[PostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Country] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Phone] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Fax] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[HomePage] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[Territories] (
-	[TerritoryID] [nvarchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[TerritoryDescription] [nchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[RegionID] [int] NOT NULL 
-) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Categories] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Categories] PRIMARY KEY  CLUSTERED 
-	(
-		[CategoryID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Customers] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Customers] PRIMARY KEY  CLUSTERED 
-	(
-		[CustomerID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Employees] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Employees] PRIMARY KEY  CLUSTERED 
-	(
-		[EmployeeID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Order Details] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Order_Details] PRIMARY KEY  CLUSTERED 
-	(
-		[OrderID],
-		[ProductID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Orders] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Orders] PRIMARY KEY  CLUSTERED 
-	(
-		[OrderID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Products] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Products] PRIMARY KEY  CLUSTERED 
-	(
-		[ProductID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Shippers] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Shippers] PRIMARY KEY  CLUSTERED 
-	(
-		[ShipperID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Suppliers] WITH NOCHECK ADD 
-	CONSTRAINT [PK_Suppliers] PRIMARY KEY  CLUSTERED 
-	(
-		[SupplierID]
-	)  ON [PRIMARY] 
-GO
-
- CREATE  INDEX [CategoryName] ON [dbo].[Categories]([CategoryName]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[CustomerCustomerDemo] ADD 
-	CONSTRAINT [PK_CustomerCustomerDemo] PRIMARY KEY  NONCLUSTERED 
-	(
-		[CustomerID],
-		[CustomerTypeID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[CustomerDemographics] ADD 
-	CONSTRAINT [PK_CustomerDemographics] PRIMARY KEY  NONCLUSTERED 
-	(
-		[CustomerTypeID]
-	)  ON [PRIMARY] 
-GO
-
- CREATE  INDEX [City] ON [dbo].[Customers]([City]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [CompanyName] ON [dbo].[Customers]([CompanyName]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [PostalCode] ON [dbo].[Customers]([PostalCode]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [Region] ON [dbo].[Customers]([Region]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[EmployeeTerritories] ADD 
-	CONSTRAINT [PK_EmployeeTerritories] PRIMARY KEY  NONCLUSTERED 
-	(
-		[EmployeeID],
-		[TerritoryID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[Employees] ADD 
-	CONSTRAINT [CK_Birthdate] CHECK ([BirthDate] < getdate())
-GO
-
- CREATE  INDEX [LastName] ON [dbo].[Employees]([LastName]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [PostalCode] ON [dbo].[Employees]([PostalCode]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Order Details] ADD 
-	CONSTRAINT [DF_Order_Details_UnitPrice] DEFAULT (0) FOR [UnitPrice],
-	CONSTRAINT [DF_Order_Details_Quantity] DEFAULT (1) FOR [Quantity],
-	CONSTRAINT [DF_Order_Details_Discount] DEFAULT (0) FOR [Discount],
-	CONSTRAINT [CK_Discount] CHECK ([Discount] >= 0 and [Discount] <= 1),
-	CONSTRAINT [CK_Quantity] CHECK ([Quantity] > 0),
-	CONSTRAINT [CK_UnitPrice] CHECK ([UnitPrice] >= 0)
-GO
-
- CREATE  INDEX [OrderID] ON [dbo].[Order Details]([OrderID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [OrdersOrder_Details] ON [dbo].[Order Details]([OrderID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [ProductID] ON [dbo].[Order Details]([ProductID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [ProductsOrder_Details] ON [dbo].[Order Details]([ProductID]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Orders] ADD 
-	CONSTRAINT [DF_Orders_Freight] DEFAULT (0) FOR [Freight]
-GO
-
- CREATE  INDEX [CustomerID] ON [dbo].[Orders]([CustomerID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [CustomersOrders] ON [dbo].[Orders]([CustomerID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [EmployeeID] ON [dbo].[Orders]([EmployeeID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [EmployeesOrders] ON [dbo].[Orders]([EmployeeID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [OrderDate] ON [dbo].[Orders]([OrderDate]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [ShippedDate] ON [dbo].[Orders]([ShippedDate]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [ShippersOrders] ON [dbo].[Orders]([ShipVia]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [ShipPostalCode] ON [dbo].[Orders]([ShipPostalCode]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Products] ADD 
-	CONSTRAINT [DF_Products_UnitPrice] DEFAULT (0) FOR [UnitPrice],
-	CONSTRAINT [DF_Products_UnitsInStock] DEFAULT (0) FOR [UnitsInStock],
-	CONSTRAINT [DF_Products_UnitsOnOrder] DEFAULT (0) FOR [UnitsOnOrder],
-	CONSTRAINT [DF_Products_ReorderLevel] DEFAULT (0) FOR [ReorderLevel],
-	CONSTRAINT [DF_Products_Discontinued] DEFAULT (0) FOR [Discontinued],
-	CONSTRAINT [CK_Products_UnitPrice] CHECK ([UnitPrice] >= 0),
-	CONSTRAINT [CK_ReorderLevel] CHECK ([ReorderLevel] >= 0),
-	CONSTRAINT [CK_UnitsInStock] CHECK ([UnitsInStock] >= 0),
-	CONSTRAINT [CK_UnitsOnOrder] CHECK ([UnitsOnOrder] >= 0)
-GO
-
- CREATE  INDEX [CategoriesProducts] ON [dbo].[Products]([CategoryID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [CategoryID] ON [dbo].[Products]([CategoryID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [ProductName] ON [dbo].[Products]([ProductName]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [SupplierID] ON [dbo].[Products]([SupplierID]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [SuppliersProducts] ON [dbo].[Products]([SupplierID]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Region] ADD 
-	CONSTRAINT [PK_Region] PRIMARY KEY  NONCLUSTERED 
-	(
-		[RegionID]
-	)  ON [PRIMARY] 
-GO
-
- CREATE  INDEX [CompanyName] ON [dbo].[Suppliers]([CompanyName]) ON [PRIMARY]
-GO
-
- CREATE  INDEX [PostalCode] ON [dbo].[Suppliers]([PostalCode]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Territories] ADD 
-	CONSTRAINT [PK_Territories] PRIMARY KEY  NONCLUSTERED 
-	(
-		[TerritoryID]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[CustomerCustomerDemo] ADD 
-	CONSTRAINT [FK_CustomerCustomerDemo] FOREIGN KEY 
-	(
-		[CustomerTypeID]
-	) REFERENCES [dbo].[CustomerDemographics] (
-		[CustomerTypeID]
-	),
-	CONSTRAINT [FK_CustomerCustomerDemo_Customers] FOREIGN KEY 
-	(
-		[CustomerID]
-	) REFERENCES [dbo].[Customers] (
-		[CustomerID]
-	)
-GO
-
-ALTER TABLE [dbo].[EmployeeTerritories] ADD 
-	CONSTRAINT [FK_EmployeeTerritories_Employees] FOREIGN KEY 
-	(
-		[EmployeeID]
-	) REFERENCES [dbo].[Employees] (
-		[EmployeeID]
-	),
-	CONSTRAINT [FK_EmployeeTerritories_Territories] FOREIGN KEY 
-	(
-		[TerritoryID]
-	) REFERENCES [dbo].[Territories] (
-		[TerritoryID]
-	)
-GO
-
-ALTER TABLE [dbo].[Employees] ADD 
-	CONSTRAINT [FK_Employees_Employees] FOREIGN KEY 
-	(
-		[ReportsTo]
-	) REFERENCES [dbo].[Employees] (
-		[EmployeeID]
-	)
-GO
-
-ALTER TABLE [dbo].[Order Details] ADD 
-	CONSTRAINT [FK_Order_Details_Orders] FOREIGN KEY 
-	(
-		[OrderID]
-	) REFERENCES [dbo].[Orders] (
-		[OrderID]
-	),
-	CONSTRAINT [FK_Order_Details_Products] FOREIGN KEY 
-	(
-		[ProductID]
-	) REFERENCES [dbo].[Products] (
-		[ProductID]
-	)
-GO
-
-ALTER TABLE [dbo].[Orders] ADD 
-	CONSTRAINT [FK_Orders_Customers] FOREIGN KEY 
-	(
-		[CustomerID]
-	) REFERENCES [dbo].[Customers] (
-		[CustomerID]
-	),
-	CONSTRAINT [FK_Orders_Employees] FOREIGN KEY 
-	(
-		[EmployeeID]
-	) REFERENCES [dbo].[Employees] (
-		[EmployeeID]
-	),
-	CONSTRAINT [FK_Orders_Shippers] FOREIGN KEY 
-	(
-		[ShipVia]
-	) REFERENCES [dbo].[Shippers] (
-		[ShipperID]
-	)
-GO
-
-ALTER TABLE [dbo].[Products] ADD 
-	CONSTRAINT [FK_Products_Categories] FOREIGN KEY 
-	(
-		[CategoryID]
-	) REFERENCES [dbo].[Categories] (
-		[CategoryID]
-	),
-	CONSTRAINT [FK_Products_Suppliers] FOREIGN KEY 
-	(
-		[SupplierID]
-	) REFERENCES [dbo].[Suppliers] (
-		[SupplierID]
-	)
-GO
-
-ALTER TABLE [dbo].[Territories] ADD 
-	CONSTRAINT [FK_Territories_Region] FOREIGN KEY 
-	(
-		[RegionID]
-	) REFERENCES [dbo].[Region] (
-		[RegionID]
-	)
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Current Product List" AS
-SELECT Product_List.ProductID, Product_List.ProductName
-FROM Products AS Product_List
-WHERE (((Product_List.Discontinued)=0))
---ORDER BY Product_List.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Orders Qry" AS
-SELECT Orders.OrderID, Orders.CustomerID, Orders.EmployeeID, Orders.OrderDate, Orders.RequiredDate, 
-	Orders.ShippedDate, Orders.ShipVia, Orders.Freight, Orders.ShipName, Orders.ShipAddress, Orders.ShipCity, 
-	Orders.ShipRegion, Orders.ShipPostalCode, Orders.ShipCountry, 
-	Customers.CompanyName, Customers.Address, Customers.City, Customers.Region, Customers.PostalCode, Customers.Country
-FROM Customers INNER JOIN Orders ON Customers.CustomerID = Orders.CustomerID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Products Above Average Price" AS
-SELECT Products.ProductName, Products.UnitPrice
-FROM Products
-WHERE Products.UnitPrice>(SELECT AVG(UnitPrice) From Products)
---ORDER BY Products.UnitPrice DESC
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Products by Category" AS
-SELECT Categories.CategoryName, Products.ProductName, Products.QuantityPerUnit, Products.UnitsInStock, Products.Discontinued
-FROM Categories INNER JOIN Products ON Categories.CategoryID = Products.CategoryID
-WHERE Products.Discontinued <> 1
---ORDER BY Categories.CategoryName, Products.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Quarterly Orders" AS
-SELECT DISTINCT Customers.CustomerID, Customers.CompanyName, Customers.City, Customers.Country
-FROM Customers RIGHT JOIN Orders ON Customers.CustomerID = Orders.CustomerID
-WHERE Orders.OrderDate BETWEEN '19970101' And '19971231'
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view Invoices AS
-SELECT Orders.ShipName, Orders.ShipAddress, Orders.ShipCity, Orders.ShipRegion, Orders.ShipPostalCode, 
-	Orders.ShipCountry, Orders.CustomerID, Customers.CompanyName AS CustomerName, Customers.Address, Customers.City, 
-	Customers.Region, Customers.PostalCode, Customers.Country, 
-	(FirstName + ' ' + LastName) AS Salesperson, 
-	Orders.OrderID, Orders.OrderDate, Orders.RequiredDate, Orders.ShippedDate, Shippers.CompanyName As ShipperName, 
-	"Order Details".ProductID, Products.ProductName, "Order Details".UnitPrice, "Order Details".Quantity, 
-	"Order Details".Discount, 
-	(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS ExtendedPrice, Orders.Freight
-FROM 	Shippers INNER JOIN 
-		(Products INNER JOIN 
-			(
-				(Employees INNER JOIN 
-					(Customers INNER JOIN Orders ON Customers.CustomerID = Orders.CustomerID) 
-				ON Employees.EmployeeID = Orders.EmployeeID) 
-			INNER JOIN "Order Details" ON Orders.OrderID = "Order Details".OrderID) 
-		ON Products.ProductID = "Order Details".ProductID) 
-	ON Shippers.ShipperID = Orders.ShipVia
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Order Details Extended" AS
-SELECT "Order Details".OrderID, "Order Details".ProductID, Products.ProductName, 
-	"Order Details".UnitPrice, "Order Details".Quantity, "Order Details".Discount, 
-	(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS ExtendedPrice
-FROM Products INNER JOIN "Order Details" ON Products.ProductID = "Order Details".ProductID
---ORDER BY "Order Details".OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Order Subtotals" AS
-SELECT "Order Details".OrderID, Sum(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS Subtotal
-FROM "Order Details"
-GROUP BY "Order Details".OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Product Sales for 1997" AS
-SELECT Categories.CategoryName, Products.ProductName, 
-Sum(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS ProductSales
-FROM (Categories INNER JOIN Products ON Categories.CategoryID = Products.CategoryID) 
-	INNER JOIN (Orders 
-		INNER JOIN "Order Details" ON Orders.OrderID = "Order Details".OrderID) 
-	ON Products.ProductID = "Order Details".ProductID
-WHERE (((Orders.ShippedDate) Between '19970101' And '19971231'))
-GROUP BY Categories.CategoryName, Products.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Category Sales for 1997" AS
-SELECT "Product Sales for 1997".CategoryName, Sum("Product Sales for 1997".ProductSales) AS CategorySales
-FROM "Product Sales for 1997"
-GROUP BY "Product Sales for 1997".CategoryName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Sales Totals by Amount" AS
-SELECT "Order Subtotals".Subtotal AS SaleAmount, Orders.OrderID, Customers.CompanyName, Orders.ShippedDate
-FROM 	Customers INNER JOIN 
-		(Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID) 
-	ON Customers.CustomerID = Orders.CustomerID
-WHERE ("Order Subtotals".Subtotal >2500) AND (Orders.ShippedDate BETWEEN '19970101' And '19971231')
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Sales by Category" AS
-SELECT Categories.CategoryID, Categories.CategoryName, Products.ProductName, 
-	Sum("Order Details Extended".ExtendedPrice) AS ProductSales
-FROM 	Categories INNER JOIN 
-		(Products INNER JOIN 
-			(Orders INNER JOIN "Order Details Extended" ON Orders.OrderID = "Order Details Extended".OrderID) 
-		ON Products.ProductID = "Order Details Extended".ProductID) 
-	ON Categories.CategoryID = Products.CategoryID
-WHERE Orders.OrderDate BETWEEN '19970101' And '19971231'
-GROUP BY Categories.CategoryID, Categories.CategoryName, Products.ProductName
---ORDER BY Products.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Summary of Sales by Quarter" AS
-SELECT Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal
-FROM Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID
-WHERE Orders.ShippedDate IS NOT NULL
---ORDER BY Orders.ShippedDate
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create view "Summary of Sales by Year" AS
-SELECT Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal
-FROM Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID
-WHERE Orders.ShippedDate IS NOT NULL
---ORDER BY Orders.ShippedDate
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE CustOrderHist @CustomerID nchar(5)
-AS
-SELECT ProductName, Total=SUM(Quantity)
-FROM Products P, [Order Details] OD, Orders O, Customers C
-WHERE C.CustomerID = @CustomerID
-AND C.CustomerID = O.CustomerID AND O.OrderID = OD.OrderID AND OD.ProductID = P.ProductID
-GROUP BY ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE CustOrdersDetail @OrderID int
-AS
-SELECT ProductName,
-    UnitPrice=ROUND(Od.UnitPrice, 2),
-    Quantity,
-    Discount=CONVERT(int, Discount * 100), 
-    ExtendedPrice=ROUND(CONVERT(money, Quantity * (1 - Discount) * Od.UnitPrice), 2)
-FROM Products P, [Order Details] Od
-WHERE Od.ProductID = P.ProductID and Od.OrderID = @OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE CustOrdersOrders @CustomerID nchar(5)
-AS
-SELECT OrderID, 
-	OrderDate,
-	RequiredDate,
-	ShippedDate
-FROM Orders
-WHERE CustomerID = @CustomerID
-ORDER BY OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create procedure "Employee Sales by Country" 
-@Beginning_Date DateTime, @Ending_Date DateTime AS
-SELECT Employees.Country, Employees.LastName, Employees.FirstName, Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal AS SaleAmount
-FROM Employees INNER JOIN 
-	(Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID) 
-	ON Employees.EmployeeID = Orders.EmployeeID
-WHERE Orders.ShippedDate Between @Beginning_Date And @Ending_Date
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE GH_CREATETABLE
-AS
-Begin
-    --craete a temporary table
-     Create Table #temp_tbl (
-                            Col1 int,
-                            Col2 int
-                            )
-          --insert values to the table
-         insert into #temp_tbl values (11,12)
-         insert into #temp_tbl values (21,22)
-         insert into #temp_tbl values (31,32)
-         --execute select on the created table
-         select col1 as Value1, col2 as Value2 from #temp_tbl;
-         --Update Return code
-         end
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE GH_MultiRecordSets 
-as BEGIN
-    -- Declare cursor
-          SELECT EmployeeId, LastName FROM Employees where EmployeeId in (1,2) order by EmployeeId asc;
-          SELECT CustomerId, CompanyName,ContactName FROM Customers  where CustomerId in ('MORGK','NORTS') order by customerid asc;
-            -- return empty result set
-          SELECT OrderId, ShipAddress,ShipVia, ShipCity FROM Orders where OrderId=-1  ;
-END
-GO
-
-CREATE procedure GH_INOUT1
-@INPARAM varchar(20) ,
-@OUTPARAM  int output
-AS
-declare @L_INPARAM varchar(30) 
-select L_INPARAM = @INPARAM
-select @OUTPARAM = 100
-GO
-
-
-CREATE procedure GH_REFCURSOR1
-AS
-SELECT EmployeeId, LastName FROM Employees
-WHERE EmployeeId=1;
-GO
-
-CREATE procedure GH_REFCURSOR2
-@IN_EMPLOYEEID int
-AS
-SELECT EmployeeId, LastName FROM Employees 
-where EmployeeId = @IN_EMPLOYEEID
-GO
-
-
-CREATE procedure GH_REFCURSOR3
-@IN_LASTNAME varchar(20) AS
-SELECT EmployeeId, LastName FROM Employees  
-where LastName = @IN_LASTNAME
-GO
-
-
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create procedure "Sales by Year" 
-	@Beginning_Date DateTime, @Ending_Date DateTime AS
-SELECT Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal, DATENAME(yy,ShippedDate) AS Year
-FROM Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID
-WHERE Orders.ShippedDate Between @Beginning_Date And @Ending_Date
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE SalesByCategory
-    @CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
-AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
-BEGIN
-	SELECT @OrdYear = '1998'
-END
-SELECT ProductName,
-	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
-FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID 
-	AND OD.ProductID = P.ProductID 
-	AND P.CategoryID = C.CategoryID
-	AND C.CategoryName = @CategoryName
-	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
-GROUP BY ProductName
-ORDER BY ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-create procedure "Ten Most Expensive Products" AS
-SET ROWCOUNT 10
-SELECT Products.ProductName AS TenMostExpensiveProducts, Products.UnitPrice
-FROM Products
-ORDER BY Products.UnitPrice DESC
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_1
-@T_BIT bit ,
-@T_TINYINT tinyint,
-@T_SMALLINT smallint ,
-@T_INT int,
-@T_BIGINT bigint,
-@T_DECIMAL decimal(18, 0),
-@T_NUMERIC numeric(18, 0) ,
-@T_FLOAT float  ,
-@T_REAL  real  ,
-@T_CHAR char (10),
-@T_NCHAR nchar (10),
-@T_VARCHAR varchar (50) ,
-@T_NVARCHAR nvarchar (50)
- AS
-SELECT @T_BIT as 'T_BIT', @T_TINYINT as 'T_TINYINT', @T_SMALLINT as 'T_SMALLINT' , @T_INT as 'T_INT', @T_BIGINT as 'T_BIGINT', @T_DECIMAL as 'T_DECIMAL',
-@T_NUMERIC as 'T_NUMERIC' , @T_FLOAT as 'T_FLOAT'  , @T_REAL  as 'T_REAL'  , @T_CHAR as 'T_CHAR', @T_NCHAR as 'T_NCHAR', @T_VARCHAR as 'T_VARCHAR' , @T_NVARCHAR as 'T_NVARCHAR'
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_2
-@T_BIT bit output,
-@T_TINYINT tinyint output,
-@T_SMALLINT smallint output,
-@T_INT int output,
-@T_BIGINT bigint output,
-@T_DECIMAL decimal(18, 0) output,
-@T_NUMERIC numeric(18, 0)  output,
-@T_FLOAT float output,
-@T_REAL  real output,
-@T_CHAR char (10) output,
-@T_NCHAR nchar (10) output,
-@T_VARCHAR varchar (50) output,
-@T_NVARCHAR nvarchar (50) output
- AS
-IF @T_BIT=0
-	SELECT @T_BIT=1
-ELSE IF (@T_BIT=1)
-	SELECT @T_BIT=0
-SELECT @T_TINYINT = @T_TINYINT*2
-SELECT @T_SMALLINT = @T_SMALLINT*2 
-SELECT @T_INT = @T_INT*2
-SELECT @T_BIGINT = @T_BIGINT*2
-SELECT @T_DECIMAL = @T_DECIMAL*2
-SELECT @T_NUMERIC = @T_NUMERIC*2 
-SELECT @T_FLOAT = @T_FLOAT*2  
-SELECT @T_REAL = @T_REAL*2  
-SELECT @T_CHAR = UPPER(@T_CHAR)
-SELECT @T_NCHAR =UPPER(@T_NCHAR)
-SELECT @T_VARCHAR = UPPER(@T_VARCHAR)
-SELECT @T_NVARCHAR = UPPER(@T_NVARCHAR)
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_3
-@ID char,
-@T_BIT bit output,
-@T_TINYINT tinyint output,
-@T_SMALLINT smallint output,
-@T_INT int output,
-@T_BIGINT bigint output,
-@T_DECIMAL decimal(18, 0) output,
-@T_NUMERIC numeric(18, 0)  output,
-@T_FLOAT float output,
-@T_REAL  real output,
-@T_CHAR char (10) output,
-@T_NCHAR nchar (10) output,
-@T_VARCHAR varchar (50) output,
-@T_NVARCHAR nvarchar (50) output
-AS
-SELECT @T_BIT = T_BIT, @T_TINYINT = T_TINYINT, @T_SMALLINT = T_SMALLINT , @T_INT = T_INT, @T_BIGINT = T_BIGINT, @T_DECIMAL = T_DECIMAL ,
-@T_NUMERIC = T_NUMERIC , @T_FLOAT = T_FLOAT  , @T_REAL = T_REAL  , @T_CHAR = T_CHAR, @T_NCHAR = T_NCHAR, 
-@T_VARCHAR = T_VARCHAR, @T_NVARCHAR = T_NVARCHAR FROM TYPES_SIMPLE WHERE ID = @ID
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_4
-@ID char
-AS
-/*Insert*/
-insert into TYPES_SIMPLE(ID,T_INT) values (@ID,50)
-SELECT * FROM TYPES_SIMPLE WHERE ID = @ID
-/*Update*/
-update TYPES_SIMPLE set T_INT=60 where Id = @ID
-SELECT * FROM TYPES_SIMPLE WHERE ID = @ID
-/*Delete*/
-delete from TYPES_SIMPLE WHERE ID = @ID
-SELECT * FROM TYPES_SIMPLE WHERE ID = @ID
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_5
-AS
-DECLARE @T_BIT bit
-DECLARE @T_TINYINT tinyint
-DECLARE @T_SMALLINT smallint
-DECLARE @T_INT int
-DECLARE @T_BIGINT bigint
-DECLARE @T_DECIMAL decimal(18,0)
-DECLARE @T_NUMERIC numeric(18,0)
-DECLARE @T_FLOAT float
-DECLARE @T_REAL real
-DECLARE @T_CHAR char(10)
-DECLARE @T_NCHAR nchar(10)
-DECLARE @T_VARCHAR varchar(50)
-DECLARE @T_NVARCHAR nvarchar(50)
-
-SELECT @T_BIT = 1
-SELECT @T_TINYINT = 25
-SELECT @T_SMALLINT = 77
-SELECT @T_INT = 2525
-SELECT @T_BIGINT = 25251414
-SELECT @T_DECIMAL = 10
-SELECT @T_NUMERIC = 123123
-SELECT @T_FLOAT = 17.1414257
-SELECT @T_REAL = 0.71425
-SELECT @T_CHAR = 'abcdefghij'
-SELECT @T_NCHAR = N'klmnopqrst'
-SELECT @T_VARCHAR = 'qwertasdfg'
-SELECT @T_NVARCHAR = N'qwertasdfg'
- 
-SELECT @T_BIT as 'T_BIT', @T_TINYINT as 'T_TINYINT', @T_SMALLINT as 'T_SMALLINT' , @T_INT as 'T_INT', @T_BIGINT as 'T_BIGINT', @T_DECIMAL as 'T_DECIMAL', @T_NUMERIC as 'T_NUMERIC' , @T_FLOAT as 'T_FLOAT'  , @T_REAL  as 'T_REAL'  , @T_CHAR as 'T_CHAR', @T_NCHAR as 'T_NCHAR', @T_VARCHAR as 'T_VARCHAR' , @T_NVARCHAR as 'T_NVARCHAR'
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-
-if not exists (select * from master.dbo.syslogins where loginname = N'mainsoft')
-BEGIN
-	declare @logindb nvarchar(132), @loginlang nvarchar(132) select @logindb = N'GHTDB', @loginlang = N'us_english'
-	if @logindb is null or not exists (select * from master.dbo.sysdatabases where name = @logindb)
-		select @logindb = N'master'
-	if @loginlang is null or (not exists (select * from master.dbo.syslanguages where name = @loginlang) and @loginlang <> N'us_english')
-		select @loginlang = @@language
-	exec sp_addlogin N'mainsoft', null, @logindb, @loginlang
-END
-GO
-
-exec sp_addsrvrolemember N'mainsoft', sysadmin
-GO
-
-
-if not exists (select * from dbo.sysusers where name = N'mainsoft' and uid < 16382)
-	EXEC sp_grantdbaccess N'mainsoft', N'mainsoft'
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[mainsoft].[CategoriesNew]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [mainsoft].[CategoriesNew]
-GO
-
-CREATE TABLE [mainsoft].[CategoriesNew] (
-	[CategoryID] [int] IDENTITY (1, 1) NOT NULL ,
-	[CategoryName] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[Description] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Picture] [image] NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [mainsoft].[Categories] (
-	[CategoryID] [nvarchar] (15) NOT NULL ,
-	[CategoryName] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[Description] [ntext] COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Picture] [int] NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE  procedure [mainsoft].[GH_DUMMY]
-@EmployeeIdPrm  char (10)
-AS
-SELECT * FROM Employees where EmployeeID > @EmployeeIdPrm
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
-------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------
-
-IF EXISTS (SELECT name FROM master.dbo.sysdatabases WHERE name = N'GHTDB_EX')
-	DROP DATABASE [GHTDB_EX]
-GO
-
-CREATE DATABASE [GHTDB_EX]  ON (NAME = N'GHTDB_dat_EX', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL\data\GHTDB_EX.mdf' , SIZE = 6, FILEGROWTH = 10%) LOG ON (NAME = N'GHTDB_EX_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL\data\GHTDB_EX.ldf' , SIZE = 2, FILEGROWTH = 10%)
- COLLATE SQL_Latin1_General_CP1_CI_AS
-GO
-
-exec sp_dboption N'GHTDB_EX', N'autoclose', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'bulkcopy', N'true'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'trunc. log', N'true'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'torn page detection', N'true'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'read only', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'dbo use', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'single', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'autoshrink', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'ANSI null default', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'recursive triggers', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'ANSI nulls', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'concat null yields null', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'cursor close on commit', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'default to local cursor', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'quoted identifier', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'ANSI warnings', N'false'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'auto create statistics', N'true'
-GO
-
-exec sp_dboption N'GHTDB_EX', N'auto update statistics', N'true'
-GO
-
-if( ( (@@microsoftversion / power(2, 24) = 8) and (@@microsoftversion & 0xffff >= 724) ) or ( (@@microsoftversion / power(2, 24) = 7) and (@@microsoftversion & 0xffff >= 1082) ) )
-	exec sp_dboption N'GHTDB_EX', N'db chaining', N'false'
-GO
-
-use [GHTDB_EX]
-GO
-
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GH_DUMMY]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[GH_DUMMY]
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[Customers]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-drop table [dbo].[Customers]
-GO
-
-CREATE TABLE [dbo].[Customers] (
-	[CustomerID] [char] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-	[CompanyName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ContactName] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[ContactTitle] [nvarchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Address] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[City] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Region] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[PostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Country] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Phone] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-	[Fax] [nvarchar] (24) COLLATE SQL_Latin1_General_CP1_CI_AS NULL 
-) ON [PRIMARY]
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-print '------------------------------'
-print 'create another GH_DUMMY which select from a different table'
-print 'customers instead of employees'
-print '------------------------------'
-go
-
-CREATE  procedure GH_DUMMY
-@CustomerIdPrm  char (10)
-AS
-SELECT * FROM Customers where CustomerID = @CustomerIdPrm
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.ORACLE.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.ORACLE.sql
deleted file mode 100755
index a5feb72a00b..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.ORACLE.sql
+++ /dev/null
@@ -1,979 +0,0 @@
-DROP INDEX GHTDB.categoryname;
-DROP INDEX GHTDB.city;
-DROP INDEX GHTDB.companyname_1;
-DROP INDEX GHTDB.postalcode_2;
-DROP INDEX GHTDB.region;
-DROP INDEX GHTDB.lastname;
-DROP INDEX GHTDB.postalcode_1;
-DROP INDEX GHTDB.categoryid;
-DROP INDEX GHTDB.productname;
-DROP INDEX GHTDB.suppliersproducts;
-DROP INDEX GHTDB.companyname;
-DROP INDEX GHTDB.postalcode;
-
-DROP TABLE GHTDB.TYPES_SIMPLE;
-DROP TABLE GHTDB.TYPES_EXTENDED;
-DROP TABLE GHTDB.TYPES_SPECIFIC;
-DROP TABLE GHTDB.categories;
-DROP TABLE GHTDB.customercustomerdemo;
-DROP TABLE GHTDB.customerdemographics;
-DROP TABLE GHTDB.customers;
-DROP TABLE GHTDB.employees;
-DROP TABLE GHTDB.employeeterritories;
-DROP TABLE GHTDB.gh_emptytable;
-DROP TABLE GHTDB."Order Details";
-DROP TABLE GHTDB.orders;
-DROP TABLE GHTDB.products;
-DROP TABLE GHTDB.region;
-DROP TABLE GHTDB.Results;
-DROP TABLE GHTDB.shippers;
-DROP TABLE GHTDB.shoppingcart;
-DROP TABLE GHTDB.suppliers;
-DROP TABLE GHTDB.territories;
-
-DROP SEQUENCE GHTDB.s_463_1_reviews;
-DROP SEQUENCE GHTDB.s_464_1_shoppingcart;
-DROP SEQUENCE GHTDB.s_59_1_products;
-DROP SEQUENCE GHTDB.s_60_1_orders;
-DROP SEQUENCE GHTDB.s_62_1_suppliers;
-DROP SEQUENCE GHTDB.s_63_1_shippers;
-DROP SEQUENCE GHTDB.s_65_1_employees;
-DROP SEQUENCE GHTDB.s_68_1_categories;
-
-DROP USER GHTDB CASCADE;
-
-CREATE USER "GHTDB"
-    IDENTIFIED BY "GHTDB" DEFAULT TABLESPACE "USERS"
-    TEMPORARY TABLESPACE "TEMP" ;
-
-GRANT CONNECT, RESOURCE, CREATE TABLE  TO "GHTDB";
-
-CREATE OR REPLACE  PACKAGE "GHTDB"."GHTPKG"  AS
-	TYPE RCT1 IS REF CURSOR;
-	IDENTITY INTEGER;
-	
-	procedure ghsp_pkgAmbig(res out rct1);
-	procedure ghsp_inPkg(CustomerIdPrm IN CHAR, result OUT RCT1);
-END;
-/
-
-CREATE TABLE GHTDB.TYPES_SIMPLE (
-	ID CHAR(10) NULL,
-	T_NUMBER NUMBER(10) NULL, 
-	T_LONG LONG NULL, 
-	T_FLOAT FLOAT(10) NULL, 
-	T_VARCHAR VARCHAR2(10) NULL, 
-	T_NVARCHAR NVARCHAR2(10) NULL, 
-	T_CHAR CHAR(10) NULL,
-	T_NCHAR NCHAR(10) NULL
-)
-  TABLESPACE USERS
-/
-
-
-
-CREATE TABLE GHTDB.TYPES_EXTENDED (
-	ID CHAR(10) NULL,
-	T_RAW RAW(10) NULL, 
-	T_LONGRAW LONG RAW NULL, 
-	T_DATE DATE NULL, 
-	T_BLOB BLOB NULL, 
-	T_CLOB CLOB NULL, 
-	T_NCLOB NCLOB NULL
-)
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB.TYPES_SPECIFIC (
-	ID	CHAR(10) NULL,
-	T_ROWID ROWID NULL, 
-	T_UROWID UROWID NULL, 
-	T_BFILE BFILE NULL, 
-	T_XMLTYPE SYS.XMLTYPE NULL
-)
-  TABLESPACE USERS 
-/
-
-CREATE TABLE GHTDB.categories (
-  categoryid   NUMBER(10,0) NOT NULL,
-  categoryname VARCHAR2(30) NOT NULL,
-  description  CLOB         NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.categoryname
-  ON GHTDB.categories (
-    categoryname
-  )
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB.customercustomerdemo (
-  customerid     CHAR(10) NOT NULL,
-  customertypeid CHAR(20) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-ALTER TABLE GHTDB.customercustomerdemo
-  ADD CONSTRAINT pk_customercustomerdemo UNIQUE (
-    customerid,
-    customertypeid
-  )
-/
-
-CREATE TABLE GHTDB.customerdemographics (
-  customertypeid CHAR(20) NOT NULL,
-  customerdesc   CLOB     NULL
-)
-  TABLESPACE USERS
-/
-
-
-ALTER TABLE GHTDB.customerdemographics
-  ADD CONSTRAINT pk_customerdemographics UNIQUE (
-    customertypeid
-  )
-/
-
-CREATE TABLE GHTDB.customers (
-  customerid   CHAR(10)      NOT NULL,
-  companyname  VARCHAR2(80)  NOT NULL,
-  contactname  VARCHAR2(60)  NULL,
-  contacttitle VARCHAR2(60)  NULL,
-  address      VARCHAR2(120) NULL,
-  city         VARCHAR2(30)  NULL,
-  region       VARCHAR2(30)  NULL,
-  postalcode   VARCHAR2(20)  NULL,
-  country      VARCHAR2(30)  NULL,
-  phone        VARCHAR2(48)  NULL,
-  fax          VARCHAR2(48)  NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.city
-  ON GHTDB.customers (
-    city
-  )
-/
-
-CREATE INDEX GHTDB.companyname_1
-  ON GHTDB.customers (
-    companyname
-  )
-/
-
-CREATE INDEX GHTDB.postalcode_2
-  ON GHTDB.customers (
-    postalcode
-  )
-/
-
-CREATE INDEX GHTDB.region
-  ON GHTDB.customers (
-    region
-  )
-/
-
-ALTER TABLE GHTDB.customers
-  ADD CONSTRAINT uk_customers_customerid UNIQUE (
-    customerid
-  )
-/
-
-CREATE TABLE GHTDB.employees (
-  employeeid      NUMBER(10,0)  NOT NULL,
-  lastname        VARCHAR2(40)  NOT NULL,
-  firstname       VARCHAR2(20)  NOT NULL,
-  title           VARCHAR2(60)  NULL,
-  titleofcourtesy VARCHAR2(50)  NULL,
-  birthdate       DATE          NULL,
-  hiredate        DATE          NULL,
-  address         VARCHAR2(120) NULL,
-  city            VARCHAR2(30)  NULL,
-  region          VARCHAR2(30)  NULL,
-  postalcode      VARCHAR2(20)  NULL,
-  country         VARCHAR2(30)  NULL,
-  homephone       VARCHAR2(48)  NULL,
-  extension       VARCHAR2(8)   NULL,
-  notes           CLOB          NULL,
-  reportsto       NUMBER(10,0)  NULL,
-  photopath       VARCHAR2(510) NULL,
-  mycolumn        NUMBER(10,0)  NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.lastname
-  ON GHTDB.employees (
-    lastname
-  )
-  TABLESPACE USERS
-/
-
-CREATE INDEX GHTDB.postalcode_1
-  ON GHTDB.employees (
-    postalcode
-  )
-  TABLESPACE USERS
-/
-
-ALTER TABLE GHTDB.employees
-  ADD CONSTRAINT pk_employees UNIQUE (
-    employeeid
-  )
-/
-
-CREATE TABLE GHTDB.employeeterritories (
-  employeeid  NUMBER(10,0) NOT NULL,
-  territoryid VARCHAR2(40) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-
-CREATE TABLE GHTDB.gh_emptytable (
-  col1 INTEGER      NULL,
-  col2 VARCHAR2(50) NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB."Order Details" (
-  orderid   NUMBER(10,0) NOT NULL,
-  productid NUMBER(10,0) NOT NULL,
-  unitprice NUMBER(19,4) NOT NULL,
-  quantity  NUMBER(5,0)  NOT NULL,
-  discount  FLOAT(126)   NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.orders (
-  orderid        NUMBER(10,0)  NOT NULL,
-  customerid     NCHAR(5)      NULL,
-  employeeid     NUMBER(10,0)  NULL,
-  orderdate      DATE          NULL,
-  requireddate   DATE          NULL,
-  shippeddate    DATE          NULL,
-  shipvia        NUMBER(10,0)  NULL,
-  freight        NUMBER(19,4)  NULL,
-  shipname       NVARCHAR2(40) NULL,
-  shipaddress    NVARCHAR2(60) NULL,
-  shipcity       NVARCHAR2(15) NULL,
-  shipregion     NVARCHAR2(15) NULL,
-  shippostalcode NVARCHAR2(10) NULL,
-  shipcountry    NVARCHAR2(15) NULL
-)
-  TABLESPACE USERS
-/
-
-ALTER TABLE GHTDB.orders
-  ADD CONSTRAINT orders_uk11075049410018 UNIQUE (
-    orderid
-  )
-/
-
-ALTER TABLE GHTDB.orders
-  ADD CONSTRAINT orders_fk21075049699981 FOREIGN KEY (
-    orderid
-  ) REFERENCES GHTDB.orders (
-    orderid
-  )
-/
-
-CREATE TABLE GHTDB.products (
-  productid       NUMBER(10,0) NOT NULL,
-  productname     VARCHAR2(80) NOT NULL,
-  supplierid      NUMBER(10,0) NULL,
-  categoryid      NUMBER(10,0) NULL,
-  quantityperunit VARCHAR2(40) NULL,
-  unitprice       NUMBER(19,4) DEFAULT (0) NULL,
-  unitsinstock    NUMBER(5,0)  DEFAULT (0) NULL,
-  unitsonorder    NUMBER(5,0)  DEFAULT (0) NULL,
-  reorderlevel    NUMBER(5,0)  DEFAULT (0) NULL,
-  discontinued    NUMBER(1,0)  DEFAULT (0) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_products_unitprice CHECK (
-    UnitPrice >= 0
-  )
-/
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_reorderlevel CHECK (
-    ReorderLevel >= 0
-  )
-/
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_unitsinstock CHECK (
-    UnitsInStock >= 0
-  )
-/
-
-ALTER TABLE GHTDB.products
-  ADD CONSTRAINT ck_unitsonorder CHECK (
-    UnitsOnOrder >= 0
-  )
-/
-
-CREATE INDEX GHTDB.categoryid
-  ON GHTDB.products (
-    categoryid
-  )
-/
-
-CREATE INDEX GHTDB.productname
-  ON GHTDB.products (
-    productname
-  )
-/
-
-CREATE INDEX GHTDB.suppliersproducts
-  ON GHTDB.products (
-    supplierid
-  )
-/
-
-CREATE TABLE GHTDB.region (
-  regionid          NUMBER(10,0) NOT NULL,
-  regiondescription CHAR(100)    NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.Results (
-  employeeid      NUMBER(10,0)  NOT NULL,
-  lastname        VARCHAR2(20)  NOT NULL,
-  firstname       VARCHAR2(10)  NOT NULL,
-  title           VARCHAR2(30)  NULL,
-  titleofcourtesy VARCHAR2(25)  NULL,
-  birthdate       DATE          NULL,
-  hiredate        DATE          NULL,
-  address         VARCHAR2(60)  NULL,
-  city            VARCHAR2(15)  NULL,
-  region          VARCHAR2(15)  NULL,
-  postalcode      VARCHAR2(10)  NULL,
-  country         VARCHAR2(15)  NULL,
-  homephone       VARCHAR2(24)  NULL,
-  extension       VARCHAR2(4)   NULL,
-  notes           CLOB          NULL,
-  reportsto       NUMBER(10,0)  NULL,
-  photopath       VARCHAR2(255) NULL,
-  mycolumn        NUMBER(10,0)  NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.shippers (
-  shipperid   NUMBER(10,0) NOT NULL,
-  companyname VARCHAR2(80) NOT NULL,
-  phone       VARCHAR2(48) NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.shoppingcart (
-  recordid    NUMBER(10,0)  NOT NULL,
-  cartid      VARCHAR2(100) NULL,
-  quantity    NUMBER(10,0)  DEFAULT (1) NOT NULL,
-  productid   NUMBER(10,0)  NOT NULL,
-  datecreated DATE          DEFAULT (SYSDATE) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE TABLE GHTDB.suppliers (
-  supplierid   NUMBER(10,0)  NOT NULL,
-  companyname  VARCHAR2(80)  NOT NULL,
-  contactname  VARCHAR2(60)  NULL,
-  contacttitle VARCHAR2(60)  NULL,
-  address      VARCHAR2(120) NULL,
-  city         VARCHAR2(30)  NULL,
-  region       VARCHAR2(30)  NULL,
-  postalcode   VARCHAR2(20)  NULL,
-  country      VARCHAR2(30)  NULL,
-  phone        VARCHAR2(48)  NULL,
-  fax          VARCHAR2(48)  NULL,
-  homepage     CLOB          NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE INDEX GHTDB.companyname
-  ON GHTDB.suppliers (
-    companyname
-  )
-  TABLESPACE USERS
-/
-
-CREATE INDEX GHTDB.postalcode
-  ON GHTDB.suppliers (
-    postalcode
-  )
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB.territories (
-  territoryid          VARCHAR2(40) NOT NULL,
-  territorydescription CHAR(100)    NOT NULL,
-  regionid             NUMBER(10,0) NOT NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE SEQUENCE GHTDB.s_463_1_reviews
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_464_1_shoppingcart
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_59_1_products
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_60_1_orders
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_62_1_suppliers
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_63_1_shippers
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_65_1_employees
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE SEQUENCE GHTDB.s_68_1_categories
-  MINVALUE 1
-  MAXVALUE 999999999999999999999999999
-  INCREMENT BY 1
-  NOCYCLE
-  NOORDER
-  CACHE 20
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_464_1_shoppingcart
-BEFORE INSERT
-ON GHTDB.shoppingcart
-FOR EACH ROW
-BEGIN
- IF (:new.RECORDID IS NULL) THEN
-  SELECT S_464_1_SHOPPINGCART.nextval
-  INTO :NEW.RECORDID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_59_1_products
-BEFORE INSERT
-ON GHTDB.products
-FOR EACH ROW
-BEGIN
- IF (:new.PRODUCTID IS NULL) THEN
-  SELECT S_59_1_PRODUCTS.nextval
-  INTO :NEW.PRODUCTID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_62_1_suppliers
-BEFORE INSERT
-ON GHTDB.suppliers
-FOR EACH ROW
-BEGIN
- IF (:new.SUPPLIERID IS NULL) THEN
-  SELECT S_62_1_SUPPLIERS.nextval
-  INTO :NEW.SUPPLIERID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_63_1_shippers
-BEFORE INSERT
-ON GHTDB.shippers
-FOR EACH ROW
-BEGIN
- IF (:new.SHIPPERID IS NULL) THEN
-  SELECT S_63_1_SHIPPERS.nextval
-  INTO :NEW.SHIPPERID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE TRIGGER GHTDB.tr_s_68_1_categories
-BEFORE INSERT
-ON GHTDB.categories
-FOR EACH ROW
-BEGIN
- IF (:new.CATEGORYID IS NULL) THEN
-  SELECT S_68_1_CATEGORIES.nextval
-  INTO :NEW.CATEGORYID
-  FROM dual;
- END IF;
-END;
-/
-
-CREATE OR REPLACE VIEW GHTDB.current_product_list (
-  productid,
-  productname
-) AS
-SELECT  Product_List.ProductID, Product_List.ProductName
- FROM Products Product_List
-	WHERE
-	(
-	(( Product_List.Discontinued ) = 0))
-/
-
-CREATE OR REPLACE VIEW GHTDB.customer_and_suppliers_by_cit (
-  city,
-  companyname,
-  contactname,
-  relationship
-) AS
-SELECT  City, CompanyName, ContactName, 'Customers' Relationship
- FROM Customers UNION SELECT  City, CompanyName, ContactName, 'Suppliers'
- FROM Suppliers
-/
-
-CREATE OR REPLACE VIEW GHTDB.products_above_average_price (
-  productname,
-  unitprice
-) AS
-SELECT  Products.ProductName, Products.UnitPrice
- FROM Products
-	WHERE Products.UnitPrice > (
-		SELECT  AVG(UnitPrice)
-		 FROM Products  )
-/
-
-CREATE OR REPLACE  PACKAGE BODY "GHTDB"."GHTPKG"  AS
-
---Procedure declerations:
-	procedure ghsp_pkgAmbig(res out rct1) is
-  begin
-	   --Return a value which indocates that the procedure 'ghsp_pkgAmbig' was called not from within GHTPKG.
-     declare IN_GHTPKG varchar2(4) := 'TRUE';
-     begin
-  	   open res for
-  	   select IN_GHTPKG as IN_PKG from dual;
-	   end;
-  end;
-
-  procedure ghsp_inPkg(CustomerIdPrm in char, result out rct1) is
-  begin
-  OPEN result FOR
-  SELECT * FROM Customers where CustomerId=CustomerIdPrm;
-  end;
-  
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_MULTIRECORDSETS" (
-    RCT_Employees OUT GHTPKG.RCT1,
-    RCT_Customers OUT GHTPKG.RCT1,
-    RCT_Orders OUT GHTPKG.RCT1
- )
- IS
- -- Declare cursor
-    m_RCT_Employees GHTPKG.RCT1;
-    m_RCT_Customers GHTPKG.RCT1;
-    m_RCT_Orders GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM Employees where EmployeeId in (1,2) ORDER BY EMPLOYEEID ASC;
-
-    OPEN m_RCT_Customers FOR
-    SELECT CustomerId, CompanyName,ContactName FROM Customers  where CustomerId in ('MORGK','NORTS') ORDER BY CustomerId ASC;
-    -- return empty result set
-    OPEN m_RCT_Orders FOR
-    SELECT OrderId, ShipAddress,ShipVia, ShipCity FROM Orders where OrderId=-1  ;
-
-    RCT_Employees := m_RCT_Employees;
-    RCT_Customers := m_RCT_Customers;
-    RCT_Orders := m_RCT_Orders;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_INOUT1" (
-INPARAM IN VARCHAR DEFAULT NULL,
-OUTPARAM OUT INTEGER 
-)
-AS
-L_INPARAM VARCHAR(30) := INPARAM;
-BEGIN
-OUTPARAM := 100;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_CREATETABLE"  AS
-Begin
-  --craete a temporary table
-  execute immediate 'Create global temporary Table ghtdb.temp_tbl (Col1 int,Col2 int)';
-  --insert values to the table
-  execute immediate 'insert into ghtdb.temp_tbl values (11,12)';
-  execute immediate 'insert into ghtdb.temp_tbl values (21,22)';
-  execute immediate 'insert into ghtdb.temp_tbl values (31,32)';
-  --execute select on the created table
-  execute immediate 'select col1 as Value1, col2 as Value2 from ghtdb.temp_tbl';
-  execute immediate 'drop table temp_tbl';
-end;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_REFCURSOR1" (
-    RCT_Employees OUT GHTPKG.RCT1
- )
- IS
-    m_RCT_Employees GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM GHTDB.Employees where EmployeeId = 1;
-
-    RCT_Employees := m_RCT_Employees;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_REFCURSOR2" (
-    IN_EMPLOYEEID INTEGER,
-    RCT_Employees OUT GHTPKG.RCT1
- )
- IS
-    m_RCT_Employees GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM GHTDB.Employees where EmployeeId = IN_EMPLOYEEID;
-
-    RCT_Employees := m_RCT_Employees;
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_REFCURSOR3" (
-    IN_LASTNAME VARCHAR2,
-    RCT_Employees OUT GHTPKG.RCT1
- )
- IS
-    m_RCT_Employees GHTPKG.RCT1;
- BEGIN
-    OPEN m_RCT_Employees FOR
-    SELECT EmployeeId, LastName FROM GHTDB.Employees where LastName = IN_LASTNAME;
-
-    RCT_Employees := m_RCT_Employees;
-END;
-/
-
-
-CREATE OR REPLACE PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_1 (
-T_NUMBER   IN NUMBER,
-T_LONG     IN LONG,
-T_FLOAT    IN FLOAT,
-T_VARCHAR  IN VARCHAR2,
-T_NVARCHAR IN NVARCHAR2,
-T_CHAR     IN CHAR,
-T_NCHAR    IN NCHAR,
-RESULT     OUT GHTPKG.RCT1
-)
-AS
-BEGIN
-OPEN RESULT FOR
-SELECT T_NUMBER AS T_NUMBER, T_LONG AS T_LONG, T_FLOAT AS T_FLOAT, T_VARCHAR AS T_VARCHAR, T_NVARCHAR AS T_NVARCHAR, T_CHAR AS T_CHAR, T_NCHAR AS T_NCHAR FROM DUAL;
-RETURN;
-END;
-/
-
-
-
-CREATE OR REPLACE PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_2 (
-T_NUMBER   IN OUT NUMBER,
-T_LONG     IN OUT LONG,
-T_FLOAT    IN OUT FLOAT,
-T_VARCHAR  IN OUT VARCHAR2,
-T_NVARCHAR IN OUT NVARCHAR2,
-T_CHAR     IN OUT CHAR,
-T_NCHAR    IN OUT NCHAR
-)
-AS
-BEGIN
-T_NUMBER := T_NUMBER * 2;
-T_LONG := UPPER(T_LONG);
-T_FLOAT := T_FLOAT * 2;
-T_VARCHAR := UPPER(T_VARCHAR);
-T_NVARCHAR := UPPER(T_NVARCHAR);
-T_CHAR := UPPER(T_CHAR);
-T_NCHAR := UPPER(T_NCHAR);
-END;
-/
-
-
-
-CREATE OR REPLACE PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_3 (
-ID1        IN CHAR,
-P_NUMBER   OUT NUMBER,
-P_LONG     OUT LONG,
-P_FLOAT    OUT FLOAT,
-P_VARCHAR  OUT VARCHAR2,
-P_NVARCHAR OUT NVARCHAR2,
-P_CHAR     OUT CHAR,
-P_NCHAR    OUT NCHAR
-)
-AS
-BEGIN
-SELECT T_NUMBER, T_LONG, T_FLOAT, T_VARCHAR, T_NVARCHAR, T_CHAR, T_NCHAR INTO P_NUMBER, P_LONG, P_FLOAT, P_VARCHAR, P_NVARCHAR, P_CHAR, P_NCHAR FROM TYPES_SIMPLE WHERE ID = ID1;
-RETURN;
-END;
-/
-
-
-
-CREATE OR REPLACE  PROCEDURE GHTDB.GHSP_TYPES_SIMPLE_4  (
-ID1        IN CHAR,
-RESULT     OUT GHTPKG.RCT1,
-RESULT1    OUT GHTPKG.RCT1,
-RESULT2    OUT GHTPKG.RCT1
-)
-IS
-
-m_result  GHTPKG.RCT1;
-m_result1  GHTPKG.RCT1;
-m_result2  GHTPKG.RCT1;
-
-BEGIN
-
-insert into TYPES_SIMPLE(ID,T_NUMBER) values (ID1,50);
-
-OPEN m_result FOR
-SELECT * FROM TYPES_SIMPLE where ID = ID1;
-
-update TYPES_SIMPLE set T_NUMBER=60 where Id = ID1;
-
-OPEN m_result1 FOR
-SELECT * FROM TYPES_SIMPLE where ID = ID1;
-
-delete from TYPES_SIMPLE where ID = ID1;
-
-OPEN m_result2 FOR
-SELECT * FROM TYPES_SIMPLE where ID = ID1;
-
-RESULT := m_result;
-RESULT1 := m_result1;
-RESULT2 := m_result2;
-
-END;
-/
-
-
-
-CREATE OR REPLACE PROCEDURE   GHTDB.GHSP_TYPES_SIMPLE_5(
-RESULT     OUT GHTPKG.RCT1
-)AS
-
-BEGIN
-  DECLARE
-    T_NUMBER    NUMBER(10)    := 21;
-    T_LONG      LONG          := 'abcdefghijklmnopqrstuvwxyz1234567890~!@#$%^&*()_+-=[]\|;:,./<>? ';
-    T_FLOAT     FLOAT(10)     := 1.234;
-    T_VARCHAR   VARCHAR2(10)  := 'qwertasdfg';
-    T_NVARCHAR  NVARCHAR2(10) := 'qwertasdfg';
-    T_CHAR      CHAR(10)      := 'abcdefghij';
-    T_NCHAR     NCHAR(10)     := 'abcdefghij';
-
-  BEGIN
-  OPEN RESULT FOR
-  SELECT T_NUMBER,T_LONG, T_FLOAT, T_VARCHAR, T_NVARCHAR, T_CHAR, T_NCHAR FROM DUAL;
-  RETURN;
-  END;
-
-END;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GHSP_PKGAMBIG"  (
- res out ghtpkg.rct1
-)
-as
-begin
-	 --Return a value which indocates that the procedure 'ghsp_pkgAmbig' was called not from within GHTPKG.
-   declare IN_GHTPKG varchar2(5) := 'FALSE';
-   begin
-  	 open res for
-	   select IN_GHTPKG as IN_PKG from dual;
-	 end;
-end;
-/
-
-CREATE OR REPLACE  PROCEDURE "GHTDB"."GH_DUMMY"  (
- EmployeeIDPrm in NUMBER,
- result     OUT GHTPKG.RCT1
-)
-as
-begin
- OPEN result FOR
-  SELECT EMPLOYEEID,
-         LASTNAME, 
-         FIRSTNAME, 
-         TITLE, 
-         TITLEOFCOURTESY, 
-         BIRTHDATE, 
-         HIREDATE, 
-         ADDRESS, 
-         CITY, 
-         REGION, 
-         POSTALCODE, 
-         COUNTRY, 
-         HOMEPHONE, 
-         EXTENSION, 
-         REPORTSTO, 
-         PHOTOPATH, 
-         MYCOLUMN
-  FROM GHTDB.EMPLOYEES where EmployeeID > EmployeeIDPrm;
-RETURN;
-end;
-/
-
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.categories TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.current_product_list TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.customercustomerdemo TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.customerdemographics TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.customers TO PUBLIC;
-GRANT EXECUTE ON GHTDB.GH_MULTIRECORDSETS TO PUBLIC;
---GRANT EXECUTE ON GHTDB.custordersorders TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.employees TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.employeeterritories TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.products TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.products_above_average_price TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.region TO PUBLIC;
---GRANT EXECUTE ON salesbycategory TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.suppliers TO PUBLIC;
---GRANT EXECUTE ON ten_most_expensive_products TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB.territories TO PUBLIC;
-
----------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------
-DROP TABLE GHTDB_EX.CUSTOMERS;
-DROP TABLE GHTDB_EX.categories;
-
-DROP USER GHTDB_EX CASCADE;
-
-CREATE USER "GHTDB_EX"
-    IDENTIFIED BY "GHTDB_EX" DEFAULT TABLESPACE "USERS"
-    TEMPORARY TABLESPACE "TEMP" ;
-
-GRANT CONNECT, RESOURCE TO "GHTDB_EX";
-
-CREATE OR REPLACE PACKAGE GHTDB_EX.GHTPKG
-AS
-	TYPE RCT1 IS REF CURSOR;
-	IDENTITY INTEGER;
-END;
-/
-
-CREATE TABLE GHTDB_EX.CUSTOMERS (
-  customerid   CHAR(10)      NOT NULL,
-  companyname  VARCHAR2(80)  NULL,
-  contactname  VARCHAR2(60)  NULL,
-  contacttitle VARCHAR2(60)  NULL,
-  address      VARCHAR2(120) NULL,
-  city         VARCHAR2(30)  NULL,
-  region       VARCHAR2(30)  NULL,
-  postalcode   VARCHAR2(20)  NULL,
-  country      VARCHAR2(30)  NULL,
-  phone        VARCHAR2(48)  NULL,
-  fax          VARCHAR2(48)  NULL,
-  picture      VARCHAR2(48)  NULL
-)
-  TABLESPACE USERS
-/
-
-CREATE TABLE GHTDB_EX.categories (
-  categoryid   VARCHAR2(20) NOT NULL,
-  categoryname VARCHAR2(30) NOT NULL,
-  description  CLOB         NULL
-)
-  TABLESPACE USERS
-/
-
-
-CREATE OR REPLACE  PROCEDURE "GHTDB_EX"."GH_DUMMY"  
-    (CustomerIdPrm IN CHAR,
-result     OUT GHTPKG.RCT1)
-AS
-BEGIN
-OPEN result FOR
-SELECT * FROM Customers where CustomerID=CustomerIdPrm;
-RETURN;
-END;
-/
-
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB_EX.CUSTOMERS TO PUBLIC;
-GRANT DELETE,INSERT,SELECT,UPDATE ON GHTDB_EX.CATEGORIES TO PUBLIC;
-GRANT EXECUTE ON GHTDB_EX.gh_dummy TO PUBLIC;
-
-
-
-COMMIT;
-
-exit
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.PostgreSQL.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.PostgreSQL.sql
deleted file mode 100755
index 38e14e8c017..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.PostgreSQL.sql
+++ /dev/null
@@ -1,576 +0,0 @@
-DROP FUNCTION GHSP_TYPES_SIMPLE_1(BOOL, INT2, INT4, INT8, NUMERIC, FLOAT4, FLOAT8, VARCHAR, CHAR, NCHAR);
-DROP FUNCTION GHSP_TYPES_SIMPLE_4(VARCHAR);
-DROP FUNCTION GHSP_TYPES_SIMPLE_5();
-DROP FUNCTION GH_DUMMY(NUMERIC);
-DROP FUNCTION GH_REFCURSOR1();
-DROP FUNCTION GH_REFCURSOR2(integer);
-DROP FUNCTION GH_REFCURSOR3(varchar);
-DROP FUNCTION gh_createtable();
-DROP FUNCTION GH_MULTIRECORDSETS();
-
-DROP VIEW products_above_average_price;
-DROP VIEW current_product_list;
-
-DROP TABLE categories;
-DROP TABLE customercustomerdemo;
-DROP TABLE customerdemographics;
-DROP TABLE customers;
-DROP TABLE employees;
-DROP TABLE employeeterritories;
-DROP TABLE gh_emptytable;
-DROP TABLE "Order Details";
-DROP TABLE orders;
-DROP TABLE products;
-DROP TABLE region;
-DROP TABLE Results;
-DROP TABLE shippers;
-DROP TABLE shoppingcart;
-DROP TABLE suppliers;
-DROP TABLE territories;
-DROP TABLE TYPES_SIMPLE;
-DROP TABLE TYPES_EXTENDED;
-DROP TABLE TYPES_SPECIFIC;
-
-
--- Create tables
-----------------------------------------------------------------
-CREATE TABLE categories (
-  categoryid   serial unique NOT NULL,
-  categoryname VARCHAR(30) NOT NULL,
-  description  VARCHAR(4000)         NULL
-)
-WITHOUT OIDS;
-
-
-CREATE INDEX categoryname
-  ON categories (
-    categoryname
-);
-
-CREATE TABLE customercustomerdemo (
-  customerid     CHAR(10) NOT NULL,
-  customertypeid CHAR(20) NOT NULL
-)
-WITHOUT OIDS;
-
-
-ALTER TABLE customercustomerdemo
-  ADD CONSTRAINT pk_customercustomerdemo UNIQUE (
-    customerid,
-    customertypeid
-);
-
-CREATE TABLE customerdemographics (
-  customertypeid CHAR(20) NOT NULL,
-  customerdesc   VARCHAR(4000)     NULL
-)
-WITHOUT OIDS;
-
-
-ALTER TABLE customerdemographics
-  ADD CONSTRAINT pk_customerdemographics UNIQUE (
-    customertypeid
-);
-
-CREATE TABLE customers (
-  customerid   CHAR(10)      NOT NULL,
-  companyname  VARCHAR(80)  NOT NULL,
-  contactname  VARCHAR(60)  NULL,
-  contacttitle VARCHAR(60)  NULL,
-  address      VARCHAR(120) NULL,
-  city         VARCHAR(30)  NULL,
-  region       VARCHAR(30)  NULL,
-  postalcode   VARCHAR(20)  NULL,
-  country      VARCHAR(30)  NULL,
-  phone        VARCHAR(48)  NULL,
-  fax          VARCHAR(48)  NULL
-)
-WITHOUT OIDS;
-
-CREATE INDEX city
-  ON customers (
-    city
-);
-
-CREATE INDEX companyname_1
-  ON customers (
-    companyname
-);
-
-CREATE INDEX postalcode_2
-  ON customers (
-    postalcode
-);
-
-CREATE INDEX ix_region
-  ON customers (
-    region
-);
-
-ALTER TABLE customers
-  ADD CONSTRAINT uk_customers_customerid UNIQUE (
-    customerid
-);
-
-CREATE TABLE employees (
-  employeeid      numeric(10,0)  NOT NULL,
-  lastname        VARCHAR(40)  NOT NULL,
-  firstname       VARCHAR(20)  NOT NULL,
-  title           VARCHAR(60)  NULL,
-  titleofcourtesy VARCHAR(50)  NULL,
-  birthdate       Timestamp    NULL,
-  hiredate        Timestamp    NULL,
-  address         VARCHAR(120) NULL,
-  city            VARCHAR(30)  NULL,
-  region          VARCHAR(30)  NULL,
-  postalcode      VARCHAR(20)  NULL,
-  country         VARCHAR(30)  NULL,
-  homephone       VARCHAR(48)  NULL,
-  extension       VARCHAR(8)   NULL,
-  notes           VARCHAR(4000)          NULL,
-  reportsto       numeric(10,0)  NULL,
-  photopath       VARCHAR(510) NULL,
-  mycolumn        numeric(10,0)  NULL
-)
-WITHOUT OIDS;
-
-
-CREATE INDEX lastname
-  ON employees (
-    lastname
-);
-
-CREATE INDEX postalcode_1
-  ON employees (
-    postalcode
-);
-
-ALTER TABLE employees
-  ADD CONSTRAINT pk_employees UNIQUE (
-    employeeid
-);
-
-
-CREATE TABLE employeeterritories (
-  employeeid  numeric(10,0) NOT NULL,
-  territoryid VARCHAR(40) NOT NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE gh_emptytable (
-  col1 INTEGER      NULL,
-  col2 VARCHAR(50) NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE "Order Details" (
-  orderid   numeric(10,0) NOT NULL,
-  productid numeric(10,0) NOT NULL,
-  unitprice numeric(19,4) NOT NULL,
-  quantity  numeric(5,0)  NOT NULL,
-  discount  FLOAT(53)   NOT NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE orders (
-  orderid        numeric(10,0)  NOT NULL,
-  customerid     NCHAR(5)      NULL,
-  employeeid     numeric(10,0)  NULL,
-  orderdate      DATE          NULL,
-  requireddate   DATE          NULL,
-  shippeddate    DATE          NULL,
-  shipvia        numeric(10,0)  NULL,
-  freight        numeric(19,4)  NULL,
-  shipname       VARCHAR(40) NULL,
-  shipaddress    VARCHAR(60) NULL,
-  shipcity       VARCHAR(15) NULL,
-  shipregion     VARCHAR(15) NULL,
-  shippostalcode VARCHAR(10) NULL,
-  shipcountry    VARCHAR(15) NULL
-)
-WITHOUT OIDS;
-
-ALTER TABLE orders
-  ADD CONSTRAINT orders_uk11075049410018 UNIQUE (
-    orderid
-);
-
-
-ALTER TABLE orders
-  ADD CONSTRAINT orders_fk21075049699981 FOREIGN KEY (
-    orderid
-  ) REFERENCES orders (
-    orderid
-);
-
-
-CREATE TABLE products (
-  productid       serial unique NOT NULL,
-  productname     VARCHAR(80) NOT NULL,
-  supplierid      numeric(10,0) NULL,
-  categoryid      numeric(10,0) NULL,
-  quantityperunit VARCHAR(40) NULL,
-  unitprice       numeric(19,4) DEFAULT (0) NULL,
-  unitsinstock    numeric(5,0)  DEFAULT (0) NULL,
-  unitsonorder    numeric(5,0)  DEFAULT (0) NULL,
-  reorderlevel    numeric(5,0)  DEFAULT (0) NULL,
-  discontinued    numeric(1,0)  DEFAULT (0) NOT NULL
-)
-WITHOUT OIDS;
-
-
-ALTER TABLE products
-  ADD CONSTRAINT ck_products_unitprice CHECK (
-    UnitPrice >= 0
-);
-
-
-ALTER TABLE products
-  ADD CONSTRAINT ck_reorderlevel CHECK (
-    ReorderLevel >= 0
-);
-
-
-ALTER TABLE products
-  ADD CONSTRAINT ck_unitsinstock CHECK (
-    UnitsInStock >= 0
-);
-
-
-ALTER TABLE products
-  ADD CONSTRAINT ck_unitsonorder CHECK (
-    UnitsOnOrder >= 0
-);
-
-
-CREATE INDEX categoryid
-  ON products (
-    categoryid
-);
-
-
-CREATE INDEX productname
-  ON products (
-    productname
-);
-
-
-CREATE INDEX suppliersproducts
-  ON products (
-    supplierid
-);
-
-
-CREATE TABLE region (
-  regionid          numeric(10,0) NOT NULL,
-  regiondescription CHAR(100)    NOT NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE Results (
-  employeeid      numeric(10,0)  NOT NULL,
-  lastname        VARCHAR(20)  NOT NULL,
-  firstname       VARCHAR(10)  NOT NULL,
-  title           VARCHAR(30)  NULL,
-  titleofcourtesy VARCHAR(25)  NULL,
-  birthdate       DATE          NULL,
-  hiredate        DATE          NULL,
-  address         VARCHAR(60)  NULL,
-  city            VARCHAR(15)  NULL,
-  region          VARCHAR(15)  NULL,
-  postalcode      VARCHAR(10)  NULL,
-  country         VARCHAR(15)  NULL,
-  homephone       VARCHAR(24)  NULL,
-  extension       VARCHAR(4)   NULL,
-  notes           VARCHAR(4000)          NULL,
-  reportsto       numeric(10,0)  NULL,
-  photopath       VARCHAR(255) NULL,
-  mycolumn        numeric(10,0)  NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE shippers (
-  shipperid   serial unique NOT NULL,
-  companyname VARCHAR(80) NOT NULL,
-  phone       VARCHAR(48) NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE shoppingcart (
-  recordid    serial unique  NOT NULL,
-  cartid      VARCHAR(100) NULL,
-  quantity    numeric(10,0)  DEFAULT (1) NOT NULL,
-  productid   numeric(10,0)  NOT NULL,
-  datecreated TIMESTAMP  DEFAULT (CURRENT_TIMESTAMP) NOT NULL
-)
-WITHOUT OIDS;
-
-
-CREATE TABLE suppliers (
-  supplierid   serial unique  NOT NULL,
-  companyname  VARCHAR(80)  NOT NULL,
-  contactname  VARCHAR(60)  NULL,
-  contacttitle VARCHAR(60)  NULL,
-  address      VARCHAR(120) NULL,
-  city         VARCHAR(30)  NULL,
-  region       VARCHAR(30)  NULL,
-  postalcode   VARCHAR(20)  NULL,
-  country      VARCHAR(30)  NULL,
-  phone        VARCHAR(48)  NULL,
-  fax          VARCHAR(48)  NULL,
-  homepage     VARCHAR(4000)          NULL
-)
-WITHOUT OIDS;
-
-
-CREATE INDEX companyname
-  ON suppliers (
-    companyname
-);
-
-CREATE INDEX postalcode
-  ON suppliers (
-    postalcode
-);
-
-CREATE TABLE territories (
-  territoryid          VARCHAR(40) NOT NULL,
-  territorydescription CHAR(100)    NOT NULL,
-  regionid             numeric(10,0) NOT NULL
-)
-WITHOUT OIDS;
-
-CREATE TABLE TYPES_SIMPLE (
-  id char(10),
-  t_bool bool,
-  t_int2 int2,
-  t_int4 int4,
-  t_int8 int8,
-  t_numeric numeric(10),
-  t_float4 float4,
-  t_float8 float8,
-  t_varchar varchar(50),
-  t_char char(10),
-  t_nchar char(10)
-)
-WITHOUT OIDS;
-
-CREATE TABLE TYPES_EXTENDED (
-  id char(10),
-  t_bytea bytea,
-  t_date date,
-  t_text text,
-  t_time time,
-  t_timestamp timestamp
-)
-WITHOUT OIDS;
-
-CREATE TABLE TYPES_SPECIFIC (
-  id char(10),
-  t_bit bit(1),
-  t_box box,
-  t_cidr cidr,
-  t_circle circle,
-  t_inet inet,
-  t_interval interval (6),  
-  t_line line,
-  t_lseg lseg,
-  t_macaddr macaddr,
-  t_money money,
-  t_path path,
-  t_point point,
-  t_polygon polygon,
-  t_serial serial,
-  t_bigserial bigserial,
-  t_timetz timetz,  
-  t_timestamptz timestamptz
-)
-WITHOUT OIDS;
-
--- Create views
-----------------------------------------------------------------
-CREATE OR REPLACE VIEW products_above_average_price (
-  productname,
-  unitprice
-) AS
-SELECT  Products.ProductName, Products.UnitPrice
- FROM Products
-	WHERE Products.UnitPrice > (
-		SELECT  AVG(UnitPrice)
-		 FROM Products  );
-
-
-CREATE OR REPLACE VIEW current_product_list (
-  productid,
-  productname
-) AS
-SELECT  Product_List.ProductID, Product_List.ProductName
- FROM Products Product_List
-	WHERE
-	(
-	(( Product_List.Discontinued ) = 0));
-
-
--- Create functions
-----------------------------------------------------------------
-CREATE FUNCTION GH_MULTIRECORDSETS() RETURNS SETOF refcursor AS $$
-DECLARE 
-	rct1 refcursor;
-	rct2 refcursor;
-	rct3 refcursor;
-BEGIN
-	OPEN rct1 FOR
-	SELECT EmployeeId, LastName FROM Employees where EmployeeId in (1,2) ORDER BY EMPLOYEEID ASC;
-	RETURN NEXT rct1;
-
-	OPEN rct2 FOR
-	SELECT CustomerId, CompanyName,ContactName FROM Customers  where CustomerId in ('MORGK','NORTS') ORDER BY CustomerId ASC;
-	RETURN NEXT rct2;
-
-	OPEN rct3 FOR
-	SELECT OrderId, ShipAddress,ShipVia, ShipCity FROM Orders where OrderId=-1  ;
-	RETURN NEXT rct3;
-	RETURN;
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE FUNCTION gh_createtable() RETURNS void AS $$
-BEGIN
-  --craete a temporary table
-  execute 'Create Table temp_tbl (Col1 int,Col2 int)';
-  --insert values to the table
-  execute 'insert into temp_tbl values (11,12)';
-  execute 'insert into temp_tbl values (21,22)';
-  execute 'insert into temp_tbl values (31,32)';
-  --execute select on the created table
-  execute 'select col1 as Value1, col2 as Value2 from temp_tbl';
-  execute 'drop table temp_tbl';
-  RETURN;
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE FUNCTION GH_REFCURSOR1() RETURNS refcursor AS $$
-DECLARE 
-	rct1 refcursor;
-BEGIN
-	OPEN rct1 FOR
-	SELECT EmployeeId, LastName FROM Employees where EmployeeId = 1;
-	RETURN rct1;
-END;
-$$ LANGUAGE 'plpgsql';
-
-
-CREATE FUNCTION GH_REFCURSOR2(integer) RETURNS refcursor AS $$
-DECLARE 
-	rct1 refcursor;
-BEGIN
-	OPEN rct1 FOR
-	SELECT EmployeeId, LastName FROM Employees where EmployeeId = $1;
-	RETURN rct1;
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE FUNCTION GH_REFCURSOR3(varchar) RETURNS refcursor AS $$
-DECLARE 
-	rct1 refcursor;
-BEGIN
-	OPEN rct1 FOR
-	SELECT EmployeeId, LastName FROM Employees where LastName = $1;
-	RETURN rct1;
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE FUNCTION GHSP_TYPES_SIMPLE_1(BOOL, INT2, INT4, INT8, NUMERIC, FLOAT4, FLOAT8, VARCHAR, CHAR, NCHAR)  RETURNS refcursor AS $$
-DECLARE 
-	rct1 refcursor;
-BEGIN
-	OPEN rct1 FOR
-	SELECT $1 as T_BOOL, $2 as T_INT2, $3 as T_INT4, $4 as T_INT8, $5 as T_NUMERIC, $6 as T_FLOAT4, $7 as T_FLOAT8, $8 as T_VARCHAR, $9 as T_CHAR, $10 as T_NCHAR;
-	RETURN rct1;
-END
-$$  LANGUAGE 'plpgsql';
-
-CREATE FUNCTION GHSP_TYPES_SIMPLE_4(VARCHAR) RETURNS SETOF refcursor AS $$
-DECLARE
-	rct1 refcursor;
-	rct2 refcursor;
-	rct3 refcursor;
-BEGIN
-
-	insert into TYPES_SIMPLE(ID,t_numeric) values ($1,50);
-	
-	OPEN rct1 FOR
-	SELECT * FROM TYPES_SIMPLE where ID = $1;
-	RETURN NEXT rct1;
-
-	update TYPES_SIMPLE set t_numeric=60 where Id = $1;
-
-	OPEN rct2 FOR
-	SELECT * FROM TYPES_SIMPLE where ID = $1;
-	RETURN NEXT rct2;
-
-	delete from TYPES_SIMPLE where ID = $1;
-
-	OPEN rct3 FOR
-	SELECT * FROM TYPES_SIMPLE where ID = $1;
-	RETURN NEXT rct3;
-
-	RETURN;
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE FUNCTION GHSP_TYPES_SIMPLE_5() RETURNS refcursor AS $$
-DECLARE 
-   rct1 refcursor;
-   T_BOOL    boolean        :=true;
-   T_INT2      int2           := 21;
-   T_INT4      int4           := 30000;
-   T_INT8      int8           := 30001;
-   T_NUMERIC	NUMERIC(10)    := 100000;
-   T_FLOAT4    	FLOAT4      := 7.23157;
-   T_FLOAT8		FLOAT8         := 7.123456;
-   T_VARCHAR   	VARCHAR(10)    := 'qwertasdfg';
-   T_CHAR	CHAR(10)       := 'abcdefghij';
-   T_NCHAR	NCHAR(10)       := 'klmnopqrst';
- 
-BEGIN
-  OPEN rct1 FOR
-  SELECT T_BOOL, T_INT2, T_INT4, T_INT8, T_NUMERIC, T_FLOAT4, T_FLOAT8, T_VARCHAR, T_CHAR, T_NCHAR;
-  RETURN rct1;
-END;
-$$ LANGUAGE 'plpgsql';
-
-
-CREATE FUNCTION GH_DUMMY(NUMERIC) RETURNS refcursor AS $$
-DECLARE 
-   rct1 refcursor;
- 
-BEGIN
-  OPEN rct1 FOR
-  SELECT EMPLOYEEID,
-         LASTNAME, 
-         FIRSTNAME, 
-         TITLE, 
-         TITLEOFCOURTESY, 
-         BIRTHDATE, 
-         HIREDATE, 
-         ADDRESS, 
-         CITY, 
-         REGION, 
-         POSTALCODE, 
-         COUNTRY, 
-         HOMEPHONE, 
-         EXTENSION, 
-         REPORTSTO, 
-         PHOTOPATH, 
-         MYCOLUMN
-  	FROM EMPLOYEES where EmployeeID > $1;
-  RETURN rct1;
-END;
-$$ LANGUAGE 'plpgsql';
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.SYBASE.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.SYBASE.sql
deleted file mode 100755
index d709822b693..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDB.SYBASE.sql
+++ /dev/null
@@ -1,1184 +0,0 @@
-use master
-go
-
-set nocount on
-go
-set dateformat mdy
-go
-
-if exists (select * from master.dbo.sysdatabases
-		where name = "GHTDB")
-begin
-	drop database GHTDB
-end
-go
-print 'Creating the "GHTDB" database'
-go
-
-if (@@maxpagesize = 1024 * 2)
-	create database GHTDB on default = 10
-else
-	create database GHTDB on default = 10
-go
-
-exec sp_dboption N'GHTDB', N'trunc log on chkpt', true, 1
-print 'print1'
-go
-exec sp_dboption N'GHTDB', N'trunc. log', N'true', 1
-print 'print2'
-go
-exec sp_dboption N'GHTDB', N'read only', N'false', 1
-print 'print3'
-go
-exec sp_dboption N'GHTDB', N'dbo use', N'false', 1
-print 'print4'
-go
--- exec sp_dboption N'GHTDB', N'cursor close on commit', N'false', 1
--- exec sp_dboption N'GHTDB', N'abort tran on log full', N'true', 1
-print 'print5'
-go
-
-use GHTDB
-GO
-
-checkpoint
-go
-
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-print '------------------------------'
-print 'create tables - start'
-print '------------------------------'
-go
-
-CREATE TABLE [dbo].[TYPES_SIMPLE] (
--- ID
-	[ID] char(10) NULL,
-	[T_BIT] [bit] DEFAULT  0 not null,
--- integer
-	[T_TINYINT] [tinyint] NULL ,
-	[T_SMALLINT] [smallint] NULL ,
-	[T_INT] [int] NULL ,
--- float
-	[T_DECIMAL] [decimal](18, 0) NULL ,
-	[T_NUMERIC] [numeric](18, 7) NULL ,
-	[T_FLOAT] [float] NULL ,
-	[T_REAL] [real] NULL ,
--- text
-	[T_CHAR] [char] (10) NULL ,
-	[T_NCHAR] [nchar] (10) NULL ,
-	[T_VARCHAR] [varchar] (50) NULL ,
-	[T_NVARCHAR] [nvarchar] (50) NULL
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[TYPES_EXTENDED] (
--- ID
-	[ID] char(10) NULL,
--- Text
-	[T_TEXT] [text] NULL ,
-	[T_NTEXT] [nvarchar](1000) NULL ,
--- Binary
-	[T_BINARY] [binary] (50) NULL ,
-	[T_VARBINARY] [varbinary] (50) NULL ,
---Time
-	[T_DATETIME] [datetime] NULL ,
-	[T_SMALLDATETIME] [smalldatetime] NULL 
-) ON [default] 
-
-CREATE TABLE [dbo].[TYPES_SPECIFIC] (
--- ID
-	[ID1] char(10) NULL
-) ON [default] 
-GO
-
-CREATE TABLE [dbo].[Categories] (
-	[CategoryID] numeric(5,0) IDENTITY NOT NULL ,
-	[CategoryName] [nvarchar] (15) NOT NULL ,
-	[Description] [nvarchar](1000) NULL ,
-	[Picture] [image] NULL 
-) ON [default] 
-GO
-
-CREATE TABLE [dbo].[CustomerCustomerDemo] (
-	[CustomerID] [nchar] (5) NOT NULL ,
-	[CustomerTypeID] [nchar] (10) NOT NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[CustomerDemographics] (
-	[CustomerTypeID] [nchar] (10) NOT NULL ,
-	[CustomerDesc] [nvarchar](1000) NULL 
-) ON [default] 
-GO
-
-CREATE TABLE [dbo].[Customers] (
-	[CustomerID] [nchar] (5) NOT NULL ,
-	[CompanyName] [nvarchar] (40) NOT NULL ,
-	[ContactName] [nvarchar] (30) NULL ,
-	[ContactTitle] [nvarchar] (30) NULL ,
-	[Address] [nvarchar] (60) NULL ,
-	[City] [nvarchar] (15) NULL ,
-	[Region] [nvarchar] (15) NULL ,
-	[PostalCode] [nvarchar] (10) NULL ,
-	[Country] [nvarchar] (15) NULL ,
-	[Phone] [nvarchar] (24) NULL ,
-	[Fax] [nvarchar] (24) NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[EmployeeTerritories] (
-	[EmployeeID] [int] NOT NULL ,
-	[TerritoryID] [nvarchar] (20) NOT NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Employees] (
-	[EmployeeID] [int] NOT NULL ,
-	[LastName] [nvarchar] (20) NOT NULL ,
-	[FirstName] [nvarchar] (10) NOT NULL ,
-	[Title] [nvarchar] (30) NULL ,
-	[TitleOfCourtesy] [nvarchar] (25) NULL ,
-	[BirthDate] [datetime] NULL ,
-	[HireDate] [datetime] NULL ,
-	[Address] [nvarchar] (60) NULL ,
-	[City] [nvarchar] (15) NULL ,
-	[Region] [nvarchar] (15) NULL ,
-	[PostalCode] [nvarchar] (10) NULL ,
-	[Country] [nvarchar] (15) NULL ,
-	[HomePhone] [nvarchar] (24) NULL ,
-	[Extension] [nvarchar] (4) NULL ,
-	[Photo] [image] NULL ,
-	[Notes] [nvarchar](1000) NULL ,
-	[ReportsTo] [int] NULL ,
-	[PhotoPath] [nvarchar] (255) NULL 
-) ON [default] 
-GO
-
-CREATE TABLE [dbo].[GH_EMPTYTABLE] (
-	[Col1] [int] NULL ,
-	[Col2] [varchar] (50) NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Order Details] (
-	[OrderID] numeric(5,0) NOT NULL ,
-	[ProductID] numeric(5,0) NOT NULL ,
-	[UnitPrice] [money] DEFAULT (0) NOT NULL ,
-	[Quantity] [smallint] DEFAULT (1) NOT NULL ,
-	[Discount] [real] DEFAULT (0) NOT NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Orders] (
-	[OrderID] numeric(5,0) IDENTITY NOT NULL ,
-	[CustomerID] [nchar] (5) NULL ,
-	[EmployeeID] [int] NULL ,
-	[OrderDate] [datetime] NULL ,
-	[RequiredDate] [datetime] NULL ,
-	[ShippedDate] [datetime] NULL ,
-	[ShipVia] numeric(5,0) NULL ,
-	[Freight] [money] DEFAULT (0) NULL ,
-	[ShipName] [nvarchar] (40) NULL ,
-	[ShipAddress] [nvarchar] (60) NULL ,
-	[ShipCity] [nvarchar] (15) NULL ,
-	[ShipRegion] [nvarchar] (15) NULL ,
-	[ShipPostalCode] [nvarchar] (10) NULL ,
-	[ShipCountry] [nvarchar] (15) NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Products] (
-	[ProductID] numeric(5,0) IDENTITY NOT NULL ,
-	[ProductName] [nvarchar] (40) NOT NULL ,
-	[SupplierID] numeric(5,0) NULL ,
-	[CategoryID] numeric(5,0) NULL ,
-	[QuantityPerUnit] [nvarchar] (20) NULL ,
-	[UnitPrice] [money] DEFAULT (0) NULL ,
-	[UnitsInStock] [smallint] DEFAULT (0) NULL ,
-	[UnitsOnOrder] [smallint] DEFAULT (0) NULL ,
-	[ReorderLevel] [smallint] DEFAULT (0) NULL ,
-	[Discontinued] [bit] NOT NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Region] (
-	[RegionID] [int] NOT NULL ,
-	[RegionDescription] [nchar] (50) NOT NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Shippers] (
-	[ShipperID] numeric(5,0) IDENTITY NOT NULL ,
-	[CompanyName] [nvarchar] (40) NOT NULL ,
-	[Phone] [nvarchar] (24) NULL 
-) ON [default]
-GO
-
-CREATE TABLE [dbo].[Suppliers] (
-	[SupplierID] numeric(5,0) IDENTITY NOT NULL ,
-	[CompanyName] [nvarchar] (40) NOT NULL ,
-	[ContactName] [nvarchar] (30) NULL ,
-	[ContactTitle] [nvarchar] (30) NULL ,
-	[Address] [nvarchar] (60) NULL ,
-	[City] [nvarchar] (15) NULL ,
-	[Region] [nvarchar] (15) NULL ,
-	[PostalCode] [nvarchar] (10) NULL ,
-	[Country] [nvarchar] (15) NULL ,
-	[Phone] [nvarchar] (24) NULL ,
-	[Fax] [nvarchar] (24) NULL ,
-	[HomePage] [nvarchar](1000) NULL 
-) ON [default] 
-GO
-
-CREATE TABLE [dbo].[Territories] (
-	[TerritoryID] [nvarchar] (20) NOT NULL ,
-	[TerritoryDescription] [nchar] (50) NOT NULL ,
-	[RegionID] [int] NOT NULL 
-) ON [default]
-GO
-
-print '------------------------------'
-print 'create tables - finish'
-print '------------------------------'
-go
-
-ALTER TABLE [dbo].[Categories] ADD 
-	CONSTRAINT [PK_Categories] PRIMARY KEY  CLUSTERED 
-	(
-		[CategoryID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Customers] ADD 
-	CONSTRAINT [PK_Customers] PRIMARY KEY  CLUSTERED 
-	(
-		[CustomerID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Employees] ADD 
-	CONSTRAINT [PK_Employees] PRIMARY KEY  CLUSTERED 
-	(
-		[EmployeeID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Order Details] ADD 
-	CONSTRAINT [PK_Order_Details] PRIMARY KEY  CLUSTERED 
-	(
-		[OrderID],
-		[ProductID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Orders] ADD 
-	CONSTRAINT [PK_Orders] PRIMARY KEY  CLUSTERED 
-	(
-		[OrderID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Products] ADD 
-	CONSTRAINT [PK_Products] PRIMARY KEY  CLUSTERED 
-	(
-		[ProductID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Shippers] ADD 
-	CONSTRAINT [PK_Shippers] PRIMARY KEY  CLUSTERED 
-	(
-		[ShipperID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Suppliers] ADD 
-	CONSTRAINT [PK_Suppliers] PRIMARY KEY  CLUSTERED 
-	(
-		[SupplierID]
-	)  ON [default] 
-GO
-
- CREATE  INDEX [CategoryName] ON [dbo].[Categories]([CategoryName]) ON [default]
-GO
-
-ALTER TABLE [dbo].[CustomerCustomerDemo] ADD 
-	CONSTRAINT [PK_CustomerCustomerDemo] PRIMARY KEY  NONCLUSTERED 
-	(
-		[CustomerID],
-		[CustomerTypeID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[CustomerDemographics] ADD 
-	CONSTRAINT [PK_CustomerDemographics] PRIMARY KEY  NONCLUSTERED 
-	(
-		[CustomerTypeID]
-	)  ON [default] 
-GO
-
- CREATE  INDEX [City] ON [dbo].[Customers]([City]) ON [default]
-GO
-
- CREATE  INDEX [CompanyName] ON [dbo].[Customers]([CompanyName]) ON [default]
-GO
-
- CREATE  INDEX [PostalCode] ON [dbo].[Customers]([PostalCode]) ON [default]
-GO
-
- CREATE  INDEX [Region] ON [dbo].[Customers]([Region]) ON [default]
-GO
-
-ALTER TABLE [dbo].[EmployeeTerritories] ADD 
-	CONSTRAINT [PK_EmployeeTerritories] PRIMARY KEY  NONCLUSTERED 
-	(
-		[EmployeeID],
-		[TerritoryID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[Employees] ADD 
-	CONSTRAINT [CK_Birthdate] CHECK ([BirthDate] < getdate())
-GO
-
- CREATE  INDEX [LastName] ON [dbo].[Employees]([LastName]) ON [default]
-GO
-
- CREATE  INDEX [PostalCode] ON [dbo].[Employees]([PostalCode]) ON [default]
-GO
-
-ALTER TABLE [dbo].[Order Details] ADD 
-	CONSTRAINT [CK_Discount] CHECK ([Discount] >= 0 and [Discount] <= 1),
-	CONSTRAINT [CK_Quantity] CHECK ([Quantity] > 0),
-	CONSTRAINT [CK_UnitPrice] CHECK ([UnitPrice] >= 0)
-GO
-
-print 'got here5'
-go
-
- CREATE  INDEX [OrderID] ON [dbo].[Order Details]([OrderID]) ON [default]
-GO
-
- CREATE  INDEX [OrdersOrder_Details] ON [dbo].[Order Details]([OrderID]) ON [default]
-GO
-
- CREATE  INDEX [ProductID] ON [dbo].[Order Details]([ProductID]) ON [default]
-GO
-
- CREATE  INDEX [ProductsOrder_Details] ON [dbo].[Order Details]([ProductID]) ON [default]
-GO
-
- CREATE  INDEX [CustomerID] ON [dbo].[Orders]([CustomerID]) ON [default]
-GO
-
- CREATE  INDEX [CustomersOrders] ON [dbo].[Orders]([CustomerID]) ON [default]
-GO
-
- CREATE  INDEX [EmployeeID] ON [dbo].[Orders]([EmployeeID]) ON [default]
-GO
-
- CREATE  INDEX [EmployeesOrders] ON [dbo].[Orders]([EmployeeID]) ON [default]
-GO
-
- CREATE  INDEX [OrderDate] ON [dbo].[Orders]([OrderDate]) ON [default]
-GO
-
- CREATE  INDEX [ShippedDate] ON [dbo].[Orders]([ShippedDate]) ON [default]
-GO
-
- CREATE  INDEX [ShippersOrders] ON [dbo].[Orders]([ShipVia]) ON [default]
-GO
-
- CREATE  INDEX [ShipPostalCode] ON [dbo].[Orders]([ShipPostalCode]) ON [default]
-GO
-
-print 'got here6'
-go
-
-ALTER TABLE [dbo].[Products] ADD 
-	CONSTRAINT [CK_Products_UnitPrice] CHECK ([UnitPrice] >= 0),
-	CONSTRAINT [CK_ReorderLevel] CHECK ([ReorderLevel] >= 0),
-	CONSTRAINT [CK_UnitsInStock] CHECK ([UnitsInStock] >= 0),
-	CONSTRAINT [CK_UnitsOnOrder] CHECK ([UnitsOnOrder] >= 0)
-GO
-
-print 'got here7'
-go
-
- CREATE  INDEX [CategoriesProducts] ON [dbo].[Products]([CategoryID]) ON [default]
-GO
-
- CREATE  INDEX [CategoryID] ON [dbo].[Products]([CategoryID]) ON [default]
-GO
-
- CREATE  INDEX [ProductName] ON [dbo].[Products]([ProductName]) ON [default]
-GO
-
- CREATE  INDEX [SupplierID] ON [dbo].[Products]([SupplierID]) ON [default]
-GO
-
- CREATE  INDEX [SuppliersProducts] ON [dbo].[Products]([SupplierID]) ON [default]
-GO
-
-ALTER TABLE [dbo].[Region] ADD 
-	CONSTRAINT [PK_Region] PRIMARY KEY  NONCLUSTERED 
-	(
-		[RegionID]
-	)  ON [default] 
-GO
-
- CREATE  INDEX [CompanyName] ON [dbo].[Suppliers]([CompanyName]) ON [default]
-GO
-
- CREATE  INDEX [PostalCode] ON [dbo].[Suppliers]([PostalCode]) ON [default]
-GO
-
-ALTER TABLE [dbo].[Territories] ADD 
-	CONSTRAINT [PK_Territories] PRIMARY KEY  NONCLUSTERED 
-	(
-		[TerritoryID]
-	)  ON [default] 
-GO
-
-ALTER TABLE [dbo].[CustomerCustomerDemo] ADD 
-	CONSTRAINT [FK_CustomerCustomerDemo] FOREIGN KEY 
-	(
-		[CustomerTypeID]
-	) REFERENCES [dbo].[CustomerDemographics] (
-		[CustomerTypeID]
-	),
-	CONSTRAINT [FK_CustCustDemo_Customers] FOREIGN KEY 
-	(
-		[CustomerID]
-	) REFERENCES [dbo].[Customers] (
-		[CustomerID]
-	)
-GO
-
-ALTER TABLE [dbo].[EmployeeTerritories] ADD 
-	CONSTRAINT [FK_EmpTer_Employees] FOREIGN KEY 
-	(
-		[EmployeeID]
-	) REFERENCES [dbo].[Employees] (
-		[EmployeeID]
-	),
-	CONSTRAINT [FK_EmpTer_Ter] FOREIGN KEY 
-	(
-		[TerritoryID]
-	) REFERENCES [dbo].[Territories] (
-		[TerritoryID]
-	)
-GO
-
-ALTER TABLE [dbo].[Employees] ADD 
-	CONSTRAINT [FK_Employees_Employees] FOREIGN KEY 
-	(
-		[ReportsTo]
-	) REFERENCES [dbo].[Employees] (
-		[EmployeeID]
-	)
-GO
-
-ALTER TABLE [dbo].[Order Details] ADD 
-	CONSTRAINT [FK_Order_Details_Orders] FOREIGN KEY 
-	(
-		[OrderID]
-	) REFERENCES [dbo].[Orders] (
-		[OrderID]
-	),
-	CONSTRAINT [FK_Order_Details_Products] FOREIGN KEY 
-	(
-		[ProductID]
-	) REFERENCES [dbo].[Products] (
-		[ProductID]
-	)
-GO
-
-ALTER TABLE [dbo].[Orders] ADD 
-	CONSTRAINT [FK_Orders_Customers] FOREIGN KEY 
-	(
-		[CustomerID]
-	) REFERENCES [dbo].[Customers] (
-		[CustomerID]
-	),
-	CONSTRAINT [FK_Orders_Employees] FOREIGN KEY 
-	(
-		[EmployeeID]
-	) REFERENCES [dbo].[Employees] (
-		[EmployeeID]
-	),
-	CONSTRAINT [FK_Orders_Shippers] FOREIGN KEY 
-	(
-		[ShipVia]
-	) REFERENCES [dbo].[Shippers] (
-		[ShipperID]
-	)
-GO
-
-ALTER TABLE [dbo].[Products] ADD 
-	CONSTRAINT [FK_Products_Categories] FOREIGN KEY 
-	(
-		[CategoryID]
-	) REFERENCES [dbo].[Categories] (
-		[CategoryID]
-	),
-	CONSTRAINT [FK_Products_Suppliers] FOREIGN KEY 
-	(
-		[SupplierID]
-	) REFERENCES [dbo].[Suppliers] (
-		[SupplierID]
-	)
-GO
-
-ALTER TABLE [dbo].[Territories] ADD 
-	CONSTRAINT [FK_Territories_Region] FOREIGN KEY 
-	(
-		[RegionID]
-	) REFERENCES [dbo].[Region] (
-		[RegionID]
-	)
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-print '------------------------------'
-print 'create views - start'
-print '------------------------------'
-go
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Current Product List" AS
-SELECT Product_List.ProductID, Product_List.ProductName
-FROM Products AS Product_List
-WHERE (((Product_List.Discontinued)=0))
---ORDER BY Product_List.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Orders Qry" AS
-SELECT Orders.OrderID, Orders.CustomerID, Orders.EmployeeID, Orders.OrderDate, Orders.RequiredDate, 
-	Orders.ShippedDate, Orders.ShipVia, Orders.Freight, Orders.ShipName, Orders.ShipAddress, Orders.ShipCity, 
-	Orders.ShipRegion, Orders.ShipPostalCode, Orders.ShipCountry, 
-	Customers.CompanyName, Customers.Address, Customers.City, Customers.Region, Customers.PostalCode, Customers.Country
-FROM Customers INNER JOIN Orders ON Customers.CustomerID = Orders.CustomerID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Products Above Average Price" AS
-SELECT Products.ProductName, Products.UnitPrice
-FROM Products
-WHERE Products.UnitPrice>(SELECT AVG(UnitPrice) From Products)
---ORDER BY Products.UnitPrice DESC
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Products by Category" AS
-SELECT Categories.CategoryName, Products.ProductName, Products.QuantityPerUnit, Products.UnitsInStock, Products.Discontinued
-FROM Categories INNER JOIN Products ON Categories.CategoryID = Products.CategoryID
-WHERE Products.Discontinued <> 1
---ORDER BY Categories.CategoryName, Products.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Quarterly Orders" AS
-SELECT DISTINCT Customers.CustomerID, Customers.CompanyName, Customers.City, Customers.Country
-FROM Customers RIGHT JOIN Orders ON Customers.CustomerID = Orders.CustomerID
-WHERE Orders.OrderDate BETWEEN '19970101' And '19971231'
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view Invoices AS
-SELECT Orders.ShipName, Orders.ShipAddress, Orders.ShipCity, Orders.ShipRegion, Orders.ShipPostalCode, 
-	Orders.ShipCountry, Orders.CustomerID, Customers.CompanyName AS CustomerName, Customers.Address, Customers.City, 
-	Customers.Region, Customers.PostalCode, Customers.Country, 
-	(FirstName + ' ' + LastName) AS Salesperson, 
-	Orders.OrderID, Orders.OrderDate, Orders.RequiredDate, Orders.ShippedDate, Shippers.CompanyName As ShipperName, 
-	"Order Details".ProductID, Products.ProductName, "Order Details".UnitPrice, "Order Details".Quantity, 
-	"Order Details".Discount, 
-	(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS ExtendedPrice, Orders.Freight
-FROM 	Shippers INNER JOIN 
-		(Products INNER JOIN 
-			(
-				(Employees INNER JOIN 
-					(Customers INNER JOIN Orders ON Customers.CustomerID = Orders.CustomerID) 
-				ON Employees.EmployeeID = Orders.EmployeeID) 
-			INNER JOIN "Order Details" ON Orders.OrderID = "Order Details".OrderID) 
-		ON Products.ProductID = "Order Details".ProductID) 
-	ON Shippers.ShipperID = Orders.ShipVia
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Order Details Extended" AS
-SELECT "Order Details".OrderID, "Order Details".ProductID, Products.ProductName, 
-	"Order Details".UnitPrice, "Order Details".Quantity, "Order Details".Discount, 
-	(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS ExtendedPrice
-FROM Products INNER JOIN "Order Details" ON Products.ProductID = "Order Details".ProductID
---ORDER BY "Order Details".OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Order Subtotals" AS
-SELECT "Order Details".OrderID, Sum(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS Subtotal
-FROM "Order Details"
-GROUP BY "Order Details".OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Product Sales for 1997" AS
-SELECT Categories.CategoryName, Products.ProductName, 
-Sum(CONVERT(money,("Order Details".UnitPrice*Quantity*(1-Discount)/100))*100) AS ProductSales
-FROM (Categories INNER JOIN Products ON Categories.CategoryID = Products.CategoryID) 
-	INNER JOIN (Orders 
-		INNER JOIN "Order Details" ON Orders.OrderID = "Order Details".OrderID) 
-	ON Products.ProductID = "Order Details".ProductID
-WHERE (((Orders.ShippedDate) Between '19970101' And '19971231'))
-GROUP BY Categories.CategoryName, Products.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Category Sales for 1997" AS
-SELECT "Product Sales for 1997".CategoryName, Sum("Product Sales for 1997".ProductSales) AS CategorySales
-FROM "Product Sales for 1997"
-GROUP BY "Product Sales for 1997".CategoryName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Sales Totals by Amount" AS
-SELECT "Order Subtotals".Subtotal AS SaleAmount, Orders.OrderID, Customers.CompanyName, Orders.ShippedDate
-FROM 	Customers INNER JOIN 
-		(Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID) 
-	ON Customers.CustomerID = Orders.CustomerID
-WHERE ("Order Subtotals".Subtotal >2500) AND (Orders.ShippedDate BETWEEN '19970101' And '19971231')
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Sales by Category" AS
-SELECT Categories.CategoryID, Categories.CategoryName, Products.ProductName, 
-	Sum("Order Details Extended".ExtendedPrice) AS ProductSales
-FROM 	Categories INNER JOIN 
-		(Products INNER JOIN 
-			(Orders INNER JOIN "Order Details Extended" ON Orders.OrderID = "Order Details Extended".OrderID) 
-		ON Products.ProductID = "Order Details Extended".ProductID) 
-	ON Categories.CategoryID = Products.CategoryID
-WHERE Orders.OrderDate BETWEEN '19970101' And '19971231'
-GROUP BY Categories.CategoryID, Categories.CategoryName, Products.ProductName
---ORDER BY Products.ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Summary of Sales by Quarter" AS
-SELECT Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal
-FROM Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID
-WHERE Orders.ShippedDate IS NOT NULL
---ORDER BY Orders.ShippedDate
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create view "Summary of Sales by Year" AS
-SELECT Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal
-FROM Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID
-WHERE Orders.ShippedDate IS NOT NULL
---ORDER BY Orders.ShippedDate
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-print '------------------------------'
-print 'create views - finish'
-print '------------------------------'
-go
-
-print '------------------------------'
-print 'create procedures - start'
-print '------------------------------'
-go
-
-CREATE PROCEDURE CustOrderHist @CustomerID nchar(5)
-AS
-SELECT ProductName, Total=SUM(Quantity)
-FROM Products P, [Order Details] OD, Orders O, Customers C
-WHERE C.CustomerID = @CustomerID
-AND C.CustomerID = O.CustomerID AND O.OrderID = OD.OrderID AND OD.ProductID = P.ProductID
-GROUP BY ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-CREATE PROCEDURE CustOrdersDetail @OrderID int
-AS
-SELECT ProductName,
-    UnitPrice=ROUND(Od.UnitPrice, 2),
-    Quantity,
-    Discount=CONVERT(int, Discount * 100), 
-    ExtendedPrice=ROUND(CONVERT(money, Quantity * (1 - Discount) * Od.UnitPrice), 2)
-FROM Products P, [Order Details] Od
-WHERE Od.ProductID = P.ProductID and Od.OrderID = @OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-CREATE PROCEDURE CustOrdersOrders @CustomerID nchar(5)
-AS
-SELECT OrderID, 
-	OrderDate,
-	RequiredDate,
-	ShippedDate
-FROM Orders
-WHERE CustomerID = @CustomerID
-ORDER BY OrderID
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create procedure "Employee Sales by Country" 
-@Beginning_Date DateTime, @Ending_Date DateTime AS
-SELECT Employees.Country, Employees.LastName, Employees.FirstName, Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal AS SaleAmount
-FROM Employees INNER JOIN 
-	(Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID) 
-	ON Employees.EmployeeID = Orders.EmployeeID
-WHERE Orders.ShippedDate Between @Beginning_Date And @Ending_Date
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-CREATE PROCEDURE GH_CREATETABLE
-AS
-Begin
-     Create Table #temp_tbl (
-                            Col1 int,
-                            Col2 int
-                            )
-          --insert values to the table
-         insert into #temp_tbl values (11,12)
-         insert into #temp_tbl values (21,22)
-         insert into #temp_tbl values (31,32)
-         --execute select on the created table
-         select Col1 as Value1, Col2 as Value2 from #temp_tbl
-         end
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-CREATE PROCEDURE GH_MULTIRECORDSETS
-as BEGIN
-    -- Declare cursor
-          SELECT EmployeeID, LastName FROM Employees where EmployeeID in (1,2) order by EmployeeID asc
-          SELECT CustomerID, CompanyName,ContactName FROM Customers  where CustomerID in ('MORGK','NORTS') order by CustomerID asc
-            -- return empty result set
-          SELECT OrderID, ShipAddress,ShipVia, ShipCity FROM Orders where OrderID=-1
-END
-GO
-
-CREATE procedure GH_INOUT1
-@INPARAM varchar(20) ,
-@OUTPARAM  int output
-AS
-declare @L_INPARAM varchar(30) 
-select L_INPARAM = @INPARAM
-select @OUTPARAM = 100
-GO
-
-
-CREATE procedure GH_REFCURSOR1
-AS
-SELECT EmployeeID, LastName FROM Employees
-WHERE EmployeeID=1
-GO
-
-CREATE procedure GH_REFCURSOR2
-@IN_EMPLOYEEID int
-AS
-SELECT EmployeeID, LastName FROM Employees 
-where EmployeeID = @IN_EMPLOYEEID
-GO
-
-
-CREATE procedure GH_REFCURSOR3
-@IN_LASTNAME varchar(20) AS
-SELECT EmployeeID, LastName FROM Employees  
-where LastName = @IN_LASTNAME
-GO
-
-
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create procedure "Sales by Year" 
-	@Beginning_Date DateTime, @Ending_Date DateTime AS
-SELECT Orders.ShippedDate, Orders.OrderID, "Order Subtotals".Subtotal, DATENAME(yy,ShippedDate) AS Year
-FROM Orders INNER JOIN "Order Subtotals" ON Orders.OrderID = "Order Subtotals".OrderID
-WHERE Orders.ShippedDate Between @Beginning_Date And @Ending_Date
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-CREATE PROCEDURE SalesByCategory
-    @CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
-AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
-BEGIN
-	SELECT @OrdYear = '1998'
-END
-SELECT ProductName,
-	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
-FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID 
-	AND OD.ProductID = P.ProductID 
-	AND P.CategoryID = C.CategoryID
-	AND C.CategoryName = @CategoryName
-	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
-GROUP BY ProductName
-ORDER BY ProductName
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-create procedure "Ten Most Expensive Products" AS
-SET ROWCOUNT 10
-SELECT Products.ProductName AS TenMostExpensiveProducts, Products.UnitPrice
-FROM Products
-ORDER BY Products.UnitPrice DESC
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_1
-@T_TINYINT tinyint,
-@T_SMALLINT smallint ,
-@T_INT int,
-@T_DECIMAL decimal(18, 0),
-@T_NUMERIC numeric(18, 0) ,
-@T_FLOAT float  ,
-@T_REAL  real  ,
-@T_CHAR char (10),
-@T_NCHAR nchar (10),
-@T_VARCHAR varchar (50) ,
-@T_NVARCHAR nvarchar (50)
- AS
-SELECT @T_TINYINT as 'T_TINYINT', @T_SMALLINT as 'T_SMALLINT' , @T_INT as 'T_INT', @T_DECIMAL as 'T_DECIMAL',
-@T_NUMERIC as 'T_NUMERIC' , @T_FLOAT as 'T_FLOAT'  , @T_REAL  as 'T_REAL'  , @T_CHAR as 'T_CHAR', @T_NCHAR as 'T_NCHAR', @T_VARCHAR as 'T_VARCHAR' , @T_NVARCHAR as 'T_NVARCHAR'
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_2
-@T_TINYINT tinyint output,
-@T_SMALLINT smallint output,
-@T_INT int output,
-@T_DECIMAL decimal(18, 0) output,
-@T_NUMERIC numeric(18, 0)  output,
-@T_FLOAT float output,
-@T_REAL  real output,
-@T_CHAR char (10) output,
-@T_NCHAR nchar (10) output,
-@T_VARCHAR varchar (50) output,
-@T_NVARCHAR nvarchar (50) output
- AS
-SELECT @T_TINYINT = @T_TINYINT*2
-SELECT @T_SMALLINT = @T_SMALLINT*2 
-SELECT @T_INT = @T_INT*2
-SELECT @T_DECIMAL = @T_DECIMAL*2
-SELECT @T_NUMERIC = @T_NUMERIC*2 
-SELECT @T_FLOAT = @T_FLOAT*2  
-SELECT @T_REAL = @T_REAL*2  
-SELECT @T_CHAR = UPPER(@T_CHAR)
-SELECT @T_NCHAR =UPPER(@T_NCHAR)
-SELECT @T_VARCHAR = UPPER(@T_VARCHAR)
-SELECT @T_NVARCHAR = UPPER(@T_NVARCHAR)
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_3
-@ID char,
-@T_TINYINT tinyint output,
-@T_SMALLINT smallint output,
-@T_INT int output,
-@T_DECIMAL decimal(18, 0) output,
-@T_NUMERIC numeric(18, 0)  output,
-@T_FLOAT float output,
-@T_REAL  real output,
-@T_CHAR char (10) output,
-@T_NCHAR nchar (10) output,
-@T_VARCHAR varchar (50) output,
-@T_NVARCHAR nvarchar (50) output
-AS
-SELECT @T_TINYINT = T_TINYINT, @T_SMALLINT = T_SMALLINT , @T_INT = T_INT, @T_DECIMAL = T_DECIMAL ,
-@T_NUMERIC = T_NUMERIC , @T_FLOAT = T_FLOAT  , @T_REAL = T_REAL  , @T_CHAR = T_CHAR, @T_NCHAR = T_NCHAR, 
-@T_VARCHAR = T_VARCHAR, @T_NVARCHAR = T_NVARCHAR FROM TYPES_SIMPLE WHERE ID = @ID
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_4
-@ID char
-AS
-/*Insert*/
-insert into TYPES_SIMPLE(ID,T_INT) values (@ID,50)
-SELECT * FROM TYPES_SIMPLE WHERE ID = @ID
-/*Update*/
-update TYPES_SIMPLE set T_INT=60 where ID = @ID
-SELECT * FROM TYPES_SIMPLE WHERE ID = @ID
-/*Delete*/
-delete from TYPES_SIMPLE WHERE ID = @ID
-SELECT * FROM TYPES_SIMPLE WHERE ID = @ID
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-CREATE PROCEDURE GHSP_TYPES_SIMPLE_5
-AS
-DECLARE @T_TINYINT tinyint
-DECLARE @T_SMALLINT smallint
-DECLARE @T_INT int
-DECLARE @T_DECIMAL decimal(18,0)
-DECLARE @T_NUMERIC numeric(18,0)
-DECLARE @T_FLOAT float
-DECLARE @T_REAL real
-DECLARE @T_CHAR char(10)
-DECLARE @T_NCHAR nchar(10)
-DECLARE @T_VARCHAR varchar(50)
-DECLARE @T_NVARCHAR nvarchar(50)
-
-SELECT @T_TINYINT = 25
-SELECT @T_SMALLINT = 77
-SELECT @T_INT = 2525
-SELECT @T_DECIMAL = 10
-SELECT @T_NUMERIC = 123123
-SELECT @T_FLOAT = 17.1414257
-SELECT @T_REAL = 0.71425
-SELECT @T_CHAR = 'abcdefghij'
-SELECT @T_NCHAR = N'klmnopqrst'
-SELECT @T_VARCHAR = 'qwertasdfg'
-SELECT @T_NVARCHAR = N'qwertasdfg'
- 
-SELECT @T_TINYINT as 'T_TINYINT', @T_SMALLINT as 'T_SMALLINT' , @T_INT as 'T_INT', @T_DECIMAL as 'T_DECIMAL', @T_NUMERIC as 'T_NUMERIC' , @T_FLOAT as 'T_FLOAT'  , @T_REAL  as 'T_REAL'  , @T_CHAR as 'T_CHAR', @T_NCHAR as 'T_NCHAR', @T_VARCHAR as 'T_VARCHAR' , @T_NVARCHAR as 'T_NVARCHAR'
-
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-if not exists (select * from master.dbo.syslogins where name = N'mainsoft')
-BEGIN
-	declare @logindb nvarchar(132), @loginlang nvarchar(132) select @logindb = N'GHTDB', @loginlang = N'us_english'
-	if @logindb is null or not exists (select * from master.dbo.sysdatabases where name = @logindb)
-		select @logindb = N'master'
-	if @loginlang is null or (not exists (select * from master.dbo.syslanguages where name = @loginlang) and @loginlang <> N'us_english')
-		select @loginlang = @@language
-	exec sp_addlogin N'mainsoft', 'mainsoft', @logindb, @loginlang
-END
-GO
-
---exec sp_addsrvrolemember N'mainsoft', sysadmin
-exec sp_adduser mainsoft
-GO
-
-
-if not exists (select * from dbo.sysusers where name = N'mainsoft' and uid < 16382)
-	EXEC sp_grantdbaccess N'mainsoft', N'mainsoft', 1
-GO
-
-SET QUOTED_IDENTIFIER ON 
-GO
-
-CREATE TABLE [mainsoft].[CategoriesNew] (
-	[CategoryID] numeric(5,0) IDENTITY NOT NULL ,
-	[CategoryName] [nvarchar] (15) NOT NULL ,
-	[Description] [nvarchar](1000) NULL ,
-	[Picture] [image] NULL 
-) ON [default] 
-GO
-
-CREATE TABLE [mainsoft].[Categories] (
-	[CategoryID] [nvarchar] (15) NOT NULL ,
-	[CategoryName] [nvarchar] (15) NOT NULL ,
-	[Description] [nvarchar](1000) NULL ,
-	[Picture] [int] NULL 
-) ON [default] 
-GO
-
-CREATE  procedure [mainsoft].[GH_DUMMY]
-@EmployeeIdPrm  char (10)
-AS
-SELECT * FROM Employees where EmployeeID > CONVERT(int,@EmployeeIdPrm)
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------
-use master
-go
-
-IF EXISTS (SELECT name FROM master.dbo.sysdatabases WHERE name = N'GHTDB_EX')
-	DROP DATABASE [GHTDB_EX]
-GO
-
-if (@@maxpagesize = 1024 * 2)
-	create database GHTDB_EX on default = 10
-else
-	create database GHTDB_EX on default = 10
-go
-
-exec sp_dboption N'GHTDB_EX', N'trunc log on chkpt', true, 1
-exec sp_dboption N'GHTDB_EX', N'trunc. log', N'true', 1
-exec sp_dboption N'GHTDB_EX', N'read only', N'false', 1
-exec sp_dboption N'GHTDB_EX', N'dbo use', N'false', 1
-go
-
-
-use [GHTDB_EX]
-GO
-
-CREATE TABLE [dbo].[Customers] (
-	[CustomerID] [char] (10)  NOT NULL ,
-	[CompanyName] [nvarchar] (40)  NULL ,
-	[ContactName] [nvarchar] (30)  NULL ,
-	[ContactTitle] [nvarchar] (30)  NULL ,
-	[Address] [nvarchar] (60)  NULL ,
-	[City] [nvarchar] (15)  NULL ,
-	[Region] [nvarchar] (15)  NULL ,
-	[PostalCode] [nvarchar] (10)  NULL ,
-	[Country] [nvarchar] (15)  NULL ,
-	[Phone] [nvarchar] (24)  NULL ,
-	[Fax] [nvarchar] (24)  NULL 
-) ON [default]
-GO
-
-SET QUOTED_IDENTIFIER OFF 
-GO
-
-print '------------------------------'
-print 'create another GH_DUMMY which select from a different table'
-print 'customers instead of employees'
-print '------------------------------'
-go
-CREATE  procedure GH_DUMMY
-@CustomerIdPrm char (10)
-AS
-SELECT * FROM Customers where CustomerID=CONVERT(char,@CustomerIdPrm)
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDBEX.PostgreSQL.sql b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDBEX.PostgreSQL.sql
deleted file mode 100755
index 64ec295a4d1..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/GHTDBEX.PostgreSQL.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-DROP FUNCTION GH_DUMMY(CHAR);
-
-
-CREATE FUNCTION GH_DUMMY(CHAR) RETURNS refcursor AS $$
-DECLARE 
-   rct1 refcursor;
- 
-BEGIN
-  OPEN rct1 FOR
-	SELECT * FROM Customers where CustomerID = $1;
-  RETURN rct1;
-END;
-$$ LANGUAGE 'plpgsql';
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ADONetTesterClass.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ADONetTesterClass.cs
deleted file mode 100755
index df79aafd0d5..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ADONetTesterClass.cs
+++ /dev/null
@@ -1,1865 +0,0 @@
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Oren Gurfinkel   <oreng@mainsoft.com>
-//   Ofer Borstein
-// 
-// Copyright (c) 2004 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-using System.IO;
-using System.Collections;
-using MonoTests.System.Data.Utils.Data;
-using Sys = System;
-
-namespace MonoTests.System.Data.Utils {
-	public class ADONetTesterClass : GHTBase {
-		#region " Base Constructors "
-		protected ADONetTesterClass(Sys.IO.TextWriter Logger, bool LogOnSuccess) : base(Logger,LogOnSuccess){}
-		protected ADONetTesterClass(bool LogOnSuccess):base(Console.Out, LogOnSuccess){}
-		protected ADONetTesterClass():base(Console.Out, false){}
-
-		#endregion
-
-		private MonoTests.System.Data.Utils.DataBaseServer DBType ;
-
-
-		#region "-----------  Build Update Commands --------------"
-		protected void OleDbDataAdapter_BuildUpdateCommands(ref Sys.Data.OleDb.OleDbDataAdapter oleDBda) {
-			Sys.Data.OleDb.OleDbConnection Conn = oleDBda.SelectCommand.Connection;
-
-			oleDBda.DeleteCommand = new Sys.Data.OleDb.OleDbCommand();
-			oleDBda.InsertCommand = new Sys.Data.OleDb.OleDbCommand();
-			oleDBda.UpdateCommand = new Sys.Data.OleDb.OleDbCommand();
-
-			oleDBda.DeleteCommand.Connection = Conn;
-			oleDBda.InsertCommand.Connection = Conn;
-			oleDBda.UpdateCommand.Connection = Conn;
-
-			oleDBda.DeleteCommand.Parameters.Add(new Sys.Data.OleDb.OleDbParameter("EmployeeID",Sys.Data.OleDb.OleDbType.Integer)) ;
-			oleDBda.DeleteCommand.Parameters["EmployeeID"].SourceVersion = DataRowVersion.Original;
-			oleDBda.DeleteCommand.Parameters["EmployeeID"].SourceColumn = "EmployeeID";
-
-			oleDBda.InsertCommand.Parameters.Add(new Sys.Data.OleDb.OleDbParameter("EmployeeID",Sys.Data.OleDb.OleDbType.Integer));
-			oleDBda.InsertCommand.Parameters.Add(new Sys.Data.OleDb.OleDbParameter("LastName",Sys.Data.OleDb.OleDbType.VarWChar ,20));
-			oleDBda.InsertCommand.Parameters.Add(new Sys.Data.OleDb.OleDbParameter("FirstName",Sys.Data.OleDb.OleDbType.VarWChar,10));
-			oleDBda.InsertCommand.Parameters["EmployeeID"].SourceColumn = "EmployeeID";
-			oleDBda.InsertCommand.Parameters["LastName"].SourceColumn = "LastName";
-			oleDBda.InsertCommand.Parameters["FirstName"].SourceColumn = "FirstName";
-
-			oleDBda.UpdateCommand.Parameters.Add(new Sys.Data.OleDb.OleDbParameter("Title",Sys.Data.OleDb.OleDbType.VarWChar,30));
-			oleDBda.UpdateCommand.Parameters.Add(new Sys.Data.OleDb.OleDbParameter("EmployeeID",Sys.Data.OleDb.OleDbType.Integer));
-			oleDBda.UpdateCommand.Parameters["EmployeeID"].SourceColumn = "EmployeeID";
-			oleDBda.UpdateCommand.Parameters["Title"].SourceColumn = "Title";
-
-
-			//for OleDB, ODBC
-			string deleteSQL = "DELETE FROM Employees WHERE EmployeeID = ?";
-			string insertSQL = "INSERT INTO Employees (EmployeeID, LastName, FirstName) VALUES (?, ?, ?)";
-			string updateSQL = "UPDATE Employees SET Title = ? WHERE EmployeeID = ?";
-
-			oleDBda.DeleteCommand.CommandText = deleteSQL;
-			oleDBda.InsertCommand.CommandText = insertSQL;
-			oleDBda.UpdateCommand.CommandText = updateSQL;
-
-		}
-		protected void SqlDataAdapter_BuildUpdateCommands(ref Sys.Data.SqlClient.SqlDataAdapter Sqlda) {
-			Sys.Data.SqlClient.SqlConnection Conn = Sqlda.SelectCommand.Connection;
-
-			Sqlda.DeleteCommand = new Sys.Data.SqlClient.SqlCommand();
-			Sqlda.InsertCommand = new Sys.Data.SqlClient.SqlCommand();
-			Sqlda.UpdateCommand = new Sys.Data.SqlClient.SqlCommand();
-
-			Sqlda.DeleteCommand.Connection = Conn;
-			Sqlda.InsertCommand.Connection = Conn;
-			Sqlda.UpdateCommand.Connection = Conn;
-
-			Sqlda.DeleteCommand.Parameters.Add(new Sys.Data.SqlClient.SqlParameter("@EmployeeID",DbType.Int32)) ;
-			Sqlda.DeleteCommand.Parameters["@EmployeeID"].SourceVersion = DataRowVersion.Original;
-			Sqlda.DeleteCommand.Parameters["@EmployeeID"].SourceColumn = "EmployeeID";
-
-			Sqlda.InsertCommand.Parameters.Add(new Sys.Data.SqlClient.SqlParameter("@EmployeeID",DbType.Int32));
-			Sqlda.InsertCommand.Parameters.Add(new Sys.Data.SqlClient.SqlParameter("@LastName",Sys.Data.SqlDbType.VarChar ,20));
-			Sqlda.InsertCommand.Parameters.Add(new Sys.Data.SqlClient.SqlParameter("@FirstName",Sys.Data.SqlDbType.VarChar ,10));
-			Sqlda.InsertCommand.Parameters["@EmployeeID"].SourceColumn = "EmployeeID";
-			Sqlda.InsertCommand.Parameters["@LastName"].SourceColumn = "LastName";
-			Sqlda.InsertCommand.Parameters["@FirstName"].SourceColumn = "FirstName";
-
-			Sqlda.UpdateCommand.Parameters.Add(new Sys.Data.SqlClient.SqlParameter("@Title",Sys.Data.SqlDbType.VarChar,30));
-			Sqlda.UpdateCommand.Parameters.Add(new Sys.Data.SqlClient.SqlParameter("@EmployeeID",DbType.Int32));
-			Sqlda.UpdateCommand.Parameters["@EmployeeID"].SourceColumn = "EmployeeID";
-			Sqlda.UpdateCommand.Parameters["@Title"].SourceColumn = "Title";
-
-			//for Sql Client
-			string deleteSql = "DELETE FROM Employees WHERE EmployeeID = @EmployeeID";
-			string insertSql = "INSERT INTO Employees (EmployeeID, LastName, FirstName) VALUES (@EmployeeID, @LastName, @FirstName)";
-			string updateSql = "UPDATE Employees SET Title = @Title WHERE EmployeeID = @EmployeeID";
-
-			Sqlda.DeleteCommand.CommandText = deleteSql;
-			Sqlda.InsertCommand.CommandText = insertSql;
-			Sqlda.UpdateCommand.CommandText = updateSql;
-
-		}
-		#endregion
-
-		#region "-----------  Sys.Data.Common.DBDataAdapter --------------"
-
-		#region " DBDataAdapter - Fill / Fill Schema "
-
-		protected void DbDataAdapter_Fill_Ds(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds,false);
-
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, this table will be addedd during the fill process
-			ds.AcceptChanges();
-	
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult);
-		
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_Fill_Dt(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds, false);
-
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, fill only one table
-
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			ds.AcceptChanges();
-		
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult.Tables["Table"]);
-
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		protected void DbDataAdapter_Fill_Ds_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds, false);
-
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, this table will be addedd during the fill process
-			ds.AcceptChanges();
-		
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult,dsResult.Tables[0].TableName );
-
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_Fill_Ds_Int_Int_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult, dsExpected ;
-			int ExpectedRowsCount,ResultRowsCount;
-			DataSet ds = new DataSet();
-
-			ExpectedRowsCount = ReadDBData_Fill(dbDA,ref ds, false);
-			// create expected dataset to compare result to
-			dsExpected = ds.Copy();
-
-			//make some changes, the fill method will overides those changes with data from DB.
-			foreach (DataRow dr in ds.Tables[0].Select())
-				dr["Country"] = "NeverNeverLand";	
-			ds.Tables[0].Columns.Remove("HomePhone"); //remove column, this column will be addedd during the fill process
-			//ds.Tables.Remove(ds.Tables[1]); //remove the table, this table will be addedd during the fill process
-			ds.AcceptChanges();
-		
-			// create source dataset to be filled
-			dsResult = ds.Copy();
-		
-			//execute fill
-			ResultRowsCount = dbDA.Fill(dsResult,0,0,dsResult.Tables[0].TableName);
-			CompareResults_Fill(dsResult,dsExpected);
-		
-			dsResult = ds.Copy();
-			//modify expected dataset to match the expected result
-			for (int i=0; i < dsExpected.Tables[0].Rows.Count ; i++) {
-				if (i < 5 || i > 14) {
-					dsExpected.Tables[0].Rows[i]["Country"] = "NeverNeverLand";
-					dsExpected.Tables[0].Rows[i]["HomePhone"] = DBNull.Value; 
-				}
-			}
-			ResultRowsCount = dbDA.Fill(dsResult,5,10,dsResult.Tables[0].TableName);
-			CompareResults_Fill(dsResult,dsExpected);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-
-		protected void DbDataAdapter_FillSchema_Ds_SchemaType(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult = new DataSet(); 
-			DataSet dsExpected = new DataSet();
-		
-			// create expected dataset to compare result to
-			ReadDBData_Fill(dbDA,ref dsExpected ,true);
-
-			//  Note:   When handling batch SQL statements that return multiple results, 
-			//	the implementation of FillSchema for the .NET Framework Data Provider for OLEDB 
-			//	retrieves schema information for only the first result. 
-			//	To retrieve schema information for multiple results, use Fill with the MissingSchemaAction set to AddWithKey
-			//			if (dbDA.GetType() == typeof(Sys.Data.OleDb.OleDbDataAdapter)) 
-			//				dsExpected.Tables.Remove(dsExpected.Tables[1]);
-
-			//execute FillSchema
-
-			//dsResult = dsExpected.Copy();
-			DataTable[] dtArr = dbDA.FillSchema(dsResult,SchemaType.Mapped );
-
-			//************  Fix .Net bug? (FillSchema method add AutoIncrement=true) *******************
-			dsResult.Tables[0].Columns["EmployeeID"].AutoIncrement = false;
-		
-			CompareResults_Fill(dsResult,dsExpected);
-
-			Exception exp = null;
-			try {
-				BeginCase("Check return value - Table[0]");
-				Compare(dtArr[0],dsResult.Tables[0] );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//			if (dbDA.GetType() != typeof(Sys.Data.OleDb.OleDbDataAdapter)) 
-			//				try
-			//				{
-			//					BeginCase("Check return value - Table[1]");
-			//					Compare(dtArr[1],dsResult.Tables[1]);
-			//				}
-			//				catch(Exception ex)	{exp = ex;}
-			//				finally	{EndCase(exp); exp = null;}
-	
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_FillSchema_Dt_SchemaType(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult = new DataSet(); 
-			DataSet dsExpected = new DataSet();
-		
-			// create expected dataset to compare result to
-			ReadDBData_Fill(dbDA,ref dsExpected ,true);
-
-			//dsExpected.Tables.Remove(dsExpected.Tables[1]);
-
-			//execute FillSchema
-
-			dsResult.Tables.Add("Table");
-			DataTable dt = dbDA.FillSchema(dsResult.Tables[0],SchemaType.Mapped );
-
-			//************  Fix .Net bug? (FillSchema method add AutoIncrement=true) *******************
-			dsResult.Tables[0].Columns["EmployeeID"].AutoIncrement = false;
-
-			CompareResults_Fill(dsResult,dsExpected);
-			Exception exp = null;
-			try {
-				BeginCase("Check return value - Table[0]");
-				Compare(dt,dsResult.Tables[0] );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-		protected void DbDataAdapter_FillSchema_Ds_SchemaType_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			DataSet dsResult = new DataSet(); 
-			DataSet dsExpected = new DataSet();
-		
-			// create expected dataset to compare result to
-			ReadDBData_Fill(dbDA,ref dsExpected ,true);
-
-			//dsExpected.Tables.Remove(dsExpected.Tables[1]);
-
-			//execute FillSchema
-
-			dsResult.Tables.Add("Table");
-			DataTable[] dtArr = dbDA.FillSchema(dsResult,SchemaType.Mapped,dsResult.Tables[0].TableName);
-
-			//************  Fix .Net bug? (FillSchema method add AutoIncrement=true) *******************
-			dsResult.Tables[0].Columns["EmployeeID"].AutoIncrement = false;
-
-			CompareResults_Fill(dsResult,dsExpected);
-			Exception exp = null;
-			try {
-				BeginCase("Check return value - Table[0]");
-				Compare(dtArr[0],dsResult.Tables[0] );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-
-
-		private int ReadDBData_Fill(Sys.Data.Common.DbDataAdapter dbDA, ref DataSet ds, bool ReadSchemaOnly) {
-			int ExpectedRowsCount = 0;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IDataReader Idr;
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			ICmd.CommandText = "SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, Country, Extension, HomePhone  FROM Employees "  ;
-			IConn.Open();
-
-			//get db type
-			DBType = ConnectedDataProvider.GetDbType(((IDbDataAdapter)dbDA).SelectCommand.Connection.ConnectionString);
-
-			// Execute data Reader - Get Expected results
-			Idr = ICmd.ExecuteReader();
-
-			// create temp dataset to insert results
-			ExpectedRowsCount = DataReaderFill_Fill(ref ds,ref Idr,ReadSchemaOnly);
-			Idr.Close();
-			return ExpectedRowsCount;
-		}
-		private void CompareResults_Fill(DataSet dsResult,DataSet dsExpected ) {
-			Exception exp = null;
-
-			//			try
-			//			{
-			//				BeginCase("Compare Rows count");
-			//				// ???????   Fill return count for first table only    ??????
-			//				Compare(ExpectedRowsCount  ,ResultRowsCount );
-			//			}
-			//			catch(Exception ex)	{exp = ex;}
-			//			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("Compare data");
-				Compare(dsResult.GetXml() ,dsExpected.GetXml());
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("Compare schema");
-				Compare(dsResult.GetXmlSchema() ,dsExpected.GetXmlSchema());
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		private int DataReaderFill_Fill(ref DataSet dsExpected, ref IDataReader Idr,bool ReadSchemaOnly) {
-			bool blnNextResults;
-			int RowsAffected = 0;
-			object[] objArr = null;
-			DataTable SchemaTable = null;
-			do {
-				SchemaTable = Idr.GetSchemaTable();
-
-				//add new table with the right amount of columns, the first table must be named "Table"
-				if (dsExpected.Tables.Count == 0)
-					dsExpected.Tables.Add(new DataTable("Table"));
-				else
-					dsExpected.Tables.Add();
-				for (int i = 0 ; i < Idr.FieldCount; i++) {
-					dsExpected.Tables[dsExpected.Tables.Count-1].Columns.Add(new DataColumn(Idr.GetName(i),Idr.GetFieldType(i)));
-					if (ReadSchemaOnly) {	// add schema info
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].AllowDBNull = (bool)SchemaTable.Rows[i]["AllowDBNull"];
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].AutoIncrement = (bool)SchemaTable.Rows[i]["IsAutoIncrement"];
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].ReadOnly = (bool)SchemaTable.Rows[i]["IsReadOnly"];
-						dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].Unique = (bool)SchemaTable.Rows[i]["IsUnique"];
-						if (dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].DataType == typeof(string))
-							dsExpected.Tables[dsExpected.Tables.Count-1].Columns[i].MaxLength = (int)SchemaTable.Rows[i]["ColumnSize"];
-					}
-				}
-
-				if (!ReadSchemaOnly) {
-					//array that holds the current rows values
-					objArr = new object[Idr.FieldCount];
-
-					//fill the new table
-					while (Idr.Read()) {
-						Idr.GetValues(objArr);
-						//update existing row, if no row is found - add it as new row
-						dsExpected.Tables[dsExpected.Tables.Count-1].LoadDataRow(objArr,false);
-						RowsAffected++;
-					}
-				}
-
-				//get next record set 
-				blnNextResults = Idr.NextResult(); 
-			} 
-			while (blnNextResults);
-
-			// add primary key, fill method will update existing rows instead of insert new ones
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-			//if (ReadSchemaOnly)	dsExpected.Tables[1].PrimaryKey = new DataColumn[] {dsExpected.Tables[1].Columns["CustomerID"]};
-			dsExpected.AcceptChanges();
-
-			return RowsAffected;
-		
-		}
-
-		#endregion
-
-		#region " DBDataAdapter - FillError "
-		private bool blnReadDBData_Fill = false;
-
-		protected void DbDataAdapter_FillError(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers ";
-			IConn.Open();
-
-			DataSet ds = new DataSet();
-			ds.Tables.Add(new DataTable("Customers"));
-			ds.Tables[0].Columns.Add("CustomerID",typeof(byte));
-        
-			//check FillError event
-			dbDA.FillError += new FillErrorEventHandler(dbDA_FillError);
-			blnReadDBData_Fill = false;
-			try {
-				BeginCase("FillError");
-				try {
-					dbDA.Fill(ds,"Customers");
-				}
-				catch (Exception ){};
-				Compare(blnReadDBData_Fill ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dbDA.FillError -= new FillErrorEventHandler(dbDA_FillError);
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-		private void dbDA_FillError(object sender, FillErrorEventArgs args) {
-			blnReadDBData_Fill = true;
-			args.Continue = false;
-		}
-
-		#endregion
-
-		#region " DBDataAdapter - Update "
-		protected void DbDataAdapter_Update_Ds(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-		
-			//update expecteed dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-			//make changes to the DataBase (through the dataset)
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-			NumberOfAffectedRows = dbDA.Update(dsDB1);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Ds_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998).Delete();
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(dsDB1);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Ds_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-
-		
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-		}
-	
-
-		protected void DbDataAdapter_Update_Dt(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);			
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-
-			//update dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-		
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-			NumberOfAffectedRows = dbDA.Update(dsDB1.Tables[0]);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Dt_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998).Delete();
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(dsDB1.Tables[0]);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Dt_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-
-
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException.Tables[0]);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException.Tables[0]);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException.Tables[0]);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-		}
-
-
-		protected void DbDataAdapter_Update_Dr(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-
-			//update dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-		
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-		
-			DataRow[] drArr = new DataRow[dsDB1.Tables[0].Rows.Count] ;
-			dsDB1.Tables[0].Rows.CopyTo(drArr,0);
-			NumberOfAffectedRows = dbDA.Update(drArr);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Dr_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998)[1] = "Updated!";
-		
-			drArr = new DataRow[dsDB1.Tables[0].Rows.Count];
-			dsDB1.Tables[0].Rows.CopyTo(drArr,0);
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(drArr);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Dr_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-		
-			DataRow[] drArr = new DataRow[dsResultException.Tables[0].Rows.Count];
-		
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				dsResultException.Tables[0].Rows.CopyTo(drArr,0);
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(drArr);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				dsResultException.Tables[0].Rows.CopyTo(drArr,0);
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(drArr);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				dsResultException.Tables[0].Rows.CopyTo(drArr,0);
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(drArr);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-		}
-
-
-		protected void DbDataAdapter_Update_Ds_Str(Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-
-			// --------- get data from DB -----------------
-			DataSet ds = PrepareDBData_Update(dbDA);
-
-			// --------- prepare dataset for update method -----------------
-			DataSet dsDB1 = ds.Copy(); 
-		
-			// --------- prepare dataset for DBConcurrencyException -----------------
-			DataSet dsDB2 = ds.Copy(); 
-		
-			//update dataset
-			dsDB2.Tables[0].Rows.Add(new object[] {9994,"Ofer", "Borshtein", "Delete"});
-			dsDB2.Tables[0].Rows.Add(new object[] {9995,"Ofer", "Borshtein", "Update"});
-			dsDB2.Tables[0].Rows.Find(9996).Delete();
-			dsDB2.AcceptChanges();
-
-		
-			dsDB1.Tables[0].Rows.Add(new object[] {9991,"Ofer","Borshtein","Insert"});
-			dsDB1.Tables[0].Rows.Find(9992).Delete();
-			dsDB1.Tables[0].Rows.Find(9993)["Title"] = "Jack the ripper"; 
-
-			//execute update to db
-			NumberOfAffectedRows = dbDA.Update(dsDB1,dsDB1.Tables[0].TableName);
-		
-			try {
-				BeginCase("Number Of Affected Rows");
-				Compare(NumberOfAffectedRows ,3 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//get result from db in order to check them
-			DataSet dsExpected = new DataSet(); //ds.Reset();
-			dbDA.Fill(dsExpected);
-			dsExpected.Tables[0].PrimaryKey = new DataColumn[] {dsExpected.Tables[0].Columns["EmployeeID"]};
-
-			CompareResults_Update(dsDB1,dsDB2,ref dbDA);
-			CompareResults_Update_Ds_Str_Exception(dsDB2,ref dbDA);
-
-			//Create rows which not exists in the DB but exists in the DS with row state = deleted
-			//this will cause the Update to fail.
-			dsDB1.Tables[0].Rows.Add(new object[] {9997,"Ofer", "Borshtein", "Delete"});
-			dsDB1.Tables[0].Rows.Add(new object[] {9998,"Ofer", "Borshtein", "Delete"});
-			dsDB1.AcceptChanges();
-			dsDB1.Tables[0].Rows.Find(9997).Delete();
-			dsDB1.Tables[0].Rows.Find(9998).Delete();
-
-
-			//Check Sys.Data.DBConcurrencyException
-			//The exception that is thrown by the DataAdapter during the update operation if the number of rows affected equals zero.
-			try {
-				BeginCase("Check DBConcurrencyException");
-				try {
-					NumberOfAffectedRows = dbDA.Update(dsDB1,dsDB1.Tables[0].TableName);
-				}
-				catch (DBConcurrencyException ex) {exp=ex;}
-				Compare(exp.GetType(),typeof(DBConcurrencyException) );
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-
-		}
-
-		private void CompareResults_Update_Ds_Str_Exception(DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			int NumberOfAffectedRows = 0;
-			Exception exp = null;
-			Exception e = null;
-
-		
-			// --------- check for DBConcurrencyException /UniqueConstraint -----------------
-			//	call AcceptChanges after each exception check in order to make sure that we check only the the current row 
-
-
-			try {
-				BeginCase("DBConcurrencyException - Delete");
-				dsResultException.Tables[0].Rows.Find(9994).Delete();
-				//no row with row version delete exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException,dsResultException.Tables[0].TableName);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Delete Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-			try {
-				BeginCase("DBConcurrencyException - Update");
-				dsResultException.Tables[0].Rows.Find(9995)["Title"] = "Jack the ripper"; 
-				//no row with row version Update exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException,dsResultException.Tables[0].TableName);}
-				catch (DBConcurrencyException dbExp){e = dbExp;}
-				Compare(e.GetType(),typeof(DBConcurrencyException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Update Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-			try {
-				BeginCase("DBConcurrencyException - Insert");
-				dsResultException.Tables[0].Rows.Add(new object[] {9996,"Ofer","Borshtein","Insert"});
-				//no row with row version Insert exists - records affected = 0
-				NumberOfAffectedRows = -1;
-				try {NumberOfAffectedRows = dbDA.Update(dsResultException,dsResultException.Tables[0].TableName);}
-				catch (Exception dbExp){e = dbExp;} //throw Sys.Exception
-				Compare(e != null ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null; e = null;}
-			try {
-				BeginCase("Number Of Affected Rows - Insert Exception");
-				Compare(NumberOfAffectedRows ,-1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			dsResultException.AcceptChanges();
-
-
-		}
-
-		/*
-			* 
-			* insert/update the database with data that will be used in testings
-			* 
-			*/
-		protected void PrepareDataForTesting(string ConnectionString) {
-			int iExists = 0;
-			try {
-
-				//create database specific date value
-				string strBirthDateValue = "";
-				switch (ConnectedDataProvider.GetDbType(ConnectionString)) {
-					case DataBaseServer.DB2:
-						strBirthDateValue = "'1988-05-31-15.33.44'";
-						break;
-					case DataBaseServer.Oracle:
-						strBirthDateValue = "to_date('1988-05-31 15:33:44', 'yyyy-mm-dd HH24:mi:ss')";
-						break;
-					case DataBaseServer.PostgreSQL:
-						strBirthDateValue = "to_timestamp('1988-05-31 15:33:44', 'yyyy-mm-dd HH24:mi:ss')";
-						break;
-					case DataBaseServer.SQLServer:
-					case DataBaseServer.Sybase:
-						strBirthDateValue = "'1988-May-31 15:33:44'";
-						break;
-				}
-				OleDbConnection con = new OleDbConnection(ConnectionString);
-				try {
-					con.Open();
-				}
-				catch (Exception ex) {
-					throw new Exception("PrepareDataForTesting failed trying to connect to DB using Connection string:" + ConnectionString + "\nException:" +  ex.ToString(),ex);
-				}
-
-				OleDbCommand cmd = new OleDbCommand("",con);
-
-				//update / insert to table Employees
-				for (int i = 100; i <= 700; i +=100) {
-					cmd.CommandText = "select 1 from Employees where EmployeeID = " + i.ToString();
-					iExists =  Sys.Convert.ToInt32(cmd.ExecuteScalar());
-					if (iExists != 1) {
-						cmd.CommandText = "insert into Employees (EmployeeID, LastName, FirstName, Title, BirthDate) " + 
-							" Values (" + i.ToString() + 
-							",'Last" + i.ToString() 
-							+ "','First" + i.ToString() 
-							+ "', null, " 
-							+ strBirthDateValue + ")";
-						cmd.ExecuteNonQuery();
-					}
-					else {
-						cmd.CommandText = "update Employees set " 
-							+ " LastName = 'Last" + i.ToString() 
-							+ "', FirstName = 'First" + i.ToString() 
-							+ "', Title = null, BirthDate = " 
-							+ strBirthDateValue 
-							+ " where EmployeeID = " + i.ToString() ;
-						Log(cmd.CommandText);
-						cmd.ExecuteNonQuery();
-					}
-				}
-
-				//update / insert to table Customers
-				for (int i = 100; i <= 700; i +=100) {
-					cmd.CommandText = "select 1 from Customers where CustomerID = 'GH" + i.ToString() + "'";
-					iExists =  Sys.Convert.ToInt32(cmd.ExecuteScalar());
-					if (iExists != 1) {
-						cmd.CommandText = "insert into Customers (CustomerID , CompanyName, Phone) Values ('GH" + i.ToString() + "','Company" + i.ToString() + "','00-" + i.ToString() + i.ToString() + "')";
-						cmd.ExecuteNonQuery();
-					}
-					else {
-						cmd.CommandText = "update Customers set CompanyName = 'Company" + i.ToString() + "', Phone = '00-" + i.ToString() + i.ToString() + "' where CustomerID = 'GH" + i.ToString() + "'";
-						cmd.ExecuteNonQuery();
-					}
-				}
-
-				cmd.CommandText = "select 1 from Customers where CustomerID = 'GH200'";
-				iExists =  Sys.Convert.ToInt32(cmd.ExecuteScalar());
-				if (iExists != 1) {
-					cmd.CommandText = "insert into Customers (CustomerID , CompanyName) Values ('GH200','Company200')";
-					cmd.ExecuteNonQuery();
-				}
-				else {
-					cmd.CommandText = "update Customers set CompanyName = 'Company200' where CustomerID = 'GH200'";
-					cmd.ExecuteNonQuery();
-				}
-
-				con.Close();
-			}
-			catch (Exception ex) {
-				throw new Exception("PrepareDataForTesting failed with exception:" + ex.ToString(),ex);
-			}
-		}
-
-		/*
-		*	used to insert data to the database in order to check DataAdapter Update metods 
-		*/
-		protected DataSet PrepareDBData_Update(Sys.Data.Common.DbDataAdapter dbDA) {
-			return PrepareDBData_Update(dbDA,false); 
-
-		}
-		protected DataSet PrepareDBData_Update(Sys.Data.Common.DbDataAdapter dbDA,bool sqlConnectionString) {
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand;
-			ICmd.CommandText = "SELECT EmployeeID, LastName, FirstName, Title FROM Employees WHERE EmployeeID in (9991,9992,9993,9994,9995,9996)";  
-			IDbConnection IConn = ICmd.Connection; 
-			if (!sqlConnectionString) {
-				IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			IConn.Open();
-					
-			//Insert rows to be updated (insert,delete,update)
-			IDbCommand cmd;
-			if (sqlConnectionString) {
-				cmd = new Sys.Data.SqlClient.SqlCommand();
-				cmd.Connection = (Sys.Data.SqlClient.SqlConnection)IConn; 
-			}
-			else {
-				cmd = new Sys.Data.OleDb.OleDbCommand();
-				cmd.Connection = (Sys.Data.OleDb.OleDbConnection)IConn;
-			}
-
-
-			//run execute after each command because DB2 doesn't support multiple commands
-			cmd.CommandText =  "DELETE FROM Employees WHERE EmployeeID in (9991,9992,9993,9994,9995,9996,9997,9998)";
-			cmd.ExecuteNonQuery();
-
-			//only for SQL Server
-			DataBaseServer DBType =  ConnectedDataProvider.GetDbType(IConn.ConnectionString);
-
-			cmd.CommandText = "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9992, 'Ofer', 'Borshtein', 'delete')";
-			//if (DBType == DataBaseServer.SQLServer) cmd.CommandText = "SET IDENTITY_INSERT Employees ON;" + cmd.CommandText;
-			cmd.ExecuteNonQuery();
-			cmd.CommandText = "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9993, 'Ofer', 'Borshtein', 'Update')";
-			//if (DBType == DataBaseServer.SQLServer) cmd.CommandText = "SET IDENTITY_INSERT Employees ON;" + cmd.CommandText;
-			cmd.ExecuteNonQuery();
-			cmd.CommandText = "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9996, 'Ofer', 'Borshtein', 'Exp')";
-			//if (DBType == DataBaseServer.SQLServer) cmd.CommandText = "SET IDENTITY_INSERT Employees ON;" + cmd.CommandText;
-			cmd.ExecuteNonQuery();
-
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9991, 'Ofer', 'Borshtein', 'Insert'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9994, 'Ofer', 'Borshtein', 'Exp'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9995, 'Ofer', 'Borshtein', 'Exp'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9997, 'Ofer', 'Borshtein', 'delete'); ";
-			//cmd.CommandText += "INSERT INTO Employees (EmployeeID, LastName, FirstName, Title) VALUES(9998, 'Ofer', 'Borshtein', 'delete'); ";
-
-			DataSet ds = new DataSet();
-			dbDA.Fill(ds);
-			ds.Tables[0].PrimaryKey = new DataColumn[] {ds.Tables[0].Columns["EmployeeID"]};
-			return ds;
-
-		}
-
-
-		private void CompareResults_Update(DataSet dsResult,DataSet dsResultException,ref Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-		
-			//----------------- Compare dsDB with dsExcepted -----------------
-			try {
-				BeginCase("Insert Row ");
-				Compare(dsResult.Tables[0].Rows.Find(9991) == null ,false );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("Update Row ");
-				Compare(dsResult.Tables[0].Rows.Find(9993)["Title"],"Jack the ripper");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			try {
-				BeginCase("Delete Row ");
-				Compare(dsResult.Tables[0].Rows.Find(9992) ,null);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}			
-
-		}
-
-		#endregion
-
-		protected void DBDataAdapter_DefaultSourceTableName() {
-			Exception exp = null;
-			try {
-				BeginCase("DefaultSourceTableName");
-				Compare(Sys.Data.Common.DbDataAdapter.DefaultSourceTableName , "Table");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		#endregion
-
-		#region "-----------  Sys.Data.Common.DataAdapter --------------"
-		protected void DataAdapter_AcceptChangesDuringFill(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			IConn.Open();
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			//get the total rows count
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-			DataSet ds = new DataSet();
-			dbDA.AcceptChangesDuringFill = false;
-
-        
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(ds);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-				
-
-			bool blnAcceptChanges = false;
-
-			foreach (DataRow dr in ds.Tables[0].Rows) {
-				if (dr.RowState != DataRowState.Added ) {
-					blnAcceptChanges = true;
-					break;
-				}
-			}
-			try {
-				BeginCase("AcceptChangesDuringFill - false");
-				Compare(blnAcceptChanges ,false );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ds.Reset();
-			dbDA.AcceptChangesDuringFill = true;
-			dbDA.Fill(ds);
-			blnAcceptChanges = false;            			
-			foreach (DataRow dr in ds.Tables[0].Rows) {
-				if (dr.RowState != DataRowState.Unchanged ) {
-					blnAcceptChanges = true;
-					break;
-				}
-			}
-			try {
-				BeginCase("AcceptChangesDuringFill - true");
-				Compare(blnAcceptChanges ,false );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-		}
-
-		protected void DataAdapter_ContinueUpdateOnError(Sys.Data.Common.DbDataAdapter dbDA) {
-			/*
-				!!!!!! Not working (TestName "ContinueUpdateOnError - true, check value 2")!!!!!
-				If ContinueUpdateOnError is set to true, no exception is thrown when an error occurs during the update of a row. 
-				The update of the row is skipped and the error information is placed in the RowError property of the row in error. 
-				The DataAdapter continues to update subsequent rows.
-				If ContinueUpdateOnError is set to false, an exception is thrown when an error occurs during the update of a row.
-			*/
-			Exception exp = null;
-
-	
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			IConn.Open();
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			//get the total rows count
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-
-			DataSet dsMem = new DataSet();	//Disconected dataset
-			DataSet dsDB = new DataSet();	//DataBase data
-			dbDA.AcceptChangesDuringFill = true;
-			//get data from DB
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(dsMem);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-
-			//update data with invalid information (Max. length for Phone is 24)
-			//					123456789012345678901234
-			string newValue1 = "Very Long String That Will Raise An Error Yep!";
-			string oldValue1 = dsMem.Tables[0].Rows[3]["Phone"].ToString();
-			string oldValue2 = dsMem.Tables[0].Rows[4]["Phone"].ToString();
-			string newValue2 = "03-1234";
-
-
-			dsMem.Tables[0].Rows[3]["Phone"] = newValue1;
-			dsMem.Tables[0].Rows[4]["Phone"] = newValue2;
-			dbDA.ContinueUpdateOnError = true;
-        
-			//will not throw exception
-			try {
-				BeginCase("ContinueUpdateOnError - true, check exception");
-				try {
-					dbDA.Update(dsMem);
-				}
-				catch(Exception ex){exp = ex;}
-				Compare(exp == null,true);
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			dbDA.Fill(dsDB); //get data from DB to check the update operation
-
-			try {
-				BeginCase("ContinueUpdateOnError - true, check RowError");
-				Compare(dsMem.Tables[0].Rows[3].RowError.Length > 0 , true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("ContinueUpdateOnError - true, check value 1");
-				Compare(dsDB.Tables[0].Rows[3]["Phone"] , oldValue1);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-
-			/*		- Test excluded, it is not working in .NET too!
-					//should continue the update
-					try
-					{
-						BeginCase("ContinueUpdateOnError - true, check value 2");
-						Compare(dsDB.Tables[0].Rows[4]["Phone"] , newValue2);  //--------- NOT WORKING !!! -----------
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-			*/
-			dsMem.Reset();
-			dsDB.Reset();
-			dbDA.Fill(dsMem);
-			dsMem.Tables[0].Rows[3]["Phone"] = newValue1 ;
-			dsMem.Tables[0].Rows[4]["Phone"] = newValue2;
-			dbDA.ContinueUpdateOnError = false;
-        
-			try {
-				BeginCase("ContinueUpdateOnError - false, check exception");
-				try {
-					dbDA.Update(dsMem);
-				}
-				catch(Exception ex){exp = ex;}
-				Compare(exp == null,false);
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			dbDA.Fill(dsDB); //get data from DB to check the update operation
-			try {
-				BeginCase("ContinueUpdateOnError - false,check RowError");
-				Compare(dsMem.Tables[0].Rows[3].RowError.Length > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try {
-				BeginCase("ContinueUpdateOnError - false,check value 1");
-				Compare(dsDB.Tables[0].Rows[3]["Phone"] , oldValue1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-
-			try {
-				BeginCase("ContinueUpdateOnError - false,check value 2");
-				Compare(dsDB.Tables[0].Rows[4]["Phone"] , oldValue2 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-
-		}
-		protected void DataAdapter_MissingMappingAction(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-
-			IConn.Open();
-
-			//get the total rows count
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-
-			//init dataset
-			DataSet ds = new DataSet();
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(ds);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			//make dataset schema mismatch with DB
-			ds.Tables[0].Columns.Remove("Country");
-			ds.Tables[0].Clear();
-        
-			//--- Default value ---
-        
-			try {
-				BeginCase("MissingMappingAction Default value");
-				Compare(dbDA.MissingMappingAction , MissingMappingAction.Passthrough);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-			//--- MissingMappingAction.Error ---
-			ds.Tables[0].Clear();
-			dbDA.MissingMappingAction  = MissingMappingAction.Error ;
-			Exception ExMissingMappingAction = null;
-			try {
-				BeginCase("MissingMappingAction.Error");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingMappingAction = e;
-				}
-				Compare(ExMissingMappingAction.GetType() ,typeof(InvalidOperationException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Error, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count , 0 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Error, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//--- MissingMappingAction.Ignore ---
-			ds.Tables[0].Clear();
-			dbDA.MissingMappingAction  = MissingMappingAction.Ignore  ;
-			ExMissingMappingAction = null;
-			try {
-				BeginCase("MissingMappingAction.Ignore");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingMappingAction = e;
-				}
-				Compare(ExMissingMappingAction ,null);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Ignore, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count ,0);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Ignore, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//--- MissingMappingAction.Passthrough ---
-			ds.Tables[0].Clear();
-			dbDA.MissingMappingAction  = MissingMappingAction.Passthrough   ;
-			ExMissingMappingAction = null;
-			try {
-				BeginCase("MissingMappingAction.Passthrough");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingMappingAction = e;
-				}
-				Compare(ExMissingMappingAction ,null);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Passthrough, Row.Count > 0");
-				Compare(ds.Tables[0].Rows.Count >= 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingMappingAction.Passthrough, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country") >= 0  ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-		protected void DataAdapter_MissingSchemaAction(Sys.Data.Common.DbDataAdapter dbDA) {
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			IConn.Open();
-
-			PrepareDataForTesting( MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			//get the total rows count
-			ICmd.CommandText = "SELECT Count(*) FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			int ExpectedRows = Sys.Convert.ToInt32(ICmd.ExecuteScalar());
-			try {
-				BeginCase("Check that Expected rows count > 0");
-				Compare(ExpectedRows > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-
-			//get db type
-			DBType = ConnectedDataProvider.GetDbType(((IDbDataAdapter)dbDA).SelectCommand.Connection.ConnectionString);
-
-			//init dataset
-			DataSet ds = new DataSet();
-			try {
-				BeginCase("Execute Fill - check return rows count");
-				int i = dbDA.Fill(ds);
-				Compare(i ,ExpectedRows );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//make dataset schema mismatch with DB
-			ds.Tables[0].Columns.Remove("Country");
-			ds.Tables[0].Clear();
-        
-
-			//--- Default value ---
-        
-			try {
-				BeginCase("MissingSchemaAction Default value");
-				Compare(dbDA.MissingSchemaAction, MissingSchemaAction.Add);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-			//--- MissingSchemaAction.Error ---
-			ds.Tables[0].Clear();
-			dbDA.MissingSchemaAction  = MissingSchemaAction.Error  ;
-			Exception ExMissingSchemaAction = null;
-			try {
-				BeginCase("MissingSchemaAction.Error");
-				try {
-					dbDA.Fill(ds);
-				}
-				catch (InvalidOperationException e) {
-					ExMissingSchemaAction = e;
-				}
-				Compare(ExMissingSchemaAction.GetType() ,typeof(InvalidOperationException));
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Error, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count , 0 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Error, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-	
-
-			//--- MissingSchemaAction.Ignore ---
-			try {
-				//catch any exception that might occure 
-				BeginCase("MissingSchemaAction.Ignore - invoke");
-				ds.Tables[0].Clear();
-				dbDA.MissingSchemaAction  = MissingSchemaAction.Ignore  ;
-				ExMissingSchemaAction = null;
-				dbDA.Fill(ds);
-				Compare(true ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Ignore, Row.Count = 0");
-				Compare(ds.Tables[0].Rows.Count > 0 ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Ignore, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country")  , -1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-#if !KNOWN_BUG //BUG_NUM:1951
-			try {
-				BeginCase("MissingSchemaAction.Ignore, PrimaryKey");
-				Compare(ds.Tables[0].PrimaryKey.Length == 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-#endif
-
-			//--- MissingSchemaAction.Add ---
-			try {
-				//catch any exception that might occure 
-				BeginCase("MissingSchemaAction.Add - invoke");
-				ds.Tables[0].Clear();
-				dbDA.MissingSchemaAction  = MissingSchemaAction.Add   ;
-				ExMissingSchemaAction = null;
-				dbDA.Fill(ds);
-				Compare(true ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Add, Row.Count > 0");
-				Compare(ds.Tables[0].Rows.Count >= 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.Add, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country") >= 0  ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-#if !KNOWN_BUG //BUG_NUM:1952
-			//DB2 don't return primary key
-			if (DBType != DataBaseServer.DB2) {
-				try {
-					BeginCase("MissingSchemaAction.AddWithKey, PrimaryKey");
-					Compare(ds.Tables[0].PrimaryKey.Length  ,0);
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-			}
-
-			//--- MissingSchemaAction.AddWithKey ---
-			try {
-				//catch any exception that might occure 
-				BeginCase("MissingSchemaAction.AddWithKey - invoke");
-				ds.Tables[0].Clear();
-				ds.Tables[0].Columns.Remove("Country");
-				dbDA.MissingSchemaAction  = MissingSchemaAction.AddWithKey    ;
-				ExMissingSchemaAction = null;
-				dbDA.Fill(ds);
-				Compare(true ,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.AddWithKey, Row.Count > 0");
-				Compare(ds.Tables[0].Rows.Count >= 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try {
-				BeginCase("MissingSchemaAction.AddWithKey, Column");
-				Compare(ds.Tables[0].Columns.IndexOf("Country") >= 0  ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//DB2 don't return primary key
-			if (DBType != DataBaseServer.DB2 &&
-				DBType != DataBaseServer.Oracle) {
-				try {
-					BeginCase("MissingSchemaAction.AddWithKey, PrimaryKey");
-					Compare(ds.Tables[0].PrimaryKey.Length > 0 ,true );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-			}
-#endif
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-		#endregion
-
-		public override void BeginTest(string testName) {
-			base.BeginTest (testName);
-			Log(String.Format("DataBase Type is {0}", ConnectedDataProvider.GetDbType()));
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
deleted file mode 100755
index a91f79d2b9b..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/ConnectedDataProvider.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Oren Gurfinkel   <oreng@mainsoft.com>
-//   Ofer Borstein
-// 
-// Copyright (c) 2004 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-using System.IO;
-using System.Collections;
-using Sys = System;
-using MonoTests.System.Data.Utils.Data;
-
-// Provide All Data required by the diffderent tests e.g.DataTable, DataRow ...
-namespace MonoTests.System.Data.Utils {
-	/// <summary>
-	/// Types of Database Servers that tests can be run on.
-	/// </summary>
-	public enum DataBaseServer {
-		SQLServer,
-		Oracle,
-		DB2,
-		Sybase,
-		PostgreSQL,
-		Unknown
-	}
-
-	public class ConnectedDataProvider {
-
-		#region Private
-		//A string containing all printable charachters.
-		private const string SAMPLE_STRING = "abcdefghijklmnopqrstuvwxyz1234567890~!@#$%^&*()_+-=[]\\|;:,./<>? ";
-		#endregion
-
-		#region Public
-		/// <summary>
-		/// Name of the table in the database, that contain columns of simple types.
-		/// </summary>
-		public const string SIMPLE_TYPES_TABLE_NAME = "TYPES_SIMPLE";
-		/// <summary>
-		/// Name of the table in the database, that contain columns of extended types.
-		/// </summary>
-		public const string EXTENDED_TYPES_TABLE_NAME = "TYPES_EXTENDED";
-		/// <summary>
-		/// Name of the table in the database, that contain columns of DB specific types.
-		/// </summary>
-		public const string SPECIFIC_TYPES_TABLE_NAME = "TYPES_SPECIFIC";
-		#endregion
-
-		public static string ConnectionString {
-			get {
-				return Sys.Configuration.ConfigurationSettings.AppSettings["ConnectionString"];
-			}
-		}
-
-		//	SQLClient does not allow to use the Provider token
-		//	since Provider is always the first parameter(in GHT framework),
-		//	we trim it.
-		public static string ConnectionStringSQLClient {
-			get {
-				return ConnectionString.Substring(ConnectionString.IndexOf(";"));
-			}
-		}
-	
-
-		/// <summary>
-		/// Resolves the type of DB server specified by the "ADOConString.txt" file.
-		/// </summary>
-		/// <returns>The type of DB server specified by the "ADOConString.txt" file.</returns>
-		public static DataBaseServer GetDbType() {
-			return ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString);
-		}
-		
-		/// <summary>
-		/// Resolves the type of DB server that the specified connection refers.
-		/// </summary>
-		/// <param name="OleCon">A valid connection object to a DataBase.</param>
-		/// <returns>The type of DB server that the specified connection refers to.</returns>
-		public static DataBaseServer GetDbType(Sys.Data.OleDb.OleDbConnection OleCon) {
-			return ConnectedDataProvider.GetDbType(OleCon.ConnectionString);
-		}
-
-		/// <summary>
-		/// Resolves the type of DB server that the specified connection string refers.
-		/// </summary>
-		/// <param name="ConnectionString">A valid connection string to a DataBase server.</param>
-		/// <returns>The type of DB server that the specified connection string refers to.</returns>
-		public static DataBaseServer GetDbType(string ConnectionString) {
-			if (ConnectionString.ToUpper().IndexOf("PROVIDER=SQLOLEDB") >= 0) return DataBaseServer.SQLServer ;
-			if (ConnectionString.ToUpper().IndexOf("SYBASE") >= 0) return DataBaseServer.Sybase ;
-			if (ConnectionString.ToUpper().IndexOf("PROVIDER=MSDAORA") >= 0) return DataBaseServer.Oracle;
-			if (ConnectionString.ToUpper().IndexOf("PROVIDER=IBMDADB2") >= 0) return DataBaseServer.DB2;
-			if (ConnectionString.ToUpper().IndexOf("POSTGRESQL") >= 0) return DataBaseServer.PostgreSQL;
-			return DataBaseServer.Unknown ;
-		}
-
-		/// <summary>
-		/// Creates a DbTypeParametersCollection with default types and data for the TYPES_SIMPLE table.
-		/// </summary>
-		/// <returns>The initialized DbTypeParametersCollection</returns>
-		public static DbTypeParametersCollection GetSimpleDbTypesParameters() {
-			DbTypeParametersCollection row = new DbTypeParametersCollection(SIMPLE_TYPES_TABLE_NAME);
-			switch (ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString)) {
-					#region SQLServer
-				case MonoTests.System.Data.Utils.DataBaseServer.SQLServer:
-					row.Add("bit", true, 1);
-					row.Add("tinyint", (byte)25, 1);
-					row.Add("smallint", (Int16)77, 2);
-					row.Add("int", (Int32)2525, 4);
-					row.Add("bigint", (Int64)25251414, 8);
-					row.Add("decimal", 10M, 9);	//(Decimal)10
-					row.Add("numeric", 123123M, 9); //(Decimal)123123
-					row.Add("float", 17.1414257, 8);
-					row.Add("real", (float)0.71425, 4);
-					row.Add("char", "abcdefghij", 10);
-					row.Add("nchar", "klmnopqrst", 10);
-					row.Add("varchar", "qwertasdfg", 50);
-					row.Add("nvarchar", "qwertasdfg", 50);
-					break;
-					#endregion
-
-					#region Sybase
-				case MonoTests.System.Data.Utils.DataBaseServer.Sybase:
-					//row.Add("BIT", true, 1);
-					row.Add("TINYINT", (byte)25, 1);
-					row.Add("SMALLINT", (Int16)77, 2);
-					row.Add("INT", (Int32)2525, 4);
-					//row.Add("BIGINT", (Int64)25251414, 8);
-					row.Add("DECIMAL", 10M, 9);	//(Decimal)10
-					row.Add("NUMERIC", 123123M, 9); //(Decimal)123123
-					row.Add("FLOAT", 17.1414257, 8);
-					row.Add("REAL", (float)0.71425, 4);
-					row.Add("CHAR", "abcdefghij", 10);
-					row.Add("NCHAR", "klmnopqrst", 10);
-					row.Add("VARCHAR", "qwertasdfg", 50);
-					row.Add("NVARCHAR", "qwertasdfg", 50);
-					break;
-					#endregion
-
-					#region ORACLE
-				case MonoTests.System.Data.Utils.DataBaseServer.Oracle:
-					row.Add("NUMBER", 21M, 22);	//(Decimal)21
-					row.Add("LONG", SAMPLE_STRING, 2147483647);	//Default data type in .NET is system.String.
-					row.Add("FLOAT", 1.234, 22);
-					row.Add("VARCHAR", "qwertasdfg", 10);
-					row.Add("NVARCHAR", "qwertasdfg", 20);
-					row.Add("CHAR", "abcdefghij", 10);
-					row.Add("NCHAR", "abcdefghij", 10);
-					break;
-					#endregion
-
-					#region DB2
-				case MonoTests.System.Data.Utils.DataBaseServer.DB2:
-					row.Add("SMALLINT", (Int16)2, 2);
-					row.Add("INTEGER", 7777, 4);
-					row.Add("BIGINT", (Int64)21767267, 8);
-					row.Add("DECIMAL", 123M, 9); //(decimal)123
-					row.Add("REAL", (float)0.7, 4);
-					row.Add("DOUBLE", 1.7, 8);
-					row.Add("CHARACTER", "abcdefghij", 10);
-					row.Add("VARCHAR", "qwertasdfg", 10);
-					row.Add("LONGVARCHAR", SAMPLE_STRING, 32000);
-					break;
-					#endregion
-
-					#region PostgreSQL
-				case MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL:
-					
-					// PostgreSQL ODBC Type BOOL returns String with value "1" 
-					// so we don't run it on .NET
-					//					if (!GHTEnvironment.IsJavaRunTime())
-					//					{
-					//						row.Add("BOOL", "1", 1);
-					//					}
-					//					else
-					//					{
-					row.Add("BOOL", (bool)true, 1);
-					//					}
-
-					row.Add("INT2", (Int16)21, 2);
-					row.Add("INT4", (Int32)30000, 4);
-					row.Add("INT8", (Int64)30001, 8);
-					row.Add("NUMERIC", (decimal)100000M, 10); //(decimal)100000
-					row.Add("FLOAT4", (Single)7.23157, 4);
-					row.Add("FLOAT8", (Double)7.123456, 8);
-					row.Add("VARCHAR", "qwertasdfg", 10);
-					row.Add("CHAR", "abcdefghij", 10);
-					row.Add("NCHAR", "klmnopqrst", 10);
-					break;
-					#endregion
-			}
-			return row;
-		}
-		/// <summary>
-		/// Creates a DbTypeParametersCollection with default types and data for the TYPES_EXTENDED table.
-		/// </summary>
-		/// <returns>The initialized DbTypeParametersCollection</returns>
-		public static DbTypeParametersCollection GetExtendedDbTypesParameters() {
-			DbTypeParametersCollection row = new DbTypeParametersCollection(EXTENDED_TYPES_TABLE_NAME);
-			switch (ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString)) {
-					#region SQLServer
-				case MonoTests.System.Data.Utils.DataBaseServer.SQLServer:
-					row.Add("text", SAMPLE_STRING, 16);
-					row.Add("ntext", SAMPLE_STRING, 16);
-					row.Add("binary", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("varbinary", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("datetime", new DateTime(2004, 8, 9, 20, 30, 15, 500), 8);
-					row.Add("smalldatetime", new DateTime(2004, 8, 9, 20, 30, 00), 4);
-					break;
-					#endregion
-
-					#region Sybase
-				case MonoTests.System.Data.Utils.DataBaseServer.Sybase:
-					row.Add("TEXT", SAMPLE_STRING, 16);
-					//There is probably a bug in the jdbc driver , we've tried to insert this string using
-					//sybase command tool and it gave the same result (3850)
-					row.Add("NTEXT", SAMPLE_STRING.Trim() , 16);
-					row.Add("BINARY", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("VARBINARY", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-														0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("DATETIME", new DateTime(2004, 8, 9, 20, 30, 15, 500), 8);
-					row.Add("SMALLDATETIME", new DateTime(2004, 8, 9, 20, 30, 00), 4);
-					break;
-					#endregion
-
-					#region ORACLE
-				case MonoTests.System.Data.Utils.DataBaseServer.Oracle:
-					row.Add("RAW", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 10);
-					row.Add("LONGRAW", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-														,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													}, 100);
-					row.Add("DATE", new DateTime(2004, 8, 9, 20, 30, 15), 7);
-					
-					// The .NET Framework provides support for Oracle LOBs in the OracleClient namespace, but not in the OleDb namespace.
-					// Since Visual MainWin does not support the OracleClient namespace, a partial support for this important feature is provided in the OleDb namespace.
-					// See ms-help://MS.VSCC.2003/VMW.GH.1033/ghdoc/vmwdoc_ADONET_data_access_limitations_51.htm
-#if TARGET_JVM
-
-					row.Add("BLOB", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-												}, 4000);
-					row.Add("CLOB",	SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						, 4000);
-					row.Add("NCLOB", SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						, 4000);
-#endif
-					break;
-					#endregion
-
-					#region DB2
-				case MonoTests.System.Data.Utils.DataBaseServer.DB2:
-					row.Add("DATE", new DateTime(2004, 8, 9, 20, 30, 15, 500).Date);
-					row.Add("TIME", new TimeSpan(20, 30, 15));
-					row.Add("TIMESTAMP", new DateTime(2004, 8, 9, 20, 30, 15, 500));
-					row.Add("BLOB", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-													,0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0
-												});
-					row.Add("CLOB", SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						);
-					row.Add("DBCLOB", SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						+ SAMPLE_STRING
-						);
-					break;
-					#endregion
-
-					#region PostgreSQL
-				case MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL:
-					row.Add("BYTEA", new byte[]	{0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0,
-													0x00, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF, 0xF0}, 50);
-					row.Add("DATE", new DateTime(2004, 8, 9));
-					row.Add("TEXT", "abcdefg", 16); 
-					row.Add("TIME", new Sys.TimeSpan(02,02,02));
-					row.Add("TIMESTAMP", new DateTime(2004, 8, 9, 20, 30, 15, 500), 8);
-					break;
-					#endregion
-
-			}
-			return row;
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/DbTypeParameter.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/DbTypeParameter.cs
deleted file mode 100755
index ce993ac9bb4..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/DbTypeParameter.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-namespace MonoTests.System.Data.Utils.Data
-{
-	/// <summary>
-	/// Represents a parameter type for use in tests of System.Data.
-	/// </summary>
-	public class DbTypeParameter
-	{
-		#region Members
-		//Name of the Database type of this parameter.
-		private string m_sDbTypeName;
-		//Value of this parameter.
-		private object m_oValue;
-		//Size of this parameter.
-		private int m_iSize;
-		//Indicates wheather the size of this DbTypeParameter was initialized.
-		private bool m_bIsSizeSet = false;
-		#endregion
-
-		#region Constructors
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public DbTypeParameter()
-		{
-		}
-
-		/// <summary>
-		/// Constructor, Initializes the DbTypeParameter's properties according to specified values.
-		/// </summary>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		public DbTypeParameter(string a_sTypeName, object a_oValue)
-		{
-			DbTypeName = a_sTypeName;
-			Value = a_oValue;
-		}
-		/// <summary>
-		/// Constructor, Initializes the DbTypeParameter's properties according to specified values.
-		/// </summary>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		/// <param name="a_iSize">Specifies the initial size for the DbTypeParameter.</param>
-		public DbTypeParameter(string a_sTypeName, object a_oValue, int a_iSize)
-		{
-			DbTypeName = a_sTypeName;
-			Value = a_oValue;
-			Size = a_iSize;
-		}
-		#endregion
-
-		#region Properties
-		public string DbColumnName
-		{
-			get
-			{
-				return string.Format("T_{0}", m_sDbTypeName);
-			}
-		}
-
-		public string ParameterName
-		{
-			get
-			{
-				return String.Format("@T_{0}", m_sDbTypeName);
-			}
-		}
-		public string DbTypeName
-		{
-			get
-			{
-				return m_sDbTypeName;
-			}
-			set
-			{
-				m_sDbTypeName = value;
-			}
-		}
-
-		public object Value
-		{
-			get
-			{
-				return m_oValue;
-			}
-			set
-			{
-				m_oValue = value;
-			}
-		}
-
-		public int Size
-		{
-			get
-			{
-				if (IsSizeSet)
-				{
-					return m_iSize;
-				}
-				else
-				{
-					throw new InvalidOperationException("DbTypeParameter size was not set.");
-				}
-			}
-			set
-			{
-				m_iSize = value;
-				m_bIsSizeSet = true;
-			}
-		}
-		public bool IsSizeSet
-		{
-			get
-			{
-				return m_bIsSizeSet;
-			}
-		}
-		public DbType DbType
-		{
-			get
-			{
-				return GetDefaultDbType(DbTypeName);
-			}
-		}
-		#endregion
-
-		#region Methods
-		public static DbType GetDefaultDbType(string dbTypeName)
-		{
-			switch (dbTypeName.ToUpper())
-			{
-				case "BIT":	//SQLServer.
-					return DbType.Boolean;
-				case "TINYINT":	//SQLServer.
-					return DbType.Byte;
-				case "SMALLINT":	//SQLServer & DB2.
-					return DbType.Int16;
-				case "INT":	//SQLServer.
-					return DbType.Int32;
-				case "INTEGER": //DB2
-					return DbType.Int32;
-				case "BIGINT":	//MSSQLServer &DB2
-					return DbType.Int64;
-				case "NUMERIC": //MSSQLServer.
-					return DbType.Decimal;
-				case "NUMBER": //Oracle.
-					return DbType.VarNumeric;
-			case "DECIMAL":	//MSSQLServer & DB2
-				return DbType.Decimal;
-				case "FLOAT":	//MSSQLServer & Oracle
-						return DbType.Double;
-				case "REAL": //MSSQLServer & DB2
-					return DbType.Single;
-				case "DOUBLE":
-					return DbType.Double;
-				case "CHAR":	//MSSQLServer & Oracle.
-					return DbType.AnsiStringFixedLength;
-				case "NCHAR": //MSSQLServer & Oracle.
-					return DbType.AnsiStringFixedLength;
-				case "VARCHAR": //MSSQLServer, Oracle & DB2.
-					return DbType.AnsiString;
-				case "NVARCHAR": //MSSQLServer & Oracle.
-					return DbType.AnsiString;
-				case "CHARACTER": //DB2
-					return DbType.AnsiStringFixedLength;
-				case "LONGVARCHAR": //DB2
-					return DbType.String;
-				case "LONG":	//Oracle.
-					return DbType.AnsiString;
-				default:
-					throw new ApplicationException(string.Format("Dont know the default DbType for {0}.", dbTypeName));
-			}
-		}
-		public object ApplyDefaultDataTransformation()
-		{
-			if (Value == DBNull.Value)
-			{
-				return DBNull.Value;
-			}
-			else if (Value.GetType() == typeof(bool))
-			{
-				return DefaultBooleanTransformation((bool)Value);
-			}
-			else if (Value.GetType() == typeof(byte))
-			{
-				return DefaultByteTransformation((byte)Value);
-			}
-			else if (Value.GetType() == typeof(Int16))
-			{
-				return DefaultInt16Transformation((Int16)Value);
-			}
-			else if (Value.GetType() == typeof(int))
-			{
-				return DefaultIntTransformation((int)Value);
-			}
-			else if (Value.GetType() == typeof(Int64))
-			{
-				return DefaultInt64Transformation((Int64)Value);
-			}
-			else if (Value.GetType() == typeof(decimal))
-			{
-				return DefaultDecimalTransformation((decimal)Value);
-			}
-			else if (Value.GetType() == typeof(double))
-			{
-				return DefaultDoubleTransformation((double)Value);
-			}
-			else if (Value.GetType() == typeof(float))
-			{
-				return DefaultFloatTransformation((float)Value);
-			}
-			else if (Value.GetType() == typeof(string))
-			{
-				return DefaultStringTransformation((string)Value);
-			}
-			else
-			{
-				throw new ApplicationException(string.Format("No default transformation for type {0}.", Value));
-			}
-		}
-		public static bool DefaultBooleanTransformation(bool val)
-		{
-			return !val;
-		}
-		public static byte DefaultByteTransformation(byte val)
-		{
-			return (byte)(val*2);;
-		}
-		public static Int16 DefaultInt16Transformation(Int16 val)
-		{
-			return (Int16)(val*2);
-		}
-		public static int DefaultIntTransformation(int val)
-		{
-			return (int)(val*2);;
-		}
-		public static Int64 DefaultInt64Transformation(Int64 val)
-		{
-			return (Int64)(val*2);;
-		}
-		public static decimal DefaultDecimalTransformation(decimal val)
-		{
-			return (decimal)(val*2);;
-		}
-		public static double DefaultDoubleTransformation(double val)
-		{
-			return (double)(val*2);;
-		}
-		public static float DefaultFloatTransformation(float val)
-		{
-			return (float)(val*2);;
-		}
-		public static string DefaultStringTransformation(string val)
-		{
-			return val.ToUpper();;
-		}
-		/// <summary>
-		/// Invalidates the size of this DbTypeParameter.
-		/// </summary>
-		public void InvalidateSize()
-		{
-			m_bIsSizeSet = false;
-		}
-		#endregion
-
-	}
-}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs
deleted file mode 100755
index caae6740f7d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/DbTypeParametersCollection.cs
+++ /dev/null
@@ -1,559 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-using System.Data.SqlClient;
-using CollectionBase = System.Collections.CollectionBase;
-using Sys = System;
-
-namespace MonoTests.System.Data.Utils.Data
-{
-	/// <summary>
-	/// A collection of DbTypeParameters that matches the column of specific a database table
-	/// </summary>
-	public class DbTypeParametersCollection : CollectionBase
-	{
-		#region Constructors
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public DbTypeParametersCollection()
-		{
-		}
-
-		/// <summary>
-		/// Constructor.
-		/// Initializes a DbTypeParametersCollection with the specified TableName
-		/// </summary>
-		/// <param name="a_sTableName">Specifies the table name to set.</param>
-		public DbTypeParametersCollection(string a_sTableName)
-		{
-			m_sTableName = a_sTableName;
-		}
-		#endregion
-
-		#region Members
-		private string m_sTableName;
-		#endregion
-
-		#region Properties & Indexers
-		public string TableName
-		{
-			get
-			{
-				return m_sTableName;
-			}
-			set
-			{
-				m_sTableName = value;
-			}
-		}
-		/// <summary>
-		/// Gets or sets the DbTypeParameter at the specified index.
-		/// </summary>
-		/// <exception cref="ArgumentException">The column name specified by value.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public DbTypeParameter this[int a_iIndex]  
-		{
-			get  
-			{
-				return((DbTypeParameter)List[a_iIndex]);
-			}
-			set  
-			{
-				//Check that the collection does not already contain a DbTypeParameter with the same column name.
-				int l_iIndexOfValueColumnName = this.IndexOf(value.DbColumnName);
-				if (l_iIndexOfValueColumnName != -1 && l_iIndexOfValueColumnName != a_iIndex)
-				{
-					throw new ArgumentException("The column name specified by DbTypeParameter.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.", "value");
-				}
-				else
-				{
-					List[a_iIndex] = value;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the DbTypeParameter with the specified DBColumnName.
-		/// </summary>
-		/// <exception cref="ArgumentException">The column name specified by value.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public DbTypeParameter this[string a_sDBColumnName]  
-		{
-			get  
-			{
-				return this[IndexOf(a_sDBColumnName)];
-			}
-			set  
-			{
-				this[IndexOf(a_sDBColumnName)] = value;
-			}
-		}
-		/// <summary>
-		/// A textual string that conatins the OleDb place holder for parameter ('?') for each of the parameters.
-		/// </summary>
-		public  string OleDbParameterPlaceHolderList
-		{
-			get
-			{
-				return GetParameterPlaceHolderList("?, ");
-			}
-		}
-		/// <summary>
-		/// A textual string that conatins the MSSQL place holder for parameter ('@parame_name') for each of the parameters.
-		/// </summary>
-		public string SqlParameterPlaceHolderList
-		{
-			get
-			{
-				return GetParameterPlaceHolderList("{0}, ");
-			}
-		}
-		/// <summary>
-		/// A string that contains a comma delimited list of all default column names for the parameters held by this collection.
-		/// </summary>
-		public string ColumnsList
-		{
-			get
-			{
-				Sys.Text.StringBuilder l_sbColumnsList = new Sys.Text.StringBuilder();;
-
-				foreach (DbTypeParameter l_oCurrent in this)
-				{
-					l_sbColumnsList.AppendFormat("{0}, ", l_oCurrent.DbColumnName);
-				}
-
-				//remove last ', ' from values list:
-				l_sbColumnsList.Remove(l_sbColumnsList.Length -2, 2);
-
-				return l_sbColumnsList.ToString();
-			}
-		}
-		/// <summary>
-		/// A string that contains a comma delimited list of all values of the parameters held by this collection.
-		/// </summary>
-		public string ValuesList
-		{
-			get
-			{
-				Sys.Text.StringBuilder l_sbValuesList = new Sys.Text.StringBuilder();
-				string l_sCurrentVal = string.Empty;
-				string l_sCurrentFormatting = string.Empty;
-
-				foreach (DbTypeParameter l_oCurrent in this)
-				{
-					//Handle types with string representation different then ToString().
-					l_sCurrentVal = (l_oCurrent.Value != DBNull.Value) ? l_oCurrent.Value.ToString() : "NULL";
-					if (l_oCurrent.Value is bool)
-					{
-						l_sCurrentVal = ((bool)l_oCurrent.Value) ? "1" : "0";
-					}
-
-                    //Set the correct foratting according to type.					
-					l_sCurrentFormatting = (l_oCurrent.Value is string) ? "'{0}', " : "{0}, ";
-					
-					//appent the textual representation.
-					l_sbValuesList.AppendFormat(l_sCurrentFormatting, l_sCurrentVal);
-				}
-
-				//remove last ', ' from values list:
-				l_sbValuesList.Remove(l_sbValuesList.Length -2, 2);
-
-				return l_sbValuesList.ToString();
-			}
-		}
-		#endregion
-		
-		#region Methods
-		#region Public
-		#region Sys.Collections.CollectionBase implementation
-		/// <summary>
-		/// Adds the specified DbTypeParameter to the DbTypeParametersCollection.
-		/// </summary>
-		/// <param name="a_oToAdd">The DbTypeParameter to add to the collection. </param>
-		/// <returns>The index of the new DbTypeParameter object.</returns>
-		/// <exception cref="ArgumentException">The column name specified by a_oToAdd.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public virtual int Add( DbTypeParameter a_oToAdd )  
-		{
-			if (this.Contains(a_oToAdd.DbColumnName))
-			{
-				throw new ArgumentException("The column name specified by DbTypeParameter.DBColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.", "a_oToAdd");
-			}
-			return( List.Add( a_oToAdd ) );
-		}
-
-		/// <summary>
-		/// Adds a DbTypeParameter with the specified data to the DbTypeParametersCollection.
-		/// </summary>
-		/// <param name="a_sColumnName">Specifies the initial column name for the DbTypeParameter.</param>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		/// <returns>The index of the new DbTypeParameter object.</returns>
-		/// <exception cref="ArgumentException">The column name specified by a_sColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public virtual int Add(string a_sTypeName, object a_oValue)
-		{
-			DbTypeParameter l_oToAdd = new DbTypeParameter(a_sTypeName, a_oValue);
-			return this.Add(l_oToAdd);
-		}
-
-		/// <summary>
-		/// Adds a DbTypeParameter with the specified data to the DbTypeParametersCollection.
-		/// </summary>
-		/// <param name="a_sColumnName">Specifies the initial column name for the DbTypeParameter.</param>
-		/// <param name="a_sTypeName">Specifies the initial parameter type Name for the DbTypeParameter.</param>
-		/// <param name="a_oValue">Specifies the initial value for the DbTypeParameter.</param>
-		/// <param name="a_iSize">Specifies the initial size for the DbTypeParameter</param>
-		/// <returns>The index of the new DbTypeParameter object.</returns>
-		/// <exception cref="ArgumentException">The column name specified by a_sColumnName already exist in other DbTypeParameter in the DbTypeParametersCollection.</exception>
-		public virtual int Add(string a_sTypeName, object a_oValue, int a_iSize)
-		{
-			DbTypeParameter l_oToAdd = new DbTypeParameter(a_sTypeName, a_oValue, a_iSize);
-			return this.Add(l_oToAdd);
-		}
-
-		/// <summary>
-		/// Gets the location of the DbTypeParameter object in the collection.
-		/// </summary>
-		/// <param name="a_oToFind">The DbTypeParameter object to locate. </param>
-		/// <returns>The zero-based location of the DbTypeParameter in the collection, if found; otherwise, -1.</returns>
-		public virtual int IndexOf( DbTypeParameter a_oToFind)  
-		{
-			return( List.IndexOf( a_oToFind ) );
-		}
-
-		/// <summary>
-		/// Gets the location of the DbTypeParameter object in the collection.
-		/// </summary>
-		/// <param name="a_oToFind">The DbTypeParameter object to locate. </param>
-		/// <returns>The zero-based location of the DbTypeParameter in the collection, if found; otherwise, -1.</returns>
-		public virtual int IndexOf( string a_sColumnName )  
-		{
-			for (int i=0; i<List.Count; i++)
-			{
-				if (this[i].DbColumnName.ToUpper() == a_sColumnName.ToUpper())
-				{
-					return i;
-				}
-			}
-
-			//Didn't find such DbTypeParameter:
-			return-1;
-		}
-
-		/// <summary>
-		/// Determines whether the DbTypeParametersCollection contains a specific DbTypeParameter.
-		/// </summary>
-		/// <param name="a_oToFind">The DbTypeParameter to locate in the DbTypeParametersCollection</param>
-		/// <returns>true if the DbTypeParametersCollection contains the specified DbTypeParameter; otherwise, false.</returns>
-		public virtual bool Contains( DbTypeParameter a_oToFind )  
-		{
-			// If a_oToFind is not of type DbTypeParameter, this will return false.
-			return( List.Contains( a_oToFind ) );
-		}
-
-		/// <summary>
-		/// Determines whether the DbTypeParametersCollection contains a DbTypeParameter with specific column name (DBColumnName).
-		/// </summary>
-		/// <param name="a_sToFind">The column name to locate in the DbTypeParametersCollection</param>
-		/// <returns>true if the DbTypeParametersCollection contains a DbTypeParameter with specific column name; otherwise, false.</returns>
-		public virtual bool Contains( string a_sToFind )  
-		{
-			return (this.IndexOf(a_sToFind) > -1);
-		}
-
-		/// <summary>
-		/// Creates an array of OleDbParameters based on the contents of this collection.
-		/// </summary>
-		/// <returns>An array of OleDbParameters based on the contents of this collection</returns>
-		public virtual OleDbParameter[] ToOleDbParameterArray()
-		{
-			OleDbParameter[] l_oParams = new OleDbParameter[this.Count];
-			for (int i=0; i<this.Count; i++)
-			{
-				l_oParams[i] = new OleDbParameter(this[i].ParameterName, this[i].Value);
-			}
-
-			return l_oParams;
-		}
-
-		/// <summary>
-		/// Creates an array of SqlParameters based on the contents of this collection.
-		/// </summary>
-		/// <returns>An array of SqlParameters based on the contents of this collection</returns>
-		public virtual SqlParameter[] ToSqlParameterArray()
-		{
-			SqlParameter[] l_oParams = new SqlParameter[this.Count];
-			for (int i=0; i<this.Count; i++)
-			{
-				l_oParams[i] = new SqlParameter(this[i].ParameterName, this[i].Value);
-			}
-
-			return l_oParams;
-		}
-
-		/// <summary>
-		/// Creates an array of objects based on the contents of this collection.
-		/// </summary>
-		/// <returns>An array of objects that contains all values of parameters in this collection</returns>
-		public virtual object[] ToValuesArray()
-		{
-			
-			object[] l_oParams = new object[this.Count];
-			for (int i=0; i<this.Count; i++)
-			{
-				l_oParams[i] = this[i].Value;
-			}
-
-			return l_oParams;
-		}
-		#endregion
-		#region Execute methods
-		/// <summary>
-		/// Builds and execute an INSERT command according to the DbTypeParameters in this collection, and the TableName property.
-		/// </summary>
-		/// <param name="a_sUniqueId">A unique identifier for the inserted row.</param>
-		/// <returns>The number of inserted rows (usually 1).</returns>
-		public virtual int ExecuteInsert(string a_sUniqueId)
-		{
-			int l_iRecordsInserted;
-			OleDbCommand l_cmdInsert = new OleDbCommand();
-			l_cmdInsert.Connection = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-			l_cmdInsert.CommandText = GetInsertCommandText(a_sUniqueId);
-			AddInsertCommandParameters(l_cmdInsert.Parameters);
-
-			try
-			{
-				if (l_cmdInsert.Connection.State != ConnectionState.Open)
-				{
-					l_cmdInsert.Connection.Open();
-				}
-//				Sys.Console.WriteLine(l_cmdInsert.CommandText);
-				l_iRecordsInserted = l_cmdInsert.ExecuteNonQuery();
-			}
-			finally
-			{
-				l_cmdInsert.Connection.Close();
-			}
-
-			return l_iRecordsInserted;
-		}
-
-		/// <summary>
-		/// Builds and executes an DELETE command according to the UniqueId parameter, and the TableName property.
-		/// </summary>
-		/// <param name="a_sUniqueId">The criteria for deleting.</param>
-		/// <returns>The number of deleted rows.</returns>
-		public virtual int ExecuteDelete(string a_sUniqueId)
-		{
-			return DbTypeParametersCollection.ExecuteDelete(this.TableName, a_sUniqueId);
-		}
-
-		/// <summary>
-		/// Builds and executes an DELETE command according to the given TableName & UniqueId parameters.
-		/// </summary>
-		/// <param name="a_sTableName">The table to delete from.</param>
-		/// <param name="a_sUniqueId">The criteria for deleting.</param>
-		/// <returns>The number of deleted rows.</returns>
-		public static int ExecuteDelete(string a_sTableName, string a_sUniqueId)
-		{
-			int l_iRecordsDeleted;
-			OleDbCommand l_cmdDelete = new OleDbCommand();
-			l_cmdDelete.Connection = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-			l_cmdDelete.CommandText = String.Format("DELETE FROM {0} WHERE ID='{1}'", a_sTableName, a_sUniqueId);
-			try
-			{
-				if (l_cmdDelete.Connection.State != ConnectionState.Open)
-				{
-					l_cmdDelete.Connection.Open();
-				}
-				l_iRecordsDeleted = l_cmdDelete.ExecuteNonQuery();
-			}
-			finally
-			{
-				l_cmdDelete.Connection.Close();
-			}
-
-			return l_iRecordsDeleted;
-		}
-		
-		/// <summary>
-		/// Executes a select command that selects all columns specified by this collection,
-		/// from the table specified by this collections TableName property,
-		/// filtered by the given unique id.
-		/// The select command is executed using ExecuteReader.
-		/// </summary>
-		/// <param name="a_sUniqueId">The unique id to use as rows filter.</param>
-		/// <param name="a_oReader">Reader that holds the results of the select command.</param>
-		/// <param name="a_oConnection">A connection object that serves the reader a_oReader for retrivieng data.</param>
-		/// <remarks>
-		/// While the OleDbDataReader is in use, the associated OleDbConnection is open and busy serving the OleDbDataReader.
-		/// While in this state, no other operations can be performed on the OleDbConnection other than closing it.
-		/// This is the case until the Close method of the OleDbDataReader is called.
-		/// It is the users responsibility to close the OleDbConnection explicitly when it is no longer needed.
-		/// </remarks>
-		public virtual void ExecuteSelectReader(string a_sUniqueId, out OleDbDataReader a_oReader, out OleDbConnection a_oConnection)
-		{
-			OleDbCommand l_cmdSelect = BuildSelectCommand(a_sUniqueId);
-			l_cmdSelect.Connection.Open();
-			a_oConnection = l_cmdSelect.Connection;
-			a_oReader = l_cmdSelect.ExecuteReader();
-		}
-		/// <summary>
-		/// Executes a select command that selects all columns specified by this collection,
-		/// from the table specified by this collections TableName property,
-		/// filtered by the given unique id.
-		/// The select command is executed using ExecuteScalar.
-		/// </summary>
-		/// <param name="a_sUniqueId">The unique id to use as rows filter.</param>
-		/// <returns>The first column of the first row in the result set, or a null reference if the result set is empty.</returns>
-		public virtual object ExecuteSelectScalar(string a_sUniqueId)
-		{
-			object l_oReturnValue = null;
-			OleDbCommand l_cmdSelect = BuildSelectCommand(a_sUniqueId);
-
-			try
-			{
-				l_cmdSelect.Connection.Open();
-				l_oReturnValue = l_cmdSelect.ExecuteScalar();
-			}
-			finally
-			{
-				if (l_cmdSelect.Connection.State != ConnectionState.Closed)
-				{
-					l_cmdSelect.Connection.Close();
-				}
-			}
-
-			return l_oReturnValue;
-		}
-
-		#endregion
-		#endregion
-
-		#region Callbacks
-		//All these methods are callbacks, that ensure type safty of elements within the base.List.
-
-		protected override void OnInsert( int index, Object value )  
-		{
-			if ( value.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "value must be of type DbTypeParameter.", "value" );
-		}
-
-		protected override void OnRemove( int index, Object value )  
-		{
-			if ( value.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "value must be of type DbTypeParameter.", "value" );
-		}
-
-		protected override void OnSet( int index, Object oldValue, Object newValue )  
-		{
-			if ( newValue.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "newValue must be of type DbTypeParameter.", "newValue" );
-		}
-
-		protected override void OnValidate( Object value )  
-		{
-			if ( value.GetType() != Type.GetType("MonoTests.System.Data.Utils.Data.DbTypeParameter") )
-				throw new ArgumentException( "value must be of type DbTypeParameter." );
-		}
-		#endregion
-
-		#region Private
-		/// <summary>
-		/// Create a SQL text for an INSERT command with parameters ('?' notation).
-		/// The command uses the table specified in the TableName property, 
-		/// and uses the columns specified in this parameters collection.
-		/// </summary>
-		/// <param name="a_sUniqueId">The Unique id for the row to be inserted.</param>
-		private string GetInsertCommandText(string a_sUniqueId)
-		{
-			string l_sCmd = string.Empty;
-			string l_sColumnsList = ColumnsList;
-			string l_sValuesList = OleDbParameterPlaceHolderList;
-
-			l_sCmd = String.Format("INSERT INTO {0} (ID, {1}) VALUES ('{2}', {3})", m_sTableName, l_sColumnsList, a_sUniqueId, l_sValuesList);
-            
-			return l_sCmd;
-		}
-
-		/// <summary>
-		/// Builds an OleDbParametersCollection for an INSERT command, according to the DbTypeParameters in this collection.
-		/// </summary>
-		/// <param name="a_oParams">The OleDbParameterCollection to be filled.</param>
-		private void AddInsertCommandParameters(OleDbParameterCollection a_oParams)
-		{
-			foreach (DbTypeParameter l_oCurrent in this)
-			{
-				a_oParams.Add(l_oCurrent.ParameterName, l_oCurrent.Value);
-			}
-		}
-		/// <summary>
-		/// Create a command object for a SELECT command .
-		/// The command uses the table specified in the TableName property, 
-		/// and uses the columns specified in this parameters collection.
-		/// </summary>
-		/// <remarks>The ID column is not included in the selected columns of this command.</remarks>
-		/// <returns>An OleDbCommand for selecting the columns specified in this collection, from the table specified in the TableName property. </returns>
-		private OleDbCommand BuildSelectCommand(string a_sUniqueId)
-		{
-			string l_sColumnsList = ColumnsList;
-			string l_sCmdTxt;
-			OleDbConnection l_oConnection = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-			OleDbCommand l_cmdSelect = new OleDbCommand();
-
-			//Build the command's text.
-			l_sCmdTxt = string.Format("SELECT {0} FROM {1} WHERE ID='{2}'", l_sColumnsList, this.TableName, a_sUniqueId);
-
-			//Build the command object.
-			l_cmdSelect.CommandText = l_sCmdTxt;
-			l_cmdSelect.Connection = l_oConnection;
-
-			return l_cmdSelect;
-		}
-
-		/// <summary>
-		/// Create a string that conatins a place holder for each of the parameters.
-		/// </summary>
-		/// <param name="a_sSormatting">The format for each parameter in the list (defined in String.Format())</param>
-		/// <returns>A string that conatins a place holder for each of the parameters.</returns>
-		private string GetParameterPlaceHolderList(string a_sSormatting)
-		{
-			Sys.Text.StringBuilder l_sbValuesList = new Sys.Text.StringBuilder();;
-
-			foreach (DbTypeParameter l_oCurrent in this)
-			{
-				l_sbValuesList.AppendFormat(a_sSormatting, l_oCurrent.ParameterName);
-			}
-
-			//remove last ', ' from values list:
-			l_sbValuesList.Remove(l_sbValuesList.Length -2, 2);
-
-			return l_sbValuesList.ToString();
-		}
-		#endregion
-
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/GHTBase.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/GHTBase.cs
deleted file mode 100755
index 24585c22c02..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/MonoTests.System.Data.Utils/GHTBase.cs
+++ /dev/null
@@ -1,486 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.Utils
-{
-	public class GHTBase
-	{
-		#region Constructors	
-		/// <summary>Constructor 
-		/// <param name="Logger">Custom TextWriter to log to</param>
-		/// <param name="LogOnSuccess">False to log only failed TestCases, True to log all</param>
-		/// </summary>
-		protected GHTBase(TextWriter Logger, bool LogOnSuccess)
-		{
-			this._logger = Logger;
-			this._logOnSuccess = LogOnSuccess;
-		}
-
-		/// <summary>Constructor, log to Console
-		/// <param name="LogOnSuccess">False to log only failed TestCases, True to log all</param>
-		/// </summary>
-		protected GHTBase(bool LogOnSuccess):this(Console.Out, LogOnSuccess){}
-
-		/// <summary>Constructor, log to Console only when Failed 
-		/// </summary>
-		protected GHTBase():this(Console.Out, false){}
-		#endregion
-
-		#region protected methods
-
-		public void GHTSetLogger(TextWriter Logger)
-		{
-			this._logger = Logger;
-		}
-		/// <summary>Begin Test which containes TestCases
-		/// <param name="testName">Test name, used on logs</param>
-		/// </summary>
-		public virtual void BeginTest(string testName)
-		{
-			//set test name
-			this._testName = testName;
-			//reset the Failure Counter and the TestCase Number
-			UniqueId.ResetCounters();
-
-			if(this._logOnSuccess == true)
-				Log(string.Format("*** Starting Test: [{0}] ***", this._testName));
-		}
-
-		/// <summary>Begin TestCase
-		/// <param name="Description">TestCase Description, used on logs</param>
-		/// </summary>
-		public void BeginCase(string Description)
-		{
-			//Previous TestCase must be ended before beginning a new one.
-			if (_testCase != null) throw new Exception("Previous Case not Ended");
-			//init the new TestCase with Unique TestCase Number and Description
-			_testCase = new UniqueId(Description);
-
-			if(this._logOnSuccess == true)
-				Log(string.Format("Starting Case: [{0}]", _testCase.ToString()));
-		}
-
-
-		/// <summary>Compare two objects (using Object.Equals)
-		/// </summary>
-		protected bool Compare(object a, object b)
-		{
-			Assert.AreEqual(b, a);
-			//signal that the Compare method has been called
-			this._testCase.CompareInvoked = true;
-			//a string that holds the description of the objects for log
-			string ObjectData;
-
-			//check if one of the objects is null
-			if  (a == null && b != null)
-			{
-				ObjectData = "Object a = null" + ", Object b.ToString() = '" + b.ToString() + "'(" + b.GetType().FullName + ")";
-				this._testCase.Success = false; //objects are different, TestCase Failed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//check if the other object is null
-			if  (a != null && b == null)
-			{
-				ObjectData = "Object a.ToString() = '" + a.ToString() + "'(" + a.GetType().FullName + "), Object b = null";
-				this._testCase.Success = false; //objects are different, TestCase Failed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//check if both objects are null
-			if ( (a == null && b == null) )
-			{
-				ObjectData = "Object a = null, Object b = null";
-				this._testCase.Success = true; //both objects are null, TestCase Succeed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			ObjectData = "Object a.ToString() = '" + a.ToString() + "'(" + a.GetType().FullName + "), Object b.ToString = '" + b.ToString() + "'(" + b.GetType().FullName + ")";
-			//use Object.Equals to compare the objects
-			this._testCase.Success = (a.Equals(b));
-			LogCompareResult(ObjectData);
-			return this._testCase.Success;
-		}
-
-		/// <summary>Compare two Object Arrays. 
-		/// <param name="a">First array.</param>
-		/// <param name="b">Second array.</param>
-		/// <param name="Sorted">Used to indicate if both arrays are sorted.</param>
-		/// </summary>
-		protected bool Compare(Array a, Array b)
-		{
-			Assert.AreEqual(b, a);
-			//signal that the Compare method has been called
-			this._testCase.CompareInvoked=true;
-			//a string that holds the description of the objects for log
-			string ObjectData;
-
-			//check if both objects are null
-			if ( (a == null && b == null) )
-			{
-				ObjectData = "Array a = null, Array b = null";
-				this._testCase.Success = true; //both objects are null, TestCase Succeed
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//Check if one of the objects is null.
-			//(If both were null, we wouldn't have reached here).
-			if (a == null || b == null)
-			{
-				string aData = (a==null) ? "null" : "'" + a.ToString() + "' (" + a.GetType().FullName + ")";
-				string bData = (b==null) ? "null" : "'" +b.ToString() + "' (" + b.GetType().FullName + ")";
-				ObjectData = "Array a = "  + aData + ", Array b = " + bData;
-				this._testCase.Success = false; //objects are different, testCase Failed.
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//check if both arrays are of the same rank.
-			if (a.Rank != b.Rank)
-			{
-				this._testCase.Success = false;
-				ObjectData = string.Format("Array a.Rank = {0}, Array b.Rank = {1}", a.Rank, b.Rank);
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//Do not handle multi dimentional arrays.
-			if (a.Rank != 1)
-			{
-				this._testCase.Success = false;
-				ObjectData = "Multi-dimension array comparison is not supported";
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			//Check if both arrays are of the same length.
-			if (a.Length != b.Length)
-			{
-				this._testCase.Success = false;
-				ObjectData = string.Format("Array a.Length = {0}, Array b.Length = {1}", a.Length, b.Length);
-				LogCompareResult(ObjectData);
-				return this._testCase.Success;
-			}
-
-			ObjectData = "Array a.ToString() = '" + a.ToString() + "'(" + a.GetType().FullName + ") Array b.ToString = '" + b.ToString() + "'(" + b.GetType().FullName + ")";
-
-			//Compare elements of the Array.
-			int iLength = a.Length;
-			for (int i=0; i<iLength; i++)
-			{
-				object aValue = a.GetValue(i);
-				object bValue = b.GetValue(i);
-
-				if (aValue == null && bValue == null)
-				{
-					continue;
-				}
-
-				if (aValue == null || bValue == null  ||  !aValue.Equals(bValue) )
-				{
-					string aData = (aValue==null) ? "null" : "'" + aValue.ToString() + "' (" + aValue.GetType().FullName + ")";
-					string bData = (bValue==null) ? "null" : "'" + bValue.ToString() + "' (" + bValue.GetType().FullName + ")";
-					ObjectData = string.Format("Array a[{0}] = {1}, Array b[{0}] = {2}", i, aData, bData);
-					this._testCase.Success = false; //objects are different, testCase Failed.
-					LogCompareResult(ObjectData);
-					return this._testCase.Success;
-				}
-			}
-
-
-			this._testCase.Success = true;
-			LogCompareResult(ObjectData);
-			return this._testCase.Success;
-		}
-	
-
-		/// <summary>
-		/// Intentionally fail a testcase, without calling the compare method.
-		/// </summary>
-		/// <param name="message">The reason for the failure.</param>
-		protected void Fail(string message)
-		{
-			this._testCase.CompareInvoked = true;
-			this._testCase.Success = false;
-			//Log(string.Format("TestCase \"{0}\" Failed: [{1}]", _testCase.ToString(), message));
-			Assert.Fail(message);
-		}
-
-		/// <summary>
-		/// Intentionally cause a testcase to pass, without calling the compare message.
-		/// </summary>
-		/// <param name="message">The reason for passing the test.</param>
-		protected void Pass(string message)
-		{
-			this._testCase.CompareInvoked = true;
-			this._testCase.Success = true;
-			if (this._logOnSuccess)
-			{
-				Log(string.Format("TestCase \"{0}\" Passed: [{1}]", _testCase.ToString(), message));
-			}
-		}
-
-		/// <summary>
-		/// Marks this testcase as success, but logs the reason for skipping regardless of _logOnSuccess value.
-		/// </summary>
-		/// <param name="message">The reason for skipping the test.</param>
-		protected void Skip(string message)
-		{
-			this._testCase.CompareInvoked = true;
-			this._testCase.Success = true;
-			Log(string.Format("TestCase \"{0}\" Skipped: [{1}]", _testCase.ToString(), message));
-		}
-
-		/// <summary>
-		/// Intentionally fail a testcase when an expected exception is not thrown.
-		/// </summary>
-		/// <param name="exceptionName">The name of the expected exception type.</param>
-		protected void ExpectedExceptionNotCaught(string exceptionName)
-		{
-			this.Fail(string.Format("Expected {0} was not caught.", exceptionName));
-		}
-
-		/// <summary>
-		/// Intentionally cause a testcase to pass, when an expected exception is thrown.
-		/// </summary>
-		/// <param name="ex"></param>
-		protected void ExpectedExceptionCaught(Exception ex)
-		{
-			this.Pass(string.Format("Expected {0} was caught.", ex.GetType().FullName));
-		}
-
-		/// <summary>End TestCase
-		/// <param name="ex">Exception object if exception occured during the TestCase, null if not</param>
-		/// </summary>
-		protected void EndCase(Exception ex)
-		{
-			//check if BeginCase was called. cannot end an unopen TestCase
-			if(_testCase == null)
-			{
-				throw new Exception("BeginCase was not called");
-			}
-			else
-			{
-				//if Exception occured during the test - log the error and faile the TestCase.
-				if(ex != null)
-				{
-					_testCase.Success=false;
-					Log(string.Format("TestCase: \"{0}\" Error: [Failed With Unexpected {1}: \n\t{2}]", _testCase.ToString(), ex.GetType().FullName, ex.Message + "\n" + ex.StackTrace ));
-					_testCase = null;
-					throw ex;
-				}
-				else
-				{                    
-					//check if Compare was called
-					if (_testCase.CompareInvoked == true)
-					{
-						if(this._logOnSuccess == true) Log(string.Format("Finished Case: [{0}] ", _testCase.ToString()));
-					}
-					else
-					{
-						//if compare was not called, log error message
-						Log(string.Format("TestCase \"{0}\" Warning: [TestCase didn't invoke the Compare mehtod] ", _testCase.ToString()));
-					}
-				}
-				//Terminate TestCase (set TestCase to null)
-				_testCase = null;
-			}
-		}
-
-
-		/// <summary>End Test
-		/// <param name="ex">Exception object if exception occured during the Test, null if not</param>
-		/// </summary>
-		public void EndTest(Exception ex)
-		{
-			//if all test cases succeeded but an exception occured - set exit code to -1
-			//if we wont set it to -1, the exit code will be 0 !!!
-			if (UniqueId.FailureCounter == 0 && ex != null) 
-			{
-				Environment.ExitCode = -1;
-			}
-			else
-			{
-				//set exitcode to the count of failed TestCases
-				Environment.ExitCode = UniqueId.FailureCounter;
-			}
-
-			//if exception occured - log error
-			if(ex != null)
-			{
-				Log(string.Format("Unexpected Exception accured in Test [{0}] - {1} \n {2}" , this._testName, ex.Message ,ex.StackTrace));
-			}
-			if(this._logOnSuccess)
-			{
-				Log(string.Format("*** Finished Test: [{0}] ***", this._testName));
-			}
-		}
-	
-
-		public int GHTGetExitCode()
-		{
-			return UniqueId.FailureCounter;
-		}
-
-		/// <summary>logger 
-		/// <param name="text">string message to log</param>
-		/// </summary>
-		protected void Log(string text)
-		{
-//			_loggerBuffer = _loggerBuffer + "\n" + "GHTBase:Logger - " + text;
-//			_logger.WriteLine("GHTBase:Logger - " + text);
-		}
-
-		//used to log the results from the compare methods
-		private void LogCompareResult(string ObjectData)
-		{
-			if(this._testCase.Success == false)
-			{
-				Log(string.Format("TeseCase \"{0}\" Error: [Failed while comparing(" + ObjectData + ")] ", _testCase.ToString() ));
-			}
-			else
-				if(this._logOnSuccess == true)
-				Log(string.Format("TestCase \"{0}\" Passed ", _testCase.ToString()));
-			
-		}
-
-		protected int TestCaseNumber
-		{
-			get
-			{
-				return _testCase.CaseNumber;
-			}
-		}
-		#endregion
-
-		#region private fields
-		
-		private TextWriter _logger;
-		public string _loggerBuffer; // a public clone string of the _logger (used in web tests)
-
-		private string _testName;
-		private UniqueId _testCase;
-		private bool _logOnSuccess;
-		#endregion
-		
-	}
-
-	//holds all the info on a TestCase
-	internal class UniqueId
-	{
-		//holds the unique name of the test case
-		//this name must be recieved from the test case itself
-		//when calling BeginCase.
-		//example: BeginCase("MyName")
-		private string _caseName;
-
-		//maintains the number generated for this test case
-		private static int _caseNumber;
-
-		//maintains the number of failed test case 
-		private static int _FailureCounter;
-		internal static int FailureCounter
-		{
-			get
-			{
-				return _FailureCounter;
-			}
-		}
-		
-		//indicate if the Compare method has been invoked AND containes compare objects message (ToString)
-		private bool _CompareInvoked;
-		internal bool CompareInvoked
-		{
-			get
-			{
-				return _CompareInvoked;
-			}
-			set
-			{
-				_CompareInvoked = value;
-			}
-		}
-
-
-		//reset the static counters when a new Test (not TestCase !!) begin
-		internal static void ResetCounters()
-		{
-			_FailureCounter = 0;
-			_caseNumber = 0;
-		}
-
-		//signal if a TestCase failed, if failed - increment the _FailureCounter
-		private bool _success;
-		internal bool Success
-		{
-			get
-			{
-				return this._success;
-			}
-			set
-			{
-				this._success = value;
-
-				if (value == false) 
-				{
-					_FailureCounter++;
-				}
-
-
-			}
-		}
-
-
-		//Ctor, Recieve the name for the test case
-		//generate a unique number and apply it to the test case
-		internal UniqueId(string Name)
-		{
-			this._caseName = Name;
-			//this._caseNumber = ++UniqueId._counter;
-			_caseNumber++;
-		}
-
-		internal int CaseNumber
-		{
-			get
-			{
-				return _caseNumber;
-			}
-		}
-
-		public override string ToString()
-		{
-			return string.Format("\"{0}\" #{1}", this._caseName, _caseNumber);
-		}
-	}
-}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandText.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandText.cs
deleted file mode 100755
index a5ca347df35..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandText.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_CommandText : GHTBase
-	{
-		private Exception exp = null;
-		private OleDbCommand cmd;
-		const string TEST_CASE_ID = "48341_";
-		public static void Main()
-		{
-			OleDbCommand_CommandText tc = new OleDbCommand_CommandText();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDBCommandText");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-			SetInConstractor();
-			SetByProperty();
-			UseSemiColonAsValue();
-			UseColonAsValue();
-			UseQuestionMarkAsValue();
-			UseExclamationMarkAsValue();
-			UseApostropheAsValue();
-			UseCommaAsValue();
-			UseDotAsValue();
-			UseAtAsValue();
-			UseQuoteAsValue();
-			UseDollarAsValue();
-			UsePercentAsValue();
-			UseHatAsValue();
-			UseAmpersnadAsValue();
-			UseStartAsValue();
-			UseParentesesAsValue();
-			UsePlusAsValue();
-			UseMinusAsValue();
-			UseUnderscoreAsValue();
-			UseSpaceAsValue();
-			UseEqualAsValue();
-			UseSlashAsValue();
-			UseBackSlashAsValue();
-			UseTildeAsValue();
-			UseNOTAsValue();
-			UseORAsValue();
-			UseANDAsValue();
-			UseSELECTAsValue();
-			UseFROMAsValue();
-			UseWHEREAsValue();
-			UseINSERTAsValue();
-			UseINTOAsValue();
-			UseVALUESAsValue();
-			UseDELETEAsValue();
-			UseUPDATEAsValue();
-			UseEXECAsValue();
-			UseQueryAsValue();
-		}
-		[Test] public void SetByProperty()
-		{
-			exp = null;
-			cmd = new OleDbCommand();
-			cmd.CommandText = "SELECT * FROM Employees";
-			try
-			{
-				BeginCase("CommandText2");
-				Compare(cmd.CommandText, "SELECT * FROM Employees");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-		}
-
-		[Test] public void SetInConstractor()
-		{
-			exp = null;
-			cmd = new OleDbCommand("SELECT * FROM Employees");
-			try
-			{
-				BeginCase("CommandText1");
-				Compare(cmd.CommandText, "SELECT * FROM Employees");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-		}
-		[Test] public void UseSemiColonAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ";");
-		}
-		[Test] public void UseColonAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ":");
-		}
-		[Test] public void UseQuestionMarkAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "?");
-		}
-		[Test] public void UseExclamationMarkAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "?");
-		}
-		[Test] public void UseApostropheAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "'");
-		}
-		[Test] public void UseCommaAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ",");
-		}
-		[Test] public void UseDotAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", ".");
-		}
-		[Test] public void UseAtAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "@");
-		}
-		[Test] public void UseQuoteAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "\"");
-		}
-		[Test] public void UseDiezAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "#");
-		}
-		[Test] public void UseDollarAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "$");
-		}
-		[Test] public void UsePercentAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "%");
-		}
-		[Test] public void UseHatAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "^");
-		}
-		[Test] public void UseAmpersnadAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "&");
-		}
-		[Test] public void UseStartAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "*");
-		}
-		[Test] public void UseParentesesAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "(");
-			RunValueInColumnTest("T_VARCHAR", "()");
-			RunValueInColumnTest("T_VARCHAR", ")");
-			RunValueInColumnTest("T_VARCHAR", "{");
-			RunValueInColumnTest("T_VARCHAR", "{}");
-			RunValueInColumnTest("T_VARCHAR", "}");
-			RunValueInColumnTest("T_VARCHAR", "[");
-			RunValueInColumnTest("T_VARCHAR", "[]");
-			RunValueInColumnTest("T_VARCHAR", "]");
-			RunValueInColumnTest("T_VARCHAR", "<");
-			RunValueInColumnTest("T_VARCHAR", "<>");
-			RunValueInColumnTest("T_VARCHAR", ">");
-		}
-		[Test] public void UsePlusAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "+");
-		}
-		[Test] public void UseMinusAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "-");
-		}
-		[Test] public void UseUnderscoreAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "_");
-		}
-		[Test] public void UseSpaceAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", " ");
-		}
-		[Test] public void UseEqualAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "=");
-		}
-		[Test] public void UseSlashAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "\\");
-		}
-		[Test] public void UseBackSlashAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "/");
-		}
-		[Test] public void UseTildeAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "~");
-		}
-		[Test] public void UseNOTAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "NOT");
-		}
-		[Test] public void UseORAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "OR");
-		}
-		[Test] public void UseANDAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "AND");
-		}
-		[Test] public void UseSELECTAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "SELECT");
-		}
-		[Test] public void UseFROMAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "FROM");
-		}
-		[Test] public void UseWHEREAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "WHERE");
-		}
-		[Test] public void UseINSERTAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "INSERT");
-		}
-		[Test] public void UseINTOAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "INTO");
-		}
-		[Test] public void UseVALUESAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "VALUES");
-		}
-		[Test] public void UseDELETEAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "DELETE");
-		}
-		[Test] public void UseUPDATEAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "UPDATE");
-		}
-		[Test] public void UseEXECAsValue()
-		{
-			RunValueInColumnTest("T_VARCHAR", "EXEC");
-		}
-
-		[Test] public void UseQueryAsValue()
-		{
-			string columnName;
-			switch (ConnectedDataProvider.GetDbType())
-			{
-				case DataBaseServer.SQLServer:
-					columnName = "T_VARCHAR";
-					break;
-				case DataBaseServer.Oracle:
-					columnName = "T_LONG";
-					break;
-				case DataBaseServer.DB2:
-					columnName = "T_LONGVARCHAR";
-					break;
-				default:
-					columnName = "T_VARCHAR";
-					break;
-
-			}
-			RunValueInColumnTest(columnName, "SELECT * FROM TYPES_SIMPLE");
-		}
-
-		private void RunValueInColumnTest(string columnToTest, string valueToTest)
-		{
-			UnQuotedValueInColumn(columnToTest, valueToTest);
-			QuotedValueInColumn(columnToTest, valueToTest);
-		}
-		private void QuotedValueInColumn(string columnToTest, string valueToTest)
-		{
-			ValueInColumn(columnToTest, string.Format("'{0}'", valueToTest));
-		}
-		private void UnQuotedValueInColumn(string columnToTest, string valueToTest)
-		{
-			ValueInColumn(columnToTest, valueToTest);
-		}
-		private void ValueInColumn(string columnToTest, string valueToTest)
-		{
-			exp = null;
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			DbTypeParametersCollection row = ConnectedDataProvider.GetSimpleDbTypesParameters();
-			BeginCase(string.Format("Use {0} as value", valueToTest));
-			string rowId = TEST_CASE_ID + TestCaseNumber.ToString();
-			try
-			{
-				foreach(DbTypeParameter param in row)
-				{
-					param.Value = DBNull.Value;
-				}
-				row[columnToTest].Value = valueToTest;
-				Log("rowId:" + rowId + " columnToTest:" + columnToTest + " valueToTest:" + valueToTest);
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				rdr.Read();
-				int columnOrdinal = rdr.GetOrdinal(columnToTest);
-				//this.Log(valueToTest);
-				Compare(valueToTest, rdr.GetValue(columnOrdinal));
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				row.ExecuteDelete(rowId);
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-			}
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandTimeout.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandTimeout.cs
deleted file mode 100755
index 3e7085e3e5f..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandTimeout.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data.OleDb ;
-
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbCommand_CommandTimeout : GHTBase
-{
-	public static void Main()
-	{
-		OleDbCommand_CommandTimeout tc = new OleDbCommand_CommandTimeout();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbCommand_CommandTimeout");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		OleDbCommand cmd = new OleDbCommand();
-		Assert.AreEqual(cmd.CommandTimeout , 30);
-		cmd.CommandTimeout = 12;
-		Assert.AreEqual(cmd.CommandTimeout , 12);
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandType.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandType.cs
deleted file mode 100755
index d6dd6638528..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_CommandType.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-#if DAAB
-using Microsoft.ApplicationBlocks.Data;
-#endif
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_CommandType : ADONetTesterClass
-	{
-		OleDbConnection	con;
-		// transaction is must on PostgreSQL
-		OleDbTransaction tr;
-		OleDbCommand cmd;
-		OleDbDataReader dr = null;
-		DataBaseServer dbServerType;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-				tr = con.BeginTransaction();
-				cmd = new OleDbCommand("", con, tr);
-				dbServerType = ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Assert.AreEqual("Setup", "Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbCommand_CommandType tc = new OleDbCommand_CommandType();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_CommandType");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-		
-			OleDbCommand cmd = new OleDbCommand();
-			try
-			{
-				BeginCase("CommandType - default");
-				Assert.AreEqual(cmd.CommandType , CommandType.Text );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("CommandType - TableDirect");
-				cmd.CommandType = CommandType.TableDirect; 
-				Assert.AreEqual(cmd.CommandType , CommandType.TableDirect);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("CommandType - Text");
-				cmd.CommandType = CommandType.Text  ; 
-				Assert.AreEqual(cmd.CommandType , CommandType.Text);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-
-			#region		---- CommandType.Text using Parameters.Add ---- 
-			try
-			{
-				BeginCase("CommandType.Text using Parameters.Add");
-
-				cmd = new OleDbCommand();
-				cmd.Connection = con;
-				cmd.Transaction = tr;
-				cmd.CommandType = CommandType.Text;
-				switch (dbServerType)
-				{
-					case DataBaseServer.PostgreSQL:
-						cmd.CommandText = "SELECT * FROM GH_REFCURSOR3(?)";
-						break;
-					default:
-						cmd.CommandText = "{call GH_REFCURSOR3(?)}";
-						break;
-				}
-
-				OleDbParameter param1 = cmd.Parameters.Add("IN_LASTNAME", OleDbType.VarChar,20);
-				param1.Direction = ParameterDirection.Input;
-				param1.Value = "Yavine"; 
-#if DAAB
-#if !JAVA
-				if ((dbServerType == DataBaseServer.PostgreSQL))
-				{
-					dr = PostgresOleDbHelper.OLEDB4ODBCExecuteReader(cmd,true);
-				}
-				else
-#endif
-#endif
-				{
-					dr = cmd.ExecuteReader();
-				}
-
-				if (dr.HasRows)
-				{
-					dr.Read();
-					Assert.AreEqual(dr.GetValue(0).ToString(),"1");
-					Assert.AreEqual(dr.GetString(1),"Yavine");
-				}
-				else
-					Assert.AreEqual("error","HasRows=0");
-
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if (con != null)
-				{if (con.State == ConnectionState.Open) con.Close();}
-
-				EndCase(exp);
-				exp = null;
-			}
-			#endregion
-		
-			CommandTypeSP_Manual_InOutParameters();
-
-			#region		---- ORACLE CommandType.StoredProcedure using DeriveParameters ---- 
-			if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.Oracle)
-			{
-				try
-				{
-					BeginCase("ORACLE CommandType.StoredProcedure using DeriveParameters");
-
-					con.Open();
-					cmd = new OleDbCommand();
-					cmd.Connection = con;
-					cmd.Transaction = tr;
-					cmd.CommandType = CommandType.StoredProcedure;
-					cmd.CommandText = "GH_REFCURSOR3";
-
-					OleDbCommandBuilder.DeriveParameters(cmd);
-					cmd.Parameters[0].Value = "Yavine"; 
-					cmd.Parameters.RemoveAt(1); // the ORACLE DAAB trick is to remove the out parameter
-
-					dr = cmd.ExecuteReader();
-					if (dr.HasRows)
-					{
-						dr.Read();
-						Assert.AreEqual(dr.GetValue(0).ToString(),"1");
-						Assert.AreEqual(dr.GetString(1),"Yavine");
-					}
-					else
-						Assert.AreEqual("error","HasRows=0");
-
-				} 
-				catch(Exception ex)
-				{
-					exp = ex;
-				}
-				finally
-				{
-					if (dr != null)dr.Close();
-					if (con != null)
-					{if (con.State == ConnectionState.Open) con.Close();}
-
-					EndCase(exp);
-					exp = null;
-				}
-			}		
-			#endregion
-
-			#region CommandType.StoredProcedure in order to repreduce bug 4003
-			if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.SQLServer)
-			{
-				exp = null;
-				try
-				{
-					if (con.State == ConnectionState.Closed) con.Open();
-					BeginCase("Bug 4003");
-					OleDbCommand cmd4003 = new OleDbCommand("[mainsoft].[GH_DUMMY]",con);
-					cmd4003.CommandType = CommandType.StoredProcedure;
-					cmd4003.Parameters.Add("@EmployeeIDPrm","1");
-					cmd4003.ExecuteReader();
-					
-				}
-				catch (Exception ex)
-				{
-					exp=ex;
-				}
-				finally
-				{
-					if (con.State == ConnectionState.Open) con.Close();
-					EndCase(exp);
-				}
-
-			}
-
-			#endregion
-		}
-
-		#region		---- CommandType.StoredProcedure manual in out parameters ---- 
-		public void CommandTypeSP_Manual_InOutParameters()
-		{
-			Exception exp = null;
-			try
-			{
-				BeginCase("CommandType.StoredProcedure manual in out parameters");
-
-				if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL)
-				{
-					this.Log("CommandType.StoredProcedure manual in out parameters is not tested in oracle.");
-					return;
-				}
-
-				con.Open();
-				cmd = new OleDbCommand();
-				cmd.Connection = con;
-
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "GH_INOUT1";
-
-				//RETURN_VALUE for SQLServer
-				if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.SQLServer)
-				{
-					OleDbParameter param0 = cmd.Parameters.Add("@RETURN_VALUE", OleDbType.Integer);
-					param0.Direction = ParameterDirection.ReturnValue;
-				}
-
-				OleDbParameter param1 = cmd.Parameters.Add("@INPARAM", OleDbType.VarChar,20);
-				param1.Direction = ParameterDirection.Input;
-				param1.Value = Convert.ToString("dummy"); 
-	
-				OleDbParameter param2 = cmd.Parameters.Add("@OUTPARAM", OleDbType.Integer);//VarNumeric);
-				param2.Direction = ParameterDirection.Output;
-
-				int ret = cmd.ExecuteNonQuery();
-				int intReturn;
-				intReturn = Convert.ToInt32(cmd.Parameters["@OUTPARAM"].Value);
-				Assert.AreEqual(intReturn,100);
-
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if (con != null)
-				{if (con.State == ConnectionState.Open) con.Close();}
-
-				EndCase(exp);
-				exp = null;
-			}
-		}
-		#endregion
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Connection.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Connection.cs
deleted file mode 100755
index c433728d119..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Connection.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_Connection : GHTBase
-	{
-		OleDbCommand cmd;
-		OleDbConnection con;
-
-		[SetUp]
-		public void SetUp()
-		{
-			cmd = new OleDbCommand("SELECT * FROM Employees");
-			con = new OleDbConnection();
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbCommand_Connection tc = new OleDbCommand_Connection();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_Connection");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			try
-			{
-				BeginCase("Command Connection - set");
-				cmd.Connection = con;	
-				Compare(cmd.Connection ,con);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Command Connection - ctor");
-				cmd = new OleDbCommand("",con);
-				Compare(cmd.Connection ,con);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Dispose.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Dispose.cs
deleted file mode 100755
index 1dc993950f8..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Dispose.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbCommand_Dispose : GHTBase
-{
-	public static void Main()
-	{
-		OleDbCommand_Dispose tc = new OleDbCommand_Dispose();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDBCommand_Dispose");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-	//problems from Synergy
-
-	//Ofer, 
-
-	//Take a look at #1. Test this to see if we have a problem in dispose. If we do, add a test for this to make sure we catch it in next rounds. 
-
-	//
-
-	//-----Original Message-----
-	//From: David Teplitchi [mailto:davidt@mainsoft.com] 
-	//Sent: Sunday, March 21, 2004 9:31 AM
-	//To: //Oved Yavine//
-	//Subject: 2 problems from Synergy
-
-
-	//Please check those 2 problems reported by Synergy and tell me what do you think.
-
-	//1) The following code works in dotnet but doesn//t work in j2ee.
-	//// Oracle Drivers
-	//OleDbConnection Connect;
-	//OleDbDataReader DbReader;
-	//OleDbCommand DbCommand;
-	//IDataReader DR;
-	//string sSQL;
-	//int iField;
-	//bool bFound;
-	//try
-	//{
-	//Connect = new OleDbConnection("Provider=\"MSDAORA.1\";User
-	//ID=COM;Password=SQL;Data Source=LLO1;HostName=WS10359;Port=1521");
-	//Connect.Open();
-	//sSQL = "SELECT * FROM PRODUCT WHERE PRO_SKU = //SKU_208//";
-	//DbCommand = new OleDbCommand(sSQL, Connect);
-	//DbReader = DbCommand.ExecuteReader(CommandBehavior.SingleRow);
-	//DR = DbReader;
-	//DbCommand.Dispose(); // comment out
-	////DbCommand = null;
-	//bFound = DbReader.HasRows;
-	//DR.Read();
-	//// Get Column Ordinal
-	//iField = DR.GetOrdinal("PRO_DESCRIPTION");
-
-	//string sDesc = DR.GetString(iField);
-	//}
-	//catch(Exception e)
-	//{
-	//this.WriteErrorLog(e.Message);
-	//}
-	//i have identified the problem as being "DbCommand.Dispose()". If you comment this line out or make it 
-	//"DbCommand = null", then its okay. So this instruction doesnt work the same in both in .net and j2ee.
-
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		//OleDbConnection  con = null;
-
-		//this test was added due to a request from Oved:
-		//this bug occur on all databases (SQL,Oracle,DB2)
-		OleDbCommand DbCommand = null;
-		OleDbConnection Connect = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		Connect.Open();
-		DbCommand = new OleDbCommand("SELECT * FROM Customers", Connect);
-		OleDbDataReader  DbReader  = DbCommand.ExecuteReader();
-
-		BeginCase("Check DataReader.IsClosed - before dispose");
-		try
-		{
-			Compare(DbReader.IsClosed,false); //.Net=false, GH=false
-		}
-		catch (Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-
-		BeginCase("Check DataReader.IsClosed - after dispose");
-		try
-		{
-			DbCommand.Dispose();
-			Compare(DbReader.IsClosed,false); //.Net=false, GH=true
-		}
-		catch (Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-
-	}
-}
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteNonQuery.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteNonQuery.cs
deleted file mode 100755
index 8f55800c793..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteNonQuery.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_ExecuteNonQuery : GHTBase
-	{
-		OleDbConnection con;
-		OleDbCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				//prepare Data
-				OleDbCommand cmdPrepare = new OleDbCommand("", new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString));
-				cmdPrepare.Connection.Open();
-				cmdPrepare.CommandText = "DELETE FROM Employees WHERE EmployeeID = 99999";
-				cmdPrepare.ExecuteScalar();
-				cmdPrepare.Connection.Close();
-				cmdPrepare.Dispose();
-
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OleDbCommand("", con);
-				con.Open();
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbCommand_ExecuteNonQuery tc = new OleDbCommand_ExecuteNonQuery();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_ExecuteNonQuery");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-	
-			int intRecordsAffected = 0;
-
-			try
-			{
-				BeginCase("Execute Insert");
-				cmd.CommandText = "INSERT INTO Employees (EmployeeID,FirstName, LastName) VALUES (99999,'OferXYZ', 'Testing')";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected, 1);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check insert operation");
-				cmd.CommandText = "SELECT FirstName FROM Employees WHERE (EmployeeID = 99999)";
-				string  strFirstName = cmd.ExecuteScalar().ToString();
-				Compare(strFirstName, "OferXYZ");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Execute Select");
-				cmd.CommandText = "SELECT EmployeeID FROM Employees WHERE (EmployeeID = 99999)";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				
-				switch (ConnectedDataProvider.GetDbType())
-				{
-					case DataBaseServer.PostgreSQL:
-						// postgres odbc returns 1
-#if !JAVA
-						{
-							Compare(intRecordsAffected, 1);
-						}
-#else
-						{
-							Compare(intRecordsAffected, -1);
-						}
-#endif
-						break;
-					default:
-						Compare(intRecordsAffected, -1);
-						break;
-				}
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Execute UPDATE");
-				cmd.CommandText = "UPDATE Employees SET FirstName = 'OferABC', LastName = 'TestXYZ' WHERE (EmployeeID = 99999)";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected, 1);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("Check Update operation");
-				cmd.CommandText = "SELECT FirstName FROM Employees WHERE (EmployeeID = 99999)";
-				string  strFirstName = cmd.ExecuteScalar().ToString();
-				Compare(strFirstName, "OferABC");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Execute UPDATE");
-				cmd.CommandText = "DELETE FROM Employees WHERE (EmployeeID = 99999)";
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected, 1);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check Delete operation");
-				cmd.CommandText = "SELECT FirstName FROM Employees WHERE (EmployeeID = 99999)";
-				object obj = cmd.ExecuteScalar();
-				Compare(obj==null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check OleDBException - update with bad value");
-				cmd.CommandText = "UPDATE Employees SET BirthDate = 'bad value' WHERE (EmployeeID = 1)";
-				try
-				{
-					cmd.ExecuteNonQuery(); 
-				}
-				catch (OleDbException ex)
-				{
-					exp = ex;
-				}
-				Compare(exp.GetType().FullName, typeof(OleDbException).FullName);
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check OleDBException - missing EmployeeID");
-				cmd.CommandText = "INSERT INTO Employees (FirstName, BirthDate) VALUES ('Dado', 'Ben David')";
-				try
-				{
-					cmd.ExecuteNonQuery(); 
-				}
-				catch (OleDbException ex)
-				{
-					exp = ex;
-				}
-				Compare(exp.GetType().FullName, typeof(OleDbException).FullName);
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
deleted file mode 100755
index c86de4650e9..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
+++ /dev/null
@@ -1,491 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-#if DAAB
-using Microsoft.ApplicationBlocks;
-#endif
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_ExecuteReader : ADONetTesterClass
-	{
-		OleDbConnection	con;
-		OleDbCommand cmd;
-		
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OleDbCommand("", con);
-				con.Open();
-				this.Pass("Setup.");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbCommand_ExecuteReader tc = new OleDbCommand_ExecuteReader();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_ExecuteReader");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			bool RecordsExists = false;
-			OleDbDataReader rdr =null;
-
-//			testBug3965();
-//			TestMultipleResultsets();
-//			TestCompoundVariable();
-
-			cmd.CommandText = "Select FirstName,City From Employees";
-			if (con.State != ConnectionState.Open)
-			{
-				con.Open();
-			}
-
-			try
-			{
-				BeginCase("check reader is null");
-				rdr = cmd.ExecuteReader();
-				Compare(rdr==null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp);
-				exp = null;
-			}
-
-			try
-			{
-				BeginCase("check reader.read");
-				rdr = cmd.ExecuteReader();
-				RecordsExists = rdr.Read();
-				Compare(RecordsExists ,true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-
-			try
-			{
-				BeginCase("execute reader again ");
-				rdr = cmd.ExecuteReader();
-				Compare(rdr==null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-
-			try
-			{
-				BeginCase("Test compound SQL statement");
-				//Build a compund SQL command.
-				string[] sqlStatements = new string[] {
-														  "INSERT INTO Categories (CategoryName, Description) VALUES('__TEST_RECORD__', 'Inserted')",
-														  "UPDATE Categories  SET Description='Updated' WHERE CategoryName='__TEST_RECORD__'",
-														  "DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'" ,
-				};
-				cmd.CommandText = CreateCompundSqlStatement(sqlStatements, ConnectedDataProvider.GetDbType());
-				rdr = cmd.ExecuteReader();
-				Compare(rdr.Read(), false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-
-
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.Oracle)
-			{
-				try
-				{
-					BeginCase("Check that in a compound SQL statement, resultsets are returned only for SELECT statements. (bug #3358)");
-					//prepare db:
-					OleDbCommand prepare = new OleDbCommand("DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'", con);
-					prepare.ExecuteNonQuery();
-
-
-					//Test body
-					int resultSetCount ;
-
-					//Build a compund SQL command that contains only one select statement.
-					string[] sqlStatements = new string[] {
-															  "INSERT INTO Categories (CategoryName, Description) VALUES('__TEST_RECORD__', 'Inserted')",
-															  "UPDATE Categories  SET Description='Updated' WHERE CategoryName='__TEST_RECORD__'",
-															  "DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'" ,
-															  "SELECT * FROM Categories "
-														  };
-					string insertCmdTxt = CreateCompundSqlStatement(sqlStatements, ConnectedDataProvider.GetDbType());
-					//this.Log(insertCmdTxt);
-					OleDbCommand InsertCmd = new OleDbCommand(insertCmdTxt, con);
-					rdr = InsertCmd.ExecuteReader();
-
-					//Count the number of result sets.
-					resultSetCount = 0;
-					do
-					{
-						resultSetCount++;
-					}while (rdr.NextResult());
-
-					//Test that there is only one result set.
-					Compare(resultSetCount, 1);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally
-				{
-					if (rdr != null) rdr.Close();
-					EndCase(exp); 
-					exp = null;
-					//cleanup db:
-					OleDbCommand cleanup = new OleDbCommand("DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'", con);
-					cleanup.ExecuteNonQuery();
-				}
-			}
-
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.Oracle)
-			{
-				try
-				{
-					BeginCase("Use out refcursor implicitly to get resultset from stored-procedure in command type text.");
-					cmd.CommandText = "{ call ghsp_types_simple_1 (null, null, 1.234, null, null, null, null)}";
-					cmd.CommandType = CommandType.Text;
-					rdr = cmd.ExecuteReader();
-					Compare(rdr.HasRows, true);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally
-				{
-					if (rdr != null) rdr.Close();
-					EndCase(exp); 
-					exp = null;
-				}
-
-				try
-				{
-					BeginCase("Use out refcursor implicitly to get resultset from stored-procedure in CommandType.StoredProcedure.");
-					cmd.CommandText = "GHSP_TYPES_SIMPLE_1";
-					cmd.CommandType = CommandType.StoredProcedure;
-					cmd.Parameters.Add("", 123456);
-					cmd.Parameters.Add("", "asdasd");
-					cmd.Parameters.Add("", 1.234);
-					cmd.Parameters.Add("", "asdasd");
-					cmd.Parameters.Add("", "asdasd");
-					cmd.Parameters.Add("", "asdasd");
-					cmd.Parameters.Add("", "asdasd");
-					rdr = cmd.ExecuteReader();
-					Compare(rdr.HasRows, true);
-				}
-				catch(Exception ex){exp = ex;}
-				finally
-				{
-					if (rdr != null) rdr.Close();
-					EndCase(exp); 
-					exp = null;
-				}
-			}
-		}
-
-
-		//Create the compund sql statement according to the dbserver.
-		private string CreateCompundSqlStatement(string[] sqlStatements, DataBaseServer dbServer)
-		{
-			string beginStatement;
-			string endStatement;
-			string commandDelimiter;
-
-			GetDBSpecificSyntax(dbServer, out beginStatement, out endStatement, out commandDelimiter);
-
-			StringBuilder cmdBuilder = new StringBuilder();
-			cmdBuilder.Append(beginStatement);
-			cmdBuilder.Append(" ");
-			foreach (string statement in sqlStatements)
-			{
-				cmdBuilder.Append(statement);
-				cmdBuilder.Append(commandDelimiter);
-				cmdBuilder.Append(" ");
-			}
-			cmdBuilder.Append(endStatement);
-
-			return cmdBuilder.ToString();
-		}
-
-		private void GetDBSpecificSyntax(DataBaseServer dbServer, out string beginStatement, out string endStatement, out string commandDelimiter)
-		{
-			switch (dbServer)
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.PostgreSQL:
-					beginStatement = "";
-					endStatement = "";
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.Sybase:
-					beginStatement = "BEGIN";
-					endStatement = "END";
-					commandDelimiter = "";
-					break;
-				case DataBaseServer.Oracle:
-					beginStatement = "BEGIN";
-					endStatement = "END;";
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.DB2:
-					beginStatement = "BEGIN ATOMIC";
-					endStatement = "END";
-					commandDelimiter = ";";
-					break;
-
-				default:
-					this.Fail("Unknown DataBaseServer type");
-					throw new ApplicationException("Unknown DataBaseServer type");
-			}
-		}
-
-		[Test]
-		public void testBug3965()
-		{
-			Exception exp=null;
-			BeginCase("Test for bug #3965");
-			OleDbConnection con = new OleDbConnection("Provider=SQLOLEDB.1;Data Source=TESTDIR;User ID=ghuser;Password=ghuser;Persist Security Info=True;Initial Catalog=default_grasshopper_db;Packet Size=4096;Connect Timeout=60");
-			con.Open();
-			string text = "SELECT     td.TESTCYCL.TC_TEST_ID, td.TESTCYCL.TC_STATUS, td.BUG.BG_STATUS, td.BUG.BG_BUG_ID, td.BUG.BG_USER_03, td.BUG.BG_USER_09,";
-			text+=  " td.BUG.BG_USER_10, td.BUG.BG_SUMMARY,BG_DETECTION_VERSION";
-			text+= " FROM         td.TESTCYCL INNER JOIN";
-			text+= " td.TEST ON td.TESTCYCL.TC_TEST_ID = td.TEST.TS_TEST_ID INNER JOIN";
-			text+= " td.ALL_LISTS ON td.TEST.TS_SUBJECT = td.ALL_LISTS.AL_ITEM_ID RIGHT OUTER JOIN";
-			text+= " td.BUG ON td.TEST.TS_TEST_ID = td.BUG.BG_TEST_REFERENCE";
-			OleDbCommand cmd = new OleDbCommand(text,con);
-			try 
-			{		
-				cmd.ExecuteReader();
-				Compare(true,true);
-				
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-		}
-
-
-		[Test]
-		public void TestMultipleResultsets()
-		{
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle)
-			{
-				//In .NET there is a bug when calling a SP with multiple REFCURSORS, the workaround is to use OracleClient and not OleDb.
-				//In GH we are not bug complient in this issue, because there is no workaround (We do not support the OracleClient namespace.
-			    this.Log("Not testing multi result set Oracle on .NET");
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				// fail to work on .NET OLEDB
-				//reader = Microsoft.ApplicationBlocks.Data.PostgresOleDbHelper.ADOExecuteReader(cmd1);
-				this.Log("Not testing PostgreSQL CommandType.StoredProcedure which return SETOF");
-				return;
-			}
-#endif
-
-			Exception exp = null;
-			BeginCase("Test multi result set from stored procedure");
-
-				
-			OleDbDataReader reader = null;
-			OleDbTransaction tr = null;
-
-			try
-			{
-				//Check SP with the structre : insert Select + update Select + delete Select
-				if (con.State != ConnectionState.Open)
-				{
-					con.Open();
-				}
-					
-				// transaction use was add for PostgreSQL
-				tr = con.BeginTransaction();
-				OleDbCommand cmd1 = new OleDbCommand("GHSP_TYPES_SIMPLE_4", con, tr);
-				cmd1.CommandType = CommandType.StoredProcedure;
-
-				OleDbParameter param = new OleDbParameter();
-				param.ParameterName = "ID1";
-				param.Value = string.Format("13268_{0}", this.TestCaseNumber);
-				param.OleDbType = OleDbType.VarWChar;
-				cmd1.Parameters.Add(param);
-
-				reader = cmd1.ExecuteReader();
-				
-				//Count the number of result sets.
-				int resultSetCount = 0;
-				//Count the number of the records
-				int recordCounter=0;
-
-				do
-				{
-					//this.Log(string.Format("resultSetCount:{0}",resultSetCount));
-				while (reader.Read())
-				{
-					recordCounter++;
-				}
-					//this.Log(string.Format("recordCounter:{0}",recordCounter));
-					if (resultSetCount != 2)
-					{
-						Compare(recordCounter,1); //Insert + update 
-					}
-					else
-					{
-						Compare(recordCounter,0); //Delete 
-					}
-
-					recordCounter=0;
-					resultSetCount++;
-				}while (reader.NextResult());
-
-				Compare(resultSetCount,3);
-			}
-			catch (Exception ex)
-			{
-				exp=ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				if (reader != null) reader.Close();
-				tr.Commit();
-				con.Close();
-			}
-		}
-		[Test]
-		public void TestCompoundVariable()
-		{
-			OleDbDataReader rdr = null;
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				this.Log("not testing PostgreSQL");
-				return;
-			}
-
-			Exception exp = null;
-			try
-			{
-				BeginCase("Check sql statement that declares a local variable and uses it.");
-
-				if (con.State != ConnectionState.Open)
-				{
-					con.Open();
-				}
-
-				string sqlTxt = "";
-				switch (ConnectedDataProvider.GetDbType(cmd.Connection))
-				{
-					case DataBaseServer.SQLServer:
-						sqlTxt = "declare @var int; select @var=1;";
-						break;
-					case DataBaseServer.Sybase:
-						sqlTxt = "declare @var int select @var=1";
-						break;
-					case DataBaseServer.Oracle:
-						sqlTxt = "declare var int;begin var:=1;end;";
-						break;
-					case DataBaseServer.DB2:
-						sqlTxt = "begin atomic declare var integer; set var = 1; end";
-						break;
-					case DataBaseServer.PostgreSQL:
-						// we don't know how the heck to do this in PostgreSQL
-						sqlTxt = "";
-						break;
-					default:
-						throw new ApplicationException(string.Format("GHT: Unknown DataBaseServer '{0}'", ConnectedDataProvider.GetDbType(cmd.Connection)));
-				}
-				cmd.CommandText = sqlTxt;
-				rdr = cmd.ExecuteReader();
-				Compare(rdr.Read(), false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally
-			{
-				if (rdr != null) rdr.Close();
-				EndCase(exp); 
-				exp = null;
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteScalar.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteScalar.cs
deleted file mode 100755
index 135317363e4..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteScalar.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_ExecuteScalar : GHTBase
-	{
-		OleDbConnection	con;
-		OleDbCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-
-				//prepare Data
-				OleDbCommand cmdPrepare = new OleDbCommand("", con);
-				cmdPrepare.CommandText = "DELETE FROM Employees WHERE EmployeeID = 99999";
-				cmdPrepare.ExecuteNonQuery();
-				cmdPrepare.CommandText = "INSERT INTO Employees (EmployeeID, FirstName, LastName) VALUES (99999,'OferXYZ', 'Testing')";
-				cmdPrepare.ExecuteNonQuery();
-				cmdPrepare.Dispose();
-
-				cmd = new OleDbCommand("", con);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbCommand_ExecuteScalar tc = new OleDbCommand_ExecuteScalar();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_ExecuteScalar");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			object objResult = null;
-
-			cmd.CommandText="Select FirstName,City From Employees Where EmployeeID=-1";
-
-			try
-			{
-				BeginCase("Execute Scalar");
-				objResult = cmd.ExecuteScalar();
-				Compare(objResult==null,true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			cmd.CommandText="Select FirstName,City From Employees Where EmployeeID=99999 ";
-		
-			try
-			{
-				BeginCase("Execute Scalar");
-				objResult = cmd.ExecuteScalar();
-				Compare(objResult.ToString(), "OferXYZ");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("Execute Scalar again");
-				objResult = cmd.ExecuteScalar();
-				Compare(objResult.ToString(), "OferXYZ");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_New.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_New.cs
deleted file mode 100755
index 1a4c2bafce2..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_New.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbCommand_New : GHTBase
-{
-	public static void Main()
-	{
-		OleDbCommand_New tc = new OleDbCommand_New();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDBCommand_New");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbCommand cmd = null;
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString );
-		OleDbTransaction tran;
-
-
-		try
-		{
-			BeginCase("OleDbCommand New");
-			cmd = new OleDbCommand();
-			Compare(cmd==null, false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OleDbCommand - new CommandText");
-			cmd = new OleDbCommand("Select * from Table");
-			Compare(cmd==null, false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OleDbCommand CommandText");
-			Compare(cmd.CommandText , "Select * from Table");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OleDbCommand - Connection");
-			cmd = new OleDbCommand("Select * from Table",con);
-			Compare(cmd.Connection ,con);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con.Open();
-		tran = con.BeginTransaction();
-
-		try
-		{
-			BeginCase("OleDbCommand - Transaction");
-			cmd = new OleDbCommand("Select * from Table",con,tran);
-			Compare(cmd.Transaction ,tran);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		
-		if (con.State == ConnectionState.Open) con.Close();
-
-	}
-}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs
deleted file mode 100755
index 7752016f55c..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_Parameters : ADONetTesterClass 
-	{
-		//Used to test GUID.
-		private const string TEST_GUID_STRING = "239A3C5E-8D41-11D1-B675-00C04FA3C554";
-
-		private Exception exp;
-		public static void Main()
-		{
-			OleDbCommand_Parameters tc = new OleDbCommand_Parameters();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_Parameters");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-
-			#region Simple Tests
-			//string str="";
-			string sql;
-			OleDbConnection con = null;
-
-			sql = "UPDATE Employees SET Region = ?, TitleOfCourtesy = ? WHERE EmployeeID=1";
-			con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			
-			//not testing with DB2 provider
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.DB2) 
-			{
-
-				OleDbCommand cmd = new OleDbCommand(sql, con);
-				cmd.Parameters.Add(new OleDbParameter("Region", OleDbType.VarWChar));
-				cmd.Parameters.Add(new OleDbParameter("TitleOfCourtesy", OleDbType.VarWChar));
-
-				con.Open();
-				cmd.Parameters["Region"].Value = "WA";
-				cmd.Parameters["TitleOfCourtesy"].Value = "Mr";
-
-				//return the number of rows affected
-				int i = cmd.ExecuteNonQuery();
-
-				try
-				{
-					BeginCase("Check row count");
-					Compare(i, 1);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			}
-
-			if (con.State == ConnectionState.Open) con.Close();
-			#endregion
-			#region Test Parameter Types
-			#region General
-			TypesSubTests(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			TypesSubTests(ConnectedDataProvider.GetExtendedDbTypesParameters());
-			#endregion
-			#endregion
-		}
-
-		private void TypesSubTests(DbTypeParametersCollection typesToTest)
-		{
-			DbTypeParametersCollection currentlyTested = new DbTypeParametersCollection(typesToTest.TableName);
-			int affectedRows;
-			string rowId = string.Empty;
-
-			foreach (DbTypeParameter currentParamType in typesToTest)
-			{
-				try
-				{
-					BeginCase("Test INSERT with parameter of type: " + currentParamType.DbTypeName);
-					rowId = string.Format("13282_{0}", this.TestCaseNumber);
-					currentlyTested.Clear();
-					currentlyTested.Add(currentParamType);
-					affectedRows = currentlyTested.ExecuteInsert(rowId);
-					Compare(affectedRows, 1);
-				} 
-				catch(Exception ex)
-				{
-					exp = ex;
-				}
-				finally
-				{
-					EndCase(exp);
-					exp = null;
-					currentlyTested.ExecuteDelete(rowId);
-				}
-			}
-		}
-
-		//Test insertion of a GUID parameter on MSSQLServer.
-		[Test]
-		public void DoTestGUIDOnMSSQLServer()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer)
-				return;
-			DbTypeParametersCollection guidRow = new DbTypeParametersCollection(ConnectedDataProvider.SPECIFIC_TYPES_TABLE_NAME);
-			guidRow.Add("UNIQUEIDENTIFIER", new Guid(TEST_GUID_STRING));
-			TypesSubTests(guidRow);
-		}
-		//Test problems specific to the TIME type on DB2.
-		[Test]
-		public void DoTestTimeOnDB2()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2)
-				return;
-
-			OleDbConnection conn = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-			string rowId = string .Empty;
-
-			try
-			{
-				BeginCase("Test INSERT to TIME column using only TimeOfDate part of DateTime");
-				rowId = "13282_" + this.TestCaseNumber.ToString();
-				OleDbCommand cmd = new OleDbCommand();
-				conn.Open();
-				cmd.Connection = conn;
-				cmd.CommandText = string.Format("INSERT INTO {0} (ID, T_TIME) VALUES ('{1}', ?)",ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME ,rowId);
-				cmd.Parameters.Add("time", DateTime.Now.TimeOfDay);
-				int affectedRows;
-				affectedRows = cmd.ExecuteNonQuery();
-				Compare(affectedRows, 1);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				DbTypeParametersCollection.ExecuteDelete(ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME, rowId);
-				conn.Close();
-			}
-
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void DoTestTimeOnDB2_bug3391()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2)
-				return;
-
-			OleDbConnection conn = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-			string rowId = string .Empty;
-
-			try {
-				BeginCase("Test INSERT to TIME column using all of the DateTime");
-				rowId = "13282_" + this.TestCaseNumber.ToString();
-				OleDbCommand cmd = new OleDbCommand();
-				conn.Open();
-				cmd.Connection = conn;
-				cmd.CommandText = string.Format("INSERT INTO {0} (ID, T_TIME) VALUES ('{1}', ?)",ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME ,rowId);
-				cmd.Parameters.Add("time", DateTime.Now);
-				try {
-					cmd.ExecuteNonQuery();
-					ExpectedExceptionNotCaught("System.OleDbException");
-				}
-				catch (OleDbException ex) {
-					ExpectedExceptionCaught(ex);
-				}
-			}
-			catch (Exception ex) {
-				exp = ex;
-			}
-			finally {
-				EndCase(exp);
-				exp = null;
-				DbTypeParametersCollection.ExecuteDelete(ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME, rowId);
-				conn.Close();
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Prepare.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Prepare.cs
deleted file mode 100755
index 5e6b4008263..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Prepare.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommand_Prepare : GHTBase
-	{
-		public static void Main()
-		{
-			OleDbCommand_Prepare tc = new OleDbCommand_Prepare();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbCommand_Prepare");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			int intRecordsAffected = 0;
-
-			string sql = "Update Shippers Set CompanyName=? Where ShipperID = 2";
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OleDbCommand cmd = new OleDbCommand("", con);
-			con.Open();
-
-
-			//get expected result
-			cmd.CommandText = "select count(*) from Shippers where ShipperID = 2";
-			int ExpectedRows = int.Parse(cmd.ExecuteScalar().ToString());
-
-			cmd.CommandText = sql;
-
-			//Currently not running on DB2: .Net-Failed, GH:Pass
-			//if (con.Provider.IndexOf("IBMDADB2") >= 0) return ;
-
-			cmd.Parameters.Add(new OleDbParameter()); 
-			cmd.Parameters[0].ParameterName = "CompName";
-			cmd.Parameters[0].OleDbType = OleDbType.VarWChar; //System.InvalidOperationException:
-			cmd.Parameters[0].Size = 20; //System.InvalidOperationException
-			cmd.Parameters[0].SourceColumn = "CompanyName";
-			cmd.Parameters[0].Value = "Comp1";
-
-			try
-			{
-				BeginCase("Prepare Exception - missing OleDbType");
-				try
-				{
-					cmd.Parameters[0].OleDbType = OleDbType.Empty ;
-					cmd.Prepare();
-				}
-				catch (Exception ex) {exp = ex;}
-				Compare(exp.GetType().FullName, typeof(InvalidOperationException).FullName );
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			cmd.Parameters[0].OleDbType = OleDbType.VarWChar; 
-
-			try
-			{
-				BeginCase("Prepare Exception - missing Size");
-				try
-				{
-					cmd.Parameters[0].Size = 0;
-					cmd.Prepare();
-				}
-				catch (Exception ex) {exp = ex;}
-				Compare(exp.GetType().FullName, typeof(InvalidOperationException).FullName );
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			cmd.Parameters[0].Size = 20;
-
-			try
-			{
-				BeginCase("Prepare Exception - missing Size");
-				try
-				{
-					con.Close();
-					cmd.Prepare();
-				}
-				catch (Exception ex) {exp = ex;}
-				Compare(exp.GetType().FullName, typeof(InvalidOperationException).FullName );
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			con.Open();
-
-			try
-			{
-				BeginCase("ExecuteNonQuery first time");
-				intRecordsAffected = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected , ExpectedRows);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("ExecuteNonQuery second time, chage value");
-				cmd.Parameters[0].Value = "Comp2";
-				intRecordsAffected  = cmd.ExecuteNonQuery();
-				Compare(intRecordsAffected , ExpectedRows);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-	
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Transaction.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Transaction.cs
deleted file mode 100755
index 244cb5e7ea3..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Transaction.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class TestId13266 : GHTBase
-{
-	public static void Main()
-	{
-		TestId13266 tc = new TestId13266();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbCommand_Transaction");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-
-		Exception exp = null;
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OleDbTransaction txn = con.BeginTransaction();
-		OleDbCommand cmd = new OleDbCommand("Select * From Employees", con);
-
-		try
-		{
-			BeginCase("check Transaction property - default");
-			Compare(cmd.Transaction==null , true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		cmd.Transaction = txn;
-
-		try
-		{
-			BeginCase("check Transaction property");
-			Compare(cmd.Transaction , txn);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		
-		if (con.State == ConnectionState.Open) con.Close();
-
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommandBuilder/OleDbCommandBuilder_DeriveParameters_O.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommandBuilder/OleDbCommandBuilder_DeriveParameters_O.cs
deleted file mode 100755
index 2e31e97e4bf..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommandBuilder/OleDbCommandBuilder_DeriveParameters_O.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbCommandBuilder_DeriveParameters_O : GHTBase
-	{
-		OleDbConnection	con;
-		OleDbCommand cmd;
-		Exception exp = null;
-
-		[SetUp]
-		public void SetUp()
-		{
-			exp=null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-				con.Open();
-				cmd = new OleDbCommand("", con);
-				Compare("Setup", "Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbCommandBuilder_DeriveParameters_O tc = new OleDbCommandBuilder_DeriveParameters_O();
-			try
-			{
-				tc.BeginTest("OleDbCommandBuilder_DeriveParameters_O");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-
-		public void run()
-		{
-            RetrieveParameters();
-		}
-
-		[Test]
-		public void RetrieveParameters()
-		{
-			exp = null;
-
-			try
-			{
-				BeginCase("retrieve parameters");
-				
-				if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.DB2)
-				{
-					this.Skip("Not Implemented on DB2.");
-					return;
-				}
-
-				switch (ConnectedDataProvider.GetDbType(con))
-				{
-//					case MonoTests.Utils.DataBaseServer.PostgreSQL:
-//						cmd = new OleDbCommand("GH_MULTIRECORDSETS('a','b','c')", con);
-//						break;
-					default:
-						cmd = new OleDbCommand("GH_MultiRecordSets", con);
-						break;
-				}
-				
-				cmd.CommandType = CommandType.StoredProcedure;
-				OleDbCommandBuilder.DeriveParameters(cmd);
-
-				switch (ConnectedDataProvider.GetDbType(con))
-				{
-					case DataBaseServer.SQLServer:
-					case DataBaseServer.Sybase:
-						Compare(cmd.Parameters.Count, 1);
-						Compare(cmd.Parameters[0].Direction, ParameterDirection.ReturnValue);
-						Compare(cmd.Parameters[0].ParameterName, "RETURN_VALUE");
-						break;
-				
-					case DataBaseServer.Oracle:
-						Compare(cmd.Parameters.Count, 3);
-						Compare(cmd.Parameters[0].Direction, ParameterDirection.Output);
-						Compare(cmd.Parameters[1].Direction, ParameterDirection.Output);
-						Compare(cmd.Parameters[2].Direction, ParameterDirection.Output);
-						Compare(cmd.Parameters[0].ParameterName, "RCT_EMPLOYEES");
-						break;
-
-					case DataBaseServer.PostgreSQL:
-						Compare(cmd.Parameters.Count, 1);
-						Compare(cmd.Parameters[0].Direction, ParameterDirection.ReturnValue);
-						Compare(cmd.Parameters[0].ParameterName, "returnValue");
-						break;
-
-					default:
-						throw new ApplicationException(string.Format("GHT: Test not implemented for DB type {0}", ConnectedDataProvider.GetDbType(con)));
-				}
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/IDBConnection_For_OleDb.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/IDBConnection_For_OleDb.cs
deleted file mode 100755
index 97fd6f120ed..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/IDBConnection_For_OleDb.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	class IDBConnection_For_OleDb : GHTBase
-	{
-		string _ConnectionString = "";
-		[SetUp]
-		public void SetUp()
-		{
-			try
-			{
-				_ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			catch(Exception ex)
-			{
-				EndCase(ex);
-			}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			IDBConnection_For_OleDb tc = new IDBConnection_For_OleDb();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("IDBConnection_For_OleDb");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			IDbConnection ICon = new OleDbConnection();
-
-			try
-			{
-				BeginCase("check IDbConnection is null");
-				Compare(ICon != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection type");
-				Compare(ICon.GetType().FullName ,typeof(OleDbConnection).FullName);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			ICon = new OleDbConnection(_ConnectionString);
-
-			try
-			{
-				BeginCase("check IDbConnection connection string");
-				Compare(ICon.ConnectionString ,_ConnectionString);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection ConnectionTimeout");
-				Compare(ICon.ConnectionTimeout ,15);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection state - closed");
-				Compare(ICon.State ,ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			ICon.Open();
-
-			try
-			{
-				BeginCase("check IDbConnection - open");
-				Compare(ICon.State ,ConnectionState.Open );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check IDbConnection CreateCommand");
-				IDbCommand cmd = ICon.CreateCommand();
-				Compare(cmd.GetType().FullName ,typeof(OleDbCommand).FullName);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (ICon.State == ConnectionState.Open) ICon.Close();
-
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_BeginTransaction.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_BeginTransaction.cs
deleted file mode 100755
index 60f25728893..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_BeginTransaction.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbConnection_BeginTransaction : ADONetTesterClass
-	{
-		Exception exp = null;
-		OleDbConnection con = null;
-		OleDbTransaction tran = null;
-
-		public static void Main()
-		{
-			OleDbConnection_BeginTransaction tc = new OleDbConnection_BeginTransaction();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbConnection_BeginTransaction");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[SetUp]
-		public void SetUp() {
-			con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-		}
-
-		[TearDown]
-		public void TearDown() {
-			if (con != null && con.State == ConnectionState.Open) con.Close();
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void TestBeginTransactionChaos() {
-
-			DataBaseServer dbType = ConnectedDataProvider.GetDbType(con);
-			// not supported on DB2 and Oracle and Sybase
-			if (dbType != DataBaseServer.Oracle && dbType != DataBaseServer.DB2 && dbType != DataBaseServer.Sybase) {
-				con.Close();
-				con.Open();
-				try {
-					BeginCase("BeginTransaction - IsolationLevel Chaos");
-					tran = con.BeginTransaction(IsolationLevel.Chaos);
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			}
-			/*	not supported by MSSQL,DB2,Oracle
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel Unspecified");
-					tran = con.BeginTransaction(IsolationLevel.Unspecified );
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			*/
-			
-		}
-
-		[Test]
-		public void run()
-		{
-			try
-			{
-				BeginCase("BeginTransaction");
-				tran = con.BeginTransaction();
-				Compare(tran == null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			con.Close();
-			con.Open();
-			try
-			{
-				BeginCase("BeginTransaction - IsolationLevel ReadCommitted");
-				tran = con.BeginTransaction(IsolationLevel.ReadCommitted);
-				Compare(tran == null, false);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		
-			DataBaseServer dbType = ConnectedDataProvider.GetDbType(con);
-
-			//Not supported by JDBC driver for oracle
-			if (dbType != DataBaseServer.Oracle) 
-			{
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel ReadUncommitted");
-					tran = con.BeginTransaction(IsolationLevel.ReadUncommitted );
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel RepeatableRead");
-					tran = con.BeginTransaction(IsolationLevel.RepeatableRead);
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				con.Close();
-				con.Open();
-				try
-				{
-					BeginCase("BeginTransaction - IsolationLevel Serializable");
-					tran = con.BeginTransaction(IsolationLevel.Serializable );
-					Compare(tran == null, false);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ChangeDatabase.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ChangeDatabase.cs
deleted file mode 100755
index b57dd2564ee..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ChangeDatabase.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_ChangeDatabase : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OleDbConnection_ChangeDatabase tc = new OleDbConnection_ChangeDatabase();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("NoName");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-
-		//Currently not running on Oracle/DB2: .Net-Failed, GH:Pass
-		//not runnig on postgres because "The 'current catalog' property is not supported by the 'Mainsoft.JDBC.OLEDB.1' provider."
-		if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle  &&
-			ConnectedDataProvider.GetDbType(con) != DataBaseServer.DB2 && 
-			ConnectedDataProvider.GetDbType(con) != DataBaseServer.Sybase &&
-			ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL)
-		{
-			try
-			{
-				BeginCase("Change DataBase");
-				con.ChangeDatabase("GHTDB_EX");
-				Compare(con.Database , "GHTDB_EX");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check DataBase Changed ");
-				OleDbCommand cmd = new OleDbCommand("select count(*) from Customers", con);
-				object obj = cmd.ExecuteScalar();
-				Compare(obj != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Close.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Close.cs
deleted file mode 100755
index 862231154e3..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Close.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbConnection_Close : GHTBase
-	{
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			OleDbConnection_Close tc = new OleDbConnection_Close();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbConnection_Close");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			try
-			{
-				BeginCase("Close without open");
-				con.Close();
-				Compare(con.State , ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			con.Open();
-
-			try
-			{
-				BeginCase("Close after open");
-				con.Close();
-				Compare(con.State , ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			//An application can call Close more than one time. 
-			//No exception is generated.
-			try
-			{
-				BeginCase("Close again");
-				con.Close();
-				Compare(con.State , ConnectionState.Closed);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
deleted file mode 100755
index ba1a47afc57..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OleDb ;
-using System.Collections;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbConnection_ConnectionString : GHTBase
-	{
-		private Exception exp = null;
-		private OleDbConnection con = new OleDbConnection();
-
-		public static void Main()
-		{
-			OleDbConnection_ConnectionString tc = new OleDbConnection_ConnectionString();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbConnection_ConnectionString");
-
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-			SetConnectionString();
-			ConstractorWithConnectionString();
-			DB2MissingProperties();
-			TestCaseForBug3925();
-		}
-
-		#region Tests
-		[Test]
-		public void DB2MissingProperties()
-		{
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2)
-			{
-				Log("The 'DB2MissingProperties' subtest did not ran because it is relevant only for runs on DB2." );
-				return;
-			}
-			string[] propsToUse;
-			string description;
-
-			//The complete list of properties is:
-			//Provider, Password, User ID, Data Source, HostName, Port, Location, retrieveMessagesFromServerOnGetMessage
-			
-			description = "Test connection string without 'retrieveMessagesFromServerOnGetMessage'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "HostName", "Port", "Location"};
-			DoTestWithSpecificProperties(propsToUse, description);
-
-			description = "Test connection string without 'HostName'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "Port", "Location", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-			
-			description = "Test connection string without 'Port'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "HostName", "Location", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-			
-			description = "Test connection string without 'Location'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "HostName", "Port", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-			
-			description = "Test connection string without 'HostName' & 'Port'";
-			propsToUse = new string[] {"Provider", "Password", "User ID", "Data Source", "Location", "retrieveMessagesFromServerOnGetMessage"};
-			DoTestWithSpecificProperties(propsToUse, description);
-		}
-
-		void DoTestWithSpecificProperties(string[] propsToUse, string description)
-		{
-			try
-			{
-				BeginCase(description);
-				exp = null;
-				Hashtable connectionProps = GetConnectionStringProps(ConnectedDataProvider.ConnectionString);
-				string actualConString = CreateConStringWithProps(propsToUse, connectionProps);
-				con = new OleDbConnection(actualConString);
-				con.Open();
-				Compare(con.State, ConnectionState.Open);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp=null;
-				if (con != null && con.State == ConnectionState.Open)
-				{
-					con.Close();
-				}
-			}
-		}
-
-		[Test]
-		public void ConstractorWithConnectionString()
-		{
-			con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			try
-			{
-				BeginCase("Constructor with ConnectionString");
-				Compare(con.ConnectionString, MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp); 
-				exp = null;
-			}
-		}
-
-		[Test]
-		public void SetConnectionString()
-		{
-			con.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			try
-			{
-				BeginCase("Set ConnectionString");
-				Compare(con.ConnectionString, MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp); 
-				exp = null;
-			}
-		}
-		[Test]
-#if !JAVA
-		[Category ("NotWorking")]
-#endif
-		public void TestCaseForBug3925()
-		{
-			exp=null;
-			try
-			{
-				BeginCase("Test Case for bug #3925");
-
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer)
-			{
-				Skip("This test currently runs only on SQLServer in java.");
-				return;
-			}
-				Hashtable conProps = GetConnectionStringProps(ConnectedDataProvider.ConnectionString);
-				string server = (string)conProps["Data Source"];
-				string user = (string)conProps["User Id"];
-				string password = (string)conProps["Password"];
-				string database = (string)conProps["Initial Catalog"];
-				string jdbcUrlTemplate = "JdbcDriverClassName=com.microsoft.jdbc.sqlserver.SQLServerDriver;JdbcURL=\"jdbc:microsoft:sqlserver://{0};User={1};Password={2};DatabaseName={3}\"";
-				string conStr = string.Format(jdbcUrlTemplate, server, user, password, database);
-				con = new OleDbConnection(conStr);
-				con.Open();
-				Compare(ConnectionState.Open, con.State);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-		#endregion
-		#region Utilities
-		private string CreateConStringWithProps(string[] propsToUse, Hashtable connectionProps)
-		{
-			StringBuilder actualConStringBuilder = new StringBuilder();
-			foreach(string prop in propsToUse)
-			{
-				string propString = string.Format("{0}={1}", prop, connectionProps[prop]);
-				actualConStringBuilder.Append(propString);
-				actualConStringBuilder.Append(";");
-			}
-			return actualConStringBuilder.ToString();
-		}
-
-		private Hashtable GetConnectionStringProps(string connectionString)
-		{
-			string[] connectionStringProps = connectionString.Split(';');
-			Hashtable connectionProps = new Hashtable();
-			foreach(string prop in connectionStringProps)
-			{
-				string[] keyValue = prop.Split('=');
-				if (keyValue.Length == 2)
-				{
-					connectionProps.Add(keyValue[0], keyValue[1]);
-				}
-				else
-				{
-					connectionProps.Add(prop, prop);
-				}
-			}
-			return connectionProps;
-		}
-
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionTimeout.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionTimeout.cs
deleted file mode 100755
index 04b28cc6acb..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionTimeout.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_ConnectionTimeout : GHTBase
-{
-	public static void Main()
-	{
-		OleDbConnection_ConnectionTimeout tc = new OleDbConnection_ConnectionTimeout();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_ConnectionTimeout");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString + ";Connect timeout=44");
-
-		try
-		{
-			BeginCase("ConnectionTimeout from Connection string");
-			Compare(con.ConnectionTimeout , 44);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		try
-		{
-			BeginCase("ConnectionTimeout default");
-			Compare(con.ConnectionTimeout , 15);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_CreateCommand.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_CreateCommand.cs
deleted file mode 100755
index c00e0e6e40f..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_CreateCommand.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_CreateCommand : GHTBase
-{
-	public static void Main()
-	{
-		OleDbConnection_CreateCommand tc = new OleDbConnection_CreateCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_CreateCommand");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con = new OleDbConnection();
-		OleDbCommand cmd = null;
-		
-		try
-		{
-			BeginCase("CreateCommand");
-			cmd = con.CreateCommand();
-			Compare(cmd!=null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_DataSource.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_DataSource.cs
deleted file mode 100755
index 5b178f1e947..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_DataSource.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_DataSource : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OleDbConnection_DataSource tc = new OleDbConnection_DataSource();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_DataSource");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		//test does not apply to ORACLE,DB2,Postgres
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.DB2) return;
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL) return;
-
-		//get the expected result from the connection string
-		string[] arrCon = con.ConnectionString.Split(';');
-		string result = null;
-		for (int i=0; i < arrCon.Length; i++)
-			if (arrCon[i].IndexOf("Data Source") >= 0) 
-			{
-				result = arrCon[i];
-				break;
-			}
-		result = result.Substring(result.IndexOf('=')+1).Trim();
-		try
-		{
-			BeginCase("check DataSource");
-			Compare(con.DataSource  , result);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Database.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Database.cs
deleted file mode 100755
index f9eda834195..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Database.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_Database : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OleDbConnection_Database tc = new OleDbConnection_Database();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_Database");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-        OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		//test does not apply to ORACLE,DB2,Sybase,Postgres
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.DB2) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.Sybase) return;
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL) return;
-
-		//get the expected result from the connection string
-		string[] arrCon = con.ConnectionString.Split(';');
-		string result = null;
-		for (int i=0; i < arrCon.Length; i++)
-			if (arrCon[i].IndexOf("Initial Catalog") >= 0) 
-			{
-				result = arrCon[i];
-				break;
-			}
-		result = result.Substring(result.IndexOf('=')+1).Trim();
-		try
-		{
-			BeginCase("check Database");
-			Compare(con.Database , result);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Equals.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Equals.cs
deleted file mode 100755
index 845df526360..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Equals.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_Equals : GHTBase
-{
-	public static void Main()
-	{
-		OleDbConnection_Equals tc = new OleDbConnection_Equals();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_Equals");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con1 ,con2,con3;
-        
-		con1 = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString );
-		con3 = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString );
-
-		con2 = con1;
-        con1.Open ();
-
-		try
-		{
-			BeginCase("Equals 1");
-			Compare(con1.Equals(con2),true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Equals 2");
-			Compare(Equals(con2,con1),true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Equals 3");
-			Compare(con1.Equals(con3),false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con1.Close();
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs
deleted file mode 100755
index e11714cd7ae..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_GetOleDbSchemaTable.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_GetOleDbSchemaTable : ADONetTesterClass
-{
-	public static void Main()
-	{
-		OleDbConnection_GetOleDbSchemaTable tc = new OleDbConnection_GetOleDbSchemaTable();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_GetOleDbSchemaTable");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-	
-		Exception exp = null;
-		//bool NextResultExists = false;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-
-		DataTable dt = null;
-		try
-		{
-			BeginCase("Check table is not null");
-			dt = con.GetOleDbSchemaTable(OleDbSchemaGuid.Tables,new object[] {null,null,null,"TABLE"});
-			Compare(dt == null,false);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-
-
-		//check that some of the tables exists
-		try
-		{
-			BeginCase("Table Orders");
-			Compare(dt.Select("TABLE_NAME='Orders'").Length ,1 );  
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Table Order Details");
-			Compare(dt.Select("TABLE_NAME='Order Details'").Length ,1 );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Table Customers");
-			int expected = (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle) ? 1 : 2; // in Oracle return a value of 2 instead of 1. ?????
-			Compare(dt.Select("TABLE_NAME='Customers'").Length ,expected );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Table Employees");
-			Compare(dt.Select("TABLE_NAME='Employees'").Length ,1 );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-
-
-		
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_InfoMessage.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_InfoMessage.cs
deleted file mode 100755
index abf66deb847..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_InfoMessage.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Threading;
-using System.Data;
-using NUnit.Framework;
-using MonoTests.System.Data.Utils;
-
-using System.Data.OleDb;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbConnection_InfoMessage : GHTBase
-	{
-		private int errorCounter=0;
-		public static void Main()
-		{
-			OleDbConnection_InfoMessage tc = new OleDbConnection_InfoMessage();
-			Exception exp = null;
-			try
-			{
-				// Every Test must begin with BeginTest
-				tc.BeginTest("OleDbConnection_InfoMessage");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				// Every Test must End with EndTest
-				tc.EndTest(exp);
-			}
-		}
-
-		public void run()
-		{
-			Exception exp = null;
-
-			// Start Sub Test
-			try
-			{
-				test();
-				
-				
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				// Every Sub Test must end with EndCase
-				EndCase(exp);
-				exp = null;
-			}
-			// End Sub Test
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void test()
-		{
-			BeginCase("InfoMessage testing");
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			con.InfoMessage+=new OleDbInfoMessageEventHandler(con_InfoMessage);
-			generateError(con);
-			con.Close();
-		}
-		private void generateError(OleDbConnection con)
-		{
-			string errorString = string.Empty;
-			OleDbCommand cmd = new OleDbCommand(string.Empty,con); 
-
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-				{
-					cmd.CommandText  = "Raiserror ('A sample SQL informational message',10,1)";
-					break;
-				}
-				case DataBaseServer.Oracle:
-				case DataBaseServer.PostgreSQL:
-				{
-					cmd.CommandText = "GH_ERROR";
-					//cmd.CommandText = "print 'This is a warning.'";
-					//cmd.CommandText = "select   count(SUPPLIERID) from GHTDB.PRODUCTS";
-					cmd.CommandType = CommandType.StoredProcedure;
-					break;
-				}
-
-				case DataBaseServer.DB2:
-				{
-					cmd.CommandText = "SIGNAL SQLSTATE '99999' SET MESSAGE_TEXT ='Blah Blah';";
-					break;
-				}
-
-				default:
-				{
-					throw new NotImplementedException(string.Format("GHT: Test is not implemented for {0}", ConnectedDataProvider.GetDbType(con))); 
-				}
-			}
-
-			
-			//cmd.CommandType = CommandType.StoredProcedure;
-			
-				cmd.ExecuteNonQuery();
-		
-		
-		
-//				cmd.CommandText = "TestInfoMessage";
-//				cmd.CommandType = CommandType.StoredProcedure;
-
-			
-			if (errorCounter == 0)
-			{
-				Thread.Sleep(5000);	
-			}
-			Compare(errorCounter,1);
-		}
-
-		private void con_InfoMessage(object sender, OleDbInfoMessageEventArgs e)
-		{
-			
-			foreach(OleDbError err in e.Errors)
-			{
-				errorCounter++;
-				
-			}
-
-		}
-
-		//Activate This Construntor to log All To Standard output
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_New.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_New.cs
deleted file mode 100755
index 929d7ceaaf3..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_New.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_New : GHTBase
-{
-	public static void Main()
-	{
-		OleDbConnection_New tc = new OleDbConnection_New();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_New");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con = null;
-		try
-		{
-			BeginCase("OleDbConnection ctor");
-			con = new OleDbConnection();
-			Compare(con != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OleDbConnection ctor connection string");
-			con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			Compare(con != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OleDbConnection check connection string");
-			Compare(con.ConnectionString  ,MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString  );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Open.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Open.cs
deleted file mode 100755
index 8c0193c94c6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Open.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbConnection_Open : GHTBase
-	{
-		OleDbConnection con = null;
-		string ConString = "";
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				ConString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbConnection_Open tc = new OleDbConnection_Open();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDBOpenConnection");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-      
-			BeginCase("Open Connection ");
-			try
-			{
-				con = new OleDbConnection(ConString);
-				con.Open();
-				Compare(con.State , ConnectionState.Open);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (con != null) con.Close();
-				EndCase(exp);
-				exp = null;
-			}
-		
-			ConString = ConString.Replace("User Id", "uid");
-
-			BeginCase("Open Connection - uid");
-			try
-			{
-				con = new OleDbConnection(ConString);
-				con.Open();
-				Compare(con.State , ConnectionState.Open);
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (con != null) con.Close();
-				EndCase(exp);
-				exp = null;
-			}
-
-			BeginCase("Open Connection - garbage value");
-			try
-			{
-				con = new OleDbConnection("xxx");
-				con.Open();
-			}
-			catch (ArgumentException ex)
-			{
-				ExpectedExceptionCaught(ex); 
-			}
-			catch 
-			{
-				ExpectedExceptionNotCaught("System.ArgumentException");
-			}
-			finally
-			{
-				if (con != null) con.Close();
-				EndCase(exp);
-				exp = null;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Provider.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Provider.cs
deleted file mode 100755
index ac37334450a..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_Provider.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_Provider : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OleDbConnection_Provider tc = new OleDbConnection_Provider();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_Provider");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-		//test does not apply to ORACLE,DB2
-		if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) return;
-		if (ConnectedDataProvider.GetDbType(con) ==  DataBaseServer.DB2) return;
-
-		//get the expected result from the connection string
-		string[] arrCon = con.ConnectionString.Split(';');
-		string result = null;
-		for (int i=0; i < arrCon.Length; i++)
-			if (arrCon[i].IndexOf("Provider") >= 0) 
-			{
-				result = arrCon[i];
-				break;
-			}
-		result = result.Substring(result.IndexOf('=')+1).Trim();
-		try
-		{
-			BeginCase("check Provider");
-			Compare(con.Provider   , result);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_State.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_State.cs
deleted file mode 100755
index 24e2eb5f0f3..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_State.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_State : GHTBase
-{
-	public static void Main()
-	{
-		OleDbConnection_State tc = new OleDbConnection_State();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("NoName");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-        
-		// ----------- reserved for future versions of the product ---------------
-		//Broken	The connection to the data source is broken. This can occur only after the connection has been opened. A connection in this state may be closed and then re-opened. (This value is reserved for future versions of the product).
-		//Connecting  The connection object is connecting to the data source. (This value is reserved for future versions of the product.) 2 
-		//Executing The connection object is executing a command. (This value is reserved for future versions of the product.) 4 
-		//Fetching  The connection object is retrieving data. (This value is reserved for future versions of the product.) 8 
-
-		//-------------- checking only the following: ----------------
-		//Closed  The connection is closed.  
-		//Open  The connection is open. 
-
-		try
-		{
-			BeginCase("ConnectionState Closed");
-			Compare(con.State ,ConnectionState.Closed );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ConnectionState Open");
-			con.Open();
-			Compare(con.State ,ConnectionState.Open  );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		con.Close();
-
-		try
-		{
-			BeginCase("ConnectionState Closed after open");
-			Compare(con.State ,ConnectionState.Closed );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_StateChange.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_StateChange.cs
deleted file mode 100755
index d8f88ee7632..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_StateChange.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbConnection_StateChange : GHTBase
-{
-	public static void Main()
-	{
-		OleDbConnection_StateChange tc = new OleDbConnection_StateChange();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbConnection_StateChange");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-
-	bool blnEventRaised = false;
-	ConnectionState OriginalState,CurrentState;
-
-	[Test]
-	public void run()
-	{
-		
-		Exception exp = null;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-        
-		// ----------- reserved for future versions of the product ---------------
-		//Broken	The connection to the data source is broken. This can occur only after the connection has been opened. A connection in this state may be closed and then re-opened. (This value is reserved for future versions of the product).
-		//Connecting  The connection object is connecting to the data source. (This value is reserved for future versions of the product.) 2 
-		//Executing The connection object is executing a command. (This value is reserved for future versions of the product.) 4 
-		//Fetching  The connection object is retrieving data. (This value is reserved for future versions of the product.) 8 
-
-		//-------------- checking only the following: ----------------
-		//Closed  The connection is closed.  
-		//Open  The connection is open. 
-
-
-		//add event handler
-		con.StateChange +=new StateChangeEventHandler(con_StateChange);
-
-		con.Open();
-		try
-		{
-			BeginCase("ConnectionState Closed");
-			Compare(blnEventRaised,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OriginalState Closed");
-			Compare(OriginalState,ConnectionState.Closed );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("CurrentState Open");
-			Compare(CurrentState,ConnectionState.Open );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		blnEventRaised = false;
-		con.Close();
-		try
-		{
-			BeginCase("ConnectionState Open");
-			Compare(blnEventRaised,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OriginalState Open");
-			Compare(OriginalState,ConnectionState.Open );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("CurrentState Close");
-			Compare(CurrentState,ConnectionState.Closed  );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-
-	void con_StateChange(Object sender, StateChangeEventArgs e)
-	{
-		CurrentState = e.CurrentState ;
-		OriginalState = e.OriginalState ;
-		blnEventRaised = true;
-
-
-	}
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_AcceptChangesDuringFill.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_AcceptChangesDuringFill.cs
deleted file mode 100755
index 0c193b691c0..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_AcceptChangesDuringFill.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_AcceptChangesDuringFill : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_AcceptChangesDuringFill tc = new OleDbDataAdapter_AcceptChangesDuringFill();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_AcceptChangesDuringFill");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			DataAdapter_AcceptChangesDuringFill((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ContinueUpdateOnError.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ContinueUpdateOnError.cs
deleted file mode 100755
index a80edd540a2..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ContinueUpdateOnError.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_ContinueUpdateOnError : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_ContinueUpdateOnError tc = new OleDbDataAdapter_ContinueUpdateOnError();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_ContinueUpdateOnError");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-
-			base.DataAdapter_ContinueUpdateOnError((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_DeleteCommand.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_DeleteCommand.cs
deleted file mode 100755
index c1d24da76e0..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_DeleteCommand.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_DeleteCommand : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_DeleteCommand tc = new OleDbDataAdapter_DeleteCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_DeleteCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-
-		OleDbCommand Cmd = new OleDbCommand();
-
-		oleDBda.DeleteCommand = Cmd;
-
-		try
-		{
-			BeginCase("DeleteCommand - Get");
-			Compare(oleDBda.DeleteCommand , Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Dispose.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Dispose.cs
deleted file mode 100755
index e7586649e9d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Dispose.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_Dispose : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_Dispose tc = new OleDbDataAdapter_Dispose();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_Dispose");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		DataSet ds = new DataSet();
-		string sqlSelect = "Select * from Customers where CustomerID = 'ABC'";
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		
-		OleDbCommand cmdSelect = new OleDbCommand(sqlSelect,con);
-		OleDbCommand cmdDelete = new OleDbCommand("",con);
-		OleDbCommand cmdUpdate = new OleDbCommand("",con);
-		OleDbCommand cmdInsert = null;
-
-		con.Open();
-
-		OleDbDataAdapter da = new OleDbDataAdapter(cmdSelect);
-		da.DeleteCommand = cmdDelete;
-		da.UpdateCommand = cmdUpdate;
-		da.InsertCommand = new OleDbCommand("",con);
-
-		cmdInsert =	da.InsertCommand;
-
-		da.Fill(ds);
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter select command");
-			da.Dispose();
-			Compare(da.SelectCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter insert command");
-			Compare(da.InsertCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter Delete Command");
-			Compare(da.DeleteCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check DataAdapter update command");
-			Compare(da.UpdateCommand == null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-
-
-		try
-		{
-			BeginCase("Dispose - check select command object");
-			Compare(cmdSelect != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check delete command object");
-			Compare(cmdDelete  != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check insert command object");
-			Compare(cmdInsert != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check Update command object");
-			Compare(cmdUpdate != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdSelect.connection object");
-			Compare(cmdSelect.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdDelete.connection object");
-			Compare(cmdDelete.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdUpdate.connection object");
-			Compare(cmdUpdate.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check cmdInsert.connection object");
-			Compare(cmdInsert.Connection != null ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-		try
-		{
-			BeginCase("Dispose - check command connection state");
-			da.Dispose();
-			Compare(cmdSelect.Connection.State ,ConnectionState.Open);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp);exp = null;}
-
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillError.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillError.cs
deleted file mode 100755
index 2bdf1f179b2..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillError.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_FillError : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_FillError tc = new OleDbDataAdapter_FillError();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_FillError");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.DbDataAdapter_FillError((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DS.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DS.cs
deleted file mode 100755
index d19cd79e275..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DS.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_FillSchema_DS : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_FillSchema_DS tc = new OleDbDataAdapter_FillSchema_DS();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_FillSchema_DS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.DbDataAdapter_FillSchema_Ds_SchemaType((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DSS.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DSS.cs
deleted file mode 100755
index e02a2ec085b..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DSS.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_FillSchema_DSS : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_FillSchema_DSS tc = new OleDbDataAdapter_FillSchema_DSS();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_FillSchema_DSS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.DbDataAdapter_FillSchema_Ds_SchemaType_Str((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DsSt.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DsSt.cs
deleted file mode 100755
index a50bf78da8d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DsSt.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_FillSchema_DsSt : ADONetTesterClass
-{
-	private Exception exp;
-	private string connectionString = ConnectedDataProvider.ConnectionString;
-
-	public static void Main()
-	{
-		OleDbDataAdapter_FillSchema_DsSt tc = new OleDbDataAdapter_FillSchema_DsSt();
-		Exception l_exp = null;
-		try
-		{
-			// Every Test must begin with BeginTest
-			tc.BeginTest("OleDbDataAdapter_FillSchema_DsSt");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			l_exp = ex;
-		}
-		finally
-		{
-			// Every Test must End with EndTest
-			tc.EndTest(l_exp);
-		}
-	}
-
-	public void run()
-	{
-		TestLongSqlExpression();
-	}
-
-	//Test case for bug #4708
-	[Test(Description="Test case for bug #4708")]
-	public void TestLongSqlExpression()
-	{
-		BeginCase("Long SQL string cause java.lang.StackOverflowError (Test case for bug #4708)");
-
-		StringBuilder querySb = new StringBuilder();
-		querySb.Append("SELECT ");
-		querySb.Append("c.CustomerID as ci1, c.CustomerID as ci2, c.CustomerID as ci3, c.CustomerID as ci4, ");
-		querySb.Append("c.CompanyName as cn1, c.CompanyName as cn2, c.CompanyName as cn3, c.CompanyName as cn4, ");
-		querySb.Append("c.ContactName as cntn1, c.ContactName as cntn2, c.ContactName as cntn3, c.ContactName as cntn4, ");
-		querySb.Append("c.ContactTitle as ct1, c.ContactTitle as ct2, c.ContactTitle as ct3, c.ContactTitle as ct4, ");
-		querySb.Append("c.Address as ad1, c.Address as ad2, c.Address as ad3, c.Address as ad4, ");
-		querySb.Append("c.City as ct1, c.City as ct2, c.City as ct3, c.City as ct4, ");
-		querySb.Append("c.Region as rg1, c.Region as rg2, c.Region as rg3, c.Region as rg4, ");
-		querySb.Append("c.PostalCode as pc1, c.PostalCode as pc2, c.PostalCode as pc3, c.PostalCode as pc4, ");
-		querySb.Append("c.Country as co1, c.Country as co2, c.Country as co3, c.Country as co4, ");
-		querySb.Append("c.Phone as ph1, c.Phone as ph2, c.Phone as ph3, c.Phone as ph4, ");
-		querySb.Append("c.Fax as fx1, c.Fax as fx2, c.Fax as fx3, c.Fax as fx4 ");
-		querySb.Append("FROM Customers c");
-		OleDbDataAdapter adapter = null;
-		DataSet schemaDs = new DataSet();
-		try
-		{
-			using(adapter = new OleDbDataAdapter(querySb.ToString(), this.connectionString))
-			{
-				adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
-				adapter.FillSchema(schemaDs, SchemaType.Source);
-				Compare(schemaDs.Tables.Count, 1);
-			}
-		} 
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DtSch.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DtSch.cs
deleted file mode 100755
index a8a3ec06446..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_FillSchema_DtSch.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_FillSchema_DtSch : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_FillSchema_DtSch tc = new OleDbDataAdapter_FillSchema_DtSch();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_FillSchema_DtSch");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			//Exception exp = null;
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.DbDataAdapter_FillSchema_Dt_SchemaType((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_1.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_1.cs
deleted file mode 100755
index 7ee0d62add6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_1.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_1: ADONetTesterClass 
-	{
-		// transaction use was add for PostgreSQL
-		OleDbTransaction tr;
-
-		OleDbConnection con;
-		OleDbCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				
-				con.Open();
-				// transaction use was add for PostgreSQL
-				tr = con.BeginTransaction();
-				
-				cmd = new OleDbCommand("", con, tr);
-				// prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Compare("Setup" ,"Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			// transaction use was add for PostgreSQL
-			tr.Commit();
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_1 tc = new OleDbDataAdapter_Fill_1();
-			Exception exp = null;
-			try
-			{
-				// Every Test must begin with BeginTest
-				tc.BeginTest("OleDbDataAdapter_Fill_1");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				// Every Test must End with EndTest
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle)
-			{
-				StringBuilder messageBuilder = new StringBuilder();
-				messageBuilder.Append("Test \"OleDbDataAdapter_Fill_1\" Skipped when running in .NET against Oracle database:\n");
-				messageBuilder.Append("In .NET there is a bug when calling a SP with multiple REFCURSORS from oracle server, the workaround is to use OracleClient and not OleDb.\n");
-				messageBuilder.Append("In GH we are not bug complient in this issue, because there is no workaround - We do not support the OracleClient namespace.");
-				messageBuilder.Append(" (The java run is not skipped).");
-				Log(messageBuilder.ToString());
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				// fail to work on .NET OLEDB
-				this.Log("Not testing PostgreSQL CommandType.StoredProcedure which return SETOF");
-				return;
-			}
-#endif
-
-			cmd.CommandText = "GH_MULTIRECORDSETS";
-			cmd.CommandType = CommandType.StoredProcedure;
-			OleDbDataAdapter da = new OleDbDataAdapter(cmd);
-			DataSet ds = new DataSet();
-
-			//execute the fill command
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Check table count");
-				Compare(ds.Tables.Count ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 0 rows count");
-				Compare(ds.Tables[0].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 0 Columns count");
-				Compare(ds.Tables[0].Columns.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 1 rows count");
-				Compare(ds.Tables[1].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 1 Columns count");
-				Compare(ds.Tables[1].Columns.Count ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 2 rows count");
-				Compare(ds.Tables[2].Rows.Count ,0);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check table 2 Columns count");
-				Compare(ds.Tables[2].Columns.Count ,4);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_2.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_2.cs
deleted file mode 100755
index 211a435d074..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_2.cs
+++ /dev/null
@@ -1,824 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-using NUnit.Framework;
-using MonoTests.System.Data.Utils;
-
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_2 : ADONetTesterClass 
-	{
-		private string nonUniqueId;
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_2 tc = new OleDbDataAdapter_Fill_2();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Fill_2");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			
-			
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			//DoTestThis(con);
-			DoTestTypes1(con);
-			//Don't know how to access diffrent database
-			if ((ConnectedDataProvider.GetDbType(con) != DataBaseServer.DB2) && (ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL))
-			{ 
-				DoTestTypes2(con);
-				DoTestTypes3(con);
-			}
-			
-			DoTestTypes4(con);
-		//	DoTestTypes5(con);   //Table direct --> multipe tables
-			DoTestTypes6(con);
-			
-			if ((ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle) && 
-				(ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL))
-			{
-				DoTestTypes7(con); //Diffrent owner
-				DoTestTypes8(con); //Diffrent owner
-				DoTestTypes9(con);
-			}
-			
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.PostgreSQL)
-			{
-				DoTestTypes10(con);
-			}
-
-			CallStoredProcedureInPackage(con);
-			StoredProcedurePackageambiguity_InsidePackage(con);
-			StoredProcedurePackageambiguity_OutsidePackage(con);
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		//[Test]
-		public void DoTestThis(OleDbConnection con)
-		{
-			Exception exp = null;
-			OleDbCommand cmd = new OleDbCommand("GH_CREATETABLE", con);
-				cmd.CommandType = CommandType.StoredProcedure;
-				OleDbDataAdapter da = new OleDbDataAdapter(cmd);
-				DataSet ds = new DataSet();
-
-				try
-				{
-					BeginCase("Check effected rows after create table ddl in stored procedure.");
-					int RowsAffected;
-					RowsAffected = cmd.ExecuteNonQuery();
-					int ExpectedRowsAffected;
-					switch (ConnectedDataProvider.GetDbType(con))
-					{
-						case DataBaseServer.SQLServer:
-						case DataBaseServer.Sybase:
-							ExpectedRowsAffected = 3;
-							break;
-						case DataBaseServer.Oracle:
-							//In .NET the ExpectedRowsAffected is '1', where as in Java it is '-1', this gap is because of jdbc driver for oracle.
-							ExpectedRowsAffected = -1;
-
-							break;
-						case DataBaseServer.DB2:
-							ExpectedRowsAffected = -1;
-							break;
-						default:
-							string errMsg = string.Format("GHT: Test not implemented for DB type: {0}", ConnectedDataProvider.GetDbType(con));
-							throw new NotImplementedException(errMsg);
-					}
-					Compare(RowsAffected ,ExpectedRowsAffected);
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-		}
-
-
-		#region Select by full table name in the same catalog
-		//[Test]
-		public void DoTestTypes1(OleDbConnection conn)
-		{
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-
-			string tableName = getDbObjectName("Employees",conn);
-			int expectedRowsCount = 8;
-
-			#region Select by full table name in the same catalog
-
-			string[] arr = new string[2];
-
-			arr[0] = "LastName";
-			arr[1] = "FirstName";
-
-			prepareTableForTest(conn,expectedRowsCount,"Employees","EmployeeID",arr);
-			comm.CommandText="select max(EmployeeID) from " + tableName;
-			// on some databases the max is on a field which is decimal
-			decimal maxEmployee = decimal.Parse(comm.ExecuteScalar().ToString()) - expectedRowsCount;
-
-			comm.CommandText = "SELECT EmployeeID FROM " + tableName + " where EmployeeID > " +  maxEmployee.ToString() ;
-			da.Fill(ds);
-
-			Exception exp = null;
-			try
-			{
-				BeginCase("Select by full table name in the same catalog");
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{cleanTableAfterTest(conn,"Employees","EmployeeID",Convert.ToInt32(maxEmployee));
-				EndCase(exp); exp = null;}
-
-			#endregion //Select by full table name in the same catalog
-
-		}
-
-		#endregion
-
-		#region Select by full table name in the different catalog
-		//[Test]
-		public void DoTestTypes2(OleDbConnection conn)
-		{
-			BeginCase("Select by full table name in the different catalog");
-			nonUniqueId = "48951_" +  TestCaseNumber.ToString(); 
-			Exception exp=null;
-			string tableName = getDbObjectName("Customers",conn,"GHTDB_EX");
-			int expectedRowsCount = 5;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-
-			insertIntoStandatTable(conn,tableName,expectedRowsCount,"CustomerID");
-		
-			comm.CommandText = "SELECT * FROM " + tableName + " where CustomerID='" + nonUniqueId + "'" ;
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;
-			cleanStandatTable(conn,tableName,"CustomerID");
-			}
-		}
-		#endregion
-
-		#region Call stored procedure in the different catalog
-		//[Test]
-		public void DoTestTypes3(OleDbConnection conn)
-		{
-			BeginCase("Call stored procedure in the different catalog");
-			nonUniqueId = "48951_" +  TestCaseNumber.ToString(); 
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-
-			string tableName = getDbObjectName("Customers",conn,"GHTDB_EX");
-			int expectedRowsCount = 5;
-
-			insertIntoStandatTable(conn,tableName,expectedRowsCount,"CustomerID");
-
-			comm.CommandType = CommandType.StoredProcedure;
-			comm.CommandText = getDbObjectName("GH_DUMMY",conn,"GHTDB_EX");
-			switch (ConnectedDataProvider.GetDbType(conn))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-					comm.Parameters.Add("@CustomerID",nonUniqueId);
-					break;
-				default:
-					comm.Parameters.Add(new OleDbParameter("CustomerIDPrm",OleDbType.Char));
-					break;
-			}
-			
-			comm.Parameters[0].Value = nonUniqueId;
-			ds.Tables.Clear();
-			
-
-			try
-			{
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;
-			cleanStandatTable(conn,tableName,"CustomerID"); }
-		}
-
-#endregion // Call stored procedure in the different catalog
-
-		#region Select using Table direct - single table
-		//[Test]
-		public void DoTestTypes4(OleDbConnection conn)
-		{
-			
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			string tableName = getDbObjectName("Customers",conn);
-			//int expectedRowsCount = 5;
-
-			comm.CommandText = tableName;
-
-			comm.CommandType = CommandType.TableDirect;
-
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Select using Table direct - single table");
-				Compare(ds.Tables[0].Rows.Count > 0 ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-#endregion // Select using Table direct - single table
-
-		#region Select using Table direct - multiple tables
-
-		//[Test]
-		public void DoTestTypes5(OleDbConnection conn)
-		{
-
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.TableDirect;
-			comm.CommandText = "Categories;Employees";
-
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Select using Table direct - multiple tables");
-				int result =  + ds.Tables[1].Rows.Count + ds.Tables[2].Rows.Count;
-				Compare(ds.Tables[0].Rows.Count > 0  ,true );
-				Compare(ds.Tables[1].Rows.Count > 0  ,true );
-				Compare(ds.Tables[0].Rows.Count == ds.Tables[1].Rows.Count ,true );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-#endregion // Select using Table direct - multiple tables
-
-
-		#region Test view
-
-		//[Test]
-		public void DoTestTypes6(OleDbConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.Text;
-
-			switch (ConnectedDataProvider.GetDbType(conn))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-					comm.CommandText = "select * from [Current Product List]";
-					break;
-				case DataBaseServer.Oracle:
-				case DataBaseServer.PostgreSQL:
-					comm.CommandText = "select * from Current_Product_List";
-					break;
-				default:
-					comm.CommandText = "select * from DB2ADMIN.Current_Product_List";
-					break;
-			}
-
-
-			ds.Tables.Clear();
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Testing view");
-				Compare(ds.Tables[0].Rows.Count >0,true);
-				Compare(ds.Tables[0].Columns.Count,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-
-		}
-		#endregion
-
-		#region select table with diffrent owner - diffrent name
-
-		//[Test]
-		public void DoTestTypes7(OleDbConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.Text;
-
-			//First change ownerShip
-
-			//chageOwnerShip(conn,"Categories","mainsoft");
-			comm.CommandText = "SELECT * FROM mainsoft.CategoriesNew";
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("select table with diffrent owner - diffrent name");
-				Compare(ds.Tables[0].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("select table with diffrent owner - diffrent name --> negetive");
-				ds.Tables.Clear();
-				comm.CommandText = "select * from " + getDbObjectName("CategoriesNew",conn);
-				da.Fill(ds);
-			}
-			catch (OleDbException ex)
-			{
-				ExpectedExceptionCaught(ex);
-			}
-			catch 	{ExpectedExceptionNotCaught("OleDbException"); }
-			finally	{EndCase(exp); exp = null;}
-
-			//Change back
-
-			//chageOwnerShip(conn,"mainsoft.Categories","dbo");
-		}
-
-		#endregion
-
-		#region select table with diffrent owner - same name
-
-		//[Test]
-		public void DoTestTypes8(OleDbConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			//string tableName = getDbObjectName("Customers",conn);
-			comm.CommandType = CommandType.Text;
-
-			//First change ownerShip
-
-			//chageOwnerShip(conn,"Categories","mainsoft");
-			comm.CommandText = "SELECT * FROM mainsoft.Categories";
-			da.Fill(ds);
-
-			try
-			{
-				BeginCase("Select table with diffrent owner same name");
-				Compare(ds.Tables[0].Rows.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-		}
-
-		#endregion
-
-		#region select table with diffrent owner - SP
-
-		//[Test]
-		public void DoTestTypes9(OleDbConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			BeginCase("Select table with diffrent owner SP");
-			nonUniqueId = "48951" ;
-			int expectedRowsCount = 5;
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			string tableName = getDbObjectName("Employees",conn);
-			comm.CommandType = CommandType.StoredProcedure;
-
-			//insertIntoStandatTable(conn,tableName,5,"EmployeeID");
-			string[] arr = new string[2];
-			arr[0] = "LastName";
-			arr[1] = "FirstName";
-
-			int maxValue = prepareTableForTest(conn,expectedRowsCount,"Employees","EmployeeID",arr);
-
-			switch (ConnectedDataProvider.GetDbType(conn))
-			{
-				case DataBaseServer.SQLServer:
-					comm.Parameters.Add("@EmployeeIdPrm",maxValue.ToString()); 
-					break;
-				case DataBaseServer.Sybase:
-					comm.Parameters.Add("@EmployeeIdPrm",maxValue.ToString()); 
-					break;
-				default:
-					comm.Parameters.Add("EmployeeIdPrm",maxValue.ToString()); 
-					break;
-			}
-
-			
-			try
-			{
-				comm.CommandText = "mainsoft.GH_DUMMY";
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows.Count ,expectedRowsCount);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;
-			cleanTableAfterTest (conn,"Employees","EmployeeID",maxValue); }
-
-		}
-
-		#endregion
-
-		#region select table with diffrent owner - and diffrent structure
-		//[Test]
-		public void DoTestTypes10(OleDbConnection conn)
-		{
-			Exception exp =null;
-			DataSet ds = new DataSet();
-			BeginCase("Select table with diffrent owner and diffrent structure");
-			nonUniqueId = "48951" ;
-			OleDbCommand comm = new OleDbCommand("",conn);
-			OleDbDataAdapter da = new OleDbDataAdapter();
-			da.SelectCommand = comm;
-			string tableName = getDbObjectName("Categories",conn);
-			comm.CommandType = CommandType.Text;
-			OleDbDataReader reader = null;
-
-			try
-			{
-				comm.CommandText = "select CategoryID,CategoryName from " + tableName;
-				reader = comm.ExecuteReader();
-				//da.Fill(ds);
-			}
-			catch (Exception  ex) 
-			{
-				EndCase(ex);
-			}
-			finally
-			{
-				reader.Close();
-			}
-
-			if (ConnectedDataProvider.GetDbType(conn) == DataBaseServer.Oracle) 
-			{
-				comm.CommandText="select CategoryID,CategoryName  from  GHTDB_EX.Categories  where CategoryID = ?";
-			}
-			else
-			{
-				comm.CommandText="select * from mainsoft.Categories where CategoryID = ?";
-			}
-			comm.Parameters.Add("a","10");
-			da.Fill(ds);
-
-			try
-			{
-				Compare(ds.Tables[0].Rows.Count ,1);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	
-			{
-				EndCase(exp); exp = null;}
-
-		}
-
-		#endregion
-
-		#region Oracle - use stored procedure inside package
-		//[Test(Description="Call a stored procedure which is defined within a package.")]
-		public void CallStoredProcedureInPackage(OleDbConnection con)
-		{
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle)
-			{
-				//Packages exist only in oracle.
-				return;
-			}
-
-			Exception exp = null;
-			OleDbDataReader rdr = null;
-			try
-			{
-				BeginCase("Call a stored procedure which is defined within a package.");
-				exp = null;
-				DataSet ds = new DataSet();
-				OleDbDataAdapter da = new OleDbDataAdapter();
-				OleDbCommand cmd = new OleDbCommand();
-				cmd.Connection = con;
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "ghtpkg.ghsp_inPkg";
-				cmd.Parameters.Add("CustomerIdPrm", "ALFKI");
-				da.SelectCommand = cmd;
-
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows.Count, 1);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-			}
-		}
-		//[Test(Description="Call a stored procedure ghsp_pkgAmbig from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.")]
-		public void StoredProcedurePackageambiguity_InsidePackage(OleDbConnection con)
-		{
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle)
-			{
-				//Packages exist only in oracle.
-				return;
-			}
-
-			Exception exp = null;
-			OleDbDataReader rdr = null;
-			try
-			{
-				BeginCase("Call a stored procedure ghsp_pkgAmbig from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.");
-				exp = null;
-				DataSet ds = new DataSet();
-				OleDbDataAdapter da = new OleDbDataAdapter();
-				OleDbCommand cmd = new OleDbCommand();
-				cmd.Connection = con;
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "ghtpkg.ghsp_pkgAmbig";
-				da.SelectCommand = cmd;
-
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows[0]["IN_PKG"], "TRUE");
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-			}
-		}
-		//[Test(Description="Call a stored procedure ghsp_pkgAmbig not from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.")]
-		public void StoredProcedurePackageambiguity_OutsidePackage(OleDbConnection con)
-		{
-			if (ConnectedDataProvider.GetDbType(con) != DataBaseServer.Oracle)
-			{
-				//Packages exist only in oracle.
-				return;
-			}
-
-			Exception exp = null;
-			OleDbDataReader rdr = null;
-			try
-			{
-				BeginCase("Call a stored procedure ghsp_pkgAmbig not from a package, where ghsp_pkgAmbig is defined both inside and outside of a package.");
-				exp = null;
-				DataSet ds = new DataSet();
-				OleDbDataAdapter da = new OleDbDataAdapter();
-				OleDbCommand cmd = new OleDbCommand();
-				cmd.Connection = con;
-				cmd.CommandType = CommandType.StoredProcedure;
-				cmd.CommandText = "ghsp_pkgAmbig";
-				da.SelectCommand = cmd;
-
-				da.Fill(ds);
-				Compare(ds.Tables[0].Rows[0]["IN_PKG"], "FALSE");
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-			}
-		}
-		#endregion
-
-		private string getDbObjectName(string objectName,OleDbConnection con)
-		{
-			return getDbObjectName(objectName,con,string.Empty);
-			
-		}
-		private string getDbObjectName(string objectName,OleDbConnection con,string databaseName)
-		{
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-				{
-					if (databaseName == string.Empty)
-					{
-						return "GHTDB.dbo." + objectName;
-					}
-					else
-					{
-						return  databaseName +  ".dbo." + objectName;
-					}
-				}
-				case DataBaseServer.PostgreSQL:
-				{
-					return "public." + objectName.ToUpper();
-				}
-				case DataBaseServer.Oracle:
-				{
-					if (databaseName == string.Empty)
-					{
-						return "GHTDB." + objectName.ToUpper();
-					}
-					else
-					{
-						return  databaseName.ToUpper() + "." + objectName.ToUpper();
-					}
-					
-				}
-				case DataBaseServer.DB2: 
-				{
-					if (databaseName == string.Empty)
-					{
-						return   "DB2ADMIN." + objectName;
-					}
-					else
-					{
-						return  databaseName +  ".DB2ADMIN." + objectName;
-					}
-
-					
-
-				}
-				default:
-				{
-					throw new NotImplementedException();
-				}
-
-
-			}
-
-		}
-
-
-
-		/// <summary>
-		/// This method will prepare table for test
-		/// </summary>
-		private int prepareTableForTest(OleDbConnection con,int recordsNumber,string baseTableName,string keyField
-			,params string[] otherNonNullableFieldsName)
-		{
-			string tableName = getDbObjectName(baseTableName,con);
-			OleDbCommand cmd = new OleDbCommand("select max(" + keyField + ") from " + tableName,con);
-			string str_ret = cmd.ExecuteScalar().ToString();
-//			Console.WriteLine("ExecuteScalar:" + str_ret);
-			// on some databases the max is on a field which is decimal
-			decimal maxRecord = decimal.Parse(str_ret);
-			int resultCount = Convert.ToInt32(maxRecord)+recordsNumber;
-			string sqlStmt = string.Empty;
-			string valueStmt = string.Empty;
-
-			//Constrcut the statemnet once : --> TODO://Move this logic to seperate method
-			for(int i=0;i<otherNonNullableFieldsName.Length;i++)
-			{
-				sqlStmt+= otherNonNullableFieldsName[i] + ",";
-				valueStmt+="'a',";
-			}
-
-			//Trim the last ","
-			if (otherNonNullableFieldsName.Length > 0)
-			{
-				sqlStmt =  sqlStmt.Remove(sqlStmt.Length-1,1);
-				sqlStmt = "," + sqlStmt;
-
-				valueStmt =  valueStmt.Remove(valueStmt.Length-1,1);
-				valueStmt = "," + valueStmt;
-			}
-				
-
-			for (int index=Convert.ToInt32(maxRecord)+1;index<=resultCount;index++)
-			{
-				cmd.CommandText="Insert into " + tableName + " (" + keyField + sqlStmt + ") values ("
-					+ index + valueStmt + ")";
-				cmd.ExecuteNonQuery();
-			}
-			return Convert.ToInt32(maxRecord);
-
-		}
-		private void cleanTableAfterTest(OleDbConnection con,string baseTableName, string keyField, int recordNumber)
-		{
-			string tableName = getDbObjectName(baseTableName, con);
-			OleDbCommand cmd = new OleDbCommand("delete from " + tableName + " where " + keyField + " > " + recordNumber  ,con);
-			cmd.ExecuteNonQuery();
-
-		}
-
-		private void insertIntoStandatTable(OleDbConnection con,string tableName,int recordsNumber,string keyField)
-		{
-			OleDbCommand cmd = new OleDbCommand("delete from " + tableName + " where  "  + keyField + "= '" + nonUniqueId + "'",con);
-			cmd.ExecuteNonQuery();
-
-			for (int index=0;index<recordsNumber;index++)
-			{
-				cmd.CommandText = "Insert into " + tableName + "(" + keyField + ") values ('" + nonUniqueId  + "')";
-				cmd.ExecuteNonQuery();
-			}
-		}
-		private void cleanStandatTable(OleDbConnection con,string tableName,string keyField)
-		{
-			OleDbCommand cmd = new OleDbCommand("delete from " + tableName + " where " + keyField + " = '" + nonUniqueId + "'",con);
-			cmd.ExecuteNonQuery();
-
-		}
-
-		private void chageOwnerShip(OleDbConnection con,string objectName,string newOwner)
-		{
-			OleDbCommand cmd = new OleDbCommand();
-			cmd.Connection = con;
-
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-				{
-					cmd.CommandType = CommandType.StoredProcedure;
-					cmd.CommandText = "[dbo].[sp_changeobjectowner]";
-					cmd.Parameters.Add("@objname",objectName);
-					cmd.Parameters.Add("@newowner",newOwner);
-					cmd.ExecuteNonQuery();
-					return;
-
-				}
-				default:
-				{
-					throw new NotImplementedException();
-				}
-			}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_3.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_3.cs
deleted file mode 100755
index ad9446cfd50..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_3.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_3: ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_3 tc = new OleDbDataAdapter_Fill_3();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Fill_3");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			//in DB2 when trying to fill an empty table - no table is loaded
-			OleDbConnection conn = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("Select * from GH_EMPTYTABLE",conn);
-			
-			DataSet ds = new DataSet();
-			oleDBda.Fill(ds);
-        
-			try
-			{
-				BeginCase("Table count - fill with SP");
-				Compare(ds.Tables.Count ,1 );
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//add for bug #2508 - OLEDBDataAdapter.Fill fills only the 1st result set, reported from an evaluation
-			if (ConnectedDataProvider.GetDbType(oleDBda.SelectCommand.Connection) == DataBaseServer.SQLServer)
-				//multiple commands can not be done with Oracle or DB2
-			{
-
-
-				//get excpected results
-				if (oleDBda.SelectCommand.Connection.State != ConnectionState.Open)
-				{
-					oleDBda.SelectCommand.Connection.Open();
-				}
-				OleDbCommand cmd = new OleDbCommand("",oleDBda.SelectCommand.Connection);
-				cmd.CommandText = "Select count(*) from Customers";
-				int TblResult0 = (int)cmd.ExecuteScalar();
-				cmd.CommandText = "Select count(*) from Categories";
-				int TblResult1 = (int)cmd.ExecuteScalar();
-				cmd.CommandText = "Select count(*) from Region";
-				int TblResult2 = (int)cmd.ExecuteScalar();
-				if (oleDBda.SelectCommand.Connection.State != ConnectionState.Closed)
-				{
-					oleDBda.SelectCommand.Connection.Close();
-				}
-
-
-				oleDBda.SelectCommand.CommandText = "Select * from Customers; " +
-					"Select * from Categories; " +
-					"Select * from Region";
-				ds = new DataSet();
-				oleDBda.Fill(ds);
-
-				try
-				{
-					BeginCase("Table count - Fill with query");
-					Compare(ds.Tables.Count ,3 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Table 0 rows count");
-					Compare(ds.Tables[0].Rows.Count ,TblResult0 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Table 1 rows count");
-					Compare(ds.Tables[1].Rows.Count ,TblResult1 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Table 2 rows count");
-					Compare(ds.Tables[2].Rows.Count ,TblResult2 );
-				}
-				catch(Exception ex)	{exp = ex;}
-				finally	{EndCase(exp); exp = null;}
-
-			}
-
- 
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Ds.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Ds.cs
deleted file mode 100755
index 3c6292a3bd6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Ds.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_Ds : ADONetTesterClass
-	{
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_Ds tc = new OleDbDataAdapter_Fill_Ds();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Fill_Ds");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-	
-			base.DbDataAdapter_Fill_Ds((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_DsStr.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_DsStr.cs
deleted file mode 100755
index cbc16757a1b..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_DsStr.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_DsStr : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_DsStr tc = new OleDbDataAdapter_Fill_DsStr();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Fill_DsStr");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.DbDataAdapter_Fill_Ds_Str((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Ds_Int_Int_Str.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Ds_Int_Int_Str.cs
deleted file mode 100755
index a97019b9034..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Ds_Int_Int_Str.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_Ds_Int_Int_Str  : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_Ds_Int_Int_Str tc = new OleDbDataAdapter_Fill_Ds_Int_Int_Str();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Fill_DIIS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-	
-			base.DbDataAdapter_Fill_Ds_Int_Int_Str((DbDataAdapter)oleDBda);
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Dt.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Dt.cs
deleted file mode 100755
index 284402ea3b4..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Fill_Dt.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Fill_Dt : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Fill_Dt tc = new OleDbDataAdapter_Fill_Dt();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Fill_Dt");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void run()
-		{
-			//Exception exp = null;
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-	
-			base.DbDataAdapter_Fill_Dt((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_GetFillParameters.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_GetFillParameters.cs
deleted file mode 100755
index e4488eda1dc..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_GetFillParameters.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_GetFillParameters : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_GetFillParameters tc = new OleDbDataAdapter_GetFillParameters();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_GetFillParameters");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		string selectSQL = "SELECT * FROM Employees WHERE EmployeeId = ? AND FirstName = ?";
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-		oleDBda.SelectCommand = new OleDbCommand(selectSQL,new OleDbConnection());
-
-		IDataParameter[] Idp = oleDBda.GetFillParameters();
-
-		try
-		{
-			BeginCase("Length");
-			Compare(Idp.Length  ,0);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-		
-		oleDBda.SelectCommand.Parameters.Add(new OleDbParameter("@EmployeeId",DbType.Int32)) ;
-		oleDBda.SelectCommand.Parameters["@EmployeeId"].SourceColumn = "EmployeeId";
-		oleDBda.SelectCommand.Parameters.Add(new OleDbParameter("@FirstName",OleDbType.VarWChar,10));
-
-		Idp = oleDBda.GetFillParameters();
-        
-		try
-		{
-			BeginCase("Parameter 0");
-			Compare(Idp[0] ,oleDBda.SelectCommand.Parameters[0]);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-		try
-		{
-			BeginCase("Parameter 1");
-			Compare(Idp[1] ,oleDBda.SelectCommand.Parameters[1]);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-	
-		
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_InsertCommand.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_InsertCommand.cs
deleted file mode 100755
index ec260012292..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_InsertCommand.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_InsertCommand : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_InsertCommand tc = new OleDbDataAdapter_InsertCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_InsertCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-
-		OleDbCommand Cmd = new OleDbCommand();
-
-		oleDBda.InsertCommand = Cmd;
-
-		try
-		{
-			BeginCase("InsertCommand - Get");
-			Compare(oleDBda.InsertCommand, Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_MissingMappingAction.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_MissingMappingAction.cs
deleted file mode 100755
index 70063031c67..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_MissingMappingAction.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_MissingMappingAction : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_MissingMappingAction tc = new OleDbDataAdapter_MissingMappingAction();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_MissingMappingAction");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.DataAdapter_MissingMappingAction((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_MissingSchemaAction.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_MissingSchemaAction.cs
deleted file mode 100755
index b97c4c0ae50..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_MissingSchemaAction.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_MissingSchemaAction : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_MissingSchemaAction tc = new OleDbDataAdapter_MissingSchemaAction();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_MissingSchemaAction");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-			base.DataAdapter_MissingSchemaAction((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_RowUpdated.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_RowUpdated.cs
deleted file mode 100755
index c133c4408d7..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_RowUpdated.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_RowUpdated : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_RowUpdated tc = new OleDbDataAdapter_RowUpdated();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_RowUpdated");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		int EventCounter = 0;
-		DataRow drInsert,drDelete,drUpdate;
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.OleDbDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			// --------- get data from DB -----------------
-			DataSet ds = base.PrepareDBData_Update((DbDataAdapter)oleDBda);
-
-
-			// add event handler
-			oleDBda.RowUpdated += new OleDbRowUpdatedEventHandler(oleDBda_RowUpdated);
-			
-			//insert ,delete, update
-			drInsert = ds.Tables[0].NewRow();
-			drInsert.ItemArray = new object[] {9991,"Ofer","Borshtein","Insert"};
-			drDelete = ds.Tables[0].Rows.Find(9992);
-			drUpdate = ds.Tables[0].Rows.Find(9993);
-		
-			ds.Tables[0].Rows.Add(drInsert);
-			drDelete.Delete();
-			drUpdate["Title"] = "Jack the ripper"; 
-
-			//execute update to db, will raise events
-			oleDBda.Update(ds);
-
-			try
-			{
-				BeginCase("EventCounter ");
-				Compare(EventCounter ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			oleDBda.RowUpdated -= new OleDbRowUpdatedEventHandler(oleDBda_RowUpdated);
-		
-			//close connection
-			if (  ((IDbDataAdapter)oleDBda).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)oleDBda).SelectCommand.Connection.Close();
-		}
-
-		private void oleDBda_RowUpdated(object sender, OleDbRowUpdatedEventArgs e)
-		{
-			Exception exp = null;
-			switch (e.StatementType)
-			{
-				case StatementType.Insert: 
-					try
-					{
-						BeginCase("RowInsert");
-						Compare(drInsert ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Delete:
-					try
-					{
-						BeginCase("RowDelete");
-						Compare(drDelete ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Update:
-					try
-					{
-						BeginCase("RowUpdate");
-						Compare(drUpdate ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_RowUpdating.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_RowUpdating.cs
deleted file mode 100755
index d22ee6c3e1d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_RowUpdating.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_RowUpdating : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_RowUpdating tc = new OleDbDataAdapter_RowUpdating();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_RowUpdating");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-
-		int EventCounter = 0;
-		DataRow drInsert,drDelete,drUpdate;
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.OleDbDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			// --------- get data from DB -----------------
-			DataSet ds = base.PrepareDBData_Update((DbDataAdapter)oleDBda);
-			// add event handler
-			oleDBda.RowUpdating +=new OleDbRowUpdatingEventHandler(oleDBda_RowUpdating);
-			
-			//insert ,delete, update
-			drInsert = ds.Tables[0].NewRow();
-			drInsert.ItemArray = new object[] {9991,"Ofer","Borshtein","Insert"};
-			drDelete = ds.Tables[0].Rows.Find(9992);
-			drUpdate = ds.Tables[0].Rows.Find(9993);
-		
-			ds.Tables[0].Rows.Add(drInsert);
-			drDelete.Delete();
-			drUpdate["Title"] = "Jack the ripper"; 
-
-			//execute update to db, will raise events
-			oleDBda.Update(ds);
-
-			try
-			{
-				BeginCase("EventCounter ");
-				Compare(EventCounter ,3);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		
-			oleDBda.RowUpdating -=new OleDbRowUpdatingEventHandler(oleDBda_RowUpdating);
-				
-			//close connection
-			if (  ((IDbDataAdapter)oleDBda).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)oleDBda).SelectCommand.Connection.Close();
-		}
-
-		private void oleDBda_RowUpdating(object sender, OleDbRowUpdatingEventArgs e)
-		{
-			Exception exp = null;
-			switch (e.StatementType)
-			{
-				case StatementType.Insert: 
-					try
-					{
-						BeginCase("RowInsert");
-						Compare(drInsert ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Delete:
-					try
-					{
-						BeginCase("RowDelete");
-						Compare(drDelete ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-				case StatementType.Update:
-					try
-					{
-						BeginCase("RowUpdate");
-						Compare(drUpdate ,e.Row );
-					}
-					catch(Exception ex)	{exp = ex;}
-					finally	{EndCase(exp); exp = null;}
-					EventCounter++;
-					break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_SelectCommand.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_SelectCommand.cs
deleted file mode 100755
index 7526429d473..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_SelectCommand.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_SelectCommand : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_SelectCommand tc = new OleDbDataAdapter_SelectCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_SelectCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-
-		OleDbCommand Cmd = new OleDbCommand();
-
-		oleDBda.SelectCommand  = Cmd;
-
-		try
-		{
-			BeginCase("SelectCommand - Get");
-			Compare(oleDBda.SelectCommand, Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_TableMappings.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_TableMappings.cs
deleted file mode 100755
index 952190196a6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_TableMappings.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_TableMappings : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_TableMappings tc = new OleDbDataAdapter_TableMappings();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_TableMappings");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{ 
-			// open a transaction for PostgreSQL
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			DataAdapter_TableMappings((DbDataAdapter)oleDBda);
-		}
-		
-		public void DataAdapter_TableMappings(DbDataAdapter dbDA)
-		{
-			Exception exp = null;
-			IDbDataAdapter Ida = (IDbDataAdapter)dbDA;
-			IDbCommand ICmd = Ida.SelectCommand; 
-			IDbConnection IConn = ICmd.Connection; 
-			IConn.ConnectionString = MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString;
-			IConn.Open();
-			ICmd.Transaction = IConn.BeginTransaction();
-
-			//--- Default value ---
-        
-			try
-			{
-				BeginCase("TableMappings Default value");
-				Compare(dbDA.TableMappings.Count ,0);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//init dataset
-			DataSet ds = new DataSet();
-			ds.Tables.Add("CustTable");
-			ds.Tables.Add("EmplTable");
-
-			//load the tables
-			dbDA.TableMappings.Add("Table","CustTable");
-			ICmd.CommandText = "SELECT CustomerID, CompanyName, City, Country, Phone FROM Customers where CustomerID in ('GH100','GH200','GH300','GH400','GH500','GH600','GH700')";
-			dbDA.Fill(ds);
-
-			dbDA.TableMappings.Clear();
-			dbDA.TableMappings.Add("Table","EmplTable");
-			ICmd.CommandText = " SELECT EmployeeID, LastName, FirstName, Title FROM Employees where EmployeeID > 0";
-			dbDA.Fill(ds);
-
-			try
-			{
-				BeginCase("TableMappings.Count");
-				Compare(ds.Tables.Count ,2);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Customers rows count");
-				Compare(ds.Tables["CustTable"].Rows.Count > 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Employees rows count");
-				Compare(ds.Tables["EmplTable"].Rows.Count > 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Employees Columns");
-				Compare(ds.Tables["EmplTable"].Columns.IndexOf("EmployeeID") >= 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Customer Columns");
-				Compare(ds.Tables["CustTable"].Columns.IndexOf("CustomerID") >= 0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			//Another checking 
-			if (ConnectedDataProvider.GetDbType() != DataBaseServer.DB2) {
-
-			BeginCase("Check table mappings with stored procedure of another owner");
-			try
-			{
-				DataSet ds1 = new DataSet();
-				ds1.Tables.Add("EmplTable");
-				dbDA.TableMappings.Clear();
-				dbDA.TableMappings.Add("Table","EmplTable");
-				ICmd.CommandType = CommandType.StoredProcedure;
-	
-				switch (ConnectedDataProvider.GetDbType(ConnectedDataProvider.ConnectionString))
-				{
-					case MonoTests.System.Data.Utils.DataBaseServer.Oracle:
-						// On ORACLE, the Scheam is the user is the owner.
-						ICmd.CommandText = "GHTDB.GH_DUMMY";
-						break;
-					case MonoTests.System.Data.Utils.DataBaseServer.PostgreSQL:
-						ICmd.CommandText = "public.gh_dummy";
-						break;
-					default:
-						ICmd.CommandText = "mainsoft.GH_DUMMY";
-						break;
-				}
-
-				// investigate the SP parameters
-				OleDbCommandBuilder.DeriveParameters((OleDbCommand)ICmd);
-				Compare(2,ICmd.Parameters.Count);
-
-				// add one numeric parameter, and Fill
-				ICmd.Parameters.Clear();
-				ICmd.Parameters.Add(new OleDbParameter("EmployeeIDPrm",1));
-				dbDA.Fill(ds1);
-				Compare(ds1.Tables.Count,1);
-				Compare(ds1.Tables[0].Rows.Count >0,true);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			}
-		
-
-			// 
-			((IDbDataAdapter)dbDA).SelectCommand.Transaction.Commit();
-
-			//close connection
-			if (  ((IDbDataAdapter)dbDA).SelectCommand.Connection.State != ConnectionState.Closed )
-				((IDbDataAdapter)dbDA).SelectCommand.Connection.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ToString.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ToString.cs
deleted file mode 100755
index 57666909684..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ToString.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_ToString : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_ToString tc = new OleDbDataAdapter_ToString();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_ToString");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-
-		try
-		{
-			BeginCase("ToString");
-			Compare(oleDBda.ToString(),typeof(OleDbDataAdapter).ToString() );
-		} 
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_UpdateCommand.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_UpdateCommand.cs
deleted file mode 100755
index b6142eddea6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_UpdateCommand.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_UpdateCommand : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_UpdateCommand tc = new OleDbDataAdapter_UpdateCommand();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_UpdateCommand");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-
-		OleDbCommand Cmd = new OleDbCommand();
-
-		oleDBda.UpdateCommand  = Cmd;
-
-		try
-		{
-			BeginCase("UpdateCommand - Get");
-			Compare(oleDBda.UpdateCommand , Cmd);
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}	
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Dr.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Dr.cs
deleted file mode 100755
index 51b354b3e14..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Dr.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Update_Dr : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Update_Dr tc = new OleDbDataAdapter_Update_Dr();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Update_Dr");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.OleDbDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Dr((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Ds.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Ds.cs
deleted file mode 100755
index 9cfd8b8e214..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Ds.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Update_Ds :  ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Update_Ds tc = new OleDbDataAdapter_Update_Ds();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Update_DS");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.OleDbDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Ds((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_DsStr.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_DsStr.cs
deleted file mode 100755
index 6ad30ccdb9d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_DsStr.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Update_DsStr : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Update_DsStr tc = new OleDbDataAdapter_Update_DsStr();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Update_Ds_Str");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.OleDbDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Ds_Str((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Dt.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Dt.cs
deleted file mode 100755
index 1fcea58fb6a..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_Update_Dt.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataAdapter_Update_Dt : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataAdapter_Update_Dt tc = new OleDbDataAdapter_Update_Dt();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataAdapter_Update_Dt");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				tc.EndTest(exp);
-			}
-		}
-
-
-		//public TestClass():base(true){}
-
-		//Activate this constructor to log Failures to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-		//Activate this constructor to log All to a log file
-		//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-		//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-		[Test]
-		public void run()
-		{
-			OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-			oleDBda.SelectCommand = new OleDbCommand("",new OleDbConnection());
-
-			base.OleDbDataAdapter_BuildUpdateCommands(ref oleDBda);		
-			base.DbDataAdapter_Update_Dr((DbDataAdapter)oleDBda);
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor.cs
deleted file mode 100755
index 045a48a3ebd..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_ctor : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_ctor tc = new OleDbDataAdapter_ctor();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_ctor");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter();
-		        
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_O.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_O.cs
deleted file mode 100755
index 2f0aa17eb26..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_O.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_ctor_O : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_ctor_O tc = new OleDbDataAdapter_ctor_O();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_ctor_O");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter(new OleDbCommand());
-		        
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_SO.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_SO.cs
deleted file mode 100755
index aa068ceb86a..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_SO.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_ctor_SO : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_ctor_SO tc = new OleDbDataAdapter_ctor_SO();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_ctor_SO");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter("Select * from Customers",new OleDbConnection());
-		        
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_SS.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_SS.cs
deleted file mode 100755
index b10895d1d82..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataAdapter/OleDbDataAdapter_ctor_SS.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataAdapter_ctor_SS : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataAdapter_ctor_SS tc = new OleDbDataAdapter_ctor_SS();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataAdapter_ctor_SS");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbDataAdapter oleDBda = new OleDbDataAdapter("Select * from Customers",
-								"Provider=SQLOLEDB.1;Data Source=GH-SERVE;Initial Catalog=Northwind;User Id=sa;Password=");
-		try
-		{
-			BeginCase("Ctor");
-			Compare(oleDBda != null,true );
-		}
-		catch(Exception ex)	{exp = ex;}
-		finally	{EndCase(exp); exp = null;}
-		
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Close.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Close.cs
deleted file mode 100755
index ff44754f5dc..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Close.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_Close : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataReader_Close tc = new OleDbDataReader_Close();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("DataReader.IsClosed");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OleDbCommand cmd = new OleDbCommand("Select * From Customers", con);
-		OleDbDataReader rdr = cmd.ExecuteReader();
-
-		try
-		{
-			BeginCase("before closing");
-			Compare(rdr.IsClosed ,false);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-
-		try
-		{
-			BeginCase("after closing");
-			rdr.Close();
-			Compare(rdr.IsClosed ,true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Depth.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Depth.cs
deleted file mode 100755
index 5370b342e4d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Depth.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_Depth : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataReader_Depth tc = new OleDbDataReader_Depth();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_Depth");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OleDbCommand cmd = new OleDbCommand("Select * From Customers", con);
-		OleDbDataReader rdr = cmd.ExecuteReader();
-
-		try
-		{
-			BeginCase("Before execute");
-			Compare(rdr.Depth , 0);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-
-		try
-		{
-			BeginCase("After execute");
-			rdr.Read();
-			Compare(rdr.Depth , 0);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetBoolean.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetBoolean.cs
deleted file mode 100755
index f47cff213c2..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetBoolean.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetBoolean : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataReader_GetBoolean tc = new OleDbDataReader_GetBoolean();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetBoolean");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-		
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-#if !JAVA
-			// PostgreSQL ODBC treats Type BOOL as String, so we don't run it on .NET
-			if ((ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL))
-			{
-				return; 
-			}
-#endif
-
-			//Do not test with oracle or DB2, because boolean does not exist in their types.
-			if ( (ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) || (ConnectedDataProvider.GetDbType(con) == DataBaseServer.DB2) )
-			{
-				return; 
-			}
-
-			con.Open();
-			string fieldName = "t_bit";
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				fieldName ="t_bool";
-			}
-			
-			OleDbCommand cmd = new OleDbCommand("Select " + fieldName + " From TYPES_SIMPLE Where id = '0'",con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			try
-			{
-				BeginCase("GetBoolean true");
-				Boolean blnValue;
-				Compare(rdr.IsDBNull(0), false);
-				Compare("System.Boolean", rdr.GetValue(0).GetType().FullName);
-				blnValue = rdr.GetBoolean(0);
-				Compare(blnValue, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			rdr.Close();
-              
-			
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetByte_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetByte_I.cs
deleted file mode 100755
index ecf166a7c80..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetByte_I.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetByte_I : ADONetTesterClass
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OleDbDataReader_GetByte_I tc = new OleDbDataReader_GetByte_I();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetByte_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43967_" + this.testTypesInvocations.ToString();
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a byte.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(byte)) //The value in the result set should be a byte.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetByte() on a field of dbtype {0}", row[i].DbTypeName));
-								byte retByte = rdr.GetByte(i);
-								Compare(row[i].Value, retByte);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be byte. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetByte() on a field of dbtype {0}", row[i].DbTypeName));
-								byte retByte = rdr.GetByte(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetBytes_IIBII.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetBytes_IIBII.cs
deleted file mode 100755
index c8112e6614a..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetBytes_IIBII.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetBytes_IIBII : GHTBase
-	{
-		int testTypesInvocations;
-		Exception exp = null;
-		public static void Main()
-		{
-			OleDbDataReader_GetBytes_IIBII tc = new OleDbDataReader_GetBytes_IIBII();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetBytes_IIBII");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43966_" + this.testTypesInvocations.ToString();
-				OleDbConnection con =null;
-				OleDbDataReader rdr = null;
-
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a byte array.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(byte[])) //The value in the result set should be a byte array.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetBytes() on a field of dbtype {0}", row[i].DbTypeName));
-								byte[] origBytes = (byte[])row[i].Value;
-								byte[] retBytes = new byte[origBytes.Length];
-								rdr.GetBytes(i, 0, retBytes, 0, origBytes.Length);
-								Compare(origBytes, retBytes);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be byte array. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetBytes() on a field of dbtype {0}", row[i].DbTypeName));
-								byte[] retBytes = new byte[1];
-								rdr.GetBytes(i, 0, retBytes, 0, 1);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetChars.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetChars.cs
deleted file mode 100755
index 1d705bab906..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetChars.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetChars : ADONetTesterClass 
-	{
-		OleDbConnection con;
-		char [] Result;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Result = new char[100];
-				con.Open();
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_GetChars tc = new OleDbDataReader_GetChars();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetChars");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			long rdrResults = 0;
-
-			OleDbCommand cmd = new OleDbCommand("Select LastName From Employees Where EmployeeID = 100", con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			//LastName should be "Last100"
-	
-			try
-			{
-				BeginCase("check result length");
-				rdrResults = rdr.GetChars(0, 0, Result, 0, Result.Length);
-				Compare(rdrResults,(long)"Last100".Length  );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check result - char[0]");
-				Compare(Result[0] ,'L');
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check result - char[last char index]");
-				Compare(Result["Last100".Length-1] ,'0');
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDataTypeName.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDataTypeName.cs
deleted file mode 100755
index 1fba5adc9bd..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDataTypeName.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetDataTypeName : ADONetTesterClass
-	{
-		OleDbConnection con;
-		OleDbCommand cmd;
-		OleDbDataReader rdr;
-		string typeName;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OleDbCommand("Select EmployeeID From Employees Where FirstName = 'Oved'",  con);
-				cmd.CommandType = CommandType.Text;
-				con.Open();
-
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-
-				typeName = rdr.GetDataTypeName(0);
-				con.Close();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{EndCase(exp);}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_GetDataTypeName tc = new OleDbDataReader_GetDataTypeName();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetDataTypeName");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			//make database specific test
-			switch (ConnectedDataProvider.GetDbType(con))
-			{
-				case DataBaseServer.SQLServer:
-					try
-					{
-						BeginCase("check type name");
-						Compare(typeName == "DBTYPE_I4" ,true);
-					} 
-					catch(Exception ex){exp = ex;}
-					finally{EndCase(exp); exp = null;}
-					break;
-				case DataBaseServer.Oracle:
-					try
-					{
-						BeginCase("check type name");
-						Compare(typeName == "DBTYPE_NUMERIC" || typeName == "NUMBER" ,true);
-					} 
-					catch(Exception ex){exp = ex;}
-					finally{EndCase(exp); exp = null;}
-					break;
-				case DataBaseServer.DB2:
-					try
-					{
-						BeginCase("check type name");
-						Compare(typeName == "DBTYPE_I4" || typeName == "INTEGER" ,true);
-					} 
-					catch(Exception ex){exp = ex;}
-					finally{EndCase(exp); exp = null;}
-					break;
-				case DataBaseServer.Unknown:
-					break;
-			}
-
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs
deleted file mode 100755
index d1789014c9c..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetDateTime : ADONetTesterClass
-	{
-		private OleDbConnection con;
-		private OleDbCommand cmd;
-		private OleDbDataReader rdr;
-		Exception exp;
-
-		[SetUp]
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null && con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_GetDateTime tc = new OleDbDataReader_GetDateTime();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetDateTime");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-			SimpleValue();
-			MinDate();
-		}
-
-		[Test]
-		public void SimpleValue()
-		{
-			try
-			{
-				BeginCase("check simple value");
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con.Open();
-				cmd = new OleDbCommand("Select BirthDate From Employees where EmployeeID = 100", con);
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-				DateTime dt = rdr.GetDateTime(0); //will be 1988-May-31 15:33:44
-				Compare(dt,new DateTime(1988,5,31,15,33,44,00));
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp); 
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-				exp = null;
-			}
-		}
-
-		[Test]
-		public void MinDate()
-		{
-			BeginCase("Test Min date.");
-			exp = null;
-			string[] dateColumns;
-			DateTime[] expectedValues;
-			
-			InitMinDates(out dateColumns, out expectedValues);
-			try
-			{
-				con = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-				cmd = new OleDbCommand();
-				cmd.Connection = con;
-				cmd.CommandText = BuildMinDateTimeSelectSql(dateColumns);
-				con.Open();
-				rdr = cmd.ExecuteReader();
-				Compare(true, rdr.HasRows);
-				bool b = rdr.Read();
-				for (int i=0; i<dateColumns.Length && i<expectedValues.Length; i++)
-				{
-					int j=-1;
-					j = rdr.GetOrdinal(dateColumns[i]);
-					//DateTime result = rdr.GetDateTime(j);
-					object result = rdr.GetValue(j);
-					Compare(result, expectedValues[i]);
-				}
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				if (rdr != null && !rdr.IsClosed)
-				{
-					rdr.Close();
-				}
-				if (con != null && con.State != ConnectionState.Closed)
-				{
-					con.Close();
-				}
-			}
-		}
-		
-		private void InitMinDates(out string[] columns, out DateTime[] values)
-		{
-			switch(ConnectedDataProvider.GetDbType())
-			{
-				case DataBaseServer.SQLServer:
-				case DataBaseServer.Sybase:
-					columns = new string[] {"T_DATETIME", "T_SMALLDATETIME"};
-					values = new DateTime[] {new DateTime(1753, 01, 01,00, 00, 00),		//	01/01/1753 00:00:00.000
-																  new DateTime(1900, 01, 01,00, 00, 00)};		//	01/01/1900 00:00
-					break;
-				case DataBaseServer.Oracle:
-					columns = new string[] {"T_DATE"};
-					values = new DateTime[] {new DateTime(0001, 01, 01,00, 00, 00)}; //01-Jan-0001 12:00:00 AM
-					break;
-				case DataBaseServer.PostgreSQL:
-					columns = new string[] {"T_TIMESTAMP"};
-					values = new DateTime[] {new DateTime(1753, 01, 01,00, 00, 00)}; //01-Jan-1753 12:00:00 AM
-					break;
-				case DataBaseServer.DB2:
-					columns = new string[] {"T_DATE", "T_TIMESTAMP"};
-					values = new DateTime[] {new DateTime(0001, 01, 01),		//	1/1/0001
-																  new DateTime(0001, 01, 01, 00,00,00,0)};	//	1/1/0001 00:00:00.000
-					break;
-				default:
-					throw new ApplicationException(string.Format("GHT ERROR: Unknown DB server [{0}].",ConnectedDataProvider.GetDbType()));
-			}
-		}
-
-		private string BuildMinDateTimeSelectSql(string[] dateColumns)
-		{
-			StringBuilder sqlBuilder = new StringBuilder();
-			sqlBuilder.Append("SELECT ");
-			foreach(string col in dateColumns)
-			{
-				sqlBuilder.Append(col + ", ");
-			}
-			sqlBuilder.Remove(sqlBuilder.Length - 2, 2);
-			sqlBuilder.Append(" FROM TYPES_EXTENDED WHERE ID='MIN'");
-			return sqlBuilder.ToString();
-		}
-	}
-}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDecimal_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDecimal_I.cs
deleted file mode 100755
index 0505e7baac8..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDecimal_I.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_GetDecimal_I : ADONetTesterClass
-{
-	private int testTypesInvocations;
-	private Exception exp = null;
-
-	public static void Main()
-	{
-		OleDbDataReader_GetDecimal_I tc = new OleDbDataReader_GetDecimal_I();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_GetDecimal_I");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(exp);
-		}
-	}
-
-	[Test]
-	public void run()
-	{
-		DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		DoTestTextualFieldsThatContainNumbers(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTextualFieldsThatContainNumbers(ConnectedDataProvider.GetExtendedDbTypesParameters());
-	}
-
-	public void DoTestTypes(DbTypeParametersCollection row)
-	{
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43968_" + this.testTypesInvocations.ToString();
-		OleDbDataReader rdr = null;
-		OleDbConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Decimal.
-				for (int i=0; i<row.Count; i++)
-				{
-					if (row[i].Value.GetType() == typeof(decimal)) //The value in the result set should be a Decimal.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetDecimal() on a field of dbtype {0}", row[i].DbTypeName));
-							decimal retDecimal = rdr.GetDecimal(i);
-							Compare(row[i].Value, retDecimal);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-					else //The value in the result set should NOT be Decimal. In this case an Invalid case exception should be thrown.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetDecimal() on a field of dbtype {0}", row[i].DbTypeName));
-							decimal retDecimal = rdr.GetDecimal(i);
-							ExpectedExceptionNotCaught("InvalidCastException");
-						}
-						catch (InvalidCastException ex)
-						{
-							ExpectedExceptionCaught(ex);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-
-	public void DoTestTextualFieldsThatContainNumbers(DbTypeParametersCollection row)
-	{
-		//Leave only textual fields in the collection, and set their value to the string "10"
-		SetTextualFieldsWithNumericValues(ref row);
-		if (row.Count < 1)
-		{
-			return;
-		}
-
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43968_" + this.testTypesInvocations.ToString();
-		OleDbDataReader rdr = null;
-		OleDbConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Decimal.
-				//Because all the fields are textual, this should throw an InvalidCastException.
-				for (int i=0; i<row.Count; i++)
-				{
-					try
-					{
-						BeginCase(string.Format("Calling GetDecimal() on a textual field of dbtype {0} with value '{1}'", row[i].DbTypeName, row[i].Value));
-						decimal retDecimal = rdr.GetDecimal(i);
-						ExpectedExceptionNotCaught(typeof(InvalidCastException).FullName);
-					}
-					catch (InvalidCastException ex)
-					{
-						ExpectedExceptionCaught(ex);
-					}
-					catch (Exception ex)
-					{
-						exp = ex;
-					}
-					finally
-					{
-						EndCase(exp);
-						exp = null;
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-
-	private void SetTextualFieldsWithNumericValues(ref DbTypeParametersCollection row)
-	{
-		DbTypeParametersCollection newRow = new DbTypeParametersCollection(row.TableName);
-		
-		foreach (DbTypeParameter current in row)
-		{
-			if (current.Value is string)
-			{
-				newRow.Add(current.DbTypeName, "10");
-			}
-		}
-
-		row = newRow;
-	}
-}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDouble_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDouble_I.cs
deleted file mode 100755
index 921ed65ab7d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDouble_I.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetDouble_I : GHTBase
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OleDbDataReader_GetDouble_I tc = new OleDbDataReader_GetDouble_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetDouble_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43969_" + this.testTypesInvocations.ToString();
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a double.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(double)) //The value in the result set should be a double.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetDouble() on a field of dbtype {0}", row[i].DbTypeName));
-								double retDouble = rdr.GetDouble(i);
-								Compare(row[i].Value, retDouble);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be double. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetDouble() on a field of dbtype {0}", row[i].DbTypeName));
-								double retDouble = rdr.GetDouble(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-
-
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetFieldType.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetFieldType.cs
deleted file mode 100755
index 02aa6c2eb07..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetFieldType.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetFieldType : ADONetTesterClass
-	{
-		OleDbConnection con;
-		OleDbCommand cmd;
-		OleDbDataReader rdr;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-				cmd = new OleDbCommand("Select OrderID, CustomerID, OrderDate From Orders", con);
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{EndCase(exp);}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_GetFieldType tc = new OleDbDataReader_GetFieldType();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetFieldType");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			try
-			{
-				BeginCase("check type string");
-				Compare(rdr.GetFieldType(1).FullName,typeof(string).FullName );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check type date");
-				Compare(rdr.GetFieldType(2).FullName,typeof(DateTime).FullName );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetFloat_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetFloat_I.cs
deleted file mode 100755
index 604537e4cdc..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetFloat_I.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetFloat_I : ADONetTesterClass 
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OleDbDataReader_GetFloat_I tc = new OleDbDataReader_GetFloat_I();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetFloat_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43970_" + this.testTypesInvocations.ToString();
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a float.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(float)) //The value in the result set should be a float.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetFloat() on a field of dbtype {0}", row[i].DbTypeName));
-								float retFloat = rdr.GetFloat(i);
-								Compare(row[i].Value, retFloat);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be float. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetFloat() on a field of dbtype {0}", row[i].DbTypeName));
-								float retFloat = rdr.GetFloat(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs
deleted file mode 100755
index 93fddc5dd0f..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetGuiid_I : ADONetTesterClass 
-	{
-
-		private const string GUID_COLUMN_NAME = "T_UNIQUEIDENTIFIER";
-		private const string GUID_TABLE_NAME = ConnectedDataProvider.SPECIFIC_TYPES_TABLE_NAME;
-		private const string TEST_GUID_STRING = "239A3C5E-8D41-11D1-B675-00C04FA3C554";
-
-		public static void Main()
-		{
-			OleDbDataReader_GetGuiid_I tc = new OleDbDataReader_GetGuiid_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetGuiid_I");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		
-		public void run()
-		{
-			
-		
-			TestUsingSQLTextOnly();
-			TestUsingParametersArray();
-		}
-
-		[Test]
-		public void TestUsingSQLTextOnly()
-		{
-			//Only apply to MSSQL
-			if ( (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer)) {
-				return;
-			}
-
-			Exception exp = null;
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			OleDbCommand cmdDelete = null;
-			try
-			{
-				BeginCase("Test using SQL text only.");
-				string rowId = "43973_" + TestCaseNumber.ToString();
-				string insertText = string.Format("INSERT INTO {0} (ID, {1}) VALUES ('{2}', '{{{3}}}')", GUID_TABLE_NAME, GUID_COLUMN_NAME, rowId, TEST_GUID_STRING);
-				string selectText = string.Format("SELECT {0} FROM {1} WHERE ID='{2}'", GUID_COLUMN_NAME, GUID_TABLE_NAME, rowId);
-				string deleteText = string.Format("DELETE FROM {0} WHERE ID='{1}'", GUID_TABLE_NAME, rowId);
-				con = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-				OleDbCommand cmdInsert = new OleDbCommand(insertText, con);
-				OleDbCommand cmdSelect = new OleDbCommand(selectText, con);
-				cmdDelete = new OleDbCommand(deleteText, con);
-
-				con.Open();
-				cmdInsert.ExecuteNonQuery();
-				rdr = cmdSelect.ExecuteReader();
-				rdr.Read();
-				Guid  guidValue = rdr.GetGuid (0);
-				Guid origGuid = new Guid(TEST_GUID_STRING);
-				Compare(guidValue, origGuid);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if (cmdDelete != null)
-				{
-					cmdDelete.ExecuteNonQuery();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-
-		[Test]
-		public void TestUsingParametersArray()
-		{
-			//Only apply to MSSQL
-			if ( (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer))
-			{
-				return;
-			}
-			Exception exp = null;
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			DbTypeParametersCollection row = new DbTypeParametersCollection(GUID_TABLE_NAME);
-			string rowId = string.Empty;
-			try
-			{
-				BeginCase("Test using parameters array");
-				rowId = "43973_" + TestCaseNumber.ToString();
-				row.Add("UNIQUEIDENTIFIER", new Guid(TEST_GUID_STRING));
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				rdr.Read();
-				Guid  guidValue = rdr.GetGuid (0);
-				Compare(guidValue, row[GUID_COLUMN_NAME].Value);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-				exp = null;
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if (rowId != String.Empty)
-				{
-					row.ExecuteDelete(rowId);
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-				
-			}
-		}
-	}
-	
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt16.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt16.cs
deleted file mode 100755
index 0775b528a92..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt16.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_GetInt16 : ADONetTesterClass 
-{
-	private Exception exp = null;
-	private int testTypesInvocations;
-
-	public static void Main()
-	{
-		OleDbDataReader_GetInt16 tc = new OleDbDataReader_GetInt16();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_GetInt16_I");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			tc.exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(tc.exp);
-		}
-	}
-
-	[Test]
-	public void run()
-	{
-		DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-	}
-
-	public void DoTestTypes(DbTypeParametersCollection row)
-	{
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43971_" + this.testTypesInvocations.ToString();
-		OleDbDataReader rdr = null;
-		OleDbConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Int16.
-				for (int i=0; i<row.Count; i++)
-				{
-					if (row[i].Value.GetType() == typeof(Int16)) //The value in the result set should be a Int16.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt16() on a field of dbtype {0}", row[i].DbTypeName));
-							Int16 retInt16 = rdr.GetInt16(i);
-							Compare(row[i].Value, retInt16);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-					else //The value in the result set should NOT be Int16. In this case an Invalid case exception should be thrown.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt16() on a field of dbtype {0}", row[i].DbTypeName));
-							Int16 retInt16 = rdr.GetInt16(i);
-							ExpectedExceptionNotCaught("InvalidCastException");
-						}
-						catch (InvalidCastException ex)
-						{
-							ExpectedExceptionCaught(ex);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-}
-	
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt32_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt32_I.cs
deleted file mode 100755
index 456ed984b6e..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt32_I.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetInt32_I : ADONetTesterClass 
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-		public static void Main()
-		{
-			OleDbDataReader_GetInt32_I tc = new OleDbDataReader_GetInt32_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetInt32_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "13286_" + this.testTypesInvocations.ToString();
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a Int32.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(Int32)) //The value in the result set should be a Int32.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetInt32() on a field of dbtype {0}", row[i].DbTypeName));
-								Int32 retInt32 = rdr.GetInt32(i);
-								Compare(row[i].Value, retInt32);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be Int32. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetInt32() on a field of dbtype {0}", row[i].DbTypeName));
-								Int32 retInt32 = rdr.GetInt32(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt64.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt64.cs
deleted file mode 100755
index 8fbbf951ae1..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetInt64.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_GetInt64 : ADONetTesterClass 
-{
-	private Exception exp = null;
-	private int testTypesInvocations;
-
-	public static void Main()
-	{
-		OleDbDataReader_GetInt64 tc = new OleDbDataReader_GetInt64();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_GetInt64_I");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			tc.exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(tc.exp);
-		}
-	}
-
-	[Test]
-	public void run()
-	{
-		DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-		DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-	}
-	public void DoTestTypes(DbTypeParametersCollection row)
-	{
-		testTypesInvocations++;
-		exp = null;
-		string rowId = "43972_" + this.testTypesInvocations.ToString();
-		OleDbDataReader rdr = null;
-		OleDbConnection con = null;
-		try
-		{
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			while (rdr.Read())
-			{
-				//Run over all the columns in the result set row.
-				//For each column, try to read it as a Int64.
-				for (int i=0; i<row.Count; i++)
-				{
-					if (row[i].Value.GetType() == typeof(Int64)) //The value in the result set should be a Int64.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt64() on a field of dbtype {0}", row[i].DbTypeName));
-							Int64 retInt64 = rdr.GetInt64(i);
-							Compare(row[i].Value, retInt64);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-					else //The value in the result set should NOT be Int64. In this case an Invalid case exception should be thrown.
-					{
-						try
-						{
-							BeginCase(string.Format("Calling GetInt64() on a field of dbtype {0}", row[i].DbTypeName));
-							Int64 retInt64 = rdr.GetInt64(i);
-							ExpectedExceptionNotCaught("InvalidCastException");
-						}
-						catch (InvalidCastException ex)
-						{
-							ExpectedExceptionCaught(ex);
-						}
-						catch (Exception ex)
-						{
-							exp = ex;
-						}
-						finally
-						{
-							EndCase(exp);
-							exp = null;
-						}
-					}
-				}
-			}
-		}
-		finally
-		{
-			row.ExecuteDelete(rowId);
-			if ( (rdr != null) && (!rdr.IsClosed) )
-			{
-				rdr.Close();
-			}
-			if ( (con != null) && (con.State != ConnectionState.Closed) )
-			{
-				con.Close();
-			}
-		}
-	}
-
-
-}
-	
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetName_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetName_I.cs
deleted file mode 100755
index f19649d02e7..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetName_I.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_GetName_I : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataReader_GetName_I tc = new OleDbDataReader_GetName_I();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_NextResult");
-				tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		OleDbCommand cmd = new OleDbCommand("Customers",  con);
-		cmd.CommandType = CommandType.TableDirect;
-
-		con.Open();
-
-		OleDbDataReader rdr = cmd.ExecuteReader();
-		rdr.Read();
-
-
-		try
-		{
-			BeginCase("GetName field 0");
-			string str = rdr.GetName(0);
-			Compare(str.ToUpper(),"CUSTOMERID" );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("GetName last field ");
-			string str = rdr.GetName(rdr.FieldCount -1);
-			Compare(str.ToUpper(),"FAX" );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetOrdinal.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetOrdinal.cs
deleted file mode 100755
index 1d7d672bbab..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetOrdinal.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetOrdinal : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbDataReader_GetOrdinal tc = new OleDbDataReader_GetOrdinal();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetOrdinal");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OleDbCommand cmd = new OleDbCommand("Select * From Customers", con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-		
-
-			try
-			{
-				BeginCase("column REGION ordinal");
-				Compare(rdr.GetOrdinal("REGION"),6 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("column not exists");
-				try
-				{
-					int i = rdr.GetOrdinal("blabla");
-				}
-				catch (Exception ex) {exp=ex;}
-				Compare(exp.GetType().FullName,typeof(IndexOutOfRangeException).FullName);
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetSchemaTable.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetSchemaTable.cs
deleted file mode 100755
index 0ff337cb4d7..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetSchemaTable.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-class TestId13294 : GHTBase
-{
-	public static void Main()
-	{
-		TestId13294 tc = new TestId13294();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_GetSchemaTable");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OleDbCommand cmd = new OleDbCommand("Select * From Orders", con);
-		OleDbDataReader rdr = cmd.ExecuteReader();
-		DataTable tbl = rdr.GetSchemaTable();
-
-		//check that all the columns properties (according to .Net) exists (GH give more properties)
-
-		try
-		{
-			BeginCase("ColumnName");
-				Compare(tbl.Columns.Contains("ColumnName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ColumnOrdinal");
-			Compare(tbl.Columns.Contains("ColumnOrdinal"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ColumnSize");
-			Compare(tbl.Columns.Contains("ColumnSize"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("NumericPrecision");
-			Compare(tbl.Columns.Contains("NumericPrecision"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("NumericScale");
-			Compare(tbl.Columns.Contains("NumericScale"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("DataType");
-			Compare(tbl.Columns.Contains("DataType"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("ProviderType");
-			Compare(tbl.Columns.Contains("ProviderType"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsLong");
-			Compare(tbl.Columns.Contains("IsLong"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("AllowDBNull");
-			Compare(tbl.Columns.Contains("AllowDBNull"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsReadOnly");
-			Compare(tbl.Columns.Contains("IsReadOnly"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsRowVersion");
-			Compare(tbl.Columns.Contains("IsRowVersion"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsUnique");
-			Compare(tbl.Columns.Contains("IsUnique"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsKey");
-			Compare(tbl.Columns.Contains("IsKey"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("IsAutoIncrement");
-			Compare(tbl.Columns.Contains("IsAutoIncrement"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("BaseSchemaName");
-			Compare(tbl.Columns.Contains("BaseSchemaName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("BaseTableName");
-			Compare(tbl.Columns.Contains("BaseTableName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("BaseColumnName");
-			Compare(tbl.Columns.Contains("BaseColumnName"),true );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-
-		if (con.State == ConnectionState.Open) con.Close();
-	
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetString_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetString_I.cs
deleted file mode 100755
index c10d270d23b..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetString_I.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetString_I : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OleDbDataReader_GetString_I tc = new OleDbDataReader_GetString_I();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetString_I");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-		
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OleDbCommand cmd = new OleDbCommand("Select FirstName From Employees Where EmployeeID = 100", con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			try
-			{
-				BeginCase("check value");
-				string str = rdr.GetString(0);
-				Compare(str,"First100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetTimeSpan_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetTimeSpan_I.cs
deleted file mode 100755
index f555c65366d..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetTimeSpan_I.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetTimeSpan_I : ADONetTesterClass
-	{
-		private Exception exp = null;
-		private int testTypesInvocations;
-
-//		public OleDbDataReader_GetTimeSpan_I() : base(true)
-//		{
-//		}
-
-		public static void Main()
-		{
-			OleDbDataReader_GetTimeSpan_I tc = new OleDbDataReader_GetTimeSpan_I();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetTimeSpan_I");
-				tc.run();
-			}
-			catch(Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			DoTestTypes(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			DoTestTypes(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		public void DoTestTypes(DbTypeParametersCollection row)
-		{
-			testTypesInvocations++;
-			exp = null;
-			string rowId = "43967_" + this.testTypesInvocations.ToString();
-			OleDbDataReader rdr = null;
-			OleDbConnection con = null;
-			try
-			{
-				row.ExecuteInsert(rowId);
-				row.ExecuteSelectReader(rowId, out rdr, out con);
-				while (rdr.Read())
-				{
-					//Run over all the columns in the result set row.
-					//For each column, try to read it as a TimeSpan.
-					for (int i=0; i<row.Count; i++)
-					{
-						if (row[i].Value.GetType() == typeof(TimeSpan)) //The value in the result set should be a TimeSpan.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetTimeSpan() on a field of dbtype {0}", row[i].DbTypeName));
-								TimeSpan retTimeSpan = rdr.GetTimeSpan(i);
-								Compare(row[i].Value, retTimeSpan);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-						else //The value in the result set should NOT be TimeSpan. In this case an Invalid case exception should be thrown.
-						{
-							try
-							{
-								BeginCase(string.Format("Calling GetTimeSpan() on a field of dbtype {0}", row[i].DbTypeName));
-								TimeSpan retTimeSpan = rdr.GetTimeSpan(i);
-								ExpectedExceptionNotCaught("InvalidCastException");
-							}
-							catch (InvalidCastException ex)
-							{
-								ExpectedExceptionCaught(ex);
-							}
-							catch (Exception ex)
-							{
-								exp = ex;
-							}
-							finally
-							{
-								EndCase(exp);
-								exp = null;
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				row.ExecuteDelete(rowId);
-				if ( (rdr != null) && (!rdr.IsClosed) )
-				{
-					rdr.Close();
-				}
-				if ( (con != null) && (con.State != ConnectionState.Closed) )
-				{
-					con.Close();
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs
deleted file mode 100755
index 63dee0c8b61..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetValue : ADONetTesterClass
-	{
-		Exception exp;
-		OleDbConnection con;
-		char [] Result;
-
-		[SetUp]
-		public void SetUp()
-		{
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				Result = new char[100];
-				con.Open();
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_GetValue tc = new OleDbDataReader_GetValue();
-			tc.exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetValue");
-				tc.SetUp();
-				tc.run();
-			}
-			catch (Exception ex)
-			{
-				tc.exp = ex;
-			}
-			finally	
-			{
-				tc.EndTest(tc.exp);
-				tc.TearDown();
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			TypesTests(ConnectedDataProvider.GetSimpleDbTypesParameters());
-			TypesTests(ConnectedDataProvider.GetExtendedDbTypesParameters());
-		}
-
-		[Test]
-		public void SimpleTest()
-		{
-			OleDbDataReader rdr = null;
-			exp = null;
-			try
-			{
-				BeginCase("check value");
-				
-				OleDbCommand cmd = new OleDbCommand("Select LastName From Employees Where EmployeeID = 100", con);
-				rdr = cmd.ExecuteReader();
-				rdr.Read();
-
-				Object obj = rdr.GetValue(0); 
-				Compare(obj.ToString(), "Last100");
-			} 
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (rdr != null)
-				{
-					rdr.Close();
-				}
-				EndCase(exp);
-				exp = null;
-			}
-		}
-		private void TypesTests(DbTypeParametersCollection typesToTest)
-		{
-			exp = null;
-
-			DbTypeParametersCollection currentlyTested = new DbTypeParametersCollection(typesToTest.TableName);
-			string rowId = "13289";
-			object dbValue;
-			OleDbDataReader rdr = null;
-			OleDbConnection selectCon = null;
-			DataBaseServer testedDbServer = ConnectedDataProvider.GetDbType();
-
-			foreach (DbTypeParameter currentParamType in typesToTest)
-			{
-				BeginCase("Test value of db type: " + currentParamType.DbTypeName);
-				//Prepare data:
-				rowId = string.Format("13289_{0}", this.TestCaseNumber);
-				currentlyTested.Clear();
-				currentlyTested.Add(currentParamType);
-				currentlyTested.ExecuteInsert(rowId);
-
-				try
-				{
-					currentlyTested.ExecuteSelectReader(rowId, out rdr, out selectCon);
-					rdr.Read();
-					dbValue = WorkaroundOracleCharsPaddingLimitation(testedDbServer, currentParamType, rdr.GetValue(0));
-					if (currentParamType.Value.GetType().IsArray)
-					{
-						Compare(dbValue as Array, currentParamType.Value as Array);
-					}
-					else
-					{
-						Compare(dbValue, currentParamType.Value);
-					}
-				} 
-				catch(Exception ex)
-				{
-					exp = ex;
-				}
-				finally
-				{
-					EndCase(exp);
-					exp = null;
-					if (rdr != null && !rdr.IsClosed)
-					{
-						rdr.Close();
-					}
-					if (selectCon != null && selectCon.State != ConnectionState.Closed)
-					{
-						selectCon.Close();
-					}
-					currentlyTested.ExecuteDelete(rowId);
-				}
-			}
-		}
-		/// <summary>
-		/// This is a workaround for the extra white spaces added in oracle to NCHAR & NVARCHAR values.
-		/// The problem is a documented GH limitation, see bug #3417.
-		/// The workaround is to trim the lemgth of the returned string to the specified length of the parameter/column.
-		/// </summary>
-		/// <param name="testedServer">The database server we are currently running on.</param>
-		/// <param name="val">The value returned from the database.</param>
-		/// <returns>The normalized value..</returns>
-		private object WorkaroundOracleCharsPaddingLimitation(DataBaseServer testedServer, DbTypeParameter currentParam, object val)
-		{
-			object origVal = val;
-			string dbTypeName = currentParam.DbTypeName.ToUpper();
-			if ( (testedServer == DataBaseServer.Oracle) && (dbTypeName == "CHAR" || dbTypeName == "NCHAR") )
-			{
-				val = ((string)val).Substring(0, currentParam.Size);
-				Log(string.Format("Worked around oracle chars padding limitation by triming '{0}' to '{1}'", origVal, val));
-			}
-			return val;
-		}
-
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValues.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValues.cs
deleted file mode 100755
index fccb70c270a..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValues.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_GetValues : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OleDbDataReader_GetValues tc = new OleDbDataReader_GetValues();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_GetValues");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			int intValuesCount = 0;
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OleDbCommand cmd = new OleDbCommand("Select CustomerID, ContactName , CompanyName From Customers where CustomerID = 'GH100'", con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			object [] values = null;
-
-
-			//------ check big array
-			try
-			{
-				BeginCase("GetValues - bigger array - check count");
-				values = new object[50];
-				intValuesCount = rdr.GetValues(values);
-				Compare(intValuesCount ,3 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - bigger array - check CustomerID");
-				Compare(values[0].ToString().Trim() ,"GH100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - bigger array - check CompanyName");
-				Compare(values[2].ToString() ,"Company100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - bigger array - check DBNull");
-				Compare(values[3] == null ,true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			//------ check small array
-			try
-			{
-				BeginCase("GetValues - smaller array - check count");
-				values = new object[2];
-				intValuesCount = rdr.GetValues(values);
-				Compare(intValuesCount ,2 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - smaller array - check CustomerID");
-				Compare(values[0].ToString().Trim() ,"GH100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			//------ check exact array
-			try
-			{
-				BeginCase("GetValues - exact array - check count");
-				values = new object[3];
-				intValuesCount = rdr.GetValues(values);
-				Compare(intValuesCount ,3 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - exact array - check CustomerID");
-				Compare(values[0].ToString().Trim() ,"GH100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("GetValues - exact array - check CompanyName");
-				Compare(values[2].ToString() ,"Company100" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_HasRows.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_HasRows.cs
deleted file mode 100755
index 42752d22a47..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_HasRows.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-using MonoTests.System.Data.Utils.Data;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-
-[TestFixture]
-public class OleDbDataReader_HasRows : GHTBase
-{
-	Exception exp;
-
-	public static void Main()
-	{
-		OleDbDataReader_HasRows tc = new OleDbDataReader_HasRows();
-		tc.exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_HasRows");
-			tc.run();
-		}
-		catch(Exception ex)
-		{
-			tc.exp = ex;
-		}
-		finally	
-		{
-			tc.EndTest(tc.exp);
-		}
-	}
-
-	public void run()
-	{
-		TestHasRowsTrue();
-		TestHasRowsFalse();
-	}
-
-	[Test]
-	public void TestHasRowsTrue()
-	{
-		BeginCase("Test HasRows = True");
-		exp = null;
-		string rowId = string.Format("43977_{0}", TestCaseNumber);
-		OleDbConnection con = null;
-		OleDbDataReader rdr = null;
-		try
-		{
-			DbTypeParametersCollection row = ConnectedDataProvider.GetSimpleDbTypesParameters();
-			row.ExecuteInsert(rowId);
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			Compare(rdr.HasRows, true);
-		}
-		catch (Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-
-	[Test]
-	public void TestHasRowsFalse()
-	{
-		BeginCase("Test HasRows = False");
-		exp = null;
-		string rowId = string.Format("43977_{0}", TestCaseNumber);
-		OleDbConnection con = null;
-		OleDbDataReader rdr = null;
-		try
-		{
-			DbTypeParametersCollection row = ConnectedDataProvider.GetSimpleDbTypesParameters();
-			row.ExecuteDelete(rowId);	//Make sure that a row with such ID does not exist.
-			row.ExecuteSelectReader(rowId, out rdr, out con);
-			Compare(rdr.HasRows, false);
-		}
-		catch (Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			exp = null;
-		}
-	}
-}
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_IsDBNull.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_IsDBNull.cs
deleted file mode 100755
index d052a4e3960..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_IsDBNull.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	class TestId13296 : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			TestId13296 tc = new TestId13296();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_IsDBNull");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OleDbCommand cmd = new OleDbCommand("Select EmployeeID,City From Employees where EmployeeID = 100  ", con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-
-			try
-			{
-				BeginCase("IsDBNull value");
-				Compare(rdr.IsDBNull(1),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Item.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Item.cs
deleted file mode 100755
index 16630cf0fa6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Item.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_Item : ADONetTesterClass 
-{
-	public static void Main()
-	{
-		OleDbDataReader_Item tc = new OleDbDataReader_Item();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_Item");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-
-		//prepare data
-
-
-
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		OleDbCommand cmd = new OleDbCommand("select ProductID,ProductName,Discontinued from Products where ProductID=1", con);
-		con.Open();
-		OleDbDataReader rdr =  cmd.ExecuteReader();
-
-		rdr.Read();
-		object obj = null;
-
-		switch (ConnectedDataProvider.GetDbType(con)) 
-		{
-			case DataBaseServer.DB2:
-			case DataBaseServer.SQLServer:
-			case DataBaseServer.PostgreSQL:
-				try
-				{
-					BeginCase("Column int - type");
-					obj = rdr["ProductID"];
-					Compare(obj.GetType().FullName , typeof(int).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-			case DataBaseServer.Oracle:
-			case DataBaseServer.Sybase:
-				try
-				{
-					BeginCase("Column Decimal - type");
-					obj = rdr["ProductID"];
-					Compare(obj.GetType().FullName , typeof(decimal).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-		}
-
-		try
-		{
-			BeginCase("Column int - value");
-			Compare(obj.ToString(),"1");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Column string - type");
-			obj = rdr["ProductName"];
-			Compare(obj.GetType().FullName , typeof(string).FullName);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("Column string - value");
-			Compare(obj.ToString(),"Chai");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		switch (ConnectedDataProvider.GetDbType(con)) 
-		{
-			case DataBaseServer.DB2 :
-				try
-				{
-					BeginCase("Column Int16 - type");
-					obj = rdr["Discontinued"];
-					Compare(obj.GetType().FullName , typeof(Int16).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Column Int16 - value");
-					Compare(obj.ToString(),"0");
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-			case DataBaseServer.SQLServer :
-				try
-				{
-					BeginCase("Column bool - type");
-					obj = rdr["Discontinued"];
-					Compare(obj.GetType().FullName , typeof(bool).FullName);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-
-				try
-				{
-					BeginCase("Column bool - value");
-					Compare(obj.ToString().ToUpper(),"FALSE");
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null;}
-				break;
-			case DataBaseServer.Oracle :
-				//Column type is Decimal - already tested
-				break;
-		}
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_NextResult.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_NextResult.cs
deleted file mode 100755
index 380de7923ee..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_NextResult.cs
+++ /dev/null
@@ -1,661 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_NextResult : ADONetTesterClass 
-	{
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		Exception exp = null;
-
-		[SetUp]
-		public void SetUp() {
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-		}
-
-		[TearDown]
-		public void TearDown() {
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_NextResult tc = new OleDbDataReader_NextResult();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_NextResult");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		public void run()
-		{
-
-
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			TestMultipleResultSetsWithSP();
-			TestMultipleResultSetsWithSQLText();
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-
-		[Test]
-		public void TestMultipleResultSetsWithSQLText()
-		{
-
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.Oracle)
-			{
-				this.Log("Multiple result sets by sql text is not tested in oracle.");
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.DB2)
-			{
-				this.Log("Multiple result sets using compound statement not supported at DB2.");
-				return;
-			}
-
-			bool NextResultExists = false;
-			OleDbDataReader rdr = null;
-			OleDbCommand cmd;
-			int TblResult0=-1;
-			int TblResult1=-1;
-			int TblResult2=-1;
-			try
-			{
-				BeginCase("Setup: Get expected results.");
-
-				//get excpected results
-				GetExcpectedResults(ref TblResult0, ref TblResult1, ref TblResult2);
-				this.Pass("Setup: Get expected results ended.");
-			}
-			catch (Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				EndCase(exp);
-			}
-
-
-			string cmdTxt = BuildCommandText();
-			cmd = new OleDbCommand(cmdTxt, con);
-			cmd.CommandType = CommandType.Text;
-			rdr = cmd.ExecuteReader();
-			// -------------- ResultSet  1 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 1 exists");
-				Compare(rdr != null, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 1 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			int i = 1;
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 1 Data");
-				while (rdr.Read())
-				{
-					i++;
-				}
-				Compare(i, TblResult0);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 1 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "CUSTOMERID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			// -------------- ResultSet  2 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 2 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 2 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 2 Data");
-				i = 1;
-				while (rdr.Read())
-				{
-					i++;
-				}
-				Compare(i, TblResult1);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 2 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "CATEGORYID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			// -------------- ResultSet  3 ------------
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 3 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check if ResultSet 3 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 3 Data");
-				i = 1;
-				while (rdr.Read())
-				{
-					i++;
-				}
-				Compare(i, TblResult2);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check ResultSet 3 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "REGIONID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check that resultset 4 does not exist.");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets sql text) - Check that resultset 4 does not contain data.");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			if (!rdr.IsClosed)
-				rdr.Close();
-		}
-
-		[Test]
-		public void TestMultipleResultSetsWithSP()
-		{
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType() == DataBaseServer.Oracle)
-			{
-				this.Log("Not testing Stored procedures with multiple ref-cursors on Oracle with .NET due to bug in .NET (only the first ref-cursor is retrived).");
-				return;
-			}
-
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-				// fail to work on .NET OLEDB
-				this.Log("Not testing PostgreSQL CommandType.StoredProcedure which return SETOF");
-				return;
-			}
-#endif
-			
-			bool NextResultExists = false;
-			// transaction use was add for PostgreSQL
-			OleDbTransaction tr = con.BeginTransaction();
-			OleDbCommand cmd = new OleDbCommand("GH_MULTIRECORDSETS", con, tr);
-			cmd.CommandType = CommandType.StoredProcedure;
-			OleDbDataReader rdr = cmd.ExecuteReader();
-
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 1 exists");
-				Compare(rdr != null, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 1 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 1 Data");
-				Compare(rdr.GetValue(1).ToString(), "Yavine");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 1 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "EMPLOYEEID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-
-			
-			// -------------- ResultSet  2 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 2 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 2 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 2 Data");
-				Compare(rdr.GetValue(1).ToString(), "Morgenstern Gesundkost");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 2 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "CUSTOMERID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-
-			// -------------- ResultSet  3 ------------
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 3 exists");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, true);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check if ResultSet 3 contains data");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check ResultSet 3 Schema");
-				Compare(rdr.GetSchemaTable().Rows[0].ItemArray.GetValue(0).ToString().ToUpper(), "ORDERID");
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check that resultset 4 does not exist.");
-				NextResultExists = rdr.NextResult();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-			try
-			{
-				exp = null;
-				BeginCase("(Multiple Resultsets stored proc.) - Check that resultset 4 does not contain data.");
-				NextResultExists = rdr.Read();
-				Compare(NextResultExists, false);
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally	
-			{
-				EndCase(exp);
-			}
-
-			//Cleanup:
-			if (!rdr.IsClosed)
-			{
-				rdr.Close();
-			}
-
-			// transaction use was add for PostgreSQL
-			tr.Commit();
-
-		}
-
-
-		#region "Private Utilities"
-		private string BuildCommandText()
-		{
-			string beginStatement;
-			string endStatement;
-			string commandDelimiter;
-			string[] commands = new string[] {"select * from Customers", "select * from Categories", "select * from Region"};
-
-			GetDBSpecificSyntax(ConnectedDataProvider.GetDbType(), out beginStatement, out endStatement, out commandDelimiter);
-
-			StringBuilder cmdBuilder = new StringBuilder();
-			cmdBuilder.Append(beginStatement);
-			cmdBuilder.Append(" ");
-			foreach (string statement in commands)
-			{
-				cmdBuilder.Append(statement);
-				cmdBuilder.Append(commandDelimiter);
-				cmdBuilder.Append(" ");
-			}
-			cmdBuilder.Append(endStatement);
-
-			return cmdBuilder.ToString();
-		}
-		private void GetDBSpecificSyntax(DataBaseServer dbServer, out string beginStatement, out string endStatement, out string commandDelimiter)
-		{
-			switch (dbServer)
-			{
-				case DataBaseServer.SQLServer:
-					beginStatement = "BEGIN";
-					endStatement = "END";
-					commandDelimiter = ";";
-					break;
-				case DataBaseServer.Sybase:
-					beginStatement = "BEGIN";
-					endStatement = "END";
-					commandDelimiter = "\r\n";
-					break;
-				case DataBaseServer.Oracle:
-					beginStatement = "BEGIN";
-					endStatement = "END;";
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.DB2:
-					{
-						beginStatement = "";
-						endStatement = "";
-					}
-					commandDelimiter = ";";
-					break;
-
-				case DataBaseServer.PostgreSQL:
-					beginStatement = "";
-					endStatement = "";
-					commandDelimiter = ";";
-					break;
-
-				default:
-					this.Fail("Unknown DataBaseServer type");
-					throw new ApplicationException("Unknown DataBaseServer type");
-			}
-		}
-		private void GetExcpectedResults(ref int TblResult0, ref int TblResult1, ref int TblResult2)
-		{
-			// get excpected results
-			
-			// transaction use was add for PostgreSQL
-			OleDbTransaction tr = con.BeginTransaction();
-			OleDbCommand cmd = new OleDbCommand("", con,tr);
-			cmd.CommandText = "Select count(*) from Customers";
-			TblResult0 = Int32.Parse(cmd.ExecuteScalar().ToString());
-			cmd.CommandText = "Select count(*) from Categories";
-			TblResult1 = Int32.Parse(cmd.ExecuteScalar().ToString());
-			cmd.CommandText = "Select count(*) from Region";
-			TblResult2 = Int32.Parse(cmd.ExecuteScalar().ToString());
-			tr.Commit();
-		}
-
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Read.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Read.cs
deleted file mode 100755
index f6a8037f700..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_Read.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_Read : ADONetTesterClass 
-	{
-		OleDbConnection con;
-		OleDbCommand cmd;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				cmd = new OleDbCommand("", con);
-				con.Open();
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null && con.State != ConnectionState.Closed)
-				con.Close();
-		}
-
-		public static void Main()
-		{
-			OleDbDataReader_Read tc = new OleDbDataReader_Read();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbDataReader_Read");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			cmd.CommandText = "Select EmployeeID, LastName, FirstName, Title, BirthDate From Employees where EmployeeID in (100,200) order by EmployeeID asc";
-			OleDbDataReader rdr = cmd.ExecuteReader();
-
-			try
-			{
-				BeginCase("first row");
-				bool read = rdr.Read();
-				Compare(read, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("first row - value");
-				object obj = rdr.GetValue(0);
-				Compare(obj.ToString(), "100");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			try
-			{
-				BeginCase("Second row");
-				bool read = rdr.Read();
-				Compare(read, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Second row - value");
-				object obj = rdr.GetValue(0);
-				Compare(obj.ToString(), "200");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("End of data");
-				bool read = rdr.Read();
-				Compare(read, false);
-				rdr.Close();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Read return false");
-				cmd.CommandText= "select * from Orders where OrderID=-909";
-				rdr = cmd.ExecuteReader();
-				Compare(rdr.Read(),false);
-				rdr.Close();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_RecordsAffected.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_RecordsAffected.cs
deleted file mode 100755
index 91eaf80f2db..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_RecordsAffected.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbDataReader_RecordsAffected  : ADONetTesterClass 
-	{
-		public static void Main()
-		{
-			OleDbDataReader_RecordsAffected tc = new OleDbDataReader_RecordsAffected();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("RecordsAffected");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			int intRecordsAffected = 0;
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OleDbCommand cmd = new OleDbCommand("Update Employees set Title = 'title' where EmployeeID = 100", con);
-			OleDbDataReader rdr = cmd.ExecuteReader();
-			rdr.Read();
-			intRecordsAffected = rdr.RecordsAffected;
-
-			try
-			{
-				BeginCase("RecordsAffected");
-				Compare(intRecordsAffected,1 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
-
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_ctor.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_ctor.cs
deleted file mode 100755
index 8e9697facb1..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_ctor.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbDataReader_ctor : GHTBase
-{
-	public static void Main()
-	{
-		OleDbDataReader_ctor tc = new OleDbDataReader_ctor();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbDataReader_ctor");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-		con.Open();
-		OleDbCommand cmd = new OleDbCommand("Select * From Orders", con);
-		OleDbDataReader rdr = cmd.ExecuteReader();
-
-		//change a connection's state without closing the datareader (should fail
-		try
-		{
-			BeginCase("InvalidOperationException");
-			try
-			{
-				con.ChangeDatabase("msdb");
-				ExpectedExceptionNotCaught(typeof(InvalidOperationException).FullName);
-			}
-			catch (InvalidOperationException ex) 
-			{
-				ExpectedExceptionCaught(ex);
-			}
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		if (con.State == ConnectionState.Open) con.Close();
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbLiteral/OleDbLiteral.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbLiteral/OleDbLiteral.cs
deleted file mode 100755
index ab67989b1f9..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbLiteral/OleDbLiteral.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbLiteral_Enum : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbLiteral_Enum tc = new OleDbLiteral_Enum();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbLiteral_Enum");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			try
-			{
-				BeginCase("Checking Invalid value"); Compare((int)OleDbLiteral.Invalid,0  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Binary_Literalvalue"); Compare((int)OleDbLiteral.Binary_Literal,1  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Catalog_Namevalue"); Compare((int)OleDbLiteral.Catalog_Name,2  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Catalog_Separatorvalue"); Compare((int)OleDbLiteral.Catalog_Separator,3  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Char_Literalvalue"); Compare((int)OleDbLiteral.Char_Literal,4  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Column_Aliasvalue"); Compare((int)OleDbLiteral.Column_Alias,5  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Column_Namevalue"); Compare((int)OleDbLiteral.Column_Name,6  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Correlation_Namevalue"); Compare((int)OleDbLiteral.Correlation_Name,7  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Cursor_Namevalue"); Compare((int)OleDbLiteral.Cursor_Name,8  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Escape_Percent_Prefixvalue"); Compare((int)OleDbLiteral.Escape_Percent_Prefix,9  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Escape_Underscore_Prefixvalue"); Compare((int)OleDbLiteral.Escape_Underscore_Prefix,10  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Index_Namevalue"); Compare((int)OleDbLiteral.Index_Name,11  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Like_Percentvalue"); Compare((int)OleDbLiteral.Like_Percent,12  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Like_Underscorevalue"); Compare((int)OleDbLiteral.Like_Underscore,13  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Procedure_Namevalue"); Compare((int)OleDbLiteral.Procedure_Name,14  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Quote_Prefixvalue"); Compare((int)OleDbLiteral.Quote_Prefix,15  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Schema_Namevalue"); Compare((int)OleDbLiteral.Schema_Name,16  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Table_Namevalue"); Compare((int)OleDbLiteral.Table_Name,17  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Text_Commandvalue"); Compare((int)OleDbLiteral.Text_Command,18  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking User_Namevalue"); Compare((int)OleDbLiteral.User_Name,19  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking View_Namevalue"); Compare((int)OleDbLiteral.View_Name,20  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Cube_Namevalue"); Compare((int)OleDbLiteral.Cube_Name,21  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Dimension_Namevalue"); Compare((int)OleDbLiteral.Dimension_Name,22  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Hierarchy_Namevalue"); Compare((int)OleDbLiteral.Hierarchy_Name,23  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Level_Namevalue"); Compare((int)OleDbLiteral.Level_Name,24  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Member_Namevalue"); Compare((int)OleDbLiteral.Member_Name,25  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Property_Namevalue"); Compare((int)OleDbLiteral.Property_Name,26  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Schema_Separatorvalue"); Compare((int)OleDbLiteral.Schema_Separator,27  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Quote_Suffixvalue"); Compare((int)OleDbLiteral.Quote_Suffix,28  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Escape_Percent_Suffixvalue"); Compare((int)OleDbLiteral.Escape_Percent_Suffix,29  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Escape_Underscore_Suffixvalue"); Compare((int)OleDbLiteral.Escape_Underscore_Suffix,30  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor.cs
deleted file mode 100755
index d35f233a422..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbParameter_ctor : GHTBase
-{
-	public static void Main()
-	{
-		OleDbParameter_ctor tc = new OleDbParameter_ctor();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbParameter_ctor");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbParameter param = new OleDbParameter();
-
-		try
-		{
-			BeginCase("ctor");
-			Compare(param != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SO.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SO.cs
deleted file mode 100755
index e7f3fda4bfb..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SO.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbParameter_ctor_SO : GHTBase
-{
-	public static void Main()
-	{
-		OleDbParameter_ctor_SO tc = new OleDbParameter_ctor_SO();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbParameter_ctor_SO");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbParameter param = new OleDbParameter("myParam",10);
-
-		try
-		{
-			BeginCase("ctor");
-			Compare(param != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("name");
-			Compare(param.ParameterName ,"myParam");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("value");
-			Compare(param.Value, 10);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOIPBBBSDO.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOIPBBBSDO.cs
deleted file mode 100755
index 9561724dcb2..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOIPBBBSDO.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbParameter_ctor_SOIPBBBSDO : GHTBase
-{
-	public static void Main()
-	{
-		OleDbParameter_ctor_SOIPBBBSDO tc = new OleDbParameter_ctor_SOIPBBBSDO();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbParameter_ctor_SOIPBBBSDO");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-
-		OleDbParameter param = new OleDbParameter("myParam",		//param name
-												OleDbType.Double,	//type
-												5,					//size
-												ParameterDirection.Input, //direction
-												true,				//nillbale
-												1,					//precision 
-												1,					//scale	
-												"Column1",			//source column
-												DataRowVersion.Current, //datarow version
-												590.456);			//value
-		try
-		{
-			BeginCase("ParameterName");
-			Compare(param.ParameterName , "myParam");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("OleDbType");
-			Compare(param.OleDbType ,OleDbType.Double );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Size");
-			Compare(param.Size  , 5);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("ParameterDirection");
-			Compare(param.Direction  , ParameterDirection.Input );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("IsNullable");
-			Compare(param.IsNullable , true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Precision");
-			Compare(param.Precision , (byte)1);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Scale");
-			Compare(param.Scale  , (byte)1);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("SourceColumn");
-			Compare(param.SourceColumn  ,"Column1");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("SourceVersion");
-			Compare(param.SourceVersion ,DataRowVersion.Current );
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-		try
-		{
-			BeginCase("Value");
-			Compare(param.Value  ,590.456);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs
deleted file mode 100755
index 75b6a7d4487..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-#if DAAB
-using Microsoft.ApplicationBlocks;
-#endif
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbParameter_ctor_SOtype : ADONetTesterClass
-{
-	private Exception exp;
-	// transaction use was add for PostgreSQL
-	OleDbTransaction tr;
-
-	public static void Main()
-	{
-		OleDbParameter_ctor_SOtype tc = new OleDbParameter_ctor_SOtype();
-		tc.exp = null;
-		try
-		{
-			tc.BeginTest("OleDbParameter_ctor_SOtype on " + ConnectedDataProvider.GetDbType().ToString());
-			tc.run();
-		}
-		catch(Exception ex){tc.exp = ex;}
-		finally	{tc.EndTest(tc.exp);}
-	}
-
-	public void run()
-	{
-		Log(string.Format("DB Server={0}.", ConnectedDataProvider.GetDbType()));
-		AllTypes();
-		SimpleTypesWithDBNull();
-	}
-
-	[Test]
-	public void AllTypes()
-	{
-		exp = null;
-		OleDbParameter param = null;
-
-		foreach (OleDbType dbtype in Enum.GetValues(typeof(OleDbType)))
-		{
-			// not supporting OleDbType.IDispatch and OleDbType.IUnknown
-			if (( dbtype == OleDbType.IDispatch) || (dbtype == OleDbType.IUnknown) )
-			{
-				continue;
-			}
-
-			param = new OleDbParameter("myParam",dbtype);
-
-			try
-			{
-				BeginCase("ctor " + dbtype.ToString());
-				Compare(param != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("name " + dbtype.ToString());
-				Compare(param.ParameterName ,"myParam");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-		}
-	}
-
-	[Test]
-	public void SimpleTypesWithDBNull()
-	{
-		OleDbConnection con=null;
-		OleDbCommand cmd=null;
-		OleDbDataReader rdr=null;
-		try
-		{
-			exp = null;
-			BeginCase("Test simple types with DBNull");
-
-			string connectionString = ConnectedDataProvider.ConnectionString;
-			con = new	OleDbConnection(connectionString);
-			cmd = new OleDbCommand();
-			con.Open();
-			// transaction use was add for PostgreSQL
-			tr = con.BeginTransaction();
-			
-			cmd = new OleDbCommand("", con, tr);
-			cmd.CommandText = "GHSP_TYPES_SIMPLE_1";
-			cmd.CommandType = CommandType.StoredProcedure;
-
-			AddSimpleTypesNullParams(cmd);
-
-#if !JAVA
-			if (ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL)
-			{
-#if DAAB
-
-				rdr = Microsoft.ApplicationBlocks.Data.PostgresOleDbHelper.OLEDB4ODBCExecuteReader(cmd,true);
-#endif
-
-			}
-			else
-#endif
-			{
-
-				rdr = cmd.ExecuteReader();
-			}
-
-			rdr.Read();
-			for (int i=0; i<rdr.FieldCount; i++)
-			{
-				Compare(DBNull.Value, rdr.GetValue(i));
-			}
-			rdr.Close();
-		}
-		catch (Exception ex)
-		{
-			exp = ex;
-		}
-		finally
-		{
-			EndCase(exp);
-			if(rdr != null && !rdr.IsClosed)
-			{
-				rdr.Close();
-			}
-			if (con != null && con.State == ConnectionState.Open)
-			{
-				con.Close();
-			}
-			exp=null;
-		}
-	}
-
-	private void AddSimpleTypesNullParams(OleDbCommand cmd)
-	{
-		OleDbParameter tmpParam;
-
-		switch (ConnectedDataProvider.GetDbType())
-		{
-			case DataBaseServer.SQLServer:
-				tmpParam = new OleDbParameter("bit", OleDbType.Boolean);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("tinyint", OleDbType.TinyInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("smallint", OleDbType.SmallInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("integer", OleDbType.Integer);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("bigint", OleDbType.BigInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("decimal", OleDbType.Numeric);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("numeric", OleDbType.Numeric);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("float", OleDbType.Double);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("real", OleDbType.Single);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("char", OleDbType.Char);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("nchar", OleDbType.WChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("varchar", OleDbType.VarChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("nvarchar", OleDbType.VarWChar);
-				cmd.Parameters.Add(tmpParam);
-				break;
-			case DataBaseServer.Sybase:
-				tmpParam = new OleDbParameter("tinyint", OleDbType.TinyInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("smallint", OleDbType.SmallInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("integer", OleDbType.Integer);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("decimal", OleDbType.Numeric);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("numeric", OleDbType.Numeric);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("float", OleDbType.Double);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("real", OleDbType.Single);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("char", OleDbType.Char);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("nchar", OleDbType.WChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("varchar", OleDbType.VarChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("nvarchar", OleDbType.VarWChar);
-				cmd.Parameters.Add(tmpParam);
-				break;
-			case DataBaseServer.Oracle:
-				tmpParam = new OleDbParameter("NUMBER", OleDbType.Numeric);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("LONG", OleDbType.LongVarChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("FLOAT", OleDbType.Single);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("VARCHAR", OleDbType.VarChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("NVARCHAR", OleDbType.VarWChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("CHAR", OleDbType.Char);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("NCHAR", OleDbType.WChar);
-				cmd.Parameters.Add(tmpParam);
-				break;
-			case DataBaseServer.PostgreSQL:
-				tmpParam = new OleDbParameter("bool", OleDbType.Boolean);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("int2", OleDbType.SmallInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("int4", OleDbType.Integer);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("int8", OleDbType.BigInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("numeric", OleDbType.Numeric);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("float4", OleDbType.Single);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("float8", OleDbType.Double);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("varchar", OleDbType.VarChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("CHAR", OleDbType.Char);//bpchar
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("NCHAR", OleDbType.Char);//bpchar
-				cmd.Parameters.Add(tmpParam);
-				break;
-			case DataBaseServer.DB2:
-				tmpParam = new OleDbParameter("SMALLINT", OleDbType.SmallInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("INTEGER", OleDbType.Integer);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("BIGINT", OleDbType.BigInt);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("DECIMAL", OleDbType.Decimal);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("REAL", OleDbType.Double);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("DOUBLE", OleDbType.Double);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("CHARACTER", OleDbType.Char);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("VARCHAR", OleDbType.VarChar);
-				cmd.Parameters.Add(tmpParam);
-				tmpParam = new OleDbParameter("LONGVARCHAR", OleDbType.LongVarChar);
-				cmd.Parameters.Add(tmpParam);
-				break;
-			default:
-				this.Fail("Unknown DataBaseServer type.");
-				break;
-		}
-
-		foreach (OleDbParameter current in cmd.Parameters)
-		{
-			current.Value = DBNull.Value;
-		}
-	}
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtypeI.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtypeI.cs
deleted file mode 100755
index c92724e6e06..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtypeI.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbParameter_ctor_SOtypeI : GHTBase
-{
-	public static void Main()
-	{
-		OleDbParameter_ctor_SOtypeI tc = new OleDbParameter_ctor_SOtypeI();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbParameter_ctor_SOtypeI");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbParameter param = null;
-
-		foreach (OleDbType dbtype in Enum.GetValues(typeof(OleDbType)))
-		{
-
-			// not supporting OleDbType.IDispatch and OleDbType.IUnknown
-			if (( dbtype == OleDbType.IDispatch) || (dbtype == OleDbType.IUnknown) )
-			{
-				continue;
-			}
-
-			param = new OleDbParameter("myParam",dbtype,5);
-
-			try
-			{
-				BeginCase("ctor " + dbtype.ToString());
-				Compare(param != null, true);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("name " + dbtype.ToString());
-				Compare(param.ParameterName ,"myParam");
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("size " + dbtype.ToString());
-				Compare(param.Size ,5);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-
-		try
-		{
-			BeginCase("ctor - illegal size ");
-			try
-			{
-				param = new OleDbParameter("myParam",OleDbType.Integer ,-5);
-			}
-			catch (Exception ex) {exp = ex;}
-			Compare(exp.GetType().FullName , typeof(ArgumentException).FullName );
-			exp=null;
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-	}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype_IS.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype_IS.cs
deleted file mode 100755
index 557cb3e0afb..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype_IS.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-[TestFixture]
-public class OleDbParameter_ctor_SOtype_IS : GHTBase
-{
-	public static void Main()
-	{
-		OleDbParameter_ctor_SOtype_IS tc = new OleDbParameter_ctor_SOtype_IS();
-		Exception exp = null;
-		try
-		{
-			tc.BeginTest("OleDbParameter_ctor_SOtypeIS");
-			tc.run();
-		}
-		catch(Exception ex){exp = ex;}
-		finally	{tc.EndTest(exp);}
-	}
-
-	[Test]
-	public void run()
-	{
-		Exception exp = null;
-		OleDbParameter param = null;
-
-		param = new OleDbParameter("myParam",OleDbType.Integer ,5,"myColumn");
-
-		try
-		{
-			BeginCase("ctor ");
-			Compare(param != null, true);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("name ");
-			Compare(param.ParameterName ,"myParam");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("size ");
-			Compare(param.Size ,5);
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-
-		try
-		{
-			BeginCase("size ");
-			Compare(param.SourceColumn  ,"myColumn");
-		} 
-		catch(Exception ex){exp = ex;}
-		finally{EndCase(exp); exp = null;}
-	}
-}
-
-
-	//public TestClass():base(true){}
-
-	//Activate this constructor to log Failures to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, false){}
-
-	//Activate this constructor to log All to a log file
-	//public TestClass(System.IO.TextWriter tw):base(tw, true){}
-
-	//BY DEFAULT LOGGING IS DONE TO THE STANDARD OUTPUT ONLY FOR FAILURES
-
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Add.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Add.cs
deleted file mode 100755
index 12712717a15..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Add.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbParameterCollection_Add : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbParameterCollection_Add tc = new OleDbParameterCollection_Add();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbParameterCollection_Add");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-
-			OleDbCommand cmd = new OleDbCommand();
-			OleDbParameter param = cmd.Parameters.Add(new OleDbParameter("MyParam", "abcd"));
-
-			try
-			{
-				BeginCase("check value");
-				Compare(param.Value ,"abcd" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			param = cmd.Parameters.Add("MyParam", OleDbType.VarChar, 50);
-			try
-			{
-				BeginCase("check parameter type");
-				Compare(param.GetType().FullName ,typeof(OleDbParameter).FullName  );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("check parameter name");
-				Compare(param.ParameterName ,"MyParam" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Contains.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Contains.cs
deleted file mode 100755
index 2acecb31928..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Contains.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbParameterCollection_Contains : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbParameterCollection_Contains tc = new OleDbParameterCollection_Contains();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbParameterCollection_Contains");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbCommand cmd = new OleDbCommand();
-			OleDbParameter param = new OleDbParameter();
-			cmd.Parameters.Add(param);
-			cmd.Parameters.Add(new OleDbParameter("MyParam", 12));
-
-			try
-			{
-				BeginCase("Check contains - 1");
-				Compare(cmd.Parameters.Contains(param),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check contains - 2");
-				Compare(cmd.Parameters.Contains("MyParam"),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check contains - 3");
-				Compare(cmd.Parameters.Contains("abcd"),false );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check contains - 4");
-				Compare(cmd.Parameters.Contains(" MyParam"),false );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-        
-			try
-			{
-				BeginCase("Check contains - 5");
-				cmd.Parameters.Add(new OleDbParameter("MyParam", 12));
-				Compare(cmd.Parameters.Contains("MyParam"),true );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-        
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Count.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Count.cs
deleted file mode 100755
index a0d6ac8596f..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameterCollection/OleDbParameterCollection_Count.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbParameterCollection_Count : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbParameterCollection_Count tc = new OleDbParameterCollection_Count();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbParameterCollection_Count");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-	
-			OleDbCommand cmd = new OleDbCommand();
-
-			try
-			{
-				BeginCase("Count - empty");
-				Compare(cmd.Parameters.Count ,0 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			cmd.Parameters.Add(new OleDbParameter("MyParam", "abcd"));
-			try
-			{
-				BeginCase("Count - add");
-				Compare(cmd.Parameters.Count ,1 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			cmd.Parameters.Clear();
-
-			try
-			{
-				BeginCase("Count - clear");
-				Compare(cmd.Parameters.Count ,0 );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-        
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Begin.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Begin.cs
deleted file mode 100755
index ffe25139ae6..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Begin.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbTransaction_Begin : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbTransaction_Begin tc = new OleDbTransaction_Begin();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbTransaction_Begin");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-
-			Exception exp = null;
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			/*********************************************************
-			 * OLEDB Provider for SQL Server does not allow nested transactions
-			 * http://support.microsoft.com/kb/177138/EN-US/
-			 * http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q316872&
-			*/
-			if ((ConnectedDataProvider.GetDbType(con) == DataBaseServer.SQLServer) ||
-				(ConnectedDataProvider.GetDbType(con) == DataBaseServer.Oracle) ||
-				(ConnectedDataProvider.GetDbType(con) == DataBaseServer.PostgreSQL) ||
-				(ConnectedDataProvider.GetDbType(con) == DataBaseServer.DB2))
-			{
-				Log(string.Format("Test skipped, nested transactions are not supported in {0}", ConnectedDataProvider.GetDbType(con)));
-				return;
-			}
-
-			// How To Implement Nested Transactions with Oracle
-			// http://support.microsoft.com/kb/187289/EN-US/
-
-			OleDbTransaction txnOuter = null;
-			OleDbTransaction txnInner = null;
-		
-			try
-			{
-				BeginCase("Check Outer Transaction Isoloation Level");
-			
-				txnOuter = con.BeginTransaction();
-				txnInner = txnOuter.Begin();
-
-				Compare(txnOuter.IsolationLevel,IsolationLevel.ReadCommitted);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("Check Inner Transaction Isoloation Level");
-				Compare(txnOuter.IsolationLevel,IsolationLevel.RepeatableRead);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Commit.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Commit.cs
deleted file mode 100755
index d99b4ef3be4..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Commit.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbTransaction_Commit : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbTransaction_Commit tc = new OleDbTransaction_Commit();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbTransaction_Commit");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			// ORACLE does not support transactions with savepoints 
-			// http://support.microsoft.com/kb/187289/EN-US/
-			if (ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString) == DataBaseServer.Oracle) return;
-			if (ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString) == DataBaseServer.PostgreSQL) return;
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-
-			//prepare command for checking database
-			OleDbConnection conSelect = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			conSelect.Open();
-			OleDbCommand cmdSelect = new OleDbCommand("Select Title From Employees where EmployeeID in (100,200)", conSelect);
-
-			OleDbTransaction txn = con.BeginTransaction();
-
-			//prepare first transaction
-			OleDbCommand cmd1 = new OleDbCommand("Update Employees Set Title = 'New Value1' Where EmployeeID = 100",con);
-			cmd1.Transaction = txn;
-		
-			//prepare a second transaction
-			OleDbCommand cmd2 = new OleDbCommand("Update Employees Set Title = 'New Value2' Where EmployeeID = 200",con);
-			cmd2.Transaction = txn;
-
-			try
-			{
-				BeginCase("one transaction - After commiting transaction");
-				cmd1.ExecuteNonQuery();
-				txn.Commit();
-				string Result = cmdSelect.ExecuteScalar().ToString();
-				Compare(Result,"New Value1" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-			//prepare data
-			base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			txn = con.BeginTransaction();
-			cmd1.Transaction = txn;
-			cmd2.Transaction = txn;
-			cmd1.ExecuteNonQuery();
-			cmd2.ExecuteNonQuery();
-			txn.Commit();
-			OleDbDataReader rdr = cmdSelect.ExecuteReader();
-
-			try
-			{
-				BeginCase("two transaction - check first transaction");
-				rdr.Read();
-				Compare(rdr.GetString(0),"New Value1" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			try
-			{
-				BeginCase("two transaction - check second transaction");
-				rdr.Read();
-				Compare(rdr.GetString(0),"New Value2" );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-			if (conSelect.State == ConnectionState.Open) conSelect.Close();
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Connection.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Connection.cs
deleted file mode 100755
index 78a95018bf8..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Connection.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbTransaction_Connection : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbTransaction_Connection tc = new OleDbTransaction_Connection();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbTransaction_Connection");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			con.Open();
-			OleDbTransaction txn = con.BeginTransaction();
-
-			try
-			{
-				BeginCase("check connection");
-				Compare(txn.Connection,con);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			//check exception - using a command with the same connection as the transaction
-			OleDbCommand cmd = new OleDbCommand("Select * from Employees",con);
-
-			//Execute requires the command to have a transaction object when the connection assigned to the command is in a pending local transaction.  
-			//The Transaction property of the command has not been initialized.
-			try
-			{
-				BeginCase("Command that uses the transaction connection - exception");
-				try
-				{
-					cmd.ExecuteNonQuery();
-				}
-				catch (Exception ex){exp=ex;}
-				Compare(exp.GetType().FullName ,typeof(InvalidOperationException).FullName);
-				exp = null;
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_IsolationLevel.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_IsolationLevel.cs
deleted file mode 100755
index 0ef4483a385..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_IsolationLevel.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbTransaction_IsolationLevel : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbTransaction_IsolationLevel tc = new OleDbTransaction_IsolationLevel();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbTransaction_IsolationLevel");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-#if JAVA
-		[Category("NotWorking")]
-#endif
-		public void IsolationLevelChaos() {
-			Exception exp = null;
-
-
-			MonoTests.System.Data.Utils.DataBaseServer dbServer = ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OleDbTransaction txn = null;
-
-			//supported only in SQLServer
-			if (dbServer == MonoTests.System.Data.Utils.DataBaseServer.SQLServer) {
-				try {
-					BeginCase("IsolationLevel = Chaos");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.Chaos);
-					Compare(txn.IsolationLevel,IsolationLevel.Chaos);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-
-			MonoTests.System.Data.Utils.DataBaseServer dbServer = ConnectedDataProvider.GetDbType(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OleDbTransaction txn = null;
-		
-			try
-			{
-				BeginCase("IsolationLevel = ReadCommitted");
-				con.Open();
-				txn=con.BeginTransaction();
-				Compare(txn.IsolationLevel,IsolationLevel.ReadCommitted);
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-
-			//not supported in Oracle
-			if (dbServer != MonoTests.System.Data.Utils.DataBaseServer.Oracle) 
-			{
-				try
-				{
-					BeginCase("IsolationLevel = ReadUncommitted");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.ReadUncommitted );
-					Compare(txn.IsolationLevel,IsolationLevel.ReadUncommitted);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-
-			//not supported in Oracle
-			if (dbServer != MonoTests.System.Data.Utils.DataBaseServer.Oracle) 
-			{
-				try
-				{
-					BeginCase("IsolationLevel = RepeatableRead");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.RepeatableRead);
-					Compare(txn.IsolationLevel,IsolationLevel.RepeatableRead);
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-
-			try
-			{
-				BeginCase("IsolationLevel = Serializable");
-				con.Open();
-				txn=con.BeginTransaction(IsolationLevel.Serializable);
-				Compare(txn.IsolationLevel,IsolationLevel.Serializable);
-				txn.Rollback();
-				txn=con.BeginTransaction();
-				txn.Rollback();
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-
-			// not supported in DB2,MSSQL,Oracle,sybase and guess what... Postgres.
-			if (dbServer != MonoTests.System.Data.Utils.DataBaseServer.DB2 
-				&& dbServer != MonoTests.System.Data.Utils.DataBaseServer.SQLServer
-				&& dbServer != MonoTests.System.Data.Utils.DataBaseServer.Oracle 
-				&& dbServer != DataBaseServer.PostgreSQL
-				&& dbServer != MonoTests.System.Data.Utils.DataBaseServer.Sybase ) 
-			{
-				try
-				{
-					BeginCase("IsolationLevel = Unspecified");
-					con.Open();
-					txn=con.BeginTransaction(IsolationLevel.Unspecified );
-					Compare(txn.IsolationLevel,IsolationLevel.Unspecified );
-				} 
-				catch(Exception ex){exp = ex;}
-				finally{EndCase(exp); exp = null; if (con.State == ConnectionState.Open) con.Close();}
-			}
-
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Rollback.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Rollback.cs
deleted file mode 100755
index 937439316aa..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_Rollback.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbTransaction_Rollback : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbTransaction_Rollback tc = new OleDbTransaction_Rollback();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbTransaction_Rollback");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			OleDbConnection con = null;
-			OleDbTransaction txn;
-			Exception exp = null;
-			try
-			{
-				BeginCase("OleDbTransaction Rollback");
-
-				//
-				//prepare data
-				base.PrepareDataForTesting(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-
-				string Result = "";
-				con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-				con.Open();
-				txn = con.BeginTransaction();
-				OleDbCommand cmd = new OleDbCommand("Update Employees Set LastName = 'StamLastName' Where EmployeeID = 100", con, txn);
-				cmd.ExecuteNonQuery();
-				txn.Rollback();
-
-				//
-				//
-				cmd = new OleDbCommand("Select LastName From Employees Where EmployeeID = 100", con);
-				Result = cmd.ExecuteScalar().ToString();
-				Compare(Result,"Last100" );
-				this.Log(Result);
-
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_ctor.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_ctor.cs
deleted file mode 100755
index 181bcdeb408..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbTransaction/OleDbTransaction_ctor.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbTransaction_ctor : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbTransaction_ctor tc = new OleDbTransaction_ctor();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbTransaction_ctor");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			OleDbConnection con = new OleDbConnection(MonoTests.System.Data.Utils.ConnectedDataProvider.ConnectionString);
-			OleDbTransaction txn = null;
-
-			try
-			{
-				BeginCase("BeginTransaction - connection close");
-				try
-				{
-					txn = con.BeginTransaction();
-				}
-				catch (Exception ex) {exp = ex;}
-				Compare(exp.GetType().FullName ,typeof(InvalidOperationException).FullName );
-				exp=null;
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			con.Open();
-
-			try
-			{
-				BeginCase("BeginTransaction - connection close");
-				txn = con.BeginTransaction();
-				Compare(txn == null,false );
-			} 
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-			if (con.State == ConnectionState.Open) con.Close();
-
-		}
-	}   
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbType/OleDbType.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbType/OleDbType.cs
deleted file mode 100755
index da96cace3ab..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbType/OleDbType.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbType_Enum : ADONetTesterClass
-	{
-		public static void Main()
-		{
-			OleDbType_Enum tc = new OleDbType_Enum();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbType_Enum");
-				tc.run();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-
-			try
-			{
-				BeginCase("Checking Empty value");			Compare((int)OleDbType.Empty,0  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking SmallInt value");			Compare((int)OleDbType.SmallInt,2  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Integer value");			Compare((int)OleDbType.Integer,3  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Single value");			Compare((int)OleDbType.Single,4  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Double value");			Compare((int)OleDbType.Double,5  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Currency value");			Compare((int)OleDbType.Currency,6  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Date value");			Compare((int)OleDbType.Date,7  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking BSTR value");			Compare((int)OleDbType.BSTR,8  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking IDispatch value");			Compare((int)OleDbType.IDispatch,9  );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Error value");			Compare((int)OleDbType.Error,10 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Boolean value");			Compare((int)OleDbType.Boolean,11 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Variant value");			Compare((int)OleDbType.Variant,12 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking IUnknown value");			Compare((int)OleDbType.IUnknown,13 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Decimal value");			Compare((int)OleDbType.Decimal,14 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking TinyInt value");			Compare((int)OleDbType.TinyInt,16 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking UnsignedTinyInt value");		Compare((int)OleDbType.UnsignedTinyInt,17 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking UnsignedSmallInt value");		Compare((int)OleDbType.UnsignedSmallInt,18 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking UnsignedInt value");		Compare((int)OleDbType.UnsignedInt,19 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking BigInt value");			Compare((int)OleDbType.BigInt,20 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking UnsignedBigInt value");		Compare((int)OleDbType.UnsignedBigInt,21 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Filetime value");			Compare((int)OleDbType.Filetime,64 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Guid value");			Compare((int)OleDbType.Guid,72 );
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Binary value");			Compare((int)OleDbType.Binary,128);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Char value");			Compare((int)OleDbType.Char,129);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking WChar value");			Compare((int)OleDbType.WChar,130);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking Numeric value");			Compare((int)OleDbType.Numeric,131);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking DBDate value");			Compare((int)OleDbType.DBDate,133);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking DBTime value");			Compare((int)OleDbType.DBTime,134);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking DBTimeStamp value");		Compare((int)OleDbType.DBTimeStamp,135);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking PropVariant value");		Compare((int)OleDbType.PropVariant,138);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking VarNumeric value");			Compare((int)OleDbType.VarNumeric,139);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking VarChar value");			Compare((int)OleDbType.VarChar,200);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking LongVarChar value");		Compare((int)OleDbType.LongVarChar,201);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking VarWChar value");			Compare((int)OleDbType.VarWChar,202);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking LongVarWChar value");		Compare((int)OleDbType.LongVarWChar,203);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking VarBinary value");			Compare((int)OleDbType.VarBinary,204);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-			try
-			{
-				BeginCase("Checking LongVarBinary value");		Compare((int)OleDbType.LongVarBinary,205);
-			}
-			catch(Exception ex){exp = ex;}
-			finally{EndCase(exp); exp = null;}
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbType/OleDbType_Date.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbType/OleDbType_Date.cs
deleted file mode 100755
index 87d2789137a..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbType/OleDbType_Date.cs
+++ /dev/null
@@ -1,550 +0,0 @@
-// 
-// Copyright (c) 2006 Mainsoft Co.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Data.OleDb ;
-
-using MonoTests.System.Data.Utils;
-
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Data.OleDb
-{
-	[TestFixture]
-	public class OleDbType_Date : GHTBase
-	{
-		private string dateColumnName;
-		private string dateTableName;
-
-		private OleDbConnection	con;
-		private OleDbDataReader	dr	=	null;
-
-		private DateTime TestedDate1;
-		private DateTime RetDate;
-
-		[SetUp]
-		public void SetUp()
-		{
-			Exception exp = null;
-			BeginCase("Setup");
-			try
-			{
-				dateTableName = ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME;
-				switch (ConnectedDataProvider.GetDbType())
-				{
-					case DataBaseServer.SQLServer:
-					case DataBaseServer.Sybase:
-						dateColumnName = "T_DATETIME";
-						break;
-					case DataBaseServer.Oracle:
-						dateColumnName = "T_DATE";
-						break;
-					case DataBaseServer.PostgreSQL:
-						dateColumnName = "T_TIMESTAMP";
-						break;
-					case DataBaseServer.DB2:
-						dateColumnName = "T_TIMESTAMP";
-						break;
-				}
-				con = new OleDbConnection(ConnectedDataProvider.ConnectionString);
-				con.Open();
-				Compare("Setup", "Setup");
-			}
-			catch(Exception ex)	{exp = ex;}
-			finally	{EndCase(exp); exp = null;}
-		}
-
-		[TearDown]
-		public void TearDown()
-		{
-			if (con != null)
-			{
-				if (con.State == ConnectionState.Open) con.Close();
-			}
-		}
-
-		public static void Main()
-		{
-			OleDbType_Date tc = new OleDbType_Date();
-			Exception exp = null;
-			try
-			{
-				tc.BeginTest("OleDbType_Date");
-				tc.SetUp();
-				tc.run();
-				tc.TearDown();
-			}
-			catch(Exception ex){exp = ex;}
-			finally	{tc.EndTest(exp);}
-		}
-
-		[Test]
-		public void run()
-		{
-			Exception exp = null;
-			OleDbCommand cmd = new OleDbCommand();
-			string rowId = "54416_";
-
-			try
-			{
-				// clean the test table
-				cmd = new OleDbCommand(string.Format("DELETE FROM {0} WHERE ID like '54416_%'", dateTableName));
-				cmd.Connection = con;
-				cmd.ExecuteNonQuery();
-			}
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-
-			#region		---- testing parameterized query with a simple date ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a simple date");
-				rowId = "54416_" + TestCaseNumber.ToString();
-
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values ('{2}', ?)", dateTableName, dateColumnName, rowId));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2001, 1, 13);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				// checking that value returned correctly;
-				cmd.CommandText = string.Format("select {0} from {1} where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-
-				Compare(TestedDate1,RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a 1753 date min  ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a 1753 date min");
-				rowId = "54416_" + TestCaseNumber.ToString();
-
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(1753, 1, 1); 
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				this.Log(cmd.CommandText);
-				cmd.ExecuteNonQuery();
-
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				this.Log(cmd.CommandText);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1.Date, RetDate.Date);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a future date ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a future date");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a future date ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a future date");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 12, 13, 14);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText = string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part of 00:00 ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part of 00:00");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 0, 0, 0);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText =string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part of 23:59:59 ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part of 23:59:59");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 23, 59, 59);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd.CommandText =string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing parameterized query with a time part of AM ---- 
-			try
-			{
-				BeginCase("testing parameterized query with a time part of AM");
-				string str = string.Empty; //This is an addional test ,passing GH mechnizim 
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				//TestedDate1 = new DateTime(2500, 1, 13, 11, 0, 0);
-				TestedDate1 = new DateTime(1988,5,31,15,33,44,00);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				
-				//TODO:add also treat for other db
-				if (ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.SQLServer || ConnectedDataProvider.GetDbType(con) == MonoTests.System.Data.Utils.DataBaseServer.Sybase)
-				{
-					cmd.CommandText = string.Format("select CONVERT(varchar,{0},120) from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-					str = cmd.ExecuteScalar().ToString();
-					Compare(TestedDate1, Convert.ToDateTime(str));
-				}
-				//' checking that value returned correctly
-				cmd.CommandText =string.Format("select {0} from {1}  where ID='{2}'", dateColumnName, dateTableName, rowId);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar().ToString());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing a where clause using a date ---- 
-			try
-			{
-				BeginCase("testing a where clause using a date");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 11, 0, 0);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd = new OleDbCommand(string.Format("select {0} from {1} where ID='{2}' and {0}= ?", dateColumnName, dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing a where clause using a rage of dates ---- 
-			try
-			{
-				BeginCase("testing a where clause using a rage of dates");
-				
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID, {1}) values('{2}', ?)", dateTableName, dateColumnName, rowId ));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2007, 12, 31, 11, 59, 59);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-				//' checking that value returned correctly
-				cmd = new OleDbCommand(string.Format("select {0} from {1} where ID='{2}' and {0} >? and {0} <?", dateColumnName, dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1.AddSeconds(-1);
-				cmd.Parameters.Add(new OleDbParameter("date2", OleDbType.DBTimeStamp)).Value = TestedDate1.AddSeconds(+1);
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-
-			#region		---- testing a set statement ---- 
-			try
-			{
-				BeginCase("testing a set statement");
-
-				rowId = "54416_" + TestCaseNumber.ToString();
-				con.Open();
-				cmd = new OleDbCommand(string.Format("insert into {0} (ID) values('{1}')", dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.ExecuteNonQuery();
-				cmd = new OleDbCommand(string.Format("update {0} set {1} = ? where ID='{2}'", dateTableName, dateColumnName, rowId));
-				cmd.Connection = con;
-				TestedDate1 = new DateTime(2500, 1, 13, 1, 2, 3);
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				cmd.ExecuteNonQuery();
-
-				//' checking that value returned correctly
-				cmd = new OleDbCommand(string.Format("select {0} from {1} where ID='{2}' and {0}= ?", dateColumnName, dateTableName, rowId));
-				cmd.Connection = con;
-				cmd.Parameters.Add(new OleDbParameter("date1", OleDbType.DBTimeStamp)).Value = TestedDate1;
-				RetDate = Convert.ToDateTime(cmd.ExecuteScalar());
-				Compare(TestedDate1, RetDate);
-			} 
-			catch(Exception ex)
-			{
-				exp = ex;
-			}
-			finally
-			{
-				if (dr != null)dr.Close();
-				if ( (con != null) && (con.State == ConnectionState.Open) )
-				{
-					CleanTestRow(rowId);
-					con.Close();
-				}
-
-				EndCase(exp);
-				exp = null;
-			}
-		
-			#endregion
-		}
-
-		/// <summary>
-		/// Deletes a row from the date table, according to its ID.
-		/// </summary>
-		/// <param name="rowId">Id of the row to delete.</param>
-		private void CleanTestRow(string rowId)
-		{
-			OleDbCommand deleteCmd = new OleDbCommand(string.Format("DELETE FROM {0} WHERE ID = '{1}'", dateTableName, rowId), con);
-			deleteCmd.ExecuteNonQuery();
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt
deleted file mode 100755
index f5144507180..00000000000
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-To run unit test the following should be prepared:
-
-1. nunit-console.exe.config should contain an ConnectionString setting, i.e.:
-
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-<appSettings>
-    <add key="ConnectionString" value="Provider=SQLOLEDB.1;Data Source=XP050;Initial Catalog=GHTDB;User Id=sa;Password=;" />
-  </appSettings>
-</configuration>
-
-2. A target db should be prepared with the relevant structure, following are the instruction for each supported database.
-
-in order to create the testing database, on DB2, run:
-
-NOTICE !!! script does not support remote.
-you must run this script on the DB2 machine
-
-"C:\Program Files\IBM\SQLLIB\BIN\DB2CMD.exe" DB2SETCP.BAT DB2.EXE -tvf ghtdb.db2.sql
-"C:\Program Files\IBM\SQLLIB\BIN\DB2CMD.exe" DB2SETCP.BAT DB2.EXE -td@ -vf ghtdb.sp.db2.sql
-"C:\Program Files\IBM\SQLLIB\BIN\DB2CMD.exe" DB2SETCP.BAT DB2.EXE -tvf ghtdb.data.db2.sql
-
-in order to create the testing database, on SQLServer, run:
-Run the scripts with a user wich have administrator permissions. (by default user:sa, password:sa).
-
-osql -S <database> -U <username> -P <password> -i GHTDB.MSSQL.sql
-osql -S <database> -U <username> -P <password> -i GHTDB.DATA.MSSQL.sql
-
-for example
-osql -S powergh -U sa -P sa -i GHTDB.MSSQL.sql
-osql -S powergh -U sa -P sa -i GHTDB.DATA.MSSQL.sql
-
-in order to create the testing database, on ORACLE, run:
-Run the scripts with a user wich have administrator permissions. (by default user:system, password:mainsoft).
-
-sqlplus "user/password@database_sid" @GHTDB.ORACLE.sql
-sqlplus "user/password@database_sid" @GHTDB.Data.ORACLE.sql
-
-for example 
-sqlplus "system/mainsoft@rafim" @GHTDB.ORACLE.sql
-sqlplus "system/mainsoft@rafim" @GHTDB.Data.ORACLE.sql
-
----------------------------------------
-to execute postgres sql script from command line
----------------------------------------
-
-First, create the target database (GHTDB as UNICODE) and then, run the script
-"C:\Program Files\PostgreSQL\8.0\bin\psql.exe" -U<username> <db name> -f <sql file>
-
-
-NOTE: if you fail to connect to psql, with the error:
-psql: FATAL:  password authentication failed for user "postgres"
-change your pg_hba file
-from:
-host    all         all         127.0.0.1/32          md5
-change to:
-host    all         all         127.0.0.1/32          trust
-
-
-example:
-"C:\Program Files\PostgreSQL\8.0\bin\psql.exe" -q -Upostgres Store -f Store.PostgreSQL.sql
-
-example:
-"C:\Program Files\PostgreSQL\8.0\bin\psql.exe" -q -Upostgres template1 -f GHTDB.CreateDB.sql
-"C:\Program Files\PostgreSQL\8.0\bin\psql.exe" -q -Upostgres GHTDB -f GHTDB.PostgreSQL.sql
-"C:\Program Files\PostgreSQL\8.0\bin\psql.exe" -q -Upostgres GHTDBEX -f GHTDBEX.PostgreSQL.sql
-"C:\Program Files\PostgreSQL\8.0\bin\psql.exe" -q -Upostgres GHTDB -f GHTDB.DATA.PostgreSQL.sql
-
- =================
-Sybase isql readme
-=================
-
-start the server
-start %SYBASE%\ASE-15_0\bin\sqlsrvr -dmaster.dbs -e C:\ASE150\ASE-15_0\bin\errorlog.log
-
-%SYBASE%\OCS-15_0\bin\isql -Usa -P -iC:\Dev\rafi_view\studio\GH\DevQA\tests\db\sybase\GHTDB.SYBASE.sql -oGHTDB.log
-%SYBASE%\OCS-15_0\bin\isql -Usa -P -iC:\Dev\rafi_view\studio\GH\DevQA\tests\db\sybase\GHTDB.DATA.SYBASE.sql -oGHTDB.DATA.log
-
-=================
-other usefull tips 
-use them when having problems
-=================
-dump transaction GHTDB with no_log
-
-insensitive
-charset -Usa -P noaccents.srt cp850
-sp_configure "default sortorder id", 44
-
-
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
index 66ad3ccea8d..27c8ad4a0b6 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
@@ -1,16 +1,7 @@
 2006-02-13  Senganal T  <tsenganal@novell.com>
 
-	* SqlAdapterTest.cs : Added testcases for verifying FillError Behavior
-
-2006-02-13  Senganal T  <tsenganal@novell.com>
-
 	* SqlAdapterTest.cs : Added testcases for #77480
 
-2006-02-10  Senganal T  <tsenganal@novell.com>
-
-	* SqlDataReaderTest.cs : Added more tests to verify Sequential
-	reading of row data.
-
 2006-02-05  Senganal T  <tsenganal@novell.com>
 
 	* SqlParameterTest.cs : New : Testcase for bug #77410
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
index 985bd3dcf6a..488c7c65252 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
@@ -388,51 +388,6 @@ namespace MonoTests.System.Data.SqlClient
 			}
 		}
 
-		bool FillErrorContinue = false;
-		[Test]
-		public void Fill_Test_FillErrorTest ()
-		{
-			string query = "select type_bigint from numeric_family where id=1 or id=4 ";
-
-			DataSet ds = new DataSet ();
-			DataTable table = ds.Tables.Add ("test");
-			table.Columns.Add ("col", typeof (int));
-
-			adapter = new SqlDataAdapter (query, connectionString);
-			DataTableMapping mapping = adapter.TableMappings.Add ("numeric_family", "test");
-			mapping.ColumnMappings.Add ("type_bigint", "col");
-
-			int count = 0;
-			try {
-				count = adapter.Fill (ds, "numeric_family");
-				Assert.Fail ("#1 Overflow exception must be thrown");
-			}catch (OverflowException e) {
-			}
-			Assert.AreEqual (0, ds.Tables [0].Rows.Count, "#2");
-			Assert.AreEqual (0, count, "#3");
-
-			adapter.FillError += new FillErrorEventHandler (ErrorHandler);
-			FillErrorContinue = false;
-			try {
-				count = adapter.Fill (ds, "numeric_family");
-				Assert.Fail ("#4 Overflow exception must be thrown");
-			}catch (OverflowException e) {
-			}
-			Assert.AreEqual (0, ds.Tables [0].Rows.Count, "#5");
-			Assert.AreEqual (0, count, "#6");
-
-			FillErrorContinue = true;
-			count = adapter.Fill (ds, "numeric_family");
-			// 1 row shud be filled
-			Assert.AreEqual (1, ds.Tables [0].Rows.Count, "#7");
-			Assert.AreEqual (1, count, "#8");
-		}
-
-		void ErrorHandler (object sender, FillErrorEventArgs args)
-		{
-			args.Continue = FillErrorContinue;
-		}
-
 		[Test]
 		public void GetFillParametersTest ()
 		{
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs
index 1f9d707c01b..f34a3addd9b 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataReaderTest.cs
@@ -455,124 +455,6 @@ namespace MonoTests.System.Data.SqlClient
 		}
 
 		[Test]
-		public void GetBytes_Binary ()
-		{
-			cmd.CommandText = "Select type_binary,type_varbinary,type_blob ";
-			cmd.CommandText += "from binary_family where id=1";
-			reader = cmd.ExecuteReader ();
-			reader.Read ();
-			byte[] binary = (byte[])reader.GetValue (0);
-			byte[] varbinary = (byte[])reader.GetValue (1);
-			byte[] image = (byte[])reader.GetValue (2);
-			reader.Close ();
-
-			reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess);
-			reader.Read ();
-			int len = 0;
-			byte[] arr ;
-			len = (int)reader.GetBytes (0,0,null,0,0);
-			Assert.AreEqual (binary.Length, len, "#1");
-			arr = new byte [len];
-			reader.GetBytes (0,0,arr,0,len);
-			for (int i=0; i<len; ++i)
-				Assert.AreEqual (binary[i], arr[i], "#2");
-
-
-			len = (int)reader.GetBytes (1,0,null,0,0);
-			Assert.AreEqual (varbinary.Length, len, "#1");
-			arr = new byte [len];
-			reader.GetBytes (1,0,arr,0,len);
-			for (int i=0; i<len; ++i)
-				Assert.AreEqual (varbinary[i], arr[i], "#2");
-
-			len = (int)reader.GetBytes (2,0,null,0,0);
-			Assert.AreEqual (image.Length, len, "#1");
-			arr = new byte [len];
-			reader.GetBytes (2,0,arr,0,len);
-			for (int i=0; i<len; ++i)
-				Assert.AreEqual (image[i], arr[i], "#2");
-
-			reader.Close ();
-
-			cmd.CommandText = "Select type_binary,type_varbinary,type_blob ";
-			cmd.CommandText += "from binary_family where id=1";
-		
-			reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess);
-			reader.Read ();
-		
-			len  = (int)reader.GetBytes (0,0,null,0,0);	
-			arr = new byte [100];
-			for (int i=0; i<len; ++i) {
-				Assert.AreEqual (len-i, reader.GetBytes (0, i, null, 0, 0), "#1_"+i);
-				Assert.AreEqual (1, reader.GetBytes (0, i, arr, 0, 1), "#2_"+i);
-				Assert.AreEqual (binary [i], arr [0], "#3_"+i);
-			}
-			Assert.AreEqual (0, reader.GetBytes (0, len+10, null, 0, 0));
-			reader.Close ();
-		}
-
-		[Test]
-		public void GetChars ()
-		{
-			cmd.CommandText = "Select type_char, type_varchar,type_text, type_ntext ";
-			cmd.CommandText += "from string_family where id=1";
-			reader = cmd.ExecuteReader ();
-			reader.Read ();
-			string charstring = reader.GetString (0);
-			//string ncharstring = reader.GetString (1);
-			string varcharstring = reader.GetString (1);
-			//string nvarcharstring = reader.GetString (2);
-			string textstring = reader.GetString (2);
-			string ntextstring = reader.GetString (3);
-			reader.Close ();
-			
-			reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess);
-			reader.Read ();
-			int len = 0;
-			char[] arr; 
-
-			len = (int)reader.GetChars (0,0,null,0,0);
-			Assert.AreEqual (charstring.Length, len, "#1");
-			arr = new char [len];
-			reader.GetChars (0,0,arr,0,len);
-			Assert.AreEqual (0, charstring.CompareTo (new String (arr)), "#2");
-
-			len = (int)reader.GetChars (1,0,null,0,0);
-			Assert.AreEqual (varcharstring.Length, len, "#3");
-			arr = new char [len];
-			reader.GetChars (1,0,arr,0,len);
-			Assert.AreEqual (0, varcharstring.CompareTo (new String (arr)), "#4");
-
-			len = (int)reader.GetChars (2,0,null,0,0);
-			Assert.AreEqual (textstring.Length, len, "#5");
-			arr = new char [len];
-			reader.GetChars (2,0,arr,0,len);
-			Assert.AreEqual (0, textstring.CompareTo (new String (arr)), "#6");
-
-			len = (int)reader.GetChars (3,0,null,0,0);
-			Assert.AreEqual (ntextstring.Length, len, "#7");
-			arr = new char [len];
-			reader.GetChars (3,0,arr,0,len);
-			Assert.AreEqual (0, ntextstring.CompareTo (new String (arr)), "#8");
-
-			reader.Close ();
-
-			reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess);
-			reader.Read ();
-			
-			len  = (int)reader.GetChars (0,0,null,0,0);	
-			arr = new char [10];
-			for (int i=0; i<len; ++i) {
-				Assert.AreEqual (len-i, reader.GetChars (0, i, null, 0, 0), "#9_"+i);
-				Assert.AreEqual (1, reader.GetChars (0, i, arr, 0, 1), "#10_"+i);
-				Assert.AreEqual (charstring [i], arr [0], "#11_"+i);
-			}
-			Assert.AreEqual (0, reader.GetChars (0, len+10, null, 0, 0));
-
-			reader.Close ();
-		}
-
-		[Test]
 		public void GetStringTest ()
 		{
 			cmd.CommandText = "Select type_varchar,10,convert(varchar,null)";
diff --git a/mcs/class/System.Data/Test/System.Data.Common/ChangeLog b/mcs/class/System.Data/Test/System.Data.Common/ChangeLog
index c8dacb778d2..786538e8ded 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data.Common/ChangeLog
@@ -1,9 +1,3 @@
-2006-02-18  Raja R Harinath  <harinath@gmail.com>
-
-	* DbConnectionStringBuilderTest.cs
-	(ICollectionCopyToTest, NegICollectionCopyToTest): Enable.
-	(IDictionaryCopyToTest, NegIDictionaryCopyToTest): Delete.
-
 2005-09-22  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* DBDataPermissionAttributeTest.cs: Removed *Choice security actions.
diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbConnectionStringBuilderTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DbConnectionStringBuilderTest.cs
index a60c6666d56..e026c864673 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/DbConnectionStringBuilderTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DbConnectionStringBuilderTest.cs
@@ -39,7 +39,6 @@ using System.Reflection;
 using System.Data.Common;
 using System.ComponentModel;
 using System.Data.SqlClient;
-using System.Collections;
 using System.Collections.Specialized;
 using System.Collections.Generic;
 
@@ -158,34 +157,61 @@ namespace MonoTests.System.Data.Common
                                          "Item indexor does not retrun correct value!");
                 }
 
-                [Test]
-                public void ICollectionCopyToTest ()
+                [Test, Ignore ("FIXME : commented for a missing feature in gmcs, (CopyTo)")]
+                public void IDictionaryCopyToTest ()
                 {
                         KeyValuePair<string, object> [] dict = new KeyValuePair<string, object> [2];
                         builder.Add (SERVER, SERVER_VALUE);
                         builder.Add (SERVER + "1", SERVER_VALUE + "1");
-
-			// FIXME: gross hack
-			int i = dict [0].Key == SERVER ? 0 : 1;
-			int j = i == 0 ? 1 : 0;
-			((ICollection) builder).CopyTo (dict, 0);
-                        Assert.AreEqual (SERVER, dict [i].Key, "not equal");
-                        Assert.AreEqual (SERVER_VALUE, dict [i].Value, "not equal");
-                        Assert.AreEqual (SERVER + "1", dict [j].Key, "not equal");
-                        Assert.AreEqual (SERVER_VALUE + "1", dict [j].Value, "not equal");
+                        IDictionary<string, object> s = builder;
+                        //FIXME : s.CopyTo (dict, 0);
+                        Assert.AreEqual (SERVER, dict [0].Key, "not equal");
+                        Assert.AreEqual (SERVER_VALUE, dict [0].Value, "not equal");
+                        Assert.AreEqual (SERVER + "1", dict [1].Key, "not equal");
+                        Assert.AreEqual (SERVER_VALUE + "1", dict [1].Value, "not equal");
                 }
 
-                [Test]
+                [Test, Ignore ("FIXME: commented for a missing feature in gmcs (CopyTo)")]
                 [ExpectedException (typeof (ArgumentException))]
-                public void NegICollectionCopyToTest ()
+                public void NegIDictionaryCopyToTest ()
                 {
                         KeyValuePair<string, object> [] dict = new KeyValuePair<string, object> [1];
                         builder.Add (SERVER, SERVER_VALUE);
                         builder.Add (SERVER + "1", SERVER_VALUE + "1");
-			((ICollection) builder).CopyTo (dict, 0);
+                        IDictionary<string, object> s = builder;
+                        //FIXME : s.CopyTo (dict, 0);
                         Assert.Fail ("Exception Destination Array not enough is not thrown!");
                 }
 
+                [Test, Ignore ("FIXME : currently mono is not supporting casting from generic type to"+ " non generic type")]
+                public void ICollectionCopyToTest ()
+                {
+			/*
+                        KeyValuePair <string, object> [] arr = new KeyValuePair <string, object> [2];
+                        builder.Add (SERVER, SERVER_VALUE);
+                        builder.Add (SERVER + "1", SERVER_VALUE + "1");
+                        System.Collections.ICollection s = builder;
+                        s.CopyTo ((Array) arr, 0);
+                        Assert.AreEqual (SERVER, arr [0].Key, "not equal");
+                        Assert.AreEqual (SERVER_VALUE, arr [0].Value, "not equal");
+                        Assert.AreEqual (SERVER + "1", arr [1].Key, "not equal");
+                        Assert.AreEqual (SERVER_VALUE + "1", arr [1].Value, "not equal");
+			*/
+                }
+
+                [Test, Ignore ("FIXME : currently mono is not supporting casting from generic type to"+ " non generic type")]
+                [ExpectedException (typeof (ArgumentException))]
+                public void NegICollectionCopyToTest ()
+                {
+			/*
+                        string [] arr = new string [2];
+                        builder.Add (SERVER, SERVER_VALUE);
+                        builder.Add (SERVER + "1", SERVER_VALUE + "1");
+                        System.Collections.ICollection s = builder;
+                        s.CopyTo ((Array) arr, 0);
+			*/
+                }
+
                 [Test]
                 public void TryGetValueTest ()
                 {
diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index b41dda73750..2e978afaf3a 100644
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,27 +1,6 @@
 2006-02-24  Senganal T  <tsenganal@novell.com>
- 
- 	* ConstraintCollectionTest2.cs : added testcase for #77630
- 
-2006-02-22  Senganal T  <tsenganal@novell.com>
-
-	* DataRowCollectionTest2.cs : Check if index is maintained for row on calling RejectChanges. 
-	* DataTableTest2.cs : Check if data is loaded and merged (if key exists) correctly.
-	* ForeignKeyConstraintTest.cs : Check if a ParentColumn value can be modified
-		when the row is in 'Added' State. Also, check if child col values are
-		updated correctly.
-
-2006-02-16  Senganal T  <tsenganal@novell.com>
-
-	* DataSetTest2.cs :
-		- WriteXmlSchema_ForeignKeyConstraint : testcase for bug #77557
-		- WriteXmlSchema_RelationAnnotation :
-		- WriteXmlSchema_Relations_ForeignKeys :
-			ensure Relations and ForeignKeyConstraints are written and read correctly.
-	* DataSetReadXmlSchema.cs :
-		- ReadConstraints :
-			verify reading a foreignkeyconstraint doesent create a relation.
-		- ReadAnnotatedRelations_MultipleColumns :
-			verify multiple columns are read correctly if part of annotated relation.
+
+	* ConstraintCollectionTest2.cs : added testcase for #77630
 
 2006-02-11  Senganal T  <tsenganal@novell.com>
 
@@ -38,18 +17,13 @@
 		- Added few new testcases
 
 2006-01-17  Senganal T  <tsenganal@novell.com>
-
-	* DataRowTest2.cs : added testcase for bug #77267
+ 
+ 	* DataRowTest2.cs : added testcase for bug #77267
 
 2006-01-16 Boris Kirzner <borisk@mainsoft.com>
-	* DataColumnCollectionTest2.cs: added test case for index update on 
+	* DataColumnCollectionTest2.cs: added test case for index update on
 	column removal
 
-2006-01-16  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* TypedDataSetGeneratorTest.cs : added test for bug #77248, but we
-	  cannot enable it since it depends on mcs "installed".
-
 2006-01-10 Senganal T <tsenganal@novell.com>
 	* DataViewTest2.cs 
 		- Added testcase for bug #77188
diff --git a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest2.cs b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest2.cs
index 8a512a7ddd3..4e1d0d042b1 100644
--- a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest2.cs
@@ -183,22 +183,6 @@ namespace MonoTests.System.Data
 			dt.Rows.Add((Object[])null);
 		}
 
-		[Test]
-		public void FindByKey ()
-		{
-			DataTable table = new DataTable ();
-			table.Columns.Add ("col1", typeof (int));
-			table.PrimaryKey = new DataColumn[] {table.Columns [0]};
-
-			table.Rows.Add (new object[] {1});
-			table.AcceptChanges ();
-			Assert.IsNotNull (table.Rows.Find (new object[] {1}), "#1");
-
-			table.Rows[0].Delete ();
-			table.RejectChanges ();
-			Assert.IsNotNull (table.Rows.Find (new object[] {1}), "#2");
-		}
-
 		[Test]

 		public void DataRowCollection_Clear1()

 		{

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
index ed353190910..a70803fd5ca 100644
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
@@ -758,34 +758,5 @@ namespace MonoTests.System.Data
 			tbl.Columns.Add("data", typeof(string));
 			Assert (ds.GetXmlSchema ().IndexOf ("AutoIncrementStep") > 0);
 		}
-
-		[Test]
-		public void ReadConstraints ()
-		{
-			DataSet ds = new DataSet ();
-			ds.ReadXmlSchema ("Test/System.Data/schemas/test015.xsd");
-
-			NUnit.Framework.Assert.AreEqual (0, ds.Relations.Count, "#1");
-			NUnit.Framework.Assert.AreEqual(1, ds.Tables [0].Constraints.Count, "#2" );
-			NUnit.Framework.Assert.AreEqual(1, ds.Tables [1].Constraints.Count, "#3" );
-			NUnit.Framework.Assert.AreEqual("fk1", ds.Tables [1].Constraints [0].ConstraintName, "#4");
-		}
-
-		[Test]
-		public void ReadAnnotatedRelations_MultipleColumns ()
-		{
-			DataSet ds = new DataSet ();
-			ds.ReadXmlSchema ("Test/System.Data/schemas/test016.xsd");
-
-			NUnit.Framework.Assert.AreEqual (1, ds.Relations.Count, "#1");
-			NUnit.Framework.Assert.AreEqual ("rel", ds.Relations [0].RelationName, "#2");
-			NUnit.Framework.Assert.AreEqual (2, ds.Relations [0].ParentColumns.Length, "#3");
-			NUnit.Framework.Assert.AreEqual (2, ds.Relations [0].ChildColumns.Length, "#4");
-			NUnit.Framework.Assert.AreEqual(0, ds.Tables [0].Constraints.Count, "#5" );
-			NUnit.Framework.Assert.AreEqual(0, ds.Tables [1].Constraints.Count, "#6" );
-
-			AssertDataRelation ("TestRel", ds.Relations [0], "rel", false, new String[] {"col 1","col2"},
-					new String[] {"col1","col  2"}, false, false);
-		}
 	}
 }
diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
index 678ca52e089..89136d6545e 100644
--- a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
@@ -2495,116 +2495,7 @@ namespace MonoTests_System.Data
 			// ReadXml - Table 2 row count
 			Assert.AreEqual(ds2.Tables[1].Rows.Count, ds1.Tables[1].Rows.Count , "DS344");
 		}
-		
-		[Test] public void WriteXmlSchema_ForignKeyConstraint ()
-		{
-			DataSet ds1 = new DataSet();
-
-			DataTable table1 = ds1.Tables.Add();
-			DataTable table2 = ds1.Tables.Add();
-
-			DataColumn col1_1 = table1.Columns.Add ("col1", typeof (int));
-			DataColumn col2_1 = table2.Columns.Add ("col1", typeof (int));
-
-			table2.Constraints.Add ("fk", col1_1, col2_1);
-
-			StringWriter sw = new StringWriter ();
-			ds1.WriteXmlSchema (sw);
-			String xml = sw.ToString ();
-
-			Assert.IsTrue (xml.IndexOf (@"<xs:keyref name=""fk"" refer=""Constraint1"" " +
-						@"msdata:ConstraintOnly=""true"">") != -1, "#1");
-		}
-
-		[Test] public void WriteXmlSchema_RelationAnnotation ()
-		{
-			DataSet ds1 = new DataSet();
-
-			DataTable table1 = ds1.Tables.Add();
-			DataTable table2 = ds1.Tables.Add();
-
-			DataColumn col1_1 = table1.Columns.Add ("col1", typeof (int));
-			DataColumn col2_1 = table2.Columns.Add ("col1", typeof (int));
-
-			ds1.Relations.Add ("rel", col1_1, col2_1, false);
-
-			StringWriter sw = new StringWriter ();
-			ds1.WriteXmlSchema (sw);
-			String xml = sw.ToString ();
 
-      
-			Assert.IsTrue (xml.IndexOf (@"<msdata:Relationship name=""rel"" msdata:parent=""Table1""" +
-						@" msdata:child=""Table2"" msdata:parentkey=""col1"" " + 
-						@"msdata:childkey=""col1"" />") != -1, "#1");
-		}
-
-		[Test] public void WriteXmlSchema_Relations_ForeignKeys ()
-		{
-			System.IO.MemoryStream ms = null;
-			System.IO.MemoryStream ms1 = 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));
-
-			ds1.Relations.Add ("rel 1", 
-				new DataColumn[] {col1_1, col1_2},
-				new DataColumn[] {col2_1, col2_2});
-			ds1.Relations.Add ("rel 2", 
-				new DataColumn[] {col1_3, col1_4}, 
-				new DataColumn[] {col2_3, col2_4},
-				false);
-			table2.Constraints.Add ("fk 1",
-				new DataColumn[] {col1_5, col1_6},
-				new DataColumn[] {col2_5, col2_6});
-
-			table1.Constraints.Add ("pk 1", col1_7, true);
-
-			ms = new System.IO.MemoryStream();
-			ds1.WriteXmlSchema (ms);
-
-			ms1 = new System.IO.MemoryStream (ms.GetBuffer());
-			DataSet ds2 = new DataSet();
-			ds2.ReadXmlSchema(ms1);
-		
-			Assert.AreEqual (2, ds2.Relations.Count, "#1");
-			Assert.AreEqual (3, ds2.Tables [0].Constraints.Count, "#2");
-			Assert.AreEqual (2, ds2.Tables [1].Constraints.Count, "#2");
-
-			Assert.IsTrue (ds2.Relations.Contains ("rel 1"), "#3");
-			Assert.IsTrue (ds2.Relations.Contains ("rel 2"), "#4");
-
-			Assert.IsTrue (ds2.Tables [0].Constraints.Contains ("pk 1"), "#5");
-			Assert.IsTrue (ds2.Tables [1].Constraints.Contains ("fk 1"), "#6");
-			Assert.IsTrue (ds2.Tables [1].Constraints.Contains ("rel 1"), "#7");
-
-			Assert.AreEqual (2, ds2.Relations ["rel 1"].ParentColumns.Length, "#8");
-			Assert.AreEqual (2, ds2.Relations ["rel 1"].ChildColumns.Length, "#9");
-
-			Assert.AreEqual (2, ds2.Relations ["rel 2"].ParentColumns.Length, "#10");
-			Assert.AreEqual (2, ds2.Relations ["rel 2"].ChildColumns.Length, "#11");
-
-			ForeignKeyConstraint fk = (ForeignKeyConstraint)ds2.Tables [1].Constraints ["fk 1"];
-			Assert.AreEqual (2, fk.RelatedColumns.Length, "#12");
-			Assert.AreEqual (2, fk.Columns.Length, "#13");
-		}
-		
 		[Test] public void RejectChanges()
 		{
 			DataSet ds1,ds2 = new DataSet();
diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs
index 343d31a90d6..368101ddb69 100644
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs
@@ -1949,44 +1949,6 @@ namespace MonoTests_System.Data
 			Assert.AreEqual (1, table.Constraints.Count, "#1");
 		}
 
-		[Test]
-		public void LoadDataRow_ExistingData ()
-		{
-			DataSet ds = new DataSet ();
-			DataTable table = ds.Tables.Add ();
-			
-			table.Columns.Add ("col1", typeof (int));
-			table.Columns.Add ("col2", typeof (int));
-			table.PrimaryKey = new DataColumn[] {table.Columns [0]};
-
-			table.BeginLoadData ();
-			table.LoadDataRow (new object[] {1,10}, true);
-			table.LoadDataRow (new object[] {2,10}, true);
-			table.LoadDataRow (new object[] {3,10}, true);
-			table.LoadDataRow (new object[] {4,10}, true);
-			table.EndLoadData ();
-
-			Assert.AreEqual (4, table.Rows.Count, "#1");
-			Assert.AreEqual (10, table.Rows [0][1], "#2");
-			Assert.AreEqual (10, table.Rows [1][1], "#3");
-			Assert.AreEqual (10, table.Rows [2][1], "#4");
-			Assert.AreEqual (10, table.Rows [3][1], "#5");
-	
-
-			table.BeginLoadData ();
-			table.LoadDataRow (new object[] {1,100}, true);
-			table.LoadDataRow (new object[] {2,100}, true);
-			table.LoadDataRow (new object[] {3,100}, true);
-			table.LoadDataRow (new object[] {4,100}, true);
-			table.EndLoadData ();
-
-			Assert.AreEqual (4, table.Rows.Count, "#6");
-			Assert.AreEqual (100, table.Rows [0][1], "#7");
-			Assert.AreEqual (100, table.Rows [1][1], "#8");
-			Assert.AreEqual (100, table.Rows [2][1], "#7");
-			Assert.AreEqual (100, table.Rows [3][1], "#10");
-		}
-
 		private void OnRowDeleting_Handler(Object sender,DataRowChangeEventArgs e)

 		{

 			

diff --git a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
index b425842c71a..b0c508b74d0 100644
--- a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
@@ -509,22 +509,5 @@ namespace MonoTests.System.Data
 				_ds.EnforceConstraints = true;
 			}
 		}
-
-		[Test]
-		public void ModifyParentKeyBeforeAcceptChanges ()
-		{
-			DataSet ds1 = new DataSet();
-			DataTable t1= ds1.Tables.Add ("t1");
-			DataTable t2= ds1.Tables.Add ("t2");
-			t1.Columns.Add ("col1", typeof (int));
-			t2.Columns.Add ("col2", typeof (int));
-			ds1.Relations.Add ("fk", t1.Columns [0], t2.Columns [0]);
-
-			t1.Rows.Add (new object[] {10});
-			t2.Rows.Add (new object [] {10});
-
-			t1.Rows [0][0]=20;
-			Assert("#1", (int)t2.Rows [0][0] == 20);
-		}
 	}
 }
diff --git a/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog b/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog
index 498ada849e1..40d1a362445 100644
--- a/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/schemas/ChangeLog
@@ -1,9 +1,3 @@
-2006-01-16  Senganal T <tsenganal@novell.com>
-
-	* test015.xsd, test016.xsd : added 
-		- test ForeignKeyConstraint and annotated DataRelation 
-		relating multiple columns
-
 2006-01-16  Atsushi Enomoto <atsushi@ximian.com>
 
 	* bug77248.xsd : added.
diff --git a/mcs/class/System.Data/Test/System.Data/schemas/test015.xsd b/mcs/class/System.Data/Test/System.Data/schemas/test015.xsd
deleted file mode 100644
index 79fd2173df5..00000000000
--- a/mcs/class/System.Data/Test/System.Data/schemas/test015.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-  <xs:element name="NewDataSet" msdata:IsDataSet="true" msdata:Locale="en-US">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element name="Table1">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="col1" type="xs:int" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="Table2">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="col1" type="xs:int" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:complexType>
-    <xs:unique name="Constraint1">
-      <xs:selector xpath=".//Table1" />
-      <xs:field xpath="col1" />
-    </xs:unique>
-    <xs:keyref name="fk1" refer="Constraint1" msdata:ConstraintOnly="true">
-      <xs:selector xpath=".//Table2" />
-      <xs:field xpath="col1" />
-    </xs:keyref>
-  </xs:element>
-</xs:schema>
diff --git a/mcs/class/System.Data/Test/System.Data/schemas/test016.xsd b/mcs/class/System.Data/Test/System.Data/schemas/test016.xsd
deleted file mode 100644
index dc29190ad98..00000000000
--- a/mcs/class/System.Data/Test/System.Data/schemas/test016.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-  <xs:element name="NewDataSet" msdata:IsDataSet="true">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element name="Table1">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="col_x0020_1" type="xs:int" minOccurs="0" />
-              <xs:element name="col2" type="xs:int" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="Table2">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="col1" type="xs:int" minOccurs="0" />
-              <xs:element name="col_x0020__x0020_2" type="xs:int" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:annotation>
-    <xs:appinfo>
-      <msdata:Relationship name="rel" msdata:parent="Table1" msdata:child="Table2" msdata:parentkey="col_x0020_1 col2" msdata:childkey="col1 col_x0020__x0020_2" />
-    </xs:appinfo>
-  </xs:annotation>
-</xs:schema>
diff --git a/mcs/class/System.Design/ChangeLog b/mcs/class/System.Design/ChangeLog
index a15e899632e..68f7d6c25b6 100644
--- a/mcs/class/System.Design/ChangeLog
+++ b/mcs/class/System.Design/ChangeLog
@@ -1,11 +1,3 @@
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* System.Design.dll.sources: add in all the stubbed/partially
-	implemented stuff.
-
-	* Makefile (LIB_MCS_FLAGS): in the 2.0 case include a reference to
-	System.Configuration.dll.
-
 2005-06-15  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* System.Design.dll.sources :
diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index 66855fea623..f661a42af53 100644
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -6,11 +6,6 @@ LIBRARY = System.Design.dll
 LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Web.dll \
 	-r:System.Windows.Forms.dll -r:System.Drawing.dll \
 	-r:Accessibility.dll -r:System.Data.dll
-
-ifeq (net_2_0, $(PROFILE))
-LIB_MCS_FLAGS += -r:System.Configuration.dll
-endif
-
 NO_TEST = yes
 
 include ../../build/library.make
diff --git a/mcs/class/System.Design/System.Design.dll.sources b/mcs/class/System.Design/System.Design.dll.sources
index 1dc432c2d54..6b72b46dc4a 100755
--- a/mcs/class/System.Design/System.Design.dll.sources
+++ b/mcs/class/System.Design/System.Design.dll.sources
@@ -21,10 +21,8 @@ System.Diagnostics.Design/ProcessModuleDesigner.cs
 System.Diagnostics.Design/ProcessThreadDesigner.cs
 System.Messaging.Design/MessageDesigner.cs
 System.ServiceProcess.Design/ServiceControllerDesigner.cs
-System.Web.UI.Design/AppSettingsExpressionEditor.cs
 System.Web.UI.Design/CalendarDataBindingHandler.cs
 System.Web.UI.Design/ColorBuilder.cs
-System.Web.UI.Design/ConnectionStringsExpressionEditor.cs
 System.Web.UI.Design/ControlDesigner.cs
 System.Web.UI.Design/ControlParser.cs
 System.Web.UI.Design/ControlPersister.cs
@@ -36,8 +34,6 @@ System.Web.UI.Design/DataFieldConverter.cs
 System.Web.UI.Design/DataMemberConverter.cs
 System.Web.UI.Design/DataSourceConverter.cs
 System.Web.UI.Design/DesignTimeData.cs
-System.Web.UI.Design/ExpressionEditor.cs
-System.Web.UI.Design/ExpressionEditorSheet.cs
 System.Web.UI.Design/HtmlControlDesigner.cs
 System.Web.UI.Design/HtmlIntrinsicControlDesigner.cs
 System.Web.UI.Design/HyperLinkDataBindingHandler.cs
@@ -45,15 +41,12 @@ System.Web.UI.Design/IControlDesignerBehaviour.cs
 System.Web.UI.Design/IDataSourceProvider.cs
 System.Web.UI.Design/IHtmlControlDesignerBehavior.cs
 System.Web.UI.Design/ImageUrlEditor.cs
-System.Web.UI.Design/IProjectItem.cs
 System.Web.UI.Design/ITemplateEditingFrame.cs
 System.Web.UI.Design/ITemplateEditingService.cs
-System.Web.UI.Design/IWebApplication.cs
 System.Web.UI.Design/IWebFormReferenceManager.cs
 System.Web.UI.Design/IWebFormsBuilderUIService.cs
 System.Web.UI.Design/IWebFormsDocumentService.cs
 System.Web.UI.Design/ReadWriteControlDesigner.cs
-System.Web.UI.Design/ResourceExpressionEditor.cs
 System.Web.UI.Design/TemplatedControlDesigner.cs
 System.Web.UI.Design/TemplateEditingService.cs
 System.Web.UI.Design/TemplateEditingVerb.cs
diff --git a/mcs/class/System.Design/System.Web.UI.Design/AppSettingsExpressionEditor.cs b/mcs/class/System.Design/System.Web.UI.Design/AppSettingsExpressionEditor.cs
deleted file mode 100644
index e02c9441e88..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/AppSettingsExpressionEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// System.Web.UI.Design.AppSettingsExpressionEditor
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-
-namespace System.Web.UI.Design {
-
-	public class AppSettingsExpressionEditor : ExpressionEditor
-	{
-		public AppSettingsExpressionEditor ()
-		{
-		}
-
-		public override object EvaluateExpression (string expression, object parseTimeData, Type propertyType, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override ExpressionEditorSheet GetExpressionEditorSheet (string expression, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Design/System.Web.UI.Design/ChangeLog b/mcs/class/System.Design/System.Web.UI.Design/ChangeLog
index 1e67e888110..8c214bba480 100644
--- a/mcs/class/System.Design/System.Web.UI.Design/ChangeLog
+++ b/mcs/class/System.Design/System.Web.UI.Design/ChangeLog
@@ -1,13 +1,3 @@
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* IProjectItem.cs: new interface.
-	* IWebApplication.cs: new interface.
-	
-	* ExpressionEditorSheet.cs: stubbed.
-	* ExpressionEditor.cs: stubbed.
-	* AppSettingsExpressionEditor.cs: stubbed.
-	* ResourceExpressionEditor.cs: stubbed.
-
 2004-06-11  Gert Driesen <drieseng@users.sourceforge.net>
 
 	* CalendarDataBindingHandler.cs: stubbed
diff --git a/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringsExpressionEditor.cs b/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringsExpressionEditor.cs
deleted file mode 100644
index cc7215f2a8a..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/ConnectionStringsExpressionEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// System.Web.UI.Design.ConnectionStringsExpressionEditor
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-
-namespace System.Web.UI.Design {
-
-	public class ConnectionStringsExpressionEditor : ExpressionEditor
-	{
-		public ConnectionStringsExpressionEditor ()
-		{
-		}
-
-		public override object EvaluateExpression (string expression, object parseTimeData, Type propertyType, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override ExpressionEditorSheet GetExpressionEditorSheet (string expression, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Design/System.Web.UI.Design/ExpressionEditor.cs b/mcs/class/System.Design/System.Web.UI.Design/ExpressionEditor.cs
deleted file mode 100644
index 413ec077fa8..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/ExpressionEditor.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// System.Web.UI.Design.ExpressionEditor
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Web.Compilation;
-using System.Web.Configuration;
-using _Configuration = System.Configuration.Configuration;
-
-namespace System.Web.UI.Design {
-
-	public abstract class ExpressionEditor
-	{
-		Type expressionBuilderType;
-		string prefixFromReflection;
-
-		public ExpressionEditor ()
-		{
-		}
-
-		public virtual string ExpressionPrefix {
-			get { return prefixFromReflection; }
-		}
-
-		Type ExpressionBuilderType {
-			set {
-				expressionBuilderType = value;
-
-				prefixFromReflection = "";
-				object[] attrs = expressionBuilderType.GetCustomAttributes (typeof (ExpressionPrefixAttribute), false);
-				if (attrs != null && attrs.Length > 0) {
-					ExpressionPrefixAttribute pa = (ExpressionPrefixAttribute)attrs[0];
-
-					prefixFromReflection = pa.ExpressionPrefix;
-				}
-			}
-		}
-
-		public abstract object EvaluateExpression (string expression, object parseTimeData, Type propertyType, IServiceProvider serviceProvider);
-
-		public static ExpressionEditor GetExpressionEditor (string expressionPrefix, IServiceProvider serviceProvider)
-		{
-			if (serviceProvider == null)
-				return null;
-
-			IWebApplication webApp = (IWebApplication)serviceProvider.GetService(typeof(IWebApplication));
-			if (webApp == null)
-				return null;
-
-			_Configuration config = webApp.OpenWebConfiguration(true);
-			if (config == null)
-				return null;
-
-			CompilationSection sec = (CompilationSection) config.GetSection ("system.web/compilation");
-			System.Web.Configuration.ExpressionBuilder builder = sec.ExpressionBuilders [expressionPrefix];
-
-			if (builder == null)
-				return null;
-
-			return GetExpressionEditor (Type.GetType (builder.Type), serviceProvider);
-		}
-
-		[MonoTODO ("the docs make it sound like this still requires accessing <expressionBuilders>")]
-		public static ExpressionEditor GetExpressionEditor (Type expressionBuilderType, IServiceProvider serviceProvider)
-		{
-			object[] attrs = expressionBuilderType.GetCustomAttributes (typeof (ExpressionEditorAttribute), false);
-
-			if (attrs == null || attrs.Length == 0)
-				return null;
-
-			ExpressionEditorAttribute ee = (ExpressionEditorAttribute) attrs[0];
-
-			Type editor_type = Type.GetType (ee.EditorTypeName);
-			ExpressionEditor editor = (ExpressionEditor) Activator.CreateInstance (editor_type);
-
-			editor.ExpressionBuilderType = expressionBuilderType;
-
-			return editor;
-		}
-
-		public virtual ExpressionEditorSheet GetExpressionEditorSheet (string expression, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Design/System.Web.UI.Design/ExpressionEditorSheet.cs b/mcs/class/System.Design/System.Web.UI.Design/ExpressionEditorSheet.cs
deleted file mode 100644
index 282d6fe6d20..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/ExpressionEditorSheet.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// System.Web.UI.Design.ExpressionEditorSheet
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.ComponentModel;
-
-namespace System.Web.UI.Design {
-
-	public abstract class ExpressionEditorSheet
-	{
-		IServiceProvider serviceProvider;
-
-		public ExpressionEditorSheet (IServiceProvider serviceProvider)
-		{
-			this.serviceProvider = serviceProvider;
-		}
-
-		public abstract string GetExpression ();
-
-		public virtual bool IsValid {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[Browsable (false)]
-		public IServiceProvider ServiceProvider {
-			get { return serviceProvider; }
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Design/System.Web.UI.Design/IProjectItem.cs b/mcs/class/System.Design/System.Web.UI.Design/IProjectItem.cs
deleted file mode 100644
index 2605fb8dc99..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/IProjectItem.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Web.UI.Design.IProjectItem
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.UI.Design {
-
-	public interface IProjectItem
-	{
-		string AppRelativeUrl { get; }
-		string Name { get; }
-		IProjectItem Parent { get; }
-		string PhysicalPath { get; }
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Design/System.Web.UI.Design/IWebApplication.cs b/mcs/class/System.Design/System.Web.UI.Design/IWebApplication.cs
deleted file mode 100644
index affb146f5d5..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/IWebApplication.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// System.Web.UI.Design.IWebApplication
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System.Configuration;
-using System.Runtime.InteropServices;
-
-namespace System.Web.UI.Design {
-
-	[Guid ("cff39fa8-5607-4b6d-86f3-cc80b3cfe2dd")] 
-	public interface IWebApplication : IServiceProvider {
-
-		IProjectItem GetProjectItemFromUrl (string appRelativeUrl);
-		System.Configuration.Configuration OpenWebConfiguration (bool isReadOnly);
-
-		IProjectItem RootProjectItem { get; }
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Design/System.Web.UI.Design/ResourceExpressionEditor.cs b/mcs/class/System.Design/System.Web.UI.Design/ResourceExpressionEditor.cs
deleted file mode 100644
index 19d34f6b3da..00000000000
--- a/mcs/class/System.Design/System.Web.UI.Design/ResourceExpressionEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// System.Web.UI.Design.ResourceExpressionEditor
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-
-namespace System.Web.UI.Design {
-
-	public class ResourceExpressionEditor : ExpressionEditor
-	{
-		public ResourceExpressionEditor ()
-		{
-		}
-
-		public override object EvaluateExpression (string expression, object parseTimeData, Type propertyType, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override ExpressionEditorSheet GetExpressionEditorSheet (string expression, IServiceProvider serviceProvider)
-		{
-			throw new NotImplementedException ();
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Query/Assembly/AssemblyInfo.cs b/mcs/class/System.Query/Assembly/AssemblyInfo.cs
deleted file mode 100755
index 1e0a15be160..00000000000
--- a/mcs/class/System.Query/Assembly/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-

-[assembly: AssemblyTitle("System.Query")]

-[assembly: AssemblyDescription("System.Query.dll")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("Mono Development Team")]

-[assembly: AssemblyProduct("System.Query")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-[assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyDelaySign (true)]

-[assembly: AssemblyKeyFile("../msfinal.pub")]

diff --git a/mcs/class/System.Query/ChangeLog b/mcs/class/System.Query/ChangeLog
deleted file mode 100644
index dfeaa36e30f..00000000000
--- a/mcs/class/System.Query/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2006-01-31  Alejandro Serrano "Serras"  <trupill@yahoo.es>
-
-	* Fix bug in SkipWhile<T>, where the first element was never yielded
-
-2006-01-30  Alejandro Serrano "Serras"  <trupill@yahoo.es>
-
-	* Initial commit
diff --git a/mcs/class/System.Query/Makefile b/mcs/class/System.Query/Makefile
deleted file mode 100644
index 8e5996963a5..00000000000
--- a/mcs/class/System.Query/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-thisdir = class/System.Query

-SUBDIRS = 

-include ../../build/rules.make

-

-LIBRARY = System.Query.dll

-LIB_MCS_FLAGS = /r:$(corlib)

-NO_TEST = yes

-

-EXTRA_DISTFILES =

-

-include ../../build/library.make
diff --git a/mcs/class/System.Query/System.Query.dll.sources b/mcs/class/System.Query/System.Query.dll.sources
deleted file mode 100644
index f89e28a408f..00000000000
--- a/mcs/class/System.Query/System.Query.dll.sources
+++ /dev/null
@@ -1,8 +0,0 @@
-./Assembly/AssemblyInfo.cs

-./System.Runtime.CompilerServices/ExtensionAttribute.cs

-./System.Query/EmptySequenceException.cs

-./System.Query/Funcs.cs

-./System.Query/Grouping.cs

-./System.Query/OrderedSequence.cs

-./System.Query/InternalOrderedSequence.cs

-./System.Query/Sequence.cs
diff --git a/mcs/class/System.Query/System.Query/EmptySequenceException.cs b/mcs/class/System.Query/System.Query/EmptySequenceException.cs
deleted file mode 100644
index d45327096ce..00000000000
--- a/mcs/class/System.Query/System.Query/EmptySequenceException.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;

-

-namespace System.Query

-{

-        public class EmptySequenceException : Exception

-        {

-                public EmptySequenceException ()

-                {

-                }

-        }

-}

diff --git a/mcs/class/System.Query/System.Query/Funcs.cs b/mcs/class/System.Query/System.Query/Funcs.cs
deleted file mode 100644
index 827fccbffc2..00000000000
--- a/mcs/class/System.Query/System.Query/Funcs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;

-

-namespace System.Query

-{

-        public delegate T Func<T> ();

-        public delegate T Func<A0, T> (A0 arg0);

-        public delegate T Func<A0, A1, T> (A0 arg0, A1 arg1);

-        public delegate T Func<A0, A1, A2, T> (A0 arg0, A1 arg1, A2 arg2);

-        public delegate T Func<A0, A1, A2, A3, T> (A0 arg0, A1 arg1, A2 arg2, A3 arg3);

-}

diff --git a/mcs/class/System.Query/System.Query/Grouping.cs b/mcs/class/System.Query/System.Query/Grouping.cs
deleted file mode 100644
index 52fdaed8a21..00000000000
--- a/mcs/class/System.Query/System.Query/Grouping.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;

-using System.Collections.Generic;

-

-namespace System.Query

-{

-        public class Grouping<K, T>

-        {

-                K key;

-                IEnumerable<T> group;

-                

-                public Grouping (K key, IEnumerable<T> group)

-                {

-                        this.group = group;

-                        this.key = key;

-                }

-                

-                public K Key {

-                        get { return key; }

-                        set { key = value; }

-                }

-                

-                public IEnumerable<T> Group {

-                        get { return group; }

-                        set { group = value; }

-                }

-        }

-}

diff --git a/mcs/class/System.Query/System.Query/InternalOrderedSequence.cs b/mcs/class/System.Query/System.Query/InternalOrderedSequence.cs
deleted file mode 100644
index cdaa025f93f..00000000000
--- a/mcs/class/System.Query/System.Query/InternalOrderedSequence.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;

-using System.Collections.Generic;

-

-namespace System.Query

-{

-        internal class InternalOrderedSequence<T, K> : OrderedSequence<T>

-        {

-                IEnumerable<T> source;

-                Func<T, K> key_selector;

-                IComparer<K> comparer;

-                bool descending;

-                OrderedSequence<T> previous;

-                

-                internal InternalOrderedSequence (IEnumerable<T> source, Func<T, K> keySelector,

-                                                  IComparer<K> comparer, bool descending, OrderedSequence<T> previous)

-                {

-                        this.source = source;

-                        this.key_selector = keySelector;

-                        this.comparer = comparer;

-                        this.descending = descending;

-                        this.previous = previous;

-                }

-                

-                protected override IEnumerator<T> EnumeratorImplementation ()

-                {

-                        return Sort (source).GetEnumerator ();

-                }

-                

-                protected internal override IEnumerable<T> Sort (IEnumerable<T> previousList)

-                {

-                        if (previous == null)

-                                return PerformSort (previousList);

-                        else

-                                return previous.Sort (PerformSort (previousList));

-                }

-                

-                List<T> source_list;

-                K[] keys;

-                int[] indexes;

-                

-                private IEnumerable<T> PerformSort (IEnumerable<T> items)

-                {

-                        // It first enumerates source, collecting all elements

-                        source_list = new List<T> (items);

-                        

-                        // Then evaluate the keySelector function for each element,

-                        // collecting the key values

-                        keys = new K [source_list.Count];

-                        for (int i = 0; i < source_list.Count; i++)

-                                keys[i] = key_selector(source_list [i]);

-                        

-                        // Then sorts the elements according to the collected

-                        // key values and the selected ordering

-                        indexes = new int [keys.Length];

-                        for (int i = 0; i < indexes.Length; i++)

-                                indexes [i] = i;

-                        

-                        QuickSort(indexes, 0, indexes.Length - 1);

-                        

-                        // Return the values as IEnumerable<T>

-                        T[] orderedList = new T [indexes.Length];

-                        for (int i = 0; i < indexes.Length; i++)

-                                orderedList [i] = source_list [indexes [i]];

-                        return orderedList;

-                }

-                

-                private int CompareItems (int firstIndex, int secondIndex)

-                {

-                        int comparison;

-                        

-                        if (comparer == null)

-                                comparison = ((IComparable<K>)keys [firstIndex]).CompareTo (keys [secondIndex]);

-                        else

-                                comparison =  comparer.Compare (keys [firstIndex], keys [secondIndex]);

-                       

-                        // If descending, return the opposite comparison

-                        return (descending ? -comparison : comparison);

-                }

-                

-                /** QuickSort implementation

-                    Based on implementation found in Wikipedia 

-                    http://en.wikipedia.org/wiki/Quicksort_implementations

-                    that was released under the GNU Free Documentation License **/

-               

-                private void QuickSort (int[] array, int left, int right)

-                {

-                        int lhold = left;

-                        int rhold = right;

-                        Random random = new Random ();

-                        int pivot = random.Next (left, right);

-                        Swap (array, pivot, left);

-                        pivot = left;

-                        left++;

-                        

-                        while (right >= left) {

-                                int leftComparison = CompareItems (indexes [left], indexes [pivot]);

-                                int rightComparison = CompareItems (indexes [right], indexes [pivot]);

-                                if (leftComparison >= 0 && rightComparison < 0)

-                                        Swap (array, left, right);

-                                else if (leftComparison >= 0)

-                                        right--;

-                                else if (rightComparison < 0)

-                                        left++;

-                                else {

-                                        right--;

-                                        left++;

-                                }

-                        }

-                        

-                        Swap (array, pivot, right);

-                        pivot = right;

-                        if (pivot > lhold)

-                                QuickSort (array, lhold, pivot);

-                        if (rhold > pivot + 1)

-                                QuickSort (array, pivot + 1, rhold);

-                }

-                

-                private void Swap (int[] items, int left, int right)

-                {

-                        int temp = items [right];

-                        items [right] = items [left];

-                        items [left] = temp;

-                }

-                

-        }

-}

diff --git a/mcs/class/System.Query/System.Query/OrderedSequence.cs b/mcs/class/System.Query/System.Query/OrderedSequence.cs
deleted file mode 100644
index fe624766a99..00000000000
--- a/mcs/class/System.Query/System.Query/OrderedSequence.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;

-using System.Collections;

-using System.Collections.Generic;

-

-namespace System.Query

-{

-        public abstract class OrderedSequence<T> : IEnumerable<T>

-        {

-                public IEnumerator<T> GetEnumerator ()

-                {

-                        return EnumeratorImplementation ();

-                }

-                

-                IEnumerator IEnumerable.GetEnumerator ()

-                {

-                        return EnumeratorImplementation ();

-                }

-                

-                protected abstract IEnumerator<T> EnumeratorImplementation ();

-                

-                protected internal abstract IEnumerable<T> Sort (IEnumerable<T> previousSource);

-        }

-}

diff --git a/mcs/class/System.Query/System.Query/Sequence.cs b/mcs/class/System.Query/System.Query/Sequence.cs
deleted file mode 100644
index db0677bf012..00000000000
--- a/mcs/class/System.Query/System.Query/Sequence.cs
+++ /dev/null
@@ -1,2702 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;
-using System.Collections.Generic;

-

-namespace System.Query

-{

-        [System.Runtime.CompilerServices.Extension]

-        public static class Sequence

-        {

-                #region Count

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Count<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        if (source is ICollection<T>)

-                                return ((ICollection<T>)source).Count;

-                        else {

-                                int counter = 0;

-                                foreach (T element in source)

-                                        counter++;

-                                return counter;

-                        }

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Count<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source)

-                                if (selector(element))

-                                        counter++;

-                        

-                        return counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Count<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        int elementIndex = 0;

-                        foreach (T element in source) {

-                                if (selector (element, elementIndex))

-                                        counter++;

-                                elementIndex++;

-                        }

-                        

-                        return counter;

-                }

-                

-                #endregion

-                

-                #region Sum

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Sum (

-                        IEnumerable<int> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        int sum = 0;

-                        foreach (int element in source)

-                                sum += element;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, int> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int sum = 0;

-                        foreach (T element in source)

-                                sum += selector (element);

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int? Sum (

-                        IEnumerable<int?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        int? sum = 0;

-                        foreach (int? element in source)

-                                if (element.HasValue)

-                                        sum += element.Value;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int? Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, int?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int? sum = 0;

-                        foreach (T element in source) {

-                                int? item = selector (element);

-                                if (item.HasValue)

-                                        sum += item.Value;

-                        }

-                        

-                        return sum;

-                }

-

-                [System.Runtime.CompilerServices.Extension]

-                public static long Sum (

-                        IEnumerable<long> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        long sum = 0;

-                        foreach (long element in source)

-                                sum += element;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, long> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        long sum = 0;

-                        foreach (T element in source)

-                                sum += selector (element);

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long? Sum (

-                        IEnumerable<long?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        long? sum = 0;

-                        foreach (long? element in source)

-                                if (element.HasValue)

-                                        sum += element.Value;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long? Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, long?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        long? sum = 0;

-                        foreach (T element in source) {

-                                long? item = selector (element);

-                                if (item.HasValue)

-                                        sum += item.Value;

-                        }

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Sum (

-                        IEnumerable<double> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        double sum = 0;

-                        foreach (double element in source)

-                                sum += element;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, double> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        double sum = 0;

-                        foreach (T element in source)

-                                sum += selector (element);

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Sum (

-                        IEnumerable<double?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        double? sum = 0;

-                        foreach (double? element in source)

-                                if (element.HasValue)

-                                        sum += element.Value;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, double?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        double? sum = 0;

-                        foreach (T element in source) {

-                                double? item = selector (element);

-                                if (item.HasValue)

-                                        sum += item.Value;

-                        }

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Sum (

-                        IEnumerable<decimal> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal sum = 0;

-                        foreach (decimal element in source)

-                                sum += element;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal sum = 0;

-                        foreach (T element in source)

-                                sum += selector (element);

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Sum (

-                        IEnumerable<decimal?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal? sum = 0;

-                        foreach (decimal? element in source)

-                                if (element.HasValue)

-                                        sum += element.Value;

-                        

-                        return sum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Sum<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal? sum = 0;

-                        foreach (T element in source) {

-                                decimal? item = selector (element);

-                                if (item.HasValue)

-                                        sum += item.Value;

-                        }

-                        

-                        return sum;

-                }

-                

-                #endregion

-                

-                #region Min

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Min (

-                        IEnumerable<int> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        int minimum = int.MaxValue;

-                        int counter = 0;

-                        foreach (int element in source) {

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int? Min (

-                        IEnumerable<int?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        int? minimum = int.MaxValue;

-                        foreach (int? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long Min (

-                        IEnumerable<long> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        long minimum = long.MaxValue;

-                        int counter = 0;

-                        foreach (long element in source) {

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long? Min (

-                        IEnumerable<long?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long? minimum = long.MaxValue;

-                        foreach (long? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Min (

-                        IEnumerable<double> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        double minimum = double.MaxValue;

-                        int counter = 0;

-                        foreach (double element in source) {

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Min (

-                        IEnumerable<double?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        double? minimum = double.MaxValue;

-                        foreach (double? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Min (

-                        IEnumerable<decimal> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal minimum = decimal.MaxValue;

-                        int counter = 0;

-                        foreach (decimal element in source) {

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Min (

-                        IEnumerable<decimal?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        decimal? minimum = decimal.MaxValue;

-                        foreach (decimal? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T Min<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool notAssigned = true;

-                        T minimum = default (T);

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (notAssigned) {

-                                        minimum = element;

-                                        notAssigned = false;

-                                }

-                                else {

-                                        int comparison;

-                                        if (element is IComparable<T>)

-                                                comparison = ((IComparable<T>)element).CompareTo (minimum);

-                                        else if (element is System.IComparable)

-                                                comparison = ((System.IComparable)element).CompareTo (minimum);

-                                        else

-                                                throw new ArgumentNullException();

-                                        

-                                        if (comparison < 0)

-                                                minimum = element;

-                                }

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, int> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int minimum = int.MaxValue;

-                        int counter = 0;

-                        foreach (T item in source) {

-                                int element = selector (item);

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int? Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, int?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        int? minimum = int.MaxValue;

-                        foreach (T item in source) {

-                                int? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, long> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        long minimum = long.MaxValue;

-                        int counter = 0;

-                        foreach (T item in source) {

-                                long element = selector (item);

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long? Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, long?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long? minimum = long.MaxValue;

-                        foreach (T item in source) {

-                                long? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, double> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        double minimum = double.MaxValue;

-                        int counter = 0;

-                        foreach (T item in source)

-                        {

-                                double element = selector (item);

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, double?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        double? minimum = double.MaxValue;

-                        foreach (T item in source) {

-                                double? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal minimum = decimal.MaxValue;

-                        int counter = 0;

-                        foreach (T item in source) {

-                                decimal element = selector (item);

-                                if (element < minimum)

-                                        minimum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Min<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        decimal? minimum = decimal.MaxValue;

-                        foreach (T item in source) {

-                                decimal? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element < minimum)

-                                                minimum = element;

-                                }

-                        }

-                        return (onlyNull ? null : minimum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static S Min<T, S> (

-                        IEnumerable<T> source,

-                        Func<T, S> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool notAssigned = true;

-                        S minimum = default (S);

-                        int counter = 0;

-                        foreach (T item in source) {

-                                S element = selector (item);

-                                if (notAssigned) {

-                                        minimum = element;

-                                        notAssigned = false;

-                                }

-                                else {

-                                        int comparison;

-                                        if (element is IComparable<S>)

-                                                comparison = ((IComparable<S>)element).CompareTo (minimum);

-                                        else if (element is System.IComparable)

-                                                comparison = ((System.IComparable)element).CompareTo (minimum);

-                                        else

-                                                throw new ArgumentNullException ();

-                                        

-                                        if (comparison < 0)

-                                                minimum = element;

-                                }

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return minimum;

-                }

-                

-                #endregion

-                

-                #region Max

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Max (

-                        IEnumerable<int> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        int maximum = int.MinValue;

-                        int counter = 0;

-                        foreach (int element in source) {

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int? Max (

-                        IEnumerable<int?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        int? maximum = int.MinValue;

-                        foreach (int? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long Max (

-                        IEnumerable<long> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        long maximum = long.MinValue;

-                        int counter = 0;

-                        foreach (long element in source) {

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long? Max (

-                        IEnumerable<long?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long? maximum = long.MinValue;

-                        foreach (long? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Max (

-                        IEnumerable<double> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        double maximum = double.MinValue;

-                        int counter = 0;

-                        foreach (double element in source) {

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Max (

-                        IEnumerable<double?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        double? maximum = double.MinValue;

-                        foreach (double? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Max (

-                        IEnumerable<decimal> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal maximum = decimal.MinValue;

-                        int counter = 0;

-                        foreach (decimal element in source) {

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Max (

-                        IEnumerable<decimal?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        decimal? maximum = decimal.MinValue;

-                        foreach (decimal? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T Max<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool notAssigned = true;

-                        T maximum = default (T);

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (notAssigned) {

-                                        maximum = element;

-                                        notAssigned = false;

-                                }

-                                else {

-                                        int comparison;

-                                        if (element is IComparable<T>)

-                                                comparison = ((IComparable<T>)element).CompareTo (maximum);

-                                        else if (element is System.IComparable)

-                                                comparison = ((System.IComparable)element).CompareTo (maximum);

-                                        else

-                                                throw new ArgumentNullException();

-                                        

-                                        if (comparison > 0)

-                                                maximum = element;

-                                }

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, int> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int maximum = int.MinValue;

-                        int counter = 0;

-                        foreach (T item in source)

-                        {

-                                int element = selector (item);

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int? Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, int?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        int? maximum = int.MinValue;

-                        foreach (T item in source) {

-                                int? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, long> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        long maximum = long.MinValue;

-                        int counter = 0;

-                        foreach (T item in source) {

-                                long element = selector (item);

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static long? Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, long?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long? maximum = long.MinValue;

-                        foreach (T item in source) {

-                                long? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, double> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        double maximum = double.MinValue;

-                        int counter = 0;

-                        foreach (T item in source) {

-                                double element = selector (item);

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, double?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        double? maximum = double.MinValue;

-                        foreach (T item in source) {

-                                double? element = selector(item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal maximum = decimal.MinValue;

-                        int counter = 0;

-                        foreach (T item in source) {

-                                decimal element = selector(item);

-                                if (element > maximum)

-                                        maximum = element;

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Max<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        decimal? maximum = decimal.MinValue;

-                        foreach (T item in source) {

-                                decimal? element = selector(item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        if (element > maximum)

-                                                maximum = element;

-                                }

-                        }

-                        return (onlyNull ? null : maximum);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static S Max<T, S> (

-                        IEnumerable<T> source,

-                        Func<T, S> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool notAssigned = true;

-                        S maximum = default (S);

-                        int counter = 0;

-                        foreach (T item in source)

-                        {

-                                S element = selector (item);

-                                if (notAssigned)  {

-                                        maximum = element;

-                                        notAssigned = false;

-                                }

-                                else  {

-                                        int comparison;

-                                        if (element is IComparable<S>)

-                                                comparison = ((IComparable<S>)element).CompareTo (maximum);

-                                        else if (element is System.IComparable)

-                                                comparison = ((System.IComparable)element).CompareTo (maximum);

-                                        else

-                                                throw new ArgumentNullException();

-                                        

-                                        if (comparison > 0)

-                                                maximum = element;

-                                }

-                                       counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return maximum;

-                }

-                                

-                #endregion

-        

-                #region Average

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Average (

-                        IEnumerable<int> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (int element in source) {

-                                sum += element;                        

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return (double)sum / (double)counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Average (

-                        IEnumerable<int?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (int? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (double?)sum / (double?)counter);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Average (

-                        IEnumerable<long> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (long element in source) {

-                                sum += element;                        

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return (double)sum / (double)counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Average (

-                        IEnumerable<long?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (long? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (double?)sum / (double?)counter);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Average (

-                        IEnumerable<double> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        double sum = 0;

-                        double counter = 0;

-                        foreach (double element in source) {

-                                sum += element;                        

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return sum / counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Average (

-                        IEnumerable<double?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        double sum = 0;

-                        double counter = 0;

-                        foreach (double? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (double?)(sum / counter));

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Average (

-                        IEnumerable<decimal> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal sum = 0;

-                        decimal counter = 0;

-                        foreach (decimal element in source) {

-                                sum += element;                        

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return sum / counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Average (

-                        IEnumerable<decimal?> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        decimal sum = 0;

-                        decimal counter = 0;

-                        foreach (decimal? element in source) {

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (decimal?)(sum / counter));

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, int> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (T item in source) {

-                                sum += selector (item);

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return (double)sum / (double)counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, int?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (T item in source) {

-                                int? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (double?)sum / (double?)counter);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, long> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (T item in source) {

-                                sum += selector (item);

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException();

-                        else

-                                return (double)sum / (double)counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, long?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        long sum = 0;

-                        long counter = 0;

-                        foreach (T item in source) {

-                                long? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (double?)sum/(double?)counter);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, double> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        double sum = 0;

-                        double counter = 0;

-                        foreach (T item in source) {

-                                sum += selector (item);

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return sum / counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static double? Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, double?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        double sum = 0;

-                        double counter = 0;

-                        foreach (T item in source) {

-                                double? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (double?)(sum/counter));

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        decimal sum = 0;

-                        decimal counter = 0;

-                        foreach (T item in source) {

-                                sum += selector(item);

-                                counter++;

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return sum / counter;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static decimal? Average<T> (

-                        IEnumerable<T> source,

-                        Func<T, decimal?> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        bool onlyNull = true;

-                        decimal sum = 0;

-                        decimal counter = 0;

-                        foreach (T item in source) {

-                                decimal? element = selector (item);

-                                if (element.HasValue) {

-                                        onlyNull = false;

-                                        sum += element.Value;

-                                        counter++;

-                                }

-                        }

-                        return (onlyNull ? null : (decimal?)(sum/counter));

-                }

-                

-                #endregion

-                

-                #region Fold

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T Fold<T> (

-                        IEnumerable<T> source,

-                        Func<T, T, T> func)

-                {

-                        if (source == null || func == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        T folded = default (T);

-                        

-                        foreach (T element in source) {

-                                if (counter == 0)

-                                        folded = element;

-                                else

-                                        folded = func (folded, element);

-                        }

-                        

-                        if (counter == 0)

-                                throw new EmptySequenceException ();

-                        else

-                                return folded;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static U Fold<T, U> (

-                        IEnumerable<T> source,

-                        U seed,

-                        Func<U, T, U> func)

-                {

-                        if (source == null || func == null)

-                                throw new ArgumentNullException ();

-                        

-                        U folded = seed;

-                        foreach (T element in source)

-                                folded = func (folded, element);

-                        return folded;

-                }

-                

-                #endregion

-
-                #region Concat

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Concat<T> (

-                        IEnumerable<T> first,

-                        IEnumerable<T> second)

-                {

-                        if (first == null || second == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in first)

-                                yield return element;

-                        foreach (T element in second)

-                                yield return element;

-                }

-                

-                #endregion

-
-                #region ToSequence

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> ToSequence<T> (

-                        IEnumerable<T> source)

-                {

-                        return (IEnumerable<T>)source;

-                }

-                

-                #endregion

-                

-                #region ToArray

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T[] ToArray<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        List<T> list = new List<T> (source);

-                        return list.ToArray ();

-                }

-                

-                #endregion

-                

-                #region ToList

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static List<T> ToList<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new List<T> (source);

-                }

-                

-                #endregion

-                

-                #region ToDictionary

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static Dictionary<K, T> ToDictionary<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector)

-                {

-                        if (source == null || keySelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        Dictionary<K, T> dictionary = new Dictionary<K, T> ();

-                        foreach (T element in source) {

-                                K key = keySelector (element);

-                                if (key == null)

-                                        throw new ArgumentNullException ();

-                                else if (dictionary.ContainsKey (key))

-                                        throw new ArgumentException ();

-                                else

-                                        dictionary.Add (key, element);

-                        }

-                        return dictionary;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static Dictionary<K, E> ToDictionary<T, K, E> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector,

-                        Func<T, E> elementSelector)

-                {

-                        if (source == null || keySelector == null || elementSelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        Dictionary<K, E> dictionary = new Dictionary<K, E>();

-                        foreach (T element in source)

-                        {

-                                K key = keySelector (element);

-                                if (key == null)

-                                        throw new ArgumentNullException ();

-                                else if (dictionary.ContainsKey (key))

-                                        throw new ArgumentException ();

-                                else

-                                        dictionary.Add(key, elementSelector (element));

-                        }

-                        return dictionary;

-                }

-                

-                #endregion

-                

-                #region OfType

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> OfType<T> (

-                        System.Collections.IEnumerable source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (object element in source)

-                                if (element is T)

-                                        yield return (T)element;

-                }

-                

-                #endregion

-
-                #region First

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T First<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                return element;

-                        

-                        throw new EmptySequenceException();

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T First<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source) {

-                                if (predicate (element))

-                                        return element;

-                        }

-                        

-                        throw new EmptySequenceException ();

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T First<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (predicate(element, counter))

-                                        return element;

-                                counter++;

-                        }

-                        

-                        throw new EmptySequenceException ();

-                }

-                

-                #endregion

-                

-                #region FirstOrDefault

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T FirstOrDefault<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                return element;

-                        

-                        return default (T);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T FirstOrDefault<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source) {

-                                if (predicate (element))

-                                        return element;

-                        }

-                        

-                        return default (T);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T FirstOrDefault<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (predicate(element, counter))

-                                        return element;

-                                counter++;

-                        }

-                        

-                        return default (T);

-                }

-                

-                #endregion

-                

-                #region ElementAt

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static T ElementAt<T> (

-                        IEnumerable<T> source,

-                        int index)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        if (index < 0)

-                                throw new ArgumentOutOfRangeException ();

-                        

-                        if (source is IList<T>)

-                                return ((IList<T>)source)[index];

-                        else {

-                                int counter = 0;

-                                foreach (T element in source) {

-                                        if (counter == index)

-                                                return element;

-                                        counter++;

-                                }

-                                throw new ArgumentOutOfRangeException();

-                        }

-                }

-                

-                #endregion

-
-                #region EqualAll

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool EqualAll<T> (

-                        IEnumerable<T> first,

-                        IEnumerable<T> second)

-                {

-                        if (first == null || second == null)

-                                throw new ArgumentNullException ();

-                        

-                        List<T> firstList = new List<T> (first);

-                        List<T> secondList = new List<T> (second);

-                        

-                        if (firstList.Count != firstList.Count)

-                                return false;

-                        

-                        for (int i = 0; i < firstList.Count; i++) {

-                                if (!System.Object.Equals (firstList [i], secondList [i]))

-                                        return false;

-                        }

-                        // If no pair of elements is different, then everything is equal

-                        return true;

-                }

-                

-                #endregion

-
-                #region Range

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<int> Range (

-                        int start, int count)

-                {

-                        if (count < 0 || (start + count - 1) > int.MaxValue)

-                                throw new ArgumentOutOfRangeException ();

-                        

-                        for (int i = start; i < (start + count - 1); i++)

-                                yield return i;

-                }

-                

-                #endregion

-                

-                #region Repeat

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Repeat<T> (

-                        T element, int count)

-                {

-                        if (count < 0)

-                                throw new ArgumentOutOfRangeException ();

-                        

-                        for (int i = 0; i < count; i++)

-                                yield return element;

-                }

-                

-                #endregion

-
-                /** A NOTE ON IMPLEMENTATION REGARDING NULL KEYS

-                 * 

-                 *  GroupBy specification states that null-key values

-                 *  are allowed. However, all implementations of 

-                 *  Dictionary<K, T> ban null keys.

-                 *  Because of this, a small trick has to be done:

-                 *  a special List<T> variable is created in order to

-                 *  be filled with this null-key values.

-                 *  Also, groups must be yielded in the order their

-                 *  keys were found for first time, so we need to keep

-                 *  a record on when the null-key values appeared

-                 *  (that is nullCounter variable).

-                 *  Then, when results are iterated and yielded, we

-                 *  mantain a counter and if null-key values were

-                 *  found, they are yielded in the order needed.

-                 *  Because K can be a valuetype, compilers expose a

-                 *  restriction on null values, that's why default(T)

-                 *  is used. However, default(T) is null for

-                 *  reference types, and values with selectors that

-                 *  return value types can't return null. **/

-                

-                #region GroupBy

-                

-                private static List<T> ContainsGroup<K, T>(

-                        Dictionary<K, List<T>> items, K key, IEqualityComparer<K> comparer)

-                {

-                        foreach (KeyValuePair<K, List<T>> value in items) {

-                                if (comparer.Equals(value.Key, key))

-                                    return value.Value;

-                        }

-                        return null;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<Grouping<K, T>> GroupBy<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector)

-                {

-                        if (source == null || keySelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        Dictionary<K, List<T>> groups = new Dictionary<K, List<T>> ();

-                        List<T> nullList = new List<T> ();

-                        int counter = 0;

-                        int nullCounter = -1;

-                        

-                        foreach (T element in source) {

-                                K key = keySelector (element);

-                                if (key == null) {

-                                        nullList.Add (element);

-                                        if (nullCounter == -1) {

-                                                nullCounter = counter;

-                                                counter++;

-                                        }

-                                }

-                                else {

-                                        List<T> group = ContainsGroup<K, T> (groups, key, EqualityComparer<K>.Default);

-                                        if (group == null) {

-                                                group = new List<T> ();

-                                                groups.Add (key, group);

-                                                counter++;

-                                        }

-                                        group.Add (element);

-                                }

-                        }

-                        

-                        counter = 0;

-                        foreach (KeyValuePair<K, List<T>> group in groups) {

-                                if (counter == nullCounter) {

-                                        Grouping<K, T> nullGroup = new Grouping<K, T> (default (K), nullList);

-                                        yield return nullGroup;

-                                        counter++;

-                                }

-                                Grouping<K, T> grouping = new Grouping<K, T> (group.Key, group.Value);

-                                yield return grouping;

-                                counter++;

-                        }

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<Grouping<K, T>> GroupBy<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector,

-                        IEqualityComparer<K> comparer)

-                {

-                        if (source == null || keySelector == null || comparer == null)

-                                throw new ArgumentNullException ();

-                        

-                        Dictionary<K, List<T>> groups = new Dictionary<K, List<T>> ();

-                        List<T> nullList = new List<T> ();

-                        int counter = 0;

-                        int nullCounter = -1;

-                        

-                        foreach (T element in source) {

-                                K key = keySelector (element);

-                                if (key == null) {

-                                        nullList.Add (element);

-                                        if (nullCounter == -1) {

-                                                nullCounter = counter;

-                                                counter++;

-                                        }

-                                }

-                                else {

-                                        List<T> group = ContainsGroup<K, T> (groups, key, comparer);

-                                        if (group == null) {

-                                                group = new List<T> ();

-                                                groups.Add (key, group);

-                                                counter++;

-                                        }

-                                        group.Add (element);

-                                }

-                        }

-                        

-                        counter = 0;

-                        foreach (KeyValuePair<K, List<T>> group in groups) {

-                                if (counter == nullCounter) {

-                                        Grouping<K, T> nullGroup = new Grouping<K, T> (default (K), nullList);

-                                        yield return nullGroup;

-                                        counter++;

-                                }

-                                Grouping<K, T> grouping = new Grouping<K, T> (group.Key, group.Value);

-                                yield return grouping;

-                                counter++;

-                        }

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<Grouping<K, E>> GroupBy<T, K, E> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector,

-                        Func<T, E> elementSelector)

-                {

-                        if (source == null || keySelector == null || elementSelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        Dictionary<K, List<E>> groups = new Dictionary<K, List<E>> ();

-                        List<E> nullList = new List<E> ();

-                        int counter = 0;

-                        int nullCounter = -1;

-

-                        foreach (T item in source) {

-                                K key = keySelector (item);

-                                E element = elementSelector (item);

-                                if (key == null) {

-                                        nullList.Add (element);

-                                        if (nullCounter == -1) {

-                                                nullCounter = counter;

-                                                counter++;

-                                        }

-                                }

-                                else {

-                                        List<E> group = ContainsGroup<K, E> (groups, key, EqualityComparer<K>.Default);

-                                        if (group == null) {

-                                                group = new List<E> ();

-                                                groups.Add (key, group);

-                                                counter++;

-                                        }

-                                        group.Add (element);

-                                }

-                        }

-                        

-                        counter = 0;

-                        foreach (KeyValuePair<K, List<E>> group in groups) {

-                                if (counter == nullCounter) {

-                                        Grouping<K, E> nullGroup = new Grouping<K, E> (default (K), nullList);

-                                        yield return nullGroup;

-                                        counter++;

-                                }

-                                Grouping<K, E> grouping = new Grouping<K, E> (group.Key, group.Value);

-                                yield return grouping;

-                                counter++;

-                        }

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<Grouping<K, E>> GroupBy<T, K, E> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector,

-                        Func<T, E> elementSelector,

-                        IEqualityComparer<K> comparer)

-                {

-                        if (source == null || keySelector == null || comparer == null || elementSelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        Dictionary<K, List<E>> groups = new Dictionary<K, List<E>> ();

-                        List<E> nullList = new List<E> ();

-                        int counter = 0;

-                        int nullCounter = -1;

-

-                        foreach (T item in source) {

-                                K key = keySelector (item);

-                                E element = elementSelector (item);

-                                if (key == null) {

-                                        nullList.Add(element);

-                                        if (nullCounter == -1) {

-                                                nullCounter = counter;

-                                                counter++;

-                                        }

-                                }

-                                else {

-                                        List<E> group = ContainsGroup<K, E> (groups, key, comparer);

-                                        if (group == null) {

-                                                group = new List<E> ();

-                                                groups.Add (key, group);

-                                                counter++;

-                                        }

-                                        group.Add (element);

-                                }

-                        }

-                        

-                        counter = 0;

-                        foreach (KeyValuePair<K, List<E>> group in groups) {

-                                if (counter == nullCounter) {

-                                        Grouping<K, E> nullGroup = new Grouping<K, E> (default (K), nullList);

-                                        yield return nullGroup;

-                                        counter++;

-                                }

-                                Grouping<K, E> grouping = new Grouping<K, E> (group.Key, group.Value);

-                                yield return grouping;

-                                counter++;

-                        }

-                }

-                

-                #endregion

-
-                #region OrderBy

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> OrderBy<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector)

-                where

-                        K : IComparable<K>

-                {

-                        if (source == null || keySelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, null, false, null);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> OrderBy<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector,

-                        IComparer<K> comparer)

-                {

-                        if (source == null || keySelector == null || comparer == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, comparer, false, null);

-                }

-                

-                #endregion

-                

-                #region OrderByDescending

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> OrderByDescending<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector)

-                where

-                        K : IComparable<K>

-                {

-                        if (source == null || keySelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, null, true, null);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> OrderByDescending<T, K> (

-                        IEnumerable<T> source,

-                        Func<T, K> keySelector,

-                        IComparer<K> comparer)

-                {

-                        if (source == null || keySelector == null || comparer == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, comparer, true, null);

-                }

-                

-                #endregion

-                

-                #region ThenBy

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> ThenBy<T, K> (

-                        OrderedSequence<T> source,

-                        Func<T, K> keySelector)

-                where

-                        K : IComparable<K>

-                {

-                        if (source == null || keySelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, null, false, source);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> ThenBy<T, K> (

-                        OrderedSequence<T> source,

-                        Func<T, K> keySelector,

-                        IComparer<K> comparer)

-                {

-                        if (source == null || keySelector == null || comparer == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, comparer, false, source);

-                }

-                

-                #endregion

-                

-                #region ThenByDescending

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> ThenByDescending<T, K> (

-                        OrderedSequence<T> source,

-                        Func<T, K> keySelector)

-                where

-                        K : IComparable<K>

-                {

-                        if (source == null || keySelector == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, null, true, source);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static OrderedSequence<T> ThenByDescending<T, K> (

-                        OrderedSequence<T> source,

-                        Func<T, K> keySelector,

-                        IComparer<K> comparer)

-                {

-                        if (source == null || keySelector == null || comparer == null)

-                                throw new ArgumentNullException ();

-                        

-                        return new InternalOrderedSequence<T, K> (

-                                source, keySelector, comparer, true, source);

-                }

-                

-                #endregion

-                

-                #region Reverse

-

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Reverse<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        List<T> list = new List<T> (source);

-                        list.Reverse ();

-                        return list;

-                }

-                

-                #endregion

-
-                #region Take

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Take<T> (

-                        IEnumerable<T> source,

-                        int count)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        if (count <= 0)

-                                yield break;

-                        else {

-                                int counter = 0;

-                                foreach (T element in source) {

-                                        yield return element;

-                                        counter++;

-                                        if (counter == count)

-                                                yield break;

-                                }

-                        }

-                }

-                

-                #endregion

-                

-                #region Skip

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Skip<T> (

-                        IEnumerable<T> source,

-                        int count)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        bool yield = false;

-                        if (count <= 0)

-                                yield = true;

-

-                        foreach (T element in source) {

-                                if (yield)

-                                        yield return element;

-                                else {

-                                        counter++;

-                                        if (counter == count)

-                                                yield = true;

-                                }

-                        }

-                }

-                

-                #endregion

-                

-                #region TakeWhile

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> TakeWhile<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source) {

-                                if (predicate (element))

-                                        yield return element;

-                                else

-                                        yield break;

-                        }

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> TakeWhile<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source)

-                        {

-                                if (predicate (element, counter))

-                                        yield return element;

-                                else

-                                        yield break;

-                                counter++;

-                        }

-                }

-                

-                #endregion

-                

-                #region SkipWhile

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> SkipWhile<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        
-                        bool yield = false;

-                        
-                        foreach (T element in source) {
-                                if (yield)

-                                        yield return element;

-                                else

-                                        if (!predicate (element)) {
-                                                yield return element;

-                                                yield = true;
-                                        }

-                        }

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> SkipWhile<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException();

-                        

-                        int counter = 0;

-                        bool yield = false;

-                        

-                        foreach (T element in source) {
-                                if (yield)

-                                        yield return element;

-                                else

-                                        if (!predicate (element, counter)) {
-                                                yield return element;

-                                                yield = true;
-                                        }

-                                counter++;

-                        }

-                }

-                

-                #endregion

-
-                #region Select

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<S> Select<T, S> (

-                        IEnumerable<T> source,

-                        Func<T, S> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                yield return selector (element);

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<S> Select<T, S> (

-                        IEnumerable<T> source,

-                        Func<T, int, S> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source) {

-                                yield return selector (element, counter);

-                                counter++;

-                        }

-                }

-                

-                #endregion

-                

-                #region SelectMany

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<S> SelectMany<T, S> (

-                        IEnumerable<T> source,

-                        Func<T, IEnumerable<S>> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                foreach (S item in selector (element))

-                                        yield return item;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<S> SelectMany<T, S> (

-                        IEnumerable<T> source,

-                        Func<T, int, IEnumerable<S>> selector)

-                {

-                        if (source == null || selector == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source) {

-                                foreach (S item in selector (element, counter))

-                                        yield return item;

-                                counter++;

-                        }

-                }

-                

-                #endregion

-
-                #region Any

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool Any<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                return true;

-                        return false;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool Any<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                if (predicate(element))

-                                        return true;

-                        return false;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool Any<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (predicate(element, counter))

-                                        return true;

-                                counter++;

-                        }

-                        return false;

-                }

-                

-                #endregion

-                

-                #region All

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool All<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                if (!predicate(element))

-                                        return false;

-                        return true;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool All<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (!predicate(element, counter))

-                                        return false;

-                                counter++;

-                        }

-                        return true;

-                }

-                

-                #endregion

-
-                #region Where

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Where<T> (

-                        IEnumerable<T> source,

-                        Func<T, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-                        

-                        foreach (T element in source)

-                                if (predicate (element))

-                                        yield return element;

-                }

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Where<T> (

-                        IEnumerable<T> source,

-                        Func<T, int, bool> predicate)

-                {

-                        if (source == null || predicate == null)

-                                throw new ArgumentNullException ();

-

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (predicate (element, counter))

-                                        yield return element;

-                                counter++;

-                        }

-                }

-                

-                #endregion

-
-                #region Distinct

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Distinct<T> (

-                        IEnumerable<T> source)

-                {

-                        if (source == null)

-                                throw new ArgumentNullException ();

-                        

-                        List<T> items = new List<T> ();

-                        foreach (T element in source) {

-                                if (IndexOf (items, element) == -1) {

-                                        items.Add (element);

-                                        yield return element;

-                                }

-                        }

-                }

-                

-                #endregion

-                

-                #region Union

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Union<T> (

-                        IEnumerable<T> first,

-                        IEnumerable<T> second)

-                {

-                        if (first == null || second == null)

-                                throw new ArgumentNullException ();

-                        

-                        List<T> items = new List<T> ();

-                        foreach (T element in first)  {

-                                if (IndexOf (items, element) == -1) {

-                                        items.Add (element);

-                                        yield return element;

-                                }

-                        }

-                        foreach (T element in second)  {

-                                if (IndexOf (items, element) == -1) {

-                                        items.Add (element);

-                                        yield return element;

-                                }

-                        }

-                }

-                

-                #endregion

-                

-                #region Intersect

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Intersect<T> (

-                        IEnumerable<T> first,

-                        IEnumerable<T> second)

-                {

-                        if (first == null || second == null)

-                                throw new ArgumentNullException ();

-

-                        List<T> items = new List<T> (Distinct (first));

-                        bool[] marked = new bool [items.Count];

-                        for (int i = 0; i < marked.Length; i++)

-                                marked[i] = false;

-                        

-                        foreach (T element in second) {

-                                int index = IndexOf (items, element);

-                                if (index != -1)

-                                        marked [index] = true;

-                        }

-                        for (int i = 0; i < marked.Length; i++) {

-                                if (marked [i])

-                                        yield return items [i];

-                        }

-                }

-                

-                #endregion

-                

-                #region Except

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static IEnumerable<T> Except<T> (

-                        IEnumerable<T> first,

-                        IEnumerable<T> second)

-                {

-                        if (first == null || second == null)

-                                throw new ArgumentNullException ();

-

-                        List<T> items = new List<T> (Distinct (first));

-                        foreach (T element in second) {

-                                int index = IndexOf (items, element);

-                                if (index == -1)

-                                        items.Add (element);

-                                else

-                                        items.RemoveAt (index);

-                        }

-                        foreach (T item in items)

-                                yield return item;

-                }

-                

-                #endregion

-
-                // This methods are not included in the

-                // .NET Standard Query Operators Specification,

-                // but they provide additional useful commands

-                

-                #region Compare

-                

-                [System.Runtime.CompilerServices.Extension]

-                private static bool Equals<T> (

-                        T first, T second)

-                {

-                        // Mostly, values in Enumerable<T> 

-                        // sequences need to be compared using

-                        // Equals and GetHashCode

-                        

-                        if (first == null || second == null)

-                                return (first == null && second == null);

-                        else

-                                return ((first.Equals (second) ||

-                                         first.GetHashCode () == second.GetHashCode ()));

-                }

-                

-                #endregion

-                

-                #region Contains

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static bool Contains<T> (

-                        IEnumerable<T> source,

-                        T value)

-                {

-                        if (source is ICollection<T>) {

-                                ICollection<T> collection = (ICollection<T>)source;

-                                return collection.Contains(value);

-                        }

-                        else {

-                                foreach (T element in source)

-                                        if (Equals(element, value))

-                                                return true;

-                                return false;

-                        }

-                }

-                

-                #endregion

-

-                #region IndexOf

-                

-                [System.Runtime.CompilerServices.Extension]

-                public static int IndexOf<T>(

-                        IEnumerable<T> source,

-                        T item)

-                {

-                        int counter = 0;

-                        foreach (T element in source) {

-                                if (Equals(element, item))

-                                        return counter;

-                                counter++;

-                        }

-                        // The item was not found

-                        return -1;

-                }

-                

-                #endregion

-        }

-}

diff --git a/mcs/class/System.Query/System.Runtime.CompilerServices/ExtensionAttribute.cs b/mcs/class/System.Query/System.Runtime.CompilerServices/ExtensionAttribute.cs
deleted file mode 100644
index 696c82bf984..00000000000
--- a/mcs/class/System.Query/System.Runtime.CompilerServices/ExtensionAttribute.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-//

-// Authors:

-//        Alejandro Serrano "Serras" (trupill@yahoo.es)

-//

-

-using System;

-

-namespace System.Runtime.CompilerServices

-{

-        [AttributeUsage (AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]

-        public class ExtensionAttribute : Attribute

-        {

-                public ExtensionAttribute ()

-                {

-                }

-        }

-}

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
index 8cc9a39b14f..05bed853114 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
@@ -102,13 +102,8 @@ namespace System.Runtime.Remoting.Channels
 			RemotingSurrogateSelector surrogateSelector = new RemotingSurrogateSelector ();
 			StreamingContext context = new StreamingContext (StreamingContextStates.Remoting, null);
 
-#if !TARGET_JVM
 			_serializationFormatter = new BinaryFormatter (surrogateSelector, context);
 			_deserializationFormatter = new BinaryFormatter (null, context);
-#else
-			_serializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (surrogateSelector, context, false);
-			_deserializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (null, context, false);
-#endif
 			
 #if NET_1_1
 			_serializationFormatter.FilterLevel = _filterLevel;
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
index 58b034dcbc3..3139cc9779e 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
@@ -1,6 +1,3 @@
-2006-01-26  Svetlana Zholkovsky  <svetlanaz@mainsoft.com>
-    * BinaryCore.cs: TARGET_JVM related changes
-
 2005-12-05  Robert Jordan  <robertj@gmx.net>
 
 	* BinaryServerFormatterSink.cs, SoapServerFormatterSink.cs:
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
index ed1b9cd3611..29afd243029 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
@@ -1,10 +1,3 @@
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XmlDsigEnvelopedSignatureTransform.cs :
-	  It should not remove nodes in another XmlNodeList while its
-	  iterator is in active use. This is exposed by the recent
-	  XmlNodeList change.
-
 2005-09-27  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* KeyInfoX509Data.cs: Remove old 2.0 specific check.
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog b/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
index e1abfbf8f96..50c806576b2 100644
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-13  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* ServiceInstaller.cs: Stubs for 2.0 stuff
-
 2005-11-14  Marek Safar  <marek.safar@seznam.cz>
 
 	* ServiceController.cs: Simple stub only.
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
index 8893836cd9c..6d90b7e39ca 100644
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceInstaller.cs
@@ -39,24 +39,12 @@ namespace System.ServiceProcess
 	public class ServiceInstaller : System.Configuration.Install.ComponentInstaller
 	{
 		public ServiceInstaller () {}
-		
+
 		private string display_name;
 		private string service_name;
 		private string[] services_depended_on;
 		private ServiceStartMode start_type;
 
-#if NET_2_0
-		private string description;
-		public string Description {
-			get {
-				return description;
-			}
-			set {
-				description = value;
-			}
-		}
-#endif
-
 		public string DisplayName {
 			get {
 				return display_name;
diff --git a/mcs/class/System.Web.Services/ChangeLog b/mcs/class/System.Web.Services/ChangeLog
index 67647d8add1..19cdd1c20f7 100644
--- a/mcs/class/System.Web.Services/ChangeLog
+++ b/mcs/class/System.Web.Services/ChangeLog
@@ -1,13 +1,3 @@
-2006-02-04  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* System.Web.Services_test.dll.sources: Added 
-	ServiceDescriptorReflectorTest.cs.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile (LIB_MCS_FLAGS): if we're building net_2_0, define
-	CONFIGURATION_2_0 to use the new System.Configuration api.
-
 2006-01-05  Chris Toshok  <toshok@ximian.com>
 
 	* System.Web.Services_test.dll.sources: enable a bunch of the 2.0
diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 8b3d63fc879..ba7c2eebb83 100644
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -12,7 +12,7 @@ LIB_MCS_FLAGS = \
 	-r:System.Web.dll
 
 ifeq (net_2_0, $(PROFILE))
-LIB_MCS_FLAGS += -r:System.Configuration.dll -d:CONFIGURATION_2_0
+LIB_MCS_FLAGS += -r:System.Configuration.dll
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
index da1c643b568..a7319ff6617 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
@@ -1,15 +1,3 @@
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* SoapEnvelopeProcessingElement.cs: fix dumper output.
-
-	* SoapExtensionTypeElement.cs: same.
-
-	* ProtocolElement.cs: same.
-
-	* WsiProfilesElement.cs: same.
-
-	* WebServicesSection.cs: same.
-
 2006-01-06  Raja R Harinath  <rharinath@novell.com>
 
 	* TypeElement.cs (TypeElement) [string variant]: Use Type.GetType.
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs
index b000f73afeb..f54ba6ecce4 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ProtocolElement.cs
@@ -42,8 +42,7 @@ namespace System.Web.Services.Configuration {
 
 		static ProtocolElement ()
 		{
-			nameProp = new ConfigurationProperty ("name", typeof (WebServiceProtocols), WebServiceProtocols.Unknown,
-							      new GenericEnumConverter (typeof (WebServiceProtocols)), null, ConfigurationPropertyOptions.IsKey);
+			nameProp = new ConfigurationProperty ("name", typeof (WebServiceProtocols), WebServiceProtocols.Unknown, ConfigurationPropertyOptions.IsKey);
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (nameProp);
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs
index af5f6dd2206..e7338806585 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapEnvelopeProcessingElement.cs
@@ -45,9 +45,7 @@ namespace System.Web.Services.Configuration {
 		static SoapEnvelopeProcessingElement ()
 		{
 			strictProp = new ConfigurationProperty ("strict", typeof (bool), false);
-			readTimeoutProp = new ConfigurationProperty ("readTimeout", typeof (int), Int32.MaxValue,
-								     new InfiniteIntConverter(), null,
-								     ConfigurationPropertyOptions.None);
+			readTimeoutProp = new ConfigurationProperty ("readTimeout", typeof (int), Int32.MaxValue);
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (strictProp);
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs
index ba42331b95f..61355e625f4 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/SoapExtensionTypeElement.cs
@@ -46,11 +46,8 @@ namespace System.Web.Services.Configuration {
 		static SoapExtensionTypeElement ()
 		{
 			groupProp = new ConfigurationProperty ("group", typeof (PriorityGroup), PriorityGroup.Low, ConfigurationPropertyOptions.IsKey);
-			priorityProp = new ConfigurationProperty ("priority", typeof (int), 0,
-								  new Int32Converter(), new IntegerValidator (0, Int32.MaxValue),
-								  ConfigurationPropertyOptions.IsKey);
-			typeProp = new ConfigurationProperty ("type", typeof (Type), null,
-							      null, null, ConfigurationPropertyOptions.IsKey);
+			priorityProp = new ConfigurationProperty ("priority", typeof (int), 0, ConfigurationPropertyOptions.IsKey);
+			typeProp = new ConfigurationProperty ("type", typeof (Type), null, ConfigurationPropertyOptions.IsKey);
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (groupProp);
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs
index 964917f084c..2aa44f73ac8 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesSection.cs
@@ -39,7 +39,6 @@ namespace System.Web.Services.Configuration
         public sealed class WebServicesSection : ConfigurationSection
         {
                 static ConfigurationProperty conformanceWarningsProp;
-		static ConfigurationProperty diagnosticsProp;
                 static ConfigurationProperty protocolsProp;
                 static ConfigurationProperty serviceDescriptionFormatExtensionTypesProp;
                 static ConfigurationProperty soapEnvelopeProcessingProp;
@@ -53,32 +52,19 @@ namespace System.Web.Services.Configuration
 
                 static WebServicesSection ()
                 {
-			conformanceWarningsProp = new ConfigurationProperty ("conformanceWarnings", typeof (WsiProfilesElementCollection), null,
-									     null, null, ConfigurationPropertyOptions.None);
-			diagnosticsProp = new ConfigurationProperty ("diagnostics", typeof (DiagnosticsElement), null,
-								     null, null, ConfigurationPropertyOptions.None);
-                        protocolsProp = new ConfigurationProperty ("protocols", typeof (ProtocolElementCollection), null,
-								   null, null, ConfigurationPropertyOptions.None);
-			serviceDescriptionFormatExtensionTypesProp = new ConfigurationProperty ("serviceDescriptionFormatExtensionTypes", typeof (TypeElementCollection), null,
-												null, null, ConfigurationPropertyOptions.None);
-			soapEnvelopeProcessingProp = new ConfigurationProperty ("soapEnvelopeProcessing", typeof (SoapEnvelopeProcessingElement), null,
-										null, null, ConfigurationPropertyOptions.None);
-			soapExtensionImporterTypesProp = new ConfigurationProperty ("soapExtensionImporterTypes", typeof (TypeElementCollection), null,
-										    null, null, ConfigurationPropertyOptions.None);
-			soapExtensionReflectorTypesProp = new ConfigurationProperty ("soapExtensionReflectorTypes", typeof (TypeElementCollection), null,
-										     null, null, ConfigurationPropertyOptions.None);
-			soapExtensionTypesProp = new ConfigurationProperty ("soapExtensionTypes", typeof (SoapExtensionTypeElementCollection), null,
-									    null, null, ConfigurationPropertyOptions.None);
-			soapServerProtocolFactoryProp = new ConfigurationProperty ("soapServerProtocolFactory", typeof (TypeElement), null,
-										   null, null, ConfigurationPropertyOptions.None);
-			soapTransportImporterTypesProp = new ConfigurationProperty ("soapTransportImporterTypes", typeof (TypeElementCollection), null,
-										    null, null, ConfigurationPropertyOptions.None);
-			wsdlHelpGeneratorProp = new ConfigurationProperty ("wsdlHelpGenerator", typeof (WsdlHelpGeneratorElement), null,
-									   null, null, ConfigurationPropertyOptions.None);
+			conformanceWarningsProp = new ConfigurationProperty ("conformanceWarnings", typeof (WsiProfilesElementCollection));
+                        protocolsProp = new ConfigurationProperty ("protocols", typeof (ProtocolElementCollection));
+			serviceDescriptionFormatExtensionTypesProp = new ConfigurationProperty ("serviceDescriptionFormatExtensionTypes", typeof (TypeElementCollection));
+			soapEnvelopeProcessingProp = new ConfigurationProperty ("soapEnvelopeProcessing", typeof (SoapEnvelopeProcessingElement));
+			soapExtensionImporterTypesProp = new ConfigurationProperty ("soapExtensionImporterTypes", typeof (TypeElementCollection));
+			soapExtensionReflectorTypesProp = new ConfigurationProperty ("soapExtensionReflectorTypes", typeof (TypeElementCollection));
+			soapExtensionTypesProp = new ConfigurationProperty ("soapExtensionTypes", typeof (SoapExtensionTypeElementCollection));
+			soapServerProtocolFactoryProp = new ConfigurationProperty ("soapServerProtocolFactory", typeof (TypeElement));
+			soapTransportImporterTypesProp = new ConfigurationProperty ("soapTransportImporterTypes", typeof (TypeElementCollection));
+			wsdlHelpGeneratorProp = new ConfigurationProperty ("wsdlHelpGenerator", typeof (WsdlHelpGeneratorElement));
                         properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (conformanceWarningsProp);
-			properties.Add (diagnosticsProp);
                         properties.Add (protocolsProp);
 			properties.Add (serviceDescriptionFormatExtensionTypesProp);
 			properties.Add (soapEnvelopeProcessingProp);
@@ -115,9 +101,10 @@ namespace System.Web.Services.Configuration
                         get { throw new NotImplementedException (); }
                 }
 
+		[MonoTODO ("why doesn't this have a ConfigurationPropertyAttribute?")]
                 public DiagnosticsElement Diagnostics {
-                        get { return (DiagnosticsElement) base [diagnosticsProp]; }
-                        set { base[diagnosticsProp] = value; }
+                        get { throw new NotImplementedException (); }
+                        set { throw new NotImplementedException (); }
                 }
 
 		[MonoTODO]
@@ -189,7 +176,7 @@ namespace System.Web.Services.Configuration
 
 		internal static bool IsSupported (WebServiceProtocols proto)
 		{
-			return ((Instance.EnabledProtocols & proto) == proto && (proto != WebServiceProtocols.Unknown));
+			return ((Instance.EnabledProtocols & proto) == proto && (proto != 0));
 		}
         }
 
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs
index 383bfff22b8..193ccc44205 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/WsiProfilesElement.cs
@@ -43,10 +43,7 @@ namespace System.Web.Services.Configuration {
 
 		static WsiProfilesElement ()
 		{
-			nameProp = new ConfigurationProperty ("name", typeof (WsiProfiles), WsiProfiles.None,
-							      new GenericEnumConverter (typeof (WsiProfiles)),
-							      null,
-							      ConfigurationPropertyOptions.IsKey);
+			nameProp = new ConfigurationProperty ("name", typeof (WsiProfiles), WsiProfiles.None, ConfigurationPropertyOptions.IsKey);
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (nameProp);
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
index 8bbfdefa2e3..aea99df8b89 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* WebClientProtocol.cs: Add a 2.0 stub
-
 2006-01-04  Chris Toshok  <toshok@ximian.com>
 
 	* SoapDocumentationHandler.cs: add CONFIGURATION_2_0 stuff.
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs
index 4c3f70a16e9..a56615b44dd 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs
@@ -138,13 +138,6 @@ namespace System.Web.Services.Protocols {
 				uri = new Uri (url);

 			}

 		}

-#if NET_2_0

-		[MonoTODO]

-		public bool UseDefaultCredentials {

-			get { throw new NotImplementedException (); }

-			set { throw new NotImplementedException (); }

-		}

-#endif

 

 		#endregion // Properties

 

diff --git a/mcs/class/System.Web.Services/System.Web.Services_test.dll.sources b/mcs/class/System.Web.Services/System.Web.Services_test.dll.sources
index 45ba192bdf3..3c243955ac7 100644
--- a/mcs/class/System.Web.Services/System.Web.Services_test.dll.sources
+++ b/mcs/class/System.Web.Services/System.Web.Services_test.dll.sources
@@ -20,6 +20,5 @@ System.Web.Services.Description/PortTypeTest.cs
 System.Web.Services.Description/ServiceCollectionTest.cs
 System.Web.Services.Description/ServiceDescriptionTest.cs
 System.Web.Services.Description/ServiceDescriptionCollectionTest.cs
-System.Web.Services.Description/ServiceDescriptionReflectorTest.cs
 System.Web.Services.Description/SoapBodyBindingTest.cs
 System.Web.Services.Description/SoapOperationBindingTest.cs
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog
index 2462dff8fa1..fc2b58a80e4 100644
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-13  Raja R Harinath  <rharinath@novell.com>
-
-	* TypeElementTest.cs (Ctors1): Don't expect a null-reference
-	exception.
-
 2003-05-13  Martin Willemoes Hansen <mwh@sysrq.dk>
 	* XmlFormatExtensionAttributeTest.cs: Inherits from Assertion and
       	  Assertion. prefixes removed.
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
index 92294f4218d..718b48d99a7 100644
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
@@ -30,7 +30,6 @@
 #if NET_2_0
 
 using System;
-using System.Configuration;
 using System.Web.Services.Configuration;
 using NUnit.Framework;
 
@@ -72,22 +71,6 @@ namespace MonoTests.System.Web.Services {
 			el.Type = typeof (string);
 			Assert.AreEqual (typeof (string), el.Type, "A3");
 		}
-
-		[Test]
-		[ExpectedException (typeof (ConfigurationErrorsException))]
-		public void PriorityValidator1 ()
-		{
-			SoapExtensionTypeElement el = new SoapExtensionTypeElement ();
-			el.Priority = -1;
-		}
-
-		[Test]
-		public void PriorityValidator2 ()
-		{
-			SoapExtensionTypeElement el = new SoapExtensionTypeElement ();
-			el.Priority = 0;
-			el.Priority = Int32.MaxValue;
-		}
 	}
 }
 
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/TypeElementTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/TypeElementTest.cs
index 78b4d692c11..46722240634 100644
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/TypeElementTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/TypeElementTest.cs
@@ -33,21 +33,15 @@ using System;
 using System.Web.Services.Configuration;
 using NUnit.Framework;
 
-namespace MonoTests.System.Web.Services.Configuration {
+namespace MonoTests.System.Web.Services {
 	[TestFixture]
 	public class TypeElementTest
 	{
 		[Test]
-		public void Ctors1 ()
+		public void Ctors ()
 		{
 			TypeElement el = new TypeElement ();
 			Assert.IsNull (el.Type, "A1");
-		}
-
-		[Test]
-		public void Ctors2 ()
-		{
-			TypeElement el;
 
 			el = new TypeElement (typeof (string));
 			Assert.AreEqual (typeof (string), el.Type, "A2");
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ChangeLog
index 7e023339b83..7b0ccf2d3f5 100644
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ChangeLog
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ChangeLog
@@ -1,13 +1,3 @@
-2006-02-04  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* ServiceDescriptionReflectorTest.cs: Use only one include as otherwise
-	the order of elements is not consistent on MS.NET.
-
-2006-02-04  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* ServiceDescriptionReflectorTest.cs: New test, currently marked
-	NotWorking.
-
 2005-10-05  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* ServiceDescriptionTest.cs : new file (for part of bug #76311).
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs
deleted file mode 100644
index 93438a15715..00000000000
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// ServiceDescriptionReflectorTest.cs
-//
-// Author:
-//	Gert Driesen  <drieseng@users.sourceforge.net>
-//
-// Copyright (C) 2006 Novell, Inc.
-//
-
-using NUnit.Framework;
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Web.Services;
-using System.Web.Services.Description;
-using System.Xml.Serialization;
-
-namespace MonoTests.System.Web.Services.Description
-{
-	[TestFixture]
-	public class ServiceDescriptionReflectorTest
-	{
-		[Test]
-		[Category ("NotWorking")]
-		public void IncludeTest ()
-		{
-			ServiceDescriptionReflector reflector = new ServiceDescriptionReflector ();
-			reflector.Reflect (typeof (IncludeTestServices), "http://localhost/IncludeTestServices.asmx");
-
-			Assert.AreEqual (0, reflector.Schemas.Count, "#1");
-			Assert.AreEqual (1, reflector.ServiceDescriptions.Count, "#2");
-
-			ServiceDescription sd = reflector.ServiceDescriptions[0];
-
-			Assert.IsNull (sd.Name, "#3");
-			Assert.AreEqual (1, sd.Types.Schemas.Count, "#4");
-
-			StringWriter sw = new StringWriter ();
-			sd.Write (sw);
-
-			Assert.AreEqual (string.Format(CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<wsdl:definitions xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xmlns:tm=\"http://microsoft.com/wsdl/mime/textMatching/\""  +
-				" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\"" +
-				" xmlns:tns=\"http://tempuri.org/\" xmlns:s=\"http://www.w3.org/2001/XMLSchema\"" +
-				" xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\"" +
-				" xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" targetNamespace=\"http://tempuri.org/\"" +
-				" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\">{0}" +
-#else
-				"<wsdl:definitions xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\" xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"" +
-				" xmlns:s=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"" +
-				" xmlns:tns=\"http://tempuri.org/\" xmlns:tm=\"http://microsoft.com/wsdl/mime/textMatching/\"" +
-				" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\" targetNamespace=\"http://tempuri.org/\"" +
-				" xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\">{0}" +
-#endif
-				"  <wsdl:types>{0}" +
-				"    <s:schema elementFormDefault=\"qualified\" targetNamespace=\"http://tempuri.org/\">{0}" +
-				"      <s:element name=\"EchoString\">{0}" +
-				"        <s:complexType>{0}" +
-				"          <s:sequence>{0}" +
-				"            <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"strval\" type=\"s:string\" />{0}" +
-				"          </s:sequence>{0}" +
-				"        </s:complexType>{0}" +
-				"      </s:element>{0}" +
-				"      <s:element name=\"EchoStringResponse\">{0}" +
-				"        <s:complexType>{0}" +
-				"          <s:sequence>{0}" +
-				"            <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"MyTime\" type=\"s:time\" />{0}" +
-				"          </s:sequence>{0}" +
-				"        </s:complexType>{0}" +
-				"      </s:element>{0}" +
-				"      <s:element name=\"Vehicle\">{0}" +
-				"        <s:complexType>{0}" +
-				"          <s:sequence>{0}" +
-				"            <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"licenseNumber\" type=\"s:string\" />{0}" +
-				"          </s:sequence>{0}" +
-				"        </s:complexType>{0}" +
-				"      </s:element>{0}" +
-				"      <s:element name=\"VehicleResponse\">{0}" +
-				"        <s:complexType>{0}" +
-				"          <s:sequence>{0}" +
-				"            <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"NewVehicle\" nillable=\"true\" type=\"tns:Vehicle\" />{0}" +
-				"          </s:sequence>{0}" +
-				"        </s:complexType>{0}" +
-				"      </s:element>{0}" +
-				"      <s:complexType name=\"Vehicle\" abstract=\"true\">{0}" +
-				"        <s:sequence>{0}" +
-				"          <s:element minOccurs=\"0\" maxOccurs=\"1\" name=\"licenseNumber\" type=\"s:string\" />{0}" +
-				"          <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"make\" type=\"s:dateTime\" />{0}" +
-				"          <s:element minOccurs=\"1\" maxOccurs=\"1\" name=\"age\" type=\"tns:TimeSpan\" />{0}" +
-				"        </s:sequence>{0}" +
-				"      </s:complexType>{0}" +
-				"      <s:complexType name=\"TimeSpan\" />{0}" +
-				"      <s:complexType name=\"Car\">{0}" +
-				"        <s:complexContent mixed=\"false\">{0}" +
-				"          <s:extension base=\"tns:Vehicle\" />{0}" +
-				"        </s:complexContent>{0}" +
-				"      </s:complexType>{0}" +
-				"    </s:schema>{0}" +
-				"  </wsdl:types>{0}" +
-				"  <wsdl:message name=\"EchoStringSoapIn\">{0}" +
-				"    <wsdl:part name=\"parameters\" element=\"tns:EchoString\" />{0}" +
-				"  </wsdl:message>{0}" +
-				"  <wsdl:message name=\"EchoStringSoapOut\">{0}" +
-				"    <wsdl:part name=\"parameters\" element=\"tns:EchoStringResponse\" />{0}" +
-				"  </wsdl:message>{0}" +
-				"  <wsdl:message name=\"VehicleSoapIn\">{0}" +
-				"    <wsdl:part name=\"parameters\" element=\"tns:Vehicle\" />{0}" +
-				"  </wsdl:message>{0}" +
-				"  <wsdl:message name=\"VehicleSoapOut\">{0}" +
-				"    <wsdl:part name=\"parameters\" element=\"tns:VehicleResponse\" />{0}" +
-				"  </wsdl:message>{0}" +
-				"  <wsdl:portType name=\"IncludeTestServicesSoap\">{0}" +
-				"    <wsdl:operation name=\"EchoString\">{0}" +
-				"      <wsdl:input message=\"tns:EchoStringSoapIn\" />{0}" +
-				"      <wsdl:output message=\"tns:EchoStringSoapOut\" />{0}" +
-				"    </wsdl:operation>{0}" +
-				"    <wsdl:operation name=\"Vehicle\">{0}" +
-				"      <wsdl:input message=\"tns:VehicleSoapIn\" />{0}" +
-				"      <wsdl:output message=\"tns:VehicleSoapOut\" />{0}" +
-				"    </wsdl:operation>{0}" +
-				"  </wsdl:portType>{0}" +
-				"  <wsdl:binding name=\"IncludeTestServicesSoap\" type=\"tns:IncludeTestServicesSoap\">{0}" +
-#if NET_2_0
-				"    <soap:binding transport=\"http://schemas.xmlsoap.org/soap/http\" />{0}" +
-#else
-				"    <soap:binding transport=\"http://schemas.xmlsoap.org/soap/http\" style=\"document\" />{0}" +
-#endif
-				"    <wsdl:operation name=\"EchoString\">{0}" +
-				"      <soap:operation soapAction=\"http://tempuri.org/EchoString\" style=\"document\" />{0}" +
-				"      <wsdl:input>{0}" +
-				"        <soap:body use=\"literal\" />{0}" +
-				"      </wsdl:input>{0}" +
-				"      <wsdl:output>{0}" +
-				"        <soap:body use=\"literal\" />{0}" +
-				"      </wsdl:output>{0}" +
-				"    </wsdl:operation>{0}" +
-				"    <wsdl:operation name=\"Vehicle\">{0}" +
-				"      <soap:operation soapAction=\"http://tempuri.org/Vehicle\" style=\"document\" />{0}" +
-				"      <wsdl:input>{0}" +
-				"        <soap:body use=\"literal\" />{0}" +
-				"      </wsdl:input>{0}" +
-				"      <wsdl:output>{0}" +
-				"        <soap:body use=\"literal\" />{0}" +
-				"      </wsdl:output>{0}" +
-				"    </wsdl:operation>{0}" +
-				"  </wsdl:binding>{0}" +
-#if NET_2_0
-				"  <wsdl:binding name=\"IncludeTestServicesSoap12\" type=\"tns:IncludeTestServicesSoap\">{0}" +
-				"    <soap12:binding transport=\"http://schemas.xmlsoap.org/soap/http\" />{0}" +
-				"    <wsdl:operation name=\"EchoString\">{0}" +
-				"      <soap12:operation soapAction=\"http://tempuri.org/EchoString\" style=\"document\" />{0}" +
-				"      <wsdl:input>{0}" +
-				"        <soap12:body use=\"literal\" />{0}" +
-				"      </wsdl:input>{0}" +
-				"      <wsdl:output>{0}" +
-				"        <soap12:body use=\"literal\" />{0}" +
-				"      </wsdl:output>{0}" +
-				"    </wsdl:operation>{0}" +
-				"    <wsdl:operation name=\"Vehicle\">{0}" +
-				"      <soap12:operation soapAction=\"http://tempuri.org/Vehicle\" style=\"document\" />{0}" +
-				"      <wsdl:input>{0}" +
-				"        <soap12:body use=\"literal\" />{0}" +
-				"      </wsdl:input>{0}" +
-				"      <wsdl:output>{0}" +
-				"        <soap12:body use=\"literal\" />{0}" +
-				"      </wsdl:output>{0}" +
-				"    </wsdl:operation>{0}" +
-				"  </wsdl:binding>{0}" +
-#endif
-				"  <wsdl:service name=\"IncludeTestServices\">{0}" +
-#if ONLY_1_1
-				"    <documentation xmlns=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-#endif
-				"    <wsdl:port name=\"IncludeTestServicesSoap\" binding=\"tns:IncludeTestServicesSoap\">{0}" +
-				"      <soap:address location=\"http://localhost/IncludeTestServices.asmx\" />{0}" +
-				"    </wsdl:port>{0}" +
-#if NET_2_0
-				"    <wsdl:port name=\"IncludeTestServicesSoap12\" binding=\"tns:IncludeTestServicesSoap12\">{0}" +
-				"      <soap12:address location=\"http://localhost/IncludeTestServices.asmx\" />{0}" +
-				"    </wsdl:port>{0}" +
-#endif
-				"  </wsdl:service>{0}" +
-				"</wsdl:definitions>", Environment.NewLine), sw.ToString (), "#5");
-		}
-
-		public class IncludeTestServices : WebService
-		{
-			[WebMethod ()]
-			[return: XmlElement ("MyTime", DataType = "time")]
-			public DateTime EchoString ([XmlElement (DataType = "string")] string strval)
-			{
-				return DateTime.Now;
-			}
-
-			[WebMethod ()]
-			[XmlInclude (typeof (Car))]
-			public Vehicle Vehicle (string licenseNumber)
-			{
-				if (licenseNumber == "0") {
-					Vehicle v = new Car ();
-					v.licenseNumber = licenseNumber;
-					return v;
-				} else {
-					return null;
-				}
-			}
-		}
-		[XmlRoot ("NewVehicle")]
-		public abstract class Vehicle
-		{
-			public string licenseNumber;
-			public DateTime make;
-			public TimeSpan age;
-		}
-
-		public class Car : Vehicle
-		{
-		}
-	}
-}
diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index b53318952ed..dff52aa9a9b 100644
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,49 +1,3 @@
-2006-02-22  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* System.Web.dll.sources: Added System.Web.UI/ChtmlTextWriter.cs
-	* System.Web_test.dll.sources: Added System.Web.UI/ChtmlTextWriterTest.cs
-
-2006-02-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* System.Web.dll.sources: added new files.
-
-2006-02-12  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* System.Web.dll.sources: Added XhtmlTextWriter.
-	* System.Web_test.dll.sources: Added System.Web.UI/XhtmlTextWriterTest.cs.
-
-2006-02-12 Vladimir Krasnov <vladimirk@mainsoft.com>
-
-	* System.Web.vmwcsproj: grasshopper project file fix
-
-2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* System.Web.dll.sources: add new files.
-
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* System.Web.dll.sources: add IgnoreFileBuildProvider.cs and
-	IInternalConfigWebHost.cs
-
-2006-01-19  Raja R Harinath  <rharinath@novell.com>
-
-	* Makefile (LIBRARY_USE_INTERMEDIATE_FILE) [net_2_0]: Set, so as
-	to avoid sharing violations on Windows.
-
-2006-01-18  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile: Add build foo to handle the System.Web.dll <->
-	System.Web.Services.dll cyclic dependencies.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile (OTHER_LIB_MCS_FLAGS): if we're building net_2_0,
-	define CONFIGURATION_2_0 to use the new System.Configuration api.
-
-2006-01-08  Konstantin Triger <kostat@mainsoft.com>
-
-	* System.Web.vmwcsproj: fixing compilation.
-
 2005-11-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* System.Web_test.dll.sources: add new file.
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 1c9d151da31..7b6e0a1c991 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -2,22 +2,6 @@ thisdir = class/System.Web
 SUBDIRS = Test
 include ../../build/rules.make
 
-LIBRARY = System.Web.dll
-
-ifeq (net_2_0, $(PROFILE))
-
-LIBRARY_USE_INTERMEDIATE_FILE = yes
-
-# Because System.Web.dll and System.Web.Services.dll have a cyclic dependency, we need a two-pass build.
-# 1st pass - build System.Web.dll without System.Web.Services.dll reference
-# 2nd pass - build System.Web.dll with System.Web.Services.dll reference
-
-WEBSERVICES_DEP := System.Web.Services.dll
-WEBSERVICES_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(WEBSERVICES_DEP))
-CYCLIC_DEPS := $(WEBSERVICES_DEP)
-CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE)
-endif
-
 RESOURCE_FILES_1= \
 	resources/WebUIValidation.js
 
@@ -65,10 +49,11 @@ RESOURCE_FILES_2 = \
 OTHER_RES = $(RESOURCE_FILES_1)
 ifeq (net_2_0, $(PROFILE))
 OTHER_RES += $(RESOURCE_FILES_2)
-OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll
+OTHER_LIB_MCS_FLAGS = -r:System.Configuration.dll
 endif
 
 
+LIBRARY = System.Web.dll
 LIB_MCS_FLAGS = \
 	-unsafe \
 	-nowarn:612,649	\
@@ -81,25 +66,8 @@ LIB_MCS_FLAGS = \
 	$(OTHER_LIB_MCS_FLAGS) \
 	$(OTHER_RES:%=/resource:%)
 
-ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
-NO_SIGN_ASSEMBLY = yes
-NO_INSTALL = yes
-all-local: echo-warning
-.PHONY: echo-warning
-
-ifeq   (, $(strip $(CYCLIC_DEP_FILES)))
-echo-warning:
-	@echo "** Warning: System.Web.dll built without parts that depend on: $(CYCLIC_DEPS)"
-endif
-endif
-
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:219 -nowarn:169
 
 EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1)
 
 include ../../build/library.make
-
-ifdef WEBSERVICES_DEP_FILE
-LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
-$(the_lib): $(WEBSERVICES_DEP_FILE)
-endif
diff --git a/mcs/class/System.Web/System.Web.Administration/ChangeLog b/mcs/class/System.Web/System.Web.Administration/ChangeLog
new file mode 100644
index 00000000000..547cab8e3dc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Administration/ChangeLog
@@ -0,0 +1,3 @@
+2004-08-02  Duncan Mak  <duncan@ximian.com>
+
+	* WebAdminUserControl.cs (DatabaseType): Added.
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.Administration/WebAdminUserControl.cs b/mcs/class/System.Web/System.Web.Administration/WebAdminUserControl.cs
new file mode 100644
index 00000000000..90c828ed1f0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Administration/WebAdminUserControl.cs
@@ -0,0 +1,42 @@
+//
+// System.Web.Administration.WebAdminUserControl.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+#if NET_2_0
+using System.Web.UI;
+
+namespace System.Web.Administration
+{
+        public class WebAdminUserControl : UserControl {
+                public enum DatabaseType
+                {
+                        Access = 0,
+                        Sql = 1
+                }
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/AppSettingsExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Compilation/AppSettingsExpressionBuilder.cs
deleted file mode 100644
index e809f67107e..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/AppSettingsExpressionBuilder.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// System.Web.Compilation.AppSettingsExpressionBuilder
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.ComponentModel;
-using System.Configuration;
-using System.Web.Configuration;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	[ExpressionEditor("System.Web.UI.Design.AppSettingsExpressionEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	[ExpressionPrefix("AppSettings")]
-	public class AppSettingsExpressionBuilder : ExpressionBuilder {
-
-		public override object EvaluateExpression (object target, BoundPropertyEntry entry, object parsedData, ExpressionBuilderContext context)
-		{
-			return GetAppSetting (entry.Expression.Trim ());
-		}
-
-		public static object GetAppSetting (string key)
-		{
-			string value = WebConfigurationManager.AppSettings [key];
-
-			if (value == null)
-				throw new InvalidOperationException (String.Format ("App setting {0} not found", key));
-			return value;
-		}
-
-		public static object GetAppSetting (string key, Type targetType, string propertyName)
-		{
-			try {
-				TypeConverter converter = TypeDescriptor.GetConverter (targetType);
-				return converter.ConvertFrom (GetAppSetting (key));
-			}
-			catch (NotSupportedException e) {
-				throw new InvalidOperationException (String.Format ("Could not convert app setting {0} to type {1}", key, targetType));
-			}
-		}
-
-
-		public override CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData, ExpressionBuilderContext context)
-		{
-			Type type = entry.DeclaringType;
-			PropertyDescriptor descriptor = TypeDescriptor.GetProperties(type)[entry.PropertyInfo.Name];
-			CodeExpression[] expressionArray = new CodeExpression[3];
-			expressionArray[0] = new CodePrimitiveExpression(entry.Expression.Trim());
-			expressionArray[1] = new CodeTypeOfExpression(type);
-			expressionArray[2] = new CodePrimitiveExpression(entry.Name);
-			return new CodeCastExpression(descriptor.PropertyType, new CodeMethodInvokeExpression(new 
-								       CodeTypeReferenceExpression(base.GetType()), "GetAppSetting", expressionArray));
-		}
-
-		public override bool SupportsEvaluate {
-			get { return true; }
-		}
-	}
-
-}
-
-#endif
-
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs b/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
index c05c719fd66..9de26f6a8f2 100644
--- a/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
@@ -40,12 +40,8 @@ namespace System.Web.Compilation
 
 		public AspComponentFoundry ()
 		{
-#if NET_2_0
-			foundries = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			foundries = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
 						   CaseInsensitiveComparer.DefaultInvariant);
-#endif
 
 			Assembly sw = typeof (AspComponentFoundry).Assembly;
 			RegisterFoundry ("asp", sw, "System.Web.UI.WebControls");
@@ -154,12 +150,8 @@ namespace System.Web.Compilation
 			public CompoundFoundry (string tagPrefix)
 			{
 				this.tagPrefix = tagPrefix;
-#if NET_2_0
-				tagnames = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 				tagnames = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
-							  CaseInsensitiveComparer.DefaultInvariant);
-#endif
+							   CaseInsensitiveComparer.DefaultInvariant);
 			}
 
 			public void Add (Foundry foundry)
diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index 5c6496904d7..2b7ad190925 100644
--- a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -659,8 +659,8 @@ namespace System.Web.Compilation
 			if (String.Compare (lang, tparser.Language, true) == 0)
 				return;
 
-#if NET_2_0
-			CompilationSection section = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
+#if CONFIGURATION_2_0
+			CompilationSection section = (CompilationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/compilation");
 			if (section.Compilers[tparser.Language] != section.Compilers[lang])
 #else
 			CompilationConfiguration cfg = CompilationConfiguration.GetInstance (HttpContext.Current); 
diff --git a/mcs/class/System.Web/System.Web.Compilation/AssemblyBuilder.cs b/mcs/class/System.Web/System.Web.Compilation/AssemblyBuilder.cs
deleted file mode 100644
index f84376b767f..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/AssemblyBuilder.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// System.Web.Compilation.AssemblyBuilder
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Web.Configuration;
-using System.Web.Util;
-
-namespace System.Web.Compilation {
-
-	public class AssemblyBuilder {
-		static bool KeepFiles = (Environment.GetEnvironmentVariable ("MONO_ASPNET_NODELETE") != null);
-
-		CodeDomProvider provider;
-		List <CodeCompileUnit> units;
-		List <string> source_files;
-		Dictionary <string, string> resource_files;
-		TempFileCollection temp_files;
-		string virtual_path;
-		//TODO: there should be a Compile () method here which is where all the compilation exceptions are thrown from.
-		
-		internal AssemblyBuilder (string virtualPath, CodeDomProvider provider)
-		{
-			this.provider = provider;
-			this.virtual_path = virtualPath;
-			units = new List <CodeCompileUnit> ();
-			units.Add (new CodeCompileUnit ());
-			temp_files = new TempFileCollection ();
-			CompilationSection section;
-			section = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation", virtualPath);
-			string tempdir = section.TempDirectory;
-			if (tempdir == null || tempdir == "")
-				tempdir = AppDomain.CurrentDomain.SetupInformation.DynamicBase;
-				
-			temp_files = new TempFileCollection (tempdir, KeepFiles);
-		}
-
-		internal TempFileCollection TempFiles {
-			get { return temp_files; }
-		}
-
-		internal CodeCompileUnit [] GetUnitsAsArray ()
-		{
-			CodeCompileUnit [] result = new CodeCompileUnit [units.Count];
-			units.CopyTo (result, 0);
-			return result;
-		}
-
-		List <string> SourceFiles {
-			get {
-				if (source_files == null)
-					source_files = new List <string> ();
-				return source_files;
-			}
-		}
-
-		Dictionary <string, string> ResourceFiles {
-			get {
-				if (resource_files == null)
-					resource_files = new Dictionary <string, string> ();
-				return resource_files;
-			}
-		}
-
-		public void AddAssemblyReference (Assembly a)
-		{
-			if (a == null)
-				throw new ArgumentNullException ("a");
-
-			StringCollection coll = units [units.Count - 1].ReferencedAssemblies;
-			string location = a.Location;
-			if (coll.IndexOf (location) == -1)
-				coll.Add (location);
-		}
-
-		[MonoTODO ("Do something with the buildProvider argument")]
-		public void AddCodeCompileUnit (BuildProvider buildProvider, CodeCompileUnit compileUnit)
-		{
-			if (buildProvider == null)
-				throw new ArgumentNullException ("buildProvider");
-
-			if (compileUnit == null)
-				throw new ArgumentNullException ("compileUnit");
-
-			units.Add (compileUnit);
-		}
-
-		[MonoTODO ("Anything to do with the buildProvider argument?")]
-		public TextWriter CreateCodeFile (BuildProvider buildProvider)
-		{
-			if (buildProvider == null)
-				throw new ArgumentNullException ("buildProvider");
-
-			string filename = temp_files.AddExtension ("temp", true);
-			SourceFiles.Add (filename);
-			return new StreamWriter (File.OpenWrite (filename), WebEncoding.FileEncoding);
-		}
-
-		[MonoTODO ("Anything to do with the buildProvider argument?")]
-		public Stream CreateEmbeddedResource (BuildProvider buildProvider, string name)
-		{
-			if (buildProvider == null)
-				throw new ArgumentNullException ("buildProvider");
-
-			if (name == null || name == "")
-				throw new ArgumentNullException ("name");
-
-			string filename = temp_files.AddExtension ("resource", true);
-			Stream stream = File.OpenWrite (filename);
-			ResourceFiles [name] = filename;
-			return stream;
-		}
-
-		[MonoTODO]
-		public void GenerateTypeFactory (string typeName)
-		{
-			// Do nothing by now.
-		}
-
-		public string GetTempFilePhysicalPath (string extension)
-		{
-			if (extension == null)
-				throw new ArgumentNullException ("extension");
-
-			return temp_files.AddExtension (extension, true);
-		}
-
-		public CodeDomProvider CodeDomProvider {
-			get { return provider; }
-		}
-
-		internal CompilerResults BuildAssembly (string virtualPath, CompilerParameters options)
-		{
-			CompilerResults results;
-			CodeCompileUnit [] units = GetUnitsAsArray ();
-			results = provider.CompileAssemblyFromDom (options, units);
-			// FIXME: generate the code and display it
-			if (results.NativeCompilerReturnValue != 0)
-				throw new CompilationException (virtualPath, results.Errors, "");
-
-			Assembly assembly = results.CompiledAssembly;
-			if (assembly == null) {
-				if (!File.Exists (options.OutputAssembly)) {
-					results.TempFiles.Delete ();
-					throw new CompilationException (virtualPath, results.Errors,
-						"No assembly returned after compilation!?");
-				}
-
-				results.CompiledAssembly = Assembly.LoadFrom (options.OutputAssembly);
-			}
-
-			results.TempFiles.Delete ();
-			return results;
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs
index 6f67bcb42a7..82c3ab02ed0 100644
--- a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs
@@ -113,15 +113,6 @@ namespace System.Web.Compilation
 			CreateConstructor (null, null);
 		}
 
-#if NET_2_0
-		internal CodeDomProvider Provider {
-			get { return provider; }
-		}
-
-		internal CodeCompileUnit CompileUnit {
-			get { return unit; }
-		}
-#endif
 		protected virtual void CreateStaticFields ()
 		{
 			CodeMemberField fld = new CodeMemberField (typeof (bool), "__intialized");
@@ -176,7 +167,7 @@ namespace System.Web.Compilation
 			}
 		}
 		
-		protected internal virtual void CreateMethods ()
+		protected virtual void CreateMethods ()
 		{
 		}
 
@@ -324,7 +315,7 @@ namespace System.Web.Compilation
 		{
 			return AppDomain.CurrentDomain.SetupInformation.DynamicBase;
 		}
-
+		
 		public virtual Type GetCompiledType () 
 		{
 			Type type = CachingCompiler.GetTypeFromCache (parser.InputFile);
@@ -333,11 +324,10 @@ namespace System.Web.Compilation
 
 			Init ();
 			string lang = parser.Language;
-#if NET_2_0
+#if CONFIGURATION_2_0
 			CompilationSection config = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
 			Compiler comp = config.Compilers[lang];
-			Type t = Type.GetType (comp.Type, true);
-			provider = Activator.CreateInstance (t) as CodeDomProvider;
+			provider = comp.Provider;
 
 			string compilerOptions = comp.CompilerOptions;
 			int warningLevel = comp.WarningLevel;
@@ -376,11 +366,9 @@ namespace System.Web.Compilation
 			CheckCompilerErrors (results);
 			Assembly assembly = results.CompiledAssembly;
 			if (assembly == null) {
-				if (!File.Exists (compilerParameters.OutputAssembly)) {
-					results.TempFiles.Delete ();
+				if (!File.Exists (compilerParameters.OutputAssembly))
 					throw new CompilationException (parser.InputFile, results.Errors,
 						"No assembly returned after compilation!?");
-				}
 
 				assembly = Assembly.LoadFrom (compilerParameters.OutputAssembly);
 			}
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildDependencySet.cs b/mcs/class/System.Web/System.Web.Compilation/BuildDependencySet.cs
deleted file mode 100644
index a97f10d1ca5..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildDependencySet.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// System.Web.Compilation.BuildDependencySet
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-
-namespace System.Web.Compilation {
-
-	public sealed class BuildDependencySet {
-
-		internal BuildDependencySet ()
-		{
-		}
-
-		[MonoTODO]
-		public string HashCode {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public IEnumerable VirtualPaths {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
deleted file mode 100644
index 2f72dcef9d9..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// System.Web.Compilation.BuildManager
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Web;
-using System.Web.Configuration;
-using System.Web.Hosting;
-
-namespace System.Web.Compilation {
-	public sealed class BuildManager {
-		internal BuildManager ()
-		{
-		}
-
-		internal static void ThrowNoProviderException (string extension)
-		{
-			string msg = "No registered provider for extension '{0}'.";
-			throw new HttpException (String.Format (msg, extension));
-		}
-
-		public static object CreateInstanceFromVirtualPath (string virtualPath, Type requiredBaseType)
-		{
-			// virtualPath + Exists done in GetCompiledType()
-			if (requiredBaseType == null)
-				throw new NullReferenceException (); // This is what MS does, but from somewhere else.
-
-			// Get the Type.
-			Type type = GetCompiledType (virtualPath);
-			if (!requiredBaseType.IsAssignableFrom (type)) {
-				string msg = String.Format ("Type '{0}' does not inherit from '{1}'.",
-								type.FullName, requiredBaseType.FullName);
-				throw new HttpException (500, msg);
-			}
-
-			return Activator.CreateInstance (type, null);
-		}
-
-		[MonoTODO]
-		public static BuildDependencySet GetCachedBuildDependencySet (HttpContext context, string virtualPath)
-		{
-			return null; // null is ok here until we store the dependency set in the Cache.
-		}
-
-		public static Assembly GetCompiledAssembly (string virtualPath)
-		{
-			BuildProvider provider;
-			CompilerParameters parameters;
-
-			AssemblyBuilder abuilder = GetAssemblyBuilder (virtualPath, out provider);
-			CompilerType ctype = provider.CodeCompilerType;
-			parameters = PrepareParameters (abuilder.TempFiles, virtualPath, ctype.CompilerParameters);
-			CompilerResults results = abuilder.BuildAssembly (virtualPath, parameters);
-			return results.CompiledAssembly;
-		}
-
-		static AssemblyBuilder GetAssemblyBuilder (string virtualPath, out BuildProvider provider)
-		{
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			if (virtualPath [0] != '/')
-				throw new ArgumentException ("The virtual path is not rooted", "virtualPath");
-
-			if (!HostingEnvironment.VirtualPathProvider.FileExists (virtualPath))
-				throw new HttpException (String.Format ("The file '{0}' does not exist.", virtualPath));
-
-			object o = WebConfigurationManager.GetSection ("system.web/compilation/buildProviders", virtualPath);
-			BuildProviderCollection coll = (BuildProviderCollection) o;
-			string extension = VirtualPathUtility.GetExtension (virtualPath);
-			if (coll == null || coll.Count == 0)
-				ThrowNoProviderException (extension);
-
-			provider = coll.GetProviderForExtension (extension);
-			if (provider == null)
-				ThrowNoProviderException (extension);
-
-			CompilerType compiler_type = provider.CodeCompilerType;
-			Type ctype = compiler_type.CodeDomProviderType;
-			CodeDomProvider dom_provider = (CodeDomProvider) Activator.CreateInstance (ctype, null);
-
-			AssemblyBuilder abuilder = new AssemblyBuilder (virtualPath, dom_provider);
-			provider.SetVirtualPath (virtualPath);
-			provider.GenerateCode (abuilder);
-			return abuilder;
-		}
-
-		[MonoTODO]
-		public static string GetCompiledCustomString (string virtualPath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		static CompilerParameters PrepareParameters (TempFileCollection temp_files,
-								string virtualPath,
-								CompilerParameters base_params)
-		{
-			CompilerParameters res = new CompilerParameters ();
-			res.TempFiles = temp_files;
-			res.CompilerOptions = base_params.CompilerOptions;
-			res.IncludeDebugInformation = base_params.IncludeDebugInformation;
-			res.TreatWarningsAsErrors = base_params.TreatWarningsAsErrors;
-			res.WarningLevel = base_params.WarningLevel;
-			string dllfilename = Path.GetFileName (temp_files.AddExtension ("dll", true));
-			res.OutputAssembly = Path.Combine (temp_files.TempDir, dllfilename);
-			return res;
-		}
-
-		public static Type GetCompiledType (string virtualPath)
-		{
-			BuildProvider provider;
-			CompilerParameters parameters;
-
-			AssemblyBuilder abuilder = GetAssemblyBuilder (virtualPath, out provider);
-			CompilerType ctype = provider.CodeCompilerType;
-			parameters = PrepareParameters (abuilder.TempFiles, virtualPath, ctype.CompilerParameters);
-			CompilerResults results = abuilder.BuildAssembly (virtualPath, parameters);
-			return provider.GetGeneratedType (results);
-		}
-
-		// The 3 GetType() overloads work on the global.asax, App_GlobalResources, App_WebReferences or App_Browsers
-		[MonoTODO]
-		public static Type GetType (string typeName, bool throwOnError)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static Type GetType (string typeName, bool throwOnError, bool ignoreCase)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public static ICollection GetVirtualPathDependencies (string virtualPath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		// Assemblies built from the App_Code directory
-		[MonoTODO]
-		public static IList CodeAssemblies {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManagerHostUnloadEventArgs.cs b/mcs/class/System.Web/System.Web.Compilation/BuildManagerHostUnloadEventArgs.cs
deleted file mode 100644
index ee79de7ca35..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildManagerHostUnloadEventArgs.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// System.Web.Compilation.BuildManagerHostUnloadEventArgs
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Web;
-
-namespace System.Web.Compilation {
-
-	public class BuildManagerHostUnloadEventArgs : EventArgs
-	{
-		ApplicationShutdownReason reason;
-
-		public BuildManagerHostUnloadEventArgs (ApplicationShutdownReason reason)
-		{
-			this.reason = reason;
-		}
-
-		public ApplicationShutdownReason Reason {
-			get { return reason; }
-		}
-
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManagerHostUnloadEventHandler.cs b/mcs/class/System.Web/System.Web.Compilation/BuildManagerHostUnloadEventHandler.cs
deleted file mode 100644
index 7e401bbe899..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildManagerHostUnloadEventHandler.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Compilation.BuildManagerHostUnloadEventHandler
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-	public delegate void BuildManagerHostUnloadEventHandler(object sender, BuildManagerHostUnloadEventArgs e);
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/BuildProvider.cs
deleted file mode 100644
index aa1bc2e9419..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildProvider.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-//
-// System.Web.Compilation.BuildProvider
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-using System.Reflection;
-using System.Web.Configuration;
-using System.Web.Hosting;
-using System.Web.Util;
-
-namespace System.Web.Compilation {
-
-	public abstract class BuildProvider {
-		static object locker = new object ();
-		static string private_bin_path;
-
-		string virtual_path;
-		ArrayList ref_assemblies;
-
-		ICollection vpath_deps;
-
-		protected BuildProvider()
-		{
-			ref_assemblies = new ArrayList ();
-		}
-
-		internal void SetVirtualPath (string path)
-		{
-			virtual_path = path;
-		}
-
-		public virtual void GenerateCode (AssemblyBuilder assemblyBuilder)
-		{
-		}
-
-		[MonoTODO]
-		public virtual string GetCustomString (CompilerResults results)
-		{
-			throw new NotImplementedException ();
-		}
-
-		protected CompilerType GetDefaultCompilerType ()
-		{
-			CompilationSection config;
-			config = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
-			return GetDefaultCompilerTypeForLanguage (config.DefaultLanguage);
-		}
-
-		void SetCommonParameters (CompilationSection config, CompilerParameters p)
-		{
-			p.IncludeDebugInformation = config.Debug;
-			foreach (AssemblyInfo info in config.Assemblies) {
-				if (info.Assembly != "*") {
-					p.ReferencedAssemblies.Add (info.Assembly);
-					ref_assemblies.Add (info.Assembly);
-				} else {
-					AddAssembliesInBin (p.ReferencedAssemblies);
-				}
-			}
-
-			// explicit, strict?
-			// embedded? linked?/resources
-		}
-
-		
-		static void InitPath ()
-		{
-			lock (locker) {
-				if (private_bin_path != null)
-					return;
-
-				AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;
-				private_bin_path = Path.Combine (setup.ApplicationBase, setup.PrivateBinPath);
-			}
-		}
-
-		void AddAssembliesInBin (StringCollection coll)
-		{
-			InitPath ();
-			if (!Directory.Exists (private_bin_path))
-				return;
-
-			string [] binDlls = Directory.GetFiles (private_bin_path, "*.dll");
-			foreach (string s in binDlls) {
-				coll.Add (s);
-				ref_assemblies.Add (s);
-			}
-		}
-
-		protected CompilerType GetDefaultCompilerTypeForLanguage (string language)
-		{
-			// MS throws when accesing a Hashtable, we do here.
-			if (language == null || language == "")
-				throw new ArgumentNullException ("language");
-
-			CompilationSection config;
-			config = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
-			Compiler compiler = config.Compilers.Get (language);
-			CompilerParameters p;
-			if (compiler != null) {
-				Type type = Type.GetType (compiler.Type, true);
-				p = new CompilerParameters ();
-				p.CompilerOptions = compiler.CompilerOptions;
-				p.WarningLevel = compiler.WarningLevel;
-				SetCommonParameters (config, p);
-				return new CompilerType (type, p);
-			}
-
-			if (!CodeDomProvider.IsDefinedLanguage (language))
-				throw new HttpException (String.Format ("No compiler for language '{0}'.", language));
-
-			CompilerInfo info = CodeDomProvider.GetCompilerInfo (language);
-			CompilerParameters par = info.CreateDefaultCompilerParameters ();
-			SetCommonParameters (config, par);
-			return new CompilerType (info.CodeDomProviderType, par);
-		}
-
-		public virtual Type GetGeneratedType (CompilerResults results)
-		{
-			return null;
-		}
-
-		public virtual BuildProviderResultFlags GetResultFlags (CompilerResults results)
-		{
-			return BuildProviderResultFlags.Default;
-		}
-
-		protected TextReader OpenReader ()
-		{
-			return OpenReader (VirtualPath);
-		}
-
-		protected TextReader OpenReader (string virtualPath)
-		{
-			Stream st = OpenStream (virtualPath);
-			return new StreamReader (st, WebEncoding.FileEncoding);
-		}
-
-		protected Stream OpenStream ()
-		{
-			return OpenStream (VirtualPath);
-		}
-
-		protected Stream OpenStream (string virtualPath)
-		{
-			// MS also throws a NullReferenceException here when not hosted.
-			return VirtualPathProvider.OpenFile (virtualPath);
-		}
-
-		public virtual CompilerType CodeCompilerType {
-			get { return null; } // Documented to return null
-		}
-
-		protected ICollection ReferencedAssemblies {
-			get { return ref_assemblies; }
-		}
-
-		protected internal string VirtualPath {
-			get { return virtual_path; }
-		}
-
-		public virtual ICollection VirtualPathDependencies {
-			get {
-				if (vpath_deps == null)
-					vpath_deps = new OneNullCollection ();
-
-				return vpath_deps;
-			}
-		}
-	}
-
-	class OneNullCollection : ICollection {
-		public int Count {
-			get { return 1; }
-		}
-
-		public bool IsSynchronized {
-			get { return false; }
-		}
-
-		public object SyncRoot {
-			get { return this; }
-		}
-
-		public void CopyTo (Array array, int index)
-		{
-			if (array == null)
-				throw new ArgumentNullException ();
-
-			if (index < 0)
-				throw new ArgumentOutOfRangeException ();
-
-			if (array.Rank > 1)
-				throw new ArgumentException ();
-
-			int length = array.Length;
-			if (index >= length || index > length - 1)
-				throw new ArgumentException ();
-
-			array.SetValue (null, index);
-		}
-
-		public IEnumerator GetEnumerator ()
-		{
-			yield return null;
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesTo.cs b/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesTo.cs
deleted file mode 100644
index 89357f7b936..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesTo.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// System.Web.Compilation.BuildProviderAppliesTo
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	[Flags]
-	public enum BuildProviderAppliesTo
-	{
-		Web = 1,            /* generate code from files in directories *other* than App_Code,
-				       App_LocalResources, and App_GlobalResources */
-		Code = 1 << 1,      /* generate code only for App_Code/* */
-		Resources = 1 << 2, /* generate code only for App_LocalResources/* and App_GlobalResources/* */
-		All = 7             /* generate code for everything.  default value for the attribute */
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesToAttribute.cs b/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesToAttribute.cs
deleted file mode 100644
index b9302aad859..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesToAttribute.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Web.Compilation.BuildProviderAppliesToAttribute
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	[AttributeUsage (AttributeTargets.Class)]
-	public sealed class BuildProviderAppliesToAttribute : Attribute
-	{
-		BuildProviderAppliesTo appliesTo;
-
-		public BuildProviderAppliesToAttribute (BuildProviderAppliesTo appliesTo)
-		{
-			this.appliesTo = appliesTo;
-		}
-
-		public BuildProviderAppliesTo AppliesTo {
-			get { return appliesTo; }
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildProviderResultFlags.cs b/mcs/class/System.Web/System.Web.Compilation/BuildProviderResultFlags.cs
index f11f21185ff..3cd3ea5723a 100644
--- a/mcs/class/System.Web/System.Web.Compilation/BuildProviderResultFlags.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/BuildProviderResultFlags.cs
@@ -29,10 +29,9 @@
 using System.Resources;
 
 #if NET_2_0
-
 namespace System.Web.Compilation
 {
-        [Flags]
+        [Serializable, Flags]
         public enum BuildProviderResultFlags
         {
                 Default = 0,
diff --git a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
index 66f49aa9321..904fa76e365 100644
--- a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
@@ -146,11 +146,10 @@ namespace System.Web.Compilation
 				if (results != null)
 					return results;
  
-#if NET_2_0
+#if CONFIGURATION_2_0
 				CompilationSection config = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
 				Compiler c = config.Compilers[language];
-				Type t = Type.GetType (c.Type, true);
-				CodeDomProvider provider = Activator.CreateInstance (t) as CodeDomProvider;
+				CodeDomProvider provider = c.Provider;
 #else
 				CompilationConfiguration config;
 				config = CompilationConfiguration.GetInstance (HttpContext.Current);
diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index a8b73ac8514..3a7708a3b98 100644
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,161 +1,7 @@
-2006-02-23  Chris Toshok  <toshok@ximian.com>
-
-	* TemplateControlCompiler.cs (AddContentTemplateInvocation): track
-	change from ContentControlBuilderInternal to
-	ContentBuilderInternal.
-	(AddCodeRender): same.
-
-2006-02-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* AssemblyBuilder.cs:
-	* BuildManager.cs: compile the assembly from AssemblyBuilder and use
-	GetGeneratedType() on the BuildProvider instead of loading the assembly
-	and trying a wild guess at the type name.
-
-2006-02-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* GlobalAsaxCompiler.cs:
-	* PageCompiler.cs:
-	* TemplateControlCompiler.cs: CreateMethods is now internal.
-
-	* WebServiceBuildProvider.cs:
-	* PageBuildProvider.cs:
-	* UserControlBuildProvider.cs:
-	* WebHandlerBuildProvider.cs: new build providers.
-
-	* BuildProvider.cs: add assemblies.
-
-	* BaseCompiler.cs: expose the provider and the compile unit through
-	properties.
-
-2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* CompilerType.cs: implemented.
-
-	* AssemblyBuilder.cs: implemented most of it.
-
-	* WebServiceCompiler.cs:
-	* CachingCompiler.cs: update 2.0 compiler instance creation code.
-
-	* ClientBuildManager.cs: implemented some of its methods. Not yet
-	ready.
-
-	* BuildManager.cs: the more interesting methods are implemented now.
-
-	* BaseCompiler.cs: delete the temporary files in case of error.
-
-	* BuildProvider.cs: implemented the Get*Compiler* protected methods.
-
-2006-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* TemplateControlCompiler.cs (AddParsedSubObjectStmt): append the
-	calls to AddParsedSubObject to a special statement collection --
-	builder.flushOutputStatements -- not to builder.method.Statements.
-	(InitMethod): initially, set flushOutputStatements to
-	method.Statements.  If we're dealing with a ContentPlaceHolder,
-	set flushOutputStatements to be the else block of a conditional we
-	create.  This causes the compiled control to fall back to the
-	ContentPlaceHolder's child controls in case there's no
-	corresponding Content template.
-	(AddChildCall): use methodStatements instead of method.Statements.
-	(CreateControlTree): same.
-
-	* PageCompiler.cs (CreatePropertyAssign): factor out the
-	string,string implementation and add one that also takes a
-	CodeExpression; make the string,string implementation call the
-	three arg one with thisRef.
-	(AddStatementsToInitMethod): make use of the 3-arg form of
-	CreatePropertyAssign to reduce code.  Also, add support for
-	setting the page's Title from the parser's Title.
-
-2006-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* UserControlCompiler.cs (AddStatementsToInitMethod): emit code to
-	assign __ctrl.MasterPageFile to our master page, if we have one.
-
-	* PageCompiler.cs (CreateContructor): remove the MasterPageFile
-	assignment from here.
-	(AddStatementsToInitMethod): and move it here.
-	
-	* TemplateControlCompiler.cs (InitMethod): in the case where
-	builder is a RootBuilder (we're building the __BuildControlTree
-	method), call a virtual method so that subclasses can add their
-	own statements to the method (used by both Page and MasterPage);
-	Also, in the RootBuilder case, the argument should be the
-	parser.ClassName type (the class we're building); lastly, expand
-	the ContentPlaceHolder logic to include all the
-	ContentTemplates/InstantiateIn magic.
-	(AddStatementsToInitMethod): empty virtual method.
-	(AddContentTemplateInvocation): ContentControlBuilder ->
-	ContentControlBuilderInternal.
-	(CreateControlTree): same.
-	(CallBaseFrameworkInitialize): new function, create call to
-	base.FrameworkInitialize.
-	(CreateFrameworkInitializeMethod): call CallBaseFrameworkIniitialize.
-
-2006-02-06 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* IgnoreFileBuildProvider.cs: it's not public.
-	* BuildProvider.cs: mostly implemented.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* WebServiceCompiler.cs: CONFIGURATION_2_0 => NET_2_0, and use
-	GetSection instead of GetWebApplicationSection.
-
-	* CachingCompiler.cs: same.
-
-	* AspGenerator.cs: same.
-
-	* BaseCompiler.cs: same.
-	
 2006-01-23 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* AspGenerator.cs: ignore 'thead'. Fixes bug #77326.
 
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* IgnoreFileBuildProvider.cs: build provider which does nothing.
-
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* AspComponentFoundry.cs (.ctor): use a 2.0 friendly form of the
-	Hashtable ctor to silence a couple of warning.
-	(CompoundFoundry.ctor): same
-
-	* Directive.cs (InitHash): use a 2.0 friendly form of the
-	Hashtable ctor to silence a couple of warning.
-
-	* TagAttributes.cs (MakeHash): use a 2.0 friendly form of the
-	Hashtable ctor to silence a warning.
-	(GetDictionary): same.
-
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* AppSettingsExpressionBuilder.cs: implement this, patterning it
-	after an example on msdn.  Also, enable the ExpressionEditor
-	attribute, but use the string rather than the Type overload so we
-	won't have yet another circular dep.
-
-	* ConnectionStringsExpressionBuilder.cs: partial implementation.
-	Same deal with the ExpressionEditor attribute.
-
-	* ResourceExpressionBuilder.cs: same deal with the
-	ExpressionEditor attribute.
-	
-2006-01-20  Chris Toshok  <toshok@ximian.com>
-
-	* ResourceExpressionBuilder.cs (ParseExpression): implement.
-
-	* ResourceExpressionFields.cs: implement.
-
-2006-01-20  Chris Toshok  <toshok@ximian.com>
-
-	* ClientBuildManagerParameter.cs: implement.
-
-	* ClientBuildManagerCallback.cs: this class contains an empty
-	default implementation.
-
 2006-01-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* AspGenerator.cs: add support for 'src' in <script runat="server">.
diff --git a/mcs/class/System.Web/System.Web.Compilation/ClientBuildManager.cs b/mcs/class/System.Web/System.Web.Compilation/ClientBuildManager.cs
deleted file mode 100644
index 2d6768046a8..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ClientBuildManager.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-//
-// System.Web.Compilation.ClientBuildManager
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Web;
-using System.Web.Hosting;
-
-namespace System.Web.Compilation {
-	public sealed class ClientBuildManager : MarshalByRefObject, IDisposable {
-		string virt_dir;
-		string phys_src_dir;
-		string phys_target_dir;
-		ClientBuildManagerParameter build_params;
-
-		public ClientBuildManager (string appVirtualDir, string appPhysicalSourceDir)
-		{
-			virt_dir = appVirtualDir; // TODO: adjust vpath (it allows 'blah' that turns into '/blah', '////blah', '\\blah'...
-			phys_src_dir = appPhysicalSourceDir;
-		}
-
-		public ClientBuildManager (string appVirtualDir, string appPhysicalSourceDir,
-					string appPhysicalTargetDir)
-			: this (appVirtualDir, appPhysicalSourceDir)
-		{
-			phys_target_dir = appPhysicalTargetDir;
-		}
-
-		public ClientBuildManager (string appVirtualDir, string appPhysicalSourceDir,
-					string appPhysicalTargetDir, ClientBuildManagerParameter parameter)
-			: this (appVirtualDir, appPhysicalSourceDir, appPhysicalTargetDir)
-		{
-			build_params = parameter;
-		}
-
-		string CreateCodeGenDir ()
-		{
-			return null;
-		/*
-			string appname = null;
-			if (virt_dir == "/") {
-				appname = "root";
-			} else {
-				appname = virt_dir.Subtring (1).Replace ('/', '_');
-			}
-
-			string dynamic_dir = null;
-			string user = Environment.UserName;
-			for (int i = 0; ; i++){
-				string d = Path.Combine (Path.GetTempPath (),
-					String.Format ("{0}-temp-aspnet-{1:x}", user, i));
-			
-				try {
-					Directory.CreateDirectory (d);
-					string stamp = Path.Combine (d, "stamp");
-					Directory.CreateDirectory (stamp);
-					dynamic_dir = d;
-					Directory.Delete (stamp);
-					break;
-				} catch (UnauthorizedAccessException){
-					continue;
-				}
-			}
-			setup.DynamicBase = dynamic_dir;
-			Directory.CreateDirectory (setup.DynamicBase);
-			*/
-		}
-
-		[MonoTODO]
-		public void CompileApplicationDependencies ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public void CompileFile (string virtualPath)
-		{
-			CompileFile (virtualPath, null);
-		}
-
-		[MonoTODO]
-		public void CompileFile (string virtualPath, ClientBuildManagerCallback callback)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public IRegisteredObject CreateObject (Type type, bool failIfExists)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string GenerateCode (string virtualPath, string virtualFileString, out IDictionary linePragmasTable)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public CodeCompileUnit GenerateCodeCompileUnit (string virtualPath, string virtualFileString, out Type codeDomProviderType, out CompilerParameters compilerParameters, out IDictionary linePragmasTable)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public CodeCompileUnit GenerateCodeCompileUnit (string virtualPath, out Type codeDomProviderType, out CompilerParameters compilerParameters, out IDictionary linePragmasTable)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string [] GetAppDomainShutdownDirectories ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public IDictionary GetBrowserDefinitions ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void GetCodeDirectoryInformation (string virtualCodeDir, out Type codeDomProviderType, out CompilerParameters compilerParameters, out string generatedFilesDir)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public Type GetCompiledType (string virtualPath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void GetCompilerParameters (string virtualPath, out Type codeDomProviderType, out CompilerParameters compilerParameters)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string GetGeneratedFileVirtualPath (string filePath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string GetGeneratedSourceFile (string virtualPath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string[ ] GetTopLevelAssemblyReferences (string virtualPath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string[ ] GetVirtualCodeDirectories ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override object InitializeLifetimeService ()
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public bool IsCodeAssembly (string assemblyName)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void PrecompileApplication ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void PrecompileApplication (ClientBuildManagerCallback callback)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public void PrecompileApplication (ClientBuildManagerCallback callback, bool forceCleanBuild)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public bool Unload ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public string CodeGenDir {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public bool IsHostCreated {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		public event BuildManagerHostUnloadEventHandler AppDomainShutdown;
-		public event EventHandler AppDomainStarted;
-		public event BuildManagerHostUnloadEventHandler AppDomainUnloaded;
-
-
-		[MonoTODO]
-		void IDisposable.Dispose ()
-		{
-			throw new NotImplementedException ();
-		}
-
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ClientBuildManagerCallback.cs b/mcs/class/System.Web/System.Web.Compilation/ClientBuildManagerCallback.cs
deleted file mode 100644
index e390c4043a8..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ClientBuildManagerCallback.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// System.Web.Compilation.ClientBuildManagerCallback
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom.Compiler;
-using System.Web;
-
-namespace System.Web.Compilation {
-	public class ClientBuildManagerCallback : MarshalByRefObject
-	{
-		public ClientBuildManagerCallback ()
-		{
-		}
-
-		public virtual void ReportCompilerError (CompilerError error)
-		{
-		}
-
-		public virtual void ReportParseError (ParserError error)
-		{
-		}
-
-		public virtual void ReportProgress (string message)
-		{
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ClientBuildManagerParameter.cs b/mcs/class/System.Web/System.Web.Compilation/ClientBuildManagerParameter.cs
deleted file mode 100644
index 054c7db3388..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ClientBuildManagerParameter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// System.Web.Compilation.ClientBuildManagerParameter
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom.Compiler;
-using System.Web;
-
-namespace System.Web.Compilation {
-
-	[Serializable]
-	public class ClientBuildManagerParameter
-	{
-		public ClientBuildManagerParameter ()
-		{
-		}
-
-		public PrecompilationFlags PrecompilationFlags {
-			get { return precompilationFlags; }
-			set { precompilationFlags = value; }
-		}
-
-		public string StrongNameKeyContainer {
-			get { return strongNameKeyContainer; }
-			set { strongNameKeyContainer = value; }
-		}
-
-		public string StrongNameKeyFile {
-			get { return strongNameKeyFile; }
-			set { strongNameKeyFile = value; }
-		}
-
-		PrecompilationFlags precompilationFlags;
-		string strongNameKeyContainer;
-		string strongNameKeyFile;
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/CompilerType.cs b/mcs/class/System.Web/System.Web.Compilation/CompilerType.cs
deleted file mode 100644
index 255f0f00b4e..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/CompilerType.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// System.Web.Compilation.CompilerType
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom.Compiler;
-
-namespace System.Web.Compilation {
-
-	public sealed class CompilerType {
-		Type type;
-		CompilerParameters parameters;
-
-		internal CompilerType (Type type, CompilerParameters parameters)
-		{
-			this.type = type;
-			this.parameters = parameters;
-		}
-
-		public override bool Equals(object o)
-		{
-			if (!(o is CompilerType))
-				return false;
-
-			CompilerType other = (CompilerType) o;
-			//FIXME: parameters does NOT have an Equals override
-			return (other.type == type && other.parameters == parameters);
-		}
-
-		public override int GetHashCode()
-		{
-			return ((type.GetHashCode () << 6) ^ parameters.GetHashCode ());
-		}
-
-		public Type CodeDomProviderType {
-			get { return type; }
-		}
-
-		public CompilerParameters CompilerParameters {
-			get { return parameters; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/ConnectionStringsExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Compilation/ConnectionStringsExpressionBuilder.cs
deleted file mode 100644
index 8afda494f6e..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ConnectionStringsExpressionBuilder.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// System.Web.Compilation.ConnectionStringsExpressionBuilder
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.Configuration;
-using System.Web.Configuration;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	[ExpressionEditor("System.Web.UI.Design.ConnectionStringsExpressionEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	[ExpressionPrefix("ConnectionStrings")]
-	public class ConnectionStringsExpressionBuilder : ExpressionBuilder {
-
-		public override object EvaluateExpression (object target, BoundPropertyEntry entry, object parsedData, ExpressionBuilderContext context)
-		{
-			return GetConnectionString (entry.Expression.Trim());
-		}
-
-		public override CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData, ExpressionBuilderContext context)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public static string GetConnectionString (string connectionStringName)
-		{
-			ConnectionStringSettings conn = WebConfigurationManager.ConnectionStrings [connectionStringName];
-			if (conn == null)
-				return "";
-			else
-				return conn.ConnectionString;
-		}
-
-		public static string GetConnectionStringProviderName (string connectionStringName)
-		{
-			ConnectionStringSettings conn = WebConfigurationManager.ConnectionStrings [connectionStringName];
-			if (conn == null)
-				return "";
-			else
-				return conn.ProviderName;
-		}
-
-		[MonoTODO]
-		public override	object ParseExpression (string expression, Type propertyType, ExpressionBuilderContext context)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override bool SupportsEvaluate {
-			get { return true; }
-		}
-	}
-
-}
-
-#endif
-
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/DesignTimeResourceProviderFactoryAttribute.cs b/mcs/class/System.Web/System.Web.Compilation/DesignTimeResourceProviderFactoryAttribute.cs
deleted file mode 100644
index 9204cad1066..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/DesignTimeResourceProviderFactoryAttribute.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// System.Web.Compilation.DesignTimeResourceProviderFactoryAttribute
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	[AttributeUsage (AttributeTargets.Class)]
-	public sealed class DesignTimeResourceProviderFactoryAttribute : Attribute
-	{
-		string factoryTypeName;
-
-		public DesignTimeResourceProviderFactoryAttribute (string factoryTypeName)
-		{
-			this.factoryTypeName = factoryTypeName;
-		}
-
-		public DesignTimeResourceProviderFactoryAttribute (System.Type factoryType)
-		{
-			this.factoryTypeName = factoryType.AssemblyQualifiedName;
-		}
-
-		public override bool IsDefaultAttribute ()
-		{
-			return factoryTypeName == null;
-		}
-
-		public string FactoryTypeName {
-			get { return factoryTypeName; }
-		}
-
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/Directive.cs b/mcs/class/System.Web/System.Web.Compilation/Directive.cs
index ff56e5e8a6a..7f2262ac328 100644
--- a/mcs/class/System.Web/System.Web.Compilation/Directive.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/Directive.cs
@@ -40,11 +40,7 @@ namespace System.Web.Compilation
 		static string [] page_atts = {  "AspCompat", "AutoEventWireup", "Buffer",
 						"ClassName", "ClientTarget", "CodePage",
 						"CompilerOptions", "ContentType", "Culture", "Debug",
-						"Description",
-#if NET_2_0
-						"EnableEventValidation", 
-#endif
-						"EnableSessionState", "EnableViewState",
+						"Description", "EnableSessionState", "EnableViewState",
 						"EnableViewStateMac", "ErrorPage", "Explicit",
 						"Inherits", "Language", "LCID", "ResponseEncoding",
 						"Src", "SmartNavigation", "Strict", "Trace",
@@ -81,112 +77,63 @@ namespace System.Web.Compilation
 		
 		private static void InitHash ()
 		{
-#if NET_2_0
-			StringComparer comparer = StringComparer.InvariantCultureIgnoreCase;
-			directivesHash = new Hashtable (comparer);
-#else
 			CaseInsensitiveHashCodeProvider provider = new CaseInsensitiveHashCodeProvider (CultureInfo.InvariantCulture);
 			CaseInsensitiveComparer comparer =  new CaseInsensitiveComparer (CultureInfo.InvariantCulture);
 
 			directivesHash = new Hashtable (provider, comparer); 
-#endif
 
 			// Use Hashtable 'cause is O(1) in Contains (ArrayList is O(n))
-#if NET_2_0
-			Hashtable valid_attributes = new Hashtable (comparer);
-#else
 			Hashtable valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in page_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("PAGE", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in control_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("CONTROL", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in import_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("IMPORT", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in implements_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("IMPLEMENTS", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in register_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("REGISTER", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in assembly_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("ASSEMBLY", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in outputcache_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("OUTPUTCACHE", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in reference_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("REFERENCE", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in webservice_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("WEBSERVICE", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			// same attributes as webservice
 			foreach (string att in webservice_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("WEBHANDLER", valid_attributes);
 
-#if NET_2_0
-			valid_attributes = new Hashtable (comparer);
-#else
 			valid_attributes = new Hashtable (provider, comparer);
-#endif
 			foreach (string att in application_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("APPLICATION", valid_attributes);
 
 #if NET_2_0
-			valid_attributes = new Hashtable (comparer);
+			valid_attributes = new Hashtable (provider, comparer);
 			foreach (string att in mastertype_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("MASTERTYPE", valid_attributes);
 			
-			valid_attributes = new Hashtable (comparer);
+			valid_attributes = new Hashtable (provider, comparer);
 			foreach (string att in control_atts) valid_attributes.Add (att, null);
 			directivesHash.Add ("MASTER", valid_attributes);
 #endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs
index 4863f9be199..d8e0d25e3b7 100644
--- a/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs
@@ -38,23 +38,18 @@ namespace System.Web.Compilation
 		{
 		}
 
-		public abstract CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData,
-								  ExpressionBuilderContext context);
-
-		public virtual object EvaluateExpression (object target, BoundPropertyEntry entry, object parsedData,
-							  ExpressionBuilderContext context)
-		{
-			return null;
+		public virtual bool SupportsEvaluate {
+			get { return false; }
 		}
 
-		public virtual object ParseExpression (string expression, Type propertyType, ExpressionBuilderContext context)
+		public virtual object EvaluateExpression (object target, BoundPropertyEntry entry, object parsedData,
+								ExpressionBuilderContext context)
 		{
 			return null;
 		}
 
-		public virtual bool SupportsEvaluate {
-			get { return false; }
-		}
+		public abstract CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData,
+								ExpressionBuilderContext context);
 	}
 	
 }
diff --git a/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilderContext.cs b/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilderContext.cs
index 585c2519360..e095dc9e2e1 100644
--- a/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilderContext.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilderContext.cs
@@ -33,7 +33,7 @@ using System.Web.UI;
 
 namespace System.Web.Compilation
 {
-	public sealed class ExpressionBuilderContext {
+	public class ExpressionBuilderContext {
 		TemplateControl tcontrol;
 		string vpath;
 
diff --git a/mcs/class/System.Web/System.Web.Compilation/ExpressionEditorAttribute.cs b/mcs/class/System.Web/System.Web.Compilation/ExpressionEditorAttribute.cs
deleted file mode 100644
index 646cef4c938..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ExpressionEditorAttribute.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// System.Web.Compilation.ExpressionEditorAttribute
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	[AttributeUsage (AttributeTargets.Class)]
-	public sealed class ExpressionEditorAttribute : Attribute
-	{
-		string typeName;
-
-		public ExpressionEditorAttribute (string typeName)
-		{
-			this.typeName = typeName;
-		}
-		
-		public ExpressionEditorAttribute (Type type)
-		{
-			this.typeName = type.AssemblyQualifiedName;
-		}
-
-		public string EditorTypeName {
-			get { return typeName; }
-		}
-
-		[MonoTODO]
-		public override bool Equals (object obj)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override int GetHashCode ()
-		{
-			throw new NotImplementedException ();
-		}
-
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ExpressionPrefixAttribute.cs b/mcs/class/System.Web/System.Web.Compilation/ExpressionPrefixAttribute.cs
deleted file mode 100644
index 47f2732684a..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ExpressionPrefixAttribute.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// System.Web.Compilation.ExpressionPrefixAttribute
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	[AttributeUsage (AttributeTargets.Class)]
-	public sealed class ExpressionPrefixAttribute : Attribute
-	{
-		string expressionPrefix;
-
-		public ExpressionPrefixAttribute (string expressionPrefix)
-		{
-			this.expressionPrefix = expressionPrefix;
-		}
-
-		public string ExpressionPrefix {
-			get { return expressionPrefix; }
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
index 09a11b1c5c0..0c70ce86c7f 100644
--- a/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
@@ -54,7 +54,7 @@ namespace System.Web.Compilation
 			return generator.GetCompiledType ();
 		}
 
-		protected internal override void CreateMethods ()
+		protected override void CreateMethods ()
 		{
 			base.CreateMethods ();
 
diff --git a/mcs/class/System.Web/System.Web.Compilation/IAssemblyPostProcessor.cs b/mcs/class/System.Web/System.Web.Compilation/IAssemblyPostProcessor.cs
deleted file mode 100644
index 9b2797608c4..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/IAssemblyPostProcessor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.Compilation.IAssemblyPostProcessor
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	public interface IAssemblyPostProcessor : IDisposable
-	{
-		void PostProcessAssembly (string path);
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs b/mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs
index eb27062de54..3e2c38ff5db 100644
--- a/mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs
@@ -36,7 +36,7 @@ namespace System.Web.Compilation
         public interface IImplicitResourceProvider
         {
                 object GetObject (ImplicitResourceKey key, CultureInfo culture);
-		ICollection GetImplicitResourceKeys (string keyPrefix);
+                ICollection GetResources (string keyPrefix);
         }
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/IResourceProvider.cs b/mcs/class/System.Web/System.Web.Compilation/IResourceProvider.cs
deleted file mode 100644
index 212c9e0dd3e..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/IResourceProvider.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.Compilation.IResourceProvider.cs
-//
-// Authors:
-//	Duncan Mak (duncan@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-using System.Globalization;
-
-#if NET_2_0
-namespace System.Web.Compilation
-{
-        public interface IResourceProvider
-        {
-		object GetObject (string resourceKey, CultureInfo culture);
-                IResourceReader ResourceReader { get; }
-        }
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/IResourceReader.cs b/mcs/class/System.Web/System.Web.Compilation/IResourceReader.cs
new file mode 100644
index 00000000000..4cdb8b14784
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/IResourceReader.cs
@@ -0,0 +1,39 @@
+//
+// System.Web.Compilation.IResourceProvider.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System.Resources;
+
+#if NET_2_0
+namespace System.Web.Compilation
+{
+        public interface IResourceProvider
+        {
+                IResourceReader ResourceReader { get; }
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/IgnoreFileBuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/IgnoreFileBuildProvider.cs
deleted file mode 100644
index b9fe996da8c..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/IgnoreFileBuildProvider.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Web.Compilation.IgnoreFileBuildProvider
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	class IgnoreFileBuildProvider : BuildProvider
-	{
-		public override void GenerateCode (AssemblyBuilder assemblyBuilder)
-		{
-			/* do nothing */
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs b/mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs
index d829134fd82..ac2bab3c256 100644
--- a/mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs
@@ -29,37 +29,15 @@
 #if NET_2_0
 namespace System.Web.Compilation
 {
-        public sealed class ImplicitResourceKey
+        public class ImplicitResourceKey
         {
-		string filter;
-		string keyPrefix;
-		string property;
-
-		public ImplicitResourceKey (string filter, string keyPrefix, string property)
-		{
-			this.filter = filter;
-			this.keyPrefix = keyPrefix;
-			this.property = property;
-		}
-
                 public ImplicitResourceKey ()
                 {
                 }
 
-                public string Filter {
-			get { return filter; }
-			set { filter = value; }
-		}
-
-                public string KeyPrefix {
-			get { return keyPrefix; }
-			set { keyPrefix = value; }
-		}
-
-                public string Property {
-			get { return property; }
-			set { property = value; }
-		}
+                public string Filter;
+                public string KeyPrefix;
+                public string Property;
         }
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/LinePragmaCodeInfo.cs b/mcs/class/System.Web/System.Web.Compilation/LinePragmaCodeInfo.cs
deleted file mode 100644
index 0e862021e5a..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/LinePragmaCodeInfo.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// System.Web.Compilation.LinePragmaCodeInfo
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	[Serializable]
-	public sealed class LinePragmaCodeInfo {
-
-		public LinePragmaCodeInfo ()
-		{
-		}
-
-		[MonoTODO]
-		public int CodeLength {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public bool IsCodeNugget {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public int StartColumn {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public int StartGeneratedColumn {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		[MonoTODO]
-		public int StartLine {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/PageBuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/PageBuildProvider.cs
deleted file mode 100644
index 7f64c4826d4..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/PageBuildProvider.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// System.Web.Compilation.PageBuildProvider
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	sealed class PageBuildProvider : BuildProvider {
-		PageCompiler pcompiler;
-		CompilerType compiler_type;
-
-		public PageBuildProvider()
-		{
-		}
-
-		public override void GenerateCode (AssemblyBuilder assemblyBuilder)
-		{
-			HttpContext context = HttpContext.Current;
-			PageParser parser = new PageParser (VirtualPath, OpenReader (), context);
-			pcompiler = new PageCompiler (parser);
-			pcompiler.CreateMethods ();
-			compiler_type = GetDefaultCompilerTypeForLanguage (parser.Language);
-			using (TextWriter writer = assemblyBuilder.CreateCodeFile (this)) {
-				CodeDomProvider provider = pcompiler.Provider;
-				CodeCompileUnit unit = pcompiler.CompileUnit;
-				provider.CreateGenerator().GenerateCodeFromCompileUnit (unit, writer, null);
-			}
-		}
-
-		public override Type GetGeneratedType (CompilerResults results)
-		{
-			// This is not called if compilation failed.
-			// Returning null makes the caller throw an InvalidCastException
-			Assembly assembly = results.CompiledAssembly;
-			return assembly.GetType (pcompiler.Parser.ClassName);
-		}
-
-		public override CompilerType CodeCompilerType {
-			get { return compiler_type; }
-		}
-
-		// FIXME: figure this out.
-		public override ICollection VirtualPathDependencies {
-			get {
-				return pcompiler.Parser.Dependencies;
-			}
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
index 215b2f7381e..77f683035db 100644
--- a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
@@ -50,7 +50,7 @@ namespace System.Web.Compilation
 		}
 
 		protected override void CreateConstructor (CodeStatementCollection localVars,
-							   CodeStatementCollection trueStmt)
+							CodeStatementCollection trueStmt)
 		{
 			if (pageParser.ClientTarget != null) {
 				CodeExpression prop;
@@ -61,6 +61,17 @@ namespace System.Web.Compilation
 				localVars.Add (new CodeAssignStatement (prop, ct));
 			}
 
+#if NET_2_0
+			if (pageParser.MasterPageFile != null) {
+				CodeExpression prop;
+				prop = new CodePropertyReferenceExpression (thisRef, "MasterPageFile");
+				CodeExpression ct = new CodePrimitiveExpression (pageParser.MasterPageFile);
+				if (localVars == null)
+					localVars = new CodeStatementCollection ();
+				localVars.Add (new CodeAssignStatement (prop, ct));
+			}
+#endif
+
 			base.CreateConstructor (localVars, trueStmt);
 		}
 		
@@ -85,32 +96,15 @@ namespace System.Web.Compilation
 			mainClass.Members.Add (method);
 		}
 
-		static CodeAssignStatement CreatePropertyAssign (CodeExpression expr, string name, object value)
+		static CodeAssignStatement CreatePropertyAssign (string name, object value)
 		{
 			CodePropertyReferenceExpression prop;
-			prop = new CodePropertyReferenceExpression (expr, name);
+			prop = new CodePropertyReferenceExpression (thisRef, name);
 			CodePrimitiveExpression prim;
 			prim = new CodePrimitiveExpression (value);
 			return new CodeAssignStatement (prop, prim);
 		}
 
-		static CodeAssignStatement CreatePropertyAssign (string name, object value)
-		{
-			return CreatePropertyAssign (thisRef, name, value);
-		}
-
-		protected override void AddStatementsToInitMethod (CodeMemberMethod method)
-		{
-#if NET_2_0
-			CodeArgumentReferenceExpression ctrlVar = new CodeArgumentReferenceExpression("__ctrl");
-			if (pageParser.Title != null)
-				method.Statements.Add (CreatePropertyAssign (ctrlVar, "Title", pageParser.Title));
-
-			if (pageParser.MasterPageFile != null)
-				method.Statements.Add (CreatePropertyAssign (ctrlVar, "MasterPageFile", pageParser.MasterPageFile));
-#endif
-		}
-
 		protected override void AddStatementsToFrameworkInitialize (CodeMemberMethod method)
 		{
 			string responseEncoding = pageParser.ResponseEncoding;
@@ -196,7 +190,7 @@ namespace System.Web.Compilation
 				};
 		}
                 
-		protected internal override void CreateMethods ()
+		protected override void CreateMethods ()
 		{
 			base.CreateMethods ();
 
diff --git a/mcs/class/System.Web/System.Web.Compilation/PrecompilationFlags.cs b/mcs/class/System.Web/System.Web.Compilation/PrecompilationFlags.cs
deleted file mode 100644
index 5e2981326f9..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/PrecompilationFlags.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// System.Web.Compilation.IAssemblyPostProcessor
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	[Flags]
-	public enum PrecompilationFlags
-	{
-		Default                      =   0,
-		Updatable                    =   1,
-		OverwriteTarget              =   2,
-		ForceDebug                   =   4,
-		Clean                        =   8,
-		CodeAnalysis                 =  16,
-		AllowPartiallyTrustedCallers =  32,
-		DelaySign                    =  64,
-		FixedNames                   = 128
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs
deleted file mode 100644
index 4b142f4759a..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// System.Web.Compilation.ResourceExpressionBuilder
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	[ExpressionEditor("System.Web.UI.Design.ResourceExpressionEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	[ExpressionPrefix("Resources")]
-	public class ResourceExpressionBuilder : ExpressionBuilder {
-
-		public ResourceExpressionBuilder ()
-		{
-		}
-
-		[MonoTODO]
-		public override object EvaluateExpression (object target, BoundPropertyEntry entry, object parsedData, ExpressionBuilderContext context)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData, ExpressionBuilderContext context)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public static ResourceExpressionFields ParseExpression (string expression)
-		{
-			int comma = expression.IndexOf (',');
-			if (comma == -1)
-				return new ResourceExpressionFields (expression.Trim ());
-			else
-				return new ResourceExpressionFields (expression.Substring (0, comma).Trim (),
-								     expression.Substring (comma + 1).Trim ());
-		}
-
-		[MonoTODO]
-		public override object ParseExpression (string expression, Type propertyType, ExpressionBuilderContext context)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override bool SupportsEvaluate {
-			get { return true; }
-		}
-	}
-
-}
-
-#endif
-
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionFields.cs b/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionFields.cs
deleted file mode 100644
index 2ec4efcf3b2..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionFields.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// System.Web.Compilation.ResourceExpressionFields
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	public sealed class ResourceExpressionFields {
-
-		internal ResourceExpressionFields (string classKey, string resourceKey)
-		{
-			this.classKey = classKey;
-			this.resourceKey = resourceKey;
-		}
-
-		internal ResourceExpressionFields (string resourceKey) : this (null, resourceKey)
-		{
-		}
-
-		public string ClassKey {
-			get { return classKey; }
-		}
-
-		public string ResourceKey {
-			get { return resourceKey; }
-		}
-
-		string classKey;
-		string resourceKey;
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/ResourceProviderFactory.cs b/mcs/class/System.Web/System.Web.Compilation/ResourceProviderFactory.cs
deleted file mode 100644
index 2e97a8c758a..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/ResourceProviderFactory.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Web.Compilation.ResourceProviderFactory
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.Compilation {
-
-	public abstract class ResourceProviderFactory
-	{
-		protected ResourceProviderFactory() { }
-
-		public abstract IResourceProvider CreateGlobalResourceProvider (string classKey);
-		public abstract IResourceProvider CreateLocalResourceProvider (string virtualPath);
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs b/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
index 3b2826a9565..2ecffcd604d 100644
--- a/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
@@ -52,12 +52,8 @@ namespace System.Web.Compilation
 
 		void MakeHash ()
 		{
-#if NET_2_0
-			atts_hash = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			atts_hash = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
 						   CaseInsensitiveComparer.DefaultInvariant);
-#endif
 			for (int i = 0; i < keys.Count; i++) {
 				CheckServerKey (keys [i]);
 				atts_hash.Add (keys [i], values [i]);
@@ -163,12 +159,8 @@ namespace System.Web.Compilation
 				return atts_hash;
 
 			if (tmp_hash == null)
-#if NET_2_0
-				tmp_hash = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 				tmp_hash = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
 							  CaseInsensitiveComparer.DefaultInvariant);
-#endif
 			
 			tmp_hash.Clear ();
 			for (int i = keys.Count - 1; i >= 0; i--)
diff --git a/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
index 1467d750076..30877bd4e1b 100644
--- a/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
@@ -37,7 +37,6 @@ using System.Reflection;
 using System.Text;
 using System.Web;
 using System.Web.UI;
-using System.Web.UI.WebControls;
 using System.Web.Util;
 using System.ComponentModel.Design.Serialization;
 #if NET_2_0
@@ -128,14 +127,14 @@ namespace System.Web.Compilation
 				p.Name = "__parser";
 				p.Type = new CodeTypeReference (typeof (IParserAccessor));
 				p.InitExpression = new CodeCastExpression (typeof (IParserAccessor), ctrlVar);
-				builder.methodStatements.Add (p);
+				builder.method.Statements.Add (p);
 				builder.haveParserVariable = true;
 			}
 
 			CodeVariableReferenceExpression var = new CodeVariableReferenceExpression ("__parser");
 			CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (var, "AddParsedSubObject");
 			invoke.Parameters.Add (expr);
-			builder.methodStatements.Add (invoke);
+			builder.method.Statements.Add (invoke);
 		}
 
 		void InitMethod (ControlBuilder builder, bool isTemplate, bool childrenAsProperties)
@@ -143,18 +142,10 @@ namespace System.Web.Compilation
 			string tailname = ((builder is RootBuilder) ? "Tree" : ("_" + builder.ID));
 			CodeMemberMethod method = new CodeMemberMethod ();
 			builder.method = method;
-			builder.methodStatements = method.Statements;
-
 			method.Name = "__BuildControl" + tailname;
 			method.Attributes = MemberAttributes.Private | MemberAttributes.Final;
 			Type type = builder.ControlType;
 
-			/* in the case this is the __BuildControlTree
-			 * method, allow subclasses to insert control
-			 * specific code. */
-			if (builder is RootBuilder)
-				AddStatementsToInitMethod (method);
-
 			if (builder.HasAspCode) {
 				CodeMemberMethod renderMethod = new CodeMemberMethod ();
 				builder.renderMethod = renderMethod;
@@ -173,16 +164,11 @@ namespace System.Web.Compilation
 			
 			if (childrenAsProperties || builder.ControlType == null) {
 				string typeString;
-				if (builder is RootBuilder) {
-					typeString = parser.ClassName;
-				}
-				else {
-					if (builder.ControlType != null && builder.isProperty &&
-					    !typeof (ITemplate).IsAssignableFrom (builder.ControlType))
-						typeString = builder.ControlType.FullName;
-					else 
-						typeString = "System.Web.UI.Control";
-				}
+				if (builder.ControlType != null && builder.isProperty &&
+				    !typeof (ITemplate).IsAssignableFrom (builder.ControlType))
+					typeString = builder.ControlType.FullName;
+				else 
+					typeString = "System.Web.UI.Control";
 
 				method.Parameters.Add (new CodeParameterDeclarationExpression (typeString, "__ctrl"));
 			} else {
@@ -229,72 +215,6 @@ namespace System.Web.Compilation
 					CodeMethodInvokeExpression addPlaceholder = new CodeMethodInvokeExpression (prop, "Add");
 					addPlaceholder.Parameters.Add (ctrlVar);
 					method.Statements.Add (addPlaceholder);
-
-
-					CodeConditionStatement condStatement;
-
-					// Add the __Template_* field
-					CodeMemberField fld = new CodeMemberField (typeof (ITemplate), "__Template_" + builder.ID);
-					fld.Attributes = MemberAttributes.Private;
-					mainClass.Members.Add (fld);
-
-					CodeFieldReferenceExpression templateID = new CodeFieldReferenceExpression ();
-					templateID.TargetObject = thisRef;
-					templateID.FieldName = "__Template_" + builder.ID;
-
-					// if ((this.ContentTemplates != null)) {
-					// 	this.__Template_$builder.ID = ((System.Web.UI.ITemplate)(this.ContentTemplates["$builder.ID"]));
-					// }
-					//
-					CodeFieldReferenceExpression contentTemplates = new CodeFieldReferenceExpression ();
-					contentTemplates.TargetObject = thisRef;
-					contentTemplates.FieldName = "ContentTemplates";
-
-					CodeIndexerExpression indexer = new CodeIndexerExpression ();
-					indexer.TargetObject = new CodePropertyReferenceExpression (thisRef, "ContentTemplates");
-					indexer.Indices.Add (new CodePrimitiveExpression (builder.ID));
-
-					assign = new CodeAssignStatement ();
-					assign.Left = templateID;
-					assign.Right = new CodeCastExpression (new CodeTypeReference (typeof (ITemplate)), indexer);
-
-					condStatement = new CodeConditionStatement (new CodeBinaryOperatorExpression (contentTemplates,
-														      CodeBinaryOperatorType.IdentityInequality,
-														      new CodePrimitiveExpression (null)),
-										    assign);
-
-					method.Statements.Add (condStatement);
-
-					// if ((this.__Template_mainContent != null)) {
-					// 	this.__Template_mainContent.InstantiateIn(__ctrl);
-					// }
-					// and also set things up such that any additional code ends up in:
-					// else {
-					// 	...
-					// }
-					//
-					CodeMethodReferenceExpression methodRef = new CodeMethodReferenceExpression ();
-					methodRef.TargetObject = templateID;
-					methodRef.MethodName = "InstantiateIn";
-
-					CodeMethodInvokeExpression instantiateInInvoke;
-					instantiateInInvoke = new CodeMethodInvokeExpression (methodRef, ctrlVar);
-
-					condStatement = new CodeConditionStatement (new CodeBinaryOperatorExpression (templateID,
-														      CodeBinaryOperatorType.IdentityInequality,
-														      new CodePrimitiveExpression (null)),
-										    new CodeExpressionStatement (instantiateInInvoke));
-					method.Statements.Add (condStatement);
-
-					// this is the bit that causes the following stuff to end up in the else { }
-					builder.methodStatements = condStatement.FalseStatements;
-
-					// __ctrl.TemplateControl = this;
-					assign = new CodeAssignStatement ();
-					assign.Left = new CodePropertyReferenceExpression (ctrlVar, "TemplateControl");;
-					assign.Right = thisRef;
-
-					method.Statements.Add (assign);
 				}
 #endif
 			}
@@ -302,10 +222,6 @@ namespace System.Web.Compilation
 			mainClass.Members.Add (method);
 		}
 
-		protected virtual void AddStatementsToInitMethod (CodeMemberMethod method)
-		{
-		}
-
 		void AddLiteralSubObject (ControlBuilder builder, string str)
 		{
 			if (!builder.HasAspCode) {
@@ -671,7 +587,7 @@ namespace System.Web.Compilation
 							      new CodeTypeReference (typeof (System.Web.UI.BuildMethod)),
 							      thisRef, child.method.Name));
 				
-				parent.methodStatements.Add (build);
+				parent.method.Statements.Add (build);
 				if (parent.HasAspCode)
 					AddRenderControl (parent);
 				return;
@@ -679,18 +595,18 @@ namespace System.Web.Compilation
                                 
 			if (child.isProperty || parent.ChildrenAsProperties) {
 				expr.Parameters.Add (new CodeFieldReferenceExpression (ctrlVar, child.TagName));
-				parent.methodStatements.Add (expr);
+				parent.method.Statements.Add (expr);
 				return;
 			}
 
-			parent.methodStatements.Add (expr);
+			parent.method.Statements.Add (expr);
 			CodeFieldReferenceExpression field = new CodeFieldReferenceExpression (thisRef, child.ID);
 			if (parent.ControlType == null || typeof (IParserAccessor).IsAssignableFrom (parent.ControlType)) {
 				AddParsedSubObjectStmt (parent, field);
 			} else {
 				CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (ctrlVar, "Add");
 				invoke.Parameters.Add (field);
-				parent.methodStatements.Add (invoke);
+				parent.method.Statements.Add (invoke);
 			}
 				
 			if (parent.HasAspCode)
@@ -777,7 +693,7 @@ namespace System.Web.Compilation
 			return method.Name;
 		}
 
-		void AddContentTemplateInvocation (ContentBuilderInternal cbuilder, CodeMemberMethod method, string methodName)
+		void AddContentTemplateInvocation (ContentControlBuilder cbuilder, CodeMemberMethod method, string methodName)
 		{
 			CodeObjectCreateExpression newBuild = new CodeObjectCreateExpression (typeof (BuildTemplateMethod));
 			newBuild.Parameters.Add (new CodeMethodReferenceExpression (thisRef, methodName));
@@ -949,8 +865,8 @@ namespace System.Web.Compilation
 					}
 
 #if NET_2_0
-					if (b is ContentBuilderInternal) {
-						ContentBuilderInternal cb = (ContentBuilderInternal) b;
+					if (b is ContentControlBuilder) {
+						ContentControlBuilder cb = (ContentControlBuilder) b;
 						CreateControlTree (cb, false, true);
 						AddContentTemplateInvocation (cb, builder.method, cb.method.Name);
 						continue;
@@ -1023,14 +939,14 @@ namespace System.Web.Compilation
 				invoke.Method = new CodeMethodReferenceExpression (ctrlVar, "SetRenderMethodDelegate");
 				invoke.Parameters.Add (create);
 
-				builder.methodStatements.Add (invoke);
+				builder.method.Statements.Add (invoke);
 			}
 			
 			if (!childrenAsProperties && typeof (Control).IsAssignableFrom (builder.ControlType))
 				builder.method.Statements.Add (new CodeMethodReturnStatement (ctrlVar));
 		}
 
-		protected internal override void CreateMethods ()
+		protected override void CreateMethods ()
 		{
 			base.CreateMethods ();
 
@@ -1039,19 +955,11 @@ namespace System.Web.Compilation
 			CreateFrameworkInitializeMethod ();
 		}
 
-		void CallBaseFrameworkInitialize (CodeMemberMethod method)
-		{
-			CodeBaseReferenceExpression baseRef = new CodeBaseReferenceExpression ();
-			CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (baseRef, "FrameworkInitialize");
-			method.Statements.Add (invoke);
-		}
-
 		void CreateFrameworkInitializeMethod ()
 		{
 			CodeMemberMethod method = new CodeMemberMethod ();
 			method.Name = "FrameworkInitialize";
 			method.Attributes = MemberAttributes.Family | MemberAttributes.Override;
-			CallBaseFrameworkInitialize (method);
 			AddStatementsToFrameworkInitialize (method);
 			mainClass.Members.Add (method);
 		}
diff --git a/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs
deleted file mode 100644
index bb4aa373d1a..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// System.Web.Compilation.UserControlBuildProvider
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	sealed class UserControlBuildProvider : BuildProvider {
-		UserControlCompiler uccompiler;
-		CompilerType compiler_type;
-
-		public UserControlBuildProvider ()
-		{
-		}
-
-		public override void GenerateCode (AssemblyBuilder assemblyBuilder)
-		{
-			HttpContext context = HttpContext.Current;
-			UserControlParser parser = new UserControlParser (VirtualPath, OpenReader (), context);
-			uccompiler = new UserControlCompiler (parser);
-			uccompiler.CreateMethods ();
-			compiler_type = GetDefaultCompilerTypeForLanguage (parser.Language);
-			using (TextWriter writer = assemblyBuilder.CreateCodeFile (this)) {
-				CodeDomProvider provider = uccompiler.Provider;
-				CodeCompileUnit unit = uccompiler.CompileUnit;
-				provider.CreateGenerator().GenerateCodeFromCompileUnit (unit, writer, null);
-			}
-		}
-
-		public override Type GetGeneratedType (CompilerResults results)
-		{
-			// This is not called if compilation failed.
-			// Returning null makes the caller throw an InvalidCastException
-			Assembly assembly = results.CompiledAssembly;
-			return assembly.GetType (uccompiler.Parser.ClassName);
-		}
-
-		public override CompilerType CodeCompilerType {
-			get { return compiler_type; }
-		}
-
-		// FIXME: figure this out.
-		public override ICollection VirtualPathDependencies {
-			get {
-				return uccompiler.Parser.Dependencies;
-			}
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/UserControlCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/UserControlCompiler.cs
index 25a755d01d3..80f1191557c 100644
--- a/mcs/class/System.Web/System.Web.Compilation/UserControlCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/UserControlCompiler.cs
@@ -71,18 +71,6 @@ namespace System.Web.Compilation
 		{
 			cad.Arguments.Add (new CodeAttributeArgument (new CodePrimitiveExpression (obj)));
 		}
-
-		protected override void AddStatementsToInitMethod (CodeMemberMethod method)
-		{
-#if NET_2_0
-			if (parser.MasterPageFile != null) {
-				CodeExpression prop;
-				prop = new CodePropertyReferenceExpression (new CodeArgumentReferenceExpression("__ctrl"), "MasterPageFile");
-				CodeExpression ct = new CodePrimitiveExpression (parser.MasterPageFile);
-				method.Statements.Add (new CodeAssignStatement (prop, ct));
-			}
-#endif
-		}
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.Compilation/WebHandlerBuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/WebHandlerBuildProvider.cs
deleted file mode 100644
index 3b56689c66f..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/WebHandlerBuildProvider.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// System.Web.Compilation.WebHandlerBuildProvider
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	sealed class WebHandlerBuildProvider : BuildProvider {
-		WebServiceCompiler wscompiler;
-		CompilerType compiler_type;
-
-		public WebHandlerBuildProvider ()
-		{
-		}
-
-		public override void GenerateCode (AssemblyBuilder assemblyBuilder)
-		{
-			HttpContext context = HttpContext.Current;
-			WebHandlerParser parser = new WebHandlerParser (context, VirtualPath, OpenReader ());
-			wscompiler = new WebServiceCompiler (parser);
-			compiler_type = GetDefaultCompilerTypeForLanguage (parser.Language);
-			if (parser.Program.Trim () == "")
-				return;
-
-			using (TextWriter writer = assemblyBuilder.CreateCodeFile (this)) {
-				writer.WriteLine (parser.Program);
-			}
-		}
-
-		public override Type GetGeneratedType (CompilerResults results)
-		{
-			SimpleWebHandlerParser parser = wscompiler.Parser;
-			Type type = null;
-			if (parser.Program.Trim () == "") {
-				type = parser.GetTypeFromBin (parser.ClassName);
-				return type;
-			}
-
-			Assembly assembly = results.CompiledAssembly;
-			return assembly.GetType (parser.ClassName);
-		}
-
-		public override CompilerType CodeCompilerType {
-			get { return compiler_type; }
-		}
-
-		// FIXME: figure this out.
-		public override ICollection VirtualPathDependencies {
-			get {
-				return wscompiler.Parser.Dependencies;
-			}
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/WebServiceBuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/WebServiceBuildProvider.cs
deleted file mode 100644
index 91462ce6509..00000000000
--- a/mcs/class/System.Web/System.Web.Compilation/WebServiceBuildProvider.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// System.Web.Compilation.WebServiceBuildProvider
-//
-// Authors:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Web.UI;
-
-namespace System.Web.Compilation {
-
-	sealed class WebServiceBuildProvider : BuildProvider {
-		WebServiceCompiler wscompiler;
-		CompilerType compiler_type;
-
-		public WebServiceBuildProvider ()
-		{
-		}
-
-		public override void GenerateCode (AssemblyBuilder assemblyBuilder)
-		{
-			HttpContext context = HttpContext.Current;
-			WebServiceParser parser = new WebServiceParser (context, VirtualPath, OpenReader ());
-			wscompiler = new WebServiceCompiler (parser);
-			compiler_type = GetDefaultCompilerTypeForLanguage (parser.Language);
-			if (parser.Program.Trim () == "")
-				return;
-
-			using (TextWriter writer = assemblyBuilder.CreateCodeFile (this)) {
-				writer.WriteLine (parser.Program);
-			}
-		}
-
-		public override Type GetGeneratedType (CompilerResults results)
-		{
-			SimpleWebHandlerParser parser = wscompiler.Parser;
-			Type type = null;
-			if (parser.Program.Trim () == "") {
-				type = parser.GetTypeFromBin (parser.ClassName);
-				return type;
-			}
-
-			Assembly assembly = results.CompiledAssembly;
-			return assembly.GetType (parser.ClassName);
-		}
-
-		public override CompilerType CodeCompilerType {
-			get { return compiler_type; }
-		}
-
-		// FIXME: figure this out.
-		public override ICollection VirtualPathDependencies {
-			get {
-				return wscompiler.Parser.Dependencies;
-			}
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/WebServiceCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/WebServiceCompiler.cs
index 702239fd4ef..d5011f10bba 100644
--- a/mcs/class/System.Web/System.Web.Compilation/WebServiceCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/WebServiceCompiler.cs
@@ -70,11 +70,10 @@ namespace System.Web.Compilation
 			}
 
 			string lang = parser.Language;
-#if NET_2_0
-			CompilationSection config = (CompilationSection)WebConfigurationManager.GetSection ("system.web/compilation");
+#if CONFIGURATION_2_0
+			CompilationSection config = (CompilationSection)WebConfigurationManager.GetWebApplicationSection ("system.web/compilation");
 			Compiler c = config.Compilers[lang];
-			Type t = Type.GetType (c.Type, true);
-			provider = Activator.CreateInstance (t) as CodeDomProvider;
+			provider = (c == null) ? null : c.Provider;
 #else
 			CompilationConfiguration config;
 			config = CompilationConfiguration.GetInstance (parser.Context);
@@ -88,7 +87,7 @@ namespace System.Web.Compilation
 
 			compilerParameters = CachingCompiler.GetOptions (parser.Assemblies);
 			compilerParameters.IncludeDebugInformation = parser.Debug;
-#if NET_2_0
+#if CONFIGURATION_2_0
 			compilerParameters.CompilerOptions = c.CompilerOptions;
 			compilerParameters.WarningLevel = c.WarningLevel;
 #else
diff --git a/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog b/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog
deleted file mode 100644
index 75c18b75883..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration.Internal/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* IInternalConfigWebHost.cs: corcompare work.
-
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* IInternalConfigWebHost.cs: new 2.0 interface.
-
diff --git a/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs b/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs
deleted file mode 100644
index 6fb8b5b7f1d..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration.Internal/IInternalConfigWebHost.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// System.Web.Configuration.Internal.IInternalConfigWebHost
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.InteropServices;
-using System.Configuration;
-using System.Xml;
-
-#if NET_2_0
-
-namespace System.Web.Configuration.Internal {
-
-	[ComVisible (false)]
-	public interface IInternalConfigWebHost {
-
-		string GetConfigPathFromSiteIDAndVPath (string siteID, string vpath);
-		void GetSiteIDAndVPathFromConfigPath (string configPath, out string siteID, out string vpath);
-
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index 9e1b54e5101..72878fdac89 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,29 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* FormsAuthPasswordFormat.cs: ifdef out the [Serializable] in the
-	2.0 case.
-
-2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* CompilationConfiguration.cs:
-	* CompilationConfigurationHandler.cs: only compile these for
-	pre-2.0 assemblies.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* CompilerCollection.cs: CONFIGURATION_2_0 => NET_2_0.
-
-	* CompilationConfigurationHandler.cs: same.
-
-	* Compiler.cs: same.
-
-	* CompilationConfiguration.cs: same.
-
-2006-01-08  Konstantin Triger <kostat@mainsoft.com>
-
-        * HttpCapabilitiesBase.cs: TARGET_JVM changes to let the compilation
-                pass with csc 1.1.
-
 2005-12-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* WebConfigurationSettings.cs: patch by Cyrille Colin that sets the
diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
index 2f27d9b0c26..29b54eeeff2 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_0
 using System;
 using System.CodeDom.Compiler;
 using System.Collections;
@@ -134,7 +133,7 @@ namespace System.Web.Configuration
 			num_recompiles_before_app_restart = parent.num_recompiles_before_app_restart;
 			strict = parent.strict;
 			temp_directory = parent.temp_directory;
-#if NET_2_0
+#if CONFIGURATION_2_0
 			compilers = new CompilerCollection ();
 #else
 			compilers = new CompilerCollection (parent.compilers);
@@ -215,4 +214,3 @@ namespace System.Web.Configuration
 		}
 	}
 }
-#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
index b3ea431fa9b..6baef7ae2c6 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_0
+
 using System;
 using System.Collections;
 using System.Configuration;
@@ -99,7 +99,7 @@ namespace System.Web.Configuration
 				compiler.Type = AttValue ("type", child);
 				compiler.CompilerOptions = AttValue ("compilerOptions", child, true, true);
 				compiler.WarningLevel = AttUIntValue ("warningLevel", child, 0);
-#if NET_2_0
+#if CONFIGURATION_2_0
 				config.Compilers.Add (compiler);
 #else
 				config.Compilers [compiler.Language] = compiler;
@@ -198,5 +198,4 @@ namespace System.Web.Configuration
 		}
 	}
 }
-#endif
 
diff --git a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
index 5aa29a50cd0..3d552295ff1 100644
--- a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
@@ -28,8 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_0
-/* when NET_2_0 is defined, this class is found in System.Web.Configuration_2.0/ */
+#if !CONFIGURATION_2_0
 
 using System;
 using System.CodeDom.Compiler;
@@ -38,6 +37,9 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
+#if NET_2_0
+	public
+#endif
 	class Compiler
 	{
 		public string Language;
diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
index 78a619b9226..4b6f076d2a1 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
@@ -28,8 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_0
-/* when NET_2_0 is defined, this class is found in System.Web.Configuration_2.0/ */
+#if !CONFIGURATION_2_0
 
 using System;
 using System.Collections;
@@ -37,6 +36,9 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
+#if NET_2_0
+	public
+#endif
 	sealed class CompilerCollection
 	{
 		Hashtable compilers;
@@ -73,5 +75,4 @@ namespace System.Web.Configuration
 		}
 	}
 }
-
 #endif
diff --git a/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs b/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
index 91132fc35f0..5847c2e0bc3 100644
--- a/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
@@ -29,13 +29,11 @@ using System;
 
 namespace System.Web.Configuration {
 
-#if !NET_2_0
 	[Serializable]
-#endif
 	public enum FormsAuthPasswordFormat
 	{
 		Clear,
 		SHA1,
 		MD5
 	}
-}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs b/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs
index 10152dd4085..8e413cad69b 100644
--- a/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs
@@ -35,11 +35,7 @@ namespace System.Web.Configuration
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-#if NET_2_0
 	public partial class HttpCapabilitiesBase
-#else
-	public class HttpCapabilitiesBase
-#endif
 	{
 		Hashtable capabilities;
 
diff --git a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
index 10fe34fb3ea..81584de3b8b 100644
--- a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
@@ -811,7 +811,7 @@ namespace System.Web.Configuration
 				ThrowException ("sectionGroup must have a 'name' attribute.", reader);
 
 			string value = null;
-#if NET_2_0
+#if CONFIGURATION_2_0
 			do {
 				if (reader.Name == "name") {
 					if (value != null)
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
index 05fc123d803..6f30bc2174f 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRule.cs
@@ -223,7 +223,7 @@ namespace System.Web.Configuration {
 		internal bool CheckVerb (string verb)
 		{
 			foreach (string v in Verbs) {
-				if (String.Compare (v, verb, true) == 0)
+				if (verb == v)
 					return true;
 			}
 			return false;
@@ -232,9 +232,7 @@ namespace System.Web.Configuration {
 		internal bool CheckUser (string user)
 		{
 			foreach (string u in Users) {
-				if (String.Compare (u, user, true) == 0 ||
-				    u == "*" ||
-				    (u == "?" && user == ""))
+				if (u == user)
 					return true;
 			}
 			return false;
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleCollection.cs
index cf9c59f83b0..702125ed2d5 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleCollection.cs
@@ -104,7 +104,7 @@ namespace System.Web.Configuration {
 			BaseAdd(index, rule);
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationSection.cs
index 7f0a64f7306..c20b8d31940 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationSection.cs
@@ -69,13 +69,11 @@ namespace System.Web.Configuration {
 
 		internal bool IsValidUser (IPrincipal user, string verb)
 		{
-			string username = (user == null) ? "" : user.Identity.Name;
-
 			foreach (AuthorizationRule rule in Rules) {
 				if (!rule.CheckVerb (verb))
 					continue;
 
-				if (rule.CheckUser (username) || (user != null && rule.CheckRole(user)))
+				if (rule.CheckUser (user.Identity.Name) || rule.CheckRole(user))
 					return (rule.Action == AuthorizationRuleAction.Allow);
 			}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderAppliesTo.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderAppliesTo.cs
new file mode 100644
index 00000000000..5c655fdd5ec
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderAppliesTo.cs
@@ -0,0 +1,43 @@
+//
+// System.Web.Configuration.BuildProviderAppliesTo.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System.Resources;
+
+#if NET_2_0
+namespace System.Web.Configuration
+{
+        [Serializable, Flags]
+        public enum BuildProviderAppliesTo
+        {
+                Web = 1,
+                Code = 2,
+                Resources = 4,
+                All = 7,
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
index 5132c373110..cd2c2e6a08d 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
@@ -92,19 +92,6 @@ namespace System.Web.Configuration
 			BuildProvider prov = (BuildProvider) element;
 			return prov.Extension;
 		}
-
-		internal System.Web.Compilation.BuildProvider GetProviderForExtension (string extension)
-		{
-			foreach (BuildProvider provider in this) {
-				if (extension != provider.Extension)
-					continue;
-
-				Type type = Type.GetType (provider.Type);
-				return (System.Web.Compilation.BuildProvider) Activator.CreateInstance (type, null);
-			}
-
-			return null;
-		}
 	}
 }
 #endif // NET_2_0
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
index a67bbb69d80..c1a79fb5ae3 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
@@ -1,166 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* BuildProviderAppliesTo.cs, PagesToCountAction.cs: nuke.
-
-2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* Compiler.cs:
-	* CompilerCollection.cs: removed compatibility code.
-
-	* BuildProviderCollection.cs: add GetProviderForExtension().
-
-2006-02-02  Chris Toshok  <toshok@ximian.com>
-
-	* WebConfigurationManager.cs (GetSection(string,string)):
-	implement.
-
-2006-02-01  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* TrustLevelCollection.cs, CodeSubDirectoriesCollection.cs,
-	  CustomErrorCollection.cs, CompilerCollection.cs,
-	  HttpHandlerActionCollection.cs,
-	  FormsAuthenticationUserCollection.cs,
-	  AuthorizationRuleCollection.cs, TagPrefixCollection.cs :
-	  CollectionType is public.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* WebConfigurationManager.cs: In the normal case, get the current
-	request's web.config, not the application's.  If there is no
-	current request, get the application's.
-	(GetWebApplicationConfiguration): use Request.ApplicationPath, not
-	Request.PhysicalApplicationPath.  OpenWebConfiguration takes
-	virtual paths.
-
-	* HttpConfigurationSystem.cs: GetWebApplicationSection =>
-	GetSection.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* CompilerCollection.cs: CONFIGURATION_2_0 => NET_2_0
-
-	* Compiler.cs: same.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* HttpConfigurationSystem.cs: SupportsUserConfig == true.  let's
-	use this to determine if ConfigurationManager.AppSettings should
-	be read-only or not.
-
-2006-01-31  Chris Toshok  <toshok@ximian.com>
-
-	* WebConfigurationManager.cs: err, why did i ifdef stuff NET_2_0
-	inside of an ifdef NET_2_0?
-
-2006-01-30  Chris Toshok  <toshok@ximian.com>
-
-	* WebConfigurationManager.cs: lots of little changes.  hopefully
-	this doesn't break anyone.  it fixes all the nunit problems
-	gonzalo was having.
-
-	* WebConfigurationHost.cs (GetStreamName): in the MachineWebPath
-	case, handle the case where we have a WebConfigurationFileMap.
-	(MapPath): this is likely wrong, but in the case where we don't
-	have a file map or current HttpContext, just return the path.
-
-2006-01-29  Chris Toshok  <toshok@ximian.com>
-
-	* HttpModulesSection.cs (LoadModules): I'm not sure we want to
-	solve this problem in this way, but the 1.x code forces
-	DefaultAuthenticationModule to be in the list of modules..
-	Without this fix (or something else) HttpContext.User is null when
-	it shouldn't be.
-
-2006-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* HttpConfigurationSystem.cs: new class that gets sections from
-	web.config files.
-
-	* WebConfigurationManager.cs: change a lot of the
-	NotImplementedExceptions to NotSupportedExceptions.
-	(AppSettings): implement by just returning
-	ConfigurationManager.AppSettings (note this is broken because
-	ConfigurationManager.AppSettings are read-only, but it works for
-	reading.)
-	(ConnectionStrings): same (and probably broken in the same way..)
-	(Init): replace the 2.0 IInternalConfigSystem with our
-	HttpConfigurationSystem.
-
-	* WebConfigurationHost.cs: add a comment about how things are
-	likely to work in the face of IRemoteWebConfigurationHostServer.
-	(CreateConfigurationContext): return a WebContext instance.
-
-2006-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* AuthorizationSection.cs (IsValidUser): instead of a blanket
-	false for a null user, just set the username to "" and short
-	circuit out the check for roles.
-
-2006-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* AuthorizationRule.cs (CheckUser): handle * and ?, and use
-	String.Compare instead of ==.
-	(CheckVerb): use String.Compare instead of ==.
-
-	* AuthorizationSection.cs (IsValidUser): return false for a null
-	user.
-
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* GlobalizationSection.cs (VerifyData): quiet mcs.
-
-2006-01-18  Chris Toshok  <toshok@ximian.com>
-
-	* SystemWebSectionGroup.cs: wrap System.Web.Services references in
-	WEBSERVICES_DEP.
-
-2006-01-16  Chris Toshok  <toshok@ximian.com>
-
-	* WebConfigurationManager.cs: implement a IConfigurationSystem for
-	use with WebConfigurationManager.
-	(GetSection): try to load the section
-	using GetWebApplicationSection before calling into
-	ConfigurationManager.GetSection.
-	(GetWebApplicationConfiguration): move common code to here.
-	(GetWebApplicationSection): use GetWebApplicationConfiguration.
-	(AppSettings): implement.
-
-	* WebConfigurationHost.cs (GetWebConfigFileName): add
-	"Web.Config", and move to an array/loop implementation.  maybe we
-	should scan the directory and check ToLower() instead of
-	explicitly enumerating?
-
-2006-01-10  Chris Toshok  <toshok@ximian.com>
-
-	* SystemWebSectionGroup.cs (HostingEnvironment): enable this property.
-	(ProcessModel): add the ConfigurationPropertyAttribute.
-
-2006-01-10  Chris Toshok  <toshok@ximian.com>
-
-	* PagesSection.cs (.cctor): fix the default value for the
-	enableSessionState attribute - it's not a bool, but a
-	PagesEnableSessionState enum.
-
-2006-01-10  Chris Toshok  <toshok@ximian.com>
-
-	* MachineKeySection.cs (ValidationKeyBytes, DecryptionKeyBytes,
-	DecryptionKey192Bits): if the keys are null, generate them.  Fixes
-	Page.EnableViewStateMac support.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* RoleManagerSection.cs, SqlCacheDepencendySection.cs,
-	SessionStateSection.cs, TraceSection.cs, SecurityPolicySection.cs,
-	PagesSection.cs, RulesSettings.cs, UrlMappingSection.cs: fix
-	dumper output.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* ExpressionBuilderCollection.cs (.cctor): no need to create a
-	collection property here.  we're already in the collection.
-
-	* CompilationSection.cs: fix typo.
-
 2006-01-04  Chris Toshok  <toshok@ximian.com>
 
 	* MachineKeySection.cs: bring over some more internal methods from
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/CodeSubDirectoriesCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/CodeSubDirectoriesCollection.cs
index ae84c3af607..3354d9c0d88 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/CodeSubDirectoriesCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/CodeSubDirectoriesCollection.cs
@@ -54,7 +54,7 @@ namespace System.Web.Configuration
 			set { if (BaseGet (index) != null) BaseRemoveAt (index); BaseAdd (index, value); }
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMap; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/CompilationSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/CompilationSection.cs
index 63b8acba3cc..83537ec919e 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/CompilationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/CompilationSection.cs
@@ -63,7 +63,7 @@ namespace System.Web.Configuration
 								    ConfigurationPropertyOptions.None);
 			assemblyPostProcessorTypeProp = new ConfigurationProperty ("assemblyPostProcessorType", typeof (string), "");
 			batchProp = new ConfigurationProperty ("batch", typeof (bool), true);
-			buildProvidersProp = new ConfigurationProperty ("buildProviders", typeof (BuildProviderCollection), null,
+			buildProvidersProp = new ConfigurationProperty ("buidProviders", typeof (BuildProviderCollection), null,
 									null, PropertyHelper.DefaultValidator,
 									ConfigurationPropertyOptions.None);
 			batchTimeoutProp = new ConfigurationProperty ("batchTimeout", typeof (TimeSpan), new TimeSpan (0, 15, 0),
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
index 67617ec89f3..d2d771510c3 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
@@ -29,6 +29,7 @@
 //
 
 #if NET_2_0
+#if CONFIGURATION_2_0
 using System;
 using System.CodeDom.Compiler;
 using System.ComponentModel;
@@ -112,6 +113,24 @@ namespace System.Web.Configuration
 		protected override ConfigurationPropertyCollection Properties {
 			get { return properties; }
 		}
+
+#region CompatabilityCode
+		[MonoTODO ("we shouldn't need this")]
+		CodeDomProvider provider;
+		internal CodeDomProvider Provider {
+			get { 
+				if (provider == null) {
+					Type t = System.Type.GetType (this.Type);
+					provider = Activator.CreateInstance (t) as CodeDomProvider;
+				}
+				return provider;
+			}
+			set {
+				provider = value;
+			}
+		}
+#endregion
 	}
 }
 #endif
+#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
index e129987c6b5..5c3cd911a8b 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
@@ -29,6 +29,7 @@
 //
 
 #if NET_2_0
+#if CONFIGURATION_2_0
 
 using System;
 using System.Configuration;
@@ -83,7 +84,7 @@ namespace System.Web.Configuration
 			}
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMap; }
 		}
 
@@ -108,6 +109,20 @@ namespace System.Web.Configuration
 				return null;
 			}
 		}
+
+#region CompatabilityCode
+		[MonoTODO ("we shouldn't need this..")]
+		internal bool CompareLanguages (string lang1, string lang2)
+		{
+			return (this [lang1] == this [lang2]);
+		}
+
+		internal void Add (Compiler compiler)
+		{
+			BaseAdd (compiler);
+		}
+#endregion
 	}
 }
 #endif
+#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorCollection.cs
index 3aff1cf0591..b9e1932ca25 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorCollection.cs
@@ -114,7 +114,7 @@ namespace System.Web.Configuration {
 			}
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMap; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs
index f2118378b2d..fdb8a0566cc 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs
@@ -79,12 +79,6 @@ namespace System.Web.Configuration {
 			set { base[typeProp] = value; }
 		}
 
-		internal Type TypeInternal {
-			get {
-				return System.Type.GetType (this.Type, true);
-			}
-		}
-
 		protected override ConfigurationPropertyCollection Properties {
 			get { return properties; }
 		}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilderCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilderCollection.cs
index 00bef969c92..bb7b6322c37 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilderCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilderCollection.cs
@@ -42,6 +42,10 @@ namespace System.Web.Configuration
 		static ExpressionBuilderCollection ()
 		{
 			props = new ConfigurationPropertyCollection ();
+			ConfigurationProperty prop = new ConfigurationProperty ("", typeof (ExpressionBuilderCollection), null,
+										null, PropertyHelper.DefaultValidator,
+										ConfigurationPropertyOptions.IsDefaultCollection);
+			props.Add (prop);
 		}
 		
 		public ExpressionBuilderCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthenticationUserCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthenticationUserCollection.cs
index 8eb653de0d5..52669e31184 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthenticationUserCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthenticationUserCollection.cs
@@ -118,7 +118,7 @@ namespace System.Web.Configuration
 			}
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMap; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
index 241e5403fb4..a5187d33447 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
@@ -83,15 +83,17 @@ namespace System.Web.Configuration {
 
 		void VerifyData ()
 		{
+			CultureInfo culture;
+
 			try {
-				new CultureInfo (Culture);
+				culture = new CultureInfo (Culture);
 			}
 			catch {
 				throw new ConfigurationErrorsException ("the <globalization> tag contains an invalid value for the 'culture' attribute");
 			}
 
 			try {
-				new CultureInfo (UICulture);
+				culture = new CultureInfo (UICulture);
 			}
 			catch {
 				throw new ConfigurationErrorsException ("the <globalization> tag contains an invalid value for the 'uiCulture' attribute");
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpConfigurationSystem.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpConfigurationSystem.cs
deleted file mode 100644
index 00415cdc3fb..00000000000
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpConfigurationSystem.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// System.Configuration.HttpConfigurationSystem.cs
-//
-// Authors:
-//  Chris Toshok (toshok@ximian.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-
-#if NET_2_0
-
-using System;
-using System.Reflection;
-using System.Configuration.Internal;
-
-namespace System.Web.Configuration {
-
-	internal class HttpConfigurationSystem : IInternalConfigSystem
-	{
-		object IInternalConfigSystem.GetSection (string configKey)
-		{
-			return WebConfigurationManager.GetSection (configKey);
-		}
-
-		void IInternalConfigSystem.RefreshConfig (string sectionName)
-		{
-		}
-
-		bool IInternalConfigSystem.SupportsUserConfig {
-			get { return true; }
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpHandlerActionCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpHandlerActionCollection.cs
index 56821fd81c9..b0b83d77b55 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpHandlerActionCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpHandlerActionCollection.cs
@@ -89,7 +89,7 @@ namespace System.Web.Configuration
 			BaseRemoveAt (index);
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.AddRemoveClearMapAlternate; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs
index 6b674b22e3c..bbcfd41e1d5 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs
@@ -32,7 +32,6 @@
 
 using System;
 using System.Configuration;
-using System.Web.Security;
 
 namespace System.Web.Configuration
 {
@@ -80,16 +79,6 @@ namespace System.Web.Configuration
 				coll.AddModule (item.Name, module);
 			}
 
-			/* XXX the 1.x config stuff does this
-			 * indirectly..  I'm not sure we want to do it
-			 * here, but this keeps things working in much
-			 * the same fashion in 2.0-land. */
-			{
-				IHttpModule module = new DefaultAuthenticationModule ();
-				module.Init (app);
-				coll.AddModule ("DefaultAuthentication", module);
-			}
-
 			return coll;
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeySection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeySection.cs
index 0ba0a10bd74..f5c11d68c67 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeySection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeySection.cs
@@ -191,27 +191,15 @@ namespace System.Web.Configuration {
 		}
 		
 		internal byte [] ValidationKeyBytes {
-			get {
-				if (validation_key == null)
-					SetValidationKey (ValidationKey);
-				return validation_key;
-			}
+			get { return validation_key; }
 		}
 
 		internal byte [] DecryptionKeyBytes {
-			get {
-				if (decryption_key == null)
-					SetDecryptionKey (DecryptionKey);
-				return decryption_key;
-			}
+			get { return decryption_key; }
 		}
 
 		internal byte [] DecryptionKey192Bits {
-			get {
-				if (decryption_key_192bits == null)
-					SetDecryptionKey (DecryptionKey);
-				return decryption_key_192bits;
-			}
+			get { return decryption_key_192bits; }
 		}
 #endregion
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/PagesSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/PagesSection.cs
index 768f4b1c39d..aba225ea79d 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/PagesSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/PagesSection.cs
@@ -72,10 +72,9 @@ namespace System.Web.Configuration
 								      ConfigurationPropertyOptions.None);
 			autoEventWireupProp = new ConfigurationProperty ("autoEventWireup", typeof(bool), true);
 			bufferProp = new ConfigurationProperty ("buffer", typeof(bool), false);
-			controlsProp = new ConfigurationProperty ("controls", typeof(TagPrefixCollection), null,
-								  null, null, ConfigurationPropertyOptions.None);
+			controlsProp = new ConfigurationProperty ("controls", typeof(TagPrefixCollection), null);
 			enableEventValidationProp = new ConfigurationProperty ("enableEventValidation", typeof (bool), true);
-			enableSessionStateProp = new ConfigurationProperty ("enableSessionState", typeof (PagesEnableSessionState), PagesEnableSessionState.True);
+			enableSessionStateProp = new ConfigurationProperty ("enableSessionState", typeof (PagesEnableSessionState), true);
 			enableViewStateProp = new ConfigurationProperty ("enableViewState", typeof (bool), true);
 			enableViewStateMacProp = new ConfigurationProperty ("enableViewStateMac", typeof (bool), true);
 			maintainScrollPositionOnPostBackProp = new ConfigurationProperty ("maintainScrollPositionOnPostBack", typeof (bool), false);
@@ -84,14 +83,12 @@ namespace System.Web.Configuration
 			modeProp = new ConfigurationProperty ("compilationMode", typeof (CompilationMode), CompilationMode.Always,
 							      new GenericEnumConverter (typeof (CompilationMode)), PropertyHelper.DefaultValidator,
 							      ConfigurationPropertyOptions.None);
-			namespacesProp = new ConfigurationProperty ("namespaces", typeof (NamespaceCollection), null,
-								    null, null, ConfigurationPropertyOptions.None);
+			namespacesProp = new ConfigurationProperty ("namespacesProp", typeof (NamespaceCollection), null);
 			pageBaseTypeProp = new ConfigurationProperty ("pageBaseType", typeof (string), "System.Web.UI.Page");
 			pageParserFilterTypeProp = new ConfigurationProperty ("pageParserFilterType", typeof (string), "");
 			smartNavigationProp = new ConfigurationProperty ("smartNavigation", typeof (bool), false);
 			styleSheetThemeProp = new ConfigurationProperty ("styleSheetTheme", typeof (string), "");
-			tagMappingProp = new ConfigurationProperty ("tagMapping", typeof (TagMapCollection), null,
-								    null, null, ConfigurationPropertyOptions.None);
+			tagMappingProp = new ConfigurationProperty ("tagMapping", typeof (TagMapCollection), null);
 			themeProp = new ConfigurationProperty ("theme", typeof (string), "");
 			userControlBaseTypeProp = new ConfigurationProperty ("userControlBaseType", typeof (string), "System.Web.UI.UserControl");
 			validateRequestProp = new ConfigurationProperty ("validateRequest", typeof (bool), true);
@@ -103,7 +100,6 @@ namespace System.Web.Configuration
 			properties.Add (asyncTimeoutProp);
 			properties.Add (autoEventWireupProp);
 			properties.Add (bufferProp);
-			properties.Add (controlsProp);
 			properties.Add (enableEventValidationProp);
 			properties.Add (enableSessionStateProp);
 			properties.Add (enableViewStateProp);
@@ -112,12 +108,10 @@ namespace System.Web.Configuration
 			properties.Add (masterPageFileProp);
 			properties.Add (maxPageStateFieldLengthProp);
 			properties.Add (modeProp);
-			properties.Add (namespacesProp);
 			properties.Add (pageBaseTypeProp);
 			properties.Add (pageParserFilterTypeProp);
 			properties.Add (smartNavigationProp);
 			properties.Add (styleSheetThemeProp);
-			properties.Add (tagMappingProp);
 			properties.Add (themeProp);
 			properties.Add (userControlBaseTypeProp);
 			properties.Add (validateRequestProp);
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/PagesToCountAction.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/PagesToCountAction.cs
new file mode 100644
index 00000000000..eb42de35dd6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/PagesToCountAction.cs
@@ -0,0 +1,40 @@
+//
+// System.Web.Configuration.PagesToCountAction.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System.Resources;
+
+#if NET_2_0
+namespace System.Web.Configuration
+{
+        public enum PagesToCountAction
+        {
+                Include = 1,
+                Exclude = 2,
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/RoleManagerSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/RoleManagerSection.cs
index 999296e65bf..5d6c398576e 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/RoleManagerSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/RoleManagerSection.cs
@@ -85,8 +85,7 @@ namespace System.Web.Configuration {
 			domainProp = new ConfigurationProperty ("domain", typeof (string));
 			enabledProp = new ConfigurationProperty ("enabled", typeof (bool), false);
 			maxCachedResultsProp = new ConfigurationProperty ("maxCachedResults", typeof (int), 25);
-			providersProp = new ConfigurationProperty ("providers", typeof (ProviderSettingsCollection), null,
-								   null, null, ConfigurationPropertyOptions.None);
+			providersProp = new ConfigurationProperty ("providers", typeof (ProviderSettingsCollection));
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (cacheRolesInCookieProp);
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettings.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettings.cs
index 2c39d986df1..38349d500c0 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettings.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/RuleSettings.cs
@@ -60,9 +60,7 @@ namespace System.Web.Configuration {
 								      TypeDescriptor.GetConverter (typeof (int)),
 								      new IntegerValidator (1, Int32.MaxValue),
 								      ConfigurationPropertyOptions.None);
-			minIntervalProp = new ConfigurationProperty ("minInterval", typeof (TimeSpan), TimeSpan.FromSeconds (0),
-								     PropertyHelper.InfiniteTimeSpanConverter, null,
-								     ConfigurationPropertyOptions.None);
+			minIntervalProp = new ConfigurationProperty ("minInterval", typeof (TimeSpan), TimeSpan.FromSeconds (0));
 			nameProp = new ConfigurationProperty ("name", typeof (string), "",
 							      TypeDescriptor.GetConverter (typeof (string)),
 							      PropertyHelper.NonEmptyStringValidator,
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SecurityPolicySection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SecurityPolicySection.cs
index 694bb3a0067..34aa3f54938 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/SecurityPolicySection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/SecurityPolicySection.cs
@@ -42,8 +42,7 @@ namespace System.Web.Configuration {
 
 		static SecurityPolicySection ()
 		{
-			Prop = new ConfigurationProperty ("", typeof (TrustLevelCollection), null,
-							  null, null, ConfigurationPropertyOptions.IsDefaultCollection);
+			Prop = new ConfigurationProperty ("", typeof (TrustLevelCollection), null, ConfigurationPropertyOptions.IsDefaultCollection);
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (Prop);
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs
index b0d9d2b0958..c46285128e5 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs
@@ -64,17 +64,12 @@ namespace System.Web.Configuration {
 			cookielessProp = new ConfigurationProperty ("cookieless", typeof (string), null);
 			cookieNameProp = new ConfigurationProperty ("cookieName", typeof (string), "ASP.NET_SessionId");
 			customProviderProp = new ConfigurationProperty ("customProvider", typeof (string), "");
-			modeProp = new ConfigurationProperty ("mode", typeof (SessionStateMode), SessionStateMode.InProc,
-							      new GenericEnumConverter (typeof (SessionStateMode)), null,
-							      ConfigurationPropertyOptions.None);
+			modeProp = new ConfigurationProperty ("mode", typeof (SessionStateMode), SessionStateMode.InProc);
 			partitionResolverTypeProp = new ConfigurationProperty ("partitionResolverType", typeof (string), "");
-			providersProp = new ConfigurationProperty ("providers", typeof (ProviderSettingsCollection), null,
-								   null, null, ConfigurationPropertyOptions.None);
+			providersProp = new ConfigurationProperty ("providers", typeof (ProviderSettingsCollection));
 			regenerateExpiredSessionIdProp = new ConfigurationProperty ("regenerateExpiredSessionId", typeof (bool), true);
 			sessionIDManagerTypeProp = new ConfigurationProperty ("sessionIDManagerType", typeof (string), "");
-			sqlCommandTimeoutProp = new ConfigurationProperty ("sqlCommandTimeout", typeof (TimeSpan), TimeSpan.FromSeconds (30),
-									   PropertyHelper.TimeSpanSecondsOrInfiniteConverter, null,
-									   ConfigurationPropertyOptions.None);
+			sqlCommandTimeoutProp = new ConfigurationProperty ("sqlCommandTimeout", typeof (TimeSpan), TimeSpan.FromSeconds (30));
 			sqlConnectionStringProp = new ConfigurationProperty ("sqlConnectionString", typeof (string), "data source=localhost;Integrated Security=SSPI");
 			stateConnectionStringProp = new ConfigurationProperty ("stateConnectionString", typeof (string), "tcpip=loopback:42424");
 			stateNetworkTimeoutProp = new ConfigurationProperty ("stateNetworkTimeout", typeof (TimeSpan), TimeSpan.FromSeconds (10),
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SqlCacheDependencySection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SqlCacheDependencySection.cs
index 4f2772c6e2f..fadc571d209 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/SqlCacheDependencySection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/SqlCacheDependencySection.cs
@@ -46,8 +46,7 @@ namespace System.Web.Configuration {
 
 		static SqlCacheDependencySection ()
 		{
-			databasesProp = new ConfigurationProperty ("databases", typeof (SqlCacheDependencyDatabaseCollection), null,
-								   null, null, ConfigurationPropertyOptions.None);
+			databasesProp = new ConfigurationProperty ("databases", typeof (SqlCacheDependencyDatabaseCollection));
 			enabledProp = new ConfigurationProperty ("enabled", typeof (bool), true);
 			pollTimeProp = new ConfigurationProperty ("pollTime", typeof (int), 60000);
 			properties = new ConfigurationPropertyCollection ();
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs
index 9d4f9cc76b9..4786664fdb5 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs
@@ -32,9 +32,6 @@
 
 using System;
 using System.Configuration;
-#if WEBSERVICES_DEP
-using System.Web.Services.Configuration;
-#endif
 
 namespace System.Web.Configuration
 {
@@ -95,10 +92,12 @@ namespace System.Web.Configuration
 			get { return (HealthMonitoringSection)Sections ["healthMonitoring"]; }
 		}
 
+#if notyet
 		[ConfigurationProperty ("hostingEnvironment")]
 		public HostingEnvironmentSection HostingEnvironment {
 			get { return (HostingEnvironmentSection)Sections ["hostingEnvironment"]; }
 		}
+#endif
 
 		[ConfigurationProperty ("httpCookies")]
 		public HttpCookiesSection HttpCookies {
@@ -145,7 +144,6 @@ namespace System.Web.Configuration
 			get { return (PagesSection)Sections ["pages"]; }
 		}
 
-		[ConfigurationProperty ("processModel")]
 		public ProcessModelSection ProcessModel {
 			get { return (ProcessModelSection)Sections ["processModel"]; }
 		}
@@ -205,7 +203,7 @@ namespace System.Web.Configuration
 			get { return (WebPartsSection)Sections ["webParts"]; }
 		}
 
-#if WEBSERVICES_DEP
+#if notyet
 		[ConfigurationProperty ("webServices")]
 		public WebServicesSection WebServices {
 			get { return (WebServicesSection)Sections ["webServices"]; }
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/TagPrefixCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/TagPrefixCollection.cs
index 032963c93e0..f82a65e7623 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/TagPrefixCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/TagPrefixCollection.cs
@@ -77,7 +77,7 @@ namespace System.Web.Configuration
 		}
 
 		[MonoTODO ("why override this?")]
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMap; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/TraceSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/TraceSection.cs
index 9d46a69a1e3..0f15a248486 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/TraceSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/TraceSection.cs
@@ -58,9 +58,7 @@ namespace System.Web.Configuration {
 								      TypeDescriptor.GetConverter (typeof (int)),
 								      PropertyHelper.IntFromZeroToMaxValidator,
 								      ConfigurationPropertyOptions.None);
-			traceModeProp = new ConfigurationProperty ("traceMode", typeof (TraceDisplayMode), TraceDisplayMode.SortByTime,
-								   new GenericEnumConverter (typeof (TraceDisplayMode)), null,
-								   ConfigurationPropertyOptions.None);
+			traceModeProp = new ConfigurationProperty ("traceMode", typeof (TraceDisplayMode), TraceDisplayMode.SortByTime);
 			writeToDiagnosticsTraceProp = new ConfigurationProperty ("writeToDiagnosticsTrace", typeof (bool), false);
 			properties = new ConfigurationPropertyCollection ();
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs
index 4d6cd7efaea..56316ab5c1b 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/TrustLevelCollection.cs
@@ -92,7 +92,7 @@ namespace System.Web.Configuration {
 			return elementname == "trustlevel";
 		}
 
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get { return ConfigurationElementCollectionType.BasicMap; }
 		}
 
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/UrlMappingsSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/UrlMappingsSection.cs
index e6d6da9c6d5..71f390e6363 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/UrlMappingsSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/UrlMappingsSection.cs
@@ -44,8 +44,7 @@ namespace System.Web.Configuration {
 		static UrlMappingsSection ()
 		{
 			enabledProp = new ConfigurationProperty ("enabled", typeof (bool), true);
-			urlMappingsProp = new ConfigurationProperty ("", typeof (UrlMappingCollection), null,
-								     null, null, ConfigurationPropertyOptions.IsDefaultCollection);
+			urlMappingsProp = new ConfigurationProperty ("", typeof (UrlMappingCollection), null, ConfigurationPropertyOptions.IsDefaultCollection);
 			properties = new ConfigurationPropertyCollection ();
 
 			properties.Add (enabledProp);
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs
index 56c13e7c8b9..a9b92baefeb 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs
@@ -35,16 +35,6 @@ using System.Configuration;
 using System.Configuration.Internal;
 using System.Web.Util;
 
-/*
- * this class needs to be rewritten to support usage of the
- * IRemoteWebConfigurationHostServer interface.  Once that's done, we
- * need an implementation of that interface that talks (through a web
- * service?) to a remote site..
- *
- * for now, though, just implement it as we do
- * System.Configuration.InternalConfigurationHost, i.e. the local
- * case.
- */
 namespace System.Web.Configuration
 {
 	class WebConfigurationHost: IInternalConfigHost
@@ -55,11 +45,7 @@ namespace System.Web.Configuration
 		
 		public virtual object CreateConfigurationContext (string configPath, string locationSubPath)
 		{
-			return new WebContext (WebApplicationLevel.AtApplication /* XXX */,
-					       "" /* site XXX */,
-					       "" /* application path XXX */,
-					       configPath,
-					       locationSubPath);
+			return null;
 		}
 		
 		public virtual object CreateDeprecatedConfigContext (string configPath)
@@ -113,14 +99,12 @@ namespace System.Web.Configuration
 				else
 					return map.MachineConfigFilename;
 			} else if (configPath == MachineWebPath) {
-				string mdir;
-
-				if (map == null)
-					mdir = Path.GetDirectoryName (System.Runtime.InteropServices.RuntimeEnvironment.SystemConfigurationFile);
+				if (map == null) {
+					string mdir = Path.GetDirectoryName (System.Runtime.InteropServices.RuntimeEnvironment.SystemConfigurationFile);
+					return GetWebConfigFileName (mdir);
+				}
 				else
-					mdir = Path.GetDirectoryName (map.MachineConfigFilename);
-
-				return GetWebConfigFileName (mdir);
+					return null;
 			}
 			
 			string dir = MapPath (configPath);
@@ -199,11 +183,8 @@ namespace System.Web.Configuration
 		{
 			if (map != null)
 				return MapPathFromMapper (virtualPath);
-			else if (HttpContext.Current != null
-				 && HttpContext.Current.Request != null)
-				return HttpContext.Current.Request.MapPath (virtualPath);
 			else
-				return virtualPath;
+				return HttpContext.Current.Request.MapPath (virtualPath);
 		}
 		
 		public string NormalizeVirtualPath (string virtualPath)
@@ -252,14 +233,12 @@ namespace System.Web.Configuration
 
 		string GetWebConfigFileName (string dir)
 		{
-			string[] filenames = new string[] {"Web.Config", "Web.config", "web.config" };
-
-			foreach (string fn in filenames) {
-				string file = Path.Combine (dir, fn);
-				if (File.Exists (file))
-					return file;
-			}
-
+			string file = Path.Combine (dir, "Web.config");
+			if (File.Exists (file))
+				return file;
+			file = Path.Combine (dir, "web.config");
+			if (File.Exists (file))
+				return file;
 			return null;
 		}
 		
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs
index ca6136caf4b..ee96ba12812 100644
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs
@@ -58,20 +58,17 @@ namespace System.Web.Configuration {
 			return ConfigurationManager.OpenMachineConfiguration ();
 		}
 		
-		[MonoTODO ("need to handle locationSubPath")]
+		[MonoTODO]
 		public static _Configuration OpenMachineConfiguration (string locationSubPath)
 		{
-			return OpenMachineConfiguration ();
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
 		public static _Configuration OpenMachineConfiguration (string locationSubPath,
 								       string server)
 		{
-			if (server == null)
-				return OpenMachineConfiguration (locationSubPath);
-
-			throw new NotSupportedException ("Mono doesn't support remote configuration");
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -79,9 +76,7 @@ namespace System.Web.Configuration {
 								       string server,
 								       IntPtr userToken)
 		{
-			if (server == null)
-				return OpenMachineConfiguration (locationSubPath);
-			throw new NotSupportedException ("Mono doesn't support remote configuration");
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -90,9 +85,7 @@ namespace System.Web.Configuration {
 								       string userName,
 								       string password)
 		{
-			if (server == null)
-				return OpenMachineConfiguration (locationSubPath);
-			throw new NotSupportedException ("Mono doesn't support remote configuration");
+			throw new NotImplementedException ();
 		}
 
 		public static _Configuration OpenWebConfiguration (string path)
@@ -124,16 +117,13 @@ namespace System.Web.Configuration {
 		[MonoTODO]
 		public static _Configuration OpenWebConfiguration (string path, string site, string locationSubPath, string server, string userName, string password)
 		{
-			if (path == null)
-				path = "";
-
 			string basePath = GetBasePath (path);
 			_Configuration conf;
 			
 			lock (configurations) {
 				conf = (_Configuration) configurations [basePath];
 				if (conf == null) {
-					conf = ConfigurationFactory.Create (typeof(WebConfigurationHost), null, basePath, site, locationSubPath, server, userName, password);
+					conf = ConfigurationFactory.Create (typeof(WebConfigurationHost), null, path, site, locationSubPath, server, userName, password);
 					configurations [basePath] = conf;
 				}
 			}
@@ -181,70 +171,54 @@ namespace System.Web.Configuration {
 			return ConfigurationFactory.Create (typeof(WebConfigurationHost), fileMap);
 		}
 
-		[MonoTODO ("need to handle locationSubPath")]
+		[MonoTODO]
 		public static _Configuration OpenMappedMachineConfiguration (ConfigurationFileMap fileMap,
 									     string locationSubPath)
 		{
-			return OpenMappedMachineConfiguration (fileMap);
+			throw new NotImplementedException ();
 		}
 
-		[MonoTODO ("apparently this bad boy can return null, but GetWebApplicationSection doesn't")]
+		[MonoTODO ("this shouldn't call ConfigurationManager.GetSection")]
 		public static object GetSection (string sectionName)
 		{
-			try {
-				_Configuration c = OpenWebConfiguration (HttpContext.Current.Request.Path);
-				return c.GetSection (sectionName);
-			}
-			catch {
-				return GetWebApplicationSection (sectionName);
-			}
+			return ConfigurationManager.GetSection (sectionName);
 		}
 
 		[MonoTODO]
 		public static object GetSection (string sectionName, string path)
 		{
-			try {
-				_Configuration c = OpenWebConfiguration (path);
-				return c.GetSection (sectionName);
-			}
-			catch {
-				return null;
-			}
+			throw new NotImplementedException ();
 		}
 
-		static _Configuration GetWebApplicationConfiguration ()
+		[MonoTODO]
+		public static object GetWebApplicationSection (string sectionName)
 		{
 			_Configuration config;
 
 			if (HttpContext.Current == null
 			    || HttpContext.Current.Request == null
-			    || HttpContext.Current.Request.ApplicationPath == null
-			    || HttpContext.Current.Request.ApplicationPath == "") {
-				config = OpenWebConfiguration ("");
-			}
-			else {
-				config = OpenWebConfiguration (HttpContext.Current.Request.ApplicationPath);
-			}
-
-			return config;
-		}
-
-		[MonoTODO]
-		public static object GetWebApplicationSection (string sectionName)
-		{
-			_Configuration config = GetWebApplicationConfiguration ();
+			    || HttpContext.Current.Request.PhysicalApplicationPath == null)
+				config = OpenMachineConfiguration ();
+			else
+				config = OpenWebConfiguration (HttpContext.Current.Request.PhysicalApplicationPath);
 
 			ConfigurationSection section = config.GetSection (sectionName);
 
 			return section;
 		}
 
+		[MonoTODO]
 		public static NameValueCollection AppSettings {
-			get { return ConfigurationManager.AppSettings; }
+			get {
+				throw new NotImplementedException ();
+			}
 		}
 
+		[MonoTODO]
 		public static ConnectionStringSettingsCollection ConnectionStrings {
-			get { return ConfigurationManager.ConnectionStrings; }
+			get {
+				throw new NotImplementedException ();
+			}
 		}
 
 		internal static IInternalConfigConfigurationFactory ConfigurationFactory {
@@ -253,7 +227,7 @@ namespace System.Web.Configuration {
 		
 		static string GetBasePath (string path)
 		{
- 			if (path == "/" || path == "")
+ 			if (path == "/")
 				return path;
 			
 			string pd = HttpContext.Current.Request.MapPath (path);
@@ -267,117 +241,7 @@ namespace System.Web.Configuration {
 				path = path.Substring (0, path.Length - 1);
 			return path;
 		}
-
-
-#region stuff copied from WebConfigurationSettings
-#if TARGET_J2EE
-		static private IConfigurationSystem oldConfig {
-			get {
-				return (IConfigurationSystem)AppDomain.CurrentDomain.GetData("WebConfigurationManager.oldConfig");
-			}
-			set {
-				AppDomain.CurrentDomain.SetData("WebConfigurationManager.oldConfig", value);
-			}
-		}
-
-		static private Web20DefaultConfig config {
-			get {
-				return (Web20DefaultConfig)AppDomain.CurrentDomain.GetData("WebConfigurationManager.config");
-			}
-			set {
-				AppDomain.CurrentDomain.SetData("WebConfigurationManager.config", value);
-			}
-		}
-#else
-		static Web20DefaultConfig config;
-		static IInternalConfigSystem configSystem;
-#endif
-		const BindingFlags privStatic = BindingFlags.NonPublic | BindingFlags.Static;
-		static readonly object lockobj = new object ();
-
-		public static void Init ()
-		{
-			lock (lockobj) {
-				if (config != null)
-					return;
-
-				/* deal with the ConfigurationSettings stuff */
-				{
-					Web20DefaultConfig settings = Web20DefaultConfig.GetInstance ();
-					Type t = typeof (ConfigurationSettings);
-					MethodInfo changeConfig = t.GetMethod ("ChangeConfigurationSystem",
-									       privStatic);
-
-					if (changeConfig == null)
-						throw new ConfigurationException ("Cannot find method CCS");
-
-					object [] args = new object [] {settings};
-					changeConfig.Invoke (null, args);
-					config = settings;
-
-					config.Init ();
-				}
-
-				/* deal with the ConfigurationManager stuff */
-				{
-					HttpConfigurationSystem system = new HttpConfigurationSystem ();
-					Type t = typeof (ConfigurationManager);
-					MethodInfo changeConfig = t.GetMethod ("ChangeConfigurationSystem",
-									       privStatic);
-
-					if (changeConfig == null)
-						throw new ConfigurationException ("Cannot find method CCS");
-
-					object [] args = new object [] {system};
-					changeConfig.Invoke (null, args);
-					configSystem = system;
-				}
-			}
-		}
-	}
-
-	class Web20DefaultConfig : IConfigurationSystem
-	{
-#if TARGET_J2EE
-		static private Web20DefaultConfig instance {
-			get {
-				Web20DefaultConfig val = (Web20DefaultConfig)AppDomain.CurrentDomain.GetData("Web20DefaultConfig.instance");
-				if (val == null) {
-					val = new Web20DefaultConfig();
-					AppDomain.CurrentDomain.SetData("Web20DefaultConfig.instance", val);
-				}
-				return val;
-			}
-			set {
-				AppDomain.CurrentDomain.SetData("Web20DefaultConfig.instance", value);
-			}
-		}
-#else
-		static Web20DefaultConfig instance;
-#endif
-
-		static Web20DefaultConfig ()
-		{
-			instance = new Web20DefaultConfig ();
-		}
-
-		public static Web20DefaultConfig GetInstance ()
-		{
-			return instance;
-		}
-
-		public object GetConfig (string sectionName)
-		{
-			return WebConfigurationManager.GetWebApplicationSection (sectionName);
-		}
-
-		public void Init ()
-		{
-			// nothing. We need a context.
-		}
 	}
-
-#endregion
 }
 
 #endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/AppManagerAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/AppManagerAppDomainFactory.cs
deleted file mode 100644
index c4064d19b1d..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/AppManagerAppDomainFactory.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Web.Hosting.AppManagerAppDomainFactory
-// 
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-
-namespace System.Web.Hosting {
-	public sealed class AppManagerAppDomainFactory : IAppManagerAppDomainFactory {
-		public AppManagerAppDomainFactory ()
-		{
-		}
-
-		[MonoTODO]
-		public object Create (string appId, string appPath)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public void Stop ()
-		{
-			// Stop all the stuff that we Create'd here
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationInfo.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationInfo.cs
deleted file mode 100644
index 5ce539bcf83..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/ApplicationInfo.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// System.Web.Hosting.ApplicationInfo
-// 
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-
-namespace System.Web.Hosting {
-	[Serializable]
-	public sealed class ApplicationInfo {
-		string id;
-		string physical_path;
-		string virtual_path;
-
-		internal ApplicationInfo (string id, string phys, string virt)
-		{
-			this.id = id;
-			this.physical_path = phys;
-			this.virtual_path = virt;
-		}
-
-		public string ID {
-			get { return id; }
-		}
-
-		public string PhysicalPath {
-			get { return physical_path; }
-		}
-
-		public string VirtualPath {
-			get { return virtual_path; }
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationManager.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationManager.cs
deleted file mode 100644
index db69516d8d0..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/ApplicationManager.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-//
-// System.Web.Hosting.ApplicationManager
-// 
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.Permissions;
-using System.Security.Policy;
-using System.Threading;
-
-namespace System.Web.Hosting {
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public sealed class ApplicationManager : MarshalByRefObject {
-		static ApplicationManager instance = new ApplicationManager ();
-		int users;
-		Dictionary <string, BareApplicationHost> id_to_host;
-
-		private ApplicationManager ()
-		{
-			id_to_host = new Dictionary<string, BareApplicationHost> ();
-		}
-
-		public void Close ()
-		{
-			if (Interlocked.Decrement (ref users) == 0)
-				ShutdownAll ();
-		}
-
-		public IRegisteredObject CreateObject (string appId, Type type, string virtualPath,
-							string physicalPath, bool failIfExists)
-		{
-			return CreateObject (appId, type, virtualPath, physicalPath, failIfExists, true);
-		}
-
-		public IRegisteredObject CreateObject (string appId, Type type, string virtualPath,
-							string physicalPath, bool failIfExists, bool throwOnError)
-		{
-			if (appId == null)
-				throw new ArgumentNullException ("appId");
-
-			if (!VirtualPathUtility.IsAbsolute (virtualPath))
-				throw new ArgumentException ("Relative path no allowed.", "virtualPath");
-
-			if (physicalPath == null || physicalPath == "")
-				throw new ArgumentException ("Cannot be null or empty", "physicalPath");
-
-			// 'type' is not checked. If it's null, we'll throw a NullReferenceException
-			if (!typeof (IRegisteredObject).IsAssignableFrom (type)) {
-				string msg = String.Format ("Type '{0}' does not implement IRegisteredObject.", type.Name);
-				throw new ArgumentException (msg, "type");
-			}
-
-			//
-			// ArgumentException is thrown for the physical path from the internal object created
-			// in the new application domain.
-			BareApplicationHost host = null;
-			if (id_to_host.ContainsKey (appId))
-				host = id_to_host [appId];
-
-			IRegisteredObject ireg = null;
-			if (host != null) {
-				ireg = CheckIfExists (host, type, failIfExists);
-				if (ireg != null)
-					return ireg;
-			}
-
-			try {
-				if (host == null)
-					host = CreateHost (appId, virtualPath, physicalPath);
-				ireg = host.CreateInstance (type);
-			} catch (Exception e) {
-				if (throwOnError)
-					throw;
-			}
-
-			if (ireg != null && host.GetObject (type) == null) // If not registered from ctor...
-				host.RegisterObject (ireg, true);
-
-			return ireg;
-		}
-
-		BareApplicationHost CreateHost (string appId, string vpath, string ppath)
-		{
-			BareApplicationHost host;
-			host = (BareApplicationHost) ApplicationHost.CreateApplicationHost (typeof (BareApplicationHost), vpath, ppath);
-			id_to_host [appId] = host;
-			return host;
-		}
-
-		IRegisteredObject CheckIfExists (BareApplicationHost host, Type type, bool failIfExists)
-		{
-			IRegisteredObject ireg = host.GetObject (type);
-			if (ireg == null)
-				return null;
-
-			if (failIfExists) {
-				string msg = String.Format ("Well known object of type '{0}' already " +
-						"exists in this domain.", type.Name);
-				throw new InvalidOperationException (msg);
-			}
-
-			return ireg;
-		}
-
-		public static ApplicationManager GetApplicationManager ()
-		{
-			return instance;
-		}
-
-		public IRegisteredObject GetObject (string appId, Type type)
-		{
-			if (appId == null)
-				throw new ArgumentNullException ("appId");
-
-			if (type == null)
-				throw new ArgumentNullException ("type");
-
-			BareApplicationHost host = null;
-			if (!id_to_host.ContainsKey (appId))
-				return null;
-
-			host = id_to_host [appId];
-			return host.GetObject (type);
-		}
-
-		public ApplicationInfo [] GetRunningApplications ()
-		{
-			ICollection<string> coll = id_to_host.Keys;
-			string [] keys = new string [coll.Count];
-			coll.CopyTo (keys, 0);
-			ApplicationInfo [] result = new ApplicationInfo [coll.Count];
-			int i = 0;
-			foreach (string str in keys) {
-				BareApplicationHost host = id_to_host [str];
-				result [i++] = new ApplicationInfo (str, host.PhysicalPath, host.VirtualPath);
-			}
-
-			return result;
-		}
-
-		public override object InitializeLifetimeService ()
-		{
-			return null;
-		}
-
-		public bool IsIdle ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public void Open ()
-		{
-			Interlocked.Increment (ref users);
-		}
-
-		public void ShutdownAll ()
-		{
-			ICollection<string> coll = id_to_host.Keys;
-			string [] keys = new string [coll.Count];
-			coll.CopyTo (keys, 0);
-			ApplicationInfo [] result = new ApplicationInfo [coll.Count];
-			int i = 0;
-			foreach (string str in keys) {
-				BareApplicationHost host = id_to_host [str];
-				host.Shutdown ();
-			}
-
-			id_to_host.Clear ();
-		}
-
-		public void ShutdownApplication (string appId)
-		{
-			if (appId == null)
-				throw new ArgumentNullException ("appId");
-
-			BareApplicationHost host = id_to_host [appId];
-			if (host == null)
-				return;
-
-			host.Shutdown ();
-		}
-
-		public void StopObject (string appId, Type type)
-		{
-			if (appId == null)
-				throw new ArgumentNullException ("appId");
-
-			if (type == null)
-				throw new ArgumentNullException ("type");
-
-			if (!id_to_host.ContainsKey (appId))
-				return;
-
-			BareApplicationHost host = id_to_host [appId];
-			if (host == null)
-				return;
-
-			host.StopObject (type);
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/BareApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/BareApplicationHost.cs
deleted file mode 100644
index 8d4a44c9a55..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/BareApplicationHost.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// System.Web.Hosting.BareApplicationHost
-// 
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-namespace System.Web.Hosting {
-	class RegisteredItem {
-		public IRegisteredObject Item;
-		public bool AutoClean;
-		public RegisteredItem (IRegisteredObject item, bool autoclean)
-		{
-			this.Item = item;
-			this.AutoClean = autoclean;
-		}
-	}
-
-	sealed class BareApplicationHost : MarshalByRefObject {
-		string vpath;
-		string phys_path;
-		Dictionary<Type, RegisteredItem> hash;
-
-		public BareApplicationHost (string vpath, string phys_path)
-		{
-			this.vpath = vpath;
-			if (!Path.IsPathRooted (phys_path)) {
-				string msg = String.Format ("Invalid physical path: '{0}'", phys_path);
-				throw new ArgumentException (msg, "phys_path");
-			}
-			this.phys_path = phys_path;
-			hash = new Dictionary<Type, RegisteredItem> ();
-			HostingEnvironment.Host = this;
-			AppDomain.CurrentDomain.DomainUnload += OnDomainUnload;
-		}
-
-		public string VirtualPath {
-			get { return vpath; }
-		}
-
-		public string PhysicalPath {
-			get { return phys_path; }
-		}
-
-		public void Shutdown ()
-		{
-			HostingEnvironment.InitiateShutdown ();
-		}
-
-		public void StopObject (Type type)
-		{
-			if (!hash.ContainsKey (type))
-				return;
-
-			RegisteredItem reg = hash [type];
-			reg.Item.Stop (false);
-		}
-
-		public IRegisteredObject CreateInstance (Type type)
-		{
-			return (IRegisteredObject) Activator.CreateInstance (type, null);
-		}
-
-		public void RegisterObject (IRegisteredObject obj, bool auto_clean)
-		{
-			hash [obj.GetType ()] = new RegisteredItem (obj, auto_clean);
-		}
-
-		public bool UnregisterObject (IRegisteredObject obj)
-		{
-			return hash.Remove (obj.GetType ());
-		}
-
-		public IRegisteredObject GetObject (Type type)
-		{
-			if (hash.ContainsKey (type))
-				return hash [type].Item;
-
-			return null;
-		}
-
-		void OnDomainUnload (object sender, EventArgs args)
-		{
-			ICollection<RegisteredItem> values = hash.Values;
-			RegisteredItem [] objects = new RegisteredItem [hash.Count];
-			values.CopyTo (objects, 0);
-
-			foreach (RegisteredItem reg in objects) {
-				try {
-					reg.Item.Stop (true); // Stop should call Unregister. It's ok if not.
-				} catch {
-					// Ignore or throw?
-				}
-			}
-			hash.Clear ();
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
index 13df624e75d..a84dcc8ca33 100644
--- a/mcs/class/System.Web/System.Web.Hosting/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
@@ -1,98 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* IAppDomainFactory.cs: corcompare work.
-
-	* IAppManagerAppDomainFactory.cs: same
-
-	* IISAPIRuntime.cs: same.
-
-2006-02-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* ApplicationManager.cs: implemented ShutdownAll().
-	* HostingEnvironment.cs: remove MonoTODO.
-
-2006-02-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* BareApplicationHost.cs: class used as an entry point into each
-	application domiain from the ApplicationManager.
-	* ApplicationManager.cs: implemented most of the remaining methods.
-	* HostingEnvironment.cs: object handling methods are now implemented.
-
-2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* DefaultVirtualPathProvider.cs: add some comments/TODO.
-	* HostingEnvironment.cs: initialize the default value for
-	VirtualPathProvider.
-
-2006-02-02 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* HostingEnvironment.cs: MapPath is done.
-
-2006-02-02 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* DefaultVirtualDirectory.cs: implemented missing bits.
-	* DefaultVirtualFile.cs: fix ctor scope.
-	* DefaultVirtualPathProvider.cs: implemented GetFile and GetDirectory.
-
-2006-02-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* DefaultVirtualDirectory.cs:
-	* DefaultVirtualPathProvider.cs:
-	* VirtualFile.cs:
-	* DefaultVirtualFile.cs: almost done with the default
-	VirtualPathProvider which just maps to on-disk directories/files.
-
-2006-02-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* SimpleWorkerRequest.cs: implemented RootWebConfigPath.
-	* HostingEnvironment.cs: implemented RegisterVirtualPathProvider and
-	a few other defaults.
-
-2006-01-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* AppManagerAppDomainFactory.cs: stubbed out.
-
-	* ApplicationInfo.cs:
-	* ApplicationManager.cs: add 2 new classes.
-
-2006-01-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* VirtualPathProvider.cs: implemented OpenFile.
-	* VirtualFile.cs: removed stuff cut&pasted from VirtualDirectory.
-
-	* SimpleWorkerRequest.cs: 
-	* HostingEnvironment.cs: class status fixes.
-
-2006-01-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* IProcessHostFactoryHelper.cs:
-	* IProcessPingCallback.cs:
-	* IProcessHost.cs:
-	* IProcessHostSupportFunction.cs:
-	* IHttpWorkerRequestHandler.cs:
-	* IQueueHost.cs:
-	* IApplicationHost.cs: removed all this. They are not longer part of the
-	public API.
-
-2006-01-25 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* VirtualDirectory.cs:
-	* VirtualPathProvider.cs:
-	* VirtualFileBase.cs:
-	* VirtualFile.cs: implemented this base classes.
-
-	* HostingEnvironment.cs: implemented a few properties by using the ones
-	in HttpRuntime.
-
-2006-01-24  Konstantin Triger <kostat@mainsoft.com>
-
-	* ServletWorkerRequest.jvm.cs: convert .invoke requests to PathInfo,
-		remove ToUpper usage.
-
-2006-01-19  Konstantin Triger <kostat@mainsoft.com>
-
-	* ServletWorkerRequest.jvm.cs: refactoring.
-
 2005-11-28  Robert Jordan  <robertj@gmx.net>
 
 	* SimpleWorkerRequest.cs: fixed MapPath () for the case
diff --git a/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualDirectory.cs b/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualDirectory.cs
deleted file mode 100644
index 5abb299bb34..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualDirectory.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// System.Web.Hosting.DefaultVirtualDirectory
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-
-//
-// Copyright (c) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-using System.IO;
-
-namespace System.Web.Hosting {
-
-	class DefaultVirtualDirectory : VirtualDirectory
-	{
-		string phys_dir;
-		string virtual_dir;
-
-		internal DefaultVirtualDirectory (string virtualPath)
-			: base (virtualPath)
-		{
-		}
-
-		void Init ()
-		{
-			if (phys_dir == null) {
-				string vpath = VirtualPath;
-				phys_dir = HostingEnvironment.MapPath (vpath);
-				virtual_dir = VirtualPathUtility.GetDirectory (vpath);
-			}
-		}
-
-		ArrayList AddDirectories (ArrayList list, string dir)
-		{
-			foreach (string name in Directory.GetDirectories (phys_dir)) {
-				string vdir = VirtualPathUtility.Combine (virtual_dir, name);
-				list.Add (new DefaultVirtualDirectory (vdir));
-			}
-			return list;
-		}
-
-		ArrayList AddFiles (ArrayList list, string dir)
-		{
-			foreach (string name in Directory.GetFiles (phys_dir)) {
-				string vdir = VirtualPathUtility.Combine (virtual_dir, name);
-				list.Add (new DefaultVirtualFile (vdir));
-			}
-			return list;
-		}
-
-		public override IEnumerable Children {
-			get {
-				Init ();
-				ArrayList list = new ArrayList ();
-				AddDirectories (list, phys_dir);
-				return AddFiles (list, phys_dir);
-			}
-		}
-
-		public override IEnumerable Directories {
-			get {
-				Init ();
-				ArrayList list = new ArrayList ();
-				return AddDirectories (list, phys_dir);
-			}
-		}
-		
-		public override IEnumerable Files {
-			get {
-				Init ();
-				ArrayList list = new ArrayList ();
-				return AddFiles (list, phys_dir);
-			}
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualFile.cs b/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualFile.cs
deleted file mode 100644
index dc37253b481..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualFile.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Web.Hosting.DefaultVirtualFile
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.IO;
-
-namespace System.Web.Hosting {
-
-	class DefaultVirtualFile : VirtualFile
-	{
-		internal DefaultVirtualFile (string virtualPath)
-			: base (virtualPath)
-		{
-		}
-
-		public override Stream Open ()
-		{
-			return File.OpenRead (HostingEnvironment.MapPath (VirtualPath));
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualPathProvider.cs b/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualPathProvider.cs
deleted file mode 100644
index eecbcdb2305..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/DefaultVirtualPathProvider.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// System.Web.Hosting.DefaultVirtualPathProvider
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.IO;
-using System.Web.Caching;
-using System.Web.Util;
-
-namespace System.Web.Hosting {
-	sealed class DefaultVirtualPathProvider : VirtualPathProvider {
-
-		internal DefaultVirtualPathProvider ()
-		{
-		}
-
-		protected override void Initialize ()
-		{
-		}
-
-		/*
-		 * No need to override this, it seems
-		public override string CombineVirtualPaths (string basePath, string relativePath)
-		{
-			return VirtualPathUtility.Combine (basePath, relativePath);
-		}
-		*/
-
-		public override bool DirectoryExists (string virtualDir)
-		{
-			if (virtualDir == null || virtualDir == "")
-				throw new ArgumentNullException ("virtualDir");
-
-			if (UrlUtils.IsRelativeUrl (virtualDir)) {
-				string msg = String.Format ("The relative virtual path '{0}', is not allowed here.", virtualDir);
-				throw new ArgumentException (msg);
-			}
-
-			string phys_path = HostingEnvironment.MapPath (virtualDir);
-			return Directory.Exists (phys_path);
-		}
-
-		public override bool FileExists (string virtualPath)
-		{
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			if (UrlUtils.IsRelativeUrl (virtualPath)) {
-				string msg = String.Format ("The relative virtual path '{0}', is not allowed here.", virtualPath);
-				throw new ArgumentException (msg);
-			}
-
-			string phys_path = HostingEnvironment.MapPath (virtualPath);
-			return File.Exists (phys_path);
-		}
-
-		public override CacheDependency GetCacheDependency (string virtualPath,
-								IEnumerable virtualPathDependencies,
-								DateTime utcStart)
-		{
-			return null;
-		}
-
-		public override string GetCacheKey (string virtualPath)
-		{
-			return null; // Always
-		}
-
-		public override VirtualDirectory GetDirectory (string virtualDir)
-		{
-			if (virtualDir == null || virtualDir == "")
-				throw new ArgumentNullException ("virtualDir");
-
-			if (UrlUtils.IsRelativeUrl (virtualDir)) {
-				string msg = String.Format ("The relative virtual path '{0}', is not allowed here.", virtualDir);
-				throw new ArgumentException (msg);
-			}
-
-			return new DefaultVirtualDirectory (virtualDir);
-		}
-
-		public override VirtualFile GetFile (string virtualPath)
-		{
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			if (UrlUtils.IsRelativeUrl (virtualPath)) {
-				string msg = String.Format ("The relative virtual path '{0}', is not allowed here.", virtualPath);
-				throw new ArgumentException (msg);
-			}
-
-			return new DefaultVirtualFile (virtualPath);
-		}
-
-		public override string GetFileHash (string virtualPath, IEnumerable virtualPathDependencies)
-		{
-			if (virtualPath == null || virtualPathDependencies == null)
-				throw new NullReferenceException ();
-
-			// No deps -> 1505
-			// Non-existing virtual deps -> 1505
-			// Relative virtual deps -> exception
-			// virtualPath does not matter at all (?)
-			// The number varies accross xsp executions
-			return virtualPath;
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/HostingEnvironment.cs b/mcs/class/System.Web/System.Web.Hosting/HostingEnvironment.cs
index 92de7eda54b..2c26cb35822 100644
--- a/mcs/class/System.Web/System.Web.Hosting/HostingEnvironment.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/HostingEnvironment.cs
@@ -3,11 +3,10 @@
 //
 // Author:
 //	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 
 //
-// Copyright (C) 2005,2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,72 +31,68 @@
 #if NET_2_0
 
 using System;
-using System.Security.Permissions;
-using System.Threading;
 using System.Web.Caching;
-using System.Web.Util;
 
 namespace System.Web.Hosting {
 
-	[AspNetHostingPermission (SecurityAction.Demand, Level = AspNetHostingPermissionLevel.Medium)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.High)]
 	public sealed class HostingEnvironment : MarshalByRefObject
 	{
-		static bool is_hosted;
-		static string site_name;
-		static ApplicationShutdownReason shutdown_reason;
-		internal static BareApplicationHost Host;
-		static VirtualPathProvider vpath_provider = (HttpRuntime.AppDomainAppVirtualPath == null) ? null :
-								new DefaultVirtualPathProvider ();
-		static int busy_count;
-
+		[MonoTODO]
 		public HostingEnvironment ()
 		{
-			// The documentation says that this is called once per domain by the ApplicationManager and
-			// then it throws InvalidOperationException whenever called.
-			throw new InvalidOperationException ();
 		}
 
+		[MonoTODO]
 		public static string ApplicationID {
-			get { return HttpRuntime.AppDomainAppId; }
+			get { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		public static string ApplicationPhysicalPath {
-			get { return HttpRuntime.AppDomainAppPath; }
+			get { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		public static string ApplicationVirtualPath {
-			get { return HttpRuntime.AppDomainAppVirtualPath; }
+			get { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		public static Cache Cache {
-			get { return HttpRuntime.Cache; }
+			get { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		public static Exception InitializationException {
-			get { return HttpApplication.InitializationException; }
+			get { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		public static bool IsHosted {
-			get { return is_hosted; }
+			get { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		public static ApplicationShutdownReason ShutdownReason {
-			get { return shutdown_reason; }
+			get { throw new NotImplementedException (); }
 		}
 
 		[MonoTODO]
 		public static string SiteName {
-			get { return site_name; }
+			get { throw new NotImplementedException (); }
 		}
 
+#if notyet
+		[MonoTODO]
 		public static VirtualPathProvider VirtualPathProvider {
-			get { return vpath_provider; }
+			get { throw new NotImplementedException (); }
 		}
+#endif
 
+		[MonoTODO]
 		public static void DecrementBusyCount ()
 		{
-			Interlocked.Decrement (ref busy_count);
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -118,56 +113,43 @@ namespace System.Web.Hosting {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static void IncrementBusyCount ()
 		{
-			Interlocked.Increment (ref busy_count);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public override object InitializeLifetimeService ()
 		{
-			return null;
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static void InitiateShutdown ()
 		{
-			HttpRuntime.UnloadAppDomain ();
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string MapPath (string virtualPath)
 		{
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			if (UrlUtils.IsRelativeUrl (virtualPath)) {
-				string msg = String.Format ("The relative virtual path '{0}', is not allowed here.", virtualPath);
-				throw new ArgumentException (msg);
-			}
-
-			HttpContext context = HttpContext.Current;
-			if (context == null)
-				return null;
-
-			return context.Request.MapPath (virtualPath);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static void RegisterObject (IRegisteredObject obj)
 		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			Host.RegisterObject (obj, false);
+			throw new NotImplementedException ();
 		}
 
+#if notyet
+		[MonoTODO]
 		public static void RegisterVirtualPathProvider (VirtualPathProvider virtualPathProvider)
 		{
-			if (HttpRuntime.AppDomainAppVirtualPath == null)
-				throw new InvalidOperationException ();
-
-			if (virtualPathProvider == null)
-				throw new ArgumentNullException ("virtualPathProvider");
-
-			virtualPathProvider.SetPrevious (vpath_provider);
-			vpath_provider = virtualPathProvider;
+			throw new NotImplementedException ();
 		}
+#endif
 		
 		[MonoTODO]
 		public static IDisposable SetCultures (string virtualPath)
@@ -181,13 +163,13 @@ namespace System.Web.Hosting {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static void UnregisterObject (IRegisteredObject obj)
 		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			Host.UnregisterObject (obj);
+			throw new NotImplementedException ();
 		}
 	}
+
 }
 
 #endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
index accbb6ff3ba..fa4a9621a96 100644
--- a/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
@@ -35,7 +35,6 @@ namespace System.Web.Hosting
 {
 	[Guid ("e6e21054-a7dc-4378-877d-b7f4a2d7e8ba")]
 	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-	[ComImportAttribute]
 	public interface IAppDomainFactory
 	{
 		[return: MarshalAs (UnmanagedType.Interface)]
diff --git a/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs
index 911be941de4..198298ed6a3 100644
--- a/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/IAppManagerAppDomainFactory.cs
@@ -32,14 +32,9 @@ using System.Runtime.InteropServices;
 
 namespace System.Web.Hosting
 {
-	[GuidAttribute ("02998279-7175-4D59-AA5A-FB8E44D4CA9D")]
-	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-	[ComImportAttribute]
         public interface IAppManagerAppDomainFactory
         {
-		[return: MarshalAs (UnmanagedType.Interface)]
-                object Create ([In, MarshalAs(UnmanagedType.BStr)] string s,
-			       [In, MarshalAs(UnmanagedType.BStr)] string app_id);
+                object Create ([In] string s, [In] string app_id);
                 void Stop ();
         }
 }
diff --git a/mcs/class/System.Web/System.Web.Hosting/IApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/IApplicationHost.cs
new file mode 100644
index 00000000000..357db17d3a7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IApplicationHost.cs
@@ -0,0 +1,46 @@
+//
+// System.Web.Hosting.IApplicationHost.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IApplicationHost
+        {
+                IntPtr GetConfigToken ();
+                string GetPhysicalPath ();
+                string GetSiteName ();
+                string GetVirtualPath ();
+                bool IsHostProcessMultiInstance ();
+                string MapPath ([In] string s);
+                void MessageReceived ();
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IHttpWorkerRequestHandler.cs b/mcs/class/System.Web/System.Web.Hosting/IHttpWorkerRequestHandler.cs
new file mode 100644
index 00000000000..c75ccb2a2af
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IHttpWorkerRequestHandler.cs
@@ -0,0 +1,40 @@
+//
+// System.Web.Hosting.IHttpWorkerRequestHandler.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System;
+using System.Web;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IHttpWorkerRequestHandler
+        {
+                void ProcessRequest (HttpWorkerRequest worker_request);
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs b/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
index 646b2cb34c5..8c1a0e62bed 100644
--- a/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
@@ -36,7 +36,6 @@ namespace System.Web.Hosting
 	//[Guid ("c4918956-485b-3503-bd10-9083e3f6b66c")] -> 1.1 pre service pack
 	[Guid ("08A2C56F-7C16-41C1-A8BE-432917A1A2D1")]
 	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-	[ComImportAttribute]
 	public interface IISAPIRuntime
 	{
 		void DoGCCollect ();
diff --git a/mcs/class/System.Web/System.Web.Hosting/IProcessHost.cs b/mcs/class/System.Web/System.Web.Hosting/IProcessHost.cs
new file mode 100644
index 00000000000..3803b2af725
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IProcessHost.cs
@@ -0,0 +1,74 @@
+//
+// System.Web.Hosting.IProcessHost.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IProcessHost 
+        {
+                bool IsIdle ();
+
+                void Ping (IProcessPingCallback callback);
+
+                void ShutdownAll ();
+
+                void ShutdownApplication ([In] string app_id);
+
+                void StartAppDomainProtocolQueue (
+                        [In] string app_id,
+                        [In] string protocol_id,
+                        IQueueHost queue_host);
+
+                void StartProcessProtocolQueue (
+                        [In] string protocol_id,
+                        IQueueHost queue_host);
+
+                void StopAppDomainProtocol (
+                        [In] string app_id,
+                        [In] string protocol_id,
+                        bool immediate);
+
+                void StopAppDomainProtocolQueue (
+                        [In] string app_id,
+                        [In] string protocol_id,
+                        int queue_id,
+                        bool immediate);
+                
+                void StopProcessProtocol (
+                        [In] string protocol_id,
+                        bool immediate);
+
+                void StopProcessProtocolQueue (
+                        [In] string protocol_id,
+                        int queue_id,
+                        bool immediate);
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IProcessHostFactoryHelper.cs b/mcs/class/System.Web/System.Web.Hosting/IProcessHostFactoryHelper.cs
new file mode 100644
index 00000000000..0c9b3012cea
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IProcessHostFactoryHelper.cs
@@ -0,0 +1,39 @@
+//
+// System.Web.Hosting.IProcessHostFactoryHelper.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IProcessHostFactoryHelper
+        {
+                object GetProcessHost (IProcessHostSupportFunctions host);
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IProcessHostSupportFunction.cs b/mcs/class/System.Web/System.Web.Hosting/IProcessHostSupportFunction.cs
new file mode 100644
index 00000000000..77cc307dd88
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IProcessHostSupportFunction.cs
@@ -0,0 +1,57 @@
+//
+// System.Web.Hosting.IProcessHostSupportFunctions.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IProcessHostSupportFunctions
+        {
+                void GetApplicationProperties (
+                        [In] string app_id,
+                        out string virtual_path,
+                        out string physical_path,
+                        out string site_name);
+
+                IntPtr GetConfigToken ([In] string s);
+
+                string GetProcessID ();
+
+                bool IsHostProcessMultiInstance ();
+
+                void MapPath (
+                        [In] string app_id,
+                        [In] string virtual_path,
+                        out string physical_path);
+
+                void MessageReceived ();
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IProcessPingCallback.cs b/mcs/class/System.Web/System.Web.Hosting/IProcessPingCallback.cs
new file mode 100644
index 00000000000..63acbf6b2a7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IProcessPingCallback.cs
@@ -0,0 +1,40 @@
+//
+// System.Web.Hosting.IProcessPingCallback.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IProcessPingCallback
+        {
+                void Respond ();
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/IQueueHost.cs b/mcs/class/System.Web/System.Web.Hosting/IQueueHost.cs
new file mode 100644
index 00000000000..c5e60ec087b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IQueueHost.cs
@@ -0,0 +1,50 @@
+//
+// System.Web.Hosting.IQueueHost.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Hosting
+{
+        public interface IQueueHost
+        {
+                void GetQueueData (
+                        [In, Out] byte [] buffer,
+                        ref int buffer_size);
+
+                int GetQueueDataLength ();
+
+                int GetQueueId ();
+
+                void QueueStarted ();
+
+                void QueueStopped (int hr);               
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs b/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
index 897adb2e7d0..f9e04e56a7d 100644
--- a/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
@@ -33,219 +33,299 @@ using System.Collections;
 using System.Web;
 using javax.servlet;
 using javax.servlet.http;
-using System.Collections.Specialized;
-using System.Globalization;
 
-namespace System.Web.Hosting {
+namespace System.Web.Hosting
+{
 	[MonoTODO("Implement security demands on the path usage functions (and review)")]
 	[ComVisible (false)]
-	internal sealed class ServletWorkerRequest : HttpWorkerRequest {
-		readonly HttpServlet _HttpServlet;
-		readonly HttpServletRequest _HttpServletRequest;
-		readonly HttpServletResponse _HttpServletResponse;
-
-		readonly string _requestUri;
-		readonly string _pathInfo;
-
-		static readonly StringDictionary _srvVarsToHeaderMap;
+	internal class ServletWorkerRequest : HttpWorkerRequest
+	{
+		private string _Page;
+		private string _Query;
+		private string _PathInfo = String.Empty;
+		private string _AppVirtualPath;
+		private string _AppPhysicalPath;
+		private string _AppInstallPath;
+		private bool _HasInstallInfo;
+		
+		private static string SLASH = "/";
 
+		private ServletOutputStream _ServletOutputStream;
+		private HttpServlet _HttpServlet;
+		private HttpServletRequest _HttpServletRequest;
+		private HttpServletResponse _HttpServletResponse;
 		private string [][] unknownHeaders;
-		string _rawUrl;
 
 		private HttpWorkerRequest.EndOfSendNotification _endOfSendCallback;
 		private object _endOfSendArgs;
 
-		enum KnownServerVariable {
-			AUTH_TYPE,
-			CONTENT_LENGTH,
-			CONTENT_TYPE,
-			QUERY_STRING,
-			REMOTE_ADDR,
-			REMOTE_HOST,
-			REMOTE_USER,
-			REQUEST_METHOD,
-			REQUEST_URI,
-			SCRIPT_NAME,
-			SERVER_NAME,
-			SERVER_PORT,
-			SERVER_PROTOCOL,
-			SERVER_SOFTWARE,
-			PATH_INFO
-		};
-
-		static readonly Hashtable KnownServerVariableMap;
-
-		static ServletWorkerRequest() {
-			_srvVarsToHeaderMap = new StringDictionary();
-			_srvVarsToHeaderMap.Add("HTTP_ACCEPT", "Accept");
-			_srvVarsToHeaderMap.Add("HTTP_REFERER", "Referer");
-			_srvVarsToHeaderMap.Add("HTTP_ACCEPT_LANGUAGE", "Accept-Language");
-			_srvVarsToHeaderMap.Add("HTTP_ACCEPT_ENCODING", "Accept-Encoding");
-			_srvVarsToHeaderMap.Add("HTTP_CONNECTION", "Connection");
-			_srvVarsToHeaderMap.Add("HTTP_HOST", "Host");
-			_srvVarsToHeaderMap.Add("HTTP_USER_AGENT", "User-Agent");
-			_srvVarsToHeaderMap.Add("HTTP_SOAPACTION", "SOAPAction");
-
-			string[] knownServerVariableNames = Enum.GetNames(typeof(KnownServerVariable));
-			KnownServerVariableMap = CollectionsUtil.CreateCaseInsensitiveHashtable(knownServerVariableNames.Length);
-			for (int i = 0; i < knownServerVariableNames.Length; i++)
-				KnownServerVariableMap[knownServerVariableNames[i]] = (KnownServerVariable)i;
-		}
-
-		public ServletWorkerRequest (HttpServlet servlet, HttpServletRequest req, HttpServletResponse resp) {
+
+		private ServletWorkerRequest ()
+		{
+		}
+
+		public ServletWorkerRequest (HttpServlet servlet, HttpServletRequest req, HttpServletResponse resp, ServletOutputStream output)
+			:this(String.Empty, String.Empty ,String.Empty, String.Empty ,null)
+		{
+#if DEBUG
+			Console.WriteLine("Constructor 1 of ServletWorkerRequest!! -->");
+#endif
 			_HttpServlet = servlet;
 			_HttpServletRequest = req;
 			_HttpServletResponse = resp;
+			_ServletOutputStream = output;
 
-			string requestUri = req.getRequestURI();
-			const int dotInvokeLength = 7; //".invoke".Length
-			if (requestUri.Length > dotInvokeLength &&
-				String.CompareOrdinal(".invoke", 0, requestUri, 
-				requestUri.Length - dotInvokeLength, dotInvokeLength) == 0) {
-				
-				_requestUri = requestUri.Substring(0, requestUri.Length - dotInvokeLength);
-
-				int paramNameStart = requestUri.LastIndexOf('/');
-				_pathInfo = requestUri.Substring(paramNameStart,
-					requestUri.Length - paramNameStart - dotInvokeLength);
+			string contextPath = req.getContextPath();
+			string requestURI = req.getRequestURI();
+			if (requestURI.Equals(contextPath) ||
+				((requestURI.Length - contextPath.Length) == 1) && requestURI[requestURI.Length-1] == '/' && requestURI.StartsWith(contextPath))
+				requestURI = contextPath + req.getServletPath();
+		
+			_Page = requestURI.Substring(contextPath.Length);
+			
+			if (_Page.StartsWith("/"))
+				_Page = _Page.Substring(1);
+
+			_Query = req.getQueryString();
+			//_PathInfo = req.getPathInfo();
+			_AppVirtualPath = req.getContextPath();
+			_AppPhysicalPath = J2EEUtils.GetApplicationRealPath(servlet.getServletConfig());
+#if DEBUG
+			LogCurrentPageLocation();
+#endif
+		}
+
+		public ServletWorkerRequest (string Page, string Query, ServletOutputStream output)
+			:this(Page, Query)
+		{
+#if DEBUG
+			Console.WriteLine("Constructor 2 of ServletWorkerRequest!! -->");
+#endif
+			//_Page = Page;
+			ParsePathInfo ();
+
+			//_Query = Query;
+			AppDomain current = AppDomain.CurrentDomain;
+			object o = current.GetData (".appPath");
+			if (o == null)
+				throw new HttpException ("Cannot get .appPath");
+			_AppPhysicalPath = (string)current.GetData(IAppDomainConfig.WEB_APP_DIR);
+
+			o = current.GetData (".hostingVirtualPath");
+			if (o == null)
+				throw new HttpException ("Cannot get .hostingVirtualPath");
+			_AppVirtualPath = CheckAndAddVSlash (o.ToString ());
+
+			o = current.GetData (".hostingInstallDir");
+			if (o == null)
+				throw new HttpException ("Cannot get .hostingInstallDir");
+			_AppInstallPath = o.ToString ();
+			_ServletOutputStream = output;
+
+			if (_AppPhysicalPath == null)
+				throw new HttpException ("Invalid app domain");
+
+			_HasInstallInfo = true;
+#if DEBUG
+			LogCurrentPageLocation();
+#endif
+		}
+
+		public ServletWorkerRequest (string AppVirtualPath,
+					  string AppPhysicalPath,
+					  string Page,
+					  string Query,
+					  ServletOutputStream output) : this (Page, Query)
+		{
+#if DEBUG
+			Console.WriteLine("Constructor 3 of ServletWorkerRequest!! -->");
+#endif
+			if (AppDomain.CurrentDomain.GetData (".appPath") == null)
+				throw new HttpException ("Invalid app domain");
+
+			//_Page = Page;
+			ParsePathInfo ();
+			//_Query = Query;
+			_AppVirtualPath = AppVirtualPath;
+			_AppPhysicalPath = CheckAndAddSlash (AppPhysicalPath);
+			_ServletOutputStream = output;
+			_HasInstallInfo = false;
+#if DEBUG
+			LogCurrentPageLocation();
+#endif
+		}
+
+		public ServletWorkerRequest (string Page, string Query)
+		{
+			_Page = Page;
+
+			_Query = Query;
+			AppDomain current = AppDomain.CurrentDomain;
+			object o = current.GetData (".appPath");
+			if (o == null)
+				throw new HttpException ("Cannot get .appPath");
+			_AppPhysicalPath = o.ToString ();
+
+			o = current.GetData (".hostingVirtualPath");
+			if (o == null)
+				throw new HttpException ("Cannot get .hostingVirtualPath");
+			_AppVirtualPath = o.ToString ();
+
+			o = current.GetData (".hostingInstallDir");
+			if (o == null)
+				throw new HttpException ("Cannot get .hostingInstallDir");
+			_AppInstallPath = o.ToString ();
+
+			if (_AppPhysicalPath == null)
+				throw new HttpException ("Invalid app domain");
+
+			_HasInstallInfo = true;
+
+			ExtractPagePathInfo();
+		}
+
+		public ServletOutputStream ServletOutputStream
+		{
+			get	
+			{
+				return _ServletOutputStream;
 			}
 		}
 
-		public HttpServlet Servlet {
+		public HttpServlet Servlet
+		{
 			get {
 				return _HttpServlet;
 			}
 		}
 		
-		public HttpServletRequest ServletRequest {
+		public HttpServletRequest ServletRequest
+		{
 			get{
 				return _HttpServletRequest;
 			}
 		}
 
-		public HttpServletResponse ServletResponse {
+		public HttpServletResponse ServletResponse
+		{
 			get{
 				return _HttpServletResponse;
 			}
 		}
 		
 		[MonoTODO("Implement security")]
-		public override string MachineInstallDirectory {
+		public override string MachineInstallDirectory
+		{
 			get {
+				if (_HasInstallInfo)
+					return _AppInstallPath;
+
 				return ICalls.GetMachineInstallDirectory ();
 			}
 		}
 
-		public override string MachineConfigPath {
+		public override string MachineConfigPath
+		{
 			get { return ICalls.GetMachineConfigPath (); }
 		}
 
-		public override void EndOfRequest () {
+		public override void EndOfRequest ()
+		{
+			_ServletOutputStream = null;
+			_HttpServlet = null;
+			_HttpServletRequest = null;
+			_HttpServletResponse = null;
 			if (_endOfSendCallback != null)
 				_endOfSendCallback(this, _endOfSendArgs);
 		}
 
-		public override void FlushResponse (bool finalFlush) {
-			ServletOutputStream servletOutputStream = _HttpServletResponse.getOutputStream();
-			servletOutputStream.flush();
+		public override void FlushResponse (bool finalFlush)
+		{
+			_ServletOutputStream.flush();
 			if (finalFlush)
-				servletOutputStream.close();
+				_ServletOutputStream.close();
 		}
 
-		public override string GetAppPath () {
-			return _HttpServletRequest.getContextPath();
+		public override string GetAppPath ()
+		{
+			return _AppVirtualPath;
 		}
 
-		public override string GetAppPathTranslated () {
-			return J2EEUtils.GetApplicationRealPath(_HttpServlet.getServletConfig());;
+		public override string GetAppPathTranslated ()
+		{
+			return _AppPhysicalPath;
 		}
 
-		public override string GetFilePath () {
-			string uri = GetUriPath();
-			string pathInfo = GetPathInfo();
-			if (pathInfo != null && pathInfo.Length > 0)
-				uri = uri.Substring(0, uri.Length - pathInfo.Length);
-
-			return uri;
+		public override string GetFilePath ()
+		{
+                        return CreatePath (false);
 		}
 
-		public override string GetFilePathTranslated () {
-			string page = GetFilePath ();
+		public override string GetFilePathTranslated ()
+		{
+                        string page = _Page;
 
 			if (Path.DirectorySeparatorChar != '/')
-				page = page.Replace ('/', Path.DirectorySeparatorChar);
+                                page = _Page.Replace ('/', Path.DirectorySeparatorChar);
 
 			if (page [0] == Path.DirectorySeparatorChar)
 				page = page.Substring (1);
 			
-			return Path.Combine (GetAppPathTranslated (), page);
+			return (Path.Combine (_AppPhysicalPath, page));
 		}
 
-		public override string GetHttpVerbName () {
+		public override string GetHttpVerbName ()
+		{
 			return _HttpServletRequest.getMethod();
 		}
 
-		public override string GetHttpVersion () {
+		public override string GetHttpVersion ()
+		{
 			return _HttpServletRequest.getProtocol();
 		}
 
-		public override string GetLocalAddress () {
-			return _HttpServletRequest.getLocalAddr();
+		public override string GetLocalAddress ()
+		{
+			return _HttpServletRequest.getServerName();
 		}
 
-		public override int GetLocalPort () {
-			return _HttpServletRequest.getLocalPort();
+		public override int GetLocalPort ()
+		{
+			return _HttpServletRequest.getServerPort();
 		}
 
-		public override string GetPathInfo () {
-			return _pathInfo != null ? _pathInfo : _HttpServletRequest.getPathInfo();
+		public override string GetPathInfo ()
+		{
+			return (null != _PathInfo) ? _PathInfo : String.Empty;
 		}
 
-		public override string GetQueryString () {
-			return _HttpServletRequest.getQueryString();
+		public override string GetQueryString ()
+		{
+			return _Query;
 		}
 
-		public override string GetRawUrl () {
-			if (_rawUrl == null) {
-				StringBuilder builder = new StringBuilder();
-				builder.Append(GetProtocol());
-				builder.Append("://");
-				builder.Append(GetServerName());
-				int port = _HttpServletRequest.getServerPort();
-				if (port != 80) {
-					builder.Append(':');
-					builder.Append(port);
-				}
-				builder.Append(GetUriPath());
-				string pathInfo = GetPathInfo();
-				if (pathInfo != null)
-					builder.Append(pathInfo);
-				string query = GetQueryString();
-				if (query != null && query.Length > 0) {
-					builder.Append('?');
-					builder.Append(query);
-				}
-
-				_rawUrl = builder.ToString();
-			}
+		public override string GetRawUrl ()
+		{
+                        string path = CreatePath (true);
+                        if (null != _Query && _Query.Length > 0)
+				return path + "?" + _Query;
 
-			return _rawUrl;
+			return path;
 		}
 
-		public override string GetRemoteAddress() {
+		public override string GetRemoteAddress()
+		{
 			return _HttpServletRequest.getRemoteAddr();
 		}
 
-		public override string GetRemoteName() {
-			return _HttpServletRequest.getRemoteHost();
-		}
-
-
-		public override int GetRemotePort() {
-			try {
+		public override int GetRemotePort()
+		{
+			try
+			{
 				return _HttpServletRequest.getRemotePort();
 			}
-			catch(Exception e) { //should catch also java.lang.Throwable
+			catch(Exception e) //should catch also java.lang.Throwable
+			{
 				//if servlet API is 2.3 and below - there is no
 				//method getRemotePort in ServletRequest interface...
 				//should be described as limitation.
@@ -253,72 +333,42 @@ namespace System.Web.Hosting {
 			}
 		}
 
-		public override string GetServerVariable(string name) {
-			// FIXME: We need to make a proper mapping between the standard server
-			// variables and java equivalent. probably we have to have a configuration file 
-			// which associates between the two. Pay a special attention on GetUnknownRequestHeader/s
-			// while implementing. Ensure that system web "common" code correctly calls each method.
-
-			string headerName = _srvVarsToHeaderMap[name];
-
-			if (headerName != null)
-				return _HttpServletRequest.getHeader( headerName );
-
-			object knownVariable = KnownServerVariableMap[name];
-			if (knownVariable != null)
-				return GetKnownServerVariable((KnownServerVariable)knownVariable);
-
-			return _HttpServletRequest.getHeader( name );
-		}
-
-		string GetKnownServerVariable(KnownServerVariable index) {
-			switch (index) {
-				case KnownServerVariable.AUTH_TYPE : return _HttpServletRequest.getAuthType();
-				case KnownServerVariable.CONTENT_LENGTH : return Convert.ToString(_HttpServletRequest.getContentLength());
-				case KnownServerVariable.CONTENT_TYPE : return _HttpServletRequest.getContentType();
-				case KnownServerVariable.QUERY_STRING : return GetQueryString();
-				case KnownServerVariable.REMOTE_ADDR : return GetRemoteAddress();
-				case KnownServerVariable.REMOTE_HOST : return GetRemoteName();
-				case KnownServerVariable.REMOTE_USER : return _HttpServletRequest.getRemoteUser();
-				case KnownServerVariable.REQUEST_METHOD : return GetHttpVerbName ();
-				case KnownServerVariable.REQUEST_URI : return GetUriPath();
-				case KnownServerVariable.SCRIPT_NAME : return GetFilePath ();
-				case KnownServerVariable.SERVER_NAME : return GetServerName();
-				case KnownServerVariable.SERVER_PORT : return Convert.ToString(_HttpServletRequest.getServerPort());
-				case KnownServerVariable.SERVER_PROTOCOL : return GetHttpVersion ();
-				case KnownServerVariable.SERVER_SOFTWARE : return Servlet.getServletContext().getServerInfo();
-				case KnownServerVariable.PATH_INFO : return GetPathInfo();
-				default: throw new IndexOutOfRangeException("index");
-			}
+		public override string GetServerVariable(string name)
+		{
+			return String.Empty;
 		}
 
-		public override string GetUriPath() {
-			return _requestUri != null ? _requestUri : _HttpServletRequest.getRequestURI();
+		public override string GetUriPath()
+		{
+			return CreatePath (true);
 		}
 
-		public override IntPtr GetUserToken() {
+		public override IntPtr GetUserToken()
+		{
 			return IntPtr.Zero;
 		}
 
-		public override string MapPath (string path) {
-			string appVirtualPath = GetAppPath();
-			if (path.StartsWith(appVirtualPath)) {
-				path = path.Remove(0,appVirtualPath.Length);
+		public override string MapPath (string path)
+		{
+			if (path.StartsWith(_AppVirtualPath))
+			{
+				path = path.Remove(0,_AppVirtualPath.Length);
 				if (path.StartsWith("/"))
 					path = path.Remove(0,1);
 			}
 			//string realPath = Servlet.getServletContext().getRealPath(path);
-			//			if (Path.IsPathRooted(path))
-			//				return path;
-			//			if (!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&& 
-			//				!path.StartsWith("/") && !path.StartsWith("\\")&& !Path.IsPathRooted(path))            
-			//				return IAppDomainConfig.WAR_ROOT_SYMBOL + "/" + path;
-			//			else if (!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&& !Path.IsPathRooted(path))
-			//				return IAppDomainConfig.WAR_ROOT_SYMBOL + path;
-			//			else 
-			//				return path;
-
-			if (path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)) {
+//			if (Path.IsPathRooted(path))
+//				return path;
+//			if (!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&& 
+//				!path.StartsWith("/") && !path.StartsWith("\\")&& !Path.IsPathRooted(path))            
+//				return IAppDomainConfig.WAR_ROOT_SYMBOL + "/" + path;
+//			else if (!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&& !Path.IsPathRooted(path))
+//				return IAppDomainConfig.WAR_ROOT_SYMBOL + path;
+//			else 
+//				return path;
+
+			if (path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL))
+			{
 				return path;
 			}
 
@@ -332,11 +382,12 @@ namespace System.Web.Hosting {
 			return retVal;
 		}
 
-		public override void SendResponseFromFile (IntPtr handle, long offset, long length) {
-			throw new NotSupportedException();
+		public override void SendResponseFromFile (IntPtr handle, long offset, long length)
+		{
 		}
 
-		public override void SendResponseFromFile (string filename, long offset, long length) {
+		public override void SendResponseFromFile (string filename, long offset, long length)
+		{
 			using (FileStream fs = File.OpenRead (filename)) {
 				byte [] buffer = new byte [4 * 1024];
 
@@ -352,44 +403,152 @@ namespace System.Web.Hosting {
 			}
 		}
 
-		public override void SendResponseFromMemory (byte [] data, int length) {
+		public override void SendResponseFromMemory (byte [] data, int length)
+		{
 			sbyte [] sdata = vmw.common.TypeUtils.ToSByteArray(data);
-			_HttpServletResponse.getOutputStream().write(sdata, 0 , length);
+			_ServletOutputStream.write(sdata, 0 , length);
+		}
+
+		public override void SendStatus(int statusCode, string statusDescription)
+		{
+			_HttpServletResponse.setStatus(statusCode, statusDescription);
+		}
+
+		public override void SendUnknownResponseHeader(string name, string value)
+		{
+			_HttpServletResponse.addHeader(name, value);
+		}
+
+		public override bool HeadersSent ()
+		{
+			return false;
 		}
 
-		public override void SendStatus(int statusCode, string statusDescription) {
-			// setStatus(int, string) is deprecated
-			_HttpServletResponse.setStatus(statusCode/*, statusDescription*/);
+		public override void SendCalculatedContentLength (int contentLength)
+		{
+			//FIXME: Should we ignore this for apache2?
+			SendUnknownResponseHeader ("Content-Length", contentLength.ToString ());
 		}
 
-		public override void SendUnknownResponseHeader(string name, string value) {
+		public override void SendKnownResponseHeader (int index, string value)
+		{
 			if (HeadersSent ())
 				return;
 
-			_HttpServletResponse.addHeader(name, value);
+			string headerName = HttpWorkerRequest.GetKnownResponseHeaderName (index);
+			SendUnknownResponseHeader (headerName, value);
 		}
+		
+		// Create's a path string
+		private string CheckAndAddSlash(string sPath)
+		{
+			if (null == sPath)
+				return null;
+
+			if (String.Empty == sPath)
+				return SLASH;
+				
+			if (!sPath.EndsWith ("" + Path.DirectorySeparatorChar))
+				return sPath + Path.DirectorySeparatorChar;
 
-		public override bool HeadersSent () {
-			return _HttpServletResponse.isCommitted();
+			return sPath;
 		}
 
-		public override void SendCalculatedContentLength (int contentLength) {
-			_HttpServletResponse.setContentLength(contentLength);
+		// Creates a path string
+		private string CheckAndAddVSlash(string sPath)
+		{
+			if (null == sPath)
+				return null;
+
+			if (!sPath.EndsWith ("/"))
+				return sPath + "/";
+
+			return sPath;
 		}
 
-		public override void SendKnownResponseHeader (int index, string value) {
-			SendUnknownResponseHeader (GetKnownResponseHeaderName (index), value);
+		// Create's a path string
+                private string CreatePath (bool bIncludePathInfo)
+                {
+                        string sPath = Path.Combine (_AppVirtualPath, _Page);
+
+                        if (bIncludePathInfo && null != _PathInfo)
+                        {
+                                sPath += _PathInfo;
+                        }
+
+                        return sPath;
 		}
 
-		public override string GetKnownRequestHeader (int index) {	
-			return GetUnknownRequestHeader(GetKnownRequestHeaderName (index));
+		//  "The extra path information, as given by the client. In
+		//  other words, scripts can be accessed by their virtual
+		//  pathname, followed by extra information at the end of this
+		//  path. The extra information is sent as PATH_INFO."
+		private void ExtractPagePathInfo ()
+		{
+			if (_Page == null || _Page == String.Empty)
+				return;
+
+			string FullPath = GetFilePathTranslated ();
+			int PathInfoLength = 0;
+			string LastFile = String.Empty;
+
+			while (PathInfoLength < _Page.Length) {
+				if (LastFile.Length > 0) {
+					// increase it by the length of the file plus 
+					// a "/"
+					//
+					PathInfoLength += LastFile.Length + 1;
+				}
+
+				if (File.Exists (FullPath) == true)
+					break;
+
+				if (Directory.Exists (FullPath) == true) {
+					PathInfoLength -= (LastFile.Length + 1);
+					break;
+				}
+
+				LastFile = Path.GetFileName (FullPath);
+				FullPath = Path.GetDirectoryName (FullPath);
+			}
+
+			if (PathInfoLength <= 0 || PathInfoLength > _Page.Length)
+				return;
+
+			_PathInfo = _Page.Substring (_Page.Length - PathInfoLength);
+			_Page = _Page.Substring (0, _Page.Length - PathInfoLength);
+		}
+		
+		// Parses out the string after / known as the "path info"
+		private void ParsePathInfo ()
+		{
+			int iPos = _Page.LastIndexOf("/");
+			if (iPos >= 0) {
+				_PathInfo = _Page.Substring (iPos);
+				_Page = _Page.Substring (0, iPos);
+			}
+		}
+
+		public override string GetKnownRequestHeader (int index)
+		{
+			if (_HttpServletRequest == null)
+				return null;
+
+			string headerName = HttpWorkerRequest.GetKnownRequestHeaderName (index);
+			
+			return _HttpServletRequest.getHeader(headerName);
 		}
 
-		public override string GetUnknownRequestHeader (string name) {
+		public override string GetUnknownRequestHeader (string name)
+		{
+			if (_HttpServletRequest == null)
+				return null;
+
 			return _HttpServletRequest.getHeader(name);
 		}
 
-		public override string [][] GetUnknownRequestHeaders () {
+		public override string [][] GetUnknownRequestHeaders ()
+		{
 			if (unknownHeaders == null) {
 				ArrayList pairs = new ArrayList ();
 				for (java.util.Enumeration he = _HttpServletRequest.getHeaderNames(); he.hasMoreElements() ;) {
@@ -411,30 +570,32 @@ namespace System.Web.Hosting {
 			return unknownHeaders;
 		}
 
-		public override int ReadEntityBody (byte [] buffer, int size) {
+		public override int ReadEntityBody (byte [] buffer, int size)
+		{
 			if (buffer == null || size == 0)
 				return 0;
-			sbyte [] sbuffer = vmw.common.TypeUtils.ToSByteArray(buffer);
-			int r = _HttpServletRequest.getInputStream().read(sbuffer, 0, size);	
+			sbyte [] sbuffer = new sbyte [size];
+			int r = _HttpServletRequest.getInputStream().read(sbuffer, 0, size);
+			for (int i=0; i < r; i++) buffer[i] = (byte) sbuffer[i];			
 			return (r==-1)?0:r;
 		}
 
-		public override void SetEndOfSendNotification(System.Web.HttpWorkerRequest.EndOfSendNotification callback, object extraData) {
+		public override void SetEndOfSendNotification(System.Web.HttpWorkerRequest.EndOfSendNotification callback, object extraData)
+		{
 			_endOfSendCallback = callback;
 			_endOfSendArgs = extraData;
 		}
-
-		public override string GetProtocol() {
-			return _HttpServletRequest.getScheme();
-		}
-
-		public override string GetServerName() {
-			return _HttpServletRequest.getServerName();
-		}
-
-		public override bool IsSecure() {
-			return _HttpServletRequest.isSecure();
+		
+		// Prints some stats about the current _Page.
+		private void LogCurrentPageLocation()
+		{
+#if DEBUG
+			Console.WriteLine(" relpath=" + _AppVirtualPath);
+			Console.WriteLine(" physical path=" + _AppPhysicalPath);
+			Console.WriteLine(" page=" + _Page);
+#endif
 		}
+		
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs b/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
index 6d91f9d633e..c788d2adc16 100644
--- a/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
@@ -33,7 +33,6 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Permissions;
-using System.Web.Configuration;
 using System.Web.UI;
 using System.Web.Util;
 
@@ -114,11 +113,6 @@ namespace System.Web.Hosting {
 				return null;
 			}
 		}
-#if NET_2_0
-		public override string RootWebConfigPath {
-			get { return WebConfigurationManager.OpenWebConfiguration ("~").FilePath; }
-		}
-#endif
 
 		public override void EndOfRequest ()
 		{
diff --git a/mcs/class/System.Web/System.Web.Hosting/VirtualDirectory.cs b/mcs/class/System.Web/System.Web.Hosting/VirtualDirectory.cs
deleted file mode 100644
index 61dfb3fffdd..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/VirtualDirectory.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// System.Web.Hosting.VirtualDirectory
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-
-//
-// Copyright (c) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-
-namespace System.Web.Hosting {
-
-	public abstract class VirtualDirectory : VirtualFileBase
-	{
-		protected VirtualDirectory (string virtualPath)
-		{
-			SetVirtualPath (virtualPath);
-		}
-
-		public abstract IEnumerable Children { get; }
-
-		public abstract IEnumerable Directories { get; }
-		
-		public abstract IEnumerable Files { get; }
-
-		public override bool IsDirectory {
-			get { return true; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/VirtualFile.cs b/mcs/class/System.Web/System.Web.Hosting/VirtualFile.cs
deleted file mode 100644
index a139c91d1e9..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/VirtualFile.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// System.Web.Hosting.VirtualFile
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.IO;
-
-namespace System.Web.Hosting {
-
-	public abstract class VirtualFile : VirtualFileBase
-	{
-		protected VirtualFile (string virtualPath)
-		{
-			SetVirtualPath (virtualPath);
-		}
-
-		public override bool IsDirectory {
-			get { return false; }
-		}
-
-		public abstract Stream Open ();
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/VirtualFileBase.cs b/mcs/class/System.Web/System.Web.Hosting/VirtualFileBase.cs
deleted file mode 100644
index 59196da1f9c..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/VirtualFileBase.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// System.Web.Hosting.VirtualFileBase
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Web;
-
-namespace System.Web.Hosting {
-
-	public abstract class VirtualFileBase : MarshalByRefObject
-	{
-		string vpath;
-
-		protected VirtualFileBase ()
-		{
-		}
-
-		internal void SetVirtualPath (string vpath)
-		{
-			this.vpath = vpath;
-		}
-
-		public abstract bool IsDirectory { get; }
-
-		public virtual string Name {
-			get { return VirtualPathUtility.GetFileName (vpath); }
-		}
-
-		public string VirtualPath {
-			get { return vpath; }
-		}
-
-		public override object InitializeLifetimeService ()
-		{
-			return null; // forever young
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.Hosting/VirtualPathProvider.cs b/mcs/class/System.Web/System.Web.Hosting/VirtualPathProvider.cs
deleted file mode 100644
index 05d793544cb..00000000000
--- a/mcs/class/System.Web/System.Web.Hosting/VirtualPathProvider.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// System.Web.Hosting.VirtualPathProvider
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.IO;
-using System.Web.Caching;
-using System.Web.Util;
-
-namespace System.Web.Hosting {
-
-	public abstract class VirtualPathProvider : MarshalByRefObject
-	{
-		VirtualPathProvider prev;
-
-		protected VirtualPathProvider ()
-		{
-		}
-
-		internal void SetPrevious (VirtualPathProvider prev)
-		{
-			this.prev = prev;
-		}
-
-		protected internal VirtualPathProvider Previous {
-			get { return prev; }
-		}
-
-		protected virtual void Initialize ()
-		{
-		}
-
-		public virtual string CombineVirtualPaths (string basePath, string relativePath)
-		{
-			return VirtualPathUtility.Combine (basePath, relativePath);
-		}
-
-		public virtual bool DirectoryExists (string virtualDir)
-		{
-			return false;
-		}
-
-		public virtual bool FileExists (string virtualPath)
-		{
-			return false;
-		}
-
-		public virtual CacheDependency GetCacheDependency (string virtualPath,
-								IEnumerable virtualPathDependencies,
-								DateTime utcStart)
-		{
-			return null;
-		}
-
-		public virtual string GetCacheKey (string virtualPath)
-		{
-			return null;
-		}
-
-		public virtual VirtualDirectory GetDirectory (string virtualDir)
-		{
-			return null;
-		}
-
-		public virtual VirtualFile GetFile (string virtualPath)
-		{
-			return null;
-		}
-
-		public virtual string GetFileHash (string virtualPath, IEnumerable virtualPathDependencies)
-		{
-			return null;
-		}
-
-		public override object InitializeLifetimeService ()
-		{
-			return null; // forever young
-		}
-
-		public static Stream OpenFile (string virtualPath)
-		{
-			// This thing throws a nullref when we're not inside an ASP.NET appdomain, which is what MS does.
-			VirtualPathProvider provider = HostingEnvironment.VirtualPathProvider;
-			VirtualFile file = provider.GetFile (virtualPath);
-			return file.Open ();
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs b/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
index e620195991f..e44be30e1e0 100644
--- a/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
+++ b/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
@@ -60,6 +60,8 @@ namespace System.Web.J2EE
 			try 
 			{
 				AppDomain servletDomain = createServletDomain(config);
+				if(servletDomain == null)
+					throw new ArgumentException("cannot initialize AppDomain!");
 
 				//GH Infromation Initizalization
 				servletDomain.SetData(J2EEConsts.CLASS_LOADER, vmw.common.TypeUtils.ToClass(this).getClassLoader());
@@ -78,6 +80,11 @@ namespace System.Web.J2EE
 		{
 			try 
 			{
+				String pathInfo = req.getRequestURI();
+				String contextPath = req.getContextPath();
+				if (pathInfo.Equals(contextPath) ||
+					((pathInfo.Length - contextPath.Length) == 1) && pathInfo[pathInfo.Length-1] == '/' && pathInfo.StartsWith(contextPath))
+					pathInfo = contextPath + req.getServletPath();
 				// Very important - to update Virtual Path!!!
 				AppDomain servletDomain = (AppDomain)this.getServletContext().getAttribute(J2EEConsts.APP_DOMAIN);
 				servletDomain.SetData(IAppDomainConfig.APP_VIRT_DIR, req.getContextPath());
@@ -93,10 +100,11 @@ namespace System.Web.J2EE
 				resp.setHeader("X-Powered-By", "ASP.NET");
 				resp.setHeader("X-AspNet-Version", "1.1.4322");
 
-//				PageMapper.LoadFileList();
+				ServletOutputStream hos = resp.getOutputStream();
+				PageMapper.LoadFileList();
 
 				resp.setContentType("text/html");
-				HttpWorkerRequest gwr = new ServletWorkerRequest(this, req, resp);
+				HttpWorkerRequest gwr = new ServletWorkerRequest(this, req, resp, resp.getOutputStream());
 				HttpRuntime.ProcessRequest(gwr);
 			}
 			finally 
@@ -138,6 +146,8 @@ namespace System.Web.J2EE
 
 		private AppDomain createServletDomain(ServletConfig config)
 		{
+			try
+			{
 				string rootPath = J2EEUtils.GetApplicationRealPath(config);
 				AppDomainSetup domainSetup = new AppDomainSetup();
 				string name = config.getServletName();//.getServletContextName();
@@ -173,6 +183,13 @@ namespace System.Web.J2EE
 				//servletDomain.SetData(".hostingVirtualPath", "/");
 				servletDomain.SetData(".hostingInstallDir", "/");
 				return servletDomain;
+			}
+			catch(Exception e)
+			{
+				Console.WriteLine("ERROR in createServletDomain {0},{1}",e.GetType(), e.Message);
+				Console.WriteLine(e.StackTrace);
+				return null;
+			}
 		}
 	
 		virtual protected vmw.@internal.io.IObjectsDeserializer GetDeserializer()
diff --git a/mcs/class/System.Web/System.Web.J2EE/ChangeLog b/mcs/class/System.Web/System.Web.J2EE/ChangeLog
index c227f95fa10..447ff628597 100644
--- a/mcs/class/System.Web/System.Web.J2EE/ChangeLog
+++ b/mcs/class/System.Web/System.Web.J2EE/ChangeLog
@@ -1,14 +1,3 @@
-2006-01-19  Konstantin Triger <kostat@mainsoft.com>

-

-	* BaseHttpServlet.cs: call correct ServletWorkerRequest ctor

-

-2006-01-09  Konstantin Triger <kostat@mainsoft.com>

-

-	* BaseHttpServlet.cs: merging main/32, main/33

-	* PageMapper.cs: merging main/17-27

-	* J2EEUtils.cs: mergind ghutils.cs@@/main/9

-	* Added ObjectInputStream.cs, ObjectOutputStream.cs

-

 2005-09-08  Eyal Alalouf  <eyala@mainsoft.com>

 	* BaseHttpServlet.cs, PageMapper.cs, BaseStaticHttpServlet.cs,

 	  SessionListener.cs - backward compatibility fixes.

diff --git a/mcs/class/System.Web/System.Web.J2EE/J2EEUtils.cs b/mcs/class/System.Web/System.Web.J2EE/J2EEUtils.cs
index 4742628e482..c5d4d970b94 100644
--- a/mcs/class/System.Web/System.Web.J2EE/J2EEUtils.cs
+++ b/mcs/class/System.Web/System.Web.J2EE/J2EEUtils.cs
@@ -65,7 +65,7 @@ namespace System.Web.J2EE
 			string path = "";
 			ServletContext context = config.getServletContext();
 			string appDir = config.getInitParameter(IAppDomainConfig.APP_DIR_NAME);
-//			Console.WriteLine("appdir = {0}", appDir);
+			Console.WriteLine("appdir = {0}", appDir);
 			if (appDir != null)
 			{
 				try
@@ -73,7 +73,7 @@ namespace System.Web.J2EE
 					java.io.File f = new java.io.File(appDir);
 					if(f.exists())
 					{
-//						Console.WriteLine("Physical path= {0}", appDir);
+						Console.WriteLine("Physical path= {0}", appDir);
 						path = appDir;
 					}
 				}
@@ -91,7 +91,7 @@ namespace System.Web.J2EE
 			if (!path.EndsWith ("/") && !path.EndsWith ("\\"))
 				path += "/";
 
-//			Console.WriteLine("Physical path= {0}", path); 
+			Console.WriteLine("Physical path= {0}", path); 
 			return path;
 		}
 
diff --git a/mcs/class/System.Web/System.Web.J2EE/ObjectInputStream.cs b/mcs/class/System.Web/System.Web.J2EE/ObjectInputStream.cs
deleted file mode 100755
index e65db690fac..00000000000
--- a/mcs/class/System.Web/System.Web.J2EE/ObjectInputStream.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-// Authors:
-//	Vladimir Krasnov <vladimirk@mainsoft.com>
-//	Konstantin Triger <kostat@mainsoft.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-using System;

-

-namespace System.Web.J2EE

-{

-	internal class ObjectInputStream : System.IO.Stream {

-		readonly java.io.ObjectInput _javaObjectInput;

-

-		public ObjectInputStream(java.io.ObjectInput stream) {

-			_javaObjectInput = stream;

-		}

-		

-		public override bool CanRead {

-			get {

-				return true;

-			}

-		}

-

-		public override bool CanWrite {

-			get {

-				return false;

-			}

-		}

-

-		public override bool CanSeek {

-			get {

-				return true;

-			}

-		}

-

-		public override long Length {

-			get {

-				throw new NotSupportedException();

-			}

-		}

-

-		public override long Position {

-			get {

-				throw new NotSupportedException();

-			}

-			set {

-				throw new NotSupportedException();

-			}

-		}

-

-		public override void Flush() {

-			throw new NotSupportedException();

-		}

-

-		public override long Seek(long offset, System.IO.SeekOrigin origin) {

-			if (origin == System.IO.SeekOrigin.Current)

-				return _javaObjectInput.skip(offset);

-

-			throw new NotSupportedException();

-		}

-

-		public override void SetLength(long value) {

-			throw new NotSupportedException();

-		}

-

-		public override int Read(byte[] buffer, int offset, int count) {

-			return _javaObjectInput.read(vmw.common.TypeUtils.ToSByteArray(buffer), offset, count);

-		}

-

-		public override void Write(byte[] buffer, int offset, int count) {

-			throw new NotSupportedException();

-		}

-

-		public override int ReadByte() {

-			return _javaObjectInput.read();

-		}

-

-		public override void Close() {

-			_javaObjectInput.close();

-		}

-

-		public java.io.ObjectInput NativeStream {

-			get {return _javaObjectInput;}

-		}

-	}

-}

diff --git a/mcs/class/System.Web/System.Web.J2EE/ObjectOutputStream.cs b/mcs/class/System.Web/System.Web.J2EE/ObjectOutputStream.cs
deleted file mode 100755
index ecfadb47c8f..00000000000
--- a/mcs/class/System.Web/System.Web.J2EE/ObjectOutputStream.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
-//
-// Authors:
-//	Vladimir Krasnov <vladimirk@mainsoft.com>
-//	Konstantin Triger <kostat@mainsoft.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//

-

-using System;

-

-namespace System.Web.J2EE

-{

-	internal class ObjectOutputStream : System.IO.Stream {

-		readonly java.io.ObjectOutput _javaObjectOutput;

-

-		public ObjectOutputStream(java.io.ObjectOutput stream) {

-			_javaObjectOutput = stream;

-		}

-

-		public override bool CanRead {

-			get {

-				return false;

-			}

-		}

-

-		public override bool CanSeek {

-			get {

-				return false;

-			}

-		}

-

-		public override bool CanWrite {

-			get {

-				return true;

-			}

-		}

-

-		public override void Close() {

-			_javaObjectOutput.close();

-		}

-

-		public override void Flush() {

-			_javaObjectOutput.flush();

-		}

-

-		public override long Length {

-			get {

-				throw new NotSupportedException();

-			}

-		}

-

-		public override long Position {

-			get {

-				throw new NotSupportedException();

-			}

-			set {

-				throw new NotSupportedException();

-			}

-		}

-

-		public override long Seek(long offset, System.IO.SeekOrigin origin) {

-			throw new NotSupportedException();

-		}

-

-		public override void SetLength(long value) {

-			throw new NotSupportedException();

-		}

-

-		public override int Read(byte[] buffer, int offset, int count) {

-			throw new NotSupportedException();

-		}

-

-		public override void Write(byte[] buffer, int offset, int count) {

-			_javaObjectOutput.write( vmw.common.TypeUtils.ToSByteArray(buffer), offset, count );

-		}

-

-		public override void WriteByte(byte value) {

-			_javaObjectOutput.write(value);

-		}

-

-		public java.io.ObjectOutput NativeStream {

-			get {return _javaObjectOutput;}

-		}

-	}

-}

diff --git a/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs b/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
index 1ea71e5acc9..587ea307f26 100644
--- a/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
+++ b/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
@@ -40,37 +40,27 @@ namespace System.Web.J2EE
 	public class PageMapper
 	{
 		private static readonly string _fileListName = "/filelist.xml";
-		private static readonly object LOCK_GETASSEMBLIESCACHEDDOCUMENT = new object();
-		private static readonly object LOCK_GETFROMMAPPATHCACHE = new object();
 
 		public static string GetFromMapPathCache(string key)
 		{
-			Hashtable answer = null;
-			lock(LOCK_GETFROMMAPPATHCACHE)
+			Hashtable answer = (Hashtable) AppDomain.CurrentDomain.GetData(J2EEConsts.MAP_PATH_CACHE);
+			if (answer == null)
 			{
-				answer = (Hashtable) AppDomain.CurrentDomain.GetData(J2EEConsts.MAP_PATH_CACHE);
-				if (answer == null)
-				{
-					answer = new Hashtable();
-					CachedDocumentTypeStorage storage = (CachedDocumentTypeStorage)GetAssembliesCachedDocument();
-					IDictionaryEnumerator e = storage.GetEnumerator();
-					e.Reset();
-					while (e.MoveNext())
-					{					
-						string currentFile = (string)((DictionaryEntry)e.Current).Key;
-						answer[currentFile]= IAppDomainConfig.WAR_ROOT_SYMBOL + currentFile;
-					}
-					AppDomain.CurrentDomain.SetData(J2EEConsts.MAP_PATH_CACHE,answer);
-
+				answer = new Hashtable();
+				CachedDocumentTypeStorage storage = (CachedDocumentTypeStorage)GetAssembliesCachedDocument();
+				IDictionaryEnumerator e = storage.GetEnumerator();
+				e.Reset();
+				while (e.MoveNext())
+				{					
+					string currentFile = (string)((DictionaryEntry)e.Current).Key;
+					answer[currentFile]= IAppDomainConfig.WAR_ROOT_SYMBOL + currentFile;
 				}
+				AppDomain.CurrentDomain.SetData(J2EEConsts.MAP_PATH_CACHE,answer);
+
 			}
 			return (string)answer[key];
 		}
 
-		// UNUSED METHOD
-		//The method was used by runtime to force file names casesensitivity
-		// problem. The filelist.xml file should contain correct file names,
-		// but currently it is unused
 		public static void LoadFileList()
 		{
 			Hashtable hashTable = (Hashtable) AppDomain.CurrentDomain.GetData(J2EEConsts.FILE_LIST_FILE);
@@ -80,12 +70,6 @@ namespace System.Web.J2EE
 				try
 				{
 					Stream fs = (Stream)IOUtils.getStream(_fileListName);
-					if (fs == null)
-					{
-						AppDomain.CurrentDomain.SetData(J2EEConsts.FILE_LIST_FILE, new Hashtable());
-						return;
-					}
-
 					doc = new XmlDocument();
 					doc.Load(fs);
 				}
@@ -110,10 +94,11 @@ namespace System.Web.J2EE
 			}
 
 		}
+		private static readonly object LOCK_OBJECT = new object();
 
 		private static ICachedXmlDoc GetAssembliesCachedDocument()
 		{
-			lock(LOCK_GETASSEMBLIESCACHEDDOCUMENT)
+			lock(LOCK_OBJECT)
 			{
 				ICachedXmlDoc doc = (ICachedXmlDoc) AppDomain.CurrentDomain.GetData(J2EEConsts.ASSEMBLIES_FILE);
 				if (doc == null)
@@ -144,7 +129,9 @@ namespace System.Web.J2EE
 			if (url.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL))
 				url = url.Substring(IAppDomainConfig.WAR_ROOT_SYMBOL.Length);
 			
-			Type t = doc.Get(url);
+			string query = url.ToLower();
+				
+			Type t = (Type) doc.Get(query);
 
 			if (t == null)
 				throw new HttpException(404,"The requested resource (" + url + ") is not available.");
@@ -155,7 +142,7 @@ namespace System.Web.J2EE
 		#region ICachedXmlDoc interface
 		interface ICachedXmlDoc
 		{
-			Type Get(string key);
+			object Get(object key);
 			//bool ContainsKey(object key);
 		}
 		#endregion
@@ -172,16 +159,18 @@ namespace System.Web.J2EE
 
 			private CachedDocumentTypeStorage(int initTableSize)
 			{
-				_table = Hashtable.Synchronized(new Hashtable(initTableSize));
+				_table = new Hashtable(initTableSize);
 			}
 
 			public CachedDocumentTypeStorage() :
 				this(DEFAULT_PAGES_NUMBER)
 			{}
 
-			Type ICachedXmlDoc.Get(string o)
+			object ICachedXmlDoc.Get(object o)
 			{
-				return GetTypeByURL(o);
+				if(o is string)
+					return GetTypeByURL((string) o);
+				throw new ArgumentException("the key should be a string");
 			}
 
 			internal IDictionaryEnumerator GetEnumerator()
@@ -191,19 +180,14 @@ namespace System.Web.J2EE
 
 			public Type GetTypeByURL(string url)
 			{
-				string lwUrl = url.ToLower();
-				lock (_table)
+				if (!_table.ContainsKey(url))
 				{
-					object retVal = _table[lwUrl];
-					if (retVal == null)
-					{
-						PageCompiler compiler = new PageCompiler(url);
-						retVal = compiler.GetCachedType();
-						_table[lwUrl] = retVal;
-					}
-				
-					return (Type)retVal;
+					PageCompiler compiler = new PageCompiler(url);
+					_table[url] = compiler.GetCachedType();
 				}
+				
+
+				return (Type)_table[url];
 			}
 		}
 		#endregion
@@ -245,10 +229,7 @@ namespace System.Web.J2EE
 				Console.WriteLine(descPath);
 #endif
 				Stream fs = (Stream)IOUtils.getStream("/" + descPath);
-				if (fs != null)
-				{
-					typeName = GetTypeFromDescStream(fs);
-				}
+				typeName = GetTypeFromDescStream(fs);
 			}
 			catch (Exception ex)
 			{
@@ -269,17 +250,10 @@ namespace System.Web.J2EE
 			if (fileName.ToLower() != "global.asax"
 				&& fileName.ToLower() != "defaultwsdlhelpgenerator.aspx")
 			{
-				string fullFileName = HttpContext.Current.Request.MapPath(_url);
-				if ( File.Exists(fullFileName) ) {
-					//type not found - run aspxparser
-					string[] command = GetParserCmd();
-					if (J2EEUtils.RunProc(command) != 0)
-						throw GetCompilerError();
-				}
-				else {
-					string message = "The requested resource (" + _url + ") is not available.";
-					throw new HttpException(404, message);
-				}
+				//type not found - run aspxparser
+				string[] command = GetParserCmd();
+				if (J2EEUtils.RunProc(command) != 0)
+					throw GetCompilerError();
 			}
 			//if the desciptor exists in the real app dir - get the type
 			try
@@ -389,10 +363,15 @@ namespace System.Web.J2EE
 
 			if (file != null)
 			{
-				Location loc = new Location(null);
-				loc.Filename = file;
-				loc.BeginLine = int.Parse(lineInFile);
-				return new ParseException(loc,message);
+				try {
+					Location loc = new Location(null);
+					loc.Filename = file;
+					loc.BeginLine = int.Parse(lineInFile);
+					return new ParseException(loc,message);
+				}
+				// If file doesn't exist, or is unreadable just go on and send
+				// the original error message.
+				catch(Exception e) {}
 			}
 
 			if (message.IndexOf(typeof(FileNotFoundException).Name) != -1 &&
@@ -402,3 +381,10 @@ namespace System.Web.J2EE
 		}
 	}
 }
+
+namespace System.Web.GH
+{
+	public class PageMapper : System.Web.J2EE.PageMapper
+	{
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Mail/ChangeLog b/mcs/class/System.Web/System.Web.Mail/ChangeLog
index a9cdc2abb08..8e59828b4c1 100644
--- a/mcs/class/System.Web/System.Web.Mail/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Mail/ChangeLog
@@ -1,9 +1,3 @@
-2006-01-08  Konstantin Triger <kostat@mainsoft.com>
-
-	* SmtpClient.cs, SmtpMail.cs, MailMessage.cs, MailMessageWrapper.cs,
-		MailAttachment.cs: TARGET_JVM changes to let the compilation
-		pass with csc 1.1.
-
 2005-11-28  Chris Toshok  <toshok@ximian.com>
 
 	* SmtpClient.cs: ignore warning 618 (obsolete) when compiling an
diff --git a/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs b/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
index 809524b6fd3..3d6cb364baf 100644
--- a/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
@@ -34,6 +34,9 @@ using System.Security.Permissions;
 
 namespace System.Web.Mail
 {
+#if NET_2_0
+#pragma warning disable 618
+#endif
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -76,4 +79,7 @@ namespace System.Web.Mail
 			get { return encoding; } 
 		}
 	}
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }
diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
index 144903ba282..abfe72ebbcf 100644
--- a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
@@ -35,6 +35,9 @@ using System.Text;
 
 namespace System.Web.Mail
 {
+#if NET_2_0
+#pragma warning disable 618
+#endif
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -142,4 +145,7 @@ namespace System.Web.Mail
 		}
 #endif
 	}
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }
diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
index d7ab68663da..159c336def8 100644
--- a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
@@ -33,6 +33,10 @@ using System.Text;
 
 namespace System.Web.Mail {
 
+#if NET_2_0
+#pragma warning disable 618
+#endif
+
     // wraps a MailMessage to make an easier
     // interface to work with collections of
     // addresses instead of a single string
@@ -248,4 +252,8 @@ namespace System.Web.Mail {
 		}
 #endif
     }	 
+
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }
diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
index 97a8109200c..271423a4cf5 100644
--- a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
@@ -36,6 +36,9 @@ using System.Net.Sockets;
 using System.Security.Permissions;
 
 namespace System.Web.Mail {
+#if NET_2_0
+#pragma warning disable 618
+#endif
 
     /// represents a conntection to a smtp server
     internal class SmtpClient {
@@ -242,4 +245,7 @@ namespace System.Web.Mail {
 	
 		
     }
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }
diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
index 7e6042c0268..c074f44e2fb 100644
--- a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
@@ -36,6 +36,9 @@ using System.Security.Permissions;
 
 namespace System.Web.Mail
 {
+#if NET_2_0
+#pragma warning disable 618
+#endif
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -119,4 +122,7 @@ namespace System.Web.Mail
 			Send (message);
 		}
 	}
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }
diff --git a/mcs/class/System.Web/System.Web.Management/ChangeLog b/mcs/class/System.Web/System.Web.Management/ChangeLog
index 4a0e458798b..3421810ee26 100644
--- a/mcs/class/System.Web/System.Web.Management/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Management/ChangeLog
@@ -1,23 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* SqlFeatures.cs: corcompare work
-
-	* IRegiisUtility.cs: same.
-
-	* WebEventFormatter.cs: same.
-
-	* RuleFiringRecord.cs: same.
-
-	* SessionStateType.cs: same.
-
-	* WebApplicationInformtion.cs: same.
-
-	* EventNotificationType.cs: same.
-
-	* WebBaseEvent.cs: same.
-
-	* IRegisterCreateITypeLib.cs: nuke
-
 2004-08-02  Duncan Mak  <duncan@ximian.com>
 
 	* RuleFiringRecord.cs:
diff --git a/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs b/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs
index 208d9ed0f3d..0e248a12923 100644
--- a/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs
+++ b/mcs/class/System.Web/System.Web.Management/EventNotificationType.cs
@@ -27,10 +27,12 @@
 //
 
 using System;
+using System.Runtime.InteropServices;
 
 #if NET_2_0
 namespace System.Web.Management
 {
+        [Serializable]
         public enum EventNotificationType
         {
                 Regular = 0,
diff --git a/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs b/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs
index bb5c47937ec..051f5b33d12 100644
--- a/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs
+++ b/mcs/class/System.Web/System.Web.Management/IRegiisUtility.cs
@@ -32,32 +32,31 @@ using System.Runtime.InteropServices;
 #if NET_2_0
 namespace System.Web.Management
 {
-	[InterfaceTypeAttribute (ComInterfaceType.InterfaceIsIUnknown)]
-	[GuidAttribute ("C84F668A-CC3F-11D7-B79E-505054503030")]
-	[ComImportAttribute]
         public interface IRegiisUtility
         {
                 void ProtectedConfigAction (
                         long actionToPerform,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string firstArgument,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string secondArgument,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string providerName,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string appPath,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string site,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string cspOrLocation,
-                        int keySize,
-                        out IntPtr exception);
+                        [In] string first_argument,
+                        [In] string second_argument,
+                        [In] string provider_name,
+                        [In] string app_path,
+                        [In] string csp_or_location,
+                        int key_size,
+                        out string exception);
 
                 void RegisterAsnetMmcAssembly (
-                        int doReg,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string assemblyName,
-                        [In,MarshalAs(UnmanagedType.LPWStr)] string binaryDirectory,
-                        out IntPtr exception);
+                        int do_reg,
+                        [In] string assembly_name,
+                        [In] string binary_directory,
+                        out string exception);
 
-                void RegisterSystemWebAssembly (int doReg,
-						out IntPtr exception);
+                void RegisterSystemWebAssembly (int do_reg, out string exception);
 
-		void RemoveBrowserCaps (out IntPtr exception);
+                void ToggleWebAdminToolConfigs (
+                        [In] string site,
+                        [In] int [] settings,
+                        int size,
+                        out string exception);
         }
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs b/mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs
new file mode 100644
index 00000000000..4bb44b08a02
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Management/IRegisterCreateITypeLib.cs
@@ -0,0 +1,58 @@
+//
+// System.Web.Management.IRegisterCreateITypeLib.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+#if NET_2_0
+namespace System.Web.Management
+{
+        public interface IRegisterCreateITypeLib
+        {
+                void CreateTypeInfo ();
+                
+                void SaveAllChanges ();
+                
+                void SetDocString ();
+
+                void SetGuid ();
+
+                void SetHelpContext ();
+
+                void SetHelpFileName ();
+
+                void SetLcid ();
+
+                void SetLibFlags ();
+
+                void SetName ();
+
+                void SetVersion ();
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs b/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs
index c92e8081717..f8627fd8a8d 100644
--- a/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs
+++ b/mcs/class/System.Web/System.Web.Management/RuleFiringRecord.cs
@@ -32,7 +32,7 @@ using System.Web;
 
 namespace System.Web.Management
 {
-        public sealed class RuleFiringRecord
+        public class RuleFiringRecord
         {
                 internal RuleFiringRecord ()
                 {
diff --git a/mcs/class/System.Web/System.Web.Management/SessionStateType.cs b/mcs/class/System.Web/System.Web.Management/SessionStateType.cs
index ae239bb9d36..d0cf520a44f 100644
--- a/mcs/class/System.Web/System.Web.Management/SessionStateType.cs
+++ b/mcs/class/System.Web/System.Web.Management/SessionStateType.cs
@@ -29,6 +29,7 @@
 #if NET_2_0
 namespace System.Web.Management
 {
+        [Serializable]
         public enum SessionStateType
         {
                 Temporary = 0,
diff --git a/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs b/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs
index 32e2cd25815..a1df23ffd56 100644
--- a/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs
+++ b/mcs/class/System.Web/System.Web.Management/SqlFeatures.cs
@@ -29,16 +29,17 @@
 #if NET_2_0
 namespace System.Web.Management
 {
-        [Flags]
+        [Flags, Serializable]
         public enum SqlFeatures
         {
                 None = 0,
                 Membership = 1,
                 Profile = 2,
                 RoleManager = 4,
-                Personalization = 8,
-                SqlWebEventProvider = 16,
-                All = 1073741855
+                SiteCounters = 8,
+                Personalization = 16,
+                SqlWebEventProvider = 32,
+                All = 1073741887
         }
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs b/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs
index 4cf563bd632..7243b6bb683 100644
--- a/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs
+++ b/mcs/class/System.Web/System.Web.Management/WebApplicationInformation.cs
@@ -32,7 +32,7 @@ using System.Web;
 
 namespace System.Web.Management
 {
-        public sealed class WebApplicationInformation
+        public class WebApplicationInformation
         {
                 string application_domain, application_path, application_virtual_path, machine_name, trust_level;
 
diff --git a/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs b/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs
index 2745a3b387d..d27e9462904 100644
--- a/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs
+++ b/mcs/class/System.Web/System.Web.Management/WebBaseEvent.cs
@@ -37,14 +37,14 @@ namespace System.Web.Management
                 object event_source;
                 int event_code, event_detail_code;
 
-                protected WebBaseEvent (string message, object event_source, int event_code)
+                public WebBaseEvent (string message, object event_source, int event_code)
                 {
                         this.message = message;
                         this.event_source = event_source;
                         this.event_code = event_code;
                 }
 
-                protected WebBaseEvent (string message, object event_source, int event_code, int event_detail_code)
+                public WebBaseEvent (string message, object event_source, int event_code, int event_detail_code)
                 {
                         this.message = message;
                         this.event_source = event_source;
@@ -70,7 +70,7 @@ namespace System.Web.Management
                         }
                 }
 
-                public Guid EventID {
+                public Guid EventId {
                         get {
                                 throw new NotImplementedException ();
                         }
@@ -127,7 +127,7 @@ namespace System.Web.Management
                         throw new NotImplementedException ();
                 }
 
-                public virtual string ToString (bool include_app_info, bool include_custom_event_details)
+                public string ToString (bool include_app_info, bool include_custom_event_details)
                 {
                         throw new NotImplementedException ();
                 }
diff --git a/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs b/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs
index fbeef5ae02a..30b4c1234ac 100644
--- a/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs
+++ b/mcs/class/System.Web/System.Web.Management/WebEventFormatter.cs
@@ -58,7 +58,7 @@ namespace System.Web.Management
                         throw new NotImplementedException ();
                 }
                 
-                public new string ToString ()
+                public override string ToString ()
                 {
                         throw new NotImplementedException ();
                 }
diff --git a/mcs/class/System.Web/System.Web.Profile/ChangeLog b/mcs/class/System.Web/System.Web.Profile/ChangeLog
index 795d4ab8a05..352bcf8bc58 100644
--- a/mcs/class/System.Web/System.Web.Profile/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Profile/ChangeLog
@@ -1,9 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* ProfileBase.cs: corcompare work.
-
-	* SqlProfileProvider.cs: add stubbed out file.
-
 2005-11-30  Chris Toshok  <toshok@ximian.com>
 
 	* ProfileBase.cs (Properties): mark as override, not static.
diff --git a/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs b/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs
index ba4f4beee9b..2f902b08340 100644
--- a/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs
+++ b/mcs/class/System.Web/System.Web.Profile/ProfileBase.cs
@@ -59,7 +59,7 @@ namespace System.Web.Profile
 		}
 
 		[MonoTODO]
-		public object GetPropertyValue (string propertyName)
+		public Object GetPropertyValue (string propertyName)
 		{
 			throw new NotImplementedException ();
 		}
@@ -79,7 +79,7 @@ namespace System.Web.Profile
 
 		[MonoTODO]
 		public void SetPropertyValue (string propertyName,
-					      object propertyValue)
+					      Object propertyValue)
 		{
 			throw new NotImplementedException ();
 		}
@@ -99,7 +99,7 @@ namespace System.Web.Profile
 		}
 
 		[MonoTODO]
-		public override object this [ string propertyName ] {
+		public override Object this [ string propertyName ] {
 			get {
 				throw new NotImplementedException ();
 			}
@@ -123,7 +123,7 @@ namespace System.Web.Profile
 		}
 
 		[MonoTODO]
-		public static SettingsPropertyCollection Properties {
+		public override SettingsPropertyCollection Properties {
 			get {
 				throw new NotImplementedException ();
 			}
diff --git a/mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs b/mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs
deleted file mode 100644
index 06f811b37ef..00000000000
--- a/mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlProfileProvider.cs
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-using System;
-using System.Configuration;
-using System.Collections.Specialized;
-
-namespace System.Web.Profile
-{
-	public class SqlProfileProvider : ProfileProvider
-	{
-		[MonoTODO]
-		public SqlProfileProvider ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override int DeleteInactiveProfiles (ProfileAuthenticationOption authenticationOption,
-							    DateTime userInactiveSinceDate)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override int DeleteProfiles (ProfileInfoCollection profiles)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override int DeleteProfiles (string[] usernames)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override ProfileInfoCollection FindInactiveProfilesByUserName (ProfileAuthenticationOption authenticationOption,
-										      string usernameToMatch,
-										      DateTime userInactiveSinceDate,
-										      int pageIndex,
-										      int pageSize,
-										      out int totalRecords)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override ProfileInfoCollection FindProfilesByUserName (ProfileAuthenticationOption authenticationOption,
-									      string usernameToMatch,
-									      int pageIndex,
-									      int pageSize,
-									      out int totalRecords)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override ProfileInfoCollection GetAllInactiveProfiles (ProfileAuthenticationOption authenticationOption,
-									      DateTime userInactiveSinceDate,
-									      int pageIndex,
-									      int pageSize,
-									      out int totalRecords)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override ProfileInfoCollection GetAllProfiles (ProfileAuthenticationOption authenticationOption,
-								      int pageIndex,
-								      int pageSize,
-								      out int totalRecords)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override int GetNumberOfInactiveProfiles (ProfileAuthenticationOption authenticationOption,
-								 DateTime userInactiveSinceDate)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext sc,
-										   SettingsPropertyCollection properties)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void Initialize (string name,
-						 NameValueCollection config)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void SetPropertyValues (SettingsContext sc,
-							SettingsPropertyValueCollection properties)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override string ApplicationName {
-			get { throw new NotImplementedException (); }
-			set { throw new NotImplementedException (); }
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
index 9072b7e72d5..bd6d9d47c3b 100644
--- a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
+++ b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs
@@ -3,7 +3,6 @@
 //
 // Authors:
 //	Ben Maurer (bmaurer@users.sourceforge.net)
-//	Chris Toshok (toshok@ximian.com)
 //
 // (C) 2003 Ben Maurer
 // Copyright (c) 2005 Novell, Inc (http://www.novell.com)
@@ -30,65 +29,36 @@
 
 #if NET_2_0
 
-using System.Web;
-using System.Web.Configuration;
-
 namespace System.Web.Security {
 
+	[MonoTODO ("that's only a stub")]
 	public sealed class AnonymousIdentificationModule : IHttpModule {
 
 		public event AnonymousIdentificationEventHandler Creating;
 		
-		public static void ClearAnonymousIdentifier ()
+		
+		[MonoTODO]
+		public void ClearAnonymousIdentifier ()
 		{
-			HttpContext c = HttpContext.Current;
-			SystemWebSectionGroup g = (SystemWebSectionGroup)WebConfigurationManager.GetSection ("system.web");
-
-			if (!g.AnonymousIdentification.Enabled
-			    || false /* XXX The user for the current request is anonymous */)
-				throw new NotSupportedException ();
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public void Dispose ()
 		{
-			app.PostAuthenticateRequest -= OnEnter;
-			app = null;
+			throw new NotImplementedException ();
 		}
 		
+		[MonoTODO]
 		public void Init (HttpApplication app)
 		{
-			this.app = app;
-			app.PostAuthenticateRequest += OnEnter;
-		}
-
-		void OnEnter (object source, EventArgs eventArgs)
-		{
-			if (!Enabled)
-				return;
-
-			string anonymousID = null;
-
-			if (Creating != null) {
-				AnonymousIdentificationEventArgs e = new AnonymousIdentificationEventArgs (HttpContext.Current);
-				Creating (this, e);
-
-				anonymousID = e.AnonymousID;
-			}
-
-			if (anonymousID == null)
-				anonymousID = Guid.NewGuid().ToString();
-
-			app.Request.AnonymousID = anonymousID;
+			throw new NotImplementedException ();
 		}
-
+		
+		[MonoTODO]
 		public static bool Enabled {
-			get {
-				SystemWebSectionGroup g = (SystemWebSectionGroup)WebConfigurationManager.GetSection ("system.web");
-				return g.AnonymousIdentification.Enabled;
-			}
+			get { throw new NotImplementedException (); }
 		}
-
-		HttpApplication app;
 	}
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.Security/ChangeLog b/mcs/class/System.Web/System.Web.Security/ChangeLog
index 827caa46d97..61ecaf366e0 100644
--- a/mcs/class/System.Web/System.Web.Security/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Security/ChangeLog
@@ -1,30 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* FormsAuthentication.cs: corcompare work.
-
-	* MembershipCreateUserException.cs: same.
-
-	* MembershipPasswordException.cs: same.
-
-	* AnonymousIdentificationModule.cs: same.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* FormsAuthentication.cs, Membership.cs,
-	FormsAuthenticationModule.cs, UrlAuthorizationModule.cs: oops,
-	replace GetWebApplicationSection with GetSection.
-	
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* FormsAuthentication.cs: CONFIGURATION_2_0 => NET_2_0.
-	simplifies the ifdef mess quite a bit.
-
-	* Membership.cs: same.
-
-	* FormsAuthenticationModule.cs: same.
-
-	* UrlAuthorizationModule.cs: same.
-
 2006-01-04  Chris Toshok  <toshok@ximian.com>
 
 	* FormsAuthentication.cs (Authenticate): add CONFIGURATION_2_0
diff --git a/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs b/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
index 33a8b56ff3f..615c45886cb 100644
--- a/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
+++ b/mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs
@@ -75,6 +75,9 @@ namespace System.Web.Security
 						"index.html",
 						"index.htm" };
 
+#if NET_2_0
+		[Obsolete]
+#endif
 		public FormsAuthentication ()
 		{
 		}
@@ -89,8 +92,8 @@ namespace System.Web.Security
 			if (context == null)
 				throw new HttpException ("Context is null!");
 
-#if NET_2_0
-			AuthenticationSection section = (AuthenticationSection) WebConfigurationManager.GetSection (authConfigPath);
+#if CONFIGURATION_2_0
+			AuthenticationSection section = (AuthenticationSection) WebConfigurationManager.GetWebApplicationSection (authConfigPath);
 			FormsAuthenticationCredentials config = section.Forms.Credentials;
 			FormsAuthenticationUser user = config.Users[name];
 			string stored = null;
@@ -125,8 +128,8 @@ namespace System.Web.Security
 			if (protection == FormsProtectionEnum.None)
 				return FormsAuthenticationTicket.FromByteArray (bytes);
 
-#if NET_2_0
-			MachineKeySection config = (MachineKeySection) WebConfigurationManager.GetSection (machineKeyConfigPath);
+#if CONFIGURATION_2_0
+			MachineKeySection config = (MachineKeySection) WebConfigurationManager.GetWebApplicationSection (machineKeyConfigPath);
 #else
 			MachineKeyConfig config = HttpContext.GetAppConfig (machineKeyConfigPath) as MachineKeyConfig;
 #endif
@@ -144,7 +147,7 @@ namespace System.Web.Security
 				int count;
 				MachineKeyValidation validationType;
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 				validationType = config.Validation;
 #else
 				validationType = config.ValidationType;
@@ -154,7 +157,7 @@ namespace System.Web.Security
 				else
 					count = SHA1_hash_size; // 3DES and SHA1
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 				byte [] vk = config.ValidationKeyBytes;
 #else
 				byte [] vk = config.ValidationKey;
@@ -196,7 +199,7 @@ namespace System.Web.Security
 			Initialize ();
 
 			FormsAuthenticationTicket ticket;
-#if NET_2_0
+#if CONFIGURATION_2_0
 			byte [] bytes = MachineKeySection.GetBytes (encryptedTicket, encryptedTicket.Length);
 #else
 			byte [] bytes = MachineKeyConfig.GetBytes (encryptedTicket, encryptedTicket.Length);
@@ -221,15 +224,15 @@ namespace System.Web.Security
 				return GetHexString (ticket_bytes);
 
 			byte [] result = ticket_bytes;
-#if NET_2_0
-			MachineKeySection config = (MachineKeySection) WebConfigurationManager.GetSection (machineKeyConfigPath);
+#if CONFIGURATION_2_0
+			MachineKeySection config = (MachineKeySection) WebConfigurationManager.GetWebApplicationSection (machineKeyConfigPath);
 #else
 			MachineKeyConfig config = HttpContext.GetAppConfig (machineKeyConfigPath) as MachineKeyConfig;
 #endif
 			bool all = (protection == FormsProtectionEnum.All);
 			if (all || protection == FormsProtectionEnum.Validation) {
 				byte [] valid_bytes = null;
-#if NET_2_0
+#if CONFIGURATION_2_0
 				byte [] vk = config.ValidationKeyBytes;
 #else
 				byte [] vk = config.ValidationKey;
@@ -239,7 +242,7 @@ namespace System.Web.Security
 				Buffer.BlockCopy (vk, 0, mix, result.Length, vk.Length);
 
 				switch (
-#if NET_2_0
+#if CONFIGURATION_2_0
 					config.Validation
 #else
 					config.ValidationType
@@ -375,8 +378,8 @@ namespace System.Web.Security
 				if (initialized)
 					return;
 
-#if NET_2_0
-				AuthenticationSection section = (AuthenticationSection)WebConfigurationManager.GetSection (authConfigPath);
+#if CONFIGURATION_2_0
+				AuthenticationSection section = (AuthenticationSection)WebConfigurationManager.GetWebApplicationSection (authConfigPath);
 				FormsAuthenticationConfiguration config = section.Forms;
 
 				cookieName = config.Name;
@@ -393,7 +396,13 @@ namespace System.Web.Security
 				login_url = config.LoginUrl;
 #else
 				HttpContext context = HttpContext.Current;
+#if NET_2_0
+				AuthConfig authConfig = null;
+				if (context != null)
+					authConfig = context.GetConfig (authConfigPath) as AuthConfig;
+#else
 				AuthConfig authConfig = context.GetConfig (authConfigPath) as AuthConfig;
+#endif
 				if (authConfig != null) {
 					cookieName = authConfig.CookieName;
 					timeout = authConfig.Timeout;
@@ -403,6 +412,14 @@ namespace System.Web.Security
 					requireSSL = authConfig.RequireSSL;
 					slidingExpiration = authConfig.SlidingExpiration;
 #endif
+#if NET_2_0
+					cookie_domain = authConfig.CookieDomain;
+					cookie_mode = authConfig.CookieMode;
+					cookies_supported = authConfig.CookiesSupported;
+					default_url = authConfig.DefaultUrl;
+					enable_crossapp_redirects = authConfig.EnableCrossAppRedirects;
+					login_url = authConfig.LoginUrl;
+#endif
 				} else {
 					cookieName = ".MONOAUTH";
 					timeout = 30;
@@ -411,6 +428,13 @@ namespace System.Web.Security
 #if NET_1_1
 					slidingExpiration = true;
 #endif
+#if NET_2_0
+					cookie_domain = String.Empty;
+					cookie_mode = HttpCookieMode.UseDeviceProfile;
+					cookies_supported = true;
+					default_url = "/default.aspx";
+					login_url = "/login.aspx";
+#endif
 				}
 #endif
 
diff --git a/mcs/class/System.Web/System.Web.Security/FormsAuthenticationModule.cs b/mcs/class/System.Web/System.Web.Security/FormsAuthenticationModule.cs
index 36f7b3bff4b..a05e04599b1 100644
--- a/mcs/class/System.Web/System.Web.Security/FormsAuthenticationModule.cs
+++ b/mcs/class/System.Web/System.Web.Security/FormsAuthenticationModule.cs
@@ -64,8 +64,8 @@ namespace System.Web.Security
 			string loginPage;
 			bool slidingExpiration;
 
-#if NET_2_0
-			AuthenticationSection config = (AuthenticationSection) WebConfigurationManager.GetSection ("system.web/authentication");
+#if CONFIGURATION_2_0
+			AuthenticationSection config = (AuthenticationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/authentication");
 #else
 			AuthConfig config = (AuthConfig) context.GetConfig ("system.web/authentication");
 #endif
@@ -74,7 +74,7 @@ namespace System.Web.Security
 				return;
 			}
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 			cookieName = config.Forms.Name;
 			cookiePath = config.Forms.Path;
 			loginPage = config.Forms.LoginUrl;
@@ -139,8 +139,8 @@ namespace System.Web.Security
 				return;
 
 			string loginPage;
-#if NET_2_0
-			AuthenticationSection config = (AuthenticationSection) WebConfigurationManager.GetSection ("system.web/authentication");
+#if CONFIGURATION_2_0
+			AuthenticationSection config = (AuthenticationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/authentication");
 			loginPage = config.Forms.LoginUrl;
 #else
 			AuthConfig config = (AuthConfig) context.GetConfig ("system.web/authentication");
diff --git a/mcs/class/System.Web/System.Web.Security/Membership.cs b/mcs/class/System.Web/System.Web.Security/Membership.cs
index 26ab12dbf85..1cef79446ee 100644
--- a/mcs/class/System.Web/System.Web.Security/Membership.cs
+++ b/mcs/class/System.Web/System.Web.Security/Membership.cs
@@ -47,12 +47,12 @@ namespace System.Web.Security
 		
 		static Membership ()
 		{
-#if NET_2_0
-			MembershipSection section = (MembershipSection) WebConfigurationManager.GetSection ("system.web/membership");
+#if CONFIGURATION_2_0
+			MembershipSection section = (MembershipSection) WebConfigurationManager.GetWebApplicationSection ("system.web/membership");
 #endif
 			providers = new MembershipProviderCollection ();
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 			foreach (ProviderSettings prov in section.Providers) {
 				Type t = Type.GetType (prov.Type);
 				if (t == null)
@@ -76,7 +76,7 @@ namespace System.Web.Security
 				provider.Initialize ("AspNetSqlMembershipProvider", attributes);
 				providers.Add (provider);
 			}
-#if NET_2_0
+#if CONFIGURATION_2_0
 			onlineTimeWindow = (int) section.UserIsOnlineTimeWindow.TotalMinutes;
 #endif
 		}
diff --git a/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs b/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs
index 58b5e9c98b5..6a1cf6aa57b 100644
--- a/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs
+++ b/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs
@@ -51,7 +51,7 @@ namespace System.Web.Security
 		{
 		}
 		
-		protected MembershipCreateUserException (SerializationInfo info, StreamingContext context): base (info, context)
+		public MembershipCreateUserException (SerializationInfo info, StreamingContext context): base (info, context)
 		{
 			info.AddValue ("statusCode", statusCode);
 		}
diff --git a/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs b/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs
index 6601304818d..c9497cec476 100644
--- a/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs
+++ b/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs
@@ -42,7 +42,7 @@ namespace System.Web.Security
 		public MembershipPasswordException (string message) : base (message) {}
 		public MembershipPasswordException (string message, Exception innerException) : base (message, innerException) {}
 		
-		protected MembershipPasswordException (SerializationInfo info, StreamingContext context): base (info, context)
+		public MembershipPasswordException (SerializationInfo info, StreamingContext context): base (info, context)
 		{
 		}
 	}
diff --git a/mcs/class/System.Web/System.Web.Security/UrlAuthorizationModule.cs b/mcs/class/System.Web/System.Web.Security/UrlAuthorizationModule.cs
index 2c7345d8afa..e1744f5f675 100644
--- a/mcs/class/System.Web/System.Web.Security/UrlAuthorizationModule.cs
+++ b/mcs/class/System.Web/System.Web.Security/UrlAuthorizationModule.cs
@@ -58,8 +58,8 @@ namespace System.Web.Security
 			if (context.SkipAuthorization)
 				return;
 
-#if NET_2_0
-			AuthorizationSection config = (AuthorizationSection) WebConfigurationManager.GetSection ("system.web/authorization");
+#if CONFIGURATION_2_0
+			AuthorizationSection config = (AuthorizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/authorization");
 #else
 			AuthorizationConfig config = (AuthorizationConfig) context.GetConfig ("system.web/authorization");
 			if (config == null)
diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
index 874bd0500b2..6ce96b6165c 100644
--- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -1,40 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* IStateRuntime.cs: wrap new interface method with NET_2_0.
-
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* SessionStateActions.cs: oops, actually rename the enum, not just
-	the file.
-
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* SessionStateActions.cs: rename SessionStateActionFlags to this.
-
-	* ISessionIDManager.cs: rename ISessionIDModule to this.
-
-	* IStateRuntime.cs: corcompare work.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* SessionStateServerHandler.cs: CONFIGURATION_2_0 => NET_2_0.
-
-	* SessionSQLServerHandler.cs: same.
-
-	* SessionStateModule.cs: same.
-
-	* ISessionHandler.cs: same.
-
-	* SessionInProcHandler.cs: same.
-
-2006-01-18 Konstantin Triger <kostat@mainsoft.com>
-
-	* HttpSessionState.jvm.cs: correcting serialization conditions.
-
-2006-01-09  Konstantin Triger <kostat@mainsoft.com>
-
-	* HttpSessionState.jvm.cs: merging HttpSessionState.cs@@/main/19-24
-
 2005-11-28  Chris Toshok  <toshok@ximian.com>
 
 	* SessionStateModule.cs: CONFIGURATION_2_0 work.
diff --git a/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs b/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
index 42239d7a5d2..0524e74bc8c 100644
--- a/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
@@ -55,6 +55,7 @@ public sealed class HttpSessionState : ICollection, IEnumerable, java.io.Externa
 	internal bool _abandoned;
 
 	private object _app;
+	private bool _readFirstTime = true;
 	private bool _needSessionPersistence = false;
 
 	internal HttpSessionState (string id,
@@ -110,10 +111,10 @@ public sealed class HttpSessionState : ICollection, IEnumerable, java.io.Externa
 		{
 			output.writeBoolean(_needSessionPersistence);
 			if (!_needSessionPersistence)
-				//indicates that there is nothing to serialize for this object
+			{
 				return;
-
-			System.Web.J2EE.ObjectOutputStream ms = new System.Web.J2EE.ObjectOutputStream(output);
+			}
+			System.IO.MemoryStream ms = new System.IO.MemoryStream();
 			System.IO.BinaryWriter bw = new System.IO.BinaryWriter(ms);
 			bw.Write(_id);
 			_dict.Serialize(bw);
@@ -130,6 +131,7 @@ public sealed class HttpSessionState : ICollection, IEnumerable, java.io.Externa
 			else 
 				bw.Write(3);
 			bw.Write(_isReadonly);
+			output.writeObject(vmw.common.TypeUtils.ToSByteArray(ms.GetBuffer()));
 		}
 	}
 
@@ -138,10 +140,17 @@ public sealed class HttpSessionState : ICollection, IEnumerable, java.io.Externa
 		lock(this)
 		{
 			_needSessionPersistence = input.readBoolean();
-			if(!_needSessionPersistence) //noting has been written 
+			if (!_needSessionPersistence)
+			{
 				return;
-
-			System.Web.J2EE.ObjectInputStream ms = new System.Web.J2EE.ObjectInputStream( input );
+			}
+			sbyte[] array = (sbyte[])input.readObject();
+			if (!_readFirstTime || array == null || array.Length == 0)
+			{
+				return;
+			}
+			_readFirstTime = false;
+			System.IO.MemoryStream ms = new System.IO.MemoryStream((byte[])vmw.common.TypeUtils.ToByteArray(array));
 			System.IO.BinaryReader br = new System.IO.BinaryReader(ms);
 			_id = br.ReadString();
 			_dict =  SessionDictionary.Deserialize(br);
diff --git a/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs b/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs
index 26080c93bd1..af7db73693c 100644
--- a/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs
@@ -38,7 +38,7 @@ namespace System.Web.SessionState
 	{
 		void Dispose ();
 		void Init (SessionStateModule module, HttpApplication context,
-#if NET_2_0
+#if CONFIGURATION_2_0
 			   SessionStateSection config
 #else
 			   SessionConfig config
diff --git a/mcs/class/System.Web/System.Web.SessionState/ISessionIDManager.cs b/mcs/class/System.Web/System.Web.SessionState/ISessionIDManager.cs
deleted file mode 100644
index d3742521a3e..00000000000
--- a/mcs/class/System.Web/System.Web.SessionState/ISessionIDManager.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// System.Web.SessionState.ISessionIDManager
-//
-// Authors:
-//	Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Web;
-
-namespace System.Web.SessionState {
-	public interface ISessionIDManager
-	{
-		///methods
-		string CreateSessionID (HttpContext context);
-		string GetSessionID (HttpContext context);
-		void Initialize ();
-		bool InitializeRequest (HttpContext context, bool suppressAutoDetectRedirect, out bool supportSessionIDReissue);
-		void RemoveSessionID (HttpContext context);
-		void SaveSessionID (HttpContext context, string sessionID, out bool isRedirected, out bool isCookieAdded);
-		bool Validate (string id);
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.SessionState/ISessionIDModule.cs b/mcs/class/System.Web/System.Web.SessionState/ISessionIDModule.cs
new file mode 100644
index 00000000000..b178fa72cfe
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/ISessionIDModule.cs
@@ -0,0 +1,48 @@
+//
+// System.Web.SessionState.ISessionIDModule
+//
+// Authors:
+//	Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System;
+using System.Web;
+
+namespace System.Web.SessionState {
+	public interface ISessionIDModule
+	{
+		///methods
+		string CreateSessionID (HttpContext context);
+		string GetSessionID (HttpContext context);
+		void RemoveSessionID (HttpContext context);
+		void SaveSessionID (HttpContext context, string sessionID, out bool isRedirected, out bool isCookieAdded);
+		bool Validate (string id);
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs b/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs
index a877f49fa96..b1cd995f56e 100644
--- a/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/IStateRuntime.cs
@@ -35,9 +35,6 @@ namespace System.Web.SessionState
 {
 	[Guid ("7297744b-e188-40bf-b7e9-56698d25cf44")]
 	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
-#if NET_2_0
-	[ComImportAttribute]
-#endif
 	public interface IStateRuntime
 	{
 		void ProcessRequest (
@@ -51,19 +48,6 @@ namespace System.Web.SessionState
 			[In, MarshalAs(UnmanagedType.I4)] int contentLength,
 			[In, MarshalAs(UnmanagedType.SysInt)] IntPtr content);
 
-#if NET_2_0
-		void ProcessRequest (
-			[In, MarshalAs(UnmanagedType.SysInt)] IntPtr tracker, 
-			[In, MarshalAs(UnmanagedType.I4)] int verb,
-			[In, MarshalAs(UnmanagedType.LPWStr)] string uri,
-			[In, MarshalAs(UnmanagedType.I4)] int exclusive, 
-			[In, MarshalAs(UnmanagedType.I4)] int extraFlags, 
-			[In, MarshalAs(UnmanagedType.I4)] int timeout,
-			[In, MarshalAs(UnmanagedType.I4)] int lockCookieExists,
-			[In, MarshalAs(UnmanagedType.I4)] int lockCookie,
-			[In, MarshalAs(UnmanagedType.I4)] int contentLength,
-			[In, MarshalAs(UnmanagedType.SysInt)] IntPtr content);
-#endif
 		void StopProcessing ();
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs
index 3ffcf16837c..f815095fe5c 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs
@@ -40,7 +40,7 @@ namespace System.Web.SessionState
 {
 	class SessionInProcHandler : ISessionHandler
 	{
-#if NET_2_0
+#if CONFIGURATION_2_0
 		SessionStateSection config;
 #else
 		SessionConfig config;
@@ -50,7 +50,7 @@ namespace System.Web.SessionState
 		public void Dispose () { }
 
 		public void Init (SessionStateModule module, HttpApplication context,
-#if NET_2_0
+#if CONFIGURATION_2_0
 				  SessionStateSection config
 #else
 				  SessionConfig config
@@ -91,7 +91,7 @@ namespace System.Web.SessionState
 			state = new HttpSessionState (sessionID, // unique identifier
 						new SessionDictionary(), // dictionary
 						HttpApplicationFactory.ApplicationState.SessionObjects,
-#if NET_2_0
+#if CONFIGURATION_2_0
 						(int)config.Timeout.TotalMinutes, // XXX is this right?  we lose some precision here, but since the timeout is in minutes *anyway*...
 #else
 						config.Timeout, //lifetime before death.
@@ -101,7 +101,7 @@ namespace System.Web.SessionState
 						SessionStateMode.InProc,
 						read_only); //readonly
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 			TimeSpan timeout = TimeSpan.FromMinutes ((int)config.Timeout.TotalMinutes);
 #else
 			TimeSpan timeout = new TimeSpan (0, config.Timeout, 0);
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
index c820bb90de8..8a856f6c334 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
@@ -42,7 +42,7 @@ namespace System.Web.SessionState {
 	{
 		private static Type cncType = null;
 		private IDbConnection cnc = null;
-#if NET_2_0
+#if CONFIGURATION_2_0
 		private SessionStateSection config;
 #else
 		private SessionConfig config;
@@ -57,7 +57,7 @@ namespace System.Web.SessionState {
 		}
 
 		public void Init (SessionStateModule module, HttpApplication context,
-#if NET_2_0
+#if CONFIGURATION_2_0
 				  SessionStateSection config
 #else
 				  SessionConfig config
@@ -123,7 +123,7 @@ namespace System.Web.SessionState {
 			id = SessionId.Create (module.Rng);
 			session = new HttpSessionState (id, new SessionDictionary (),
 					HttpApplicationFactory.ApplicationState.SessionObjects,
-#if NET_2_0
+#if CONFIGURATION_2_0
 					(int)config.Timeout.TotalMinutes,
 #else
 					config.Timeout,
@@ -131,7 +131,7 @@ namespace System.Web.SessionState {
 					true, config.CookieLess, SessionStateMode.SQLServer, read_only);
 
 			InsertSession (session,
-#if NET_2_0
+#if CONFIGURATION_2_0
 				       (int)config.Timeout.TotalMinutes
 #else
 				       config.Timeout
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateActionFlags.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateActionFlags.cs
new file mode 100644
index 00000000000..52a10def8ee
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateActionFlags.cs
@@ -0,0 +1,36 @@
+//
+// System.Web.SessionState.SessionStateActionFlags.cs
+//
+// Authors:
+//	Sanjay Gupta (gsanjay@novell.com)
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+namespace System.Web.SessionState {
+	public enum SessionStateActionFlags {
+		InitializeItem	= 1
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
deleted file mode 100644
index f3bfc7ec039..00000000000
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.SessionState.SessionStateActions.cs
-//
-// Authors:
-//	Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-namespace System.Web.SessionState {
-	public enum SessionStateActions {
-		InitializeItem	= 1
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
index dc6d33b3e5c..7e6b1ca9e9b 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
@@ -64,7 +64,7 @@ namespace System.Web.SessionState
 			}
 		}
 #else
-#if NET_2_0
+#if CONFIGURATION_2_0
 		static SessionStateSection config;
 #else
 		static SessionConfig config;
@@ -91,7 +91,7 @@ namespace System.Web.SessionState
 			handler.Dispose();
 		}
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 		SessionStateSection GetConfig ()
 #else
 		SessionConfig GetConfig ()
@@ -101,7 +101,7 @@ namespace System.Web.SessionState
 				if (config != null)
 					return config;
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 				config = (SessionStateSection) WebConfigurationManager.GetSection ("system.web/sessionState");
 #else
 				config = (SessionConfig) HttpContext.GetAppConfig ("system.web/sessionState");
@@ -130,7 +130,7 @@ namespace System.Web.SessionState
 		public void Init (HttpApplication app)
 		{
 			sessionForStaticFiles = (Environment.GetEnvironmentVariable ("MONO_XSP_STATIC_SESSION") != null);
-#if NET_2_0
+#if CONFIGURATION_2_0
 			SessionStateSection cfg = GetConfig ();
 #else
 			SessionConfig cfg = GetConfig ();
@@ -239,7 +239,7 @@ namespace System.Web.SessionState
 
 		internal void OnSessionRemoved (string key, object value, CacheItemRemovedReason reason)
 		{
-#if NET_2_0
+#if CONFIGURATION_2_0
 			SessionStateSection cfg = GetConfig ();
 #else
 			SessionConfig cfg = GetConfig ();
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs
index 701d4c1b728..2dd27283a4b 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs
@@ -43,7 +43,7 @@ namespace System.Web.SessionState {
 		const string CookieName = "ASPSESSION";
 
 		private RemoteStateServer state_server;
-#if NET_2_0
+#if CONFIGURATION_2_0
 		private SessionStateSection config;
 #else
 		private SessionConfig config;
@@ -54,7 +54,7 @@ namespace System.Web.SessionState {
 		}
 
 		public void Init (SessionStateModule module, HttpApplication context,
-#if NET_2_0
+#if CONFIGURATION_2_0
 				  SessionStateSection config
 #else
 				  SessionConfig config
@@ -104,7 +104,7 @@ namespace System.Web.SessionState {
 					sobjs = HttpStaticObjectsCollection.FromByteArray (item.StaticObjectsData);
 					session = new HttpSessionState (id, dict,
 							HttpApplicationFactory.ApplicationState.SessionObjects,
-#if NET_2_0
+#if CONFIGURATION_2_0
 							(int)config.Timeout.TotalMinutes, // XXX is this right?  we lose some precision here, but since the timeout is in minutes *anyway*...
 #else
 							config.Timeout,
@@ -120,7 +120,7 @@ namespace System.Web.SessionState {
 			dict = new SessionDictionary ();
 			sobjs = HttpApplicationFactory.ApplicationState.SessionObjects;
 			item = new StateServerItem (dict.ToByteArray (), sobjs.ToByteArray (),
-#if NET_2_0
+#if CONFIGURATION_2_0
 						    (int)config.Timeout.TotalMinutes
 #else
 						    config.Timeout
@@ -130,7 +130,7 @@ namespace System.Web.SessionState {
 			state_server.Insert (id, item);
 
 			session = new HttpSessionState (id, dict, sobjs,
-#if NET_2_0
+#if CONFIGURATION_2_0
 							(int)config.Timeout.TotalMinutes,
 #else
 							config.Timeout,
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
index e9586e0e5d0..9a51ee1f9a4 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
@@ -1,18 +1,3 @@
-2006-02-23  Chris Toshok  <toshok@ximian.com>
-
-	* HtmlButton.cs: fix corcompare output.
-
-	* HtmlInputButton.cs: same.
-
-	* HtmlInputImage.cs: same.
-
-	* HtmlInputReset.cs: same.
-
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* HtmlInputButton.cs:
-	s/GetPostBackClientEvent/GetPostBackEventReference.
-
 2005-12-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HtmlTableRow.cs: Cells is virtual in latest 1.1.
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs
index edd854fc374..127e249318c 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs
@@ -67,7 +67,7 @@ namespace System.Web.UI.HtmlControls {
 
 #if NET_2_0
 		[DefaultValue ("")]
-		public virtual string ValidationGroup 
+		public string ValidationGroup 
 		{
 			get {
 				return ViewState.GetString ("ValidationGroup", "");
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
index 5ee4624e976..d31ca9a5e6a 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
@@ -76,7 +76,7 @@ namespace System.Web.UI.HtmlControls {
 
 #if NET_2_0
 		[DefaultValue ("")]
-		public virtual string ValidationGroup
+		public string ValidationGroup
 		{
 			get {
 				string group = Attributes["ValidationGroup"];
@@ -167,7 +167,7 @@ namespace System.Web.UI.HtmlControls {
 				if (Page.AreValidatorsUplevel ()) {
 					oc = csm.GetClientValidationEvent ();
 				} else if (Events [ServerClickEvent] != null) {
-					oc = Attributes ["onclick"] + " " + csm.GetPostBackEventReference (this, "");
+					oc = Attributes ["onclick"] + " " + csm.GetPostBackClientEvent (this, "");
 				}
 				
 				if (oc != null) {
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs
index 0ea9a923dfc..043cf887e09 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs
@@ -167,7 +167,7 @@ namespace System.Web.UI.HtmlControls {
 
 #if NET_2_0
 		[DefaultValue ("")]
-		public virtual string ValidationGroup
+		public string ValidationGroup
 		{
 			get {
 				return ViewState.GetString ("ValidationGroup", "");
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs
index 00be2772e24..ee566d56e93 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs
@@ -66,7 +66,7 @@ namespace System.Web.UI.HtmlControls {
 
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override string ValidationGroup
+		public new string ValidationGroup
 		{
 			get {
 				return ViewState.GetString ("ValidationGroup", "");
diff --git a/mcs/class/System.Web/System.Web.UI.Imaging/ChangeLog b/mcs/class/System.Web/System.Web.UI.Imaging/ChangeLog
new file mode 100644
index 00000000000..0e608568ba7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.Imaging/ChangeLog
@@ -0,0 +1,5 @@
+2004-08-03  Sanjay Gupta <gsanjay@novell.com>
+
+	* ImageScaleMode.cs:
+	* ImageType.cs:
+	* StorageType.cs: Added enumerations.
diff --git a/mcs/class/System.Web/System.Web.UI.Imaging/ImageScaleMode.cs b/mcs/class/System.Web/System.Web.UI.Imaging/ImageScaleMode.cs
new file mode 100644
index 00000000000..49765d4f35a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.Imaging/ImageScaleMode.cs
@@ -0,0 +1,41 @@
+//
+// System.Web.UI.Imaging.ImageScaleMode.cs
+//
+// Authors:
+//	Sanjay Gupta (gsanjay@novell.com)
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+namespace System.Web.UI.Imaging {
+	public enum ImageScaleMode {
+		FitBasedOnWidth = 0,
+		FitBasedOnHeight = 1,
+		ScaleBasedOnWidth = 2,
+		ScaleBasedOnHeight = 3,
+		NoScaling = 4
+	} 
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI.Imaging/ImageType.cs b/mcs/class/System.Web/System.Web.UI.Imaging/ImageType.cs
new file mode 100644
index 00000000000..8467b096bf3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.Imaging/ImageType.cs
@@ -0,0 +1,41 @@
+//
+// System.Web.UI.Imaging.ImageType.cs
+//
+// Authors:
+//	Sanjay Gupta (gsanjay@novell.com)
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+namespace System.Web.UI.Imaging {
+	public enum ImageType {
+		Automatic = 0,
+		Jpeg = 1,
+		Png = 2,
+		Gif = 3,
+		Bmp = 4
+	} 
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI.Imaging/StorageType.cs b/mcs/class/System.Web/System.Web.UI.Imaging/StorageType.cs
new file mode 100644
index 00000000000..630d9b6a879
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.Imaging/StorageType.cs
@@ -0,0 +1,38 @@
+//
+// System.Web.UI.Imaging.StorageType.cs
+//
+// Authors:
+//	Sanjay Gupta (gsanjay@novell.com)
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+namespace System.Web.UI.Imaging {
+	public enum StorageType {
+		Cache = 0,
+		Disk = 1
+	} 
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs
index 10cbe3cb5dc..ca11970c73e 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs
@@ -44,22 +44,21 @@ namespace System.Web.UI.WebControls {
 	[ToolboxBitmap ("")]
 	public class AccessDataSource : SqlDataSource {
 
-		const string PROVIDER_NAME = "System.Data.OleDb";
-		const string PROVIDER_STRING = "Microsoft.Jet.OLEDB.4.0";
-
 		string dataFile;
-		string connectionString;
-
+		
 		public AccessDataSource () : base ()
 		{
-			base.ProviderName = PROVIDER_NAME;
+			this.ProviderName = "System.Data.OleDb";
 		}
 
 		public AccessDataSource (string dataFile, string selectCommand) : 
 			base (String.Empty, selectCommand)
 		{
 			this.dataFile = dataFile;
-			this.ProviderName = PROVIDER_NAME;
+			//After setting dataFile, connectionString gets recreated
+			//On accessing ConnectionString, MS.Net throws NullReferenceException
+			//Need to dig more on this.
+			this.ProviderName = "System.Data.OleDb";							
 		}
 
 		protected override SqlDataSourceView CreateDataSourceView (string viewName)
@@ -73,7 +72,7 @@ namespace System.Web.UI.WebControls {
 
 		void ViewChanged (object source, EventArgs e)
 		{
-			RaiseDataSourceChangedEvent (e);
+			OnDataSourceChanged (e);
 		}
 
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
@@ -84,35 +83,18 @@ namespace System.Web.UI.WebControls {
 			set { throw new NotSupportedException ("AccessDataSource does not supports SQL Cache Dependencies."); }
 		}
 
-		[MonoTODO ("why override?  maybe it doesn't call DbProviderFactories.GetFactory?")]
+		[MonoTODO]
 		protected override DbProviderFactory GetDbProviderFactory ()
 		{
-			return DbProviderFactories.GetFactory (PROVIDER_NAME);
-		}
-
-		string GetPhysicalDataFilePath ()
-		{
-			if (DataFile == null || DataFile == "")
-				return "";
-
-			// more here?  how do we handle |DataDirectory|?
-			return HttpContext.Current.Request.MapPath (DataFile);
+			throw new NotImplementedException ();
 		}
 
 		[BrowsableAttribute (false), 
 		DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		public override string ConnectionString {
-			get {
-				if (connectionString == null) {
-					connectionString = String.Format ("Provider={0}; Data Source={1}",
-									  PROVIDER_STRING, GetPhysicalDataFilePath ());
-				}
-
-				return connectionString;
-			}
-			set {
-				throw new InvalidOperationException 
-					("The ConnectionString is automatically generated for AccessDataSource and hence cannot be set."); 
+			get { return this.ConnectionString; }
+			set { throw new InvalidOperationException 
+				("The ConnectionString is automatically generated for AccessDataSource and hence cannot be set."); 
 			}
 		}
 
@@ -122,17 +104,17 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescriptionAttribute ("MS Office Access database file name")]
 		[EditorAttribute ("System.Web.UI.Design.MdbDataFileEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		public string DataFile {
-			get { return ViewState.GetString ("DataFile", ""); }
-			set {
-				ViewState ["DataFile"] = value;
-				connectionString = null;
-			}
+			get { return dataFile; }
+			set { dataFile = value; }
+			//After setting dataFile, connectionString gets recreated
+			//On accessing ConnectionString, MS.Net throws NullReferenceException
+			//Need to dig more on this.
 		}
 
 		[BrowsableAttribute (false), 
 		DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]			
 		public override string ProviderName {
-			get { return base.ProviderName; }
+			get { return this.ProviderName; }
 			set { throw new InvalidOperationException
 				("Setting ProviderName on an AccessDataSource is not allowed");
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSourceView.cs
index 03c4a25fa2e..f0003bbc71e 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSourceView.cs
@@ -57,7 +57,7 @@ namespace System.Web.UI.WebControls {
 						DataSourceSelectArguments arguments)
 		{
 			oleCommand = new OleDbCommand (this.SelectCommand, oleConnection);
-			SqlDataSourceSelectingEventArgs cmdEventArgs = new SqlDataSourceSelectingEventArgs (oleCommand, arguments);
+			SqlDataSourceCommandEventArgs cmdEventArgs = new SqlDataSourceCommandEventArgs (oleCommand);
 			OnSelecting (cmdEventArgs);
 			IEnumerable enums = null; 
 			Exception exception = null;
@@ -65,7 +65,7 @@ namespace System.Web.UI.WebControls {
 			try {
 				System.IO.File.OpenRead (dataSource.DataFile).Close ();
 				oleConnection.Open ();
-				reader = (OleDbDataReader)oleCommand.ExecuteReader ();
+				reader = oleCommand.ExecuteReader ();
 			
 				//enums = reader.GetEnumerator ();
 				throw new NotImplementedException("OleDbDataReader doesnt implements GetEnumerator method yet");
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs
index aa4367e34fd..9dd115405ea 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedField.cs
@@ -96,7 +96,7 @@ namespace System.Web.UI.WebControls {
 		
 		
 		[MonoTODO ("Support other data types")]
-		protected override void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
+		public override void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
 		{
 			bool editable = (rowState & (DataControlRowState.Edit | DataControlRowState.Insert)) != 0;
 			
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedFieldProperties.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedFieldProperties.cs
index 1c05b2e2440..6d11bb4e8f6 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedFieldProperties.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AutoGeneratedFieldProperties.cs
@@ -41,18 +41,35 @@ namespace System.Web.UI.WebControls {
 		StateBag ViewState = new StateBag ();
 
 		public string DataField {
-			get { return ViewState.GetString ("DataField", ""); }
-			set { ViewState ["DataField"] = value; }
+			get {
+				object ob = ViewState ["DataField"];
+				if (ob != null) return (string) ob;
+				return string.Empty;
+			}
+			set {
+				ViewState ["DataField"] = value;
+			}
 		}
 		
 		public bool IsReadOnly {
-			get { return ViewState.GetBool ("IsReadOnly", false); }
-			set { ViewState ["IsReadOnly"] = value; }
+			get {
+				object val = ViewState ["IsReadOnly"];
+				return val != null ? (bool) val : false;
+			}
+			set { 
+				ViewState ["IsReadOnly"] = value;
+			}
 		}
 		
 		public string Name {
-			get { return ViewState.GetString ("Name", ""); }
-			set { ViewState ["Name"] = value; }
+			get {
+				object ob = ViewState ["Name"];
+				if (ob != null) return (string) ob;
+				return string.Empty;
+			}
+			set {
+				ViewState ["Name"] = value;
+			}
 		}
 		
 		public Type Type {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
index 34a9cbf22b1..278b2542872 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
@@ -41,12 +41,7 @@ namespace System.Web.UI.WebControls {
 
 		ValidationDataType type;
 
-#if NET_2_0
-		protected
-#else
-		public
-#endif
-		BaseCompareValidator ()
+		public BaseCompareValidator ()
 		{
 			type = ValidationDataType.String;
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
index 132246f01c4..4f5e814fe88 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
@@ -65,7 +65,10 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategory ("Accessibility")]
 		public virtual string Caption {
-			get { return ViewState.GetString ("Caption", ""); }
+			get {
+				object o = ViewState ["Caption"];
+				return (o == null) ? String.Empty : (string) o;
+			}
 			set {
 				if (value == null)
 					ViewState.Remove ("Caption");
@@ -76,7 +79,10 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue (TableCaptionAlign.NotSet)]
 		public virtual TableCaptionAlign CaptionAlign {
-			get { return (TableCaptionAlign) ViewState.GetInt ("CaptionAlign", (int)TableCaptionAlign.NotSet); }
+			get {
+				object o = ViewState ["CaptionAlign"];
+				return (o == null) ? TableCaptionAlign.NotSet : (TableCaptionAlign) o;
+			}
 			set {
 				if ((value < TableCaptionAlign.NotSet) || (value > TableCaptionAlign.Right))
 					throw new ArgumentOutOfRangeException (Locale.GetText ("Invalid TableCaptionAlign value."));
@@ -130,7 +136,10 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription("")]
 		[WebCategory("Data")]
 		public virtual string DataKeyField {
-			get { return ViewState.GetString ("DataKeyField", ""); }
+			get {
+				object o = ViewState ["DataKeyField"];
+				return (o == null) ? String.Empty : (string) o;
+			}
 			set {
 				if (value == null)
 					ViewState.Remove ("DataKeyField");
@@ -169,7 +178,10 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription("")]
 		[WebCategory("Data")]
 		public string DataMember {
-			get { return ViewState.GetString ("DataMember", ""); }
+			get {
+				object o = ViewState ["DataMember"];
+				return (o == null) ? String.Empty : (string) o;
+			}
 			set {
 				if (value == null)
 					ViewState.Remove ("DataMember");
@@ -247,7 +259,10 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue (false)]
 		public virtual bool UseAccessibleHeader {
-			get { return ViewState.GetBool ("UseAccessibleHeader", false); }
+			get {
+				object o = ViewState ["UseAccessibleHeader"];
+				return (o == null) ? false : (bool) o;
+			}
 			set { ViewState ["UseAccessibleHeader"] = value; }
 		}
 #if NET_2_0
@@ -255,7 +270,10 @@ namespace System.Web.UI.WebControls {
 		[IDReferenceProperty (typeof (DataSourceControl))]
 		[Themeable (false)]
 		public virtual string DataSourceID {
-			get { return ViewState.GetString ("DataSourceID", ""); }
+			get {
+				object o = ViewState ["DataSourceID"];
+				return (o == null) ? String.Empty : (string) o;
+			}
 			set {
 				// LAMESPEC ? this is documented as an HttpException in beta2
 				if (source != null)
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
index b52fd4a8940..b0fadcb89da 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
@@ -71,16 +71,24 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 		[DefaultValue ("")]
-		public virtual string ValidationGroup {
-			get { return ViewState.GetString ("ValidationGroup", String.Empty); }
-			set { ViewState["ValidationGroup"] = value; }
+		public string ValidationGroup {
+			get {
+				return ViewState.GetString ("ValidationGroup", String.Empty);
+			}
+			set {
+				ViewState["ValidationGroup"] = value;
+			}
 		}
 
 		[Themeable (false)]
 		[DefaultValue (false)]
 		public bool SetFocusOnError {
-			get { return ViewState.GetBool ("SetFocusOnError", false); }
-			set { ViewState["SetFocusOnError"] = value; }
+			get {
+				return ViewState.GetBool ("SetFocusOnError", false);
+			}
+			set {
+				ViewState["SetFocusOnError"] = value;
+			}
 		}
 
 		/* listed in corcompare */
@@ -89,8 +97,12 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue ("")]
 		public override string Text 
 		{
-			get { return base.Text; }
-			set { base.Text = value; }
+			get {
+				return base.Text;
+			}
+			set {
+				base.Text = value;
+			}
 		}
 #endif
 
@@ -103,8 +115,12 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategory ("Behavior")]
 		public string ControlToValidate {
-			get { return ViewState.GetString ("ControlToValidate", String.Empty); }
-			set { ViewState ["ControlToValidate"] = value; }
+			get {
+				return ViewState.GetString ("ControlToValidate", String.Empty);
+			}
+			set {
+				ViewState ["ControlToValidate"] = value;
+			}
 		}
 
 #if NET_2_0
@@ -117,8 +133,12 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
 		public ValidatorDisplay Display {
-			get { return (ValidatorDisplay)ViewState.GetInt ("Display", (int)ValidatorDisplay.Static); }
-			set { ViewState ["Display"] = (int)value; }
+			get {
+				return (ValidatorDisplay)ViewState.GetInt ("Display", (int)ValidatorDisplay.Static);
+			}
+			set {
+				ViewState ["Display"] = (int)value;
+			}
 		}
 
 #if NET_2_0
@@ -128,13 +148,21 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategory ("Behavior")]
 		public bool EnableClientScript {
-			get { return ViewState.GetBool ("EnableClientScript", true); }
-			set { ViewState ["EnableClientScript"] = value; }
+			get {
+				return ViewState.GetBool ("EnableClientScript", true);
+			}
+			set {
+				ViewState ["EnableClientScript"] = value;
+			}
 		}
 
 		public override bool Enabled {
-			get { return ViewState.GetBool ("Enabled", true); }
-			set { ViewState ["Enabled"] = value; }
+			get {
+				return ViewState.GetBool ("Enabled", true);
+			}
+			set {
+				ViewState ["Enabled"] = value;
+			}
 		}
 
 #if NET_2_0
@@ -146,19 +174,20 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue("")]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
-#if NET_2_0
-		public
-#else
-		public virtual
-#endif
-		string ErrorMessage {
-			get { return ViewState.GetString ("ErrorMessage", String.Empty); }
-			set { ViewState ["ErrorMessage"] = value; }
+		public virtual string ErrorMessage {
+			get {
+				return ViewState.GetString ("ErrorMessage", String.Empty);
+			}
+			set {
+				ViewState ["ErrorMessage"] = value;
+			}
 		}
 
 		[DefaultValue(typeof (Color), "Red")]
 		public override Color ForeColor {
-			get { return forecolor; }
+			get {
+				return forecolor;
+			}
 			set {
 				forecolor = value;
 				base.ForeColor = value;
@@ -173,14 +202,13 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		[WebSysDescription ("")]
 		[WebCategory ("Misc")]
-#if NET_2_0
-		public
-#else
-		public virtual
-#endif
-		bool IsValid {
-			get { return valid; }
-			set { valid = value; }
+		public virtual bool IsValid {
+			get {
+				return valid;
+			}
+			set {
+				valid = value;
+			}
 		}
 
 		protected bool PropertiesValid {
@@ -194,7 +222,9 @@ namespace System.Web.UI.WebControls {
 		}
 
 		protected bool RenderUplevel {
-			get { return render_uplevel; }
+			get {
+				return render_uplevel;
+			}
 		}
 
 		internal bool GetRenderUplevel ()
@@ -221,18 +251,12 @@ namespace System.Web.UI.WebControls {
 				if (!Enabled)
 					writer.AddAttribute ("enabled", "false");
 
-				if (!IsValid) {
+				if (!IsValid)
 					writer.AddAttribute ("isvalid", "false");
-				}
-				else {
-					if (Display == ValidatorDisplay.Static)
-						writer.AddStyleAttribute ("visibility", "hidden");
-					else
-						writer.AddStyleAttribute ("display", "none");
-				}
 
-				if (Display != ValidatorDisplay.Static)
-					writer.AddAttribute ("display", Display.ToString());
+				if (Display == ValidatorDisplay.Static) {
+					writer.AddStyleAttribute ("visibility", "static");
+				}
 			}
 
 			base.AddAttributesToRender (writer);
@@ -492,12 +516,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		/* the docs say "public sealed" here */
-#if NET_2_0
-		public
-#else
-		public virtual
-#endif
-		void Validate ()
+		public virtual void Validate ()
 		{
 			if (Enabled && Visible)
 				IsValid = ControlPropertiesValid () && EvaluateIsValid ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
index 54ebdeebb6e..eb2a1b8eb1b 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
@@ -93,22 +93,20 @@ namespace System.Web.UI.WebControls {
 		{
 			base.InitializeCell (cell, columnIndex, itemType);
 
-			string df = DataField;
-
 			switch (itemType) {
 			case ListItemType.Item:
 			case ListItemType.SelectedItem:
 			case ListItemType.AlternatingItem:
-				if (df != null && df.Length != 0)
-					cell.DataBinding += new EventHandler (ItemDataBinding);
+				cell.DataBinding += new EventHandler (ItemDataBinding);
 				break;
 			case ListItemType.EditItem:
-				if (ReadOnly && df != null && df.Length != 0) {
+				if (ReadOnly) {
 					cell.DataBinding += new EventHandler (ItemDataBinding);
 					break;
 				}
+				string df = DataField;
 				TextBox tb = new TextBox ();
-				if (df != null && df.Length != 0)
+				if (df != null && df != "")
 					tb.DataBinding += new EventHandler (ItemDataBinding);
 				cell.Controls.Add (tb);
 				break;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
index 65dac683293..ffb5bc98f5d 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
@@ -63,7 +63,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ConvertEmptyStringToNull {
-			get { return ViewState.GetBool ("ConvertEmptyStringToNull", false); }
+			get {
+				object ob = ViewState ["ConvertEmptyStringToNull"];
+				if (ob != null) return (bool) ob;
+				return true;
+			}
 			set {
 				ViewState ["ConvertEmptyStringToNull"] = value;
 				OnFieldChanged ();
@@ -75,7 +79,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
 		public virtual string DataField {
-			get { return ViewState.GetString ("DataField", ""); }
+			get {
+				object ob = ViewState ["DataField"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["DataField"] = value;
 				OnFieldChanged ();
@@ -86,7 +94,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Data")]
 		public virtual string DataFormatString {
-			get { return ViewState.GetString ("DataFormatString", ""); }
+			get {
+				object ob = ViewState ["DataFormatString"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["DataFormatString"] = value;
 				OnFieldChanged ();
@@ -96,19 +108,23 @@ namespace System.Web.UI.WebControls {
 		[MonoTODO]
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
-		public override string HeaderText {
-			get { return ViewState.GetString ("HeaderText", "");
+		public virtual string HeaderText {
+			get {
+				throw new NotImplementedException ();
 			}
 			set {
-				ViewState["HeaderText"] = value;
-				OnFieldChanged ();
+				throw new NotImplementedException ();
 			}
 		}
 
 		[DefaultValueAttribute ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual string NullDisplayText {
-			get { return ViewState.GetString ("NullDisplaytext", ""); }
+			get {
+				object ob = ViewState ["NullDisplayText"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["NullDisplayText"] = value;
 				OnFieldChanged ();
@@ -118,8 +134,11 @@ namespace System.Web.UI.WebControls {
 		[DefaultValueAttribute (false)]
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
-		public virtual bool ReadOnly {
-			get { return ViewState.GetBool ("ReadOnly", false); }
+		public bool ReadOnly {
+			get {
+				object val = ViewState ["ReadOnly"];
+				return val != null ? (bool) val : false;
+			}
 			set { 
 				ViewState ["ReadOnly"] = value;
 				OnFieldChanged ();
@@ -130,7 +149,10 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("HtmlEncode")]
 		public virtual bool HtmlEncode {
-			get { return ViewState.GetBool ("ReadOnly", true); }
+			get {
+				object val = ViewState ["HtmlEncode"];
+				return val != null ? (bool) val : true;
+			}
 			set { 
 				ViewState ["HtmlEncode"] = true;
 				OnFieldChanged ();
@@ -169,7 +191,7 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 		
-		protected virtual void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
+		public virtual void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
 		{
 			bool editable = (rowState & (DataControlRowState.Edit | DataControlRowState.Insert)) != 0;
 			if (editable && !ReadOnly) {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs
index 4d1a4d41cca..29ddf38ecf6 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs
@@ -216,13 +216,27 @@ namespace System.Web.UI.WebControls {
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[UrlPropertyAttribute]
 		public virtual string BulletImageUrl {
-			get { return ViewState.GetString ("BulletImageUrl", ""); }
-			set { ViewState ["BulletImageUrl"] = value; }
+			get {
+				object ret = ViewState ["BulletImageUrl"];
+				if (ret != null)
+					return (string) ret; 
+			
+				return "";
+			}
+			set {
+				ViewState ["BulletImageUrl"] = value;
+			}
 		}
 		
 	    [DefaultValueAttribute (BulletStyle.NotSet)]
 		public virtual BulletStyle BulletStyle {
-			get { return (BulletStyle) ViewState.GetInt ("BulletStyle", (int) BulletStyle.NotSet); }
+			get {
+				object ret = ViewState ["BulletStyle"];
+				if (ret != null)
+					return (BulletStyle) ret; 
+			
+				return BulletStyle.NotSet;
+			}
 			set {
 				if ((int) value < 0 || (int) value > 9)
 					throw new ArgumentOutOfRangeException ("value");
@@ -235,7 +249,13 @@ namespace System.Web.UI.WebControls {
 		
 	    [DefaultValueAttribute (BulletedListDisplayMode.Text)]
 		public virtual BulletedListDisplayMode DisplayMode {
-			get { return (BulletedListDisplayMode) ViewState.GetInt ("DisplayMode", (int)BulletedListDisplayMode.Text); }
+			get {
+				object ret = ViewState ["DisplayMode"];
+				if (ret != null)
+					return (BulletedListDisplayMode) ret; 
+			
+				return BulletedListDisplayMode.Text;
+			}
 			set {
 				if ((int) value < 0 || (int) value > 2)
 					throw new ArgumentOutOfRangeException ("value");
@@ -246,8 +266,16 @@ namespace System.Web.UI.WebControls {
 		
 	    [DefaultValueAttribute (1)]
 		public virtual int FirstBulletNumber {
-			get { return ViewState.GetInt ("FirstBulletNumber", 1); }
-			set { ViewState ["FirstBulletNumber"] = value; }
+			get {
+				object ret = ViewState ["FirstBulletNumber"];
+				if (ret != null)
+					return (int) ret; 
+			
+				return 1;
+			}
+			set {
+				ViewState ["FirstBulletNumber"] = value;
+			}
 		}
 		
 
@@ -275,8 +303,16 @@ namespace System.Web.UI.WebControls {
 		[DefaultValueAttribute ("")]
 		[TypeConverter (typeof (TargetConverter))]
 		public virtual string Target {
-			get { return ViewState.GetString ("Target", ""); }
-			set { ViewState ["Target"] = value; }
+			get {
+				object ret = ViewState ["Target"];
+				if (ret != null)
+					return (string) ret; 
+			
+				return "";
+			}
+			set {
+				ViewState ["Target"] = value;
+			}
 		}
 
 		[EditorBrowsable (EditorBrowsableState.Never)]
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
index a64f6bfec17..f6bd105a978 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
@@ -89,8 +89,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
+		public virtual
+#else		
+		public
 #endif		
-		public string CommandArgument {
+		string CommandArgument {
 			get {
 				return ViewState.GetString ("CommandArgument", "");
 			}
@@ -104,8 +107,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
+		public virtual
+#else
+		public
 #endif		
-		public string CommandName {
+		string CommandName {
 			get {
 				return ViewState.GetString ("CommandName", "");
 			}
@@ -138,8 +144,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Appearance")]
 #if NET_2_0
 		[Localizable (true)]
+		public virtual
+#else		
+		public
 #endif		
-		public string Text {
+		string Text {
 			get {
 				return ViewState.GetString ("Text", "");
 			}
@@ -180,15 +189,8 @@ namespace System.Web.UI.WebControls {
 			writer.AddAttribute (HtmlTextWriterAttribute.Value, Text);
 
 			if (CausesValidation && Page != null && Page.AreValidatorsUplevel ()) {
-				string onclick = Attributes["onclick"];
-				if (onclick != null) {
-					Attributes.Remove("onclick");
-					int len = onclick.Length;
-					if (len > 0 && onclick[len - 1] != ';')
-						onclick += ";";
-				}
 				ClientScriptManager csm = new ClientScriptManager (Page);
-				writer.AddAttribute (HtmlTextWriterAttribute.Onclick, onclick + csm.GetClientValidationEvent ());
+				writer.AddAttribute (HtmlTextWriterAttribute.Onclick, csm.GetClientValidationEvent ());
 				writer.AddAttribute ("language", "javascript");
 			}
 
@@ -283,7 +285,7 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 		[UrlProperty("*.aspx")]
 		[MonoTODO]
-		public virtual string PostBackUrl {
+		public string PostBackUrl {
 			get {
 				throw new NotImplementedException ();
 			}
@@ -296,7 +298,7 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
-		public virtual string ValidationGroup {
+		public string ValidationGroup {
 			get {
 				return ViewState.GetString ("ValidationGroup", "");
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonField.cs
index 92eb9c65fea..bfa1a13ad3e 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonField.cs
@@ -48,7 +48,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("Raised when a Button Command is executed.")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual string CommandName {
-			get { return ViewState.GetString ("CommandName", ""); }
+			get {
+				object ob = ViewState ["CommandName"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["CommandName"] = value;
 				OnFieldChanged ();
@@ -60,7 +64,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Data")]
 		public virtual string DataTextField {
-			get { return ViewState.GetString ("DataTextField", ""); }
+			get {
+				object ob = ViewState ["DataTextField"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["DataTextField"] = value;
 				OnFieldChanged ();
@@ -71,7 +79,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Data")]
 		public virtual string DataTextFormatString {
-			get { return ViewState.GetString ("DataTextFormatString", ""); }
+			get {
+				object ob = ViewState ["DataTextFormatString"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["DataTextFormatString"] = value;
 				OnFieldChanged ();
@@ -84,7 +96,11 @@ namespace System.Web.UI.WebControls {
 		[DefaultValueAttribute ("")]

 		[UrlPropertyAttribute]

 		public virtual string ImageUrl {
-			get { return ViewState.GetString ("ImageUrl", ""); }
+			get {
+				object ob = ViewState ["ImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["ImageUrl"] = value;
 				OnFieldChanged ();
@@ -96,7 +112,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string Text {
-			get { return ViewState.GetString ("Text", ""); }
+			get {
+				object ob = ViewState ["Text"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["Text"] = value;
 				OnFieldChanged ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonFieldBase.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonFieldBase.cs
index 9b8e3e318c1..efbdef1fc72 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonFieldBase.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonFieldBase.cs
@@ -45,7 +45,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual ButtonType ButtonType {
-			get { return (ButtonType) ViewState.GetInt ("ButtonType", (int) ButtonType.Link); }
+			get {
+				object ob = ViewState ["ButtonType"];
+				if (ob != null) return (ButtonType) ob;
+				return ButtonType.Link;
+			}
 			set {
 				ViewState ["ButtonType"] = value;
 				OnFieldChanged ();
@@ -56,7 +60,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool CausesValidation {
-			get { return ViewState.GetBool ("CausesValidation", false); }
+			get {
+				object ob = ViewState ["CausesValidation"];
+				if (ob != null) return (bool) ob;
+				return false;
+			}
 			set {
 				ViewState ["CausesValidation"] = value;
 				OnFieldChanged ();
@@ -67,7 +75,10 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public override bool ShowHeader {
-			get { return ViewState.GetBool ("showHeader", false); }
+			get {
+				object val = ViewState ["showHeader"];
+				return val != null ? (bool) val : false;
+			}
 			set { 
 				ViewState ["showHeader"] = value;
 				OnFieldChanged ();
@@ -78,7 +89,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual string ValidationGroup {
-			get { return ViewState.GetString ("ValidationGroup", ""); }
+			get {
+				object ob = ViewState ["ValidationGroup"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["ValidationGroup"] = value;
 				OnFieldChanged ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 0c45e7f2f95..62bd3263707 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,202 +1,9 @@
-2006-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* SqlDataSource.cs: track change to DataSourceControl's protected
-	methods.
-
-	* AccessDataSource.cs: same.
-
-2006-02-27  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* ListControl.cs: fixed SelectedIndex property, fixed selection
-	reset on incorrect value
-
-2006-02-27  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* TableStyle.cs: fixed AddAttributesToRender function, style
-	BorderCollapse:Collapse was added if table's CellSpacing is zero
-
-2006-02-23  Chris Toshok  <toshok@ximian.com>
-
-	* CheckBox.cs, ContentControlBuilderInternal.cs, Content.cs,
-	ContentPlaceHolderBuilder.cs, ContentPlaceHolder.cs,
-	DataControlFieldHeaderCell.cs, DataGridColumn.cs,
-	HierarchicalDataBoundControl.cs, HyperLinkField.cs,
-	ImageButton.cs, ImageField.cs, Literal.cs,
-	ObjectDataSourceView.cs, TextBox.cs: more corcompare work.
-
-	* BaseCompareValidator.cs, BaseValidator.cs, Button.cs,
-	DataControlField.cs, DetailsView.cs, FormView.cs, GridView.cs,
-	HotSpot.cs, LinkButton.cs, Login.cs, SiteMapDataSource.cs,
-	SqlDataSourceCommandType.cs, TableSectionStyle.cs,
-	TemplateField.cs, TreeNodeCollection.cs, TreeNode.cs, TreeView.cs,
-	ValidationSummary.cs, WizardStepBase.cs: fix tons of corcompare
-	errors.  most were caused by a property/method being virtual when
-	it shouldn't be, or vice versa.
-
-2006-02-22  Chris Toshok  <toshok@ximian.com>
-
-	* ObjectDataSource.cs: corcompare work.
-
-2006-02-22  Chris Toshok  <toshok@ximian.com>
-
-	* ParameterCollection.cs: add an EditorAttribute to the class.
-
-	* Parameter.cs: cleanup, fix the Value property, and implement the
-	Size property.
-
-	* SqlDataSourceView.cs: clean things up a bit, and add handling
-	for parameters.
-
-2006-02-22  Chris Toshok  <toshok@ximian.com>
-
-	* SqlDataSourceFilteringEventArgs.cs: formatting.
-
-	* SqlDataSourceSelectingEventArgs.cs: remove ExecutingSelectCount,
-	both the property and ctor arg.
-
-	* AccessDataSourceView.cs (ExecuteSelect): use SelectingEventArgs,
-	not CommandEventArgs.  Also, cast the return value of
-	oleCommand.ExecuteReader.
-
-	* AccessDataSource.cs (.ctor): fix the ctors and remove FIXME
-	comments.
-	(GetDbProviderFactory): implement naively, and leave a MonoTODO.
-	(GetPhysicalDataFilePath): implement, again naively.  this is
-	where the NRE is generated when we access ConnectionString in a
-	testcase on .net.
-	(ConnectionString): dynamically generate this based on our
-	DataFile attribute.
-	(DataFile): clear the ConnectionString in the setter so we'll
-	regenerate it.
-	(ProviderName): use base.ProviderName in the getter, not
-	this.ProviderName, so we don't recurse infinitely.
-	
-	* SqlDataSourceView.cs: start reworking this class.
-
-	* SqlDataSource.cs (GetDbProviderFactory): implement this,
-	following the MS docs on the matter (if ProviderName is null/"",
-	return SqlClientFactory.Instance.)
-	(GetDbProviderFactoryInternal): add an internal method for use by
-	SqlDataSourceView.
-	(TrackViewState): don't invoke View.TrackViewState unless we have
-	one.
-	(Selecting): change event handler type to match MS.
-	(Filtering): add missing event.
-	(View): call CreateDataSourceView, don't just create an
-	SqlDataSourceView.
-	
-2006-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* BoundField.cs: ues the ViewState.Get* pattern with default
-	instead of the explicit ViewState lookup + null check, and fix the
-	scope of InitializeDataCell.
-
-	* ButtonField.cs: ues the ViewState.Get* pattern with default
-	instead of the explicit ViewState lookup + null check.
-
-	* CommandField.cs: same.
-
-	* CheckBox.cs: same.
-
-	* AutoGeneratedFieldProperties.cs: same.
-
-	* BaseDataList.cs: same.
-
-	* CircleHotSpot.cs: same.
-
-	* BulletedList.cs: same.
-
-	* DataBoundControl.cs: same.
-
-	* CookieParameter.cs: same.
-
-	* ControlParameter.cs: same.
-
-	* CustomValidator.cs: same.
-
-	* ButtonFieldBase.cs: same.
-
-	* CheckBoxField.cs: same, and fix the scope of InitializeDataCell.
-
-	* AutoGeneratedField.cs: fix scope of InitializeDataCell.
-
-	* BaseValidator.cs: same, and clean up the getter/setter formatting.
-
-	* CompareValidator.cs: same.
-	
-2006-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* ListControl.cs: fixed DataSource property, to throw 
-	ArgumentException on incorrect value
-
-2006-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* Image.cs: fixed missing border="0" attribute, when image has style, 
-	but border width is not specified.
-
-2006-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* CheckBox.cs: fixed InternalAddAttributesToRender, Render to
-	correct the "disabled" attribute in CheckBoxList
-	* CheckBoxList.cs: fixed RenderItem, to correct the "disabled" 
-	attribute in CheckBoxList
-
-2006-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* CheckBox.cs: fixed Render function, removed rendering of empty 
-	<span> element if ControlStyleCreated but it's empty.
-	fixed "disabled" attribute, it should be placed into span element
-
-2006-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* BoundColumn.cs: fixed InitializeCell function, if DataField is 
-	null or empty string, the cell should not be bound.
-
-2006-02-08  Chris Toshok  <toshok@ximian.com>
-
-	* ListControl.cs (OnDataBinding): in 2.0, only clear our items if
-	AppendDataBoundItems != false.  Also, split all the databinding
-	logic out to DoDataBinding, which we call from here only if
-	!NET_2_0.
-	(DoDataBinding): new function. actually perform the binding.
-	(PerformDataBinding): implement.
-	(PerformSelect): chain up to base class.
-
-2006-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* ContentPlaceHolder.cs: fix ToolboxDataAttribute.
-
-	* Content.cs: use ContentControlBuilderInternal, and add a bunch
-	of unused (for now) EventHandler's here.
-
-	* ContentControlBuilderInternal.cs: rename ContentControlBuilder
-	to this.
-
 2006-01-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* ListControl.cs: bound checking for Items when loading the control
 	state, as the number might have been changed on the fly. Patch by
 	Elliott Draper.
 
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* CheckBox.cs: s/GetPostBackClientEvent/GetPostBackEventReference.
-
-	* MultiView.cs (OnBubbleEvent): case the rhs to a string to get
-	the intended comparison right and quiet mcs.
-
-2006-01-15 Konstantin Triger <kostat@mainsoft.com>
-
-	* Button.cs: Add semicolon after client script if does not exist.
-
-2006-01-15 Konstantin Triger <kostat@mainsoft.com>
-
-	* Button.cs: preserve user logic when adding client validation.
-
-2006-01-15 Konstantin Triger <kostat@mainsoft.com>
-
-	* BaseValidator.cs: fixing visibility bahavior
-
 2006-01-13 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* RangeValidator.cs: allow empty data from the control. Patch from Marek
@@ -207,11 +14,6 @@
 	* Calendar.cs: use the DateTimeFormatInfo from the current thread. Patch
 	by Cyrille Colin. Closes bug #77184.
 
-2006-01-08  Konstantin Triger <kostat@mainsoft.com>
-
-	* PagedDataSource.cs, DataGrid.cs: TARGET_JVM changes to let the
-	 compilation pass with csc 1.1.
-
 2005-12-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* DropDownList.cs: HtmlEncode the item text. Fixes bug #76949.
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
index f95bc8f9f28..57a0a9aa588 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
@@ -180,7 +180,15 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Appearance")]
 		public virtual TextAlign TextAlign
 		{
-			get { return (TextAlign) ViewState.GetInt ("TextAlign", (int)TextAlign.Right); }
+			get {
+				object o = ViewState["TextAlign"];
+
+				if (o == null) {
+					return (TextAlign.Right);
+				} else {
+					return ((TextAlign)o);
+				}
+			}
 			set {
 				if (value != TextAlign.Left &&
 				    value != TextAlign.Right) {
@@ -196,7 +204,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue ("")]
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
-		public virtual string ValidationGroup
+		public string ValidationGroup
 		{
 			get { return ViewState.GetString ("ValidationGroup", String.Empty); }
 			set { ViewState["ValidationGroup"] = value; }
@@ -312,13 +320,13 @@ namespace System.Web.UI.WebControls {
 			if (Page != null)
 				Page.VerifyRenderingInServerForm (this);
 
-			bool need_span = ControlStyleCreated && !ControlStyle.IsEmpty;
+			bool need_span = ControlStyleCreated;
 			if (need_span)
 				ControlStyle.AddAttributesToRender (w, this);
 
 			if (!Enabled) {
 				w.AddAttribute (HtmlTextWriterAttribute.Disabled, "disabled");
-				need_span = true;
+				//need_span = true;
 			}
 
 			string tt = ToolTip;
@@ -346,7 +354,7 @@ namespace System.Web.UI.WebControls {
 
 				if (AutoPostBack){
 					w.AddAttribute (HtmlTextWriterAttribute.Onclick,
-							Page.ClientScript.GetPostBackEventReference (this, String.Empty));
+							     Page.ClientScript.GetPostBackClientEvent (this, String.Empty));
 					w.AddAttribute ("language", "javascript");
 				}
 
@@ -383,6 +391,9 @@ namespace System.Web.UI.WebControls {
 					w.RenderEndTag ();
 				}
 
+				if (!Enabled)
+					w.AddAttribute (HtmlTextWriterAttribute.Disabled, "disabled");
+
 				w.AddAttribute (HtmlTextWriterAttribute.Id, ClientID);
 				w.AddAttribute (HtmlTextWriterAttribute.Type, render_type);
 				w.AddAttribute (HtmlTextWriterAttribute.Name, NameAttribute);
@@ -392,7 +403,7 @@ namespace System.Web.UI.WebControls {
 
 				if (AutoPostBack){
 					w.AddAttribute (HtmlTextWriterAttribute.Onclick,
-							Page.ClientScript.GetPostBackEventReference (this, String.Empty));
+							     Page.ClientScript.GetPostBackClientEvent (this, String.Empty));
 					w.AddAttribute ("language", "javascript");
 				}
 
@@ -459,8 +470,6 @@ namespace System.Web.UI.WebControls {
 
 		internal virtual void InternalAddAttributesToRender (HtmlTextWriter w)
 		{
-			if (!Enabled)
-				w.AddAttribute (HtmlTextWriterAttribute.Disabled, "disabled");
 		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs
index 5234fe4822c..7ba198f9495 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs
@@ -82,14 +82,18 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string Text {
-			get { return ViewState.GetString ("Text", ""); }
+			get {
+				object ob = ViewState ["Text"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["Text"] = value;
 				OnFieldChanged ();
 			}
 		}
 		
-		protected override void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
+		public override void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
 		{
 			bool editable = (rowState & (DataControlRowState.Edit | DataControlRowState.Insert)) != 0;
 			CheckBox box = new CheckBox ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
index 35fd1827e3c..76b50706cf5 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
@@ -338,9 +338,18 @@ namespace System.Web.UI.WebControls {
 			check_box.Text = item.Text;
 			check_box.AutoPostBack = AutoPostBack;
 			check_box.Checked = item.Selected;
-			check_box.TextAlign = TextAlign;
-			check_box.Enabled = Enabled;
+
+			if (!Enabled) {
+				check_box.Enabled = false;
+				writer.AddAttribute (HtmlTextWriterAttribute.Disabled, "disabled");
+				writer.RenderBeginTag (HtmlTextWriterTag.Span);
+			}
+
 			check_box.RenderControl (writer);
+
+			if (!Enabled) {
+				writer.RenderEndTag ();
+			}
 		}
 
 		void IRepeatInfoUser.RenderItem (ListItemType itemType,
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CircleHotSpot.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CircleHotSpot.cs
index eeb0b650f89..5d06791335e 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CircleHotSpot.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CircleHotSpot.cs
@@ -45,22 +45,37 @@ namespace System.Web.UI.WebControls
 			get { return "circle"; }
 		}
 		
-		[DefaultValueAttribute (0)]
+	    [DefaultValueAttribute (0)]

 		public int Radius {
-			get { return ViewState.GetInt ("Radius", 0); }
-			set { ViewState ["Radius"] = value; }
+			get {
+				object o = ViewState ["Radius"];
+				return o != null ? (int) o : 0;
+			}
+			set {
+				ViewState ["Radius"] = value;
+			}
 		}
 
-		[DefaultValueAttribute (0)]
+	    [DefaultValueAttribute (0)]

 		public int X {
-			get { return ViewState.GetInt ("X", 0); }
-			set { ViewState ["X"] = value; }
+			get {
+				object o = ViewState ["X"];
+				return o != null ? (int) o : 0;
+			}
+			set {
+				ViewState ["X"] = value;
+			}
 		}
 
-		[DefaultValueAttribute (0)]
+	    [DefaultValueAttribute (0)]

 		public int Y {
-			get { return ViewState.GetInt ("Y", 0); }
-			set { ViewState ["Y"] = value; }
+			get {
+				object o = ViewState ["Y"];
+				return o != null ? (int) o : 0;
+			}
+			set {
+				ViewState ["Y"] = value;
+			}
 		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
index a70c3ca8521..511f0608f3a 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
@@ -47,7 +47,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string CancelImageUrl {
-			get { return ViewState.GetString ("CancelImageUrl", ""); }
+			get {
+				object ob = ViewState ["CancelImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["CancelImageUrl"] = value;
 				OnFieldChanged ();
@@ -58,16 +62,24 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string CancelText {
-			get { return ViewState.GetString ("CancelText", "Cancel"); }
+			get {
+				object ob = ViewState ["CancelText"];
+				if (ob != null) return (string) ob;
+				return "Cancel";
+			}
 			set {
 				ViewState ["CancelText"] = value;
 				OnFieldChanged ();
 			}
 		}
 
-		[DefaultValueAttribute (true)]
+	    [DefaultValueAttribute (true)]

 		public override bool CausesValidation {
-			get { return ViewState.GetBool ("CausesValidation", true); }
+			get {
+				object ob = ViewState ["CausesValidation"];
+				if (ob != null) return (bool) ob;
+				return true;
+			}
 			set {
 				ViewState ["CausesValidation"] = value;
 				OnFieldChanged ();
@@ -80,7 +92,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string DeleteImageUrl {
-			get { return ViewState.GetString ("DeleteImageUrl", ""); }
+			get {
+				object ob = ViewState ["DeleteImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["DeleteImageUrl"] = value;
 				OnFieldChanged ();
@@ -91,7 +107,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string DeleteText {
-			get { return ViewState.GetString ("DeleteText", "Delete"); }
+			get {
+				object ob = ViewState ["DeleteText"];
+				if (ob != null) return (string) ob;
+				return "Delete";
+			}
 			set {
 				ViewState ["DeleteText"] = value;
 				OnFieldChanged ();
@@ -104,7 +124,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string EditImageUrl {
-			get { return ViewState.GetString ("EditImageUrl", ""); }
+			get {
+				object ob = ViewState ["EditImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["EditImageUrl"] = value;
 				OnFieldChanged ();
@@ -115,7 +139,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string EditText {
-			get { return ViewState.GetString ("EditText", "Edit"); }
+			get {
+				object ob = ViewState ["EditText"];
+				if (ob != null) return (string) ob;
+				return "Edit";
+			}
 			set {
 				ViewState ["EditText"] = value;
 				OnFieldChanged ();
@@ -128,7 +156,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string InsertImageUrl {
-			get { return ViewState.GetString ("InsertImageUrl", ""); }
+			get {
+				object ob = ViewState ["InsertImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["InsertImageUrl"] = value;
 				OnFieldChanged ();
@@ -139,7 +171,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string InsertText {
-			get { return ViewState.GetString ("InsertText", "Insert"); }
+			get {
+				object ob = ViewState ["InsertText"];
+				if (ob != null) return (string) ob;
+				return "Insert";
+			}
 			set {
 				ViewState ["InsertText"] = value;
 				OnFieldChanged ();
@@ -152,7 +188,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string NewImageUrl {
-			get { return ViewState.GetString ("NewImageUrl", ""); }
+			get {
+				object ob = ViewState ["NewImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["NewImageUrl"] = value;
 				OnFieldChanged ();
@@ -163,7 +203,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string NewText {
-			get { return ViewState.GetString ("NewText", "New"); }
+			get {
+				object ob = ViewState ["NewText"];
+				if (ob != null) return (string) ob;
+				return "New";
+			}
 			set {
 				ViewState ["NewText"] = value;
 				OnFieldChanged ();
@@ -176,7 +220,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string SelectImageUrl {
-			get { return ViewState.GetString ("SelectImageUrl", ""); }
+			get {
+				object ob = ViewState ["SelectImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["SelectImageUrl"] = value;
 				OnFieldChanged ();
@@ -187,7 +235,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string SelectText {
-			get { return ViewState.GetString ("SelectText", "Select"); }
+			get {
+				object ob = ViewState ["SelectText"];
+				if (ob != null) return (string) ob;
+				return "Select";
+			}
 			set {
 				ViewState ["SelectText"] = value;
 				OnFieldChanged ();
@@ -198,7 +250,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowCancelButton {
-			get { return ViewState.GetBool ("ShowCancelButton", true); }
+			get {
+				object ob = ViewState ["ShowCancelButton"];
+				if (ob != null) return (bool) ob;
+				return true;
+			}
 			set {
 				ViewState ["ShowCancelButton"] = value;
 				OnFieldChanged ();
@@ -209,7 +265,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowDeleteButton {
-			get { return ViewState.GetBool ("ShowDeleteButton", false); }
+			get {
+				object ob = ViewState ["ShowDeleteButton"];
+				if (ob != null) return (bool) ob;
+				return false;
+			}
 			set {
 				ViewState ["ShowDeleteButton"] = value;
 				OnFieldChanged ();
@@ -220,7 +280,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowEditButton {
-			get { return ViewState.GetBool ("ShowEditButton", false); }
+			get {
+				object ob = ViewState ["ShowEditButton"];
+				if (ob != null) return (bool) ob;
+				return false;
+			}
 			set {
 				ViewState ["ShowEditButton"] = value;
 				OnFieldChanged ();
@@ -231,7 +295,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowSelectButton {
-			get { return ViewState.GetBool ("ShowSelectButton", false); }
+			get {
+				object ob = ViewState ["ShowSelectButton"];
+				if (ob != null) return (bool) ob;
+				return false;
+			}
 			set {
 				ViewState ["ShowSelectButton"] = value;
 				OnFieldChanged ();
@@ -242,7 +310,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowInsertButton {
-			get { return ViewState.GetBool ("ShowInsertButton", false); }
+			get {
+				object ob = ViewState ["ShowInsertButton"];
+				if (ob != null) return (bool) ob;
+				return false;
+			}
 			set {
 				ViewState ["ShowInsertButton"] = value;
 				OnFieldChanged ();
@@ -255,7 +327,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string UpdateImageUrl {
-			get { return ViewState.GetString ("UpdateImageUrl", ""); }
+			get {
+				object ob = ViewState ["UpdateImageUrl"];
+				if (ob != null) return (string) ob;
+				return "";
+			}
 			set {
 				ViewState ["UpdateImageUrl"] = value;
 				OnFieldChanged ();
@@ -266,7 +342,11 @@ namespace System.Web.UI.WebControls {
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Appearance")]
 		public virtual string UpdateText {
-			get { return ViewState.GetString ("UpdateText", "Update"); }
+			get {
+				object ob = ViewState ["UpdateText"];
+				if (ob != null) return (string) ob;
+				return "Update";
+			}
 			set {
 				ViewState ["UpdateText"] = value;
 				OnFieldChanged ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
index 3d84615b195..0046a9c4ddb 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
@@ -99,8 +99,12 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		public string ControlToCompare {
-			get { return ViewState.GetString ("ControlToCompare", String.Empty); }
-			set { ViewState["ControlToCompare"] = value; }
+			get {
+				return ViewState.GetString ("ControlToCompare", String.Empty);
+			}
+			set {
+				ViewState["ControlToCompare"] = value;
+			}
 		}
 
 		[DefaultValue(ValidationCompareOperator.Equal)]
@@ -110,8 +114,13 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		public ValidationCompareOperator Operator {
-			get { return (ValidationCompareOperator)ViewState.GetInt ("Operator", (int)ValidationCompareOperator.Equal); }
-			set { ViewState ["Operator"] = (int)value; }
+			get {
+				return (ValidationCompareOperator)ViewState.GetInt ("Operator", (int)ValidationCompareOperator.Equal);
+			}
+
+			set {
+				ViewState ["Operator"] = (int)value;
+			}
 		}
 
 #if !NET_2_0
@@ -124,8 +133,12 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		public string ValueToCompare {
-			get { return ViewState.GetString ("ValueToCompare", String.Empty); }
-			set { ViewState ["ValueToCompare"] = value; }
+			get {
+				return ViewState.GetString ("ValueToCompare", String.Empty);
+			}
+			set {
+				ViewState ["ValueToCompare"] = value;
+			}
 		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
index 57ed42702be..a6011121e13 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Content.cs
@@ -37,7 +37,11 @@ namespace System.Web.UI.WebControls
 {
 	[ToolboxItem (false)]
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.ContentDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-	[ControlBuilder(typeof(ContentBuilderInternal))]
+#if notyet
+	[ControlBuilder(typeof(ContentControlBuilderInternal))]  /* XXX ew, this is in beta2 - an internal builder? */
+#else
+	[ControlBuilder(typeof(ContentControlBuilder))] 
+#endif
 	public class Content: Control, INamingContainer
 	{
 		string placeHolderId;
@@ -50,54 +54,6 @@ namespace System.Web.UI.WebControls
 			get { return placeHolderId; }
 			set { placeHolderId = value; }
 		}
-
-		static readonly object DataBindingEvent = new object ();
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
-		public new event EventHandler DataBinding {
-			add { Events.AddHandler (DataBindingEvent, value); }
-			remove { Events.RemoveHandler (DataBindingEvent, value); }
-		}
-
-		static readonly object DisposedEvent = new object ();
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
-		public new event EventHandler Disposed {
-			add { Events.AddHandler (DisposedEvent, value); }
-			remove { Events.RemoveHandler (DisposedEvent, value); }
-		}
-
-		static readonly object InitEvent = new object ();
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
-		public new event EventHandler Init {
-			add { Events.AddHandler (InitEvent, value); }
-			remove { Events.RemoveHandler (InitEvent, value); }
-		}
-
-		static readonly object LoadEvent = new object ();
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
-		public new event EventHandler Load {
-			add { Events.AddHandler (LoadEvent, value); }
-			remove { Events.RemoveHandler (LoadEvent, value); }
-		}
-
-		static readonly object PreRenderEvent = new object ();
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
-		public new event EventHandler PreRender {
-			add { Events.AddHandler (PreRenderEvent, value); }
-			remove { Events.RemoveHandler (PreRenderEvent, value); }
-		}
-
-		static readonly object UnloadEvent = new object ();
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[Browsable (false)]
-		public new event EventHandler Unload {
-			add { Events.AddHandler (UnloadEvent, value); }
-			remove { Events.RemoveHandler (UnloadEvent, value); }
-		}
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilder.cs
new file mode 100644
index 00000000000..ca31d83b974
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilder.cs
@@ -0,0 +1,60 @@
+//
+// System.Web.UI.WebControls.Content.cs
+//
+// Authors:
+//   Lluis Sanchez Gual (lluis@novell.com)
+//
+// (C) 2005 Novell, Inc.
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+
+namespace System.Web.UI
+{
+	internal class ContentControlBuilder: TemplateBuilder
+	{
+		string placeHolderID;
+		
+		public override void Init (TemplateParser parser,
+					  ControlBuilder parentBuilder,
+					  Type type,
+					  string tagName,
+					  string ID,
+					  IDictionary attribs)
+		{
+			base.Init (parser, parentBuilder, type, tagName, ID, attribs);
+			placeHolderID = attribs ["ContentPlaceHolderID"] as string;
+		}
+		
+		public string ContentPlaceHolderID {
+			get { return placeHolderID; }
+		}
+	}
+}
+
+#endif
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs
deleted file mode 100644
index e72f2a5e056..00000000000
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// System.Web.UI.WebControls.ContentBuilderInternal.cs
-//
-// Authors:
-//   Lluis Sanchez Gual (lluis@novell.com)
-//
-// (C) 2005 Novell, Inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI.WebControls
-{
-	internal class ContentBuilderInternal: TemplateBuilder
-	{
-		string placeHolderID;
-		
-		public override void Init (TemplateParser parser,
-					  ControlBuilder parentBuilder,
-					  Type type,
-					  string tagName,
-					  string ID,
-					  IDictionary attribs)
-		{
-			base.Init (parser, parentBuilder, type, tagName, ID, attribs);
-			placeHolderID = attribs ["ContentPlaceHolderID"] as string;
-		}
-		
-		public string ContentPlaceHolderID {
-			get { return placeHolderID; }
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs
index 439e9d6b844..7fd9d5b70ed 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs
@@ -39,8 +39,7 @@ namespace System.Web.UI.WebControls
 	[ToolboxItemFilterAttribute ("Microsoft.VisualStudio.Web.WebForms.MasterPageWebFormDesigner", ToolboxItemFilterType.Require)]
 	[ToolboxItemFilterAttribute ("System.Web.UI", ToolboxItemFilterType.Allow)]
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.ContentPlaceHolderDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-                               
-	[ToolboxDataAttribute ("<;{0}:ContentPlaceHolder runat=&quot;server&quot;></{0}:ContentPlaceHolder>")]
+	[ToolboxDataAttribute ("<{0}:ContentPlaceHolder runat='server'></{0}:ContentPlaceHolder>")]
 	[ControlBuilder(typeof(ContentPlaceHolderBuilder))] 
 	public class ContentPlaceHolder: Control, INamingContainer
 	{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolderBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolderBuilder.cs
index bf3c1bf91fe..c5d6a1b5b5d 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolderBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolderBuilder.cs
@@ -34,7 +34,7 @@ using System;
 using System.Collections;
 using System.Web.UI.WebControls;
 
-namespace System.Web.UI.WebControls
+namespace System.Web.UI
 {
 	internal class ContentPlaceHolderBuilder: ControlBuilder
 	{
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs
index 90e40c24de8..5e6bae48d16 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs
@@ -92,7 +92,13 @@ namespace System.Web.UI.WebControls {
 		[DefaultValueAttribute ("")]
 		[IDReferencePropertyAttribute (typeof(System.Web.UI.Control))]
 		public string ControlID {
-			get { return ViewState.GetString ("ControlID", ""); }
+			get {
+				string s = ViewState ["ControlID"] as string;
+				if (s != null)
+					return s;
+				
+				return "";
+			}
 			set {
 				if (ControlID != value) {
 					ViewState ["ControlID"] = value;
@@ -105,7 +111,13 @@ namespace System.Web.UI.WebControls {
 		[TypeConverterAttribute (typeof (ControlPropertyNameConverter))]
 		[WebCategoryAttribute ("Control")]
 		public string PropertyName {
-			get { return ViewState.GetString ("PropertyName", ""); }
+			get {
+				string s = ViewState ["PropertyName"] as string;
+				if (s != null)
+					return s;
+				
+				return "";
+			}
 			set {
 				
 				if (PropertyName != value) {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs
index 29639548c63..21d09877c0d 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs
@@ -75,9 +75,15 @@ namespace System.Web.UI.WebControls {
 			return c.Value;
 		}
 		
-		[DefaultValueAttribute ("")]
+	    [DefaultValueAttribute ("")]
 		public string CookieName {
-			get { return ViewState.GetString ("CookieName", ""); }
+			get {
+				string s = ViewState ["CookieName"] as string;
+				if (s != null)
+					return s;
+				
+				return "";
+			}
 			set {
 				if (CookieName != value) {
 					ViewState ["CookieName"] = value;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs
index a6e76669a31..5be24aec210 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs
@@ -52,8 +52,13 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		public string ClientValidationFunction {
-			get { return ViewState.GetString("ClientValidationFunction", ""); }
-			set { ViewState["ClientValidationFunction"] = value; }
+			get {
+				return ViewState.GetString("ClientValidationFunction", string.Empty);
+			}
+
+			set {
+				ViewState["ClientValidationFunction"] = value;
+			}
 		}
 
 #if NET_2_0
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs
index 7c14828aa1f..561b15168d6 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs
@@ -156,14 +156,28 @@ namespace System.Web.UI.WebControls {
 		[ThemeableAttribute (false)]
 		[DefaultValueAttribute ("")]
 		[WebCategoryAttribute ("Data")]
-		public virtual string DataMember {
-			get { return ViewState.GetString ("DataMember", ""); }
-			set { ViewState["DataMember"] = value; }
+		public virtual string DataMember
+		{
+			get {
+				object o = ViewState["DataMember"];
+				if(o!=null)
+					return (string)o;
+				return String.Empty;
+			}
+			set {
+				ViewState["DataMember"] = value;
+			}
 		}
 
 		[IDReferencePropertyAttribute (typeof(DataSourceControl))]
 		public override string DataSourceID {
-			get { return ViewState.GetString ("DataSourceID", ""); }
+			get {
+				object o = ViewState ["DataSourceID"];
+				if (o != null)
+					return (string)o;
+				
+				return String.Empty;
+			}
 			set {
 				ViewState ["DataSourceID"] = value;
 				base.DataSourceID = value;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlField.cs
index 19db7ef97bf..1de3cc852f8 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlField.cs
@@ -223,7 +223,7 @@ namespace System.Web.UI.WebControls {
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[DefaultValueAttribute (null)]
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
-		public Style ControlStyle {
+		public virtual Style ControlStyle {
 			get {
 				if (controlStyle == null) {
 					controlStyle = new Style ();
@@ -242,7 +242,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[WebCategoryAttribute ("Styles")]
-		public TableItemStyle FooterStyle {
+		public virtual TableItemStyle FooterStyle {
 			get {
 				if (footerStyle == null) {
 					footerStyle = new TableItemStyle ();
@@ -286,7 +286,7 @@ namespace System.Web.UI.WebControls {
 		[WebCategoryAttribute ("Styles")]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[DefaultValueAttribute (null)]
-		public TableItemStyle HeaderStyle {
+		public virtual TableItemStyle HeaderStyle {
 			get {
 				if (headerStyle == null) {
 					headerStyle = new TableItemStyle ();
@@ -328,7 +328,7 @@ namespace System.Web.UI.WebControls {
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[WebCategoryAttribute ("Styles")]
 		[DefaultValueAttribute (null)]
-		public TableItemStyle ItemStyle {
+		public virtual TableItemStyle ItemStyle {
 			get {
 				if (itemStyle == null) {
 					itemStyle = new TableItemStyle ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlFieldHeaderCell.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlFieldHeaderCell.cs
index 5a90177ffa4..084fd852d48 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlFieldHeaderCell.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlFieldHeaderCell.cs
@@ -46,7 +46,7 @@ namespace System.Web.UI.WebControls
 			this.scope = scope;
 		}
 		
-		public virtual TableHeaderScope Scope {
+		public TableHeaderScope Scope {
 			get {
 				object ob = ViewState ["Scope"];
 				if (ob != null) return (TableHeaderScope) ob;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
index 8f320673036..6dfda09afc5 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
@@ -858,29 +858,6 @@ namespace System.Web.UI.WebControls {
 
 		class NCollection : ICollection {
 			int n;
-#if TARGET_JVM
-			class SequenceEnumerator : IEnumerator {
-				readonly int _max;
-				object _current;
-				public SequenceEnumerator(int max) {
-					_max = max;
-					Reset();
-				}
-
-				public bool MoveNext() {
-					_current = (int)_current + 1;
-					return (int)_current >= 0 && (int)_current < _max;
-				}
-
-				public void Reset() {
-					_current = -1;
-				}
-
-				public object Current {
-					get { return _current; }
-				}
-			}
-#endif
 
 			public NCollection (int n)
 			{
@@ -889,12 +866,8 @@ namespace System.Web.UI.WebControls {
 
 			public IEnumerator GetEnumerator ()
 			{
-#if TARGET_JVM
-				return new SequenceEnumerator(n);
-#else
 				for (int i = 0; i < n; i++)
 					yield return i;
-#endif
 			}
 
 			public int Count {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
index 79436ef754f..0db64c077f9 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
@@ -48,12 +48,7 @@ namespace System.Web.UI.WebControls {
 		TableItemStyle header_style;
 		TableItemStyle item_style;
 		
-#if NET_2_0
-		protected
-#else
-		public
-#endif
-		DataGridColumn ()
+		public DataGridColumn ()
 		{
 			viewstate = new StateBag ();
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
index 296a1191ac2..38fafe7a75d 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
@@ -40,14 +40,13 @@ using System.Reflection;
 
 namespace System.Web.UI.WebControls
 {
-	[SupportsEventValidation]
 	[ToolboxDataAttribute ("<{0}:DetailsView runat=\"server\" Width=\"125px\" Height=\"50px\"></{0}:DetailsView>")]

 	[DesignerAttribute ("System.Web.UI.Design.WebControls.DetailsViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
 	[ControlValuePropertyAttribute ("SelectedValue")]
 	[DefaultEventAttribute ("PageIndexChanging")]
 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class DetailsView: CompositeDataBoundControl, ICallbackEventHandler, ICallbackContainer, IDataItemContainer, INamingContainer, IPostBackEventHandler, IPostBackContainer
+	public class DetailsView: CompositeDataBoundControl, ICallbackEventHandler, ICallbackContainer, IDataItemContainer, INamingContainer
 	{
 		object dataItem;
 		
@@ -273,7 +272,7 @@ namespace System.Web.UI.WebControls
 		
 		[WebCategoryAttribute ("Paging")]
 		[DefaultValueAttribute (false)]
-		public virtual bool AllowPaging {
+		public bool AllowPaging {
 			get {
 				object ob = ViewState ["AllowPaging"];
 				if (ob != null) return (bool) ob;
@@ -286,11 +285,11 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[DefaultValueAttribute (null)]
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle AlternatingRowStyle {
+		public virtual TableItemStyle AlternatingRowStyle {
 			get {
 				if (alternatingRowStyle == null) {
 					alternatingRowStyle = new TableItemStyle ();
@@ -385,7 +384,7 @@ namespace System.Web.UI.WebControls
 		[WebCategoryAttribute ("Accessibility")]
 		[DefaultValueAttribute ("")]
 		[LocalizableAttribute (true)]
-		public virtual string Caption {
+		public string Caption {
 			get {
 				object ob = ViewState ["Caption"];
 				if (ob != null) return (string) ob;
@@ -443,11 +442,11 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[DefaultValueAttribute (null)]
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle CommandRowStyle {
+		public virtual TableItemStyle CommandRowStyle {
 			get {
 				if (commandRowStyle == null) {
 					commandRowStyle = new TableItemStyle ();
@@ -458,16 +457,16 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

-		[BrowsableAttribute (false)]

+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

+	    [BrowsableAttribute (false)]

 		public DetailsViewMode CurrentMode {
 			get {
 				return currentMode;
 			}
 		}
 	
-		[DefaultValueAttribute (DetailsViewMode.ReadOnly)]

-		[WebCategoryAttribute ("Behavior")]

+	    [DefaultValueAttribute (DetailsViewMode.ReadOnly)]

+	    [WebCategoryAttribute ("Behavior")]

 		public virtual DetailsViewMode DefaultMode {
 			get {
 				object o = ViewState ["DefaultMode"];
@@ -523,12 +522,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		[DefaultValueAttribute (null)]

-		public TableItemStyle EditRowStyle {
+	    [DefaultValueAttribute (null)]

+		public virtual TableItemStyle EditRowStyle {
 			get {
 				if (editRowStyle == null) {
 					editRowStyle = new TableItemStyle ();
@@ -539,12 +538,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		[DefaultValueAttribute (null)]

-		public TableItemStyle EmptyDataRowStyle {
+	    [DefaultValueAttribute (null)]

+		public virtual TableItemStyle EmptyDataRowStyle {
 			get {
 				if (emptyDataRowStyle == null) {
 					emptyDataRowStyle = new TableItemStyle ();
@@ -558,8 +557,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(DetailsView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate EmptyDataTemplate {
+	    [Browsable (false)]
+		public ITemplate EmptyDataTemplate {
 			get { return emptyDataTemplate; }
 			set { emptyDataTemplate = value; RequireBinding (); }
 		}
@@ -593,12 +592,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle FieldHeaderStyle {
+		public virtual TableItemStyle FieldHeaderStyle {
 			get {
 				if (fieldHeaderStyle == null) {
 					fieldHeaderStyle = new TableItemStyle ();
@@ -621,16 +620,16 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(DetailsView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate FooterTemplate {
+	    [Browsable (false)]
+		public ITemplate FooterTemplate {
 			get { return footerTemplate; }
 			set { footerTemplate = value; RequireBinding (); }
 		}
 
-		[LocalizableAttribute (true)]

-		[WebCategoryAttribute ("Appearance")]

-		[DefaultValueAttribute ("")]

-		public virtual string FooterText {
+	    [LocalizableAttribute (true)]

+	    [WebCategoryAttribute ("Appearance")]

+	    [DefaultValueAttribute ("")]

+		public string FooterText {
 			get {
 				object ob = ViewState ["FooterText"];
 				if (ob != null) return (string) ob;
@@ -642,12 +641,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle FooterStyle {
+		public virtual TableItemStyle FooterStyle {
 			get {
 				if (footerStyle == null) {
 					footerStyle = new TableItemStyle ();
@@ -680,12 +679,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle HeaderStyle {
+		public virtual TableItemStyle HeaderStyle {
 			get {
 				if (headerStyle == null) {
 					headerStyle = new TableItemStyle ();
@@ -699,16 +698,16 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(DetailsView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate HeaderTemplate {
+	    [Browsable (false)]
+		public ITemplate HeaderTemplate {
 			get { return headerTemplate; }
 			set { headerTemplate = value; RequireBinding (); }
 		}
 
-		[LocalizableAttribute (true)]

-		[WebCategoryAttribute ("Appearance")]

-		[DefaultValueAttribute ("")]

-		public virtual string HeaderText {
+	    [LocalizableAttribute (true)]

+	    [WebCategoryAttribute ("Appearance")]

+	    [DefaultValueAttribute ("")]

+		public string HeaderText {
 			get {
 				object ob = ViewState ["HeaderText"];
 				if (ob != null) return (string) ob;
@@ -734,12 +733,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		[DefaultValueAttribute (null)]

-		public TableItemStyle InsertRowStyle {
+	    [DefaultValueAttribute (null)]

+		public virtual TableItemStyle InsertRowStyle {
 			get {
 				if (insertRowStyle == null) {
 					insertRowStyle = new TableItemStyle ();
@@ -752,7 +751,7 @@ namespace System.Web.UI.WebControls
 		
 		[BrowsableAttribute (false)]
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		public virtual int PageCount {
+		public int PageCount {
 			get {
 				if (pageCount != -1) return pageCount;
 				EnsureDataBound ();
@@ -761,9 +760,9 @@ namespace System.Web.UI.WebControls
 		}
 
 		[WebCategoryAttribute ("Paging")]
-		[BindableAttribute (true, BindingDirection.OneWay)]

+	    [BindableAttribute (true, BindingDirection.OneWay)]

 		[DefaultValueAttribute (0)]
-		public virtual int PageIndex {
+		public int PageIndex {
 			get {
 				return pageIndex;
 			}
@@ -777,7 +776,7 @@ namespace System.Web.UI.WebControls
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
 		[NotifyParentPropertyAttribute (true)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
-		public virtual PagerSettings PagerSettings {
+		public PagerSettings PagerSettings {
 			get {
 				if (pagerSettings == null) {
 					pagerSettings = new PagerSettings (this);
@@ -788,11 +787,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle PagerStyle {
+		public virtual TableItemStyle PagerStyle {
 			get {
 				if (pagerStyle == null) {
 					pagerStyle = new TableItemStyle ();
@@ -808,8 +807,8 @@ namespace System.Web.UI.WebControls
 		/* DataControlPagerCell isnt specified in the docs */
 		//[TemplateContainer (typeof(DataControlPagerCell), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate PagerTemplate {
+	    [Browsable (false)]
+		public ITemplate PagerTemplate {
 			get { return pagerTemplate; }
 			set { pagerTemplate = value; RequireBinding (); }
 		}
@@ -823,12 +822,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[DefaultValue (null)]
-		public TableItemStyle RowStyle {
+		public virtual TableItemStyle RowStyle {
 			get {
 				if (rowStyle == null) {
 					rowStyle = new TableItemStyle ();
@@ -839,9 +838,9 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

 		[BrowsableAttribute (false)]
-		public object SelectedValue {
+		public virtual object SelectedValue {
 			get { return DataKey.Value; }
 		}
 		
@@ -856,7 +855,7 @@ namespace System.Web.UI.WebControls
 	
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		[BrowsableAttribute (false)]
-		public virtual object DataItem {
+		public object DataItem {
 			get {
 				EnsureDataBound ();
 				return dataItem;
@@ -871,7 +870,7 @@ namespace System.Web.UI.WebControls
 	
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		[BrowsableAttribute (false)]
-		public virtual int DataItemIndex {
+		public int DataItemIndex {
 			get { return PageIndex; }
 		}		
 	
@@ -1292,12 +1291,7 @@ namespace System.Web.UI.WebControls
 			}
 			return base.OnBubbleEvent (source, e);
 		}
-
-		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)
-		{
-			RaisePostBackEvent (eventArgument);
-		}
-
+		
 		// TODO: This is prolly obsolete
 		protected virtual void RaisePostBackEvent (string eventArgument)
 		{
@@ -1312,69 +1306,69 @@ namespace System.Web.UI.WebControls
 		{
 			switch (eventName)
 			{
-			case DataControlCommands.PageCommandName:
-				int newIndex = -1;
-				switch (param) {
+				case DataControlCommands.PageCommandName:
+					int newIndex = -1;
+					switch (param) {
+						case DataControlCommands.FirstPageCommandArgument:
+							newIndex = 0;
+							break;
+						case DataControlCommands.LastPageCommandArgument:
+							newIndex = PageCount - 1;
+							break;
+						case DataControlCommands.NextPageCommandArgument:
+							if (PageIndex < PageCount - 1) newIndex = PageIndex + 1;
+							break;
+						case DataControlCommands.PreviousPageCommandArgument:
+							if (PageIndex > 0) newIndex = PageIndex - 1;
+							break;
+						default:
+							newIndex = int.Parse (param) - 1;
+							break;
+					}
+					ShowPage (newIndex);
+					break;
+					
 				case DataControlCommands.FirstPageCommandArgument:
-					newIndex = 0;
+					ShowPage (0);
 					break;
+
 				case DataControlCommands.LastPageCommandArgument:
-					newIndex = PageCount - 1;
+					ShowPage (PageCount - 1);
 					break;
+					
 				case DataControlCommands.NextPageCommandArgument:
-					if (PageIndex < PageCount - 1) newIndex = PageIndex + 1;
+					if (PageIndex < PageCount - 1)
+						ShowPage (PageIndex + 1);
 					break;
+
 				case DataControlCommands.PreviousPageCommandArgument:
-					if (PageIndex > 0) newIndex = PageIndex - 1;
-					break;
-				default:
-					newIndex = int.Parse (param) - 1;
+					if (PageIndex > 0)
+						ShowPage (PageIndex - 1);
 					break;
-				}
-				ShowPage (newIndex);
-				break;
-					
-			case DataControlCommands.FirstPageCommandArgument:
-				ShowPage (0);
-				break;
-
-			case DataControlCommands.LastPageCommandArgument:
-				ShowPage (PageCount - 1);
-				break;
-					
-			case DataControlCommands.NextPageCommandArgument:
-				if (PageIndex < PageCount - 1)
-					ShowPage (PageIndex + 1);
-				break;
-
-			case DataControlCommands.PreviousPageCommandArgument:
-				if (PageIndex > 0)
-					ShowPage (PageIndex - 1);
-				break;
 					
-			case DataControlCommands.EditCommandName:
-				ChangeMode (DetailsViewMode.Edit);
-				break;
+				case DataControlCommands.EditCommandName:
+					ChangeMode (DetailsViewMode.Edit);
+					break;
 					
-			case DataControlCommands.NewCommandName:
-				ChangeMode (DetailsViewMode.Insert);
-				break;
+				case DataControlCommands.NewCommandName:
+					ChangeMode (DetailsViewMode.Insert);
+					break;
 					
-			case DataControlCommands.UpdateCommandName:
-				UpdateItem (param, true);
-				break;
+				case DataControlCommands.UpdateCommandName:
+					UpdateItem (param, true);
+					break;
 					
-			case DataControlCommands.CancelCommandName:
-				CancelEdit ();
-				break;
+				case DataControlCommands.CancelCommandName:
+					CancelEdit ();
+					break;
 					
-			case DataControlCommands.DeleteCommandName:
-				DeleteItem ();
-				break;
+				case DataControlCommands.DeleteCommandName:
+					DeleteItem ();
+					break;
 					
-			case DataControlCommands.InsertCommandName:
-				InsertItem (true);
-				break;
+				case DataControlCommands.InsertCommandName:
+					InsertItem (true);
+					break;
 			}
 		}
 		
@@ -1436,7 +1430,7 @@ namespace System.Web.UI.WebControls
 				EndRowEdit ();
 		}
 
-		bool UpdateCallback (int recordsAffected, Exception exception)
+        bool UpdateCallback (int recordsAffected, Exception exception)
 		{
 			DetailsViewUpdatedEventArgs dargs = new DetailsViewUpdatedEventArgs (recordsAffected, exception, currentEditRowKeys, currentEditOldValues, currentEditNewValues);
 			OnItemUpdated (dargs);
@@ -1470,7 +1464,7 @@ namespace System.Web.UI.WebControls
 				EndRowEdit ();
 		}
 		
-		bool InsertCallback (int recordsAffected, Exception exception)
+        bool InsertCallback (int recordsAffected, Exception exception)
 		{
 			DetailsViewInsertedEventArgs dargs = new DetailsViewInsertedEventArgs (recordsAffected, exception, currentEditNewValues);
 			OnItemInserted (dargs);
@@ -1481,7 +1475,7 @@ namespace System.Web.UI.WebControls
 			return dargs.ExceptionHandled;
 		}
 
-		public virtual void DeleteItem ()
+		public void DeleteItem ()
 		{
 			currentEditRowKeys = DataKey.Values;
 			currentEditNewValues = GetRowValues (true, true);
@@ -1503,7 +1497,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		bool DeleteCallback (int recordsAffected, Exception exception)
+        bool DeleteCallback (int recordsAffected, Exception exception)
 		{
 			DetailsViewDeletedEventArgs dargs = new DetailsViewDeletedEventArgs (recordsAffected, exception, currentEditRowKeys, currentEditNewValues);
 			OnItemDeleted (dargs);
@@ -1535,7 +1529,7 @@ namespace System.Web.UI.WebControls
 			object bstate = base.SaveControlState ();
 			return new object[] {
 				bstate, pageIndex, pageCount, currentMode
-					};
+			};
 		}
 		
 		protected override void TrackViewState()
@@ -1630,13 +1624,12 @@ namespace System.Web.UI.WebControls
 			if (states[12] != null && oldEditValues != null) ((IStateManager)oldEditValues).LoadViewState (states[12]);
 		}
 		
-		void ICallbackEventHandler.RaiseCallbackEvent (string eventArgs)
+		string ICallbackEventHandler.RaiseCallbackEvent (string eventArgs)
 		{
-			RaiseCallbackEvent (eventArgs);
+			return RaiseCallbackEvent (eventArgs);
 		}
 		
-		string callbackResult;
-		protected virtual void RaiseCallbackEvent (string eventArgs)
+		protected virtual string RaiseCallbackEvent (string eventArgs)
 		{
 			string[] clientData = eventArgs.Split ('|');
 			pageIndex = int.Parse (clientData[0]);
@@ -1650,17 +1643,7 @@ namespace System.Web.UI.WebControls
 
 			HtmlTextWriter writer = new HtmlTextWriter (sw);
 			RenderGrid (writer);
-			callbackResult = sw.ToString ();
-		}
-
-		string ICallbackEventHandler.GetCallbackResult ()
-		{
-			return GetCallbackResult ();
-		}
-
-		protected virtual string GetCallbackResult ()
-		{
-			return callbackResult;
+			return sw.ToString ();
 		}
 
 		[MonoTODO]
@@ -1701,7 +1684,7 @@ namespace System.Web.UI.WebControls
 				Page.ClientScript.RegisterStartupScript (typeof(TreeView), this.UniqueID, script, true);
 				
 				// Make sure the basic script infrastructure is rendered
-				Page.ClientScript.GetCallbackEventReference (this, "null", "", "null");
+		        Page.ClientScript.GetCallbackEventReference (this, "null", "", "null");
 				Page.ClientScript.GetPostBackClientHyperlink (this, "");
 			}
 		}
@@ -1720,21 +1703,21 @@ namespace System.Web.UI.WebControls
 		void RenderGrid (HtmlTextWriter writer)
 		{
 			switch (GridLines) {
-			case GridLines.Horizontal:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "rows");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			case GridLines.Vertical:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "cols");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			case GridLines.Both:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "all");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			default:
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
-				break;
+				case GridLines.Horizontal:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "rows");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				case GridLines.Vertical:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "cols");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				case GridLines.Both:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "all");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				default:
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
+					break;
 			}
 			
 			writer.AddAttribute (HtmlTextWriterAttribute.Cellspacing, "0");
@@ -1744,21 +1727,21 @@ namespace System.Web.UI.WebControls
 			foreach (DetailsViewRow row in table.Rows)
 			{
 				switch (row.RowType) {
-				case DataControlRowType.Header:
-					if (headerStyle != null)headerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.Footer:
-					if (footerStyle != null) footerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.Pager:
-					if (pagerStyle != null) pagerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.EmptyDataRow:
-					if (emptyDataRowStyle != null) emptyDataRowStyle.AddAttributesToRender (writer, row);
-					break;
-				default:
-					if (rowStyle != null) rowStyle.AddAttributesToRender (writer, row);
-					break;
+					case DataControlRowType.Header:
+						if (headerStyle != null)headerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.Footer:
+						if (footerStyle != null) footerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.Pager:
+						if (pagerStyle != null) pagerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.EmptyDataRow:
+						if (emptyDataRowStyle != null) emptyDataRowStyle.AddAttributesToRender (writer, row);
+						break;
+					default:
+						if (rowStyle != null) rowStyle.AddAttributesToRender (writer, row);
+						break;
 				}
 
 				if ((row.RowState & DataControlRowState.Alternate) != 0 && alternatingRowStyle != null)
@@ -1790,13 +1773,6 @@ namespace System.Web.UI.WebControls
 			}
 			table.RenderEndTag (writer);
 		}
-
-
-		[MonoTODO]
-		PostBackOptions IPostBackContainer.GetPostBackOptions (IButtonControl control)
-		{
-			throw new NotImplementedException ();
-		}
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
index ca5e4db4296..570bb6d3806 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
@@ -40,13 +40,12 @@ using System.Reflection;
 
 namespace System.Web.UI.WebControls
 {
-	[SupportsEventValidation]
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.FormViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
 	[ControlValuePropertyAttribute ("SelectedValue")]
 	[DefaultEventAttribute ("PageIndexChanging")]
 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class FormView: CompositeDataBoundControl, IDataItemContainer, INamingContainer, IPostBackEventHandler, IPostBackContainer
+	public class FormView: CompositeDataBoundControl, IDataItemContainer, INamingContainer
 	{
 		object dataItem;
 		
@@ -268,7 +267,7 @@ namespace System.Web.UI.WebControls
 		
 		[WebCategoryAttribute ("Paging")]
 		[DefaultValueAttribute (false)]
-		public virtual bool AllowPaging {
+		public bool AllowPaging {
 			get {
 				object ob = ViewState ["AllowPaging"];
 				if (ob != null) return (bool) ob;
@@ -308,7 +307,7 @@ namespace System.Web.UI.WebControls
 		[WebCategoryAttribute ("Accessibility")]
 		[DefaultValueAttribute ("")]
 		[LocalizableAttribute (true)]
-		public virtual string Caption {
+		public string Caption {
 			get {
 				object ob = ViewState ["Caption"];
 				if (ob != null) return (string) ob;
@@ -365,16 +364,16 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		[BrowsableAttribute (false)]
+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

+	    [BrowsableAttribute (false)]

 		public FormViewMode CurrentMode {
 			get {
 				return currentMode;
 			}
 		}
 	
-		[DefaultValueAttribute (FormViewMode.ReadOnly)]
-		[WebCategoryAttribute ("Behavior")]
+	    [DefaultValueAttribute (FormViewMode.ReadOnly)]

+	    [WebCategoryAttribute ("Behavior")]

 		public virtual FormViewMode DefaultMode {
 			get {
 				object o = ViewState ["DefaultMode"];
@@ -416,18 +415,18 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(FormView), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate EditItemTemplate {
+	    [Browsable (false)]
+		public ITemplate EditItemTemplate {
 			get { return editItemTemplate; }
 			set { editItemTemplate = value; RequireBinding (); }
 		}
 
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		[DefaultValueAttribute (null)]
-		public TableItemStyle EditRowStyle {
+	    [DefaultValueAttribute (null)]

+		public virtual TableItemStyle EditRowStyle {
 			get {
 				if (editRowStyle == null) {
 					editRowStyle = new TableItemStyle ();
@@ -438,12 +437,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		[DefaultValueAttribute (null)]
-		public TableItemStyle EmptyDataRowStyle {
+	    [DefaultValueAttribute (null)]

+		public virtual TableItemStyle EmptyDataRowStyle {
 			get {
 				if (emptyDataRowStyle == null) {
 					emptyDataRowStyle = new TableItemStyle ();
@@ -457,8 +456,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(FormView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate EmptyDataTemplate {
+	    [Browsable (false)]
+		public ITemplate EmptyDataTemplate {
 			get { return emptyDataTemplate; }
 			set { emptyDataTemplate = value; RequireBinding (); }
 		}
@@ -490,16 +489,16 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(FormView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate FooterTemplate {
+	    [Browsable (false)]
+		public ITemplate FooterTemplate {
 			get { return footerTemplate; }
 			set { footerTemplate = value; RequireBinding (); }
 		}
 
-		[LocalizableAttribute (true)]
-		[WebCategoryAttribute ("Appearance")]
-		[DefaultValueAttribute ("")]
-		public virtual string FooterText {
+	    [LocalizableAttribute (true)]

+	    [WebCategoryAttribute ("Appearance")]

+	    [DefaultValueAttribute ("")]

+		public string FooterText {
 			get {
 				object ob = ViewState ["FooterText"];
 				if (ob != null) return (string) ob;
@@ -511,12 +510,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle FooterStyle {
+		public virtual TableItemStyle FooterStyle {
 			get {
 				if (footerStyle == null) {
 					footerStyle = new TableItemStyle ();
@@ -549,12 +548,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle HeaderStyle {
+		public virtual TableItemStyle HeaderStyle {
 			get {
 				if (headerStyle == null) {
 					headerStyle = new TableItemStyle ();
@@ -568,16 +567,16 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(FormView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate HeaderTemplate {
+	    [Browsable (false)]
+		public ITemplate HeaderTemplate {
 			get { return headerTemplate; }
 			set { headerTemplate = value; RequireBinding (); }
 		}
 
-		[LocalizableAttribute (true)]
-		[WebCategoryAttribute ("Appearance")]
-		[DefaultValueAttribute ("")]
-		public virtual string HeaderText {
+	    [LocalizableAttribute (true)]

+	    [WebCategoryAttribute ("Appearance")]

+	    [DefaultValueAttribute ("")]

+		public string HeaderText {
 			get {
 				object ob = ViewState ["HeaderText"];
 				if (ob != null) return (string) ob;
@@ -606,18 +605,18 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(FormView), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate InsertItemTemplate {
+	    [Browsable (false)]
+		public ITemplate InsertItemTemplate {
 			get { return insertItemTemplate; }
 			set { insertItemTemplate = value; RequireBinding (); }
 		}
 
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		[DefaultValueAttribute (null)]
-		public TableItemStyle InsertRowStyle {
+	    [DefaultValueAttribute (null)]

+		public virtual TableItemStyle InsertRowStyle {
 			get {
 				if (insertRowStyle == null) {
 					insertRowStyle = new TableItemStyle ();
@@ -631,15 +630,15 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(FormView), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate ItemTemplate {
+	    [Browsable (false)]
+		public ITemplate ItemTemplate {
 			get { return itemTemplate; }
 			set { itemTemplate = value; RequireBinding (); }
 		}
 		
 		[BrowsableAttribute (false)]
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		public virtual int PageCount {
+		public int PageCount {
 			get {
 				if (pageCount != -1) return pageCount;
 				EnsureDataBound ();
@@ -648,9 +647,9 @@ namespace System.Web.UI.WebControls
 		}
 
 		[WebCategoryAttribute ("Paging")]
-		[BindableAttribute (true, BindingDirection.OneWay)]
+	    [BindableAttribute (true, BindingDirection.OneWay)]

 		[DefaultValueAttribute (0)]
-		public virtual int PageIndex {
+		public int PageIndex {
 			get {
 				return pageIndex;
 			}
@@ -664,7 +663,7 @@ namespace System.Web.UI.WebControls
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
 		[NotifyParentPropertyAttribute (true)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
-		public virtual PagerSettings PagerSettings {
+		public PagerSettings PagerSettings {
 			get {
 				if (pagerSettings == null) {
 					pagerSettings = new PagerSettings (this);
@@ -675,11 +674,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle PagerStyle {
+		public virtual TableItemStyle PagerStyle {
 			get {
 				if (pagerStyle == null) {
 					pagerStyle = new TableItemStyle ();
@@ -695,27 +694,27 @@ namespace System.Web.UI.WebControls
 		/* DataControlPagerCell isnt specified in the docs */
 		//[TemplateContainer (typeof(DataControlPagerCell), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate PagerTemplate {
+	    [Browsable (false)]
+		public ITemplate PagerTemplate {
 			get { return pagerTemplate; }
 			set { pagerTemplate = value; RequireBinding (); }
 		}
 		
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		[BrowsableAttribute (false)]
-		public virtual FormViewRow Row {
+		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

+		[BrowsableAttribute (false)]

+		public FormViewRow Row {
 			get {
 				EnsureDataBound ();
 				return itemRow;
 			}
 		}
-		
-		[WebCategoryAttribute ("Styles")]
+	    

+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[DefaultValue (null)]
-		public TableItemStyle RowStyle {
+		public virtual TableItemStyle RowStyle {
 			get {
 				if (rowStyle == null) {
 					rowStyle = new TableItemStyle ();
@@ -726,9 +725,9 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

 		[BrowsableAttribute (false)]
-		public object SelectedValue {
+		public virtual object SelectedValue {
 			get { return DataKey.Value; }
 		}
 		
@@ -743,7 +742,7 @@ namespace System.Web.UI.WebControls
 	
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		[BrowsableAttribute (false)]
-		public virtual object DataItem {
+		public object DataItem {
 			get {
 				EnsureDataBound ();
 				return dataItem;
@@ -758,7 +757,7 @@ namespace System.Web.UI.WebControls
 	
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		[BrowsableAttribute (false)]
-		public virtual int DataItemIndex {
+		public int DataItemIndex {
 			get { return PageIndex; }
 		}		
 	
@@ -1069,6 +1068,12 @@ namespace System.Web.UI.WebControls
 			base.OnInit (e);
 		}
 		
+		protected override void OnDataSourceViewChanged (object sender, EventArgs e)
+		{
+			base.OnDataSourceViewChanged (sender, e);
+			RequireBinding ();
+		}
+		
 		protected override bool OnBubbleEvent (object source, EventArgs e)
 		{
 			FormViewCommandEventArgs args = e as FormViewCommandEventArgs;
@@ -1079,11 +1084,7 @@ namespace System.Web.UI.WebControls
 			return base.OnBubbleEvent (source, e);
 		}
 		
-                void IPostBackEventHandler.RaisePostBackEvent(string eventArgument)
-		{
-			RaisePostBackEvent (eventArgument);
-		}
-
+		// This is prolly obsolete
 		protected virtual void RaisePostBackEvent (string eventArgument)
 		{
 			int i = eventArgument.IndexOf ('$');
@@ -1097,69 +1098,69 @@ namespace System.Web.UI.WebControls
 		{
 			switch (eventName)
 			{
-			case DataControlCommands.PageCommandName:
-				int newIndex = -1;
-				switch (param) {
+				case DataControlCommands.PageCommandName:
+					int newIndex = -1;
+					switch (param) {
+						case DataControlCommands.FirstPageCommandArgument:
+							newIndex = 0;
+							break;
+						case DataControlCommands.LastPageCommandArgument:
+							newIndex = PageCount - 1;
+							break;
+						case DataControlCommands.NextPageCommandArgument:
+							if (PageIndex < PageCount - 1) newIndex = PageIndex + 1;
+							break;
+						case DataControlCommands.PreviousPageCommandArgument:
+							if (PageIndex > 0) newIndex = PageIndex - 1;
+							break;
+						default:
+							newIndex = int.Parse (param) - 1;
+							break;
+					}
+					ShowPage (newIndex);
+					break;
+					
 				case DataControlCommands.FirstPageCommandArgument:
-					newIndex = 0;
+					ShowPage (0);
 					break;
+
 				case DataControlCommands.LastPageCommandArgument:
-					newIndex = PageCount - 1;
+					ShowPage (PageCount - 1);
 					break;
+					
 				case DataControlCommands.NextPageCommandArgument:
-					if (PageIndex < PageCount - 1) newIndex = PageIndex + 1;
+					if (PageIndex < PageCount - 1)
+						ShowPage (PageIndex + 1);
 					break;
+
 				case DataControlCommands.PreviousPageCommandArgument:
-					if (PageIndex > 0) newIndex = PageIndex - 1;
-					break;
-				default:
-					newIndex = int.Parse (param) - 1;
+					if (PageIndex > 0)
+						ShowPage (PageIndex - 1);
 					break;
-				}
-				ShowPage (newIndex);
-				break;
-					
-			case DataControlCommands.FirstPageCommandArgument:
-				ShowPage (0);
-				break;
-
-			case DataControlCommands.LastPageCommandArgument:
-				ShowPage (PageCount - 1);
-				break;
 					
-			case DataControlCommands.NextPageCommandArgument:
-				if (PageIndex < PageCount - 1)
-					ShowPage (PageIndex + 1);
-				break;
-
-			case DataControlCommands.PreviousPageCommandArgument:
-				if (PageIndex > 0)
-					ShowPage (PageIndex - 1);
-				break;
-					
-			case DataControlCommands.EditCommandName:
-				ChangeMode (FormViewMode.Edit);
-				break;
+				case DataControlCommands.EditCommandName:
+					ChangeMode (FormViewMode.Edit);
+					break;
 					
-			case DataControlCommands.NewCommandName:
-				ChangeMode (FormViewMode.Insert);
-				break;
+				case DataControlCommands.NewCommandName:
+					ChangeMode (FormViewMode.Insert);
+					break;
 					
-			case DataControlCommands.UpdateCommandName:
-				UpdateItem (param, true);
-				break;
+				case DataControlCommands.UpdateCommandName:
+					UpdateItem (param, true);
+					break;
 					
-			case DataControlCommands.CancelCommandName:
-				CancelEdit ();
-				break;
+				case DataControlCommands.CancelCommandName:
+					CancelEdit ();
+					break;
 					
-			case DataControlCommands.DeleteCommandName:
-				DeleteItem ();
-				break;
+				case DataControlCommands.DeleteCommandName:
+					DeleteItem ();
+					break;
 					
-			case DataControlCommands.InsertCommandName:
-				InsertItem (true);
-				break;
+				case DataControlCommands.InsertCommandName:
+					InsertItem (true);
+					break;
 			}
 		}
 		
@@ -1220,7 +1221,7 @@ namespace System.Web.UI.WebControls
 				EndRowEdit ();
 		}
 
-		bool UpdateCallback (int recordsAffected, Exception exception)
+        bool UpdateCallback (int recordsAffected, Exception exception)
 		{
 			FormViewUpdatedEventArgs dargs = new FormViewUpdatedEventArgs (recordsAffected, exception, currentEditRowKeys, currentEditOldValues, currentEditNewValues);
 			OnItemUpdated (dargs);
@@ -1254,7 +1255,7 @@ namespace System.Web.UI.WebControls
 				EndRowEdit ();
 		}
 		
-		bool InsertCallback (int recordsAffected, Exception exception)
+        bool InsertCallback (int recordsAffected, Exception exception)
 		{
 			FormViewInsertedEventArgs dargs = new FormViewInsertedEventArgs (recordsAffected, exception, currentEditNewValues);
 			OnItemInserted (dargs);
@@ -1265,7 +1266,7 @@ namespace System.Web.UI.WebControls
 			return dargs.ExceptionHandled;
 		}
 
-		public virtual void DeleteItem ()
+		public void DeleteItem ()
 		{
 			currentEditRowKeys = DataKey.Values;
 			currentEditNewValues = GetRowValues (true);
@@ -1289,7 +1290,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		bool DeleteCallback (int recordsAffected, Exception exception)
+        bool DeleteCallback (int recordsAffected, Exception exception)
 		{
 			FormViewDeletedEventArgs dargs = new FormViewDeletedEventArgs (recordsAffected, exception, currentEditRowKeys, currentEditNewValues);
 			OnItemDeleted (dargs);
@@ -1321,7 +1322,7 @@ namespace System.Web.UI.WebControls
 			object bstate = base.SaveControlState ();
 			return new object[] {
 				bstate, pageIndex, pageCount, currentMode
-					};
+			};
 		}
 		
 		protected override void TrackViewState()
@@ -1388,21 +1389,21 @@ namespace System.Web.UI.WebControls
 		protected internal override void Render (HtmlTextWriter writer)
 		{
 			switch (GridLines) {
-			case GridLines.Horizontal:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "rows");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			case GridLines.Vertical:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "cols");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			case GridLines.Both:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "all");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			default:
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
-				break;
+				case GridLines.Horizontal:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "rows");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				case GridLines.Vertical:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "cols");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				case GridLines.Both:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "all");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				default:
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
+					break;
 			}
 			
 			writer.AddAttribute (HtmlTextWriterAttribute.Cellspacing, "0");
@@ -1412,21 +1413,21 @@ namespace System.Web.UI.WebControls
 			foreach (FormViewRow row in table.Rows)
 			{
 				switch (row.RowType) {
-				case DataControlRowType.Header:
-					if (headerStyle != null)headerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.Footer:
-					if (footerStyle != null) footerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.Pager:
-					if (pagerStyle != null) pagerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.EmptyDataRow:
-					if (emptyDataRowStyle != null) emptyDataRowStyle.AddAttributesToRender (writer, row);
-					break;
-				default:
-					if (rowStyle != null) rowStyle.AddAttributesToRender (writer, row);
-					break;
+					case DataControlRowType.Header:
+						if (headerStyle != null)headerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.Footer:
+						if (footerStyle != null) footerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.Pager:
+						if (pagerStyle != null) pagerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.EmptyDataRow:
+						if (emptyDataRowStyle != null) emptyDataRowStyle.AddAttributesToRender (writer, row);
+						break;
+					default:
+						if (rowStyle != null) rowStyle.AddAttributesToRender (writer, row);
+						break;
 				}
 
 				if ((row.RowState & DataControlRowState.Edit) != 0 && editRowStyle != null)
@@ -1443,13 +1444,6 @@ namespace System.Web.UI.WebControls
 			}
 			table.RenderEndTag (writer);
 		}
-
-		[MonoTODO]
-		PostBackOptions IPostBackContainer.GetPostBackOptions (IButtonControl control)
-		{
-			throw new NotImplementedException ();
-		}
-
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
index 435f248315e..967fc84fb83 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
@@ -40,13 +40,12 @@ using System.Reflection;
 
 namespace System.Web.UI.WebControls
 {
-	[SupportsEventValidation]
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.GridViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
 	[ControlValuePropertyAttribute ("SelectedValue")]
 	[DefaultEventAttribute ("SelectedIndexChanged")]
 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class GridView: CompositeDataBoundControl, ICallbackEventHandler, ICallbackContainer, IPostBackEventHandler, IPostBackContainer
+	public class GridView: CompositeDataBoundControl, ICallbackEventHandler, ICallbackContainer
 	{
 		Table table;
 		GridViewRowCollection rows;
@@ -307,7 +306,7 @@ namespace System.Web.UI.WebControls
 		
 		[WebCategoryAttribute ("Paging")]
 		[DefaultValueAttribute (false)]
-		public virtual bool AllowPaging {
+		public bool AllowPaging {
 			get {
 				object ob = ViewState ["AllowPaging"];
 				if (ob != null) return (bool) ob;
@@ -321,7 +320,7 @@ namespace System.Web.UI.WebControls
 		
 		[WebCategoryAttribute ("Behavior")]
 		[DefaultValueAttribute (false)]
-		public virtual bool AllowSorting {
+		public bool AllowSorting {
 			get {
 				object ob = ViewState ["AllowSorting"];
 				if (ob != null) return (bool) ob;
@@ -333,11 +332,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle AlternatingRowStyle {
+		public virtual TableItemStyle AlternatingRowStyle {
 			get {
 				if (alternatingRowStyle == null) {
 					alternatingRowStyle = new TableItemStyle ();
@@ -432,7 +431,7 @@ namespace System.Web.UI.WebControls
 		[WebCategoryAttribute ("Accessibility")]
 		[DefaultValueAttribute ("")]
 		[LocalizableAttribute (true)]
-		public virtual string Caption {
+		public string Caption {
 			get {
 				object ob = ViewState ["Caption"];
 				if (ob != null) return (string) ob;
@@ -534,7 +533,7 @@ namespace System.Web.UI.WebControls
 
 		[WebCategoryAttribute ("Misc")]
 		[DefaultValueAttribute (-1)]
-		public virtual int EditIndex {
+		public int EditIndex {
 			get {
 				return editIndex;
 			}
@@ -544,11 +543,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle EditRowStyle {
+		public virtual TableItemStyle EditRowStyle {
 			get {
 				if (editRowStyle == null) {
 					editRowStyle = new TableItemStyle ();
@@ -559,11 +558,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle EmptyDataRowStyle {
+		public virtual TableItemStyle EmptyDataRowStyle {
 			get {
 				if (emptyDataRowStyle == null) {
 					emptyDataRowStyle = new TableItemStyle ();
@@ -575,10 +574,10 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[DefaultValue (null)]
-		[TemplateContainer (typeof(GridViewRow), BindingDirection.OneWay)]
+		[TemplateContainer (typeof(GridView), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate EmptyDataTemplate {
+	    [Browsable (false)]
+		public ITemplate EmptyDataTemplate {
 			get { return emptyDataTemplate; }
 			set { emptyDataTemplate = value; RequireBinding (); }
 		}
@@ -622,12 +621,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle FooterStyle {
+		public virtual TableItemStyle FooterStyle {
 			get {
 				if (footerStyle == null) {
 					footerStyle = new TableItemStyle ();
@@ -661,12 +660,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle HeaderStyle {
+		public virtual TableItemStyle HeaderStyle {
 			get {
 				if (headerStyle == null) {
 					headerStyle = new TableItemStyle ();
@@ -693,7 +692,7 @@ namespace System.Web.UI.WebControls
 
 		[BrowsableAttribute (false)]
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		public virtual int PageCount {
+		public int PageCount {
 			get {
 				if (pageCount != -1) return pageCount;
 				EnsureDataBound ();
@@ -704,7 +703,7 @@ namespace System.Web.UI.WebControls
 		[WebCategoryAttribute ("Paging")]
 		[BrowsableAttribute (true)]
 		[DefaultValueAttribute (0)]
-		public virtual int PageIndex {
+		public int PageIndex {
 			get {
 				return pageIndex;
 			}
@@ -716,7 +715,7 @@ namespace System.Web.UI.WebControls
 	
 		[DefaultValueAttribute (10)]
 		[WebCategoryAttribute ("Paging")]
-		public virtual int PageSize {
+		public int PageSize {
 			get {
 				object ob = ViewState ["PageSize"];
 				if (ob != null) return (int) ob;
@@ -732,7 +731,7 @@ namespace System.Web.UI.WebControls
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
 		[NotifyParentPropertyAttribute (true)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
-		public virtual PagerSettings PagerSettings {
+		public PagerSettings PagerSettings {
 			get {
 				if (pagerSettings == null) {
 					pagerSettings = new PagerSettings (this);
@@ -743,11 +742,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 	
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle PagerStyle {
+		public virtual TableItemStyle PagerStyle {
 			get {
 				if (pagerStyle == null) {
 					pagerStyle = new TableItemStyle ();
@@ -763,15 +762,15 @@ namespace System.Web.UI.WebControls
 		/* DataControlPagerCell isnt specified in the docs */
 		//[TemplateContainer (typeof(DataControlPagerCell), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate PagerTemplate {
+	    [Browsable (false)]
+		public ITemplate PagerTemplate {
 			get { return pagerTemplate; }
 			set { pagerTemplate = value; RequireBinding (); }
 		}
 		
 		[DefaultValueAttribute ("")]
 		[WebCategoryAttribute ("Accessibility")]
-		//		[TypeConverterAttribute (typeof(System.Web.UI.Design.DataColumnSelectionConverter)]
+//		[TypeConverterAttribute (typeof(System.Web.UI.Design.DataColumnSelectionConverter)]
 		public virtual string RowHeaderColumn {
 			get {
 				object ob = ViewState ["RowHeaderColumn"];
@@ -793,11 +792,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle RowStyle {
+		public virtual TableItemStyle RowStyle {
 			get {
 				if (rowStyle == null) {
 					rowStyle = new TableItemStyle ();
@@ -821,18 +820,18 @@ namespace System.Web.UI.WebControls
 		
 		[BindableAttribute (true)]
 		[DefaultValueAttribute (-1)]
-		public virtual int SelectedIndex {
+		public int SelectedIndex {
 			get {
 				return selectedIndex;
 			}
 			set {
-				if (Rows != null && selectedIndex >= 0 && selectedIndex < Rows.Count) {
+				if (selectedIndex >= 0 && selectedIndex < Rows.Count) {
 					int oldIndex = selectedIndex;
 					selectedIndex = -1;
 					Rows [oldIndex].RowState = GetRowState (oldIndex);
 				}
 				selectedIndex = value;
-				if (Rows != null && selectedIndex >= 0 && selectedIndex < Rows.Count) {
+				if (selectedIndex >= 0 && selectedIndex < Rows.Count) {
 					Rows [selectedIndex].RowState = GetRowState (selectedIndex);
 				}
 			}
@@ -849,11 +848,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Styles")]
+	    [WebCategoryAttribute ("Styles")]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
 		[NotifyParentProperty (true)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
-		public TableItemStyle SelectedRowStyle {
+		public virtual TableItemStyle SelectedRowStyle {
 			get {
 				if (selectedRowStyle == null) {
 					selectedRowStyle = new TableItemStyle ();
@@ -865,7 +864,7 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[BrowsableAttribute (false)]
-		public object SelectedValue {
+		public virtual object SelectedValue {
 			get {
 				if (SelectedDataKey != null)
 					return SelectedDataKey.Value;
@@ -995,9 +994,9 @@ namespace System.Web.UI.WebControls
 				object fitem = null;
 				prop_type = null;
 				PropertyInfo prop_item =  source.DataSource.GetType().GetProperty("Item",
-												  BindingFlags.Instance | BindingFlags.Static |
-												  BindingFlags.Public, null, null,
-												  new Type[] { typeof(int) }, null);
+						  BindingFlags.Instance | BindingFlags.Static |
+						  BindingFlags.Public, null, null,
+						  new Type[] { typeof(int) }, null);
 				
 				if (prop_item != null) {
 					prop_type = prop_item.PropertyType;
@@ -1155,7 +1154,7 @@ namespace System.Web.UI.WebControls
 				table.Rows.Add (row);
 				InitializeRow (row, fields);
 				if (dataBinding) {
-					//					row.DataBind ();
+//					row.DataBind ();
 					OnRowDataBound (new GridViewRowEventArgs (row));
 					if (EditIndex == row.RowIndex)
 						oldEditValues = new DataKey (GetRowValues (row, false, true));
@@ -1248,16 +1247,16 @@ namespace System.Web.UI.WebControls
 			bool accessibleHeader = false;
 
 			switch (row.RowType) {
-			case DataControlRowType.Header:
-				ctype = DataControlCellType.Header; 
-				accessibleHeader = UseAccessibleHeader;
-				break;
-			case DataControlRowType.Footer:
-				ctype = DataControlCellType.Footer;
-				break;
-			default:
-				ctype = DataControlCellType.DataCell;
-				break;
+				case DataControlRowType.Header:
+					ctype = DataControlCellType.Header; 
+					accessibleHeader = UseAccessibleHeader;
+					break;
+				case DataControlRowType.Footer:
+					ctype = DataControlCellType.Footer;
+					break;
+				default:
+					ctype = DataControlCellType.DataCell;
+					break;
 			}
 			
 			for (int n=0; n<fields.Length; n++) {
@@ -1384,11 +1383,6 @@ namespace System.Web.UI.WebControls
 			return base.OnBubbleEvent (source, e);
 		}
 		
-		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)
-		{
-			RaisePostBackEvent (eventArgument);
-		}
-
 		// This is prolly obsolete
 		protected virtual void RaisePostBackEvent (string eventArgument)
 		{
@@ -1403,69 +1397,69 @@ namespace System.Web.UI.WebControls
 		{
 			switch (eventName)
 			{
-			case DataControlCommands.PageCommandName:
-				int newIndex = -1;
-				switch (param) {
+				case DataControlCommands.PageCommandName:
+					int newIndex = -1;
+					switch (param) {
+						case DataControlCommands.FirstPageCommandArgument:
+							newIndex = 0;
+							break;
+						case DataControlCommands.LastPageCommandArgument:
+							newIndex = PageCount - 1;
+							break;
+						case DataControlCommands.NextPageCommandArgument:
+							if (PageIndex < PageCount - 1) newIndex = PageIndex + 1;
+							break;
+						case DataControlCommands.PreviousPageCommandArgument:
+							if (PageIndex > 0) newIndex = PageIndex - 1;
+							break;
+						default:
+							newIndex = int.Parse (param) - 1;
+							break;
+					}
+					ShowPage (newIndex);
+					break;
+					
 				case DataControlCommands.FirstPageCommandArgument:
-					newIndex = 0;
+					ShowPage (0);
 					break;
+
 				case DataControlCommands.LastPageCommandArgument:
-					newIndex = PageCount - 1;
+					ShowPage (PageCount - 1);
 					break;
+					
 				case DataControlCommands.NextPageCommandArgument:
-					if (PageIndex < PageCount - 1) newIndex = PageIndex + 1;
+					if (PageIndex < PageCount - 1)
+						ShowPage (PageIndex + 1);
 					break;
+
 				case DataControlCommands.PreviousPageCommandArgument:
-					if (PageIndex > 0) newIndex = PageIndex - 1;
+					if (PageIndex > 0)
+						ShowPage (PageIndex - 1);
 					break;
-				default:
-					newIndex = int.Parse (param) - 1;
-					break;
-				}
-				ShowPage (newIndex);
-				break;
 					
-			case DataControlCommands.FirstPageCommandArgument:
-				ShowPage (0);
-				break;
-
-			case DataControlCommands.LastPageCommandArgument:
-				ShowPage (PageCount - 1);
-				break;
-					
-			case DataControlCommands.NextPageCommandArgument:
-				if (PageIndex < PageCount - 1)
-					ShowPage (PageIndex + 1);
-				break;
-
-			case DataControlCommands.PreviousPageCommandArgument:
-				if (PageIndex > 0)
-					ShowPage (PageIndex - 1);
-				break;
-					
-			case DataControlCommands.SelectCommandName:
-				SelectRow (int.Parse (param));
-				break;
+				case DataControlCommands.SelectCommandName:
+					SelectRow (int.Parse (param));
+					break;
 					
-			case DataControlCommands.EditCommandName:
-				EditRow (int.Parse (param));
-				break;
+				case DataControlCommands.EditCommandName:
+					EditRow (int.Parse (param));
+					break;
 					
-			case DataControlCommands.UpdateCommandName:
-				UpdateRow (EditIndex, true);
-				break;
+				case DataControlCommands.UpdateCommandName:
+					UpdateRow (EditIndex, true);
+					break;
 					
-			case DataControlCommands.CancelCommandName:
-				CancelEdit ();
-				break;
+				case DataControlCommands.CancelCommandName:
+					CancelEdit ();
+					break;
 					
-			case DataControlCommands.DeleteCommandName:
-				DeleteRow (int.Parse (param));
-				break;
+				case DataControlCommands.DeleteCommandName:
+					DeleteRow (int.Parse (param));
+					break;
 					
-			case DataControlCommands.SortCommandName:
-				Sort (param);
-				break;
+				case DataControlCommands.SortCommandName:
+					Sort (param);
+					break;
 			}
 		}
 		
@@ -1483,7 +1477,7 @@ namespace System.Web.UI.WebControls
 			Sort (newSortExpression, newDirection);
 		}
 		
-		public virtual void Sort (string newSortExpression, SortDirection newSortDirection)
+		public void Sort (string newSortExpression, SortDirection newSortDirection)
 		{
 			GridViewSortEventArgs args = new GridViewSortEventArgs (newSortExpression, newSortDirection);
 			OnSorting (args);
@@ -1559,7 +1553,7 @@ namespace System.Web.UI.WebControls
 				EndRowEdit ();
 		}
 
-		bool UpdateCallback (int recordsAffected, Exception exception)
+        bool UpdateCallback (int recordsAffected, Exception exception)
 		{
 			GridViewUpdatedEventArgs dargs = new GridViewUpdatedEventArgs (recordsAffected, exception, currentEditRowKeys, currentEditOldValues, currentEditNewValues);
 			OnRowUpdated (dargs);
@@ -1570,7 +1564,7 @@ namespace System.Web.UI.WebControls
 			return dargs.ExceptionHandled;
 		}
 		
-		public virtual void DeleteRow (int rowIndex)
+		public void DeleteRow (int rowIndex)
 		{
 			GridViewRow row = Rows [rowIndex];
 			currentEditRowKeys = DataKeys [rowIndex].Values;
@@ -1591,7 +1585,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		bool DeleteCallback (int recordsAffected, Exception exception)
+        bool DeleteCallback (int recordsAffected, Exception exception)
 		{
 			GridViewDeletedEventArgs dargs = new GridViewDeletedEventArgs (recordsAffected, exception, currentEditRowKeys, currentEditNewValues);
 			OnRowDeleted (dargs);
@@ -1625,7 +1619,7 @@ namespace System.Web.UI.WebControls
 			object bstate = base.SaveControlState ();
 			return new object[] {
 				bstate, pageIndex, pageCount, selectedIndex, editIndex, sortExpression, sortDirection
-					};
+			};
 		}
 		
 		protected override void TrackViewState()
@@ -1720,13 +1714,12 @@ namespace System.Web.UI.WebControls
 			if (states[12] != null && oldEditValues != null) ((IStateManager)oldEditValues).LoadViewState (states[12]);
 		}
 		
-		void ICallbackEventHandler.RaiseCallbackEvent (string eventArgs)
+		string ICallbackEventHandler.RaiseCallbackEvent (string eventArgs)
 		{
-			RaiseCallbackEvent (eventArgs);
+			return RaiseCallbackEvent (eventArgs);
 		}
 		
-		string callbackResult;
-		protected virtual void RaiseCallbackEvent (string eventArgs)
+		protected virtual string RaiseCallbackEvent (string eventArgs)
 		{
 			string[] clientData = eventArgs.Split ('|');
 			pageIndex = int.Parse (clientData[0]);
@@ -1742,19 +1735,9 @@ namespace System.Web.UI.WebControls
 
 			HtmlTextWriter writer = new HtmlTextWriter (sw);
 			RenderGrid (writer);
-			callbackResult = sw.ToString ();
+			return sw.ToString ();
 		}
 		
-		string ICallbackEventHandler.GetCallbackResult ()
-		{
-			return GetCallbackResult ();
-		}
-
-		protected virtual string GetCallbackResult ()
-		{
-			return callbackResult;
-		}
-
 		string ICallbackContainer.GetCallbackScript (IButtonControl control, string argument)
 		{
 			return GetCallbackScript (control, argument);
@@ -1793,7 +1776,7 @@ namespace System.Web.UI.WebControls
 				Page.ClientScript.RegisterStartupScript (typeof(TreeView), this.UniqueID, script, true);
 				
 				// Make sure the basic script infrastructure is rendered
-				Page.ClientScript.GetCallbackEventReference (this, "null", "", "null");
+		        Page.ClientScript.GetCallbackEventReference (this, "null", "", "null");
 				Page.ClientScript.GetPostBackClientHyperlink (this, "");
 			}
 		}
@@ -1812,21 +1795,21 @@ namespace System.Web.UI.WebControls
 		void RenderGrid (HtmlTextWriter writer)
 		{
 			switch (GridLines) {
-			case GridLines.Horizontal:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "rows");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			case GridLines.Vertical:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "cols");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			case GridLines.Both:
-				writer.AddAttribute (HtmlTextWriterAttribute.Rules, "all");
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
-				break;
-			default:
-				writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
-				break;
+				case GridLines.Horizontal:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "rows");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				case GridLines.Vertical:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "cols");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				case GridLines.Both:
+					writer.AddAttribute (HtmlTextWriterAttribute.Rules, "all");
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "1");
+					break;
+				default:
+					writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
+					break;
 			}
 			
 			writer.AddAttribute (HtmlTextWriterAttribute.Cellspacing, "0");
@@ -1836,20 +1819,20 @@ namespace System.Web.UI.WebControls
 			foreach (GridViewRow row in table.Rows)
 			{
 				switch (row.RowType) {
-				case DataControlRowType.Header:
-					if (headerStyle != null)headerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.Footer:
-					if (footerStyle != null) footerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.Pager:
-					if (pagerStyle != null) pagerStyle.AddAttributesToRender (writer, row);
-					break;
-				case DataControlRowType.EmptyDataRow:
-					if (emptyDataRowStyle != null) emptyDataRowStyle.AddAttributesToRender (writer, row);
-					break;
-				default:
-					break;
+					case DataControlRowType.Header:
+						if (headerStyle != null)headerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.Footer:
+						if (footerStyle != null) footerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.Pager:
+						if (pagerStyle != null) pagerStyle.AddAttributesToRender (writer, row);
+						break;
+					case DataControlRowType.EmptyDataRow:
+						if (emptyDataRowStyle != null) emptyDataRowStyle.AddAttributesToRender (writer, row);
+						break;
+					default:
+						break;
 				}
 
 				if ((row.RowState & DataControlRowState.Normal) != 0 && rowStyle != null)
@@ -1868,9 +1851,9 @@ namespace System.Web.UI.WebControls
 					if (fcell != null) {
 						Style cellStyle = null;
 						switch (row.RowType) {
-						case DataControlRowType.Header: cellStyle = fcell.ContainingField.HeaderStyle; break;
-						case DataControlRowType.Footer: cellStyle = fcell.ContainingField.FooterStyle; break;
-						default: cellStyle = fcell.ContainingField.ItemStyle; break;
+							case DataControlRowType.Header: cellStyle = fcell.ContainingField.HeaderStyle; break;
+							case DataControlRowType.Footer: cellStyle = fcell.ContainingField.FooterStyle; break;
+							default: cellStyle = fcell.ContainingField.ItemStyle; break;
 						}
 						if (cellStyle != null)
 							cellStyle.AddAttributesToRender (writer, cell);
@@ -1881,12 +1864,6 @@ namespace System.Web.UI.WebControls
 			}
 			table.RenderEndTag (writer);
 		}
-
-		[MonoTODO]
-		PostBackOptions IPostBackContainer.GetPostBackOptions (IButtonControl control)
-		{
-			throw new NotImplementedException ();
-		}
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
index c343c301d92..0013ac89944 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
@@ -54,7 +54,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		protected virtual HierarchicalDataSourceView GetData (string viewPath)
+		protected HierarchicalDataSourceView GetData (string viewPath)
 		{
 			if (DataSource != null && DataSourceID != "")
 				throw new HttpException ();
@@ -66,7 +66,7 @@ namespace System.Web.UI.WebControls
 				return null; 
 		}
 		
-		protected virtual IHierarchicalDataSource GetDataSource ()
+		protected IHierarchicalDataSource GetDataSource ()
 		{
 			if (DataSourceID != "")
 				return NamingContainer.FindControl (DataSourceID) as IHierarchicalDataSource;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HotSpot.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HotSpot.cs
index 42c55f7b4f2..6c587c26851 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/HotSpot.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HotSpot.cs
@@ -35,15 +35,15 @@ using System.Security.Permissions;
 
 namespace System.Web.UI.WebControls
 {
-	[TypeConverterAttribute (typeof(ExpandableObjectConverter))]
+	[TypeConverterAttribute (typeof(ExpandableObjectConverter))]

 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	public abstract class HotSpot: IStateManager
 	{
 		StateBag viewState = new StateBag ();
 		
-		[LocalizableAttribute (true)]
-		[DefaultValueAttribute ("")]
+	    [LocalizableAttribute (true)]

+	    [DefaultValueAttribute ("")]

 		public virtual string AccessKey {
 			get {
 				object o = viewState ["AccessKey"];
@@ -54,11 +54,10 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[LocalizableAttribute (true)]
-		[NotifyParentPropertyAttribute (true)]
-		[WebCategoryAttribute ("Behavior")]
-		[DefaultValueAttribute ("")]
-		[BindableAttribute (true)]
+	    [NotifyParentPropertyAttribute (true)]

+	    [WebCategoryAttribute ("Behavior")]

+	    [DefaultValueAttribute ("")]

+	    [BindableAttribute (true)]

 		public virtual string AlternateText {
 			get {
 				object o = viewState ["AlternateText"];
@@ -69,9 +68,9 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Behavior")]
-		[DefaultValueAttribute (HotSpotMode.NotSet)]
-		[NotifyParentPropertyAttribute (true)]
+	    [WebCategoryAttribute ("Behavior")]

+	    [DefaultValueAttribute (HotSpotMode.NotSet)]

+	    [NotifyParentPropertyAttribute (true)]

 		public virtual HotSpotMode HotSpotMode {
 			get {
 				object o = viewState ["HotSpotMode"];
@@ -82,12 +81,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute ("")]
-		[BindableAttribute (true)]
-		[EditorAttribute ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[NotifyParentPropertyAttribute (true)]
-		[UrlPropertyAttribute]
-		public string NavigateUrl {
+	    [DefaultValueAttribute ("")]

+	    [BindableAttribute (true)]

+	    [EditorAttribute ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [NotifyParentPropertyAttribute (true)]

+	    [UrlPropertyAttribute]

+		public virtual string NavigateUrl {
 			get {
 				object o = viewState ["NavigateUrl"];
 				return o != null ? (string) o : "";
@@ -97,11 +96,11 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[BindableAttribute (true)]
-		[WebCategoryAttribute ("Behavior")]
-		[DefaultValueAttribute ("")]
-		[NotifyParentPropertyAttribute (true)]
-		public string PostBackValue {
+	    [BindableAttribute (true)]

+	    [WebCategoryAttribute ("Behavior")]

+	    [DefaultValueAttribute ("")]

+	    [NotifyParentPropertyAttribute (true)]

+		public virtual string PostBackValue {
 			get {
 				object o = viewState ["PostBackValue"];
 				return o != null ? (string) o : "";
@@ -111,8 +110,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute ((short)0)]
-		[WebCategoryAttribute ("Accessibility")]
+	    [DefaultValueAttribute ((short)0)]

+	    [WebCategoryAttribute ("Accessibility")]

 		public virtual short TabIndex {
 			get {
 				object o = viewState ["TabIndex"];
@@ -123,10 +122,10 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[WebCategoryAttribute ("Behavior")]
-		[NotifyParentPropertyAttribute (true)]
-		[DefaultValueAttribute ("")]
-		[TypeConverterAttribute (typeof(TargetConverter))]
+	    [WebCategoryAttribute ("Behavior")]

+	    [NotifyParentPropertyAttribute (true)]

+	    [DefaultValueAttribute ("")]

+	    [TypeConverterAttribute (typeof(TargetConverter))]

 		public virtual string Target {
 			get {
 				object o = viewState ["Target"];
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkField.cs
index 5da25f03c1e..998cfc8134e 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkField.cs
@@ -51,10 +51,10 @@ namespace System.Web.UI.WebControls {
 			return base.Initialize (sortingEnabled, control);
 		}
 		
-		[EditorAttribute ("System.Web.UI.Design.WebControls.DataFieldEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[TypeConverterAttribute (typeof(StringArrayConverter))]
-		[WebCategoryAttribute ("Data")]
-		[DefaultValueAttribute (null)]
+	    [EditorAttribute ("System.Web.UI.Design.WebControls.DataFieldEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [TypeConverterAttribute (typeof(StringArrayConverter))]

+	    [WebCategoryAttribute ("Data")]

+	    [DefaultValueAttribute ("")]

 		public virtual string[] DataNavigateUrlFields {
 			get {
 				object ob = ViewState ["DataNavigateUrlFields"];
@@ -84,7 +84,7 @@ namespace System.Web.UI.WebControls {
 
 		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
-		[TypeConverterAttribute ("System.Web.UI.Design.DataSourceViewSchemaConverter, " + Consts.AssemblySystem_Design)]
+	    [TypeConverterAttribute ("System.Web.UI.Design.DataSourceViewSchemaConverter, " + Consts.AssemblySystem_Design)]

 		public virtual string DataTextField {
 			get {
 				object ob = ViewState ["DataTextField"];
@@ -111,10 +111,10 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[DefaultValueAttribute ("")]
-		[EditorAttribute ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[UrlPropertyAttribute]
-		[WebCategoryAttribute ("Behavior")]
+	    [DefaultValueAttribute ("")]

+	    [EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [UrlPropertyAttribute]

+	    [WebCategoryAttribute ("Behavior")]

 		public virtual string NavigateUrl {
 			get {
 				object ob = ViewState ["NavigateUrl"];
@@ -129,7 +129,7 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValueAttribute ("")]
 		[WebCategoryAttribute ("Behavior")]
-		[TypeConverterAttribute (typeof(TargetConverter))]
+	    [TypeConverterAttribute (typeof(TargetConverter))]

 		public virtual string Target {
 			get {
 				object ob = ViewState ["Target"];
@@ -142,9 +142,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[LocalizableAttribute (true)]
-		[DefaultValueAttribute ("")]
-		[WebCategoryAttribute ("Appearance")]
+	    [LocalizableAttribute (true)]

+	    [DefaultValueAttribute ("")]

+	    [WebCategoryAttribute ("Appearance")]

 		public virtual string Text {
 			get {
 				object ob = ViewState ["Text"];
@@ -158,7 +158,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		public override void InitializeCell (DataControlFieldCell cell,
-						     DataControlCellType cellType, DataControlRowState rowState, int rowIndex)
+			DataControlCellType cellType, DataControlRowState rowState, int rowIndex)
 		{
 			base.InitializeCell (cell, cellType, rowState, rowIndex);
 			HyperLink link = new HyperLink ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
index dd2cb5cb8ac..4b66b964ed3 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
@@ -225,9 +225,8 @@ namespace System.Web.UI.WebControls {
 				break;
 			}
 
-			// if border-with is not specified in style or 
-			// no style is defined - set image to no border
-			if (!ControlStyleCreated || ControlStyle.BorderWidth.IsEmpty) {
+			// if no style is defined default image to no border
+			if (!ControlStyleCreated) {
 				writer.AddAttribute (HtmlTextWriterAttribute.Border, "0");
 			}
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
index b6f3b2fa0bc..3c6e6ac4bce 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
@@ -83,8 +83,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
+		public virtual
+#else		
+		public
 #endif		
-		public string CommandArgument {
+		string CommandArgument {
 			get {
 				return ViewState.GetString ("CommandArgument", "");
 			}
@@ -98,8 +101,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
+		public virtual
+#else		
+		public
 #endif		
-		public string CommandName {
+		string CommandName {
 			get {
 				return ViewState.GetString ("CommandName", "");
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
index 370eaeff96d..082795ae801 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
@@ -181,7 +181,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValueAttribute (false)]
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
-		public virtual bool ReadOnly {
+		public bool ReadOnly {
 			get {
 				object val = ViewState ["ReadOnly"];
 				return val != null ? (bool) val : false;
@@ -218,7 +218,7 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 		
-		protected virtual void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
+		public virtual void InitializeDataCell (DataControlFieldCell cell, DataControlRowState rowState)
 		{
 			bool editable = (rowState & (DataControlRowState.Edit | DataControlRowState.Insert)) != 0;
 			if (editable && !ReadOnly) {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
index 95d8466fbad..884055dee50 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
@@ -190,8 +190,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
+		public virtual
+#else		
+		public
 #endif		
-		public string CommandArgument {
+		string CommandArgument {
 			get {
 				return ViewState.GetString ("CommandArgument", "");
 			}
@@ -205,8 +208,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
+		public virtual
+#else		
+		public
 #endif		
-		public string CommandName {
+		string CommandName {
 			get {
 				return ViewState.GetString ("CommandName", "");	
 			}
@@ -291,7 +297,7 @@ namespace System.Web.UI.WebControls {
 		[UrlProperty ("*.aspx")]
 		[DefaultValue ("")]
 		[MonoTODO]
-		public virtual string PostBackUrl {
+		public string PostBackUrl {
 			get {
 				throw new NotImplementedException ();
 			}
@@ -304,7 +310,7 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
-		public virtual string ValidationGroup {
+		public string ValidationGroup {
 			get {
 				return ViewState.GetString ("ValidationGroup", "");	
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
index 6da296b7f96..ed86db570cc 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
@@ -115,13 +115,7 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Data")]
 		public virtual object DataSource {
 			get { return data_source; }
-			set { 
-				if(value == null || value is IListSource || value is IEnumerable) { 
-					data_source = value;
-					return;
-				}
-				throw new ArgumentException("Invalid DataSource Type");
-			}
+			set { data_source = value; }
 		}
 #endif		
 
@@ -196,6 +190,10 @@ namespace System.Web.UI.WebControls {
 				return -1;
 			}
 			set {
+				ClearSelection ();
+				if (value == -1)
+					return;
+
 				if (items == null || items.Count == 0) {
 					// This will happen when assigning this property
 					// before DataBind () is called on the control.
@@ -203,13 +201,8 @@ namespace System.Web.UI.WebControls {
 					return;
 				}
 
-				if (value < -1 || value >= Items.Count)
+				if (value < 0 || value >= Items.Count)
 					throw new ArgumentOutOfRangeException ("value");
-
-				ClearSelection ();
-				if (value == -1)
-					return;
-
 				items [value].Selected = true;
 
 				/* you'd think this would be called, but noooo */
@@ -355,14 +348,40 @@ namespace System.Web.UI.WebControls {
 			if (list == null)
 				return;
 
-#if NET_2_0
-			if (!AppendDataBoundItems)
-#endif
-				Items.Clear();
+			Items.Clear ();
+
+			string format = DataTextFormatString;
+			if (format == "")
+				format = null;
+
+			string text_field = DataTextField;
+			string value_field = DataValueField;
+			ListItemCollection coll = Items;
+			foreach (object container in list) {
+				string text;
+				string val;
+
+				text = val = null;
+				if (text_field != "") {
+					text = DataBinder.GetPropertyValue (container, text_field, format);
+				}
+
+				if (value_field != "") {
+					val = DataBinder.GetPropertyValue (container, value_field).ToString ();
+				} else if (text_field == "") {
+					text = val = container.ToString ();
+					if (format != null)
+						text = String.Format (format, container);
+				} else if (text != null) {
+					val = text;
+				}
+
+				if (text == null)
+					text = val;
+
+				coll.Add (new ListItem (text, val));
+			}
 
-#if !NET_2_0
-			DoDataBinding (list);
-#endif
 			if (saved_selected_value != null) {
 				SelectedValue = saved_selected_value;
 				if (saved_selected_index != -2 && saved_selected_index != SelectedIndex)
@@ -391,43 +410,6 @@ namespace System.Web.UI.WebControls {
 			base.OnPreRender (e);
 		}
 
-		void DoDataBinding (IEnumerable dataSource)
-		{
-			if (dataSource != null) {
-				string format = DataTextFormatString;
-				if (format == "")
-					format = null;
-
-				string text_field = DataTextField;
-				string value_field = DataValueField;
-				ListItemCollection coll = Items;
-				foreach (object container in dataSource) {
-					string text;
-					string val;
-
-					text = val = null;
-					if (text_field != "") {
-						text = DataBinder.GetPropertyValue (container, text_field, format);
-					}
-
-					if (value_field != "") {
-						val = DataBinder.GetPropertyValue (container, value_field).ToString ();
-					} else if (text_field == "") {
-						text = val = container.ToString ();
-						if (format != null)
-							text = String.Format (format, container);
-					} else if (text != null) {
-						val = text;
-					}
-
-					if (text == null)
-						text = val;
-
-					coll.Add (new ListItem (text, val));
-				}
-			}
-		}
-
 #if NET_2_0
 		protected virtual void OnTextChanged (EventArgs e)
 		{
@@ -436,17 +418,16 @@ namespace System.Web.UI.WebControls {
 				handler (this, e);
 		}
 
+		[MonoTODO]
 		protected internal override void PerformDataBinding (IEnumerable dataSource)
 		{
-			base.PerformDataBinding (dataSource);
-
-			DoDataBinding (dataSource);
+			throw new NotImplementedException ();
 		}
 
-		[MonoTODO ("why override?")]
+		[MonoTODO]
 		protected override void PerformSelect ()
 		{
-			base.PerformSelect ();
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
index 14f46e6a21c..c78b116087d 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
@@ -73,8 +73,11 @@ namespace System.Web.UI.WebControls {
 		[WebCategory ("Appearance")]
 #if NET_2_0
 		[Localizable (true)]
+		public virtual
+#else		
+		public
 #endif		
-		public string Text {
+		string Text {
 			get {
 				return ViewState.GetString ("Text", String.Empty);
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
index 6fee3287f6a..ad2741f70df 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Login.cs
@@ -95,7 +95,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public TableItemStyle CheckBoxStyle {
+		public virtual TableItemStyle CheckBoxStyle {
 			get {
 				if (checkBoxStyle == null) {
 					checkBoxStyle = new TableItemStyle ();
@@ -216,7 +216,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public TableItemStyle FailureTextStyle {
+		public virtual TableItemStyle FailureTextStyle {
 			get {
 				if (failureTextStyle == null) {
 					failureTextStyle = new TableItemStyle ();
@@ -279,7 +279,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public TableItemStyle HyperLinkStyle {
+		public virtual TableItemStyle HyperLinkStyle {
 			get {
 				if (hyperLinkStyle == null) {
 					hyperLinkStyle = new TableItemStyle ();
@@ -310,7 +310,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public TableItemStyle InstructionTextStyle {
+		public virtual TableItemStyle InstructionTextStyle {
 			get {
 				if (instructionTextStyle == null) {
 					instructionTextStyle = new TableItemStyle ();
@@ -326,7 +326,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public TableItemStyle LabelStyle {
+		public virtual TableItemStyle LabelStyle {
 			get {
 				if (labelStyle == null) {
 					labelStyle = new TableItemStyle ();
@@ -366,7 +366,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public Style LoginButtonStyle {
+		public virtual Style LoginButtonStyle {
 			get {
 				if (logonButtonStyle == null) {
 					logonButtonStyle = new Style ();
@@ -551,7 +551,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public Style TextBoxStyle {
+		public virtual Style TextBoxStyle {
 			get {
 				if (textBoxStyle == null) {
 					textBoxStyle = new Style ();
@@ -594,7 +594,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public TableItemStyle TitleTextStyle {
+		public virtual TableItemStyle TitleTextStyle {
 			get {
 				if (titleTextStyle == null) {
 					titleTextStyle = new TableItemStyle ();
@@ -652,7 +652,7 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		public Style ValidatorTextStyle {
+		public virtual Style ValidatorTextStyle {
 			get {
 				if (validatorTextStyle == null) {
 					validatorTextStyle = new Style ();
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MultiView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MultiView.cs
index f2ea72e0243..7e3e51d5851 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/MultiView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/MultiView.cs
@@ -147,7 +147,7 @@ namespace System.Web.UI.WebControls
 						
 					case "SwitchViewByID":
 						foreach (View v in Controls)
-							if (v.ID == (string)ca.CommandArgument) {
+							if (v.ID == ca.CommandArgument) {
 								SetActiveView (v);
 								break;
 							}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSource.cs
index f857719d490..f7308dd6f02 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSource.cs
@@ -39,11 +39,11 @@ using System.Drawing;
 namespace System.Web.UI.WebControls
 {
 	
-	[DefaultEventAttribute ("Selecting")]
-	[DefaultPropertyAttribute ("TypeName")]
-	[DesignerAttribute ("System.Web.UI.Design.WebControls.ObjectDataSourceDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-	[ParseChildrenAttribute (true)]
-	[PersistChildrenAttribute (false)]
+	[DefaultEventAttribute ("Selecting")]

+	[DefaultPropertyAttribute ("TypeName")]

+	[DesignerAttribute ("System.Web.UI.Design.WebControls.ObjectDataSourceDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]

+	[ParseChildrenAttribute (true)]

+	[PersistChildrenAttribute (false)]

 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[ToolboxBitmap ("bitmap file goes here")]
@@ -109,11 +109,11 @@ namespace System.Web.UI.WebControls
 			remove { DefaultView.ObjectDisposing -= value; }
 		}
 		
-		/*		public event ObjectDataSourceResolvingMethodEventHandler ResolvingMethod {
-				add { DefaultView.ResolvingMethod += value; }
-				remove { DefaultView.ResolvingMethod -= value; }
-				}
-		*/
+/*		public event ObjectDataSourceResolvingMethodEventHandler ResolvingMethod {
+			add { DefaultView.ResolvingMethod += value; }
+			remove { DefaultView.ResolvingMethod -= value; }
+		}
+*/
 		public event ObjectDataSourceStatusEventHandler Selected {
 			add { DefaultView.Selected += value; }
 			remove { DefaultView.Selected -= value; }
@@ -173,8 +173,8 @@ namespace System.Web.UI.WebControls
 		
 		
 		
-		[WebCategoryAttribute ("Data")]
-		[DefaultValueAttribute (ConflictOptions.OverwriteChanges)]
+	    [WebCategoryAttribute ("Data")]

+	    [DefaultValueAttribute (ConflictOptions.OverwriteChanges)]

 		public ConflictOptions ConflictDetection {
 			get { return DefaultView.ConflictDetection; }
 			set { DefaultView.ConflictDetection = value; }
@@ -193,25 +193,25 @@ namespace System.Web.UI.WebControls
 		}
 		
 		
-		[WebCategoryAttribute ("Data")]
-		[DefaultValueAttribute ("")]
+	    [WebCategoryAttribute ("Data")]

+	    [DefaultValueAttribute ("")]

 		public string DataObjectTypeName {
 			get { return DefaultView.DataObjectTypeName; }
 			set { DefaultView.DataObjectTypeName = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[DefaultValueAttribute ("")]
+	    [WebCategoryAttribute ("Data")]

+	    [DefaultValueAttribute ("")]

 		public string DeleteMethod {
 			get { return DefaultView.DeleteMethod; }
 			set { DefaultView.DeleteMethod = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[MergablePropertyAttribute (false)]
-		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[DefaultValueAttribute (null)]
-		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
+	    [WebCategoryAttribute ("Data")]

+	    [MergablePropertyAttribute (false)]

+	    [EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [DefaultValueAttribute (null)]

+	    [PersistenceModeAttribute (PersistenceMode.InnerProperty)]

 		public ParameterCollection DeleteParameters {
 			get { return DefaultView.DeleteParameters; }
 		}
@@ -229,84 +229,84 @@ namespace System.Web.UI.WebControls
 		}
 		
 		
-		[WebCategoryAttribute ("Paging")]
-		[DefaultValueAttribute (false)]
-		public bool EnablePaging {
+	    [WebCategoryAttribute ("Paging")]

+	    [DefaultValueAttribute (false)]

+		public virtual bool EnablePaging {
 			get { return DefaultView.EnablePaging; }
 			set { DefaultView.EnablePaging = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[DefaultValueAttribute ("")]
+	    [WebCategoryAttribute ("Data")]

+	    [DefaultValueAttribute ("")]

 		public string FilterExpression {
 			get { return DefaultView.FilterExpression; }
 			set { DefaultView.FilterExpression = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[MergablePropertyAttribute (false)]
-		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[DefaultValueAttribute (null)]
-		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
+	    [WebCategoryAttribute ("Data")]

+	    [MergablePropertyAttribute (false)]

+	    [EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [DefaultValueAttribute (null)]

+	    [PersistenceModeAttribute (PersistenceMode.InnerProperty)]

 		public ParameterCollection FilterParameters {
 			get { return DefaultView.FilterParameters; }
 		}
 		
-		[DefaultValueAttribute ("")]
-		[WebCategoryAttribute ("Data")]
-		public string InsertMethod {
+	    [DefaultValueAttribute ("")]

+	    [WebCategoryAttribute ("Data")]

+		public virtual string InsertMethod {
 			get { return DefaultView.InsertMethod; }
 			set { DefaultView.InsertMethod = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[MergablePropertyAttribute (false)]
-		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[DefaultValueAttribute (null)]
-		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
+	    [WebCategoryAttribute ("Data")]

+	    [MergablePropertyAttribute (false)]

+	    [EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [DefaultValueAttribute (null)]

+	    [PersistenceModeAttribute (PersistenceMode.InnerProperty)]

 		public ParameterCollection InsertParameters {
 			get { return DefaultView.InsertParameters; }
 		}
 		
-		[WebCategoryAttribute ("Paging")]
-		[DefaultValueAttribute ("maximumRows")]
+	    [WebCategoryAttribute ("Paging")]

+	    [DefaultValueAttribute ("maximumRows")]

 		public string MaximumRowsParameterName {
 			get { return DefaultView.MaximumRowsParameterName; }
 			set { DefaultView.MaximumRowsParameterName = value; }
 		}
 
-		[WebCategoryAttribute ("Data")]
-		[DefaultValueAttribute ("{0}")]
+	    [WebCategoryAttribute ("Data")]

+	    [DefaultValueAttribute ("original_{0}")]

 		public string OldValuesParameterFormatString {
 			get { return DefaultView.OldValuesParameterFormatString; }
 			set { DefaultView.OldValuesParameterFormatString = value; }
 		}
 		
-		[WebCategoryAttribute ("Paging")]
-		[DefaultValueAttribute ("")]
-		public string SelectCountMethod {
+	    [WebCategoryAttribute ("Paging")]

+	    [DefaultValueAttribute ("")]

+		public virtual string SelectCountMethod {
 			get { return DefaultView.SelectCountMethod; }
 			set { DefaultView.SelectCountMethod = value; }
 		}
 		
-		[DefaultValueAttribute ("")]
-		[WebCategoryAttribute ("Data")]
-		public string SelectMethod {
+	    [DefaultValueAttribute ("")]

+	    [WebCategoryAttribute ("Data")]

+		public virtual string SelectMethod {
 			get { return DefaultView.SelectMethod; }
 			set { DefaultView.SelectMethod = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[MergablePropertyAttribute (false)]
-		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[DefaultValueAttribute (null)]
-		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
+	    [WebCategoryAttribute ("Data")]

+	    [MergablePropertyAttribute (false)]

+	    [EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [DefaultValueAttribute (null)]

+	    [PersistenceModeAttribute (PersistenceMode.InnerProperty)]

 		public ParameterCollection SelectParameters {
 			get { return DefaultView.SelectParameters; }
 		}
 
-		[DefaultValueAttribute ("")]
-		[WebCategoryAttribute ("Data")]
+	    [DefaultValueAttribute ("")]

+	    [WebCategoryAttribute ("Data")]

 		public string SortParameterName {
 			get { return DefaultView.SortParameterName; }
 			set { DefaultView.SortParameterName = value; }
@@ -325,32 +325,32 @@ namespace System.Web.UI.WebControls
 		}
 		
 		
-		[WebCategoryAttribute ("Paging")]
-		[DefaultValueAttribute ("startRowIndex")]
+	    [WebCategoryAttribute ("Paging")]

+	    [DefaultValueAttribute ("startRowIndex")]

 		public string StartRowIndexParameterName {
 			get { return DefaultView.StartRowIndexParameterName; }
 			set { DefaultView.StartRowIndexParameterName = value; }
 		}
 		
-		[DefaultValueAttribute ("")]
-		[WebCategoryAttribute ("Data")]
-		public string TypeName {
+	    [DefaultValueAttribute ("")]

+	    [WebCategoryAttribute ("Data")]

+		public virtual string TypeName {
 			get { return DefaultView.TypeName; }
 			set { DefaultView.TypeName = value; }
 		}
 		
-		[DefaultValueAttribute ("")]
-		[WebCategoryAttribute ("Data")]
-		public string UpdateMethod {
+	    [DefaultValueAttribute ("")]

+	    [WebCategoryAttribute ("Data")]

+		public virtual string UpdateMethod {
 			get { return DefaultView.UpdateMethod; }
 			set { DefaultView.UpdateMethod = value; }
 		}
 		
-		[WebCategoryAttribute ("Data")]
-		[MergablePropertyAttribute (false)]
-		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[DefaultValueAttribute (null)]
-		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
+	    [WebCategoryAttribute ("Data")]

+	    [MergablePropertyAttribute (false)]

+	    [EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [DefaultValueAttribute (null)]

+	    [PersistenceModeAttribute (PersistenceMode.InnerProperty)]

 		public ParameterCollection UpdateParameters {
 			get { return DefaultView.UpdateParameters; }
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
index 7cc4ecdda72..2462e3785df 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
@@ -62,7 +62,7 @@ namespace System.Web.UI.WebControls
 		private static readonly object ObjectCreatedEvent = new object();
 		private static readonly object ObjectCreatingEvent = new object();
 		private static readonly object ObjectDisposingEvent = new object();
-		//		private static readonly object ResolvingMethodEvent = new object();
+//		private static readonly object ResolvingMethodEvent = new object();
 		private static readonly object SelectedEvent = new object();
 		private static readonly object SelectingEvent = new object();
 		private static readonly object UpdatedEvent = new object();
@@ -114,11 +114,11 @@ namespace System.Web.UI.WebControls
 			remove { Events.RemoveHandler (ObjectDisposingEvent, value); }
 		}
 		
-		/*		public event ObjectDataSourceResolvingMethodEventHandler ResolvingMethod {
-				add { Events.AddHandler (ResolvingMethodEvent, value); }
-				remove { Events.RemoveHandler (ResolvingMethodEvent, value); }
-				}
-		*/
+/*		public event ObjectDataSourceResolvingMethodEventHandler ResolvingMethod {
+			add { Events.AddHandler (ResolvingMethodEvent, value); }
+			remove { Events.RemoveHandler (ResolvingMethodEvent, value); }
+		}
+*/
 		public event ObjectDataSourceStatusEventHandler Selected {
 			add { Events.AddHandler (SelectedEvent, value); }
 			remove { Events.RemoveHandler (SelectedEvent, value); }
@@ -203,14 +203,14 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		/*		protected virtual void OnResolvingMethod (ObjectDataSourceResolvingMethodEventArgs e)
-				{
-				if (Events != null) {
+/*		protected virtual void OnResolvingMethod (ObjectDataSourceResolvingMethodEventArgs e)
+		{
+			if (Events != null) {
 				ObjectDataSourceResolvingMethodEventHandler eh = (ObjectDataSourceResolvingMethodEventHandler) Events [ResolvingMethodEvent];
 				if (eh != null) eh (this, e);
-				}
-				}
-		*/
+			}
+		}
+*/
 		
 		protected virtual void OnSelected (ObjectDataSourceStatusEventArgs e)
 		{
@@ -317,7 +317,7 @@ namespace System.Web.UI.WebControls
 				if (deleteParameters == null) {
 					deleteParameters = new ParameterCollection ();
 					deleteParameters.ParametersChanged += new EventHandler (OnParametersChanged); 
-					if (IsTrackingViewState)
+					if (((IStateManager)this).IsTrackingViewState)
 						((IStateManager)deleteParameters).TrackViewState ();
 				}
 				return deleteParameters;
@@ -388,7 +388,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute ("{0}")]
+	    [DefaultValueAttribute ("original_{0}")]

 		public string OldValuesParameterFormatString {
 			get {
 				object ret = ViewState ["OldValuesParameterFormatString"];
@@ -424,7 +424,7 @@ namespace System.Web.UI.WebControls
 				if (selectParameters == null) {
 					selectParameters = new ParameterCollection ();
 					selectParameters.ParametersChanged += new EventHandler (OnParametersChanged); 
-					if (IsTrackingViewState)
+					if (((IStateManager)this).IsTrackingViewState)
 						((IStateManager)selectParameters).TrackViewState ();
 				}
 				return selectParameters;
@@ -477,7 +477,7 @@ namespace System.Web.UI.WebControls
 				if (updateParameters == null) {
 					updateParameters = new ParameterCollection ();
 					updateParameters.ParametersChanged += new EventHandler (OnParametersChanged); 
-					if (IsTrackingViewState)
+					if (((IStateManager)this).IsTrackingViewState)
 						((IStateManager)updateParameters).TrackViewState ();
 				}
 				return updateParameters;
@@ -1007,7 +1007,7 @@ namespace System.Web.UI.WebControls
 			if (filterParameters != null) ((IStateManager)filterParameters).TrackViewState ();
 		}
 		
-		protected bool IsTrackingViewState
+		protected virtual bool IsTrackingViewState
 		{
 			get { return viewState.IsTrackingViewState; }
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
index 9e036145322..6afb4687e49 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
@@ -243,81 +243,10 @@ namespace System.Web.UI.WebControls {
 			return String.Empty; // as documented
 		}
 
-#if TARGET_JVM
-		internal class ListEnum : IEnumerator
-		{
-			int start;
-			int end;
-			int ind;
-			IList list;
-
-			internal ListEnum(IList list, int start, int end)
-			{
-				this.list = list;
-				this.start = start;
-				this.end = end;
-				this.ind = start - 1;
-			}
-
-			public bool MoveNext()
-			{
-				ind++;
-				return (ind < end);
-			}
-
-			public void Reset() { ind = start - 1; }
-			public object Current { get { return list[ind]; }}
-		}
-
 		private IEnumerator GetListEnum (IList list, int start, int end)
 		{
 			if (!allow_paging)
 				end = list.Count;
-			return new ListEnum(list, start, end);
-		}
-
-		internal class EnumeratorEnum : IEnumerator
-		{
-			int start;
-			int end;
-			int ind;
-			IEnumerator en;
-			PagedDataSource parent;
-
-			internal EnumeratorEnum(PagedDataSource parent, IEnumerator en, int start, int end)
-			{
-				this.parent = parent;
-				this.en = en;
-				this.start = start;
-				this.end = end;
-				this.ind = start - 1;
-				for (int i = 0; i < start; i++)
-					en.MoveNext ();
-			}
-
-			public bool MoveNext()
-			{
-				ind++;
-				return (!parent.allow_paging || ind < end) && en.MoveNext ();
-			}
-
-			public void Reset()
-			{
-				throw new NotSupportedException();
-			}
-
-			public object Current { get { return en.Current; }}
-		}
-
-		private IEnumerator GetEnumeratorEnum (IEnumerator e, int start, int end)
-		{
-			return new EnumeratorEnum(this, e, start, end);
-		}
-#else
-		private IEnumerator GetListEnum (IList list, int start, int end)
-		{
-			if (!AllowPaging)
-				end = list.Count;
 			else if (start >= list.Count)
 				yield break;
 			
@@ -332,7 +261,6 @@ namespace System.Web.UI.WebControls {
 			for (int i = start; (!allow_paging || i < end) && e.MoveNext (); i++)
 				yield return e.Current;
 		}
-#endif
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs
index 917f0a304c8..ff96dfd2452 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs
@@ -123,16 +123,15 @@ namespace System.Web.UI.WebControls {
 		
 		public override string ToString ()
 		{
-			object o = GetValue (HttpContext.Current, null);
-			if (o != null) return o.ToString();
-			return "";
+			return Name;
 		}
 		
-		[WebCategoryAttribute ("Parameter")]
-		[DefaultValueAttribute (null)]
-		[WebSysDescriptionAttribute ("Default value to be used in case value is null.")]
+		[WebCategoryAttribute ("Parameter"), DefaultValueAttribute (""),
+		WebSysDescriptionAttribute ("Default value to be used in case value is null.") ]
 		public string DefaultValue {
-			get { return ViewState.GetString ("DefaultValue", null); }
+			get {
+				return ViewState ["DefaultValue"] as string;
+			}
 			set {
 				
 				if (DefaultValue != value) {
@@ -142,12 +141,17 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Parameter")]
-		[DefaultValueAttribute ("Input")]
-		[WebSysDescriptionAttribute ("Parameter's direction.")]
+		[WebCategoryAttribute ("Parameter"), DefaultValueAttribute ("Input"),
+		WebSysDescriptionAttribute ("Parameter's direction.")]
 		public ParameterDirection Direction
 		{
-			get { return (ParameterDirection) ViewState.GetInt ("Direction", (int)ParameterDirection.Input); }
+			get {
+				object o = ViewState ["Direction"];
+				if (o != null)
+					return (ParameterDirection) o;
+				
+				return ParameterDirection.Input;
+			}
 			set {				
 				if (Direction != value) {
 					ViewState ["Direction"] = value;
@@ -157,9 +161,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 
-		[WebCategoryAttribute ("Parameter")]
-		[DefaultValueAttribute ("")]
-		[WebSysDescriptionAttribute ("Parameter's name.")]
+		[WebCategoryAttribute ("Parameter"), DefaultValueAttribute (""),
+		WebSysDescriptionAttribute ("Parameter's name.")]
 		public string Name
 		{
 			get {
@@ -178,12 +181,17 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Parameter")]
-		[DefaultValueAttribute (true)]
-	        [WebSysDescriptionAttribute ("Checks whether an empty string is treated as a null value.")]
+		[WebCategoryAttribute ("Parameter"), DefaultValueAttribute (true),
+	        WebSysDescriptionAttribute ("Checks whether an empty string is treated as a null value.")]
 		public bool ConvertEmptyStringToNull
 		{
-			get { return ViewState.GetBool ("ConvertEmptyStringToNull", true); }
+			get {
+				object o = ViewState["ConvertEmptyStringToNull"];
+				if (o != null)
+					return (bool) o;
+				
+				return true;
+			}
 			set {
 				if (ConvertEmptyStringToNull != value) {
 					ViewState["ConvertEmptyStringToNull"] = value;
@@ -192,23 +200,18 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[DefaultValue (0)]
-		public int Size {
-			get { return ViewState.GetInt ("Size", 0); }
-			set {
-				if (Size != value) {
-					ViewState["Size"] = value;
-					OnParameterChanged ();
-				}
-			}
-		}
-
-		[DefaultValueAttribute (TypeCode.Empty)]
+	    [DefaultValueAttribute (TypeCode.Object)]
 		[WebCategoryAttribute ("Parameter"), 
 		WebSysDescriptionAttribute("Represents type of the parameter.")]
 		public TypeCode Type
 		{
-			get { return (TypeCode) ViewState.GetInt ("Type", (int)TypeCode.Empty); }
+			get {
+				object o = ViewState ["Type"];
+				if (o != null)
+					return (TypeCode) o;
+				
+				return TypeCode.Object;
+			}
 			set {
 				
 				if (Type != value) {
@@ -219,6 +222,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		StateBag viewState;
+		
 		[BrowsableAttribute (false), 
 		DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		protected StateBag ViewState {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs
index 0560011c882..3a1de3dabe5 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs
@@ -31,12 +31,10 @@
 using System.Web.UI;
 using System.Collections;
 using System.Collections.Specialized;
-using System.ComponentModel;
 
 namespace System.Web.UI.WebControls
 {
 
-	[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 	public class ParameterCollection : StateManagedCollection
 	{
 
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
index fceea4f2178..d979d84e50c 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
@@ -52,14 +52,14 @@ namespace System.Web.UI.WebControls
 			return emptyNames;
 		}
 		
-		public virtual IList GetList ()
+		public IList GetList ()
 		{
 			return ListSourceHelper.GetList (this);
 		}
 		
-		[BrowsableAttribute (false)]
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		public virtual bool ContainsListCollection {
+	    [BrowsableAttribute (false)]

+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

+		public bool ContainsListCollection {
 			get { return ListSourceHelper.ContainsListCollection (this); }
 		}
 		
@@ -68,8 +68,8 @@ namespace System.Web.UI.WebControls
 			remove { ((IHierarchicalDataSource)this).DataSourceChanged -= value; }
 		}
 		
-		[BrowsableAttribute (false)]
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
+	    [BrowsableAttribute (false)]

+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

 		public SiteMapProvider Provider {
 			get {
 				if (provider == null) {
@@ -91,8 +91,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute ("")]
-		public virtual string SiteMapProvider {
+	    [DefaultValueAttribute ("")]

+		public string SiteMapProvider {
 			get {
 				object o = ViewState ["SiteMapProvider"];
 				if (o != null) return (string) o;
@@ -104,10 +104,10 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute ("")]
-		[EditorAttribute ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[UrlPropertyAttribute]
-		public virtual string StartingNodeUrl {
+	    [DefaultValueAttribute ("")]

+	    [EditorAttribute ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]

+	    [UrlPropertyAttribute]

+		public string StartingNodeUrl {
 			get {
 				object o = ViewState ["StartingNodeUrl"];
 				if (o != null) return (string) o;
@@ -119,8 +119,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute (false)]
-		public virtual bool StartFromCurrentNode {
+	    [DefaultValueAttribute (false)]

+		public bool StartFromCurrentNode {
 			get {
 				object o = ViewState ["StartFromCurrentNode"];
 				if (o != null) return (bool) o;
@@ -132,8 +132,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute (true)]
-		public virtual bool ShowStartingNode {
+	    [DefaultValueAttribute (true)]

+		public bool ShowStartingNode {
 			get {
 				object o = ViewState ["ShowStartingNode"];
 				if (o != null) return (bool) o;
@@ -145,7 +145,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		public virtual DataSourceView GetView (string viewName)
+		public DataSourceView GetView (string viewName)
 		{
 			SiteMapNode node = GetStartNode (viewName);
 			if (node == null)
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs
index 069795afe35..ee0a210560a 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs
@@ -4,10 +4,9 @@
 // Authors:
 //	Ben Maurer (bmaurer@users.sourceforge.net)
 //	Sanjay Gupta (gsanjay@novell.com)
-//	Chris Toshok (toshok@ximian.com)
 //
 // (C) 2003 Ben Maurer
-// (C) 2004-2006 Novell, Inc. (http://www.novell.com)
+// (C) 2004 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -34,11 +33,7 @@
 #if NET_2_0
 using System.Collections;
 using System.Collections.Specialized;
-using System.Configuration;
-using System.Drawing;
-using System.Web.Configuration;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.Text;
 using System.ComponentModel;
 
@@ -50,11 +45,11 @@ namespace System.Web.UI.WebControls {
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.SqlDataSourceDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
 	[DefaultEventAttribute ("Selecting")]
 	public class SqlDataSource : DataSourceControl {
-		
+
 		public SqlDataSource ()
 		{
 		}
-
+		
 		public SqlDataSource (string connectionString, string selectCommand)
 		{
 			ConnectionString = connectionString;
@@ -85,25 +80,10 @@ namespace System.Web.UI.WebControls {
 			return view;
 		}
 
+		[MonoTODO]
 		protected virtual DbProviderFactory GetDbProviderFactory ()
 		{
-			DbProviderFactory f = null;
-
-			if (ProviderName != null && ProviderName != "") {
-				try {
-					f = DbProviderFactories.GetFactory(ProviderName);
-				}
-				catch { /* nada */ }
-				if (f != null)
-					return f;
-			}
-
-			return SqlClientFactory.Instance;
-		}
-
-		internal DbProviderFactory GetDbProviderFactoryInternal ()
-		{
-			return GetDbProviderFactory ();
+			throw new NotImplementedException ();
 		}
 
 		protected override ICollection GetViewNames ()
@@ -152,123 +132,58 @@ namespace System.Web.UI.WebControls {
 		protected override void TrackViewState ()
 		{
 			base.TrackViewState ();
-			if (view != null)
-				((IStateManager) view).TrackViewState ();
-		}
-
-#region TODO
-		[MonoTODO]
-		[DefaultValue ("")]
-		public virtual string CacheKeyDependency {
-			get { return ViewState.GetString ("CacheKeyDependency", ""); }
-			set { ViewState ["CacheKeyDependency"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue (true)]
-		public virtual bool CancelSelectOnNullParameter {
-			get { return ViewState.GetBool ("CancelSelectOnNullParameter", true); }
-			set { ViewState["CancelSelectOnNullParameter"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue (ConflictOptions.OverwriteChanges)]
-		public ConflictOptions ConflictDetection {
-			get { return (ConflictOptions) ViewState.GetInt ("ConflictDetection", (int)ConflictOptions.OverwriteChanges); }
-			set { ViewState ["ConflictDetection"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue (SqlDataSourceCommandType.Text)]
-		public SqlDataSourceCommandType DeleteCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("DeleteCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["DeleteCommandType"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue (SqlDataSourceCommandType.Text)]
-		public SqlDataSourceCommandType InsertCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("InsertCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["InsertCommandType"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue (SqlDataSourceCommandType.Text)]
-		public SqlDataSourceCommandType SelectCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("SelectCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["SelectCommandType"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue (SqlDataSourceCommandType.Text)]
-		public SqlDataSourceCommandType UpdateCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("UpdateCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["UpdateCommandType"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue ("{0}")]
-		public string OldValuesParameterFormatString {
-			get { return ViewState.GetString ("OldValuesParameterFormatString", "{0}"); }
-			set { ViewState ["OldValuesParameterFormatString"] = value; }
+			((IStateManager) View).TrackViewState ();
 		}
 		
+		//protected virtual DataSourceCache Cache { get; }
+		//public virtual int CacheDuration { get; set; }
+		//public virtual DataSourceCacheExpiry CacheExpirationPolicy { get; set; }
+		//public virtual string CacheKeyDependency { get; set; }
+
 		[DefaultValue ("")]
 		[MonoTODO]
 		public virtual string SqlCacheDependency {
-			get { return ViewState.GetString ("SqlCacheDependency", ""); }
-			set { ViewState ["SqlCacheDependency"] = value; }
-		}
-
-		[MonoTODO]
-		[DefaultValue ("")]
-		public string SortParameterName {
-			get { return ViewState.GetString ("SortParameterName", ""); }
-			set { ViewState ["SortParameterName"] = value; }
-		}
-
-		[DefaultValue (0)]
-		//		[TypeConverter (typeof (DataSourceCacheDurationConverter))]
-		public virtual int CacheDuration {
-			get { return ViewState.GetInt ("CacheDuration", 0); }
-			set { ViewState ["CacheDuration"] = value; }
-		}
-
-		[DefaultValue (DataSourceCacheExpiry.Absolute)]
-		public virtual DataSourceCacheExpiry CacheExpirationPolicy {
-			get { return (DataSourceCacheExpiry) ViewState.GetInt ("CacheExpirationPolicy", (int)DataSourceCacheExpiry.Absolute); }
-			set { ViewState ["CacheExpirationPolicy"] = value; }
-		}
-
-		[DefaultValue (false)]
-		public virtual bool EnableCaching {
-			get { return ViewState.GetBool ("EnableCaching", false); }
-			set { ViewState ["EnableCaching"] = value; }
+			get {
+				throw new NotImplementedException ();
+			}
+			set {
+				throw new NotImplementedException ();
+			}
 		}
-#endregion
 
+		//public virtual bool EnableCaching { get; set; }
+		
 		[DefaultValueAttribute ("")]
-		[TypeConverterAttribute ("System.Web.UI.Design.WebControls.DataProviderNameConverter, " + Consts.AssemblySystem_Design)]
+//		[TypeConverterAttribute (typeof (System.Web.UI.Design.WebControls.DataProviderNameConverter)]
 		public virtual string ProviderName {
-			get { return ViewState.GetString ("ProviderName", ""); }
+			get {
+				string val = ViewState ["ProviderName"] as string;
+				return val == null ? "System.Data.SqlClient" : val;
+			}
 			set { ViewState ["ProviderName"] = value; }
 		}
 		
 		
-		[EditorAttribute ("System.Web.UI.Design.WebControls.SqlDataSourceConnectionStringEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		[EditorAttribute ("System.Web.UI.Design.ConnectionStringEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[DefaultValueAttribute ("")]
 		public virtual string ConnectionString {
-			get { return ViewState.GetString ("ConnectionString", ""); }
+			get {
+				string val = ViewState ["ConnectionString"] as string;
+				return val == null ? "" : val;
+			}
 			set { ViewState ["ConnectionString"] = value; }
 		}
 		
-		[DefaultValueAttribute (SqlDataSourceMode.DataSet)]
+	    [DefaultValueAttribute (SqlDataSourceMode.DataSet)]
 		public SqlDataSourceMode DataSourceMode {
-			get { return (SqlDataSourceMode) ViewState.GetInt ("DataSourceMode", (int)SqlDataSourceMode.DataSet); }
+			get {
+				object val = ViewState ["DataSourceMode"];
+				return val == null ? SqlDataSourceMode.DataSet : (SqlDataSourceMode) val;
+			}
 			set { ViewState ["DataSourceMode"] = value; }
 		}
 				
-		[DefaultValueAttribute ("")]
+	    [DefaultValueAttribute ("")]
 		public string DeleteCommand {
 			get { return View.DeleteCommand; }
 			set { View.DeleteCommand = value; }
@@ -290,7 +205,7 @@ namespace System.Web.UI.WebControls {
 			get { return View.FilterParameters; }
 		}
 		
-		[DefaultValueAttribute ("")]
+	    [DefaultValueAttribute ("")]
 		public string InsertCommand {
 			get { return View.InsertCommand; }
 			set { View.InsertCommand = value; }
@@ -318,7 +233,7 @@ namespace System.Web.UI.WebControls {
 			get { return View.SelectParameters; }
 		}
 		
-		[DefaultValueAttribute ("")]
+	    [DefaultValueAttribute ("")]
 		public string UpdateCommand {
 			get { return View.UpdateCommand; }
 			set { View.UpdateCommand = value; }
@@ -332,7 +247,7 @@ namespace System.Web.UI.WebControls {
 			get { return View.UpdateParameters; }
 		}
 		
-		[DefaultValueAttribute ("")]
+	    [DefaultValueAttribute ("")]
 		public string FilterExpression {
 			get { return View.FilterExpression; }
 			set { View.FilterExpression = value; }
@@ -353,11 +268,6 @@ namespace System.Web.UI.WebControls {
 			remove { View.Inserted -= value; }
 		}
 		
-		public event SqlDataSourceFilteringEventHandler Filtering {
-			add { View.Filtering += value; }
-			remove { View.Filtering -= value; }
-		}
-
 		public event SqlDataSourceCommandEventHandler Inserting {
 			add { View.Inserting += value; }
 			remove { View.Inserting -= value; }
@@ -368,7 +278,7 @@ namespace System.Web.UI.WebControls {
 			remove { View.Selected -= value; }
 		}
 		
-		public event SqlDataSourceSelectingEventHandler Selecting {
+		public event SqlDataSourceCommandEventHandler Selecting {
 			add { View.Selecting += value; }
 			remove { View.Selecting -= value; }
 		}
@@ -387,7 +297,7 @@ namespace System.Web.UI.WebControls {
 		SqlDataSourceView View {
 			get {
 				if (view == null) {
-					view = CreateDataSourceView ("DefaultView");
+					view = new SqlDataSourceView (this, "DefaultView", this.Context);
 					view.DataSourceViewChanged += new EventHandler (ViewChanged);
 					if (IsTrackingViewState)
 						((IStateManager) view).TrackViewState ();
@@ -398,7 +308,7 @@ namespace System.Web.UI.WebControls {
 		
 		void ViewChanged (object source, EventArgs e)
 		{
-			RaiseDataSourceChangedEvent (e);
+			OnDataSourceChanged (e);
 		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs
index fafb45c8b5f..a991e2df085 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs
@@ -32,8 +32,8 @@ namespace System.Web.UI.WebControls {
 
 	public enum SqlDataSourceCommandType
 	{
-		Text = 0,
-		StoredProcedure = 1
+		StoredProcedure,
+		Text
 	}
 
 }
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventArgs.cs
index 11008985509..decb8df4251 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventArgs.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventArgs.cs
@@ -42,7 +42,9 @@ namespace System.Web.UI.WebControls
 
 		public IOrderedDictionary ParameterValues
 		{
-			get { return param_values; }
+			get {
+				return param_values;
+			}
 		}
 
 		IOrderedDictionary param_values;
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventArgs.cs
index 05b31581c46..585a45362d8 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventArgs.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventArgs.cs
@@ -34,16 +34,22 @@ using System.Data.Common;
 namespace System.Web.UI.WebControls {
 	public class SqlDataSourceSelectingEventArgs : SqlDataSourceCommandEventArgs {
 		DataSourceSelectArguments arguments;
+		bool executeSelect;
 		
-		public SqlDataSourceSelectingEventArgs (DbCommand command, DataSourceSelectArguments argument)
-			: base (command)
+		public SqlDataSourceSelectingEventArgs (DbCommand command, DataSourceSelectArguments argument, 
+			bool executeSelect) : base (command)
 		{
 			this.arguments = argument;
+			this.executeSelect = executeSelect;
 		}
 		
 		public DataSourceSelectArguments Arguments {
 			get { return arguments; }
 		}
+
+		public bool ExecutingSelectCount {
+			get { return executeSelect; }
+		}
 	}
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
index 42132b29281..0ba8c1ed6dc 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
@@ -36,30 +36,22 @@ using System.Collections.Specialized;
 using System.Text;
 using System.Data;
 using System.ComponentModel;
-using System.Data.Common;
+using System.Data.SqlClient;
 
 namespace System.Web.UI.WebControls {
 	public class SqlDataSourceView : DataSourceView, IStateManager {
 
+		SqlCommand command;
+		SqlConnection connection;
 		HttpContext context;
-		DbProviderFactory factory;
-		DbConnection connection;
 
 		public SqlDataSourceView (SqlDataSource owner, string name, HttpContext context)
-			: base (owner, name)
+		: base (owner, name)
 		{
 			this.owner = owner;
 			this.name = name;
 			this.context = context;
-		}
-
-		void InitConnection ()
-		{
-                        if (factory == null) factory = owner.GetDbProviderFactoryInternal ();
-                        if (connection == null) {
-				connection = factory.CreateConnection();
-				connection.ConnectionString = owner.ConnectionString;
-			}
+			connection = new SqlConnection (owner.ConnectionString);
 		}
 
 		public int Delete (IDictionary keys, IDictionary oldValues)
@@ -68,29 +60,16 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[MonoTODO ("Handle keys, oldValues, parameters and check for path for AccessDBFile")]
-		protected override int ExecuteDelete (IDictionary keys, IDictionary oldValues)
+		protected override int ExecuteDelete(IDictionary keys, IDictionary oldValues)
 		{
 			if (!CanDelete)
 				throw new NotSupportedException("Delete operation is not supported");
 			if (oldValues == null && conflictOptions == ConflictOptions.CompareAllValues)
 				throw new InvalidOperationException ("oldValues parameters should be specified when ConflictOptions is set to CompareAllValues");
-
-			InitConnection ();
-
-			DbCommand command = factory.CreateCommand ();
-			command.CommandText = DeleteCommand;
-			command.Connection = connection;
-			command.CommandType = CommandType.Text;
-
-                        if (DeleteParameters.Count > 0)
-                                InitializeParameters (command, DeleteParameters, null);
-
-			OnDeleting (new SqlDataSourceCommandEventArgs (command));
-
-			bool closed = connection.State == ConnectionState.Closed;
-
-			if (closed)
-				connection.Open();
+			command = new SqlCommand (this.DeleteCommand, connection);
+			SqlDataSourceCommandEventArgs cmdEventArgs = new SqlDataSourceCommandEventArgs (command);
+			OnDeleting (cmdEventArgs);
+			connection.Open ();
 			Exception exception = null; 
 			int result = -1;;
 			try {
@@ -98,12 +77,8 @@ namespace System.Web.UI.WebControls {
 			} catch (Exception e) {
 				exception = e;
 			}
-
-			if (closed)
-				connection.Close ();
-
-			OnDeleted (new SqlDataSourceStatusEventArgs (command, result, exception));
-
+			SqlDataSourceStatusEventArgs statusEventArgs = new SqlDataSourceStatusEventArgs (command, result, exception);
+			OnDeleted (statusEventArgs);
 			if (exception != null)
 				throw exception;
 			return result;
@@ -119,36 +94,19 @@ namespace System.Web.UI.WebControls {
 		{
 			if (!CanInsert)
 				throw new NotSupportedException ("Insert operation is not supported");
-
-			InitConnection ();
-
-			DbCommand command = factory.CreateCommand ();
-			command.CommandText = InsertCommand;
-			command.Connection = connection;
-			command.CommandType = CommandType.Text;
-
-                        if (InsertParameters.Count > 0)
-                                InitializeParameters (command, InsertParameters, null);
-
-			OnInserting (new SqlDataSourceCommandEventArgs (command));
-
-			bool closed = connection.State == ConnectionState.Closed;
-
-			if (closed)
-				connection.Open();
+			command = new SqlCommand (this.InsertCommand, connection);
+			SqlDataSourceCommandEventArgs cmdEventArgs = new SqlDataSourceCommandEventArgs (command);
+			OnInserting (cmdEventArgs);
+			connection.Open();
 			Exception exception = null;
 			int result = -1;
 			try {
 				result = command.ExecuteNonQuery();
-			} catch (Exception e) {
+			}catch (Exception e) {
 				exception = e;
 			}
-
-			if (closed)
-				connection.Close ();
-
-			OnInserted (new SqlDataSourceStatusEventArgs (command, result, exception));
-
+			SqlDataSourceStatusEventArgs statusEventArgs = new SqlDataSourceStatusEventArgs (command, result, exception);
+			OnInserted (statusEventArgs);
 			if (exception != null)
 				throw exception;
 			return result;
@@ -156,74 +114,55 @@ namespace System.Web.UI.WebControls {
 				
 		public IEnumerable Select (DataSourceSelectArguments arguments)
 		{
+			
 			return ExecuteSelect (arguments);
 		}
 
-		[MonoTODO ("Handle @arguments")]
-		protected internal override IEnumerable ExecuteSelect (DataSourceSelectArguments arguments)
+		[MonoTODO ("Handle arguments")]
+		protected internal override IEnumerable ExecuteSelect (
+						DataSourceSelectArguments arguments)
 		{
-			InitConnection ();
-
-			DbCommand command = factory.CreateCommand ();
-			command.CommandText = SelectCommand;
-			command.Connection = connection;
-			command.CommandType = CommandType.Text;
-
-                        if (SelectParameters.Count > 0)
-                                InitializeParameters (command, SelectParameters, null);
-
-			OnSelecting (new SqlDataSourceSelectingEventArgs (command, arguments));
-
-			if (owner.DataSourceMode == SqlDataSourceMode.DataSet) {
-				DbDataAdapter adapter = factory.CreateDataAdapter ();
-
-				adapter.SelectCommand = command;
-
-				DataSet dataset = new DataSet ();
-
-				adapter.Fill (dataset, name);
-
-				return dataset.CreateDataReader ();
-			}
-			else {
-				bool closed = connection.State == ConnectionState.Closed;
-
-                                if (closed)
-                                        connection.Open ();
+			command = new SqlCommand (this.SelectCommand, connection);
+			SqlDataSourceCommandEventArgs cmdEventArgs = new SqlDataSourceCommandEventArgs (command);
+			OnSelecting (cmdEventArgs);
+			connection.Open ();
+			SqlDataReader reader = command.ExecuteReader ();
 
-                                return command.ExecuteReader (closed ? CommandBehavior.CloseConnection : CommandBehavior.Default);
+			IEnumerable enums = null; 
+			Exception exception = null;
+			try {
+				//enums = reader.GetEnumerator();
+				throw new NotImplementedException ("SqlDataReader doesnt implements GetEnumerator method yet");
+			} catch (Exception e) {
+				exception = e;
 			}
+			SqlDataSourceStatusEventArgs statusEventArgs = 
+				new SqlDataSourceStatusEventArgs (command, reader.RecordsAffected, exception);
+			OnSelected (statusEventArgs);
+			if (exception !=null)
+				throw exception;
+			return enums;
+			
 		}
 
-		public int Update (IDictionary keys, IDictionary values, IDictionary oldValues)
+		public int Update(IDictionary keys, IDictionary values,
+			IDictionary oldValues)
 		{
 			return ExecuteUpdate (keys, values, oldValues);
 		}
 
 		[MonoTODO ("Handle keys, values and oldValues")]
-		protected override int ExecuteUpdate (IDictionary keys, IDictionary values, IDictionary oldValues)
+		protected override int ExecuteUpdate (IDictionary keys,
+					IDictionary values, IDictionary oldValues)
 		{
 			if (!CanUpdate)
 				throw new NotSupportedException ("Update operation is not supported");
 			if (oldValues == null && conflictOptions == ConflictOptions.CompareAllValues)
 				throw new InvalidOperationException ("oldValues parameters should be specified when ConflictOptions is set to CompareAllValues");
-
-			InitConnection ();
-
-			DbCommand command = factory.CreateCommand ();
-			command.CommandText = UpdateCommand;
-			command.Connection = connection;
-			command.CommandType = CommandType.Text;
-
-                        if (UpdateParameters.Count > 0)
-                                InitializeParameters (command, UpdateParameters, null);
-
-			OnUpdating (new SqlDataSourceCommandEventArgs (command));
-
-			bool closed = connection.State == ConnectionState.Closed;
-
-			if (closed)
-				connection.Open();
+			command = new SqlCommand(this.UpdateCommand, connection);
+			SqlDataSourceCommandEventArgs cmdEventArgs = new SqlDataSourceCommandEventArgs (command);
+			OnUpdating (cmdEventArgs);
+			connection.Open ();
 			Exception exception = null;
 			int result = -1;
 			try {
@@ -231,32 +170,13 @@ namespace System.Web.UI.WebControls {
 			}catch (Exception e) {
 				exception = e;
 			}
-
-			if (closed)
-				connection.Close ();
-
-			OnUpdated (new SqlDataSourceStatusEventArgs (command, result, exception));
-
+			SqlDataSourceStatusEventArgs statusEventArgs = new SqlDataSourceStatusEventArgs (command, result, exception);
+			OnUpdated (statusEventArgs);
 			if (exception != null)
 				throw exception;
 			return result;
 		}
 
-                void InitializeParameters (DbCommand command, ParameterCollection parameters, IDictionary exclusionList)
-                {
-                        IOrderedDictionary values = parameters.GetValues (HttpContext.Current, owner);
-
-                        foreach (Parameter p in parameters) {
-                                DbParameter dbp = factory.CreateParameter ();
-
-                                dbp.ParameterName = p.Name;
-                                dbp.Value = values[p.Name];
-                                dbp.Direction = p.Direction;
-                                dbp.Size = p.Size;
-                                command.Parameters.Add (dbp);
-                        }
-                }
-
 		void IStateManager.LoadViewState (object savedState)
 		{
 			LoadViewState (savedState);
@@ -283,7 +203,7 @@ namespace System.Web.UI.WebControls {
 			if (vs [2] != null) ((IStateManager) insertParameters).LoadViewState (vs [2]);
 			if (vs [3] != null) ((IStateManager) selectParameters).LoadViewState (vs [3]);
 			if (vs [4] != null) ((IStateManager) updateParameters).LoadViewState (vs [4]);
-			if (vs [5] != null) ((IStateManager) ViewState).LoadViewState (vs [5]);
+			if (vs [5] != null) ((IStateManager) viewState).LoadViewState (vs [5]);
 		}
 
 		protected virtual object SaveViewState ()
@@ -314,46 +234,76 @@ namespace System.Web.UI.WebControls {
 			if (viewState != null) ((IStateManager) viewState).TrackViewState ();
 		}
 		
+		protected bool IsTrackingViewState {
+			get { return tracking; }
+		}
+		
 		bool IStateManager.IsTrackingViewState {
 			get { return IsTrackingViewState; }
 		}
-
-		bool cancelSelectOnNullParameter = true;
-		public bool CancelSelectOnNullParameter {
-			get { return cancelSelectOnNullParameter; }
-			set { cancelSelectOnNullParameter = value; }
+		
+		public string DeleteCommand {
+			get {
+				string val = ViewState ["DeleteCommand"] as string;
+				return val == null ? "" : val;
+			}
+			set { ViewState ["DeleteCommand"] = value; }
 		}
-
-		public override bool CanDelete {
-			get { return DeleteCommand != null && DeleteCommand != ""; }
+		
+		public string FilterExpression {
+			get {
+				string val = ViewState ["FilterExpression"] as string;
+				return val == null ? "" : val;
+			}
+			set { ViewState ["FilterExpression"] = value; }
 		}
-
-		public override bool CanInsert {
-			get { return InsertCommand != null && InsertCommand != ""; }
+		
+		public string InsertCommand {
+			get {
+				string val = ViewState ["InsertCommand"] as string;
+				return val == null ? "" : val;
+			}
+			set { ViewState ["InsertCommand"] = value; }
 		}
 		
-		public override bool CanPage {
-			/* according to MS, this is false in all cases */
-			get { return false; }
+		public string SelectCommand {
+			get {
+				string val = ViewState ["SelectCommand"] as string;
+				return val == null ? "" : val;
+			}
+			set { ViewState ["SelectCommand"] = value; }
 		}
-
-		public override bool CanRetrieveTotalRowCount {
-			/* according to MS, this is false in all cases */
-			get { return false; }
+		
+		public string UpdateCommand {
+			get {
+				string val = ViewState ["UpdateCommand"] as string;
+				return val == null ? "" : val;
+			}
+			set { ViewState ["UpdateCommand"] = value; }
 		}
-
-		public override bool CanSort {
+		
+		public string SortExpression {
 			get {
-				/* we can sort if we're a DataSet, regardless of sort parameter name.
-				   we can sort if we're a DataReader, if the sort parameter name is not null/"".
-				*/
-				return (owner.DataSourceMode == SqlDataSourceMode.DataSet
-					|| (SortParameterName != null && SortParameterName != ""));
+				string val = ViewState ["SortExpression"] as string;
+				return val == null ? "" : val;
 			}
+			set { ViewState ["SortExpression"] = value; }
+		}
+		
+		public override bool CanDelete {
+			get { return DeleteCommand != ""; }
+		}
+		
+		public override bool CanInsert {
+			get { return UpdateCommand != ""; }
+		}
+		
+		public override bool CanSort {
+			get { return owner.DataSourceMode == SqlDataSourceMode.DataSet; }
 		}
 		
 		public override bool CanUpdate {
-			get { return UpdateCommand != null && UpdateCommand != ""; }
+			get { return UpdateCommand != ""; }
 		}
 
 		ConflictOptions conflictOptions = ConflictOptions.OverwriteChanges;
@@ -362,17 +312,25 @@ namespace System.Web.UI.WebControls {
 			set { conflictOptions = value; }
 		}
 
-		public string DeleteCommand {
-			get { return ViewState.GetString ("DeleteCommand", ""); }
-			set { ViewState ["DeleteCommand"] = value; }
+		void ParametersChanged (object source, EventArgs args)
+		{
+			OnDataSourceViewChanged (EventArgs.Empty);
 		}
-
-		[MonoTODO]
-		public SqlDataSourceCommandType DeleteCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("DeleteCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["DeleteCommandType"] = value; }
+		
+		ParameterCollection GetParameterCollection (ref ParameterCollection output)
+		{
+			if (output != null)
+				return output;
+			
+			output = new ParameterCollection ();
+			output.ParametersChanged += new EventHandler (ParametersChanged);
+			
+			if (IsTrackingViewState)
+				((IStateManager) output).TrackViewState ();
+			
+			return output;
 		}
-
+		
 		[DefaultValueAttribute (null)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
@@ -380,11 +338,6 @@ namespace System.Web.UI.WebControls {
 			get { return GetParameterCollection (ref deleteParameters); }
 		}
 		
-		public string FilterExpression {
-			get { return ViewState.GetString ("FilterExpression", ""); }
-			set { ViewState ["FilterExpression"] = value; }
-		}
-
 		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[DefaultValueAttribute (null)]
@@ -392,67 +345,17 @@ namespace System.Web.UI.WebControls {
 			get { return GetParameterCollection (ref filterParameters); }
 		}
 		
-		public string InsertCommand {
-			get { return ViewState.GetString ("InsertCommand", ""); }
-			set { ViewState ["InsertCommand"] = value; }
-		}
-
-		[MonoTODO]
-		public SqlDataSourceCommandType InsertCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("InsertCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["InsertCommandType"] = value; }
-		}
-
 		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[DefaultValueAttribute (null)]
 		public ParameterCollection InsertParameters {
 			get { return GetParameterCollection (ref insertParameters); }
 		}
-
-		protected bool IsTrackingViewState {
-			get { return tracking; }
-		}
-
-		[MonoTODO]
-		[DefaultValue ("{0}")]
-		public string OldValuesParameterFormatString {
-			get { return ViewState.GetString ("OldValuesParameterFormatString", "{0}"); }
-			set { ViewState ["OldValuesParameterFormatString"] = value; }
-		}
-		
-		public string SelectCommand {
-			get { return ViewState.GetString ("SelectCommand", ""); }
-			set { ViewState ["SelectCommand"] = value; }
-		}
-
-		[MonoTODO]
-		public SqlDataSourceCommandType SelectCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("SelectCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["SelectCommandType"] = value; }
-		}
 		
 		public ParameterCollection SelectParameters {
 			get { return GetParameterCollection (ref selectParameters); }
 		}
-
-		[MonoTODO]
-		public string SortParameterName {
-			get { return ViewState.GetString ("SortParameterName", ""); }
-			set { ViewState ["SortParameterName"] = value; }
-		}
-
-		public string UpdateCommand {
-			get { return ViewState.GetString ("UpdateCommand", ""); }
-			set { ViewState ["UpdateCommand"] = value; }
-		}
-
-		[MonoTODO]
-		public SqlDataSourceCommandType UpdateCommandType {
-			get { return (SqlDataSourceCommandType) ViewState.GetInt ("UpdateCommandType", (int)SqlDataSourceCommandType.StoredProcedure); }
-			set { ViewState ["UpdateCommandType"] = value; }
-		}
-
+		
 		[EditorAttribute ("System.Web.UI.Design.WebControls.ParameterCollectionEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[PersistenceModeAttribute (PersistenceMode.InnerProperty)]
 		[DefaultValueAttribute (null)]
@@ -460,23 +363,9 @@ namespace System.Web.UI.WebControls {
 			get { return GetParameterCollection (ref updateParameters); }
 		}
 		
-		void ParametersChanged (object source, EventArgs args)
-		{
-			OnDataSourceViewChanged (EventArgs.Empty);
-		}
 		
-		ParameterCollection GetParameterCollection (ref ParameterCollection output)
-		{
-			if (output != null)
-				return output;
-			
-			output = new ParameterCollection ();
-			output.ParametersChanged += new EventHandler (ParametersChanged);
-			
-			if (IsTrackingViewState)
-				((IStateManager) output).TrackViewState ();
-			
-			return output;
+		public override string Name {
+			get { return name; }
 		}
 		
 		protected virtual string ParameterPrefix {
@@ -484,19 +373,19 @@ namespace System.Web.UI.WebControls {
 		}
 
 		StateBag viewState;
-		private StateBag ViewState {
+		protected StateBag ViewState {
 			get {
 				if (viewState != null)
 					return viewState;
-
+				
 				viewState = new StateBag ();
 				if (IsTrackingViewState)
 					viewState.TrackViewState ();
-
+				
 				return viewState;
 			}
 		}
-
+			
 		ParameterCollection deleteParameters;
 		ParameterCollection filterParameters;
 		ParameterCollection insertParameters;
@@ -536,21 +425,6 @@ namespace System.Web.UI.WebControls {
 			remove { Events.RemoveHandler (EventDeleting, value); }
 		}
 		#endregion
-
-		#region OnFiltering
-		static readonly object EventFiltering = new object ();
-		protected virtual void OnFiltering (SqlDataSourceFilteringEventArgs e)
-		{
-			if (!HasEvents ()) return;
-			SqlDataSourceFilteringEventHandler h = Events [EventFiltering] as SqlDataSourceFilteringEventHandler;
-			if (h != null)
-				h (this, e);
-		}
-		public event SqlDataSourceFilteringEventHandler Filtering {
-			add { Events.AddHandler (EventFiltering, value); }
-			remove { Events.RemoveHandler (EventFiltering, value); }
-		}
-		#endregion
 		
 		#region OnInsert
 		static readonly object EventInserted = new object ();
@@ -597,14 +471,14 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		static readonly object EventSelecting = new object ();
-		protected virtual void OnSelecting (SqlDataSourceSelectingEventArgs e)
+		protected virtual void OnSelecting (SqlDataSourceCommandEventArgs e)
 		{
 			if (!HasEvents ()) return;
-			SqlDataSourceSelectingEventHandler h = Events [EventSelecting] as SqlDataSourceSelectingEventHandler;
+			SqlDataSourceCommandEventHandler h = Events [EventSelecting] as SqlDataSourceCommandEventHandler;
 			if (h != null)
 				h (this, e);
 		}
-		public event SqlDataSourceSelectingEventHandler Selecting {
+		public event SqlDataSourceCommandEventHandler Selecting {
 			add { Events.AddHandler (EventSelecting, value); }
 			remove { Events.RemoveHandler (EventSelecting, value); }
 		}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableSectionStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableSectionStyle.cs
index 6a1febb0435..2e0bb83d573 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TableSectionStyle.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableSectionStyle.cs
@@ -43,7 +43,7 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue (true)]
 		[NotifyParentProperty (true)]
-		public bool Visible {
+		public virtual bool Visible {
 			get {
 // commented to match MS behaviour (beta2)
 //				if ((styles & Styles.Visible) == 0)
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs
index 8ed44b3173b..c7abd475b19 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs
@@ -178,12 +178,8 @@ namespace System.Web.UI.WebControls {
 				writer.AddAttribute (HtmlTextWriterAttribute.Cellpadding, i.ToString (CultureInfo.InvariantCulture));
 			
 			i = CellSpacing;
-			if (i != -1) {
+			if (i != -1)
 				writer.AddAttribute (HtmlTextWriterAttribute.Cellspacing, i.ToString (CultureInfo.InvariantCulture));
-				if (i == 0) {
-					writer.AddStyleAttribute(HtmlTextWriterStyle.BorderCollapse, "collapse");
-				}
-			}
 
 			GridLines g = GridLines;
 			switch (g) {
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TemplateField.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TemplateField.cs
index 0c2a32822c4..ac8fc7d1d74 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TemplateField.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TemplateField.cs
@@ -51,8 +51,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(IDataItemContainer), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate AlternatingItemTemplate {
+	    [Browsable (false)]
+		public ITemplate AlternatingItemTemplate {
 			get { return alternatingItemTemplate; }
 			set { alternatingItemTemplate = value; OnFieldChanged (); }
 		}
@@ -74,8 +74,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(IDataItemContainer), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate EditItemTemplate {
+	    [Browsable (false)]
+		public ITemplate EditItemTemplate {
 			get { return editItemTemplate; }
 			set { editItemTemplate = value; OnFieldChanged (); }
 		}
@@ -83,8 +83,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(IDataItemContainer), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate FooterTemplate {
+	    [Browsable (false)]
+		public ITemplate FooterTemplate {
 			get { return footerTemplate; }
 			set { footerTemplate = value; OnFieldChanged (); }
 		}
@@ -92,8 +92,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(IDataItemContainer), BindingDirection.OneWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate HeaderTemplate {
+	    [Browsable (false)]
+		public ITemplate HeaderTemplate {
 			get { return headerTemplate; }
 			set { headerTemplate = value; OnFieldChanged (); }
 		}
@@ -101,8 +101,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(IDataItemContainer), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate InsertItemTemplate {
+	    [Browsable (false)]
+		public ITemplate InsertItemTemplate {
 			get { return insertItemTemplate; }
 			set { insertItemTemplate = value; OnFieldChanged (); }
 		}
@@ -110,14 +110,14 @@ namespace System.Web.UI.WebControls
 		[DefaultValue (null)]
 		[TemplateContainer (typeof(IDataItemContainer), BindingDirection.TwoWay)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
-		[Browsable (false)]
-		public virtual ITemplate ItemTemplate {
+	    [Browsable (false)]
+		public ITemplate ItemTemplate {
 			get { return itemTemplate; }
 			set { itemTemplate = value; OnFieldChanged (); }
 		}
 		
 		public override void InitializeCell (DataControlFieldCell cell,
-						     DataControlCellType cellType, DataControlRowState rowState, int rowIndex)
+			DataControlCellType cellType, DataControlRowState rowState, int rowIndex)
 		{
 			if (cellType == DataControlCellType.Header) {
 				if (headerTemplate != null && ShowHeader) {
@@ -156,7 +156,7 @@ namespace System.Web.UI.WebControls
 		}
 		
 		public override void ExtractValuesFromCell (IOrderedDictionary dictionary,
-							    DataControlFieldCell cell, DataControlRowState rowState, bool includeReadOnly)
+			DataControlFieldCell cell, DataControlRowState rowState, bool includeReadOnly)
 		{
 			IBindableTemplate bt;
 			
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
index 81a6a890f8d..12fa1be6b05 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
@@ -340,7 +340,7 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 		[DefaultValue ("")]
-		public virtual string ValidationGroup
+		public string ValidationGroup
 		{
 			get {
 				return ViewState.GetString ("ValidationGroup", "");
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
index 7993443ae4b..fe7716ef12a 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
@@ -95,12 +95,6 @@ namespace System.Web.UI.WebControls
 			Target = target;
 		}
 		
-		[MonoTODO]
-		protected TreeNode (TreeView owner, bool isRoot)
-		{
-			throw new NotImplementedException ();
-		}
-
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		[Browsable (false)]
 		public int Depth {
@@ -166,7 +160,7 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[DefaultValue (false)]
-		public bool Checked {
+		public virtual bool Checked {
 			get {
 				object o = ViewState ["Checked"];
 				if (o != null) return (bool)o;
@@ -183,7 +177,7 @@ namespace System.Web.UI.WebControls
 		[MergableProperty (false)]
 		[Browsable (false)]
 		[PersistenceMode (PersistenceMode.InnerDefaultProperty)]
-		public TreeNodeCollection ChildNodes {
+		public virtual TreeNodeCollection ChildNodes {
 			get {
 				if (nodes == null) {
 					if (PopulateOnDemand && tree == null)
@@ -206,12 +200,12 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValue (null)]
-		public bool? Expanded {
+		[DefaultValue (false)]
+		public virtual bool Expanded {
 			get {
 				object o = ViewState ["Expanded"];
 				if (o != null) return (bool)o;
-				return true;
+				return false;
 			}
 			set {
 				ViewState ["Expanded"] = value;
@@ -222,7 +216,7 @@ namespace System.Web.UI.WebControls
 
 		[Localizable (true)]
 		[DefaultValue ("")]
-		public string ImageToolTip {
+		public virtual string ImageToolTip {
 			get {
 				object o = ViewState ["ImageToolTip"];
 				if (o != null) return (string)o;
@@ -244,7 +238,7 @@ namespace System.Web.UI.WebControls
 		[DefaultValue ("")]
 		[UrlProperty]
 		[Editor ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
-		public string ImageUrl {
+		public virtual string ImageUrl {
 			get {
 				object o = ViewState ["ImageUrl"];
 				if (o != null) return (string)o;
@@ -266,7 +260,7 @@ namespace System.Web.UI.WebControls
 		[DefaultValue ("")]
 		[UrlProperty]
 		[Editor ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
-		public string NavigateUrl {
+		public virtual string NavigateUrl {
 			get {
 				object o = ViewState ["NavigateUrl"];
 				if (o != null) return (string)o;
@@ -319,8 +313,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 
-		[DefaultValue (null)]
-		public bool? ShowCheckBox {
+		[DefaultValue (false)]
+		public bool ShowCheckBox {
 			get {
 				object o = ViewState ["ShowCheckBox"];
 				if (o != null) return (bool)o;
@@ -329,7 +323,7 @@ namespace System.Web.UI.WebControls
 					if (bin != null)
 						return bin.ShowCheckBox;
 				}
-				return true;
+				return false;
 			}
 			set {
 				ViewState ["ShowCheckBox"] = value;
@@ -341,7 +335,7 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue ("")]
-		public string Target {
+		public virtual string Target {
 			get {
 				object o = ViewState ["Target"];
 				if(o != null) return (string)o;
@@ -363,7 +357,7 @@ namespace System.Web.UI.WebControls
 		[Localizable (true)]
 		[DefaultValue ("")]
 		[WebSysDescription ("The display text of the tree node.")]
-		public string Text {
+		public virtual string Text {
 			get {
 				object o = ViewState ["Text"];
 				if (o != null) return (string)o;
@@ -393,7 +387,7 @@ namespace System.Web.UI.WebControls
 
 		[Localizable (true)]
 		[DefaultValue ("")]
-		public string ToolTip {
+		public virtual string ToolTip {
 			get {
 				object o = ViewState ["ToolTip"];
 				if(o != null) return (string)o;
@@ -414,7 +408,7 @@ namespace System.Web.UI.WebControls
 
 		[Localizable (true)]
 		[DefaultValue ("")]
-		public string Value {
+		public virtual string Value {
 			get {
 				object o = ViewState ["Value"];
 				if(o != null) return (string)o;
@@ -436,7 +430,7 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[DefaultValue (false)]
-		public bool Selected {
+		public virtual bool Selected {
 			get {
 				return SelectedFlag;
 			}
@@ -526,7 +520,7 @@ namespace System.Web.UI.WebControls
 			get { return nodes != null; }
 		}
 		
-		internal void Populate ()
+		protected virtual void Populate ()
 		{
 			tree.NotifyPopulateRequired (this);
 		}
@@ -575,12 +569,7 @@ namespace System.Web.UI.WebControls
 			Expanded = !Expanded;
 		}
 
-		void IStateManager.LoadViewState (object savedState)
-		{
-			LoadViewState (savedState);
-		}
-
-		protected virtual void LoadViewState (object savedState)
+		public void LoadViewState (object savedState)
 		{
 			if (savedState == null)
 				return;
@@ -595,12 +584,7 @@ namespace System.Web.UI.WebControls
 				((IStateManager)ChildNodes).LoadViewState (states [1]);
 		}
 		
-		object IStateManager.SaveViewState ()
-		{
-			return SaveViewState ();
-		}
-
-		protected virtual object SaveViewState ()
+		public object SaveViewState ()
 		{
 			object[] states = new object[2];
 			states[0] = ViewState.SaveViewState();
@@ -612,13 +596,8 @@ namespace System.Web.UI.WebControls
 			}
 			return null;
 		}
-
-		void IStateManager.TrackViewState ()
-		{
-			TrackViewState ();
-		}
-
-		protected void TrackViewState ()
+		
+		public void TrackViewState ()
 		{
 			if (marked) return;
 			marked = true;
@@ -628,11 +607,7 @@ namespace System.Web.UI.WebControls
 				((IStateManager)nodes).TrackViewState ();
 		}
 		
-		bool IStateManager.IsTrackingViewState {
-			get { return IsTrackingViewState; }
-		}
-
-		protected bool IsTrackingViewState
+		public bool IsTrackingViewState
 		{
 			get { return marked; }
 		}
@@ -642,7 +617,7 @@ namespace System.Web.UI.WebControls
 			ViewState.SetDirty (true);
 		}
 		
-		public virtual object Clone ()
+		public object Clone ()
 		{
 			TreeNode nod = tree != null ? tree.CreateNode () : new TreeNode ();
 			foreach (DictionaryEntry e in ViewState)
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeCollection.cs
index ed20aadcf7e..79899ead9a6 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeCollection.cs
@@ -77,7 +77,7 @@ namespace System.Web.UI.WebControls
 			child.Tree = tree;
 			child.SetParent (parent);
 			if (marked) {
-				((IStateManager)child).TrackViewState ();
+				child.TrackViewState ();
 				child.SetDirty ();
 				dirty = true;
 			}
@@ -92,7 +92,7 @@ namespace System.Web.UI.WebControls
 			for (int n=index+1; n<items.Count; n++)
 				((TreeNode)items[n]).Index = n;
 			if (marked) {
-				((IStateManager)child).TrackViewState ();
+				child.TrackViewState ();
 				child.SetDirty ();
 				dirty = true;
 			}
@@ -183,7 +183,7 @@ namespace System.Web.UI.WebControls
 				if (oi != -1) node = originalItems [oi];
 				else node = new TreeNode ();
 				if (dirty) Add (node);
-				((IStateManager)node).LoadViewState (pair.Second);
+				node.LoadViewState (pair.Second);
 			}
 		}
 		
@@ -198,7 +198,7 @@ namespace System.Web.UI.WebControls
 				for (int n=0; n<items.Count; n++) {
 					TreeNode node = items[n] as TreeNode;
 					int oi = Array.IndexOf (originalItems, node);
-					object ns = ((IStateManager)node).SaveViewState ();
+					object ns = node.SaveViewState ();
 					if (ns != null) hasData = true;
 					state [n + 1] = new Pair (oi, ns);
 				}
@@ -206,7 +206,7 @@ namespace System.Web.UI.WebControls
 				ArrayList list = new ArrayList ();
 				for (int n=0; n<items.Count; n++) {
 					TreeNode node = items[n] as TreeNode;
-					object ns = ((IStateManager)node).SaveViewState ();
+					object ns = node.SaveViewState ();
 					if (ns != null) {
 						hasData = true;
 						list.Add (new Pair (n, ns));
@@ -230,7 +230,7 @@ namespace System.Web.UI.WebControls
 			originalItems = new TreeNode [items.Count];
 			for (int n=0; n<items.Count; n++) {
 				originalItems [n] = (TreeNode) items [n];
-				((IStateManager)originalItems [n]).TrackViewState ();
+				originalItems [n].TrackViewState ();
 			}
 		}
 		
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
index 1f9e43dc99a..1126ff72882 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
@@ -44,7 +44,6 @@ namespace System.Web.UI.WebControls
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	// attributes
-	[SupportsEventValidation]
 	[ControlValueProperty ("SelectedValue")]
 	[DefaultEvent ("SelectedNodeChanged")]
 	[Designer ("System.Web.UI.Design.WebControls.TreeViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
@@ -354,7 +353,7 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue ("")]
-		public string LineImagesFolder {
+		public virtual string LineImagesFolder {
 			get {
 				return ViewState.GetString ("LineImagesFolder", "");
 			}
@@ -364,7 +363,7 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue (-1)]
-		public int MaxDataBindDepth {
+		public virtual int MaxDataBindDepth {
 			get {
 				return ViewState.GetInt ("MaxDataBindDepth", -1);
 			}
@@ -374,7 +373,7 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue (20)]
-		public int NodeIndent {
+		public virtual int NodeIndent {
 			get {
 				return ViewState.GetInt ("NodeIndent", 20);
 			}
@@ -696,7 +695,7 @@ namespace System.Web.UI.WebControls
 
 		internal void NotifyExpandedChanged (TreeNode node)
 		{
-			if (node.Expanded.HasValue && node.Expanded.Value)
+			if (node.Expanded)
 				OnTreeNodeExpanded (new TreeNodeEventArgs (node));
 			else
 				OnTreeNodeCollapsed (new TreeNodeEventArgs (node));
@@ -828,8 +827,7 @@ namespace System.Web.UI.WebControls
 		{
 		}
 		
-		string callbackResult;
-		protected virtual void RaiseCallbackEvent (string eventArgs)
+		protected virtual string RaiseCallbackEvent (string eventArgs)
 		{
 			RequiresDataBinding = true;
 			EnsureDataBound ();
@@ -851,14 +849,9 @@ namespace System.Web.UI.WebControls
 				RenderNode (writer, node.ChildNodes [n], node.Depth + 1, levelLines, true, n<num-1);
 			
 			string res = sw.ToString ();
-			callbackResult = res != "" ? res : "*";
+			return res != "" ? res : "*";
 		}
 		
-		protected virtual string GetCallbackResult ()
-		{
-			return callbackResult;
-		}
-
 		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)
 		{
 			RaisePostBackEvent (eventArgument);
@@ -874,16 +867,11 @@ namespace System.Web.UI.WebControls
 			RaisePostDataChangedEvent ();
 		}
 		
-		void ICallbackEventHandler.RaiseCallbackEvent (string eventArgs)
+		string ICallbackEventHandler.RaiseCallbackEvent (string eventArgs)
 		{
-			RaiseCallbackEvent (eventArgs);
+			return RaiseCallbackEvent (eventArgs);
 		}
 		
-		string ICallbackEventHandler.GetCallbackResult ()
-		{
-			return GetCallbackResult ();
-		}
-
 		protected override ControlCollection CreateControlCollection ()
 		{
 			return new EmptyControlCollection (this);
@@ -1030,7 +1018,7 @@ namespace System.Web.UI.WebControls
 			string nodeImage;
 			bool clientExpand = EnableClientScript && Events [TreeNodeCollapsedEvent] == null && Events [TreeNodeExpandedEvent] == null;
 			ImageStyle imageStyle = GetImageStyle ();
-			bool renderChildNodes = node.Expanded.HasValue && node.Expanded.Value;
+			bool renderChildNodes = node.Expanded;
 			
 			if (clientExpand && !renderChildNodes)
 				renderChildNodes = (!PopulateNodesFromClient || HasChildInputData (node));
@@ -1090,9 +1078,9 @@ namespace System.Web.UI.WebControls
 				if (ShowExpandCollapse) {
 					if (hasChildNodes) {
 						buttonImage = true;
-						if (node.Expanded.HasValue && node.Expanded.Value) shape += "minus";
+						if (node.Expanded) shape += "minus";
 						else shape += "plus";
-						tooltip = GetNodeImageToolTip (!(node.Expanded.HasValue && node.Expanded.Value), node.Text);
+						tooltip = GetNodeImageToolTip (!node.Expanded, node.Text);
 					} else if (!ShowLines)
 						shape = "noexpand";
 				}
@@ -1153,7 +1141,7 @@ namespace System.Web.UI.WebControls
 			
 			bool showChecks;
 			if (node.IsShowCheckBoxSet)
-				showChecks = node.ShowCheckBox.HasValue && node.ShowCheckBox.Value;
+				showChecks = node.ShowCheckBox;
 			else
 				showChecks = (ShowCheckBoxes == TreeNodeTypes.All) ||
 							 (ShowCheckBoxes == TreeNodeTypes.Leaf && node.ChildNodes.Count == 0) ||
@@ -1206,7 +1194,7 @@ namespace System.Web.UI.WebControls
 				}
 				
 				if (clientExpand) {
-					if (!(node.Expanded.HasValue && node.Expanded.Value)) writer.AddStyleAttribute ("display", "none");
+					if (!node.Expanded) writer.AddStyleAttribute ("display", "none");
 					else writer.AddStyleAttribute ("display", "block");
 					writer.AddAttribute ("id", GetNodeClientId (node, null));
 					writer.RenderBeginTag (HtmlTextWriterTag.Span);
@@ -1394,7 +1382,7 @@ namespace System.Web.UI.WebControls
 		void UnsetExpandStates (TreeNodeCollection col, string[] states)
 		{
 			foreach (TreeNode node in col) {
-				if (node.Expanded.HasValue && node.Expanded.Value) {
+				if (node.Expanded) {
 					bool expand = (Array.IndexOf (states, node.Path) != -1);
 					if (!expand) node.Expanded = false;
 				}
@@ -1424,7 +1412,7 @@ namespace System.Web.UI.WebControls
 		
 		void GetExpandStates (StringBuilder sb, TreeNode node)
 		{
-			if (node.Expanded.HasValue && node.Expanded.Value) {
+			if (node.Expanded) {
 				sb.Append (node.Path);
 				sb.Append ('|');
 			}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
index f462156fe94..70505142589 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
@@ -149,7 +149,7 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[DefaultValue ("")]
 		[Themeable (false)]
-		public virtual string ValidationGroup
+		public string ValidationGroup
 		{
 			get {
 				return ViewState.GetString("ValidationGroup", string.Empty);
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WizardStepBase.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WizardStepBase.cs
index 240f7e3d16b..ebf9ee36a66 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/WizardStepBase.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WizardStepBase.cs
@@ -42,9 +42,9 @@ namespace System.Web.UI.WebControls
 	{
 		Wizard wizard;
 		
-		[DefaultValueAttribute (true)]

-		[ThemeableAttribute (false)]

-		[FilterableAttribute (false)]

+	    [DefaultValueAttribute (true)]

+	    [ThemeableAttribute (false)]

+	    [FilterableAttribute (false)]

 		public virtual bool AllowReturn {
 			get {
 				object v = ViewState ["AllowReturn"];
@@ -55,9 +55,9 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

-		[BrowsableAttribute (false)]

-		public virtual string Name {
+	    [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]

+	    [BrowsableAttribute (false)]

+		public string Name {
 			get {
 				if (Title.Length > 0) return Title;
 				else if (ID.Length > 0) return ID;
@@ -65,7 +65,7 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute (WizardStepType.Auto)]

+	    [DefaultValueAttribute (WizardStepType.Auto)]

 		public virtual WizardStepType StepType {
 			get {
 				object v = ViewState ["StepType"];
@@ -76,8 +76,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[DefaultValueAttribute ("")]

-		[LocalizableAttribute (true)]

+	    [DefaultValueAttribute ("")]

+	    [LocalizableAttribute (true)]

 		public virtual string Title {
 			get {
 				object v = ViewState ["Title"];
@@ -88,8 +88,8 @@ namespace System.Web.UI.WebControls
 			}
 		}
 		
-		[EditorBrowsableAttribute (EditorBrowsableState.Advanced)]

-		[BrowsableAttribute (false)]

+	    [EditorBrowsableAttribute (EditorBrowsableState.Advanced)]

+	    [BrowsableAttribute (false)]

 		public Wizard Wizard {
 			get { return wizard; }
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/BaseParser.cs b/mcs/class/System.Web/System.Web.UI/BaseParser.cs
index 89c6f4a2005..12d3cae054d 100644
--- a/mcs/class/System.Web/System.Web.UI/BaseParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/BaseParser.cs
@@ -46,7 +46,7 @@ namespace System.Web.UI
 		string baseDir;
 		string baseVDir;
 		ILocation location;
-#if !NET_2_0
+#if !CONFIGURATION_2_0
 		CompilationConfiguration compilationConfig;
 #endif
 
@@ -138,7 +138,7 @@ namespace System.Web.UI
 			set { baseVDir = value; }
 		}
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 		internal CompilationSection CompilationConfig {
 			get {
 				return WebConfigurationManager.GetSection ("system.web/compilation") as CompilationSection;
diff --git a/mcs/class/System.Web/System.Web.UI/BaseTemplateParser.cs b/mcs/class/System.Web/System.Web.UI/BaseTemplateParser.cs
deleted file mode 100644
index 7a5435f96d7..00000000000
--- a/mcs/class/System.Web/System.Web.UI/BaseTemplateParser.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Web.UI.BaseTemplateParser
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-using System;
-
-namespace System.Web.UI {
-	public abstract class BaseTemplateParser : TemplateParser
-	{
-		protected BaseTemplateParser ()
-		{
-		}
-
-		[MonoTODO]
-		protected Type GetReferenceType ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected internal Type GetUserControlType (string virtualPath)
-		{
-			throw new NotImplementedException ();
-		}
-	}
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/BoundPropertyEntry.cs b/mcs/class/System.Web/System.Web.UI/BoundPropertyEntry.cs
index 55237d86569..31fe258fc5f 100644
--- a/mcs/class/System.Web/System.Web.UI/BoundPropertyEntry.cs
+++ b/mcs/class/System.Web/System.Web.UI/BoundPropertyEntry.cs
@@ -36,10 +36,6 @@ namespace System.Web.UI
 		bool generated;
 		bool useSetAttribute;
 
-		internal BoundPropertyEntry ()
-		{
-		}
-
 		public string Expression {
 			get { return expression; }
 			set { expression = value; }
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 0a7f73eeaa9..6ee04ce30c4 100644
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,202 +1,3 @@
-2006-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* TemplateControl.cs: corcompare work.
-
-	* ExpressionBindingCollection.cs: same.
-
-	* HierarchicalDataSourceControl.cs: same.
-
-	* PostBackOptions.cs: same.
-
-	* ClientScriptManager.cs: same.
-
-	* FilterableAttribute.cs: same.
-
-	* ControlCollection.cs: same.
-
-	* DataBindingCollection.cs: same.
-	
-	* PropertyEntry.cs: mark ctor internal.
-
-	* SimpleWebHandlerParser.cs: mark the 2.0 ctor as internal.
-
-	* Page.cs: stub out two Theme oriented 2.0 properties.
-
-	* DataBinder.cs: remove the obsolete attribute on the ctor.
-
-	* TwoWayBoundPropertyEntry.cs: remove this.
-	
-	* ControlBuilder.cs (BindingContainerType): virtual in 2.0.
-
-	* ThemeProvider: new (stubbed) class.
-
-	* SkinBuilder.cs: same.
-
-	* PageTheme.cs: same.
-
-	* ControlSkin.cs: same.
-	
-	* ControlSkinProc.cs: rename this to ControlSkinDelegate.cs.
-	
-	* SimplePropertyEntry.cs: mark ctor as internal.
-
-	* IThemeResolutionService.cs: enable the 3 members of this
-	interface.
-
-2006-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* ListSourceHelper.cs: this class is static.
-
-	* Page.cs: add some EditorBrowsable attributes to the 2.0 events.
-
-2006-02-27  Chris Toshok  <toshok@ximian.com>
-
-	* DataSourceView.cs: Name isn't virtual.
-
-	* DataSourceControl.cs: beat this class over the head with the
-	corcompare stick.
-
-	* DataSourceControlBuilder.cs: new stubbed control builder for
-	DataSourceControl.
-
-2006-02-23  Chris Toshok  <toshok@ximian.com>
-
-	* Page.cs: more corcompare work.
-
-2006-02-23  Chris Toshok  <toshok@ximian.com>
-
-	* Page.cs (ProcessCallbackData): track change to
-	ICallbackEventHandler iface.
-
-	* ICallbackEventHandler.cs: enable the proper members of this
-	interface.
-
-	* DataSourceSelectArguments.cs: reformat getter/setters.
-	
-2006-02-22  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* HtmlTextWriter.cs: Added method WriteEncodedText for the .NET 2.0 profile.
-
-2006-02-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* WebHandlerParser.cs:
-	* WebServiceParser.cs:
-	* UserControlParser.cs:
-	* PageParser.cs: added new ctor that uses a TextReader as input.
-
-	* TemplateControlParser.cs: new Reader property.
-	* SimpleWebHandlerParser.cs: new Reader property and ctor.
-
-2006-02-12  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* HtmlTextWriter.cs: Implemented IsValidFormAttribute and
-	WriterBreak for the .NET 2.0 profile.
-
-2006-02-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* IThemeResolutionService.cs: this is now added to the
-	sources file, but some other stuff does not compile yet as the
-	interface changed after the beta.
-
-	* ObjectConverter.cs: removed extra attribute.
-
-	* ObjectStateFormatter.cs: add IStateFormatter for 2.0.
-
-	* ICallbackEventHandler.cs: update the interface, but commented the
-	'good' stuff out, since other files need to be fixed too.
-
-2006-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* ControlBuilder.cs: rename flushOutputStatements to
-	methodStatements to at least reflect that they're in that method.
-
-2006-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* MasterPage.cs (CreateMasterPage): don't nullref on null
-	contentTemplateCollection.
-
-	* ControlBuilder.cs: add a flushOutputStatements field.
-
-	* PageParser.cs (ProcessMainAttributes): handle Title attribute.
-	(Title): add getter.
-	
-	* Page.cs (Title): implement getter/setter.
-	(InternalProcessRequest): after calling ApplyMasterPage, apply the
-	page's Title directive if there is one.
-	(AddContentTemplate): make the EditorBrowsable attribute apply to
-	the method, not the field.
-	
-2006-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* MasterPage.cs: rework this file, adding some static methods
-	gleaned from MS stack traces, and clear up the propogation of
-	content templates between nested master pages.
-
-	* Control.cs (TemplateControl): implement.
-
-	* TemplateControl.cs: re-indent some of the code.
-	(ReadStringRecource): according to msdn2, these throw
-	NotSupportedException.
-
-	* MasterPageParser.cs (HandleOption): implement.  assign our
-	master page's MasterPageFile from the UserControl property.
-
-	* UserControl.cs (InitializeAsUserControlInternal): new method
-	that allows initialization without a page.
-
-	* UserControlParser.cs (ProcessMainAttributes): for 2.0 handle
-	MasterPageFile attributes, so we can have nested master pages.
-	(MasterPageFile): add a 2.0 specific property.
-	
-	* TemplateControlParser.cs: in .net 2.0, our base class is
-	BaseTemplateParser.
-	(HandleOptions): be consistent and call base.HandleOptions.
-
-	* BaseTemplateParser.cs: new (stubbed) class.
-
-	* MasterPageControlBuilder.cs: new file, not filled in (and really
-	not used either.)
-
-	* Page.cs (InternalProcessRequest): call ApplyMasterPage.
-	(SaveExistingContentTemplates): nuke.
-	(ReapplyExistingContentTemplate): nuke.
-	(ApplyMasterPage): if we have a master page, call
-	MasterPage.ApplyMasterPageRecursive with it and add it to our
-	controls.
-	(set_MasterPageFile): remove call to SaveExistingContentTemplates.
-	(get_Master): call MasterPage.CreateMasterPage.
-	(AddContentTemplate): keep track of the page's content templates
-	in a local Hashtable - they aren't our master page's content
-	templates.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* TemplateParser.cs: CONFIGURATION_2_0 => NET_2_0, and replace
-	calls to GetWebApplicationSection with GetSection.
-
-	* SimpleWebHandlerParser.cs: same.
-
-	* Page.cs: same.
-
-	* PageParser.cs: same.
-
-	* BaseParser.cs: same.
-
-2006-01-27  Chris Toshok  <toshok@ximian.com>
-
-	* MasterPage.cs (ContentTemplatesInternal): add get/set for the
-	actual Hashtable.
-
-	* Page.cs (SaveExistingContentTemplates): store off the existing
-	MasterPage content templates so they can be reapplied when setting
-	MasterPageFile to something else.
-	(ReapplyExistingContentTemplates): set masterPage's
-	ContentTemplates to our saved copy.
-	(set_MasterPageFile): save off the current content templates
-	before clearing masterPage.
-	(get_Master): reapply the saved content templates after we create
-	the new MasterPage.
-	
 2006-01-25  Chris Toshok  <toshok@ximian.com>
 
 	* ClientScriptManager.cs (RegisterClientScriptResource): last
@@ -208,54 +9,10 @@
 	problem with last commit - unquote "resourceName" so it uses the
 	parameter instead of the string constant.
 
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* RootBuilder.cs (.cctor): use a 2.0 friendly hashtable ctor to
-	quiet mcs.
-
-	* PageParser.cs (ProcessMainAttributes): i missed a
-	CONFIGURATION_2_0 block.
-
-	* BoundPropertyEntry.cs (.ctor): mark as internal to fix
-	corcompare.
-
-2006-01-18 Konstantin Triger <kostat@mainsoft.com>
-
-	* ObjectStateFormatter.cs: preserve emptiness in ColorFormatter.
-
-2006-01-18 Konstantin Triger <kostat@mainsoft.com>
-
-	* HtmlTextWriter.cs: perform case insensitive compare;
-	  return correct key in default case.
-
-2006-01-11  Chris Toshok  <toshok@ximian.com>
+2006-01-25  Chris Toshok  <toshok@ximian.com>
 
 	* ClientScriptManager.cs (RegisterClientScriptResource):
-	implement.
-
-2006-01-11  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* ObjectStateFormatter.cs: Removed TARGET_JVM parts in 
-	TypeFormatter.Read
-
-2006-01-10  Chris Toshok  <toshok@ximian.com>
-
-	* Page.cs (ValidateCollection): in NET_2_0 if event validation is
-	off, return true.
-
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* Page.cs: fix a lot of indentation, and add the
-	EnableEventValidation .net 2.0 property.
-
-2006-01-09  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* ObjectStateFormatter.cs: Merged TARGET_JVM parts in 
-	TypeFormatter.Read, TypeFormatter.Write from /main/5
-
-2006-01-09  Konstantin Triger <kostat@mainsoft.com>
-
-	* Page.cs: make ProcessRequest virtual under TARGET_JVM.
+	implement.  backported fix from HEAD.
 
 2006-01-04  Chris Toshok  <toshok@ximian.com>
 
diff --git a/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs
deleted file mode 100644
index 6bcdf6536a5..00000000000
--- a/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// ChtmlTextWriter.cs: Compact HTML
-//
-// Author:
-//	Cesar Lopez Nataren <cnataren@novell.com>
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.IO;
-using System.Collections;
-
-namespace System.Web.UI {
-
-	public class ChtmlTextWriter : Html32TextWriter
-	{
-		static Hashtable global_suppressed_attrs;
-
-		static string [] global_suppressed_attributes = {
-			"onclick", "ondblclick", "onmousedown", "onmouseup",
-			"onmouseover", "onmousemove", "onmouseout",
-			"onkeypress", "onkeydown", "onkeyup"
-		};
-
-		static string [] recognized_attributes = {"div", "span"};
-
-		Hashtable recognized_attrs = new Hashtable (recognized_attributes.Length);
-		Hashtable suppressed_attrs = new Hashtable (recognized_attributes.Length);
-
-		static ChtmlTextWriter ()
-		{
-			SetupGlobalSuppressedAttrs (global_suppressed_attributes);
-		}
-
-		static void SetupGlobalSuppressedAttrs (string [] attrs)
-		{
-			global_suppressed_attrs = new Hashtable ();
-			PopulateHash (global_suppressed_attrs, global_suppressed_attributes);
-		}
-
-		static void PopulateHash (Hashtable hash, string [] keys)
-		{
-			foreach (string key in keys)
-				hash.Add (key, true);
-		}
-
-		public ChtmlTextWriter (TextWriter writer)
-			: this (writer, DefaultTabString)
-		{
-		}
-
-		public ChtmlTextWriter (TextWriter writer, string tabString)
-			: base (writer, tabString)
-		{
-			//
-			// setup the recognized attrs
-			//
-			foreach (string key in recognized_attributes)
-				recognized_attrs.Add (key, new Hashtable ());
-
-			SetupSuppressedAttrs ();
-		}
-
-
-		void SetupSuppressedAttrs ()
-		{
-			//
-			// we don't make these static because they are not read-only
-			//
-			string [] div_suppressed_attributes = {
-				"accesskey", "cellspacing", "cellpadding",
-				"gridlines", "rules"
-			};
-
-			string [] span_suppressed_attributes = {
-				"cellspacing", "cellpadding",
-				"gridlines", "rules"
-			};
-
-			Init ("div", div_suppressed_attributes, suppressed_attrs);
-			Init ("span", span_suppressed_attributes, suppressed_attrs);
-		}
-
-		static void Init (string key, string [] attrs, Hashtable container)
-		{
-			Hashtable attrs_hash = new Hashtable (attrs.Length);
-			PopulateHash (attrs_hash, attrs);
-			container.Add (key, attrs_hash);
-		}
-
-		protected Hashtable GlobalSuppressedAttributes {
-			get { return global_suppressed_attrs; }
-		}
-
-		protected Hashtable RecognizedAttributes {
-			get { return recognized_attrs; }
-		}
-
-		protected Hashtable SuppressedAttributes {
-			get { return suppressed_attrs; }
-		}
-
-		public virtual void AddRecognizedAttribute (string elementName, string attributeName)
-		{
-			Hashtable elem_attrs = (Hashtable) recognized_attrs [elementName];
-
-			if (elem_attrs == null) {
-				elem_attrs = new Hashtable ();
-				elem_attrs.Add (attributeName, true);
-				recognized_attrs.Add (elementName, elem_attrs);
-			} else
-				elem_attrs.Add (attributeName, true);
-		}
-
-		public virtual void RemoveRecognizedAttribute (string elementName, string attributeName)
-		{
-			Hashtable elem_attrs = (Hashtable) recognized_attrs [elementName];
-
-			if (elem_attrs != null)
-				elem_attrs.Remove (attributeName);
-		}
-
-		//
-		// writes <br>
-		//
-		public override void WriteBreak ()
-		{
-			string br = GetTagName (HtmlTextWriterTag.Br);
-			WriteBeginTag (br);
-			Write (TagRightChar);
-		}
-
-		public override void WriteEncodedText (string text)
-		{
-			base.WriteEncodedText (text);
-		}
-
-		Hashtable attr_render = new Hashtable ();
-
-		[MonoTODO]
-		protected override bool OnAttributeRender (string name, string value, HtmlTextWriterAttribute key)
-		{
-			// I checked every possible HtmlTextWriterAttribute key
-			// and always throws ArgumentNullException.
-			return (bool) attr_render [null];
-		}
-
-		protected override bool OnStyleAttributeRender (string styleAttrName, string value, HtmlTextWriterStyle key)
-		{
-			return key == HtmlTextWriterStyle.Display;
-		}
-
-		protected override bool OnTagRender (string name, HtmlTextWriterTag tag)
-		{
-			return tag != HtmlTextWriterTag.Span;
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs b/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
index d4678410a4b..79fcb353449 100644
--- a/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
+++ b/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
@@ -58,13 +58,12 @@ namespace System.Web.UI
 			this.page = page;
 		}
 
-#if !NET_2_0
+		[Obsolete ("Use GetPostBackEventReference instead")]
 		public string GetPostBackClientEvent (Control control, string argument)
 		{
 			return GetPostBackEventReference (control, argument);
 		}
-#endif
-
+	
 		public string GetPostBackClientHyperlink (Control control, string argument)
 		{
 			return "javascript:" + GetPostBackEventReference (control, argument);
diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
index 8e1e390f667..ab63b54221e 100644
--- a/mcs/class/System.Web/System.Web.UI/Control.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -90,7 +90,6 @@ namespace System.Web.UI
 
 		string uniqueID;
 		string _userId;
-		TemplateControl _templateControl;
 		ControlCollection _controls;
 		Control _namingContainer;
 		Page _page;
@@ -358,11 +357,11 @@ namespace System.Web.UI
 		public TemplateControl TemplateControl 
 		{
 			get {
-				return _templateControl;
+				throw new NotImplementedException ();
 			}
 			[EditorBrowsable (EditorBrowsableState.Never)]
 			set {
-				_templateControl = value;
+				throw new NotImplementedException ();
 			}
 		}
 #endif		
diff --git a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
index 8bc063a0f77..ec6aae8f540 100644
--- a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
@@ -63,7 +63,6 @@ namespace System.Web.UI {
 
 		internal bool haveParserVariable;
 		internal CodeMemberMethod method;
-		internal CodeStatementCollection methodStatements;
 		internal CodeMemberMethod renderMethod;
 		internal int renderIndex;
 		internal bool isProperty;
@@ -155,7 +154,7 @@ namespace System.Web.UI {
 		}
 
 #if NET_2_0
-		public virtual
+		public
 #else
 		internal
 #endif
diff --git a/mcs/class/System.Web/System.Web.UI/ControlCollection.cs b/mcs/class/System.Web/System.Web.UI/ControlCollection.cs
index a9b1b3a4935..a850439fa37 100644
--- a/mcs/class/System.Web/System.Web.UI/ControlCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI/ControlCollection.cs
@@ -51,11 +51,7 @@ namespace System.Web.UI {
 			this.owner = owner;
 		}
 
-		public
-#if NET_2_0
-		virtual
-#endif
-		int Count {
+		public int Count {
 			get { return count; }
 		}
 
@@ -159,11 +155,7 @@ namespace System.Web.UI {
 			return (controls != null && Array.IndexOf (controls, c) != -1);
 		}
 
-		public
-#if NET_2_0
-		virtual
-#endif
-		void CopyTo (Array array, int index)
+		public void CopyTo (Array array, int index)
 		{
 			if (controls == null)
 				return;
@@ -186,11 +178,7 @@ namespace System.Web.UI {
 				array.SetValue (controls [i], i);
 		}
 
-		public
-#if NET_2_0
-		virtual
-#endif
-		IEnumerator GetEnumerator ()
+		public IEnumerator GetEnumerator ()
 		{
 			return new SimpleEnumerator (this);
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/ControlSkin.cs b/mcs/class/System.Web/System.Web.UI/ControlSkin.cs
deleted file mode 100644
index 971efab0a0f..00000000000
--- a/mcs/class/System.Web/System.Web.UI/ControlSkin.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// System.Web.UI.ControlSkin.cs
-//
-// Authors:
-//   Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System.ComponentModel;
-
-namespace System.Web.UI {
-
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
-	public class ControlSkin
-	{
-		Type controlType;
-		ControlSkinDelegate themeDelegate;
-
-		public ControlSkin (Type controlType, ControlSkinDelegate themeDelegate)
-		{
-			this.controlType = controlType;
-			this.themeDelegate = themeDelegate;
-		}
-
-		public void ApplySkin (Control control)
-		{
-			themeDelegate (control);
-		}
-
-		public Type ControlType {
-			get { return controlType; }
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/ControlSkinDelegate.cs b/mcs/class/System.Web/System.Web.UI/ControlSkinDelegate.cs
deleted file mode 100644
index 11564c31538..00000000000
--- a/mcs/class/System.Web/System.Web.UI/ControlSkinDelegate.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.UI.ControlSkinDelegate.cs
-//
-// Author:
-//   Sanjay Gupta <gsanjay@novell.com>
-//
-// (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-#if NET_2_0
-using System;
-using System.ComponentModel;
-
-namespace System.Web.UI
-{
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
-        public delegate Control ControlSkinDelegate (Control control);
-}
-
-#endif
-
diff --git a/mcs/class/System.Web/System.Web.UI/ControlSkinProc.cs b/mcs/class/System.Web/System.Web.UI/ControlSkinProc.cs
new file mode 100644
index 00000000000..8c351adbaaf
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ControlSkinProc.cs
@@ -0,0 +1,42 @@
+//
+// System.Web.UI.ControlSkinProc.cs
+//
+// Author:
+//   Sanjay Gupta <gsanjay@novell.com>
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public delegate Control ControlSkinProc (Control control);
+}
+
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/DataBinder.cs b/mcs/class/System.Web/System.Web.UI/DataBinder.cs
index 8010238e09b..86d1d9e174d 100644
--- a/mcs/class/System.Web/System.Web.UI/DataBinder.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataBinder.cs
@@ -38,6 +38,9 @@ namespace System.Web.UI {
 	// CAS - no InheritanceDemand here as the class is sealed
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	public sealed class DataBinder {
+#if NET_2_0
+		[Obsolete]
+#endif
 		public DataBinder ()
 		{
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs b/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs
index c919e35af0c..57306336be4 100644
--- a/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs
@@ -120,10 +120,14 @@ namespace System.Web.UI {
 		}
 
 		public event EventHandler Changed;
+
+		public
 #else
 		internal event EventHandler Changed;
+
+		internal
 #endif
-		internal void RaiseChanged ()
+		void RaiseChanged ()
 		{
 			if (Changed != null)
 				Changed (this, EventArgs.Empty);
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs b/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs
index 98a47c9d1db..ba0914d2636 100644
--- a/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs
@@ -31,16 +31,9 @@
 #if NET_2_0
 using System.Collections;
 using System.Collections.Specialized;
-using System.ComponentModel;
 using System.Text;
 
 namespace System.Web.UI {
-
-	[DesignerAttribute ("System.Web.UI.Design.DataSourceDesigner, " + Consts.AssemblySystem_Design,
-			    "System.ComponentModel.Design.IDesigner")]
-	[ControlBuilderAttribute (typeof (DataSourceControlBuilder))]
-	[NonVisualControlAttribute]
-	[BindableAttribute (false)]
 	public abstract class DataSourceControl : Control, IDataSource, System.ComponentModel.IListSource {
 
 
@@ -48,33 +41,15 @@ namespace System.Web.UI {
 		{
 		}
 		
-		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override void ApplyStyleSheetSkin (Page page)
-		{
-			throw new NotImplementedException ();
-		}
-
 		protected override ControlCollection CreateControlCollection ()
 		{
 			return new EmptyControlCollection (this);
 		}
-
-		[MonoTODO ("why override?")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override Control FindControl (string id)
-		{
-			return base.FindControl (id);
-		}
-
-		[MonoTODO ("why override?")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override void Focus ()
+		
+		protected virtual DataSourceView GetView (string viewName)
 		{
-			base.Focus();
+			return null;
 		}
-
-		protected abstract DataSourceView GetView (string viewName);
 		
 		DataSourceView IDataSource.GetView (string viewName)
 		{
@@ -96,64 +71,13 @@ namespace System.Web.UI {
 			return ListSourceHelper.GetList (this);
 		}
 		
-		[MonoTODO ("why override?")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override bool HasControls ()
-		{
-			return base.HasControls ();
-		}
-
-		protected virtual void RaiseDataSourceChangedEvent (EventArgs e)
-		{
-			EventHandler eh = Events [dataSourceChanged] as EventHandler;
-			if (eh != null)
-				eh (this, e);
-		}
-
-		[MonoTODO ("why override?")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override void RenderControl (HtmlTextWriter tw)
-		{
-			base.RenderControl (tw);
-		}
-
-		[MonoTODO ("why override?")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override string ClientID {
-			get { return base.ClientID; }
-		}
-
-		[MonoTODO ("why override?")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override ControlCollection Controls {
-			get { return base.Controls; }
-		}
-
-		[MonoTODO ("why override?")]
-		[DefaultValue (false)]
-		[Browsable (false)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override bool EnableTheming {
-			get { return base.EnableTheming; }
-			set { base.EnableTheming = value; }
-		}
-
-		[MonoTODO ("why override?")]
-		[DefaultValue ("")]
-		[Browsable (false)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public override string SkinID {
-			get { return base.SkinID; }
-			set { base.SkinID = value; }
-		}
-
 		bool System.ComponentModel.IListSource.ContainsListCollection {
 			get { return ListSourceHelper.ContainsListCollection (this); }
 		}
 
-		[Browsable (false)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		[DefaultValue (false)]
+		//public override bool EnablePersonalization { get; set; }
+		//public override bool EnableTheming { get; set; }
+		//public override string SkinID { get; set; }
 		public override bool Visible { 
 			get { return false; }
 			set { throw new NotSupportedException (); }
@@ -164,7 +88,13 @@ namespace System.Web.UI {
 			add { Events.AddHandler (dataSourceChanged, value); }
 			remove { Events.RemoveHandler (dataSourceChanged, value); }
 		}
-
+		
+		protected virtual void OnDataSourceChanged (EventArgs e)
+		{
+			EventHandler eh = Events [dataSourceChanged] as EventHandler;
+			if (eh != null)
+				eh (this, e);
+		}
 	}
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/DataSourceControlBuilder.cs
deleted file mode 100644
index 97f8b07ce2a..00000000000
--- a/mcs/class/System.Web/System.Web.UI/DataSourceControlBuilder.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.DataSourceControlBuilder.cs
-//
-// Authors:
-//   Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.UI {
-
-	public sealed class DataSourceControlBuilder : ControlBuilder
-	{
-	}
-
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceSelectArguments.cs b/mcs/class/System.Web/System.Web.UI/DataSourceSelectArguments.cs
index 2e695298b27..d00dae48ed6 100644
--- a/mcs/class/System.Web/System.Web.UI/DataSourceSelectArguments.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataSourceSelectArguments.cs
@@ -100,7 +100,9 @@ namespace System.Web.UI
 
 		public int MaximumRows {
 			get { return this.maxRows; }
-			set { this.maxRows = value; }
+			set {
+				this.maxRows = value;
+			}
 		}
 
 		public bool RetrieveTotalRowCount  {
@@ -110,17 +112,23 @@ namespace System.Web.UI
 
 		public string SortExpression {
 			get { return this.sortExpression; }
-			set { this.sortExpression = value; }
+			set {
+				this.sortExpression = value;
+			}
 		}
 
 		public int StartRowIndex {
 			get { return this.startingRowIndex; }
-			set { this.startingRowIndex = value; }
+			set {
+				this.startingRowIndex = value;
+			}
 		}
 
 		public int TotalRowCount {
 			get { return this.totalRowCount; }
-			set { this.totalRowCount = value; }
+			set {
+				this.totalRowCount = value;
+			}
 		}
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
index fa8efa1ce84..ddcca295f05 100644
--- a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
@@ -182,7 +182,7 @@ namespace System.Web.UI {
 			return eventsList != null;
 		}
 
-		public string Name { 
+		public virtual string Name { 
 			get { return viewName; } 
 		}
 
diff --git a/mcs/class/System.Web/System.Web.UI/ExpressionBindingCollection.cs b/mcs/class/System.Web/System.Web.UI/ExpressionBindingCollection.cs
index c343ac9ae18..79cb1ef0ffa 100644
--- a/mcs/class/System.Web/System.Web.UI/ExpressionBindingCollection.cs
+++ b/mcs/class/System.Web/System.Web.UI/ExpressionBindingCollection.cs
@@ -61,8 +61,8 @@ namespace System.Web.UI {
             		get { return list [propertyName] as ExpressionBinding; }
         	}
 
-		public ICollection RemovedBindings {
-			get { return removed; }
+		public string [] RemovedBindings {
+			get { return (string []) removed.ToArray (typeof (string)); }
 		}
 
 		public object SyncRoot {
@@ -133,7 +133,7 @@ namespace System.Web.UI {
 
         	public event EventHandler Changed;
 
-        	void OnChanged (EventArgs e)   
+        	protected void OnChanged (EventArgs e)   
         	{
             		if (Changed != null)
                 		Changed (this, e);
diff --git a/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs b/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs
index 61834b75c32..511ff4622b3 100644
--- a/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs
+++ b/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs
@@ -33,9 +33,10 @@ using System.ComponentModel;
 
 namespace System.Web.UI {
 	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-	public sealed class FilterableAttribute : Attribute
+	public sealed class FilterableAttribute : Attribute, IDisposable 
 	{
 		private bool filterable;
+		private bool dispose;
 
 		public FilterableAttribute (bool filterable) 
 		{
@@ -52,6 +53,20 @@ namespace System.Web.UI {
 			get { return filterable; } 
 		}
 
+		public void Dispose ()
+		{
+			Dispose (true);
+			GC.SuppressFinalize (this);
+		}
+		
+		private void Dispose (bool disposing)
+		{
+			if (!this.dispose) {
+				//Do nothing
+				this.dispose = true;
+			}
+		}
+
 		public override bool Equals (object obj)
 		{
 			if (obj != null && obj is FilterableAttribute) {
diff --git a/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs b/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs
index 7a5e2926e90..d54215a1490 100644
--- a/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs
@@ -38,10 +38,10 @@ using System.ComponentModel;
 
 namespace System.Web.UI
 {
-	[NonVisualControlAttribute]
-	[DesignerAttribute ("System.Web.UI.Design.HierarchicalDataSourceDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-	[ControlBuilderAttribute (typeof(DataSourceControlBuilder))]
-	[BindableAttribute (false)]
+	[NonVisualControlAttribute]

+	[DesignerAttribute ("System.Web.UI.Design.HierarchicalDataSourceDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]

+//	[ControlBuilderAttribute (typeof(DataSourceControlBuilder))]

+	[BindableAttribute (false)]

 	public abstract class HierarchicalDataSourceControl : Control, IHierarchicalDataSource
 	{
 		static object dataSourceChanged = new object ();
@@ -50,32 +50,26 @@ namespace System.Web.UI
 		{
 		}
 		
-		protected abstract HierarchicalDataSourceView GetHierarchicalView (string viewPath);
+		protected virtual HierarchicalDataSourceView GetHierarchicalView (string viewPath)
+		{
+			return null;
+		}
 		
 		HierarchicalDataSourceView IHierarchicalDataSource.GetHierarchicalView (string viewPath)
 		{
-			return GetHierarchicalView (viewPath);
+			return this.GetHierarchicalView (viewPath);
 		}
-
-		[Browsable (false)]
-		[DefaultValue (false)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
+		
 		public override bool EnableTheming {
 			get { return false; }
 			set { throw new NotSupportedException (); }
 		}
 		
-		[Browsable (false)]
-		[DefaultValue ("")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public override string SkinID {
 			get { return string.Empty; }
 			set { throw new NotSupportedException (); }
 		}
 		
-		[Browsable (false)]
-		[DefaultValue (false)]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public override bool Visible { 
 			get { return false; }
 			set { throw new NotSupportedException (); }
@@ -86,20 +80,17 @@ namespace System.Web.UI
 			return new EmptyControlCollection (this);
 		}
 		
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public override Control FindControl (string id)
 		{
 			if (id == ID) return this;
 			else return null;
 		}
 		
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public override bool HasControls ()
 		{
 			return false;
 		}
 		
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public override void Focus ()
 		{
 			throw new NotSupportedException ();
@@ -117,7 +108,6 @@ namespace System.Web.UI
 				eh (this, e);
 		}
 		
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public override void RenderControl (HtmlTextWriter writer)
 		{
 			// nop
diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
index f2858da6ef3..30cca3967a6 100644
--- a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
@@ -204,11 +204,11 @@ namespace System.Web.UI {
 			// faster than a linear search?
 			
 			foreach (HtmlAttribute t in htmlattrs) {
-				if (String.Compare(t.name, attrName, true, CultureInfo.InvariantCulture) == 0)
+				if (t.name == attrName)
 					return t.key;
 			}
 
-			return (HtmlTextWriterAttribute)(-1);		
+			return 0;		
 		}
 
 		[MonoTODO]
@@ -229,11 +229,11 @@ namespace System.Web.UI {
 			// faster than a linear search?
 			
 			foreach (HtmlStyle t in htmlstyles) {
-				if (String.Compare(t.name, styleName, true, CultureInfo.InvariantCulture) == 0)
+				if (t.name == styleName)
 					return t.key;
 			}
 
-			return (HtmlTextWriterStyle)(-1);			
+			return 0;			
 		}
 		
 		[MonoTODO]
@@ -251,7 +251,7 @@ namespace System.Web.UI {
 			// faster than a linear search?
 			
 			foreach (HtmlTag t in tags) {
-				if (String.Compare(t.name, tagName, true, CultureInfo.InvariantCulture) == 0)
+				if (t.name == tagName)
 					return t.key;
 			}
 
@@ -333,7 +333,7 @@ namespace System.Web.UI {
 			if (! newline)
 				return;
 			newline = false;
-
+			
 			for (int i = 0; i < Indent; i ++)
 				b.Write (tab_string);
 		}
@@ -1113,25 +1113,5 @@ namespace System.Web.UI {
 			new HtmlStyle (HtmlTextWriterStyle.ZIndex,             "z-index"),
 #endif
 		};
-
-#if NET_2_0
-		public virtual bool IsValidFormAttribute (string attribute)
-		{
-			return true;
-		}
-
-		// writes <br />
-		public virtual void WriteBreak ()
-		{
-			string br = GetTagName (HtmlTextWriterTag.Br);
-			WriteBeginTag (br);
-			Write (SelfClosingTagEnd);
-		}
-
-		public virtual void WriteEncodedText (string text)
-		{
-			Write (HttpUtility.HtmlEncode (text));
-		}
-#endif
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI/IAdaptableTextWriter.cs b/mcs/class/System.Web/System.Web.UI/IAdaptableTextWriter.cs
new file mode 100644
index 00000000000..b4d35bbbe48
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IAdaptableTextWriter.cs
@@ -0,0 +1,38 @@
+//
+// System.Web.UI.IAdaptableTextWriter
+//
+// Authors:
+//	Chris Toshok (toshok@ximian.com)
+//
+// (C) 2005 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+namespace System.Web.UI {
+
+	public interface IAdaptableTextWriter {
+		void AddRecognizedAttribute (string elementName, string attributeName);
+		void RemoveRecognizedAttribute (string elementName, string attributeName);
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs b/mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs
index d561ad97130..f2ffc89ed18 100644
--- a/mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs
+++ b/mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs
@@ -35,8 +35,7 @@ namespace System.Web.UI
 {
 	public interface ICallbackEventHandler
 	{
-		string GetCallbackResult ();
-		void RaiseCallbackEvent (string eventArgs);
+		string RaiseCallbackEvent (string eventArgs);
 	}
 }
 #endif
diff --git a/mcs/class/System.Web/System.Web.UI/IControlTypeFilter.cs b/mcs/class/System.Web/System.Web.UI/IControlTypeFilter.cs
new file mode 100644
index 00000000000..f9a82f2b2aa
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IControlTypeFilter.cs
@@ -0,0 +1,44 @@
+//
+// System.Web.UI.IControlTypeFilter.cs
+//
+// Authors:
+//      Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+
+namespace System.Web.UI
+{
+	public interface IControlTypeFilter
+	{
+		string GetFilterHash (string virtualPathContainer);
+		bool IsAllowedMethod (string virtualPathContainer, string controlPath);
+		bool IsAllowedMethod (string virtualPathContainer, Type control);
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IItemPaginationInfo.cs b/mcs/class/System.Web/System.Web.UI/IItemPaginationInfo.cs
new file mode 100644
index 00000000000..9c9ee2aad38
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IItemPaginationInfo.cs
@@ -0,0 +1,47 @@
+//
+// System.Web.UI.IItemPaginationInfo.cs
+//
+// Authors:
+//      Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+
+namespace System.Web.UI
+{
+	public interface IItemPaginationInfo
+	{
+		void SetVisibleItems (int itemIndex, int count);
+		
+		int FirstVisibleItemIndex { get; } 
+		int ItemCount { get; }
+		int ItemWeight { get; }
+		int VisibleItemCount { get; }
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IMobileTextWriter.cs b/mcs/class/System.Web/System.Web.UI/IMobileTextWriter.cs
new file mode 100644
index 00000000000..35f024e7fa6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IMobileTextWriter.cs
@@ -0,0 +1,43 @@
+//
+// System.Web.UI.IMobileTextWriter.cs
+//
+// Authors:
+//      Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+
+namespace System.Web.UI
+{
+	public interface IMobileTextWriter
+	{
+		void AddRecognizedAttribute (string element, string attribute);
+		void RemoveRecognizedAttribute (string element, string attribute);
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IPaginationContainer.cs b/mcs/class/System.Web/System.Web.UI/IPaginationContainer.cs
new file mode 100644
index 00000000000..f5d36a71abb
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IPaginationContainer.cs
@@ -0,0 +1,42 @@
+//
+// System.Web.UI.IPaginationContainer.cs
+//
+// Authors:
+//      Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+
+namespace System.Web.UI
+{
+	public interface IPaginationContainer
+	{
+		int MaximumWeight { get; }
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IPaginationInfo.cs b/mcs/class/System.Web/System.Web.UI/IPaginationInfo.cs
new file mode 100644
index 00000000000..7e4339efcfb
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IPaginationInfo.cs
@@ -0,0 +1,43 @@
+//
+// System.Web.UI.IPaginationInfo.cs
+//
+// Authors:
+//      Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+
+namespace System.Web.UI
+{
+	public interface IPaginationInfo
+	{
+		bool PaginateChildren { get; }
+		int Weight { get; }
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IResourceResolutionService.cs b/mcs/class/System.Web/System.Web.UI/IResourceResolutionService.cs
new file mode 100644
index 00000000000..0db76bce114
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IResourceResolutionService.cs
@@ -0,0 +1,43 @@
+//
+// System.Web.UI.IResourceResolutionService.cs
+//
+// Authors:
+//      Sanjay Gupta (gsanjay@novell.com)
+//
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+using System.Collections;
+
+namespace System.Web.UI
+{
+	public interface IResourceResolutionService
+	{
+		IDictionary GetPagedResources ();
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IStaticTextControl.cs b/mcs/class/System.Web/System.Web.UI/IStaticTextControl.cs
new file mode 100644
index 00000000000..8e77249442a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IStaticTextControl.cs
@@ -0,0 +1,42 @@
+//
+// System.Web.UI.IStaticTextControl.cs
+//
+// Authors:
+//	Lluis Sanchez Gual (lluis@novell.com)
+//
+// (C) 2005 Novell, Inc (http://www.novell.com)
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+#if NET_2_0
+using System;
+
+namespace System.Web.UI
+{
+	public interface IStaticTextControl
+	{
+		string Text { get; set; }
+	}
+}
+#endif
+
diff --git a/mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs b/mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs
index 4ee874ee2f0..428595b40a2 100644
--- a/mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs
+++ b/mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs
@@ -37,7 +37,6 @@ namespace System.Web.UI
 	public interface IThemeResolutionService
 	{
 		ThemeProvider [] GetAllThemeProviders ();
-		ThemeProvider GetStylesheetThemeProvider ();
 		ThemeProvider GetThemeProvider ();
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs b/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs
index bbc2808ee23..d423f9e47de 100644
--- a/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs
+++ b/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs
@@ -34,7 +34,9 @@ using System.Collections.Specialized;
 using System.Text;
 
 namespace System.Web.UI {
-	public static class ListSourceHelper {
+	public sealed class ListSourceHelper {
+		private ListSourceHelper () {}
+		
 		[MonoTODO]
 		public static bool ContainsListCollection (IDataSource dataSource)
 		{
diff --git a/mcs/class/System.Web/System.Web.UI/MasterPage.cs b/mcs/class/System.Web/System.Web.UI/MasterPage.cs
index 08613716e0e..1f725c33e09 100644
--- a/mcs/class/System.Web/System.Web.UI/MasterPage.cs
+++ b/mcs/class/System.Web/System.Web.UI/MasterPage.cs
@@ -33,85 +33,35 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
+using System.Web.UI.WebControls;
 
 namespace System.Web.UI
 {
-	[ParseChildren (false)]
-#if notyet
-	[Designer (...)]
-#endif
-	[ControlBuilder (typeof (MasterPageControlBuilder))]
 	public class MasterPage: UserControl
 	{
-		Hashtable definedContentTemplates = new Hashtable ();
 		Hashtable templates = new Hashtable ();
 		ArrayList placeholders = new ArrayList ();
-
-		string parentMasterPageFile = "";
-		MasterPage parentMasterPage;
-
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
+		
 		protected internal void AddContentTemplate (string templateName, ITemplate template)
 		{
-			definedContentTemplates [templateName] = template;
+			templates [templateName] = template;
 		}
 		
-		[Browsable (false)]
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
 		protected internal IList ContentPlaceHolders {
 			get { return placeholders; }
 		}
 		
-		[Browsable (false)]
-		[EditorBrowsable (EditorBrowsableState.Advanced)]
-		protected internal IDictionary ContentTemplates {
+		protected internal ICollection ContentTemplates {
 			get { return templates; }
 		}
 		
-		[DefaultValueAttribute ("")]
-		public string MasterPageFile {
-			get { return parentMasterPageFile; }
-			set {
-				parentMasterPageFile = value;
-				parentMasterPage = null;
-			}
-		}
-
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		[BrowsableAttribute (false)]
-		public MasterPage Master {
-			get {
-				if (parentMasterPage == null && parentMasterPageFile != null)
-					parentMasterPage = MasterPage.CreateMasterPage (this, Context, parentMasterPageFile, definedContentTemplates);
-			
-				return parentMasterPage;
-			}
-		}
-
-		internal static MasterPage CreateMasterPage (TemplateControl owner, HttpContext context, string masterPageFile, IDictionary contentTemplateCollection)
-		{
-			MasterPage masterPage = MasterPageParser.GetCompiledMasterInstance (masterPageFile, masterPageFile /* XXX virtualPath */, context);
-			if (contentTemplateCollection != null) {
-				foreach (string templateName in contentTemplateCollection.Keys) {
-					if (masterPage.ContentTemplates[templateName] == null)
-						masterPage.ContentTemplates [templateName] = contentTemplateCollection[templateName];
-				}
-			}
-			masterPage.InitializeAsUserControlInternal ();
-			return masterPage;
-		}
-
-		internal static void ApplyMasterPageRecursive (MasterPage master, IList appliedMasterPageFiles)
+		internal void FillPlaceHolders ()
 		{
-			/* XXX need to use virtual paths here? */
-			if (master.MasterPageFile != null) {
-				if (appliedMasterPageFiles.Contains (master.MasterPageFile))
-					throw new HttpException ("circular dependency in master page files detected");
-				if (master.Master != null) {
-					master.Controls.Clear ();
-					master.Controls.Add (master.Master);
-					appliedMasterPageFiles.Add (master.MasterPageFile);
-					MasterPage.ApplyMasterPageRecursive (master.Master, appliedMasterPageFiles);
+			foreach (ContentPlaceHolder place in placeholders) {
+				ITemplate template = templates [place.ID] as ITemplate;
+				if (template != null) {
+					place.Controls.Clear ();
+					template.InstantiateIn (place);
 				}
 			}
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs
deleted file mode 100644
index 615b04d0fd0..00000000000
--- a/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.MasterPageControlBuilder.cs
-//
-// Authors:
-//   Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.UI {
-
-	public class MasterPageControlBuilder : UserControlControlBuilder
-	{
-	}
-
-}
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/MasterPageParser.cs b/mcs/class/System.Web/System.Web.UI/MasterPageParser.cs
index 5a17920a242..6eceb28a861 100644
--- a/mcs/class/System.Web/System.Web.UI/MasterPageParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/MasterPageParser.cs
@@ -58,15 +58,6 @@ namespace System.Web.UI
 			return mpp.CompileIntoType ();
 		}
 
-		internal override void HandleOptions (object obj)
-		{
-			base.HandleOptions (obj);
-
-			MasterPage mp = (MasterPage)obj;
-			mp.MasterPageFile = MasterPageFile;
-		}
-
-
 		internal override Type DefaultBaseType {
 			get { return typeof (MasterPage); }
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/ObjectConverter.cs b/mcs/class/System.Web/System.Web.UI/ObjectConverter.cs
index 5c51905a8ac..62dbfa188fc 100644
--- a/mcs/class/System.Web/System.Web.UI/ObjectConverter.cs
+++ b/mcs/class/System.Web/System.Web.UI/ObjectConverter.cs
@@ -35,6 +35,9 @@ namespace System.Web.UI {
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	public sealed class ObjectConverter {
 
+#if NET_2_0
+		[Obsolete]
+#endif
 		public ObjectConverter ()
 		{
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs b/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
index 39cffdc7e22..678e939f518 100644
--- a/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
+++ b/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
@@ -46,16 +46,12 @@ using System.Web.Util;
 using System.Diagnostics;
 
 namespace System.Web.UI {
-#if NET_2_0
-	public
-#else
-	internal
-#endif
-	sealed class ObjectStateFormatter : IFormatter
-#if NET_2_0
-		, IStateFormatter
-#endif
-	{
+	#if NET_2_0
+		public
+	#else
+		internal
+	#endif
+	sealed class ObjectStateFormatter : IFormatter {
 		public object Deserialize (Stream inputStream)
 		{
 			if (inputStream == null)
@@ -665,29 +661,21 @@ namespace System.Web.UI {
 			{
 				Color c = (Color) o;
 				
-				if (c.IsEmpty || c.IsKnownColor) {
-					w.Write (SecondaryId);
-					if (c.IsEmpty)
-						w.Write (-1); //isempty marker
-					else
-						w.Write ((int) c.ToKnownColor ());
-				}
-				else {
+				if (!c.IsKnownColor) {
 					w.Write (PrimaryId);
 					w.Write (c.ToArgb ());
+				} else {
+					w.Write (SecondaryId);
+					w.Write ((int) c.ToKnownColor ());
 				}
 			}
 			
 			protected override object Read (byte token, BinaryReader r, ReaderContext ctx)
 			{
-				int value = r.ReadInt32 ();
 				if (token == PrimaryId)
-					return Color.FromArgb (value);
-				else {
-					if (value == -1) //isempty marker
-						return Color.Empty;
-					return Color.FromKnownColor ((KnownColor)value);
-				}
+					return Color.FromArgb (r.ReadInt32 ());
+				else
+					return Color.FromKnownColor ((KnownColor) r.ReadInt32 ());
 			}
 			
 			protected override Type Type {
@@ -733,7 +721,7 @@ namespace System.Web.UI {
 				} else {
 					w.Write (PrimaryId);
 					w.Write (((Type) o).FullName);
-
+					
 					// We should cache the name of the assembly
 					w.Write (((Type) o).Assembly.FullName);
 				}
@@ -744,6 +732,7 @@ namespace System.Web.UI {
 				if (token == PrimaryId) {
 					string type = r.ReadString ();
 					string assembly = r.ReadString ();
+					
 					Type t = Assembly.Load (assembly).GetType (type);
 					ctx.CacheItem (t);
 					return t;
diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
index 8a64c1ba1bd..00c268a2fc3 100644
--- a/mcs/class/System.Web/System.Web.UI/Page.cs
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -58,7 +58,9 @@ namespace System.Web.UI
 // CAS
 [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-#if !NET_2_0
+#if NET_2_0
+[RootDesignerSerializer ("Microsoft.VisualStudio.Web.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VisualStudio_Web, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)]
+#else
 [RootDesignerSerializer ("Microsoft.VSDesigner.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)]
 #endif
 [DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")]
@@ -70,7 +72,6 @@ namespace System.Web.UI
 #endif
 public class Page : TemplateControl, IHttpHandler
 {
-	private bool _eventValidation = true;
 	private bool _viewState = true;
 	private bool _viewStateMac;
 	private string _errorPage;
@@ -96,20 +97,9 @@ public class Page : TemplateControl, IHttpHandler
 	bool allow_load; // true when the Form collection belongs to this page (GetTypeHashCode)
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
-#if NET_2_0
-	public
-#else
-	protected
-#endif
-	const string postEventArgumentID = "__EVENTARGUMENT";
-
+	protected const string postEventArgumentID = "__EVENTARGUMENT";
 	[EditorBrowsable (EditorBrowsableState.Never)]
-#if NET_2_0
-	public
-#else
-	protected
-#endif
-	const string postEventSourceID = "__EVENTTARGET";
+	protected const string postEventSourceID = "__EVENTTARGET";
 
 #if NET_2_0
 	internal const string CallbackArgumentID = "__CALLBACKARGUMENT";
@@ -126,8 +116,6 @@ public class Page : TemplateControl, IHttpHandler
 	ArrayList requireStateControls;
 	Hashtable _validatorsByGroup;
 	HtmlForm _form;
-
-	string _title;
 #endif
 
 	#region Constructor
@@ -154,18 +142,23 @@ public class Page : TemplateControl, IHttpHandler
 	}
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
-	protected bool AspCompatMode
-	{
 #if NET_2_0
+	public bool AspCompatMode
+	{
 		get { return false; }
-#endif
 		set { throw new NotImplementedException (); }
 	}
+#else
+	protected bool AspCompatMode
+	{
+		set { throw new NotImplementedException (); }
+	}
+#endif
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public bool Buffer
 	{
 		get { return Response.BufferOutput; }
@@ -190,7 +183,7 @@ public class Page : TemplateControl, IHttpHandler
 	}
 
 #if NET_2_0
-	[EditorBrowsableAttribute (EditorBrowsableState.Advanced)]
+    [EditorBrowsableAttribute (EditorBrowsableState.Advanced)]
 #endif
 	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 	[Browsable (false), DefaultValue ("")]
@@ -207,8 +200,8 @@ public class Page : TemplateControl, IHttpHandler
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public int CodePage
 	{
 		get { return Response.ContentEncoding.CodePage; }
@@ -223,8 +216,8 @@ public class Page : TemplateControl, IHttpHandler
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public string ContentType
 	{
 		get { return Response.ContentType; }
@@ -247,30 +240,22 @@ public class Page : TemplateControl, IHttpHandler
 		}
 	}
 
+	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public string Culture
 	{
 		get { return Thread.CurrentThread.CurrentCulture.Name; }
 		set { Thread.CurrentThread.CurrentCulture = new CultureInfo (value); }
 	}
 #else
-	[EditorBrowsable (EditorBrowsableState.Never)]
 	protected string Culture
 	{
 		set { Thread.CurrentThread.CurrentCulture = new CultureInfo (value); }
 	}
 #endif
 
-#if NET_2_0
-	public virtual bool EnableEventValidation {
-		get { return _eventValidation; }
-		set { _eventValidation = value;}
-	}
-#endif
-
 	[Browsable (false)]
 	public override bool EnableViewState
 	{
@@ -279,16 +264,11 @@ public class Page : TemplateControl, IHttpHandler
 	}
 
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 #endif
 	[EditorBrowsable (EditorBrowsableState.Never)]
-#if NET_2_0
-	public
-#else
-	protected
-#endif
-	bool EnableViewStateMac
+	protected bool EnableViewStateMac
 	{
 		get { return _viewStateMac; }
 		set { _viewStateMac = value; }
@@ -320,9 +300,6 @@ public class Page : TemplateControl, IHttpHandler
 	}
 
 	[Browsable (false)]
-#if NET_2_0
-	[EditorBrowsable (EditorBrowsableState.Never)]
-#endif
 	public override string ID
 	{
 		get { return base.ID; }
@@ -356,8 +333,8 @@ public class Page : TemplateControl, IHttpHandler
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public int LCID {
 		get { return Thread.CurrentThread.CurrentCulture.LCID; }
 		set { Thread.CurrentThread.CurrentCulture = new CultureInfo (value); }
@@ -402,8 +379,8 @@ public class Page : TemplateControl, IHttpHandler
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public string ResponseEncoding
 	{
 		get { return Response.ContentEncoding.WebName; }
@@ -453,35 +430,6 @@ public class Page : TemplateControl, IHttpHandler
 		set { _smartNavigation = value; }
 	}
 
-#if NET_2_0
-	[MonoTODO]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[Filterable (false)]
-	[Browsable (false)]
-	public virtual string StyleSheetTheme {
-		get { throw new NotImplementedException (); }
-		set { throw new NotImplementedException (); }
-	}
-
-	[MonoTODO]
-	[Browsable (false)]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	public virtual string Theme {
-		get { throw new NotImplementedException (); }
-		set { throw new NotImplementedException (); }
-	}
-#endif
-
-#if NET_2_0
-	[Localizable (true)] 
-	[Bindable (true)] 
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	public string Title {
-		get { return _title; }
-		set { _title = value; }
-	}
-#endif
-
 	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 	[Browsable (false)]
 	public TraceContext Trace
@@ -491,8 +439,8 @@ public class Page : TemplateControl, IHttpHandler
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public bool TraceEnabled
 	{
 		get { return Trace.IsEnabled; }
@@ -507,8 +455,8 @@ public class Page : TemplateControl, IHttpHandler
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public TraceMode TraceModeValue
 	{
 		get { return Trace.TraceMode; }
@@ -522,25 +470,29 @@ public class Page : TemplateControl, IHttpHandler
 #endif
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
-	protected int TransactionMode
-	{
 #if NET_2_0
+	public int TransactionMode
+	{
 		get { return _transactionMode; }
-#endif
 		set { _transactionMode = value; }
 	}
+#else
+	protected int TransactionMode
+	{
+		set { _transactionMode = value; }
+	}
+#endif
 
+	[EditorBrowsable (EditorBrowsableState.Never)]
 #if NET_2_0
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public string UICulture
 	{
 		get { return Thread.CurrentThread.CurrentUICulture.Name; }
 		set { Thread.CurrentThread.CurrentUICulture = new CultureInfo (value); }
 	}
 #else
-	[EditorBrowsable (EditorBrowsableState.Never)]
 	protected string UICulture
 	{
 		set { Thread.CurrentThread.CurrentUICulture = new CultureInfo (value); }
@@ -826,15 +778,15 @@ public class Page : TemplateControl, IHttpHandler
 
 	LosFormatter GetFormatter ()
 	{
-#if NET_2_0
-		PagesSection config = (PagesSection) WebConfigurationManager.GetSection ("system.web/pages");
+#if CONFIGURATION_2_0
+		PagesSection config = (PagesSection) WebConfigurationManager.GetWebApplicationSection ("system.web/pages");
 #else
 		PagesConfiguration config = PagesConfiguration.GetInstance (_context);
 #endif
 		byte [] vkey = null;
 		if (config.EnableViewStateMac) {
-#if NET_2_0
-			MachineKeySection mconfig = (MachineKeySection) WebConfigurationManager.GetSection ("system.web/machineKey");
+#if CONFIGURATION_2_0
+			MachineKeySection mconfig = (MachineKeySection) WebConfigurationManager.GetWebApplicationSection ("system.web/machineKey");
 			vkey = mconfig.ValidationKeyBytes;
 #else
 			MachineKeyConfig mconfig = HttpContext.GetAppConfig ("system.web/machineKey") as MachineKeyConfig;
@@ -947,11 +899,7 @@ public class Page : TemplateControl, IHttpHandler
 	}
 
 	[EditorBrowsable (EditorBrowsableState.Never)]
-#if NET_2_0 || TARGET_JVM
-	public virtual void ProcessRequest (HttpContext context)
-#else
 	public void ProcessRequest (HttpContext context)
-#endif
 	{
 		_context = context;
 		if (clientTarget != null)
@@ -1014,10 +962,10 @@ public class Page : TemplateControl, IHttpHandler
 #if NET_2_0
 		OnInitComplete (EventArgs.Empty);
 		
-		ApplyMasterPage ();
-
-		if (_title != null && htmlHeader != null)
-			htmlHeader.Title = _title;
+		if (masterPageFile != null) {
+			Controls.Add (Master);
+			Master.FillPlaceHolders ();
+		}
 #endif
 			
 		renderingForm = false;	
@@ -1329,11 +1277,6 @@ public class Page : TemplateControl, IHttpHandler
 
 	bool ValidateCollection (ValidatorCollection validators)
 	{
-#if NET_2_0
-		if (!_eventValidation)
-			return true;
-#endif
-
 		if (validators == null || validators.Count == 0)
 			return true;
 
@@ -1388,7 +1331,6 @@ public class Page : TemplateControl, IHttpHandler
 	const int prerendercomplete_mask = 1 << 4;
 	const int savestatecomplete_mask = 1 << 5;
 	
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
 	public event EventHandler InitComplete {
 		add {
 			event_mask |= initcomplete_mask;
@@ -1397,7 +1339,6 @@ public class Page : TemplateControl, IHttpHandler
 		remove { Events.RemoveHandler (InitCompleteEvent, value); }
 	}
 	
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
 	public event EventHandler LoadComplete {
 		add {
 			event_mask |= loadcomplete_mask;
@@ -1414,7 +1355,6 @@ public class Page : TemplateControl, IHttpHandler
 		remove { Events.RemoveHandler (PreInitEvent, value); }
 	}
 	
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
 	public event EventHandler PreLoad {
 		add {
 			event_mask |= preload_mask;
@@ -1423,7 +1363,6 @@ public class Page : TemplateControl, IHttpHandler
 		remove { Events.RemoveHandler (PreLoadEvent, value); }
 	}
 	
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
 	public event EventHandler PreRenderComplete {
 		add {
 			event_mask |= prerendercomplete_mask;
@@ -1432,7 +1371,6 @@ public class Page : TemplateControl, IHttpHandler
 		remove { Events.RemoveHandler (PreRenderCompleteEvent, value); }
 	}
 	
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
 	public event EventHandler SaveStateComplete {
 		add {
 			event_mask |= savestatecomplete_mask;
@@ -1498,21 +1436,21 @@ public class Page : TemplateControl, IHttpHandler
 		_form = form;
 	}
 	
-	[BrowsableAttribute (false)]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 	public Page PreviousPage {
 		get { return previousPage; }
 	}
 
 	
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public bool IsCallback {
 		get { return _requestValueCollection != null && _requestValueCollection [CallbackArgumentID] != null; }
 	}
 	
-	[BrowsableAttribute (false)]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 	public bool IsCrossPagePostBack {
 		get { return _requestValueCollection != null && isCrossPagePostBack; }
 	}
@@ -1528,12 +1466,11 @@ public class Page : TemplateControl, IHttpHandler
 			throw new HttpException (string.Format ("Invalid callback target '{0}'.", callbackTarget));
 
 		string callbackArgument = _requestValueCollection [CallbackArgumentID];
-		target.RaiseCallbackEvent (callbackArgument);
-		return target.GetCallbackResult ();
+		return target.RaiseCallbackEvent (callbackArgument);
 	}
 
-	[BrowsableAttribute (false)]
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 	public HtmlHead Header {
 		get { return htmlHeader; }
 	}
@@ -1543,37 +1480,18 @@ public class Page : TemplateControl, IHttpHandler
 		htmlHeader = header;
 	}
 	
-	void ApplyMasterPage ()
-	{
-		if (masterPageFile != null) {
-			ArrayList appliedMasterPageFiles = new ArrayList ();
-
-			if (Master != null) {
-				MasterPage.ApplyMasterPageRecursive (Master, appliedMasterPageFiles);
-
-				Master.Page = this;
-				Controls.Clear ();
-				Controls.Add (Master);
-			}
-		}
-	}
-
-	[DefaultValueAttribute ("")]
-	public virtual string MasterPageFile {
+    [DefaultValueAttribute ("")]
+	public string MasterPageFile {
 		get { return masterPageFile; }
-		set {
-			masterPageFile = value;
-			masterPage = null;
-		}
+		set { masterPageFile = value; masterPage = null; }
 	}
 	
-	[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-	[BrowsableAttribute (false)]
+    [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+    [BrowsableAttribute (false)]
 	public MasterPage Master {
 		get {
 			if (masterPage == null)
-				masterPage = MasterPage.CreateMasterPage (this, Context, masterPageFile, contentTemplates);
-
+				masterPage = MasterPageParser.GetCompiledMasterInstance (masterPageFile, Server.MapPath (masterPageFile), Context);
 			return masterPage;
 		}
 	}
@@ -1663,13 +1581,10 @@ public class Page : TemplateControl, IHttpHandler
 	}
 
 
-	Hashtable contentTemplates;
-	[EditorBrowsable (EditorBrowsableState.Never)]
+	[EditorBrowsable (EditorBrowsableState.Advanced)]
 	protected internal void AddContentTemplate (string templateName, ITemplate template)
 	{
-		if (contentTemplates == null)
-			contentTemplates = new Hashtable ();
-		contentTemplates [templateName] = template;
+		Master.AddContentTemplate (templateName, template);
 	}
 		
 	#endif
diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs
index 4af4452af99..7a15503b073 100644
--- a/mcs/class/System.Web/System.Web.UI/PageParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs
@@ -35,7 +35,6 @@ using System.Text;
 using System.Web.Compilation;
 using System.Web.Configuration;
 using System.Web.Util;
-using System.IO;
 
 namespace System.Web.UI
 {
@@ -63,7 +62,6 @@ namespace System.Web.UI
 #if NET_2_0
 		string masterPage;
 		Type masterType;
-		string title;
 #endif
 
 		public PageParser ()
@@ -79,17 +77,6 @@ namespace System.Web.UI
 			AddApplicationAssembly ();
 		}
 
-#if NET_2_0
-		internal PageParser (string virtualPath, TextReader reader, HttpContext context)
-		{
-			Context = context;
-			BaseVirtualDir = UrlUtils.GetDirectory (virtualPath);
-			Reader = reader;
-			SetBaseType (PagesConfig.PageBaseType);
-			AddApplicationAssembly ();
-		}
-#endif
-
 		public static IHttpHandler GetCompiledPageInstance (string virtualPath,
 								    string inputFile, 
 								    HttpContext context)
@@ -102,7 +89,7 @@ namespace System.Web.UI
 		internal override void ProcessMainAttributes (Hashtable atts)
 		{
 			string enabless = GetString (atts, "EnableSessionState",
-#if NET_2_0
+#if CONFIGURATION_2_0
 						     PagesConfig.EnableSessionState.ToString()
 #else
 						     PagesConfig.EnableSessionState
@@ -249,16 +236,6 @@ namespace System.Web.UI
 			validateRequest = GetBool (atts, "ValidateRequest", PagesConfig.ValidateRequest);
 			clientTarget = GetString (atts, "ClientTarget", null);
 			if (clientTarget != null) {
-#if NET_2_0
-				ClientTargetSection sec = (ClientTargetSection)WebConfigurationManager.GetSection ("system.web/clientTarget");
-				if (sec.ClientTargets[clientTarget] == null) {
-					ThrowParseException (String.Format (
-							"ClientTarget '{0}' is an invalid alias. See the " +
-							"documentation for <clientTarget> config. section.",
-							clientTarget));
-				}
-				clientTarget = sec.ClientTargets[clientTarget].UserAgent;
-#else
 				NameValueCollection coll;
 				coll = (NameValueCollection) Context.GetConfig ("system.web/clientTarget");
 				if (coll == null || coll [clientTarget] == null) {
@@ -268,7 +245,6 @@ namespace System.Web.UI
 							clientTarget));
 				}
 				clientTarget = (string) coll [clientTarget];
-#endif
 			}
 
 			notBuffer = !GetBool (atts, "Buffer", true);
@@ -279,8 +255,6 @@ namespace System.Web.UI
 			// Make sure the page exists
 			if (masterPage != null)
 				MasterPageParser.GetCompiledMasterType (masterPage, MapPath (masterPage), HttpContext.Current);
-
-			title = GetString(atts, "Title", null);
 #endif
 			// Ignored by now
 			GetString (atts, "EnableViewStateMac", null);
@@ -408,10 +382,6 @@ namespace System.Web.UI
 		internal Type MasterType {
 			get { return masterType; }
 		}
-
-		internal string Title {
-			get { return title; }
-		}
 #endif
 	}
 }
diff --git a/mcs/class/System.Web/System.Web.UI/PageTheme.cs b/mcs/class/System.Web/System.Web.UI/PageTheme.cs
deleted file mode 100644
index d3ada397744..00000000000
--- a/mcs/class/System.Web/System.Web.UI/PageTheme.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// System.Web.UI.PageTheme.cs
-//
-// Authors:
-//   Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Xml;
-
-namespace System.Web.UI {
-
-	[EditorBrowsable (EditorBrowsableState.Advanced)]
-	public abstract class PageTheme
-	{
-		protected PageTheme ()
-		{
-		}
-
-		[MonoTODO]
-		public static object CreateSkinKey (Type controlType, string skinID)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected object Eval (string expression)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected string Eval (string expression, string format)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public bool TestDeviceFilter (string deviceFilterName)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected object XPath (string xPathExpression)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected object XPath (string xPathExpression, IXmlNamespaceResolver resolver)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected string XPath (string xPathExpression, string format)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected string XPath (string xPathExpression, string format, IXmlNamespaceResolver resolver)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected IEnumerable XPathSelect (string xPathExpression)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		protected IEnumerable XPathSelect (string xPathExpression, IXmlNamespaceResolver resolver)
-		{
-			throw new NotImplementedException ();
-		}
-
-		protected abstract string AppRelativeTemplateSourceDirectory { get; }
-		protected abstract IDictionary ControlSkins { get; }
-		protected abstract string[] LinkedStyleSheets { get; }
-
-		[MonoTODO]
-		protected Page Page {
-			get { throw new NotImplementedException (); }
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/PostBackOptions.cs b/mcs/class/System.Web/System.Web.UI/PostBackOptions.cs
index e764d7f6219..c75c6eb54eb 100644
--- a/mcs/class/System.Web/System.Web.UI/PostBackOptions.cs
+++ b/mcs/class/System.Web/System.Web.UI/PostBackOptions.cs
@@ -29,7 +29,6 @@
 
 #if NET_2_0
 using System;
-using System.ComponentModel;
 
 namespace System.Web.UI
 {
@@ -70,57 +69,49 @@ namespace System.Web.UI
 			this.validationGroup = validatingGroup;
 		}
 
-		[DefaultValue ("")]
 		public string ActionUrl {
 			get { return actionUrl;	}
 			set { actionUrl = value; }
 		}
 
-		[DefaultValue ("")]
 		public string Argument {
 			get { return  argument;	}
 			set { argument = value; }
 		}
 
 		[MonoTODO ("Implement support for this in Page")]
-		[DefaultValue (false)]
 		public bool AutoPostBack {
 			get { return autoPostBack; }
 			set { autoPostBack = value; }
 		}
 
-		[DefaultValue (true)]
 		public bool ClientSubmit {
 			get { return clientSubmit; }
 			set { clientSubmit = value; }
 		}
 		
-		[DefaultValue (false)]
 		public bool PerformValidation {
 			get { return performValidation;	}
 			set { performValidation = value; }
 		}
 
-		[DefaultValue (true)]
 		public bool RequiresJavaScriptProtocol {
 			get { return requiresJavaScriptProtocol; }
 			set { requiresJavaScriptProtocol = value; }
 		}
 
-		[DefaultValue (null)]
 		public Control TargetControl {
 			get { return control; }
+			set { control = value; }
 		}
 
 		[MonoTODO ("Implement support for this in Page")]
-		[DefaultValue (false)]
 		public bool TrackFocus {
 			get { return trackFocus; }
 			set { trackFocus = value; }
 		}
 
 		[MonoTODO ("Implement support for this in Page")]
-		[DefaultValue ("")]
 		public string ValidationGroup {
 			get { return validationGroup; }
 			set { validationGroup = value; }
diff --git a/mcs/class/System.Web/System.Web.UI/PropertyEntry.cs b/mcs/class/System.Web/System.Web.UI/PropertyEntry.cs
index b83d24b1167..942d262910d 100644
--- a/mcs/class/System.Web/System.Web.UI/PropertyEntry.cs
+++ b/mcs/class/System.Web/System.Web.UI/PropertyEntry.cs
@@ -39,8 +39,6 @@ namespace System.Web.UI
 		string filter;
 		PropertyInfo pinfo;
 
-		internal PropertyEntry () { }
-
 		public Type DeclaringType {
 			get { return pinfo.DeclaringType; }
 		}
diff --git a/mcs/class/System.Web/System.Web.UI/RootBuilder.cs b/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
index b5fd74e5d05..3eae34435a2 100644
--- a/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
@@ -53,12 +53,8 @@ namespace System.Web.UI {
 
 		static RootBuilder ()
 		{
-#if NET_2_0
-			htmlControls = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			htmlControls = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
 						      CaseInsensitiveComparer.DefaultInvariant); 
-#endif
 
 			htmlControls.Add ("A", typeof (HtmlAnchor));
 			htmlControls.Add ("BUTTON", typeof (HtmlButton));
@@ -79,12 +75,8 @@ namespace System.Web.UI {
 			htmlControls.Add ("TR", typeof (HtmlTableRow));
 			htmlControls.Add ("TEXTAREA", typeof (HtmlTextArea));
 
-#if NET_2_0
-			htmlInputControls = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			htmlInputControls = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
-							   CaseInsensitiveComparer.DefaultInvariant);
-#endif
+						      CaseInsensitiveComparer.DefaultInvariant); 
 
 			htmlInputControls.Add ("BUTTON", typeof (HtmlInputButton));
 #if NET_2_0
diff --git a/mcs/class/System.Web/System.Web.UI/SimplePropertyEntry.cs b/mcs/class/System.Web/System.Web.UI/SimplePropertyEntry.cs
index 6bd7912f1f7..057c9debf9a 100644
--- a/mcs/class/System.Web/System.Web.UI/SimplePropertyEntry.cs
+++ b/mcs/class/System.Web/System.Web.UI/SimplePropertyEntry.cs
@@ -34,8 +34,6 @@ namespace System.Web.UI
 		bool useSetAttribute;
 		object val;
 
-		internal SimplePropertyEntry () { }
-
 		public bool UseSetAttribute {
 			get { return useSetAttribute; }
 			set { useSetAttribute = value; }
diff --git a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
index 5b09e23b4a1..368b25899fb 100644
--- a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
@@ -58,10 +58,8 @@ namespace System.Web.UI
 		string privateBinPath;
 		string baseDir;
 		string baseVDir;
-#if !NET_2_0
+#if !CONFIGURATION_2_0
 		CompilationConfiguration compilationConfig;
-#else
-		TextReader reader;
 #endif
 		int appAssemblyIndex = -1;
 		Type cachedType;
@@ -82,7 +80,7 @@ namespace System.Web.UI
 			if (location != typeof (TemplateParser).Assembly.Location)
 				appAssemblyIndex = assemblies.Add (location);
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 			bool addAssembliesInBin = false;
 			foreach (AssemblyInfo info in CompilationConfig.Assemblies) {
 				if (info.Assembly == "*")
@@ -98,17 +96,13 @@ namespace System.Web.UI
 				AddAssembliesInBin ();
 #endif
 
+#if !CONFIGURATION_2_0
+#endif
+
 			language = CompilationConfig.DefaultLanguage;
 
 			GetDirectivesAndContent ();
 		}
-#if NET_2_0
-		internal SimpleWebHandlerParser (HttpContext context, string virtualPath, string physicalPath, TextReader reader)
-			: this (context, virtualPath, physicalPath)
-		{
-			this.reader = reader;
-		}
-#endif
 
 		protected Type GetCompiledTypeFromCache ()
 		{
@@ -471,17 +465,12 @@ namespace System.Web.UI
 			}
 		}
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 		CompilationSection CompilationConfig {
 			get {
-				return (CompilationSection)WebConfigurationManager.GetSection ("system.web/compilation");
+				return (CompilationSection)WebConfigurationManager.GetWebApplicationSection ("system.web/compilation");
 			}
 		}
-
-		internal TextReader Reader {
-			get { return reader; }
-			set { reader = value; }
-		}
 #else
 		internal CompilationConfiguration CompilationConfig {
 			get {
diff --git a/mcs/class/System.Web/System.Web.UI/SkinBuilder.cs b/mcs/class/System.Web/System.Web.UI/SkinBuilder.cs
deleted file mode 100644
index aaa2a89f625..00000000000
--- a/mcs/class/System.Web/System.Web.UI/SkinBuilder.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// System.Web.UI.SkinBuilder.cs
-//
-// Authors:
-//   Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Web.UI {
-
-	public sealed class SkinBuilder : ControlBuilder
-	{
-		ThemeProvider provider;
-		Control control;
-		ControlBuilder skinBuilder;
-		string themePath;
-
-		public SkinBuilder (ThemeProvider provider,
-				    Control control,
-				    ControlBuilder skinBuilder,
-				    string themePath)
-		{
-			this.provider = provider;
-			this.control = control;
-			this.skinBuilder = skinBuilder;
-			this.themePath = themePath;
-		}
-
-		[MonoTODO]
-		public Control ApplyTheme ()
-		{
-			return control;
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
index a68a6674956..6c629e05363 100644
--- a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
@@ -73,9 +73,6 @@ namespace System.Web.UI {
 
 		#region Properties
 		[EditorBrowsable (EditorBrowsableState.Never)]
-#if NET_2_0
-		[Obsolete]
-#endif
 		protected virtual int AutoHandlers {
 			get { return 0; }
 			set { }
@@ -233,20 +230,14 @@ namespace System.Web.UI {
 			return null;
 		}
 
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public 
-#if !NET_2_0
-		static
-#endif
-		object ReadStringResource ()
-		{
-			throw new NotSupportedException ();
-		}
-
+		[MonoTODO]
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		public static object ReadStringResource (Type t)
 		{
-			throw new NotSupportedException ();
+			if (t == null)
+				throw new ArgumentNullException ("t");
+
+			return null;
 		}
 
 		[MonoTODO]
@@ -306,57 +297,57 @@ namespace System.Web.UI {
 
 #if NET_2_0
 
-		Stack dataItemCtx;
+	Stack dataItemCtx;
 	
-		internal void PushDataItemContext (object o)
-		{
-			if (dataItemCtx == null)
-				dataItemCtx = new Stack ();
+	internal void PushDataItemContext (object o)
+	{
+		if (dataItemCtx == null)
+			dataItemCtx = new Stack ();
 		
-			dataItemCtx.Push (o);
-		}
-		
-		internal void PopDataItemContext ()
-		{
-			if (dataItemCtx == null)
-				throw new InvalidOperationException ();
+		dataItemCtx.Push (o);
+	}
+	
+	internal void PopDataItemContext ()
+	{
+		if (dataItemCtx == null)
+			throw new InvalidOperationException ();
 		
-			dataItemCtx.Pop ();
-		}
+		dataItemCtx.Pop ();
+	}
 	
-		internal object CurrentDataItem {
-			get {
-				if (dataItemCtx == null || dataItemCtx.Count == 0)
-					throw new InvalidOperationException ("No data item");
+	internal object CurrentDataItem {
+		get {
+			if (dataItemCtx == null || dataItemCtx.Count == 0)
+				throw new InvalidOperationException ("No data item");
 			
-				return dataItemCtx.Peek ();
-			}
+			return dataItemCtx.Peek ();
 		}
+	}
 	
-		protected object Eval (string expression)
-		{
-			return DataBinder.Eval (CurrentDataItem, expression);
-		}
+	protected object Eval (string expression)
+	{
+		return DataBinder.Eval (CurrentDataItem, expression);
+	}
 	
-		protected string Eval (string expression, string format)
-		{
-			return DataBinder.Eval (CurrentDataItem, expression, format);
-		}
+	protected object Eval (string expression, string format)
+	{
+		return DataBinder.Eval (CurrentDataItem, expression, format);
+	}
 	
-		protected object XPath (string xpathexpression)
-		{
-			return XPathBinder.Eval (CurrentDataItem, xpathexpression);
-		}
+	protected object XPath (string xpathexpression)
+	{
+		return XPathBinder.Eval (CurrentDataItem, xpathexpression);
+	}
 	
-		protected string XPath (string xpathexpression, string format)
-		{
-			return XPathBinder.Eval (CurrentDataItem, xpathexpression, format);
-		}
+	protected object XPath (string xpathexpression, string format)
+	{
+		return XPathBinder.Eval (CurrentDataItem, xpathexpression, format);
+	}
 	
-		protected IEnumerable XPathSelect (string xpathexpression)
-		{
-			return XPathBinder.Select (CurrentDataItem, xpathexpression);
-		}
+	protected IEnumerable XPathSelect (string xpathexpression)
+	{
+		return XPathBinder.Select (CurrentDataItem, xpathexpression);
+	}
 
 		// IFilterResolutionService
 
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs
index a004f3aa712..65e1663c8ca 100644
--- a/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs
@@ -39,19 +39,10 @@ namespace System.Web.UI {
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class TemplateControlParser
-#if NET_2_0
-		: BaseTemplateParser 
-#else
-		: TemplateParser
-#endif
-	{
+	public abstract class TemplateControlParser : TemplateParser {
 
 		bool autoEventWireup = true;
 		bool enableViewState = true;
-#if NET_2_0
-		TextReader reader;
-#endif
 
 		protected TemplateControlParser ()
 		{
@@ -176,8 +167,6 @@ namespace System.Web.UI {
 
 		internal override void HandleOptions (object obj)
 		{
-			base.HandleOptions (obj);
-
 			Control ctrl = obj as Control;
 			ctrl.AutoEventWireup = autoEventWireup;
 			ctrl.EnableViewState = enableViewState;
@@ -190,12 +179,6 @@ namespace System.Web.UI {
 		internal bool EnableViewState {
 			get { return enableViewState; }
 		}
-#if NET_2_0
-		internal TextReader Reader {
-			get { return reader; }
-			set { reader = value; }
-		}
-#endif
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
index aad6114a1ae..d009cfef35d 100644
--- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -92,7 +92,7 @@ namespace System.Web.UI {
 			imports.Add ("System.Web.UI.HtmlControls");
 
 			assemblies = new ArrayList ();
-#if NET_2_0
+#if CONFIGURATION_2_0
 			bool addAssembliesInBin = false;
 			foreach (AssemblyInfo info in CompilationConfig.Assemblies) {
 				if (info.Assembly == "*")
@@ -690,7 +690,7 @@ namespace System.Web.UI {
 			get { return oc_param; }
 		}
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 		internal PagesSection PagesConfig {
 			get {
 				return WebConfigurationManager.GetSection ("system.web/pages") as PagesSection;
diff --git a/mcs/class/System.Web/System.Web.UI/ThemeProvider.cs b/mcs/class/System.Web/System.Web.UI/ThemeProvider.cs
deleted file mode 100644
index cf6d325e063..00000000000
--- a/mcs/class/System.Web/System.Web.UI/ThemeProvider.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// System.Web.UI.ThemeProvider.cs
-//
-// Authors:
-//   Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System.Collections;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.ComponentModel.Design;
-
-namespace System.Web.UI {
-
-	public sealed class ThemeProvider
-	{
-		IDesignerHost host;
-		string name;
-		string themeDefinition;
-		string[] cssFiles;
-		string themePath;
-
-		public ThemeProvider (IDesignerHost host,
-				      string name,
-				      string themeDefinition,
-				      string[] cssFiles,
-				      string themePath)
-		{
-			this.host = host;
-			this.name = name;
-			this.themeDefinition = themeDefinition;
-			this.cssFiles = cssFiles; /* XXX copy? */
-			this.themePath = themePath;
-		}
-
-		[MonoTODO]
-		public SkinBuilder GetSkinBuilder (Control control)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public IDictionary GetSkinControlBuildersForControlType (Type type)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public ICollection GetSkinsForControl (Type type)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public int ContentHashCode {
-			get { throw new NotImplementedException (); }
-		}
-
-		public ICollection CssFiles {
-			get { return cssFiles; }
-		}
-
-		public IDesignerHost DesignerHost {
-			get { return host; }
-		}
-
-		public string ThemeName {
-			get { return name; }
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.UI/TwoWayBoundPropertyEntry.cs b/mcs/class/System.Web/System.Web.UI/TwoWayBoundPropertyEntry.cs
new file mode 100644
index 00000000000..0fa5586d3b8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TwoWayBoundPropertyEntry.cs
@@ -0,0 +1,61 @@
+//
+// System.Web.UI.TwoWayBoundPropertyEntry
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// Copyright (c) 2005 Novell, Inc (http://www.novell.com)
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+#if NET_2_0
+namespace System.Web.UI
+{
+	public class TwoWayBoundPropertyEntry : BoundPropertyEntry {
+		string controlID;
+		Type controlType;
+		string fieldName;
+		string formatString;
+
+		public string ControlID {
+			get { return controlID; }
+			set { controlID = value; }
+		}
+
+		public Type ControlType {
+			get { return controlType; }
+			set { controlType = value; }
+		}
+
+		public string FieldName {
+			get { return fieldName; }
+			set { fieldName = value; }
+		}
+
+		public string FormatString {
+			get { return formatString; }
+			set { formatString = value; }
+		}
+	}
+}
+#endif // NET_2_0
+
diff --git a/mcs/class/System.Web/System.Web.UI/UserControl.cs b/mcs/class/System.Web/System.Web.UI/UserControl.cs
index 3b0ebc830d6..298e0653daa 100644
--- a/mcs/class/System.Web/System.Web.UI/UserControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/UserControl.cs
@@ -209,16 +209,6 @@ namespace System.Web.UI {
 			FrameworkInitialize ();
 		}
 
-		[MonoTODO]
-		internal void InitializeAsUserControlInternal ()
-		{
-			/* XXX make sure this really works - we need a
-			 * test for InitializeAsUserControl to see if
-			 * it throws ArgumentNullException on a null
-			 * @page. */
-			InitializeAsUserControl (null);
-		}
-
 		public string MapPath (string virtualPath)
 		{
 			return Request.MapPath (virtualPath, TemplateSourceDirectory, true);
diff --git a/mcs/class/System.Web/System.Web.UI/UserControlParser.cs b/mcs/class/System.Web/System.Web.UI/UserControlParser.cs
index be3d572292b..222a0b6dd15 100644
--- a/mcs/class/System.Web/System.Web.UI/UserControlParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/UserControlParser.cs
@@ -38,10 +38,6 @@ namespace System.Web.UI
 {
 	internal class UserControlParser : TemplateControlParser
 	{
-#if NET_2_0
-		string masterPage;
-#endif
-
 		internal UserControlParser (string virtualPath, string inputFile, HttpContext context)
 			: this (virtualPath, inputFile, context, null)
 		{
@@ -62,18 +58,7 @@ namespace System.Web.UI
 			SetBaseType (type);
 			AddApplicationAssembly ();
 		}
-
-#if NET_2_0
-		internal UserControlParser (string virtualPath, TextReader reader, HttpContext context)
-		{
-			Context = context;
-			BaseVirtualDir = UrlUtils.GetDirectory (virtualPath);
-			Reader = reader;
-			SetBaseType (PagesConfig.UserControlBaseType);
-			AddApplicationAssembly ();
-		}
-#endif
-
+		
 		internal static Type GetCompiledType (string virtualPath, string inputFile, ArrayList deps, HttpContext context)
 		{
 			UserControlParser ucp = new UserControlParser (virtualPath, inputFile, deps, context);
@@ -94,19 +79,9 @@ namespace System.Web.UI
 
 		internal override void ProcessMainAttributes (Hashtable atts)
 		{
-#if NET_2_0
-			masterPage = GetString (atts, "MasterPageFile", null);
-			if (masterPage != null) {
-				// Make sure the page exists
-				if (masterPage != null) {
-					MasterPageParser.GetCompiledMasterType (masterPage, MapPath (masterPage), HttpContext.Current);
-				}
-			}
-#endif
-
 			base.ProcessMainAttributes (atts);
 		}
-
+		
 		internal override Type DefaultBaseType {
 			get { return typeof (UserControl); }
 		}
@@ -118,13 +93,6 @@ namespace System.Web.UI
 		internal override string DefaultDirectiveName {
 			get { return "control"; }
 		}
-
-#if NET_2_0
-		internal string MasterPageFile {
-			get { return masterPage; }
-		}
-#endif
-
 	}
 }
 
diff --git a/mcs/class/System.Web/System.Web.UI/WebHandlerParser.cs b/mcs/class/System.Web/System.Web.UI/WebHandlerParser.cs
index 7d047ad2693..f069ef398e8 100644
--- a/mcs/class/System.Web/System.Web.UI/WebHandlerParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/WebHandlerParser.cs
@@ -30,7 +30,6 @@
 
 using System.Web;
 using System.Web.Compilation;
-using System.IO;
 
 namespace System.Web.UI
 {
@@ -41,13 +40,6 @@ namespace System.Web.UI
 		{
 		}
 
-#if NET_2_0
-		internal WebHandlerParser (HttpContext context, string virtualPath, TextReader reader)
-			: base (context, virtualPath, null, reader)
-		{
-		}
-#endif
-
 		public static Type GetCompiledType (HttpContext context, string virtualPath, string physicalPath)
 		{
 			WebHandlerParser parser = new WebHandlerParser (context, virtualPath, physicalPath);
diff --git a/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs b/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs
index dc1c44fb9bb..ebcddb76b0b 100644
--- a/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs
@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.IO;
 using System.Security.Permissions;
 using System.Web.Compilation;
 
@@ -43,13 +42,6 @@ namespace System.Web.UI {
 		{
 		}
 
-#if NET_2_0
-		internal WebServiceParser (HttpContext context, string virtualPath, TextReader reader)
-			: base (context, virtualPath, null, reader)
-		{
-		}
-#endif
-
 		public static Type GetCompiledType (string inputFile, HttpContext context)
 		{
 			WebServiceParser parser = new WebServiceParser (context, null, inputFile);
diff --git a/mcs/class/System.Web/System.Web.UI/XhtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/XhtmlTextWriter.cs
deleted file mode 100644
index 154d319a733..00000000000
--- a/mcs/class/System.Web/System.Web.UI/XhtmlTextWriter.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-//
-// XhtmlTextWriter.cs
-//
-// Author:
-//	Cesar Lopez Nataren <cnataren@novell.com>
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System.IO;
-using System.Collections;
-
-namespace System.Web.UI {
-
-	public class XhtmlTextWriter : HtmlTextWriter
-	{
-		Hashtable common_attrs = new Hashtable (DefaultCommonAttributes.Length);
-		Hashtable suppress_common_attrs = new Hashtable (DefaultSuppressCommonAttributes.Length);
-		Hashtable element_specific_attrs = new Hashtable ();
-
-		Hashtable attr_render = new Hashtable ();
-
-		XhtmlMobileDocType doc_type;
-
-		static string [] DefaultCommonAttributes = {
-			"class",
-			"id",
-			"title",
-			"xml:lang"
-		};
-
-		//
-		// XHTML elements whose CommonAttributes are supressed
-		//
-		static string [] DefaultSuppressCommonAttributes = {
-			"base",
-			"meta",
-			"br",
-			"head",
-			"title",
-			"html",
-			"style"
-		};
-
-	        public XhtmlTextWriter (TextWriter writer)
-			: this (writer, DefaultTabString)
-		{
-		}
-
-		public XhtmlTextWriter (TextWriter writer, string tabString)
-			: base (writer, tabString)
-		{
-			SetupCommonAttributes ();
-			SetupSuppressCommonAttributes ();
-			SetupElementsSpecificAttributes ();
-		}
-
-		void SetupHash (Hashtable hash, string [] values) {
-			foreach (string str in values)
-				hash.Add (str, true);
-		}
-
-		//
-		// if you need to add a new default common attribute,
-		// add the literal as a member of the DefaultCommonAttributes array
-		//
-		void SetupCommonAttributes ()
-		{
-			SetupHash (common_attrs, DefaultCommonAttributes);
-		}
-
-		//
-		// if you need to add a new suppressed common attribute,
-		// add the literal as a member of the SuppressCommonAttrs array
-		//
-		void SetupSuppressCommonAttributes ()
-		{
-			SetupHash (suppress_common_attrs, DefaultSuppressCommonAttributes);
-		}
-
-		//
-		// I did not make them static because different instances of XhtmlTextWriter's
-		// do not share the changes made to the element's attributes tables,
-		// they are not read-only.
-		//
-		Hashtable a_attrs, base_attrs, blockquote_attrs, br_attrs, form_attrs, head_attrs;
-		Hashtable html_attrs, img_attrs, input_attrs, label_attrs, li_attrs, link_attrs;
-		Hashtable meta_attrs, object_attrs, ol_attrs, optgroup_attrs, option_attrs, param_attrs;
-		Hashtable pre_attrs, q_attrs, select_attrs, style_attrs, table_attrs, textarea_attrs;
-		Hashtable td_attrs, th_attrs, title_attrs, tr_attrs;
-
-		void SetupElementsSpecificAttributes ()
-		{
-			string [] a_attrs_names = {"accesskey", "href", "charset", "hreflang", "rel", "type", "rev", "title", "tabindex"};
-			SetupElementSpecificAttributes ("a", a_attrs, a_attrs_names);
-
-			string [] base_attrs_names = {"href"};
-			SetupElementSpecificAttributes ("base", base_attrs, base_attrs_names);
-
-			string [] blockquote_attrs_names = {"cite"};
-			SetupElementSpecificAttributes ("blockquote", blockquote_attrs, blockquote_attrs_names);
-
-			string [] br_attrs_names = {"id", "class", "title"};
-			SetupElementSpecificAttributes ("br", br_attrs, br_attrs_names);
-
-			string [] form_attrs_names = {"action", "method", "enctype"};
-			SetupElementSpecificAttributes ("form", form_attrs, form_attrs_names);
-
-			string [] head_attrs_names = {"xml:lang"};
-			SetupElementSpecificAttributes ("head", head_attrs, head_attrs_names);
-
-			string [] html_attrs_names = {"version", "xml:lang", "xmlns"};
-			SetupElementSpecificAttributes ("html", html_attrs, html_attrs_names);
-
-			string [] img_attrs_names = {"src", "alt", "width", "longdesc", "height"};
-			SetupElementSpecificAttributes ("img", img_attrs, img_attrs_names);
-
-			string [] input_attrs_names = {"size", "accesskey", "title", "name", "type", "disabled", 
-						       "value", "src", "checked", "maxlength", "tabindex"};
-			SetupElementSpecificAttributes ("input", input_attrs, input_attrs_names);
-
-			string [] label_attrs_names = {"accesskey", "for"};
-			SetupElementSpecificAttributes ("label", label_attrs, label_attrs_names);
-
-			string [] li_attrs_names = {"value"};
-			SetupElementSpecificAttributes ("li", li_attrs, li_attrs_names);
-
-			string [] link_attrs_names = {"hreflang", "rev", "type", "charset", "rel", "href", "media"};
-			SetupElementSpecificAttributes ("link", link_attrs, link_attrs_names);
-
-			string [] meta_attrs_names = {"content", "name", "xml:lang", "http-equiv", "scheme"};
-			SetupElementSpecificAttributes ("meta", meta_attrs, meta_attrs_names);
-
-			string [] object_attrs_names = {"codebase", "classid", "data", "standby", "name", "type", 
-							"height", "archive", "declare", "width", "tabindex", "codetype"};
-			SetupElementSpecificAttributes ("object", object_attrs, object_attrs_names);
-
-			string [] ol_attrs_names = {"start"};
-			SetupElementSpecificAttributes ("ol", ol_attrs, ol_attrs_names);
-
-			string [] optgroup_attrs_names = {"label", "disabled"};
-			SetupElementSpecificAttributes ("optgroup", optgroup_attrs, optgroup_attrs_names);
-
-			string [] option_attrs_names = {"selected", "value"};
-			SetupElementSpecificAttributes ("option", option_attrs, option_attrs_names);
-
-			string [] param_attrs_names = {"id", "name", "valuetype", "value", "type"};
-			SetupElementSpecificAttributes ("param", param_attrs, param_attrs_names);
-
-			string [] pre_attrs_names = {"xml:space"};
-			SetupElementSpecificAttributes ("pre", pre_attrs, pre_attrs_names);
-
-			string [] q_attrs_names = {"cite"};
-			SetupElementSpecificAttributes ("q", q_attrs, q_attrs_names);
-
-			string [] select_attrs_names = {"name", "tabindex", "disabled", "multiple", "size"};
-			SetupElementSpecificAttributes ("select", select_attrs, select_attrs_names);
-
-			string [] style_attrs_names = {"xml:lang", "xml:space", "type", "title", "media"};
-			SetupElementSpecificAttributes ("style", style_attrs, style_attrs_names);
-
-			string [] table_attrs_names = {"width", "summary"};
-			SetupElementSpecificAttributes ("table", table_attrs, table_attrs_names);
-
-			string [] textarea_attrs_names = {"name", "cols", "accesskey", "tabindex", "rows"};
-			SetupElementSpecificAttributes ("textarea", textarea_attrs, textarea_attrs_names);
-
-			string [] td_and_th_attrs_names = {"headers", "align", "rowspan", "colspan", "axis",
-							   "scope", "abbr", "valign"};
-			SetupElementSpecificAttributes ("td", td_attrs, td_and_th_attrs_names);
-			SetupElementSpecificAttributes ("th", th_attrs, td_and_th_attrs_names);
-
-			string [] title_attrs_names = {"xml:lang"};
-			SetupElementSpecificAttributes ("title", title_attrs, title_attrs_names);
-
-			string [] tr_attrs_names = {"align", "valign"};
-			SetupElementSpecificAttributes ("tr", tr_attrs, tr_attrs_names);
-		}
-		
-		void SetupElementSpecificAttributes (string elementName, Hashtable attrs, string [] attributesNames)
-		{
-			attrs = new Hashtable (attributesNames.Length);
-			InitElementAttributes (attrs, attributesNames);
-			element_specific_attrs.Add (elementName, attrs);
-		}
-
-		void InitElementAttributes (Hashtable attrs, string [] attributesNames)
-		{
-			SetupHash (attrs, attributesNames);
-		}
-
-		protected Hashtable CommonAttributes {
-			get { return common_attrs; }
-		}
-
-		protected Hashtable ElementSpecificAttributes {
-			get { return element_specific_attrs; }
-		}
-
-		protected Hashtable  SuppressCommonAttributes {
-			get { return suppress_common_attrs; }
-		}
-
-		public virtual void AddRecognizedAttribute (string elementName, string attributeName)
-		{
-			Hashtable elem_attrs = (Hashtable) element_specific_attrs [elementName];
-
-			if (elem_attrs == null) {
-				Hashtable attrs = new Hashtable ();
-				attrs.Add (attributeName, true);
-				element_specific_attrs.Add (elementName, attrs);
-			} else
-				elem_attrs.Add (attributeName, true);
-		}
-
-		public override bool IsValidFormAttribute (string attributeName)
-		{
-			return attributeName == "action" || attributeName == "method" || attributeName == "enctype";
-		}
-
-		public virtual void RemoveRecognizedAttribute (string elementName, string attributeName)
-		{
-			Hashtable elem_attrs = (Hashtable) element_specific_attrs [elementName];
-
-			if (elem_attrs != null)
-				elem_attrs.Remove (attributeName);
-		}
-
-		public virtual void SetDocType (XhtmlMobileDocType docType)
-		{
-			doc_type = docType;
-		}
-
-		// writes <br/>
-		public override void WriteBreak ()
-		{
-			string tag = GetTagName (HtmlTextWriterTag.Br);
-			WriteBeginTag (tag);
-			Write (SlashChar);
-			Write (TagRightChar);
-		}
-
-		[MonoTODO]
-		protected override bool OnAttributeRender (string name, string value, HtmlTextWriterAttribute key)
-		{
-			// I tested every possible value of HtmlTextWriterAttribute
-			// and the MS implementation always throws ArgumentNullException
-			return (bool) attr_render [null];
-		}
-
-		[MonoTODO]
-		protected override bool OnStyleAttributeRender (string name, string value, HtmlTextWriterStyle key)
-		{
-			// I tested every possible value of HtmlTextWriterStyle
-			// and the MS implementation always returned false. Sigh
-			return false;
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/System.Web.Util/AltSerialization.cs b/mcs/class/System.Web/System.Web.Util/AltSerialization.cs
index a36237a93b3..98116fb897f 100644
--- a/mcs/class/System.Web/System.Web.Util/AltSerialization.cs
+++ b/mcs/class/System.Web/System.Web.Util/AltSerialization.cs
@@ -71,12 +71,8 @@ namespace System.Web.Util {
 			int i = types.IndexOf (type);
 			if (i == -1) {
 				w.Write (15); // types.Count
-#if TARGET_J2EE
-				((System.Web.J2EE.ObjectOutputStream)w.BaseStream).NativeStream.writeObject(value);
-#else
 				BinaryFormatter bf = new BinaryFormatter ();
 				bf.Serialize (w.BaseStream, value);
-#endif
 				return;
 			}
 			
@@ -130,12 +126,8 @@ namespace System.Web.Util {
 		internal static object DeserializeFromIndex (int index, BinaryReader r)
 		{
 			if (index == 15){
-#if TARGET_J2EE
-				return ((System.Web.J2EE.ObjectInputStream)r.BaseStream).NativeStream.readObject();
-#else
 				BinaryFormatter bf = new BinaryFormatter ();
 				return bf.Deserialize (r.BaseStream);
-#endif
 			}
 			
 			object value = null;
diff --git a/mcs/class/System.Web/System.Web.Util/ChangeLog b/mcs/class/System.Web/System.Web.Util/ChangeLog
index 394d9e2ef68..b3730d9ffe2 100644
--- a/mcs/class/System.Web/System.Web.Util/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Util/ChangeLog
@@ -1,21 +1,3 @@
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* WebEncoding.cs: CONFIGURATION_2_0 => NET_2_0, and use GetSection
-	instead of GetWebApplicationSection.
-
-2006-01-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* UrlUtils.cs: more than one consecutive slash are turned into one.
-
-2006-01-26  Chris Toshok  <toshok@ximian.com>
-
-	* WebEncoding.cs: rework this so we cache the section, and so we
-	swallow exceptions based on a broken configuration.
-
-2006-01-09  Konstantin Triger <kostat@mainsoft.com>
-
-	AltSerialization.cs: under TARGET_JVM: merging /main/4
-
 2005-11-28  Chris Toshok  <toshok@ximian.com>
 
 	* WebEncoding.cs (FileEncoding, ResponseEncoding,
diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
index 179158ec1ab..6e158a40c0b 100644
--- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
+++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
@@ -177,41 +177,17 @@ namespace System.Web.Util {
 		{
 			url = url.Replace('\\','/');
 			int last = url.LastIndexOf ('/');
-
-			if (last > 0) {
-#if NET_2_0
-				return RemoveDoubleSlashes (url.Substring (0, last));
-#else
+			if (last > 0)
 				return url.Substring (0, last);
-#endif
-			}
-
 			return "/";
 		}
 
-#if NET_2_0
-		internal static string RemoveDoubleSlashes (string input)
-		{
-			// MS VirtualPathUtility removes duplicate '/'
-			string str = input;
-			string x;
-			while ((x = str.Replace ("//", "/")) != str) {
-				str = x;
-			}
-
-			return str;
-		}
-#endif
-
 		internal static string GetFile (string url)
 		{
 			url = url.Replace('\\','/');
 			int last = url.LastIndexOf ('/');
-			if (last >= 0) {
-				if (url.Length == 1) // Empty file name instead of ArgumentOutOfRange
-					return "";
+			if (last >= 0)
 				return url.Substring (last+1);
-			}
 
 			throw new Exception (String.Format ("GetFile: `{0}' does not contain a /", url));
 		}
diff --git a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
index cfc6a689d38..1e53db51d6b 100644
--- a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
+++ b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
@@ -36,44 +36,44 @@ namespace System.Web.Util
 {
 	internal class WebEncoding
 	{
-#if NET_2_0
-		static bool cached;
-		static GlobalizationSection sect;
-		static GlobalizationSection GlobalizationConfig {
+		static public Encoding FileEncoding {
 			get {
-				if (!cached) {
-					try {
-						sect = (GlobalizationSection) WebConfigurationManager.GetSection ("system.web/globalization");
-					}
-					catch { }
-					cached = true;
-				}
-				return sect;
-			}
-		}
+#if CONFIGURATION_2_0
+				GlobalizationSection gc = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization");
 #else
-		static GlobalizationConfiguration GlobalizationConfig {
-			get {
-				return GlobalizationConfiguration.GetInstance (null);
-			}
-		}
+				GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null);
+				if (gc == null)
+					return Encoding.Default;
 #endif
 
-		static public Encoding FileEncoding {
-			get {
-				return GlobalizationConfig != null ? GlobalizationConfig.FileEncoding : Encoding.Default;
+				return gc.FileEncoding;
 			}
 		}
 
 		static public Encoding ResponseEncoding {
 			get {
-				return GlobalizationConfig != null ? GlobalizationConfig.ResponseEncoding : Encoding.Default;
+#if CONFIGURATION_2_0
+				GlobalizationSection gc = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization");
+#else
+				GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null);
+				if (gc == null)
+					return Encoding.Default;
+#endif
+
+				return gc.ResponseEncoding;
 			}
 		}
 
 		static public Encoding RequestEncoding {
 			get {
-				return GlobalizationConfig != null ? GlobalizationConfig.RequestEncoding : Encoding.Default;
+#if CONFIGURATION_2_0
+				GlobalizationSection gc = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization");
+#else
+				GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null);
+				if (gc == null)
+					return Encoding.Default;
+#endif
+				return gc.RequestEncoding;
 			}
 		}
 	}
diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index 6ce7f0bffd1..7f8f02d3be2 100644
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -2,6 +2,7 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
+System.Web.Administration/WebAdminUserControl.cs
 System.Web/ApplicationShutdownReason.cs
 System.Web/BeginEventHandler.cs
 System.Web.Caching/Cache.cs
@@ -14,58 +15,30 @@ System.Web.Caching/CachedVaryBy.cs
 System.Web.Caching/OutputCacheModule.cs
 System.Web/CapabilitiesLoader.cs
 System.Web/BrowserCapabilities.cs
-System.Web.Compilation/AppSettingsExpressionBuilder.cs
 System.Web.Compilation/AspComponentFoundry.cs
 System.Web.Compilation/AspGenerator.cs
 System.Web.Compilation/AspParser.cs
 System.Web.Compilation/AspTokenizer.cs
-System.Web.Compilation/AssemblyBuilder.cs
 System.Web.Compilation/BaseCompiler.cs
-System.Web.Compilation/BuildDependencySet.cs
-System.Web.Compilation/BuildManager.cs
-System.Web.Compilation/BuildManagerHostUnloadEventArgs.cs
-System.Web.Compilation/BuildManagerHostUnloadEventHandler.cs
-System.Web.Compilation/BuildProviderAppliesToAttribute.cs
-System.Web.Compilation/BuildProviderAppliesTo.cs
 System.Web.Compilation/BuildProviderResultFlags.cs
-System.Web.Compilation/BuildProvider.cs
 System.Web.Compilation/CachingCompiler.cs
-System.Web.Compilation/ClientBuildManagerCallback.cs
-System.Web.Compilation/ClientBuildManagerParameter.cs
-System.Web.Compilation/ClientBuildManager.cs
 System.Web.Compilation/CompilationException.cs
-System.Web.Compilation/CompilerType.cs
-System.Web.Compilation/ConnectionStringsExpressionBuilder.cs
-System.Web.Compilation/DesignTimeResourceProviderFactoryAttribute.cs
 System.Web.Compilation/Directive.cs
 System.Web.Compilation/ExpressionBuilderContext.cs
 System.Web.Compilation/ExpressionBuilder.cs
-System.Web.Compilation/ExpressionEditorAttribute.cs
-System.Web.Compilation/ExpressionPrefixAttribute.cs
 System.Web.Compilation/GlobalAsaxCompiler.cs
-System.Web.Compilation/IAssemblyPostProcessor.cs
-System.Web.Compilation/IgnoreFileBuildProvider.cs
 System.Web.Compilation/IImplicitResourceProvider.cs
 System.Web.Compilation/ILocation.cs
 System.Web.Compilation/ImplicitResourceKey.cs
-System.Web.Compilation/IResourceProvider.cs
-System.Web.Compilation/LinePragmaCodeInfo.cs
+System.Web.Compilation/IResourceReader.cs
 System.Web.Compilation/Location.cs
-System.Web.Compilation/PageBuildProvider.cs
 System.Web.Compilation/PageCompiler.cs
 System.Web.Compilation/ParseException.cs
-System.Web.Compilation/PrecompilationFlags.cs
-System.Web.Compilation/ResourceExpressionBuilder.cs
-System.Web.Compilation/ResourceExpressionFields.cs
-System.Web.Compilation/ResourceProviderFactory.cs
-System.Web.Compilation/UserControlBuildProvider.cs
 System.Web.Compilation/TagAttributes.cs
 System.Web.Compilation/TagType.cs
 System.Web.Compilation/TemplateControlCompiler.cs
 System.Web.Compilation/UserControlCompiler.cs
 System.Web.Compilation/WebServiceCompiler.cs
-System.Web.Compilation/WebHandlerBuildProvider.cs
-System.Web.Compilation/WebServiceBuildProvider.cs
 System.Web.Configuration/AuthConfig.cs
 System.Web.Configuration/AuthenticationConfigHandler.cs
 System.Web.Configuration/AuthenticationMode.cs
@@ -109,6 +82,7 @@ System.Web.Configuration_2.0/AuthorizationRuleCollection.cs
 System.Web.Configuration_2.0/AuthorizationSection.cs
 System.Web.Configuration_2.0/BufferModesCollection.cs
 System.Web.Configuration_2.0/BufferModeSettings.cs
+System.Web.Configuration_2.0/BuildProviderAppliesTo.cs
 System.Web.Configuration_2.0/BuildProviderCollection.cs
 System.Web.Configuration_2.0/BuildProvider.cs
 System.Web.Configuration_2.0/ClientTarget.cs
@@ -138,7 +112,6 @@ System.Web.Configuration_2.0/HealthMonitoringSection.cs
 System.Web.Configuration_2.0/HostingEnvironmentSection.cs
 System.Web.Configuration_2.0/HttpCapabilitiesBase.cs
 System.Web.Configuration_2.0/HttpCookiesSection.cs
-System.Web.Configuration_2.0/HttpConfigurationSystem.cs
 System.Web.Configuration_2.0/HttpHandlerAction.cs
 System.Web.Configuration_2.0/HttpHandlerActionCollection.cs
 System.Web.Configuration_2.0/HttpHandlersSection.cs
@@ -160,6 +133,7 @@ System.Web.Configuration_2.0/OutputCacheSection.cs
 System.Web.Configuration_2.0/OutputCacheSettingsSection.cs
 System.Web.Configuration_2.0/PagesEnableSessionState.cs
 System.Web.Configuration_2.0/PagesSection.cs
+System.Web.Configuration_2.0/PagesToCountAction.cs
 System.Web.Configuration_2.0/PassportAuthentication.cs
 System.Web.Configuration_2.0/ProcessModelSection.cs
 System.Web.Configuration_2.0/ProcessModelComAuthenticationLevel.cs
@@ -217,31 +191,25 @@ System.Web.Configuration_2.0/WebPartsPersonalizationAuthorization.cs
 System.Web.Configuration_2.0/WebPartsSection.cs
 System.Web.Configuration_2.0/XhtmlConformanceMode.cs
 System.Web.Configuration_2.0/XhtmlConformanceSection.cs
-System.Web.Configuration.Internal/IInternalConfigWebHost.cs
-System.Web/DefaultHttpHandler.cs
 System.Web/EndEventHandler.cs
 System.Web.Handlers/AssemblyResourceLoader.cs
 System.Web.Handlers/TraceHandler.cs
 System.Web.Hosting/AppDomainFactory.cs
-System.Web.Hosting/AppManagerAppDomainFactory.cs
-System.Web.Hosting/ApplicationInfo.cs
 System.Web.Hosting/ApplicationHost.cs
-System.Web.Hosting/ApplicationManager.cs
-System.Web.Hosting/BareApplicationHost.cs
-System.Web.Hosting/DefaultVirtualDirectory.cs
-System.Web.Hosting/DefaultVirtualFile.cs
-System.Web.Hosting/DefaultVirtualPathProvider.cs
 System.Web.Hosting/HostingEnvironment.cs
 System.Web.Hosting/IAppDomainFactory.cs
+System.Web.Hosting/IApplicationHost.cs
 System.Web.Hosting/IAppManagerAppDomainFactory.cs
+System.Web.Hosting/IHttpWorkerRequestHandler.cs
 System.Web.Hosting/IISAPIRuntime.cs
+System.Web.Hosting/IProcessHost.cs
+System.Web.Hosting/IProcessHostFactoryHelper.cs
+System.Web.Hosting/IProcessHostSupportFunction.cs
+System.Web.Hosting/IProcessPingCallback.cs
+System.Web.Hosting/IQueueHost.cs
 System.Web.Hosting/IRegisteredObject.cs
 System.Web.Hosting/ISAPIRuntime.cs
 System.Web.Hosting/SimpleWorkerRequest.cs
-System.Web.Hosting/VirtualDirectory.cs
-System.Web.Hosting/VirtualFileBase.cs
-System.Web.Hosting/VirtualFile.cs
-System.Web.Hosting/VirtualPathProvider.cs
 System.Web/HtmlizedException.cs
 System.Web/HttpApplication.cs
 System.Web/HttpApplicationFactory.cs
@@ -259,6 +227,7 @@ System.Web/HttpContext.cs
 System.Web/HttpCookieCollection.cs
 System.Web/HttpCookie.cs
 System.Web/HttpCookieMode.cs
+System.Web/HttpDataTransferMode.cs
 System.Web/HttpException.cs
 System.Web/HttpFileCollection.cs
 System.Web/HttpForbiddenHandler.cs
@@ -267,6 +236,7 @@ System.Web/HttpModuleCollection.cs
 System.Web/HttpParseException.cs
 System.Web/HttpPostedFile.cs
 System.Web/HttpRequest.cs
+System.Web/HttpRequestPriority.cs
 System.Web/HttpRequestValidationException.cs
 System.Web/HttpResponseHeader.cs
 System.Web/HttpResponseStream.cs
@@ -309,6 +279,7 @@ System.Web.Mail/ToUUEncodingTransform.cs
 System.Web.Mail/UUAttachmentEncoder.cs
 System.Web.Management/EventNotificationType.cs
 System.Web.Management/IRegiisUtility.cs
+System.Web.Management/IRegisterCreateITypeLib.cs
 System.Web.Management/IWebEventCustomEvaluator.cs
 System.Web.Management/RuleFiringRecord.cs
 System.Web.Management/SessionStateType.cs
@@ -343,7 +314,6 @@ System.Web.Profile/ProfileProviderAttribute.cs
 System.Web.Profile/ProfileProviderCollection.cs
 System.Web.Profile/ProfileProvider.cs
 System.Web.Profile/SettingsAllowAnonymousAttribute.cs
-System.Web.Profile/SqlProfileProvider.cs
 System.Web/QueueManager.cs
 System.Web.Security/ActiveDirectoryConnectionProtection.cs
 System.Web.Security/ActiveDirectoryMembershipProvider.cs
@@ -395,7 +365,7 @@ System.Web.SessionState/IHttpSessionState.cs
 System.Web.SessionState/IReadOnlySessionState.cs
 System.Web.SessionState/IRequiresSessionState.cs
 System.Web.SessionState/ISessionHandler.cs
-System.Web.SessionState/ISessionIDManager.cs
+System.Web.SessionState/ISessionIDModule.cs
 System.Web.SessionState/ISessionStateItemCollection.cs
 System.Web.SessionState/IStateRuntime.cs
 System.Web.SessionState/RemoteStateServer.cs
@@ -404,7 +374,7 @@ System.Web.SessionState/SessionDictionary.cs
 System.Web.SessionState/SessionId.cs
 System.Web.SessionState/SessionInProcHandler.cs
 System.Web.SessionState/SessionSQLServerHandler.cs
-System.Web.SessionState/SessionStateActions.cs
+System.Web.SessionState/SessionStateActionFlags.cs
 System.Web.SessionState/SessionStateItemExpireCallback.cs
 System.Web.SessionState/SessionStateMode.cs
 System.Web.SessionState/SessionStateModule.cs
@@ -435,12 +405,10 @@ System.Web.UI/ApplicationFileParser.cs
 System.Web.UI/AttributeCollection.cs
 System.Web.UI/BaseParser.cs
 System.Web.UI/BasePartialCachingControl.cs
-System.Web.UI/BaseTemplateParser.cs
 System.Web.UI/BoundPropertyEntry.cs
 System.Web.UI/BuildMethod.cs
 System.Web.UI/BuildTemplateMethod.cs
 System.Web.UI/ClientScriptManager.cs
-System.Web.UI/ChtmlTextWriter.cs
 System.Web.UI/CodeBuilder.cs
 System.Web.UI/CodeRenderBuilder.cs
 System.Web.UI/CollectionBuilder.cs
@@ -454,8 +422,7 @@ System.Web.UI/ControlBuilder.cs
 System.Web.UI/ControlCachePolicy.cs
 System.Web.UI/ControlCollection.cs
 System.Web.UI/Control.cs
-System.Web.UI/ControlSkin.cs
-System.Web.UI/ControlSkinDelegate.cs
+System.Web.UI/ControlSkinProc.cs
 System.Web.UI/ControlValuePropertyAttribute.cs
 System.Web.UI/CssStyleCollection.cs
 System.Web.UI/DataBinder.cs
@@ -467,7 +434,6 @@ System.Web.UI/DataBoundLiteralControl.cs
 System.Web.UI/DataSourceCacheExpiry.cs
 System.Web.UI/DataSourceCapabilities.cs
 System.Web.UI/DataSourceControl.cs
-System.Web.UI/DataSourceControlBuilder.cs
 System.Web.UI/DataSourceOperation.cs
 System.Web.UI/DataSourceSelectArguments.cs
 System.Web.UI/DataSourceView.cs
@@ -528,6 +494,7 @@ System.Web.UI/ICallbackEventHandler.cs
 System.Web.UI/ICheckBoxControl.cs
 System.Web.UI/IControlBuilderAccessor.cs
 System.Web.UI/IControlDesignerAccessor.cs
+System.Web.UI/IControlTypeFilter.cs
 System.Web.UI/IDataBindingsAccessor.cs
 System.Web.UI/IDataItemContainer.cs
 System.Web.UI/IDataSource.cs
@@ -539,22 +506,31 @@ System.Web.UI/IFilterResolutionService.cs
 System.Web.UI/IgnoreUnknownContentAttribute.cs
 System.Web.UI/IHierarchicalDataSource.cs
 System.Web.UI/IHierarchicalEnumerable.cs
+System.Web.UI/IAdaptableTextWriter.cs
 System.Web.UI/IHierarchyData.cs
+System.Web.UI/IItemPaginationInfo.cs
 System.Web.UI/ImageClickEventArgs.cs
 System.Web.UI/ImageClickEventHandler.cs
+System.Web.UI.Imaging/ImageScaleMode.cs
+System.Web.UI.Imaging/ImageType.cs
+System.Web.UI.Imaging/StorageType.cs
+System.Web.UI/IMobileTextWriter.cs
 System.Web.UI/INamingContainer.cs
 System.Web.UI/INavigateUIData.cs
+System.Web.UI/IPaginationContainer.cs
+System.Web.UI/IPaginationInfo.cs
 System.Web.UI/IParserAccessor.cs
 System.Web.UI/IPostBackDataHandler.cs
 System.Web.UI/IPostBackEventHandler.cs
+System.Web.UI/IResourceResolutionService.cs
 System.Web.UI/IResourceUrlGenerator.cs
 System.Web.UI/IStateFormatter.cs
 System.Web.UI/IStateManager.cs
+System.Web.UI/IStaticTextControl.cs
 System.Web.UI/IStyleSheet.cs
 System.Web.UI/ITagNameToTypeMapper.cs
 System.Web.UI/ITemplate.cs
 System.Web.UI/ITextControl.cs
-System.Web.UI/IThemeResolutionService.cs
 System.Web.UI/IUrlResolutionService.cs
 System.Web.UI/IUserControlDesignerAccessor.cs
 System.Web.UI/IUserControlTypeResolutionService.cs
@@ -565,7 +541,6 @@ System.Web.UI/ListSourceHelper.cs
 System.Web.UI/LiteralControl.cs
 System.Web.UI/LosFormatter.cs
 System.Web.UI/MasterPage.cs
-System.Web.UI/MasterPageControlBuilder.cs
 System.Web.UI/MasterPageParser.cs
 System.Web.UI/MinimizableAttributeTypeConverter.cs
 System.Web.UI/NonVisualControlAttribute.cs
@@ -578,7 +553,6 @@ System.Web.UI/Page.cs
 System.Web.UI/PageHandlerFactory.cs
 System.Web.UI/PageParser.cs
 System.Web.UI/PageStatePersister.cs
-System.Web.UI/PageTheme.cs
 System.Web.UI/Pair.cs
 System.Web.UI/ParseChildrenAttribute.cs
 System.Web.UI/PartialCachingAttribute.cs
@@ -594,7 +568,6 @@ System.Web.UI/RootBuilder.cs
 System.Web.UI/SimpleHandlerFactory.cs
 System.Web.UI/SimplePropertyEntry.cs
 System.Web.UI/SimpleWebHandlerParser.cs
-System.Web.UI/SkinBuilder.cs
 System.Web.UI/StateBag.cs
 System.Web.UI/StateItem.cs
 System.Web.UI/StateManagedCollection.cs
@@ -603,14 +576,15 @@ System.Web.UI/SupportsEventValidationAttribute.cs
 System.Web.UI/TagPrefixAttribute.cs
 System.Web.UI/TemplateBuilder.cs
 System.Web.UI/TemplateContainerAttribute.cs
+System.Web.UI/TemplateContentType.cs
 System.Web.UI/TemplateControl.cs
 System.Web.UI/TemplateControlParser.cs
 System.Web.UI/TemplateInstance.cs
 System.Web.UI/TemplateParser.cs
 System.Web.UI/ThemeableAttribute.cs
-System.Web.UI/ThemeProvider.cs
 System.Web.UI/ToolboxDataAttribute.cs
 System.Web.UI/Triplet.cs
+System.Web.UI/TwoWayBoundPropertyEntry.cs
 System.Web.UI/UrlPropertyAttribute.cs
 System.Web.UI/UserControlControlBuilder.cs
 System.Web.UI/UserControl.cs
@@ -669,7 +643,7 @@ System.Web.UI.WebControls/CommandField.cs
 System.Web.UI.WebControls/CompareValidator.cs
 System.Web.UI.WebControls/CompositeControl.cs
 System.Web.UI.WebControls/CompositeDataBoundControl.cs
-System.Web.UI.WebControls/ContentControlBuilderInternal.cs
+System.Web.UI.WebControls/ContentControlBuilder.cs
 System.Web.UI.WebControls/Content.cs
 System.Web.UI.WebControls/ContentDirection.cs
 System.Web.UI.WebControls/ContentPlaceHolderBuilder.cs
@@ -1047,7 +1021,6 @@ System.Web.UI/WebHandlerParser.cs
 System.Web.UI/WebResourceAttribute.cs
 System.Web.UI/WebServiceParser.cs
 System.Web.UI/XhtmlMobileDocType.cs
-System.Web.UI/XhtmlTextWriter.cs
 System.Web.UI/XPathBinder.cs
 System.Web.Util/AltSerialization.cs
 System.Web.Util/DataSourceHelper.cs
diff --git a/mcs/class/System.Web/System.Web.vmwcsproj b/mcs/class/System.Web/System.Web.vmwcsproj
index 0c380a061d4..fa5264cfccd 100644
--- a/mcs/class/System.Web/System.Web.vmwcsproj
+++ b/mcs/class/System.Web/System.Web.vmwcsproj
@@ -8,48 +8,48 @@
 				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="NET_1_1;TARGET_J2EE;TARGET_JVM;GH_ONLY;ONLY_1_1" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595,169,649,67,168,219" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

 			</Settings>

 			<References>

-				<Reference Name="J2EE.Helpers" AssemblyName="J2EE.Helpers" HintPath="..\lib\J2EE.Helpers.dll" Private="False"/>

-				<Reference Name="J2SE.Helpers" AssemblyName="J2SE.Helpers" HintPath="..\lib\J2SE.Helpers.dll" Private="False"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>

-				<Reference Name="j2ee" AssemblyName="j2ee" HintPath="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\tomcat\j2ee.dll" Private="False"/>

+				<Reference Name="System.EnterpriseServices" AssemblyName="System.EnterpriseServices" Private="False"/>

+				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\lib\System.Xml.dll" Private="False"/>

+				<Reference Name="SystemDll" AssemblyName="System" HintPath="..\lib\System.dll" Private="True"/>

+				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\lib\System.Drawing.dll" Private="True"/>

+				<Reference Name="J2EE.Helpers" AssemblyName="J2EE.Helpers" HintPath="..\lib\J2EE.Helpers.dll" Private="True"/>

+				<Reference Name="J2SE.Helpers" AssemblyName="J2SE.Helpers" HintPath="..\lib\J2SE.Helpers.dll" Private="True"/>

+				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\lib\System.Data.dll" Private="False"/>

+				<Reference Name="rt" AssemblyName="rt" HintPath="..\lib\j2sdk1.4.1\rt.dll" Private="False"/>

+				<Reference Name="j2ee" AssemblyName="j2ee" HintPath="..\lib\j2ee.dll"/>

 			</References>

 		</Build>

 		<Files>

 			<Include>

-				<File RelPath="browscap.ini" Link="..\..\..\mono\data\browscap.ini" BuildAction="EmbeddedResource"/>

-				<File RelPath="Consts.cs.in" Link="..\..\build\common\Consts.cs.in" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="jar.resources" BuildAction="None"/>

 				<File RelPath="Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="Consts.cs" Link="..\..\build\common\Consts.cs.in" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Mail\ChangeLog" BuildAction="None"/>

 				<File RelPath="Assembly\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="resources\WebUIValidation.js" BuildAction="EmbeddedResource"/>

 				<File RelPath="System.Web\ApplicationShutdownReason.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\BeginEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\BrowserCapabilities.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\CapabilitiesLoader.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web\DefaultHttpHandler.cs" BuildAction="Compile"/>

 				<File RelPath="System.Web\EndEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HtmlizedException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpApplication.jvm.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpApplicationFactory.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpApplicationState.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpBrowserCapabilities.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web\HttpCacheability.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCachePolicy.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCacheRevalidation.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCacheValidateHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCacheVaryByHeaders.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCacheVaryByParams.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web\HttpCacheability.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpClientCertificate.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCompileException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpContext.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCookie.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCookieCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpCookieMode.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web\HttpDataTransferMode.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpFileCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpForbiddenHandler.cs" SubType="Code" BuildAction="Compile"/>

@@ -58,6 +58,7 @@
 				<File RelPath="System.Web\HttpParseException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpPostedFile.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpRequest.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web\HttpRequestPriority.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpRequestValidationException.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpResponse.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\HttpResponseHeader.cs" SubType="Code" BuildAction="Compile"/>

@@ -75,10 +76,8 @@
 				<File RelPath="System.Web\IHttpHandlerFactory.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\IHttpMapPath.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\IHttpModule.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web\InputFilterStream.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\MimeTypes.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\NoParamsInvoker.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web\OutputFilterStream.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\ParserError.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\ParserErrorCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\ProcessInfo.cs" SubType="Code" BuildAction="Compile"/>

@@ -104,25 +103,42 @@
 				<File RelPath="System.Web\WebROCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\WebSysDescriptionAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web\XmlSiteMapProvider.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Administration\WebAdminUserControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Caching\Cache.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Caching\CacheDependency.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Caching\CachedRawResponse.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Caching\CachedVaryBy.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Caching\CacheItemPriority.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Caching\CacheItemRemovedCallback.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Caching\CacheItemRemovedReason.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Caching\CachedRawResponse.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Caching\CachedVaryBy.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Caching\OutputCacheModule.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Compilation\ILocation.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Compilation\Location.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Compilation\ParseException.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\AdapterDictionary.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\AnonymousIdentificationSection.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\AssemblyCollection.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\AuthConfig.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\AuthenticationConfigHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\AuthenticationMode.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\AuthenticationSection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\AuthorizationConfig.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\AuthorizationConfigHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\AuthorizationRuleAction.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\BuildProvider.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\BuildProviderAppliesTo.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\BuildProviderCollection.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\CodeSubDirectoriesCollection.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\CodeSubDirectory.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\CompilationSection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\Compiler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\CustomErrorsConfigHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\CustomErrorsMode.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\ExpressionBuilder.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\ExpressionBuilderCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\FormsAuthPasswordFormat.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\FormsAuthenticationConfiguration.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\FormsProtectionEnum.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\GlobalizationConfiguration.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\GlobalizationConfigurationHandler.cs" SubType="Code" BuildAction="Compile"/>

@@ -133,26 +149,43 @@
 				<File RelPath="System.Web.Configuration\HttpModulesConfigurationHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\HttpRuntimeConfig.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\HttpRuntimeConfigurationHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\IRemoteWebConfigurationHostServer.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\InternalSection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\MachineKeyConfig.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\MachineKeyConfigHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\MachineKeyValidation.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\MembershipSection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\ModulesConfiguration.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\PagesConfiguration.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\PagesConfigurationHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\PagesEnableSessionState.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\PagesToCountAction.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\ProcessModelComAuthenticationLevel.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\ProcessModelComImpersonationLevel.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\ProcessModelLogLevel.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\SerializationMode.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\SiteMapSection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\TraceConfig.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\TraceConfigurationHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\TraceDisplayMode.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\VirtualDirectoryMapping.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\VirtualDirectoryMappingCollection.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\WebConfigurationFileMap.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\WebConfigurationHost.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Configuration\WebConfigurationManager.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\WebConfigurationSettings.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Configuration\WebControlsSectionHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Handlers\AssemblyResourceLoader.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Handlers\TraceHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Hosting\ApplicationInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Hosting\ApplicationManager.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Hosting\AppManagerAppDomainFactory.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Hosting\DefaultVirtualDirectory.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Hosting\DefaultVirtualFile.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.Hosting\DefaultVirtualPathProvider.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Hosting\IAppDomainFactory.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Hosting\IAppManagerAppDomainFactory.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IApplicationHost.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IHttpWorkerRequestHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IProcessHost.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IProcessHostFactoryHelper.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IProcessHostSupportFunction.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IProcessPingCallback.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Hosting\IQueueHost.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Hosting\IRegisteredObject.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Hosting\ServletWorkerRequest.jvm.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Hosting\SimpleWorkerRequest.cs" SubType="Code" BuildAction="Compile"/>

@@ -160,8 +193,6 @@
 				<File RelPath="System.Web.J2EE\BaseStaticHttpServlet.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.J2EE\J2EEConsts.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.J2EE\J2EEUtils.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.J2EE\ObjectInputStream.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.J2EE\ObjectOutputStream.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.J2EE\PageMapper.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.J2EE\SessionListener.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Mail\Base64AttachmentEncoder.cs" SubType="Code" BuildAction="Compile"/>

@@ -258,7 +289,6 @@
 				<File RelPath="System.Web.SessionState\StateServerItem.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\AttributeCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\BasePartialCachingControl.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\BaseTemplateParser.cs" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\BoundPropertyEntry.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\BuildMethod.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\BuildTemplateMethod.cs" SubType="Code" BuildAction="Compile"/>

@@ -289,8 +319,8 @@
 				<File RelPath="System.Web.UI\DataSourceView.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\DataSourceViewOperationCallback.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\DataSourceViewSelectCallback.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\DesignerDataBoundLiteralControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\DesignTimeParseData.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\DesignerDataBoundLiteralControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\EmptyControlCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ExpressionBinding.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ExpressionBindingCollection.cs" SubType="Code" BuildAction="Compile"/>

@@ -304,35 +334,40 @@
 				<File RelPath="System.Web.UI\HtmlTextWriterAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\HtmlTextWriterStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\HtmlTextWriterTag.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IAdaptableTextWriter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IAttributeAccessor.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IBindableTemplate.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ICallbackEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ICheckBoxControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IControlBuilderAccessor.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IControlDesignerAccessor.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IControlTypeFilter.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IDReferencePropertyAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IDataBindingsAccessor.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IDataItemContainer.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IDataSource.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IDataSourceViewSchemaAccessor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\IDReferencePropertyAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IEditableTextControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IExpressionsAccessor.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IFilterResolutionService.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\IgnoreUnknownContentAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IHierarchicalDataSource.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IHierarchicalEnumerable.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IHierarchyData.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\ImageClickEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\ImageClickEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IItemPaginationInfo.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IMobileTextWriter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\INamingContainer.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\INavigateUIData.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IPageHeader.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IPaginationContainer.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IPaginationInfo.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IParserAccessor.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IPostBackDataHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IPostBackEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IResourceResolutionService.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IResourceUrlGenerator.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IStateFormatter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IStateManager.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IStaticTextControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IStyleSheet.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ITagNameToTypeMapper.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ITemplate.cs" SubType="Code" BuildAction="Compile"/>

@@ -341,13 +376,15 @@
 				<File RelPath="System.Web.UI\IUserControlDesignerAccessor.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IUserControlTypeResolutionService.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\IValidator.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\IgnoreUnknownContentAttribute.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\ImageClickEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\ImageClickEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\KeyedList.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\KeyedListEnumerator.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ListSourceHelper.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\LiteralControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\LosFormatter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\MasterPage.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\MasterPageControlBuilder.cs" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\MasterPageParser.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\NonVisualControlAttribute.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\ObjectConverter.cs" SubType="Code" BuildAction="Compile"/>

@@ -393,8 +430,8 @@
 				<File RelPath="System.Web.UI\VerificationReportLevel.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\VerificationRule.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\WebResourceAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI\XhtmlMobileDocType.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI\XPathBinder.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI\XhtmlMobileDocType.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.Adapters\ControlAdapter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.Adapters\PageAdapter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.Adapters\WmlPostFieldType.cs" SubType="Code" BuildAction="Compile"/>

@@ -428,6 +465,9 @@
 				<File RelPath="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.HtmlControls\HtmlTextArea.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.HtmlControls\HtmlTitle.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.Imaging\ImageScaleMode.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.Imaging\ImageType.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.Imaging\StorageType.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\AccessDataSource.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\AccessDataSourceView.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\AdCreatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

@@ -446,11 +486,11 @@
 				<File RelPath="System.Web.UI.WebControls\BorderStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\BoundColumn.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\BoundField.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\BulletStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\BulletedList.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\BulletedListDisplayMode.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\BulletedListEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\BulletedListEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\BulletStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\Button.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ButtonColumn.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ButtonColumnType.cs" SubType="Code" BuildAction="Compile"/>

@@ -472,7 +512,7 @@
 				<File RelPath="System.Web.UI.WebControls\CompositeControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\CompositeDataBoundControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\Content.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\ContentControlBuilder.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ContentDirection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ContentPlaceHolder.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" SubType="Code" BuildAction="Compile"/>

@@ -504,7 +544,7 @@
 				<File RelPath="System.Web.UI.WebControls\DataGridItemEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DataGridPagerStyle.cs" SubType="Component" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DataGridPagerStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DataKey.cs" SubType="Code" BuildAction="Compile"/>

@@ -523,14 +563,14 @@
 				<File RelPath="System.Web.UI.WebControls\DetailsView.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewMode.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" SubType="Code" BuildAction="Compile"/>

@@ -538,10 +578,10 @@
 				<File RelPath="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewRow.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewRowCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\DropDownList.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\EditCommandColumn.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FirstDayOfWeek.cs" SubType="Code" BuildAction="Compile"/>

@@ -554,34 +594,34 @@
 				<File RelPath="System.Web.UI.WebControls\FormView.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewMode.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewModeEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewModeEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewPageEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewPageEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewRow.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridLines.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridView.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewEditEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewEditEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewPageEventArgs.cs" SubType="Code" BuildAction="Compile"/>

@@ -594,10 +634,10 @@
 				<File RelPath="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewSortEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewSortEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\HiddenField.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\HorizontalAlign.cs" SubType="Code" BuildAction="Compile"/>

@@ -612,6 +652,8 @@
 				<File RelPath="System.Web.UI.WebControls\IButtonControl.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ICallbackContainer.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\IPostBackContainer.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\IRepeatInfoUser.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\Image.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ImageAlign.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ImageButton.cs" SubType="Code" BuildAction="Compile"/>

@@ -619,8 +661,6 @@
 				<File RelPath="System.Web.UI.WebControls\ImageMap.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ImageMapEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\ImageMapEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\IPostBackContainer.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\IRepeatInfoUser.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\Label.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\LabelControlBuilder.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\LinkButton.cs" SubType="Code" BuildAction="Compile"/>

@@ -695,6 +735,8 @@
 				<File RelPath="System.Web.UI.WebControls\RectangleHotSpot.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RegularExpressionValidator.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RepeatDirection.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\RepeatInfo.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\RepeatLayout.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\Repeater.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" SubType="Code" BuildAction="Compile"/>

@@ -702,8 +744,6 @@
 				<File RelPath="System.Web.UI.WebControls\RepeaterItemCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\RepeatInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\RepeatLayout.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RequiredFieldValidator.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RoleGroup.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\RoleGroupCollection.cs" SubType="Code" BuildAction="Compile"/>

@@ -737,7 +777,7 @@
 				<File RelPath="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\SqlDataSourceView.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\StringArrayConverter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\Style.cs" SubType="Component" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\Style.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\SubMenuStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\SubMenuStyleCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\Table.cs" SubType="Code" BuildAction="Compile"/>

@@ -749,12 +789,12 @@
 				<File RelPath="System.Web.UI.WebControls\TableHeaderCell.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TableHeaderRow.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TableHeaderScope.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\TableItemStyle.cs" SubType="Component" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\TableItemStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TableRow.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TableRowCollection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TableRowSection.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TableSectionStyle.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System.Web.UI.WebControls\TableStyle.cs" SubType="Component" BuildAction="Compile"/>

+				<File RelPath="System.Web.UI.WebControls\TableStyle.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TargetConverter.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TemplateColumn.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.UI.WebControls\TemplateField.cs" SubType="Code" BuildAction="Compile"/>

@@ -856,6 +896,7 @@
 				<File RelPath="System.Web.Util\StrUtils.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Util\TimeUtil.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Util\TransactedCallback.cs" SubType="Code" BuildAction="Compile"/>

+				<File RelPath="System.Web.Util\Transactions.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Util\UrlUtils.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Util\WebEncoding.cs" SubType="Code" BuildAction="Compile"/>

 				<File RelPath="System.Web.Util\WebTrace.cs" SubType="Code" BuildAction="Compile"/>

@@ -863,6 +904,6 @@
 				<File RelPath="System.Web.Util\WorkItemCallback.cs" SubType="Code" BuildAction="Compile"/>

 			</Include>

 		</Files>

-		<UserProperties project.AppServerType="tomcat" REFS.JarPath.System.Xml="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.vmwutils="..\lib\vmwutils.jar" REFS.JarPath.System.Data="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.rt="..\lib\rt.jar" REFS.JarPath.j2ee="C:\Program Files\Mainsoft\Visual MainWin for J2EE\jakarta-tomcat\server\lib\catalina.jar;C:\Program Files\Mainsoft\Visual MainWin for J2EE\jakarta-tomcat\common\lib\servlet-api.jar" REFS.JarPath.System="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" project.JDKType="1.5.0_05" REFS.JarPath.j2se.helpers="..\lib\J2SE.Helpers.jar" REFS.JarPath.j2ee.helpers="..\lib\J2EE.Helpers.jar" REFS.JarPath.System.Drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_imageio.jar" jarserver="ipa"/>

+		<UserProperties REFS.JarPath.System.Drawing="..\lib\System.Drawing.jar" REFS.JarPath.j2ee.helpers="..\lib\J2EE.Helpers.jar" REFS.JarPath.j2se.helpers="..\lib\J2SE.Helpers.jar" project.JDKType="1.4.2_05" REFS.JarPath.System="..\lib\System.jar" REFS.JarPath.j2ee="..\lib\j2ee.jar" REFS.JarPath.rt="..\lib\rt.jar" REFS.JarPath.System.Data="..\lib\System.Data.jar" REFS.JarPath.vmwutils="..\lib\vmwutils.jar" REFS.JarPath.System.Xml="..\lib\System.Xml.jar" jarserver="ip2"/>

 	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="2" ApplicationServerType="tomcat" AppServerDefaultName="localhost:8080"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="3" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="yen" Prop2014="8009" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="3" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="yen" Prop2014="8007" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Release"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="8000" Prop2016="" Prop2027="" Prop2019="-1" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

+	<VisualMainWin><Project Prop2023="1.4.2_05" Prop2024="" Prop2026="" Prop2015="" Version="1.6.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="3" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="yen" Prop2014="8009" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="3" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="yen" Prop2014="8007" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Release"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="8000" Prop2016="" Prop2027="" Prop2019="-1" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Web/System.Web/ApplicationShutdownReason.cs b/mcs/class/System.Web/System.Web/ApplicationShutdownReason.cs
index 758af298496..603651effc6 100644
--- a/mcs/class/System.Web/System.Web/ApplicationShutdownReason.cs
+++ b/mcs/class/System.Web/System.Web/ApplicationShutdownReason.cs
@@ -29,6 +29,7 @@
 #if NET_2_0
 namespace System.Web
 {
+        [Serializable]
         public enum ApplicationShutdownReason
         {
                 None = 0,
@@ -49,4 +50,3 @@ namespace System.Web
         }
 }
 #endif
-
diff --git a/mcs/class/System.Web/System.Web/BrowserCapabilities.cs b/mcs/class/System.Web/System.Web/BrowserCapabilities.cs
index d4b95f660fa..1e219c54be9 100644
--- a/mcs/class/System.Web/System.Web/BrowserCapabilities.cs
+++ b/mcs/class/System.Web/System.Web/BrowserCapabilities.cs
@@ -33,7 +33,6 @@ using System.Collections;
 using System.Globalization;
 using System.Web.Configuration;
 using System.Web.UI;
-using System.Security.Permissions;
 
 #if NET_2_0
 namespace System.Web.Configuration {
@@ -41,9 +40,7 @@ namespace System.Web.Configuration {
 #else
 
 namespace System.Web {
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpBrowserCapabilities : HttpCapabilitiesBase
+	public partial class HttpBrowserCapabilities : HttpCapabilitiesBase
 #endif
 	{
 		const int HaveActiveXControls = 1;
@@ -99,12 +96,6 @@ namespace System.Web {
 		Version [] clrVersions;
 		internal string useragent;
 
-#if !NET_2_0
-		public HttpBrowserCapabilities ()
-		{
-		}
-#endif
-
 		public bool ActiveXControls {
 			get {
 				if (!Get (HaveActiveXControls)) {
diff --git a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
index c21cac8dfb8..f6e1f03dfd4 100644
--- a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
+++ b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
@@ -184,11 +184,7 @@ namespace System.Web
 #if TARGET_J2EE
 				string filepath = "browscap.ini";
 #else
-#if NET_2_0
-				string dir = Path.GetDirectoryName (WebConfigurationManager.OpenMachineConfiguration().FilePath);
-#else
 				string dir = Path.GetDirectoryName (WebConfigurationSettings.MachineConfigPath);
-#endif
 				string filepath = Path.Combine (dir, "browscap.ini");
 				if (!File.Exists (filepath)) {
 					// try removing the trailing version directory
@@ -214,13 +210,7 @@ namespace System.Web
 					AppDomain.CurrentDomain.GetData("GH_ContextClassLoader");
 				if (cl == null)
 					return null;
-
-				string custom = String.Concat("browscap/", filename);
-				
-				java.io.InputStream inputStream = cl.getResourceAsStream(custom);
-				if (inputStream == null)
-					inputStream = cl.getResourceAsStream(filename);
-
+				java.io.InputStream inputStream = cl.getResourceAsStream(filename);
 				s = (Stream)vmw.common.IOUtils.getStream(inputStream);
 			}
 			catch (Exception e)
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index f5d79e55ac4..db59d588b71 100644
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,70 +1,3 @@
-2006-02-28  Chris Toshok  <toshok@ximian.com>
-
-	* HttpCookieMode.cs: corcompare work.
-
-	* ProcessShutdownReason.cs: same.
-
-	* SiteMapNodeCollection.cs: same.
-
-	* SiteMapNode.cs: same.
-
-	* SiteMapProvider.cs: same.
-
-	* HttpCacheRevalidation.cs: same.
-
-	* HttpCacheability.cs: same.
-
-	* StaticSiteMapProvider.cs: same.
-
-	* HttpValidationStatus.cs: same.
-	
-2006-02-06 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* DefaultHttpHandler.cs: New file.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* SiteMap.cs: use GetSection instead of GetWebApplicationSection.
-
-2006-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* HttpApplication.cs: CONFIGURATION_2_0 => NET_2_0, and use
-	GetSection instead of GetWebApplicationSection.
-
-	* HttpApplication.jvm.cs: same.
-	
-	* HttpApplicationFactory.cs: same.
-
-	* HttpContext.cs: same.
-
-	* CapabilitiesLoader.cs: same.
-
-	* QueueManager.cs: same.
-
-	* HttpRuntime.cs: same.
-
-	* TraceManager.cs: same.
-
-	* HttpRequest.cs: same.
-	
-2006-01-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* HttpApplication.cs: keep any exception that happens during
-	initialization.
-
-2006-01-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* HttpDataTransferMode.cs: Removed file.
-	* HttpRequestPriority.cs: Removed file.
-	* ApplicationShutdownReason.cs:
-	* SiteMap.cs:
-	* HttpRuntime.cs:
-	* HttpApplication.cs: minor class status fixes.
-
-2006-01-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* VirtualPathUtility.cs: done with all the not implemented methods.
-
 2006-01-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpResponse.cs: use UInt64.Parse for content length. In AppendHeader,
@@ -74,52 +7,11 @@
 	* HttpCacheVaryByParams.cs: if there are no params, return null.
 	Otherwise we get an empty 'Vary' header.
 
-2006-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* HttpApplication.cs (Start): wrap InitOnce in a try/catch block,
-	and if there's a configuration error, output it and end things
-	immediately.
-
 2006-01-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpRequest.cs: fixed the file path when RewritePath is used. Also
 	add the PathInfo to the Url. Fixes bug #77291.
 
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* HttpRequest.cs (ReadBoundary): remove two unused variables to
-	quiet mcs.
-	(IsBoundary): remove unused method.
-
-	* MimeTypes.cs (.cctor): use a 2.0 friendly form of the Hashtable
-	ctor to silence a warning.
-
-	* HttpCacheVaryByHeaders.cs (.ctor): same.
-
-	* HttpCacheVaryByParams.cs (.ctor): same.
-
-	* StaticSiteMapProvider.cs (UrlToNode): same.
-
-2006-01-22  Konstantin Triger <kostat@mainsoft.com>
-
-	* HttpWorkerRequest.cs: ensure case insensitivity in header search.
-
-2006-01-19  Konstantin Triger <kostat@mainsoft.com>
-
-	* HttpApplication.jvm.cs: merge HttpApplication.cs changes.
-
-2006-01-17  Chris Toshok  <toshok@ximian.com>
-
-	* CapabilitiesLoader.cs (Init): use WebConfigurationManager in the
-	CONFIGURATION_2_0 case.
-
-	* HttpRuntime.cs (MachineConfigurationDirectory): same.
-
-2006-01-16  Chris Toshok  <toshok@ximian.com>
-
-	* HttpApplicationFactory.cs: call WebConfigurationManager.Init in
-	the CONFIGURATION_2_0 case.
-
 2006-01-13 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpWriter.cs: made Write (char) less memory hungry. Thanks to Mike
@@ -131,16 +23,6 @@
 
 2006-01-11  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
-	* HttpResponse.cs: removed TARGET_JVM block from End
-	* GetJavaTextReader: Merged TARGET_JVM block from LoadFile
-	to GetJavaTextReader
-
-2006-01-11  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* HttpRequest.cs: removed TARGET_JVM block from MapPath
-
-2006-01-11  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
 	* HttpRequest.cs: little fix in MapPath(), virtualPath.Replace
 	return value wasnt stored.
 
@@ -155,23 +37,6 @@
 	can still be retrieved through HttpContext.Current.blah). Fixes
 	bug #77162.
 
-2006-01-09  Vladimir Krasnov <vladimirk@mainsoft.com>
-
-	* CapabilitiesLoader.cs: Merged TARGET_JVM parts in LoadFile
-	from /main/9
-	* HttpException.cs: Merged TARGET_JVM parts in GetHtmlizedErrorMessage
-	from /main/13
-	* HttpRequest.cs: Merged TARGET_JVM parts in MapPath from /main/29
-	* HttpResponse.cs: Merged TARGET_JVM parts in End() from /main/30
-	* StaticFileHandler.cs: Merged TARGET_JVM parts in ProcessRequest
-	from /main/7
-
-2006-01-08  Konstantin Triger <kostat@mainsoft.com>
-
-	* BrowserCapabilities.cs, HttpBrowserCapabilities.cs,
-	HttpResponseStream.cs: TARGET_JVM changes to let the compilation
-	pass with csc 1.1.
-
 2006-01-04  Chris Toshok  <toshok@ximian.com>
 
 	* HttpContext.cs (IsCustomErrorEnabled): add CONFIGURATION_2_0
diff --git a/mcs/class/System.Web/System.Web/DefaultHttpHandler.cs b/mcs/class/System.Web/System.Web/DefaultHttpHandler.cs
deleted file mode 100644
index 1636415efb2..00000000000
--- a/mcs/class/System.Web/System.Web/DefaultHttpHandler.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// System.Web.DefaultHttpHandler
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System.Collections.Specialized;
-
-namespace System.Web {
-	public class DefaultHttpHandler : IHttpAsyncHandler {
-		HttpContext context;
-
-		protected HttpContext Context {
-			get { return context; }
-		}
-
-		public virtual bool IsReusable {
-			get { return false; }
-		}
-
-		[MonoTODO]
-		protected NameValueCollection ExecuteUrlHeaders {
-			get { return null; }
-		}
-
-		[MonoTODO]
-		public virtual IAsyncResult BeginProcessRequest (HttpContext context, AsyncCallback callback, object state)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public virtual void EndProcessRequest (IAsyncResult result)
-		{
-		}
-
-		[MonoTODO]
-		public virtual void ProcessRequest (HttpContext context)
-		{
-		}
-
-		public virtual void OnExecuteUrlPreconditionFailure ()
-		{
-		}
-
-		public virtual string OverrideExecuteUrlPath ()
-		{
-			return null;
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/System.Web/HttpApplication.cs b/mcs/class/System.Web/System.Web/HttpApplication.cs
index 2786b890dc0..61db77d0dfb 100644
--- a/mcs/class/System.Web/System.Web/HttpApplication.cs
+++ b/mcs/class/System.Web/System.Web/HttpApplication.cs
@@ -65,7 +65,6 @@
 using System.IO;
 using System.Collections;
 using System.ComponentModel;
-using System.Configuration;
 using System.Globalization;
 using System.Security.Permissions;
 using System.Security.Principal;
@@ -124,9 +123,6 @@ namespace System.Web {
 		CultureInfo prev_app_culture;
 		CultureInfo prev_appui_culture;
 		IPrincipal prev_user;
-#if NET_2_0
-		static Exception initialization_exception;
-#endif
 
 		//
 		// These are used to detect the case where the EndXXX method is invoked
@@ -147,9 +143,9 @@ namespace System.Web {
 				if (modcoll != null)
 					return;
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 				HttpModulesSection modules;
-				modules = (HttpModulesSection) WebConfigurationManager.GetSection ("system.web/httpModules");
+				modules = (HttpModulesSection) WebConfigurationManager.GetWebApplicationSection ("system.web/httpModules");
 #else
 				ModulesConfiguration modules;
 
@@ -161,9 +157,9 @@ namespace System.Web {
 				if (full_init)
 					HttpApplicationFactory.AttachEvents (this);
 
-#if NET_2_0
+#if CONFIGURATION_2_0
 				GlobalizationSection cfg;
-				cfg = (GlobalizationSection) WebConfigurationManager.GetSection ("system.web/globalization");
+				cfg = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization");
 				app_culture = cfg.GetCulture();
 				appui_culture = cfg.GetUICulture();
 #else
@@ -185,12 +181,6 @@ namespace System.Web {
 			}
 		}
 
-#if NET_2_0
-		internal static Exception InitializationException {
-			get { return initialization_exception; }
-		}
-#endif
-
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public HttpApplicationState Application {
@@ -287,11 +277,7 @@ namespace System.Web {
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#if NET_2_0
-		public ISite Site {
-#else
 		public virtual ISite Site {
-#endif
 			get {
 				return isite;
 			}
@@ -1026,16 +1012,7 @@ namespace System.Web {
 
 		void Start (object x)
 		{
-			try {
-				InitOnce (true);
-			} catch (Exception e) {
-#if NET_2_0
-				initialization_exception = e;
-#endif
-				FinalErrorWrite (context.Response, new HttpException ("", e).GetHtmlErrorMessage ());
-				return;
-			}
-
+			InitOnce (true);
 			PreStart ();
 			pipeline = Pipeline ();
 			Tick ();
@@ -1049,8 +1026,8 @@ namespace System.Web {
 			string url = request.FilePath;
 			
 			IHttpHandler handler = null;
-#if NET_2_0
-			HttpHandlersSection section = (HttpHandlersSection) WebConfigurationManager.GetSection ("system.web/httpHandlers");
+#if CONFIGURATION_2_0
+			HttpHandlersSection section = (HttpHandlersSection) WebConfigurationManager.GetWebApplicationSection ("system.web/httpHandlers");
 			object o = section.LocateHandler (verb, url);
 #else
 			HandlerFactoryConfiguration factory_config = (HandlerFactoryConfiguration) HttpContext.GetAppConfig ("system.web/httpHandlers");
@@ -1146,8 +1123,8 @@ namespace System.Web {
 			if (!context.IsCustomErrorEnabled)
 				return false;
 			
-#if NET_2_0
-			CustomErrorsSection config = (CustomErrorsSection)WebConfigurationManager.GetSection ("system.web/customErrors");
+#if CONFIGURATION_2_0
+			CustomErrorsSection config = (CustomErrorsSection)WebConfigurationManager.GetWebApplicationSection ("system.web/customErrors");
 #else
 			CustomErrorsConfig config = null;
 			try {
@@ -1162,7 +1139,7 @@ namespace System.Web {
 				return false;
 			}
 			
-#if NET_2_0
+#if CONFIGURATION_2_0
 			CustomError err = config.Errors [context.Response.StatusCode.ToString()];
 			string redirect = err == null ? null : err.Redirect;
 #else
diff --git a/mcs/class/System.Web/System.Web/HttpApplication.jvm.cs b/mcs/class/System.Web/System.Web/HttpApplication.jvm.cs
index c356aa9bb7c..98bd4c07efe 100644
--- a/mcs/class/System.Web/System.Web/HttpApplication.jvm.cs
+++ b/mcs/class/System.Web/System.Web/HttpApplication.jvm.cs
@@ -143,33 +143,19 @@ namespace System.Web {
 				if (modcoll != null)
 					return;
 
-#if NET_2_0
-				HttpModulesSection modules;
-				modules = (HttpModulesSection) WebConfigurationManager.GetSection ("system.web/httpModules");
-#else
 				ModulesConfiguration modules;
-
 				modules = (ModulesConfiguration) HttpContext.GetAppConfig ("system.web/httpModules");
-#endif
 
 				modcoll = modules.LoadModules (this);
 
 				if (full_init)
 					HttpApplicationFactory.AttachEvents (this);
 
-#if NET_2_0
-				GlobalizationSection cfg;
-				cfg = (GlobalizationSection) WebConfigurationManager.GetSection ("system.web/globalization");
-				app_culture = cfg.GetCulture();
-				appui_culture = cfg.GetUICulture();
-#else
-				GlobalizationConfiguration cfg;
-				cfg = GlobalizationConfiguration.GetInstance (null);
+				GlobalizationConfiguration cfg = GlobalizationConfiguration.GetInstance (null);
 				if (cfg != null) {
 					app_culture = cfg.Culture;
 					appui_culture = cfg.UICulture;
 				}
-#endif
 			}
 		}
 
@@ -224,10 +210,6 @@ namespace System.Web {
 			get {
 				if (context == null)
 					throw new HttpException (Locale.GetText ("No context is available."));
-
-				if (false == HttpApplicationFactory.ContextAvailable)
-					throw new HttpException (Locale.GetText ("Request is not available in this context."));
-
 				return context.Request;
 			}
 		}
@@ -238,10 +220,6 @@ namespace System.Web {
 			get {
 				if (context == null)
 					throw new HttpException (Locale.GetText ("No context is available."));
-
-				if (false == HttpApplicationFactory.ContextAvailable)
-					throw new HttpException (Locale.GetText ("Response is not available in this context."));
-
 				return context.Response;
 			}
 		}
@@ -546,10 +524,6 @@ namespace System.Web {
 			stop_processing = true;
 		}
 
-		internal bool RequestCompleted {
-			set { stop_processing = value; }
-		}
-
 		public virtual void Dispose ()
 		{
 			if (modcoll != null) {
@@ -589,9 +563,6 @@ namespace System.Web {
 				if (Error != null){
 					try {
 						Error (this, EventArgs.Empty);
-					} catch (ThreadAbortException ee){
-						// This happens on Redirect() or End()
-						Thread.ResetAbort ();
 					} catch (Exception ee){
 						context.AddError (ee);
 					}
@@ -606,12 +577,15 @@ namespace System.Web {
 		void Tick ()
 		{
 			try {
-				if (pipeline.MoveNext ()){
-					if ((bool)pipeline.Current)
+				// FIXME: We should use 'if' instead of 'while'!!
+				while (pipeline.MoveNext ()){
+					if ((bool)pipeline.Current) {
 						PipelineDone ();
+						break;
+					}
 				}
 			} catch (Exception e) {
-				Console.WriteLine ("Tick caught an exception that has not been propagated:\n" + e);
+				Console.WriteLine ("Tick caught an exception that has not been propagated:\n" + e.GetType().FullName + e.Message + e.StackTrace);
 			}
 		}
 
@@ -652,14 +626,13 @@ namespace System.Web {
 			
 			Resume ();
 		}
-		
+
 		//
 		// This enumerator yields whether processing must be stopped:
 		//    true:  processing of the pipeline must be stopped
 		//    false: processing of the pipeline must not be stopped
 		//
-#if TARGET_JVM && !NET_2_0
-		sealed class RunHooksEnumerator : IEnumerable, IEnumerator
+		internal class RunHooksEnumerator : IEnumerable, IEnumerator
 		{
 			Delegate [] delegates;
 			int currentStep = 0;
@@ -671,13 +644,13 @@ namespace System.Web {
 				delegates = list.GetInvocationList ();
 			}
 
-			public IEnumerator GetEnumerator() { return this; }
-			public object Current { get{ return app.stop_processing; } }
-			public void Reset()
+			public virtual IEnumerator GetEnumerator() { return this; }
+			public virtual object Current { get{ return app.stop_processing; } }
+			public virtual void Reset()
 			{
 				throw new NotImplementedException("HttpApplication.RunHooksEnumerator.Reset called.");
 			}
-			public bool MoveNext ()
+			public virtual bool MoveNext ()
 			{
 				while (currentStep < delegates.Length) {
 					if (ProcessDelegate((EventHandler)delegates[currentStep++]))
@@ -749,62 +722,6 @@ namespace System.Web {
 		{
 			return new RunHooksEnumerator(this, list);
 		}
-#else
-		IEnumerable RunHooks (Delegate list)
-		{
-			Delegate [] delegates = list.GetInvocationList ();
-
-			foreach (EventHandler d in delegates){
-				if (d.Target != null && (d.Target is AsyncInvoker)){
-					current_ai = (AsyncInvoker) d.Target;
-
-					try {
-						must_yield = true;
-						in_begin = true;
-						context.BeginTimeoutPossible ();
-						current_ai.begin (this, EventArgs.Empty, async_callback_completed_cb, current_ai.data);
-					} catch (ThreadAbortException taex){
-						object obj = taex.ExceptionState;
-						Thread.ResetAbort ();
-						stop_processing = true;
-						if (obj is StepTimeout)
-							ProcessError (new HttpException ("The request timed out."));
-					} catch (Exception e){
-						ProcessError (e);
-					} finally {
-						in_begin = false;
-						context.EndTimeoutPossible ();
-					}
-
-					//
-					// If things are still moving forward, yield this
-					// thread now
-					//
-					if (must_yield)
-						yield return stop_processing;
-					else if (stop_processing)
-						yield return true;
-				} else {
-					try {
-						context.BeginTimeoutPossible ();
-						d (this, EventArgs.Empty);
-					} catch (ThreadAbortException taex){
-						object obj = taex.ExceptionState;
-						Thread.ResetAbort ();
-						stop_processing = true;
-						if (obj is StepTimeout)
-							ProcessError (new HttpException ("The request timed out."));
-					} catch (Exception e){
-						ProcessError (e);
-					} finally {
-						context.EndTimeoutPossible ();
-					}
-					if (stop_processing)
-						yield return true;
-				}
-			}
-		}
-#endif
 
 		static void FinalErrorWrite (HttpResponse response, string error)
 		{
@@ -899,544 +816,213 @@ namespace System.Web {
 			PostDone ();
 		}
 
-		//
-		// Events fired as described in `Http Runtime Support, HttpModules,
-		// Handling Public Events'
-		//
-#if TARGET_JVM && !NET_2_0
-		sealed class PipeLineEnumerator : IEnumerator
+		class PipeLineEnumerator : IEnumerator
 		{
-			readonly HttpApplication _this;
-
-			object current;
-			int currentYield;
-			IEnumerator currentEnumerator;
-
+			HttpApplication app;
+			IEnumerator currentEnumerator = null;
+			int currentStep = 0;
+			bool pipelineFinished = false;
 			IHttpHandler handler = null;
+			bool currentVal;
+			InternalStepDelegate AllocateHandlerDel;
+			InternalStepDelegate ProcessHandlerDel;
+			InternalStepDelegate ReleaseHandlerDel;
 
-			internal PipeLineEnumerator(HttpApplication app) {
-				_this = app;
-			}
+			// true means that we need to yield and return the current value;
+			// false means that we need to go on to the next delegate and return
+			// values from there.
+			delegate bool InternalStepDelegate();
 
-			public object Current { get{ return currentEnumerator != null ? currentEnumerator.Current : current; } }
-			public void Reset() {
-				currentEnumerator = null;
-				currentYield = 0;
+			internal PipeLineEnumerator(HttpApplication app)
+			{
+				this.app = app;
+				AllocateHandlerDel = new InternalStepDelegate(AllocateHandler);
+				ProcessHandlerDel = new InternalStepDelegate(ProcessHandler);
+				ReleaseHandlerDel = new InternalStepDelegate(ReleaseHandler);
 			}
 
-			void ResetEnumerator() {
-				if (currentEnumerator != null) {
-					current = currentEnumerator.Current;
-					currentEnumerator = null;
+			public virtual object Current
+			{
+				get
+				{
+					if (currentEnumerator != null)
+						return currentEnumerator.Current;
+					return currentVal;
 				}
 			}
 
-			public bool MoveNext () {
-				switch (currentYield) {
-					case 0: break;
-					case 1: goto yield_1;
-					case 2: goto yield_2;
-					case 3: goto yield_3;
-					case 4: goto yield_4;
-#if NET_2_0
-					case 5: goto yield_5;
-#endif
-					case 6: goto yield_6;
-#if NET_2_0
-					case 7: goto yield_7;
-#endif
-					case 8: goto yield_8;
-					case 9: goto yield_9;
-#if NET_2_0
-					case 10: goto yield_10;
-					case 11: goto yield_11;
-#endif
-					case 12: goto yield_12;
-#if NET_2_0
-					case 13: goto yield_13;
-#endif
-					case 14: goto yield_14;
-					case 15: goto yield_15;
-#if NET_2_0
-					case 16: goto yield_16;
-#endif
-					case 17: goto yield_17;
-#if NET_2_0
-					case 18: goto yield_18;
-#endif
-					default: goto yield_19;
-				}
-
-				if (_this.stop_processing) {
-					//yield return true;
-					current = true;
-					currentYield = 1;
-					return true;
-				}
-yield_1:
-yield_2:
-				if (_this.BeginRequest != null) {
-					//foreach (bool stop in RunHooks (BeginRequest))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 2;
-						currentEnumerator = _this.RunHooks(_this.BeginRequest).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-yield_3:
-				if (_this.AuthenticateRequest != null) {
-					//foreach (bool stop in RunHooks (AuthenticateRequest))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 3;
-						currentEnumerator = _this.RunHooks(_this.AuthenticateRequest).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-yield_4:
-				if (_this.DefaultAuthentication != null) {
-					//foreach (bool stop in RunHooks (DefaultAuthentication))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 4;
-						currentEnumerator = _this.RunHooks(_this.DefaultAuthentication).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-
-#if NET_2_0
-yield_5:
-				if (_this.PostAuthenticateRequest != null) {
-					//foreach (bool stop in RunHooks (AuthenticateRequest))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 5;
-						currentEnumerator = _this.RunHooks(_this.PostAuthenticateRequest).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-#endif
-yield_6:
-				if (_this.AuthorizeRequest != null) {
-					//foreach (bool stop in RunHooks (AuthorizeRequest))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 6;
-						currentEnumerator = _this.RunHooks(_this.AuthorizeRequest).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-#if NET_2_0
-yield_7:
-				if (_this.PostAuthorizeRequest != null) {
-					//foreach (bool stop in RunHooks (PostAuthorizeRequest))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 7;
-						currentEnumerator = _this.RunHooks(_this.PostAuthorizeRequest).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-#endif
-yield_8:
-				if (_this.ResolveRequestCache != null) {
-					//foreach (bool stop in RunHooks (ResolveRequestCache))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 8;
-						currentEnumerator = _this.RunHooks(_this.ResolveRequestCache).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-
+			// See InternalStepDelegate for meaning of true/false return value
+			bool AllocateHandler()
+			{
 				// Obtain the handler for the request.
-				//IHttpHandler handler = null;
 				try {
-					handler = _this.GetHandler (_this.context);
-				} catch (FileNotFoundException fnf){
-					if (_this.context.Request.IsLocal)
-						_this.ProcessError (new HttpException (404, String.Format ("File not found {0}", fnf.FileName), fnf));
+					handler = app.GetHandler (app.context);
+				}
+				catch (FileNotFoundException fnf){
+					if (app.context.Request.IsLocal)
+						app.ProcessError (new HttpException (404, String.Format ("File not found {0}", fnf.FileName), fnf));
 					else
-						_this.ProcessError (new HttpException (404, "File not found", fnf));
+						app.ProcessError (new HttpException (404, "File not found", fnf));
 				} catch (DirectoryNotFoundException dnf){
-					_this.ProcessError (new HttpException (404, "Directory not found", dnf));
+					app.ProcessError (new HttpException (404, "Directory not found", dnf));
 				} catch (Exception e) {
-					_this.ProcessError (e);
+					app.ProcessError (e);
 				}
 
-				if (_this.stop_processing) {
-					//yield return true;
-					current = true;
-					currentYield = 9;
+				if (app.stop_processing) {
+					currentVal = false;
 					return true;
 				}
-yield_9:
-#if NET_2_0
-yield_10:
-				if (_this.PostResolveRequestCache != null) {
-					//foreach (bool stop in RunHooks (PostResolveRequestCache))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 10;
-						currentEnumerator = _this.RunHooks(_this.PostResolveRequestCache).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-yield_11:
-				if (_this.PostMapRequestHandler != null) {
-					//foreach (bool stop in RunHooks (PostMapRequestHandler))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 11;
-						currentEnumerator = _this.RunHooks(_this.PostMapRequestHandler).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-			
-#endif
-yield_12:
-				if (_this.AcquireRequestState != null){
-					//foreach (bool stop in RunHooks (AcquireRequestState))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 12;
-						currentEnumerator = _this.RunHooks(_this.AcquireRequestState).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
-				}
-
-#if NET_2_0
-yield_13:
-				if (_this.PostAcquireRequestState != null){
-					//foreach (bool stop in RunHooks (PostAcquireRequestState))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 13;
-						currentEnumerator = _this.RunHooks(_this.PostAcquireRequestState).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
+				return false;
+			}
 
-					ResetEnumerator();
-				}
-#endif
-			
+			// See InternalStepDelegate for meaning of true/false return value
+			bool ProcessHandler()
+			{
 				//
 				// From this point on, we need to ensure that we call
 				// ReleaseRequestState, so the code below jumps to
 				// `release:' to guarantee it rather than yielding.
 				//
-				if (_this.PreRequestHandlerExecute != null)
-					foreach (bool stop in _this.RunHooks (_this.PreRequestHandlerExecute))
+				if (app.PreRequestHandlerExecute != null)
+					foreach (bool stop in app.RunHooks (app.PreRequestHandlerExecute))
 						if (stop)
-							goto release;
-				
+							return false;
+
 				try {
-					_this.context.BeginTimeoutPossible ();
+					app.context.BeginTimeoutPossible ();
 					if (handler != null){
 						IHttpAsyncHandler async_handler = handler as IHttpAsyncHandler;
 					
 						if (async_handler != null){
-							_this.must_yield = true;
-							_this.in_begin = true;
-							async_handler.BeginProcessRequest (_this.context, new AsyncCallback(_this.async_handler_complete_cb), handler);
+							app.must_yield = true;
+							app.in_begin = true;
+							async_handler.BeginProcessRequest (app.context, new AsyncCallback(app.async_handler_complete_cb), handler);
 						} else {
-							_this.must_yield = false;
-							handler.ProcessRequest (_this.context);
+							app.must_yield = false;
+							handler.ProcessRequest (app.context);
 						}
 					}
-				} catch (ThreadAbortException taex){
+				}
+				catch (ThreadAbortException taex){
 					object obj = taex.ExceptionState;
 					Thread.ResetAbort ();
-					_this.stop_processing = true;
+					app.stop_processing = true;
 					if (obj is StepTimeout)
-						_this.ProcessError (new HttpException ("The request timed out."));
-				} catch (Exception e){
-					_this.ProcessError (e);
-				} finally {
-					_this.in_begin = false;
-					_this.context.EndTimeoutPossible ();
+						app.ProcessError (new HttpException ("The request timed out."));
 				}
-				if (_this.must_yield) {
-					//yield return stop_processing;
-					current = _this.stop_processing;
-					currentYield = 14;
+				catch (Exception e){
+					app.ProcessError (e);
+				}
+				finally {
+					app.in_begin = false;
+					app.context.EndTimeoutPossible ();
+				}
+				if (app.must_yield) {
+					currentVal = app.stop_processing;
 					return true;
 				}
-				else if (_this.stop_processing)
-					goto release;
-yield_14:	
-				// These are executed after the application has returned
+				else if (app.stop_processing)
+					return false;
 			
-				if (_this.PostRequestHandlerExecute != null)
-					foreach (bool stop in _this.RunHooks (_this.PostRequestHandlerExecute))
+				// These are executed after the application has returned
+				if (app.PostRequestHandlerExecute != null)
+					foreach (bool stop in app.RunHooks (app.PostRequestHandlerExecute))
 						if (stop)
-							goto release;
-			
-				release:
-					if (_this.ReleaseRequestState != null){
-						foreach (bool stop in _this.RunHooks (_this.ReleaseRequestState)){
-							//
-							// Ignore the stop signal while release the state
-							//
-					
-						}
-					}
-			
-				if (_this.stop_processing) {
-					//yield return true;
-					current = true;
-					currentYield = 15;
-					return true;
-				}
-yield_15:
-#if NET_2_0
-yield_16:
-				if (_this.PostReleaseRequestState != null) {
-					//foreach (bool stop in RunHooks (PostReleaseRequestState))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 16;
-						currentEnumerator = _this.RunHooks(_this.PostReleaseRequestState).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
+							return false;
 
-					ResetEnumerator();
-				}
-#endif
+				return false;
+			}
 
-				if (_this.context.Error == null)
-					_this.context.Response.DoFilter (true);
-yield_17:
-				if (_this.UpdateRequestCache != null) {
-					//foreach (bool stop in RunHooks (UpdateRequestCache))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 17;
-						currentEnumerator = _this.RunHooks(_this.UpdateRequestCache).GetEnumerator();
+			// See InternalStepDelegate for meaning of true/false return value
+			bool ReleaseHandler()
+			{
+				if (app.ReleaseRequestState != null){
+					foreach (bool stop in app.RunHooks (app.ReleaseRequestState)){
+						//
+						// Ignore the stop signal while release the state
+						//
 					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
 				}
 
-#if NET_2_0
-yield_18:
-				if (_this.PostUpdateRequestCache != null) {
-					//foreach (bool stop in RunHooks (PostUpdateRequestCache))
-					//	yield return stop;
-					if (currentEnumerator == null) {
-						currentYield = 18;
-						currentEnumerator = _this.RunHooks(_this.PostUpdateRequestCache).GetEnumerator();
-					}
-					while (currentEnumerator.MoveNext())
-						return true;
-
-					ResetEnumerator();
+				if (app.stop_processing) {
+					currentVal = true;
+					return true;
 				}
-#endif
-				_this.PipelineDone ();
-				currentYield = 19;
-yield_19:
 				return false;
 			}
-		}
-
-		IEnumerator Pipeline ()
-		{
-			return new PipeLineEnumerator(this);
-		}
-#else
-		IEnumerator Pipeline ()
-		{
-			if (stop_processing)
-				yield return true;
-
-			if (BeginRequest != null)
-				foreach (bool stop in RunHooks (BeginRequest))
-					yield return stop;
-
-			if (AuthenticateRequest != null)
-				foreach (bool stop in RunHooks (AuthenticateRequest))
-					yield return stop;
-
-			if (DefaultAuthentication != null)
-				foreach (bool stop in RunHooks (DefaultAuthentication))
-					yield return stop;
 
+			Delegate FindNextDelegate ()
+			{
+				switch(currentStep++) {
+					case  1: return app.BeginRequest;
+					case  2: return app.AuthenticateRequest;
+					case  3: return app.DefaultAuthentication;
 #if NET_2_0
-			if (PostAuthenticateRequest != null)
-				foreach (bool stop in RunHooks (AuthenticateRequest))
-					yield return stop;
+					case  4: return app.PostAuthenticateRequest;
 #endif
-			if (AuthorizeRequest != null)
-				foreach (bool stop in RunHooks (AuthorizeRequest))
-					yield return stop;
+					case  5: return app.AuthorizeRequest;
 #if NET_2_0
-			if (PostAuthorizeRequest != null)
-				foreach (bool stop in RunHooks (PostAuthorizeRequest))
-					yield return stop;
+					case  6: return app.PostAuthorizeRequest;
 #endif
-
-			if (ResolveRequestCache != null)
-				foreach (bool stop in RunHooks (ResolveRequestCache))
-					yield return stop;
-
-			// Obtain the handler for the request.
-			IHttpHandler handler = null;
-			try {
-				handler = GetHandler (context);
-			} catch (FileNotFoundException fnf){
-				if (context.Request.IsLocal)
-					ProcessError (new HttpException (404, String.Format ("File not found {0}", fnf.FileName), fnf));
-				else
-					ProcessError (new HttpException (404, "File not found", fnf));
-			} catch (DirectoryNotFoundException dnf){
-				ProcessError (new HttpException (404, "Directory not found", dnf));
-			} catch (Exception e) {
-				ProcessError (e);
-			}
-
-			if (stop_processing)
-				yield return true;
-
+					case  7: return app.ResolveRequestCache;
+					case  8: return AllocateHandlerDel;
 #if NET_2_0
-			if (PostResolveRequestCache != null)
-				foreach (bool stop in RunHooks (PostResolveRequestCache))
-					yield return stop;
-
-			if (PostMapRequestHandler != null)
-				foreach (bool stop in RunHooks (PostMapRequestHandler))
-					yield return stop;
-			
+					case  9: return app.PostResolveRequestCache;
 #endif
-			if (AcquireRequestState != null){
-				foreach (bool stop in RunHooks (AcquireRequestState))
-					yield return stop;
-			}
-
 #if NET_2_0
-			if (PostAcquireRequestState != null){
-				foreach (bool stop in RunHooks (PostAcquireRequestState))
-					yield return stop;
-			}
+					case 10: return app.PostMapRequestHandler;
 #endif
-			
-			//
-			// From this point on, we need to ensure that we call
-			// ReleaseRequestState, so the code below jumps to
-			// `release:' to guarantee it rather than yielding.
-			//
-			if (PreRequestHandlerExecute != null)
-				foreach (bool stop in RunHooks (PreRequestHandlerExecute))
-					if (stop)
-						goto release;
-				
-			try {
-				context.BeginTimeoutPossible ();
-				if (handler != null){
-					IHttpAsyncHandler async_handler = handler as IHttpAsyncHandler;
-					
-					if (async_handler != null){
-						must_yield = true;
-						in_begin = true;
-						async_handler.BeginProcessRequest (context, async_handler_complete_cb, handler);
-					} else {
-						must_yield = false;
-						handler.ProcessRequest (context);
-					}
-				}
-			} catch (ThreadAbortException taex){
-				object obj = taex.ExceptionState;
-				Thread.ResetAbort ();
-				stop_processing = true;
-				if (obj is StepTimeout)
-					ProcessError (new HttpException ("The request timed out."));
-			} catch (Exception e){
-				ProcessError (e);
-			} finally {
-				in_begin = false;
-				context.EndTimeoutPossible ();
-			}
-			if (must_yield)
-				yield return stop_processing;
-			else if (stop_processing)
-				goto release;
-			
-			// These are executed after the application has returned
-			
-			if (PostRequestHandlerExecute != null)
-				foreach (bool stop in RunHooks (PostRequestHandlerExecute))
-					if (stop)
-						goto release;
-			
-		release:
-			if (ReleaseRequestState != null){
-				foreach (bool stop in RunHooks (ReleaseRequestState)){
-					//
-					// Ignore the stop signal while release the state
-					//
-					
+					case 11: return app.AcquireRequestState;
+#if NET_2_0
+					case 12: return app.PostAcquireRequestState;
+#endif
+					case 13: return app.ResolveRequestCache;
+					case 14: return ProcessHandlerDel;
+					case 15: return ReleaseHandlerDel;
+#if NET_2_0
+					case 16: return app.PostReleaseRequestState;
+#endif
+					case 17: return app.UpdateRequestCache;
+#if NET_2_0
+					case 18: return app.PostUpdateRequestCache;
+#endif
+					case 19: pipelineFinished = true; return null;
 				}
+				return null;
 			}
-			
-			if (stop_processing)
-				yield return true;
 
-#if NET_2_0
-			if (PostReleaseRequestState != null)
-				foreach (bool stop in RunHooks (PostReleaseRequestState))
-					yield return stop;
-#endif
+			public virtual bool MoveNext ()
+			{
+				while (!pipelineFinished) {
+					if (currentEnumerator != null && currentEnumerator.MoveNext())
+						return true;
+					currentEnumerator = null;
 
-			if (context.Error == null)
-				context.Response.DoFilter (true);
+					Delegate d = FindNextDelegate();
+					InternalStepDelegate d1 = d as InternalStepDelegate;
+					if (d1 != null) {
+						if (d1())
+							return true;
+					}
+					else if (d != null)
+						currentEnumerator = app.RunHooks(d).GetEnumerator();
+				}
 
-			if (UpdateRequestCache != null)
-				foreach (bool stop in RunHooks (UpdateRequestCache))
-					yield return stop;
+				app.PipelineDone ();
+				return false;
+			}
 
-#if NET_2_0
-			if (PostUpdateRequestCache != null)
-				foreach (bool stop in RunHooks (PostUpdateRequestCache))
-					yield return stop;
-#endif
-			PipelineDone ();
+			public virtual void Reset()
+			{
+				throw new NotImplementedException("HttpApplication.PipelineEnumerator.Reset called.");
+			}
+		}
+
+		IEnumerator Pipeline ()
+		{
+			return new PipeLineEnumerator(this);
 		}
-#endif
 
 		void PreStart ()
 		{
@@ -1483,6 +1069,7 @@ yield_19:
 		{
 			InitOnce (true);
 			PreStart ();
+			stop_processing = false;
 			pipeline = Pipeline ();
 			Tick ();
 		}
@@ -1494,16 +1081,10 @@ yield_19:
 			string verb = request.RequestType;
 			string url = request.FilePath;
 			
-			IHttpHandler handler = null;
-#if NET_2_0
-			HttpHandlersSection section = (HttpHandlersSection) WebConfigurationManager.GetSection ("system.web/httpHandlers");
-			object o = section.LocateHandler (verb, url);
-#else
 			HandlerFactoryConfiguration factory_config = (HandlerFactoryConfiguration) HttpContext.GetAppConfig ("system.web/httpHandlers");
 			object o = factory_config.LocateHandler (verb, url);
-#endif
-
 			factory = o as IHttpHandlerFactory;
+			IHttpHandler handler;
 			
 			if (factory == null) {
 				handler = (IHttpHandler) o;
@@ -1546,15 +1127,7 @@ yield_19:
 			done.Reset ();
 			
 			begin_iar = new AsyncRequestState (done, cb, extraData);
-#if TARGET_JVM
-			if (true)
-#else
-			if (Thread.CurrentThread.IsThreadPoolThread)
-#endif
-				Start (null);
-			else
-				ThreadPool.QueueUserWorkItem (new WaitCallback (Start), null);
-			
+			Start (null);
 			return begin_iar;
 		}
 
@@ -1595,14 +1168,10 @@ yield_19:
 			if (!context.IsCustomErrorEnabled)
 				return false;
 			
-#if NET_2_0
-			CustomErrorsSection config = (CustomErrorsSection)WebConfigurationManager.GetSection ("system.web/customErrors");
-#else
 			CustomErrorsConfig config = null;
 			try {
 				config = (CustomErrorsConfig) context.GetConfig ("system.web/customErrors");
 			} catch { }
-#endif
 			
 			if (config == null) {
 				if (context.ErrorPage != null)
@@ -1611,12 +1180,7 @@ yield_19:
 				return false;
 			}
 			
-#if NET_2_0
-			CustomError err = config.Errors [context.Response.StatusCode.ToString()];
-			string redirect = err == null ? null : err.Redirect;
-#else
 			string redirect =  config [context.Response.StatusCode];
-#endif
 			if (redirect == null) {
 				redirect = context.ErrorPage;
 				if (redirect == null)
diff --git a/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs b/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
index 7bb1e22b805..d7912a01026 100644
--- a/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
+++ b/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
@@ -364,9 +364,7 @@ namespace System.Web {
 				if (!File.Exists (app_file))
 					app_file = Path.Combine (physical_app_path, "global.asax");
 			
-#if NET_2_0
-				WebConfigurationManager.Init ();
-#else
+#if !CONFIGURATION_2_0
 				WebConfigurationSettings.Init (context);
 #endif
 				
diff --git a/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs b/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs
index 3276fe904cd..72acd00f89f 100644
--- a/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs
+++ b/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs
@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Security.Permissions;
 using System.Web.Configuration;
 using System.Web.UI;
@@ -41,12 +40,16 @@ namespace System.Web
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpBrowserCapabilities : HttpCapabilitiesBase, IFilterResolutionService
+	public partial class HttpBrowserCapabilities : HttpCapabilitiesBase
+#if NET_2_0
+		, IFilterResolutionService
+#endif
 	{
 		public HttpBrowserCapabilities ()
 		{
 		}
 
+#if NET_2_0
 		bool IFilterResolutionService.EvaluateFilter (string filterName)
 		{
 			throw new NotImplementedException ();
@@ -56,7 +59,7 @@ namespace System.Web
 		{
 			throw new NotImplementedException ();
 		}
+#endif
 	}
 }
 
-#endif
diff --git a/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs b/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
index 81fdf21ff2c..afb4f5181eb 100644
--- a/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
+++ b/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
@@ -29,9 +29,7 @@
 //
 
 namespace System.Web {
-#if !NET_2_0
 	[Serializable]
-#endif
 	public enum HttpCacheRevalidation {
 		AllCaches = 0x1,
 		ProxyCaches,
diff --git a/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs b/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs
index 0a4d5c7487c..3508adacfc6 100644
--- a/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs
+++ b/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs
@@ -69,12 +69,8 @@ namespace System.Web {
 		internal HttpCacheVaryByHeaders ()
 		{
 			/* the field names are meant to be case insensitive */
-#if NET_2_0
-			fields = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			fields = new Hashtable(CaseInsensitiveHashCodeProvider.Default,
 					       CaseInsensitiveComparer.Default);
-#endif
 		}
 
 		internal string[] GetHeaderNames ()
diff --git a/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs b/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs
index 0eabbed64cb..db1f462aab9 100644
--- a/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs
+++ b/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs
@@ -44,12 +44,8 @@ namespace System.Web {
 		internal HttpCacheVaryByParams ()
 		{
 			/* the parameter names are meant to be case insensitive */
-#if NET_2_0
-			parms = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			parms = new Hashtable(CaseInsensitiveHashCodeProvider.Default,
 					      CaseInsensitiveComparer.Default);
-#endif
 		}
 
 		internal string[] GetParamNames ()
diff --git a/mcs/class/System.Web/System.Web/HttpCacheability.cs b/mcs/class/System.Web/System.Web/HttpCacheability.cs
index abf0a0c2af4..f8f4fcb2923 100644
--- a/mcs/class/System.Web/System.Web/HttpCacheability.cs
+++ b/mcs/class/System.Web/System.Web/HttpCacheability.cs
@@ -29,9 +29,7 @@
 //
 
 namespace System.Web {
-#if !NET_2_0
 	[Serializable]
-#endif
 	public enum HttpCacheability {
 		NoCache = 0x1,
 		Private,
diff --git a/mcs/class/System.Web/System.Web/HttpContext.cs b/mcs/class/System.Web/System.Web/HttpContext.cs
index 57a160a214e..a5a98b86c69 100644
--- a/mcs/class/System.Web/System.Web/HttpContext.cs
+++ b/mcs/class/System.Web/System.Web/HttpContext.cs
@@ -43,6 +43,8 @@ using System.Web.UI;
 using System.Web.Util;
 #if NET_2_0
 using System.Web.Profile;
+#endif
+#if CONFIGURATION_2_0
 using CustomErrorMode = System.Web.Configuration.CustomErrorsMode;
 #endif
 
@@ -165,8 +167,8 @@ namespace System.Web {
 
 		public bool IsCustomErrorEnabled {
 			get {
-#if NET_2_0
-				CustomErrorsSection cfg = (CustomErrorsSection) WebConfigurationManager.GetSection ("system.web/customErrors");
+#if CONFIGURATION_2_0
+				CustomErrorsSection cfg = (CustomErrorsSection) WebConfigurationManager.GetWebApplicationSection ("system.web/customErrors");
 #else
 				CustomErrorsConfig cfg = null;
 				try {
@@ -190,8 +192,8 @@ namespace System.Web {
 #else
 		public bool IsDebuggingEnabled {
 			get {
-#if NET_2_0
-				CompilationSection section = (CompilationSection) WebConfigurationManager.GetSection ("system.web/compilation");
+#if CONFIGURATION_2_0
+				CompilationSection section = (CompilationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/compilation");
 				return section.Debug;
 #else
 				try {
@@ -332,7 +334,7 @@ namespace System.Web {
 #endif
 		public object GetConfig (string name)
 		{
-#if NET_2_0
+#if CONFIGURATION_2_0
 			return GetSection (name);
 #else
 			return WebConfigurationSettings.GetConfig (name, this);
@@ -367,7 +369,7 @@ namespace System.Web {
 		[MonoTODO]
 		public object GetSection (string name)
 		{
-#if NET_2_0
+#if CONFIGURATION_2_0
 			return WebConfigurationManager.GetSection (name);
 #else
 			throw new NotImplementedException ();
@@ -473,8 +475,8 @@ namespace System.Web {
 		internal TimeSpan ConfigTimeout {
 			get {
 				if (config_timeout == null) {
-#if NET_2_0
-					HttpRuntimeSection section = (HttpRuntimeSection)WebConfigurationManager.GetSection ("system.web/httpRuntime");
+#if CONFIGURATION_2_0
+					HttpRuntimeSection section = (HttpRuntimeSection)WebConfigurationManager.GetWebApplicationSection ("system.web/httpRuntime");
 					config_timeout = section.ExecutionTimeout;
 #else
 					HttpRuntimeConfig config = (HttpRuntimeConfig)
diff --git a/mcs/class/System.Web/System.Web/HttpCookieMode.cs b/mcs/class/System.Web/System.Web/HttpCookieMode.cs
index 9bcadf217d2..bc48d6bb95a 100644
--- a/mcs/class/System.Web/System.Web/HttpCookieMode.cs
+++ b/mcs/class/System.Web/System.Web/HttpCookieMode.cs
@@ -29,9 +29,7 @@
 #if NET_2_0
 namespace System.Web
 {
-#if !NET_2_0
         [Serializable]
-#endif
         public enum HttpCookieMode
         {
                 UseUri = 0,
diff --git a/mcs/class/System.Web/System.Web/HttpDataTransferMode.cs b/mcs/class/System.Web/System.Web/HttpDataTransferMode.cs
new file mode 100644
index 00000000000..7690bfecb21
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpDataTransferMode.cs
@@ -0,0 +1,39 @@
+//
+// System.Web.HttpDataTransferMode.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+#if NET_2_0
+namespace System.Web
+{
+        [Serializable]
+        public enum HttpDataTransferMode
+        {
+                HttpDataStore = 0,
+                QueryString = 1
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web/HttpException.cs b/mcs/class/System.Web/System.Web/HttpException.cs
index e8d4c55b176..2beb0fb6216 100644
--- a/mcs/class/System.Web/System.Web/HttpException.cs
+++ b/mcs/class/System.Web/System.Web/HttpException.cs
@@ -35,7 +35,9 @@ using System.Runtime.InteropServices;
 using System.Security.Permissions;
 using System.Text;
 using System.Web.Util;
+#if !TARGET_J2EE
 using System.Web.Compilation;
+#endif
 
 namespace System.Web
 {
@@ -162,7 +164,42 @@ namespace System.Web
 			string res = HttpUtility.HtmlEncode (s);
 			return res.Replace ("\r\n", "<br />");
 		}
+#if TARGET_J2EE
+		string GetHtmlizedErrorMessage ()
+		{
+			StringBuilder builder = new StringBuilder ("<html>\r\n<title>");
+			HtmlizedException exc = (HtmlizedException) this.InnerException;
+			builder.Append (exc.Title);
+			builder.AppendFormat ("</title><body bgcolor=\"white\">" +
+					      "<h1><font color=\"red\">Server Error in '{0}' " +
+					      "Application</font></h1><hr>\r\n",
+					      HttpRuntime.AppDomainAppVirtualPath);
+		
+			builder.AppendFormat ("<h2><font color=\"maroon\"><i>{0}</i></font></h2>\r\n", exc.Title);
+			builder.AppendFormat ("<b>Description: </b>{0}\r\n<p>\r\n", HtmlEncode (exc.Description));
+			builder.AppendFormat ("<b>Error message: </b>{0}\r\n<p>\r\n", HtmlEncode (exc.ErrorMessage));
 
+			if (exc.FileName != null)
+				builder.AppendFormat ("<b>File name: </b> {0}", HtmlEncode (exc.FileName));
+
+			if (exc.FileText != null) {
+				if (exc.SourceFile != exc.FileName)
+					builder.AppendFormat ("<p><b>Source File: </b>{0}", exc.SourceFile);
+
+				builder.Append ("\r\n<p>\r\n");
+
+				builder.Append ("<table summary=\"Source file\" width=\"100%\" " +
+							"bgcolor=\"#ffffc\">\r\n<tr><td>");
+					WriteSource (builder, exc);
+					builder.Append ("</td></tr>\r\n</table>\r\n<p>\r\n");
+			}
+
+			builder.Append ("<hr>\r\n</body>\r\n</html>\r\n");
+			builder.AppendFormat ("<!--\r\n{0}\r\n-->\r\n", HtmlEncode (exc.ToString ()));
+			builder.AppendFormat ("<!--\r\n{0}\r\n-->\r\n", HtmlEncode (exc.StackTrace));
+			return builder.ToString ();
+		}
+#else
 		string GetHtmlizedErrorMessage ()
 		{
 			StringBuilder builder = new StringBuilder ("<html>\r\n<title>");
@@ -207,12 +244,9 @@ namespace System.Web
 			
 			builder.Append ("<hr>\r\n</body>\r\n</html>\r\n");
 			builder.AppendFormat ("<!--\r\n{0}\r\n-->\r\n", HtmlEncode (exc.ToString ()));
-#if TARGET_JVM
-			builder.AppendFormat ("<!--\r\n{0}\r\n-->\r\n", HtmlEncode (exc.StackTrace));
-#endif
 			return builder.ToString ();
 		}
-
+#endif
 		static void WriteTextAsCode (StringBuilder builder, string text)
 		{
 			builder.Append ("<code><pre>\r\n");
diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
index e2eaaff98be..a745d003f2a 100644
--- a/mcs/class/System.Web/System.Web/HttpRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -554,8 +554,8 @@ namespace System.Web {
 			if (content_length == 0 && HttpMethod == "POST")
 				throw new HttpException (411, "Length expected");
 			
-#if NET_2_0
-			HttpRuntimeSection config = (HttpRuntimeSection) WebConfigurationManager.GetSection ("system.web/httpRuntime");
+#if CONFIGURATION_2_0
+			HttpRuntimeSection config = (HttpRuntimeSection) WebConfigurationManager.GetWebApplicationSection ("system.web/httpRuntime");
 #else
 			HttpRuntimeConfig config = (HttpRuntimeConfig) HttpContext.GetAppConfig ("system.web/httpRuntime");
 #endif
@@ -632,8 +632,8 @@ namespace System.Web {
 			//
 			int content_length = ContentLength;
 
-#if NET_2_0
-			HttpRuntimeSection config = (HttpRuntimeSection) WebConfigurationManager.GetSection ("system.web/httpRuntime");
+#if CONFIGURATION_2_0
+			HttpRuntimeSection config = (HttpRuntimeSection) WebConfigurationManager.GetWebApplicationSection ("system.web/httpRuntime");
 #else
 			HttpRuntimeConfig config = (HttpRuntimeConfig) HttpContext.GetAppConfig ("system.web/httpRuntime");
 #endif
@@ -1066,10 +1066,6 @@ namespace System.Web {
 				throw new ArgumentNullException (
 					String.Format ("MapPath: Invalid path '{0}', only virtual paths are accepted", virtualPath));
 
-#if TARGET_J2EE
- 			if (virtualPath.StartsWith(vmw.common.IAppDomainConfig.WAR_ROOT_SYMBOL))			
- 				return 	virtualPath;			
-#endif 
 			if (System.IO.Path.DirectorySeparatorChar != '/')
 				virtualPath = virtualPath.Replace (System.IO.Path.DirectorySeparatorChar, '/');
 
@@ -1397,6 +1393,8 @@ namespace System.Web {
 				string line = ReadLine ();
 				while (line == "")
 					line = ReadLine ();
+				int ll = line.Length;
+				int bl = boundary.Length;
 				if (line [0] != '-' || line [1] != '-')
 					return false;
 
@@ -1408,6 +1406,25 @@ namespace System.Web {
 			return false;
 		}
 
+		bool IsBoundary (string line)
+		{
+			if (line.Length < 2)
+				return false;
+
+			int ll = line.Length;
+			int bl = boundary.Length;
+			if (line [0] != '-' || line [1] != '-')
+				return false;
+
+			if (line.IndexOf (boundary) != 2)
+				return false;
+
+			if (ll == bl + 4 && line [ll -1] == '-' && line [ll - 2] == '-')
+				at_eof = true;
+
+			return  (at_eof || ll == bl + 2);
+		}
+
 		string ReadHeaders ()
 		{
 			string s = ReadLine ();
diff --git a/mcs/class/System.Web/System.Web/HttpRequestPriority.cs b/mcs/class/System.Web/System.Web/HttpRequestPriority.cs
new file mode 100644
index 00000000000..973931f7251
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpRequestPriority.cs
@@ -0,0 +1,39 @@
+//
+// System.Web.HttpRequestPriority.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+
+#if NET_2_0
+namespace System.Web
+{
+        public enum HttpRequestPriority
+        {
+                Normal,
+                High,
+                Critical
+        }
+}
+#endif
diff --git a/mcs/class/System.Web/System.Web/HttpResponse.cs b/mcs/class/System.Web/System.Web/HttpResponse.cs
index 4a93c449330..4107b6277fd 100644
--- a/mcs/class/System.Web/System.Web/HttpResponse.cs
+++ b/mcs/class/System.Web/System.Web/HttpResponse.cs
@@ -833,11 +833,7 @@ namespace System.Web {
 			Flush ();
 		}
 
-#if TARGET_JVM
-		public void WriteFile (IntPtr fileHandle, long offset, long size) {
-			throw new NotSupportedException("IntPtr not supported");
-		}
-#else
+#if !TARGET_JVM
 		public void WriteFile (IntPtr fileHandle, long offset, long size)
 		{
 			if (offset < 0)
diff --git a/mcs/class/System.Web/System.Web/HttpResponseStream.cs b/mcs/class/System.Web/System.Web/HttpResponseStream.cs
index ac06d1d8cd4..2be06d8b365 100644
--- a/mcs/class/System.Web/System.Web/HttpResponseStream.cs
+++ b/mcs/class/System.Web/System.Web/HttpResponseStream.cs
@@ -75,70 +75,93 @@ namespace System.Web {
 			}
 		}
 #if TARGET_JVM
+		class Chunk
+		{
+			public byte[] data;
+			public int size;
+			public const int Length = 32 * 1024;
+			
+			public Chunk Next, Prev;
 
-		class BlockManager {
-			const int PreferredLength = 16 * 1024;
-			static readonly byte[] EmptyBuffer = new byte[0];
-
-			byte[] buffer = EmptyBuffer;
-			int position;
-
-			public BlockManager () {
+			public Chunk () 
+			{
+				data = new byte[Length];
+				size = Length;
 			}
-
-			public int Position {
-				get { return position; }
+	
+			public void Dispose ()
+			{
 			}
+	
+			public static Chunk Unlink (ref Chunk head, Chunk b)
+			{
+				if (head == b)
+					head = head.Next;
+				if (b.Prev != null)
+					b.Prev.Next = b.Next;
+				if (b.Next != null)
+					b.Next.Prev = b.Prev;
 
-			void EnsureCapacity (int capacity) {
-				if (buffer.Length >= capacity)
-					return;
-
-				capacity += PreferredLength;
-				capacity = (capacity / PreferredLength) * PreferredLength;
-				byte[] temp = new byte[capacity];
-				Array.Copy(buffer, 0, temp, 0, buffer.Length);
-				buffer = temp;
+				b.Next = b.Prev = null;
+				return b;
 			}
-
-			public void Write (byte [] buffer, int offset, int count) {
-				if (count == 0)
-					return;
-
-				EnsureCapacity (position + count);
-				Array.Copy(buffer, offset, this.buffer, position, count);
-				position += count;
+	
+			public static Chunk Link (Chunk head, Chunk b)
+			{
+				b.Next = head;
+				if (head != null)
+					head.Prev = b;
+				return b;
 			}
 
-			public void Send (HttpWorkerRequest wr, int start, int end) {
-				int length = end - start;
-				if (length <= 0)
-					return;
-
-				if (length > buffer.Length - start)
-					length = buffer.Length - start;
-
-				if (start > 0) {
-					byte[] temp = new byte[length];
-					Array.Copy(buffer, start, temp, 0, length);
-					buffer = temp;
-				}
-				wr.SendResponseFromMemory(buffer, length);
+			public static void Copy(byte[] buff, int offset, Chunk c, int pos, int len)
+			{
+				Array.Copy(buff, offset, c.data, pos, len);
 			}
 
-			public void Send (Stream stream, int start, int end) {
-				int length = end - start;
-				if (length <= 0)
-					return;
-
-				if (length > buffer.Length - start)
-					length = buffer.Length - start;
-
-				stream.Write(buffer, start, length);
+			public static void Copy(Chunk c, int pos, byte[] buff, int offset, int len)
+			{
+				Array.Copy(c.data, pos, buff, offset, len);
 			}
+		}
 
-			public void Dispose () {
-				buffer = null;
+		sealed class BufferManager {
+			static Chunk filled;
+			static Chunk empty;
+	
+			public static Chunk GetChunk (int cb)
+			{
+				Chunk c;
+				if (empty == null)
+					empty = new Chunk (cb);
+				
+				c = empty;
+				filled = Chunk.Link (filled, Chunk.Unlink (ref empty, c));
+				return c;
+			}
+	
+			public static void DisposeChunk (Chunk c)
+			{
+				empty = Chunk.Link (empty, Chunk.Unlink (ref filled, c));
+			}
+	
+			public static void DisposeEmptyChunks ()
+			{
+				for (Chunk c = empty; c != null; c = c.Next)
+					c.Dispose ();
+				empty = null;
+			}
+			
+	
+			public static void PrintState ()
+			{
+				Console.WriteLine ("Filled blocks:");
+				for (Chunk c = filled; c != null; c = c.Next)
+					Console.WriteLine ("\t{0}", c);
+				Console.WriteLine ("Empty blocks:");
+				for (Chunk c = empty; c != null; c = c.Next)
+					Console.WriteLine ("\t{0}", c);	
+				
 			}
 		}
 
@@ -482,24 +505,13 @@ namespace System.Web {
 			}
 		}
 
-#if TARGET_JVM
-		void UnsafeWrite (HttpWorkerRequest wr, byte [] buffer, int offset, int count)
-		{
-			if (count <= 0)
-				return;
-
-			byte[] copy = new byte[count];
-			Array.Copy(buffer, offset, copy, 0, count);
-			wr.SendResponseFromMemory (copy, count);
-		}
-#else
 		unsafe void UnsafeWrite (HttpWorkerRequest wr, byte [] buffer, int offset, int count)
 		{
 			fixed (byte *ptr = buffer) {
 				wr.SendResponseFromMemory ((IntPtr) (ptr + offset), count);
 			}
 		}
-#endif
+
 		void AppendBuffer (byte [] buffer, int offset, int count)
 		{
 			if (!(cur_bucket is ByteBucket))
diff --git a/mcs/class/System.Web/System.Web/HttpRuntime.cs b/mcs/class/System.Web/System.Web/HttpRuntime.cs
index ed4183c9a17..41700354f1c 100644
--- a/mcs/class/System.Web/System.Web/HttpRuntime.cs
+++ b/mcs/class/System.Web/System.Web/HttpRuntime.cs
@@ -205,11 +205,7 @@ namespace System.Web {
 
 		public static string MachineConfigurationDirectory {
 			get {
-#if NET_2_0
-				string dirname = Path.GetDirectoryName (WebConfigurationManager.OpenMachineConfiguration().FilePath);
-#else
 				string dirname = Path.GetDirectoryName (WebConfigurationSettings.MachineConfigPath);
-#endif
 				if ((dirname != null) && (dirname.Length > 0) && SecurityManager.SecurityEnabled) {
 					new FileIOPermission (FileIOPermissionAccess.PathDiscovery, dirname).Demand ();
 				}
@@ -391,5 +387,36 @@ namespace System.Web {
 			}
 		}
 #endif
+
+#if NET_2_0
+		static ApplicationShutdownReason shutdown_reason = ApplicationShutdownReason.None;
+
+		[MonoTODO]
+		public static ApplicationShutdownReason ShutdownReason {
+			get {
+				//
+				// Unlike previously believed by Gonzalo and
+				// myself HttpRuntime.UnloadAppDomain is not
+				// something that happens right away, UnloadAppDomain
+				// mereley "queues" the domain for destruction, but
+				// the application continues to execute until it
+				// is time to terminate.  Only at that point is
+				// the domain unloaded.
+				//
+				// This means that we should probably not use the
+				// QueueUserWorkItem above to shutdown the appdomain
+				// in a separate thread, but rather just flag this
+				// app for termination, and then unload the domain
+				//
+				// The user can continue executing for a long time
+				//
+				// See the sample in the docs for ShutdownReason.
+				//
+				
+				return shutdown_reason;
+			}
+		}
+#endif
+
 	}
 }
diff --git a/mcs/class/System.Web/System.Web/HttpValidationStatus.cs b/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
index d30201becaf..b8e873452f6 100644
--- a/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
+++ b/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
@@ -29,9 +29,7 @@
 //
 
 namespace System.Web {
-#if !NET_2_0
 	[Serializable]
-#endif
         public enum HttpValidationStatus {
                 Invalid = 0x1,
                 IgnoreThisRequest,
diff --git a/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs b/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs
index a7a5e7aeed9..1d9f0faa15c 100644
--- a/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs
@@ -32,7 +32,6 @@ using System.Collections;
 using System.Runtime.InteropServices;
 using System.Security.Permissions;
 using System.Web.UI;
-using System.Collections.Specialized;
 
 namespace System.Web {
 
@@ -106,19 +105,6 @@ namespace System.Web {
 		public const int ReasonClientDisconnect = 4;
 		public const int ReasonDefault = 0;
 
-		static readonly Hashtable RequestHeaderIndexer;
-		static readonly Hashtable ResponseHeaderIndexer;
-
-		static HttpWorkerRequest() {
-			RequestHeaderIndexer = CollectionsUtil.CreateCaseInsensitiveHashtable(RequestHeaderMaximum);
-			for (int i = 0; i < RequestHeaderMaximum; i++)
-				RequestHeaderIndexer[GetKnownRequestHeaderName(i)] = i;
-
-			ResponseHeaderIndexer = CollectionsUtil.CreateCaseInsensitiveHashtable(ResponseHeaderMaximum);
-			for (int i = 0; i < ResponseHeaderMaximum; i++)
-				ResponseHeaderIndexer[GetKnownResponseHeaderName(i)] = i;
-		}
-
 		public virtual string MachineConfigPath {
 			get {
 				return null;
@@ -387,11 +373,6 @@ namespace System.Web {
 			case "TE": return HeaderTe;
 			case "User-Agent": return HeaderUserAgent;
 			}
-
-			object index = RequestHeaderIndexer[header];
-			if (index != null)
-				return (int)index;
-
 			return -1;
 		}
 
@@ -478,10 +459,6 @@ namespace System.Web {
 			case "WWW-Authenticate": return HeaderWwwAuthenticate;
 			}
 
-			object index = ResponseHeaderIndexer[header];
-			if (index != null)
-				return (int)index;
-
 			return -1;
 		}
 
diff --git a/mcs/class/System.Web/System.Web/MimeTypes.cs b/mcs/class/System.Web/System.Web/MimeTypes.cs
index 3708bee4bf4..85678ff104a 100644
--- a/mcs/class/System.Web/System.Web/MimeTypes.cs
+++ b/mcs/class/System.Web/System.Web/MimeTypes.cs
@@ -39,12 +39,8 @@ namespace System.Web
 
 		static MimeTypes ()
 		{
-#if NET_2_0
-			mimeTypes = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 			mimeTypes = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
 						   CaseInsensitiveComparer.DefaultInvariant);
-#endif
 
 			mimeTypes.Add ("3dm", "x-world/x-3dmf");
                 	mimeTypes.Add ("3dmf", "x-world/x-3dmf");
diff --git a/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs b/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
index f98a9d9793a..b8cba9d6809 100644
--- a/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
+++ b/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
@@ -29,9 +29,7 @@
 //
 
 namespace System.Web {
-#if !NET_2_0
 	[Serializable]
-#endif
 	public enum ProcessShutdownReason {
 		None,
 		Unexpected,
diff --git a/mcs/class/System.Web/System.Web/QueueManager.cs b/mcs/class/System.Web/System.Web/QueueManager.cs
index 76ec46dcf8d..3bd6f3ab8d7 100644
--- a/mcs/class/System.Web/System.Web/QueueManager.cs
+++ b/mcs/class/System.Web/System.Web/QueueManager.cs
@@ -45,7 +45,7 @@ namespace System.Web
 
 		public QueueManager ()
 		{
-#if NET_2_0
+#if CONFIGURATION_2_0
 			HttpRuntimeSection config;
 
 			config = (HttpRuntimeSection) WebConfigurationManager.GetSection ("system.web/httpRuntime");
diff --git a/mcs/class/System.Web/System.Web/SiteMap.cs b/mcs/class/System.Web/System.Web/SiteMap.cs
index 7b45c45f2b2..71927a18811 100644
--- a/mcs/class/System.Web/System.Web/SiteMap.cs
+++ b/mcs/class/System.Web/System.Web/SiteMap.cs
@@ -37,13 +37,17 @@ using System.Configuration;
 using System.Web.Configuration;
 
 namespace System.Web {
-	public static class SiteMap {
+	public abstract class SiteMap {
 	
+		internal SiteMap ()
+		{
+		}
+		
 		private static void Init ()
 		{
 			lock (locker) {
 				if (provider == null) {
-					SiteMapSection section = (SiteMapSection) WebConfigurationManager.GetSection ("system.web/siteMap");
+					SiteMapSection section = (SiteMapSection) WebConfigurationManager.GetWebApplicationSection ("system.web/siteMap");
 					providers = new SiteMapProviderCollection ();
 					
 					if (section.Enabled) {
@@ -95,16 +99,11 @@ namespace System.Web {
 			}
 		}
 		
-		public static event SiteMapResolveEventHandler SiteMapResolve {
+		public event SiteMapResolveEventHandler SiteMapResolve {
 			add { Provider.SiteMapResolve += value; }
 			remove { Provider.SiteMapResolve -= value; }
 		}
-
-		[MonoTODO ("By now it always return 'true'")]
-		public static bool Enabled {
-			get { return true; }
-		}
-
+		
 		static SiteMapProvider provider;
 		static SiteMapProviderCollection providers;
 		static object locker = new object ();
diff --git a/mcs/class/System.Web/System.Web/SiteMapNode.cs b/mcs/class/System.Web/System.Web/SiteMapNode.cs
index 388a7e3a70f..1ffac4dcf38 100644
--- a/mcs/class/System.Web/System.Web/SiteMapNode.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapNode.cs
@@ -73,7 +73,7 @@ namespace System.Web {
 			return new SiteMapHierarchicalDataSourceView (this);
 		}
 		
-		public virtual bool IsAccessibleToUser (System.Web.HttpContext ctx)
+		public bool IsAccessibleToUser (System.Web.HttpContext ctx)
 		{
 			return provider.IsAccessibleToUser (ctx, this);
 		}
@@ -200,7 +200,7 @@ namespace System.Web {
 		}
 		
 		[MonoTODO ("resource string?")]
-		public virtual string this [string key]
+		public string this [string key]
 		{
 			get {
 				string val = null;
@@ -284,7 +284,7 @@ namespace System.Web {
 				
 		#region Field Accessors
 		
-		protected NameValueCollection Attributes {
+		public virtual NameValueCollection Attributes {
 			get { return attributes; } 
 			set { CheckWritable (); attributes = value; }
 		}
@@ -306,7 +306,7 @@ namespace System.Web {
 			set { CheckWritable (); url = value; }
 		}
 		
-		public IList Roles {
+		public virtual IList Roles {
 			get { return roles; }
 			set { CheckWritable (); roles = value; }
 		}
diff --git a/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs b/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
index 13b1536666b..2c5bd5e1478 100644
--- a/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
@@ -137,17 +137,17 @@ namespace System.Web
 			List.AddRange (value);
 		}
 
-		public virtual bool Contains (SiteMapNode value)
+		public bool Contains (SiteMapNode value)
 		{
 			return this.List.Contains (value);
 		}
 		
-		public virtual void CopyTo (System.Web.SiteMapNode[] array, int index)
+		public void CopyTo (System.Web.SiteMapNode[] array, int index)
 		{
 			this.List.CopyTo (array, index);
 		}
 		
-		public virtual int IndexOf (SiteMapNode value)
+		public int IndexOf (SiteMapNode value)
 		{
 			return this.List.IndexOf (value);
 		}
diff --git a/mcs/class/System.Web/System.Web/SiteMapProvider.cs b/mcs/class/System.Web/System.Web/SiteMapProvider.cs
index b427c399192..731c2773fed 100644
--- a/mcs/class/System.Web/System.Web/SiteMapProvider.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapProvider.cs
@@ -150,7 +150,7 @@ namespace System.Web {
 			if (node == null) throw new ArgumentNullException ("node");
 		}
 		
-		protected virtual void RemoveNode (SiteMapNode node)
+		public virtual void RemoveNode (SiteMapNode node)
 		{
 			if (node == null)
 				throw new ArgumentNullException("node");
diff --git a/mcs/class/System.Web/System.Web/StaticFileHandler.cs b/mcs/class/System.Web/System.Web/StaticFileHandler.cs
index ae127d350fc..d309319a1d7 100644
--- a/mcs/class/System.Web/System.Web/StaticFileHandler.cs
+++ b/mcs/class/System.Web/System.Web/StaticFileHandler.cs
@@ -54,21 +54,7 @@ namespace System.Web
 			try {
 				if (strHeader != null) {
 					DateTime dtIfModifiedSince = DateTime.ParseExact (strHeader, "r", null);
-					DateTime ftime;
-#if TARGET_JVM
-					try 
-					{
-						ftime = fi.LastWriteTime.ToUniversalTime ();
-					} 
-					catch (NotSupportedException) 
-					{
-						// The file is in a WAR, it was not modified.
-						response.StatusCode = 304;
-						return;
-					}
-#else
-					ftime = fi.LastWriteTime.ToUniversalTime ();
-#endif
+					DateTime ftime = fi.LastWriteTime.ToUniversalTime ();
 					if (ftime <= dtIfModifiedSince) {
 						response.StatusCode = 304;
 						return;
diff --git a/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs b/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs
index 474ece1c7bc..cb119ca2684 100644
--- a/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs
+++ b/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs
@@ -103,14 +103,10 @@ namespace System.Web
 			get {
 				lock (this) {
 					if (urlToNode == null) {
-#if NET_2_0
-						urlToNode = new Hashtable (StringComparer.InvariantCultureIgnoreCase);
-#else
 						urlToNode = new Hashtable (
 							CaseInsensitiveHashCodeProvider.DefaultInvariant,
 							CaseInsensitiveComparer.DefaultInvariant
 						);
-#endif
 					}
 				}
 				return urlToNode;
@@ -195,7 +191,7 @@ namespace System.Web
 			return parent != null && IsAccessibleToUser (HttpContext.Current, parent) ? parent : null;
 		}
 		
-		protected override void RemoveNode (SiteMapNode node)
+		public override void RemoveNode (SiteMapNode node)
 		{
 			if (node == null)
 				throw new ArgumentNullException("node");
diff --git a/mcs/class/System.Web/System.Web/TraceManager.cs b/mcs/class/System.Web/System.Web/TraceManager.cs
index db9d8b36f09..4196db244b7 100644
--- a/mcs/class/System.Web/System.Web/TraceManager.cs
+++ b/mcs/class/System.Web/System.Web/TraceManager.cs
@@ -49,7 +49,7 @@ namespace System.Web {
 		
 		public TraceManager ()
 		{
-#if NET_2_0
+#if CONFIGURATION_2_0
 			TraceSection config = WebConfigurationManager.GetSection ("system.web/trace") as TraceSection;
 			if (config == null)
 				config = new TraceSection ();
@@ -63,7 +63,7 @@ namespace System.Web {
 			enabled = config.Enabled;
 			local_only = config.LocalOnly;
 			page_output = config.PageOutput;
-#if NET_2_0
+#if CONFIGURATION_2_0
 			if (config.TraceMode == TraceDisplayMode.SortByTime)
 				mode = TraceMode.SortByTime;
 			else
diff --git a/mcs/class/System.Web/System.Web/VirtualPathUtility.cs b/mcs/class/System.Web/System.Web/VirtualPathUtility.cs
index c6a1defdd82..d08520dacd7 100644
--- a/mcs/class/System.Web/System.Web/VirtualPathUtility.cs
+++ b/mcs/class/System.Web/System.Web/VirtualPathUtility.cs
@@ -3,7 +3,6 @@
 //
 // Author:
 //	Chris Toshok (toshok@ximian.com)
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 
 //
@@ -39,167 +38,93 @@ namespace System.Web {
 	{
 		public static string AppendTrailingSlash (string virtualPath)
 		{
-			if (virtualPath == null)
-				return virtualPath;
-
-			int length = virtualPath.Length;
-			if (length == 0 || virtualPath [length - 1] == '/')
+			if (virtualPath == null || virtualPath == "" || virtualPath.EndsWith ("/"))
 				return virtualPath;
 
 			return virtualPath + "/";
 		}
 
+		[MonoTODO ("more work here")]
 		public static string Combine (string basePath, string relativePath)
 		{
-			if (basePath == null || basePath == "")
-				throw new ArgumentNullException ("basePath");
-
-			if (relativePath == null || relativePath == "")
-				throw new ArgumentNullException ("relativePath");
-
-			if (basePath [0] != '/')
-				throw new ArgumentException ("basePath is not an absolute path", "basePath");
+			if (!IsAbsolute (basePath))
+				throw new ArgumentException ();
 
-			if (relativePath [0] != '/')
-				return "/" + relativePath;
+			if (basePath.EndsWith ("/"))
+				return basePath + relativePath;
 
 			return UrlUtils.Combine (basePath, relativePath);
 		}
 
+		[MonoTODO]
 		public static string GetDirectory (string virtualPath)
 		{
-			if (virtualPath == null || virtualPath == "") // Yes, "" throws an ArgumentNullException
-				throw new ArgumentNullException ("virtualPath");
-
-			if (virtualPath [0] != '/')
-				throw new ArgumentException ("The virtual path is not rooted", "virtualPath");
-
-			string result = UrlUtils.GetDirectory (virtualPath);
-			return AppendTrailingSlash (result);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string GetExtension (string virtualPath)
 		{
-			string filename = GetFileName (virtualPath);
-			int dot = filename.LastIndexOf ('.');
-			if (dot == -1 || dot == filename.Length + 1)
-				return "";
-
-			return filename.Substring (dot);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string GetFileName (string virtualPath)
 		{
-			if (virtualPath == null || virtualPath == "") // Yes, "" throws an ArgumentNullException
-				throw new ArgumentNullException ("virtualPath");
-			
-			return UrlUtils.GetFile (RemoveTrailingSlash (virtualPath));
+			throw new NotImplementedException ();
 		}
 
 		public static bool IsAbsolute (string virtualPath)
 		{
 			if (virtualPath == "" || virtualPath == null)
-				throw new ArgumentNullException ("virtualPath");
+				throw new ArgumentNullException ();
 
-			return (virtualPath [0] == '/');
+			return virtualPath.StartsWith ("/");
 		}
 
+		[MonoTODO]
 		public static bool IsAppRelative (string virtualPath)
 		{
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			string vpath = HttpRuntime.AppDomainAppVirtualPath;
-			if (vpath == null)
-				return false;
-
-			return virtualPath.StartsWith (AppendTrailingSlash (vpath));
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string MakeRelative (string fromPath, string toPath)
 		{
-			if (fromPath == null || toPath == null)
-				throw new NullReferenceException (); // yeah!
-
-			if (toPath == "")
-				return toPath;
-
-			if (toPath [0] != '/')
-				throw new ArgumentOutOfRangeException (); // This is what MS does.
-
-			if (fromPath.Length > 0 && fromPath [0] != '/')
-				throw new ArgumentOutOfRangeException (); // This is what MS does.
-
-			Uri from = new Uri ("http://nothing" + fromPath);
-			return from.MakeRelativeUri (new Uri ("http://nothing" + toPath)).AbsolutePath;
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string RemoveTrailingSlash (string virtualPath)
 		{
-			if (virtualPath == null || virtualPath == "")
-				return null;
-
-			int last = virtualPath.Length - 1;
-			if (last == 0 || virtualPath [last] != '/')
-				return virtualPath;
-
-			return virtualPath.Substring (0, last);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string ToAbsolute (string virtualPath)
 		{
-			string apppath = HttpRuntime.AppDomainAppVirtualPath;
-			if (apppath == null)
-				throw new HttpException ("The path to the application is not known");
-
-			return ToAbsolute (apppath, virtualPath);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string ToAbsolute (string virtualPath, string applicationPath)
 		{
-			if (applicationPath == null || applicationPath == "")
-				throw new ArgumentNullException ("applicationPath");
-
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			if (virtualPath.StartsWith (".."))
-				throw new ArgumentException (String.Format ("Relative path not allowed: '{0}'", virtualPath));
-
-			if (applicationPath [0] != '/')
-				throw new ArgumentOutOfRangeException ("appPath is not rooted", "applicationPath");
-
-			return UrlUtils.Combine (applicationPath, virtualPath);
-
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string ToAppRelative (string virtualPath)
 		{
-			string apppath = HttpRuntime.AppDomainAppVirtualPath;
-			if (apppath == null)
-				throw new HttpException ("The path to the application is not known");
-
-			return ToAppRelative (apppath, virtualPath);
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		public static string ToAppRelative (string virtualPath, string applicationPath)
 		{
-			if (applicationPath == null || applicationPath == "")
-				throw new ArgumentNullException ("applicationPath");
-
-			if (virtualPath == null || virtualPath == "")
-				throw new ArgumentNullException ("virtualPath");
-
-			if (virtualPath.StartsWith (".."))
-				throw new ArgumentException (String.Format ("Relative path not allowed: '{0}'", virtualPath));
-
-			if (applicationPath [0] != '/')
-				throw new ArgumentOutOfRangeException ("appPath is not rooted", "applicationPath");
-
-			return MakeRelative (applicationPath, virtualPath);
+			throw new NotImplementedException ();
 		}
 	}
+
 }
 
 #endif
-
diff --git a/mcs/class/System.Web/System.Web_test.dll.sources b/mcs/class/System.Web/System.Web_test.dll.sources
index 985e0cbd14d..17a2bb74ada 100644
--- a/mcs/class/System.Web/System.Web_test.dll.sources
+++ b/mcs/class/System.Web/System.Web_test.dll.sources
@@ -8,7 +8,6 @@ System.Web/HttpRequestTest.cs
 System.Web/HttpResponseTest.cs
 System.Web/HttpServerUtilityTest.cs
 System.Web/HttpUtilityTest.cs
-System.Web.Compilation/ClientBuildManagerParameterTest.cs
 System.Web.Configuration/AnonymousIdentificationSectionTest.cs
 System.Web.Configuration/AssemblyCollectionTest.cs
 System.Web.Configuration/AssemblyInfoTest.cs
@@ -30,11 +29,8 @@ System.Web.Configuration/GlobalizationSectionTest.cs
 System.Web.Configuration/HostingEnvironmentSectionTest.cs
 System.Web.Configuration/MachineKeyValidationConverterTest.cs
 System.Web.Configuration/ProfilePropertySettingsTest.cs
-System.Web.Configuration/WebConfigurationManagerTest.cs
-System.Web.Hosting/ApplicationHostTest.cs
-System.Web.Hosting/HostingEnvironmentTest.cs
 System.Web.Hosting/SimpleWorkerRequestTest.cs
-System.Web.Hosting/VirtualPathProviderTest.cs
+System.Web.Hosting/ApplicationHostTest.cs
 System.Web.Profile/ProfileInfoTest.cs
 System.Web.Security/FormsAuthenticationTest.cs
 System.Web.Security/FormsIdentityTest.cs
@@ -45,7 +41,6 @@ System.Web.Security/MembershipUserCollectionTest.cs
 System.Web.Security/RolePrincipalTest.cs
 System.Web.Security/RolesTest.cs
 System.Web.UI/AttributeCollectionTest.cs
-System.Web.UI/ChtmlTextWriterTest.cs
 System.Web.UI/CleanHtmlTextWriter.cs
 System.Web.UI/ControlTest.cs
 System.Web.UI/ControlCollectionTest.cs
@@ -80,8 +75,6 @@ System.Web.UI/PropertyConverterTest.cs
 System.Web.UI/StateBagTest.cs
 System.Web.UI/TestUrlPropertyAttribute.cs
 System.Web.UI/ToolboxDataAttributeTest.cs
-System.Web.UI/XhtmlTextWriterTest.cs
-System.Web.UI.WebControls/AccessDataSourceTest.cs
 System.Web.UI.WebControls/AdCreatedEventArgsTest.cs
 System.Web.UI.WebControls/BaseCompareValidatorTest.cs
 System.Web.UI.WebControls/BaseDataBoundControlTest.cs
@@ -141,8 +134,6 @@ System.Web.UI.WebControls/RepeaterTest.cs
 System.Web.UI.WebControls/RoleGroupCollectionTest.cs
 System.Web.UI.WebControls/RoleGroupTest.cs
 System.Web.UI.WebControls/SelectedDatesCollectionTest.cs
-System.Web.UI.WebControls/SqlDataSourceTest.cs
-System.Web.UI.WebControls/SqlDataSourceViewTest.cs
 System.Web.UI.WebControls/StyleTest.cs
 System.Web.UI.WebControls/TableCellTest.cs
 System.Web.UI.WebControls/TableFooterRowTest.cs
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog
deleted file mode 100644
index 379a6c25eb4..00000000000
--- a/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2006-01-20  Chris Toshok  <toshok@ximian.com>
-
-	* ClientBuildManagerParameterTest.cs: new test.
-
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/ClientBuildManagerParameterTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/ClientBuildManagerParameterTest.cs
deleted file mode 100644
index e339d76de76..00000000000
--- a/mcs/class/System.Web/Test/System.Web.Compilation/ClientBuildManagerParameterTest.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// ClientBuildManagerParameterTest.cs 
-//	- unit tests for System.Web.Compilation.ClientBuildManagerParameter
-//
-// Author:
-//	Chris Toshok  <toshok@ximian.com>
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using NUnit.Framework;
-
-using System;
-using System.Configuration;
-using System.Web.Compilation;
-using System.Web;
-using System.Web.UI;
-
-namespace MonoTests.System.Web.Compilation {
-
-	[TestFixture]
-	public class ClientBuildManagerParameterTest  {
-
-		[Test]
-		public void Defaults ()
-		{
-			ClientBuildManagerParameter p = new ClientBuildManagerParameter ();
-
-			Assert.AreEqual (PrecompilationFlags.Default, p.PrecompilationFlags, "A1");
-			Assert.IsNull (p.StrongNameKeyContainer, "A2");
-			Assert.IsNull (p.StrongNameKeyFile, "A3");
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web.Configuration/WebConfigurationManagerTest.cs b/mcs/class/System.Web/Test/System.Web.Configuration/WebConfigurationManagerTest.cs
deleted file mode 100644
index 520b29cc423..00000000000
--- a/mcs/class/System.Web/Test/System.Web.Configuration/WebConfigurationManagerTest.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-// WebConfigurationManagerTest.cs 
-//	- unit tests for System.Web.Configuration.WebConfigurationManager
-//
-// Author:
-//	Chris Toshok  <toshok@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using NUnit.Framework;
-
-using System;
-using System.Configuration;
-using _Configuration = System.Configuration.Configuration;
-using System.IO;
-using System.Web.Configuration;
-using System.Web;
-using System.Web.Security;
-
-namespace MonoTests.System.Web.Configuration {
-
-	[TestFixture]
-	public class WebConfigurationManagerTest  {
-
-		[Test]
-		public void OpenMachineConfiguration_1 ()
-		{
-			_Configuration c1 = WebConfigurationManager.OpenMachineConfiguration ();
-			_Configuration c2 = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual (c1.FilePath, c2.FilePath, "A1");
-		}
-
-		[Test]
-		public void OpenMachineConfiguration_2 ()
-		{
-			_Configuration c1 = WebConfigurationManager.OpenMachineConfiguration ("configTest");
-			_Configuration c2 = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual (c1.FilePath, c2.FilePath, "A1");
-		}
-
-		[Test]
-		public void OpenMachineConfiguration_serverNull ()
-		{
-			_Configuration c1 = WebConfigurationManager.OpenMachineConfiguration ("configTest", null);
-			_Configuration c2 = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual (c1.FilePath, c2.FilePath, "A1");
-		}
-
-		[Test]
-		public void OpenWebConfiguration_null ()
-		{
-			_Configuration web = WebConfigurationManager.OpenWebConfiguration (null);
-			_Configuration machine = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual ("web.config", Path.GetFileName (web.FilePath), "A1");
-			Assert.AreEqual (Path.GetDirectoryName (web.FilePath), Path.GetDirectoryName (machine.FilePath), "A2");
-		}
-
-		[Test]
-		public void OpenWebConfiguration_empty ()
-		{
-			_Configuration web1 = WebConfigurationManager.OpenWebConfiguration (null);
-			_Configuration web2 = WebConfigurationManager.OpenWebConfiguration ("");
-			_Configuration machine = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual (web1.FilePath, web2.FilePath, "A1");
-			Assert.AreEqual (Path.GetDirectoryName (web2.FilePath), Path.GetDirectoryName (machine.FilePath), "A2");
-		}
-
-		[Test]
-		public void OpenWebConfiguration_siteNull ()
-		{
-			_Configuration web = WebConfigurationManager.OpenWebConfiguration ("", null);
-			_Configuration machine = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual ("web.config", Path.GetFileName (web.FilePath), "A1");
-			Assert.AreEqual (Path.GetDirectoryName (web.FilePath), Path.GetDirectoryName (machine.FilePath), "A2");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ConfigurationErrorsException))]
-		public void OpenWebConfiguration_siteNull2_absolutePath ()
-		{
-			WebConfigurationManager.OpenWebConfiguration ("", null, "/clientTest");
-		}
-
-		[Test]
-		public void OpenWebConfiguration_siteNull2 ()
-		{
-			_Configuration web = WebConfigurationManager.OpenWebConfiguration ("", null, "clientTest");
-			_Configuration machine = ConfigurationManager.OpenMachineConfiguration ();
-
-			Assert.AreEqual ("web.config", Path.GetFileName (web.FilePath), "A1");
-			Assert.AreEqual (Path.GetDirectoryName (web.FilePath), Path.GetDirectoryName (machine.FilePath), "A2");
-		}
-
-		[Test]
-		public void GetWebApplicationSection_1 ()
-		{
-			Assert.IsNotNull (WebConfigurationManager.GetWebApplicationSection ("system.web/clientTarget"), "A1");
-		}
-
-		[Test]
-		public void GetSection_1 ()
-		{
-			object sect1 = WebConfigurationManager.GetSection ("system.web/clientTarget");
-			object sect2 = WebConfigurationManager.GetSection ("system.web/clientTarget");
-			Assert.AreEqual (sect1, sect2, "A1");
-
-			sect1 = WebConfigurationManager.GetSection ("foo");
-			Assert.IsNull (sect1);
-
-			sect1 = WebConfigurationManager.GetSection ("appSettings");
-			Assert.IsNotNull (sect1, "A2");
-
-			sect1 = WebConfigurationManager.GetSection ("connectionStrings");
-			Assert.IsNotNull (sect1, "A3");
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		// InvalidOperationException (WebConfigurationManager.GetSection(sectionName,path) can only be called from within a web application.)
-		// thrown from WebConfigurationManager.GetSection
-		public void GetSection_2 ()
-		{
-			object sect1 = WebConfigurationManager.GetSection ("system.web/clientTarget", "/clientTest");
-			Assert.IsNull (sect1, "A1");
-		}
-
-		[Test]
-		public void OpenMappedMachineConfiguration ()
-		{
-			ConfigurationFileMap map = new ConfigurationFileMap ();
-
-			_Configuration c1 = WebConfigurationManager.OpenMappedMachineConfiguration (map, "clientTest");
-			_Configuration c2 = ConfigurationManager.OpenMappedMachineConfiguration (map);
-
-			Assert.AreEqual (c1.FilePath, c2.FilePath, "A1");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ConfigurationErrorsException))]
-		// same stack trace for OpenWebConfiguration_siteNull2_absolutePath.
-		public void OpenMappedMachineConfiguration_absolute ()
-		{
-			ConfigurationFileMap map = new ConfigurationFileMap ();
-
-			WebConfigurationManager.OpenMappedMachineConfiguration (map, "/clientTest");
-		}
-
-		[Test]
-		public void StaticProps ()
-		{
-			Assert.IsNotNull (WebConfigurationManager.AppSettings, "A1");
-			Assert.IsNotNull (WebConfigurationManager.ConnectionStrings, "A2");
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/Test/System.Web.Hosting/ChangeLog
index d638509df8b..97127d29966 100644
--- a/mcs/class/System.Web/Test/System.Web.Hosting/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.Hosting/ChangeLog
@@ -1,19 +1,3 @@
-2006-02-02 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* HostingEnvironmentTest.cs: tests for MapPath.
-
-2006-02-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* VirtualPathProviderTest.cs: tests for GetFileHash.
-
-2006-02-01 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* HostingEnvironmentTest.cs: new tests.
-
-2006-01-25 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* VirtualPathProviderTest.cs: new tests.
-
 2005-11-23  Robert Jordan  <robertj@gmx.net>
 
 	* SimpleWorkerRequestTest.cs: added a test case for #76794.
diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/HostingEnvironmentTest.cs b/mcs/class/System.Web/Test/System.Web.Hosting/HostingEnvironmentTest.cs
deleted file mode 100644
index fff1fb2210b..00000000000
--- a/mcs/class/System.Web/Test/System.Web.Hosting/HostingEnvironmentTest.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// System.Web.Hosting.HostingEnvironmentTest 
-// 
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Web.Hosting;
-using NUnit.Framework;
-using System.Web;
-
-namespace MonoTests.System.Web.Hosting {
-	[TestFixture]
-	public class HostingEnvironmentTest {
-		[Test]
-		public void StaticDefaultValues ()
-		{
-			Assert.IsNull (HostingEnvironment.InitializationException);
-			Assert.IsFalse (HostingEnvironment.IsHosted);
-			Assert.IsNull (HostingEnvironment.ApplicationID);
-			Assert.IsNull (HostingEnvironment.ApplicationPhysicalPath);
-			Assert.IsNull (HostingEnvironment.ApplicationVirtualPath);
-			Assert.IsNull (HostingEnvironment.SiteName);
-			Assert.IsNotNull (HostingEnvironment.Cache);
-			Assert.AreEqual (ApplicationShutdownReason.None, HostingEnvironment.ShutdownReason);
-			Assert.IsNull (HostingEnvironment.VirtualPathProvider);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void MapPath1 ()
-		{
-			HostingEnvironment.MapPath (null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void MapPath2 ()
-		{
-			HostingEnvironment.MapPath ("");
-		}
-
-		[Test]
-		public void MapPath3 ()
-		{
-			Assert.IsNull (HostingEnvironment.MapPath ("hola"));
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs b/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs
deleted file mode 100644
index d886340e939..00000000000
--- a/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// System.Web.Hosting.VirtualPathProviderTest
-// 
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.IO;
-using System.Web;
-using System.Web.Caching;
-using System.Web.Hosting;
-using NUnit.Framework;
-
-namespace MonoTests.System.Web.Hosting {
-	class DummyVPP : VirtualPathProvider {
-		public override bool FileExists (string virtualPath)
-		{
-			bool de = base.FileExists (virtualPath);
-			return de;
-		}
-
-		public override bool DirectoryExists (string virtualDir)
-		{
-			bool de = base.DirectoryExists (virtualDir);
-			return de;
-		}
-
-		public override VirtualFile GetFile (string virtualPath)
-		{
-			VirtualFile vf = base.GetFile (virtualPath);
-			return vf;
-		}
-
-		public override string GetFileHash (string virtualPath, IEnumerable dependencies)
-		{
-			return base.GetFileHash (virtualPath, dependencies);
-		}
-
-		public override VirtualDirectory GetDirectory (string virtualDir)
-		{
-			VirtualDirectory vd = base.GetDirectory (virtualDir);
-			return vd;
-		}
-
-		public override CacheDependency GetCacheDependency (string virtualPath,
-						IEnumerable virtualPathDependencies, DateTime utcStart)
-		{
-			CacheDependency cd = base.GetCacheDependency (virtualPath, virtualPathDependencies, utcStart);
-			return cd;
-		}
-	}
-
-	[TestFixture]
-	public class VirtualPathProviderTest {
-		// Unhosted tests: not running inside an ASP.NET appdomain.
-		// Some tests may yield different results when hosted. I'll add those later.
-		[Test]
-		public void FileExists1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.FileExists ("hola.aspx"));
-		}
-
-		[Test]
-		public void DirectoryExists1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.DirectoryExists ("hola"));
-		}
-
-		[Test]
-		public void GetFile1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.GetFile ("index.aspx"));
-		}
-
-		[Test]
-		public void GetFileHash1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.GetFileHash (null, null));
-		}
-
-		[Test]
-		public void GetFileHash2 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.GetFileHash ("something", null));
-		}
-
-		[Test]
-		public void GetDirectory1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.GetDirectory ("some_directory"));
-		}
-
-		[Test]
-		public void GetCacheDependency1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.GetCacheDependency (null, null, DateTime.UtcNow));
-		}
-
-		[Test]
-		public void GetCacheKey1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.IsNull (dummy.GetCacheKey ("index.aspx"));
-		}
-
-		[Test]
-		[ExpectedException (typeof (NullReferenceException))]
-		public void OpenFile1 ()
-		{
-			VirtualPathProvider.OpenFile ("index.aspx");
-		}
-
-		[Test]
-		public void CombineVirtualPaths1 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.AreEqual ("/otherroot", dummy.CombineVirtualPaths ("/root", "/otherroot"));
-		}
-
-		[Test]
-		public void CombineVirtualPaths2 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.AreEqual ("/otherleaf", dummy.CombineVirtualPaths ("/root", "otherleaf"));
-		}
-
-		[Test]
-		public void CombineVirtualPaths3 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.AreEqual ("/otherleaf/index.aspx", dummy.CombineVirtualPaths ("/root", "otherleaf/index.aspx"));
-		}
-
-		[Test]
-		public void CombineVirtualPaths4 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			Assert.AreEqual ("/otherleaf/index.aspx", dummy.CombineVirtualPaths ("/root", "./otherleaf/index.aspx"));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void CombineVirtualPaths5 ()
-		{
-			DummyVPP dummy = new DummyVPP ();
-			dummy.CombineVirtualPaths ("root", "./otherleaf/index.aspx");
-		}
-	}
-	
-}
-#endif
-
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs
deleted file mode 100644
index be1f24059e8..00000000000
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Tests for System.Web.UI.WebControls.AccessDataSource
-//
-// Author:
-//	Chris Toshok (toshok@novell.com)
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using NUnit.Framework;
-using System;
-using System.Configuration;
-using System.Data.Common;
-using System.Data.OleDb;
-using System.IO;
-using System.Globalization;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace MonoTests.System.Web.UI.WebControls
-{
-	class AccessPoker : AccessDataSource {
-		public AccessPoker ()
-		{
-			TrackViewState ();
-		}
-
-		public object SaveToViewState ()
-		{
-			return SaveViewState ();
-		}
-
-		public void LoadFromViewState (object savedState)
-		{
-			LoadViewState (savedState);
-		}
-
-		public DbProviderFactory GetFactory ()
-		{
-			return GetDbProviderFactory ();
-		}
-	}
-
-	[TestFixture]
-	public class AccessDataSourceTest {
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void ProviderName ()
-		{
-			AccessPoker sql = new AccessPoker ();
-			sql.ProviderName = "foo";
-		}
-
-		[Test]
-		[ExpectedException (typeof (NotSupportedException))]
-		public void SqlCacheDependency1 ()
-		{
-			AccessPoker sql = new AccessPoker ();
-			Assert.AreEqual ("", sql.SqlCacheDependency, "A1");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NotSupportedException))]
-		public void SqlCacheDependency2 ()
-		{
-			AccessPoker sql = new AccessPoker ();
-			sql.SqlCacheDependency = "hi";
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void ConnectionString1 ()
-		{
-			AccessPoker sql = new AccessPoker ();
-			sql.ConnectionString = "hi";
-		}
-
-		[Test]
-		public void ConnectionString2 ()
-		{
-			AccessPoker sql = new AccessPoker ();
-
-			sql.DataFile = "";
-			Assert.AreEqual ("Provider=Microsoft.Jet.OLEDB.4.0; Data Source=", sql.ConnectionString, "A1");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NullReferenceException))]
-		public void ConnectionString3 ()
-		{
-			AccessPoker sql = new AccessPoker ();
-
-			sql.DataFile = "hi there";
-			Assert.AreEqual ("Provider=Microsoft.Jet.OLEDB.4.0; Data Source=", sql.ConnectionString, "A1");
-		}
-
-#if notyet
-		// XXX enable this test once mono gets System.Data.OleDb.OleDbFactory
-		//
-		[Test]
-		public void ProviderFactory ()
-		{
-			AccessPoker sql = new AccessPoker ();
-
-			Assert.AreEqual (typeof (OleDbFactory), sql.GetFactory ().GetType());
-		}
-#endif
-
-		[Test]
-		public void Defaults ()
-		{
-			AccessPoker sql = new AccessPoker ();
-
-			Assert.AreEqual ("", sql.CacheKeyDependency, "A1");
-			Assert.IsTrue (sql.CancelSelectOnNullParameter, "A2");
-			Assert.AreEqual (ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A3");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A4");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A5");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A6");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A7");
-			Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A8");
-
-			// SqlCacheDependency access should raise an exception
-			//			Assert.AreEqual ("", sql.SqlCacheDependency, "A9");
-			Assert.AreEqual ("", sql.SortParameterName, "A10");
-			Assert.AreEqual (0, sql.CacheDuration, "A11");
-			Assert.AreEqual (DataSourceCacheExpiry.Absolute, sql.CacheExpirationPolicy, "A12");
-			Assert.IsFalse (sql.EnableCaching, "A13");
-			Assert.AreEqual ("System.Data.OleDb", sql.ProviderName, "A14");
-			Assert.AreEqual ("Provider=Microsoft.Jet.OLEDB.4.0; Data Source=", sql.ConnectionString, "A15");
-			Assert.AreEqual (SqlDataSourceMode.DataSet, sql.DataSourceMode, "A16");
-			Assert.AreEqual ("", sql.DeleteCommand, "A17");
-			Assert.IsNotNull (sql.DeleteParameters, "A18");
-			Assert.AreEqual (0, sql.DeleteParameters.Count, "A18.1");
-			Assert.IsNotNull (sql.FilterParameters, "A19");
-			Assert.AreEqual (0, sql.FilterParameters.Count, "A19.1");
-			Assert.AreEqual ("", sql.InsertCommand, "A20");
-			Assert.IsNotNull (sql.InsertParameters, "A21");
-			Assert.AreEqual (0, sql.InsertParameters.Count, "A21.1");
-			Assert.AreEqual ("", sql.SelectCommand, "A22");
-			Assert.IsNotNull (sql.SelectParameters, "A23");
-			Assert.AreEqual (0, sql.SelectParameters.Count, "A23.1");
-			Assert.AreEqual ("", sql.UpdateCommand, "A24");
-			Assert.IsNotNull (sql.UpdateParameters, "A25");
-			Assert.AreEqual (0, sql.UpdateParameters.Count, "A25.1");
-			Assert.AreEqual ("", sql.FilterExpression, "A26");
-			Assert.AreEqual ("", sql.DataFile, "A27");
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index 923304567d6..c9035795552 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -1,8 +1,3 @@
-2006-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* SqlDataSourceTest.cs, SqlDataSourceViewTest.cs,
-	AccessDataSourceTest.cs: new tests.
-
 2005-12-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* DropDownListTest.cs: test for html-encoding of the text.
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
deleted file mode 100644
index 146438c3e3b..00000000000
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Tests for System.Web.UI.WebControls.SqlDataSource
-//
-// Author:
-//	Chris Toshok (toshok@novell.com)
-//
-
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using NUnit.Framework;
-using System;
-using System.Configuration;
-using System.Data.Common;
-using System.IO;
-using System.Globalization;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace MonoTests.System.Web.UI.WebControls
-{
-	class SqlPoker : SqlDataSource {
-		public SqlPoker ()
-		{
-			TrackViewState ();
-		}
-
-		public object SaveToViewState ()
-		{
-			return SaveViewState ();
-		}
-
-		public void LoadFromViewState (object savedState)
-		{
-			LoadViewState (savedState);
-		}
-	}
-
-	[TestFixture]
-	public class SqlDataSourceTest {
-		[Test]
-		public void Defaults ()
-		{
-			SqlPoker sql = new SqlPoker ();
-
-			Assert.AreEqual ("", sql.CacheKeyDependency, "A1");
-			Assert.IsTrue (sql.CancelSelectOnNullParameter, "A2");
-			Assert.AreEqual (ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A3");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A4");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A5");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A6");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A7");
-			Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A8");
-			Assert.AreEqual ("", sql.SqlCacheDependency, "A9");
-			Assert.AreEqual ("", sql.SortParameterName, "A10");
-			Assert.AreEqual (0, sql.CacheDuration, "A11");
-			Assert.AreEqual (DataSourceCacheExpiry.Absolute, sql.CacheExpirationPolicy, "A12");
-			Assert.IsFalse (sql.EnableCaching, "A13");
-			Assert.AreEqual ("", sql.ProviderName, "A14");
-			Assert.AreEqual ("", sql.ConnectionString, "A15");
-			Assert.AreEqual (SqlDataSourceMode.DataSet, sql.DataSourceMode, "A16");
-			Assert.AreEqual ("", sql.DeleteCommand, "A17");
-			Assert.IsNotNull (sql.DeleteParameters, "A18");
-			Assert.AreEqual (0, sql.DeleteParameters.Count, "A18.1");
-			Assert.IsNotNull (sql.FilterParameters, "A19");
-			Assert.AreEqual (0, sql.FilterParameters.Count, "A19.1");
-			Assert.AreEqual ("", sql.InsertCommand, "A20");
-			Assert.IsNotNull (sql.InsertParameters, "A21");
-			Assert.AreEqual (0, sql.InsertParameters.Count, "A21.1");
-			Assert.AreEqual ("", sql.SelectCommand, "A22");
-			Assert.IsNotNull (sql.SelectParameters, "A23");
-			Assert.AreEqual (0, sql.SelectParameters.Count, "A23.1");
-			Assert.AreEqual ("", sql.UpdateCommand, "A24");
-			Assert.IsNotNull (sql.UpdateParameters, "A25");
-			Assert.AreEqual (0, sql.UpdateParameters.Count, "A25.1");
-			Assert.AreEqual ("", sql.FilterExpression, "A26");
-		}
-
-		[Test]
-		public void ViewState ()
-		{
-			SqlPoker sql = new SqlPoker ();
-
-			sql.CacheKeyDependency = "hi";
-			sql.CancelSelectOnNullParameter = false;
-			sql.ConflictDetection = ConflictOptions.CompareAllValues;
-			sql.DeleteCommandType = SqlDataSourceCommandType.Text;
-			sql.InsertCommandType = SqlDataSourceCommandType.Text;
-			sql.SelectCommandType = SqlDataSourceCommandType.Text;
-			sql.UpdateCommandType = SqlDataSourceCommandType.Text;
-			sql.OldValuesParameterFormatString = "{1}";
-			sql.SqlCacheDependency = "hi";
-			sql.SortParameterName = "hi";
-			sql.CacheDuration = 1;
-			sql.CacheExpirationPolicy = DataSourceCacheExpiry.Sliding;
-			sql.EnableCaching = true;
-			sql.DataSourceMode = SqlDataSourceMode.DataReader;
-			sql.DeleteCommand = "DELETE foo";
-			sql.InsertCommand = "INSERT foo";
-			sql.SelectCommand = "SELECT foo";
-			sql.UpdateCommand = "UPDATE foo";
-			sql.FilterExpression = "hi";
-			
-			Assert.AreEqual ("hi", sql.CacheKeyDependency, "A1");
-			Assert.IsFalse (sql.CancelSelectOnNullParameter, "A2");
-			Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "A3");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "A4");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "A5");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "A6");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "A7");
-			Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "A8");
-			Assert.AreEqual ("hi", sql.SqlCacheDependency, "A9");
-			Assert.AreEqual ("hi", sql.SortParameterName, "A10");
-			Assert.AreEqual (1, sql.CacheDuration, "A11");
-			Assert.AreEqual (DataSourceCacheExpiry.Sliding, sql.CacheExpirationPolicy, "A12");
-			Assert.IsTrue (sql.EnableCaching, "A13");
-			Assert.AreEqual (SqlDataSourceMode.DataReader, sql.DataSourceMode, "A16");
-			Assert.AreEqual ("DELETE foo", sql.DeleteCommand, "A17");
-			Assert.AreEqual ("INSERT foo", sql.InsertCommand, "A20");
-			Assert.AreEqual ("SELECT foo", sql.SelectCommand, "A22");
-			Assert.AreEqual ("UPDATE foo", sql.UpdateCommand, "A24");
-			Assert.AreEqual ("hi", sql.FilterExpression, "A26");
-
-			object state = sql.SaveToViewState();
-
-			sql = new SqlPoker ();
-			sql.LoadFromViewState (state);
-
-			Assert.AreEqual ("hi", sql.CacheKeyDependency, "B1");
-			Assert.IsFalse  (sql.CancelSelectOnNullParameter, "B2");
-			Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "B3");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "B4");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "B5");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "B6");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "B7");
-			Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "B8");
-			Assert.AreEqual ("hi", sql.SqlCacheDependency, "B9");
-			Assert.AreEqual ("hi", sql.SortParameterName, "B10");
-			Assert.AreEqual (1, sql.CacheDuration, "B11");
-			Assert.AreEqual (DataSourceCacheExpiry.Sliding, sql.CacheExpirationPolicy, "B12");
-			Assert.IsTrue   (sql.EnableCaching, "B13");
-			Assert.AreEqual (SqlDataSourceMode.DataReader, sql.DataSourceMode, "B16");
-			Assert.AreEqual ("DELETE foo", sql.DeleteCommand, "B17");
-			Assert.AreEqual ("INSERT foo", sql.InsertCommand, "B20");
-			Assert.AreEqual ("SELECT foo", sql.SelectCommand, "B22");
-			Assert.AreEqual ("UPDATE foo", sql.UpdateCommand, "B24");
-			Assert.AreEqual ("hi", sql.FilterExpression, "B26");
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
deleted file mode 100644
index 3c467d90cc6..00000000000
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-//
-// Tests for System.Web.UI.WebControls.SqlDataSourceView
-//
-// Author:
-//	Chris Toshok (toshok@novell.com)
-//
-
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using NUnit.Framework;
-using System;
-using System.Configuration;
-using System.Data.Common;
-using System.IO;
-using System.Globalization;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace MonoTests.System.Web.UI.WebControls
-{
-	class SqlViewPoker : SqlDataSourceView {
-		public SqlViewPoker (SqlDataSource ds, string name, HttpContext context)
-			: base (ds, name, context)
-		{
-			TrackViewState ();
-		}
-
-		public object SaveToViewState ()
-		{
-			return SaveViewState ();
-		}
-
-		public void LoadFromViewState (object savedState)
-		{
-			LoadViewState (savedState);
-		}
-	}
-
-	[TestFixture]
-	public class SqlDataSourceViewTest {
-		[Test]
-		public void Defaults ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			Assert.IsTrue (sql.CancelSelectOnNullParameter, "A1");
-			Assert.IsFalse (sql.CanDelete,"A2");
-			Assert.IsFalse (sql.CanInsert,"A3");
-			Assert.IsFalse (sql.CanPage,"A4");
-			Assert.IsFalse (sql.CanRetrieveTotalRowCount,"A5");
-			Assert.IsTrue (sql.CanSort,"A6");
-			Assert.IsFalse (sql.CanUpdate,"A7");
-			Assert.AreEqual (ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A8");
-			Assert.AreEqual ("", sql.DeleteCommand, "A9");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A10");
-			Assert.IsNotNull (sql.DeleteParameters, "A11");
-			Assert.AreEqual (0, sql.DeleteParameters.Count, "A12");
-			Assert.AreEqual ("", sql.FilterExpression, "A13");
-			Assert.IsNotNull (sql.FilterParameters, "A14");
-			Assert.AreEqual (0, sql.FilterParameters.Count, "A15");
-			Assert.AreEqual ("", sql.InsertCommand, "A16");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A17");
-			Assert.IsNotNull (sql.InsertParameters, "A18");
-			Assert.AreEqual (0, sql.InsertParameters.Count, "A19");
-			Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A20");
-			Assert.AreEqual ("", sql.SelectCommand, "A21");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A22");
-			Assert.IsNotNull (sql.SelectParameters, "A23");
-			Assert.AreEqual (0, sql.SelectParameters.Count, "A24");
-			Assert.AreEqual ("", sql.SortParameterName, "A25");
-			Assert.AreEqual ("", sql.UpdateCommand, "A26");
-			Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A27");
-			Assert.IsNotNull (sql.UpdateParameters, "A28");
-			Assert.AreEqual (0, sql.UpdateParameters.Count, "A29");
-		}
-
-		[Test]
-		public void ViewState ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			/* XXX test parameters */
-
-			sql.CancelSelectOnNullParameter = false;
-			sql.ConflictDetection = ConflictOptions.CompareAllValues;
-			sql.DeleteCommandType = SqlDataSourceCommandType.Text;
-			sql.DeleteCommand = "delete command";
-			sql.FilterExpression = "filter expression";
-			sql.InsertCommand = "insert command";
-			sql.InsertCommandType = SqlDataSourceCommandType.Text;
-			sql.OldValuesParameterFormatString = "{1}";
-			sql.SelectCommand = "select command";
-			sql.SelectCommandType = SqlDataSourceCommandType.Text;
-			sql.SortParameterName = "sort parameter";
-			sql.UpdateCommand = "update command";
-			sql.UpdateCommandType = SqlDataSourceCommandType.Text;
-
-			Assert.IsFalse (sql.CancelSelectOnNullParameter, "A1");
-			Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "A2");
-			Assert.AreEqual ("delete command", sql.DeleteCommand, "A3");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "A4");
-			Assert.AreEqual ("filter expression", sql.FilterExpression, "A5");
-			Assert.AreEqual ("insert command", sql.InsertCommand, "A6");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "A7");
-			Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "A8");
-			Assert.AreEqual ("select command", sql.SelectCommand, "A9");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "A10");
-			Assert.AreEqual ("sort parameter", sql.SortParameterName, "A11");
-			Assert.AreEqual ("update command", sql.UpdateCommand, "A12");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "A13");
-
-			object state = sql.SaveToViewState();
-
-			sql = new SqlViewPoker (ds, "DefaultView", null);
-			sql.LoadFromViewState (state);
-
-			Assert.IsFalse (sql.CancelSelectOnNullParameter, "B1");
-			Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "B2");
-			Assert.AreEqual ("delete command", sql.DeleteCommand, "B3");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "B4");
-			Assert.AreEqual ("filter expression", sql.FilterExpression, "B5");
-			Assert.AreEqual ("insert command", sql.InsertCommand, "B6");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "B7");
-			Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "B8");
-			Assert.AreEqual ("select command", sql.SelectCommand, "B9");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "B10");
-			Assert.AreEqual ("sort parameter", sql.SortParameterName, "B11");
-			Assert.AreEqual ("update command", sql.UpdateCommand, "B12");
-			Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "B13");
-		}
-
-		[Test]
-		public void CanDelete ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			sql.DeleteCommand = "DELETE from foo";
-			Assert.IsTrue (sql.CanDelete, "A1");
-
-			sql.DeleteCommand = "";
-			Assert.IsFalse (sql.CanDelete, "A2");
-
-			sql.DeleteCommand = null;
-			Assert.IsFalse (sql.CanDelete, "A3");
-		}
-
-		[Test]
-		public void CanInsert ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			sql.InsertCommand = "INSERT into foo";
-			Assert.IsTrue (sql.CanInsert, "A1");
-
-			sql.InsertCommand = "";
-			Assert.IsFalse (sql.CanInsert, "A2");
-
-			sql.InsertCommand = null;
-			Assert.IsFalse (sql.CanInsert, "A3");
-		}
-
-		[Test]
-		public void CanUpdate ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			sql.UpdateCommand = "UPDATE foo";
-			Assert.IsTrue (sql.CanUpdate, "A1");
-
-			sql.UpdateCommand = "";
-			Assert.IsFalse (sql.CanUpdate, "A2");
-
-			sql.UpdateCommand = null;
-			Assert.IsFalse (sql.CanUpdate, "A3");
-		}
-
-		[Test]
-		public void CanSort ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			sql.SortParameterName = "foo";
-			Assert.IsTrue (sql.CanSort, "A1");
-
-			sql.SortParameterName = null;
-			Assert.IsTrue (sql.CanSort, "A2");
-
-			sql.SortParameterName = "";
-			Assert.IsTrue (sql.CanSort, "A3");
-
-			sql.SortParameterName = "foo";
-
-			ds.DataSourceMode = SqlDataSourceMode.DataReader;
-			Assert.IsTrue (sql.CanSort, "A4");
-
-			ds.DataSourceMode = SqlDataSourceMode.DataSet;
-			Assert.IsTrue (sql.CanSort, "A5");
-
-			sql.SortParameterName = "";
-
-			ds.DataSourceMode = SqlDataSourceMode.DataReader;
-			Assert.IsFalse (sql.CanSort, "A6");
-
-			ds.DataSourceMode = SqlDataSourceMode.DataSet;
-			Assert.IsTrue (sql.CanSort, "A7");
-		}
-
-		[Test]
-		public void OldValuesParameterFormatString ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-			
-			Assert.AreEqual ("{0}", ds.OldValuesParameterFormatString, "A1");
-
-			ds.OldValuesParameterFormatString = "hi {0}";
-
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A2");
-
-			ds.OldValuesParameterFormatString = "hi {0}";
-
-			Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A3");
-
-			ds.OldValuesParameterFormatString = "{0}";
-			sql.OldValuesParameterFormatString = "hi {0}";
-
-			Assert.AreEqual ("{0}", ds.OldValuesParameterFormatString, "A4");
-		}
-
-		[Test]
-		public void CancelSelectOnNullParameter ()
-		{
-			SqlDataSource ds = new SqlDataSource ();
-
-			ds.CancelSelectOnNullParameter = false;
-
-			SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
-
-			Assert.IsTrue (sql.CancelSelectOnNullParameter, "A1");
-
-			ds.CancelSelectOnNullParameter = true;
-			sql.CancelSelectOnNullParameter = false;
-
-			Assert.IsTrue (ds.CancelSelectOnNullParameter, "A2");
-
-			sql.CancelSelectOnNullParameter = false;
-			ds.CancelSelectOnNullParameter = true;
-			Assert.IsFalse (sql.CancelSelectOnNullParameter, "A3");
-		}
-	}
-
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web.UI/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
index fb2b4f26f76..0b8bb79b811 100644
--- a/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
@@ -1,12 +1,3 @@
-2006-02-12  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* HtmlTextWriterTest.cs: Added test for WriteBreak.
-
-2006-01-18 Konstantin Triger <kostat@mainsoft.com>
-
-	* HtmlTextWriterTest.cs: Added tests enduring case insensitivity of
-	  attributes and correctness of HtmlTextWriterAttribute
-
 2005-12-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* ControlTest.cs: new tests to prove that Control uses its own
diff --git a/mcs/class/System.Web/Test/System.Web.UI/ChtmlTextWriterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/ChtmlTextWriterTest.cs
deleted file mode 100644
index 8e194571421..00000000000
--- a/mcs/class/System.Web/Test/System.Web.UI/ChtmlTextWriterTest.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// ChtmlTextWriterTest.cs: Unit tests for System.Web.UI.ChtmlTextWriter
-//
-// Author:
-//	Cesar Lopez Nataren <cnataren@novell.com>
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.IO;
-using System.Web.UI;
-using NUnit.Framework;
-using System.Collections;
-
-namespace MonoTests.System.Web.UI {
-
-	public class ChtmlTextWriterTester : ChtmlTextWriter {
-
-		public ChtmlTextWriterTester (TextWriter writer)
-			: this (writer, DefaultTabString)
-		{
-		}
-
-		public ChtmlTextWriterTester (TextWriter writer, string tabString)
-			: base (writer, tabString)
-		{
-		}
-
-		public bool IsRecognizedAttribute (string elementName, string attributeName)
-		{
-			Hashtable elem_attrs = (Hashtable) RecognizedAttributes [elementName];
-
-			if (elem_attrs == null)
-				return false;
-			return elem_attrs [attributeName] != null;
-		}
-
-		public string PublicGetAttributeName (HtmlTextWriterAttribute attrKey)
-		{
-			return GetAttributeName (attrKey);
-		}
-
-		public bool PublicOnAttributeRender (string name, string value, HtmlTextWriterAttribute attr)
-		{
-			return OnAttributeRender (name, value, attr);
-		}
-
-		public bool PublicOnStyleAttributeRender (string name, string value, HtmlTextWriterStyle key)
-		{
-			return OnStyleAttributeRender (name, value, key);
-		}
-
-		public bool PublicOnTagRender (string name, HtmlTextWriterTag tag)
-		{
-			return OnTagRender (name, tag);
-		}
-
-		public Hashtable PublicGlobalSuppressedAttributes {
-			get { return GlobalSuppressedAttributes; }
-		}
-
-		public Hashtable PublicSuppressedAttributes {
-			get { return SuppressedAttributes; }
-		}
-	}
-
-	[TestFixture]
-	public class ChtmlTextWriterTest {
-
-		ChtmlTextWriterTester chtml;
-		StringWriter writer;
-
-		string absent_element = "absent-elem";
-		string absent_attr = "absent-attr";
-
-		[SetUp]
-		public void SetupTests ()
-		{
-			writer = new StringWriter ();
-			chtml = new ChtmlTextWriterTester (writer);
-		}
-
-		[Test]
-		public void AddRecognizedAttributeTest ()
-		{
-			chtml.AddRecognizedAttribute (absent_element, absent_attr);
-			Assertion.AssertEquals ("#A01", true, chtml.IsRecognizedAttribute (absent_element, absent_attr));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void AddRecognizedAttribute2 ()
-		{
-			AddRecognizedAttributeTest ();
-			AddRecognizedAttributeTest ();
-		}
-
-		[Test]
-		public void RemoveRecognizedAttributeTest ()
-		{
-			AddRecognizedAttributeTest ();
-
-			chtml.RemoveRecognizedAttribute (absent_element, absent_attr);
-			Assertion.AssertEquals ("#B01", false, chtml.IsRecognizedAttribute (absent_element, absent_attr));
-
-			string version_two = "v2";
-			chtml.RemoveRecognizedAttribute (absent_element + version_two, absent_attr + version_two);
-		}
-
-		[Test]
-		public void WriteBreakTest ()
-		{
-			string br = "<br>";
-			chtml.WriteBreak ();
-			Assertion.AssertEquals ("#C01", true, br == writer.ToString ());
-		}
-
-		[Test]
-		public void WriteEncodedTest ()
-		{
-			string encoded_text = "<custID> & <invoice#>";
-			string unencoded_text = "&lt;custID&gt; &amp; &lt;invoice#&gt;";
-			chtml.WriteEncodedText (encoded_text);
-
-			Assertion.AssertEquals ("#D01", true, unencoded_text == writer.ToString ());
-		}
-
-		[Test]
-		public void OnAttributeRenderTest ()
-		{
-			HtmlTextWriterAttribute [] enum_values = (HtmlTextWriterAttribute []) Enum.GetValues (typeof (HtmlTextWriterAttribute));
-			int i = 0;
-
-			foreach (HtmlTextWriterAttribute attr in enum_values) {
-				try {
-					chtml.PublicOnAttributeRender (chtml.PublicGetAttributeName (attr), "accesskey", attr);
-				} catch (ArgumentNullException e) {
-					i++;
-				}
-			}
-			Assertion.AssertEquals ("#E01", enum_values.Length, i);
-		}
-
-		[Test]
-		public void OnStyleAttributeRenderTest ()
-		{
-			bool expected;
-			int i = 0;
-
-			foreach (HtmlTextWriterStyle tag in Enum.GetValues (typeof (HtmlTextWriterStyle))) {
-				expected = (tag == HtmlTextWriterStyle.Display);
-				Assertion.AssertEquals ("#F0" + i++, expected, chtml.PublicOnStyleAttributeRender ("foo", "foo", tag));
-			}
-		}
-
-
-		[Test]
-		public void OnTagRenderTest ()
-		{
-			int i = 0;
-			bool expected;
-
-			foreach (HtmlTextWriterTag tag in Enum.GetValues (typeof (HtmlTextWriterTag))) {
-				expected = (tag != HtmlTextWriterTag.Span);
-				Assertion.AssertEquals ("#G0" + i++, expected, chtml.PublicOnTagRender ("foo", tag));
-			}
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
index 61b2fc59c61..fce8924f087 100644
--- a/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
@@ -352,43 +352,5 @@ namespace MonoTests.System.Web.UI {
 
 			Assert.AreEqual ("<div>\n\n</div>", sw.ToString ());
 		}
-
-#if NET_2_0
-		[Test]
-		public void WriteBreakTest ()
-		{
-			w.WriteBreak ();
-			Assertion.AssertEquals ("WriteBreakTest01", "<br />", sw.ToString ());
-		}
-#endif
-		
-		class MyHttpTextWriter : HtmlTextWriter {
-			int i = 0;
-			public MyHttpTextWriter(TextWriter tw) : base(tw) {
-	
-			}
-			protected override bool OnAttributeRender(string name, string value, HtmlTextWriterAttribute key) {
-				switch (i++) {
-				case 0:
-				case 1: Assert.AreEqual(HtmlTextWriterAttribute.Border, key);
-					break;
-				case 2: Assert.AreEqual((HtmlTextWriterAttribute)(-1), key);
-					break;
-				}
-				return base.OnAttributeRender (name, value, key);
-			}
-	
-		}
-		
-		[Test]
-		public void TestOnAttributeRender() {
-			MyHttpTextWriter myw = new MyHttpTextWriter (sw);
-			
-			myw.AddAttribute ("border", "0");
-			myw.AddAttribute ("BoRDeR", "0");
-			myw.AddAttribute ("error", "0");
-			myw.RenderBeginTag ("div");
-			myw.RenderEndTag ();
-		}
 	}
 }
diff --git a/mcs/class/System.Web/Test/System.Web.UI/XhtmlTextWriterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/XhtmlTextWriterTest.cs
deleted file mode 100644
index 80585425cec..00000000000
--- a/mcs/class/System.Web/Test/System.Web.UI/XhtmlTextWriterTest.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// XhtmlTextWriterTest.cs
-//	- Unit tests for System.Web.UI.XhtmlTextWriter
-//
-// Author:
-//	Cesar Lopez Nataren <cnataren@novell.com>
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.IO;
-using System.Web.UI;
-using NUnit.Framework;
-using System.Collections;
-
-namespace MonoTests.System.Web.UI {
-
-	public class XhtmlTextWriterTester : XhtmlTextWriter
-	{
-		public XhtmlTextWriterTester (TextWriter writer)
-			: this (writer, HtmlTextWriter.DefaultTabString)
-		{
-		}
-
-		public XhtmlTextWriterTester (TextWriter writer, string tabString)
-			: base (writer, tabString)
-		{
-		}
-
-		public Hashtable PublicElementSpecificAttributes {
-			get { return ElementSpecificAttributes; }
-		}
-
-		public bool PublicOnStyleAttributeRender (string name, string value, HtmlTextWriterStyle style)
-		{
-			return OnStyleAttributeRender (name, value, style);
-		}
-
-		public bool PublicOnAttributeRender (string name, string value, HtmlTextWriterAttribute attr)
-		{
-			return OnAttributeRender (name, value, attr);
-		}
-
-		public string PublicGetAttributeName (HtmlTextWriterAttribute attrKey)
-		{
-			return GetAttributeName (attrKey);
-		}
-
-		public string PublicGetStyleName (HtmlTextWriterStyle styleKey)
-		{
-			return GetStyleName (styleKey);
-		}
-	}
-
-	[TestFixture]
-	public class XhtmlTextWriterTest {
-
-		XhtmlTextWriterTester xhtml;
-		StringWriter writer;
-
-		// attributes
-		string absent_attr = "absent-attr";
-		string a_attr = "accesskey";
-
-		// elements
-		string elem_name = "a";
-		string absent_elem = "absent-elem";
-
-		Hashtable attrs;
-
-		[SetUp]
-		public void SetupTests ()
-		{
-			writer = new StringWriter ();
-			xhtml = new XhtmlTextWriterTester (writer);
-			attrs = (Hashtable) xhtml.PublicElementSpecificAttributes;
-		}
-
-		[Test]
-		public void AddRecognizedAttributeTest ()
-		{
-			Hashtable elem_attrs = (Hashtable) attrs [elem_name];
-
-			// absent attr
-			Assertion.AssertEquals ("#A01", null, elem_attrs [absent_attr]);
-
-			// recently added attr
-			xhtml.AddRecognizedAttribute (elem_name, absent_attr);
-			Assertion.AssertEquals ("A02", true, elem_attrs [absent_attr]);
-
-			// ensure there's no absent_elem
-			Assertion.AssertEquals ("#A03", null, attrs [absent_elem]);
-
-			// Given absent_elem and absent_attr, we must add the element 
-			// and bind the given attr to it
-			xhtml.AddRecognizedAttribute (absent_elem, absent_attr);
-			Assertion.AssertEquals ("#A04", true, ((Hashtable) attrs [absent_elem]) [absent_attr]);
-
-			// Given a known element and attribute
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void AddRecognizedAttributeTest2 ()
-		{
-			// if attr is already there we must throw ArgumentException
-			xhtml.AddRecognizedAttribute (elem_name, a_attr);
-		}
-
-		[Test]
-		public void RemoveRecognizedAttribute ()
-		{
-			// ensure we add it
-			xhtml.AddRecognizedAttribute (elem_name, absent_attr);
-			Assertion.AssertEquals ("#B01", true, ((Hashtable) attrs [elem_name]) [absent_attr]);
-
-			// ensure we remove it
-			xhtml.RemoveRecognizedAttribute (elem_name, absent_attr);
-			Assertion.AssertEquals ("#B02", null, ((Hashtable) attrs [elem_name]) [absent_attr]);
-
-			// if the element does not exist we must resume cleanly
-			xhtml.RemoveRecognizedAttribute (absent_elem, absent_attr);
-
-			// if the attr does not exist we must resume cleanly
-			xhtml.RemoveRecognizedAttribute (elem_name, a_attr);
-		}
-
-		[Test]
-		public void OnStyleAttributeRenderTest ()
-		{
-			int i = 0;
-
-			foreach (HtmlTextWriterStyle style in Enum.GetValues (typeof (HtmlTextWriterStyle)))
-				Assertion.AssertEquals ("#C0" + i++, false,
-						xhtml.PublicOnStyleAttributeRender (xhtml.PublicGetStyleName (style), 
-									    "foo", style));
-		}
-
-		[Test]
-		public void WriteBreakTest ()
-		{
-			xhtml.WriteBreak ();
-			Assertion.AssertEquals ("#D01", "<br/>", writer.ToString ());
-		}
-
-		[Test]
-		public void OnAttributeRenderTest ()
-		{
-			int i = 0;
-			Array attrs = Enum.GetValues (typeof (HtmlTextWriterAttribute));
-
-			foreach (HtmlTextWriterAttribute attr in attrs) {
-				try {
-					xhtml.PublicOnAttributeRender (xhtml.PublicGetAttributeName (attr), "foo", attr);
-				} catch (ArgumentNullException e) {
-					i++;
-				}
-			}
-			Assertion.AssertEquals ("#F01", attrs.Length, i);
-		}
-	}
-}
-
-#endif
diff --git a/mcs/class/System.Web/Test/System.Web/ChangeLog b/mcs/class/System.Web/Test/System.Web/ChangeLog
index 0ab6d7258cf..179d5921885 100644
--- a/mcs/class/System.Web/Test/System.Web/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* VirtualPathUtilityTest.cs: added new tests.
-
 2005-12-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpRequestTest.cs: ignore test.
diff --git a/mcs/class/System.Web/Test/System.Web/HttpRuntimeCas.cs b/mcs/class/System.Web/Test/System.Web/HttpRuntimeCas.cs
index 81d32bebd04..efa741a6fb4 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpRuntimeCas.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpRuntimeCas.cs
@@ -78,6 +78,10 @@ namespace MonoCasTests.System.Web {
 		{
 			Assert.IsNull (HttpRuntime.AppDomainAppVirtualPath, "AppDomainAppVirtualPath");
 			Assert.IsNotNull (HttpRuntime.Cache, "Cache");
+#if NET_2_0
+			ApplicationShutdownReason asr = HttpRuntime.ShutdownReason;
+			Assert.AreEqual (asr, asr, "ShutdownReason"); // value depends on execution order
+#endif
 		}
 
 		[Test]
diff --git a/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs b/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
index 17241e977dd..b7b3e7d0a37 100644
--- a/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
@@ -3,9 +3,8 @@
 //
 // Author:
 //	Chris Toshok  <toshok@novell.com>
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
 //
-// Copyright (C) 2005,2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -31,7 +30,6 @@
 
 using System;
 using System.Web;
-using VPU = System.Web.VirtualPathUtility;
 
 using NUnit.Framework;
 
@@ -42,40 +40,40 @@ namespace MonoTests.System.Web {
 		[Test]
 		public void AppendTrailingSlash ()
 		{
-			Assert.AreEqual ("/hithere/", VPU.AppendTrailingSlash ("/hithere"), "A1");
-			Assert.AreEqual ("/hithere/", VPU.AppendTrailingSlash ("/hithere/"), "A2");
-			Assert.AreEqual ("/", VPU.AppendTrailingSlash ("/"), "A3");
-			Assert.AreEqual ("", VPU.AppendTrailingSlash (""), "A4");
-			Assert.AreEqual (null, VPU.AppendTrailingSlash (null), "A5");
+			Assert.AreEqual ("/hithere/", VirtualPathUtility.AppendTrailingSlash ("/hithere"), "A1");
+			Assert.AreEqual ("/hithere/", VirtualPathUtility.AppendTrailingSlash ("/hithere/"), "A2");
+			Assert.AreEqual ("/", VirtualPathUtility.AppendTrailingSlash ("/"), "A3");
+			Assert.AreEqual ("", VirtualPathUtility.AppendTrailingSlash (""), "A4");
+			Assert.AreEqual (null, VirtualPathUtility.AppendTrailingSlash (null), "A5");
 		}
 
 		[Test]
 		public void Combine ()
 		{
-			Assert.AreEqual ("/there", VPU.Combine ("/hi", "there"), "A1");
-			Assert.AreEqual ("/hi/you", VPU.Combine ("/hi/there", "you"), "A2");
-			Assert.AreEqual ("/hi/there/you", VPU.Combine ("/hi/there/", "you"), "A3");
+			Assert.AreEqual ("/there", VirtualPathUtility.Combine ("/hi", "there"), "A1");
+			Assert.AreEqual ("/hi/you", VirtualPathUtility.Combine ("/hi/there", "you"), "A2");
+			Assert.AreEqual ("/hi/there/you", VirtualPathUtility.Combine ("/hi/there/", "you"), "A3");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void Combine_ArgException1 ()
 		{
-			Assert.AreEqual ("hi/there/you", VPU.Combine ("hi/there", "you"), "A1");
+			Assert.AreEqual ("hi/there/you", VirtualPathUtility.Combine ("hi/there", "you"), "A1");
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
+		[ExpectedException (typeof (ArgumentException))]
 		public void Combine_ArgException2 ()
 		{
-			Assert.AreEqual ("hi/there", VPU.Combine ("hi/there", null), "A1");
+			Assert.AreEqual ("hi/there", VirtualPathUtility.Combine ("hi/there", null), "A1");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void Combine_ArgException3 ()
 		{
-			Assert.AreEqual ("hi/there", VPU.Combine (null, "there"), "A1");
+			Assert.AreEqual ("hi/there", VirtualPathUtility.Combine (null, "there"), "A1");
 		}
 
 		[Test]
@@ -87,7 +85,7 @@ namespace MonoTests.System.Web {
 		*/
 		public void Combine_ArgException4 ()
 		{
-			Assert.AreEqual ("/you", VPU.Combine ("", "you"), "A1");
+			Assert.AreEqual ("/you", VirtualPathUtility.Combine ("", "you"), "A1");
 		}
 
 		[Test]
@@ -99,15 +97,15 @@ namespace MonoTests.System.Web {
 		*/
 		public void Combine_ArgException5 ()
 		{
-			Assert.AreEqual ("/hi", VPU.Combine ("/hi", ""), "A1");
+			Assert.AreEqual ("/hi", VirtualPathUtility.Combine ("/hi", ""), "A1");
 		}
 
 		[Test]
 		public void GetDirectory ()
 		{
-			Assert.AreEqual ("/hi/", VPU.GetDirectory ("/hi/there"), "A1");
-			Assert.AreEqual ("/hi/", VPU.GetDirectory ("/hi/there/"), "A2");
-			Assert.AreEqual (null, VPU.GetDirectory ("/"), "A3");
+			Assert.AreEqual ("/hi/", VirtualPathUtility.GetDirectory ("/hi/there"), "A1");
+			Assert.AreEqual ("/hi/", VirtualPathUtility.GetDirectory ("/hi/there/"), "A2");
+			Assert.AreEqual (null, VirtualPathUtility.GetDirectory ("/"), "A3");
 		}
 
 		[Test]
@@ -119,103 +117,103 @@ namespace MonoTests.System.Web {
 		 */
 		public void GetDirectory_ArgException1 ()
 		{
-			Assert.AreEqual ("", VPU.GetDirectory (""), "A1");
+			Assert.AreEqual ("", VirtualPathUtility.GetDirectory (""), "A1");
 		}
 
 		[Test]
 		public void GetExtension ()
 		{
-			Assert.AreEqual (".aspx", VPU.GetExtension ("/hi/index.aspx"), "A1");
-			Assert.AreEqual (".aspx", VPU.GetExtension ("index.aspx"), "A2");
-			Assert.AreEqual ("", VPU.GetExtension ("/hi/index"), "A3");
+			Assert.AreEqual (".aspx", VirtualPathUtility.GetExtension ("/hi/index.aspx"), "A1");
+			Assert.AreEqual (".aspx", VirtualPathUtility.GetExtension ("index.aspx"), "A2");
+			Assert.AreEqual ("", VirtualPathUtility.GetExtension ("/hi/index"), "A3");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void GetExtension_ArgException1 ()
 		{
-			Assert.AreEqual (null, VPU.GetExtension (null), "A1");
+			Assert.AreEqual (null, VirtualPathUtility.GetExtension (null), "A1");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void GetExtension_ArgException2 ()
 		{
-			Assert.AreEqual ("", VPU.GetExtension (""), "A1");
+			Assert.AreEqual ("", VirtualPathUtility.GetExtension (""), "A1");
 		}
 
 		[Test]
 		public void GetFileName ()
 		{
-			Assert.AreEqual ("index.aspx", VPU.GetFileName ("/hi/index.aspx"), "A1");
-			Assert.AreEqual ("hi", VPU.GetFileName ("/hi/"), "A2");
+			Assert.AreEqual ("index.aspx", VirtualPathUtility.GetFileName ("/hi/index.aspx"), "A1");
+			Assert.AreEqual ("hi", VirtualPathUtility.GetFileName ("/hi/"), "A2");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void GetFileName_ArgException1 ()
 		{
-			Assert.AreEqual (null, VPU.GetFileName (null), "A1");
+			Assert.AreEqual (null, VirtualPathUtility.GetFileName (null), "A1");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void GetFileName_ArgException2 ()
 		{
-			Assert.AreEqual ("", VPU.GetFileName (""), "A1");
+			Assert.AreEqual ("", VirtualPathUtility.GetFileName (""), "A1");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void GetFileName_ArgException3 ()
 		{
-			Assert.AreEqual ("index.aspx", VPU.GetFileName ("index.aspx"), "A1");
+			Assert.AreEqual ("index.aspx", VirtualPathUtility.GetFileName ("index.aspx"), "A1");
 		}
 
 		[Test]
 		public void IsAbsolute ()
 		{
-			Assert.IsTrue (VPU.IsAbsolute ("/"), "A1");
-			Assert.IsTrue (VPU.IsAbsolute ("/hi/there"), "A2");
-			Assert.IsFalse (VPU.IsAbsolute ("hi/there"), "A3");
-			Assert.IsFalse (VPU.IsAbsolute ("./hi"), "A4");
+			Assert.IsTrue (VirtualPathUtility.IsAbsolute ("/"), "A1");
+			Assert.IsTrue (VirtualPathUtility.IsAbsolute ("/hi/there"), "A2");
+			Assert.IsFalse (VirtualPathUtility.IsAbsolute ("hi/there"), "A3");
+			Assert.IsFalse (VirtualPathUtility.IsAbsolute ("./hi"), "A4");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void IsAbsolute_ArgException1 ()
 		{
-			Assert.IsFalse (VPU.IsAbsolute (""), "A1");
+			Assert.IsFalse (VirtualPathUtility.IsAbsolute (""), "A1");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void IsAbsolute_ArgException2 ()
 		{
-			Assert.IsFalse (VPU.IsAbsolute (null), "A1");
+			Assert.IsFalse (VirtualPathUtility.IsAbsolute (null), "A1");
 		}
 
 		[Test]
 		public void IsAppRelative ()
 		{
-			Assert.IsTrue (VPU.IsAppRelative ("~/Stuff"), "A1");
-			Assert.IsFalse (VPU.IsAppRelative ("./Stuff"), "A2");
-			Assert.IsFalse (VPU.IsAppRelative ("/Stuff"), "A3");
-			Assert.IsFalse (VPU.IsAppRelative ("/"), "A4");
+			Assert.IsTrue (VirtualPathUtility.IsAppRelative ("~/Stuff"), "A1");
+			Assert.IsFalse (VirtualPathUtility.IsAppRelative ("./Stuff"), "A2");
+			Assert.IsFalse (VirtualPathUtility.IsAppRelative ("/Stuff"), "A3");
+			Assert.IsFalse (VirtualPathUtility.IsAppRelative ("/"), "A4");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void IsAppRelative_ArgException1 ()
 		{
-			Assert.IsFalse (VPU.IsAppRelative (""), "A1");
+			Assert.IsFalse (VirtualPathUtility.IsAppRelative (""), "A1");
 		}
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void IsAppRelative_ArgException2 ()
 		{
-			Assert.IsFalse (VPU.IsAppRelative (null), "A1");
+			Assert.IsFalse (VirtualPathUtility.IsAppRelative (null), "A1");
 		}
 
 #if false
@@ -228,204 +226,20 @@ namespace MonoTests.System.Web {
 		*/
 		public void MakeRelative ()
 		{
-			Assert.AreEqual ("../bar", VPU.MakeRelative ("~/foo/hi", "~/foo/bar"), "A1");
+			Assert.AreEqual ("../bar", VirtualPathUtility.MakeRelative ("~/foo/hi", "~/foo/bar"), "A1");
 		}
 #endif
 
 		[Test]
 		public void RemoveTrailingSlash ()
 		{
-			Assert.AreEqual ("/hi/there", VPU.RemoveTrailingSlash ("/hi/there/"), "A1");
-			Assert.AreEqual ("/hi/there", VPU.RemoveTrailingSlash ("/hi/there"), "A2");
-			Assert.AreEqual ("/", VPU.RemoveTrailingSlash ("/"), "A3");
-			Assert.AreEqual (null, VPU.RemoveTrailingSlash (""), "A4");
-			Assert.AreEqual (null, VPU.RemoveTrailingSlash (null), "A5");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void Combine1 ()
-		{
-			VPU.Combine (null, "something");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void Combine2 ()
-		{
-			VPU.Combine ("something", null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void GetDirectory1 ()
-		{
-			VPU.GetDirectory (null);
-		}
-		
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void GetDirectory2 ()
-		{
-			VPU.GetDirectory ("");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void GetDirectory3 ()
-		{
-			VPU.GetDirectory ("hola");
-		}
-
-		[Test]
-		public void GetDirectory4 ()
-		{
-			Assert.AreEqual ("/direc/", VPU.GetDirectory ("/direc/somefilenoextension"));
-			Assert.AreEqual ("/direc/", VPU.GetDirectory ("/direc/somefile.aspx"));
-			Assert.AreEqual ("/direc/", VPU.GetDirectory ("/////direc///somefile.aspx"));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void GetExtension1 ()
-		{
-			VPU.GetExtension (null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void GetExtension2 ()
-		{
-			// Amazing.
-			VPU.GetExtension ("");
-		}
-
-		[Test]
-		public void GetExtension3 ()
-		{
-			Assert.AreEqual ("", VPU.GetExtension ("/direc/somefilenoextension"));
-			Assert.AreEqual ("", VPU.GetExtension ("/"));
-			Assert.AreEqual (".aspx", VPU.GetDirectory ("/////direc///somefile.aspx"));
-		}
-
-		[Test]
-		public void GetFileName1 ()
-		{
-			Assert.AreEqual ("", VPU.GetFileName ("/"));
-			Assert.AreEqual ("hola", VPU.GetFileName ("/hola"));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void GetFileName2 ()
-		{
-			VPU.GetFileName (null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void GetFileName3 ()
-		{
-			VPU.GetFileName ("");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NullReferenceException))]
-		public void MakeRelative1 ()
-		{
-			VPU.MakeRelative (null, "");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NullReferenceException))]
-		public void MakeRelative2 ()
-		{
-			VPU.MakeRelative ("", null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-		public void MakeRelative3 ()
-		{
-			VPU.MakeRelative ("/", "i");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-		public void MakeRelative4 ()
-		{
-			VPU.MakeRelative ("aa", "/i");
-		}
-
-		[Test]
-		public void MakeRelative5 ()
-		{
-			Assert.AreEqual ("", VPU.MakeRelative ("", ""));
-			Assert.AreEqual ("", VPU.MakeRelative ("/something", ""));
-			Assert.AreEqual ("./", VPU.MakeRelative ("/", "/"));
-		}
-
-		[Test]
-		public void RemoveTrailingSlash2 ()
-		{
-			Assert.AreEqual (null, VPU.RemoveTrailingSlash (null));
-			Assert.AreEqual (null, VPU.RemoveTrailingSlash (""));
-			Assert.AreEqual ("/", VPU.RemoveTrailingSlash ("/"));
-			Assert.AreEqual ("////", VPU.RemoveTrailingSlash ("/////"));
-			Assert.AreEqual ("/pepe", VPU.RemoveTrailingSlash ("/pepe"));
-			Assert.AreEqual ("/pepe", VPU.RemoveTrailingSlash ("/pepe/"));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void ToAbsolute1 ()
-		{
-			VPU.ToAbsolute (null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void ToAbsolute2 ()
-		{
-			VPU.ToAbsolute ("");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void ToAbsolute3 ()
-		{
-			VPU.ToAbsolute ("..");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void ToAbsolute4 ()
-		{
-			VPU.ToAbsolute ("...");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void ToAbsolute5 ()
-		{
-			VPU.ToAbsolute ("../blah");
-		}
-
-		[Test]
-		[ExpectedException (typeof (HttpException))]
-		public void ToAbsolute6 ()
-		{
-			VPU.ToAbsolute ("~/");
-		}
-
-		[Test]
-		[ExpectedException (typeof (HttpException))]
-		public void ToAbsolute7 ()
-		{
-			Assert.AreEqual ("/", VPU.ToAbsolute ("/"));
+			Assert.AreEqual ("/hi/there", VirtualPathUtility.RemoveTrailingSlash ("/hi/there/"), "A1");
+			Assert.AreEqual ("/hi/there", VirtualPathUtility.RemoveTrailingSlash ("/hi/there"), "A2");
+			Assert.AreEqual ("/", VirtualPathUtility.RemoveTrailingSlash ("/"), "A3");
+			Assert.AreEqual (null, VirtualPathUtility.RemoveTrailingSlash (""), "A4");
+			Assert.AreEqual (null, VirtualPathUtility.RemoveTrailingSlash (null), "A5");
 		}
 	}
 }
 
 #endif
-
diff --git a/mcs/class/System.Web/Test/mainsoft/ChangeLog b/mcs/class/System.Web/Test/mainsoft/ChangeLog
deleted file mode 100755
index 618dcaf1974..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2006-02-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* run-test.bat: fixed references copying
-
-2006-02-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* added run-test.bat file for running in GH environment
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/ChangeLog b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/ChangeLog
deleted file mode 100755
index 8b28b39d5bb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2006-02-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* added GH project files: MainsoftWebApp.JBoss.vmwcsproj,
-	MainsoftWebApp.Tomcat.vmwcsproj for Tomcat and JBoss servers
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/MainsoftWebApp.JBoss.vmwcsproj b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/MainsoftWebApp.JBoss.vmwcsproj
deleted file mode 100755
index aa8f5f5c717..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/MainsoftWebApp.JBoss.vmwcsproj
+++ /dev/null
@@ -1,1040 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Web" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{F03B9573-A5B5-445F-9C0B-801A67E2BF9F}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="MainsoftWebApp" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="MainsoftWebApp" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="true" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Web" AssemblyName="System.Web" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="j2ee" AssemblyName="j2ee" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jboss\j2ee.dll" Private="False"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="Web.config" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_BeginInvoke_OEAOAO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_BeginInvoke_OEAOAO.aspx.cs" DependentUpon="BeginEventHandler_BeginInvoke_OEAOAO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_ctor_OI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_ctor_OI.aspx.cs" DependentUpon="BeginEventHandler_ctor_OI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_Invoke_OEAO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_Invoke_OEAO.aspx.cs" DependentUpon="BeginEventHandler_Invoke_OEAO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Add_SO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Add_SO.aspx.cs" DependentUpon="HttpApplicationState_Add_SO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_AllKeys.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_AllKeys.aspx.cs" DependentUpon="HttpApplicationState_AllKeys.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Clear_.aspx.cs" DependentUpon="HttpApplicationState_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Contents.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Contents.aspx.cs" DependentUpon="HttpApplicationState_Contents.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Count.aspx.cs" DependentUpon="HttpApplicationState_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_GetKey_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_GetKey_I.aspx.cs" DependentUpon="HttpApplicationState_GetKey_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item.aspx.cs" DependentUpon="HttpApplicationState_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item_S.aspx.cs" DependentUpon="HttpApplicationState_Item_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Remove_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Remove_S.aspx.cs" DependentUpon="HttpApplicationState_Remove_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAll_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAll_.aspx.cs" DependentUpon="HttpApplicationState_RemoveAll_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAt_I.aspx.cs" DependentUpon="HttpApplicationState_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpCacheability\HttpCacheability_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpCacheability\HttpCacheability_Enum.aspx.cs" DependentUpon="HttpCacheability_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpCacheRevalidation\HttpCacheRevalidation_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpCacheRevalidation\HttpCacheRevalidation_Enum.aspx.cs" DependentUpon="HttpCacheRevalidation_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_AcceptTypes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_AcceptTypes.aspx.cs" DependentUpon="HttpRequest_AcceptTypes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ApplicationPath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ApplicationPath.aspx.cs" DependentUpon="HttpRequest_ApplicationPath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Browser.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Browser.aspx.cs" DependentUpon="HttpRequest_Browser.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ClientCertificate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ClientCertificate.aspx.cs" DependentUpon="HttpRequest_ClientCertificate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ContentEncoding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ContentEncoding.aspx.cs" DependentUpon="HttpRequest_ContentEncoding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Cookies.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Cookies.aspx.cs" DependentUpon="HttpRequest_Cookies.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_CurrentExecutionFilePath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_CurrentExecutionFilePath.aspx.cs" DependentUpon="HttpRequest_CurrentExecutionFilePath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Headers.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Headers.aspx.cs" DependentUpon="HttpRequest_Headers.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_MapPath_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_MapPath_S.aspx.cs" DependentUpon="HttpRequest_MapPath_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ServerVariables.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ServerVariables.aspx.cs" DependentUpon="HttpRequest_ServerVariables.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath.aspx.cs" DependentUpon="HttpRuntime_AppDomainAppPath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath_MapPath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath_MapPath.aspx.cs" DependentUpon="HttpRuntime_AppDomainAppPath_MapPath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpValidationStatus\HttpValidationStatus_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpValidationStatus\HttpValidationStatus_Enum.aspx.cs" DependentUpon="HttpValidationStatus_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\ProcessShutdownReason\ProcessShutdownReason_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\ProcessShutdownReason\ProcessShutdownReason_Enum.aspx.cs" DependentUpon="ProcessShutdownReason_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\ProcessStatus\ProcessStatus_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\ProcessStatus\ProcessStatus_Enum.aspx.cs" DependentUpon="ProcessStatus_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\TraceMode\TraceMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\TraceMode\TraceMode_Enum.aspx.cs" DependentUpon="TraceMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_Nothing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_Nothing.aspx.cs" DependentUpon="HttpSessionState_Add_Nothing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_SO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_SO.aspx.cs" DependentUpon="HttpSessionState_Add_SO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Clear_.aspx.cs" DependentUpon="HttpSessionState_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CodePage.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CodePage.aspx.cs" DependentUpon="HttpSessionState_CodePage.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Contents.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Contents.aspx.cs" DependentUpon="HttpSessionState_Contents.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CopyTo_AI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CopyTo_AI.aspx.cs" DependentUpon="HttpSessionState_CopyTo_AI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Count.aspx.cs" DependentUpon="HttpSessionState_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_GetEnumerator_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_GetEnumerator_.aspx.cs" DependentUpon="HttpSessionState_GetEnumerator_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsCookieless.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsCookieless.aspx.cs" DependentUpon="HttpSessionState_IsCookieless.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession.aspx.cs" DependentUpon="HttpSessionState_IsNewSession.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession2.aspx.cs" DependentUpon="HttpSessionState_IsNewSession2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly.aspx.cs" DependentUpon="HttpSessionState_IsReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly2.aspx.cs" DependentUpon="HttpSessionState_IsReadOnly2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item.aspx.cs" DependentUpon="HttpSessionState_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_I.aspx.cs" DependentUpon="HttpSessionState_Item_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_S.aspx.cs" DependentUpon="HttpSessionState_Item_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Keys.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Keys.aspx.cs" DependentUpon="HttpSessionState_Keys.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_LCID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_LCID.aspx.cs" DependentUpon="HttpSessionState_LCID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Remove_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Remove_S.aspx.cs" DependentUpon="HttpSessionState_Remove_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAll_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAll_.aspx.cs" DependentUpon="HttpSessionState_RemoveAll_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAt_I.aspx.cs" DependentUpon="HttpSessionState_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_SessionID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_SessionID.aspx.cs" DependentUpon="HttpSessionState_SessionID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Timeout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Timeout.aspx.cs" DependentUpon="HttpSessionState_Timeout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ClientID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ClientID.aspx.cs" DependentUpon="Control_ClientID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Dispose_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Dispose_.aspx.cs" DependentUpon="Control_Dispose_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_FindControl_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_FindControl_S.aspx.cs" DependentUpon="Control_FindControl_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ID.aspx.cs" DependentUpon="Control_ID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Init.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Init.aspx.cs" DependentUpon="Control_Init.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Load.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Load.aspx.cs" DependentUpon="Control_Load.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Load_wo_CodeBehind.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Load_wo_CodeBehind.aspx.cs" DependentUpon="Control_Load_wo_CodeBehind.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_NamingContainer.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_NamingContainer.aspx.cs" DependentUpon="Control_NamingContainer.aspx" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Page.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Page.aspx.cs" DependentUpon="Control_Page.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Parent.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Parent.aspx.cs" DependentUpon="Control_Parent.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_RenderControl_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_RenderControl_H.aspx.cs" DependentUpon="Control_RenderControl_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ResolveUrl_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ResolveUrl_S.aspx.cs" DependentUpon="Control_ResolveUrl_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_TemplateSourceDirectory.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_TemplateSourceDirectory.aspx.cs" DependentUpon="Control_TemplateSourceDirectory.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_UniqueID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_UniqueID.aspx.cs" DependentUpon="Control_UniqueID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ViewState.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ViewState.aspx.cs" DependentUpon="Control_ViewState.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Visible.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Visible.aspx.cs" DependentUpon="Control_Visible.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterAttribute\HtmlTextWriterAttribute_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterAttribute\HtmlTextWriterAttribute_Enum.aspx.cs" DependentUpon="HtmlTextWriterAttribute_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterStyle\HtmlTextWriterStyle_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterStyle\HtmlTextWriterStyle_Enum.aspx.cs" DependentUpon="HtmlTextWriterStyle_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterTag\HtmlTextWriterTag_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterTag\HtmlTextWriterTag_Enum.aspx.cs" DependentUpon="HtmlTextWriterTag_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Page\Page_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Page\Page_ctor_.aspx.cs" DependentUpon="Page_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\ValidationPropertyAttribute\ValidationPropertyAttribute_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\ValidationPropertyAttribute\ValidationPropertyAttribute_ctor_S.aspx.cs" DependentUpon="ValidationPropertyAttribute_ctor_S.aspx" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_ctor_.aspx.cs" DependentUpon="HtmlAnchor_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_HRef.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_HRef.aspx.cs" DependentUpon="HtmlAnchor_HRef.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Name.aspx.cs" DependentUpon="HtmlAnchor_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Target.aspx.cs" DependentUpon="HtmlAnchor_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Title.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Title.aspx.cs" DependentUpon="HtmlAnchor_Title.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_CausesValidation.aspx.cs" DependentUpon="HtmlButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_ctor_.aspx.cs" DependentUpon="HtmlButton_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerHtml.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerHtml.aspx.cs" DependentUpon="HtmlContainerControl_InnerHtml.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerText.aspx.cs" DependentUpon="HtmlContainerControl_InnerText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Attributes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Attributes.aspx.cs" DependentUpon="HtmlControl_Attributes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Disabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Disabled.aspx.cs" DependentUpon="HtmlControl_Disabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Style.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Style.aspx.cs" DependentUpon="HtmlControl_Style.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_TagName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_TagName.aspx.cs" DependentUpon="HtmlControl_TagName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype.aspx.cs" DependentUpon="HtmlForm_Enctype.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype1.aspx.cs" DependentUpon="HtmlForm_Enctype1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype2.aspx.cs" DependentUpon="HtmlForm_Enctype2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method.aspx.cs" DependentUpon="HtmlForm_Method.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method1.aspx.cs" DependentUpon="HtmlForm_Method1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method2.aspx.cs" DependentUpon="HtmlForm_Method2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name.aspx.cs" DependentUpon="HtmlForm_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name1.aspx.cs" DependentUpon="HtmlForm_Name1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name2.aspx.cs" DependentUpon="HtmlForm_Name2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target.aspx.cs" DependentUpon="HtmlForm_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target.aspx.resx" DependentUpon="HtmlForm_Target.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target1.aspx.cs" DependentUpon="HtmlForm_Target1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target2.aspx.cs" DependentUpon="HtmlForm_Target2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_.aspx.cs" DependentUpon="HtmlGenericControl_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_S.aspx.cs" DependentUpon="HtmlGenericControl_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_TagName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_TagName.aspx.cs" DependentUpon="HtmlGenericControl_TagName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputButton\HtmlInputButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputButton\HtmlInputButton_CausesValidation.aspx.cs" DependentUpon="HtmlInputButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputHidden\HtmlInputHidden_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputHidden\HtmlInputHidden_ctor_.aspx.cs" DependentUpon="HtmlInputHidden_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Align.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Align.aspx.cs" DependentUpon="HtmlInputImage_Align.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Alt.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Alt.aspx.cs" DependentUpon="HtmlInputImage_Alt.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Border.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Border.aspx.cs" DependentUpon="HtmlInputImage_Border.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_CausesValidation.aspx.cs" DependentUpon="HtmlInputImage_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_ctor_.aspx.cs" DependentUpon="HtmlInputImage_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Src.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Src.aspx.cs" DependentUpon="HtmlInputImage_Src.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Cols.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Cols.aspx.cs" DependentUpon="HtmlTextArea_Cols.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_.aspx.cs" DependentUpon="HtmlTextArea_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_2.aspx.cs" DependentUpon="HtmlTextArea_ctor_2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_3.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_3.aspx.cs" DependentUpon="HtmlTextArea_ctor_3.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Name.aspx.cs" DependentUpon="HtmlTextArea_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Rows.aspx.cs" DependentUpon="HtmlTextArea_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Value.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Value.aspx.cs" DependentUpon="HtmlTextArea_Value.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellPadding.aspx.cs" DependentUpon="BaseDataList_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellPadding.aspx.resx" DependentUpon="BaseDataList_CellPadding.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellSpacing.aspx.cs" DependentUpon="BaseDataList_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_Controls.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_Controls.aspx.cs" DependentUpon="BaseDataList_Controls.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_ctor_.aspx.cs" DependentUpon="BaseDataList_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataBind_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataBind_.aspx.cs" DependentUpon="BaseDataList_DataBind_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeyField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeyField.aspx.cs" DependentUpon="BaseDataList_DataKeyField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeys.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeys.aspx.cs" DependentUpon="BaseDataList_DataKeys.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataMember.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataMember.aspx.cs" DependentUpon="BaseDataList_DataMember.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataSource.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataSource.aspx.cs" DependentUpon="BaseDataList_DataSource.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_GridLines.aspx.cs" DependentUpon="BaseDataList_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_HorizontalAlign.aspx.cs" DependentUpon="BaseDataList_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_IsBindableType_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_IsBindableType_T.aspx.cs" DependentUpon="BaseDataList_IsBindableType_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseValidator\BaseValidator_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseValidator\BaseValidator_ctor_.aspx.cs" DependentUpon="BaseValidator_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BorderStyle\BorderStyle_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BorderStyle\BorderStyle_Enum.aspx.cs" DependentUpon="BorderStyle_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ctor_.aspx.cs" DependentUpon="BoundColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataField.aspx.cs" DependentUpon="BoundColumn_DataField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataFormatString.aspx.cs" DependentUpon="BoundColumn_DataFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_InitializeCell_TIL.aspx.cs" DependentUpon="BoundColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ReadOnly.aspx.cs" DependentUpon="BoundColumn_ReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_CausesValidation.aspx.cs" DependentUpon="Button_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_Text.aspx.cs" DependentUpon="Button_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ButtonType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ButtonType.aspx.cs" DependentUpon="ButtonColumn_ButtonType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_CommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_CommandName.aspx.cs" DependentUpon="ButtonColumn_CommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ctor_.aspx.cs" DependentUpon="ButtonColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextField.aspx.cs" DependentUpon="ButtonColumn_DataTextField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextFormatString.aspx.cs" DependentUpon="ButtonColumn_DataTextFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_FormatDataTextValue_O.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_FormatDataTextValue_O.aspx.cs" DependentUpon="ButtonColumn_FormatDataTextValue_O.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_InitializeCell_TIL.aspx.cs" DependentUpon="ButtonColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_Text.aspx.cs" DependentUpon="ButtonColumn_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CalendarSelectionMode\CalendarSelectionMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CalendarSelectionMode\CalendarSelectionMode_Enum.aspx.cs" DependentUpon="CalendarSelectionMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_AutoPostBack.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_AutoPostBack.aspx.cs" DependentUpon="CheckBox_AutoPostBack.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Checked.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Checked.aspx.cs" DependentUpon="CheckBox_Checked.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Enabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Enabled.aspx.cs" DependentUpon="CheckBox_Enabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Text.aspx.cs" DependentUpon="CheckBox_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_TextAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_TextAlign.aspx.cs" DependentUpon="CheckBox_TextAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellPadding.aspx.cs" DependentUpon="CheckBoxList_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellSpacing.aspx.cs" DependentUpon="CheckBoxList_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatColumns.aspx.cs" DependentUpon="CheckBoxList_RepeatColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatDirection.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatDirection.aspx.cs" DependentUpon="CheckBoxList_RepeatDirection.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatLayout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatLayout.aspx.cs" DependentUpon="CheckBoxList_RepeatLayout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_TextAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_TextAlign.aspx.cs" DependentUpon="CheckBoxList_TextAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_TextAlign.aspx.resx" DependentUpon="CheckBoxList_TextAlign.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowCustomPaging.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowCustomPaging.aspx.cs" DependentUpon="DataGrid_AllowCustomPaging.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowPaging.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowPaging.aspx.cs" DependentUpon="DataGrid_AllowPaging.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowSorting.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowSorting.aspx.cs" DependentUpon="DataGrid_AllowSorting.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AlternatingItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AlternatingItemStyle.aspx.cs" DependentUpon="DataGrid_AlternatingItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AlternatingItemStyle.aspx.resx" DependentUpon="DataGrid_AlternatingItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AutoGenerateColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AutoGenerateColumns.aspx.cs" DependentUpon="DataGrid_AutoGenerateColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_BackImageUrl.aspx.cs" DependentUpon="DataGrid_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CancelCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CancelCommandName.aspx.cs" DependentUpon="DataGrid_CancelCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Columns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Columns.aspx.cs" DependentUpon="DataGrid_Columns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ctor_.aspx.cs" DependentUpon="DataGrid_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CurrentPageIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CurrentPageIndex.aspx.cs" DependentUpon="DataGrid_CurrentPageIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommand.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommand.aspx.cs" DependentUpon="DataGrid_DeleteCommand.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommandName.aspx.cs" DependentUpon="DataGrid_DeleteCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditCommandName.aspx.cs" DependentUpon="DataGrid_EditCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemIndex.aspx.cs" DependentUpon="DataGrid_EditItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemStyle.aspx.cs" DependentUpon="DataGrid_EditItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_FooterStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_FooterStyle.aspx.cs" DependentUpon="DataGrid_FooterStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_HeaderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_HeaderStyle.aspx.cs" DependentUpon="DataGrid_HeaderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemCreated.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemCreated.aspx.cs" DependentUpon="DataGrid_ItemCreated.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemDataBound.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemDataBound.aspx.cs" DependentUpon="DataGrid_ItemDataBound.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Items.aspx.cs" DependentUpon="DataGrid_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemStyle.aspx.cs" DependentUpon="DataGrid_ItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_NextPageCommandArgument.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_NextPageCommandArgument.aspx.cs" DependentUpon="DataGrid_NextPageCommandArgument.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCommandName.aspx.cs" DependentUpon="DataGrid_PageCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCount.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCount.aspx.cs" DependentUpon="DataGrid_PageCount.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageIndexChanged.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageIndexChanged.aspx.cs" DependentUpon="DataGrid_PageIndexChanged.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PagerStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PagerStyle.aspx.cs" DependentUpon="DataGrid_PagerStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageSize.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageSize.aspx.cs" DependentUpon="DataGrid_PageSize.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PrevPageCommandArgument.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PrevPageCommandArgument.aspx.cs" DependentUpon="DataGrid_PrevPageCommandArgument.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectCommandName.aspx.cs" DependentUpon="DataGrid_SelectCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedIndex.aspx.cs" DependentUpon="DataGrid_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItem.aspx.cs" DependentUpon="DataGrid_SelectedItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItemStyle.aspx.cs" DependentUpon="DataGrid_SelectedItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowFooter.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowFooter.aspx.cs" DependentUpon="DataGrid_ShowFooter.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowHeader.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowHeader.aspx.cs" DependentUpon="DataGrid_ShowHeader.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommand.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommand.aspx.cs" DependentUpon="DataGrid_SortCommand.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommandName.aspx.cs" DependentUpon="DataGrid_SortCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_UpdateCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_UpdateCommandName.aspx.cs" DependentUpon="DataGrid_UpdateCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_VirtualItemCount.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_VirtualItemCount.aspx.cs" DependentUpon="DataGrid_VirtualItemCount.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterStyle.aspx.cs" DependentUpon="DataGridColumn_FooterStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterText.aspx.cs" DependentUpon="DataGridColumn_FooterText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderImageUrl.aspx.cs" DependentUpon="DataGridColumn_HeaderImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderStyle.aspx.cs" DependentUpon="DataGridColumn_HeaderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderText.aspx.cs" DependentUpon="DataGridColumn_HeaderText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ItemStyle.aspx.cs" DependentUpon="DataGridColumn_ItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_SortExpression.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_SortExpression.aspx.cs" DependentUpon="DataGridColumn_SortExpression.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ToString_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ToString_.aspx.cs" DependentUpon="DataGridColumn_ToString_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_Visible.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_Visible.aspx.cs" DependentUpon="DataGridColumn_Visible.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataItem.aspx.cs" DependentUpon="DataGridItem_DataItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataSetIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataSetIndex.aspx.cs" DependentUpon="DataGridItem_DataSetIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataSetIndex.aspx.resx" DependentUpon="DataGridItem_DataSetIndex.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemIndex.aspx.cs" DependentUpon="DataGridItem_ItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemType.aspx.cs" DependentUpon="DataGridItem_ItemType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_CopyFrom_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_CopyFrom_S.aspx.cs" DependentUpon="DataGridPagerStyle_CopyFrom_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_MergeWith_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_MergeWith_S.aspx.cs" DependentUpon="DataGridPagerStyle_MergeWith_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Mode.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Mode.aspx.cs" DependentUpon="DataGridPagerStyle_Mode.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_NextPageText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_NextPageText.aspx.cs" DependentUpon="DataGridPagerStyle_NextPageText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PageButtonCount.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PageButtonCount.aspx.cs" DependentUpon="DataGridPagerStyle_PageButtonCount.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Position.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Position.aspx.cs" DependentUpon="DataGridPagerStyle_Position.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PrevPageText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PrevPageText.aspx.cs" DependentUpon="DataGridPagerStyle_PrevPageText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PrevPageText.aspx.resx" DependentUpon="DataGridPagerStyle_PrevPageText.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Reset_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Reset_.aspx.cs" DependentUpon="DataGridPagerStyle_Reset_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Visible.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Visible.aspx.cs" DependentUpon="DataGridPagerStyle_Visible.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemStyle.aspx.cs" DependentUpon="DataList_AlternatingItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemStyle.aspx.resx" DependentUpon="DataList_AlternatingItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemTemplate.aspx.cs" DependentUpon="DataList_AlternatingItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_CancelCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_CancelCommandName.aspx.cs" DependentUpon="DataList_CancelCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_DeleteCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_DeleteCommandName.aspx.cs" DependentUpon="DataList_DeleteCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditCommandName.aspx.cs" DependentUpon="DataList_EditCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemIndex.aspx.cs" DependentUpon="DataList_EditItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemStyle.aspx.cs" DependentUpon="DataList_EditItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemTemplate.aspx.cs" DependentUpon="DataList_EditItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ExtractTemplateRows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ExtractTemplateRows.aspx.cs" DependentUpon="DataList_ExtractTemplateRows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ExtractTemplateRows.aspx.resx" DependentUpon="DataList_ExtractTemplateRows.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterStyle.aspx.cs" DependentUpon="DataList_FooterStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterTemplate.aspx.cs" DependentUpon="DataList_FooterTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_GridLines.aspx.cs" DependentUpon="DataList_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderStyle.aspx.cs" DependentUpon="DataList_HeaderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderTemplate.aspx.cs" DependentUpon="DataList_HeaderTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_Items.aspx.cs" DependentUpon="DataList_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemStyle.aspx.cs" DependentUpon="DataList_ItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemStyle.aspx.resx" DependentUpon="DataList_ItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemTemplate.aspx.cs" DependentUpon="DataList_ItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatColumns.aspx.cs" DependentUpon="DataList_RepeatColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatDirection.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatDirection.aspx.cs" DependentUpon="DataList_RepeatDirection.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatLayout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatLayout.aspx.cs" DependentUpon="DataList_RepeatLayout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectCommandName.aspx.cs" DependentUpon="DataList_SelectCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedIndex.aspx.cs" DependentUpon="DataList_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItem.aspx.cs" DependentUpon="DataList_SelectedItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemStyle.aspx.cs" DependentUpon="DataList_SelectedItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemStyle.aspx.resx" DependentUpon="DataList_SelectedItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemTemplate.aspx.cs" DependentUpon="DataList_SelectedItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorStyle.aspx.cs" DependentUpon="DataList_SeparatorStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorTemplate.aspx.cs" DependentUpon="DataList_SeparatorTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowFooter.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowFooter.aspx.cs" DependentUpon="DataList_ShowFooter.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowHeader.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowHeader.aspx.cs" DependentUpon="DataList_ShowHeader.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_UpdateCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_UpdateCommandName.aspx.cs" DependentUpon="DataList_UpdateCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ctor_IL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ctor_IL.aspx.cs" DependentUpon="DataListItem_ctor_IL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_DataItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_DataItem.aspx.cs" DependentUpon="DataListItem_DataItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemIndex.aspx.cs" DependentUpon="DataListItem_ItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemIndex.aspx.resx" DependentUpon="DataListItem_ItemIndex.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemType.aspx.cs" DependentUpon="DataListItem_ItemType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_RenderItem_HBB.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_RenderItem_HBB.aspx.cs" DependentUpon="DataListItem_RenderItem_HBB.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DayNameFormat\DayNameFormat_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DayNameFormat\DayNameFormat_Enum.aspx.cs" DependentUpon="DayNameFormat_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderColor.aspx.cs" DependentUpon="DropDownList_BorderColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderStyle.aspx.cs" DependentUpon="DropDownList_BorderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderWidth.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderWidth.aspx.cs" DependentUpon="DropDownList_BorderWidth.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_SelectedIndex.aspx.cs" DependentUpon="DropDownList_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_ToolTip.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_ToolTip.aspx.cs" DependentUpon="DropDownList_ToolTip.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ButtonType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ButtonType.aspx.cs" DependentUpon="EditCommandColumn_ButtonType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_CancelText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_CancelText.aspx.cs" DependentUpon="EditCommandColumn_CancelText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ctor_.aspx.cs" DependentUpon="EditCommandColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_EditText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_EditText.aspx.cs" DependentUpon="EditCommandColumn_EditText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_InitializeCell_TIL.aspx.cs" DependentUpon="EditCommandColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_UpdateText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_UpdateText.aspx.cs" DependentUpon="EditCommandColumn_UpdateText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\FirstDayOfWeek\FirstDayOfWeek_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\FirstDayOfWeek\FirstDayOfWeek_Enum.aspx.cs" DependentUpon="FirstDayOfWeek_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\FontSize\FontSize_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\FontSize\FontSize_Enum.aspx.cs" DependentUpon="FontSize_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\GridLines\GridLines_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\GridLines\GridLines_Enum.aspx.cs" DependentUpon="GridLines_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HorizontalAlign\HorizontalAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HorizontalAlign\HorizontalAlign_Enum.aspx.cs" DependentUpon="HorizontalAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\Car.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_ImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_ImageUrl.aspx.cs" DependentUpon="HyperLink_ImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_NavigateUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_NavigateUrl.aspx.cs" DependentUpon="HyperLink_NavigateUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Target.aspx.cs" DependentUpon="HyperLink_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Text.aspx.cs" DependentUpon="HyperLink_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlField.aspx.cs" DependentUpon="HyperLinkColumn_DataNavigateUrlField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlFormatString.aspx.cs" DependentUpon="HyperLinkColumn_DataNavigateUrlFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextField.aspx.cs" DependentUpon="HyperLinkColumn_DataTextField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextFormatString.aspx.cs" DependentUpon="HyperLinkColumn_DataTextFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_InitializeCell_TIL.aspx.cs" DependentUpon="HyperLinkColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_NavigateUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_NavigateUrl.aspx.cs" DependentUpon="HyperLinkColumn_NavigateUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Target.aspx.cs" DependentUpon="HyperLinkColumn_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Text.aspx.cs" DependentUpon="HyperLinkColumn_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Car.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_AlternateText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_AlternateText.aspx.cs" DependentUpon="Image_AlternateText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Enabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Enabled.aspx.cs" DependentUpon="Image_Enabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Font.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Font.aspx.cs" DependentUpon="Image_Font.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageAlign.aspx.cs" DependentUpon="Image_ImageAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageUrl.aspx.cs" DependentUpon="Image_ImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ImageAlign\ImageAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ImageAlign\ImageAlign_Enum.aspx.cs" DependentUpon="ImageAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ImageButton\ImageButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ImageButton\ImageButton_CausesValidation.aspx.cs" DependentUpon="ImageButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_ctor_.aspx.cs" DependentUpon="Label_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_Text.aspx.cs" DependentUpon="Label_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_CausesValidation.aspx.cs" DependentUpon="LinkButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_Text.aspx.cs" DependentUpon="LinkButton_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx.cs" DependentUpon="LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_ctor_.aspx.cs" DependentUpon="LinkButtonControlBuilder_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderColor.aspx.cs" DependentUpon="ListBox_BorderColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderStyle.aspx.cs" DependentUpon="ListBox_BorderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderWidth.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderWidth.aspx.cs" DependentUpon="ListBox_BorderWidth.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_Rows.aspx.cs" DependentUpon="ListBox_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_SelectionMode.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_SelectionMode.aspx.cs" DependentUpon="ListBox_SelectionMode.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_ToolTip.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_ToolTip.aspx.cs" DependentUpon="ListBox_ToolTip.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_AutoPostBack.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_AutoPostBack.aspx.cs" DependentUpon="ListControl_AutoPostBack.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_ClearSelection_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_ClearSelection_.aspx.cs" DependentUpon="ListControl_ClearSelection_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataMember.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataMember.aspx.cs" DependentUpon="ListControl_DataMember.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataSource.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataSource.aspx.cs" DependentUpon="ListControl_DataSource.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataSource.aspx.resx" DependentUpon="ListControl_DataSource.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextField.aspx.cs" DependentUpon="ListControl_DataTextField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextFormatString.aspx.cs" DependentUpon="ListControl_DataTextFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataValueField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataValueField.aspx.cs" DependentUpon="ListControl_DataValueField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_Items.aspx.cs" DependentUpon="ListControl_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedIndex.aspx.cs" DependentUpon="ListControl_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedIndex.aspx.resx" DependentUpon="ListControl_SelectedIndex.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedItem.aspx.cs" DependentUpon="ListControl_SelectedItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedValue.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedValue.aspx.cs" DependentUpon="ListControl_SelectedValue.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Attributes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Attributes.aspx.cs" DependentUpon="ListItem_Attributes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_.aspx.cs" DependentUpon="ListItem_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_S.aspx.cs" DependentUpon="ListItem_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_SS.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_SS.aspx.cs" DependentUpon="ListItem_ctor_SS.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Equals_O.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Equals_O.aspx.cs" DependentUpon="ListItem_Equals_O.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_FromString_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_FromString_S.aspx.cs" DependentUpon="ListItem_FromString_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_GetHashCode_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_GetHashCode_.aspx.cs" DependentUpon="ListItem_GetHashCode_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Selected.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Selected.aspx.cs" DependentUpon="ListItem_Selected.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Text.aspx.cs" DependentUpon="ListItem_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ToString_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ToString_.aspx.cs" DependentUpon="ListItem_ToString_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Value.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Value.aspx.cs" DependentUpon="ListItem_Value.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItemType\ListItemType_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItemType\ListItemType_Enum.aspx.cs" DependentUpon="ListItemType_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListSelectionMode\ListSelectionMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListSelectionMode\ListSelectionMode_Enum.aspx.cs" DependentUpon="ListSelectionMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Literal\Literal_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Literal\Literal_Text.aspx.cs" DependentUpon="Literal_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\NextPrevFormat\NextPrevFormat_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\NextPrevFormat\NextPrevFormat_Enum.aspx.cs" DependentUpon="NextPrevFormat_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Car.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_BackImageUrl.aspx.cs" DependentUpon="Panel_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_HorizontalAlign.aspx.cs" DependentUpon="Panel_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_Wrap.aspx.cs" DependentUpon="Panel_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\PlaceHolder\PlaceHolder_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\PlaceHolder\PlaceHolder_ctor_.aspx.cs" DependentUpon="PlaceHolder_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_ctor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_ctor.aspx.cs" DependentUpon="RadioButton_ctor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_ctor.aspx.resx" DependentUpon="RadioButton_ctor.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_GroupName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_GroupName.aspx.cs" DependentUpon="RadioButton_GroupName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellPadding.aspx.cs" DependentUpon="RadioButtonList_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellSpacing.aspx.cs" DependentUpon="RadioButtonList_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatColumns.aspx.cs" DependentUpon="RadioButtonList_RepeatColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatDirection.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatDirection.aspx.cs" DependentUpon="RadioButtonList_RepeatDirection.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatLayout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatLayout.aspx.cs" DependentUpon="RadioButtonList_RepeatLayout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_TextAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_TextAlign.aspx.cs" DependentUpon="RadioButtonList_TextAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatDirection\RepeatDirection_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatDirection\RepeatDirection_Enum.aspx.cs" DependentUpon="RepeatDirection_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_AlternatingItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_AlternatingItemTemplate.aspx.cs" DependentUpon="Repeater_AlternatingItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ctor_.aspx.cs" DependentUpon="Repeater_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataBind_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataBind_.aspx.cs" DependentUpon="Repeater_DataBind_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataMember.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataMember.aspx.cs" DependentUpon="Repeater_DataMember.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataSource.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataSource.aspx.cs" DependentUpon="Repeater_DataSource.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_FooterTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_FooterTemplate.aspx.cs" DependentUpon="Repeater_FooterTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_HeaderTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_HeaderTemplate.aspx.cs" DependentUpon="Repeater_HeaderTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemDataBound.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemDataBound.aspx.cs" DependentUpon="Repeater_ItemDataBound.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_Items.aspx.cs" DependentUpon="Repeater_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemTemplate.aspx.cs" DependentUpon="Repeater_ItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_SeparatorTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_SeparatorTemplate.aspx.cs" DependentUpon="Repeater_SeparatorTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_DataItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_DataItem.aspx.cs" DependentUpon="RepeaterItem_DataItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemIndex.aspx.cs" DependentUpon="RepeaterItem_ItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType.aspx.cs" DependentUpon="RepeaterItem_ItemType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType_Manual.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType_Manual.aspx.cs" DependentUpon="RepeaterItem_ItemType_Manual.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatLayout\RepeatLayout_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatLayout\RepeatLayout_Enum.aspx.cs" DependentUpon="RepeatLayout_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_BackImageUrl.aspx.cs" DependentUpon="Table_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellPadding.aspx.cs" DependentUpon="Table_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellSpacing.aspx.cs" DependentUpon="Table_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_ctor_.aspx.cs" DependentUpon="Table_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_GridLines.aspx.cs" DependentUpon="Table_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_HorizontalAlign.aspx.cs" DependentUpon="Table_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_Rows.aspx.cs" DependentUpon="Table_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ColumnSpan.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ColumnSpan.aspx.cs" DependentUpon="TableCell_ColumnSpan.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ctor_.aspx.cs" DependentUpon="TableCell_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_HorizontalAlign.aspx.cs" DependentUpon="TableCell_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_RowSpan.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_RowSpan.aspx.cs" DependentUpon="TableCell_RowSpan.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Text.aspx.cs" DependentUpon="TableCell_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_VerticalAlign.aspx.cs" DependentUpon="TableCell_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Wrap.aspx.cs" DependentUpon="TableCell_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Add_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Add_T.aspx.cs" DependentUpon="TableCellCollection_Add_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddAt_IT.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddAt_IT.aspx.cs" DependentUpon="TableCellCollection_AddAt_IT.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddRange_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddRange_T.aspx.cs" DependentUpon="TableCellCollection_AddRange_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Clear_.aspx.cs" DependentUpon="TableCellCollection_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_CopyTo_AI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_CopyTo_AI.aspx.cs" DependentUpon="TableCellCollection_CopyTo_AI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Count.aspx.cs" DependentUpon="TableCellCollection_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetCellIndex_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetCellIndex_T.aspx.cs" DependentUpon="TableCellCollection_GetCellIndex_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetEnumerator_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetEnumerator_.aspx.cs" DependentUpon="TableCellCollection_GetEnumerator_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsReadOnly.aspx.cs" DependentUpon="TableCellCollection_IsReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsSynchronized.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsSynchronized.aspx.cs" DependentUpon="TableCellCollection_IsSynchronized.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Item.aspx.cs" DependentUpon="TableCellCollection_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Remove_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Remove_T.aspx.cs" DependentUpon="TableCellCollection_Remove_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_RemoveAt_I.aspx.cs" DependentUpon="TableCellCollection_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_SyncRoot.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_SyncRoot.aspx.cs" DependentUpon="TableCellCollection_SyncRoot.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableHeaderCell\TableHeaderCell_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableHeaderCell\TableHeaderCell_ctor_.aspx.cs" DependentUpon="TableHeaderCell_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_CopyFrom_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_CopyFrom_S.aspx.cs" DependentUpon="TableItemStyle_CopyFrom_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_.aspx.cs" DependentUpon="TableItemStyle_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_S.aspx.cs" DependentUpon="TableItemStyle_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_HorizontalAlign.aspx.cs" DependentUpon="TableItemStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_MergeWith_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_MergeWith_S.aspx.cs" DependentUpon="TableItemStyle_MergeWith_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Reset_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Reset_.aspx.cs" DependentUpon="TableItemStyle_Reset_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_VerticalAlign.aspx.cs" DependentUpon="TableItemStyle_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Wrap.aspx.cs" DependentUpon="TableItemStyle_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_Cells.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_Cells.aspx.cs" DependentUpon="TableRow_Cells.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlCollection_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlCollection_.aspx.cs" DependentUpon="TableRow_CreateControlCollection_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlStyle_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlStyle_.aspx.cs" DependentUpon="TableRow_CreateControlStyle_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_ctor_.aspx.cs" DependentUpon="TableRow_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_HorizontalAlign.aspx.cs" DependentUpon="TableRow_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_VerticalAlign.aspx.cs" DependentUpon="TableRow_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Add_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Add_T.aspx.cs" DependentUpon="TableRowCollection_Add_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddAt_IT.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddAt_IT.aspx.cs" DependentUpon="TableRowCollection_AddAt_IT.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddRange_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddRange_T.aspx.cs" DependentUpon="TableRowCollection_AddRange_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Clear_.aspx.cs" DependentUpon="TableRowCollection_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_CopyTo_AI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_CopyTo_AI.aspx.cs" DependentUpon="TableRowCollection_CopyTo_AI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_CopyTo_AI.aspx.resx" DependentUpon="TableRowCollection_CopyTo_AI.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Count.aspx.cs" DependentUpon="TableRowCollection_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetEnumerator_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetEnumerator_.aspx.cs" DependentUpon="TableRowCollection_GetEnumerator_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetRowIndex_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetRowIndex_T.aspx.cs" DependentUpon="TableRowCollection_GetRowIndex_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsReadOnly.aspx.cs" DependentUpon="TableRowCollection_IsReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsSynchronized.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsSynchronized.aspx.cs" DependentUpon="TableRowCollection_IsSynchronized.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Item.aspx.cs" DependentUpon="TableRowCollection_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Remove_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Remove_T.aspx.cs" DependentUpon="TableRowCollection_Remove_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_RemoveAt_I.aspx.cs" DependentUpon="TableRowCollection_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_SyncRoot.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_SyncRoot.aspx.cs" DependentUpon="TableRowCollection_SyncRoot.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_BackImageUrl.aspx.cs" DependentUpon="TableStyle_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellPadding.aspx.cs" DependentUpon="TableStyle_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellSpacing.aspx.cs" DependentUpon="TableStyle_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CopyFrom_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CopyFrom_S.aspx.cs" DependentUpon="TableStyle_CopyFrom_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_.aspx.cs" DependentUpon="TableStyle_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_S.aspx.cs" DependentUpon="TableStyle_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_GridLines.aspx.cs" DependentUpon="TableStyle_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_HorizontalAlign.aspx.cs" DependentUpon="TableStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_MergeWith_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_MergeWith_S.aspx.cs" DependentUpon="TableStyle_MergeWith_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_MergeWith_S.aspx.resx" DependentUpon="TableStyle_MergeWith_S.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_Reset_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_Reset_.aspx.cs" DependentUpon="TableStyle_Reset_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ctor_.aspx.cs" DependentUpon="TemplateColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_EditItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_EditItemTemplate.aspx.cs" DependentUpon="TemplateColumn_EditItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_FooterTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_FooterTemplate.aspx.cs" DependentUpon="TemplateColumn_FooterTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_HeaderTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_HeaderTemplate.aspx.cs" DependentUpon="TemplateColumn_HeaderTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_InitializeCell_TIL.aspx.cs" DependentUpon="TemplateColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ItemTemplate.aspx.cs" DependentUpon="TemplateColumn_ItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextAlign\TextAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextAlign\TextAlign_Enum.aspx.cs" DependentUpon="TextAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_AutoPostBack.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_AutoPostBack.aspx.cs" DependentUpon="TextBox_AutoPostBack.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Columns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Columns.aspx.cs" DependentUpon="TextBox_Columns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_MaxLength.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_MaxLength.aspx.cs" DependentUpon="TextBox_MaxLength.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_ReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_ReadOnly.aspx.cs" DependentUpon="TextBox_ReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Rows.aspx.cs" DependentUpon="TextBox_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Text.aspx.cs" DependentUpon="TextBox_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_TextMode.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_TextMode.aspx.cs" DependentUpon="TextBox_TextMode.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Wrap.aspx.cs" DependentUpon="TextBox_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBoxMode\TextBoxMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBoxMode\TextBoxMode_Enum.aspx.cs" DependentUpon="TextBoxMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TitleFormat\TitleFormat_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TitleFormat\TitleFormat_Enum.aspx.cs" DependentUpon="TitleFormat_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\UnitType\UnitType_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\UnitType\UnitType_Enum.aspx.cs" DependentUpon="UnitType_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationCompareOperator\ValidationCompareOperator_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationCompareOperator\ValidationCompareOperator_Enum.aspx.cs" DependentUpon="ValidationCompareOperator_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationDataType\ValidationDataType_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationDataType\ValidationDataType_Enum.aspx.cs" DependentUpon="ValidationDataType_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationSummaryDisplayMode\ValidationSummaryDisplayMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationSummaryDisplayMode\ValidationSummaryDisplayMode_Enum.aspx.cs" DependentUpon="ValidationSummaryDisplayMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidatorDisplay\ValidatorDisplay_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidatorDisplay\ValidatorDisplay_Enum.aspx.cs" DependentUpon="ValidatorDisplay_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\VerticalAlign\VerticalAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\VerticalAlign\VerticalAlign_Enum.aspx.cs" DependentUpon="VerticalAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\cat.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\dog.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_AccessKey.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_AccessKey.aspx.cs" DependentUpon="WebControl_AccessKey.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ApplyStyle_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ApplyStyle_S.aspx.cs" DependentUpon="WebControl_ApplyStyle_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Attributes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Attributes.aspx.cs" DependentUpon="WebControl_Attributes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BackColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BackColor.aspx.cs" DependentUpon="WebControl_BackColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderColor.aspx.cs" DependentUpon="WebControl_BorderColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderStyle.aspx.cs" DependentUpon="WebControl_BorderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderStyle.aspx.resx" DependentUpon="WebControl_BorderStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderWidth.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderWidth.aspx.cs" DependentUpon="WebControl_BorderWidth.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyle.aspx.cs" DependentUpon="WebControl_ControlStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyleCreated.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyleCreated.aspx.cs" DependentUpon="WebControl_ControlStyleCreated.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CopyBaseAttributes_W.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CopyBaseAttributes_W.aspx.cs" DependentUpon="WebControl_CopyBaseAttributes_W.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CssClass.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CssClass.aspx.cs" DependentUpon="WebControl_CssClass.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ctor_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ctor_H.aspx.cs" DependentUpon="WebControl_ctor_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Enabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Enabled.aspx.cs" DependentUpon="WebControl_Enabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Font.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Font.aspx.cs" DependentUpon="WebControl_Font.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ForeColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ForeColor.aspx.cs" DependentUpon="WebControl_ForeColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Height.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Height.aspx.cs" DependentUpon="WebControl_Height.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_MergeStyle_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_MergeStyle_S.aspx.cs" DependentUpon="WebControl_MergeStyle_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderBeginTag_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderBeginTag_H.aspx.cs" DependentUpon="WebControl_RenderBeginTag_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderEndTag_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderEndTag_H.aspx.cs" DependentUpon="WebControl_RenderEndTag_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style.aspx.cs" DependentUpon="WebControl_Style.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_BackColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_BackColor.aspx.cs" DependentUpon="WebControl_Style_BackColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Border.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Border.aspx.cs" DependentUpon="WebControl_Style_Border.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_CssClass.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_CssClass.aspx.cs" DependentUpon="WebControl_Style_CssClass.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Bold.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Bold.aspx.cs" DependentUpon="WebControl_Style_Font_Bold.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Italic.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Italic.aspx.cs" DependentUpon="WebControl_Style_Font_Italic.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Name.aspx.cs" DependentUpon="WebControl_Style_Font_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Names.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Names.aspx.cs" DependentUpon="WebControl_Style_Font_Names.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_OverLine.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_OverLine.aspx.cs" DependentUpon="WebControl_Style_Font_OverLine.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Size.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Size.aspx.cs" DependentUpon="WebControl_Style_Font_Size.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_StrikeOut.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_StrikeOut.aspx.cs" DependentUpon="WebControl_Style_Font_StrikeOut.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_UnderLine.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_UnderLine.aspx.cs" DependentUpon="WebControl_Style_Font_UnderLine.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_ForeColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_ForeColor.aspx.cs" DependentUpon="WebControl_Style_ForeColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Hight.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Hight.aspx.cs" DependentUpon="WebControl_Style_Hight.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Width.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Width.aspx.cs" DependentUpon="WebControl_Style_Width.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TabIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TabIndex.aspx.cs" DependentUpon="WebControl_TabIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_HorizontalAlign.aspx.cs" DependentUpon="WebControl_TableItemStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_VerticalAlign.aspx.cs" DependentUpon="WebControl_TableItemStyle_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_Wrap.aspx.cs" DependentUpon="WebControl_TableItemStyle_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_BackImageUrl.aspx.cs" DependentUpon="WebControl_TableStyle_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellPadding.aspx.cs" DependentUpon="WebControl_TableStyle_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellSpacing.aspx.cs" DependentUpon="WebControl_TableStyle_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_GridLines.aspx.cs" DependentUpon="WebControl_TableStyle_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_HorizontalAlign.aspx.cs" DependentUpon="WebControl_TableStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ToolTip.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ToolTip.aspx.cs" DependentUpon="WebControl_ToolTip.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Width.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Width.aspx.cs" DependentUpon="WebControl_Width.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Width.aspx.resx" DependentUpon="WebControl_Width.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="utils\GHDataSources.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="utils\GHTBaseWeb.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTControlBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTDataListBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTListControlBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTSubTest.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="utils\GHTWebControlBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="WEB-INF\web.xml" BuildAction="Content"/>

-			</Include>

-		</Files>

-		<UserProperties REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.drawing="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_core.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_codec.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.web="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Web.jar" REFS.JarPath.system.xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.j2ee="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jakarta-jboss\server\lib\catalina.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jakarta-jboss\common\lib\servlet-api.jar" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" project.JDKType="1.5.0_05" project.AppServerType="jboss" PACK.WarPath="bin\MainsoftWebApp.war" PACK.Standalone="False" PACK.IncludeOpt="0" PACK.Compress="False"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="3" ApplicationServerType="jboss"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="-1" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="8009" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="-1" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="8009" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="1" Name="Debug_Java"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/MainsoftWebApp.Tomcat.vmwcsproj b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/MainsoftWebApp.Tomcat.vmwcsproj
deleted file mode 100755
index 44ed45ebd2d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/MainsoftWebApp.Tomcat.vmwcsproj
+++ /dev/null
@@ -1,1040 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Web" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{F03B9573-A5B5-445F-9C0B-801A67E2BF9F}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="MainsoftWebApp" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="MainsoftWebApp" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="true" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Web" AssemblyName="System.Web" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="j2ee" AssemblyName="j2ee" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\tomcat\j2ee.dll" Private="False"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="Web.config" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_BeginInvoke_OEAOAO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_BeginInvoke_OEAOAO.aspx.cs" DependentUpon="BeginEventHandler_BeginInvoke_OEAOAO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_ctor_OI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_ctor_OI.aspx.cs" DependentUpon="BeginEventHandler_ctor_OI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_Invoke_OEAO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\BeginEventHandler\BeginEventHandler_Invoke_OEAO.aspx.cs" DependentUpon="BeginEventHandler_Invoke_OEAO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Add_SO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Add_SO.aspx.cs" DependentUpon="HttpApplicationState_Add_SO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_AllKeys.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_AllKeys.aspx.cs" DependentUpon="HttpApplicationState_AllKeys.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Clear_.aspx.cs" DependentUpon="HttpApplicationState_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Contents.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Contents.aspx.cs" DependentUpon="HttpApplicationState_Contents.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Count.aspx.cs" DependentUpon="HttpApplicationState_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_GetKey_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_GetKey_I.aspx.cs" DependentUpon="HttpApplicationState_GetKey_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item.aspx.cs" DependentUpon="HttpApplicationState_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Item_S.aspx.cs" DependentUpon="HttpApplicationState_Item_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Remove_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_Remove_S.aspx.cs" DependentUpon="HttpApplicationState_Remove_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAll_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAll_.aspx.cs" DependentUpon="HttpApplicationState_RemoveAll_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpApplicationState\HttpApplicationState_RemoveAt_I.aspx.cs" DependentUpon="HttpApplicationState_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpCacheability\HttpCacheability_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpCacheability\HttpCacheability_Enum.aspx.cs" DependentUpon="HttpCacheability_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpCacheRevalidation\HttpCacheRevalidation_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpCacheRevalidation\HttpCacheRevalidation_Enum.aspx.cs" DependentUpon="HttpCacheRevalidation_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_AcceptTypes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_AcceptTypes.aspx.cs" DependentUpon="HttpRequest_AcceptTypes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ApplicationPath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ApplicationPath.aspx.cs" DependentUpon="HttpRequest_ApplicationPath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Browser.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Browser.aspx.cs" DependentUpon="HttpRequest_Browser.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ClientCertificate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ClientCertificate.aspx.cs" DependentUpon="HttpRequest_ClientCertificate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ContentEncoding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ContentEncoding.aspx.cs" DependentUpon="HttpRequest_ContentEncoding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Cookies.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Cookies.aspx.cs" DependentUpon="HttpRequest_Cookies.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_CurrentExecutionFilePath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_CurrentExecutionFilePath.aspx.cs" DependentUpon="HttpRequest_CurrentExecutionFilePath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Headers.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_Headers.aspx.cs" DependentUpon="HttpRequest_Headers.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_MapPath_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_MapPath_S.aspx.cs" DependentUpon="HttpRequest_MapPath_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ServerVariables.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRequest\HttpRequest_ServerVariables.aspx.cs" DependentUpon="HttpRequest_ServerVariables.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath.aspx.cs" DependentUpon="HttpRuntime_AppDomainAppPath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath_MapPath.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpRuntime\HttpRuntime_AppDomainAppPath_MapPath.aspx.cs" DependentUpon="HttpRuntime_AppDomainAppPath_MapPath.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\HttpValidationStatus\HttpValidationStatus_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\HttpValidationStatus\HttpValidationStatus_Enum.aspx.cs" DependentUpon="HttpValidationStatus_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\ProcessShutdownReason\ProcessShutdownReason_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\ProcessShutdownReason\ProcessShutdownReason_Enum.aspx.cs" DependentUpon="ProcessShutdownReason_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\ProcessStatus\ProcessStatus_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\ProcessStatus\ProcessStatus_Enum.aspx.cs" DependentUpon="ProcessStatus_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web\TraceMode\TraceMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web\TraceMode\TraceMode_Enum.aspx.cs" DependentUpon="TraceMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_Nothing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_Nothing.aspx.cs" DependentUpon="HttpSessionState_Add_Nothing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_SO.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Add_SO.aspx.cs" DependentUpon="HttpSessionState_Add_SO.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Clear_.aspx.cs" DependentUpon="HttpSessionState_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CodePage.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CodePage.aspx.cs" DependentUpon="HttpSessionState_CodePage.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Contents.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Contents.aspx.cs" DependentUpon="HttpSessionState_Contents.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CopyTo_AI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_CopyTo_AI.aspx.cs" DependentUpon="HttpSessionState_CopyTo_AI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Count.aspx.cs" DependentUpon="HttpSessionState_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_GetEnumerator_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_GetEnumerator_.aspx.cs" DependentUpon="HttpSessionState_GetEnumerator_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsCookieless.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsCookieless.aspx.cs" DependentUpon="HttpSessionState_IsCookieless.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession.aspx.cs" DependentUpon="HttpSessionState_IsNewSession.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsNewSession2.aspx.cs" DependentUpon="HttpSessionState_IsNewSession2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly.aspx.cs" DependentUpon="HttpSessionState_IsReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_IsReadOnly2.aspx.cs" DependentUpon="HttpSessionState_IsReadOnly2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item.aspx.cs" DependentUpon="HttpSessionState_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_I.aspx.cs" DependentUpon="HttpSessionState_Item_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Item_S.aspx.cs" DependentUpon="HttpSessionState_Item_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Keys.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Keys.aspx.cs" DependentUpon="HttpSessionState_Keys.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_LCID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_LCID.aspx.cs" DependentUpon="HttpSessionState_LCID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Remove_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Remove_S.aspx.cs" DependentUpon="HttpSessionState_Remove_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAll_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAll_.aspx.cs" DependentUpon="HttpSessionState_RemoveAll_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_RemoveAt_I.aspx.cs" DependentUpon="HttpSessionState_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_SessionID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_SessionID.aspx.cs" DependentUpon="HttpSessionState_SessionID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Timeout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_SessionState\HttpSessionState\HttpSessionState_Timeout.aspx.cs" DependentUpon="HttpSessionState_Timeout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ClientID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ClientID.aspx.cs" DependentUpon="Control_ClientID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Dispose_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Dispose_.aspx.cs" DependentUpon="Control_Dispose_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_FindControl_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_FindControl_S.aspx.cs" DependentUpon="Control_FindControl_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ID.aspx.cs" DependentUpon="Control_ID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Init.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Init.aspx.cs" DependentUpon="Control_Init.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Load.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Load.aspx.cs" DependentUpon="Control_Load.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Load_wo_CodeBehind.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Load_wo_CodeBehind.aspx.cs" DependentUpon="Control_Load_wo_CodeBehind.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_NamingContainer.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_NamingContainer.aspx.cs" DependentUpon="Control_NamingContainer.aspx" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Page.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Page.aspx.cs" DependentUpon="Control_Page.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Parent.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Parent.aspx.cs" DependentUpon="Control_Parent.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_RenderControl_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_RenderControl_H.aspx.cs" DependentUpon="Control_RenderControl_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ResolveUrl_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ResolveUrl_S.aspx.cs" DependentUpon="Control_ResolveUrl_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_TemplateSourceDirectory.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_TemplateSourceDirectory.aspx.cs" DependentUpon="Control_TemplateSourceDirectory.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_UniqueID.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_UniqueID.aspx.cs" DependentUpon="Control_UniqueID.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_ViewState.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_ViewState.aspx.cs" DependentUpon="Control_ViewState.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Control\Control_Visible.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Control\Control_Visible.aspx.cs" DependentUpon="Control_Visible.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterAttribute\HtmlTextWriterAttribute_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterAttribute\HtmlTextWriterAttribute_Enum.aspx.cs" DependentUpon="HtmlTextWriterAttribute_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterStyle\HtmlTextWriterStyle_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterStyle\HtmlTextWriterStyle_Enum.aspx.cs" DependentUpon="HtmlTextWriterStyle_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterTag\HtmlTextWriterTag_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\HtmlTextWriterTag\HtmlTextWriterTag_Enum.aspx.cs" DependentUpon="HtmlTextWriterTag_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\Page\Page_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\Page\Page_ctor_.aspx.cs" DependentUpon="Page_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI\ValidationPropertyAttribute\ValidationPropertyAttribute_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI\ValidationPropertyAttribute\ValidationPropertyAttribute_ctor_S.aspx.cs" DependentUpon="ValidationPropertyAttribute_ctor_S.aspx" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_ctor_.aspx.cs" DependentUpon="HtmlAnchor_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_HRef.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_HRef.aspx.cs" DependentUpon="HtmlAnchor_HRef.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Name.aspx.cs" DependentUpon="HtmlAnchor_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Target.aspx.cs" DependentUpon="HtmlAnchor_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Title.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlAnchor\HtmlAnchor_Title.aspx.cs" DependentUpon="HtmlAnchor_Title.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_CausesValidation.aspx.cs" DependentUpon="HtmlButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlButton\HtmlButton_ctor_.aspx.cs" DependentUpon="HtmlButton_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerHtml.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerHtml.aspx.cs" DependentUpon="HtmlContainerControl_InnerHtml.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlContainerControl\HtmlContainerControl_InnerText.aspx.cs" DependentUpon="HtmlContainerControl_InnerText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Attributes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Attributes.aspx.cs" DependentUpon="HtmlControl_Attributes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Disabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Disabled.aspx.cs" DependentUpon="HtmlControl_Disabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Style.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_Style.aspx.cs" DependentUpon="HtmlControl_Style.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_TagName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlControl\HtmlControl_TagName.aspx.cs" DependentUpon="HtmlControl_TagName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype.aspx.cs" DependentUpon="HtmlForm_Enctype.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype1.aspx.cs" DependentUpon="HtmlForm_Enctype1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Enctype2.aspx.cs" DependentUpon="HtmlForm_Enctype2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method.aspx.cs" DependentUpon="HtmlForm_Method.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method1.aspx.cs" DependentUpon="HtmlForm_Method1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Method2.aspx.cs" DependentUpon="HtmlForm_Method2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name.aspx.cs" DependentUpon="HtmlForm_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name1.aspx.cs" DependentUpon="HtmlForm_Name1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Name2.aspx.cs" DependentUpon="HtmlForm_Name2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target.aspx.cs" DependentUpon="HtmlForm_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target.aspx.resx" DependentUpon="HtmlForm_Target.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target1.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target1.aspx.cs" DependentUpon="HtmlForm_Target1.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlForm\HtmlForm_Target2.aspx.cs" DependentUpon="HtmlForm_Target2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_.aspx.cs" DependentUpon="HtmlGenericControl_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_ctor_S.aspx.cs" DependentUpon="HtmlGenericControl_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_TagName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlGenericControl\HtmlGenericControl_TagName.aspx.cs" DependentUpon="HtmlGenericControl_TagName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputButton\HtmlInputButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputButton\HtmlInputButton_CausesValidation.aspx.cs" DependentUpon="HtmlInputButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputHidden\HtmlInputHidden_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputHidden\HtmlInputHidden_ctor_.aspx.cs" DependentUpon="HtmlInputHidden_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Align.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Align.aspx.cs" DependentUpon="HtmlInputImage_Align.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Alt.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Alt.aspx.cs" DependentUpon="HtmlInputImage_Alt.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Border.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Border.aspx.cs" DependentUpon="HtmlInputImage_Border.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_CausesValidation.aspx.cs" DependentUpon="HtmlInputImage_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_ctor_.aspx.cs" DependentUpon="HtmlInputImage_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Src.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlInputImage\HtmlInputImage_Src.aspx.cs" DependentUpon="HtmlInputImage_Src.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Cols.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Cols.aspx.cs" DependentUpon="HtmlTextArea_Cols.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_.aspx.cs" DependentUpon="HtmlTextArea_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_2.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_2.aspx.cs" DependentUpon="HtmlTextArea_ctor_2.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_3.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_ctor_3.aspx.cs" DependentUpon="HtmlTextArea_ctor_3.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Name.aspx.cs" DependentUpon="HtmlTextArea_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Rows.aspx.cs" DependentUpon="HtmlTextArea_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Value.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_HtmlControls\HtmlTextArea\HtmlTextArea_Value.aspx.cs" DependentUpon="HtmlTextArea_Value.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellPadding.aspx.cs" DependentUpon="BaseDataList_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellPadding.aspx.resx" DependentUpon="BaseDataList_CellPadding.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_CellSpacing.aspx.cs" DependentUpon="BaseDataList_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_Controls.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_Controls.aspx.cs" DependentUpon="BaseDataList_Controls.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_ctor_.aspx.cs" DependentUpon="BaseDataList_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataBind_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataBind_.aspx.cs" DependentUpon="BaseDataList_DataBind_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeyField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeyField.aspx.cs" DependentUpon="BaseDataList_DataKeyField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeys.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataKeys.aspx.cs" DependentUpon="BaseDataList_DataKeys.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataMember.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataMember.aspx.cs" DependentUpon="BaseDataList_DataMember.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataSource.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_DataSource.aspx.cs" DependentUpon="BaseDataList_DataSource.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_GridLines.aspx.cs" DependentUpon="BaseDataList_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_HorizontalAlign.aspx.cs" DependentUpon="BaseDataList_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_IsBindableType_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseDataList\BaseDataList_IsBindableType_T.aspx.cs" DependentUpon="BaseDataList_IsBindableType_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BaseValidator\BaseValidator_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BaseValidator\BaseValidator_ctor_.aspx.cs" DependentUpon="BaseValidator_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BorderStyle\BorderStyle_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BorderStyle\BorderStyle_Enum.aspx.cs" DependentUpon="BorderStyle_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ctor_.aspx.cs" DependentUpon="BoundColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataField.aspx.cs" DependentUpon="BoundColumn_DataField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_DataFormatString.aspx.cs" DependentUpon="BoundColumn_DataFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_InitializeCell_TIL.aspx.cs" DependentUpon="BoundColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\BoundColumn\BoundColumn_ReadOnly.aspx.cs" DependentUpon="BoundColumn_ReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_CausesValidation.aspx.cs" DependentUpon="Button_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Button\Button_Text.aspx.cs" DependentUpon="Button_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ButtonType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ButtonType.aspx.cs" DependentUpon="ButtonColumn_ButtonType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_CommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_CommandName.aspx.cs" DependentUpon="ButtonColumn_CommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_ctor_.aspx.cs" DependentUpon="ButtonColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextField.aspx.cs" DependentUpon="ButtonColumn_DataTextField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_DataTextFormatString.aspx.cs" DependentUpon="ButtonColumn_DataTextFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_FormatDataTextValue_O.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_FormatDataTextValue_O.aspx.cs" DependentUpon="ButtonColumn_FormatDataTextValue_O.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_InitializeCell_TIL.aspx.cs" DependentUpon="ButtonColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ButtonColumn\ButtonColumn_Text.aspx.cs" DependentUpon="ButtonColumn_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CalendarSelectionMode\CalendarSelectionMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CalendarSelectionMode\CalendarSelectionMode_Enum.aspx.cs" DependentUpon="CalendarSelectionMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_AutoPostBack.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_AutoPostBack.aspx.cs" DependentUpon="CheckBox_AutoPostBack.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Checked.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Checked.aspx.cs" DependentUpon="CheckBox_Checked.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Enabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Enabled.aspx.cs" DependentUpon="CheckBox_Enabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_Text.aspx.cs" DependentUpon="CheckBox_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_TextAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBox\CheckBox_TextAlign.aspx.cs" DependentUpon="CheckBox_TextAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellPadding.aspx.cs" DependentUpon="CheckBoxList_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_CellSpacing.aspx.cs" DependentUpon="CheckBoxList_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatColumns.aspx.cs" DependentUpon="CheckBoxList_RepeatColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatDirection.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatDirection.aspx.cs" DependentUpon="CheckBoxList_RepeatDirection.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatLayout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_RepeatLayout.aspx.cs" DependentUpon="CheckBoxList_RepeatLayout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_TextAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_TextAlign.aspx.cs" DependentUpon="CheckBoxList_TextAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\CheckBoxList\CheckBoxList_TextAlign.aspx.resx" DependentUpon="CheckBoxList_TextAlign.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowCustomPaging.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowCustomPaging.aspx.cs" DependentUpon="DataGrid_AllowCustomPaging.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowPaging.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowPaging.aspx.cs" DependentUpon="DataGrid_AllowPaging.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowSorting.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AllowSorting.aspx.cs" DependentUpon="DataGrid_AllowSorting.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AlternatingItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AlternatingItemStyle.aspx.cs" DependentUpon="DataGrid_AlternatingItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AlternatingItemStyle.aspx.resx" DependentUpon="DataGrid_AlternatingItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AutoGenerateColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_AutoGenerateColumns.aspx.cs" DependentUpon="DataGrid_AutoGenerateColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_BackImageUrl.aspx.cs" DependentUpon="DataGrid_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CancelCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CancelCommandName.aspx.cs" DependentUpon="DataGrid_CancelCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Columns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Columns.aspx.cs" DependentUpon="DataGrid_Columns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ctor_.aspx.cs" DependentUpon="DataGrid_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CurrentPageIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_CurrentPageIndex.aspx.cs" DependentUpon="DataGrid_CurrentPageIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommand.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommand.aspx.cs" DependentUpon="DataGrid_DeleteCommand.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_DeleteCommandName.aspx.cs" DependentUpon="DataGrid_DeleteCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditCommandName.aspx.cs" DependentUpon="DataGrid_EditCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemIndex.aspx.cs" DependentUpon="DataGrid_EditItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_EditItemStyle.aspx.cs" DependentUpon="DataGrid_EditItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_FooterStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_FooterStyle.aspx.cs" DependentUpon="DataGrid_FooterStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_HeaderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_HeaderStyle.aspx.cs" DependentUpon="DataGrid_HeaderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemCreated.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemCreated.aspx.cs" DependentUpon="DataGrid_ItemCreated.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemDataBound.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemDataBound.aspx.cs" DependentUpon="DataGrid_ItemDataBound.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_Items.aspx.cs" DependentUpon="DataGrid_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ItemStyle.aspx.cs" DependentUpon="DataGrid_ItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_NextPageCommandArgument.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_NextPageCommandArgument.aspx.cs" DependentUpon="DataGrid_NextPageCommandArgument.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCommandName.aspx.cs" DependentUpon="DataGrid_PageCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCount.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageCount.aspx.cs" DependentUpon="DataGrid_PageCount.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageIndexChanged.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageIndexChanged.aspx.cs" DependentUpon="DataGrid_PageIndexChanged.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PagerStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PagerStyle.aspx.cs" DependentUpon="DataGrid_PagerStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageSize.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PageSize.aspx.cs" DependentUpon="DataGrid_PageSize.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PrevPageCommandArgument.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_PrevPageCommandArgument.aspx.cs" DependentUpon="DataGrid_PrevPageCommandArgument.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectCommandName.aspx.cs" DependentUpon="DataGrid_SelectCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedIndex.aspx.cs" DependentUpon="DataGrid_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItem.aspx.cs" DependentUpon="DataGrid_SelectedItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SelectedItemStyle.aspx.cs" DependentUpon="DataGrid_SelectedItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowFooter.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowFooter.aspx.cs" DependentUpon="DataGrid_ShowFooter.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowHeader.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_ShowHeader.aspx.cs" DependentUpon="DataGrid_ShowHeader.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommand.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommand.aspx.cs" DependentUpon="DataGrid_SortCommand.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_SortCommandName.aspx.cs" DependentUpon="DataGrid_SortCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_UpdateCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_UpdateCommandName.aspx.cs" DependentUpon="DataGrid_UpdateCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_VirtualItemCount.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGrid\DataGrid_VirtualItemCount.aspx.cs" DependentUpon="DataGrid_VirtualItemCount.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterStyle.aspx.cs" DependentUpon="DataGridColumn_FooterStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_FooterText.aspx.cs" DependentUpon="DataGridColumn_FooterText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderImageUrl.aspx.cs" DependentUpon="DataGridColumn_HeaderImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderStyle.aspx.cs" DependentUpon="DataGridColumn_HeaderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_HeaderText.aspx.cs" DependentUpon="DataGridColumn_HeaderText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ItemStyle.aspx.cs" DependentUpon="DataGridColumn_ItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_SortExpression.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_SortExpression.aspx.cs" DependentUpon="DataGridColumn_SortExpression.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ToString_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_ToString_.aspx.cs" DependentUpon="DataGridColumn_ToString_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_Visible.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridColumn\DataGridColumn_Visible.aspx.cs" DependentUpon="DataGridColumn_Visible.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataItem.aspx.cs" DependentUpon="DataGridItem_DataItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataSetIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataSetIndex.aspx.cs" DependentUpon="DataGridItem_DataSetIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_DataSetIndex.aspx.resx" DependentUpon="DataGridItem_DataSetIndex.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemIndex.aspx.cs" DependentUpon="DataGridItem_ItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridItem\DataGridItem_ItemType.aspx.cs" DependentUpon="DataGridItem_ItemType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_CopyFrom_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_CopyFrom_S.aspx.cs" DependentUpon="DataGridPagerStyle_CopyFrom_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_MergeWith_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_MergeWith_S.aspx.cs" DependentUpon="DataGridPagerStyle_MergeWith_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Mode.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Mode.aspx.cs" DependentUpon="DataGridPagerStyle_Mode.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_NextPageText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_NextPageText.aspx.cs" DependentUpon="DataGridPagerStyle_NextPageText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PageButtonCount.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PageButtonCount.aspx.cs" DependentUpon="DataGridPagerStyle_PageButtonCount.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Position.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Position.aspx.cs" DependentUpon="DataGridPagerStyle_Position.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PrevPageText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PrevPageText.aspx.cs" DependentUpon="DataGridPagerStyle_PrevPageText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_PrevPageText.aspx.resx" DependentUpon="DataGridPagerStyle_PrevPageText.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Reset_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Reset_.aspx.cs" DependentUpon="DataGridPagerStyle_Reset_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Visible.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataGridPagerStyle\DataGridPagerStyle_Visible.aspx.cs" DependentUpon="DataGridPagerStyle_Visible.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemStyle.aspx.cs" DependentUpon="DataList_AlternatingItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemStyle.aspx.resx" DependentUpon="DataList_AlternatingItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_AlternatingItemTemplate.aspx.cs" DependentUpon="DataList_AlternatingItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_CancelCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_CancelCommandName.aspx.cs" DependentUpon="DataList_CancelCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_DeleteCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_DeleteCommandName.aspx.cs" DependentUpon="DataList_DeleteCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditCommandName.aspx.cs" DependentUpon="DataList_EditCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemIndex.aspx.cs" DependentUpon="DataList_EditItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemStyle.aspx.cs" DependentUpon="DataList_EditItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_EditItemTemplate.aspx.cs" DependentUpon="DataList_EditItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ExtractTemplateRows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ExtractTemplateRows.aspx.cs" DependentUpon="DataList_ExtractTemplateRows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ExtractTemplateRows.aspx.resx" DependentUpon="DataList_ExtractTemplateRows.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterStyle.aspx.cs" DependentUpon="DataList_FooterStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_FooterTemplate.aspx.cs" DependentUpon="DataList_FooterTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_GridLines.aspx.cs" DependentUpon="DataList_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderStyle.aspx.cs" DependentUpon="DataList_HeaderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_HeaderTemplate.aspx.cs" DependentUpon="DataList_HeaderTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_Items.aspx.cs" DependentUpon="DataList_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemStyle.aspx.cs" DependentUpon="DataList_ItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemStyle.aspx.resx" DependentUpon="DataList_ItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ItemTemplate.aspx.cs" DependentUpon="DataList_ItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatColumns.aspx.cs" DependentUpon="DataList_RepeatColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatDirection.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatDirection.aspx.cs" DependentUpon="DataList_RepeatDirection.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatLayout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_RepeatLayout.aspx.cs" DependentUpon="DataList_RepeatLayout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectCommandName.aspx.cs" DependentUpon="DataList_SelectCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedIndex.aspx.cs" DependentUpon="DataList_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItem.aspx.cs" DependentUpon="DataList_SelectedItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemStyle.aspx.cs" DependentUpon="DataList_SelectedItemStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemStyle.aspx.resx" DependentUpon="DataList_SelectedItemStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SelectedItemTemplate.aspx.cs" DependentUpon="DataList_SelectedItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorStyle.aspx.cs" DependentUpon="DataList_SeparatorStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_SeparatorTemplate.aspx.cs" DependentUpon="DataList_SeparatorTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowFooter.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowFooter.aspx.cs" DependentUpon="DataList_ShowFooter.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowHeader.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_ShowHeader.aspx.cs" DependentUpon="DataList_ShowHeader.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_UpdateCommandName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataList\DataList_UpdateCommandName.aspx.cs" DependentUpon="DataList_UpdateCommandName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ctor_IL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ctor_IL.aspx.cs" DependentUpon="DataListItem_ctor_IL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_DataItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_DataItem.aspx.cs" DependentUpon="DataListItem_DataItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemIndex.aspx.cs" DependentUpon="DataListItem_ItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemIndex.aspx.resx" DependentUpon="DataListItem_ItemIndex.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_ItemType.aspx.cs" DependentUpon="DataListItem_ItemType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_RenderItem_HBB.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DataListItem\DataListItem_RenderItem_HBB.aspx.cs" DependentUpon="DataListItem_RenderItem_HBB.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DayNameFormat\DayNameFormat_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DayNameFormat\DayNameFormat_Enum.aspx.cs" DependentUpon="DayNameFormat_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderColor.aspx.cs" DependentUpon="DropDownList_BorderColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderStyle.aspx.cs" DependentUpon="DropDownList_BorderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderWidth.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_BorderWidth.aspx.cs" DependentUpon="DropDownList_BorderWidth.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_SelectedIndex.aspx.cs" DependentUpon="DropDownList_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_ToolTip.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\DropDownList\DropDownList_ToolTip.aspx.cs" DependentUpon="DropDownList_ToolTip.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ButtonType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ButtonType.aspx.cs" DependentUpon="EditCommandColumn_ButtonType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_CancelText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_CancelText.aspx.cs" DependentUpon="EditCommandColumn_CancelText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_ctor_.aspx.cs" DependentUpon="EditCommandColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_EditText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_EditText.aspx.cs" DependentUpon="EditCommandColumn_EditText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_InitializeCell_TIL.aspx.cs" DependentUpon="EditCommandColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_UpdateText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\EditCommandColumn\EditCommandColumn_UpdateText.aspx.cs" DependentUpon="EditCommandColumn_UpdateText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\FirstDayOfWeek\FirstDayOfWeek_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\FirstDayOfWeek\FirstDayOfWeek_Enum.aspx.cs" DependentUpon="FirstDayOfWeek_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\FontSize\FontSize_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\FontSize\FontSize_Enum.aspx.cs" DependentUpon="FontSize_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\GridLines\GridLines_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\GridLines\GridLines_Enum.aspx.cs" DependentUpon="GridLines_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HorizontalAlign\HorizontalAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HorizontalAlign\HorizontalAlign_Enum.aspx.cs" DependentUpon="HorizontalAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\Car.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_ImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_ImageUrl.aspx.cs" DependentUpon="HyperLink_ImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_NavigateUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_NavigateUrl.aspx.cs" DependentUpon="HyperLink_NavigateUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Target.aspx.cs" DependentUpon="HyperLink_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLink\HyperLink_Text.aspx.cs" DependentUpon="HyperLink_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlField.aspx.cs" DependentUpon="HyperLinkColumn_DataNavigateUrlField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataNavigateUrlFormatString.aspx.cs" DependentUpon="HyperLinkColumn_DataNavigateUrlFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextField.aspx.cs" DependentUpon="HyperLinkColumn_DataTextField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_DataTextFormatString.aspx.cs" DependentUpon="HyperLinkColumn_DataTextFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_InitializeCell_TIL.aspx.cs" DependentUpon="HyperLinkColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_NavigateUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_NavigateUrl.aspx.cs" DependentUpon="HyperLinkColumn_NavigateUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Target.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Target.aspx.cs" DependentUpon="HyperLinkColumn_Target.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\HyperLinkColumn\HyperLinkColumn_Text.aspx.cs" DependentUpon="HyperLinkColumn_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Car.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_AlternateText.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_AlternateText.aspx.cs" DependentUpon="Image_AlternateText.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Enabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Enabled.aspx.cs" DependentUpon="Image_Enabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Font.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_Font.aspx.cs" DependentUpon="Image_Font.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageAlign.aspx.cs" DependentUpon="Image_ImageAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Image\Image_ImageUrl.aspx.cs" DependentUpon="Image_ImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ImageAlign\ImageAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ImageAlign\ImageAlign_Enum.aspx.cs" DependentUpon="ImageAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ImageButton\ImageButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ImageButton\ImageButton_CausesValidation.aspx.cs" DependentUpon="ImageButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_ctor_.aspx.cs" DependentUpon="Label_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Label\Label_Text.aspx.cs" DependentUpon="Label_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_CausesValidation.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_CausesValidation.aspx.cs" DependentUpon="LinkButton_CausesValidation.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButton\LinkButton_Text.aspx.cs" DependentUpon="LinkButton_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx.cs" DependentUpon="LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\LinkButtonControlBuilder\LinkButtonControlBuilder_ctor_.aspx.cs" DependentUpon="LinkButtonControlBuilder_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderColor.aspx.cs" DependentUpon="ListBox_BorderColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderStyle.aspx.cs" DependentUpon="ListBox_BorderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderWidth.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_BorderWidth.aspx.cs" DependentUpon="ListBox_BorderWidth.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_Rows.aspx.cs" DependentUpon="ListBox_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_SelectionMode.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_SelectionMode.aspx.cs" DependentUpon="ListBox_SelectionMode.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_ToolTip.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListBox\ListBox_ToolTip.aspx.cs" DependentUpon="ListBox_ToolTip.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_AutoPostBack.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_AutoPostBack.aspx.cs" DependentUpon="ListControl_AutoPostBack.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_ClearSelection_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_ClearSelection_.aspx.cs" DependentUpon="ListControl_ClearSelection_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataMember.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataMember.aspx.cs" DependentUpon="ListControl_DataMember.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataSource.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataSource.aspx.cs" DependentUpon="ListControl_DataSource.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataSource.aspx.resx" DependentUpon="ListControl_DataSource.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextField.aspx.cs" DependentUpon="ListControl_DataTextField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextFormatString.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataTextFormatString.aspx.cs" DependentUpon="ListControl_DataTextFormatString.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataValueField.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_DataValueField.aspx.cs" DependentUpon="ListControl_DataValueField.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_Items.aspx.cs" DependentUpon="ListControl_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedIndex.aspx.cs" DependentUpon="ListControl_SelectedIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedIndex.aspx.resx" DependentUpon="ListControl_SelectedIndex.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedItem.aspx.cs" DependentUpon="ListControl_SelectedItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedValue.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListControl\ListControl_SelectedValue.aspx.cs" DependentUpon="ListControl_SelectedValue.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Attributes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Attributes.aspx.cs" DependentUpon="ListItem_Attributes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_.aspx.cs" DependentUpon="ListItem_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_S.aspx.cs" DependentUpon="ListItem_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_SS.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ctor_SS.aspx.cs" DependentUpon="ListItem_ctor_SS.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Equals_O.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Equals_O.aspx.cs" DependentUpon="ListItem_Equals_O.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_FromString_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_FromString_S.aspx.cs" DependentUpon="ListItem_FromString_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_GetHashCode_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_GetHashCode_.aspx.cs" DependentUpon="ListItem_GetHashCode_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Selected.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Selected.aspx.cs" DependentUpon="ListItem_Selected.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Text.aspx.cs" DependentUpon="ListItem_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ToString_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_ToString_.aspx.cs" DependentUpon="ListItem_ToString_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Value.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItem\ListItem_Value.aspx.cs" DependentUpon="ListItem_Value.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListItemType\ListItemType_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListItemType\ListItemType_Enum.aspx.cs" DependentUpon="ListItemType_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ListSelectionMode\ListSelectionMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ListSelectionMode\ListSelectionMode_Enum.aspx.cs" DependentUpon="ListSelectionMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Literal\Literal_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Literal\Literal_Text.aspx.cs" DependentUpon="Literal_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\NextPrevFormat\NextPrevFormat_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\NextPrevFormat\NextPrevFormat_Enum.aspx.cs" DependentUpon="NextPrevFormat_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Car.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_BackImageUrl.aspx.cs" DependentUpon="Panel_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_HorizontalAlign.aspx.cs" DependentUpon="Panel_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Panel\Panel_Wrap.aspx.cs" DependentUpon="Panel_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\PlaceHolder\PlaceHolder_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\PlaceHolder\PlaceHolder_ctor_.aspx.cs" DependentUpon="PlaceHolder_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_ctor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_ctor.aspx.cs" DependentUpon="RadioButton_ctor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_ctor.aspx.resx" DependentUpon="RadioButton_ctor.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_GroupName.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButton\RadioButton_GroupName.aspx.cs" DependentUpon="RadioButton_GroupName.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellPadding.aspx.cs" DependentUpon="RadioButtonList_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_CellSpacing.aspx.cs" DependentUpon="RadioButtonList_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatColumns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatColumns.aspx.cs" DependentUpon="RadioButtonList_RepeatColumns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatDirection.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatDirection.aspx.cs" DependentUpon="RadioButtonList_RepeatDirection.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatLayout.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_RepeatLayout.aspx.cs" DependentUpon="RadioButtonList_RepeatLayout.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_TextAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RadioButtonList\RadioButtonList_TextAlign.aspx.cs" DependentUpon="RadioButtonList_TextAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatDirection\RepeatDirection_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatDirection\RepeatDirection_Enum.aspx.cs" DependentUpon="RepeatDirection_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_AlternatingItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_AlternatingItemTemplate.aspx.cs" DependentUpon="Repeater_AlternatingItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ctor_.aspx.cs" DependentUpon="Repeater_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataBind_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataBind_.aspx.cs" DependentUpon="Repeater_DataBind_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataMember.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataMember.aspx.cs" DependentUpon="Repeater_DataMember.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataSource.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_DataSource.aspx.cs" DependentUpon="Repeater_DataSource.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_FooterTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_FooterTemplate.aspx.cs" DependentUpon="Repeater_FooterTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_HeaderTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_HeaderTemplate.aspx.cs" DependentUpon="Repeater_HeaderTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemDataBound.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemDataBound.aspx.cs" DependentUpon="Repeater_ItemDataBound.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_Items.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_Items.aspx.cs" DependentUpon="Repeater_Items.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_ItemTemplate.aspx.cs" DependentUpon="Repeater_ItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_SeparatorTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Repeater\Repeater_SeparatorTemplate.aspx.cs" DependentUpon="Repeater_SeparatorTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_DataItem.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_DataItem.aspx.cs" DependentUpon="RepeaterItem_DataItem.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemIndex.aspx.cs" DependentUpon="RepeaterItem_ItemIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType.aspx.cs" DependentUpon="RepeaterItem_ItemType.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType_Manual.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeaterItem\RepeaterItem_ItemType_Manual.aspx.cs" DependentUpon="RepeaterItem_ItemType_Manual.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatLayout\RepeatLayout_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\RepeatLayout\RepeatLayout_Enum.aspx.cs" DependentUpon="RepeatLayout_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_BackImageUrl.aspx.cs" DependentUpon="Table_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellPadding.aspx.cs" DependentUpon="Table_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_CellSpacing.aspx.cs" DependentUpon="Table_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_ctor_.aspx.cs" DependentUpon="Table_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_GridLines.aspx.cs" DependentUpon="Table_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_HorizontalAlign.aspx.cs" DependentUpon="Table_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\Table\Table_Rows.aspx.cs" DependentUpon="Table_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ColumnSpan.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ColumnSpan.aspx.cs" DependentUpon="TableCell_ColumnSpan.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_ctor_.aspx.cs" DependentUpon="TableCell_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_HorizontalAlign.aspx.cs" DependentUpon="TableCell_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_RowSpan.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_RowSpan.aspx.cs" DependentUpon="TableCell_RowSpan.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Text.aspx.cs" DependentUpon="TableCell_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_VerticalAlign.aspx.cs" DependentUpon="TableCell_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCell\TableCell_Wrap.aspx.cs" DependentUpon="TableCell_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Add_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Add_T.aspx.cs" DependentUpon="TableCellCollection_Add_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddAt_IT.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddAt_IT.aspx.cs" DependentUpon="TableCellCollection_AddAt_IT.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddRange_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_AddRange_T.aspx.cs" DependentUpon="TableCellCollection_AddRange_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Clear_.aspx.cs" DependentUpon="TableCellCollection_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_CopyTo_AI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_CopyTo_AI.aspx.cs" DependentUpon="TableCellCollection_CopyTo_AI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Count.aspx.cs" DependentUpon="TableCellCollection_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetCellIndex_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetCellIndex_T.aspx.cs" DependentUpon="TableCellCollection_GetCellIndex_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetEnumerator_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_GetEnumerator_.aspx.cs" DependentUpon="TableCellCollection_GetEnumerator_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsReadOnly.aspx.cs" DependentUpon="TableCellCollection_IsReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsSynchronized.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_IsSynchronized.aspx.cs" DependentUpon="TableCellCollection_IsSynchronized.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Item.aspx.cs" DependentUpon="TableCellCollection_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Remove_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_Remove_T.aspx.cs" DependentUpon="TableCellCollection_Remove_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_RemoveAt_I.aspx.cs" DependentUpon="TableCellCollection_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_SyncRoot.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableCellCollection\TableCellCollection_SyncRoot.aspx.cs" DependentUpon="TableCellCollection_SyncRoot.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableHeaderCell\TableHeaderCell_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableHeaderCell\TableHeaderCell_ctor_.aspx.cs" DependentUpon="TableHeaderCell_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_CopyFrom_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_CopyFrom_S.aspx.cs" DependentUpon="TableItemStyle_CopyFrom_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_.aspx.cs" DependentUpon="TableItemStyle_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_ctor_S.aspx.cs" DependentUpon="TableItemStyle_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_HorizontalAlign.aspx.cs" DependentUpon="TableItemStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_MergeWith_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_MergeWith_S.aspx.cs" DependentUpon="TableItemStyle_MergeWith_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Reset_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Reset_.aspx.cs" DependentUpon="TableItemStyle_Reset_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_VerticalAlign.aspx.cs" DependentUpon="TableItemStyle_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableItemStyle\TableItemStyle_Wrap.aspx.cs" DependentUpon="TableItemStyle_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_Cells.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_Cells.aspx.cs" DependentUpon="TableRow_Cells.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlCollection_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlCollection_.aspx.cs" DependentUpon="TableRow_CreateControlCollection_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlStyle_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_CreateControlStyle_.aspx.cs" DependentUpon="TableRow_CreateControlStyle_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_ctor_.aspx.cs" DependentUpon="TableRow_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_HorizontalAlign.aspx.cs" DependentUpon="TableRow_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRow\TableRow_VerticalAlign.aspx.cs" DependentUpon="TableRow_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Add_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Add_T.aspx.cs" DependentUpon="TableRowCollection_Add_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddAt_IT.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddAt_IT.aspx.cs" DependentUpon="TableRowCollection_AddAt_IT.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddRange_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_AddRange_T.aspx.cs" DependentUpon="TableRowCollection_AddRange_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Clear_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Clear_.aspx.cs" DependentUpon="TableRowCollection_Clear_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_CopyTo_AI.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_CopyTo_AI.aspx.cs" DependentUpon="TableRowCollection_CopyTo_AI.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_CopyTo_AI.aspx.resx" DependentUpon="TableRowCollection_CopyTo_AI.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Count.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Count.aspx.cs" DependentUpon="TableRowCollection_Count.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetEnumerator_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetEnumerator_.aspx.cs" DependentUpon="TableRowCollection_GetEnumerator_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetRowIndex_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_GetRowIndex_T.aspx.cs" DependentUpon="TableRowCollection_GetRowIndex_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsReadOnly.aspx.cs" DependentUpon="TableRowCollection_IsReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsSynchronized.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_IsSynchronized.aspx.cs" DependentUpon="TableRowCollection_IsSynchronized.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Item.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Item.aspx.cs" DependentUpon="TableRowCollection_Item.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Remove_T.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_Remove_T.aspx.cs" DependentUpon="TableRowCollection_Remove_T.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_RemoveAt_I.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_RemoveAt_I.aspx.cs" DependentUpon="TableRowCollection_RemoveAt_I.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_SyncRoot.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableRowCollection\TableRowCollection_SyncRoot.aspx.cs" DependentUpon="TableRowCollection_SyncRoot.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_BackImageUrl.aspx.cs" DependentUpon="TableStyle_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellPadding.aspx.cs" DependentUpon="TableStyle_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CellSpacing.aspx.cs" DependentUpon="TableStyle_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CopyFrom_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_CopyFrom_S.aspx.cs" DependentUpon="TableStyle_CopyFrom_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_.aspx.cs" DependentUpon="TableStyle_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_ctor_S.aspx.cs" DependentUpon="TableStyle_ctor_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_GridLines.aspx.cs" DependentUpon="TableStyle_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_HorizontalAlign.aspx.cs" DependentUpon="TableStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_MergeWith_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_MergeWith_S.aspx.cs" DependentUpon="TableStyle_MergeWith_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_MergeWith_S.aspx.resx" DependentUpon="TableStyle_MergeWith_S.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_Reset_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TableStyle\TableStyle_Reset_.aspx.cs" DependentUpon="TableStyle_Reset_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ctor_.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ctor_.aspx.cs" DependentUpon="TemplateColumn_ctor_.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_EditItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_EditItemTemplate.aspx.cs" DependentUpon="TemplateColumn_EditItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_FooterTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_FooterTemplate.aspx.cs" DependentUpon="TemplateColumn_FooterTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_HeaderTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_HeaderTemplate.aspx.cs" DependentUpon="TemplateColumn_HeaderTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_InitializeCell_TIL.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_InitializeCell_TIL.aspx.cs" DependentUpon="TemplateColumn_InitializeCell_TIL.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ItemTemplate.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TemplateColumn\TemplateColumn_ItemTemplate.aspx.cs" DependentUpon="TemplateColumn_ItemTemplate.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextAlign\TextAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextAlign\TextAlign_Enum.aspx.cs" DependentUpon="TextAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_AutoPostBack.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_AutoPostBack.aspx.cs" DependentUpon="TextBox_AutoPostBack.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Columns.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Columns.aspx.cs" DependentUpon="TextBox_Columns.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_MaxLength.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_MaxLength.aspx.cs" DependentUpon="TextBox_MaxLength.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_ReadOnly.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_ReadOnly.aspx.cs" DependentUpon="TextBox_ReadOnly.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Rows.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Rows.aspx.cs" DependentUpon="TextBox_Rows.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Text.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Text.aspx.cs" DependentUpon="TextBox_Text.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_TextMode.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_TextMode.aspx.cs" DependentUpon="TextBox_TextMode.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBox\TextBox_Wrap.aspx.cs" DependentUpon="TextBox_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TextBoxMode\TextBoxMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TextBoxMode\TextBoxMode_Enum.aspx.cs" DependentUpon="TextBoxMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\TitleFormat\TitleFormat_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\TitleFormat\TitleFormat_Enum.aspx.cs" DependentUpon="TitleFormat_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\UnitType\UnitType_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\UnitType\UnitType_Enum.aspx.cs" DependentUpon="UnitType_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationCompareOperator\ValidationCompareOperator_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationCompareOperator\ValidationCompareOperator_Enum.aspx.cs" DependentUpon="ValidationCompareOperator_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationDataType\ValidationDataType_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationDataType\ValidationDataType_Enum.aspx.cs" DependentUpon="ValidationDataType_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationSummaryDisplayMode\ValidationSummaryDisplayMode_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidationSummaryDisplayMode\ValidationSummaryDisplayMode_Enum.aspx.cs" DependentUpon="ValidationSummaryDisplayMode_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\ValidatorDisplay\ValidatorDisplay_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\ValidatorDisplay\ValidatorDisplay_Enum.aspx.cs" DependentUpon="ValidatorDisplay_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\VerticalAlign\VerticalAlign_Enum.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\VerticalAlign\VerticalAlign_Enum.aspx.cs" DependentUpon="VerticalAlign_Enum.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\cat.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\dog.jpg" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_AccessKey.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_AccessKey.aspx.cs" DependentUpon="WebControl_AccessKey.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ApplyStyle_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ApplyStyle_S.aspx.cs" DependentUpon="WebControl_ApplyStyle_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Attributes.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Attributes.aspx.cs" DependentUpon="WebControl_Attributes.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BackColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BackColor.aspx.cs" DependentUpon="WebControl_BackColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderColor.aspx.cs" DependentUpon="WebControl_BorderColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderStyle.aspx.cs" DependentUpon="WebControl_BorderStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderStyle.aspx.resx" DependentUpon="WebControl_BorderStyle.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderWidth.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_BorderWidth.aspx.cs" DependentUpon="WebControl_BorderWidth.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyle.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyle.aspx.cs" DependentUpon="WebControl_ControlStyle.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyleCreated.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ControlStyleCreated.aspx.cs" DependentUpon="WebControl_ControlStyleCreated.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CopyBaseAttributes_W.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CopyBaseAttributes_W.aspx.cs" DependentUpon="WebControl_CopyBaseAttributes_W.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CssClass.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_CssClass.aspx.cs" DependentUpon="WebControl_CssClass.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ctor_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ctor_H.aspx.cs" DependentUpon="WebControl_ctor_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Enabled.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Enabled.aspx.cs" DependentUpon="WebControl_Enabled.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Font.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Font.aspx.cs" DependentUpon="WebControl_Font.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ForeColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ForeColor.aspx.cs" DependentUpon="WebControl_ForeColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Height.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Height.aspx.cs" DependentUpon="WebControl_Height.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_MergeStyle_S.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_MergeStyle_S.aspx.cs" DependentUpon="WebControl_MergeStyle_S.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderBeginTag_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderBeginTag_H.aspx.cs" DependentUpon="WebControl_RenderBeginTag_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderEndTag_H.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_RenderEndTag_H.aspx.cs" DependentUpon="WebControl_RenderEndTag_H.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style.aspx.cs" DependentUpon="WebControl_Style.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_BackColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_BackColor.aspx.cs" DependentUpon="WebControl_Style_BackColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Border.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Border.aspx.cs" DependentUpon="WebControl_Style_Border.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_CssClass.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_CssClass.aspx.cs" DependentUpon="WebControl_Style_CssClass.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Bold.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Bold.aspx.cs" DependentUpon="WebControl_Style_Font_Bold.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Italic.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Italic.aspx.cs" DependentUpon="WebControl_Style_Font_Italic.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Name.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Name.aspx.cs" DependentUpon="WebControl_Style_Font_Name.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Names.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Names.aspx.cs" DependentUpon="WebControl_Style_Font_Names.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_OverLine.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_OverLine.aspx.cs" DependentUpon="WebControl_Style_Font_OverLine.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Size.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_Size.aspx.cs" DependentUpon="WebControl_Style_Font_Size.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_StrikeOut.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_StrikeOut.aspx.cs" DependentUpon="WebControl_Style_Font_StrikeOut.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_UnderLine.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Font_UnderLine.aspx.cs" DependentUpon="WebControl_Style_Font_UnderLine.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_ForeColor.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_ForeColor.aspx.cs" DependentUpon="WebControl_Style_ForeColor.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Hight.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Hight.aspx.cs" DependentUpon="WebControl_Style_Hight.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Width.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Style_Width.aspx.cs" DependentUpon="WebControl_Style_Width.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TabIndex.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TabIndex.aspx.cs" DependentUpon="WebControl_TabIndex.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_HorizontalAlign.aspx.cs" DependentUpon="WebControl_TableItemStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_VerticalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_VerticalAlign.aspx.cs" DependentUpon="WebControl_TableItemStyle_VerticalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_Wrap.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableItemStyle_Wrap.aspx.cs" DependentUpon="WebControl_TableItemStyle_Wrap.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_BackImageUrl.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_BackImageUrl.aspx.cs" DependentUpon="WebControl_TableStyle_BackImageUrl.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellPadding.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellPadding.aspx.cs" DependentUpon="WebControl_TableStyle_CellPadding.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellSpacing.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_CellSpacing.aspx.cs" DependentUpon="WebControl_TableStyle_CellSpacing.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_GridLines.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_GridLines.aspx.cs" DependentUpon="WebControl_TableStyle_GridLines.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_HorizontalAlign.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_TableStyle_HorizontalAlign.aspx.cs" DependentUpon="WebControl_TableStyle_HorizontalAlign.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ToolTip.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_ToolTip.aspx.cs" DependentUpon="WebControl_ToolTip.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Width.aspx" BuildAction="Content"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Width.aspx.cs" DependentUpon="WebControl_Width.aspx" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="System_Web_UI_WebControls\WebControl\WebControl_Width.aspx.resx" DependentUpon="WebControl_Width.aspx.cs" BuildAction="EmbeddedResource"/>

-				<File RelPath="utils\GHDataSources.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="utils\GHTBaseWeb.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTControlBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTDataListBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTListControlBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="utils\GHTSubTest.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="utils\GHTWebControlBase.cs" SubType="ASPXCodeBehind" BuildAction="Compile"/>

-				<File RelPath="WEB-INF\web.xml" BuildAction="Content"/>

-			</Include>

-		</Files>

-		<UserProperties REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.drawing="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_core.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_codec.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.web="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Web.jar" REFS.JarPath.system.xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.j2ee="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jakarta-tomcat\server\lib\catalina.jar;..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jakarta-tomcat\common\lib\servlet-api.jar" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" project.JDKType="1.5.0_05" project.AppServerType="tomcat" PACK.WarPath="bin\MainsoftWebApp.war" PACK.Standalone="False" PACK.IncludeOpt="0" PACK.Compress="False"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="3" ApplicationServerType="tomcat"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="-1" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="8009" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="-1" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="8009" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="1" Name="Debug_Java"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx
deleted file mode 100644
index c757a9b2bff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BeginEventHandler_BeginInvoke_OEAOAO.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.BeginEventHandler_BeginInvoke_OEAOAO" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BeginEventHandler_BeginInvoke_OEAOAO</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx.cs
deleted file mode 100644
index ab5e43b59b7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class BeginEventHandler_BeginInvoke_OEAOAO
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx
deleted file mode 100644
index a7462e81602..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BeginEventHandler_Invoke_OEAO.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.BeginEventHandler_Invoke_OEAO" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BeginEventHandler_Invoke_OEAO</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx.cs
deleted file mode 100644
index 48ad513ce4f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class BeginEventHandler_Invoke_OEAO
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx
deleted file mode 100644
index 7328606e6d8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BeginEventHandler_ctor_OI.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.BeginEventHandler_ctor_OI" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BeginEventHandler_ctor_OI</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx.cs
deleted file mode 100644
index 6310b71ffe1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class BeginEventHandler_ctor_OI
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx
deleted file mode 100644
index ebf0cd08d18..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Add_SO.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Add_SO" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Add_SO</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx.cs
deleted file mode 100644
index a0eb8ae84b2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_Add_SO
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private class CustomClass
-		{
-			public string str = "";
-			public int num = 0;
-			public string Print()
-			{
-				return str;
-			}
-		}
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				IEnumerator enumerator5 = null;
-				this.Application.Clear();
-				this.Application.Add("var1", "variable1");
-				try
-				{
-					enumerator5 = this.Application.GetEnumerator();
-					while (enumerator5.MoveNext())
-					{
-						string text1 = (string)(enumerator5.Current);
-						if (this.Application[text1] == null)
-						{
-							this.GHTSubTestAddResult("Application(\"" + text1 + "\") = Nothing");
-							continue;
-						}
-						this.GHTSubTestAddResult((string)(("Application(\"" + text1) + "\") = " + this.Application[text1]));
-					}
-				}
-				finally
-				{
-					if (enumerator5 is IDisposable)
-					{
-						((IDisposable) enumerator5).Dispose();
-					}
-				}
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception1 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				IEnumerator enumerator4 = null;
-				this.Application.Add("var2", "variable2");
-				this.Application.Add("var3", "variable3");
-				try
-				{
-					enumerator4 = this.Application.GetEnumerator();
-					while (enumerator4.MoveNext())
-					{
-						string text2 = (string)(enumerator4.Current);
-						if (this.Application[text2] == null)
-						{
-							this.GHTSubTestAddResult("Application(\"" + text2 + "\") = Nothing");
-							continue;
-						}
-						this.GHTSubTestAddResult((string)("Application(\"" + text2 + "\") = " + this.Application[text2]));
-					}
-				}
-				finally
-				{
-					if (enumerator4 is IDisposable)
-					{
-						((IDisposable) enumerator4).Dispose();
-					}
-				}
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception2 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest3");
-			try
-			{
-				IEnumerator enumerator3 = null;
-				this.Application.Add("var4", "");
-				this.Application.Add("", "variable5");
-				try
-				{
-					enumerator3 = this.Application.GetEnumerator();
-					while (enumerator3.MoveNext())
-					{
-						string text3 = (string)(enumerator3.Current);
-						if (this.Application[text3] == null)
-						{
-							this.GHTSubTestAddResult("Application(\"" + text3 + "\") = Nothing");
-							continue;
-						}
-						this.GHTSubTestAddResult((string)("Application(\"" + text3 + "\") = " + this.Application[text3]));
-					}
-				}
-				finally
-				{
-					if (enumerator3 is IDisposable)
-					{
-						((IDisposable) enumerator3).Dispose();
-					}
-				}
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception3 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest4");
-			try
-			{
-				IEnumerator enumerator2 = null;
-				this.Application.Add("var2", "variable2");
-				this.Application.Add("var3", "variable3");
-				try
-				{
-					enumerator2 = this.Application.GetEnumerator();
-					while (enumerator2.MoveNext())
-					{
-						string text4 = (string)(enumerator2.Current);
-						if (this.Application[text4] == null)
-						{
-							this.GHTSubTestAddResult("Application(\"" + text4 + "\") = Nothing");
-							continue;
-						}
-						this.GHTSubTestAddResult((string)("Application(\"" + text4 + "\") = " + this.Application[text4]));
-					}
-				}
-				finally
-				{
-					if (enumerator2 is IDisposable)
-					{
-						((IDisposable) enumerator2).Dispose();
-					}
-				}
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception4 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest5");
-			try
-			{
-				this.Application.Add("int1", 1);
-				this.Application.Add("int2", -1);
-				this.Application.Add("nothing1", null);
-				IEnumerator enumerator1 = this.Application.GetEnumerator();
-				try
-				{
-					while (enumerator1.MoveNext())
-					{
-						string text5 = (string)(enumerator1.Current);
-						if (this.Application[text5] == null)
-						{
-							this.GHTSubTestAddResult("Application(\"" + text5 + "\") = Nothing");
-							continue;
-						}
-						this.GHTSubTestAddResult((string)("Application(\"" + text5 + "\") = " + this.Application[text5]));
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception5 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest6");
-			try
-			{
-				DateTime time1 = DateTime.Now;
-				this.Application.Add("date", time1);
-				this.GHTSubTestAddResult(this.Application["date"].GetType().ToString());
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception6 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest7");
-			try
-			{
-				HttpApplicationState_Add_SO.CustomClass class1 = new HttpApplicationState_Add_SO.CustomClass();
-				this.Application.Add("c", class1);
-				this.GHTSubTestAddResult(this.Application["c"].GetType().ToString());
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception7 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx
deleted file mode 100644
index 89e502987b7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_AllKeys.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_AllKeys" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_AllKeys</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx.cs
deleted file mode 100644
index dd665829bbe..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_AllKeys
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				this.Application.Clear();
-				this.Application.Add("var1", "variable1");
-				this.Application.Add("var2", "variable2");
-				this.Application.Add("var3", "variable3");
-				string[] textArray1 = new string[this.Application.Count + 1];
-				string[] textArray4 = this.Application.AllKeys;
-				for (int num2 = 0; num2 < textArray4.Length; num2++)
-				{
-					string text1 = textArray4[num2];
-					this.GHTSubTestAddResult((string)("(\"" + text1 + "\") = " + this.Application[text1]));
-				}
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				this.Application.Add("var4", "");
-				this.Application.Add("", "variable5");
-				string[] textArray2 = new string[3];
-				string[] textArray3 = this.Application.AllKeys;
-				for (int num1 = 0; num1 < textArray3.Length; num1++)
-				{
-					string text2 = textArray3[num1];
-					this.GHTSubTestAddResult((string)("(\"" + text2 + "\") = " + this.Application[text2]));
-				}
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx
deleted file mode 100644
index 2cbcc22eceb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Clear_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Clear_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Clear_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx.cs
deleted file mode 100644
index d7b37999715..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_Clear_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			IEnumerator enumerator2 = null;
-			try
-			{
-				this.Application.Clear();
-				this.Application.Add("var1", "variable1");
-				this.Application.Add("var2", "variable2");
-				this.Application.Clear();
-				this.Application.Add("var3", "variable3");
-				try
-				{
-					enumerator2 = this.Application.GetEnumerator();
-					while (enumerator2.MoveNext())
-					{
-						string text1 = (string)(enumerator2.Current);
-						this.GHTSubTestAddResult((string)("(\"" + text1 + "\") = " + this.Application[text1]));
-					}
-				}
-				finally
-				{
-					if (enumerator2 is IDisposable)
-					{
-						((IDisposable) enumerator2).Dispose();
-					}
-				}
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				IEnumerator enumerator1 = null;
-				this.Application.Add("var4", "");
-				this.Application.Add("", "variable5");
-				this.Application.Clear();
-				try
-				{
-					enumerator1 = this.Application.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text2 = (string)(enumerator1.Current);
-						this.GHTSubTestAddResult((string)("(\"" + text2 + "\") = " + this.Application[text2]));
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx
deleted file mode 100644
index a5544ab9f42..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Contents.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Contents" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Contents</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx.cs
deleted file mode 100644
index 74a492bd7ba..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_Contents
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				this.GHTSubTestAddResult(this.Application.Contents.GetType().ToString());
-				if (object.Equals(this.Application, this.Application.Contents))
-				{
-					this.GHTSubTestAddResult("Objects are equal");
-				}
-				else
-				{
-					this.GHTSubTestAddResult("Objects are not equal");
-				}
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx
deleted file mode 100644
index 824ffb21faa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Count.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Count" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Count</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx.cs
deleted file mode 100644
index 4acaa1f380d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_Count
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				this.Application.Clear();
-				string text1 = (string)(this.Application["variable"]);
-				this.GHTSubTestAddResult(this.Application.Count.ToString());
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception1 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				this.GHTSubTestAddResult(this.Application.Count.ToString());
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception2 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest3");
-			try
-			{
-				this.Application["v1"] = "v1";
-				this.Application["v2"] = "v2";
-				this.Application["v3"] = "v3";
-				this.GHTSubTestAddResult(this.Application.Count.ToString());
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception3 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest4");
-			try
-			{
-				this.Application.Add("v4", "v4");
-				this.Application.Add("v5", "v5");
-				this.Application.Add("v6", "v6");
-				this.Application.Add("v7", "v7");
-				this.GHTSubTestAddResult(this.Application.Count.ToString());
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception4 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest4");
-			try
-			{
-				this.Application["v8"] = "v8";
-				this.Application["v9"] = "v9";
-				this.Application["v10"] = "v10";
-				this.GHTSubTestAddResult(this.Application.Count.ToString());
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception5 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx
deleted file mode 100644
index ec376f90bfb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_GetKey_I.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_GetKey_I" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_GetKey_I</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx.cs
deleted file mode 100644
index 4c9f9d18653..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_GetKey_I
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				this.Application.Clear();
-				this.Application["var1"] = "variable1";
-				this.Application["var2"] = "variable2";
-				this.Application["var3"] = "variable3";
-				int num2 = this.Application.Count - 1;
-				for (int num1 = 0; num1 <= num2; num1++)
-				{
-					this.GHTSubTestAddResult(this.Application.GetKey(num1));
-				}
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception1 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				this.GHTSubTestAddResult(this.Application.GetKey(0x7d));
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				ArgumentOutOfRangeException exception2 = exception7;
-				this.GHTSubTestExpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception3 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest3");
-			try
-			{
-				this.GHTSubTestAddResult(this.Application.GetKey(-125));
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				ArgumentOutOfRangeException exception4 = exception9;
-				this.GHTSubTestExpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception5 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx
deleted file mode 100644
index 9fb2b7a6d0e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Item.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Item" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Item</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx.cs
deleted file mode 100644
index 6ccdf408bb7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{public class HttpApplicationState_Item
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.Application.Clear();
-			 this.Application["var1"] = "variable1";
-			 this.Application["var2"] = "variable2";
-			 this.Application["var3"] = "variable3";
-			 int num2 = this.Application.Count - 1;
-			 for (int num1 = 0; num1 <= num2; num1++)
-			 {
-				 this.GHTSubTestAddResult((string)("Application.Item(" + num1.ToString() + ") = " + this.Application[num1]));
-			 }
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception1 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)("Application.Item(125) = " + this.Application[0x7d]));
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 ArgumentOutOfRangeException exception2 = exception7;
-			 this.GHTSubTestExpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception3 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)("Application.Item(-125) = " + this.Application[-125]));
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 ArgumentOutOfRangeException exception4 = exception9;
-			 this.GHTSubTestExpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception5 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx
deleted file mode 100644
index 9dbc6120c73..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Item_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Item_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Item_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx.cs
deleted file mode 100644
index 9b6ad78f51d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web
-{public class HttpApplicationState_Item_S
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 IEnumerator enumerator4 = null;
-			 this.Application.Clear();
-			 this.Application["var1"] = "variable1";
-			 this.Application["var2"] = "variable2";
-			 this.Application["var3"] = "variable3";
-			 try
-			 {
-				 enumerator4 = this.Application.GetEnumerator();
-				 while (enumerator4.MoveNext())
-				 {
-					 string text1 = (string)(enumerator4.Current);
-					 if (this.Application[text1] == null)
-					 {
-						 this.GHTSubTestAddResult(("Application(\"" + text1) + "\") = null");
-						 continue;
-					 }
-					 this.GHTSubTestAddResult((string)(("Application(\"" + text1) + "\") = " + this.Application[text1]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator4 is IDisposable)
-				 {
-					 ((IDisposable) enumerator4).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 IEnumerator enumerator3 = null;
-			 this.Application["var1"] = "variable1";
-			 this.Application["var2"] = "variable2";
-			 this.Application["var3"] = "variable3";
-			 try
-			 {
-				 enumerator3 = this.Application.GetEnumerator();
-				 while (enumerator3.MoveNext())
-				 {
-					 string text2 = (string)(enumerator3.Current);
-					 if (this.Application[text2] == null)
-					 {
-						 this.GHTSubTestAddResult(("Application(\"" + text2) + "\") = null");
-						 continue;
-					 }
-					 this.GHTSubTestAddResult((string)(("Application(\"" + text2) + "\") = " + this.Application[text2]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator3 is IDisposable)
-				 {
-					 ((IDisposable) enumerator3).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 IEnumerator enumerator2 = null;
-			 this.Application[""] = "";
-			 this.Application["Nothing"] = null;
-			 try
-			 {
-				 enumerator2 = this.Application.GetEnumerator();
-				 while (enumerator2.MoveNext())
-				 {
-					 string text3 = (string)(enumerator2.Current);
-					 if (this.Application[text3] == null)
-					 {
-						 this.GHTSubTestAddResult(("Application(\"" + text3) + "\") = null");
-						 continue;
-					 }
-					 this.GHTSubTestAddResult((string)(("Application(\"" + text3) + "\") = " + this.Application[text3]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator2 is IDisposable)
-				 {
-					 ((IDisposable) enumerator2).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 IEnumerator enumerator1 = null;
-			 try
-			 {
-				 enumerator1 = this.Application.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 string text4 = (string)(enumerator1.Current);
-					 if (this.Application[text4 + "_" + text4] == null)
-					 {
-						 this.GHTSubTestAddResult(("Application(\"" + text4 + "_" + text4) + "\")  = null");
-						 continue;
-					 }
-					 this.GHTSubTestAddResult((string)(((("Application(\"" + text4) + "_") + text4) + "\") = " + this.Application[text4 + "_" + text4]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx
deleted file mode 100644
index 28c929b9b25..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_RemoveAll_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_RemoveAll_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_RemoveAll_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx.cs
deleted file mode 100644
index 60a49aa74e6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpApplicationState_RemoveAll_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				Application.Clear();
-				Application["var1"] = "variable1";
-				Application["var2"] = "variable2";
-				Application["var3"] = "variable3";
-
-				Application.RemoveAll();
-
-				int num2 = this.Application.Count - 1;
-				for (int num1 = 0; num1 <= num2; num1++)
-				{
-					this.GHTSubTestAddResult((string)("Application.Item(" + num1.ToString() + ") = " + this.Application[num1]));
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx
deleted file mode 100644
index b2055cf6969..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_RemoveAt_I.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_RemoveAt_I" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_RemoveAt_I</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx.cs
deleted file mode 100644
index f05a8975784..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{public class HttpApplicationState_RemoveAt_I
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.Application.Clear();
-			 this.Application["var1"] = "variable1";
-			 this.Application["var2"] = "variable2";
-			 this.Application["var3"] = "variable3";
-			 this.Application.RemoveAt(2);
-			 int num8 = this.Application.Count - 1;
-			 for (int num1 = 0; num1 <= num8; num1++)
-			 {
-				 this.GHTSubTestAddResult((string)("Application.Item(" + num1.ToString() + ") = " + this.Application[num1]));
-			 }
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception1 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.Application.RemoveAt(2);
-			 int num7 = this.Application.Count - 1;
-			 for (int num2 = 0; num2 <= num7; num2++)
-			 {
-				 this.GHTSubTestAddResult((string)("Application.Item(" + num2.ToString() + ") = " + this.Application[num2]));
-			 }
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 ArgumentOutOfRangeException exception2 = exception9;
-			 this.GHTSubTestExpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception3 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.Application.RemoveAt(0x7d);
-			 int num6 = this.Application.Count - 1;
-			 for (int num3 = 0; num3 <= num6; num3++)
-			 {
-				 this.GHTSubTestAddResult((string)("Application.Item(" + num3.ToString() + ") = " + this.Application[num3]));
-			 }
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 ArgumentOutOfRangeException exception4 = exception11;
-			 this.GHTSubTestExpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception5 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Application.RemoveAt(-125);
-			 int num5 = this.Application.Count - 1;
-			 for (int num4 = 0; num4 <= num5; num4++)
-			 {
-				 this.GHTSubTestAddResult((string)("Application.Item(" + num4.ToString() + ") = " + this.Application[num4].ToString()));
-			 }
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception13)
-		 {
-			 // ProjectData.SetProjectError(exception13);
-			 ArgumentOutOfRangeException exception6 = exception13;
-			 this.GHTSubTestExpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception14)
-		 {
-			 // ProjectData.SetProjectError(exception14);
-			 Exception exception7 = exception14;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception7);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx
deleted file mode 100644
index cb279123f2c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpApplicationState_Remove_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpApplicationState_Remove_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpApplicationState_Remove_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx.cs
deleted file mode 100644
index 66a98400725..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web
-{public class HttpApplicationState_Remove_S
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 IEnumerator enumerator3 = null;
-			 this.Application.Clear();
-			 this.Application["var1"] = "variable1";
-			 this.Application["var2"] = "variable2";
-			 this.Application["var3"] = "variable3";
-			 this.Application.Remove("var2");
-			 try
-			 {
-				 enumerator3 = this.Application.GetEnumerator();
-				 while (enumerator3.MoveNext())
-				 {
-					 string text1 = (string)(enumerator3.Current);
-					 this.GHTSubTestAddResult((string)(("Application(\"" + text1) + "\") = " + this.Application[text1]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator3 is IDisposable)
-				 {
-					 ((IDisposable) enumerator3).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 IEnumerator enumerator2 = null;
-			 this.Application.Remove("var2");
-			 try
-			 {
-				 enumerator2 = this.Application.GetEnumerator();
-				 while (enumerator2.MoveNext())
-				 {
-					 string text2 = (string)(enumerator2.Current);
-					 this.GHTSubTestAddResult((string)(("Application(\"" + text2) + "\") = " + this.Application[text2]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator2 is IDisposable)
-				 {
-					 ((IDisposable) enumerator2).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 IEnumerator enumerator1 = null;
-			 this.Application.Remove("NotExist");
-			 try
-			 {
-				 enumerator1 = this.Application.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 string text3 = (string)(enumerator1.Current);
-					 this.GHTSubTestAddResult((string)(("Application(\"" + text3) + "\") = " + this.Application[text3]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Application.Remove("");
-			 int num2 = this.Application.Count - 1;
-			 for (int num1 = 0; num1 <= num2; num1++)
-			 {
-				 this.GHTSubTestAddResult((string)(("Application.Item(" + num1.ToString()) + ") = " + this.Application[num1]));
-			 }
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx
deleted file mode 100644
index 02f70a30502..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpCacheRevalidation_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpCacheRevalidation_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpCacheRevalidation_Enum</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx.cs
deleted file mode 100644
index 1356f535f91..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpCacheRevalidation_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			//// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.HttpCacheRevalidation"); 
-			try
-			{ 
-				GHTSubTestAddResult(Test()); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(HttpCacheRevalidation));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(HttpCacheRevalidation));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheability/HttpCacheability_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheability/HttpCacheability_Enum.aspx
deleted file mode 100644
index e22b900e4cd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheability/HttpCacheability_Enum.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpCacheability_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpCacheability_Enum" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpCacheability_Enum</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheability/HttpCacheability_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheability/HttpCacheability_Enum.aspx.cs
deleted file mode 100644
index 6869eaf89ca..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpCacheability/HttpCacheability_Enum.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpCacheability_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.HttpCacheRevalidation");
-			try
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test() 
-		{ 
-			string result = string.Empty; 
-			string[] Names; 
-			int[] Values; 
-			Names = System.Enum.GetNames(typeof(System.Web.HttpCacheRevalidation)); 
-			foreach (string name in Names) 
-			{ 
-				result += name + "; "; 
-			} 
-			Values = (int[])System.Enum.GetValues(typeof(System.Web.HttpCacheRevalidation)); 
-			foreach (int val in Values) 
-			{ 
-				result += val.ToString() + "; "; 
-			} 
-			return result; 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx
deleted file mode 100644
index 22ce552f9f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_AcceptTypes.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_AcceptTypes" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_AcceptTypes</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx.cs
deleted file mode 100644
index ea297cc7898..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_AcceptTypes
-		: GHTBaseWeb 
-	{
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Need more testing on different
-			// application paths. Needs for that multiple virtual directories
-			this.GHTSubTestBegin("AcceptedTypes1");
-			try
-			{
-				string[] textArray1 = this.Request.AcceptTypes;
-				int num2 = textArray1.Length - 1;
-				for (int num1 = 0; num1 <= num2; num1++)
-				{
-					string[] textArray2 = new string[] { "Accept Type ", num1.ToString(), ": ", textArray1[num1], "<br>" } ;
-					this.GHTSubTestAddResult(string.Concat(textArray2));
-				}
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestAddResult("unxpected " + exception1.GetType().Name + " exception was caught-" + exception1.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx
deleted file mode 100644
index b361b581e44..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_ApplicationPath.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_ApplicationPath" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_ApplicationPath</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx.cs
deleted file mode 100644
index 1a14124a040..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using GHTWebControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_ApplicationPath
-		: GHTBaseWeb 
-	{
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Need more testing on different
-			// application paths. Needs for that multiple virtual directories
-			this.GHTSubTestBegin("AppPath1");
-			try
-			{
-				this.GHTSubTestAddResult(this.Request.ApplicationPath);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestAddResult("unxpected " + exception1.GetType().Name + " exception was caught-" + exception1.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
-
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Browser.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Browser.aspx
deleted file mode 100644
index 766f809282c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Browser.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_Browser.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_Browser" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_Browser</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Browser.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Browser.aspx.cs
deleted file mode 100644
index 331c853ebbf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Browser.aspx.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_Browser
-		: GHTBaseWeb 
-	{
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the Browser object is set
-			// ===================================
-			this.GHTSubTestBegin("Request.Browser1");
-			try
-			{
-				if (this.Request.Browser == null)
-				{
-					this.GHTSubTestAddResult("Failed");
-				}
-				else
-				{
-					this.GHTSubTestAddResult("Success");
-				}
-			}
-			catch (Exception ex)
-			{
-				this.GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-			this.GHTSubTestEnd();
-
-			// ===================================
-			// testing if the objects return is from the 
-			// correct type
-			// ===================================
-			this.GHTSubTestBegin("Request.Browser2");
-			try
-			{
-				HttpBrowserCapabilities capabilities1 = this.Request.Browser;
-				this.GHTSubTestAddResult("success");
-			}
-			catch (Exception ex)
-			{
-				this.GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-			this.GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Browser contains the
-			// right context. This is basic testing
-			// a more rigorous testing needs to be included
-			// in the HTTPBrowserCapabilities object
-			// ===================================
-			GHTSubTestBegin("Request.Browser3");
-			try
-			{
-				HttpBrowserCapabilities capabilities2 = this.Request.Browser;
-				this.GHTSubTestAddResult(capabilities2.Browser);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Browser contains the
-			// right context. This is basic testing
-			// a more rigorous testing needs to be included
-			// in the HTTPBrowserCapabilities object
-			// ===================================
-			GHTSubTestBegin("Request.Browser4");
-			try
-			{
-				HttpBrowserCapabilities brw = Request.Browser;
-				GHTSubTestAddResult(brw.MajorVersion.ToString() + "." + brw.MinorVersion.ToString());
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx
deleted file mode 100644
index dbc23db115a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_ClientCertificate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_ClientCertificate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_ClientCertificate</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx.cs
deleted file mode 100644
index 74d93093904..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_ClientCertificate
-		: GHTBaseWeb 
-	{
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the clientCertficate object is set
-			// ===================================
-			GHTSubTestBegin("ClinetCertficate1");
-			try
-			{
-				if (Request.ClientCertificate == null)
-					GHTSubTestAddResult("Failed");
-				else
-					GHTSubTestAddResult("Success");
-			}
-                
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-			
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the objects return is from the 
-			// correct type
-			// ===================================
-			GHTSubTestBegin("ClinetCertficate2");
-			try
-			{
-				HttpClientCertificate CC = this.Request.ClientCertificate;
-					GHTSubTestAddResult("success");
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-			
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx
deleted file mode 100644
index 166fdbe93fa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_ContentEncoding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_ContentEncoding" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_ContentEncoding</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx.cs
deleted file mode 100644
index 8d42e85edd3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_ContentEncoding
-		: GHTBaseWeb 
-	{
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the Browser object is set
-			// ===================================
-			GHTSubTestBegin("Request.ContentEncoding1");
-			try
-			{
-				if (Request.ContentEncoding == null)
-					GHTSubTestAddResult("Failed");
-				else
-					GHTSubTestAddResult("Success");
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-            
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the objects return is from the 
-			// correct type
-			// ===================================
-			GHTSubTestBegin("Request.ContentEncoding2");
-			try
-			{
-				System.Text.Encoding enc = this.Request.ContentEncoding;
-				GHTSubTestAddResult("success");
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-            
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Request object returns the 
-			// correct encoding
-			// ===================================
-			GHTSubTestBegin("Request.ContentEncoding3");
-			try
-			{
-				System.Text.Encoding enc = this.Request.ContentEncoding;
-				GHTSubTestAddResult(enc.EncodingName);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-            
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Cookies.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Cookies.aspx
deleted file mode 100644
index 90f4a28342c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Cookies.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_Cookies.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_Cookies" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_Cookies</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-	</HEAD>
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>   
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Cookies.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Cookies.aspx.cs
deleted file mode 100644
index 2e910c888c9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Cookies.aspx.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_Cookies
-		: GHTBaseWeb 
-	{
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the Context object is set
-			// ===================================
-			GHTSubTestBegin("Request.Cookies1");
-			try 
-			{
-				if (Request.Cookies == null)
-					GHTSubTestAddResult("Failed");
-				else
-					GHTSubTestAddResult("Success");
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-				}
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the objects return is from the 
-			// correct type
-			// ===================================
-			GHTSubTestBegin("Request.Cookies2");
-			try 
-			{
-				HttpCookieCollection cookie = Request.Cookies;
-				GHTSubTestAddResult("success");
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Cookies collection contains the
-			// right context. This is basic testing
-			// a more rigorous testing needs to be included
-			// in the HTTPColkiesCollction object
-			// ===================================
-			GHTSubTestBegin("Request.Cookies3");
-			HttpCookie MyCookie;
-			MyCookie = new HttpCookie("MyCookie", "MyCookieValue");
-			Response.Cookies.Add(MyCookie);
-			try 
-			{
-				HttpCookieCollection Cookies = Request.Cookies;
-				foreach (System.Web.HttpCookie cookie in Cookies)
-					if (cookie.Name == "MyCookie")
-						GHTSubTestAddResult(cookie.Name + " - " + cookie.Value);
-			}
-
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Cookies collection contains the
-			// right context. This is basic testing
-			// a more rigorous testing needs to be included
-			// in the HTTPColkiesCollction object
-			// ===================================
-			GHTSubTestBegin("Request.Cookies4");
-			try 
-			{
-				System.Web.HttpCookieCollection Cookies = Request.Cookies;
-				string currentKey = "MyCookie";
-				GHTSubTestAddResult(Cookies[currentKey].Name + " - " + Cookies[currentKey].Value);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx
deleted file mode 100644
index 1fd36da7c25..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_CurrentExecutionFilePath.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_CurrentExecutionFilePath" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_CurrentExecutionFilePath</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-	</HEAD>
-<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-	</script>	
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx.cs
deleted file mode 100644
index 1834b2fb788..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_CurrentExecutionFilePath
-		: GHTBaseWeb 
-	{
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("Request.CurrentExecutionFilePath1");
-			try 
-			{
-				GHTSubTestAddResult(Request.CurrentExecutionFilePath);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-
-			// we pring the File Path as well to see that they are equasll
-			// we alsi call this page from HttpRequest_CurrentExecutionFilePath_1 
-			// to see the difference
-			GHTSubTestBegin("Request.FilePath1");
-			try 
-			{
-				GHTSubTestAddResult(Request.FilePath);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Headers.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Headers.aspx
deleted file mode 100644
index 392bea6604c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Headers.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_Headers.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_Headers" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_Headers</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Headers.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Headers.aspx.cs
deleted file mode 100644
index 70df5042242..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_Headers.aspx.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections.Specialized;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_Headers
-		: GHTBaseWeb 
-	{
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the headers object is set
-			// ===================================
-			GHTSubTestBegin("Request.Headers1");
-				try 
-				{
-					if (Request.Headers == null)
-						GHTSubTestAddResult("Failed");
-					else
-						GHTSubTestAddResult("Success");
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-				}
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the objects returned is from the 
-			// correct type
-			// ===================================
-			GHTSubTestBegin("Request.Headers2");
-			try 
-			{
-				NameValueCollection cookie = Request.Headers;
-				GHTSubTestAddResult("success");
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Headers collection contains the
-			// right context. 
-			// ===================================
-			GHTSubTestBegin("Request.Headers3");
-			try 
-			{
-				NameValueCollection Headers = Request.Headers;
-				foreach (string current in Headers.Keys)
-					GHTSubTestAddResult(current);
-			}
-
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-
-			// ===================================
-			// testing if the Headers collection contains the
-			// right context. 
-			// ===================================
-			GHTSubTestBegin("Request.Headers4");
-			try 
-			{
-				NameValueCollection Headers = this.Request.Headers;
-				foreach (string header in Headers.AllKeys)
-					GHTSubTestAddResult(header);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("Unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Request.Headers5");
-			try
-			{
-				int num1 = 0;
-				string[] textArray1 = this.Request.Headers.AllKeys;
-				int num2 = textArray1.Length - 1;
-				for (num1 = 0; num1 <= num2; num1++)
-				{
-					if (textArray1[num1].ToLower().CompareTo("host") != 0)
-					{
-						this.GHTSubTestAddResult(textArray1[num1] + "=" + this.Request.Headers.Get(textArray1[num1]) + "<br>");
-					}
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-				}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx
deleted file mode 100644
index d5772020d06..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" AutoEventWireup="false" Codebehind="HttpRequest_MapPath_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_MapPath_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_MapPath_S</title>
-		<meta name="GENERATOR" Content="Microsoft Visual Studio .1">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx.cs
deleted file mode 100644
index 6ab1beed58b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
- 
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRequest_MapPath_S
-		: GHTBaseWeb 
-	{
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// trying full path
-			GHTSubTestBegin("Request.MapPath1");
-			try 
-			{
-				GHTSubTestAddResult(Request.MapPath("/"));
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// trying invalid path
-			GHTSubTestBegin("Request.MapPath2");
-			try 
-			{
-				GHTSubTestAddResult(Request.MapPath("Http://dummy"));
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// another invalid path
-			GHTSubTestBegin("Request.MapPath3");
-			try 
-			{
-				// due to bug limitation 2846 we compare only the lenght of the MapPath
-				GHTSubTestAddResult((Request.MapPath("").Length > 0).ToString());
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// trying a sub directory with a "/"
-			GHTSubTestBegin("Request.MapPath4");
-			try 
-			{
-				// due to bug limitation 2846 we compare only the lenght of the MapPath
-				GHTSubTestAddResult((Request.MapPath("/System_Web_dll").Length > 0).ToString());
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// trying a sub directory 
-			GHTSubTestBegin("Request.MapPath5");
-			try 
-			{
-				// due to bug limitation 2846 we compare only the lenght of the MapPath
-				GHTSubTestAddResult((Request.MapPath("/System_Web_dll/").Length > 0).ToString());
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx
deleted file mode 100644
index b8650290dc7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpRequest_ServerVariables.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRequest_ServerVariables" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRequest_ServerVariables</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx.cs
deleted file mode 100644
index 9aae0fdecd3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-    public class HttpRequest_ServerVariables
-        : GHTBaseWeb {
-
-        private string [] sortKeys = null;
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) this.FindControl("form1");
-			this.GHTTestBegin(form1);
-			this.CreateSortKeys();
-			this.GHTSubTestBegin("All keys:");
-			try
-			{
-				string[] textArray1 = this.sortKeys;
-				for (int num1 = 0; num1 < textArray1.Length; num1++)
-				{
-					string text1 = textArray1[num1];
-				}
-			}
-			catch (Exception exception2)
-			{
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
-
-		private void CreateSortKeys()
-		{
-			this.sortKeys = new string[this.Request.ServerVariables.Keys.Count + 1];
-			((ICollection) this.Request.ServerVariables.Keys).CopyTo(this.sortKeys, 0);
-			Array.Sort(this.sortKeys);
-		}
- 
-
- 
-
-
-
-#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx
deleted file mode 100644
index d1107ed515f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpRuntime_AppDomainAppPath.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRuntime_AppDomainAppPath" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpRuntime_AppDomainAppPath</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx.cs
deleted file mode 100644
index c87453e3bdf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRuntime_AppDomainAppPath
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the headers object is set
-			// ===================================
-			GHTSubTestBegin("AppDomainAppPath");
-			try 
-			{
-				string s1;
-				s1 = HttpRuntime.AppDomainAppPath;
-				s1 = s1.Replace("\\", "/");
-				s1 = s1.Replace("C:", "c:");
-				GHTSubTestAddResult(s1);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-			}
-
-			GHTSubTestEnd();
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx
deleted file mode 100644
index f01475f4ae3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpRuntime_AppDomainAppPath_MapPath.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpRuntime_AppDomainAppPath_MapPath" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>HttpRuntime_AppDomainAppPath_MapPath</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-    <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>   
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx.cs
deleted file mode 100644
index a7232d9847d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpRuntime_AppDomainAppPath_MapPath
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// ===================================
-			// testing if the headers object is set
-			// ===================================
-			GHTSubTestBegin("AppDomainAppPath");
-			try 
-			{
-				string s1, s2, s3;
-				s1 = HttpRuntime.AppDomainAppPath;
-				s1 = s1.Replace("\\", "/");
-				s1 = s1.Replace("C:", "c:");
-
-				s2 = Server.MapPath(".");
-				s2 = s2.Replace("\\", "/");
-				s2 = s2.Replace("C:", "c:");
-
-				if (s1 == s2)
-					s3 = "Identical";
-				else
-					s3 = "Not Identical";
-
-				GHTSubTestAddResult(s1);
-				GHTSubTestAddResult(s2);
-				GHTSubTestAddResult(s3);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult("unxpected " + ex.GetType().Name + " exception was caught-" + ex.Message);
-				}
-
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx
deleted file mode 100644
index 575b530931f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpValidationStatus_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.HttpValidationStatus_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpValidationStatus_Enum</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx.cs
deleted file mode 100644
index 85cb33ef8de..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class HttpValidationStatus_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.HttpValidationStatus");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(HttpValidationStatus));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(HttpValidationStatus));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx
deleted file mode 100644
index 8490f26f672..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ProcessShutdownReason_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.ProcessShutdownReason_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ProcessShutdownReason_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx.cs
deleted file mode 100644
index f782d2f381a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class ProcessShutdownReason_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.ProcessShutdownReason");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ProcessShutdownReason));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ProcessShutdownReason));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessStatus/ProcessStatus_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessStatus/ProcessStatus_Enum.aspx
deleted file mode 100644
index d8d4b64b76d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessStatus/ProcessStatus_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ProcessStatus_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.ProcessStatus_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ProcessStatus_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessStatus/ProcessStatus_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessStatus/ProcessStatus_Enum.aspx.cs
deleted file mode 100644
index 3f3a3bcf23f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/ProcessStatus/ProcessStatus_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class ProcessStatus_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.ProcessStatus");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ProcessStatus));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ProcessStatus));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/TraceMode/TraceMode_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/TraceMode/TraceMode_Enum.aspx
deleted file mode 100644
index dcb596a0f19..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/TraceMode/TraceMode_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TraceMode_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web.TraceMode_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>TraceMode_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/TraceMode/TraceMode_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/TraceMode/TraceMode_Enum.aspx.cs
deleted file mode 100644
index 042633bff47..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web/TraceMode/TraceMode_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web
-{
-	public class TraceMode_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.TraceMode");
-				try 
-				{
-					GHTSubTestAddResult(Test());
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(TraceMode));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(TraceMode));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx
deleted file mode 100644
index 79a4ddb8542..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Add_Nothing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Add_Nothing" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Add_Nothing</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx.cs
deleted file mode 100644
index 43be4570eec..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_Add_Nothing
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");;
-			try 
-			{
-				Session.Clear();
-				Session.Add("s_nothing", null);
-
-				if (Session["s_nothing"] == null)
-				{
-					GHTSubTestAddResult("Session(\"s_nothing\") is really Nothing");
-					GHTSubTestAddResult(Session.Count.ToString());
-				}
-				else
-					GHTSubTestAddResult("Session(\"s_nothing\") has " + Session["s_nothing"].GetType().ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest2");
-				try 
-				{
-					Session.Clear();
-					Session["name"] = "Name";
-					Session["name"] = null;
-
-					if (Session["name"] == null)
-					{
-						GHTSubTestAddResult("Session(\"name\") is really Nothing");
-						GHTSubTestAddResult(Session.Count.ToString());
-					}
-					else
-						GHTSubTestAddResult("Session(\"name\") has " + Session["name"].GetType().ToString());
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest1");;
-			try 
-			{
-				Session.Clear();
-				Session["name"] = "Name";
-				Session[0] = null;
-
-				if (Session[0] == null)
-				{
-					GHTSubTestAddResult("Session(0) is really Nothing");
-					GHTSubTestAddResult(Session.Count.ToString());
-				}
-				else
-					GHTSubTestAddResult("Session(0) has " + Session[0].GetType().ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx
deleted file mode 100644
index 5aa2486bb9e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Add_SO.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Add_SO" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Add_SO</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx.cs
deleted file mode 100644
index 77a8d3006c7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Add_SO
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 IEnumerator enumerator4 = null;
-			 this.Session.Clear();
-			 this.Session.Add("var1", "variable1");
-			 try
-			 {
-				 enumerator4 = this.Session.GetEnumerator();
-				 while (enumerator4.MoveNext())
-				 {
-					 string text1 = (string)(enumerator4.Current);
-					 this.GHTSubTestAddResult((string)("Session(\"" + text1 + "\") = " + this.Session[text1]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator4 is IDisposable)
-				 {
-					 ((IDisposable) enumerator4).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception1 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 IEnumerator enumerator3 = null;
-			 this.Session.Add("var2", "variable2");
-			 this.Session.Add("var3", "variable3");
-			 try
-			 {
-				 enumerator3 = this.Session.GetEnumerator();
-				 while (enumerator3.MoveNext())
-				 {
-					 string text2 = (string)(enumerator3.Current);
-					 this.GHTSubTestAddResult((string)("Session(\"" + text2 + "\") = " + this.Session[text2]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator3 is IDisposable)
-				 {
-					 ((IDisposable) enumerator3).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception2 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 IEnumerator enumerator2 = null;
-			 this.Session.Add("var4", "");
-			 this.Session.Add("", "variable5");
-			 try
-			 {
-				 enumerator2 = this.Session.GetEnumerator();
-				 while (enumerator2.MoveNext())
-				 {
-					 string text3 = (string)(enumerator2.Current);
-					 this.GHTSubTestAddResult((string)("Session(\"" + text3 + "\") = " + this.Session[text3]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator2 is IDisposable)
-				 {
-					 ((IDisposable) enumerator2).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception3 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 IEnumerator enumerator1 = null;
-			 this.Session.Add("int1", 1);
-			 this.Session.Add("int2", -1);
-			 this.Session.Add("nothing1", null);
-			 try
-			 {
-				 enumerator1 = this.Session.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 string text4 = (string)(enumerator1.Current);
-					 this.GHTSubTestAddResult((string)("Session(\"" + text4 + "\") = " + this.Session[text4]));
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 Exception exception4 = exception9;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest5");
-		 try
-		 {
-			 DateTime time1 = DateTime.Now;
-			 this.Session.Add("date", time1);
-			 this.GHTSubTestAddResult(this.Session["date"].GetType().ToString());
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception5 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx
deleted file mode 100644
index 29469950512..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Clear_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Clear_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Clear_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx.cs
deleted file mode 100644
index fd1e43400d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Clear_
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 string text1;
-			 IEnumerator enumerator1 = null;
-			 IEnumerator enumerator2 = null;
-			 this.Session.Clear();
-			 this.Session["v1"] = "v1";
-			 this.Session["v2"] = "v2";
-			 this.Session["v3"] = "v3";
-			 this.GHTSubTestAddResult(this.Session.Count.ToString());
-			 try
-			 {
-				 enumerator2 = this.Session.GetEnumerator();
-				 while (enumerator2.MoveNext())
-				 {
-					 text1 = (string)(enumerator2.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text1 + "\") = " + text1);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator2 is IDisposable)
-				 {
-					 ((IDisposable) enumerator2).Dispose();
-				 }
-			 }
-			 this.Session.Clear();
-			 this.GHTSubTestAddResult(this.Session.Count.ToString());
-			 try
-			 {
-				 enumerator1 = this.Session.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 text1 = (string)(enumerator1.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text1 + "\") = " + text1);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception2)
-		 {
-			 // ProjectData.SetProjectError(exception2);
-			 Exception exception1 = exception2;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx
deleted file mode 100644
index fa8db3a683d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_CodePage.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_CodePage" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_CodePage</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx.cs
deleted file mode 100644
index d7d218f8aed..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_CodePage
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.GHTSubTestAddResult(this.Session.CodePage.ToString());
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception1 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.Session.CodePage = 0x7b;
-			 this.GHTSubTestAddResult(this.Session.CodePage.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-		 }
-		 catch (ArgumentException exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 ArgumentException exception2 = exception7;
-			 this.GHTSubTestExpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception3 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Session.CodePage = -125;
-			 this.GHTSubTestAddResult(this.Session.CodePage.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-		 }
-		 catch (ArgumentException exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 ArgumentException exception4 = exception9;
-			 this.GHTSubTestExpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception5 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx
deleted file mode 100644
index 596e5b0dfda..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Contents.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Contents" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Contents</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx.cs
deleted file mode 100644
index 7255e2b76f3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_Contents
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				GHTSubTestAddResult(Session.Contents.GetType().ToString());
-				if (Equals(Session, Session.Contents))
-					GHTSubTestAddResult("Objects are equal");
-				else
-					GHTSubTestAddResult("Objects are not equal");
-                
-
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx
deleted file mode 100644
index 4fa3689309b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_CopyTo_AI.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_CopyTo_AI" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_CopyTo_AI</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx.cs
deleted file mode 100644
index 30fef21c952..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_CopyTo_AI
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				string[] textArray1 = new string[4];
-				this.Session.Clear();
-				this.Session["v1"] = "variable1";
-				this.Session["v2"] = "variable2";
-				this.Session["v3"] = "variable3";
-				this.Session["v4"] = "variable4";
-				this.Session.CopyTo(textArray1, 0);
-				int num1 = 0;
-				do
-				{
-					this.GHTSubTestAddResult(textArray1[num1]);
-					num1++;
-				}
-				while (num1 <= 3);
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception1 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				string[] textArray2 = new string[3];
-				this.Session.Clear();
-				this.Session["v1"] = "variable1";
-				this.Session["v2"] = "variable2";
-				this.Session["v3"] = "variable3";
-				this.Session["v4"] = "variable4";
-				this.Session.CopyTo(textArray2, 0);
-				int num2 = 0;
-				do
-				{
-					this.GHTSubTestAddResult(textArray2[num2]);
-					num2++;
-				}
-				while (num2 <= 3);
-				this.GHTSubTestExpectedExceptionNotCaught("IndexOutOfRangeException");
-			}
-			catch (IndexOutOfRangeException exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				IndexOutOfRangeException exception2 = exception5;
-				this.GHTSubTestExpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception3 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx
deleted file mode 100644
index fa768c58297..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Count.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Count" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Count</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx.cs
deleted file mode 100644
index 24cb4af0160..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_Count
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				Session.Clear();
-				string ttt = (string)Session["variable"];
-				GHTSubTestAddResult(Session.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest2");
-			try 
-			{
-				GHTSubTestAddResult(Session.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest3");
-			try 
-			{
-				Session["v1"] = "v1";
-				Session["v2"] = "v2";
-				Session["v3"] = "v3";
-				GHTSubTestAddResult(Session.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest4");
-			try 
-			{
-				Session.Add("v4", "v4");
-				Session.Add("v5", "v5");
-				Session.Add("v6", "v6");
-				Session.Add("v7", "v7");
-				GHTSubTestAddResult(Session.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest4");
-			try 
-			{
-				Session["v8"] = "v8";
-				Session["v9"] = "v9";
-				Session["v10"] = "v10";
-				GHTSubTestAddResult(Session.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx
deleted file mode 100644
index 73e644e045d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_GetEnumerator_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_GetEnumerator_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_GetEnumerator_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx.cs
deleted file mode 100644
index 5fb06ff4f12..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_GetEnumerator_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-
-				Session.Clear();
-
-				Session["v1"] = "value1";
-				Session["v2"] = "value2";
-				Session["v3"] = "value3";
-				Session["v4"] = "value4";
-				Session["v5"] = "value5";
-				Session["v6"] = "value6";
-				Session["v7"] = "value7";
-
-				IEnumerator items= Session.GetEnumerator();
-				string item;
-
-				while ( items.MoveNext() )
-				{
-					item = (string)items.Current;
-					GHTSubTestAddResult("Session(\"" + item + "\") = " + Session[item]);
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx
deleted file mode 100644
index 7f3faf59683..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_IsCookieless.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_IsCookieless" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_IsCookieless</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx.cs
deleted file mode 100644
index 9508390c643..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_IsCookieless
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				GHTSubTestAddResult(Session.IsCookieless.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession.aspx
deleted file mode 100644
index 40004130eb6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_IsNewSession.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_IsNewSession" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_IsNewSession</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			By pressing "<STRONG>browser refresh</STRONG>" button, session state should 
-			change from <STRONG>true</STRONG> to <STRONG>false</STRONG></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession.aspx.cs
deleted file mode 100644
index 7db7b4f38be..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_IsNewSession
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				GHTSubTestAddResult(Session.IsNewSession.ToString());
-				Session["v1"] = "v1";
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession2.aspx
deleted file mode 100644
index 05198d2ab02..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession2.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_IsNewSession2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_IsNewSession2" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_IsNewSession2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			By pressing "<STRONG>browser refresh</STRONG>" button, session state should 
-			leave <STRONG>true.<BR>
-			</STRONG>Because Session object was untouched and therefore was not saved.</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession2.aspx.cs
deleted file mode 100644
index 151eb0482b1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsNewSession2.aspx.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_IsNewSession2
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				GHTSubTestAddResult(Session.IsNewSession.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx
deleted file mode 100644
index c1148fae673..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_IsReadOnly.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_IsReadOnly" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_IsReadOnly</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx.cs
deleted file mode 100644
index 2741dda5814..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_IsReadOnly
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				GHTSubTestAddResult("Session.IsReadOnly = " + Session.IsReadOnly);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx
deleted file mode 100644
index 63afecf8c15..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_IsReadOnly2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_IsReadOnly2" EnableSessionState="readonly" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_IsReadOnly2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx.cs
deleted file mode 100644
index ce1e9b4b102..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_IsReadOnly2
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("GHTSubTest1");
-			try
-			{
-				this.GHTSubTestAddResult("Session.IsReadOnly = " + this.Session.IsReadOnly.ToString());
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("GHTSubTest2");
-			try
-			{
-				IEnumerator enumerator1 = null;
-				this.Session.Add("v_ro1", "Test String1");
-				this.Session.Add("v_ro2", "Test String2");
-				this.Session.Add("v_ro2", "Test String3");
-				try
-				{
-					enumerator1 = this.Session.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text1 = (string)(enumerator1.Current);
-						this.GHTSubTestAddResult((string)("Session(\"" + text1 + "\") = " + this.Session[text1]));
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx
deleted file mode 100644
index 1bcb40eb575..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Item.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Item" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Item</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx.cs
deleted file mode 100644
index 8585f0fe9e5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Item
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.Session.Clear();
-			 this.GHTSubTestAddResult((string)(this.Session["variable1"]));
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception1 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.Session["variable1"] = "var1";
-			 this.GHTSubTestAddResult((string)(this.Session["variable1"]));
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception2 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.Session["variable1"] = "changed var1";
-			 this.GHTSubTestAddResult((string)(this.Session["variable1"]));
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception3 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Session["variable1"] = null;
-			 this.GHTSubTestAddResult((string)(this.Session["variable1"]));
-		 }
-		 catch (Exception exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 Exception exception4 = exception9;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest5");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)(this.Session[0]));
-			 this.GHTSubTestAddResult(this.Session.Count.ToString());
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception5 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx
deleted file mode 100644
index 4af31c46adc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Item_I.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Item_I" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Item_I</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx.cs
deleted file mode 100644
index 9ba7d276efd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Item_I
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.Session.Clear();
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.Session["var1"] = "variable1";
-			 this.GHTSubTestAddResult((string)(this.Session[0]));
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception1 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)(this.Session[0]));
-		 }
-		 catch (Exception exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 Exception exception2 = exception11;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.Session[0] = "changed variable1";
-			 this.GHTSubTestAddResult((string)(this.Session[0]));
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception3 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)(this.Session[0x7d]));
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception13)
-		 {
-			 // ProjectData.SetProjectError(exception13);
-			 ArgumentOutOfRangeException exception4 = exception13;
-			 this.GHTSubTestExpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception14)
-		 {
-			 // ProjectData.SetProjectError(exception14);
-			 Exception exception5 = exception14;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest5");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)(this.Session[-1]));
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception15)
-		 {
-			 // ProjectData.SetProjectError(exception15);
-			 ArgumentOutOfRangeException exception6 = exception15;
-			 this.GHTSubTestExpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception16)
-		 {
-			 // ProjectData.SetProjectError(exception16);
-			 Exception exception7 = exception16;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception7);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest6");
-		 try
-		 {
-			 this.Session[0] = null;
-			 this.GHTSubTestAddResult((string)(this.Session[0]));
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception17)
-		 {
-			 // ProjectData.SetProjectError(exception17);
-			 ArgumentOutOfRangeException exception8 = exception17;
-			 this.GHTSubTestExpectedExceptionCaught(exception8);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception18)
-		 {
-			 // ProjectData.SetProjectError(exception18);
-			 Exception exception9 = exception18;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception9);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx
deleted file mode 100644
index 2b682f5fc8e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Item_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Item_S" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Item_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx.cs
deleted file mode 100644
index 2dd0709387b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Item_S
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.GHTSubTestAddResult((string)(this.Session["var1"]));
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.Session["var1"] = "variable1";
-			 this.GHTSubTestAddResult((string)(this.Session["var1"]));
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.Session["var1"] = "changed variable1";
-			 this.GHTSubTestAddResult((string)(this.Session["var1"]));
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Session["var1"] = null;
-			 this.GHTSubTestAddResult((string)(this.Session["var1"]));
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx
deleted file mode 100644
index 55b5e55ed0b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Keys.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Keys" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Keys</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx.cs
deleted file mode 100644
index b8138846855..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{
-	public class HttpSessionState_Keys : GHTBaseWeb 
-	{
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				Session.Clear();
-
-				Session["v1"] = "value1";
-				Session["v2"] = "value2";
-				Session["v3"] = "value3";
-
-				IEnumerator enumerator1 = this.Session.Keys.GetEnumerator();
-				while (enumerator1.MoveNext())
-				{
-					string text1 = (string)(enumerator1.Current);
-					this.GHTSubTestAddResult((string)("Session(\"" + text1 + "\") = " + this.Session[text1]));
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx
deleted file mode 100644
index dd0eec239b0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_LCID.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_LCID" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_LCID</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx.cs
deleted file mode 100644
index 7cef070a999..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_LCID
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.GHTSubTestAddResult(this.Session.LCID.ToString());
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception1 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.Session.LCID = 0x7b;
-			 this.GHTSubTestAddResult(this.Session.LCID.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-		 }
-		 catch (ArgumentException exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 ArgumentException exception2 = exception9;
-			 this.GHTSubTestExpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception3 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.Session.LCID = 0;
-			 this.GHTSubTestAddResult(this.Session.LCID.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-		 }
-		 catch (ArgumentException exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 ArgumentException exception4 = exception11;
-			 this.GHTSubTestExpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception5 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Session.LCID = -125;
-			 this.GHTSubTestAddResult(this.Session.LCID.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception13)
-		 {
-			 // ProjectData.SetProjectError(exception13);
-			 ArgumentOutOfRangeException exception6 = exception13;
-			 this.GHTSubTestExpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception14)
-		 {
-			 // ProjectData.SetProjectError(exception14);
-			 Exception exception7 = exception14;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception7);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx
deleted file mode 100644
index 7ec412e32fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_RemoveAll_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_RemoveAll_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_RemoveAll_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx.cs
deleted file mode 100644
index 3498e31c0dc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_RemoveAll_
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 IEnumerator enumerator1 = null;
-			 this.Session.Clear();
-			 this.Session["var1"] = "var1";
-			 this.Session["var2"] = "var2";
-			 this.Session["var3"] = "var3";
-			 this.Session.RemoveAll();
-			 try
-			 {
-				 enumerator1 = this.Session.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 string text1 = (string)(enumerator1.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text1 + "\") = " + text1);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception2)
-		 {
-			 // ProjectData.SetProjectError(exception2);
-			 Exception exception1 = exception2;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx
deleted file mode 100644
index 80f0d881b95..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_RemoveAt_I.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_RemoveAt_I" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_RemoveAt_I</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx.cs
deleted file mode 100644
index 209dbd20338..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_RemoveAt_I
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 IEnumerator enumerator4 = null;
-			 this.Session.Clear();
-			 this.Session["var1"] = "var1";
-			 this.Session["var2"] = "var2";
-			 this.Session["var3"] = "var3";
-			 this.Session.RemoveAt(1);
-			 try
-			 {
-				 enumerator4 = this.Session.GetEnumerator();
-				 while (enumerator4.MoveNext())
-				 {
-					 string text1 = (string)(enumerator4.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text1 + "\") = " + text1);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator4 is IDisposable)
-				 {
-					 ((IDisposable) enumerator4).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception1 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 IEnumerator enumerator3 = null;
-			 this.Session.Clear();
-			 this.Session.Add("var1", "var1");
-			 this.Session.Add("var2", "var2");
-			 this.Session.Add("var3", "var3");
-			 this.Session.RemoveAt(1);
-			 try
-			 {
-				 enumerator3 = this.Session.GetEnumerator();
-				 while (enumerator3.MoveNext())
-				 {
-					 string text2 = (string)(enumerator3.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text2 + "\") = " + text2);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator3 is IDisposable)
-				 {
-					 ((IDisposable) enumerator3).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception2 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 IEnumerator enumerator2 = null;
-			 this.Session.Clear();
-			 this.Session.Add("var1", "var1");
-			 this.Session.Add("var2", "var2");
-			 this.Session.Add("var3", "var3");
-			 this.Session.RemoveAt(0x7d);
-			 try
-			 {
-				 enumerator2 = this.Session.GetEnumerator();
-				 while (enumerator2.MoveNext())
-				 {
-					 string text3 = (string)(enumerator2.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text3 + "\") = " + text3);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator2 is IDisposable)
-				 {
-					 ((IDisposable) enumerator2).Dispose();
-				 }
-			 }
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 ArgumentOutOfRangeException exception3 = exception9;
-			 this.GHTSubTestExpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception4 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 IEnumerator enumerator1 = null;
-			 this.Session.Clear();
-			 this.Session.Add("var1", "var1");
-			 this.Session.Add("var2", "var2");
-			 this.Session.Add("var3", "var3");
-			 this.Session.RemoveAt(-125);
-			 try
-			 {
-				 enumerator1 = this.Session.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 string text4 = (string)(enumerator1.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text4 + "\") = " + text4);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 ArgumentOutOfRangeException exception5 = exception11;
-			 this.GHTSubTestExpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception6 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx
deleted file mode 100644
index 28f0e05fb31..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Remove_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Remove_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Remove_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx.cs
deleted file mode 100644
index 756c09bea4b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Remove_S
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 IEnumerator enumerator3 = null;
-			 this.Session.Clear();
-			 this.Session["var1"] = "var1";
-			 this.Session["var2"] = "var2";
-			 this.Session["var3"] = "var3";
-			 this.Session.Remove("var2");
-			 try
-			 {
-				 enumerator3 = this.Session.GetEnumerator();
-				 while (enumerator3.MoveNext())
-				 {
-					 string text1 = (string)(enumerator3.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text1 + "\") = " + text1);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator3 is IDisposable)
-				 {
-					 ((IDisposable) enumerator3).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception4)
-		 {
-			 // ProjectData.SetProjectError(exception4);
-			 Exception exception1 = exception4;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 IEnumerator enumerator2 = null;
-			 this.Session.Clear();
-			 this.Session.Add("var1", "var1");
-			 this.Session.Add("var2", "var2");
-			 this.Session.Add("var3", "var3");
-			 this.Session.Remove("var2");
-			 try
-			 {
-				 enumerator2 = this.Session.GetEnumerator();
-				 while (enumerator2.MoveNext())
-				 {
-					 string text2 = (string)(enumerator2.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text2 + "\") = " + text2);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator2 is IDisposable)
-				 {
-					 ((IDisposable) enumerator2).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception2 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 IEnumerator enumerator1 = null;
-		 try
-		 {
-			 this.Session.Clear();
-			 this.Session.Add("var1", "var1");
-			 this.Session.Add("var2", "var2");
-			 this.Session.Add("var3", "var3");
-			 this.Session.Remove("notexist");
-			 try
-			 {
-				 enumerator1 = this.Session.GetEnumerator();
-				 while (enumerator1.MoveNext())
-				 {
-					 string text3 = (string)(enumerator1.Current);
-					 this.GHTSubTestAddResult("Session(\"" + text3 + "\") = " + text3);
-				 }
-			 }
-			 finally
-			 {
-				 if (enumerator1 is IDisposable)
-				 {
-					 ((IDisposable) enumerator1).Dispose();
-				 }
-			 }
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception3 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx
deleted file mode 100644
index d494eb5e9af..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_SessionID.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_SessionID" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_SessionID</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx.cs
deleted file mode 100644
index d0c8196f452..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_SessionID
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.GHTSubTestAddResult(this.Session.SessionID.GetType().ToString());
-			 if (this.Session.SessionID.Length > 0)
-			 {
-				 this.GHTSubTestAddResult("length is > 0");
-			 }
-			 else
-			 {
-				 this.GHTSubTestAddResult("length is =< 0");
-			 }
-		 }
-		 catch (Exception exception2)
-		 {
-			 // ProjectData.SetProjectError(exception2);
-			 Exception exception1 = exception2;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx
deleted file mode 100644
index 197db1a9ca0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HttpSessionState_Timeout.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_SessionState.HttpSessionState_Timeout" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HttpSessionState_Timeout</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx.cs
deleted file mode 100644
index a59d4cffc39..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_SessionState
-{public class HttpSessionState_Timeout
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 this.GHTSubTestBegin("GHTSubTest1");
-		 try
-		 {
-			 this.GHTSubTestAddResult(this.Session.Timeout.ToString().Length.ToString());
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception1 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest2");
-		 try
-		 {
-			 this.Session.Timeout = 2;
-			 this.GHTSubTestAddResult(this.Session.Timeout.ToString());
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception2 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest3");
-		 try
-		 {
-			 this.Session.Timeout = 0;
-			 this.GHTSubTestAddResult(this.Session.Timeout.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-		 }
-		 catch (ArgumentException exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 ArgumentException exception3 = exception9;
-			 this.GHTSubTestExpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception4 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTSubTestBegin("GHTSubTest4");
-		 try
-		 {
-			 this.Session.Timeout = -1;
-			 this.GHTSubTestAddResult(this.Session.Timeout.ToString());
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-		 }
-		 catch (ArgumentException exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 ArgumentException exception5 = exception11;
-			 this.GHTSubTestExpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception6 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ClientID.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ClientID.aspx
deleted file mode 100644
index 43edcfc885e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ClientID.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_ClientID.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_ClientID" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_ClientID</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ClientID.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ClientID.aspx.cs
deleted file mode 100644
index f7ec0ef2f90..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ClientID.aspx.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_ClientID
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-
-			//ClientId - server generated.
-			//Because the id is random, then it cannot be compared between two servers,
-			//There for I only test that a value is automatically set, and does
-			//not add the control to the subtest.
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "ClientId - server generated", false);
-				this.GHTAddToActiveForm(this.TestedControl);
-				if (this.TestedControl.ClientID != string.Empty)
-				{
-					this.GHTSubTestAddResult("Passed, ClientID is set by the server.");
-				}
-				else
-				{
-					this.GHTSubTestAddResult("Failed, ClientID is not set by the server.");
-				}
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception1 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-
-			//ClientId - Id property set to String.empty
-			//As in previous subtest, the ClientID is a random number, and cannot be compared,
-			//There for I only test that the value is not string.empty, 
-			//and does not add the control to the subtest.
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "ClientId - Id property set to String.empty", false);
-				this.GHTAddToActiveForm(this.TestedControl);
-				this.TestedControl.ID = string.Empty;
-				if (this.TestedControl.ClientID != string.Empty)
-				{
-					this.GHTSubTestAddResult("Passed, ClientID is set by the server.");
-				}
-				else
-				{
-					this.GHTSubTestAddResult("Failed, ClientID is not set by the server.");
-				}
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception2 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-
-
-			//ClientId - overriden by Id property:
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "ClientId - overriden by Id property");
-				this.TestedControl.ID = ctrlType.ToString() + "_Id";
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception3 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Dispose_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Dispose_.aspx
deleted file mode 100644
index b8248d7b3d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Dispose_.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_Dispose_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_Dispose_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_Dispose_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server"></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Dispose_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Dispose_.aspx.cs
deleted file mode 100644
index 0219c36c3b3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Dispose_.aspx.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Dispose_
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Dispose.");
-				this.TestedControl.Dispose();
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_FindControl_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_FindControl_S.aspx
deleted file mode 100644
index 3370ac4b395..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_FindControl_S.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_FindControl_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_FindControl_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_FindControl_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-				<asp:Label id="Label1" runat="server">Label</asp:Label>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_FindControl_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_FindControl_S.aspx.cs
deleted file mode 100644
index 5c15e2568ec..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_FindControl_S.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_FindControl_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Label Label1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			//Testing empty parameter
-
-			GHTSubTestBegin("find control - Testing empty parameter");
-			try 
-			{
-				FindControl("");
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ID.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ID.aspx
deleted file mode 100644
index 98acf1ed39c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ID.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_ID.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_ID" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_ID</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:Label id="Label1" runat="server">Label</asp:Label>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ID.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ID.aspx.cs
deleted file mode 100644
index 218a5c30ca1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ID.aspx.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_ID
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			Type[] typeArray1 = TypesToTest;
-			for (int num1 = 0; num1 < typeArray1.Length; num1++)
-			{
-				Type type1 = typeArray1[num1];
-				this.GHTHeader(type1.ToString());
-				try
-				{
-					this.GHTSubTestBegin(type1, "Id - valid string");
-					this.TestedControl.ID = type1.ToString() + " - valid id";
-				}
-				catch (Exception exception3)
-				{
-					// ProjectData.SetProjectError(exception3);
-					Exception exception1 = exception3;
-					this.GHTSubTestUnexpectedExceptionCaught(exception1);
-					// ProjectData.ClearProjectError();
-				}
-				this.GHTSubTestEnd();
-			}
-			this.GHTSubTestBegin("adding several controls with same ID");
-			try
-			{
-				Label label1 = new Label();
-				label1.ID = "Label1";
-				base.GHTActiveSubTest.Controls.Add(label1);
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Init.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Init.aspx
deleted file mode 100644
index f0250ed179a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Init.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_Init.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_Init" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>Control_Init</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-    <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>   
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px"></cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Init.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Init.aspx.cs
deleted file mode 100644
index 01c1baa1d65..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Init.aspx.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Init
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) this.FindControl("form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("New Inherits TextBox");
-			try
-			{
-				MyTextBox1 box1 = new MyTextBox1();
-				box1.ID = "MyTextBox1";
-				base.GHTActiveSubTest.Controls.Add(box1);
-				this.GHTSubTestAddResult(box1.ID);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-		public class MyTextBox1 : TextBox
-		{
-			public MyTextBox1()
-			{
-			}
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load.aspx
deleted file mode 100644
index 7a27ac46bfd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_Load.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_Load" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_Load</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="704px">
-				<asp:Label id="Label1" runat="server">Page_Load event was not raised</asp:Label>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load.aspx.cs
deleted file mode 100644
index 01c0d62154a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load.aspx.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Load
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Label Label1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			Label1.Text = "Page_Load Event was raised";
-
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx
deleted file mode 100644
index db2b6835fda..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_Load_wo_CodeBehind</title>
-		<script language="c#" runat="server">
-		private void Page_Load(object sender, System.EventArgs e)
-		{
-			Label1.Text = "Page_Load Event was raised";
-		}
-		</script>
-		<meta content="Microsoft Visual Studio .NET 7.NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px">
-				<asp:Label id="Label1" runat="server">Page_Load event was not raised</asp:Label>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx.cs
deleted file mode 100644
index ea841fabf48..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Load_wo_CodeBehind
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Label Label1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("Request.PhysicalPath1");
-			try 
-			{
-				GHTSubTestAddResult(Request.PhysicalPath);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_NamingContainer.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_NamingContainer.aspx
deleted file mode 100644
index 35b61382a31..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_NamingContainer.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_NamingContainer.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_NamingContainer" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_NamingContainer</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/nav4-0" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_NamingContainer.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_NamingContainer.aspx.cs
deleted file mode 100644
index 0267daffb98..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_NamingContainer.aspx.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_NamingContainer
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			this.ID = "Control_NamingContainer";
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default naming container");
-				this.GHTSubTestAddResult(this.TestedControl.NamingContainer.ID);
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Custom naming container", false);
-				TestNamingContainer container1 = new TestNamingContainer();
-				container1.ID = ctrlType.ToString() + "custom_test_naming_container";
-				container1.Controls.Add(this.TestedControl);
-				this.HandleValidationControls(this.TestedControl);
-				base.GHTActiveForm.Controls.Add(container1);
-				this.GHTSubTestAddResult("NamingContainer.UniqueID: " + this.TestedControl.NamingContainer.UniqueID);
-				this.GHTSubTestAddResult("NamingContainer.Type: " + this.TestedControl.NamingContainer.GetType().ToString());
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-
-		public override string ToString()
-		{
-			return "Control_NamingContainer";
-		}
-
-	}
-
-	public class TestNamingContainer : System.Web.UI.Control, INamingContainer
-	{
-		public TestNamingContainer()
-		{
-			TextBox m_tbToValidate = new TextBox();
-			m_tbToValidate.ID = "m_tbToValidate";
-			this.Controls.Add(m_tbToValidate);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Page.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Page.aspx
deleted file mode 100644
index 66f5deb9575..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Page.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_Page.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_Page" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_Page</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Page.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Page.aspx.cs
deleted file mode 100644
index 3dd2b634d90..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Page.aspx.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Page
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "");
-				Compare(TestedControl.Page, this);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Parent.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Parent.aspx
deleted file mode 100644
index 933b0fd5458..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Parent.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_Parent.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_Parent" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_Parent</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Parent.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Parent.aspx.cs
deleted file mode 100644
index 42f87653119..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Parent.aspx.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Parent
-		: GHTControlBase
-	{
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-
-			this.ID = "Control_Parent";
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Basic functionality");
-				this.GHTSubTestAddResult(this.TestedControl.Parent.ID);
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception1 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("No parent set");
-				Control control1 = (Control) this.GHTElementClone(ctrlType);
-				this.GHTSubTestAddResult(control1.Parent.ToString());
-				this.GHTSubTestExpectedExceptionNotCaught("NullReferenceException");
-			}
-			catch (NullReferenceException exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				NullReferenceException exception2 = exception5;
-				this.GHTSubTestExpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception3 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_RenderControl_H.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_RenderControl_H.aspx
deleted file mode 100644
index 054bb10bc4e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_RenderControl_H.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_RenderControl_H.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_RenderControl_H" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_RenderControl_H</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_RenderControl_H.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_RenderControl_H.aspx.cs
deleted file mode 100644
index 0dbd81c05e1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_RenderControl_H.aspx.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Text;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_RenderControl_H
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void RenderControlTest(System.Web.UI.Control toTest)
-		{
-			StringBuilder sb = new StringBuilder();
-			StringWriter sw = new StringWriter(sb);
-			System.Web.UI.HtmlTextWriter htw = new System.Web.UI.HtmlTextWriter(sw);
-			toTest.RenderControl(htw);
-			GHTSubTestAddResult(sb.ToString(), true);
-		}
-
-		private void Test(Type ctrlType)
-		{
-			// Validation summery is excluded from the test because it throws an exception in the RenderControl method.
-			if (ctrlType.Equals(typeof(ValidationSummary)))
-				return;
-            
-
-			// visible = true:
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "visible = true:", false);
-				TestedControl.ID = ctrlType.ToString() + "_visible = true";
-				TestedControl.Visible = true;
-				RenderControlTest(TestedControl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// visible = false:
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "visible = false:", false);
-				TestedControl.ID = ctrlType.ToString() + "_visible = false";
-				TestedControl.Visible = false;
-				RenderControlTest(TestedControl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ResolveUrl_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ResolveUrl_S.aspx
deleted file mode 100644
index 1180a6bf83c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ResolveUrl_S.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_ResolveUrl_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_ResolveUrl_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_ResolveUrl_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ResolveUrl_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ResolveUrl_S.aspx.cs
deleted file mode 100644
index 136f65b9b55..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ResolveUrl_S.aspx.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_ResolveUrl_S
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			// Absolute url with protocol.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Absolute url with protocol:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("http://localhost/GHTTests/"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Absolute url without protocol.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Absolute url without protocol:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("/GHTTests/"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Relative url.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Relative url:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("aa/bb"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Relative url with a leading ../.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Relative url with a leading ../:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("../aa/bb"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Relative url only  ../.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Relative url only  ../:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("../"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Relative url higher then root.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Relative url higher then root:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("../../../../../"));
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// A url  that uses \.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "A url  that uses \\:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("aa\\bb\\cc"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// A file path
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "A file path:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("c:\\GHTests\\file.vb"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Empty string
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Empty string:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl(String.Empty));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// 'A url that contains invalid charachters.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "A url that contains invalid charachters:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.ResolveUrl("~!@#$%^&*()_+-=[]\\{}|;':,./<>?"));
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-		}
-
-		private void AddToForm(System.Web.UI.Control a_toAdd)
-		{
-			if (a_toAdd.Parent == null)
-				GHTActiveForm.Controls.Add(a_toAdd);
-			else
-				AddToForm(a_toAdd.Parent);
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx
deleted file mode 100644
index 93c165c7a37..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_TemplateSourceDirectory.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_TemplateSourceDirectory" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_TemplateSourceDirectory</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx.cs
deleted file mode 100644
index 92e969c6155..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_TemplateSourceDirectory
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			// Default value.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Default value:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.TemplateSourceDirectory.ToLower());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-		}
-
-		private void AddToForm(System.Web.UI.Control a_toAdd)
-		{
-			if (a_toAdd.Parent == null)
-				GHTActiveForm.Controls.Add(a_toAdd);
-			else
-				AddToForm(a_toAdd.Parent);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_UniqueID.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_UniqueID.aspx
deleted file mode 100644
index 6917155165d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_UniqueID.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_UniqueID.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_UniqueID" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_UniqueID</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_UniqueID.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_UniqueID.aspx.cs
deleted file mode 100644
index 2c630b2aef6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_UniqueID.aspx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_UniqueID
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-	 
-
-		private void Test(Type ctrlType)
-		{
-			// Default value.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Default value:", false);
-				AddToForm(TestedControl);
-				GHTSubTestAddResult(TestedControl.UniqueID);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-		}
-		private void AddToForm(System.Web.UI.Control a_toAdd)
-		{
-			if (a_toAdd.Parent == null)
-				GHTActiveForm.Controls.Add(a_toAdd);
-			else
-				AddToForm(a_toAdd.Parent);
-		}
-     
-	}
-}
-
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ViewState.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ViewState.aspx
deleted file mode 100644
index 9eeed8a951c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ViewState.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_ViewState.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_ViewState" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_ViewState</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-		  theform.submit();
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<!-- Button is used for Test Post Back -->
-			<asp:Button id="Button1" runat="server" Text="PostBack" BorderStyle="Groove"></asp:Button>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ViewState.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ViewState.aspx.cs
deleted file mode 100644
index 7ada203d66b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_ViewState.aspx.cs
+++ /dev/null
@@ -1,1365 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-using System.Reflection;
-using System.Collections;
-using System.Data;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_ViewState
-		: GHTControlBase
-	{
-		protected System.Web.UI.WebControls.Button Button1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		// =======================
-		// Dynamic Control.ID
-		// =======================
-		// In order to catch these values the dynamically generated controls 
-		// needs to be re-generated at Page_Load. 
-		// The important thing is to assign the same ID to each control. 
-		// The ViewState uses the ID property of the Control objects to reinstate the values. 
-		//
-		// =======================
-		// Page.IsPostBack
-		// =======================
-		// We set the contrro//s tested member with a value 
-		// only at the first time the page is loaded
-		//
-		//
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("Check PostBack");
-			try
-			{
-				if (this.Page.IsPostBack)
-				{
-					this.GHTSubTestAddResult("PostBack Worked!!!");
-				}
-			}
-			catch (Exception exception49)
-			{
-				// ProjectData.SetProjectError(exception49);
-				Exception exception1 = exception49;
-				this.GHTSubTestAddResult("Unxpected " + exception1.GetType().Name + " exception was caught-" + exception1.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("AdRotator.KeywordFilter,Target");
-			try
-			{
-				AdRotator rotator1 = new AdRotator();
-				rotator1.ID = "objAdRotatorAll";
-				base.GHTActiveForm.Controls.Add(rotator1);
-				if (!this.Page.IsPostBack)
-				{
-					rotator1.KeywordFilter = "test";
-					rotator1.Target = "_blank";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(rotator1.KeywordFilter);
-					this.GHTSubTestAddResult(rotator1.Target);
-				}
-			}
-			catch (Exception exception50)
-			{
-				// ProjectData.SetProjectError(exception50);
-				Exception exception2 = exception50;
-				this.GHTSubTestAddResult("Unxpected " + exception2.GetType().Name + " exception was caught-" + exception2.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			Label label1 = new Label();
-			this.GHTSubTestBegin("Style.BorderColor,BorderWidth,BorderStyle,CssClass,ForeColor,Height,Width,BackColor");
-			try
-			{
-				label1.ID = "objStyleLabelAll";
-				base.GHTActiveForm.Controls.Add(label1);
-				if (!this.Page.IsPostBack)
-				{
-					label1.Style["BorderColor"] = "ffffff";
-					label1.Style["ForeColor"] = "ffffff";
-					label1.Style["BackColor"] = "ffffff";
-					label1.Style["BorderWidth"] = "2";
-					label1.Style["BorderStyle"] = "3";
-					label1.Style["CssClass"] = "CssClass";
-					label1.Style["Height"] = "2";
-					label1.Style["Width"] = "2";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(label1.Style["BorderColor"]);
-					this.GHTSubTestAddResult(label1.Style["ForeColor"]);
-					this.GHTSubTestAddResult(label1.Style["BackColor"]);
-					this.GHTSubTestAddResult(label1.Style["BorderWidth"]);
-					this.GHTSubTestAddResult(label1.Style["BorderStyle"]);
-					this.GHTSubTestAddResult(label1.Style["CssClass"]);
-					this.GHTSubTestAddResult(label1.Style["Height"]);
-					this.GHTSubTestAddResult(label1.Style["Width"]);
-				}
-			}
-			catch (Exception exception51)
-			{
-				// ProjectData.SetProjectError(exception51);
-				Exception exception3 = exception51;
-				this.GHTSubTestAddResult("Unxpected " + exception3.GetType().Name + " exception was caught-" + exception3.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("FontInfo.Underline,Italic,Names,Overline,Size,Strikeout,Bold");
-			try
-			{
-				if (!this.Page.IsPostBack)
-				{
-					label1.Font.Underline = true;
-					label1.Font.Italic = true;
-					label1.Font.Names.SetValue("myfont", 1);
-					label1.Font.Overline = true;
-					label1.Font.Size = FontUnit.Medium;
-					label1.Font.Strikeout = true;
-					label1.Font.Bold = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(label1.Font.Underline.ToString());
-					this.GHTSubTestAddResult(label1.Font.Italic.ToString());
-					this.GHTSubTestAddResult((string)(label1.Font.Names.GetValue(1)));
-					this.GHTSubTestAddResult(label1.Font.Overline.ToString());
-					this.GHTSubTestAddResult(label1.Font.Size.ToString());
-					this.GHTSubTestAddResult(label1.Font.Strikeout.ToString());
-					this.GHTSubTestAddResult(label1.Font.Bold.ToString());
-				}
-			}
-			catch (Exception exception52)
-			{
-				// ProjectData.SetProjectError(exception52);
-				Exception exception4 = exception52;
-				this.GHTSubTestAddResult("Unxpected " + exception4.GetType().Name + " exception was caught-" + exception4.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Control.Visible");
-			try
-			{
-				Button button1 = new Button();
-				button1.ID = "objControlAll";
-				base.GHTActiveForm.Controls.Add(button1);
-				if (!this.Page.IsPostBack)
-				{
-					button1.Visible = false;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button1.Visible.ToString());
-				}
-			}
-			catch (Exception exception53)
-			{
-				// ProjectData.SetProjectError(exception53);
-				Exception exception5 = exception53;
-				this.GHTSubTestAddResult("Unxpected " + exception5.GetType().Name + " exception was caught-" + exception5.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("WebControl.AccessKey,Enabled,TabIndex,ToolTip");
-			try
-			{
-				Button button2 = new Button();
-				button2.ID = "objWebControlAll";
-				base.GHTActiveForm.Controls.Add(button2);
-				if (!this.Page.IsPostBack)
-				{
-					button2.AccessKey = "F";
-					button2.Enabled = false;
-					button2.TabIndex = 100;
-					button2.ToolTip = "ToolTip";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button2.AccessKey);
-					this.GHTSubTestAddResult(button2.Enabled.ToString());
-					this.GHTSubTestAddResult(button2.TabIndex.ToString());
-					this.GHTSubTestAddResult(button2.ToolTip);
-				}
-			}
-			catch (Exception exception54)
-			{
-				// ProjectData.SetProjectError(exception54);
-				Exception exception6 = exception54;
-				this.GHTSubTestAddResult("Unxpected " + exception6.GetType().Name + " exception was caught-" + exception6.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Button.CausesValidation,CommandArgument,CommandName,Text");
-			try
-			{
-				Button button3 = new Button();
-				button3.ID = "objButtonAll";
-				base.GHTActiveForm.Controls.Add(button3);
-				if (!this.Page.IsPostBack)
-				{
-					button3.CausesValidation = true;
-					button3.CommandArgument = "test";
-					button3.CommandName = "test";
-					button3.Text = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button3.CausesValidation.ToString());
-					this.GHTSubTestAddResult(button3.CommandArgument);
-					this.GHTSubTestAddResult(button3.CommandName);
-					this.GHTSubTestAddResult(button3.Text);
-				}
-			}
-			catch (Exception exception55)
-			{
-				// ProjectData.SetProjectError(exception55);
-				Exception exception7 = exception55;
-				this.GHTSubTestAddResult("Unxpected " + exception7.GetType().Name + " exception was caught-" + exception7.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			DataGrid grid1 = new DataGrid();
-			grid1.ID = "objDataGrid";
-			grid1.AutoGenerateColumns = false;
-			BoundColumn column1 = new BoundColumn();
-			column1.HeaderText = "IntegerValue";
-			column1.DataField = "IntegerValue";
-			grid1.Columns.Add(column1);
-			column1 = new BoundColumn();
-			column1.HeaderText = "StringValue";
-			column1.DataField = "StringValue";
-			grid1.Columns.Add(column1);
-			column1 = new BoundColumn();
-			column1.HeaderText = "CurrencyValue";
-			column1.DataField = "CurrencyValue";
-			grid1.Columns.Add(column1);
-			HyperLinkColumn column4 = new HyperLinkColumn();
-			column4.HeaderText = "objHyperLinkColumn";
-			grid1.Columns.Add(column4);
-			ButtonColumn column2 = new ButtonColumn();
-			column2.HeaderText = "ButtonColumn";
-			grid1.Columns.Add(column2);
-			EditCommandColumn column3 = new EditCommandColumn();
-			column3.HeaderText = "EditCommandColumn";
-			grid1.Columns.Add(column3);
-			grid1.DataSource = this.CreateDataSource();
-			grid1.DataBind();
-			base.GHTActiveForm.Controls.Add(grid1);
-			this.GHTSubTestBegin("BoundColumn.All");
-			try
-			{
-				column1 = (BoundColumn) grid1.Columns[2];
-				if (!this.Page.IsPostBack)
-				{
-					column1.DataFormatString = "{0:C}";
-					column1.ReadOnly = true;
-					column1.DataField = "IntegerValue";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(column1.DataFormatString);
-					this.GHTSubTestAddResult(column1.ReadOnly.ToString());
-					this.GHTSubTestAddResult(column1.DataField);
-				}
-			}
-			catch (Exception exception56)
-			{
-				// ProjectData.SetProjectError(exception56);
-				Exception exception8 = exception56;
-				this.GHTSubTestAddResult("Unxpected " + exception8.GetType().Name + " exception was caught-" + exception8.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HyperLinkColumn.All");
-			try
-			{
-				if (!this.Page.IsPostBack)
-				{
-					column4.Text = "test";
-					column4.DataNavigateUrlFormatString = "test.aspx?id={0}";
-					column4.Target = "_blank";
-					column4.NavigateUrl = "test";
-					column4.DataTextField = "StringValue";
-					column4.DataNavigateUrlField = "StringValue";
-					column4.DataTextFormatString = "{0:C}";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(column4.Text);
-					this.GHTSubTestAddResult(column4.DataNavigateUrlFormatString);
-					this.GHTSubTestAddResult(column4.Target);
-					this.GHTSubTestAddResult(column4.NavigateUrl);
-					this.GHTSubTestAddResult(column4.DataTextField);
-					this.GHTSubTestAddResult(column4.DataNavigateUrlField);
-					this.GHTSubTestAddResult(column4.DataTextFormatString);
-				}
-			}
-			catch (Exception exception57)
-			{
-				// ProjectData.SetProjectError(exception57);
-				Exception exception9 = exception57;
-				this.GHTSubTestAddResult("Unxpected " + exception9.GetType().Name + " exception was caught-" + exception9.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("ButtonColumn.All");
-			try
-			{
-				column2 = (ButtonColumn) grid1.Columns[4];
-				if (!this.Page.IsPostBack)
-				{
-					column2.DataTextField = "StringValue";
-					//column2.ButtonType = (ButtonColumnType) "test";
-					column2.DataTextFormatString = "{0:C}";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(column2.DataTextField);
-					this.GHTSubTestAddResult(((int) column2.ButtonType).ToString());
-					this.GHTSubTestAddResult(column2.DataTextFormatString);
-				}
-			}
-			catch (Exception exception58)
-			{
-				// ProjectData.SetProjectError(exception58);
-				Exception exception10 = exception58;
-				this.GHTSubTestAddResult("Unxpected " + exception10.GetType().Name + " exception was caught-" + exception10.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("EditCommandColumn.All");
-			try
-			{
-				column3 = (EditCommandColumn) grid1.Columns[5];
-				if (!this.Page.IsPostBack)
-				{
-					column3.UpdateText = "test";
-					column3.CancelText = "test";
-					column3.EditText = "test";
-					column3.ButtonType = ButtonColumnType.PushButton;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(column3.UpdateText);
-					this.GHTSubTestAddResult(column3.CancelText);
-					this.GHTSubTestAddResult(column3.EditText);
-					this.GHTSubTestAddResult(((int) column3.ButtonType).ToString());
-				}
-			}
-			catch (Exception exception59)
-			{
-				// ProjectData.SetProjectError(exception59);
-				Exception exception11 = exception59;
-				this.GHTSubTestAddResult("Unxpected " + exception11.GetType().Name + " exception was caught-" + exception11.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Calendar.All");
-			try
-			{
-				Calendar calendar1 = new Calendar();
-				calendar1.ID = "objCalendarAll";
-				base.GHTActiveForm.Controls.Add(calendar1);
-				if (!this.Page.IsPostBack)
-				{
-					calendar1.ShowDayHeader = true;
-					calendar1.FirstDayOfWeek = FirstDayOfWeek.Tuesday;
-					calendar1.SelectWeekText = "SelectWeekText";
-					calendar1.CellSpacing = 4;
-					calendar1.CellPadding = 6;
-					calendar1.SelectMonthText = "SelectMonthText";
-					calendar1.VisibleDate = DateTime.Now;
-					calendar1.DayNameFormat = DayNameFormat.FirstTwoLetters;
-					calendar1.ShowGridLines = true;
-					calendar1.TodaysDate = DateTime.Now.AddDays(1);
-					calendar1.ShowNextPrevMonth = true;
-					calendar1.ShowTitle = true;
-					calendar1.TitleFormat = TitleFormat.MonthYear;
-					calendar1.NextMonthText = "NextMonthText";
-					calendar1.NextPrevFormat = NextPrevFormat.FullMonth;
-					calendar1.PrevMonthText = "PrevMonthText";
-					calendar1.SelectionMode = CalendarSelectionMode.DayWeekMonth;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(calendar1.ShowDayHeader.ToString());
-					this.GHTSubTestAddResult(((int) calendar1.FirstDayOfWeek).ToString());
-					this.GHTSubTestAddResult(calendar1.SelectWeekText);
-					this.GHTSubTestAddResult(calendar1.CellSpacing.ToString());
-					this.GHTSubTestAddResult(calendar1.CellPadding.ToString());
-					this.GHTSubTestAddResult(calendar1.SelectMonthText);
-					this.GHTSubTestAddResult(calendar1.VisibleDate.ToString());
-					this.GHTSubTestAddResult(((int) calendar1.DayNameFormat).ToString());
-					this.GHTSubTestAddResult(calendar1.ShowGridLines.ToString());
-					this.GHTSubTestAddResult(calendar1.TodaysDate.ToString());
-					this.GHTSubTestAddResult(calendar1.ShowNextPrevMonth.ToString());
-					this.GHTSubTestAddResult(calendar1.ShowTitle.ToString());
-					this.GHTSubTestAddResult(((int) calendar1.TitleFormat).ToString());
-					this.GHTSubTestAddResult(calendar1.NextMonthText);
-					this.GHTSubTestAddResult(((int) calendar1.NextPrevFormat).ToString());
-					this.GHTSubTestAddResult(calendar1.PrevMonthText);
-					this.GHTSubTestAddResult(((int) calendar1.SelectionMode).ToString());
-				}
-			}
-			catch (Exception exception60)
-			{
-				// ProjectData.SetProjectError(exception60);
-				Exception exception12 = exception60;
-				this.GHTSubTestAddResult("Unxpected " + exception12.GetType().Name + " exception was caught-" + exception12.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CheckBox.TextAlign,Text,Checked,AutoPostBack");
-			try
-			{
-				CheckBox box2 = new CheckBox();
-				box2.ID = "objCheckBoxAll";
-				base.GHTActiveForm.Controls.Add(box2);
-				if (!this.Page.IsPostBack)
-				{
-					box2.TextAlign = TextAlign.Left;
-					box2.Text = "test";
-					box2.Checked = true;
-					box2.Checked = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) box2.TextAlign).ToString());
-					this.GHTSubTestAddResult(box2.Text);
-					this.GHTSubTestAddResult(box2.Checked.ToString());
-					this.GHTSubTestAddResult(box2.Checked.ToString());
-				}
-			}
-			catch (Exception exception61)
-			{
-				// ProjectData.SetProjectError(exception61);
-				Exception exception13 = exception61;
-				this.GHTSubTestAddResult("Unxpected " + exception13.GetType().Name + " exception was caught-" + exception13.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CheckBoxList.RepeatColumns");
-			try
-			{
-				CheckBoxList list1 = new CheckBoxList();
-				list1.ID = "objCheckBoxListRepeatColumns";
-				base.GHTActiveForm.Controls.Add(list1);
-				if (!this.Page.IsPostBack)
-				{
-					list1.RepeatColumns = 2;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(list1.RepeatColumns.ToString());
-				}
-			}
-			catch (Exception exception62)
-			{
-				// ProjectData.SetProjectError(exception62);
-				Exception exception14 = exception62;
-				this.GHTSubTestAddResult("Unxpected " + exception14.GetType().Name + " exception was caught-" + exception14.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CheckBoxList.TextAlign");
-			try
-			{
-				CheckBoxList list2 = new CheckBoxList();
-				list2.ID = "objCheckBoxListTextAlign";
-				base.GHTActiveForm.Controls.Add(list2);
-				if (!this.Page.IsPostBack)
-				{
-					list2.TextAlign = TextAlign.Right;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) list2.TextAlign).ToString());
-				}
-			}
-			catch (Exception exception63)
-			{
-				// ProjectData.SetProjectError(exception63);
-				Exception exception15 = exception63;
-				this.GHTSubTestAddResult("Unxpected " + exception15.GetType().Name + " exception was caught-" + exception15.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CheckBoxList.RepeatDirection");
-			try
-			{
-				CheckBoxList list3 = new CheckBoxList();
-				list3.ID = "objCheckBoxListRepeatDirection";
-				base.GHTActiveForm.Controls.Add(list3);
-				if (!this.Page.IsPostBack)
-				{
-					list3.RepeatDirection = RepeatDirection.Horizontal;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) list3.RepeatDirection).ToString());
-				}
-			}
-			catch (Exception exception64)
-			{
-				// ProjectData.SetProjectError(exception64);
-				Exception exception16 = exception64;
-				this.GHTSubTestAddResult("Unxpected " + exception16.GetType().Name + " exception was caught-" + exception16.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CheckBoxList.RepeatLayout");
-			try
-			{
-				CheckBoxList list4 = new CheckBoxList();
-				list4.ID = "objCheckBoxListRepeatLayout";
-				base.GHTActiveForm.Controls.Add(list4);
-				if (!this.Page.IsPostBack)
-				{
-					list4.RepeatLayout = RepeatLayout.Table;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) list4.RepeatLayout).ToString());
-				}
-			}
-			catch (Exception exception65)
-			{
-				// ProjectData.SetProjectError(exception65);
-				Exception exception17 = exception65;
-				this.GHTSubTestAddResult("Unxpected " + exception17.GetType().Name + " exception was caught-" + exception17.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			TextBox box1 = new TextBox();
-			box1.ID = "objControlToValidate";
-			base.GHTActiveForm.Controls.Add(box1);
-			this.GHTSubTestBegin("CompareValidator.Operator");
-			try
-			{
-				CompareValidator validator1 = new CompareValidator();
-				validator1.ID = "objCompareValidatorOperator";
-				validator1.ControlToValidate = "objControlToValidate";
-				base.GHTActiveForm.Controls.Add(validator1);
-				if (!this.Page.IsPostBack)
-				{
-					validator1.Operator = ValidationCompareOperator.GreaterThan;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) validator1.Operator).ToString());
-				}
-			}
-			catch (Exception exception66)
-			{
-				// ProjectData.SetProjectError(exception66);
-				Exception exception18 = exception66;
-				this.GHTSubTestAddResult("Unxpected " + exception18.GetType().Name + " exception was caught-" + exception18.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CompareValidator.ControlToCompare");
-			try
-			{
-				CompareValidator validator2 = new CompareValidator();
-				validator2.ID = "objCompareValidatorControlToCompare";
-				validator2.ControlToValidate = "objControlToValidate";
-				base.GHTActiveForm.Controls.Add(validator2);
-				if (!this.Page.IsPostBack)
-				{
-					validator2.ControlToValidate = "objControlToValidate";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(validator2.ControlToValidate);
-				}
-			}
-			catch (Exception exception67)
-			{
-				// ProjectData.SetProjectError(exception67);
-				Exception exception19 = exception67;
-				this.GHTSubTestAddResult("Unxpected " + exception19.GetType().Name + " exception was caught-" + exception19.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("CompareValidator.ValueToCompare");
-			try
-			{
-				CompareValidator validator3 = new CompareValidator();
-				validator3.ID = "objCompareValidatorValueToCompare";
-				validator3.ControlToValidate = "objControlToValidate";
-				base.GHTActiveForm.Controls.Add(validator3);
-				if (!this.Page.IsPostBack)
-				{
-					validator3.ValueToCompare = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(validator3.ValueToCompare);
-				}
-			}
-			catch (Exception exception68)
-			{
-				// ProjectData.SetProjectError(exception68);
-				Exception exception20 = exception68;
-				this.GHTSubTestAddResult("Unxpected " + exception20.GetType().Name + " exception was caught-" + exception20.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HtmlButton.CausesValidation");
-			try
-			{
-				HtmlButton button4 = new HtmlButton();
-				button4.ID = "objHtmlButtonCausesValidation";
-				base.GHTActiveForm.Controls.Add(button4);
-				if (!this.Page.IsPostBack)
-				{
-					button4.CausesValidation = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button4.CausesValidation.ToString());
-				}
-			}
-			catch (Exception exception69)
-			{
-				// ProjectData.SetProjectError(exception69);
-				Exception exception21 = exception69;
-				this.GHTSubTestAddResult("Unxpected " + exception21.GetType().Name + " exception was caught-" + exception21.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HtmlInputImage.CausesValidation");
-			try
-			{
-				HtmlInputImage image1 = new HtmlInputImage();
-				image1.ID = "objHtmlInputImageCausesValidation";
-				base.GHTActiveForm.Controls.Add(image1);
-				if (!this.Page.IsPostBack)
-				{
-					image1.CausesValidation = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(image1.CausesValidation.ToString());
-				}
-			}
-			catch (Exception exception70)
-			{
-				// ProjectData.SetProjectError(exception70);
-				Exception exception22 = exception70;
-				this.GHTSubTestAddResult("Unxpected " + exception22.GetType().Name + " exception was caught-" + exception22.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HtmlInputButton.CausesValidation");
-			try
-			{
-				HtmlInputButton button5 = new HtmlInputButton();
-				button5.ID = "objHtmlInputButtonCausesValidation";
-				base.GHTActiveForm.Controls.Add(button5);
-				if (!this.Page.IsPostBack)
-				{
-					button5.CausesValidation = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button5.CausesValidation.ToString());
-				}
-			}
-			catch (Exception exception71)
-			{
-				// ProjectData.SetProjectError(exception71);
-				Exception exception23 = exception71;
-				this.GHTSubTestAddResult("Unxpected " + exception23.GetType().Name + " exception was caught-" + exception23.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HyperLink.Text");
-			try
-			{
-				HyperLink link1 = new HyperLink();
-				link1.ID = "objHyperLinkText";
-				base.GHTActiveForm.Controls.Add(link1);
-				if (!this.Page.IsPostBack)
-				{
-					link1.Text = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(link1.Text);
-				}
-			}
-			catch (Exception exception72)
-			{
-				// ProjectData.SetProjectError(exception72);
-				Exception exception24 = exception72;
-				this.GHTSubTestAddResult("Unxpected " + exception24.GetType().Name + " exception was caught-" + exception24.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HyperLink.Target");
-			try
-			{
-				HyperLink link2 = new HyperLink();
-				link2.ID = "objHyperLinkTarget";
-				base.GHTActiveForm.Controls.Add(link2);
-				if (!this.Page.IsPostBack)
-				{
-					link2.Target = "_blank";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(link2.Target);
-				}
-			}
-			catch (Exception exception73)
-			{
-				// ProjectData.SetProjectError(exception73);
-				Exception exception25 = exception73;
-				this.GHTSubTestAddResult("Unxpected " + exception25.GetType().Name + " exception was caught-" + exception25.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HyperLink.ImageUrl");
-			try
-			{
-				HyperLink link3 = new HyperLink();
-				link3.ID = "objHyperLinkImageUrl";
-				base.GHTActiveForm.Controls.Add(link3);
-				if (!this.Page.IsPostBack)
-				{
-					link3.ImageUrl = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(link3.ImageUrl);
-				}
-			}
-			catch (Exception exception74)
-			{
-				// ProjectData.SetProjectError(exception74);
-				Exception exception26 = exception74;
-				this.GHTSubTestAddResult("Unxpected " + exception26.GetType().Name + " exception was caught-" + exception26.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("HyperLink.NavigateUrl");
-			try
-			{
-				HyperLink link4 = new HyperLink();
-				link4.ID = "objHyperLinkNavigateUrl";
-				base.GHTActiveForm.Controls.Add(link4);
-				if (!this.Page.IsPostBack)
-				{
-					link4.NavigateUrl = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(link4.NavigateUrl);
-				}
-			}
-			catch (Exception exception75)
-			{
-				// ProjectData.SetProjectError(exception75);
-				Exception exception27 = exception75;
-				this.GHTSubTestAddResult("Unxpected " + exception27.GetType().Name + " exception was caught-" + exception27.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Image.AlternateText");
-			try
-			{
-				Image image2 = new Image();
-				image2.ID = "objImageAlternateText";
-				base.GHTActiveForm.Controls.Add(image2);
-				if (!this.Page.IsPostBack)
-				{
-					image2.AlternateText = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(image2.AlternateText);
-				}
-			}
-			catch (Exception exception76)
-			{
-				// ProjectData.SetProjectError(exception76);
-				Exception exception28 = exception76;
-				this.GHTSubTestAddResult("Unxpected " + exception28.GetType().Name + " exception was caught-" + exception28.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Image.ImageAlign");
-			try
-			{
-				Image image3 = new Image();
-				image3.ID = "objImageImageAlign";
-				base.GHTActiveForm.Controls.Add(image3);
-				if (!this.Page.IsPostBack)
-				{
-					image3.ImageAlign = ImageAlign.Right;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) image3.ImageAlign).ToString());
-				}
-			}
-			catch (Exception exception77)
-			{
-				// ProjectData.SetProjectError(exception77);
-				Exception exception29 = exception77;
-				this.GHTSubTestAddResult("Unxpected " + exception29.GetType().Name + " exception was caught-" + exception29.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Image.ImageUrl");
-			try
-			{
-				Image image4 = new Image();
-				image4.ID = "objImageImageUrl";
-				base.GHTActiveForm.Controls.Add(image4);
-				if (!this.Page.IsPostBack)
-				{
-					image4.ImageUrl = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(image4.ImageUrl);
-				}
-			}
-			catch (Exception exception78)
-			{
-				// ProjectData.SetProjectError(exception78);
-				Exception exception30 = exception78;
-				this.GHTSubTestAddResult("Unxpected " + exception30.GetType().Name + " exception was caught-" + exception30.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("ImageButton.CommandName");
-			try
-			{
-				ImageButton button6 = new ImageButton();
-				button6.ID = "objImageButtonCommandName";
-				base.GHTActiveForm.Controls.Add(button6);
-				if (!this.Page.IsPostBack)
-				{
-					button6.CommandName = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button6.CommandName);
-				}
-			}
-			catch (Exception exception79)
-			{
-				// ProjectData.SetProjectError(exception79);
-				Exception exception31 = exception79;
-				this.GHTSubTestAddResult("Unxpected " + exception31.GetType().Name + " exception was caught-" + exception31.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("ImageButton.CommandArgument");
-			try
-			{
-				ImageButton button7 = new ImageButton();
-				button7.ID = "objImageButtonCommandArgument";
-				base.GHTActiveForm.Controls.Add(button7);
-				if (!this.Page.IsPostBack)
-				{
-					button7.CommandArgument = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button7.CommandArgument);
-				}
-			}
-			catch (Exception exception80)
-			{
-				// ProjectData.SetProjectError(exception80);
-				Exception exception32 = exception80;
-				this.GHTSubTestAddResult("Unxpected " + exception32.GetType().Name + " exception was caught-" + exception32.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("ImageButton.CommandName");
-			try
-			{
-				ImageButton button8 = new ImageButton();
-				button8.ID = "objImageButtonCausesValidation";
-				base.GHTActiveForm.Controls.Add(button8);
-				if (!this.Page.IsPostBack)
-				{
-					button8.CausesValidation = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button8.CausesValidation.ToString());
-				}
-			}
-			catch (Exception exception81)
-			{
-				// ProjectData.SetProjectError(exception81);
-				Exception exception33 = exception81;
-				this.GHTSubTestAddResult("Unxpected " + exception33.GetType().Name + " exception was caught-" + exception33.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Label.Text");
-			try
-			{
-				Label label2 = new Label();
-				label2.ID = "objLabelText";
-				base.GHTActiveForm.Controls.Add(label2);
-				if (!this.Page.IsPostBack)
-				{
-					label2.Text = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(label2.Text);
-				}
-			}
-			catch (Exception exception82)
-			{
-				// ProjectData.SetProjectError(exception82);
-				Exception exception34 = exception82;
-				this.GHTSubTestAddResult("Unxpected " + exception34.GetType().Name + " exception was caught-" + exception34.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("LinkButton.CausesValidation");
-			try
-			{
-				LinkButton button9 = new LinkButton();
-				button9.ID = "objLinkButtonCausesValidation";
-				base.GHTActiveForm.Controls.Add(button9);
-				if (!this.Page.IsPostBack)
-				{
-					button9.CausesValidation = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button9.CausesValidation.ToString());
-				}
-			}
-			catch (Exception exception83)
-			{
-				// ProjectData.SetProjectError(exception83);
-				Exception exception35 = exception83;
-				this.GHTSubTestAddResult("Unxpected " + exception35.GetType().Name + " exception was caught-" + exception35.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("LinkButton.CommandName");
-			try
-			{
-				LinkButton button10 = new LinkButton();
-				button10.ID = "objLinkButtonCommandName";
-				base.GHTActiveForm.Controls.Add(button10);
-				if (!this.Page.IsPostBack)
-				{
-					button10.CommandName = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button10.CommandName);
-				}
-			}
-			catch (Exception exception84)
-			{
-				// ProjectData.SetProjectError(exception84);
-				Exception exception36 = exception84;
-				this.GHTSubTestAddResult("Unxpected " + exception36.GetType().Name + " exception was caught-" + exception36.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("LinkButton.CommandArgument");
-			try
-			{
-				LinkButton button11 = new LinkButton();
-				button11.ID = "objLinkButtonCommandArgument";
-				base.GHTActiveForm.Controls.Add(button11);
-				if (!this.Page.IsPostBack)
-				{
-					button11.CommandArgument = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button11.CommandArgument);
-				}
-			}
-			catch (Exception exception85)
-			{
-				// ProjectData.SetProjectError(exception85);
-				Exception exception37 = exception85;
-				this.GHTSubTestAddResult("Unxpected " + exception37.GetType().Name + " exception was caught-" + exception37.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("LinkButton.Text");
-			try
-			{
-				LinkButton button12 = new LinkButton();
-				button12.ID = "objLinkButtonText";
-				base.GHTActiveForm.Controls.Add(button12);
-				if (!this.Page.IsPostBack)
-				{
-					button12.Text = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button12.Text);
-				}
-			}
-			catch (Exception exception86)
-			{
-				// ProjectData.SetProjectError(exception86);
-				Exception exception38 = exception86;
-				this.GHTSubTestAddResult("Unxpected " + exception38.GetType().Name + " exception was caught-" + exception38.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("ListBox.All");
-			try
-			{
-				ListBox box3 = new ListBox();
-				box3.ID = "objListBoxAll";
-				base.GHTActiveForm.Controls.Add(box3);
-				if (!this.Page.IsPostBack)
-				{
-					box3.SelectionMode = ListSelectionMode.Multiple;
-					box3.Rows = 2;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) box3.SelectionMode).ToString());
-					this.GHTSubTestAddResult(box3.Rows.ToString());
-				}
-			}
-			catch (Exception exception87)
-			{
-				// ProjectData.SetProjectError(exception87);
-				Exception exception39 = exception87;
-				this.GHTSubTestAddResult("Unxpected " + exception39.GetType().Name + " exception was caught-" + exception39.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("ListControl.All");
-			try
-			{
-				ListBox box4 = new ListBox();
-				box4.ID = "objListControlAll";
-				box4.DataSource = this.CreateDataSource();
-				box4.DataBind();
-				base.GHTActiveForm.Controls.Add(box4);
-				if (!this.Page.IsPostBack)
-				{
-					box4.AutoPostBack = true;
-					box4.DataMember = "test";
-					box4.DataTextField = "StringValue";
-					box4.DataTextFormatString = "{0:C}";
-					box4.DataValueField = "StringValue";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(box4.AutoPostBack.ToString());
-					this.GHTSubTestAddResult(box4.DataMember);
-					this.GHTSubTestAddResult(box4.DataTextField);
-					this.GHTSubTestAddResult(box4.DataTextFormatString);
-					this.GHTSubTestAddResult(box4.DataValueField);
-				}
-			}
-			catch (Exception exception88)
-			{
-				// ProjectData.SetProjectError(exception88);
-				Exception exception40 = exception88;
-				this.GHTSubTestAddResult("Unxpected " + exception40.GetType().Name + " exception was caught-" + exception40.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Literal.Text");
-			try
-			{
-				Literal literal1 = new Literal();
-				literal1.ID = "objLiteralText";
-				base.GHTActiveForm.Controls.Add(literal1);
-				if (!this.Page.IsPostBack)
-				{
-					literal1.Text = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(literal1.Text);
-				}
-			}
-			catch (Exception exception89)
-			{
-				// ProjectData.SetProjectError(exception89);
-				Exception exception41 = exception89;
-				this.GHTSubTestAddResult("Unxpected " + exception41.GetType().Name + " exception was caught-" + exception41.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Panel.All");
-			try
-			{
-				Panel panel1 = new Panel();
-				panel1.ID = "objPanelAll";
-				base.GHTActiveForm.Controls.Add(panel1);
-				if (!this.Page.IsPostBack)
-				{
-					panel1.BackImageUrl = "test";
-					panel1.HorizontalAlign = HorizontalAlign.Right;
-					panel1.Wrap = true;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(panel1.BackImageUrl);
-					this.GHTSubTestAddResult(((int) panel1.HorizontalAlign).ToString());
-					this.GHTSubTestAddResult(panel1.Wrap.ToString());
-				}
-			}
-			catch (Exception exception90)
-			{
-				// ProjectData.SetProjectError(exception90);
-				Exception exception42 = exception90;
-				this.GHTSubTestAddResult("Unxpected " + exception42.GetType().Name + " exception was caught-" + exception42.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("RadioButton.GroupName");
-			try
-			{
-				RadioButton button13 = new RadioButton();
-				button13.ID = "objRadioButtonGroupName";
-				base.GHTActiveForm.Controls.Add(button13);
-				if (!this.Page.IsPostBack)
-				{
-					button13.GroupName = "test";
-				}
-				else
-				{
-					this.GHTSubTestAddResult(button13.GroupName);
-				}
-			}
-			catch (Exception exception91)
-			{
-				// ProjectData.SetProjectError(exception91);
-				Exception exception43 = exception91;
-				this.GHTSubTestAddResult("Unxpected " + exception43.GetType().Name + " exception was caught-" + exception43.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("RadioButtonList.RepeatColumns");
-			try
-			{
-				RadioButtonList list5 = new RadioButtonList();
-				list5.ID = "objRadioButtonListRepeatColumns";
-				base.GHTActiveForm.Controls.Add(list5);
-				if (!this.Page.IsPostBack)
-				{
-					list5.RepeatColumns = 2;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(list5.RepeatColumns.ToString());
-				}
-			}
-			catch (Exception exception92)
-			{
-				// ProjectData.SetProjectError(exception92);
-				Exception exception44 = exception92;
-				this.GHTSubTestAddResult("Unxpected " + exception44.GetType().Name + " exception was caught-" + exception44.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("RadioButtonList.RepeatDirection");
-			try
-			{
-				RadioButtonList list6 = new RadioButtonList();
-				list6.ID = "objRadioButtonListRepeatDirection";
-				base.GHTActiveForm.Controls.Add(list6);
-				if (!this.Page.IsPostBack)
-				{
-					list6.RepeatDirection = RepeatDirection.Horizontal;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) list6.RepeatDirection).ToString());
-				}
-			}
-			catch (Exception exception93)
-			{
-				// ProjectData.SetProjectError(exception93);
-				Exception exception45 = exception93;
-				this.GHTSubTestAddResult("Unxpected " + exception45.GetType().Name + " exception was caught-" + exception45.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("RadioButtonList.TextAlign");
-			try
-			{
-				RadioButtonList list7 = new RadioButtonList();
-				list7.ID = "objRadioButtonListTextAlign";
-				base.GHTActiveForm.Controls.Add(list7);
-				if (!this.Page.IsPostBack)
-				{
-					list7.TextAlign = TextAlign.Right;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) list7.TextAlign).ToString());
-				}
-			}
-			catch (Exception exception94)
-			{
-				// ProjectData.SetProjectError(exception94);
-				Exception exception46 = exception94;
-				this.GHTSubTestAddResult("Unxpected " + exception46.GetType().Name + " exception was caught-" + exception46.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("RadioButtonList.RepeatLayout");
-			try
-			{
-				RadioButtonList list8 = new RadioButtonList();
-				list8.ID = "objRadioButtonListRepeatLayout";
-				base.GHTActiveForm.Controls.Add(list8);
-				if (!this.Page.IsPostBack)
-				{
-					list8.RepeatLayout = RepeatLayout.Flow;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(((int) list8.RepeatLayout).ToString());
-				}
-			}
-			catch (Exception exception95)
-			{
-				// ProjectData.SetProjectError(exception95);
-				Exception exception47 = exception95;
-				this.GHTSubTestAddResult("Unxpected " + exception47.GetType().Name + " exception was caught-" + exception47.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("TextBox.ReadOnly,AutoPostBack,Columns,Wrap,Text,Rows,MaxLength,TextMode");
-			try
-			{
-				TextBox box5 = new TextBox();
-				box5.ID = "objTextBoxAll";
-				base.GHTActiveForm.Controls.Add(box5);
-				if (!this.Page.IsPostBack)
-				{
-					box5.ReadOnly = true;
-					box5.AutoPostBack = true;
-					box5.Columns = 2;
-					box5.Wrap = true;
-					box5.Text = "test";
-					box5.Rows = 2;
-					box5.MaxLength = 10;
-					box5.TextMode = TextBoxMode.MultiLine;
-				}
-				else
-				{
-					this.GHTSubTestAddResult(box5.ReadOnly.ToString());
-					this.GHTSubTestAddResult(box5.ReadOnly.ToString());
-					this.GHTSubTestAddResult(box5.AutoPostBack.ToString());
-					this.GHTSubTestAddResult(box5.Columns.ToString());
-					this.GHTSubTestAddResult(box5.Wrap.ToString());
-					this.GHTSubTestAddResult(box5.Text);
-					this.GHTSubTestAddResult(box5.Rows.ToString());
-					this.GHTSubTestAddResult(box5.MaxLength.ToString());
-					this.GHTSubTestAddResult(((int) box5.TextMode).ToString());
-				}
-			}
-			catch (Exception exception96)
-			{
-				// ProjectData.SetProjectError(exception96);
-				Exception exception48 = exception96;
-				this.GHTSubTestAddResult("Unxpected " + exception48.GetType().Name + " exception was caught-" + exception48.Message);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-		private ICollection CreateDataSource()
-		{
-			DataTable table1 = new DataTable();
-			table1.TableName = "test";
-			table1.Columns.Add(new DataColumn("IntegerValue", typeof(int)));
-			table1.Columns.Add(new DataColumn("StringValue", typeof(string)));
-			table1.Columns.Add(new DataColumn("CurrencyValue", typeof(double)));
-			int num1 = 0;
-			do
-			{
-				DataRow row1 = table1.NewRow();
-				row1[0] = num1;
-				row1[1] = "Item " + num1.ToString();
-				row1[2] = 1.23 * (num1 + 1);
-				table1.Rows.Add(row1);
-				num1++;
-			}
-			while (num1 <= 8);
-			return new DataView(table1);
-		}
- 
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Visible.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Visible.aspx
deleted file mode 100644
index 6f5c359d575..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Visible.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Control_Visible.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Control_Visible" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Control_Visible</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Visible.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Visible.aspx.cs
deleted file mode 100644
index 032ff40bd7c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Control/Control_Visible.aspx.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Control_Visible
-		: GHTControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			// Visible = true.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Visible = true:");
-				TestedControl.Visible = true;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Visible = false.
-			try 
-			{
-				GHTSubTestBegin(ctrlType, "Visible = false:");
-				TestedControl.Visible = false;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx
deleted file mode 100644
index 6408907335f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextWriterAttribute_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.HtmlTextWriterAttribute_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>HtmlTextWriterAttribute_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx.cs
deleted file mode 100644
index ba5f535eae8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class HtmlTextWriterAttribute_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.HtmlTextWriterAttribute");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(HtmlTextWriterAttribute));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(HtmlTextWriterAttribute));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx
deleted file mode 100644
index bd2276ebe2a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextWriterStyle_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.HtmlTextWriterStyle_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>HtmlTextWriterStyle_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx.cs
deleted file mode 100644
index 2c121339a7e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class HtmlTextWriterStyle_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.HtmlTextWriterStyle");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(HtmlTextWriterStyle));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(HtmlTextWriterStyle));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx
deleted file mode 100644
index f99e5aa448b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextWriterTag_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.HtmlTextWriterTag_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>HtmlTextWriterTag_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx.cs
deleted file mode 100644
index 5eba4117cc0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class HtmlTextWriterTag_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.HtmlTextWriterTag");
-				try 
-				{
-					GHTSubTestAddResult(Test());
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(HtmlTextWriterTag));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(HtmlTextWriterTag));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Page/Page_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Page/Page_ctor_.aspx
deleted file mode 100644
index 310d41560f3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Page/Page_ctor_.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Page_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.Page_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Page_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-            aspx code is trying to access a protected variable from the code behind <BR>
-<SCRIPT language="javascript">
-					var b = <%#bTestAccessScopeProtected.ToString()%>;
-				</SCRIPT>
-<asp:Label id="Label1" runat="server">#bTestAccessScopeProtected.ToString()</asp:Label>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Page/Page_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Page/Page_ctor_.aspx.cs
deleted file mode 100644
index a81aa904314..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/Page/Page_ctor_.aspx.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class Page_ctor_
-		: GHTBaseWeb 
-	{
-		protected bool bTestAccessScopeProtected = false;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Label Label1;
-
-												#region Web Form Designer generated code
-												override protected void OnInit(EventArgs e) 
-												{
-													//
-													// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-													//
-													InitializeComponent();
-													base.OnInit(e);
-												}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			Page.DataBind();;
-		}
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx
deleted file mode 100644
index 2eb7077577c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ValidationPropertyAttribute_ctor_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI.ValidationPropertyAttribute_ctor_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ValidationPropertyAttribute_ctor_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-			<asp:RegularExpressionValidator id="RegularExpressionValidator1" style="Z-INDEX: 101; LEFT: 104px; POSITION: absolute; TOP: 136px"
-				runat="server" ErrorMessage="RegularExpressionValidator"></asp:RegularExpressionValidator></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx.cs
deleted file mode 100644
index beebe8dc1ad..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI
-{
-	public class ValidationPropertyAttribute_ctor_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RegularExpressionValidator RegularExpressionValidator1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("ValidationPropertyAttribute inherited into Custom Control"); 
-			try 
-			{ 
-				MyTextBox2 myTextBox2 = new MyTextBox2(); 
-				myTextBox2.ID = "MyTextBox2"; 
-				GHTActiveSubTest.Controls.Add(myTextBox2); 
-				MyControl MyControl1 = new MyControl(); 
-				GHTActiveSubTest.Controls.Add(MyControl1); 
-				RegularExpressionValidator1.ControlToValidate = "MyTextBox2"; 
-				GHTSubTestAddResult(GHTActiveSubTest.ID); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-	public class MyTextBox2		: TextBox
-	{
-		public MyTextBox2()
-		{
-		}
-	}
-	[System.Web.UI.ValidationPropertyAttribute("Message")]
-	public class MyControl        : System.Web.UI.Control
-	{
-		public MyControl()
-		{
-			MyTextBox2 myTextBox2 = new MyTextBox2(); 
-			this.Controls.Add(myTextBox2);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx
deleted file mode 100644
index 6a624a98d92..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlAnchor_HRef.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlAnchor_HRef" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlAnchor_HRef</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px" Description="HTMLAnchor_href_1">
-					<A id="anchor1" href="http://localhost/ght" name="anchor1" runat="server">Anchor1</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GhtSubTest2" runat="server" Width="553px" Height="56px" Description="HTMLAnchor_href_2">
-					<A id="anchor2" href="#top" name="anchor2" runat="server">Anchor2</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GhtSubTest3" runat="server" Width="553px" Height="59px" Description="HTMLAnchor_href_3">
-					<A id="anchor3" href="874y5/........../n3th293" name="anchor3" runat="server">Anchor3</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GhtSubTest4" runat="server" Width="553px" Height="59px" Description="HTMLAnchor_href_4">
-					<A id="anchor4" name="anchor4" runat="server">Anchor4</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GhtSubTest5" runat="server" Width="553px" Height="59px" Description="HTMLAnchor_href_5">
-					<A id="anchor5" name="anchor5" runat="server">Anchor5</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GhtSubTest6" runat="server" Width="553px" Height="59px" Description="HTMLAnchor_href_6">
-					<A id="anchor6" name="anchor5" runat="server">Anchor6</A>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx.cs
deleted file mode 100644
index 4afbf090214..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlAnchor_HRef
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GhtSubTest2;
-		protected GHTWebControls.GHTSubTest GhtSubTest3;
-		protected GHTWebControls.GHTSubTest GhtSubTest4;
-		protected GHTWebControls.GHTSubTest GhtSubTest5;
-		protected GHTWebControls.GHTSubTest GhtSubTest6;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor1;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor2;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor3;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor4;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor5;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GhtSubTest4; 
-			try 
-			{ 
-				anchor4.HRef = "http://localhost/ght"; 
-				GHTSubTestAddResult(anchor4.HRef); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GhtSubTest5; 
-			try 
-			{ 
-				anchor5.HRef = "http://lo!@#$%^&*()calhost/ght"; 
-				GHTSubTestAddResult(anchor5.HRef); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GhtSubTest6; 
-			try 
-			{ 
-				anchor6.HRef = "123"; 
-				GHTSubTestAddResult(anchor6.HRef); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx
deleted file mode 100644
index 4323f58fe0f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlAnchor_Name.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlAnchor_Name" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlAnchor_Name</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px" Description="HTMLAnchor_Name_1">
-					<A id="anchor1" href="http://www.google.com" name="anchor1" runat="server">Anchor1</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Width="553px" Height="56px" Description="HTMLAnchor_Name_2">
-					<A id="anchor2" href="http://www.google.com" name="anchor2_!@#$%^&amp;*()" runat="server">
-						Anchor2</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="553px" Height="59px" Description="HTMLAnchor_Name_3">
-					<A id="anchor3" href="http://www.google.com" name="anchor3" runat="server">Anchor3</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest4" runat="server" Width="553px" Height="59px" Description="HTMLAnchor_Name_4">
-					<A id="anchor4" href="http://www.google.com" name="anchor4" runat="server">Anchor4</A>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx.cs
deleted file mode 100644
index f1146215245..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlAnchor_Name
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor1;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor2;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor3;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = Ghtsubtest3;; 
-			try 
-			{ 
-				anchor3.Name = "name_anchor3"; 
-				GHTSubTestAddResult(anchor3.Name); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = Ghtsubtest4;; 
-			try 
-			{ 
-				anchor4.Name = "123"; 
-				GHTSubTestAddResult(anchor4.Name); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx
deleted file mode 100644
index fd8972d0bf6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlAnchor_Target.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlAnchor_Target" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlAnchor_Target</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Target_1">
-					<A id="A1" href="http://www.microsoft.com" target="" name="anchor1" runat="server">anchor1</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Target_2">
-					<A id="A2" href="http://www.microsoft.com" target="_blank" name="anchor2" runat="server">
-						anchor2</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Target_3">
-					<A id="A3" href="http://www.microsoft.com" target="_blank" name="anchor3" runat="server">
-						anchor3</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Target_4">
-					<A id="A4" href="http://www.microsoft.com" target="_blank" name="anchor4" runat="server">
-						anchor4</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Target_5">
-					<A id="A5" href="http://www.microsoft.com" target="_blank" name="anchor5" runat="server">
-						anchor5</A>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx.cs
deleted file mode 100644
index f53991558a0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlAnchor_Target
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.HtmlControls.HtmlAnchor A1;
-		protected System.Web.UI.HtmlControls.HtmlAnchor A2;
-		protected System.Web.UI.HtmlControls.HtmlAnchor A3;
-		protected System.Web.UI.HtmlControls.HtmlAnchor A4;
-		protected System.Web.UI.HtmlControls.HtmlAnchor A5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;; 
-			try 
-			{ 
-				GHTSubTestAddResult(A1.Target); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GHTSubTest2;; 
-			try 
-			{ 
-				GHTSubTestAddResult(A2.Target); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GHTSubTest3;; 
-			try 
-			{ 
-				A3.Target = "_self"; 
-				GHTSubTestAddResult(A3.Target); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GHTSubTest4;; 
-			try 
-			{ 
-				A4.Target = "123"; 
-				GHTSubTestAddResult(A4.Target); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GHTSubTest5;; 
-			try 
-			{ 
-				A5.Target = ""; 
-				GHTSubTestAddResult(A5.Target); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx
deleted file mode 100644
index d194430a69c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlAnchor_Title.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlAnchor_Title" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlAnchor_Title</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Title_1">
-					<A id="anchor1" title="title of anchor1" href="http://www.microsoft.com" name="anchor1"
-						runat="server">Anchor1</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Title_2">
-					<A id="anchor2" href="http://www.microsoft.com" name="anchor2" runat="server">Anchor2</A>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="553px" Height="64px" Description="HTMLAnchor_Title_3">
-					<A id="anchor3" href="http://www.microsoft.com" name="anchor3" runat="server">Anchor3</A>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx.cs
deleted file mode 100644
index c5a3fa8c231..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlAnchor_Title
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor1;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor2;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;; 
-			try 
-			{ 
-				GHTSubTestAddResult(anchor1.Title); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GHTSubTest2;; 
-			try 
-			{ 
-				anchor2.Title = "New title"; 
-				GHTSubTestAddResult(anchor2.Title); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTActiveSubTest = GHTSubTest3;; 
-			try 
-			{ 
-				anchor3.Title = "123"; 
-				GHTSubTestAddResult(anchor3.Title); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			}
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx
deleted file mode 100644
index 3a83bf0953f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlAnchor_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlAnchor_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlAnchor_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P><cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="64px" Width="553px" Description="HTMLAnchor_ctor_1"><A id="anchor1" href="telnet://192.1.1.1" name="anchor1" runat="server">Anchor1</A>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="64px" Width="553px" Description="HTMLAnchor_ctor_2"><A id="anchor2" title="title" href="http://localhost/" target="_blank" name="anchor2"
-						runat="server">Anchor2</A>
-				</cc1:ghtsubtest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx.cs
deleted file mode 100644
index 54ae4d98376..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlAnchor_ctor_
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor1;
-		protected System.Web.UI.HtmlControls.HtmlAnchor anchor2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx
deleted file mode 100644
index 8cd1b742461..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlButton_CausesValidation.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlButton_CausesValidation" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlButton_CausesValidation</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx.cs
deleted file mode 100644
index 7ef42596f29..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlButton_CausesValidation
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-            
-			//False
-			GHTSubTestBegin("Causes validation = false"); 
-			try
-			{ 
-				System.Web.UI.HtmlControls.HtmlButton btn = new System.Web.UI.HtmlControls.HtmlButton(); 
-				btn.CausesValidation = false; 
-				GHTActiveSubTest.Controls.Add(btn); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			}
-			GHTTestEnd();
-
-			//true
-			GHTSubTestBegin("Causes validation = true"); 
-			try
-			{ 
-				System.Web.UI.HtmlControls.HtmlButton btn = new System.Web.UI.HtmlControls.HtmlButton(); 
-				btn.CausesValidation = true; 
-				GHTActiveSubTest.Controls.Add(btn); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-			} 
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx
deleted file mode 100644
index 271a3b22870..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlButton_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlButton_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlButton_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="464px" Height="72px" Description="HtmlButton_ctor_1">
-					<INPUT id="Button1" type="button" value="Button" name="Button1" runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="464px" Description="HtmlButton_ctor_2">
-					<INPUT id="Reset1" type="reset" value="Reset" name="Reset1" runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="464px" Description="HtmlButton_ctor_3">
-					<INPUT id="Submit1" type="submit" value="Submit" name="Submit1" runat="server">
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx.cs
deleted file mode 100644
index 069034d71d7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlButton_ctor_
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.HtmlControls.HtmlInputButton Button1;
-		protected System.Web.UI.HtmlControls.HtmlInputButton Reset1;
-		protected System.Web.UI.HtmlControls.HtmlInputButton Submit1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx
deleted file mode 100644
index e83b384a742..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlContainerControl_InnerHtml.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlContainerControl_InnerHtml" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlContainerControl_InnerHtml</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx.cs
deleted file mode 100644
index 2e3466f808f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlContainerControl_InnerHtml
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void TestInnerHTMLControl(Type HTMLCtlType, string TestName, string html)
-		{
-			System.Web.UI.HtmlControls.HtmlContainerControl ctl;
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				ctl = (HtmlContainerControl)GHTElementClone(HTMLCtlType);
-				GHTActiveSubTest.Controls.Add(ctl);
-				ctl.InnerHtml = html;
-				GHTSubTestAddResult(ctl.InnerHtml);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				ctl = null;
-			}
-			GHTSubTestEnd();
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			try 
-			{
-				System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-				GHTTestBegin(frm);
-
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerHTML_1", "sample text");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerHTML_1", "sample text");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerHTML_1", "sample text");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerHTML_1", "sample text");
-
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerHTML_2", "other text: ~!@#$%^&*()_+");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerHTML_2", "other text: ~!@#$%^&*()_+");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerHTML_2", "other text: ~!@#$%^&*()_+");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerHTML_2", "other text: ~!@#$%^&*()_+");
-
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerHTML_3", "<b>Bold</b>");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerHTML_3", "<b>Bold</b>");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerHTML_3", "<b>Bold</b>");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerHTML_3", "<b>Bold</b>");
-
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerHTML_5", "");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerHTML_5", "");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerHTML_5", "");
-				TestInnerHTMLControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerHTML_5", "");
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx
deleted file mode 100644
index 46396856cf9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlContainerControl_InnerText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlContainerControl_InnerText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlContainerControl_InnerText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx.cs
deleted file mode 100644
index 2a7d0867d5d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlContainerControl_InnerText
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void TestInnerTextControl(Type HTMLCtlType, string TestName, string text)
-		{
-
-			System.Web.UI.HtmlControls.HtmlContainerControl ctl;
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				ctl = (HtmlContainerControl)GHTElementClone(HTMLCtlType);
-				GHTActiveSubTest.Controls.Add(ctl);
-				ctl.InnerText = text;
-				GHTSubTestAddResult(ctl.InnerText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				ctl = null;
-			}
-			GHTSubTestEnd();
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerText_1", "sample text");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerText_1", "sample text");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerText_1", "sample text");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerText_1", "sample text");
-
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerText_2", "other text: ~!@#$%^&*()_+");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerText_2", "other text: ~!@#$%^&*()_+");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerText_2", "other text: ~!@#$%^&*()_+");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerText_2", "other text: ~!@#$%^&*()_+");
-
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_InnerText_3", "");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_InnerText_3", "");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_InnerText_3", "");
-			TestInnerTextControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_InnerText_3", "");
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx
deleted file mode 100644
index 485a5d4e3e4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlControl_Attributes.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlControl_Attributes" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlControl_Attributes</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx.cs
deleted file mode 100644
index 4eb1a16e262..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlControl_Attributes
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-
-		private void TestAttributeseControl(Type HTMLCtlType, string TestName)
-		{
-
-			System.Web.UI.HtmlControls.HtmlControl ctl;
-			string attributesStr = "";
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				ctl = (HtmlControl)GHTElementClone(HTMLCtlType);
-				GHTActiveSubTest.Controls.Add(ctl);
-				ctl.Attributes.Add("id", "ctl:" + TestName);
-				ctl.Attributes.Add("notid", "ctl");
-				ctl.Attributes.Add("no_value", "");
-				ctl.Attributes.Add("space space", "sp a ce");
-
-				IEnumerator keys = ctl.Attributes.Keys.GetEnumerator();
-				while ( keys.MoveNext() )
-				{
-					string key = (string)keys.Current;
-					if (attributesStr != "") attributesStr += ",";
-					attributesStr += key + "=" + ctl.Attributes[key];
-				}
-
-				GHTSubTestAddResult(attributesStr);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				ctl = null;
-			}
-			GHTSubTestEnd();
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			try 
-			{
-				//Put user code to initialize the page here
-				System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-				GHTTestBegin(frm);
-
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlInputButton), "HTMLInputButton_Attributes");
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_Attributes");
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_Attributes");
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlInputHidden), "HtmlInputHidden_Attributes");
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlInputImage), "HtmlInputImage_Attributes");
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_Attributes");
-				TestAttributeseControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_Attributes");
-			}
-
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx
deleted file mode 100644
index f3b606544b8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlControl_Disabled.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlControl_Disabled" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlControl_Disabled</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx.cs
deleted file mode 100644
index 081c7b8028d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlControl_Disabled
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void TestDisableControl(Type HTMLCtlType, string TestName, bool Dis)
-		{
-			System.Web.UI.HtmlControls.HtmlControl ctl;
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				ctl = (HtmlControl)GHTElementClone(HTMLCtlType);
-				GHTActiveSubTest.Controls.Add(ctl);
-				ctl.Disabled = Dis;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				ctl = null;
-			}
-			GHTSubTestEnd();
-		}
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlInputButton), "HTMLInputButton_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlInputButton), "HTMLInputButton_Disable_f", false);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_Disable_f", false);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_Disable_f", false);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlInputHidden), "HtmlInputHidden_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlInputHidden), "HtmlInputHidden_Disable_f", false);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlInputImage), "HtmlInputImage_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlInputImage), "HtmlInputImage_Disable_f", false);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_Disable_f", false);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_Disable_t", true);
-			TestDisableControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_Disable_f", false);
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx
deleted file mode 100644
index 80019177dc2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlControl_Style.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlControl_Style" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlControl_Style</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx.cs
deleted file mode 100644
index dc9d61cb60e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlControl_Style
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void TestStyleControl(Type HTMLCtlType, string TestName) 
-		{ 
-			System.Web.UI.HtmlControls.HtmlControl ctl; 
-			string styleStr = ""; 
-			GHTSubTestBegin(TestName); 
-			try
-			{ 
-				ctl = (HtmlControl)GHTElementClone(HTMLCtlType); 
-				GHTActiveSubTest.Controls.Add(ctl); 
-				ctl.Style.Add("background-color", "#eeeeee"); 
-				ctl.Style.Add("some-other-color", "#eeeeee"); 
-				ctl.Style.Add("unknown-without-value", ""); 
-				ctl.Style.Add("space space", "sp a ce"); 
-				IEnumerator keys = ctl.Style.Keys.GetEnumerator(); 
-				while (keys.MoveNext()) 
-				{ 
-					string key = ((string)(keys.Current)); 
-					if ((styleStr != "")) 
-					{ 
-						styleStr += ","; 
-					} 
-					styleStr += key + "=" + ctl.Style[key]; 
-				} 
-				GHTSubTestAddResult(styleStr); 
-			} 
-			catch (Exception ex) 
-			{ 
-				GHTSubTestUnexpectedExceptionCaught(ex); 
-				ctl = null; 
-			} 
-			GHTSubTestEnd(); 
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlInputButton), "HTMLInputButton_Style");
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_Style");
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_Style");
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlInputHidden), "HtmlInputHidden_Style");
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlInputImage), "HtmlInputImage_Style");
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_Style");
-			TestStyleControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_Style");
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx
deleted file mode 100644
index 1462ef4d0f9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlControl_TagName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlControl_TagName" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlControl_TagName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx.cs
deleted file mode 100644
index 9858232beda..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{public class HtmlControl_TagName
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private void TestTagNameControl(Type HTMLCtlType, string TestName) 
-	 { 
-		 System.Web.UI.HtmlControls.HtmlControl ctl; 
-		 GHTSubTestBegin(TestName); 
-		 try 
-		 { 
-			 ctl = (HtmlControl)GHTElementClone(HTMLCtlType); 
-			 GHTActiveSubTest.Controls.Add(ctl); 
-			 GHTSubTestAddResult(ctl.TagName); 
-		 } 
-		 catch (Exception ex) 
-		 { 
-			 GHTSubTestUnexpectedExceptionCaught(ex); 
-			 ctl = null; 
-		 } 
-		 GHTSubTestEnd(); 
-	 }
-	 
-		 private void Page_Load(object sender, System.EventArgs e) 
-	 {
-            //Put user code to initialize the page here
-
-            System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-            GHTTestBegin(frm);
-
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlInputButton), "HTMLInputButton_TagName");
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlButton), "HTMLButton_TagName");
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlAnchor), "HTMLAnchor_TagName");
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlInputHidden), "HtmlInputHidden_TagName");
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlInputImage), "HtmlInputImage_TagName");
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlTextArea), "HtmlTextArea_TagName");
-            TestTagNameControl(typeof(System.Web.UI.HtmlControls.HtmlGenericControl), "HtmlGenericControl_TagName");
-
-            GHTTestEnd();
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx
deleted file mode 100644
index 6f392056221..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Enctype.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Enctype" EnableSessionState="False" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Enctype</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="296px" Description="HtmlForm_Enctype_1"
-			EnableViewState="False">
-			<FORM id="myForm1" encType="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx.cs
deleted file mode 100644
index a41a686284b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Enctype
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx
deleted file mode 100644
index dc466a27868..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Enctype1.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Enctype1" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Enctype1</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="296px" Description="HtmlForm_Enctype_1">
-			<FORM id="myForm1" encType="sfgs.dg.sd.f.sdf.sd.f!@#$%^*()" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx.cs
deleted file mode 100644
index 9197a63120b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Enctype1
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx
deleted file mode 100644
index 3c0eaecf69d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Enctype2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Enctype2" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Enctype2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="296px" Description="HtmlForm_Enctype_1">
-			<FORM id="myForm1" encType="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx.cs
deleted file mode 100644
index ae36342d6b8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Enctype2
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx
deleted file mode 100644
index dd0108df4c0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Method.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Method" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Method</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="96px" Description="HtmlForm_Method_1">
-			<FORM id="myForm1" method="post" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx.cs
deleted file mode 100644
index f49903130f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Method
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx
deleted file mode 100644
index 7f0ebaef682..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Method1.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Method1" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Method1</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="96px" Description="HtmlForm_Method_1">
-			<FORM id="myForm1" method="asdljhfkj.sd.sd..df." enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx.cs
deleted file mode 100644
index 72ceff32e6e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Method1
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx
deleted file mode 100644
index 554cbb78edc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Method2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Method2" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Method2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="96px" Description="HtmlForm_Method_1">
-			<FORM id="myForm1" method="" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx.cs
deleted file mode 100644
index 5455156f3a1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Method2
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx
deleted file mode 100644
index 7eecdb3c11d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Name.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Name" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Name</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="80px" Description="HtmlForm_Name_1">
-			<FORM id="myForm1" name="myForm1" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx.cs
deleted file mode 100644
index b246a112ae8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Name
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx
deleted file mode 100644
index c3006cf0df8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Name1.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Name1" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Name1</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="80px" Description="HtmlForm_Name_1">
-			<FORM id="myForm1" name="fgs.g.sd.f.sdf.s.df.sd.f.sd.f" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx.cs
deleted file mode 100644
index 814d5612750..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Name1
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx
deleted file mode 100644
index b2aa65b9233..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Name2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Name2" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Name2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="80px" Description="HtmlForm_Name_1">
-			<FORM id="myForm1" name="" encType="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx.cs
deleted file mode 100644
index daadb5f8544..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Name2
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx
deleted file mode 100644
index 84683b9a058..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Target.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Target" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Target</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="104px" Description="HtmlForm_Target_1">
-			<FORM id="myForm1" target="update.aspx" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx.cs
deleted file mode 100755
index d196807b0b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Target
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx
deleted file mode 100644
index 6ff6e6b9f06..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Target1.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Target1" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Target1</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="296px" Description="HtmlForm_Target_1">
-			<FORM id="myForm1" target="_self" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx.cs
deleted file mode 100644
index 8506595a6d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Target1
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx
deleted file mode 100644
index 7b2311f1cf4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlForm_Target2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlForm_Target2" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlForm_Target2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="152px" Description="HtmlForm_Target_1">
-			<FORM id="myForm1" target="" enctype="application/x-www-form-urlencoded" runat="server">
-			</FORM>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx.cs
deleted file mode 100644
index e2a0b34c28c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlForm_Target2
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx
deleted file mode 100644
index 1e524348474..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlGenericControl_TagName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlGenericControl_TagName" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlGenericControl_TagName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="88px" Description="HtmlGenericControl_TagName_1">
-				<DIV id="myDiv" runat="server">text in div</DIV>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="88px" Width="553px" Description="HtmlGenericControl_TagName_2">
-				<DIV id="myUnknown1" runat="server">text in unknown1</DIV>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Height="88px" Width="553px" Description="HtmlGenericControl_TagName_3">
-				<DIV id="myUnknown2" runat="server">text in unknown2</DIV>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx.cs
deleted file mode 100644
index 7d85d24a533..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlGenericControl_TagName
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl myDiv;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl myUnknown1;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl myUnknown2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				myDiv.TagName = "span";
-				GHTSubTestAddResult(myDiv.TagName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				myUnknown1.TagName = "unknown";
-				GHTSubTestAddResult(myUnknown1.TagName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				myUnknown2.TagName = "";
-				GHTSubTestAddResult(myUnknown2.TagName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx
deleted file mode 100644
index 85df5b30a3e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlGenericControl_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlGenericControl_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlGenericControl_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="88px" Description="HtmlGenericControl_ctor_1">
-				<DIV id="myDiv1" runat="server">text in div</DIV>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="88px" Width="553px" Description="HtmlGenericControl_ctor_2">
-				<SPAN id="mySpan1" runat="server">text in span</SPAN>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="96px" Width="553px" Description="HtmlGenericControl_ctor_3">
-				<P id="myParagraph1" runat="server">text in paragraph1</P>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="96px" Width="553px" Description="HtmlGenericControl_ctor_4">
-				<P id="myParagraph2" runat="server">text in paragraph2</P>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx.cs
deleted file mode 100644
index be29cbd06c1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlGenericControl_ctor_
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl myDiv1;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl mySpan1;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl myParagraph1;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl myParagraph2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				GHTSubTestAddResult(myParagraph2.TagName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx
deleted file mode 100644
index 6044fed15d5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlGenericControl_ctor_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlGenericControl_ctor_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlGenericControl_ctor_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="80px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx.cs
deleted file mode 100644
index cc7a8c97727..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlGenericControl_ctor_S
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				System.Web.UI.HtmlControls.HtmlGenericControl gc = new System.Web.UI.HtmlControls.HtmlGenericControl("div");
-				GHTActiveSubTest.Controls.Add(gc);
-				GHTSubTestAddResult(gc.TagName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx
deleted file mode 100644
index 49e7611b1dc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputButton_CausesValidation.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputButton_CausesValidation" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputButton_CausesValidation</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx.cs
deleted file mode 100644
index 832a577e99d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputButton_CausesValidation
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			//False
-			GHTSubTestBegin("Causes validation = false");
-			try 
-			{
-				System.Web.UI.HtmlControls.HtmlInputButton btn = new System.Web.UI.HtmlControls.HtmlInputButton();
-				btn.CausesValidation = false;
-				GHTActiveSubTest.Controls.Add(btn);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			//true
-			GHTSubTestBegin("Causes validation = true");
-			try 
-			{
-				System.Web.UI.HtmlControls.HtmlInputButton btn = new System.Web.UI.HtmlControls.HtmlInputButton();
-				btn.CausesValidation = true;
-				GHTActiveSubTest.Controls.Add(btn);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx
deleted file mode 100644
index 024780bf6eb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputHidden_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputHidden_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputHidden_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="104px" Description="HtmlInputHidden_ctor_1">
-					<INPUT id="Hidden1" type="hidden" value="value" name="Hidden1" runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="104px" Width="553px" Description="HtmlInputHidden_ctor_2">
-					<INPUT id="Hidden2" type="hidden" name="Hidden1" runat="server"></cc1:GHTSubTest>
-			</P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx.cs
deleted file mode 100644
index 50e74f8c74f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputHidden_ctor_
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.HtmlControls.HtmlInputHidden Hidden1;
-		protected System.Web.UI.HtmlControls.HtmlInputHidden Hidden2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Hidden2.Value = "new value of hidden2";
-				GHTSubTestAddResult(Hidden2.Value);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx
deleted file mode 100644
index c2e6d696328..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputImage_Align.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputImage_Align" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputImage_Align</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Align_1">
-					<INPUT id="Image1" type="image" src="/test.img" align="left" value="value of ImageInput1"
-						name="InputImage1" runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Align_2">
-					<INPUT id="Image2" type="image" src="/test.img" align="notExist" value="value of ImageInput2"
-						name="InputImage2" runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Align_3">
-					<INPUT id="Image3" type="image" src="/test.img" value="value of ImageInput3" name="InputImage3"
-						runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Align_4">
-					<INPUT id="Image4" type="image" src="/test.img" align="right" value="value of ImageInput4"
-						name="InputImage4" runat="server"></cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx.cs
deleted file mode 100644
index 63a77cf3ab1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputImage_Align
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image1;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image2;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image3;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Image4.Align = "left";
-				GHTSubTestAddResult(Image4.Align);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx
deleted file mode 100644
index 7cd34f15c2a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputImage_Alt.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputImage_Alt" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputImage_Alt</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Alt_1">
-					<INPUT id="Image1" type="image" alt="alt of ImageInput1" src="/test.img" value="value of ImageInput1"
-						name="InputImage1" runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Alt_2">
-					<INPUT id="Image2" type="image" alt="" src="/test.img" value="value of ImageInput1" name="InputImage1"
-						runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Alt_3">
-					<INPUT id="Image3" type="image" alt="alt of ImageInput3" src="/test.img" value="value of ImageInput1"
-						name="InputImage1" runat="server"></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest4" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Alt_4">
-					<INPUT id="Image4" type="image" alt="alt of ImageInput4" src="/test.img" value="value of ImageInput1"
-						name="InputImage1" runat="server"></cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx.cs
deleted file mode 100644
index a6d6593b36d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputImage_Alt
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image1;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image2;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image3;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Image3.Alt = "code inserted alt";
-				GHTSubTestAddResult(Image3.Alt);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				Image4.Alt = "123";
-				GHTSubTestAddResult(Image4.Alt);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx
deleted file mode 100644
index f44f28f347d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputImage_Border.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputImage_Border" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputImage_Border</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Border_1">
-					<INPUT id="Image1" type="image" src="/test.img" value="value of ImageInput1" name="InputImage1"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Border_2">
-					<INPUT id="Image2" type="image" src="/test.img" value="value of ImageInput2" name="InputImage2"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Border_3">
-					<INPUT id="Image3" type="image" src="/test.img" value="value of ImageInput3" name="InputImage3"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Border_4">
-					<INPUT id="Image4" type="image" src="/test.img" value="value of ImageInput4" name="InputImage4"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="Ghtsubtest5" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Border_5">
-					<INPUT id="Image5" type="image" src="/test.img" value="value of ImageInput4" border="7"
-						name="InputImage4" runat="server">
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx.cs
deleted file mode 100644
index 0404ac727ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputImage_Border
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image1;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image2;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image3;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image4;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Image1.Border = 0;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Image2.Border = 2;
-				GHTSubTestAddResult(Image2.Border.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Image3.Border = 2;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Image4.Border = -1;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx
deleted file mode 100644
index 9d431aa0169..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputImage_CausesValidation.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputImage_CausesValidation" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputImage_CausesValidation</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_CausesValidation_1">
-					<INPUT id="Image1" type="image" src="/test.img" value="value of ImageInput1" name="InputImage1"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_CausesValidation_2">
-					<INPUT id="Image2" type="image" src="/test.img" value="value of ImageInput2" name="InputImage2"
-						runat="server">
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx.cs
deleted file mode 100644
index cb9f32cc049..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputImage_CausesValidation
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image1;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Image1.CausesValidation = false;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Image2.CausesValidation = true;
-				GHTSubTestAddResult(Image2.CausesValidation.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx
deleted file mode 100644
index c5640a27e24..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputImage_Src.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputImage_Src" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputImage_Src</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Src_1">
-					<INPUT id="Image1" type="image" src="/test.img" value="value of ImageInput1" name="InputImage1"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Src_2">
-					<INPUT id="Image2" type="image" src="" value="value of ImageInput2" name="InputImage2"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Src_3">
-					<INPUT id="Image3" type="image" src="/test.img" value="value of ImageInput3" name="InputImage3"
-						runat="server">
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px" Description="HtmlInputImage_Src_4">
-					<INPUT id="Image4" type="image" src="/test.img" value="value of ImageInput4" name="InputImage4"
-						runat="server">
-				</cc1:GHTSubTest></P>
-		</form>
-		<BR>
-		<BR>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx.cs
deleted file mode 100644
index 1b11bb98ae5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputImage_Src
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image1;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image2;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image3;
-		protected System.Web.UI.HtmlControls.HtmlInputImage Image4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Image3.Src = "/image.jpg";
-				GHTSubTestAddResult(Image3.Src);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Image4.Src = "123";
-				GHTSubTestAddResult(Image4.Src);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx
deleted file mode 100644
index 379ad0f7f5c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlInputImage_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlInputImage_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlInputImage_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px" Description="HtmlInputImage_ctor_1">
-					<INPUT id="InputImage1" type="image" src="/test.img" name="InputImage1" runat="server"></cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx.cs
deleted file mode 100644
index 670dbfd3d60..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlInputImage_ctor_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx
deleted file mode 100644
index 519a3751e23..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx
+++ /dev/null
@@ -1,51 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_Cols.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_Cols" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_Cols</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px" Description="HtmlTextArea_Cols_1">
-					<TEXTAREA id="TEXTAREA1" name="TEXTAREA1" rows="2" cols="20" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Cols_2">
-					<TEXTAREA id="Textarea2" name="TEXTAREA2" rows="2" cols="10" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest>
-			</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Cols_3">
-					<TEXTAREA id="Textarea3" name="TEXTAREA3" rows="2" cols="0" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Cols_4">
-					<TEXTAREA id="Textarea4" name="TEXTAREA4" rows="2" cols="-20" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Cols_5">
-					<TEXTAREA id="Textarea5" name="TEXTAREA5" rows="2" cols="-20" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx.cs
deleted file mode 100644
index 15692c4e11a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_Cols
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA1;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea2;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea3;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea4;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Textarea5.Cols = 7;
-				GHTSubTestAddResult(Textarea5.Cols.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx
deleted file mode 100644
index a6826cfbc74..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_Name.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_Name" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_Name</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px" Description="HtmlTextArea_Name_1">
-					<TEXTAREA id="TEXTAREA1" name="TEXTAREA1" rows="2" cols="20" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Name_2">
-					<TEXTAREA id="TEXTAREA2" name="name name" rows="2" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Name_3">
-					<TEXTAREA id="TEXTAREA3" name="name_!@#$%^&amp;*()" rows="2" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Name_4">
-					<TEXTAREA id="TEXTAREA4" name="" rows="2" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Name_5">
-					<TEXTAREA id="TEXTAREA5" name="TEXTAREA5" rows="2" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Name_6">
-					<TEXTAREA id="Textarea6" name="TEXTAREA5" rows="2" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest>
-				<br>
-			</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx.cs
deleted file mode 100644
index e4aa40b8265..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_Name
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA1;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA2;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA3;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA4;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA5;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				TEXTAREA5.Name = "nameOfTextArea";
-				GHTSubTestAddResult(TEXTAREA5.Name);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				Textarea6.Name = "123";
-				GHTSubTestAddResult(Textarea6.Name);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx
deleted file mode 100644
index aeea04132cf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_Rows.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_Rows" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_Rows</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="64px" Description="HtmlTextArea_Rows_1">
-					<TEXTAREA id="TEXTAREA1" name="TEXTAREA1" rows="2" cols="20" runat="server">Sample Text</TEXTAREA>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="64px" Width="553px" Description="HtmlTextArea_Rows_2">
-					<TEXTAREA id="Textarea2" name="TEXTAREA2" rows="20" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="64px" Width="553px" Description="HtmlTextArea_Rows_3">
-					<TEXTAREA id="Textarea3" name="TEXTAREA3" rows="-20" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="64px" Width="553px" Description="HtmlTextArea_Rows_4">
-					<TEXTAREA id="Textarea4" name="TEXTAREA4" rows="0" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="64px" Width="553px" Description="HtmlTextArea_Rows_5">
-					<TEXTAREA id="Textarea5" name="TEXTAREA5" rows="2" cols="20" runat="server">Sample Text</TEXTAREA></cc1:GHTSubTest>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx.cs
deleted file mode 100644
index b1d5d6777b1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_Rows
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA1;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea2;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea3;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea4;
-		protected System.Web.UI.HtmlControls.HtmlTextArea Textarea5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Textarea5.Rows = 7;
-				GHTSubTestAddResult(Textarea5.Rows.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx
deleted file mode 100644
index 43346a5533d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_Value.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_Value" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_Value</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px" Description="HtmlTextArea_Value_1">
-					<TEXTAREA id="TEXTAREA1" name="TEXTAREA1" rows="2" cols="20" runat="server">					</TEXTAREA>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Value_2">
-					<TEXTAREA id="TEXTAREA2" name="TEXTAREA2" rows="2" cols="20" runat="server">Sample Value</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Value_3">
-					<TEXTAREA id="TEXTAREA3" name="TEXTAREA3" rows="2" cols="20" runat="server">123</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Value_4">
-					<TEXTAREA id="TEXTAREA4" name="TEXTAREA4" rows="2" cols="20" runat="server">"text text text"</TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Value_5">
-					<TEXTAREA id="TEXTAREA5" name="TEXTAREA5" rows="2" cols="20" runat="server"></TEXTAREA></cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="56px" Width="553px" Description="HtmlTextArea_Value_6">
-					<TEXTAREA id="TEXTAREA6" name="TEXTAREA6" rows="2" cols="20" runat="server"></TEXTAREA></cc1:GHTSubTest>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx.cs
deleted file mode 100644
index ae6df5fe56d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_Value
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA1;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA2;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA3;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA4;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA5;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				TEXTAREA5.Value = "new value";
-				GHTSubTestAddResult(TEXTAREA5.Value);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				TEXTAREA6.Value = "123";
-				GHTSubTestAddResult(TEXTAREA6.Value);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx
deleted file mode 100644
index 5ec92e35db8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="296px" Description="HtmlTextArea_ctor_1">
-				<TEXTAREA id="TEXTAREA1" name="TEXTAREA1" rows="2" cols="20" runat="server">Sample Text</TEXTAREA>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx.cs
deleted file mode 100644
index ed8f1de92b4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_ctor_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx
deleted file mode 100644
index 90edb06ca17..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_ctor_2.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_ctor_2" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_ctor_2</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx.cs
deleted file mode 100644
index 6d13c20cedd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_ctor_2
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTSubTestBegin("GHTSubTest1");
-			try 
-			{
-				System.Web.UI.HtmlControls.HtmlTextArea ta = new System.Web.UI.HtmlControls.HtmlTextArea();
-				ta.Value = "sample text";
-				GHTActiveSubTest.Controls.Add(ta);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx
deleted file mode 100644
index fed84d517d9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HtmlTextArea_ctor_3.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_HtmlControls.HtmlTextArea_ctor_3" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HtmlTextArea_ctor_3</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="296px" Description="HtmlTextArea_ctor_1">
-				<TEXTAREA id="TEXTAREA1" name="TEXTAREA1" rows="2" cols="20" runat="server"></TEXTAREA>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx.cs
deleted file mode 100644
index 433bcbaaa3f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_HtmlControls
-{
-	public class HtmlTextArea_ctor_3
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.HtmlControls.HtmlTextArea TEXTAREA1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			TEXTAREA1.Value = "Sample Text";
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx
deleted file mode 100644
index f12283ccc5a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx
+++ /dev/null
@@ -1,99 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_CellPadding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_CellPadding" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_CellPadding</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P><br>
-				<cc1:ghtsubtest id="GHTSubTest1" runat="server" DESIGNTIMEDRAGDROP="36" Description="DataGrid_CellPadding1"
-					Width="176px" Height="123px">
-					<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest2" tabIndex="5" runat="server" Height="40px" Width="277px" Description="DataGrid_CellPadding3">
-					<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False" CellPadding="5">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest3" runat="server" Description="DataGrid_CellPadding2" Width="225px"
-					Height="148px">
-					<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False" CellPadding="0">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest4" tabIndex="5" runat="server" Description="DataGrid_CellPadding4"
-					Width="215px" Height="40px">
-					<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False" CellPadding="0">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest5" runat="server" Width="86px">
-					<asp:DataList id="DataList1" runat="server" GridLines="Both">
-						<ItemTemplate>
-							<td><%# DataBinder.Eval(Container.DataItem,"colA") %></td>
-							<td><%# DataBinder.Eval(Container.DataItem,"colB") %></td>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest6" runat="server" Width="86px">
-					<asp:DataList id="DataList2" runat="server" GridLines="Both">
-						<ItemTemplate>
-							<td><%# DataBinder.Eval(Container.DataItem,"colA") %></td>
-							<td><%# DataBinder.Eval(Container.DataItem,"colB") %></td>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest7" runat="server" Width="103px">
-					<asp:DataList id="DataList3" runat="server" DESIGNTIMEDRAGDROP="258" GridLines="Both">
-						<ItemTemplate>
-							<td><%# DataBinder.Eval(Container.DataItem,"colA") %></td>
-							<td><%# DataBinder.Eval(Container.DataItem,"colB") %></td>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest8" runat="server" Width="93px">
-					<asp:DataList id="DataList4" runat="server" GridLines="Both">
-						<ItemTemplate>
-							<td><%# DataBinder.Eval(Container.DataItem,"colA") %></td>
-							<td><%# DataBinder.Eval(Container.DataItem,"colB") %></td>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx.cs
deleted file mode 100644
index 40611fb8dbd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using GHTTests;
-using GHTWebControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_CellPadding
-		: GHTDataListBase
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			TestCellPadding(DataGrid1, GHTSubTest1, -1);
-			TestCellPadding(DataGrid2, GHTSubTest2, 0);
-			TestCellPadding(DataGrid3, GHTSubTest3, 2);
-			TestCellPaddingError(DataGrid4, GHTSubTest4, -2);
-			TestCellPadding(DataList2, GHTSubTest6, 0);
-			TestCellPadding(DataList1, GHTSubTest5, -1);
-			TestCellPadding(DataList3, GHTSubTest7, 2);
-			TestCellPaddingError(DataList4, GHTSubTest8, -2);
-
-
-			GHTTestEnd();
-		}
-		private void TestCellPadding(BaseDataList ctl, GHTSubTest SubTest, int CellPadding)
-		{
-			try
-			{
-				base.GHTActiveSubTest = SubTest;
-				ctl.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				ctl.DataBind();
-				ctl.CellPadding = CellPadding;
-			}
-			catch (Exception exception2)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			}
-		}
- 
-		private void TestCellPaddingError(BaseDataList ctl, GHTSubTest SubTest, int CellPadding)
-		{
-			try
-			{
-				base.GHTActiveSubTest = SubTest;
-				ctl.DataBind();
-				ctl.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				ctl.CellPadding = CellPadding;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception3)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception3);
-			}
-			catch (Exception exception4)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			}
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx
deleted file mode 100644
index af505f24a1a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx
+++ /dev/null
@@ -1,109 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_CellSpacing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_CellSpacing" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_CellSpacing</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<P><BR>
-				<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="123px" Width="176px" Description="DataGrid_CellSpacing1"
-					DESIGNTIMEDRAGDROP="36">
-					<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest2" tabIndex="5" runat="server" Height="40px" Width="277px" Description="DataGrid_CellSpacing2">
-					<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False" CellPadding="5">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="148px" Width="225px" Description="DataGrid_CellSpacing32">
-					<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False" CellPadding="0">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest4" tabIndex="5" runat="server" Height="40px" Width="215px" Description="DataGrid_CellSpacing4">
-					<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False" CellPadding="0">
-						<Columns>
-							<asp:BoundColumn DataField="colA" HeaderText="col a"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colB" HeaderText="col b"></asp:BoundColumn>
-							<asp:BoundColumn DataField="colC" HeaderText="col C"></asp:BoundColumn>
-						</Columns>
-					</asp:DataGrid>
-				</cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="GHTSubTest5" runat="server" Width="86px" Description="DataList_CellSpacing1">
-					<asp:DataList id="DataList1" runat="server" GridLines="Both">
-						<ItemTemplate>
-							<asp:TextBox id=TextBox1 runat="server" Width="39px" Text='<%# DataBinder.Eval(Container.DataItem,"colA") %>'>
-							</asp:TextBox>
-							<asp:TextBox id=TextBox2 runat="server" Width="31px" Text='<%# DataBinder.Eval(Container.DataItem,"colB") %>'>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest6" runat="server" Width="86px" Description="DataList_CellSpacing2">
-					<asp:DataList id="DataList2" runat="server" GridLines="Both">
-						<ItemTemplate>
-							<asp:TextBox id=TextBox1 runat="server" Width="39px" Text='<%# DataBinder.Eval(Container.DataItem,"colA") %>'>
-							</asp:TextBox>
-							<asp:TextBox id=TextBox2 runat="server" Width="31px" Text='<%# DataBinder.Eval(Container.DataItem,"colB") %>'>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest7" runat="server" Width="103px" Description="DataList_CellSpacing3">
-					<asp:DataList id="DataList3" runat="server" DESIGNTIMEDRAGDROP="258" GridLines="Both">
-						<ItemTemplate>
-							<asp:TextBox id=TextBox1 runat="server" Width="39px" Text='<%# DataBinder.Eval(Container.DataItem,"colA") %>'>
-							</asp:TextBox>
-							<asp:TextBox id=TextBox2 runat="server" Width="31px" Text='<%# DataBinder.Eval(Container.DataItem,"colB") %>'>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="GHTSubTest8" runat="server" Width="93px" Description="DataList_CellSpacing4">
-					<asp:DataList id="DataList4" runat="server" GridLines="Both">
-						<ItemTemplate>
-							<asp:TextBox id=TextBox1 runat="server" Width="39px" Text='<%# DataBinder.Eval(Container.DataItem,"colA") %>'>
-							</asp:TextBox>
-							<asp:TextBox id=TextBox2 runat="server" Width="31px" Text='<%# DataBinder.Eval(Container.DataItem,"colB") %>'>
-							</asp:TextBox>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-		</FORM>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx.cs
deleted file mode 100644
index f5210489006..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using GHTTests;
-using GHTWebControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_CellSpacing
-		: GHTDataListBase
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			TestCellSpacing(DataGrid1, GHTSubTest1, -1);
-			TestCellSpacing(DataGrid2, GHTSubTest2, 0);
-			TestCellSpacing(DataGrid3, GHTSubTest3, 2);
-			TestCellSpacingError(DataGrid4, GHTSubTest4, -2);
-			TestCellSpacing(DataList2, GHTSubTest6, 0);
-			TestCellSpacing(DataList1, GHTSubTest5, -1);
-			TestCellSpacing(DataList3, GHTSubTest7, 2);
-			TestCellSpacingError(DataList4, GHTSubTest8, -2);
-			GHTTestEnd();
-		}
-		private void TestCellSpacingError(BaseDataList ctl, GHTSubTest SubTest, int CellSpacing)
-		{
-			try
-			{
-				base.GHTActiveSubTest = SubTest;
-				ctl.DataBind();
-				ctl.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				ctl.CellSpacing = CellSpacing;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception3)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception3);
-			}
-			catch (Exception exception4)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			}
-		}
- 
-		private void TestCellSpacing(BaseDataList ctl, GHTSubTest SubTest, int CellSpacing)
-		{
-			try
-			{
-				base.GHTActiveSubTest = SubTest;
-				ctl.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				ctl.DataBind();
-				ctl.CellSpacing = CellSpacing;
-			}
-			catch (Exception exception2)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			}
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx
deleted file mode 100644
index 30942a95eac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_Controls.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_Controls" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_Controls</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<br>
-			<br>
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx.cs
deleted file mode 100644
index a805fd7ecea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Data;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_Controls
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			this.GHTTestBegin(frm);
-			DataGrid grid1 = new DataGrid();
-			this.GHTBuildSampleDataGrid(grid1);
-			this.TestControls(grid1);
-			DataList list1 = new DataList();
-			this.GHTBuildSampleDataList(list1);
-			this.TestControls(list1);
-			this.GHTTestEnd();
-		}
-
-		private void TestControls(BaseDataList ctl)
-		{
-			this.GHTSubTestBegin("BaseDataList_" + ctl.GetType().Name + "_Controls1");
-			base.GHTActiveSubTest.Controls.Add(ctl);
-			try
-			{
-				ControlCollection collection1 = ctl.Controls;
-			}
-			catch (Exception exception2)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx
deleted file mode 100644
index be8d0e27a9e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_DataBind_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_DataBind_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_DataBind_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx.cs
deleted file mode 100644
index c703bc098b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Data;
-using System.Text;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_DataBind_
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-
-			GHTTestBegin(frm);
-
-			this.Test(typeof(DataGrid), new BaseDataList_DataBind_.BuildDataListControl(this.GHTBuildSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_DataBind_.BuildDataListControl(this.GHTBuildSampleDataList));
-			testDataSetBind();
-
-			GHTTestEnd();
-		}
-
-		private void Test(Type CtlType, BaseDataList_DataBind_.BuildDataListControl CtlBuilder)
-		{
-			BaseDataList list1;
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataBind1");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception3)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			}
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataBind2");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = "Unknown";
-				list1.DataBind();
-				this.GHTSubTestExpectedExceptionNotCaught("??????");
-			}
-			catch (Exception exception4)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception4);
-				return;
-			}
-		}
-
-		private void testDataSetBind()
-		{
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_DataGrid_DataBind3");
-				DataGrid grid1 = new DataGrid();
-				base.GHTActiveSubTest.Controls.Add(grid1);
-				DataSet set1 = new DataSet();
-				string text1 = "<NewDataSet><TestRunDetails><Test_x0020_Id>13266</Test_x0020_Id><Name>OleDbCommand_Transaction</Name></TestRunDetails></NewDataSet>";
-				MemoryStream stream1 = new MemoryStream();
-				byte[] buffer1 = Encoding.Default.GetBytes(text1);
-				stream1.Write(buffer1, 0, buffer1.Length);
-				stream1.Seek(0, SeekOrigin.Begin);
-				set1.ReadXml(stream1);
-				set1.Tables[0].Columns["Test Id"].ColumnName = "TestId";
-				grid1.DataSource = set1;
-				grid1.DataBind();
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-		}
- 
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx
deleted file mode 100644
index a9e05187b8c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_DataKeyField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_DataKeyField" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_DataKeyField</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx.cs
deleted file mode 100644
index c9c7a010661..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_DataKeyField
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-
-			GHTTestBegin(frm);
-
-			this.Test(typeof(DataGrid), new BaseDataList_DataKeyField.BuildDataListControl(this.GHTBuildSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_DataKeyField.BuildDataListControl(this.GHTBuildSampleDataList));
-
-			GHTTestEnd();
-
-		}
-		private void Test(Type CtlType, BaseDataList_DataKeyField.BuildDataListControl CtlBuilder)
-		{
-			BaseDataList list1;
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataKeyField1");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				CtlBuilder(list1);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				list1.DataKeyField = "colB";
-			}
-			catch (Exception exception4)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataKeyField2");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				CtlBuilder(list1);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				list1.DataKeyField = "colB";
-				this.GHTSubTestAddResult("Result = " + list1.DataKeyField);
-			}
-			catch (Exception exception5)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataKeyField3");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				list1.DataKeyField = "Unknown";
-			}
-			catch (Exception exception6)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			}
-			this.GHTSubTestEnd();
-		}
- 	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx
deleted file mode 100644
index 483383c9cf2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_DataKeys.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_DataKeys" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_DataKeys</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx.cs
deleted file mode 100644
index bb7f87f0551..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_DataKeys
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-
-			GHTTestBegin(frm);
-
-			this.Test(typeof(DataGrid), new BaseDataList_DataKeys.BuildDataListControl(this.GHTBuildSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_DataKeys.BuildDataListControl(this.GHTBuildSampleDataList));
-			
-			GHTTestEnd();
-
-		}
-		private void Test(Type CtlType, BaseDataList_DataKeys.BuildDataListControl CtlBuilder)
-		{
-			try
-			{
-				string text1 = "";
-				IEnumerator enumerator1 = null;
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataKeys1");
-				BaseDataList list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				list1.DataKeyField = "colA";
-				CtlBuilder(list1);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				try
-				{
-					enumerator1 = list1.DataKeys.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text2 = (string)(enumerator1.Current);
-						text1 = text1 + text2 + "-";
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-				this.GHTSubTestAddResult("DataKeys = " + text1);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx
deleted file mode 100644
index 4975a7c82ff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_DataMember.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_DataMember" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_DataMember</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx.cs
deleted file mode 100644
index 15150377bd7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_DataMember
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-
-			this.Test(typeof(DataGrid), new BaseDataList_DataMember.BuildDataListControl(this.GHTBuildUnboundSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_DataMember.BuildDataListControl(this.GHTBuildUnboundSampleDataList));
-			
-			GHTTestEnd();
-
-		}
-		private void Test(Type CtlType, BaseDataList_DataMember.BuildDataListControl CtlBuilder)
-		{
-			BaseDataList list1;
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataMember1");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSourceDS();
-				list1.DataMember = "Sample";
-				list1.DataBind();
-			}
-			catch (Exception exception4)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataMember1");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSourceDS();
-				list1.DataMember = "Unknown";
-				list1.DataBind();
-				this.GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException exception5)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception5);
-			}
-			catch (Exception exception6)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx
deleted file mode 100644
index 2299356d5a8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_DataSource.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_DataSource" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_DataSource</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx.cs
deleted file mode 100644
index 7ace1df44d1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_DataSource
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-
-			this.Test(typeof(DataGrid), new BaseDataList_DataSource.BuildDataListControl(this.GHTBuildUnboundSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_DataSource.BuildDataListControl(this.GHTBuildUnboundSampleDataList));
-  
-			GHTTestEnd();
-		}
-		private void Test(Type CtlType, BaseDataList_DataSource.BuildDataListControl CtlBuilder)
-		{
-			BaseDataList list1;
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataSource1");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSourceDS();
-				list1.DataMember = "Sample";
-				list1.DataBind();
-			}
-			catch (Exception exception6)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataSource2");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception7)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataSource3");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSourceArray();
-				list1.DataBind();
-			}
-			catch (Exception exception8)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataSource5");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = "Unknown";
-				list1.DataBind();
-				this.GHTSubTestExpectedExceptionNotCaught("httpException");
-			}
-			catch (Exception exception9)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception9);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataSource6");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = null;
-				list1.DataBind();
-			}
-			catch (Exception exception10)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception10);
-			}
-			this.GHTSubTestEnd();
-		}
- 	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx
deleted file mode 100644
index 28604dce51d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_GridLines.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_GridLines" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_GridLines</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx.cs
deleted file mode 100644
index 306610870e8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class BaseDataList_GridLines
-        : GHTDataListBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-	 private delegate void BuildDataListControl(BaseDataList ctl);
-
-
-        private void Page_Load(object sender, System.EventArgs e) 
-		{
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			this.Test(typeof(DataGrid), new BaseDataList_GridLines.BuildDataListControl(this.GHTBuildUnboundSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_GridLines.BuildDataListControl(this.GHTBuildUnboundSampleDataList));
-
-            GHTTestEnd();
-
-        }
-	 private void Test(Type CtlType, BaseDataList_GridLines.BuildDataListControl CtlBuilder)
-	 {
-		 BaseDataList list1;
-		 try
-		 {
-			 this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_GridLines1");
-			 list1 = (BaseDataList) this.GHTElementClone(CtlType);
-			 base.GHTActiveSubTest.Controls.Add(list1);
-			 CtlBuilder(list1);
-			 list1.GridLines = GridLines.Both;
-			 list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-			 list1.DataBind();
-			 this.GHTSubTestExpectedExceptionNotCaught("argumentOutOfRange");
-		 }
-		 catch (Exception exception9)
-		 {
-			 this.GHTSubTestUnexpectedExceptionCaught(exception9);
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_GridLines2");
-			 list1 = (BaseDataList) this.GHTElementClone(CtlType);
-			 base.GHTActiveSubTest.Controls.Add(list1);
-			 CtlBuilder(list1);
-			 list1.GridLines = GridLines.Horizontal;
-			 list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-			 list1.DataBind();
-		 }
-		 catch (Exception exception10)
-		 {
-			 this.GHTSubTestUnexpectedExceptionCaught(exception10);
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_GridLines3");
-			 list1 = (BaseDataList) this.GHTElementClone(CtlType);
-			 base.GHTActiveSubTest.Controls.Add(list1);
-			 CtlBuilder(list1);
-			 list1.GridLines = GridLines.Vertical;
-			 list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-			 list1.DataBind();
-		 }
-		 catch (Exception exception11)
-		 {
-			 this.GHTSubTestUnexpectedExceptionCaught(exception11);
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_GridLines4");
-			 list1 = (BaseDataList) this.GHTElementClone(CtlType);
-			 base.GHTActiveSubTest.Controls.Add(list1);
-			 CtlBuilder(list1);
-			 list1.GridLines = GridLines.None;
-			 list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-			 list1.DataBind();
-		 }
-		 catch (Exception exception12)
-		 {
-			 this.GHTSubTestUnexpectedExceptionCaught(exception12);
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_GridLines5");
-			 list1 = (BaseDataList) this.GHTElementClone(CtlType);
-			 base.GHTActiveSubTest.Controls.Add(list1);
-			 CtlBuilder(list1);
-			 list1.GridLines = ~GridLines.None;
-			 list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-			 list1.DataBind();
-		 }
-		 catch (ArgumentOutOfRangeException exception13)
-		 {
-			 this.GHTSubTestExpectedExceptionCaught(exception13);
-		 }
-		 catch (Exception exception14)
-		 {
-			 this.GHTSubTestUnexpectedExceptionCaught(exception14);
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_GridLines5");
-			 list1 = (BaseDataList) this.GHTElementClone(CtlType);
-			 base.GHTActiveSubTest.Controls.Add(list1);
-			 CtlBuilder(list1);
-			 list1.GridLines = (GridLines) 4;
-			 list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-			 list1.DataBind();
-		 }
-		 catch (ArgumentOutOfRangeException exception15)
-		 {
-			 this.GHTSubTestExpectedExceptionCaught(exception15);
-		 }
-		 catch (Exception exception16)
-		 {
-			 this.GHTSubTestUnexpectedExceptionCaught(exception16);
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
-
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx
deleted file mode 100644
index f0eecb1ab98..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_HorizontalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx.cs
deleted file mode 100644
index a122c003ad2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_HorizontalAlign
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			this.Test(typeof(DataGrid), new BaseDataList_HorizontalAlign.BuildDataListControl(this.GHTBuildUnboundSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_HorizontalAlign.BuildDataListControl(this.GHTBuildUnboundSampleDataList));
-    
-			GHTTestEnd();
-
-		}
-		private void Test(Type CtlType, BaseDataList_HorizontalAlign.BuildDataListControl CtlBuilder)
-		{
-			BaseDataList list1;
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign1");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = HorizontalAlign.Center;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception10)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception10);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign2");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = HorizontalAlign.Justify;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception11)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception11);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign3");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = HorizontalAlign.Left;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception12)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception12);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign4");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = HorizontalAlign.NotSet;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception13)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception13);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign5");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = HorizontalAlign.Right;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-			}
-			catch (Exception exception14)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception14);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign6");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = ~HorizontalAlign.NotSet;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-				this.GHTSubTestExpectedExceptionNotCaught("argumentOutOfRange");
-			}
-			catch (ArgumentOutOfRangeException exception15)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception15);
-			}
-			catch (Exception exception16)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception16);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_HorizontalAlign7");
-				list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.HorizontalAlign = HorizontalAlign.Justify | HorizontalAlign.Left;
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-				this.GHTSubTestExpectedExceptionNotCaught("argumentOutOfRange");
-			}
-			catch (ArgumentOutOfRangeException exception17)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception17);
-			}
-			catch (Exception exception18)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception18);
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx
deleted file mode 100644
index f1200020fc5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_IsBindableType_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_IsBindableType_T" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_IsBindableType_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx.cs
deleted file mode 100644
index 4924cdb5398..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_IsBindableType_T
-		: GHTDataListBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private Type [] marrBindaleType = {typeof(System.Boolean), 
-											  typeof(System.Byte), 
-											  typeof(System.Int16),
-											  typeof(System.UInt16),
-											  typeof(System.Int32), 
-											  typeof(System.UInt32),
-											  typeof(System.Int64), 
-											  typeof(System.UInt64), 
-											  typeof(System.Char), 
-											  typeof(System.Double), 
-											  typeof(System.Single), 
-											  typeof(System.DateTime), 
-											  typeof(System.Decimal), 
-											  typeof(System.SByte), 
-											  typeof(MyPrivateClass), 
-											  typeof(System.String)};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			Test(typeof(System.Web.UI.WebControls.DataGrid));
-			Test(typeof(System.Web.UI.WebControls.DataList));
-			GHTTestEnd();
-
-		}
-		private void Test(Type CtlType)
-		{
-			Type type1;
-			bool flag1;
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_IsBindableType1");
-				Type[] typeArray1 = this.marrBindaleType;
-				for (int num1 = 0; num1 < typeArray1.Length; num1++)
-				{
-					type1 = typeArray1[num1];
-					flag1 = BaseDataList.IsBindableType(type1);
-					this.GHTSubTestAddResult(type1.ToString() + " is bindable = " + flag1.ToString());
-				}
-			}
-			catch (Exception exception4)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_IsBindableType2");
-				type1 = null;
-				flag1 = BaseDataList.IsBindableType(null);
-				this.GHTSubTestAddResult("Nothing is bindable = " + flag1.ToString());
-				this.GHTSubTestExpectedExceptionNotCaught("NullReferenceException");
-			}
-			catch (NullReferenceException exception5)
-			{
-				this.GHTSubTestExpectedExceptionCaught(exception5);
-				return;
-			}
-			catch (Exception exception6)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				return;
-			}
-		}
- 
-		private class MyPrivateClass
-		{
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx
deleted file mode 100644
index 712dcb385dd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseDataList_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseDataList_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx.cs
deleted file mode 100644
index 56e28bf4a1b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BaseDataList_ctor_
-		: GHTDataListBase
-	{
-		private delegate void BuildDataListControl(BaseDataList ctl);
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			HtmlForm form1 = (HtmlForm) this.FindControl("form1");
-			this.GHTTestBegin(form1);
-			this.Test(typeof(DataGrid), new BaseDataList_ctor_.BuildDataListControl(this.GHTBuildSampleDataGrid));
-			this.Test(typeof(DataList), new BaseDataList_ctor_.BuildDataListControl(this.GHTBuildSampleDataList));
-			this.GHTTestEnd();
-		}
-		private void Test(Type CtlType, BaseDataList_ctor_.BuildDataListControl CtlBuilder)
-		{
-			try
-			{
-				this.GHTSubTestBegin("BaseDataList_" + CtlType.Name + "_DataBind1");
-				BaseDataList list1 = (BaseDataList) this.GHTElementClone(CtlType);
-				base.GHTActiveSubTest.Controls.Add(list1);
-				CtlBuilder(list1);
-				list1.DataSource = GHTDataListBase.GHTGetSampleDataSource();
-				list1.DataBind();
-				list1.Caption = "Caption Text";
-				list1.CaptionAlign = TableCaptionAlign.Right;
-				list1.UseAccessibleHeader = true;
-			}
-			catch (Exception exception2)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			}
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx
deleted file mode 100644
index dcf59d9336d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BaseValidator_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseValidator_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BaseValidator_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:RequiredFieldValidator id="RequiredFieldValidator1" runat="server" ErrorMessage="RequiredFieldValidator"
-					ControlToValidate="TextBox1"></asp:RequiredFieldValidator>
-				<asp:TextBox id="TextBox1" runat="server"></asp:TextBox>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx.cs
deleted file mode 100644
index 841ee9c55fe..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class BaseValidator_ctor_
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx
deleted file mode 100644
index ca33dd706e7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BorderStyle_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BorderStyle_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>BorderStyle_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx.cs
deleted file mode 100644
index 48cfcf60ea3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BorderStyle_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.BorderStyle");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(BorderStyle));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(BorderStyle));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx
deleted file mode 100644
index 55e2bf0d194..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BoundColumn_DataField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BoundColumn_DataField" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BoundColumn_DataField</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField=""></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="NotExist"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx.cs
deleted file mode 100644
index 88919d600d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BoundColumn_DataField
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.BoundColumn c_id = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.BoundColumn c_name = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_id.DataField = "ID";
-				c_name.DataField = "Name";
-				c_company.DataField = "Company";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataField);
-				GHTSubTestAddResult(c_name.DataField);
-				GHTSubTestAddResult(c_company.DataField);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.BoundColumn c_empty = new System.Web.UI.WebControls.BoundColumn();
-				c_empty.DataField = "";
-
-				DataGrid2.Columns.Add(c_empty);
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(c_empty.DataField);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.BoundColumn c_ne = new System.Web.UI.WebControls.BoundColumn();
-				c_ne.DataField = "NotExist";
-
-				DataGrid3.Columns.Add(c_ne);
-				DataGrid3.DataBind();;
-			
-
-				GHTSubTestAddResult(c_ne.DataField);
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid6.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx
deleted file mode 100644
index df8d388a329..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BoundColumn_DataFormatString.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BoundColumn_DataFormatString" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BoundColumn_DataFormatString</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="ID" DataFormatString=""></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name" DataFormatString="sample text"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company" DataFormatString="{0:c5}"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx.cs
deleted file mode 100644
index 2d1fe691c8d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BoundColumn_DataFormatString
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();;
-				System.Web.UI.WebControls.BoundColumn c_id = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.BoundColumn c_name = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_id.DataField = "ID";
-				c_name.DataField = "Name";
-				c_company.DataField = "Company";
-
-				c_id.DataFormatString = "";
-				c_name.DataFormatString = "slkdjflkfslkjf slkfjsl ks jlflks d";
-				c_company.DataFormatString = "{0:c2}";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(c_id.DataFormatString);
-				GHTSubTestAddResult(c_name.DataFormatString);
-				GHTSubTestAddResult(c_company.DataFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx
deleted file mode 100644
index 045dfe7bdc6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BoundColumn_InitializeCell_TIL.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BoundColumn_InitializeCell_TIL" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BoundColumn_InitializeCell_TIL</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx.cs
deleted file mode 100644
index 23207898820..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BoundColumn_InitializeCell_TIL
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemDataBound += new DataGridItemEventHandler(DataGrid1_ItemDataBound);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			base.GHTActiveSubTest = this.GHTSubTest1;
-			try
-			{
-				this.DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				BoundColumn column2 = new BoundColumn();
-				BoundColumn column3 = new BoundColumn();
-				BoundColumn column1 = new BoundColumn();
-				column2.DataField = "ID";
-				column3.DataField = "Name";
-				column1.DataField = "Company";
-				this.DataGrid1.Columns.Add(column2);
-				this.DataGrid1.Columns.Add(column3);
-				this.DataGrid1.Columns.Add(column1);
-				this.DataGrid1.DataBind();
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTTestEnd();
-		}
- 
-
-		private void DataGrid1_ItemDataBound(object sender, DataGridItemEventArgs e)
-		{
-			ListItemType type1 = e.Item.ItemType;
-			if (((type1 != ListItemType.Header) && (type1 != ListItemType.Footer)) && (type1 != ListItemType.Separator))
-			{
-				TableCell cell1 = (TableCell) e.Item.Controls[0];
-				this.DataGrid1.Columns[1].InitializeCell(cell1, 1, ListItemType.Item);
-				cell1.Attributes.Add("Index", e.Item.ItemIndex.ToString());
-			}
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx
deleted file mode 100644
index 88a38f77662..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BoundColumn_ReadOnly.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BoundColumn_ReadOnly" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BoundColumn_ReadOnly</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="ID" DataFormatString="" ReadOnly=False></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="ID" DataFormatString="" ReadOnly=True></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx.cs
deleted file mode 100644
index f60f64c3c03..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BoundColumn_ReadOnly
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-
-				System.Web.UI.WebControls.BoundColumn c_id = new System.Web.UI.WebControls.BoundColumn();
-				c_id.DataField = "ID";
-				c_id.ReadOnly = false;
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(c_id.ReadOnly.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-
-				System.Web.UI.WebControls.BoundColumn c_id = new System.Web.UI.WebControls.BoundColumn();
-				c_id.DataField = "ID";
-				c_id.ReadOnly = true;
-
-				DataGrid2.Columns.Add(c_id);
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(c_id.ReadOnly.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(((System.Web.UI.WebControls.BoundColumn)DataGrid3.Columns[0]).ReadOnly.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(((System.Web.UI.WebControls.BoundColumn)DataGrid4.Columns[0]).ReadOnly.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx
deleted file mode 100644
index 2e09090ad2f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="BoundColumn_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.BoundColumn_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>BoundColumn_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx.cs
deleted file mode 100644
index a1c66780106..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class BoundColumn_ctor_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.BoundColumn c_id = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.BoundColumn c_name = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_id.DataField = "ID";
-				c_name.DataField = "Name";
-				c_company.DataField = "Company";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx
deleted file mode 100644
index e04a7f7bb9c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Button_CausesValidation.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Button_CausesValidation" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Button_CausesValidation</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 32px; POSITION: absolute; TOP: 24px"
-				runat="server" Width="136px" Height="56px">
-				<asp:Button id="Button1" runat="server" Text="Button"></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 32px; POSITION: absolute; TOP: 96px"
-				runat="server" Height="56px" Width="136px">
-				<asp:Button id="Button2" runat="server" Text="Button" CausesValidation="False"></asp:Button>
-			</cc1:GHTSubTest>&nbsp;
-			<asp:TextBox id="TextBox1" style="Z-INDEX: 103; LEFT: 208px; POSITION: absolute; TOP: 24px" runat="server"></asp:TextBox>
-			<br>
-			<br>
-			<asp:RequiredFieldValidator id="RequiredFieldValidator1" style="Z-INDEX: 104; LEFT: 208px; POSITION: absolute; TOP: 80px"
-				runat="server" ErrorMessage="RequiredFieldValidator" ControlToValidate="TextBox1"></asp:RequiredFieldValidator>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx.cs
deleted file mode 100644
index 488d75679d9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class Button_CausesValidation
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            //Put user code to initialize the page here
-
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_Text.aspx
deleted file mode 100644
index e79d3de8412..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_Text.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Button_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Button_Text" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Button_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="168px" Height="64px">
-				<asp:Button id="Button1" runat="server" Text="qwerpoiuytlkjahsdfgmnzxcbv"></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 392px"
-				runat="server" Height="64px" Width="168px">
-				<asp:Button id="Button6" runat="server" Text=""></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 312px"
-				runat="server" Height="64px" Width="168px">
-				<asp:Button id="Button5" runat="server" Text="         "></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 232px"
-				runat="server" Height="64px" Width="168px">
-				<asp:Button id="Button4" runat="server" Text="   adfasdf   asdfasdf   "></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 160px"
-				runat="server" Height="64px" Width="168px">
-				<asp:Button id="Button3" runat="server" Text="~`!@#$%^&amp;*&amp;()_+-=[]\{}|;':&quot;,./<>?"></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 88px"
-				runat="server" Height="64px" Width="168px">
-				<asp:Button id="Button2" runat="server" Text="1234567890"></asp:Button>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_Text.aspx.cs
deleted file mode 100644
index c7882182e10..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Button/Button_Text.aspx.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class Button_Text : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            //Put user code to initialize the page here
-
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx
deleted file mode 100644
index 3f3bb5f2ac8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_ButtonType.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_ButtonType" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_ButtonType</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" ButtonType="LinkButton"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name" ButtonType="LinkButton"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company" ButtonType="LinkButton"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" ButtonType="PushButton"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name" ButtonType="PushButton"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company" ButtonType="PushButton"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx.cs
deleted file mode 100644
index d8c673fcd0f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Data;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ButtonColumn_ButtonType
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.DataGrid DataGrid1;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid4;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest4;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid5;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest5;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid6;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest6;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 base.GHTActiveSubTest = this.GHTSubTest1;
-		 try
-		 {
-			 this.DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-			 ButtonColumn column2 = new ButtonColumn();
-			 ButtonColumn column3 = new ButtonColumn();
-			 ButtonColumn column1 = new ButtonColumn();
-			 column2.DataTextField = "ID";
-			 column3.DataTextField = "Name";
-			 column1.DataTextField = "Company";
-			 this.DataGrid1.Columns.Add(column2);
-			 this.DataGrid1.Columns.Add(column3);
-			 this.DataGrid1.Columns.Add(column1);
-			 this.DataGrid1.DataBind();
-			 this.GHTSubTestAddResult(column2.ButtonType.ToString());
-			 this.GHTSubTestAddResult(column3.ButtonType.ToString());
-			 this.GHTSubTestAddResult(column1.ButtonType.ToString());
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception1 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest2;
-		 try
-		 {
-			 this.DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-			 ButtonColumn column5 = new ButtonColumn();
-			 ButtonColumn column6 = new ButtonColumn();
-			 ButtonColumn column4 = new ButtonColumn();
-			 column5.DataTextField = "ID";
-			 column6.DataTextField = "Name";
-			 column4.DataTextField = "Company";
-			 column5.ButtonType = ButtonColumnType.LinkButton;
-			 column6.ButtonType = ButtonColumnType.LinkButton;
-			 column4.ButtonType = ButtonColumnType.LinkButton;
-			 this.DataGrid2.Columns.Add(column5);
-			 this.DataGrid2.Columns.Add(column6);
-			 this.DataGrid2.Columns.Add(column4);
-			 this.DataGrid2.DataBind();
-			 this.GHTSubTestAddResult(column5.ButtonType.ToString());
-			 this.GHTSubTestAddResult(column6.ButtonType.ToString());
-			 this.GHTSubTestAddResult(column4.ButtonType.ToString());
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception2 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest3;
-		 try
-		 {
-			 this.DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-			 ButtonColumn column8 = new ButtonColumn();
-			 ButtonColumn column9 = new ButtonColumn();
-			 ButtonColumn column7 = new ButtonColumn();
-			 column8.DataTextField = "ID";
-			 column9.DataTextField = "Name";
-			 column7.DataTextField = "Company";
-			 column8.ButtonType = ButtonColumnType.PushButton;
-			 column9.ButtonType = ButtonColumnType.PushButton;
-			 column7.ButtonType = ButtonColumnType.PushButton;
-			 this.DataGrid3.Columns.Add(column8);
-			 this.DataGrid3.Columns.Add(column9);
-			 this.DataGrid3.Columns.Add(column7);
-			 this.DataGrid3.DataBind();
-			 this.GHTSubTestAddResult(column8.ButtonType.ToString());
-			 this.GHTSubTestAddResult(column9.ButtonType.ToString());
-			 this.GHTSubTestAddResult(column7.ButtonType.ToString());
-		 }
-		 catch (Exception exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 Exception exception3 = exception9;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest4;
-		 try
-		 {
-			 this.DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-			 this.DataGrid4.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[0]).ButtonType.ToString());
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[1]).ButtonType.ToString());
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[2]).ButtonType.ToString());
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception4 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest5;
-		 try
-		 {
-			 this.DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable();
-			 this.DataGrid5.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid5.Columns[0]).ButtonType.ToString());
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid5.Columns[1]).ButtonType.ToString());
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid5.Columns[2]).ButtonType.ToString());
-		 }
-		 catch (Exception exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 Exception exception5 = exception11;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest6;
-		 try
-		 {
-			 this.DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable();
-			 this.DataGrid6.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid6.Columns[0]).ButtonType.ToString());
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid6.Columns[1]).ButtonType.ToString());
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid6.Columns[2]).ButtonType.ToString());
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception6 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx
deleted file mode 100644
index d4015b26bb3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_CommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_CommandName" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_set_CommandName_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" CommandName=""></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" CommandName="MyCommand"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx.cs
deleted file mode 100644
index 779b20439f9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ButtonColumn_CommandName
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.DataGrid DataGrid1;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid4;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 base.GHTActiveSubTest = this.GHTSubTest1;
-		 try
-		 {
-			 this.DataGrid1.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column1 = new ButtonColumn();
-			 column1.DataTextField = "Name";
-			 column1.CommandName = "";
-			 this.DataGrid1.Columns.Add(column1);
-			 this.DataGrid1.DataBind();
-			 this.GHTSubTestAddResult(column1.CommandName);
-		 }
-		 catch (Exception exception5)
-		 {
-			 // (exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest2;
-		 try
-		 {
-			 this.DataGrid2.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column2 = new ButtonColumn();
-			 column2.DataTextField = "Name";
-			 column2.CommandName = "MyCommand";
-			 this.DataGrid2.Columns.Add(column2);
-			 this.DataGrid2.DataBind();
-			 this.GHTSubTestAddResult(column2.CommandName);
-		 }
-		 catch (Exception exception6)
-		 {
-			 // (exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest3;
-		 try
-		 {
-			 this.DataGrid3.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid3.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[0]).CommandName);
-		 }
-		 catch (Exception exception7)
-		 {
-			 // (exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest4;
-		 try
-		 {
-			 this.DataGrid4.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid4.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[0]).CommandName);
-		 }
-		 catch (Exception exception8)
-		 {
-			 // (exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx
deleted file mode 100644
index 707a6a040b4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx
+++ /dev/null
@@ -1,64 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_DataTextField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_DataTextField" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_set_DataTextField_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField=""></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="NotExist"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx.cs
deleted file mode 100644
index dc81af9df79..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ButtonColumn_DataTextField
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.DataGrid DataGrid1;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid4;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest4;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid5;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest5;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid6;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest6;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 base.GHTActiveSubTest = this.GHTSubTest1;
-		 try
-		 {
-			 this.DataGrid1.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column2 = new ButtonColumn();
-			 ButtonColumn column3 = new ButtonColumn();
-			 ButtonColumn column1 = new ButtonColumn();
-			 column2.DataTextField = "ID";
-			 column3.DataTextField = "Name";
-			 column1.DataTextField = "Company";
-			 this.DataGrid1.Columns.Add(column2);
-			 this.DataGrid1.Columns.Add(column3);
-			 this.DataGrid1.Columns.Add(column1);
-			 this.DataGrid1.DataBind();
-			 this.GHTSubTestAddResult(column2.DataTextField);
-			 this.GHTSubTestAddResult(column3.DataTextField);
-			 this.GHTSubTestAddResult(column1.DataTextField);
-		 }
-		 catch (Exception exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 Exception exception1 = exception9;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest2;
-		 try
-		 {
-			 this.DataGrid2.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column4 = new ButtonColumn();
-			 ButtonColumn column5 = new ButtonColumn();
-			 ButtonColumn column6 = new ButtonColumn();
-			 column4.DataTextField = "";
-			 column5.DataTextField = "Name";
-			 column6.DataTextField = "Name";
-			 this.DataGrid2.Columns.Add(column4);
-			 this.DataGrid2.Columns.Add(column5);
-			 this.DataGrid2.Columns.Add(column6);
-			 this.DataGrid2.DataBind();
-			 this.GHTSubTestAddResult(column4.DataTextField);
-			 this.GHTSubTestAddResult(column5.DataTextField);
-			 this.GHTSubTestAddResult(column6.DataTextField);
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception2 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest3;
-		 try
-		 {
-			 this.DataGrid3.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column7 = new ButtonColumn();
-			 column7.DataTextField = "NotExist";
-			 this.DataGrid3.Columns.Add(column7);
-			 this.DataGrid3.DataBind();
-			 this.GHTSubTestAddResult(column7.DataTextField);
-			 this.GHTSubTestExpectedExceptionNotCaught("HttpException");
-		 }
-		 catch (HttpException exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 HttpException exception3 = exception11;
-			 this.GHTSubTestExpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception4 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest4;
-		 try
-		 {
-			 this.DataGrid4.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid4.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[0]).DataTextField);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[1]).DataTextField);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[2]).DataTextField);
-		 }
-		 catch (Exception exception13)
-		 {
-			 // ProjectData.SetProjectError(exception13);
-			 Exception exception5 = exception13;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest5;
-		 try
-		 {
-			 this.DataGrid5.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid5.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid5.Columns[0]).DataTextField);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid5.Columns[1]).DataTextField);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid5.Columns[2]).DataTextField);
-		 }
-		 catch (Exception exception14)
-		 {
-			 // ProjectData.SetProjectError(exception14);
-			 Exception exception6 = exception14;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest6;
-		 try
-		 {
-			 this.DataGrid6.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid6.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid6.Columns[0]).DataTextField);
-			 this.GHTSubTestExpectedExceptionNotCaught("HttpException");
-		 }
-		 catch (HttpException exception15)
-		 {
-			 // ProjectData.SetProjectError(exception15);
-			 HttpException exception7 = exception15;
-			 this.GHTSubTestExpectedExceptionCaught(exception7);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception16)
-		 {
-			 // ProjectData.SetProjectError(exception16);
-			 Exception exception8 = exception16;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception8);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx
deleted file mode 100644
index 3346d6bcc72..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_DataTextFormatString.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_DataTextFormatString" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_set_DataTextFormatString_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" DataTextFormatString=""></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name" DataTextFormatString="(format str)"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company" DataTextFormatString="{0:c5}"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" DataTextFormatString=""></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="ID" DataTextFormatString="(format str)"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="ID" DataTextFormatString="{0:c5}"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx.cs
deleted file mode 100644
index 9f955facd5e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ButtonColumn_DataTextFormatString
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			base.GHTActiveSubTest = this.GHTSubTest1;
-			try
-			{
-				this.DataGrid1.DataSource = GHDataSources.DSDataTable();
-				ButtonColumn column2 = new ButtonColumn();
-				ButtonColumn column3 = new ButtonColumn();
-				ButtonColumn column1 = new ButtonColumn();
-				column2.DataTextField = "ID";
-				column3.DataTextField = "Name";
-				column1.DataTextField = "Company";
-				column2.DataTextFormatString = "";
-				column3.DataTextFormatString = "(format str)";
-				column1.DataTextFormatString = "{0:c5}";
-				this.DataGrid1.Columns.Add(column2);
-				this.DataGrid1.Columns.Add(column3);
-				this.DataGrid1.Columns.Add(column1);
-				this.DataGrid1.DataBind();
-				this.GHTSubTestAddResult(column2.DataTextFormatString);
-				this.GHTSubTestAddResult(column3.DataTextFormatString);
-				this.GHTSubTestAddResult(column1.DataTextFormatString);
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			base.GHTActiveSubTest = this.Ghtsubtest2;
-			try
-			{
-				this.DataGrid2.DataSource = GHDataSources.DSDataTable();
-				ButtonColumn column4 = new ButtonColumn();
-				ButtonColumn column5 = new ButtonColumn();
-				ButtonColumn column6 = new ButtonColumn();
-				column4.DataTextField = "ID";
-				column5.DataTextField = "ID";
-				column6.DataTextField = "ID";
-				column4.DataTextFormatString = "";
-				column5.DataTextFormatString = "(format str)";
-				column6.DataTextFormatString = "{0:c5}";
-				this.DataGrid2.Columns.Add(column4);
-				this.DataGrid2.Columns.Add(column5);
-				this.DataGrid2.Columns.Add(column6);
-				this.DataGrid2.DataBind();
-				this.GHTSubTestAddResult(column4.DataTextFormatString);
-				this.GHTSubTestAddResult(column5.DataTextFormatString);
-				this.GHTSubTestAddResult(column6.DataTextFormatString);
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			base.GHTActiveSubTest = this.Ghtsubtest3;
-			try
-			{
-				this.DataGrid3.DataSource = GHDataSources.DSDataTable();
-				this.DataGrid3.DataBind();
-				this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[0]).DataTextFormatString);
-				this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[1]).DataTextFormatString);
-				this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[2]).DataTextFormatString);
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			base.GHTActiveSubTest = this.Ghtsubtest4;
-			try
-			{
-				this.DataGrid4.DataSource = GHDataSources.DSDataTable();
-				this.DataGrid4.DataBind();
-				this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[0]).DataTextFormatString);
-				this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[1]).DataTextFormatString);
-				this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[2]).DataTextFormatString);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_FormatDataTextValue_O.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_FormatDataTextValue_O.aspx
deleted file mode 100644
index 60dc5693c77..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_FormatDataTextValue_O.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_FormatDataTextValue_O.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_FormatDataTextValue_O" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_FormatDataTextValue_O</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_FormatDataTextValue_O.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_FormatDataTextValue_O.aspx.cs
deleted file mode 100644
index b139eaf5479..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_FormatDataTextValue_O.aspx.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ButtonColumn_FormatDataTextValue_O
-    : GHTBaseWeb {
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx
deleted file mode 100644
index dcce2d6cbc5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_InitializeCell_TIL.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_InitializeCell_TIL" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_Initialize_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx.cs
deleted file mode 100644
index 046f3d480ac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ButtonColumn_InitializeCell_TIL
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.DataGrid DataGrid1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-		 this.DataGrid1.ItemDataBound += new DataGridItemEventHandler(DataGrid1_ItemDataBound);
-
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 base.GHTActiveSubTest = this.GHTSubTest1;
-		 try
-		 {
-			 this.DataGrid1.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column2 = new ButtonColumn();
-			 ButtonColumn column3 = new ButtonColumn();
-			 ButtonColumn column1 = new ButtonColumn();
-			 column2.DataTextField = "ID";
-			 column3.DataTextField = "Name";
-			 column1.DataTextField = "Company";
-			 this.DataGrid1.Columns.Add(column2);
-			 this.DataGrid1.Columns.Add(column3);
-			 this.DataGrid1.Columns.Add(column1);
-			 this.DataGrid1.DataBind();
-		 }
-		 catch (Exception exception2)
-		 {
-			 Exception exception1 = exception2;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-		 }
-		 this.GHTTestEnd();
-	 }
-	 private void DataGrid1_ItemDataBound(object sender, DataGridItemEventArgs e)
-	 {
-		 ListItemType type1 = e.Item.ItemType;
-		 if (((type1 != ListItemType.Header) && (type1 != ListItemType.Footer)) && (type1 != ListItemType.Separator))
-		 {
-			 TableCell cell1 = (TableCell) e.Item.Controls[0];
-			 this.DataGrid1.Columns[1].InitializeCell(cell1, 1, ListItemType.Item);
-			 cell1.Attributes.Add("Index", e.Item.ItemIndex.ToString());
-		 }
-	 }
- 
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx
deleted file mode 100644
index 452f79e1474..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ButtonColumn_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_Text" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_set_Text_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn DataTextField="ID" Text=""></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name" Text="Text"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company" Text="Button Text with!@#$%^&*()_+"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:ButtonColumn Text=""></asp:ButtonColumn>
-						<asp:ButtonColumn Text="Text"></asp:ButtonColumn>
-						<asp:ButtonColumn Text="Button Text with!@#$%^&*()_+"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="ID" Text=""></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name" Text="Text"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company" Text="Button Text with!@#$%^&*()_+"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx.cs
deleted file mode 100644
index db52a09c90b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ButtonColumn_Text
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.DataGrid DataGrid1;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
- 	protected System.Web.UI.WebControls.DataGrid DataGrid4;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-	 private void Page_Load(object sender, EventArgs e)
-	 {
-		 HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-		 this.GHTTestBegin(form1);
-		 base.GHTActiveSubTest = this.GHTSubTest1;
-		 try
-		 {
-			 this.DataGrid1.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column2 = new ButtonColumn();
-			 ButtonColumn column3 = new ButtonColumn();
-			 ButtonColumn column1 = new ButtonColumn();
-			 column2.DataTextField = "ID";
-			 column3.DataTextField = "Name";
-			 column1.DataTextField = "Company";
-			 column2.Text = "";
-			 column3.Text = "Text";
-			 column1.Text = "Button Text with!@#$%^&*()_+";
-			 this.DataGrid1.Columns.Add(column2);
-			 this.DataGrid1.Columns.Add(column3);
-			 this.DataGrid1.Columns.Add(column1);
-			 this.DataGrid1.DataBind();
-			 this.GHTSubTestAddResult(column2.Text);
-			 this.GHTSubTestAddResult(column3.Text);
-			 this.GHTSubTestAddResult(column1.Text);
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest2;
-		 try
-		 {
-			 this.DataGrid2.DataSource = GHDataSources.DSDataTable();
-			 ButtonColumn column6 = new ButtonColumn();
-			 ButtonColumn column7 = new ButtonColumn();
-			 ButtonColumn column8 = new ButtonColumn();
-			 ButtonColumn column5 = new ButtonColumn();
-			 ButtonColumn column9 = new ButtonColumn();
-			 ButtonColumn column4 = new ButtonColumn();
-			 column5.DataTextField = "ID";
-			 column9.DataTextField = "Name";
-			 column4.DataTextField = "Company";
-			 column6.Text = "";
-			 column7.Text = "Text";
-			 column8.Text = "Button Text with!@#$%^&*()_+";
-			 this.DataGrid2.Columns.Add(column6);
-			 this.DataGrid2.Columns.Add(column7);
-			 this.DataGrid2.Columns.Add(column8);
-			 this.DataGrid2.Columns.Add(column5);
-			 this.DataGrid2.Columns.Add(column9);
-			 this.DataGrid2.Columns.Add(column4);
-			 this.DataGrid2.DataBind();
-			 this.GHTSubTestAddResult(column6.Text);
-			 this.GHTSubTestAddResult(column7.Text);
-			 this.GHTSubTestAddResult(column8.Text);
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest3;
-		 try
-		 {
-			 this.DataGrid3.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid3.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[0]).Text);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[1]).Text);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid3.Columns[2]).Text);
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 base.GHTActiveSubTest = this.Ghtsubtest4;
-		 try
-		 {
-			 this.DataGrid4.DataSource = GHDataSources.DSDataTable();
-			 this.DataGrid4.DataBind();
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[0]).Text);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[1]).Text);
-			 this.GHTSubTestAddResult(((ButtonColumn) this.DataGrid4.Columns[2]).Text);
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx
deleted file mode 100644
index 67f3a88630a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page language="c#" Codebehind="ButtonColumn_ctor_.aspx.cs" AutoEventWireup="false" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ButtonColumn_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ButtonColumn_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-			<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-			<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-				<Columns>
-					<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-					<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-					<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-				</Columns>
-			</asp:DataGrid></cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx.cs
deleted file mode 100644
index 8c764e7b6d3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	/// <summary>
-	/// Summary description for ButtonColumn_ctor_.
-	/// </summary>
-	public class ButtonColumn_ctor_ : GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-	
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			base.GHTActiveSubTest = this.GHTSubTest1;
-			try
-			{
-				this.DataGrid1.DataSource = GHDataSources.DSDataTable();
-				ButtonColumn column2 = new ButtonColumn();
-				ButtonColumn column3 = new ButtonColumn();
-				ButtonColumn column1 = new ButtonColumn();
-				column2.DataTextField = "ID";
-				column3.DataTextField = "Name";
-				column1.DataTextField = "Company";
-				this.DataGrid1.Columns.Add(column2);
-				this.DataGrid1.Columns.Add(column3);
-				this.DataGrid1.Columns.Add(column1);
-				this.DataGrid1.DataBind();
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			base.GHTActiveSubTest = this.Ghtsubtest2;
-			try
-			{
-				this.DataGrid2.DataSource = GHDataSources.DSDataTable();
-				this.DataGrid2.DataBind();
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTTestEnd();
-		}
- 
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx
deleted file mode 100644
index 3e0c6eb3c10..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CalendarSelectionMode_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CalendarSelectionMode_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>CalendarSelectionMode_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx.cs
deleted file mode 100644
index 66efe62bcfa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class CalendarSelectionMode_Enum
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm = (HtmlForm)FindControl("form1");
-            GHTTestBegin(frm);
-            // Testing if the object is not nothing
-            GHTSubTestBegin("System.Web.UI.WebControls.CalendarSelectionMode");
-				try 
-				{
-					GHTSubTestAddResult(Test());
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-            GHTSubTestEnd();
-            GHTTestEnd();
-        }
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(CalendarSelectionMode));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(CalendarSelectionMode));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx
deleted file mode 100644
index 761f380502f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBox_AutoPostBack.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBox_AutoPostBack" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBox_AutoPostBack</title>
-		<meta content="Microsoft Visual Studio .1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="120px" Height="72px">
-				<asp:CheckBox id="CheckBox1" runat="server" AutoPostBack="True"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 176px"
-				runat="server" Height="72px" Width="120px">
-				<asp:CheckBox id="CheckBox3" runat="server" AutoPostBack="False"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 96px"
-				runat="server" Height="72px" Width="120px">
-				<asp:CheckBox id="CheckBox2" runat="server"></asp:CheckBox>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx.cs
deleted file mode 100644
index a71c8e5af86..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class CheckBox_AutoPostBack
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            //Put user code to initialize the page here
-
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx
deleted file mode 100644
index db61b270f07..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBox_Checked.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBox_Checked" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBox_Checked</title>
-		<meta content="Microsoft Visual Studio .1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="144px" Height="48px">
-				<asp:CheckBox id="CheckBox1" runat="server" Checked="True"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="48px" Width="144px">
-				<asp:CheckBox id="CheckBox3" runat="server" Checked="False"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 72px"
-				runat="server" Height="48px" Width="144px">
-				<asp:CheckBox id="CheckBox2" runat="server"></asp:CheckBox>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx.cs
deleted file mode 100644
index ecb3047de22..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class CheckBox_Checked
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            //Put user code to initialize the page here
-
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx
deleted file mode 100644
index d4d6a8f7535..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBox_Enabled.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBox_Enabled" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBox_Enabled</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="48px" Width="144px" Description="Enabled TextBox">
-					<asp:CheckBox id="CheckBox1" runat="server" Text="Enabled text"></asp:CheckBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="40px" Description="Disabled TextBox">
-					<asp:CheckBox id="CheckBox2" runat="server" Text="Disabled text" Enabled="False"></asp:CheckBox>
-				</cc1:GHTSubTest>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx.cs
deleted file mode 100644
index 73ca48746fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class CheckBox_Enabled
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx
deleted file mode 100644
index 20a6d9afebd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBox_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBox_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBox_Text</title>
-		<meta content="Microsoft Visual Studio .1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="232px" Height="48px">
-				<asp:CheckBox id="CheckBox1" runat="server" Text="  abcdefghijklmnopq  rstuvwxyz  "></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 312px"
-				runat="server" Height="48px" Width="176px">
-				<asp:CheckBox id="CheckBox6" runat="server" Text="`~!@#$%^&amp;*()_+-={}|[]\;':&quot;,./??<>"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 248px"
-				runat="server" Height="48px" Width="176px">
-				<asp:CheckBox id="CheckBox5" runat="server" Text=""></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 184px"
-				runat="server" Height="48px" Width="152px">
-				<asp:CheckBox id="CheckBox4" runat="server" Width="120px" Text="aaaaaaaaaa aaaaaaaaaaa"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="48px" Width="176px">
-				<asp:CheckBox id="CheckBox3" runat="server" Text="               "></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 72px"
-				runat="server" Height="48px" Width="176px">
-				<asp:CheckBox id="CheckBox2" runat="server" Text="1234567890"></asp:CheckBox>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx.cs
deleted file mode 100644
index 4aca3f4ef06..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class CheckBox_Text
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            //Put user code to initialize the page here
-
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx
deleted file mode 100644
index 687a220a517..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBox_TextAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBox_TextAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBox_TextAlign</title>
-		<meta content="Microsoft Visual Studio .1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="160px" Height="32px">
-				<asp:CheckBox id="CheckBox1" runat="server"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 104px"
-				runat="server" Height="32px" Width="160px">
-				<asp:CheckBox id="CheckBox3" runat="server" TextAlign="Right"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 56px"
-				runat="server" Height="32px" Width="160px">
-				<asp:CheckBox id="CheckBox2" runat="server" TextAlign="Left"></asp:CheckBox>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx.cs
deleted file mode 100644
index d26f12bf103..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class CheckBox_TextAlign
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            //Put user code to initialize the page here
-
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx
deleted file mode 100644
index a7cca07b969..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBoxList_CellPadding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBoxList_CellPadding" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBoxList_CellPadding</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="80px" Height="104px">
-					<asp:CheckBoxList id="CheckBoxList1" runat="server">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="104px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList2" runat="server" CellPadding="0">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="104px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList3" runat="server" CellPadding="5">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx.cs
deleted file mode 100644
index 6b28a63b5fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class CheckBoxList_CellPadding
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Negative CellPading value
-			GHTSubTestBegin("Negative CellPading value");
-			try 
-			{
-				System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				cbl.CellPadding = -2;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx
deleted file mode 100644
index 94745ee6a4f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBoxList_CellSpacing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBoxList_CellSpacing" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>CheckBoxList_CellSpacing</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            <cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="104px" Width="80px">
-                <asp:CheckBoxList id="CheckBoxList1" runat="server">
-                    <asp:ListItem Value="Item1">Item1</asp:ListItem>
-                    <asp:ListItem Value="Item2">Item2</asp:ListItem>
-                    <asp:ListItem Value="Item3">Item3</asp:ListItem>
-                    <asp:ListItem Value="Item4">Item4</asp:ListItem>
-                </asp:CheckBoxList>
-            </cc1:GHTSubTest>
-            <P></P>
-            <P>
-                <cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="104px" Width="80px">
-                    <asp:CheckBoxList id="CheckBoxList2" runat="server" CellSpacing="0">
-                        <asp:ListItem Value="Item1">Item1</asp:ListItem>
-                        <asp:ListItem Value="Item2">Item2</asp:ListItem>
-                        <asp:ListItem Value="Item3">Item3</asp:ListItem>
-                        <asp:ListItem Value="Item4">Item4</asp:ListItem>
-                    </asp:CheckBoxList>
-                </cc1:GHTSubTest></P>
-            <P>
-                <cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="104px" Width="80px">
-                    <asp:CheckBoxList id="CheckBoxList3" runat="server" CellSpacing="5">
-                        <asp:ListItem Value="Item1">Item1</asp:ListItem>
-                        <asp:ListItem Value="Item2">Item2</asp:ListItem>
-                        <asp:ListItem Value="Item3">Item3</asp:ListItem>
-                        <asp:ListItem Value="Item4">Item4</asp:ListItem>
-                    </asp:CheckBoxList>
-                </cc1:GHTSubTest></P>
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx.cs
deleted file mode 100644
index 2b7799f4544..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class CheckBoxList_CellSpacing
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// Negative CellSpacing value
-			GHTSubTestBegin("Negative CellSpacing value");
-			try 
-			{
-				System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				cbl.CellSpacing = -2;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx
deleted file mode 100644
index f544f657ab5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx
+++ /dev/null
@@ -1,72 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBoxList_RepeatColumns.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBoxList_RepeatColumns" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBoxList_RepeatColumns</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P><cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList1" runat="server" RepeatColumns="0">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest>&nbsp;
-				<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList2" runat="server" RepeatColumns="1">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest>&nbsp;
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList3" runat="server" RepeatColumns="3">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:GHTSubTest>&nbsp;
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList4" runat="server" RepeatColumns="10">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx.cs
deleted file mode 100644
index 1e8d17080c2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class CheckBoxList_RepeatColumns
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Negative RepeateColumns value
-			GHTSubTestBegin("Negative RepeateColumns value");
-			try 
-			{
-				System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				cbl.RepeatColumns = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx
deleted file mode 100644
index 65cfbad31fa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx
+++ /dev/null
@@ -1,96 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBoxList_RepeatDirection.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBoxList_RepeatDirection" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBoxList_RepeatDirection</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList1" runat="server" RepeatColumns="0">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest>&nbsp;
-				<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList2" runat="server" RepeatColumns="0" RepeatDirection="Vertical">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest>&nbsp;
-				<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList3" runat="server" RepeatColumns="0" RepeatDirection="Horizontal">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList6" runat="server" RepeatColumns="2">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList5" runat="server" RepeatColumns="3" RepeatDirection="Vertical">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="96px" Width="80px">
-					<asp:CheckBoxList id="CheckBoxList4" runat="server" RepeatColumns="4" RepeatDirection="Horizontal">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-						<asp:ListItem Value="Item3">Item3</asp:ListItem>
-						<asp:ListItem Value="Item4">Item4</asp:ListItem>
-						<asp:ListItem Value="Item5">Item5</asp:ListItem>
-						<asp:ListItem Value="Item6">Item6</asp:ListItem>
-						<asp:ListItem Value="Item7">Item7</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:ghtsubtest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx.cs
deleted file mode 100644
index b1b2667ed7c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class CheckBoxList_RepeatDirection
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Non valid RepeateDirection value - not a number
-			GHTSubTestBegin("Non valid RepeateDirection value");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				//cbl.RepeatDirection = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("InvalidCastException");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Non valid RepeateDirection value - out of range
-			GHTSubTestBegin("Non valid RepeateDirection value");
-			try 
-			{
-				System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				cbl.RepeatDirection = (RepeatDirection)10;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx
deleted file mode 100644
index ba786a31d7a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBoxList_RepeatLayout.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBoxList_RepeatLayout" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBoxList_RepeatLayout</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="152px" Width="104px">
-				<asp:CheckBoxList id="CheckBoxList1" runat="server" RepeatColumns="0">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-					<asp:ListItem Value="Item7">Item7</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:ghtsubtest>&nbsp;
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="152px" Width="104px">
-				<asp:CheckBoxList id="CheckBoxList2" runat="server" RepeatColumns="0" RepeatLayout="Table">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-					<asp:ListItem Value="Item7">Item7</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="152px" Width="104px">
-				<asp:CheckBoxList id="CheckBoxList3" runat="server" RepeatColumns="0" RepeatLayout="Flow">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-					<asp:ListItem Value="Item7">Item7</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:ghtsubtest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx.cs
deleted file mode 100644
index dea90f14dab..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class CheckBoxList_RepeatLayout
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Ilegal RepeateLayout value - not a number
-			GHTSubTestBegin("Ilegal RepeateLayout value - not a number");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				//cbl.RepeatLayout = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("InvalidCastException");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			//Ilegal RepeateLayout value - out of range
-			GHTSubTestBegin("Ilegal RepeateLayout value - out of range");
-				try 
-				{
-					System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-					cbl.RepeatLayout = (RepeatLayout)10;
-					GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-				}
-				catch (ArgumentException ex) 
-				{
-					GHTSubTestExpectedExceptionCaught(ex);
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx
deleted file mode 100644
index a105bec3f17..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx
+++ /dev/null
@@ -1,63 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="CheckBoxList_TextAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.CheckBoxList_TextAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>CheckBoxList_TextAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="96px" Width="80px">
-				<asp:CheckBoxList id="CheckBoxList1" runat="server" RepeatColumns="0">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-					<asp:ListItem Value="Item7">Item7</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:ghtsubtest>&nbsp;
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="96px" Width="80px">
-				<asp:CheckBoxList id="CheckBoxList2" runat="server" RepeatColumns="0" TextAlign="Right">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-					<asp:ListItem Value="Item7">Item7</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:ghtsubtest>&nbsp;
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="96px" Width="80px">
-				<asp:CheckBoxList id="CheckBoxList3" runat="server" RepeatColumns="0" TextAlign="Left">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-					<asp:ListItem Value="Item7">Item7</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:ghtsubtest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx.cs
deleted file mode 100644
index 062134fbbd7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class CheckBoxList_TextAlign
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-						GHTTestBegin(frm);
-
-			// Ilegal TextAlign value - not a number
-			GHTSubTestBegin("Ilegal TextAlign value - not a number");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				//cbl.TextAlign = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("InvalidCastException");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Ilegal TextAlign value - out of range
-			GHTSubTestBegin("Ilegal TextAlign value - out of range");
-			try 
-			{
-				System.Web.UI.WebControls.CheckBoxList cbl = new System.Web.UI.WebControls.CheckBoxList();
-				cbl.TextAlign = (TextAlign)10;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx
deleted file mode 100644
index 22580f5eaef..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_AllowCustomPaging.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_AllowCustomPaging" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_AllowCustomPaging</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx.cs
deleted file mode 100644
index e3bfe215e87..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_AllowCustomPaging
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.AllowCustomPaging = true;
-				DataGrid1.VirtualItemCount = 5;
-				DataGrid1.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid1.DataBind();;;
-				GHTSubTestAddResult(DataGrid1.AllowCustomPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.AllowCustomPaging = true;
-				DataGrid2.VirtualItemCount = 7;
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid2.PageSize = 7;
-				DataGrid2.DataBind();;;
-				GHTSubTestAddResult(DataGrid2.AllowCustomPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.AllowCustomPaging = true;
-				DataGrid3.VirtualItemCount = 30;
-				DataGrid3.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid3.PageSize = 9;
-				DataGrid3.DataBind();;;
-				GHTSubTestAddResult(DataGrid3.AllowCustomPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.AllowCustomPaging = false;
-				DataGrid4.VirtualItemCount = 30;
-				DataGrid4.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid4.PageSize = 9;
-				DataGrid4.DataBind();;;
-				GHTSubTestAddResult(DataGrid4.AllowCustomPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid5.AllowPaging = true;
-				DataGrid5.AllowCustomPaging = true;
-				DataGrid5.VirtualItemCount = 70;
-				DataGrid5.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid5.PageSize = 9;
-				DataGrid5.DataBind();;
-				GHTSubTestAddResult(DataGrid5.AllowCustomPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx
deleted file mode 100644
index 8c462747752..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_AllowPaging.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_AllowPaging" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_AllowPaging</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx.cs
deleted file mode 100644
index 0f7779e22ac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_AllowPaging
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;;
-				GHTSubTestAddResult(DataGrid1.AllowPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = false;
-				DataGrid2.DataBind();;;
-				GHTSubTestAddResult(DataGrid2.AllowPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.DataBind();;;
-				GHTSubTestAddResult(DataGrid3.AllowPaging.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx
deleted file mode 100644
index 0846e6c6ae0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_AllowSorting.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_AllowSorting" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_AllowSorting</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx.cs
deleted file mode 100644
index 2b047df8361..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_AllowSorting
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.AllowSorting = false;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.AllowSorting.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.AllowSorting = true;
-				DataGrid2.DataBind();
-				GHTSubTestAddResult(DataGrid2.AllowSorting.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.AllowSorting.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx
deleted file mode 100644
index 9a3f83849fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_AlternatingItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_AlternatingItemStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_AlternatingItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-					<AlternatingItemStyle></AlternatingItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<AlternatingItemStyle VerticalAlign="Bottom" HorizontalAlign="Center" Wrap="True" BackColor="cyan"></AlternatingItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-					<AlternatingItemStyle VerticalAlign="Top" HorizontalAlign="RiGhT" Height="50" Wrap="false" BackColor="#ffff00"></AlternatingItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx.cs
deleted file mode 100644
index baa6c098212..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_AlternatingItemStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest4");;
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.AlternatingItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest5");;
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.AlternatingItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.AlternatingItemStyle.VerticalAlign = VerticalAlign.Top;
-				dg.AlternatingItemStyle.Wrap = false;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx
deleted file mode 100644
index 98193deff94..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_AutoGenerateColumns.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_AutoGenerateColumns" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_AutoGenerateColumns</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx.cs
deleted file mode 100644
index c7bb8892397..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_AutoGenerateColumns
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.AutoGenerateColumns.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.AutoGenerateColumns = true;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.AutoGenerateColumns.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.AutoGenerateColumns = false;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.AutoGenerateColumns.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx
deleted file mode 100644
index 88de196e394..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_BackImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_BackImageUrl" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_BackImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid7" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx.cs
deleted file mode 100644
index 0d746355e91..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_BackImageUrl
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.DataGrid DataGrid7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.BackImageUrl = "";
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.BackImageUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.BackImageUrl = "/GHTTests/System_Web_dll/System_Web_UI_WebControls/DataGrid/123123123text";
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.BackImageUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.BackImageUrl = "/GHTTests/System_Web_dll/System_Web_UI_WebControls/DataGrid/asldkfjalasldfjlasdf_______!@#$%^&*()";
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.BackImageUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid4.BackImageUrl = "http://127.0.0.1/images/image.gif";
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.BackImageUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid6.BackImageUrl = "/images/image.gif";
-				DataGrid6.DataBind();;
-				GHTSubTestAddResult(DataGrid6.BackImageUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest7;
-			try 
-			{
-				DataGrid7.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid7.BackImageUrl = "/GHTTests/System_Web_dll/System_Web_UI_WebControls/DataGrid/image>";
-				DataGrid7.DataBind();;
-				GHTSubTestAddResult(DataGrid7.BackImageUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx
deleted file mode 100644
index a2aa1cd57f0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_CancelCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_CancelCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_CancelCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx.cs
deleted file mode 100644
index d620776c82b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_CancelCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)(HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.CancelCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx
deleted file mode 100644
index f9ed92c7de3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_Columns.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_Columns" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_Columns</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit"></asp:EditCommandColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx.cs
deleted file mode 100644
index 089492d3f6c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_Columns
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(DataGrid1.Columns.GetType().ToString());
-				GHTSubTestAddResult(DataGrid1.Columns.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(DataGrid2.Columns.GetType().ToString());
-				GHTSubTestAddResult(DataGrid2.Columns.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			//Note:   
-			//Explicitly declared columns may be used in conjunction with auto-generated columns. 
-			//When using both, explicitly declared columns will be rendered first, 
-			//followed by the auto-generated columns. 
-			//Auto-generated columns are not added to the Columns collection.
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx
deleted file mode 100644
index 9593b761c1f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_CurrentPageIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_CurrentPageIndex" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_CurrentPageIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-function ScriptTest()
-{
-    var theform;
-	if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-		theform = document.forms["Form1"];
-	}
-	else {
-		theform = document.Form1;
-	}
-}
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest><cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest><cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest><cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest><cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest><cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx.cs
deleted file mode 100644
index a532232a2fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_CurrentPageIndex
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.CurrentPageIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.CurrentPageIndex = 0;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.CurrentPageIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.CurrentPageIndex = 2;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.CurrentPageIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.CurrentPageIndex = 7;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.CurrentPageIndex.ToString());
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid5.AllowPaging = true;
-				DataGrid5.CurrentPageIndex = -1;
-				DataGrid5.DataBind();;
-				GHTSubTestAddResult(DataGrid5.CurrentPageIndex.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid6.AllowPaging = true;
-				DataGrid6.CurrentPageIndex = 2;
-				DataGrid6.DataBind();;
-				GHTSubTestAddResult(DataGrid6.CurrentPageIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommand.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommand.aspx
deleted file mode 100644
index 00c3926f5ee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommand.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_DeleteCommand.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_DeleteCommand" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_DeleteCommand</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="Ghtsubtest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" PagerStyle-BackColor="#99cc33" FooterStyle-BackColor="#cccccc"
-					HeaderStyle-BackColor="#cccccc" BorderColor="#000000" BackColor="#ffffcc" BorderWidth="1">
-					<Columns>
-						<asp:ButtonColumn HeaderText="Delete item" Text="Delete" CommandName="Delete"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommand.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommand.aspx.cs
deleted file mode 100644
index f4b5547d52c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommand.aspx.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_DeleteCommand
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.DeleteCommand += new DataGridCommandEventHandler(DataGrid1_DeleteCommand);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest1;
-
-		private DataTable dt;
-
-		private void BindGrid(System.Web.UI.WebControls.DataGrid dg)
-		{
-			dg.DataSource = (DataTable)Session["data"];
-			dg.DataBind();;
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = Ghtsubtest1;;
-			try 
-			{
-				if (!IsPostBack)
-				{
-					dt = GHTTests.GHDataSources.DSDataTable();
-					Session["data"] = dt;
-					BindGrid(DataGrid1);
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_DeleteCommand(object source, System.Web.UI.WebControls.DataGridCommandEventArgs e)
-		{
-			try 
-			{
-				DataTable t_dt = (DataTable)Session["data"];
-
-				t_dt.Rows.RemoveAt(e.Item.DataSetIndex);
-				BindGrid(DataGrid1);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx
deleted file mode 100644
index 72fe9116ae6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_DeleteCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_DeleteCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_DeleteCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx.cs
deleted file mode 100644
index 1225c4c972e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_DeleteCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.DeleteCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx
deleted file mode 100644
index 3b63f98d64f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_EditCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_EditCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_EditCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx.cs
deleted file mode 100644
index b66451d2705..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_EditCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.EditCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx
deleted file mode 100644
index 63b74067f68..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_EditItemIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_EditItemIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_EditItemIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx.cs
deleted file mode 100644
index 42c57e9cf1e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_EditItemIndex
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.EditItemIndex = 1;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.EditItemIndex = 20;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid4.EditItemIndex = -17;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.EditItemIndex.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid5.EditItemIndex = 200;
-				DataGrid5.DataBind();;
-				GHTSubTestAddResult(DataGrid5.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx
deleted file mode 100644
index d83a37b458f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx
+++ /dev/null
@@ -1,58 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_EditItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_EditItemStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_EditItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-				<EditItemStyle></EditItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-				<EditItemStyle VerticalAlign="Bottom" HorizontalAlign="Center" Wrap="True" BackColor="blue"></EditItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-				<EditItemStyle VerticalAlign="Top" HorizontalAlign="RiGhT" Height="50" Wrap="false" BackColor="#ffff00"></EditItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server">
-				<EditItemStyle VerticalAlign="Middle" HorizontalAlign="Center" Height="50" Wrap="false" BackColor="#ffff00"></EditItemStyle>
-				<Columns>
-					<asp:EditCommandColumn EditText="Edit" UpdateText="Update"></asp:EditCommandColumn>
-				</Columns>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server">
-				<Columns>
-					<asp:EditCommandColumn EditText="Edit" UpdateText="Update"></asp:EditCommandColumn>
-				</Columns>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx.cs
deleted file mode 100644
index 0d225daebcb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_EditItemStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.EditItemIndex = 7;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.EditItemIndex = 4;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.EditItemIndex = 2;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid4.EditItemIndex = 7;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid5.EditItemIndex = 4;
-				DataGrid5.DataBind();;
-				GHTSubTestAddResult(DataGrid5.EditItemIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest6");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				dg.EditItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.EditItemIndex = 4;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest7");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				dg.EditItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.EditItemStyle.VerticalAlign = VerticalAlign.Top;
-				dg.EditItemStyle.Wrap = false;
-				dg.EditItemIndex = 4;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx
deleted file mode 100644
index ada5719881d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_FooterStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_FooterStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_FooterStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-					<FooterStyle></FooterStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<FooterStyle VerticalAlign="Bottom" HorizontalAlign="Center" Wrap="True" BackColor="cyan"></FooterStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-					<FooterStyle VerticalAlign="Top" HorizontalAlign="RiGhT" Height="50" Wrap="false" BackColor="#ffff00"></FooterStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx.cs
deleted file mode 100644
index 5ee6cf4fcd8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_FooterStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.ShowFooter = true;
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.ShowFooter = true;
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.ShowFooter = true;
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest4");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.ShowFooter = true;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest5");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.FooterStyle.VerticalAlign = VerticalAlign.Top;
-				dg.FooterStyle.Wrap = false;
-				dg.ShowFooter = true;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx
deleted file mode 100644
index d2e66731993..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_HeaderStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_HeaderStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_HeaderStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-					<HeaderStyle></HeaderStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<HeaderStyle VerticalAlign="Bottom" HorizontalAlign="Center" Wrap="True" BackColor="cyan"></HeaderStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-					<HeaderStyle VerticalAlign="Top" HorizontalAlign="RiGhT" Height="50" Wrap="false" BackColor="#ffff00"></HeaderStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx.cs
deleted file mode 100644
index 16a4f68adb8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_HeaderStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest4");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest5");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-				dg.HeaderStyle.Wrap = false;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx
deleted file mode 100644
index da6d2edb36b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_ItemCreated.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_ItemCreated" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_ItemCreated</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="Ghtsubtest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" PagerStyle-BackColor="#99cc33" FooterStyle-BackColor="#cccccc"
-					HeaderStyle-BackColor="#cccccc" BorderColor="#000000" BackColor="#ffffcc" BorderWidth="1"></asp:DataGrid>
-			</cc1:ghtsubtest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx.cs
deleted file mode 100644
index 3b5e659058f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_ItemCreated
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemCreated += new DataGridItemEventHandler(DataGrid1_ItemCreated);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = Ghtsubtest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid1.ShowFooter = true;
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemCreated(object sender, DataGridItemEventArgs e)
-		{
-			e.Item.Cells[0].Controls.Add(new LiteralControl("Added on ItemCreated event"));
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx
deleted file mode 100644
index 2eda3ab9100..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_ItemDataBound.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_ItemDataBound" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_ItemDataBound</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="Ghtsubtest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" BorderWidth="1" BackColor="#ffffcc" BorderColor="#000000"
-					HeaderStyle-BackColor="#cccccc" FooterStyle-BackColor="#cccccc" PagerStyle-BackColor="#99cc33"></asp:DataGrid>
-			</cc1:ghtsubtest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx.cs
deleted file mode 100644
index 15c407785fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_ItemDataBound
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemDataBound += new DataGridItemEventHandler(DataGrid1_ItemDataBound);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = Ghtsubtest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid1.ShowFooter = true;
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemDataBound(object sender, DataGridItemEventArgs e)
-		{
-			e.Item.Cells[0].Controls.Add(new LiteralControl("Added on ItemDataBound event"));
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx
deleted file mode 100644
index 5ff6f8e97e3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_ItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_ItemStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_ItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-					<ItemStyle></ItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<ItemStyle VerticalAlign="Bottom" HorizontalAlign="Center" Wrap="True" BackColor="cyan"></ItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-					<ItemStyle VerticalAlign="Top" HorizontalAlign="RiGhT" Height="50" Wrap="false" BackColor="#ffff00"></ItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx.cs
deleted file mode 100644
index db49670612b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_ItemStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest4");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest5");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				TableItemStyle tis = new TableItemStyle();
-				dg.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.ItemStyle.VerticalAlign = VerticalAlign.Top;
-				dg.ItemStyle.Wrap = false;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx
deleted file mode 100644
index 0ea38724efd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_Items.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_Items" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_Items</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx.cs
deleted file mode 100644
index f2f4d6c2b38..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_Items
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(DataGrid1.Items.GetType().ToString());
-				GHTSubTestAddResult(DataGrid1.Items.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx
deleted file mode 100644
index 4651b43dd73..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_NextPageCommandArgument.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_NextPageCommandArgument" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_NextPageCommandArgument</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx.cs
deleted file mode 100644
index 561135989b7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_NextPageCommandArgument
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.NextPageCommandArgument);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx
deleted file mode 100644
index 22a0051c0f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_PageCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_PageCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_PageCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx.cs
deleted file mode 100644
index a7020141456..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_PageCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.PageCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx
deleted file mode 100644
index 82b5bb5fb78..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_PageCount.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_PageCount" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_PageCount</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx.cs
deleted file mode 100644
index ebc7198f7bc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_PageCount
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PageCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PageSize = 5;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PageCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PageSize = 7;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PageCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageIndexChanged.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageIndexChanged.aspx
deleted file mode 100644
index f768f8649a0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageIndexChanged.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_PageIndexChanged.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_PageIndexChanged" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_PageIndexChanged</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" PagerStyle-BackColor="#99cc33" FooterStyle-BackColor="#cccccc"
-					HeaderStyle-BackColor="#cccccc" BorderColor="#000000" BackColor="#ffffcc" BorderWidth="1"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" PagerStyle-BackColor="#99cc33" FooterStyle-BackColor="#cccccc"
-					HeaderStyle-BackColor="#cccccc" BorderColor="#000000" BackColor="#ffffcc" BorderWidth="1"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageIndexChanged.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageIndexChanged.aspx.cs
deleted file mode 100644
index e4d872eff71..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageIndexChanged.aspx.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_PageIndexChanged
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemDataBound += new DataGridItemEventHandler(DataGrid1_ItemDataBound);
-			this.DataGrid1.PageIndexChanged += new DataGridPageChangedEventHandler(DataGrid1_PageIndexChanged);
-			this.DataGrid2.ItemDataBound += new DataGridItemEventHandler(DataGrid2_ItemDataBound);
-			this.DataGrid2.PageIndexChanged += new DataGridPageChangedEventHandler(DataGrid2_PageIndexChanged);
-		}
-		#endregion
-
-		private void BindGrid(System.Web.UI.WebControls.DataGrid dg)
-		{
-			dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-			dg.DataBind();;
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.AllowPaging = true;
-				DataGrid1.ShowFooter = true;
-				BindGrid(DataGrid1);
-			}
-
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.AllowPaging = true;
-				DataGrid2.ShowFooter = true;
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid2.PageSize = 5;
-				BindGrid(DataGrid2);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_PageIndexChanged(object source, System.Web.UI.WebControls.DataGridPageChangedEventArgs e)
-		{
-			DataGrid1.CurrentPageIndex = e.NewPageIndex;
-			BindGrid(DataGrid1);
-		}
-
-		private void DataGrid1_ItemDataBound(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			ListItemType itemType = (ListItemType)e.Item.ItemType;
-
-			if (itemType == ListItemType.Footer)
-			{
-				e.Item.Cells[0].Text = "Page:";
-				e.Item.Cells[1].Text = DataGrid1.CurrentPageIndex.ToString();
-			}
-		}
-
-		private void DataGrid2_PageIndexChanged(object source, System.Web.UI.WebControls.DataGridPageChangedEventArgs e)
-		{
-			DataGrid2.CurrentPageIndex = e.NewPageIndex;
-			BindGrid(DataGrid2);
-		}
-
-		private void DataGrid2_ItemDataBound(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			ListItemType itemType = (ListItemType)e.Item.ItemType;
-
-			if (itemType == ListItemType.Footer)
-			{
-				e.Item.Cells[0].Text = "Page:";
-				e.Item.Cells[1].Text = DataGrid2.CurrentPageIndex.ToString();
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx
deleted file mode 100644
index 8fccd9d7029..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_PageSize.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_PageSize" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_PageSize</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest4" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest5" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid5" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest6" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid6" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx.cs
deleted file mode 100644
index fcce31d301d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_PageSize
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PageSize.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PageSize = 10;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PageSize.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PageSize = 2;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PageSize.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.PageSize = 0;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.CurrentPageIndex.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid5.AllowPaging = true;
-				DataGrid5.PageSize = -1;
-				DataGrid5.DataBind();;
-				GHTSubTestAddResult(DataGrid5.CurrentPageIndex.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid6.AllowPaging = true;
-				DataGrid6.PageSize = 150;
-				DataGrid6.DataBind();;
-				GHTSubTestAddResult(DataGrid6.PageSize.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx
deleted file mode 100644
index a31d6ea812d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_PagerStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_PagerStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_PagerStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx.cs
deleted file mode 100644
index a389fa6b80c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_PagerStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.PagerStyle.HorizontalAlign = HorizontalAlign.Center;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.GetType().ToString());
-				GHTSubTestAddResult(DataGrid1.PagerStyle.Mode.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx
deleted file mode 100644
index b8a45af5e24..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_PrevPageCommandArgument.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_PrevPageCommandArgument" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_PrevPageCommandArgument</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx.cs
deleted file mode 100644
index 0c05f1864b1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_PrevPageCommandArgument
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.PrevPageCommandArgument);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx
deleted file mode 100644
index 792b34d70e5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_SelectCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_SelectCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_SelectCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx.cs
deleted file mode 100644
index b90bf090ae7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_SelectCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.SelectCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx
deleted file mode 100644
index 87afb4ef87b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_SelectedIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_SelectedIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_SelectedIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-					<SelectedItemStyle BackColor="blue"></SelectedItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<SelectedItemStyle BackColor="blue"></SelectedItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-					<SelectedItemStyle BackColor="blue"></SelectedItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx.cs
deleted file mode 100644
index 7235d39af83..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_SelectedIndex
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.SelectedIndex = 3;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.SelectedIndex.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.SelectedIndex = 77;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.SelectedIndex.ToString());
-				//GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.SelectedIndex = -3;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.SelectedIndex.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx
deleted file mode 100644
index 1e71fee70a2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_SelectedItem.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_SelectedItem" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_SelectedItem</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx.cs
deleted file mode 100644
index 238abb9a92e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_SelectedItem
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx
deleted file mode 100644
index c32a2b7a7b1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_SelectedItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_SelectedItemStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_SelectedItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server">
-					<SelectedItemStyle></SelectedItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<SelectedItemStyle VerticalAlign="Bottom" HorizontalAlign="Center" Wrap="True" BackColor="blue"></SelectedItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server">
-					<SelectedItemStyle VerticalAlign="Top" HorizontalAlign="RiGhT" Height="50" Wrap="false" BackColor="#ffff00"></SelectedItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx.cs
deleted file mode 100644
index 5fb1d1c48d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_SelectedItemStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid1.SelectedIndex = 3;
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.SelectedIndex = 3;
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid3.SelectedIndex = 3;
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest4");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				dg.EditItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.EditItemIndex = 4;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("GHTSubTest5");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-
-				dg.EditItemStyle.HorizontalAlign = HorizontalAlign.Right;
-				dg.EditItemStyle.VerticalAlign = VerticalAlign.Top;
-				dg.EditItemStyle.Wrap = false;
-				dg.EditItemIndex = 4;
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx
deleted file mode 100644
index 692f2b1343a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_ShowFooter.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_ShowFooter" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_ShowFooter</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx.cs
deleted file mode 100644
index 5aea31937ae..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_ShowFooter
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.ShowFooter.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.ShowFooter = true;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.ShowFooter.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.ShowFooter = false;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.ShowFooter.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx
deleted file mode 100644
index 2289b21ae66..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_ShowHeader.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_ShowHeader" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_ShowHeader</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx.cs
deleted file mode 100644
index aebe984dc66..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_ShowHeader
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.ShowHeader.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.ShowHeader = true;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.ShowHeader.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.ShowHeader = false;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.ShowHeader.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommand.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommand.aspx
deleted file mode 100644
index ed2556f98ed..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommand.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_SortCommand.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_SortCommand" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_SortCommand</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="Ghtsubtest1" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid1" runat="server" BorderWidth="1" BackColor="#ffffcc" BorderColor="#000000"
-					HeaderStyle-BackColor="#cccccc" FooterStyle-BackColor="#cccccc" PagerStyle-BackColor="#99cc33"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid2" runat="server" BorderWidth="1" BackColor="#ffffcc" BorderColor="#000000"
-					HeaderStyle-BackColor="#cccccc" FooterStyle-BackColor="#cccccc" PagerStyle-BackColor="#99cc33"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommand.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommand.aspx.cs
deleted file mode 100644
index aeaa5825f4e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommand.aspx.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_SortCommand
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.SortCommand += new DataGridSortCommandEventHandler(DataGrid1_SortCommand);
-			this.DataGrid2.SortCommand += new DataGridSortCommandEventHandler(DataGrid2_SortCommand);
-
-		}
-		#endregion
-
-		private void BindGrid(System.Web.UI.WebControls.DataGrid dg)
-		{
-			dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-			dg.DataBind();;
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = Ghtsubtest1;
-			try 
-			{
-				DataGrid1.AllowSorting = true;
-				if (! IsPostBack )
-					BindGrid(DataGrid1);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.AllowSorting = true;
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-				if (! IsPostBack )
-					BindGrid(DataGrid2);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_SortCommand(object source, System.Web.UI.WebControls.DataGridSortCommandEventArgs e)
-		{
-			DataView dv = new DataView();
-			dv.Table = GHTTests.GHDataSources.DSDataTable();
-			dv.Sort = e.SortExpression;
-			DataGrid1.DataSource = dv;
-			DataGrid1.DataBind();;
-		}
-
-		private void DataGrid2_SortCommand(object source, System.Web.UI.WebControls.DataGridSortCommandEventArgs e)
-		{
-			DataView dv = new DataView();
-			dv.Table = GHTTests.GHDataSources.DSDataTable();
-			dv.Sort = e.SortExpression;
-			DataGrid2.DataSource = dv;
-			DataGrid2.DataBind();;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx
deleted file mode 100644
index 1e7f447e510..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_SortCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_SortCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_SortCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx.cs
deleted file mode 100644
index 27eea7679b2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_SortCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.SortCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx
deleted file mode 100644
index d19407009ad..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_UpdateCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_UpdateCommandName" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_UpdateCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="553px" DESIGNTIMEDRAGDROP="11">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx.cs
deleted file mode 100644
index 49de677dd80..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_UpdateCommandName
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataGrid.UpdateCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx
deleted file mode 100644
index ab11bcf3875..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_VirtualItemCount.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_VirtualItemCount" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_VirtualItemCount</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx.cs
deleted file mode 100644
index bea221d528c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_VirtualItemCount
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.AllowCustomPaging = true;
-				DataGrid1.VirtualItemCount = 5;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.VirtualItemCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.AllowCustomPaging = true;
-				DataGrid2.VirtualItemCount = 7;
-				DataGrid2.PageSize = 7;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.VirtualItemCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.AllowCustomPaging = true;
-				DataGrid3.VirtualItemCount = 30;
-				DataGrid3.PageSize = 9;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.VirtualItemCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.AllowCustomPaging = true;
-				DataGrid4.VirtualItemCount = -5;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.VirtualItemCount.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(1, 1);
-				DataGrid5.AllowPaging = true;
-				DataGrid5.AllowCustomPaging = true;
-				DataGrid5.VirtualItemCount = 70;
-				DataGrid5.PageSize = 10;
-				DataGrid5.CurrentPageIndex = 5;
-				DataGrid5.DataBind();;
-				GHTSubTestAddResult(DataGrid5.VirtualItemCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx
deleted file mode 100644
index f54da5068b9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGrid_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGrid_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGrid_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="120px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<br>
-			<br>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx.cs
deleted file mode 100644
index 5c08ed964c8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGrid_ctor_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataSet();
-				DataGrid2.DataMember = "Orders";
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("GHTSubTest3");
-			try 
-			{
-				System.Web.UI.WebControls.DataGrid dg = new System.Web.UI.WebControls.DataGrid();
-				GHTActiveSubTest.Controls.Add(dg);
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "", false);
-				dg.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx
deleted file mode 100644
index b818916efb5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_FooterStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_FooterStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_FooterStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx.cs
deleted file mode 100644
index b5447c40dec..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_FooterStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded(ListItemType tp, string text)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_button(ListItemType tp, string text)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(ListItemType tp, string text)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(ListItemType tp, string text)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_template(ListItemType tp, string text)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_FooterStyle.t_DBLitTemplate();
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-
-		{
-			DataGrid dg = new DataGrid();
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				dg.Columns.Add(c);
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-				dg.ShowFooter = true;
-				dg.DataBind();
-				GHTActiveSubTest.Controls.Add(dg);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				dg = null;
-			}
-			GHTSubTestEnd();
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(ListItemType.Footer, "Footer"));
-			DataGridTest("GhtSubTest2", c_button(ListItemType.Footer, "Footer"));
-			DataGridTest("GhtSubTest3", c_edit(ListItemType.Footer, "Footer"));
-			DataGridTest("GhtSubTest4", c_hyper_link(ListItemType.Footer, "Footer"));
-			DataGridTest("GhtSubTest5", c_template(ListItemType.Footer, "Footer"));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx
deleted file mode 100644
index c6fb3b47e9d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_FooterText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_FooterText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_FooterText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx.cs
deleted file mode 100644
index 1202cce8619..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_FooterText
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-		}
- 
-		private DataGridColumn c_bounded(ListItemType tp, string text)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_button(ListItemType tp, string text)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(ListItemType tp, string text)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(ListItemType tp, string text)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_template(ListItemType tp, string text)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_FooterStyle.t_DBLitTemplate();
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-
-		{
-			DataGrid dg = new DataGrid();
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				dg.Columns.Add(c);
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-				dg.ShowFooter = true;
-				dg.DataBind();
-				GHTActiveSubTest.Controls.Add(dg);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				dg = null;
-			}
-			GHTSubTestEnd();
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(ListItemType.Footer, ""));
-			DataGridTest("GhtSubTest2", c_button(ListItemType.Footer, ""));
-			DataGridTest("GhtSubTest3", c_edit(ListItemType.Footer, ""));
-			DataGridTest("GhtSubTest4", c_hyper_link(ListItemType.Footer, ""));
-			DataGridTest("GhtSubTest5", c_template(ListItemType.Footer, ""));
-			DataGridTest("GhtSubTest6", c_bounded(ListItemType.Footer, "Footer text"));
-			DataGridTest("GhtSubTest7", c_button(ListItemType.Footer, "Footer text"));
-			DataGridTest("GhtSubTest8", c_edit(ListItemType.Footer, "Footer text"));
-			DataGridTest("GhtSubTest9", c_hyper_link(ListItemType.Footer, "Footer text"));
-			DataGridTest("GhtSubTest10", c_template(ListItemType.Footer, "Footer text"));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx
deleted file mode 100644
index f3e6ced9203..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_HeaderImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_HeaderImageUrl" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_HeaderImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx.cs
deleted file mode 100644
index a465179d3be..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_HeaderImageUrl
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded(string se)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			column1.HeaderImageUrl = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_button(string se)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			column1.HeaderImageUrl = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(string se)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			column1.HeaderImageUrl = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(string se)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			column1.HeaderImageUrl = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_template(string se)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_HeaderImageUrl.t_DBLitTemplate();
-			column1.HeaderImageUrl = se;
-			return column1;
-		}
-		private void DataGridTest(string TestName, DataGridColumn c)
-		{
-			DataGrid grid1 = new DataGrid();
-			this.GHTSubTestBegin(TestName);
-			try
-			{
-				grid1.Columns.Add(c);
-				grid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				grid1.ShowFooter = true;
-				grid1.DataBind();
-				base.GHTActiveSubTest.Controls.Add(grid1);
-				this.GHTSubTestAddResult(grid1.Columns[0].HeaderImageUrl);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				grid1 = null;
-				//ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(""));
-			DataGridTest("GhtSubTest2", c_button(""));
-			DataGridTest("GhtSubTest3", c_edit(""));
-			DataGridTest("GhtSubTest4", c_hyper_link(""));
-			DataGridTest("GhtSubTest5", c_template(""));
-			DataGridTest("GhtSubTest6", c_bounded("/images/pic.gif"));
-			DataGridTest("GhtSubTest7", c_button("/images/pic.gif"));
-			DataGridTest("GhtSubTest8", c_edit("/images/pic.gif"));
-			DataGridTest("GhtSubTest9", c_hyper_link("/images/pic.gif"));
-			DataGridTest("GhtSubTest10", c_template("/images/pic.gif"));
-			DataGridTest("GhtSubTest11", c_bounded("http://127.0.0.1/asd/asd/../../asd.asd"));
-			DataGridTest("GhtSubTest12", c_button("http://127.0.0.1/asd/asd/../../asd.asd"));
-			DataGridTest("GhtSubTest13", c_edit("http://127.0.0.1/asd/asd/../../asd.asd"));
-			DataGridTest("GhtSubTest14", c_hyper_link("http://127.0.0.1/asd/asd/../../asd.asd"));
-			DataGridTest("GhtSubTest15", c_template("http://127.0.0.1/asd/asd/../../asd.asd"));
-			DataGridTest("GhtSubTest16", c_bounded(@"asdd://asd?//.\.\.\././..\/\/\/\/././zxc.zxc"));
-			DataGridTest("GhtSubTest17", c_button(@"asdd://asd?//.\.\.\././..\/\/\/\/././zxc.zxc"));
-			DataGridTest("GhtSubTest18", c_edit(@"asdd://asd?//.\.\.\././..\/\/\/\/././zxc.zxc"));
-			DataGridTest("GhtSubTest19", c_hyper_link(@"asdd://asd?//.\.\.\././..\/\/\/\/././zxc.zxc"));
-			DataGridTest("GhtSubTest20", c_template(@"asdd://asd?//.\.\.\././..\/\/\/\/././zxc.zxc"));
-
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx
deleted file mode 100644
index 23da658272a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_HeaderStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_HeaderStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_HeaderStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx.cs
deleted file mode 100644
index 186fb5b31fb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_HeaderStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded(ListItemType tp, string text)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_button(ListItemType tp, string text)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(ListItemType tp, string text)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(ListItemType tp, string text)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_template(ListItemType tp, string text)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_FooterStyle.t_DBLitTemplate();
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-
-		{
-			DataGrid dg = new DataGrid();
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				dg.Columns.Add(c);
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-				dg.ShowFooter = true;
-				dg.DataBind();
-				GHTActiveSubTest.Controls.Add(dg);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				dg = null;
-			}
-			GHTSubTestEnd();
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(ListItemType.Header, "Header"));
-			DataGridTest("GhtSubTest2", c_button(ListItemType.Header, "Header"));
-			DataGridTest("GhtSubTest3", c_edit(ListItemType.Header, "Header"));
-			DataGridTest("GhtSubTest4", c_hyper_link(ListItemType.Header, "Header"));
-			DataGridTest("GhtSubTest5", c_template(ListItemType.Header, "Header"));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx
deleted file mode 100644
index b0e15804117..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_HeaderText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_HeaderText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_HeaderText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx.cs
deleted file mode 100644
index e43e2331568..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_HeaderText
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-		}
- 
-		private DataGridColumn c_bounded(ListItemType tp, string text)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_button(ListItemType tp, string text)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(ListItemType tp, string text)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(ListItemType tp, string text)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_template(ListItemType tp, string text)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_FooterStyle.t_DBLitTemplate();
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-		{
-			DataGrid grid1 = new DataGrid();
-			this.GHTSubTestBegin(TestName);
-			try
-			{
-				grid1.Columns.Add(c);
-				grid1.DataSource = GHDataSources.DSDataTable();
-				grid1.ShowFooter = true;
-				grid1.DataBind();
-				base.GHTActiveSubTest.Controls.Add(grid1);
-			}
-			catch (Exception exception2)
-			{
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				grid1 = null;
-			}
-			this.GHTSubTestEnd();
-		}
-
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(ListItemType.Header, ""));
-			DataGridTest("GhtSubTest2", c_button(ListItemType.Header, ""));
-			DataGridTest("GhtSubTest3", c_edit(ListItemType.Header, ""));
-			DataGridTest("GhtSubTest4", c_hyper_link(ListItemType.Header, ""));
-			DataGridTest("GhtSubTest5", c_template(ListItemType.Header, ""));
-			DataGridTest("GhtSubTest6", c_bounded(ListItemType.Header, "Header text"));
-			DataGridTest("GhtSubTest7", c_button(ListItemType.Header, "Header text"));
-			DataGridTest("GhtSubTest8", c_edit(ListItemType.Header, "Header text"));
-			DataGridTest("GhtSubTest9", c_hyper_link(ListItemType.Header, "Header text"));
-			DataGridTest("GhtSubTest10", c_template(ListItemType.Header, "Header text"));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx
deleted file mode 100644
index db9e1a3208e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_ItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_ItemStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_ItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx.cs
deleted file mode 100644
index 5b5e04eb727..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_ItemStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded(ListItemType tp, string text)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_button(ListItemType tp, string text)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(ListItemType tp, string text)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(ListItemType tp, string text)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private DataGridColumn c_template(ListItemType tp, string text)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_FooterStyle.t_DBLitTemplate();
-			this.setStyle(column1, tp);
-			this.setText(column1, tp, text);
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-
-		{
-			DataGrid dg = new DataGrid();
-
-			GHTSubTestBegin(TestName);
-			try 
-			{
-				dg.Columns.Add(c);
-				dg.DataSource = GHTTests.GHDataSources.DSDataTable();
-				dg.ShowFooter = true;
-				dg.DataBind();
-				GHTActiveSubTest.Controls.Add(dg);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-				dg = null;
-			}
-			GHTSubTestEnd();
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(ListItemType.Item, "Item"));
-			DataGridTest("GhtSubTest2", c_button(ListItemType.Item, "Item"));
-			DataGridTest("GhtSubTest3", c_edit(ListItemType.Item, "Item"));
-			DataGridTest("GhtSubTest4", c_hyper_link(ListItemType.Item, "Item"));
-			DataGridTest("GhtSubTest5", c_template(ListItemType.Item, "Item"));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx
deleted file mode 100644
index 79cc882e19e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_SortExpression.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_SortExpression" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_SortExpression</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx.cs
deleted file mode 100644
index 6cf933789d4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_SortExpression
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded(string se)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			column1.SortExpression = se;
-			return column1;
-		}
- 
- 
-		private DataGridColumn c_button(string se)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			column1.SortExpression = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(string se)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			column1.SortExpression = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(string se)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			column1.SortExpression = se;
-			return column1;
-		}
- 
-		private DataGridColumn c_template(string se)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_SortExpression.t_DBLitTemplate();
-			column1.SortExpression = se;
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-		{
-			DataGrid grid1 = new DataGrid();
-			this.GHTSubTestBegin(TestName);
-			try
-			{
-				grid1.Columns.Add(c);
-				grid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				grid1.ShowFooter = true;
-				grid1.DataBind();
-				base.GHTActiveSubTest.Controls.Add(grid1);
-				this.GHTSubTestAddResult(grid1.Columns[0].SortExpression);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				grid1 = null;
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(""));
-			DataGridTest("GhtSubTest2", c_button(""));
-			DataGridTest("GhtSubTest3", c_edit(""));
-			DataGridTest("GhtSubTest4", c_hyper_link(""));
-			DataGridTest("GhtSubTest5", c_template(""));
-			DataGridTest("GhtSubTest6", c_bounded("ID"));
-			DataGridTest("GhtSubTest7", c_button("ID"));
-			DataGridTest("GhtSubTest8", c_edit("ID"));
-			DataGridTest("GhtSubTest9", c_hyper_link("ID"));
-			DataGridTest("GhtSubTest10", c_template("ID"));
-			DataGridTest("GhtSubTest11", c_bounded("test string"));
-			DataGridTest("GhtSubTest12", c_button("test string"));
-			DataGridTest("GhtSubTest13", c_edit("test string"));
-			DataGridTest("GhtSubTest14", c_hyper_link("test string"));
-			DataGridTest("GhtSubTest15", c_template("test string"));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx
deleted file mode 100644
index 5ac51d2e8d8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_ToString_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_ToString_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_ToString_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx.cs
deleted file mode 100644
index 59750d8da55..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_ToString_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded()
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			return column1;
-		}
- 
-		private DataGridColumn c_button()
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			return column1;
-		}
- 
- 
-		private DataGridColumn c_hyper_link()
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			return column1;
-		}
- 
- 
-		private DataGridColumn c_edit()
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			return column1;
-		}
- 
- 
-		private DataGridColumn c_template()
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_ToString_.t_DBLitTemplate();
-			return column1;
-		}
- 
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-		{
-			DataGrid grid1 = new DataGrid();
-			this.GHTSubTestBegin(TestName);
-			try
-			{
-				grid1.Columns.Add(c);
-				grid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				grid1.ShowFooter = true;
-				grid1.DataBind();
-				base.GHTActiveSubTest.Controls.Add(grid1);
-				this.GHTSubTestAddResult(grid1.Columns[0].ToString());
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				grid1 = null;
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded());
-			DataGridTest("GhtSubTest2", c_button());
-			DataGridTest("GhtSubTest3", c_edit());
-			DataGridTest("GhtSubTest4", c_hyper_link());
-			DataGridTest("GhtSubTest5", c_template());
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx
deleted file mode 100644
index 61fdea103b5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridColumn_Visible.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridColumn_Visible" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridColumn_Visible</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx.cs
deleted file mode 100644
index b4fd7b66488..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridColumn_Visible
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div>";
-				literal1.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(literal1);
-			}
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "Plain text template create at run time";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal literal1 = new Literal();
-				literal1.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(literal1);
-			}
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		#region "DataGrid creation functions"
-		private void setText(DataGridColumn c, ListItemType tp, string text)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderText = text;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterText = text;
-					return;
-				}
-			}
-		}
- 
-		private void setStyle(DataGridColumn c, ListItemType tp)
-		{
-			switch (tp)
-			{
-				case ListItemType.Header:
-				{
-					c.HeaderStyle.VerticalAlign = VerticalAlign.Top;
-					c.HeaderStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.HeaderStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					c.FooterStyle.VerticalAlign = VerticalAlign.Top;
-					c.FooterStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.FooterStyle.Wrap = false;
-					return;
-				}
-				case ListItemType.Item:
-				{
-					c.ItemStyle.VerticalAlign = VerticalAlign.Top;
-					c.ItemStyle.HorizontalAlign = HorizontalAlign.Right;
-					c.ItemStyle.Wrap = false;
-					return;
-				}
-			}
-		}
- 
-		private DataGridColumn c_bounded(bool v)
-		{
-			BoundColumn column1 = new BoundColumn();
-			column1.DataField = "ID";
-			column1.Visible = v;
-			return column1;
-		}
- 
-		private DataGridColumn c_button(bool v)
-		{
-			ButtonColumn column1 = new ButtonColumn();
-			column1.DataTextField = "ID";
-			column1.Visible = v;
-			return column1;
-		}
- 
-		private DataGridColumn c_hyper_link(bool v)
-		{
-			HyperLinkColumn column1 = new HyperLinkColumn();
-			column1.DataTextField = "ID";
-			column1.NavigateUrl = "http://www.google.com";
-			column1.Visible = v;
-			return column1;
-		}
- 
-		private DataGridColumn c_edit(bool v)
-		{
-			EditCommandColumn column1 = new EditCommandColumn();
-			column1.EditText = "Edit";
-			column1.Visible = v;
-			return column1;
-		}
- 
-		private DataGridColumn c_template(bool v)
-		{
-			TemplateColumn column1 = new TemplateColumn();
-			column1.ItemTemplate = new DataGridColumn_Visible.t_DBLitTemplate();
-			column1.Visible = v;
-			return column1;
-		}
- 
-		private void DataGridTest(string TestName, DataGridColumn c)
-		{
-			DataGrid grid1 = new DataGrid();
-			this.GHTSubTestBegin(TestName);
-			try
-			{
-				grid1.Columns.Add(c);
-				grid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				grid1.ShowFooter = true;
-				grid1.DataBind();
-				base.GHTActiveSubTest.Controls.Add(grid1);
-				this.GHTSubTestAddResult(grid1.Columns[0].Visible.ToString());
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				grid1 = null;
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			DataGridTest("GhtSubTest1", c_bounded(true));
-			DataGridTest("GhtSubTest2", c_button(true));
-			DataGridTest("GhtSubTest3", c_edit(true));
-			DataGridTest("GhtSubTest4", c_hyper_link(true));
-			DataGridTest("GhtSubTest5", c_template(true));
-			DataGridTest("GhtSubTest6", c_bounded(false));
-			DataGridTest("GhtSubTest7", c_button(false));
-			DataGridTest("GhtSubTest8", c_edit(false));
-			DataGridTest("GhtSubTest9", c_hyper_link(false));
-			DataGridTest("GhtSubTest10", c_template(false));
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx
deleted file mode 100644
index 7782af5c3f5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridItem_DataItem.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridItem_DataItem" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridItem_DataItem</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx.cs
deleted file mode 100644
index 7caf3f46779..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridItem_DataItem
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemCreated += new DataGridItemEventHandler(DataGrid1_ItemCreated);
-			this.DataGrid2.ItemCreated += new DataGridItemEventHandler(DataGrid2_ItemCreated);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
-			{
-				TableCell tc = new TableCell();
-				tc.Controls.Add(new LiteralControl((string)DataBinder.Eval(e.Item.DataItem, "Name")));
-				e.Item.Controls.Add(tc);
-			}
-			if (e.Item.ItemType == ListItemType.Header)
-			{
-				if (e.Item.Cells.Count < 4)
-				{
-					e.Item.Cells.Add(new TableCell());
-					e.Item.Cells[3].Text = "Name from DataItem";
-				}
-			}
-		}
-
-		private void DataGrid2_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
-			{
-				DataRowView row = (DataRowView)e.Item.DataItem;
-				row["Name"] = "heh";
-				//e.Item.Cells[1].Controls.Clear();
-			}
-            
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx
deleted file mode 100644
index 5aaef5a0b28..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridItem_DataSetIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridItem_DataSetIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridItem_DataSetIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx.cs
deleted file mode 100644
index 30da71de75a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridItem_DataSetIndex
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemCreated += new DataGridItemEventHandler(DataGrid1_ItemCreated);
-			this.DataGrid2.ItemCreated += new DataGridItemEventHandler(DataGrid2_ItemCreated);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PageSize = 5;
-				DataGrid2.CurrentPageIndex = 1;
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			TableCell tc = new TableCell();
-			tc.Controls.Add(new LiteralControl(e.Item.DataSetIndex.ToString()));
-			e.Item.Controls.Add(tc);
-		}
-
-		private void DataGrid2_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			TableCell tc = new TableCell();
-			tc.Controls.Add(new LiteralControl(e.Item.DataSetIndex.ToString()));
-			e.Item.Controls.Add(tc);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx
deleted file mode 100644
index eb9d4c3a753..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridItem_ItemIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridItem_ItemIndex" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridItem_ItemIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx.cs
deleted file mode 100644
index d52d3f71f17..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridItem_ItemIndex
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid2.ItemCreated += new DataGridItemEventHandler(DataGrid2_ItemCreated);
-			this.DataGrid3.ItemCreated += new DataGridItemEventHandler(DataGrid3_ItemCreated);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.DataBind();;
-
-				IEnumerator items = DataGrid1.Items.GetEnumerator();
-				System.Web.UI.WebControls.DataGridItem item;
-
-				while (items.MoveNext())
-				{
-					item = (DataGridItem)items.Current;
-					GHTSubTestAddResult(item.ItemIndex.ToString());
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PageSize = 5;
-				DataGrid3.CurrentPageIndex = 1;
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid2_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			TableCell tc = new TableCell();
-			tc.Controls.Add(new LiteralControl(e.Item.ItemIndex.ToString()));
-			e.Item.Controls.Add(tc);
-		}
-
-		private void DataGrid3_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			TableCell tc = new TableCell();
-			tc.Controls.Add(new LiteralControl(e.Item.ItemIndex.ToString()));
-			e.Item.Controls.Add(tc);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx
deleted file mode 100644
index 12746666632..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridItem_ItemType.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridItem_ItemType" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridItem_ItemType</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx.cs
deleted file mode 100644
index 9907150ab6a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridItem_ItemType
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.DataGrid2.ItemCreated += new System.Web.UI.WebControls.DataGridItemEventHandler(this.DataGrid2_ItemCreated);
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.DataBind();;
-
-				IEnumerator items = DataGrid1.Items.GetEnumerator();
-				System.Web.UI.WebControls.DataGridItem item;
-
-				while (items.MoveNext())
-				{
-					item = (System.Web.UI.WebControls.DataGridItem)items.Current;
-					GHTSubTestAddResult(item.ItemType.ToString());
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid2_ItemCreated(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			TableCell tc = new TableCell();
-			tc.Controls.Add(new LiteralControl(e.Item.ItemType.ToString()));
-			e.Item.Controls.Add(tc);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx
deleted file mode 100644
index d0ec9fa3007..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_CopyFrom_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_CopyFrom_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_CopyFrom_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx.cs
deleted file mode 100644
index 000c4c52f07..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_CopyFrom_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-
-				System.Web.UI.WebControls.Style s = new System.Web.UI.WebControls.Style();
-				s.Font.Bold = true;
-				DataGrid1.PagerStyle.CopyFrom(s);
-				DataGrid1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-
-				System.Web.UI.WebControls.Style s = new System.Web.UI.WebControls.Style();
-				s.Font.Bold = true;
-				//s.Height.Pixel(50);
-				//s.Width.Pixel(400);
-
-				DataGrid2.PagerStyle.CopyFrom(s);
-				DataGrid2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid3.PagerStyle.PageButtonCount = 20;
-				DataGrid3.PageSize = 2;
-
-				System.Web.UI.WebControls.Style s = new System.Web.UI.WebControls.Style();
-				s.Font.Bold = true;
-				//s.Height.Pixel(50);
-				//s.Width.Pixel(400);
-
-				DataGrid3.PagerStyle.CopyFrom(s);
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx
deleted file mode 100644
index 108d38406f8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_MergeWith_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_MergeWith_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_MergeWith_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx.cs
deleted file mode 100644
index 9380ebf67c3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_MergeWith_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-
-				System.Web.UI.WebControls.Style s = new System.Web.UI.WebControls.Style();
-				s.Font.Bold = true;
-				DataGrid1.PagerStyle.MergeWith(s);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-
-				System.Web.UI.WebControls.Style s = new System.Web.UI.WebControls.Style();
-				s.Font.Bold = true;
-				//s.Height.Pixel(50);
-				//s.Width.Pixel(400);
-
-				DataGrid2.PagerStyle.MergeWith(s);
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid3.PagerStyle.PageButtonCount = 20;
-				DataGrid3.PageSize = 2;
-
-				System.Web.UI.WebControls.Style s = new System.Web.UI.WebControls.Style();
-				s.Font.Bold = true;
-				//s.Height.Pixel(50);
-				//s.Width.Pixel(400);
-
-				DataGrid3.PagerStyle.MergeWith(s);
-				DataGrid3.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx
deleted file mode 100644
index 7c526a955f1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_Mode.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_Mode" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_Mode</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx.cs
deleted file mode 100644
index e93d18740d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_Mode
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.Mode.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PagerStyle.Mode = PagerMode.NextPrev;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PagerStyle.Mode.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PagerStyle.Mode.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx
deleted file mode 100644
index d628474ada3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_NextPageText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_NextPageText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_NextPageText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx.cs
deleted file mode 100644
index e6c9fd9e7ad..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_NextPageText
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.NextPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PagerStyle.NextPageText = "Next Page";
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PagerStyle.NextPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PagerStyle.NextPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid4.PagerStyle.NextPageText = "Next";
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.PagerStyle.NextPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx
deleted file mode 100644
index f82c7f79a1a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_PageButtonCount.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_PageButtonCount" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_PageButtonCount</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx.cs
deleted file mode 100644
index b54a9329aa8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_PageButtonCount
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.PageSize = 2;
-				DataGrid1.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.PageButtonCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PageSize = 2;
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid2.PagerStyle.PageButtonCount = 7;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PagerStyle.PageButtonCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PageSize = 2;
-				DataGrid3.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid3.PagerStyle.PageButtonCount = 20;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PagerStyle.PageButtonCount.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid2.PageSize = 2;
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid2.PagerStyle.PageButtonCount = -20;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.PagerStyle.PageButtonCount.ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx
deleted file mode 100644
index 2b8aec10576..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_Position.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_Position" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_Position</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest7" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid7" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest8" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid8" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx.cs
deleted file mode 100644
index 9db7027bc14..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_Position
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		protected System.Web.UI.WebControls.DataGrid DataGrid7;
-		protected GHTWebControls.GHTSubTest Ghtsubtest7;
-		protected System.Web.UI.WebControls.DataGrid DataGrid8;
-		protected GHTWebControls.GHTSubTest Ghtsubtest8;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PagerStyle.Position = PagerPosition.Bottom;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.Position = PagerPosition.Top;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.PagerStyle.Position = PagerPosition.TopAndBottom;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid5.AllowPaging = true;
-				DataGrid5.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid5.DataBind();
-				GHTSubTestAddResult(DataGrid5.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid6.AllowPaging = true;
-				DataGrid6.PagerStyle.Position = PagerPosition.Bottom;
-				DataGrid6.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid6.DataBind();
-				GHTSubTestAddResult(DataGrid6.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest7;
-			try 
-			{
-				DataGrid7.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid7.AllowPaging = true;
-				DataGrid7.PagerStyle.Position = PagerPosition.Top;
-				DataGrid7.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid7.DataBind();
-				GHTSubTestAddResult(DataGrid7.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest8;
-			try 
-			{
-				DataGrid8.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid8.AllowPaging = true;
-				DataGrid8.PagerStyle.Position = PagerPosition.TopAndBottom;
-				DataGrid8.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid8.DataBind();
-				GHTSubTestAddResult(DataGrid8.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx
deleted file mode 100644
index 1fca2cc12ab..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_PrevPageText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_PrevPageText" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_PrevPageText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx.cs
deleted file mode 100644
index 1457edb9976..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_PrevPageText
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.Position.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PagerStyle.PrevPageText = "Prev Page";
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PagerStyle.PrevPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.PrevPageText = "";
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PagerStyle.PrevPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid4.AllowPaging = true;
-				DataGrid4.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid4.PagerStyle.PrevPageText = "Prev";
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(DataGrid4.PagerStyle.PrevPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx
deleted file mode 100644
index 01739c37419..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_Reset_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_Reset_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_Reset_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx.cs
deleted file mode 100644
index e5c6b6742bf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_Reset_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.PagerStyle.Reset();
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-
-				DataGrid2.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid2.PagerStyle.NextPageText = "N";
-				DataGrid2.PagerStyle.PageButtonCount = 7;
-				DataGrid2.PagerStyle.Position = PagerPosition.TopAndBottom;
-				DataGrid2.PagerStyle.PrevPageText = "P";
-
-				DataGrid2.PagerStyle.Reset();
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(((int)DataGrid2.PagerStyle.Mode).ToString());
-				GHTSubTestAddResult(DataGrid2.PagerStyle.NextPageText);
-				GHTSubTestAddResult(DataGrid2.PagerStyle.PageButtonCount.ToString());
-				GHTSubTestAddResult(((int)DataGrid2.PagerStyle.Position).ToString());
-				GHTSubTestAddResult(DataGrid2.PagerStyle.PrevPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.Mode = PagerMode.NumericPages;
-				DataGrid3.PagerStyle.NextPageText = "N";
-				DataGrid3.PagerStyle.PageButtonCount = 7;
-				DataGrid3.PagerStyle.Position = PagerPosition.TopAndBottom;
-				DataGrid3.PagerStyle.PrevPageText = "P";
-
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(((int)DataGrid3.PagerStyle.Mode).ToString());
-				GHTSubTestAddResult(DataGrid3.PagerStyle.NextPageText);
-				GHTSubTestAddResult(DataGrid3.PagerStyle.PageButtonCount.ToString());
-				GHTSubTestAddResult(((int)DataGrid3.PagerStyle.Position).ToString());
-				GHTSubTestAddResult(DataGrid3.PagerStyle.PrevPageText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx
deleted file mode 100644
index 8b6b169f257..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataGridPagerStyle_Visible.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataGridPagerStyle_Visible" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataGridPagerStyle_Visible</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx.cs
deleted file mode 100644
index 375e064a72b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataGridPagerStyle_Visible
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid1.AllowPaging = true;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(DataGrid1.PagerStyle.Visible.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid2.AllowPaging = true;
-				DataGrid2.PagerStyle.Visible = true;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(DataGrid2.PagerStyle.Visible.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(1, 3);
-				DataGrid3.AllowPaging = true;
-				DataGrid3.PagerStyle.Visible = false;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(DataGrid3.PagerStyle.Visible.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx
deleted file mode 100644
index 384132ff22e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_AlternatingItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_AlternatingItemStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_AlternatingItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px" Description="Default style">
-				<asp:DataList id="DataList1" runat="server">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="96px" Description="Set legal style ">
-				<asp:DataList id="DataList2" runat="server">
-					<AlternatingItemStyle Font-Size="Medium" Font-Names="Batang" HorizontalAlign="Left" BorderWidth="2px"
-						ForeColor="Yellow" BorderStyle="Solid" BorderColor="Navy" VerticalAlign="Top" BackColor="Red"></AlternatingItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description="Overrides ItemStyle">
-				<asp:DataList id="DataList3" runat="server">
-					<AlternatingItemStyle Font-Size="Medium" Font-Names="Batang" HorizontalAlign="Left" BorderWidth="2px"
-						ForeColor="Yellow" BorderStyle="Solid" BorderColor="Navy" VerticalAlign="Top" BackColor="Red"></AlternatingItemStyle>
-					<ItemStyle Font-Names="Miriam Fixed" HorizontalAlign="Right" BorderWidth="1px" ForeColor="Purple"
-						BorderStyle="Dotted" BorderColor="Lime" VerticalAlign="Bottom" BackColor="#FFFF80"></ItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx.cs
deleted file mode 100644
index 93581a70ab8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_AlternatingItemStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataSource = m_data;
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataSource = m_data;
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx
deleted file mode 100644
index 9348c6de2f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx
+++ /dev/null
@@ -1,71 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_AlternatingItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_AlternatingItemTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_AlternatingItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="104px" Width="176px" Description="Fixed text">
-				<asp:DataList id="DataList1" runat="server">
-					<AlternatingItemTemplate>
-						fixed text
-					</AlternatingItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Height="104px" Width="176px" Description="Data bound">
-				<asp:DataList id="Datalist2" runat="server">
-					<AlternatingItemTemplate>
-						<%#Container.DataItem%>
-					</AlternatingItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Height="104px" Width="176px" Description="Control">
-				<asp:DataList id="Datalist3" runat="server">
-					<ItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-						<asp:Button id="Button1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:Button>
-					</AlternatingItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id="DataList4" runat="server">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-						<tr bgcolor="ThreeDFace">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</AlternatingItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id="DataList5" runat="server"></asp:DataList>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx.cs
deleted file mode 100644
index 12f8aa7f6d5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_AlternatingItemTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList Datalist2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				Datalist2.DataSource = m_data;
-				Datalist2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataSource = m_data;
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataSource = m_data;
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.AlternatingItemTemplate = new AlternatingItemTemplate();
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.DataSource = m_data;
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		//Template for alternating item.
-		private class AlternatingItemTemplate : ITemplate
-		{
-
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Aquamarine;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
- 
-
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-        
-		//Template for alternating item.
-		private class ItemTemplate : ITemplate
-		{
-
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Coral;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
-			
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx
deleted file mode 100644
index 4de323a712f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_CancelCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_CancelCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_CancelCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px"></cc1:GHTSubTest>
-			<asp:DataList id="DataList1" runat="server"></asp:DataList>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx.cs
deleted file mode 100644
index 42d4eaaa5e6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_CancelCommandName
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataList.CancelCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx
deleted file mode 100644
index 6984f3f0554..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_DeleteCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_DeleteCommandName" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_DeleteCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px"></cc1:GHTSubTest>
-			<asp:DataList id="DataList1" runat="server"></asp:DataList>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx.cs
deleted file mode 100644
index 56aa32e5053..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_DeleteCommandName
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataList.DeleteCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx
deleted file mode 100644
index a9db7b29dd7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_EditCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_EditCommandName" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_EditCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px"></cc1:GHTSubTest>
-			<asp:DataList id="DataList1" runat="server"></asp:DataList>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx.cs
deleted file mode 100644
index b472b3a2c32..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_EditCommandName
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataList.EditCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx
deleted file mode 100644
index c8f72e7ac09..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx
+++ /dev/null
@@ -1,73 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_EditItemIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_EditItemIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_EditItemIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="232px" Height="112px" Description="Not set">
-					<asp:DataList id="DataList1" runat="server" Width="136px" Height="112px">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<EditItemTemplate>
-							Selected for editing!
-						</EditItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="232px" Height="112px" Description="Set to legal value">
-					<asp:DataList id="DataList2" runat="server" Width="144px" Height="120px" EditItemIndex="2">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<EditItemTemplate>
-							Selected for editing!
-						</EditItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="232px" Height="112px" Description="Higher then the number of items.">
-					<asp:DataList id="DataList3" runat="server" Width="136px" Height="122px" EditItemIndex="10">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<EditItemTemplate>
-							Selected for editing!
-						</EditItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="232px" Height="112px" Description="Illegal value - less then -1">
-					<asp:DataList id="DataList4" runat="server" Width="168px" Height="130px">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<EditItemTemplate>
-							Selected for editing!
-						</EditItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx.cs
deleted file mode 100644
index 6fd667da598..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_EditItemIndex
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataSource = m_data;
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataSource = m_data;
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-				DataList1.EditItemIndex = -2;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx
deleted file mode 100644
index 7ce6d2c74c2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx
+++ /dev/null
@@ -1,86 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_EditItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_EditItemStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_EditItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="Default">
-				<asp:DataList id="DataList1" runat="server">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="152px" Height="109px" Description="Set.">
-				<asp:DataList id="DataList2" runat="server" EditItemIndex="1">
-					<EditItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></EditItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description='Overrides "SelectedItemStyle"'>
-				<asp:DataList id="DataList3" runat="server" EditItemIndex="2" SelectedIndex="2">
-					<SelectedItemStyle Font-Names="Aharoni" BorderWidth="2px" ForeColor="Maroon" BorderStyle="Double" BorderColor="#000040"
-						BackColor="#FFC0C0"></SelectedItemStyle>
-					<EditItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></EditItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="144px" Height="96px" Description='Overrides "AlternatingItemStyle"'>
-				<asp:DataList id="DataList4" runat="server" EditItemIndex="3">
-					<EditItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></EditItemStyle>
-					<AlternatingItemStyle Font-Names="Aharoni" BorderWidth="2px" ForeColor="Maroon" BorderStyle="Double" BorderColor="#000040"
-						BackColor="#FFC0C0"></AlternatingItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="144px" Height="96px" Description='Overrides "ItemStyle"'>
-				<asp:DataList id="DataList5" runat="server" EditItemIndex="5">
-					<EditItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></EditItemStyle>
-					<ItemStyle Font-Names="Aharoni" BorderWidth="2px" ForeColor="Maroon" BorderStyle="Double" BorderColor="#000040"
-						BackColor="#FFC0C0"></ItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" runat="server" Width="144px" Height="96px" Description='Overrides "ControlStyle"'>
-				<asp:DataList id="DataList6" runat="server" EditItemIndex="6" BackColor="#FFC0C0" BorderColor="#000040"
-					BorderStyle="Double" BorderWidth="2px" Font-Names="Aharoni" ForeColor="Maroon">
-					<EditItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></EditItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx.cs
deleted file mode 100644
index 687a8da6746..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_EditItemStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataSource = m_data;
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataSource = m_data;
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataSource = m_data;
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.DataSource = m_data;
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataList6.DataSource = m_data;
-				DataList6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx
deleted file mode 100644
index 2197c5aa41c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx
+++ /dev/null
@@ -1,71 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_EditItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_EditItemTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_EditItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="104px" Description="Fixed text">
-				<asp:DataList id="DataList1" runat="server" EditItemIndex="1">
-					<EditItemTemplate>
-						<P>fixed text
-						</P>
-					</EditItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Width="176px" Height="104px" Description="Data bound">
-				<asp:DataList id="Datalist2" runat="server" EditItemIndex="2">
-					<EditItemTemplate>
-						<%#Container.DataItem%>
-					</EditItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="176px" Height="104px" Description="Control">
-				<asp:DataList id="Datalist3" runat="server" EditItemIndex="3">
-					<EditItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</EditItemTemplate>
-					<ItemTemplate>
-						<asp:Button id="Button1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:Button>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id="DataList4" runat="server" EditItemIndex="4">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-					<EditItemTemplate>
-						<tr bgcolor="ThreeDFace">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</EditItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id="DataList5" runat="server" EditItemIndex="5"></asp:DataList>
-			</cc1:GHTSubTest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx.cs
deleted file mode 100644
index c20d393081e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_EditItemTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList Datalist2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				Datalist2.DataSource = m_data;
-				Datalist2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataSource = m_data;
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataSource = m_data;
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.EditItemTemplate = new EditItemTemplate();
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.DataSource = m_data;
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-			// Template for edited items.
-			private class EditItemTemplate : ITemplate
-			{
-
-				private Label m_l;
-				public void InstantiateIn(Control container)
-				{
-					this.m_l = new Label();
-					this.m_l.BackColor = Color.Aquamarine;
-					container.Controls.Add(this.m_l);
-					m_l.DataBinding += new EventHandler(m_l_DataBinding);
-				}
- 
-				private void m_l_DataBinding(object sender, EventArgs e)
-				{
-					DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-					this.m_l.Text = (string)(item1.DataItem);
-				}
- 
-			}
-
-		// Template for regular item.
-		private class ItemTemplate : ITemplate
-		{
-
-			private Label m_l;
-
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Coral;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx
deleted file mode 100755
index 4ff69ad9914..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx
+++ /dev/null
@@ -1,142 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_ExtractTemplateRows.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_ExtractTemplateRows" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_ExtractTemplateRows</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="310px" Width="280px" Description="Default value = false">
-					<asp:DataList id=DataList1 runat="server" GridLines="Both" DataSource="<%# m_data %>" DataMember="Items" BorderColor="Black" BorderStyle="Solid">
-						<AlternatingItemStyle BackColor="Gray"></AlternatingItemStyle>
-						<ItemTemplate>
-							<asp:Table id="Table1" runat="server" GridLines="Both" BackColor="Blue">
-								<asp:TableRow>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "StringValue") %>
-									</asp:TableCell>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "PriceValue") %>
-									</asp:TableCell>
-									<asp:TableCell RowSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-								<asp:TableRow>
-									<asp:TableCell ColumnSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "ExponentialValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-							</asp:Table>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="280px" Height="250px" Description="Set to true">
-					<asp:DataList id=DataList2 runat="server" GridLines="Both" DataSource="<%# m_data %>" DataMember="Items" BorderColor="Black" BorderStyle="Solid" ExtractTemplateRows="True">
-						<AlternatingItemStyle BackColor="Gray"></AlternatingItemStyle>
-						<ItemTemplate>
-							<asp:Table id="Table2" runat="server" GridLines="Both">
-								<asp:TableRow>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "StringValue") %>
-									</asp:TableCell>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "PriceValue") %>
-									</asp:TableCell>
-									<asp:TableCell RowSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-								<asp:TableRow>
-									<asp:TableCell ColumnSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "ExponentialValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-							</asp:Table>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="280px" Height="256px" Description="Show only the table in the template, when set to 'True'">
-					<asp:DataList id=DataList3 runat="server" GridLines="Both" DataSource="<%# m_data %>" DataMember="Items" BorderColor="Black" BorderStyle="Solid" ExtractTemplateRows="True">
-						<AlternatingItemStyle BackColor="Gray"></AlternatingItemStyle>
-						<ItemTemplate>
-							<asp:Table id="Table2" runat="server" GridLines="Both">
-								<asp:TableRow>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "StringValue") %>
-									</asp:TableCell>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "PriceValue") %>
-									</asp:TableCell>
-									<asp:TableCell RowSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-								<asp:TableRow>
-									<asp:TableCell ColumnSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "ExponentialValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-							</asp:Table>
-							<P>
-								<asp:Button id="Button1" runat="server" Text="Button"></asp:Button>
-								<asp:Image id="Image1" runat="server"></asp:Image>Palin Text</P>
-							<DIV style="DISPLAY: inline; WIDTH: 146px; HEIGHT: 26px" ms_positioning="FlowLayout"><STRONG><EM><U><FONT color="#ff0000">Html 
-												formatted text</FONT></U></EM></STRONG></DIV>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="120px" Height="710px" Description="Show the whole template when set to 'false'">
-					<asp:DataList id=DataList4 runat="server" GridLines="Both" DataSource="<%# m_data %>" DataMember="Items" BorderColor="Black" BorderStyle="Solid">
-						<AlternatingItemStyle BackColor="Gray"></AlternatingItemStyle>
-						<ItemTemplate>
-							<asp:Table id="Table2" runat="server" GridLines="Both">
-								<asp:TableRow>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "StringValue") %>
-									</asp:TableCell>
-									<asp:TableCell>
-										<%# DataBinder.Eval(Container.DataItem, "PriceValue") %>
-									</asp:TableCell>
-									<asp:TableCell RowSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-								<asp:TableRow>
-									<asp:TableCell ColumnSpan="2">
-										<%# DataBinder.Eval(Container.DataItem, "ExponentialValue") %>
-									</asp:TableCell>
-								</asp:TableRow>
-							</asp:Table>
-							<P>
-								<asp:Button id="Button1" runat="server" Text="Button"></asp:Button>
-								<asp:Image id="Image1" runat="server"></asp:Image>Palin Text</P>
-							<DIV style="DISPLAY: inline; WIDTH: 146px; HEIGHT: 26px" ms_positioning="FlowLayout"><STRONG><EM><U><FONT color="#ff0000">Html 
-												formatted text</FONT></U></EM></STRONG></DIV>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx.cs
deleted file mode 100644
index 3d1d43ece9d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Data;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_ExtractTemplateRows
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-
-		protected static DataTable m_data; // Will be used as datasource for the datalists in this test.
-
-		// initializes m_data.
-		static DataList_ExtractTemplateRows()
-		{
-			DataList_ExtractTemplateRows.m_data = new DataTable("Items");
-			DataList_ExtractTemplateRows.m_data.Columns.Add(new DataColumn("StringValue", typeof(string)));
-			DataList_ExtractTemplateRows.m_data.Columns.Add(new DataColumn("PriceValue", typeof(string)));
-			DataList_ExtractTemplateRows.m_data.Columns.Add(new DataColumn("DescriptionValue", typeof(string)));
-			DataList_ExtractTemplateRows.m_data.Columns.Add(new DataColumn("ExponentialValue", typeof(string)));
-			int num1 = 0;
-			do
-			{
-				DataRow row1 = DataList_ExtractTemplateRows.m_data.NewRow();
-				row1[0] = "Item " + num1.ToString();
-				double num3 = 1.23 * (num1 + 1);
-				row1[1] = num3.ToString("C");
-				row1[2] = "Description for Item " + num1.ToString();
-				int num2 = 0x75bcd15 * (num1 + 1);
-				row1[3] = num2.ToString("E");
-				DataList_ExtractTemplateRows.m_data.Rows.Add(row1);
-				num1++;
-			}
-			while (num1 <= 3);
-		}
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private class HtmlTableTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlTable table1 = new HtmlTable();
-				int num1 = 0;
-				do
-				{
-					HtmlTableRow row1 = new HtmlTableRow();
-					int num2 = 0;
-					do
-					{
-						HtmlTableCell cell1 = new HtmlTableCell();
-						int num3 = num1 * num2;
-						cell1.InnerText = num3.ToString();
-						row1.Cells.Add(cell1);
-						num2++;
-					}
-					while (num2 <= 3);
-					table1.Rows.Add(row1);
-					num1++;
-				}
-				while (num1 <= 3);
-				container.Controls.Add(table1);
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx
deleted file mode 100644
index 083a1b9df64..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx
+++ /dev/null
@@ -1,69 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_FooterStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_FooterStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_FooterStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form2" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="104px" Height="96px" Description="Default">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						Footer
-					</FooterTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="104px" Height="96px" Description="Set">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						<P>Footer</P>
-					</FooterTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-					<FooterStyle Font-Overline="True" Font-Underline="True" Font-Names="Arial Narrow" Font-Italic="True"
-						Font-Bold="True" Font-Strikeout="True" BorderWidth="3px" ForeColor="#004000" BorderStyle="Double"
-						BorderColor="Lime" BackColor="Purple"></FooterStyle>
-				</asp:DataList>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest3" runat="server" Width="104px" Height="96px" Description="Inherits control style">
-				<asp:DataList id=DataList3 runat="server" BackColor="#FF8080" BorderColor="#FFFFC0" BorderStyle="Groove" Font-Names="AngsanaUPC" ForeColor="DarkRed" GridLines="Both" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						Footer
-					</FooterTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="104px" Height="96px" Description="Overrides control style">
-				<asp:DataList id=DataList4 runat="server" BackColor="#FF8080" BorderColor="#FFFFC0" BorderStyle="Groove" Font-Names="AngsanaUPC" ForeColor="DarkRed" GridLines="Both" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						Footer
-					</FooterTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-					<FooterStyle Font-Names="Batang" ForeColor="Purple" BorderStyle="Dotted" BorderColor="#000040"
-						BackColor="#8080FF"></FooterStyle>
-				</asp:DataList>
-			</cc1:ghtsubtest>&nbsp;</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx.cs
deleted file mode 100644
index 2c6ccb65392..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_FooterStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx
deleted file mode 100644
index 7f7a474340f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx
+++ /dev/null
@@ -1,72 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_FooterTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_FooterTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_FooterTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="104px" Description="Fixed text">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						fixed text
-					</FooterTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="176px" Height="104px" Description="Data Bound">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						<%#Container.DataItem%>
-					</FooterTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="176px" Height="104px" Description="Control">
-				<asp:DataList id=Datalist3 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</ItemTemplate>
-					<FooterTemplate>
-						<asp:Button id="Button1" runat="server" Text="Footer"></asp:Button>
-					</FooterTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-					<FooterTemplate>
-						<tr bgcolor="ThreeDFace">
-							<td>Footer</td>
-							<td>Footer</td>
-						</tr>
-					</FooterTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id=DataList5 runat="server" DataSource="<%# m_data %>">
-				</asp:DataList>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx.cs
deleted file mode 100644
index 494b8de1e93..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_FooterTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.FooterTemplate = new FooterTemplate();
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-		// Template for Footer item.
-		private class FooterTemplate : ITemplate
-		{
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Aquamarine;
-				this.m_l.Text = "Footer text";
-				container.Controls.Add(this.m_l);
-			}
- 
-		}
-		// Template for alternating item.
-		private class ItemTemplate : ITemplate
-		{
-			private Label m_l;
-
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Coral;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
- 
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx
deleted file mode 100644
index ac9837650cb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx
+++ /dev/null
@@ -1,150 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_GridLines.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_GridLines" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_GridLines</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="504px" Description="None">
-					<asp:DataList id=DataList1 runat="server" Width="544px" DataSource="<%# m_data %>" BorderStyle="None">
-						<HeaderTemplate>
-							<tr style="FONT-WEIGHT: bold; TEXT-TRANSFORM: capitalize; COLOR: navy; TEXT-ALIGN: center; TEXT-DECORATION: underline">
-								<TD>StringValue</TD>
-								<TD>PriceValue</TD>
-								<TD>DescriptionValue</TD>
-								<TD>ExponentialValue</TD>
-							</tr>
-						</HeaderTemplate>
-						<ItemTemplate>
-							<tr style="TEXT-ALIGN: center;">
-								<TD><%# DataBinder.Eval(Container.DataItem, "StringValue")%></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "PriceValue")%></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "DescriptionValue")%></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "ExponentialValue")%></TD>
-							</tr>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="96px" Description="Horizontal">
-					<asp:DataList id=DataList2 runat="server" Width="552px" DataSource="<%# m_data %>" GridLines="Horizontal" BorderStyle="None">
-						<HeaderTemplate>
-							<tr style="FONT-WEIGHT: bold; TEXT-TRANSFORM: capitalize; COLOR: navy; TEXT-ALIGN: center; TEXT-DECORATION: underline">
-								<TD>StringValue</TD>
-								<TD>PriceValue</TD>
-								<TD>DescriptionValue</TD>
-								<TD>ExponentialValue</TD>
-							</tr>
-						</HeaderTemplate>
-						<ItemTemplate>
-							<tr style="TEXT-ALIGN: center;">
-								<TD><%# DataBinder.Eval(Container.DataItem, "StringValue") %></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "PriceValue") %></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "ExponentialValue")%></TD>
-							</tr>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description="Vertical">
-					<asp:DataList id=DataList3 runat="server" Width="552px" DataSource="<%# m_data %>" GridLines="Vertical" BorderStyle="None">
-						<HeaderTemplate>
-							<tr style="FONT-WEIGHT: bold; TEXT-TRANSFORM: capitalize; COLOR: navy; TEXT-ALIGN: center; TEXT-DECORATION: underline">
-								<TD>StringValue</TD>
-								<TD>PriceValue</TD>
-								<TD>DescriptionValue</TD>
-								<TD>ExponentialValue</TD>
-							</tr>
-						</HeaderTemplate>
-						<ItemTemplate>
-							<tr style="TEXT-ALIGN: center;">
-								<TD><%# DataBinder.Eval(Container.DataItem, "StringValue") %></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "PriceValue")%></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "ExponentialValue")%></TD>
-							</tr>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="144px" Height="96px" Description="Both">
-					<asp:DataList id=DataList4 runat="server" Width="552px" DataSource="<%# m_data %>" GridLines="Both" BorderStyle="None">
-						<HeaderTemplate>
-							<tr style="FONT-WEIGHT: bold; TEXT-TRANSFORM: capitalize; COLOR: navy; TEXT-ALIGN: center; TEXT-DECORATION: underline">
-								<TD>StringValue</TD>
-								<TD>PriceValue</TD>
-								<TD>DescriptionValue</TD>
-								<TD>ExponentialValue</TD>
-							</tr>
-						</HeaderTemplate>
-						<ItemTemplate>
-							<tr style="TEXT-ALIGN: center;">
-								<TD><%# DataBinder.Eval(Container.DataItem, "StringValue") %></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "PriceValue")%></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "DescriptionValue")%></TD>
-								<TD><%# DataBinder.Eval(Container.DataItem, "ExponentialValue") %></TD>
-							</tr>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="144px" Height="96px" Description="Does not apply if RepeatLayout = flow">
-					<asp:DataList id=DataList5 runat="server" Width="552px" DataSource="<%# m_data %>" GridLines="Both" RepeatLayout="Flow" BorderStyle="None">
-						<HeaderTemplate>
-							<tr style="FONT-WEIGHT: bold; TEXT-TRANSFORM: capitalize; COLOR: navy; TEXT-ALIGN: center; TEXT-DECORATION: underline">
-								<TD>
-									StringValue
-								</TD>
-								<TD>
-									PriceValue
-								</TD>
-								<TD>
-									DescriptionValue
-								</TD>
-								<TD>
-									ExponentialValue
-								</TD>
-							</tr>
-						</HeaderTemplate>
-						<ItemTemplate>
-							<tr style="TEXT-ALIGN: center;">
-								<TD>
-									<%# DataBinder.Eval(Container.DataItem, "StringValue") %>
-								</TD>
-								<TD>
-									<%# DataBinder.Eval(Container.DataItem, "PriceValue") %>
-								</TD>
-								<TD>
-									<%# DataBinder.Eval(Container.DataItem, "DescriptionValue") %>
-								</TD>
-								<TD>
-									<%# DataBinder.Eval(Container.DataItem, "ExponentialValue") %>
-								</TD>
-							</tr>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest>&nbsp;
-			</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx.cs
deleted file mode 100644
index 8ec927dbb66..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Data;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_GridLines
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected static DataTable m_data; // Will be used as datasource for the datalists in this test.
-
-		// initializes m_data.
-		static DataList_GridLines()
-		{
-			DataList_GridLines.m_data = new DataTable("Items");
-			DataList_GridLines.m_data.Columns.Add(new DataColumn("StringValue", typeof(string)));
-			DataList_GridLines.m_data.Columns.Add(new DataColumn("PriceValue", typeof(string)));
-			DataList_GridLines.m_data.Columns.Add(new DataColumn("DescriptionValue", typeof(string)));
-			DataList_GridLines.m_data.Columns.Add(new DataColumn("ExponentialValue", typeof(string)));
-			int num1 = 0;
-			do
-			{
-				DataRow row1 = DataList_GridLines.m_data.NewRow();
-				row1[0] = "Item " + num1.ToString();
-				double num3 = 1.23 * (num1 + 1);
-				row1[1] = num3.ToString("C");
-				row1[2] = "Description for Item " + num1.ToString();
-				int num2 = 0x75bcd15 * (num1 + 1);
-				row1[3] = num2.ToString("E");
-				DataList_GridLines.m_data.Rows.Add(row1);
-				num1++;
-			}
-			while (num1 <= 3);
-		}
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			// Check default value
-			try
-			{
-				this.GHTSubTestBegin("Default value");
-				DataList list1 = new DataList();
-				base.GHTActiveSubTest.Controls.Add(list1);
-				DataList list2 = list1;
-				list2.DataSource = DataList_GridLines.m_data;
-				list2.HeaderTemplate = this.DataList1.HeaderTemplate;
-				list2.ItemTemplate = this.DataList1.ItemTemplate;
-				list2.HeaderStyle.CopyFrom(this.DataList1.HeaderStyle);
-				list2.ItemStyle.CopyFrom(this.DataList1.ItemStyle);
-				list2.RepeatLayout = RepeatLayout.Table;
-				list2.DataBind();
-				list2 = null;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception6 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx
deleted file mode 100644
index efbd42133f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx
+++ /dev/null
@@ -1,93 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_HeaderStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_HeaderStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_HeaderStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form2" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="104px" Height="96px" Description="Default">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<headerTemplate>
-						header
-					</headerTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="104px" Height="96px" Description="Set">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>">
-					<headerTemplate>
-						<P>header</P>
-					</headerTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-					<headerStyle Font-Overline="True" Font-Underline="True" Font-Names="Arial Narrow" Font-Italic="True"
-						Font-Bold="True" Font-Strikeout="True" BorderWidth="3px" ForeColor="#004000" BorderStyle="Double"
-						BorderColor="Lime" BackColor="Purple"></headerStyle>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Width="104px" Height="96px" Description="Inherits control style">
-				<asp:DataList id=DataList3 runat="server" DataSource="<%# m_data %>" BackColor="#FF8080" BorderColor="#FFFFC0" BorderStyle="Groove" Font-Names="AngsanaUPC" ForeColor="DarkRed" GridLines="Both">
-					<headerTemplate>
-						header
-					</headerTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="104px" Height="96px" Description="Overrides control style">
-				<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>" BackColor="#FF8080" BorderColor="#FFFFC0" BorderStyle="Groove" Font-Names="AngsanaUPC" ForeColor="DarkRed" GridLines="Both">
-					<headerTemplate>
-						header
-					</headerTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-					<headerStyle Font-Names="Batang" ForeColor="Purple" BorderStyle="Dotted" BorderColor="#000040"
-						BackColor="#8080FF"></headerStyle>
-				</asp:DataList>
-			</cc1:ghtsubtest>&nbsp;
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Description="Multi column test" Height="96px" Width="104px">
-				<asp:DataList id=DataList5 runat="server" DataSource="<%# m_data %>">
-					<HeaderTemplate>
-						<TD align="center">Header</TD>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-						<TD><%#Container.DataItem%></TD>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx.cs
deleted file mode 100644
index b298c933653..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_HeaderStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx
deleted file mode 100644
index 3f28a7958b7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx
+++ /dev/null
@@ -1,71 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_HeaderTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_HeaderTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_HeaderTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="104px" Description="Fixed text">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<headerTemplate>
-						fixed text
-					</headerTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="176px" Height="104px" Description="Data Bound">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>">
-					<headerTemplate>
-						<%#Container.DataItem%>
-					</headerTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="176px" Height="104px" Description="Control">
-				<asp:DataList id=Datalist3 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</ItemTemplate>
-					<headerTemplate>
-						<asp:Button id="Button1" runat="server" Text="header"></asp:Button>
-					</headerTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-					<headerTemplate>
-						<tr bgcolor="ThreeDFace">
-							<td>header</td>
-							<td>header</td>
-						</tr>
-					</headerTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id=DataList5 runat="server" DataSource="<%# m_data %>">
-				</asp:DataList>
-			</cc1:GHTSubTest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx.cs
deleted file mode 100644
index 0789f009753..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_HeaderTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.HeaderTemplate = new headerTemplate();
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-		// Template for header item.
-		private class headerTemplate : ITemplate
-		{
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Aquamarine;
-				this.m_l.Text = "header text";
-				container.Controls.Add(this.m_l);
-			}
- 
-		}
-		// Template for alternating item.
-		private class ItemTemplate : ITemplate
-		{
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Coral;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
- 
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx
deleted file mode 100644
index 0925d098ae8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_ItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_ItemStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_ItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="Default">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="152px" Height="109px" Description="Set.">
-				<asp:DataList id=DataList2 runat="server" EditItemIndex="1" DataSource="<%# m_data %>">
-					<itemstyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></itemstyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description='Overrides "ControlStyle"'>
-				<asp:DataList id=DataList3 runat="server" EditItemIndex="6" BackColor="#FFC0C0" BorderColor="#000040" BorderStyle="Double" BorderWidth="2px" Font-Names="Aharoni" ForeColor="Maroon" DataSource="<%# m_data %>">
-					<ItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></ItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-		</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx.cs
deleted file mode 100644
index 5e8caf24542..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class DataList_ItemStyle
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-        protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-
-            GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-            GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-            GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-            GHTTestEnd();
-        }
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx
deleted file mode 100644
index 966aace5f7b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_ItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_ItemTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_ItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="104px" Description="Fixed text">
-				<asp:DataList id="DataList1" runat="server">
-					<ItemTemplate>
-						fixed text
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Width="176px" Height="104px" Description="Data bound">
-				<asp:DataList id="Datalist2" runat="server">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="176px" Height="104px" Description="Control">
-				<asp:DataList id="Datalist3" runat="server">
-					<ItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id="DataList4" runat="server">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id="DataList5" runat="server"></asp:DataList>
-			</cc1:GHTSubTest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx.cs
deleted file mode 100644
index 6ed85a3fd94..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_ItemTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList Datalist2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				Datalist2.DataSource = m_data;
-				Datalist2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataSource = m_data;
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataSource = m_data;
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.DataSource = m_data;
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		// Template for  item.
-		private class ItemTemplate : ITemplate
-		{
-			private Label m_l;
-
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Aquamarine;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
- 
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_Items.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_Items.aspx
deleted file mode 100644
index 8cfa387712c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_Items.aspx
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_Items.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_Items" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_Items</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<asp:Label ID="ItemLabel" Runat=server text='<%# Container.DataItem %>'>
-						</asp:Label>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_Items.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_Items.aspx.cs
deleted file mode 100644
index 52b33f5f8ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_Items.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_Items
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-				foreach (DataListItem l_current in DataList1.Items)
-					GHTSubTestAddResult("Item: " + ( (Label)l_current.FindControl("ItemLabel") ).Text);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx
deleted file mode 100644
index 00248f38a01..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx
+++ /dev/null
@@ -1,105 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_RepeatColumns.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_RepeatColumns" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_RepeatColumns</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P><cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 0 vertical">
-					<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest2" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 1 vertical">
-					<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>" RepeatColumns="1">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest3" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 3 vertical">
-					<asp:DataList id=DataList3 runat="server" DataSource="<%# m_data %>" RepeatColumns="3">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest6" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 6 vertical">
-					<asp:DataList id=DataList6 runat="server" DataSource="<%# m_data %>" RepeatColumns="6">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest4" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 20 vertical">
-					<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>" RepeatColumns="20">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest>&nbsp;
-				<cc1:ghtsubtest id="GHTSubTest5" runat="server" Width="120px" Height="128px" Description="RepeateColumns = -1 vertical">
-					<asp:DataList id=DataList5 runat="server" DataSource="<%# m_data %>">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest>&nbsp;</P>
-			<P>&nbsp;
-				<cc1:ghtsubtest id="GHTSubTest7" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 0 Horizontal">
-					<asp:DataList id=DataList7 runat="server" DataSource="<%# m_data %>" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest8" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 0 Horizontal">
-					<asp:DataList id=DataList8 runat="server" DataSource="<%# m_data %>" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest9" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 3 Horizontal">
-					<asp:DataList id=DataList9 runat="server" DataSource="<%# m_data %>" RepeatColumns="3" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest12" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 6 Horizontal">
-					<asp:DataList id=DataList12 runat="server" DataSource="<%# m_data %>" RepeatColumns="6" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest10" runat="server" Width="120px" Height="128px" Description="RepeateColumns = 20 Horizontal">
-					<asp:DataList id=DataList10 runat="server" DataSource="<%# m_data %>" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest>
-				<cc1:GHTSubTest id="GHTSubTest11" runat="server" Width="120px" Height="128px" Description="RepeateColumns = -1 Horizontal">
-					<asp:DataList id=DataList11 runat="server" DataSource="<%# m_data %>" RepeatColumns="20" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx.cs
deleted file mode 100644
index 9744f3e2f02..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_RepeatColumns
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		protected System.Web.UI.WebControls.DataList DataList8;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		protected System.Web.UI.WebControls.DataList DataList9;
-		protected GHTWebControls.GHTSubTest GHTSubTest9;
-		protected System.Web.UI.WebControls.DataList DataList12;
-		protected GHTWebControls.GHTSubTest GHTSubTest12;
-		protected System.Web.UI.WebControls.DataList DataList10;
-		protected GHTWebControls.GHTSubTest GHTSubTest10;
-		protected System.Web.UI.WebControls.DataList DataList11;
-		protected GHTWebControls.GHTSubTest GHTSubTest11;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.DataBind();
-				DataList5.RepeatColumns = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataList6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest7;
-			try 
-			{
-				DataList7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest8;
-			try 
-			{
-				DataList8.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest9;
-			try 
-			{
-				DataList9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest10;
-			try 
-			{
-				DataList10.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest11;
-			try 
-			{
-				DataList11.DataBind();
-				DataList11.RepeatColumns = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest12;
-			try 
-			{
-				DataList12.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx
deleted file mode 100644
index 87059564e55..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx
+++ /dev/null
@@ -1,72 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_RepeatDirection.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_RepeatDirection" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_RepeatDirection</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px" Description="Vertical - repeatColumn=0">
-					<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="96px" Description="Vertical - repeatColumn=3">
-					<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>" RepeatColumns="3">
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description="Vertical - repeatColumn=10">
-					<asp:DataList id=DataList3 runat="server" DataSource="<%# m_data %>" RepeatColumns="10">
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="144px" Height="96px" Description="Horizontal - repeatColumn=0">
-					<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="144px" Height="96px" Description="Horizontal - repeatColumn=3">
-					<asp:DataList id=DataList5 runat="server" DataSource="<%# m_data %>" RepeatColumns="3" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Width="144px" Height="96px" Description="Horizontal - repeatColumn=10">
-					<asp:DataList id=DataList6 runat="server" DataSource="<%# m_data %>" RepeatColumns="10" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx.cs
deleted file mode 100644
index 5986894d7ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_RepeatDirection
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataList6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx
deleted file mode 100644
index 9bd4e03f2fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx
+++ /dev/null
@@ -1,125 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_RepeatLayout.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_RepeatLayout" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_RepeatLayout</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P><cc1:ghtsubtest id="GHTSubTest1" runat="server" Description="GHTSubTest1: Table - one column, vertical "
-					Width="104px" Height="128px">
-					<asp:DataList id=DataList1 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="1" RepeatDirection="Vertical">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest2" runat="server" Description="GHTSubTest2: Flow - one column, vertical "
-					Width="104px" Height="130px">
-					<asp:DataList id=DataList2 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="1" RepeatDirection="Vertical">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest3" runat="server" Description="GHTSubTest3: Table - three columns, vertical "
-					Width="216px" Height="100px">
-					<asp:DataList id=DataList3 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="3" RepeatDirection="Vertical">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest4" runat="server" Description="GHTSubTest4: Flow- three columns, vertical "
-					Width="120px" Height="130px">
-					<asp:DataList id=DataList4 runat="server" Height="75px" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Flow" RepeatColumns="3" RepeatDirection="Vertical">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest5" runat="server" Description="GHTSubTest5: Table- one row, vertical "
-					Width="40px" Height="80px">
-					<asp:DataList id=DataList5 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="10" RepeatDirection="Vertical">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="GHTSubTest6" runat="server" Description="GHTSubTest6: Flow- one row, vertical "
-					Width="104px" Height="130px">
-					<asp:DataList id=DataList6 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Flow" RepeatColumns="10" RepeatDirection="Vertical">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest7" runat="server" Description="Ghtsubtest7: Table - one column, horizontal "
-					Width="104px" Height="140px">
-					<asp:DataList id=Datalist7 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="1" RepeatDirection="horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest8" runat="server" Description="Ghtsubtest8: Flow - one column, horizontal "
-					Width="88px" Height="202px">
-					<asp:DataList id=Datalist8 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Flow" RepeatColumns="1" RepeatDirection="horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest9" runat="server" Description="Ghtsubtest9: Table - three columns, horizontal "
-					Width="216px" Height="90px">
-					<asp:DataList id=Datalist9 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="3" RepeatDirection="horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest10" runat="server" Description="Ghtsubtest10: Flow- three columns, horizontal "
-					Width="40px" Height="80px">
-					<asp:DataList id=Datalist10 runat="server" Height="136px" Width="120px" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Flow" RepeatColumns="3" RepeatDirection="horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest11" runat="server" Description="Ghtsubtest11: Table- one row, horizontal "
-					Width="360px" Height="102px">
-					<asp:DataList id=Datalist11 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Table" RepeatColumns="10" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest12" runat="server" Description="Ghtsubtest12: Flow- one row, horizontal "
-					Width="120px" Height="138px">
-					<asp:DataList id=Datalist12 runat="server" GridLines="Both" BorderWidth="1px" BorderColor="Black" DataSource="<%# m_data %>" RepeatLayout="Flow" RepeatColumns="10" RepeatDirection="Horizontal">
-						<ItemTemplate>
-							<%#Container.DataItem%>
-						</ItemTemplate>
-					</asp:DataList>
-				</cc1:ghtsubtest></P>
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx.cs
deleted file mode 100644
index 1a4cc084fd9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_RepeatLayout
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.DataList Datalist7;
-		protected GHTWebControls.GHTSubTest Ghtsubtest7;
-		protected System.Web.UI.WebControls.DataList Datalist8;
-		protected GHTWebControls.GHTSubTest Ghtsubtest8;
-		protected System.Web.UI.WebControls.DataList Datalist9;
-		protected GHTWebControls.GHTSubTest Ghtsubtest9;
-		protected System.Web.UI.WebControls.DataList Datalist10;
-		protected GHTWebControls.GHTSubTest Ghtsubtest10;
-		protected System.Web.UI.WebControls.DataList Datalist11;
-		protected GHTWebControls.GHTSubTest Ghtsubtest11;
-		protected System.Web.UI.WebControls.DataList Datalist12;
-		protected GHTWebControls.GHTSubTest Ghtsubtest12;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataList6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest7;
-			try 
-			{
-				Datalist7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest8;
-			try 
-			{
-				Datalist8.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest9;
-			try 
-			{
-				Datalist9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest10;
-			try 
-			{
-				Datalist10.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest11;
-			try 
-			{
-				Datalist11.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest12;
-			try 
-			{
-				Datalist12.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx
deleted file mode 100644
index 0e2d21c9e6d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SelectCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SelectCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SelectCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px"></cc1:GHTSubTest>
-			<asp:DataList id="DataList1" runat="server"></asp:DataList>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx.cs
deleted file mode 100644
index 3c3b0c6f380..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SelectCommandName
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataList.SelectCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx
deleted file mode 100644
index 9a6c8049da1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx
+++ /dev/null
@@ -1,73 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SelectedIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SelectedIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SelectedIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="232px" Height="112px" Description="Not set">
-					<asp:DataList id="DataList1" runat="server" Height="112px" Width="136px">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<SelectedItemTemplate>
-							Selected Item!
-						</SelectedItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="232px" Height="112px" Description="Set to legal value">
-					<asp:DataList id="DataList2" runat="server" Height="120px" Width="144px" SelectedIndex="2">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<selectedItemTemplate>
-							Selected Item!
-						</selectedItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="232px" Height="112px" Description="Higher then the number of items.">
-					<asp:DataList id="DataList3" runat="server" Height="122px" Width="136px" SelectedIndex="10">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<selectedItemTemplate>
-							Selected Item!
-						</selectedItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="232px" Height="112px" Description="Illegal value - less then -1">
-					<asp:DataList id="DataList4" runat="server" Height="130px" Width="168px">
-						<ItemTemplate>
-							Regular item.
-						</ItemTemplate>
-						<selectedItemTemplate>
-							Selected Item!
-						</selectedItemTemplate>
-					</asp:DataList>
-				</cc1:GHTSubTest></P>
-			<P>&nbsp;</P>
-		</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx.cs
deleted file mode 100644
index 6a8c1372e63..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SelectedIndex
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataSource = m_data;
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataSource = m_data;
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-				DataList1.SelectedIndex = -2;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx
deleted file mode 100644
index 073f0c5b6f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SelectedItem.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SelectedItem" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SelectedItem</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px" Description="None selected."></cc1:GHTSubTest>
-			<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>" >
-				<ItemTemplate>
-					<%#Container.DataItem%>
-				</ItemTemplate>
-				<SelectedItemTemplate>
-					Selected Item
-				</SelectedItemTemplate>
-			</asp:DataList>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="96px" Description="Legal value selected."></cc1:GHTSubTest>
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>" SelectedIndex="3">
-					<SelectedItemTemplate>
-						Selected Item
-					</SelectedItemTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList></P>
-		</form>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx.cs
deleted file mode 100644
index 62d9d2cb95f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SelectedItem
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-				if (DataList1.SelectedItem == null)
-				{
-					GHTSubTestAddResult("Test Passed.");
-					GHTSubTestAddResult("Result: null");
-				}
-				else
-				{
-					GHTSubTestAddResult("Test Failed.");
-					GHTSubTestAddResult("Result: " + DataList1.SelectedItem.ToString());
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-				Compare(DataList2.SelectedItem, DataList2.Items[3]);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx
deleted file mode 100644
index 7d207041d15..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx
+++ /dev/null
@@ -1,75 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SelectedItemStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SelectedItemStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SelectedItemStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="Default">
-				<asp:DataList id="DataList1" runat="server">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="152px" Height="109px" Description="Set.">
-				<asp:DataList id="DataList2" runat="server" SelectedIndex="1">
-					<selectedItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></selectedItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="144px" Height="96px" Description='Overrides "AlternatingItemStyle"'>
-				<asp:DataList id="DataList4" runat="server" SelectedIndex="3">
-					<selectedItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></selectedItemStyle>
-					<AlternatingItemStyle Font-Names="Aharoni" BorderWidth="2px" ForeColor="Maroon" BorderStyle="Double" BorderColor="#000040"
-						BackColor="#FFC0C0"></AlternatingItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="144px" Height="96px" Description='Overrides "ItemStyle"'>
-				<asp:DataList id="DataList5" runat="server" SelectedIndex="5">
-					<selectedItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></selectedItemStyle>
-					<ItemStyle Font-Names="Aharoni" BorderWidth="2px" ForeColor="Maroon" BorderStyle="Double" BorderColor="#000040"
-						BackColor="#FFC0C0"></ItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" runat="server" Width="144px" Height="96px" Description='Overrides "ControlStyle"'>
-				<asp:DataList id="DataList6" runat="server" SelectedIndex="6" ForeColor="Maroon" Font-Names="Aharoni"
-					BorderWidth="2px" BorderStyle="Double" BorderColor="#000040" BackColor="#FFC0C0">
-					<selectedItemStyle Font-Names="David" BorderWidth="1px" ForeColor="Maroon" BorderStyle="Solid" BorderColor="Red"
-						BackColor="Turquoise"></selectedItemStyle>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx.cs
deleted file mode 100644
index 095fbdcb919..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SelectedItemStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DataList DataList6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataSource = m_data;
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataSource = m_data;
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.DataSource = m_data;
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				DataList6.DataSource = m_data;
-				DataList6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx
deleted file mode 100644
index 01311ea143b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx
+++ /dev/null
@@ -1,71 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SelectedItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SelectedItemTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SelectedItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="104px" Description="Fixed text">
-				<asp:DataList id="DataList1" runat="server" SelectedIndex="1">
-					<SelectedItemTemplate>
-						<P>fixed text
-						</P>
-					</SelectedItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Width="176px" Height="104px" Description="Data bound">
-				<asp:DataList id="Datalist2" runat="server" selectedindex="2">
-					<SelectedItemTemplate>
-						<%#Container.DataItem%>
-					</SelectedItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="176px" Height="104px" Description="Control">
-				<asp:DataList id="Datalist3" runat="server" selectedindex="3">
-					<SelectedItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</SelectedItemTemplate>
-					<ItemTemplate>
-						<asp:Button id="Button1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:Button>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id="DataList4" runat="server" selectedindex="4">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-					<SelectedItemTemplate>
-						<tr bgcolor="ThreeDFace">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</SelectedItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id="DataList5" runat="server" selectedindex="5"></asp:DataList>
-			</cc1:GHTSubTest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx.cs
deleted file mode 100644
index 0d469caa8ba..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SelectedItemTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList Datalist2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		private static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataSource = m_data;;
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				Datalist2.DataSource = m_data;
-				Datalist2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataSource = m_data;
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataSource = m_data;
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.SelectedItemTemplate = new SelectedItemTemplate();
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.DataSource = m_data;
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-
-		// Template for Selected items.
-		private class SelectedItemTemplate : ITemplate
-		{
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Aquamarine;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
-		}
-
-		// Template for regular item.
-		private class ItemTemplate : ITemplate
-		{
-			private Label m_l;
-
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Coral;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
- 
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx
deleted file mode 100644
index f6caf6b585c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx
+++ /dev/null
@@ -1,72 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SeparatorStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SeparatorStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SeparatorStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form2" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="104px" Height="96px" Description="Default">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<SeparatorTemplate>
-						separator
-					</SeparatorTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="104px" Height="96px" Description="Set">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>">
-					<separatorTemplate>
-						<P>separator</P>
-					</separatorTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-					<separatorStyle Font-Overline="True" Font-Underline="True" Font-Names="Arial Narrow" Font-Italic="True"
-						Font-Bold="True" Font-Strikeout="True" BorderWidth="3px" ForeColor="#004000" BorderStyle="Double"
-						BorderColor="Lime" BackColor="Purple"></separatorStyle>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Width="104px" Height="96px" Description="Inherits control style">
-				<asp:DataList id=DataList3 runat="server" DataSource="<%# m_data %>" BackColor="#FF8080" BorderColor="#FFFFC0" BorderStyle="Groove" Font-Names="AngsanaUPC" ForeColor="DarkRed" GridLines="Both">
-					<separatorTemplate>
-						separator
-					</separatorTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="104px" Height="96px" Description="Overrides control style">
-				<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>" BackColor="#FF8080" BorderColor="#FFFFC0" BorderStyle="Groove" Font-Names="AngsanaUPC" ForeColor="DarkRed" GridLines="Both">
-					<separatorTemplate>
-						separator
-					</separatorTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-					<separatorStyle Font-Names="Batang" ForeColor="Purple" BorderStyle="Dotted" BorderColor="#000040"
-						BackColor="#8080FF"></separatorStyle>
-				</asp:DataList>
-			</cc1:ghtsubtest>&nbsp;</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx.cs
deleted file mode 100644
index f401b678c33..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SeparatorStyle
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx
deleted file mode 100644
index 459b194ec74..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx
+++ /dev/null
@@ -1,71 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_SeparatorTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_SeparatorTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_SeparatorTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="104px" Description="Fixed text">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<separatorTemplate>
-						fixed text
-					</separatorTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="176px" Height="104px" Description="Data Bound">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>">
-					<separatorTemplate>
-						<%#Container.DataItem%>
-					</separatorTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="176px" Height="104px" Description="Control">
-				<asp:DataList id=Datalist3 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<asp:TextBox id="TextBox1" runat="server" Text="<%#Container.DataItem%>">
-						</asp:TextBox>
-					</ItemTemplate>
-					<separatorTemplate>
-						<asp:Button id="Button1" runat="server" Text="separator"></asp:Button>
-					</separatorTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="176px" Height="104px" Description="Table">
-				<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<tr bgcolor="ActiveCaption">
-							<td><%#Container.DataItem%></td>
-						</tr>
-					</ItemTemplate>
-					<separatorTemplate>
-						<tr bgcolor="ThreeDFace">
-							<td>separator</td>
-							<td>separator</td>
-						</tr>
-					</separatorTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Width="176px" Height="104px" Description="Template loaded at runtime">
-				<asp:DataList id=DataList5 runat="server" DataSource="<%# m_data %>">
-				</asp:DataList>
-			</cc1:GHTSubTest></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx.cs
deleted file mode 100644
index ef16a20c07c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_SeparatorTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DataList DataList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Datalist3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				DataList5.ItemTemplate = new ItemTemplate();
-				DataList5.SeparatorTemplate = new SeparatorTemplate();
-				DataList5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-		// Template for header item.
-		private class SeparatorTemplate : ITemplate
-		{
-
-			private Label m_l;
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Aquamarine;
-				this.m_l.Text = "Separator text";
-				container.Controls.Add(this.m_l);
-			}
- 
-		}
-		// Template for alternating item.
-		private class ItemTemplate : ITemplate
-		{
-			private Label m_l;
-
-
-			public void InstantiateIn(Control container)
-			{
-				this.m_l = new Label();
-				this.m_l.BackColor = Color.Coral;
-				container.Controls.Add(this.m_l);
-				m_l.DataBinding += new EventHandler(m_l_DataBinding);
-			}
- 
-			private void m_l_DataBinding(object sender, EventArgs e)
-			{
-				DataListItem item1 = (DataListItem) ((Label) sender).NamingContainer;
-				this.m_l.Text = (string)(item1.DataItem);
-			}
- 
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx
deleted file mode 100644
index b9e888b5e60..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_ShowFooter.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_ShowFooter" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_ShowFooter</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="96px" Width="144px" Description="Footer template set + Show footer enabled.">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						Footer
-					</FooterTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="96px" Description="Footer template set + Show footer disabled.">
-				<asp:DataList id=DataList2 runat="server" ShowFooter="False" DataSource="<%# m_data %>">
-					<FooterTemplate>
-						Footer
-					</FooterTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description="Footer template not set + Show footer enabled.">
-				<asp:DataList id=DataList3 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="144px" Height="96px" Description="Footer template not set + Show footer disabled.">
-				<asp:DataList id=DataList4 runat="server" ShowFooter="False" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx.cs
deleted file mode 100644
index 5efe8605f62..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_ShowFooter
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx
deleted file mode 100644
index 595c87eb014..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_ShowHeader.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_ShowHeader" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_ShowHeader</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="header template set + Show header enabled.">
-				<asp:DataList id=DataList1 runat="server" DataSource="<%# m_data %>">
-					<headerTemplate>
-						header
-					</headerTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="144px" Height="96px" Description="header template set + Show header disabled.">
-				<asp:DataList id=DataList2 runat="server" DataSource="<%# m_data %>" Showheader="False">
-					<headerTemplate>
-						header
-					</headerTemplate>
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Width="144px" Height="96px" Description="header template not set + Show header enabled.">
-				<asp:DataList id=DataList3 runat="server" DataSource="<%# m_data %>">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Width="144px" Height="96px" Description="header template not set + Show header disabled.">
-				<asp:DataList id=DataList4 runat="server" DataSource="<%# m_data %>" Showheader="False">
-					<ItemTemplate>
-						<%#Container.DataItem%>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>&nbsp;
-		</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx.cs
deleted file mode 100644
index e3ff4a5b8b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_ShowHeader
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DataList DataList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DataList DataList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataList1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				DataList2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				DataList3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				DataList4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx
deleted file mode 100644
index f4717fcd2fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataList_UpdateCommandName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataList_UpdateCommandName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataList_UpdateCommandName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="144px" Height="96px"></cc1:GHTSubTest>
-			<asp:DataList id="DataList1" runat="server"></asp:DataList></FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx.cs
deleted file mode 100644
index db00144eaf4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataList_UpdateCommandName
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected static string [] m_data = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff", "ggg"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				GHTSubTestAddResult(DataList.UpdateCommandName);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx
deleted file mode 100644
index f24063f225e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataListItem_DataItem.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataListItem_DataItem" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataListItem_DataItem</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:datalist id=DataList1 runat="server" DataSource="<%# m_data %>" SelectedIndex="3" EditItemIndex="2">
-				<HeaderTemplate>
-					Header
-				</HeaderTemplate>
-				<FooterTemplate>
-					Footer
-				</FooterTemplate>
-				<ItemTemplate>
-					<%#Container.DataItem%>
-				</ItemTemplate>
-				<SeparatorTemplate>
-					Seperator
-				</SeparatorTemplate>
-			</asp:datalist>
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Description="AlternatingItem" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Description="EditItem" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Description="FooterItem" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Description="Header" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Description="Item" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Description="Pager" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest7" runat="server" Description="SelectedItem" Height="96px" Width="144px"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest8" runat="server" Description="Separator" Height="96px" Width="144px"></cc1:ghtsubtest>&nbsp;</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx.cs
deleted file mode 100644
index 9768d600405..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class DataListItem_DataItem
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-		 this.DataList1.ItemCreated += new DataListItemEventHandler(DataList1_ItemCreated);
-
-	 }
-	 #endregion
-
- 	protected System.Web.UI.WebControls.DataList DataList1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest4;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest5;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest6;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest7;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest8;
-
-        protected static string [] m_data = new string[] {"aaa", "bbb", "ccc", "ddd"};
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm = (HtmlForm)FindControl("form1");
-            GHTTestBegin(frm);
-            DataList1.DataBind();;
-
-        }
-
-
-	 private void DataList1_ItemCreated(object sender, DataListItemEventArgs e)
-	 {
-		 switch (e.Item.ItemType)
-		 {
-			 case ListItemType.Header:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest4, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception12)
-				 {
-					 // ProjectData.SetProjectError(exception12);
-					 Exception exception4 = exception12;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.Footer:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest3, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception11)
-				 {
-					 // ProjectData.SetProjectError(exception11);
-					 Exception exception3 = exception11;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.Item:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest5, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception13)
-				 {
-					 // ProjectData.SetProjectError(exception13);
-					 Exception exception5 = exception13;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.AlternatingItem:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.GHTSubTest1, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception9)
-				 {
-					 // ProjectData.SetProjectError(exception9);
-					 Exception exception1 = exception9;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-					 // ProjectData.ClearProjectError();
-				 }
-				 return;
-			 }
-			 case ListItemType.SelectedItem:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest7, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception15)
-				 {
-					 // ProjectData.SetProjectError(exception15);
-					 Exception exception7 = exception15;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception7);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.EditItem:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest2, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception10)
-				 {
-					 // ProjectData.SetProjectError(exception10);
-					 Exception exception2 = exception10;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-					 // ProjectData.ClearProjectError();
-				 }
-				 return;
-			 }
-			 case ListItemType.Separator:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest8, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception16)
-				 {
-					 // ProjectData.SetProjectError(exception16);
-					 Exception exception8 = exception16;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception8);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.Pager:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest6, (string)(e.Item.DataItem));
-				 }
-				 catch (Exception exception14)
-				 {
-					 // ProjectData.SetProjectError(exception14);
-					 Exception exception6 = exception14;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-		 }
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx
deleted file mode 100644
index 165402115ac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataListItem_ItemIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataListItem_ItemIndex" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataListItem_ItemIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:datalist id=DataList1 runat="server" DataSource="<%# m_data %>" EditItemIndex="2" SelectedIndex="3">
-				<HeaderTemplate>
-					Header
-				</HeaderTemplate>
-				<FooterTemplate>
-					Footer
-				</FooterTemplate>
-				<ItemTemplate>
-					<%#Container.DataItem%>
-				</ItemTemplate>
-				<SeparatorTemplate>
-					Seperator
-				</SeparatorTemplate>
-			</asp:datalist>&nbsp;
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="AlternatingItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="144px" Height="96px" Description="EditItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Width="144px" Height="96px" Description="FooterItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="144px" Height="96px" Description="Header"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Width="144px" Height="96px" Description="Item"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Width="144px" Height="96px" Description="Pager"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest7" runat="server" Width="144px" Height="96px" Description="SelectedItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest8" runat="server" Width="144px" Height="96px" Description="Separator"></cc1:ghtsubtest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx.cs
deleted file mode 100755
index b92cadc27b0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class DataListItem_ItemIndex : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataList1.ItemCreated += new DataListItemEventHandler(DataList1_ItemCreated);
-
-		}
-		#endregion
-
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest7;
-		protected GHTWebControls.GHTSubTest Ghtsubtest8;
-		protected System.Web.UI.WebControls.DataList DataList1;
-
-        protected static string [] m_data = new string[] {"aaa", "bbb", "ccc", "ddd"};
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm = (HtmlForm)FindControl("form1");
-            GHTTestBegin(frm);
-            DataList1.DataBind();
-        }
-
-
-		private void DataList1_ItemCreated(object sender, DataListItemEventArgs e)
-		{
-			switch (e.Item.ItemType)
-			{
-				case ListItemType.Header:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest4, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception12)
-					{
-						// ProjectData.SetProjectError(exception12);
-						Exception exception4 = exception12;
-						this.GHTSubTestUnexpectedExceptionCaught(exception4);
-						// ProjectData.ClearProjectError();
-					}
-					this.GHTSubTestEnd();
-					return;
-				}
-				case ListItemType.Footer:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest3, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception11)
-					{
-						// ProjectData.SetProjectError(exception11);
-						Exception exception3 = exception11;
-						this.GHTSubTestUnexpectedExceptionCaught(exception3);
-						// ProjectData.ClearProjectError();
-					}
-					this.GHTSubTestEnd();
-					return;
-				}
-				case ListItemType.Item:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest5, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception13)
-					{
-						// ProjectData.SetProjectError(exception13);
-						Exception exception5 = exception13;
-						this.GHTSubTestUnexpectedExceptionCaught(exception5);
-						// ProjectData.ClearProjectError();
-					}
-					this.GHTSubTestEnd();
-					return;
-				}
-				case ListItemType.AlternatingItem:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.GHTSubTest1, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception9)
-					{
-						// ProjectData.SetProjectError(exception9);
-						Exception exception1 = exception9;
-						this.GHTSubTestUnexpectedExceptionCaught(exception1);
-						// ProjectData.ClearProjectError();
-					}
-					return;
-				}
-				case ListItemType.SelectedItem:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest7, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception15)
-					{
-						// ProjectData.SetProjectError(exception15);
-						Exception exception7 = exception15;
-						this.GHTSubTestUnexpectedExceptionCaught(exception7);
-						// ProjectData.ClearProjectError();
-					}
-					this.GHTSubTestEnd();
-					return;
-				}
-				case ListItemType.EditItem:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest2, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception10)
-					{
-						// ProjectData.SetProjectError(exception10);
-						Exception exception2 = exception10;
-						this.GHTSubTestUnexpectedExceptionCaught(exception2);
-						// ProjectData.ClearProjectError();
-					}
-					return;
-				}
-				case ListItemType.Separator:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest8, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception16)
-					{
-						// ProjectData.SetProjectError(exception16);
-						Exception exception8 = exception16;
-						this.GHTSubTestUnexpectedExceptionCaught(exception8);
-						// ProjectData.ClearProjectError();
-					}
-					this.GHTSubTestEnd();
-					return;
-				}
-				case ListItemType.Pager:
-				{
-					try
-					{
-						this.GHTSubTestAddResult(this.Ghtsubtest6, e.Item.ItemIndex.ToString());
-					}
-					catch (Exception exception14)
-					{
-						// ProjectData.SetProjectError(exception14);
-						Exception exception6 = exception14;
-						this.GHTSubTestUnexpectedExceptionCaught(exception6);
-						// ProjectData.ClearProjectError();
-					}
-					this.GHTSubTestEnd();
-					return;
-				}
-			}
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx
deleted file mode 100644
index 84ea018820f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataListItem_ItemType.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataListItem_ItemType" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataListItem_ItemType</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:datalist id=DataList1 runat="server" SelectedIndex="3" EditItemIndex="2" DataSource="<%# m_data %>">
-				<HeaderTemplate>
-					Header
-				</HeaderTemplate>
-				<FooterTemplate>
-					Footer
-				</FooterTemplate>
-				<ItemTemplate>
-					<%#Container.DataItem%>
-				</ItemTemplate>
-				<SeparatorTemplate>
-					Seperator
-				</SeparatorTemplate>
-			</asp:datalist>
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="AlternatingItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="144px" Height="96px" Description="EditItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Width="144px" Height="96px" Description="FooterItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="144px" Height="96px" Description="Header"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest8" runat="server" Width="144px" Height="96px" Description="Separator"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest7" runat="server" Width="144px" Height="96px" Description="SelectedItem"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Width="144px" Height="96px" Description="Pager"></cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Width="144px" Height="96px" Description="Item"></cc1:ghtsubtest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx.cs
deleted file mode 100644
index b143e068cc6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class DataListItem_ItemType
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-		 this.DataList1.ItemCreated += new DataListItemEventHandler(DataList1_ItemCreated);
-
-	 }
-	 #endregion
-
- 	protected System.Web.UI.WebControls.DataList DataList1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest4;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest8;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest7;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest6;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest5;
-        protected static string [] m_data = new string[] {"aaa", "bbb", "ccc", "ddd"};
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm = (HtmlForm)FindControl("form1");
-            GHTTestBegin(frm);
-            DataList1.DataBind();;
-
-        }
-
-
-	 private void DataList1_ItemCreated(object sender, DataListItemEventArgs e)
-	 {
-		 switch (e.Item.ItemType)
-		 {
-			 case ListItemType.Header:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest4, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception12)
-				 {
-					 // ProjectData.SetProjectError(exception12);
-					 Exception exception4 = exception12;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.Footer:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest3, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception11)
-				 {
-					 // ProjectData.SetProjectError(exception11);
-					 Exception exception3 = exception11;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.Item:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest5, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception13)
-				 {
-					 // ProjectData.SetProjectError(exception13);
-					 Exception exception5 = exception13;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.AlternatingItem:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.GHTSubTest1, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception9)
-				 {
-					 // ProjectData.SetProjectError(exception9);
-					 Exception exception1 = exception9;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-					 // ProjectData.ClearProjectError();
-				 }
-				 return;
-			 }
-			 case ListItemType.SelectedItem:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest7, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception15)
-				 {
-					 // ProjectData.SetProjectError(exception15);
-					 Exception exception7 = exception15;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception7);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.EditItem:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest2, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception10)
-				 {
-					 // ProjectData.SetProjectError(exception10);
-					 Exception exception2 = exception10;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-					 // ProjectData.ClearProjectError();
-				 }
-				 return;
-			 }
-			 case ListItemType.Separator:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest8, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception16)
-				 {
-					 // ProjectData.SetProjectError(exception16);
-					 Exception exception8 = exception16;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception8);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-			 case ListItemType.Pager:
-			 {
-				 try
-				 {
-					 this.GHTSubTestAddResult(this.Ghtsubtest6, e.Item.ItemIndex.ToString());
-				 }
-				 catch (Exception exception14)
-				 {
-					 // ProjectData.SetProjectError(exception14);
-					 Exception exception6 = exception14;
-					 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-					 // ProjectData.ClearProjectError();
-				 }
-				 this.GHTSubTestEnd();
-				 return;
-			 }
-		 }
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_RenderItem_HBB.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_RenderItem_HBB.aspx
deleted file mode 100644
index 0f2167df6e0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_RenderItem_HBB.aspx
+++ /dev/null
@@ -1,138 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataListItem_RenderItem_HBB.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataListItem_RenderItem_HBB" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataListItem_RenderItem_HBB</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:datalist id=DataList1 runat="server" EditItemIndex="2" SelectedIndex="3" DataSource="<%# m_data %>" >
-				<HeaderTemplate>
-					<asp:Table id="Table1" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>Header</span></asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</HeaderTemplate>
-				<SelectedItemTemplate>
-					<asp:Table id="Table2" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>
-									<%#Container.DataItem%>
-								</span>
-							</asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</SelectedItemTemplate>
-				<FooterTemplate>
-					<asp:Table id="Table3" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>Footer</span></asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</FooterTemplate>
-				<ItemTemplate>
-					<asp:Table id="Table4" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>
-									<%#Container.DataItem%>
-								</span>
-							</asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</ItemTemplate>
-				<SeparatorTemplate>
-					<asp:Table id="Table5" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>Seperator</span></asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</SeparatorTemplate>
-				<AlternatingItemTemplate>
-					<asp:Table id="Table6" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>
-									<%#Container.DataItem%>
-								</span>
-							</asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</AlternatingItemTemplate>
-				<EditItemTemplate>
-					<asp:Table id="Table7" runat="server">
-						<asp:TableRow>
-							<asp:tablecell>
-								<span>
-									<%#Container.DataItem%>
-								</span>
-							</asp:tablecell>
-						</asp:TableRow>
-					</asp:Table>
-				</EditItemTemplate>
-			</asp:datalist>
-			<P>
-				<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="144px" Height="96px" Description="AlternatingItem Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="144px" Height="96px" Description="AlternatingItem Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Width="144px" Height="96px" Description="AlternatingItem Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="144px" Height="96px" Description="AlternatingItem Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Width="144px" Height="96px" Description="EditItem Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Width="144px" Height="96px" Description="EditItem Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest7" runat="server" Width="144px" Height="96px" Description="EditItem Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest8" runat="server" Width="144px" Height="96px" Description="EditItem Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest9" runat="server" Width="144px" Height="96px" Description="FooterItem Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest10" runat="server" Width="144px" Height="96px" Description="FooterItem Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest11" runat="server" Width="144px" Height="96px" Description="FooterItem Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest12" runat="server" Width="144px" Height="96px" Description="FooterItem Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest13" runat="server" Width="144px" Height="96px" Description="Header Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest14" runat="server" Width="144px" Height="96px" Description="Header Extract = false, layout = table "></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest15" runat="server" Width="144px" Height="96px" Description="Header Extract = true, layout = flow "></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest16" runat="server" Width="144px" Height="96px" Description="Header  Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest17" runat="server" Width="144px" Height="96px" Description="Item Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest18" runat="server" Width="144px" Height="96px" Description="Item Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest19" runat="server" Width="144px" Height="96px" Description="Item Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest20" runat="server" Width="144px" Height="96px" Description="Item Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest21" runat="server" Width="144px" Height="96px" Description="Pager Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest22" runat="server" Width="144px" Height="96px" Description="Pager Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest23" runat="server" Width="144px" Height="96px" Description="Pager Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest24" runat="server" Width="144px" Height="96px" Description="Pager Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest25" runat="server" Width="144px" Height="96px" Description="SelectedItem Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest26" runat="server" Width="144px" Height="96px" Description="SelectedItem Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest27" runat="server" Width="144px" Height="96px" Description="SelectedItem Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest28" runat="server" Width="144px" Height="96px" Description="SelectedItem Extract = false, layout = flow"></cc1:ghtsubtest></P>
-			<P>
-				<cc1:ghtsubtest id="Ghtsubtest29" runat="server" Width="144px" Height="96px" Description="Separator Extract = true, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest30" runat="server" Width="144px" Height="96px" Description="Separator Extract = false, layout = table"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest31" runat="server" Width="144px" Height="96px" Description="Separator Extract = true, layout = flow"></cc1:ghtsubtest>
-				<cc1:ghtsubtest id="Ghtsubtest32" runat="server" Width="144px" Height="96px" Description="Separator Extract = false, layout = flow"></cc1:ghtsubtest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_RenderItem_HBB.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_RenderItem_HBB.aspx.cs
deleted file mode 100644
index 76c26cc4a13..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_RenderItem_HBB.aspx.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Text;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataListItem_RenderItem_HBB
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected static string [] m_data = new string[] {"aaa", "bbb", "ccc", "ddd"};
-		private StringBuilder m_sb;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest7;
-		protected GHTWebControls.GHTSubTest Ghtsubtest8;
-		protected GHTWebControls.GHTSubTest Ghtsubtest9;
-		protected GHTWebControls.GHTSubTest Ghtsubtest10;
-		protected GHTWebControls.GHTSubTest Ghtsubtest11;
-		protected GHTWebControls.GHTSubTest Ghtsubtest12;
-		protected GHTWebControls.GHTSubTest Ghtsubtest13;
-		protected GHTWebControls.GHTSubTest Ghtsubtest14;
-		protected GHTWebControls.GHTSubTest Ghtsubtest15;
-		protected GHTWebControls.GHTSubTest Ghtsubtest16;
-		protected GHTWebControls.GHTSubTest Ghtsubtest17;
-		protected GHTWebControls.GHTSubTest Ghtsubtest18;
-		protected GHTWebControls.GHTSubTest Ghtsubtest19;
-		protected GHTWebControls.GHTSubTest Ghtsubtest20;
-		protected GHTWebControls.GHTSubTest Ghtsubtest21;
-		protected GHTWebControls.GHTSubTest Ghtsubtest22;
-		protected GHTWebControls.GHTSubTest Ghtsubtest23;
-		protected GHTWebControls.GHTSubTest Ghtsubtest24;
-		protected GHTWebControls.GHTSubTest Ghtsubtest25;
-		protected GHTWebControls.GHTSubTest Ghtsubtest26;
-		protected GHTWebControls.GHTSubTest Ghtsubtest27;
-		protected GHTWebControls.GHTSubTest Ghtsubtest28;
-		protected GHTWebControls.GHTSubTest Ghtsubtest29;
-		protected GHTWebControls.GHTSubTest Ghtsubtest30;
-		protected GHTWebControls.GHTSubTest Ghtsubtest31;
-		protected GHTWebControls.GHTSubTest Ghtsubtest32;
-		HtmlTextWriter m_hw;
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			m_sb = new StringBuilder();
-			System.IO.StringWriter sw = new System.IO.StringWriter(m_sb);
-			m_hw = new HtmlTextWriter(sw);
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			DataList1.DataBind();;
-		}
-
-		/*
-				private void DataList1_ItemCreated(ByVal sender As Object, ByVal e As System.Web.UI.WebControls.DataListItemEventArgs) Handles DataList1.ItemCreated
-					Select Case e.Item.ItemType
-						Case ListItemType.AlternatingItem
-							try {
-								GHTActiveSubTest = GHTSubTest1;
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest3;
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest4;
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.EditItem
-							try {
-								GHTActiveSubTest = GHTSubTest5;
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest6;
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest7
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest8
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.Footer
-							try {
-								GHTActiveSubTest = Ghtsubtest9
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;0
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;1
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;2
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.Header
-							try {
-								GHTActiveSubTest = Ghtsubtest1;3
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;4
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;5
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;6
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.Item
-							try {
-								GHTActiveSubTest = Ghtsubtest1;7
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;8
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest1;9
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;0
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.Pager
-							try {
-								GHTActiveSubTest = Ghtsubtest2;1
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;2
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;3
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;4
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.SelectedItem
-							try {
-								GHTActiveSubTest = Ghtsubtest2;5
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;6
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;7
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest2;8
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-						Case ListItemType.Separator
-							try {
-								GHTActiveSubTest = Ghtsubtest2;9
-								e.Item.RenderItem(m_hw, true, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest3;0
-								e.Item.RenderItem(m_hw, False, true)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest3;1
-								e.Item.RenderItem(m_hw, true, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-
-							try {
-								GHTActiveSubTest = Ghtsubtest3;2
-								e.Item.RenderItem(m_hw, False, False)
-								GHTSubTestAddResult(m_sb.ToString(), true)
-							catch (Exception ex) {
-								GHTSubTestUnexpectedExceptionCaught(ex);
-							Finally
-								m_sb.Remove(0, m_sb.Length)
-							}
-					End Select
-				}
-				*/
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx
deleted file mode 100644
index 8d8479708e1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DataListItem_ctor_IL.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DataListItem_ctor_IL" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DataListItem_ctor_IL</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx.cs
deleted file mode 100644
index 1168467c86f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DataListItem_ctor_IL
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-            
-			// AlternatingItem
-			GHTSubTestBegin("AlternatingItem");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.AlternatingItem);
-				Compare(item.ItemType, ListItemType.AlternatingItem);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// EditItem
-			GHTSubTestBegin("EditItem");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.EditItem);
-				Compare(item.ItemType, ListItemType.EditItem);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Footer
-			GHTSubTestBegin("Footer");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.Footer);
-				Compare(item.ItemType, ListItemType.Footer);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Header
-			GHTSubTestBegin("Header");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.Header);
-				Compare(item.ItemType, ListItemType.Header);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Item
-			GHTSubTestBegin("Item");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.Item);
-				Compare(item.ItemType, ListItemType.Item);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Pager
-			GHTSubTestBegin("Pager");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.Pager);
-				Compare(item.ItemType, ListItemType.Pager);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// SelectedItem
-			GHTSubTestBegin("SelectedItem");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.SelectedItem);
-				Compare(item.ItemType, ListItemType.SelectedItem);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Separator
-			GHTSubTestBegin("Separator");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(1, ListItemType.Separator);
-				Compare(item.ItemType, ListItemType.Separator);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Positive  index
-			GHTSubTestBegin("Positive index");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(10, ListItemType.Item);
-				Compare(item.ItemIndex, 10);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Negative index
-			GHTSubTestBegin("Negative index");
-				try 
-				{
-					System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(-10, ListItemType.Item);
-					Compare(item.ItemIndex, -10);
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			// -1
-			GHTSubTestBegin("-1");
-			try 
-			{
-				System.Web.UI.WebControls.DataListItem item = new System.Web.UI.WebControls.DataListItem(-1, ListItemType.Item);
-				Compare(item.ItemIndex, -1);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx
deleted file mode 100644
index 68e826c9593..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DayNameFormat_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DayNameFormat_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>DayNameFormat_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx.cs
deleted file mode 100644
index 0edb0f8f07c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DayNameFormat_Enum : GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.DayNameFormat");
-				try 
-				{
-					GHTSubTestAddResult(Test());
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(DayNameFormat));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(DayNameFormat));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx
deleted file mode 100644
index fb1f1c5e4fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DropDownList_BorderColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DropDownList_BorderColor" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DropDownList_BorderColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="128px" Height="32px">
-				<asp:DropDownList id="DropDownList1" runat="server" Width="120px" BorderColor="#ff00ff"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 232px"
-				runat="server" Height="32px" Width="128px">
-				<asp:DropDownList id="DropDownList5" runat="server" Width="120px" BorderColor="#be7b1a"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 184px"
-				runat="server" Height="32px" Width="128px">
-				<asp:DropDownList id="DropDownList4" runat="server" Width="120px" BorderColor="Navy"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="32px" Width="128px">
-				<asp:DropDownList id="DropDownList3" runat="server" Width="120px" BorderColor="LimeGreen"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 72px"
-				runat="server" Height="32px" Width="128px">
-				<asp:DropDownList id="DropDownList2" runat="server" Width="120px" BorderColor="#d4d0c8"></asp:DropDownList>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx.cs
deleted file mode 100644
index 226e748b0ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DropDownList_BorderColor
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DropDownList DropDownList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DropDownList DropDownList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DropDownList DropDownList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx
deleted file mode 100644
index 31516ce9b96..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DropDownList_BorderStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DropDownList_BorderStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DropDownList_BorderStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="120px" Height="32px">
-				<asp:DropDownList id="DropDownList1" runat="server" Width="96px" BorderStyle="Dashed"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest10" style="Z-INDEX: 110; LEFT: 16px; POSITION: absolute; TOP: 376px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList10" runat="server" Width="96px" BorderStyle="Dotted"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 256px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList7" runat="server" Width="96px" BorderStyle="Double"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 216px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList6" runat="server" Width="96px" BorderStyle="Groove"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 176px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList5" runat="server" Width="96px" BorderStyle="Inset"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 136px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList4" runat="server" Width="96px" BorderStyle="None"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 96px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList3" runat="server" Width="96px" BorderStyle="NotSet"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 56px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList2" runat="server" Width="96px" BorderStyle="Outset"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest9" style="Z-INDEX: 109; LEFT: 16px; POSITION: absolute; TOP: 336px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList9" runat="server" Width="96px" BorderStyle="Ridge"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest8" style="Z-INDEX: 108; LEFT: 16px; POSITION: absolute; TOP: 296px"
-				runat="server" Height="32px" Width="120px">
-				<asp:DropDownList id="DropDownList8" runat="server" Width="96px" BorderStyle="Solid"></asp:DropDownList>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx.cs
deleted file mode 100644
index 1a5287fd69c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DropDownList_BorderStyle
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DropDownList DropDownList10;
-		protected GHTWebControls.GHTSubTest GHTSubTest10;
-		protected System.Web.UI.WebControls.DropDownList DropDownList7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		protected System.Web.UI.WebControls.DropDownList DropDownList6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.DropDownList DropDownList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.DropDownList DropDownList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.DropDownList DropDownList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DropDownList DropDownList9;
-		protected GHTWebControls.GHTSubTest GHTSubTest9;
-		protected System.Web.UI.WebControls.DropDownList DropDownList8;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx
deleted file mode 100644
index 36cf8eb564f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DropDownList_BorderWidth.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DropDownList_BorderWidth" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DropDownList_BorderWidth</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="128px" Height="32px">
-				<asp:DropDownList id="DropDownList1" runat="server" Height="32px" Width="112px" BorderWidth="10px"></asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 56px"
-				runat="server" Height="32px" Width="128px">
-				<asp:DropDownList id="DropDownList2" runat="server" Height="32px" Width="112px" BorderWidth="10"></asp:DropDownList>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx.cs
deleted file mode 100644
index d0401a10ff5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DropDownList_BorderWidth
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx
deleted file mode 100644
index 6b254e35547..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DropDownList_SelectedIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DropDownList_SelectedIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DropDownList_SelectedIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="40px" Width="96px">
-				<asp:DropDownList id="DropDownList2" runat="server" Width="88px">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3" Selected="True">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4" Selected="False">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-				</asp:DropDownList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="96px" Height="32px">
-				<asp:DropDownList id="DropDownList1" runat="server" Width="88px">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					<asp:ListItem Value="Item3">Item3</asp:ListItem>
-					<asp:ListItem Value="Item4" Selected="True">Item4</asp:ListItem>
-					<asp:ListItem Value="Item5">Item5</asp:ListItem>
-					<asp:ListItem Value="Item6">Item6</asp:ListItem>
-				</asp:DropDownList>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx.cs
deleted file mode 100644
index 821778e0420..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DropDownList_SelectedIndex
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx
deleted file mode 100644
index ccf29c18da7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="DropDownList_ToolTip.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.DropDownList_ToolTip" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>DropDownList_ToolTip</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="344px" Height="72px">
-					<asp:DropDownList id="DropDownList1" runat="server"></asp:DropDownList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="344px">
-					<asp:DropDownList id="DropDownList2" runat="server"></asp:DropDownList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="344px">
-					<asp:DropDownList id="DropDownList3" runat="server"></asp:DropDownList>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx.cs
deleted file mode 100644
index 3371671a9f7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class DropDownList_ToolTip : GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DropDownList DropDownList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			// Subtest1 - simple string:
-			try 
-			{
-				DropDownList1.ToolTip = "abcdefg hijklmnopqrst uvwxyz";
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult(GHTSubTest1, "Unexpected exception was caught, type: " + ex.GetType().ToString() + 	" Message: " + ex.Message);
-			}
-
-
-			// Subtest2 - String.empty:
-			try 
-			{
-				DropDownList2.ToolTip = String.Empty;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult(GHTSubTest2, "Unexpected exception was caught, typw: " + 
-					ex.GetType().ToString() + 
-					" Message: " + 
-					ex.Message);
-			}
-
-			// Subtest3 - Non alphnumeric charachters:
-			try 
-			{
-				DropDownList3.ToolTip = @"`1234567890-=[]\;',./~!@#$%^&*()_+{}|:<>?";
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult(GHTSubTest3, "Unexpected exception was caught, typw: " + 
-					ex.GetType().ToString() + 
-					" Message: " + 
-					ex.Message);
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx
deleted file mode 100644
index ca2f80c7e92..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="EditCommandColumn_ButtonType.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.EditCommandColumn_ButtonType" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>EditCommandColumn_ButtonType</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit this row"></asp:EditCommandColumn>
-						<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit this row" ButtonType="LinkButton"></asp:EditCommandColumn>
-						<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit this row" ButtonType="PushButton"></asp:EditCommandColumn>
-						<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx.cs
deleted file mode 100644
index 7b7dd6e35f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class EditCommandColumn_ButtonType
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.ButtonColumn c_company = new System.Web.UI.WebControls.ButtonColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.ButtonType = ButtonColumnType.LinkButton;
-				c_company.DataTextField = "Company";
-
-				DataGrid1.Columns.Add(c_edit);
-				DataGrid1.Columns.Add(c_company);
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(c_edit.ButtonType.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.ButtonColumn c_company = new System.Web.UI.WebControls.ButtonColumn();
-				c_edit.EditText = "edit this row";
-				c_company.DataTextField = "Company";
-
-				DataGrid2.Columns.Add(c_edit);
-				DataGrid2.Columns.Add(c_company);
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(c_edit.ButtonType.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.ButtonColumn c_company = new System.Web.UI.WebControls.ButtonColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.ButtonType = ButtonColumnType.PushButton;
-				c_company.DataTextField = "Company";
-
-				DataGrid3.Columns.Add(c_edit);
-				DataGrid3.Columns.Add(c_company);
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(c_edit.ButtonType.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid4.Columns[0]).ButtonType.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid5.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid5.Columns[0]).ButtonType.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid6.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid6.Columns[0]).ButtonType.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx
deleted file mode 100644
index 9ec6c3362ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx
+++ /dev/null
@@ -1,67 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="EditCommandColumn_CancelText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.EditCommandColumn_CancelText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>EditCommandColumn_CancelText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn CancelText=""></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn CancelText="cancel edit this row"></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn CancelText="cancel text with !@#$%^&*()_+_+"></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx.cs
deleted file mode 100644
index e17c70aa4c2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class EditCommandColumn_CancelText
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.CancelText = "";
-				c_edit.ButtonType = ButtonColumnType.LinkButton;
-				c_company.DataField = "Company";
-
-				DataGrid1.Columns.Add(c_edit);
-				DataGrid1.Columns.Add(c_company);
-				DataGrid1.EditItemIndex = 2;
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(c_edit.CancelText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.CancelText = "cancel edit this row";
-				c_company.DataField = "Company";
-
-				DataGrid2.Columns.Add(c_edit);
-				DataGrid2.Columns.Add(c_company);
-				DataGrid2.EditItemIndex = 2;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(c_edit.CancelText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.CancelText = "cancel text with !@#$%^&*()_+_+";
-				c_company.DataField = "Company";
-
-				DataGrid3.Columns.Add(c_edit);
-				DataGrid3.Columns.Add(c_company);
-				DataGrid3.EditItemIndex = 2;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(c_edit.CancelText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.EditItemIndex = 2;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid4.Columns[0]).CancelText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid5.EditItemIndex = 2;
-				DataGrid5.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid5.Columns[0]).CancelText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid6.EditItemIndex = 2;
-				DataGrid6.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid6.Columns[0]).CancelText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx
deleted file mode 100644
index 5075be7ad73..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx
+++ /dev/null
@@ -1,67 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="EditCommandColumn_EditText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.EditCommandColumn_EditText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>EditCommandColumn_EditText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText=""></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit edit this row"></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit text with !@#$%^&*()_+_+"></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx.cs
deleted file mode 100644
index d4155dcb5bd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class EditCommandColumn_EditText
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "";
-				c_edit.ButtonType = ButtonColumnType.LinkButton;
-				c_company.DataField = "Company";
-
-				DataGrid1.Columns.Add(c_edit);
-				DataGrid1.Columns.Add(c_company);
-				DataGrid1.DataBind();;
-				GHTSubTestAddResult(c_edit.EditText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_company.DataField = "Company";
-
-				DataGrid2.Columns.Add(c_edit);
-				DataGrid2.Columns.Add(c_company);
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(c_edit.EditText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit text with !@#$%^&*()_+_+";
-				c_company.DataField = "Company";
-
-				DataGrid3.Columns.Add(c_edit);
-				DataGrid3.Columns.Add(c_company);
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(c_edit.EditText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid4.Columns[0]).EditText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid5.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid5.Columns[0]).EditText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid6.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid6.Columns[0]).EditText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx
deleted file mode 100644
index 2f623eac9ff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="EditCommandColumn_InitializeCell_TIL.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.EditCommandColumn_InitializeCell_TIL" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>EditCommandColumn_InitializeCell_TIL</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx.cs
deleted file mode 100644
index aa20a5630a6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class EditCommandColumn_InitializeCell_TIL
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemDataBound += new DataGridItemEventHandler(DataGrid1_ItemDataBound);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edt = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_id = new System.Web.UI.WebControls.BoundColumn();
-				System.Web.UI.WebControls.ButtonColumn c_name = new System.Web.UI.WebControls.ButtonColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataField = "ID";
-				c_name.DataTextField = "Name";
-				c_company.DataTextField = "Company";
-
-				DataGrid1.Columns.Add(c_edt);
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemDataBound(object sender, DataGridItemEventArgs e)
-		{
-			ListItemType type1 = e.Item.ItemType;
-			TableCell cell1 = (TableCell) e.Item.Controls[0];
-			this.DataGrid1.Columns[0].InitializeCell(cell1, 0, type1);
-			cell1.Attributes.Add("Index", e.Item.ItemIndex.ToString());
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx
deleted file mode 100644
index 05555148e85..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx
+++ /dev/null
@@ -1,67 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="EditCommandColumn_UpdateText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.EditCommandColumn_UpdateText" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>EditCommandColumn_UpdateText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn UpdateText=""></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid5" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn UpdateText="update edit this row"></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest6" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid6" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn UpdateText="update text with !@#$%^&*()_+_+"></asp:EditCommandColumn>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx.cs
deleted file mode 100644
index 52c866a897e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class EditCommandColumn_UpdateText
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.DataGrid DataGrid6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.UpdateText = "";
-				c_edit.ButtonType = ButtonColumnType.LinkButton;
-				c_company.DataField = "Company";
-
-				DataGrid1.Columns.Add(c_edit);
-				DataGrid1.Columns.Add(c_company);
-				DataGrid1.EditItemIndex = 2;
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_edit.UpdateText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.UpdateText = "update edit this row";
-				c_company.DataField = "Company";
-
-				DataGrid2.Columns.Add(c_edit);
-				DataGrid2.Columns.Add(c_company);
-				DataGrid2.EditItemIndex = 2;
-				DataGrid2.DataBind();;
-				GHTSubTestAddResult(c_edit.UpdateText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.BoundColumn c_company = new System.Web.UI.WebControls.BoundColumn();
-				c_edit.EditText = "edit this row";
-				c_edit.UpdateText = "update text with !@#$%^&*()_+_+";
-				c_company.DataField = "Company";
-
-				DataGrid3.Columns.Add(c_edit);
-				DataGrid3.Columns.Add(c_company);
-				DataGrid3.EditItemIndex = 2;
-				DataGrid3.DataBind();;
-				GHTSubTestAddResult(c_edit.UpdateText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.EditItemIndex = 2;
-				DataGrid4.DataBind();;
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid4.Columns[0]).UpdateText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				DataGrid5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid5.EditItemIndex = 2;
-				DataGrid5.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid5.Columns[0]).UpdateText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest6;
-			try 
-			{
-				DataGrid6.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid6.EditItemIndex = 2;
-				DataGrid6.DataBind();
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.EditCommandColumn)DataGrid6.Columns[0]).UpdateText);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx
deleted file mode 100644
index ddda9b2183e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="EditCommandColumn_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.EditCommandColumn_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>EditCommandColumn_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:EditCommandColumn EditText="edit this row"></asp:EditCommandColumn>
-						<asp:ButtonColumn DataTextField="ID"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Name"></asp:ButtonColumn>
-						<asp:ButtonColumn DataTextField="Company"></asp:ButtonColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx.cs
deleted file mode 100644
index fbe0afba160..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class EditCommandColumn_ctor_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.EditCommandColumn c_edit = new System.Web.UI.WebControls.EditCommandColumn();
-				System.Web.UI.WebControls.ButtonColumn c_id = new System.Web.UI.WebControls.ButtonColumn();
-				System.Web.UI.WebControls.ButtonColumn c_name = new System.Web.UI.WebControls.ButtonColumn();
-				System.Web.UI.WebControls.ButtonColumn c_company = new System.Web.UI.WebControls.ButtonColumn();
-				c_edit.EditText = "edit this row";
-				c_id.DataTextField = "ID";
-				c_name.DataTextField = "Name";
-				c_company.DataTextField = "Company";
-
-				DataGrid1.Columns.Add(c_edit);
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx
deleted file mode 100644
index e853be989cd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="FirstDayOfWeek_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.FirstDayOfWeek_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>FirstDayOfWeek_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx.cs
deleted file mode 100644
index d51c310cc53..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class FirstDayOfWeek_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.FirstDayOfWeek");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(FirstDayOfWeek));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(FirstDayOfWeek));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx
deleted file mode 100644
index fe279f3ba86..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="FontSize_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.FontSize_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>FontSize_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx.cs
deleted file mode 100644
index f8e1a298486..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class FontSize_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.FontSize");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(FontSize));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(FontSize));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx
deleted file mode 100644
index 554d5eca8e4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="GridLines_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.GridLines_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>GridLines_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx.cs
deleted file mode 100644
index 099d0d67b5d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class GridLines_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.GridLines");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(GridLines));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(GridLines));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx
deleted file mode 100644
index e36c1be7811..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HorizontalAlign_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HorizontalAlign_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>HorizontalAlign_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx.cs
deleted file mode 100644
index eb405533210..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HorizontalAlign_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.HorizontalAlign");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(HorizontalAlign));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(HorizontalAlign));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/Car.jpg b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/Car.jpg
deleted file mode 100755
index a1b77107c25..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/Car.jpg
+++ /dev/null
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx
deleted file mode 100644
index b881c29215c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLink_ImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLink_ImageUrl" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLink_ImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="128px" Height="64px">
-				<asp:HyperLink id="HyperLink1" runat="server" ImageUrl="http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/HyperLink/Car.jpg">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 216px"
-				runat="server" Height="64px" Width="128px">
-				<asp:HyperLink id="HyperLink4" runat="server" ImageUrl="">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 144px"
-				runat="server" Height="64px" Width="128px">
-				<asp:HyperLink id="HyperLink3" runat="server" ImageUrl="/GHTTests/System_Web_dll/System_Web_UI_WebControls/HyperLink/Car.jpg">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 80px"
-				runat="server" Height="64px" Width="128px">
-				<asp:HyperLink id="HyperLink2" runat="server" ImageUrl="Car.jpg">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx.cs
deleted file mode 100644
index cfca911183d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLink_ImageUrl
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.HyperLink HyperLink1;
-		protected System.Web.UI.WebControls.HyperLink HyperLink4;
-		protected System.Web.UI.WebControls.HyperLink HyperLink3;
-		protected System.Web.UI.WebControls.HyperLink HyperLink2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx
deleted file mode 100644
index 72cde375369..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLink_NavigateUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLink_NavigateUrl" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLink_NavigateUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 16px"
-				runat="server" Width="136px" Height="64px">
-				<asp:HyperLink id="HyperLink1" runat="server" NavigateUrl="http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 304px"
-				runat="server" Height="64px" Width="136px">
-				<asp:HyperLink id="HyperLink5" runat="server" NavigateUrl="">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 232px"
-				runat="server" Height="64px" Width="136px">
-				<asp:HyperLink id="HyperLink4" runat="server" NavigateUrl="HyperLink_ImageUrl.aspx">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 160px"
-				runat="server" Height="64px" Width="136px">
-				<asp:HyperLink id="HyperLink3" runat="server" NavigateUrl="../CheckBox/CheckBox_Checked.aspx">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 88px"
-				runat="server" Height="64px" Width="136px">
-				<asp:HyperLink id="HyperLink2" runat="server" NavigateUrl="/GHTTests/System_Web_dll/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx.cs
deleted file mode 100644
index d95c33263b9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLink_NavigateUrl
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.HyperLink HyperLink1;
-		protected System.Web.UI.WebControls.HyperLink HyperLink5;
-		protected System.Web.UI.WebControls.HyperLink HyperLink4;
-		protected System.Web.UI.WebControls.HyperLink HyperLink3;
-		protected System.Web.UI.WebControls.HyperLink HyperLink2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx
deleted file mode 100644
index 383f504434d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLink_Target.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLink_Target" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLink_Target</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="88px" Height="40px">
-				<asp:HyperLink id="HyperLink1" runat="server" Target="_blank">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest9" style="Z-INDEX: 109; LEFT: 16px; POSITION: absolute; TOP: 400px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink9" runat="server" Target="         ">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest8" style="Z-INDEX: 108; LEFT: 16px; POSITION: absolute; TOP: 352px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink8" runat="server" Target="">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 304px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink7" runat="server" Target="Frame1">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 256px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink6" runat="server" Target="_New">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 208px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink5" runat="server" Target="_top">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 160px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink4" runat="server" Target="_self">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 112px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink3" runat="server" Target="_search">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="40px" Width="88px">
-				<asp:HyperLink id="HyperLink2" runat="server" Target="_parent">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx.cs
deleted file mode 100644
index 0fd8959857a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLink_Target
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.HyperLink HyperLink1;
-		protected System.Web.UI.WebControls.HyperLink HyperLink9;
-		protected System.Web.UI.WebControls.HyperLink HyperLink8;
-		protected System.Web.UI.WebControls.HyperLink HyperLink7;
-		protected System.Web.UI.WebControls.HyperLink HyperLink6;
-		protected System.Web.UI.WebControls.HyperLink HyperLink5;
-		protected System.Web.UI.WebControls.HyperLink HyperLink4;
-		protected System.Web.UI.WebControls.HyperLink HyperLink3;
-		protected System.Web.UI.WebControls.HyperLink HyperLink2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx
deleted file mode 100644
index 16ec32a50a0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLink_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLink_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>HyperLink_Text</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-    <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="200px" Height="32px">
-				<asp:HyperLink id="HyperLink1" runat="server">   abcdefghijkl    mnopqrstuvwxyz   </asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 184px"
-				runat="server" Height="24px" Width="200px">
-				<asp:HyperLink id="HyperLink4" runat="server"></asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 120px"
-				runat="server" Height="56px" Width="200px">
-				<asp:HyperLink id="HyperLink3" runat="server">1234567890-=`~!@#$%^&*()_+[]\{}|;':",./<>?</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 56px"
-				runat="server" Height="56px" Width="176px">
-				<asp:HyperLink id="HyperLink2" runat="server">   abcdefghijkl    mnopqrstuvwxyz   </asp:HyperLink>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx.cs
deleted file mode 100644
index dcbcc4a5f3c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using GHTTests;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls 
-{
-	public class HyperLink_Text : GHTBaseWeb
-	{
-		protected System.Web.UI.WebControls.HyperLink HyperLink1;
-		protected System.Web.UI.WebControls.HyperLink HyperLink4;
-		protected System.Web.UI.WebControls.HyperLink HyperLink3;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.HyperLink HyperLink2;
-	
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx
deleted file mode 100644
index 81a6b0a4ed7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_DataNavigateUrlField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_DataNavigateUrlField" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_DataNavigateUrlField</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataNavigateUrlField="" Text="123"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataNavigateUrlField="Name" Text="123"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataNavigateUrlField="Company" Text="123"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataNavigateUrlField="NotExist" Text="123"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx.cs
deleted file mode 100644
index ded6518178f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_DataNavigateUrlField
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-
-				HyperLinkColumn c_id = new HyperLinkColumn();
-				HyperLinkColumn c_name = new HyperLinkColumn();
-				HyperLinkColumn c_company = new HyperLinkColumn();
-
-				c_id.DataNavigateUrlField = "";
-				c_id.Text = "123";
-				c_name.DataNavigateUrlField = "Name";
-				c_name.Text = "123";
-				c_company.DataNavigateUrlField = "Company";
-				c_company.Text = "123";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataNavigateUrlField);
-				GHTSubTestAddResult(c_name.DataNavigateUrlField);
-				GHTSubTestAddResult(c_company.DataNavigateUrlField);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataNavigateUrlField = "NotExist";
-				c_id.Text = "123";
-
-				DataGrid2.Columns.Add(c_id);
-
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataNavigateUrlField);
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				DataGrid3.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[0]).DataNavigateUrlField);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[1]).DataNavigateUrlField);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[2]).DataNavigateUrlField);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				DataGrid4.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[0]).DataNavigateUrlField);
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx
deleted file mode 100644
index 3ecc67ffd51..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_DataNavigateUrlFormatString.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_DataNavigateUrlFormatString" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_DataNavigateUrlFormatString</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataNavigateUrlField="ID" Text="123" DataNavigateUrlFormatString=""></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataNavigateUrlField="Name" Text="123" DataNavigateUrlFormatString="(format str)"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataNavigateUrlField="Company" Text="123" DataNavigateUrlFormatString="{0:c5}"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataNavigateUrlField="ID" Text="123" DataNavigateUrlFormatString=""></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataNavigateUrlField="ID" Text="123" DataNavigateUrlFormatString="(format)"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataNavigateUrlField="ID" Text="123" DataNavigateUrlFormatString="{0:c5}"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx.cs
deleted file mode 100644
index f211cffdc41..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_DataNavigateUrlFormatString
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataNavigateUrlField = "";
-				c_id.DataNavigateUrlFormatString = "";
-				c_id.Text = "123";
-				c_name.DataNavigateUrlField = "Name";
-				c_name.DataNavigateUrlFormatString = "(format str)";
-				c_name.Text = "123";
-				c_company.DataNavigateUrlField = "Company";
-				c_company.DataNavigateUrlFormatString = "{0:c5}";
-				c_company.Text = "123";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataNavigateUrlFormatString);
-				GHTSubTestAddResult(c_name.DataNavigateUrlFormatString);
-				GHTSubTestAddResult(c_company.DataNavigateUrlFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataNavigateUrlField = "ID";
-				c_id.DataNavigateUrlFormatString = "{0:c5}";
-				c_id.Text = "123";
-
-				DataGrid2.Columns.Add(c_id);
-
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataNavigateUrlFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid3.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[0] ).DataNavigateUrlFormatString);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[1] ).DataNavigateUrlFormatString);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[2] ).DataNavigateUrlFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[0]).DataNavigateUrlFormatString);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[1]).DataNavigateUrlFormatString);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[2]).DataNavigateUrlFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx
deleted file mode 100644
index 5ef36dc701a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_DataTextField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_DataTextField" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_DataTextField</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="Name" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="Company" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataTextField="NotExist" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx.cs
deleted file mode 100644
index 8c87fa87a2a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_DataTextField
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataTextField = "";
-				c_id.NavigateUrl = "http://www.google.com";
-				c_name.DataTextField = "Name";
-				c_id.NavigateUrl = "http://www.google.com";
-				c_company.DataTextField = "Company";
-				c_id.NavigateUrl = "http://www.google.com";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataTextField);
-				GHTSubTestAddResult(c_name.DataTextField);
-				GHTSubTestAddResult(c_company.DataTextField);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataNavigateUrlField = "http://www.google.com";
-				c_id.DataTextField = "NotExist";
-
-				DataGrid2.Columns.Add(c_id);
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataTextField);
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				DataGrid3.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[0]).DataTextField);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[1]).DataTextField);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[2]).DataTextField);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				DataGrid4.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[0]).DataTextField);
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx
deleted file mode 100644
index 58794d1649f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_DataTextFormatString.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_DataTextFormatString" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_DataTextFormatString</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid3" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataTextField="ID" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="Name" NavigateUrl="&quot;http://www.google.com&quot;" DataTextFormatString="(format str)"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="Company" NavigateUrl="&quot;http://www.google.com&quot;" DataTextFormatString="{0:c5}"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid4" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataTextField="ID" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="ID" NavigateUrl="&quot;http://www.google.com&quot;" DataTextFormatString="(format)"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="ID" NavigateUrl="&quot;http://www.google.com&quot;" DataTextFormatString="{0:c5}"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx.cs
deleted file mode 100644
index fecb2cfebef..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_DataTextFormatString
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.DataGrid DataGrid4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataTextField = "";
-				c_id.DataTextFormatString = "";
-				c_id.NavigateUrl = "http://www.google.com";
-				c_name.DataTextField = "Name";
-				c_name.DataTextFormatString = "(format str)";
-				c_name.NavigateUrl = "http://www.google.com";
-				c_company.DataTextField = "Company";
-				c_company.DataTextFormatString = "{0:c5}";
-				c_company.NavigateUrl = "http://www.google.com";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataTextFormatString);
-				GHTSubTestAddResult(c_name.DataTextFormatString);
-				GHTSubTestAddResult(c_company.DataTextFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataTextField = "ID";
-				c_id.DataTextFormatString = "{0:c5}";
-				c_id.NavigateUrl = "http://www.google.com";
-
-				DataGrid2.Columns.Add(c_id);
-
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(c_id.DataTextFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				DataGrid3.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid3.DataBind();;
-
-				GHTSubTestAddResult(((System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[0]).DataTextFormatString);
-				GHTSubTestAddResult(((System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[1]).DataTextFormatString);
-				GHTSubTestAddResult(((System.Web.UI.WebControls.HyperLinkColumn)DataGrid3.Columns[2]).DataTextFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				DataGrid4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid4.DataBind();;
-
-				GHTSubTestAddResult(((System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[0]).DataTextFormatString);
-				GHTSubTestAddResult(((System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[1]).DataTextFormatString);
-				GHTSubTestAddResult(((System.Web.UI.WebControls.HyperLinkColumn)DataGrid4.Columns[2]).DataTextFormatString);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx
deleted file mode 100644
index cd3267b2c1b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_InitializeCell_TIL.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_InitializeCell_TIL" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_InitializeCell_TIL</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx.cs
deleted file mode 100644
index b53672ccde3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_InitializeCell_TIL
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.DataGrid1.ItemDataBound += new System.Web.UI.WebControls.DataGridItemEventHandler(this.DataGrid1_ItemDataBound);
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataTextField = "ID";
-				c_id.NavigateUrl = "http://www.google.com";
-				c_name.DataTextField = "Name";
-				c_name.DataNavigateUrlField = "Name";
-				c_company.DataTextField = "Company";
-				c_company.DataNavigateUrlField = "Company";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemDataBound(object sender, System.Web.UI.WebControls.DataGridItemEventArgs e)
-		{
-			ListItemType itemType = (ListItemType)e.Item.ItemType;
-
-			if ((itemType != ListItemType.Header) &&
-				(itemType != ListItemType.Footer) &&
-				(itemType != ListItemType.Separator ))
-			{
-				TableCell currentCell = (TableCell)e.Item.Controls[0];
-				DataGrid1.Columns[1].InitializeCell(currentCell, 1, ListItemType.Item);
-				currentCell.Attributes.Add("Index", e.Item.ItemIndex.ToString());
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx
deleted file mode 100644
index efe14ade7f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_NavigateUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_NavigateUrl" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_NavigateUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataTextField="ID"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="Name" NavigateUrl="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn DataTextField="Company" NavigateUrl="123.123.123.123/sdkh/........./sjhfg"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx.cs
deleted file mode 100644
index 06eead56fff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_NavigateUrl
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataTextField = "ID";
-				c_id.NavigateUrl = "";
-				c_name.DataTextField = "Name";
-				c_name.NavigateUrl = "http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk";
-				c_company.DataTextField = "Company";
-				c_company.NavigateUrl = "123.123.123.123/sdkh/........./sjhfg";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.NavigateUrl);
-				GHTSubTestAddResult(c_name.NavigateUrl);
-				GHTSubTestAddResult(c_company.NavigateUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[0]).NavigateUrl);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[1]).NavigateUrl);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[2]).NavigateUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx
deleted file mode 100644
index 6665b537f8f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_Target.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_Target" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_Target</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataTextField="ID" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn Target="_blank" DataTextField="Name" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn Target="klasjd lkajsd lkajsd" DataTextField="Company" NavigateUrl="&quot;http://www.google.com&quot;"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx.cs
deleted file mode 100644
index 8342c9bcfb8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_Target
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.DataTextField = "ID";
-				c_id.NavigateUrl = "http://www.google.com";
-				c_id.Target = "";
-				c_name.DataTextField = "Name";
-				c_name.NavigateUrl = "http://www.google.com";
-				c_name.Target = "_blank";
-				c_company.DataTextField = "Company";
-				c_company.NavigateUrl = "http://www.google.com";
-				c_company.Target = "skjfh skjf hkjd";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.Target);
-				GHTSubTestAddResult(c_name.Target);
-				GHTSubTestAddResult(c_company.Target);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[0]).NavigateUrl);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[1]).NavigateUrl);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[2]).NavigateUrl);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx
deleted file mode 100644
index db093ed784c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="HyperLinkColumn_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.HyperLinkColumn_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>HyperLinkColumn_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:HyperLinkColumn DataNavigateUrlField="Name" DataNavigateUrlFormatString="http://{0}.com"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn Text="Simple text" DataNavigateUrlField="ID" DataNavigateUrlFormatString="http://{0}.com"></asp:HyperLinkColumn>
-						<asp:HyperLinkColumn Text="Text with !@#$%^&amp;*()_+" DataNavigateUrlField="ID" DataNavigateUrlFormatString="http://{0}.com"></asp:HyperLinkColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx.cs
deleted file mode 100644
index f44e596fc1b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class HyperLinkColumn_Text
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				System.Web.UI.WebControls.HyperLinkColumn c_id = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_name = new System.Web.UI.WebControls.HyperLinkColumn();
-				System.Web.UI.WebControls.HyperLinkColumn c_company = new System.Web.UI.WebControls.HyperLinkColumn();
-
-				c_id.Text = "";
-				c_id.DataNavigateUrlField = "Name";
-				c_name.Text = "simple text";
-				c_name.DataNavigateUrlField = "Name";
-				c_company.Text = "text with !@#$%^&*()_+";
-				c_company.DataNavigateUrlField = "Name";
-
-				DataGrid1.Columns.Add(c_id);
-				DataGrid1.Columns.Add(c_name);
-				DataGrid1.Columns.Add(c_company);
-
-				DataGrid1.DataBind();;
-
-				GHTSubTestAddResult(c_id.Text);
-				GHTSubTestAddResult(c_name.Text);
-				GHTSubTestAddResult(c_company.Text);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable(0, 1, "http://");
-				DataGrid2.DataBind();;
-
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[0]).Text);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[1]).Text);
-				GHTSubTestAddResult(( (System.Web.UI.WebControls.HyperLinkColumn)DataGrid2.Columns[2]).Text);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Car.jpg b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Car.jpg
deleted file mode 100755
index a1b77107c25..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Car.jpg
+++ /dev/null
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_AlternateText.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_AlternateText.aspx
deleted file mode 100644
index 26a298a975b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_AlternateText.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Image_AlternateText.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Image_AlternateText" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Image_AlternateText</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="144px" Height="40px">
-				<asp:Image id="Image1" runat="server" AlternateText="     abcdefghijklmn opqrstuvwxyz           "></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 256px"
-				runat="server" Height="56px" Width="304px">
-				<asp:Image id="Image5" runat="server" Height="32px" Width="256px" AlternateText=""></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 192px"
-				runat="server" Height="56px" Width="304px">
-				<asp:Image id="Image4" runat="server" Height="32px" Width="256px" AlternateText="         "></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="56px" Width="304px">
-				<asp:Image id="Image3" runat="server" Height="32px" Width="256px" AlternateText="`1234567890-=[]\;',./~!@#$%^&amp;*()_+{}|:&quot;<>?"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="56px" Width="144px">
-				<asp:Image id="Image2" runat="server" Height="40px" Width="144px" AlternateText="     abcdefghijklmn opqrstuvwxyz           "></asp:Image>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_AlternateText.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_AlternateText.aspx.cs
deleted file mode 100644
index b49c08ea7f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_AlternateText.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Image_AlternateText
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Image Image1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Image Image5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
- 	protected System.Web.UI.WebControls.Image Image4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Image Image3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Image Image2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Enabled.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Enabled.aspx
deleted file mode 100644
index 87fb7b855c4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Enabled.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Image_Enabled.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Image_Enabled" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Image_Enabled</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="72px" Height="48px">
-				<asp:Image id="Image1" runat="server" Enabled="False"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="48px" Width="72px">
-				<asp:Image id="Image3" runat="server" Enabled="True"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 72px"
-				runat="server" Height="48px" Width="72px">
-				<asp:Image id="Image2" runat="server"></asp:Image>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Enabled.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Enabled.aspx.cs
deleted file mode 100644
index b9d8bedf7fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Enabled.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Image_Enabled
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Image Image1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Image Image3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Image Image2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Font.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Font.aspx
deleted file mode 100644
index ebeebe2afe0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Font.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Image_Font.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Image_Font" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Image_Font</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="40px" Height="40px">
-				<asp:Image id="Image1" runat="server" Font-Bold="False" Font-Italic="False" Font-Name="David"
-					Font-Overline="False" Font-Size="12" Font-Strikeout="False" Font-Underline="False"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 72px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image6" runat="server" Font-Bold="True" Font-Italic="True" Font-Overline="True"
-					Font-Size="12" Font-Strikeout="True" Font-Underline="True" Font-Names="David, Tahoma, Arial"></asp:Image>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Font.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Font.aspx.cs
deleted file mode 100644
index 032c691c3b3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_Font.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Image_Font
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Image Image1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Image Image6;
- 	protected GHTWebControls.GHTSubTest GHTSubTest6;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx
deleted file mode 100644
index c8a297aa474..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Image_ImageAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Image_ImageAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Image_ImageAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="40px" Height="40px">
-				<asp:Image id="Image1" runat="server" ImageAlign="NotSet"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest10" style="Z-INDEX: 110; LEFT: 88px; POSITION: absolute; TOP: 208px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image10" runat="server" ImageAlign="TextTop"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest9" style="Z-INDEX: 109; LEFT: 88px; POSITION: absolute; TOP: 160px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image9" runat="server" ImageAlign="AbsMiddle"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest8" style="Z-INDEX: 107; LEFT: 88px; POSITION: absolute; TOP: 112px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image8" runat="server" ImageAlign="AbsBottom"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" style="Z-INDEX: 106; LEFT: 88px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image7" runat="server" ImageAlign="Bottom"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 105; LEFT: 88px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image6" runat="server" ImageAlign="Middle"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 208px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image5" runat="server" ImageAlign="Top"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 160px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image4" runat="server" ImageAlign="Baseline"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 112px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image3" runat="server" ImageAlign="Right"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="40px" Width="40px">
-				<asp:Image id="Image2" runat="server" ImageAlign="Left"></asp:Image>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx.cs
deleted file mode 100644
index dc2e9eb06f1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Image_ImageAlign
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Image Image1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Image Image10;
- 	protected GHTWebControls.GHTSubTest GHTSubTest10;
- 	protected System.Web.UI.WebControls.Image Image9;
- 	protected GHTWebControls.GHTSubTest GHTSubTest9;
- 	protected System.Web.UI.WebControls.Image Image8;
- 	protected GHTWebControls.GHTSubTest GHTSubTest8;
- 	protected System.Web.UI.WebControls.Image Image7;
- 	protected GHTWebControls.GHTSubTest GHTSubTest7;
- 	protected System.Web.UI.WebControls.Image Image6;
- 	protected GHTWebControls.GHTSubTest GHTSubTest6;
- 	protected System.Web.UI.WebControls.Image Image5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
- 	protected System.Web.UI.WebControls.Image Image4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Image Image3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Image Image2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx
deleted file mode 100644
index 223f659b138..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Image_ImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Image_ImageUrl" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Image_ImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="104px" Height="56px">
-				<asp:Image id="Image1" runat="server" ImageUrl="http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/Image/Car.jpg"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 208px"
-				runat="server" Height="56px" Width="104px">
-				<asp:Image id="Image4" runat="server" ImageUrl="..\HyperLink\Car.jpg"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 144px"
-				runat="server" Height="56px" Width="104px">
-				<asp:Image id="Image3" runat="server" ImageUrl="Car.jpg"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 80px"
-				runat="server" Height="56px" Width="104px">
-				<asp:Image id="Image2" runat="server" ImageUrl="/GHTTests/System_Web_dll/System_Web_UI_WebControls/Image/Car.jpg"></asp:Image>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx.cs
deleted file mode 100644
index 0aec87d5e40..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Image_ImageUrl
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Image Image1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Image Image4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Image Image3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Image Image2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx
deleted file mode 100644
index df3e492c7b8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ImageAlign_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ImageAlign_Enum" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ImageAlign_Enum</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx.cs
deleted file mode 100644
index ec2678c0c5f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ImageAlign_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.ImageAlign");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ImageAlign));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ImageAlign));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx
deleted file mode 100644
index 193686359e0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ImageButton_CausesValidation.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ImageButton_CausesValidation" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ImageButton_CausesValidation</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="40px" Height="40px">
-				<asp:ImageButton id="ImageButton1" runat="server" CausesValidation="False"></asp:ImageButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 112px"
-				runat="server" Height="40px" Width="40px">
-				<asp:ImageButton id="ImageButton3" runat="server" CausesValidation="False"></asp:ImageButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="40px" Width="40px">
-				<asp:ImageButton id="ImageButton2" runat="server"></asp:ImageButton>
-			</cc1:GHTSubTest>&nbsp;
-			<asp:TextBox id="TextBox1" style="Z-INDEX: 104; LEFT: 88px; POSITION: absolute; TOP: 24px" runat="server"></asp:TextBox>
-			<br>
-			<br>
-			<asp:RequiredFieldValidator id="RequiredFieldValidator1" style="Z-INDEX: 103; LEFT: 88px; POSITION: absolute; TOP: 72px"
-				runat="server" ErrorMessage="RequiredFieldValidator" ControlToValidate="TextBox1"></asp:RequiredFieldValidator>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx.cs
deleted file mode 100644
index e681f07f43d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ImageButton_CausesValidation
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.ImageButton ImageButton1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.ImageButton ImageButton3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.ImageButton ImageButton2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.TextBox TextBox1;
- 	protected System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_Text.aspx
deleted file mode 100644
index 4d040d4d8e9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_Text.aspx
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Label_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Label_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Label_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>&nbsp;
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="120px" Height="48px">
-					<asp:Label id="Label1" runat="server">    abcdefghijklm nopqrstuvw xyz    </asp:Label>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="48px" Width="120px" Description="Disabled control text">
-					<asp:Label id="Label6" runat="server">Disabled control text</asp:Label>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="48px" Width="208px">
-					<asp:Label id="Label2" runat="server" Enabled="False">    abcdefghijklm nopqrstuvw xyz    </asp:Label>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="48px" Width="208px">
-					<asp:Label id="Label3" runat="server">`1234567890-=[]\;',./~!@#$%^&*()_+{}|:"<>?</asp:Label>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="48px" Width="208px">
-					<asp:Label id="Label4" runat="server"></asp:Label>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="48px" Width="208px">
-					<asp:Label id="Label5" runat="server"></asp:Label>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_Text.aspx.cs
deleted file mode 100644
index c72aea383e1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_Text.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Label_Text
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Label Label1;
- 	protected System.Web.UI.WebControls.Label Label6;
- 	protected System.Web.UI.WebControls.Label Label2;
- 	protected System.Web.UI.WebControls.Label Label3;
- 	protected System.Web.UI.WebControls.Label Label4;
- 	protected System.Web.UI.WebControls.Label Label5;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_ctor_.aspx
deleted file mode 100644
index 05cc3f95586..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_ctor_.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Label_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Label_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Label_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<P><cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="424px" Height="152px">
-					<asp:Label id="Label1" runat="server" AssociatedControlID="button1">this is label1</asp:Label>
-					<asp:Button id="Button1" runat="server" Text="Button"></asp:Button>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_ctor_.aspx.cs
deleted file mode 100644
index 282a6adefe5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Label/Label_ctor_.aspx.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Label_ctor_
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Label Label1;
- 	protected System.Web.UI.WebControls.Button Button1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx
deleted file mode 100644
index 0b0f2a770fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="LinkButton_CausesValidation.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.LinkButton_CausesValidation" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>LinkButton_CausesValidation</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="40px" Width="40px">
-				<asp:LinkButton id="LinkButton1" runat="server" CausesValidation="False"></asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 112px"
-				runat="server" Height="40px" Width="40px">
-				<asp:LinkButton id="LinkButton3" runat="server" CausesValidation="False"></asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="40px" Width="40px">
-				<asp:LinkButton id="LinkButton2" runat="server"></asp:LinkButton>
-			</cc1:GHTSubTest>
-			<asp:TextBox id="TextBox1" style="Z-INDEX: 104; LEFT: 136px; POSITION: absolute; TOP: 24px" runat="server"></asp:TextBox>
-			<asp:RequiredFieldValidator id="RequiredFieldValidator1" style="Z-INDEX: 103; LEFT: 136px; POSITION: absolute; TOP: 72px"
-				runat="server" ErrorMessage="RequiredFieldValidator" ControlToValidate="TextBox1"></asp:RequiredFieldValidator>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx.cs
deleted file mode 100644
index 732c2136ea4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class LinkButton_CausesValidation
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.LinkButton LinkButton1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.LinkButton LinkButton3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.LinkButton LinkButton2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.TextBox TextBox1;
- 	protected System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx
deleted file mode 100644
index e8a7678e6f1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx
+++ /dev/null
@@ -1,50 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="LinkButton_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.LinkButton_Text" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>LinkButton_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="48px" Width="120px">
-				<asp:LinkButton id="LinkButton1" runat="server">    abcdefghijklm nopqrstuvw xyz    </asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 248px"
-				runat="server" Height="48px" Width="208px">
-				<asp:LinkButton id="LinkButton5" runat="server"></asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 184px"
-				runat="server" Height="48px" Width="208px">
-				<asp:LinkButton id="LinkButton4" runat="server"></asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="48px" Width="208px">
-				<asp:LinkButton id="LinkButton3" runat="server">`1234567890-=[]\;',./~!@#$%^&*()_+{}|:"<>?</asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 72px"
-				runat="server" Height="48px" Width="208px">
-				<asp:LinkButton id="LinkButton2" runat="server">    abcdefghijklm nopqrstuvw xyz    </asp:LinkButton>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx.cs
deleted file mode 100644
index b62e95b1311..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class LinkButton_Text
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.LinkButton LinkButton1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.LinkButton LinkButton5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
- 	protected System.Web.UI.WebControls.LinkButton LinkButton4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.LinkButton LinkButton3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.LinkButton LinkButton2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx
deleted file mode 100644
index 36baec6b4f8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.LinkButtonControlBuilder_AllowWhitespaceLiterals_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>LinkButtonControlBuilder_AllowWhitespaceLiterals_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx.cs
deleted file mode 100644
index b9dfc0318cb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_AllowWhitespaceLiterals_.aspx.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class LinkButtonControlBuilder_AllowWhitespaceLiterals_
-    : GHTBaseWeb {
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_ctor_.aspx
deleted file mode 100644
index ae05468990c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_ctor_.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="LinkButtonControlBuilder_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.LinkButtonControlBuilder_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>LinkButtonControlBuilder_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_ctor_.aspx.cs
deleted file mode 100644
index 60ab74a8e62..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/LinkButtonControlBuilder/LinkButtonControlBuilder_ctor_.aspx.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class LinkButtonControlBuilder_ctor_
-    : GHTBaseWeb {
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx
deleted file mode 100644
index dd2e178f323..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListBox_BorderColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListBox_BorderColor" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListBox_BorderColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox1" runat="server" Width="80px" Height="40px" BorderColor="#33ffcc"></asp:ListBox>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 272px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox5" runat="server" Width="80px" Height="40px" BorderColor="Yellow"></asp:ListBox>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest4" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 208px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox4" runat="server" Width="80px" Height="40px" BorderColor="CornflowerBlue"></asp:ListBox>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 144px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox3" runat="server" Width="80px" Height="40px" BorderColor="#93a070"></asp:ListBox>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 80px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox2" runat="server" Width="80px" Height="40px" BorderColor="#9d1173"></asp:ListBox>
-			</cc1:ghtsubtest></form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx.cs
deleted file mode 100644
index c9c863062e0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ListBox_BorderColor
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.ListBox ListBox1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.ListBox ListBox5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
- 	protected System.Web.UI.WebControls.ListBox ListBox4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.ListBox ListBox3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.ListBox ListBox2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx
deleted file mode 100644
index 49634705425..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx
+++ /dev/null
@@ -1,68 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListBox_BorderStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListBox_BorderStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListBox_BorderStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest9" style="Z-INDEX: 109; LEFT: 16px; POSITION: absolute; TOP: 320px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox9" runat="server" Width="80px" Height="40px" BorderStyle="Dotted"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest8" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 192px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox8" runat="server" Width="80px" Height="40px" BorderStyle="Double"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox7" runat="server" Width="80px" Height="40px" BorderStyle="Groove"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox6" runat="server" Width="80px" Height="40px" BorderStyle="Inset"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:ghtsubtest id="GHTSubTest6" style="Z-INDEX: 108; LEFT: 16px; POSITION: absolute; TOP: 8px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox1" runat="server" Width="80px" Height="40px" BorderStyle="Dashed"></asp:ListBox>
-			</cc1:ghtsubtest>
-			<cc1:GHTSubTest id="GHTSubTest10" style="Z-INDEX: 110; LEFT: 16px; POSITION: absolute; TOP: 376px"
-				runat="server" Width="88px" Height="48px">
-				<asp:ListBox id="ListBox10" runat="server" Width="80px" Height="40px" BorderStyle="Solid"></asp:ListBox>
-			</cc1:GHTSubTest><cc1:ghtsubtest id="GHTSubTest5" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 256px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox5" runat="server" Width="80px" Height="40px" BorderStyle="None"></asp:ListBox>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest4" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 192px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox4" runat="server" Width="80px" Height="40px" BorderStyle="NotSet"></asp:ListBox>
-			</cc1:ghtsubtest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox3" runat="server" Width="80px" Height="40px" BorderStyle="Outset"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="48px" Width="88px">
-				<asp:ListBox id="ListBox2" runat="server" Width="80px" Height="40px" BorderStyle="Ridge"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<br>
-			<br>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx.cs
deleted file mode 100644
index 2e72046b2f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ListBox_BorderStyle
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.ListBox ListBox9;
- 	protected GHTWebControls.GHTSubTest GHTSubTest9;
- 	protected System.Web.UI.WebControls.ListBox ListBox8;
- 	protected GHTWebControls.GHTSubTest GHTSubTest8;
- 	protected System.Web.UI.WebControls.ListBox ListBox7;
- 	protected GHTWebControls.GHTSubTest GHTSubTest7;
- 	protected System.Web.UI.WebControls.ListBox ListBox6;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.ListBox ListBox1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest6;
- 	protected System.Web.UI.WebControls.ListBox ListBox10;
- 	protected GHTWebControls.GHTSubTest GHTSubTest10;
- 	protected System.Web.UI.WebControls.ListBox ListBox5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
- 	protected System.Web.UI.WebControls.ListBox ListBox4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.ListBox ListBox3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.ListBox ListBox2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx
deleted file mode 100644
index 39ccefe7702..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListBox_BorderWidth.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListBox_BorderWidth" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListBox_BorderWidth</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="112px" Height="56px">
-				<asp:ListBox id="ListBox1" runat="server" Height="48px" Width="88px" BorderWidth="10px"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 80px"
-				runat="server" Height="56px" Width="112px">
-				<asp:ListBox id="ListBox2" runat="server" Height="48px" Width="88px" BorderWidth="10"></asp:ListBox>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx.cs
deleted file mode 100644
index 269cae71430..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ListBox_BorderWidth
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.ListBox ListBox1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.ListBox ListBox2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx
deleted file mode 100644
index 298fa62f785..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListBox_Rows.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListBox_Rows" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListBox_Rows</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="96px" Height="184px">
-				<asp:ListBox id="ListBox1" runat="server" Rows="10"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 392px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="360px" Width="168px">
-				<asp:ListBox id="ListBox4" runat="server" Height="128px" Width="120px" Rows="2"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 256px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="48px" Width="96px">
-				<asp:ListBox id="ListBox3" runat="server" Rows="100"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 136px; POSITION: absolute; TOP: 16px"
-				runat="server" Height="48px" Width="96px">
-				<asp:ListBox id="ListBox2" runat="server" Rows="1"></asp:ListBox>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx.cs
deleted file mode 100644
index ead70f369cb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ListBox_Rows
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.ListBox ListBox1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.ListBox ListBox4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.ListBox ListBox3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.ListBox ListBox2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx
deleted file mode 100644
index 6b725a81d97..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListBox_SelectionMode.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListBox_SelectionMode" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListBox_SelectionMode</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="88px" Width="96px" DESIGNTIMEDRAGDROP="8">
-				<asp:ListBox id="ListBox1" runat="server"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="88px" Width="96px">
-				<asp:ListBox id="ListBox2" runat="server" SelectionMode="Single"></asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="88px" Width="96px">
-				<asp:ListBox id="ListBox3" runat="server" SelectionMode="Multiple">
-					<asp:ListItem></asp:ListItem>
-					<asp:ListItem Selected="True"></asp:ListItem>
-					<asp:ListItem Selected="True"></asp:ListItem>
-					<asp:ListItem Selected="True"></asp:ListItem>
-				</asp:ListBox>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx.cs
deleted file mode 100644
index 6aa8007b44c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ListBox_SelectionMode
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.ListBox ListBox1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.ListBox ListBox2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.ListBox ListBox3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-      //Put user code to initialize the page here
-
-    }
-  }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx
deleted file mode 100644
index a22985f342c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListBox_ToolTip.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListBox_ToolTip" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListBox_ToolTip</title>
-		<META http-equiv="Content-Type" content="text/html; charset=windows-1252">
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="96px" Width="416px">
-				<asp:ListBox id="ListBox1" runat="server"></asp:ListBox>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="GHTSubTest2" runat="server" Height="96px" Width="416px">
-				<asp:ListBox id="ListBox2" runat="server"></asp:ListBox>
-			</cc1:ghtsubtest>
-			<br>
-			<cc1:ghtsubtest id="GHTSubTest3" runat="server" Height="96px" Width="416px">
-				<asp:ListBox id="ListBox3" runat="server"></asp:ListBox>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx.cs
deleted file mode 100644
index 7d4d327190f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListBox_ToolTip : GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.ListBox ListBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.ListBox ListBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.ListBox ListBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			// Subtest1 - Simple text:
-			try 
-			{
-				ListBox1.ToolTip = "ToolTip text";
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult(GHTSubTest1, "Unexpected exception was caught, type: " + 
-					ex.GetType().ToString() + 
-					" Message: " + 
-					ex.Message);
-			}
-
-			// Subtest2 - String.Empty:
-			try 
-			{
-				ListBox2.ToolTip = String.Empty;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult(GHTSubTest2, "Unexpected exception was caught, type: " + 
-					ex.GetType().ToString() + 
-					" Message: " + 
-					ex.Message);
-			}
-
-			// Subtest3 - Non alphnumeric charachters:
-			try 
-			{
-				ListBox3.ToolTip = @"`1234567890-=[]\;',./~!@#$%^&*()_+{}|:<>?";
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestAddResult(GHTSubTest3, "Unexpected exception was caught, type: " + 
-					ex.GetType().ToString() + 
-					" Message: " + 
-					ex.Message);
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx
deleted file mode 100644
index 104d4688342..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_AutoPostBack.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_AutoPostBack" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_AutoPostBack</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx.cs
deleted file mode 100644
index 05db5a277fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_AutoPostBack
-		: GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_AutoPostBack(currentType);
-      
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx
deleted file mode 100644
index 85ac57de5a0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_ClearSelection_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_ClearSelection" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_ClearSelection_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx.cs
deleted file mode 100644
index 483416d7946..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_ClearSelection
-		: GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_ClearSelection(currentType);
-      
-
-			// Clearing multiple selected items:
-			// This cannot be tested in ListControl, because only ListBox can have multiple selection.
-			GHTSubTestBegin("Clear multiple selection");
-			System.Web.UI.WebControls.ListBox lb = new System.Web.UI.WebControls.ListBox();
-			GHTActiveSubTest.Controls.Add(lb);
-			try 
-			{
-				lb.Items.Add("A");
-				lb.Items.Add("B");
-				lb.Items.Add("C");
-				lb.Items.Add("D");
-				lb.SelectionMode = ListSelectionMode.Multiple;
-				lb.Items[0].Selected = true;
-				lb.Items[1].Selected = true;
-				lb.Items[2].Selected = true;
-				lb.ClearSelection();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx
deleted file mode 100644
index e0dd6fa8101..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_DataMember.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_DataMember" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_DataMember</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx.cs
deleted file mode 100644
index fcbc3c84c2c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_DataMember
-		: GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_DataMember(currentType);
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx
deleted file mode 100644
index 98d36e55451..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_DataSource.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_DataSource" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_DataSource</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-	<form id="Form1" runat=server method=post></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx.cs
deleted file mode 100644
index 51ea2daa7da..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_DataSource
-		: GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_DataSource(currentType);
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx
deleted file mode 100644
index 1b96fd4d760..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_DataTextField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_DataTextField" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_DataTextField</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx.cs
deleted file mode 100644
index d14944844fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_DataTextField
-		: GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_DataTextField(currentType);
-      
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx
deleted file mode 100644
index 90b0b5a3e66..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_DataTextFormatString.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_DataTextFormatString" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_DataTextFormatString</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx.cs
deleted file mode 100644
index b3e16c0dd12..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_DataTextFormatString : GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_DataTextFormatString(currentType);
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx
deleted file mode 100644
index 95300c8e7b8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_DataValueField.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_DataValueField" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_DataValueField</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx.cs
deleted file mode 100644
index d75e85eb1df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_DataValueField
-		: GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_DataValueField(currentType);
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx
deleted file mode 100644
index 77a47756051..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_Items.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_Items" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_Items</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method=post runat=server></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx.cs
deleted file mode 100644
index 530152fc3ef..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_Items : GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_Items(currentType);
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx
deleted file mode 100644
index 03b0bac3c7a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_SelectedIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_SelectedIndex" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_SelectedIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" runat="server" method="post">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="88px" Width="56px" Description="Multiple selection">
-				<asp:CheckBoxList id="CheckBoxList1" runat="server">
-					<asp:ListItem Value="a">a</asp:ListItem>
-					<asp:ListItem Value="b">b</asp:ListItem>
-					<asp:ListItem Value="c" Selected="True">c</asp:ListItem>
-					<asp:ListItem Value="d">d</asp:ListItem>
-					<asp:ListItem Value="e" Selected="True">e</asp:ListItem>
-					<asp:ListItem Value="f">f</asp:ListItem>
-					<asp:ListItem Value="g" Selected="True">g</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="88px" Width="56px" Description="Multiple selection">
-				<asp:RadioButtonList id="RadioButtonList1" runat="server">
-					<asp:ListItem Value="a">a</asp:ListItem>
-					<asp:ListItem Value="b">b</asp:ListItem>
-					<asp:ListItem Value="c" Selected="True">c</asp:ListItem>
-					<asp:ListItem Value="d">d</asp:ListItem>
-					<asp:ListItem Value="e" Selected="True">e</asp:ListItem>
-					<asp:ListItem Value="f">f</asp:ListItem>
-					<asp:ListItem Value="g" Selected="True">g</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="88px" Width="56px" Description="Multiple selection">
-				<asp:ListBox id="ListBox1" runat="server" Height="190px" SelectionMode="Multiple">
-					<asp:ListItem Value="a">a</asp:ListItem>
-					<asp:ListItem Value="b">b</asp:ListItem>
-					<asp:ListItem Value="c" Selected="True">c</asp:ListItem>
-					<asp:ListItem Value="d">d</asp:ListItem>
-					<asp:ListItem Value="e" Selected="True">e</asp:ListItem>
-					<asp:ListItem Value="f">f</asp:ListItem>
-					<asp:ListItem Value="g" Selected="True">g</asp:ListItem>
-				</asp:ListBox>
-			</cc1:GHTSubTest>&nbsp;</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx.cs
deleted file mode 100644
index b7bb4ef3ec1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_SelectedIndex
-		: GHTListControlBase
-	{
-		protected System.Web.UI.WebControls.CheckBoxList CheckBoxList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.ListBox ListBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			try 
-			{
-				GHTSubTestAddResult(GHTSubTest1, CheckBoxList1.SelectedIndex.ToString());
-				GHTSubTestAddResult(GHTSubTest2, RadioButtonList1.SelectedIndex.ToString());
-				GHTSubTestAddResult(GHTSubTest3, ListBox1.SelectedIndex.ToString());
-
-				foreach (Type currentType in TestedTypes)
-					ListControl_SelectedIndex(currentType);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			// SelectedIndex = 0
-			try 
-			{
-				ListBox1.SelectedIndex = 0;
-				GHTSubTestAddResult("no exception should be raised");
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			// SelectedIndex = out of range
-			try 
-			{
-				ListBox1.SelectedIndex = 10;
-			}
-			catch (ArgumentOutOfRangeException ex1)
-			{
-				GHTSubTestExpectedExceptionCaught(ex1);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx
deleted file mode 100644
index a2ed3534176..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_SelectedItem.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_SelectedItem" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_SelectedItem</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx.cs
deleted file mode 100644
index bb10228f1d5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_SelectedItem : GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_SelectedItem(currentType);
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx
deleted file mode 100644
index 0518d4a65fb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListControl_SelectedValue.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListControl_SelectedValue" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListControl_SelectedValue</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-	<form id="Form1" method=post runat=server></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx.cs
deleted file mode 100644
index c6da261c6ad..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListControl_SelectedValue : GHTListControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TestedTypes)
-				ListControl_SelectedValue(currentType);
-      
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx
deleted file mode 100644
index dfa363ceb8d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_Attributes.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_Attributes" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_Attributes</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-					<asp:ListBox id="ListBox1" runat="server" Height="64px" Width="56px">
-						<asp:ListItem Value="0">item 0</asp:ListItem>
-						<asp:ListItem Value="1" AttributeKey="AttributeValue">item 1</asp:ListItem>
-						<asp:ListItem Value="2" AttributeKey1="AttributeValue1" AttributeKey2="AttributeValue2" AttributeKey3="AttributeValue3"
-							AttributeKey4="AttributeValue4" AttributeKey5="AttributeValue5" AttributeKey6="AttributeValue6"
-							AttributeKey7="AttributeValue7" AttributeKey8="AttributeValue8" AttributeKey9="AttributeValue9"
-							AttributeKey10="AttributeValue10" AttributeKey11="AttributeValue11" AttributeKey12="AttributeValue12"
-							AttributeKey13="AttributeValue13">item 2</asp:ListItem>
-					</asp:ListBox></P>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx.cs
deleted file mode 100644
index ee683cc3f28..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_Attributes
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.ListBox ListBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			foreach (ListItem item1 in this.ListBox1.Items)
-			{
-				AttributeCollection collection1 = item1.Attributes;
-				this.AddTitle(ref form1, item1.Text);
-				this.RunSubTests(ref collection1);
-			}
-			this.GHTTestEnd();
-		}
- 
-
-		private void RunSubTests(ref AttributeCollection attributes)
-		{
-			this.GHTSubTestBegin("Attributes Keys count");
-			try
-			{
-				this.GHTSubTestAddResult(attributes.Count.ToString());
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception1 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Attributes Values count");
-			try
-			{
-				this.GHTSubTestAddResult(attributes[attributes.Count.ToString()]);
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception2 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Attributes Keys+Values ");
-			try
-			{
-				IEnumerator enumerator1 = null;
-				string text1 = string.Empty + "<AttributeContainer ";
-				try
-				{
-					enumerator1 = attributes.Keys.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text2 = (string)(enumerator1.Current);
-						string[] textArray1 = new string[] { text1, " ", text2, "=", attributes[text2], " " } ;
-						text1 = string.Concat(textArray1);
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-				text1 = text1 + "></AttributeContainer>";
-				this.GHTSubTestAddResult(text1);
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception3 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-		private void AddTitle(ref HtmlForm frm, string text)
-		{
-			Label label1 = new Label();
-			label1.Text = text;
-			label1.Font.Bold = true;
-			label1.Font.Underline = true;
-			FontUnit unit1 = new FontUnit(FontSize.Larger);
-			label1.Font.Size = unit1;
-			frm.Controls.Add(label1);
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx
deleted file mode 100644
index 5a11dddea3b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_Equals_O.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_Equals_O" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_Equals_O</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" runat="server" method="post">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx.cs
deleted file mode 100644
index 9bd9390cbc7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_Equals_O
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(frm);
-
-
-			// SubTest Reference equality
-			this.GHTSubTestBegin("Reference equality");
-			try 
-			{
-				System.Web.UI.WebControls.ListItem item1 = new System.Web.UI.WebControls.ListItem("Text", "Value");
-				System.Web.UI.WebControls.ListItem item2 = item1;
-
-				Compare(item1.Equals(item2), true);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestBegin(frm);
-
-			// SubTest Text & Value equal, but selected is not equal
-			GHTSubTestBegin("Text & Value equal, but selected is not equal");
-				try 
-				{
-					System.Web.UI.WebControls.ListItem item3 = new System.Web.UI.WebControls.ListItem("Text", "Value");
-					item3.Selected = true;
-					System.Web.UI.WebControls.ListItem item4 = new System.Web.UI.WebControls.ListItem("Text", "Value");
-					item4.Selected = false;
-					Compare(item3.Equals(item4), true);
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			// SubTest Values are not equal
-			GHTSubTestBegin("Values are not equal");
-			try 
-			{
-				System.Web.UI.WebControls.ListItem item5 = new System.Web.UI.WebControls.ListItem("Text", "Value1");
-				System.Web.UI.WebControls.ListItem item6 = new System.Web.UI.WebControls.ListItem("Text", "Value2");
-				Compare(item5.Equals(item6), false);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// SubTest Texts are not equal
-			GHTSubTestBegin("Texts are not equal");
-				try 
-				{
-					System.Web.UI.WebControls.ListItem item7 = new System.Web.UI.WebControls.ListItem("Text1", "Value");
-					System.Web.UI.WebControls.ListItem item8 = new System.Web.UI.WebControls.ListItem("Text2", "Value");
-					Compare(item7.Equals(item8), false);
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			// SubTest FakeListItem
-			GHTSubTestBegin("FakeListItem");
-			try 
-			{
-				System.Web.UI.WebControls.ListItem item9 = new System.Web.UI.WebControls.ListItem("Text", "Value");
-				FakeListItem item10 = new FakeListItem("Text", "Value");
-				Compare(item9.Equals(item10), false);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-
-
-	class FakeListItem
-	{
-		// Methods
-		public FakeListItem(string a_text, string a_value)
-		{
-			this.m_text = a_text;
-			this.m_value = a_value;
-		}
-		// Properties
-		public bool Selected
-		{
-			get
-			{
-				return this.m_selected;
-			}
-			set
-			{
-				this.m_selected = value;
-			}
-		}
-		public string Text
-		{
-			get
-			{
-				return this.m_text;
-			}
-			set
-			{
-				this.m_text = value;
-			}
-		}
-		public string Value
-		{
-			get
-			{
-				return this.m_value;
-			}
-			set
-			{
-				this.m_value = value;
-			}
-		}
-		// Fields
-		private bool m_selected;
-		private string m_text;
-		private string m_value;
-	}
-}
-
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx
deleted file mode 100644
index 8ca749e4483..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_FromString_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_FromString_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_FromString_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx.cs
deleted file mode 100644
index b648f0f6273..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_FromString_S
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin("use as instance method");
-			try
-			{
-				string text1 = "Item's Text";
-				ListItem item1 = ListItem.FromString(text1);
-				this.Compare(item1.Text, text1);
-				this.Compare(item1.Value, text1);
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception1 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("use as class method");
-			try
-			{
-				string text2 = "Item's Text";
-				ListItem item2 = ListItem.FromString(text2);
-				this.Compare(item2.Text, text2);
-				this.Compare(item2.Value, text2);
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception2 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTSubTestBegin("Empty string");
-			try
-			{
-				string text3 = string.Empty;
-				ListItem item3 = ListItem.FromString(text3);
-				this.Compare(item3.Text, text3);
-				this.Compare(item3.Value, text3);
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception3 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx
deleted file mode 100644
index ef649efe8d5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_GetHashCode_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_GetHashCode_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_GetHashCode_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-	<form id="Form1" method=post runat=server></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx.cs
deleted file mode 100644
index 381f4955cee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_GetHashCode_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Call twice with the same instance should provide the same result.
-			this.GHTSubTestBegin("Two calls by the same object.");
-			try
-			{
-				bool flag1;
-				ListItem item1 = new ListItem("Text", "Value");
-				if (item1.GetHashCode() == item1.GetHashCode())
-				{
-					flag1 = true;
-				}
-				else
-				{
-					flag1 = false;
-				}
-				this.GHTSubTestAddResult(flag1.ToString());
-			}
-			catch (Exception exception5)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			}
-			this.GHTSubTestEnd();
-
-			// Equal items (value equality, and not ref equality) should provide the same hashcode.
-			this.GHTSubTestBegin("Equal items ");
-			try
-			{
-				bool flag2;
-				ListItem item2 = new ListItem("Text", "Value");
-				ListItem item3 = new ListItem("Text", "Value");
-				if (item2.GetHashCode() == item3.GetHashCode())
-				{
-					flag2 = true;
-				}
-				else
-				{
-					flag2 = false;
-				}
-				this.GHTSubTestAddResult(flag2.ToString());
-			}
-			catch (Exception exception6)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			}
-			this.GHTSubTestEnd();
-
-			// Not equal items (different text) should provide the diffrent hashcode.
-			this.GHTSubTestBegin("Not equal items ");
-			try
-			{
-				bool flag3;
-				ListItem item4 = new ListItem("Text1", "Value");
-				ListItem item5 = new ListItem("Text2", "Value");
-				if (item4.GetHashCode() == item5.GetHashCode())
-				{
-					flag3 = true;
-				}
-				else
-				{
-					flag3 = false;
-				}
-				this.GHTSubTestAddResult(flag3.ToString());
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-
-			// Not equal items (different value) should provide the diffrent hashcode.
-			this.GHTSubTestBegin("Not equal items ");
-			try
-			{
-				bool flag4;
-				ListItem item6 = new ListItem("Text", "Value1");
-				ListItem item7 = new ListItem("Text", "Value2");
-				if (item6.GetHashCode() == item7.GetHashCode())
-				{
-					flag4 = true;
-				}
-				else
-				{
-					flag4 = false;
-				}
-				this.GHTSubTestAddResult(flag4.ToString());
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx
deleted file mode 100644
index abe15ba3862..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx
+++ /dev/null
@@ -1,39 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_Selected.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_Selected" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_Selected</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:CheckBoxList id="CheckBoxList1" runat="server">
-				<asp:ListItem Value="Item1" Selected="True">Item1</asp:ListItem>
-				<asp:ListItem Value="Item2">Item2</asp:ListItem>
-			</asp:CheckBoxList>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="64px" Width="88px" Description="selected - set">
-					<asp:CheckBoxList id="CheckBoxList2" runat="server">
-						<asp:ListItem Value="Item1">Item1</asp:ListItem>
-						<asp:ListItem Value="Item2">Item2</asp:ListItem>
-					</asp:CheckBoxList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx.cs
deleted file mode 100644
index 43c7819e933..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_Selected
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.CheckBoxList CheckBoxList1;
-		protected System.Web.UI.WebControls.CheckBoxList CheckBoxList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Selected - Get
-			GHTSubTestBegin("Selected - Get");
-			try 
-			{
-				GHTSubTestAddResult(CheckBoxList1.Items[0].Selected.ToString());
-				GHTSubTestAddResult(CheckBoxList1.Items[1].Selected.ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// Selected - Set (output is to GHTsubTest2)
-			CheckBoxList2.Items[0].Selected = false;
-			CheckBoxList2.Items[1].Selected = true;
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx
deleted file mode 100644
index 0455f35ac07..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="144px" Height="56px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server" Width="128px">
-						<asp:ListItem Value="   abcd efg hijkl nmopqrst   uvwxyz    ">   abcd efg hijkl nmopqrst   uvwxyz    </asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest>&nbsp;
-			</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="144px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" Width="128px">
-						<asp:ListItem>`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:&quot;&lt;&gt;?</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="64px" Width="136px">
-					<asp:DropDownList id="DropDownList1" runat="server">
-						<asp:ListItem Value="                               "></asp:ListItem>
-					</asp:DropDownList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="64px" Width="136px">
-					<asp:DropDownList id="DropDownList2" runat="server">
-						<asp:ListItem></asp:ListItem>
-					</asp:DropDownList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx.cs
deleted file mode 100644
index 5cc10cc22e8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_Text
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx
deleted file mode 100644
index da4f74b0ecc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_ToString_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_ToString_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_ToString_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<P>
-				<asp:RadioButtonList id="RadioButtonList1" runat="server" Width="128px">
-					<asp:ListItem Value="   abcd efg hijkl nmopqrst   uvwxyz    "></asp:ListItem>
-				</asp:RadioButtonList></P>
-			<P>
-				<asp:RadioButtonList id="RadioButtonList2" runat="server" Width="128px">
-					<asp:ListItem Value="`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:&quot;&lt;&gt;?"></asp:ListItem>
-				</asp:RadioButtonList></P>
-			<P>
-				<asp:DropDownList id="DropDownList1" runat="server">
-					<asp:ListItem Value="                               "></asp:ListItem>
-				</asp:DropDownList></P>
-			<P>
-				<asp:DropDownList id="DropDownList2" runat="server">
-					<asp:ListItem></asp:ListItem>
-				</asp:DropDownList></P>
-		</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx.cs
deleted file mode 100644
index 42f72727d41..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_ToString_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected System.Web.UI.WebControls.DropDownList DropDownList2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// RadioButtonList1.Items[0].ToString()
-			GHTSubTestBegin("RadioButtonList1.Items(0).ToString()");
-			try 
-			{
-				GHTSubTestAddResult(RadioButtonList1.Items[0].ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// RadioButtonList2.Items[0].ToString()
-			GHTSubTestBegin("RadioButtonList2.Items(0).ToString()");
-			try 
-			{
-				GHTSubTestAddResult(RadioButtonList2.Items[0].ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// DropDownList1.Items[0].ToString()
-			GHTSubTestBegin("DropDownList1.Items(0).ToString()");
-			try 
-			{
-				GHTSubTestAddResult(DropDownList1.Items[0].ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			// DropDownList2.Items[0].ToString()
-			GHTSubTestBegin("DropDownList2.Items(0).ToString()");
-			try 
-			{
-				GHTSubTestAddResult(DropDownList2.Items[0].ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx
deleted file mode 100644
index c0fc197d4f8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_Value.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_Value" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_Value</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<FORM id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="144px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server" Width="128px">
-						<asp:ListItem Value="   abcd efg hijkl nmopqrst   uvwxyz    "></asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest>&nbsp;
-			</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="144px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" Width="128px">
-						<asp:ListItem Value="`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:&quot;&lt;&gt;?"></asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="64px" Width="136px">
-					<asp:DropDownList id="DropDownList1" runat="server">
-						<asp:ListItem Value="                               "></asp:ListItem>
-					</asp:DropDownList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="64px" Width="136px">
-					<asp:DropDownList id="DropDownList2" runat="server">
-						<asp:ListItem></asp:ListItem>
-					</asp:DropDownList>
-				</cc1:GHTSubTest></P>
-		</FORM>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx.cs
deleted file mode 100644
index 400c37d2ec8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class ListItem_Value
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.DropDownList DropDownList1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.DropDownList DropDownList2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx
deleted file mode 100644
index f14fb923b8e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx.cs
deleted file mode 100644
index 17d4f6878b0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_ctor_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Default values
-			GHTSubTestBegin("Default values");
-			try 
-			{
-				System.Web.UI.WebControls.ListItem item = new System.Web.UI.WebControls.ListItem();
-				Compare(item.Text, String.Empty);
-				Compare(item.Value, String.Empty);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}      
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx
deleted file mode 100644
index 39670398ce8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_ctor_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_ctor_S" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_ctor_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx.cs
deleted file mode 100644
index ab7fe92063f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_ctor_S : GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin();
-			try
-			{
-				string text1 = "Item's Text";
-				ListItem item1 = new ListItem(text1);
-				this.Compare(item1.Text, text1);
-				this.Compare(item1.Value, text1);
-			}
-			catch (Exception exception2)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx
deleted file mode 100644
index 5a9bcfdd36a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItem_ctor_SS.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItem_ctor_SS" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ListItem_ctor_SS</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-	<form id = "Form1" runat=server method=post></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx.cs
deleted file mode 100644
index f17a741a9c8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItem_ctor_SS
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			this.GHTSubTestBegin();
-			try
-			{
-				string text1 = "Item's text";
-				string text2 = "Item's value";
-				ListItem item1 = new ListItem(text1, text2);
-				this.Compare(item1.Text, text1);
-				this.Compare(item1.Value, text2);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			this.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx
deleted file mode 100644
index 79e6b4e9873..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListItemType_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListItemType_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ListItemType_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx.cs
deleted file mode 100644
index 704436481a8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListItemType_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.ListItemType");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ListItemType));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ListItemType));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx
deleted file mode 100644
index e8a016b9c27..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ListSelectionMode_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ListSelectionMode_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ListSelectionMode_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx.cs
deleted file mode 100644
index 08be068055f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ListSelectionMode_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.ListSelectionMode");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ListSelectionMode));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ListSelectionMode));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Literal/Literal_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Literal/Literal_Text.aspx
deleted file mode 100644
index 5c5c081be08..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Literal/Literal_Text.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Literal_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Literal_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>Literal_Text</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-    <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="120px" Height="56px">
-				<asp:Literal id="Literal1" runat="server" Text="   abcdefghijklm nopqrstuvwxyz       "></asp:Literal>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 106; LEFT: 24px; POSITION: absolute; TOP: 312px"
-				runat="server" Height="40px" Width="192px">
-				<asp:Literal id="Literal6" runat="server" Text="                          "></asp:Literal>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 24px; POSITION: absolute; TOP: 256px"
-				runat="server" Height="40px" Width="192px">
-				<asp:Literal id="Literal5" runat="server"></asp:Literal>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 200px"
-				runat="server" Height="40px" Width="192px">
-				<asp:Literal id="Literal4" runat="server" Text='~!@#$%^&amp;*()_+{}|:"<>?`[]\-=,./'></asp:Literal>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 144px"
-				runat="server" Height="40px" Width="192px">
-				<asp:Literal id="Literal3" runat="server" Text="134567890"></asp:Literal>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 88px"
-				runat="server" Height="40px" Width="192px">
-				<asp:Literal id="Literal2" runat="server" Text="   abcdefghijklm nopqrstuvwxyz       "></asp:Literal>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Literal/Literal_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Literal/Literal_Text.aspx.cs
deleted file mode 100644
index c8a4d7938e1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Literal/Literal_Text.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Literal_Text
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx
deleted file mode 100644
index 3e1c86f6fdc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="NextPrevFormat_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.NextPrevFormat_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>NextPrevFormat_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx.cs
deleted file mode 100644
index 280a772c120..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class NextPrevFormat_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			GHTSubTestBegin("System.Web.UI.WebControls.NextPrevFormat");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(NextPrevFormat));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(NextPrevFormat));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Car.jpg b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Car.jpg
deleted file mode 100755
index a1b77107c25..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Car.jpg
+++ /dev/null
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx
deleted file mode 100644
index 2dad6dbe0e1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Panel_BackImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Panel_BackImageUrl" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Panel_BackImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="136px" Height="80px">
-				<asp:Panel id="Panel1" runat="server" Height="72px" Width="128px" BackImageUrl="http://localhost/GHTTests/System_Web_dll/System_Web_UI_WebControls/Panel/Car.jpg">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 352px"
-				runat="server" Height="80px" Width="136px">
-				<asp:Panel id="Panel4" runat="server" Height="72px" Width="128px" BackImageUrl="../HyperLink/Car.jpg">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 248px"
-				runat="server" Height="80px" Width="136px">
-				<asp:Panel id="Panel3" runat="server" Height="72px" Width="128px" BackImageUrl="/GHTTests/System_Web_dll/System_Web_UI_WebControls/Panel/Car.jpg">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 128px"
-				runat="server" Height="80px" Width="136px">
-				<asp:Panel id="Panel2" runat="server" Height="72px" Width="128px" BackImageUrl="Car.jpg">Panel</asp:Panel>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx.cs
deleted file mode 100644
index 481f99acbb3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Panel_BackImageUrl
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx
deleted file mode 100644
index 7f77780eed6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Panel_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Panel_HorizontalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Panel_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="136px" Height="40px">
-				<asp:Panel id="Panel1" runat="server" Height="48px" Width="112px">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 416px"
-				runat="server" Height="40px" Width="136px">
-				<asp:Panel id="Panel6" runat="server" Height="48px" Width="112px" HorizontalAlign="NotSet">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 336px"
-				runat="server" Height="40px" Width="136px">
-				<asp:Panel id="Panel5" runat="server" Height="48px" Width="112px" HorizontalAlign="Justify">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 256px"
-				runat="server" Height="40px" Width="136px">
-				<asp:Panel id="Panel4" runat="server" Height="48px" Width="112px" HorizontalAlign="Right">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 176px"
-				runat="server" Height="40px" Width="136px">
-				<asp:Panel id="Panel3" runat="server" Height="48px" Width="112px" HorizontalAlign="Center">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 96px"
-				runat="server" Height="40px" Width="136px">
-				<asp:Panel id="Panel2" runat="server" Height="48px" Width="112px" HorizontalAlign="Left">Panel</asp:Panel>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx.cs
deleted file mode 100644
index e716f90bfd6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Panel_HorizontalAlign
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx
deleted file mode 100644
index 07f30583376..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Panel_Wrap.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Panel_Wrap" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Panel_Wrap</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="160px" Height="96px">
-					<asp:Panel id="Panel1" runat="server" Height="56px" Width="112px">Panel</asp:Panel>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="96px" Width="160px">
-					<asp:Panel id="Panel2" runat="server" Height="56px" Width="112px" Wrap="False">Panel</asp:Panel>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="96px" Width="160px">
-					<asp:Panel id="Panel3" runat="server" Height="56px" Width="112px" Wrap="True">Panel</asp:Panel>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx.cs
deleted file mode 100644
index 5dbf3a4a47e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Panel_Wrap
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx
deleted file mode 100644
index 57ef67668cc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="PlaceHolder_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.PlaceHolder_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>PlaceHolder_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="168px" Height="104px">
-				<asp:PlaceHolder id="PlaceHolder1" runat="server"></asp:PlaceHolder>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx.cs
deleted file mode 100644
index 7940a04b75f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class PlaceHolder_ctor_
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx
deleted file mode 100644
index 78d9f2e6713..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx
+++ /dev/null
@@ -1,58 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButton_GroupName.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButton_GroupName" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButton_GroupName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="136px" Height="24px">
-				<asp:RadioButton id="RadioButton1" runat="server"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" style="Z-INDEX: 107; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton7" runat="server" GroupName=""></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" style="Z-INDEX: 106; LEFT: 16px; POSITION: absolute; TOP: 192px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton6" runat="server" GroupName="Group11"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" style="Z-INDEX: 105; LEFT: 16px; POSITION: absolute; TOP: 360px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton5" runat="server" GroupName="Group2"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" style="Z-INDEX: 104; LEFT: 16px; POSITION: absolute; TOP: 320px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton4" runat="server" GroupName="Group2"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" style="Z-INDEX: 103; LEFT: 16px; POSITION: absolute; TOP: 280px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton3" runat="server" GroupName="Group2"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 16px; POSITION: absolute; TOP: 136px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton2" runat="server" GroupName="Group1"></asp:RadioButton>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx.cs
deleted file mode 100644
index 896534d0e6e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class RadioButton_GroupName
-    : GHTBaseWeb {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_ctor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_ctor.aspx
deleted file mode 100644
index 1b7891d6c33..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_ctor.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButton_ctor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButton_ctor" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButton_GroupName</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="136px" Height="24px">
-				<asp:RadioButton id="RadioButton1" runat="server"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 107; LEFT: 16px; POSITION: absolute; TOP: 64px"
-				runat="server" Height="24px" Width="136px">
-				<asp:RadioButton id="RadioButton7" runat="server" GroupName="" Text="textext"></asp:RadioButton>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_ctor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_ctor.aspx.cs
deleted file mode 100644
index 7635832c81a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButton/RadioButton_ctor.aspx.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class RadioButton_ctor
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.RadioButton RadioButton1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.RadioButton RadioButton7;
- 	protected GHTWebControls.GHTSubTest GHTSubTest7;
- 	protected System.Web.UI.WebControls.RadioButton RadioButton6;
- 	protected GHTWebControls.GHTSubTest GHTSubTest6;
- 	protected System.Web.UI.WebControls.RadioButton RadioButton5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
- 	protected System.Web.UI.WebControls.RadioButton RadioButton4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.RadioButton RadioButton3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.RadioButton RadioButton2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx
deleted file mode 100644
index dc5db7e657f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButtonList_CellPadding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButtonList_CellPadding" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButtonList_CellPadding</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="40px" Height="104px">
-				<asp:RadioButtonList id="RadioButtonList2" runat="server">
-					<asp:ListItem Value="1">1</asp:ListItem>
-					<asp:ListItem Value="2">2</asp:ListItem>
-					<asp:ListItem Value="3">3</asp:ListItem>
-					<asp:ListItem Value="4">4</asp:ListItem>
-					<asp:ListItem Value="5">5</asp:ListItem>
-					<asp:ListItem Value="6">6</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="104px" Width="40px">
-				<asp:RadioButtonList id="RadioButtonList1" runat="server" CellPadding="1">
-					<asp:ListItem Value="1">1</asp:ListItem>
-					<asp:ListItem Value="2">2</asp:ListItem>
-					<asp:ListItem Value="3">3</asp:ListItem>
-					<asp:ListItem Value="4">4</asp:ListItem>
-					<asp:ListItem Value="5">5</asp:ListItem>
-					<asp:ListItem Value="6">6</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest>&nbsp;
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="104px" Width="40px">
-				<asp:RadioButtonList id="RadioButtonList3" runat="server" CellPadding="5">
-					<asp:ListItem Value="1">1</asp:ListItem>
-					<asp:ListItem Value="2">2</asp:ListItem>
-					<asp:ListItem Value="3">3</asp:ListItem>
-					<asp:ListItem Value="4">4</asp:ListItem>
-					<asp:ListItem Value="5">5</asp:ListItem>
-					<asp:ListItem Value="6">6</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest></P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="104px" Width="40px">
-				<asp:RadioButtonList id="RadioButtonList4" runat="server" CellPadding="50">
-					<asp:ListItem Value="1">1</asp:ListItem>
-					<asp:ListItem Value="2">2</asp:ListItem>
-					<asp:ListItem Value="3">3</asp:ListItem>
-					<asp:ListItem Value="4">4</asp:ListItem>
-					<asp:ListItem Value="5">5</asp:ListItem>
-					<asp:ListItem Value="6">6</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest></P>
-			</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx.cs
deleted file mode 100644
index 0466f05986c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RadioButtonList_CellPadding
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			//Negative CellPadding value:
-			GHTSubTestBegin("Negative CellPadding value");
-			try 
-			{
-				System.Web.UI.WebControls.RadioButtonList rbl = new System.Web.UI.WebControls.RadioButtonList();
-				rbl.RepeatLayout = RepeatLayout.Table;
-				rbl.CellPadding = -100;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx
deleted file mode 100644
index 4bacb21713b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx
+++ /dev/null
@@ -1,63 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButtonList_CellSpacing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButtonList_CellSpacing" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButtonList_CellSpacing</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="48px" Height="128px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server">
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-						<asp:ListItem Value="6">6</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest>&nbsp;
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="128px" Width="48px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" CellSpacing="5">
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-						<asp:ListItem Value="6">6</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest>&nbsp;&nbsp;&nbsp;
-			</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="128px" Width="48px">
-					<asp:RadioButtonList id="RadioButtonList3" runat="server" CellSpacing="50">
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-						<asp:ListItem Value="6">6</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx.cs
deleted file mode 100644
index 4951c03a32e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RadioButtonList_CellSpacing
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			//Negative CellSpacing value:
-			GHTSubTestBegin("Negative CellSpacing value");
-			try 
-			{
-				System.Web.UI.WebControls.RadioButtonList rbl = new System.Web.UI.WebControls.RadioButtonList();
-				rbl.RepeatLayout = RepeatLayout.Table;
-				rbl.CellSpacing = -100;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx
deleted file mode 100644
index 5d9d715b891..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx
+++ /dev/null
@@ -1,83 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButtonList_RepeatColumns.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButtonList_RepeatColumns" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButtonList_RepeatColumns</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="64px" Height="136px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="136px" Width="64px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" RepeatColumns="1">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="85px" Width="88px">
-					<asp:RadioButtonList id="RadioButtonList3" runat="server" RepeatColumns="2">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="47px" Width="88px">
-					<asp:RadioButtonList id="RadioButtonList4" runat="server" RepeatColumns="4">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="47px" Width="88px">
-					<asp:RadioButtonList id="RadioButtonList5" runat="server" RepeatColumns="13">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx.cs
deleted file mode 100644
index 2b6c8ec9c5c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RadioButtonList_RepeatColumns
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-
-			//Non valid RepeatColumns value
-			GHTSubTestBegin("Non valid RepeatColumns value");
-			try 
-			{
-				System.Web.UI.WebControls.RadioButtonList rbl = new System.Web.UI.WebControls.RadioButtonList();
-				rbl.RepeatColumns = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx
deleted file mode 100644
index c286d166e02..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx
+++ /dev/null
@@ -1,71 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButtonList_RepeatDirection.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButtonList_RepeatDirection" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButtonList_RepeatDirection</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="112px" Height="248px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-						<asp:ListItem Value="6">6</asp:ListItem>
-						<asp:ListItem Value="7">7</asp:ListItem>
-						<asp:ListItem Value="8">8</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="296px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" RepeatDirection="Horizontal">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-						<asp:ListItem Value="6">6</asp:ListItem>
-						<asp:ListItem Value="7">7</asp:ListItem>
-						<asp:ListItem Value="8">8</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest>&nbsp;
-			</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="112px">
-					<asp:RadioButtonList id="RadioButtonList3" runat="server" RepeatDirection="Vertical">
-						<asp:ListItem Value="0">0</asp:ListItem>
-						<asp:ListItem Value="1">1</asp:ListItem>
-						<asp:ListItem Value="2">2</asp:ListItem>
-						<asp:ListItem Value="3">3</asp:ListItem>
-						<asp:ListItem Value="4">4</asp:ListItem>
-						<asp:ListItem Value="5">5</asp:ListItem>
-						<asp:ListItem Value="6">6</asp:ListItem>
-						<asp:ListItem Value="7">7</asp:ListItem>
-						<asp:ListItem Value="8">8</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx.cs
deleted file mode 100644
index 6784190f823..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RadioButtonList_RepeatDirection
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// Non valid RepeateDirection value
-			GHTSubTestBegin("Non valid RepeateDirection value");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.RadioButtonList rbl;
-				//rbl.RepeatDirection = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("InvalidCastException");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx
deleted file mode 100644
index 7b77ea513b9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButtonList_RepeatLayout.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButtonList_RepeatLayout" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButtonList_RepeatLayout</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="88px" Height="88px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server">
-						<asp:ListItem Value="item1">item1</asp:ListItem>
-						<asp:ListItem Value="item2">item2</asp:ListItem>
-						<asp:ListItem Value="item3">item3</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="96px" Width="88px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" Height="72px" Width="80px" RepeatLayout="Table">
-						<asp:ListItem Value="item1">item1</asp:ListItem>
-						<asp:ListItem Value="item2">item2</asp:ListItem>
-						<asp:ListItem Value="item3">item3</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="96px" Width="88px">
-					<asp:RadioButtonList id="RadioButtonList3" runat="server" Height="72px" Width="80px" RepeatLayout="Flow">
-						<asp:ListItem Value="item1">item1</asp:ListItem>
-						<asp:ListItem Value="item2">item2</asp:ListItem>
-						<asp:ListItem Value="item3">item3</asp:ListItem>
-					</asp:RadioButtonList>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx.cs
deleted file mode 100644
index 73133609f70..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RadioButtonList_RepeatLayout
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			// Non valid RepeateLayout value
-			GHTSubTestBegin("Non valid RepeateLayout value");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.RadioButtonList rbl = new System.Web.UI.WebControls.RadioButtonList();
-				//rbl.RepeatLayout = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("InvalidCastException ");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx
deleted file mode 100644
index ec364a8d46e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RadioButtonList_TextAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RadioButtonList_TextAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RadioButtonList_TextAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P><cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="80px" Width="96px">
-					<asp:RadioButtonList id="RadioButtonList1" runat="server"></asp:RadioButtonList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="80px" Width="96px">
-					<asp:RadioButtonList id="RadioButtonList2" runat="server" TextAlign="Left"></asp:RadioButtonList>
-				</cc1:ghtsubtest></P>
-			<P><cc1:ghtsubtest id="Ghtsubtest4" runat="server" Height="80px" Width="96px">
-					<asp:RadioButtonList id="RadioButtonList6" runat="server" TextAlign="Right"></asp:RadioButtonList>
-				</cc1:ghtsubtest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx.cs
deleted file mode 100644
index f617f2a061e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RadioButtonList_TextAlign
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList6;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// try { illegal text align value:
-			GHTSubTestBegin("Illegal text align value");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.RadioButtonList rbl = new System.Web.UI.WebControls.RadioButtonList();
-				//rbl.TextAlign = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx
deleted file mode 100644
index a0dd586736e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RepeatDirection_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RepeatDirection_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>RepeatDirection_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx.cs
deleted file mode 100644
index ad918f92925..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RepeatDirection_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.RepeatDirection");
-				try 
-				{
-					GHTSubTestAddResult(Test());
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(RepeatDirection));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(RepeatDirection));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx
deleted file mode 100644
index 9c10c139626..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RepeatLayout_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RepeatLayout_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RepeatLayout_Enum</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx.cs
deleted file mode 100644
index d24b24f3648..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RepeatLayout_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.RepeatLayout");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(RepeatLayout));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(RepeatLayout));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx
deleted file mode 100644
index 18914a066d7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_AlternatingItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_AlternatingItemTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_AlternatingItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="88px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-					</AlternatingItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-						plain text as alternative item template
-					</AlternatingItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-						<div><span><b><i>html as alternating item template</i></b></span></div>
-					</AlternatingItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<ItemTemplate>
-						<asp:RadioButton runat="server" Text="<%# Container.DataItem %>" ID="Checkbox2"/>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-						<asp:CheckBox runat="server" Text="<%# Container.DataItem %>" ID="Checkbox1"/>
-					</AlternatingItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<HeaderTemplate><table border="1"></HeaderTemplate>
-					<ItemTemplate>
-						<tr bgcolor="#777777"><td><%# Container.DataItem %></td></tr>
-					</ItemTemplate>
-					<AlternatingItemTemplate>
-						<tr bgcolor="#eeeeee"><td><%# Container.DataItem %></td></tr>
-					</AlternatingItemTemplate>
-					<FooterTemplate></table></FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx.cs
deleted file mode 100644
index 4782b1a8b7a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_AlternatingItemTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("Code base template 1");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater6 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater6);
-				Repeater6.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater6.AlternatingItemTemplate = new t_EmptyLitTemplate();
-				Repeater6.ItemTemplate = new t_DBLitTemplate();
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 2");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater7 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater7);
-				Repeater7.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater7.AlternatingItemTemplate = new t_PlainTextLitTemplate();
-				Repeater7.ItemTemplate = new t_DBLitTemplate();
-				Repeater7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 3");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater8 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater8);
-				Repeater8.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater8.AlternatingItemTemplate = new t_HtmlLitTemplate();
-				Repeater8.ItemTemplate = new t_DBLitTemplate();
-				Repeater8.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 4");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater9 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater9);
-				Repeater9.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater9.AlternatingItemTemplate = new t_ControlLitTemplate();
-				Repeater9.ItemTemplate = new t_DBLitTemplate();
-				Repeater9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 5");
-				try 
-				{
-					System.Web.UI.WebControls.Repeater Repeater10 = new System.Web.UI.WebControls.Repeater();
-					GHTActiveSubTest.Controls.Add(Repeater10);
-					Repeater10.DataSource = GHTTests.GHDataSources.DSArrayList();;
-					Repeater10.AlternatingItemTemplate = new t_DBLitTemplate();
-					Repeater10.ItemTemplate = new t_DBLitTemplate();
-					Repeater10.DataBind();
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx
deleted file mode 100644
index c1067fd5214..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx
+++ /dev/null
@@ -1,90 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_DataBind_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_DataBind_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_DataBind_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="96px">
-					<asp:Repeater id="Repeater1" runat="server">
-						<ItemTemplate>
-							<div><%#Container.DataItem%></div>
-							<br>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="96px" Width="553px">
-					<asp:Repeater id="Repeater2" runat="server">
-						<ItemTemplate>
-							<div><%#Container.DataItem%></div>
-							<br>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="96px" Width="553px">
-					<asp:Repeater id="Repeater3" runat="server">
-						<ItemTemplate>
-							<div><%#DataBinder.Eval(Container.DataItem, "number")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "number_up")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "number_number")%></div>
-							<br>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="96px" Width="553px">
-					<asp:Repeater id="Repeater4" runat="server">
-						<ItemTemplate>
-							<div><%#DataBinder.Eval(Container.DataItem, "id")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "name")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "company")%></div>
-							<br>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest>&nbsp;
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="96px" Width="553px">
-					<asp:Repeater id="Repeater5" runat="server">
-						<ItemTemplate>
-							<div><%#DataBinder.Eval(Container.DataItem, "id")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "name")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "company")%></div>
-							<br>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest>
-				<br>
-				<br>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="96px" Width="553px">
-					<asp:Repeater id="Repeater6" runat="server">
-						<ItemTemplate>
-							<div><%#DataBinder.Eval(Container.DataItem, "color")%></div>
-							<div><%#DataBinder.Eval(Container.DataItem, "colorObj")%></div>
-							<br>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest7" runat="server" Height="96px" Width="553px">
-					<asp:Repeater id="Repeater7" runat="server"></asp:Repeater>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx.cs
deleted file mode 100644
index 32289d650d8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_DataBind_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.Repeater Repeater6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.Repeater Repeater7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-
-		#region Datasource
-		private ArrayList DSArrayHashObject()
-		{
-			ArrayList list1 = new ArrayList();
-			ArrayList list3 = GHTTests.GHDataSources.DSArrayList();
-			IEnumerator enumerator1 = list3.GetEnumerator();
-			while (enumerator1.MoveNext())
-			{
-				Hashtable hashtable1 = new Hashtable();
-				hashtable1.Add("color", new Repeater_DataBind_.CustomColor("1", 1).ToString());
-				hashtable1.Add("numberObj", new Repeater_DataBind_.CustomColor("1", 1));
-				list1.Add(hashtable1);
-			}
-			return list1;
-		}
-		#endregion
-
-		private class CustomColor
-		{
-			private string color_name;
-			private byte color_value;
-			public CustomColor(string name, byte value)
-			{
-				color_name = name;
-				color_value = value;
-			}
-			public override string ToString()
-			{
-				return "Color: " + color_name;
-			}
-		}
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArray();;
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayHash();
-				Repeater3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSDataSet();
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				Repeater6.DataSource = DSArrayHashObject();
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest7;
-			try 
-			{
-				Repeater7.DataSource = GHTTests.GHDataSources.DSArray();
-					Repeater7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx
deleted file mode 100644
index cf62ae51686..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx
+++ /dev/null
@@ -1,93 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_DataMember.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_DataMember" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_DataMember</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="56px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<ItemTemplate>
-						<%# DataBinder.Eval(Container.DataItem, "id") %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<ItemTemplate>
-						<%# DataBinder.Eval(Container.DataItem, "id") %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater6" runat="server">
-					<ItemTemplate>
-						<%# DataBinder.Eval(Container.DataItem, "id") %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater7" runat="server">
-					<ItemTemplate>
-						<%# DataBinder.Eval(Container.DataItem, "id") %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest8" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater8" runat="server">
-					<ItemTemplate>
-						<%# DataBinder.Eval(Container.DataItem, "id") %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest9" runat="server" Height="56px" Width="553px">
-				<asp:Repeater id="Repeater9" runat="server">
-					<ItemTemplate>
-						<%# DataBinder.Eval(Container.DataItem, "id") %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<br>
-			<br>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx.cs
deleted file mode 100644
index ad44d113b06..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_DataMember
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.Repeater Repeater6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.Repeater Repeater7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		protected System.Web.UI.WebControls.Repeater Repeater8;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		protected System.Web.UI.WebControls.Repeater Repeater9;
-		protected GHTWebControls.GHTSubTest GHTSubTest9;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-				GHTSubTestAddResult(Repeater1.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.DataMember = "";
-				Repeater2.DataBind();
-				GHTSubTestAddResult(Repeater2.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater3.DataMember = "NonExistValue";
-				Repeater3.DataBind();
-				GHTSubTestAddResult(Repeater3.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSDataTable();
-				Repeater4.DataMember = "Not Name Of Table";
-				Repeater4.DataBind();
-				GHTSubTestAddResult(Repeater4.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSDataTable();
-				Repeater5.DataMember = "Customers";
-				Repeater5.DataBind();
-				GHTSubTestAddResult(Repeater5.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				Repeater6.DataSource = GHTTests.GHDataSources.DSDataSet();;
-				Repeater6.DataBind();
-				GHTSubTestAddResult(Repeater6.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest7;
-			try 
-			{
-				Repeater7.DataSource = GHTTests.GHDataSources.DSDataSet();
-				Repeater7.DataMember = "Customers";
-				Repeater7.DataBind();
-				GHTSubTestAddResult(Repeater7.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest8;
-			try 
-			{
-				Repeater8.DataSource = GHTTests.GHDataSources.DSDataSet();
-				Repeater8.DataMember = "Orders";
-				Repeater8.DataBind();
-				GHTSubTestAddResult(Repeater8.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest9;
-			try 
-			{
-				Repeater9.DataSource = GHTTests.GHDataSources.DSDataSet();
-				Repeater9.DataMember = "NonExist";
-				Repeater9.DataBind();
-				GHTSubTestAddResult(Repeater9.DataMember);
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx
deleted file mode 100644
index 2b04ebcea3a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx
+++ /dev/null
@@ -1,103 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_DataSource.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_DataSource" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_DataSource</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest><cc1:ghtsubtest id="Ghtsubtest3" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest4" runat="server" Width="553px" Height="88px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<HeaderTemplate>
-						<div>Header</div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						<div>Footer</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest5" runat="server" Width="553px" Height="88px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<HeaderTemplate>
-						<div>Header</div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						<div>Footer</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>
-			<cc1:GHTSubTest id="GHTSubTest6" runat="server" Width="384px" Height="91px">
-				<asp:Repeater id="Repeater6" runat="server">
-					<HeaderTemplate>
-						<div>Header</div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						<div>Footer</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx.cs
deleted file mode 100644
index 9b5ee5c891e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_DataSource
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest Ghtsubtest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest Ghtsubtest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest Ghtsubtest5;
-		protected System.Web.UI.WebControls.Repeater Repeater6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-
-				GHTSubTestAddResult(Repeater1.DataSource.GetType().ToString());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				Repeater2.DataBind();
-				GHTSubTestAddResult(Repeater2.DataSource.GetType().ToString());
-				GHTSubTestExpectedExceptionNotCaught("NullReferenceException");
-			}
-			catch (NullReferenceException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest3;
-			try 
-			{
-				Repeater3.DataSource = 123;
-				Repeater3.DataBind();
-
-				GHTSubTestAddResult(Repeater3.DataSource.GetType().ToString());
-				GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException eex) 
-			{
-				GHTSubTestExpectedExceptionCaught(eex); 
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest4;
-			try 
-			{
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest5;
-			try 
-			{
-				ArrayList a = new ArrayList();
-				Repeater5.DataSource = a;
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				Repeater6.DataSource = null;
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx
deleted file mode 100644
index c3e74dc0c3a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx
+++ /dev/null
@@ -1,87 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_FooterTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_FooterTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_FooterTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="80px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-					<FooterTemplate>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="80px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-					<FooterTemplate>
-						plain text footer template
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="80px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-					<FooterTemplate>
-						<div><span><b><i>html template</i></b></span></div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="80px" Width="553px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-					<FooterTemplate>
-						<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="80px" Width="553px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<HeaderTemplate>
-						<table>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<tr>
-							<td><%# Container.DataItem %></td>
-						</tr>
-					</ItemTemplate>
-					<FooterTemplate>
-						<tr>
-							<td>separated html tag template</td>
-						</tr>
-						</table>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx.cs
deleted file mode 100644
index 93bc2d7d36e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Data;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_FooterTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("Code base template 1");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater6 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater6);
-				Repeater6.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater6.FooterTemplate = new t_EmptyLitTemplate();
-				Repeater6.ItemTemplate = new t_DBLitTemplate();
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 2");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater7 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater7);
-				Repeater7.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater7.FooterTemplate = new t_PlainTextLitTemplate();
-				Repeater7.ItemTemplate = new t_DBLitTemplate();
-				Repeater7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 3");
-				try 
-				{
-					System.Web.UI.WebControls.Repeater Repeater8 = new System.Web.UI.WebControls.Repeater();
-					GHTActiveSubTest.Controls.Add(Repeater8);
-					Repeater8.DataSource = GHTTests.GHDataSources.DSArrayList();
-					Repeater8.FooterTemplate = new t_HtmlLitTemplate();
-					Repeater8.ItemTemplate = new t_DBLitTemplate();
-					Repeater8.DataBind();
-				}
-				catch (Exception ex) 
-				{
-					GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 4");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater9 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater9);
-				Repeater9.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater9.FooterTemplate = new t_ControlLitTemplate();
-				Repeater9.ItemTemplate = new t_DBLitTemplate();
-				Repeater9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx
deleted file mode 100644
index e0e10d41032..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx
+++ /dev/null
@@ -1,86 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_HeaderTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_HeaderTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_HeaderTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="24px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<HeaderTemplate>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="24px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<HeaderTemplate>
-						plain text header template
-					</HeaderTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="24px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<HeaderTemplate>
-						<div><span><b><i>html template</i></b></span></div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="24px" Width="553px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<HeaderTemplate>
-						<asp:Button Width="100px" Runat="server" Text="Server control template"></asp:Button>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="24px" Width="553px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<HeaderTemplate>
-						<table>
-							<tr>
-								<td>separated html tag template</td>
-							</tr>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<tr>
-							<td><%# Container.DataItem %></td>
-						</tr>
-					</ItemTemplate>
-					<FooterTemplate>
-						</table>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<br>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx.cs
deleted file mode 100644
index 80a704af3b3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_HeaderTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("Code base template 1");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater6 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater6);
-				Repeater6.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater6.HeaderTemplate = new t_EmptyLitTemplate();
-				Repeater6.ItemTemplate = new t_DBLitTemplate();
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 2");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater7 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater7);
-				Repeater7.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater7.HeaderTemplate = new t_PlainTextLitTemplate();
-				Repeater7.ItemTemplate = new t_DBLitTemplate();
-				Repeater7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 3");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater8 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater8);
-				Repeater8.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater8.HeaderTemplate = new t_HtmlLitTemplate();
-				Repeater8.ItemTemplate = new t_DBLitTemplate();
-				Repeater8.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 4");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater9 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater9);
-				Repeater9.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater9.HeaderTemplate = new t_ControlLitTemplate();
-				Repeater9.ItemTemplate = new t_DBLitTemplate();
-				Repeater9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx
deleted file mode 100644
index 00a14bb0df4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_ItemDataBound.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_ItemDataBound" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_ItemDataBound</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="72px" Width="553px">
-					<asp:Repeater id="Repeater1" runat="server">
-						<ItemTemplate>
-							<asp:HyperLink id="hl_name" NavigateUrl="http://www.google.com/" Runat="server">
-								<%# Container.DataItem %>
-							</asp:HyperLink>
-						</ItemTemplate>
-					</asp:Repeater>
-				</cc1:GHTSubTest></P>
-			<P>
-				<asp:HyperLink id="HyperLink1" runat="server">HyperLink</asp:HyperLink></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx.cs
deleted file mode 100644
index 1893cf2c587..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_ItemDataBound
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.HyperLink HyperLink1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.Repeater1.ItemDataBound += new RepeaterItemEventHandler(Repeater1_ItemDataBound);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				( (HyperLink)frm.FindControl("HyperLink1") ).Text = "changed text";
-
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-				GHTSubTestAddResult(Repeater1.DataMember);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void Repeater1_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
-		{
-			if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
-				( (HyperLink)e.Item.FindControl("hl_name") ).Text = "hehe";
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx
deleted file mode 100644
index eccdf513dfd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx
+++ /dev/null
@@ -1,84 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_ItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_ItemTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_ItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="72px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<ItemTemplate>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>&nbsp;
-			<br>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<ItemTemplate>
-						plain text
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<ItemTemplate>
-						<b>html</b>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="72px" Width="553px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<ItemTemplate>
-						<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="72px" Width="553px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="72px" Width="553px">
-				<asp:Repeater id="Repeater6" runat="server">
-					<ItemTemplate>
-						<asp:CheckBox runat="server" Text="<%# Container.DataItem %>">
-						</asp:CheckBox>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest7" runat="server" Height="72px" Width="553px">
-				<asp:Repeater id="Repeater7" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-						<%# Container.DataItem %>
-						<%# Container.DataItem %>
-						<%# Container.DataItem %>
-						<%# Container.DataItem %>
-						<%# Container.DataItem %>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx.cs
deleted file mode 100644
index 0fb0d200f0d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_ItemTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.Repeater Repeater6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.Repeater Repeater7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest6;
-			try 
-			{
-				Repeater6.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest7;
-			try 
-			{
-				Repeater7.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("Code base template 1");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater8 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater8);
-				Repeater8.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater8.ItemTemplate = new t_EmptyLitTemplate();
-				Repeater8.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 2");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater9 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater9);
-				Repeater9.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater9.ItemTemplate = new t_PlainTextLitTemplate();
-				Repeater9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 3");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater10 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater10);
-				Repeater10.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater10.ItemTemplate = new t_HtmlLitTemplate();
-				Repeater10.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 4");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater11 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater11);
-				Repeater11.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater11.ItemTemplate = new t_ControlLitTemplate();
-				Repeater11.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 5");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater12 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater12);
-				Repeater12.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater12.ItemTemplate = new t_DBLitTemplate();
-				Repeater12.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx
deleted file mode 100644
index a4e5d2ba081..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_Items.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_Items" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_Items</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="104px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx.cs
deleted file mode 100644
index 9f0746b16e6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_Items
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-				GHTSubTestAddResult(Repeater1.Items.GetType().ToString());
-				foreach (RepeaterItem item in Repeater1.Items)
-					GHTSubTestAddResult(item.ItemIndex + "," + item.ItemType.ToString() + "," + ((DataBoundLiteralControl)item.Controls[0]).Text);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx
deleted file mode 100644
index 0664a3cee4e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx
+++ /dev/null
@@ -1,89 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_SeparatorTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_SeparatorTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_SeparatorTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="104px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<SeparatorTemplate>
-					</SeparatorTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="104px" Width="553px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<SeparatorTemplate>
-						------------------------------------------------------------------------------------
-					</SeparatorTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="104px" Width="553px">
-				<asp:Repeater id="Repeater3" runat="server">
-					<SeparatorTemplate>
-						<hr>
-					</SeparatorTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="104px" Width="553px">
-				<asp:Repeater id="Repeater4" runat="server">
-					<HeaderTemplate>
-						<table border="1">
-					</HeaderTemplate>
-					<FooterTemplate>
-						</table>
-					</FooterTemplate>
-					<SeparatorTemplate>
-						<tr>
-							<td>----separator----</td>
-						</tr>
-					</SeparatorTemplate>
-					<ItemTemplate>
-						<tr>
-							<td><%# Container.DataItem %></td>
-						</tr>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="104px" Width="553px">
-				<asp:Repeater id="Repeater5" runat="server">
-					<SeparatorTemplate>
-						<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-					</SeparatorTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx.cs
deleted file mode 100644
index 339edec345b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_SeparatorTemplate
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Repeater Repeater3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Repeater Repeater4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Repeater Repeater5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest3;
-			try 
-			{
-				Repeater3.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater3.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest4;
-			try 
-			{
-				Repeater4.DataSource = GHTTests.GHDataSources.DSArrayList();;
-				Repeater4.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = GHTSubTest5;
-			try 
-			{
-				Repeater5.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater5.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("Code base template 1");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater6 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater6);
-				Repeater6.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater6.SeparatorTemplate = new t_EmptyLitTemplate();
-				Repeater6.ItemTemplate = new t_DBLitTemplate();
-				Repeater6.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 2");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater7 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater7);
-				Repeater7.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater7.SeparatorTemplate = new t_PlainTextLitTemplate();
-				Repeater7.ItemTemplate = new t_DBLitTemplate();
-				Repeater7.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 3");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater8 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater8);
-				Repeater8.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater8.SeparatorTemplate = new t_HtmlLitTemplate();
-				Repeater8.ItemTemplate = new t_DBLitTemplate();
-				Repeater8.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTSubTestBegin("Code base template 4");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater9 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater9);
-				Repeater9.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater9.SeparatorTemplate = new t_ControlLitTemplate();
-				Repeater9.ItemTemplate = new t_DBLitTemplate();
-				Repeater9.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx
deleted file mode 100644
index 9b00a9b7624..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Repeater_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Repeater_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Repeater_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<ItemTemplate>
-						<div><%#Container.DataItem%></div>
-					</ItemTemplate>
-				</asp:Repeater>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx.cs
deleted file mode 100644
index b9c8f3efa66..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Repeater_ctor_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArray();
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestBegin("Code base constructor 1");
-			try 
-			{
-				System.Web.UI.WebControls.Repeater Repeater2 = new System.Web.UI.WebControls.Repeater();
-				GHTActiveSubTest.Controls.Add(Repeater2);
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.ItemTemplate = new t_DBLitTemplate();
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx
deleted file mode 100644
index 3803a211c70..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RepeaterItem_DataItem.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RepeaterItem_DataItem" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RepeaterItem_DataItem</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Width="553px" Height="88px">
-				<asp:Repeater id="Repeater2" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<div><%# Container.DataItem %></div>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx.cs
deleted file mode 100644
index 772a016da0a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RepeaterItem_DataItem
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Repeater Repeater2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.Repeater1.ItemCreated += new RepeaterItemEventHandler(Repeater1_ItemCreated);
-			this.Repeater2.ItemCreated += new RepeaterItemEventHandler(Repeater2_ItemCreated);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-
-				IEnumerator items = Repeater1.Items.GetEnumerator();
-				System.Web.UI.WebControls.RepeaterItem item;
-
-				while ( items.MoveNext() )
-				{
-					item = (System.Web.UI.WebControls.RepeaterItem)items.Current;
-					GHTSubTestAddResult(item.DataItem.ToString());
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				Repeater2.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater2.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void Repeater1_ItemCreated(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
-		{
-			if (e.Item.ItemIndex >= 0)
-			{
-				e.Item.Controls.Add(new LiteralControl("<div>"));
-				e.Item.Controls.Add(new LiteralControl(e.Item.DataItem.GetType().ToString()));
-				e.Item.Controls.Add(new LiteralControl("</div>"));
-				e.Item.Controls.Add(new LiteralControl("<div>"));
-				e.Item.Controls.Add(new LiteralControl(e.Item.DataItem.ToString()));
-				e.Item.Controls.Add(new LiteralControl("</div>"));
-			}
-		}
-
-		private void Repeater2_ItemCreated(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
-		{
-			if (e.Item.ItemIndex >= 0)
-				e.Item.DataItem = "eee";
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx
deleted file mode 100644
index cda14d2eb6d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RepeaterItem_ItemIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RepeaterItem_ItemIndex" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RepeaterItem_ItemIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>
-			<br>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx.cs
deleted file mode 100644
index a092365bd7e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RepeaterItem_ItemIndex
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-
-				IEnumerator items = Repeater1.Items.GetEnumerator();
-				System.Web.UI.WebControls.RepeaterItem item;
-
-				while ( items.MoveNext() )
-				{
-					item = (RepeaterItem)items.Current;
-					GHTSubTestAddResult(item.ItemIndex.ToString());
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx
deleted file mode 100644
index 1413f1bf533..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RepeaterItem_ItemType.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RepeaterItem_ItemType" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RepeaterItem_ItemType</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="88px" Width="553px">
-				<asp:Repeater id="Repeater1" runat="server">
-					<HeaderTemplate>
-						<div>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<%# Container.DataItem %>
-					</ItemTemplate>
-					<FooterTemplate>
-						</div>
-					</FooterTemplate>
-				</asp:Repeater>
-			</cc1:ghtsubtest>
-			<br>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx.cs
deleted file mode 100644
index b3fd97ce8d3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RepeaterItem_ItemType
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-
-				IEnumerator items = Repeater1.Items.GetEnumerator();
-				System.Web.UI.WebControls.RepeaterItem item;
-
-				while (items.MoveNext())
-				{
-					item = (RepeaterItem)items.Current;
-					GHTSubTestAddResult(item.ItemType.ToString());
-				}
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx
deleted file mode 100644
index faa520be18f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="RepeaterItem_ItemType_Manual.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.RepeaterItem_ItemType_Manual" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>RepeaterItem_ItemType_Manual</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:ghtsubtest id="GHTSubTest1" runat="server" Width="553px" Height="88px">
-					<asp:Repeater id="Repeater1" runat="server">
-						<HeaderTemplate>
-							<div>
-						</HeaderTemplate>
-						<ItemTemplate>
-							<%# Container.DataItem %>
-						</ItemTemplate>
-						<FooterTemplate>
-							</div>
-						</FooterTemplate>
-					</asp:Repeater>
-				</cc1:ghtsubtest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx.cs
deleted file mode 100644
index 0510457d524..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class RepeaterItem_ItemType_Manual
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Repeater Repeater1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.Repeater1.ItemDataBound += new RepeaterItemEventHandler(Repeater1_ItemDataBound);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				Repeater1.DataSource = GHTTests.GHDataSources.DSArrayList();
-				Repeater1.DataBind();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void Repeater1_ItemDataBound(object sender,System.Web.UI.WebControls.RepeaterItemEventArgs e)
-		{
-			if (e.Item.ItemType == ListItemType.AlternatingItem)
-			{
-				e.Item.Controls.Add(new CheckBox());
-				e.Item.Controls.Add(new LiteralControl("<br>"));
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx
deleted file mode 100644
index e9d46a41c39..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx
+++ /dev/null
@@ -1,76 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_BackImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_BackImageUrl" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_BackImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 16px"
-					runat="server" Width="553px" Height="296px">
-					<asp:Table id="Table1" runat="server" Height="176px" Width="360px" BackImageUrl="myImage.jpg">
-						<asp:TableRow>
-							<asp:TableCell>1</asp:TableCell>
-							<asp:TableCell>2</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>3</asp:TableCell>
-							<asp:TableCell>4</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<cc1:GHTSubTest id="Ghtsubtest2" runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table2" runat="server" Height="176px" Width="360px" BackImageUrl="!@##$%$^%^&amp;*(myImage.&amp;^**&amp;jpg">
-					<asp:TableRow>
-						<asp:TableCell>1</asp:TableCell>
-						<asp:TableCell>2</asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>3</asp:TableCell>
-						<asp:TableCell>4</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="Ghtsubtest3" runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table3" runat="server" Height="176px" Width="360px" BackImageUrl="c:\temp\test.jshmeg">
-					<asp:TableRow>
-						<asp:TableCell>1</asp:TableCell>
-						<asp:TableCell>2</asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>3</asp:TableCell>
-						<asp:TableCell>4</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx.cs
deleted file mode 100644
index 82e5c756063..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Table_BackImageUrl
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest Ghtsubtest3;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellPadding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellPadding.aspx
deleted file mode 100644
index c7cdea1a139..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellPadding.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_CellPadding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_CellPadding" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_CellPadding</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="152px" Height="80px">
-				<asp:Table id="Table1" runat="server" Height="88px" Width="232px" CellPadding="5"></asp:Table>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>
-			<br>
-			<br>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="80px" Width="152px">
-				<asp:Table id="Table2" runat="server" Height="88px" Width="232px" CellPadding="99"></asp:Table>
-			</cc1:GHTSubTest></P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellPadding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellPadding.aspx.cs
deleted file mode 100644
index b40054524ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellPadding.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Table_CellPadding
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx
deleted file mode 100644
index 05d6f86a3e7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_CellSpacing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_CellSpacing" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_CellSpacing</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="168px" Height="48px">
-				<asp:Table id="Table1" runat="server" CellSpacing="5"></asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-		<cc1:GHTSubTest id="GHTSubTest2" style="Z-INDEX: 102; LEFT: 120px; POSITION: absolute; TOP: 232px"
-			runat="server" Height="56px" Width="168px">
-			<asp:Table id="Table2" runat="server" Height="147px" Width="410px" CellSpacing="99"></asp:Table>
-		</cc1:GHTSubTest>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx.cs
deleted file mode 100644
index 2eed805adb6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Table_CellSpacing
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_GridLines.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_GridLines.aspx
deleted file mode 100644
index 5a3f25468d7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_GridLines.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_GridLines.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_GridLines" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_GridLines</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="144px" Height="48px">
-			<asp:Table id="Table1" runat="server" GridLines="Horizontal"></asp:Table>
-		</cc1:GHTSubTest>
-		<br>
-		<br>
-		<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="40px" Width="136px">
-			<asp:Table id="Table2" runat="server" GridLines="Vertical"></asp:Table>
-		</cc1:GHTSubTest>
-		<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="40px" Width="136px">
-			<asp:Table id="Table3" runat="server" GridLines="Both"></asp:Table>
-		</cc1:GHTSubTest>
-		<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="40px" Width="144px">
-			<asp:Table id="Table4" runat="server"></asp:Table>
-		</cc1:GHTSubTest>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_GridLines.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_GridLines.aspx.cs
deleted file mode 100644
index 0677e4d0045..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_GridLines.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Table_GridLines
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Table Table4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx
deleted file mode 100644
index fb690fdfd22..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx
+++ /dev/null
@@ -1,51 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_HorizontalAlign" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>&nbsp;
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="200px" Height="112px">
-					<asp:Table id="Table1" runat="server"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="112px" Width="200px">
-					<asp:Table id="Table2" runat="server" HorizontalAlign="Left"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="112px" Width="200px">
-					<asp:Table id="Table3" runat="server" HorizontalAlign="Center"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="112px" Width="200px">
-					<asp:Table id="Table4" runat="server" HorizontalAlign="Right"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="112px" Width="200px">
-					<asp:Table id="Table5" runat="server" HorizontalAlign="Justify"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx.cs
deleted file mode 100644
index e6de16c56da..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Table_HorizontalAlign
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Table Table4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Table Table5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_Rows.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_Rows.aspx
deleted file mode 100644
index 0e8c6ab830a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_Rows.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_Rows.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_Rows" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_Rows</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server">
-					<asp:TableRow></asp:TableRow>
-					<asp:TableRow></asp:TableRow>
-					<asp:TableRow></asp:TableRow>
-					<asp:TableRow></asp:TableRow>
-					<asp:TableRow></asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_Rows.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_Rows.aspx.cs
deleted file mode 100644
index 403a7c01c79..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_Rows.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class Table_Rows
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			base.GHTActiveSubTestId = 2;
-			base.GHTSubTestBegin("Table Rows Collection - Get");
-			try 
-			{
-				base.GHTSubTestAddResult("Table1.Rows.Count=" + Table1.Rows.Count);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_ctor_.aspx
deleted file mode 100644
index 4f8957b2d11..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_ctor_.aspx
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="Table_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.Table_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>Table_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server" Height="48px" Width="128px"></asp:Table>
-				<asp:Table id="Table2" runat="server" Height="120px" Width="312px" CaptionAlign="Bottom" Caption="Caption Text"></asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_ctor_.aspx.cs
deleted file mode 100644
index 8bc81c4e00c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/Table/Table_ctor_.aspx.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class Table_ctor_
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx
deleted file mode 100644
index 0ece828e15f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_ColumnSpan.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_ColumnSpan" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_ColumnSpan</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<p>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="72px">
-					<asp:Table id="Table1" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell ColumnSpan="50">123</asp:TableCell>
-							<asp:TableCell ColumnSpan="12">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell ColumnSpan="30">123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-			</p>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table2" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell ColumnSpan="0">123</asp:TableCell>
-							<asp:TableCell ColumnSpan="0">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table3" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx.cs
deleted file mode 100644
index 2b3a218274d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_ColumnSpan
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx
deleted file mode 100644
index 7d8f11fbc72..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx
+++ /dev/null
@@ -1,87 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_HorizontalAlign" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<p>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="72px">
-					<asp:Table id="Table1" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell HorizontalAlign="NotSet">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-			</p>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table2" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell HorizontalAlign="Left">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table3" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell HorizontalAlign="Center">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table4" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell HorizontalAlign="Right">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table5" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell HorizontalAlign="Justify">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-				<br>
-				<br>
-			</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx.cs
deleted file mode 100644
index eaff591c2a9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_HorizontalAlign
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Table Table4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Table Table5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx
deleted file mode 100644
index 3aedd6d7efc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_RowSpan.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_RowSpan" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_RowSpan</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<p>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="72px">
-					<asp:Table id="Table1" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell RowSpan="50">123</asp:TableCell>
-							<asp:TableCell RowSpan="12">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell RowSpan="30">123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-			</p>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table2" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell RowSpan="0">123</asp:TableCell>
-							<asp:TableCell RowSpan="0">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table3" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx.cs
deleted file mode 100644
index f94bd667e7e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_RowSpan
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx
deleted file mode 100644
index 54dd5c8beb6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_Text" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<p>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="72px">
-					<asp:Table id="Table1" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell>1234569.1233 -995</asp:TableCell>
-							<asp:TableCell>ASMVBKFIRJKSMNDJF DFDFD</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>!@#$%^&*()_+|~</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-			</p>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table2" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell>!@#$%^&*() ASAD			3333_+|~</asp:TableCell>
-							<asp:TableCell RowSpan="0">123 !@#	$%^&	*()_+|gggtgtg */~</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell></asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx.cs
deleted file mode 100644
index ea86a096842..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_Text
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx
deleted file mode 100644
index 46b3ed8fecf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx
+++ /dev/null
@@ -1,75 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_VerticalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_VerticalAlign" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_VerticalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="FlowLayout">
-		<form id="Form1" method="post" runat="server">
-			<p>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="72px">
-					<asp:Table id="Table1" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell VerticalAlign="NotSet">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest>
-			</p>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table2" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell VerticalAlign="Bottom">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table3" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell VerticalAlign="Middle">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="72px" Width="176px">
-					<asp:Table id="Table4" runat="server" Height="120px" Width="248px">
-						<asp:TableRow>
-							<asp:TableCell VerticalAlign="Top">123</asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>123</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx.cs
deleted file mode 100644
index 41345be512f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_VerticalAlign
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Table Table4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx
deleted file mode 100644
index 8a03667f53c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_Wrap.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_Wrap" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_Wrap</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server" Height="200px" Width="48px">
-					<asp:TableRow>
-						<asp:TableCell Wrap="False">*A 123456790123456790123456790123456790123456790123456790123456790123456790*</asp:TableCell>
-						<asp:TableCell Wrap="True">*B 123456790123456790123456790123456790123456790123456790123456790123456790*</asp:TableCell>
-						<asp:TableCell>*C 123456790123456790123456790123456790123456790123456790123456790123456790*</asp:TableCell>
-						<asp:TableCell Wrap="True">*D 123456790				123456790				123456790			123456790*</asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Wrap="True">*D 	123456790	123456790	123456790	123456790*</asp:TableCell>
-						<asp:TableCell Wrap="True">*E  123456790   123456790   123456790   123456790*</asp:TableCell>
-						<asp:TableCell Wrap="False">*F 123456790123456790123456790123456790123456790123456790123456790123456790*</asp:TableCell>
-						<asp:TableCell Wrap="False">*G 123456790123456790123456790123456790123456790123456790123456790123456790*</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx.cs
deleted file mode 100644
index 0381da31421..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_Wrap
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx
deleted file mode 100644
index c63c306edb1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCell_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCell_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCell_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="432px" Height="152px">
-				<asp:Table id="Table1" runat="server" Height="88px" Width="160px">
-					<asp:TableRow>
-						<asp:TableCell>AAAA</asp:TableCell>
-						<asp:TableCell>BBBB</asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>CCCC</asp:TableCell>
-						<asp:TableCell>DDDD</asp:TableCell>
-						<asp:TableCell>1234</asp:TableCell>
-						<asp:TableCell>5678</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx.cs
deleted file mode 100644
index 1203cd06b5b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableCell_ctor_
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddAt_IT.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddAt_IT.aspx
deleted file mode 100644
index dc1f078d140..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddAt_IT.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_AddAt_IT.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_AddAt_IT" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_AddAt_IT</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddAt_IT.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddAt_IT.aspx.cs
deleted file mode 100644
index 7da58ee123b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddAt_IT.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_AddAt_IT
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)(HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-			tbl1.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			try 
-			{
-				base.GHTSubTestBegin("Add cells");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTActiveSubTest.Controls.Add(tbl1);
-
-				//add new cell
-				tbl1.Rows[0].Cells.AddAt(0, new System.Web.UI.WebControls.TableCell());
-				tbl.Rows[0].Cells.AddAt(0, new System.Web.UI.WebControls.TableCell());
-				System.Web.UI.WebControls.TableCell tblCell = new System.Web.UI.WebControls.TableCell();
-				tbl.Rows[0].Cells.AddAt(1, tblCell);
-
-				// add cell from one table to another
-				tbl.Rows[0].Cells.AddAt(1, tbl1.Rows[0].Cells[0]);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx
deleted file mode 100644
index d6d08a43549..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_AddRange_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_AddRange_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_AddRange_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx.cs
deleted file mode 100644
index d814b2facbb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_AddRange_T
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, EventArgs e)
-		{
-			base.GHTTestBegin((HtmlForm) (HtmlForm)this.FindControl("Form1"));
-			Table table1 = new Table();
-			int num3 = 3;
-			TableCell[] cellArray1 = new TableCell[num3 + 1];
-			table1.Rows.Add(new TableRow());
-			int num4 = num3;
-			for (int num2 = 0; num2 <= num4; num2++)
-			{
-				TableCell cell1 = new TableCell();
-				cell1.Text = "[Cell " + num2.ToString() + "]";
-				cellArray1[num2] = cell1;
-			}
-			base.GHTSubTestBegin("AddRange cells");
-			base.GHTActiveSubTest.Controls.Add(table1);
-			table1.Rows[0].Cells.AddRange(cellArray1);
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx
deleted file mode 100644
index a54fea29cb2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_Add_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_Add_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_Add_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx.cs
deleted file mode 100644
index 02847adefbb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_Add_T
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-			tbl1.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			try 
-			{
-				base.GHTSubTestBegin("Add cells");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTActiveSubTest.Controls.Add(tbl1);
-
-				// add new cell
-				tbl1.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-				tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-				System.Web.UI.WebControls.TableCell tblCell = new System.Web.UI.WebControls.TableCell();
-				tbl.Rows[0].Cells.Add(tblCell);
-			
-				// add cell from one table to another
-				tbl.Rows[0].Cells.Add(tbl1.Rows[0].Cells[0]);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx
deleted file mode 100644
index 6b26c7c20b3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_Clear_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_Clear_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_Clear_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx.cs
deleted file mode 100644
index f0402865288..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_Clear_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[1].Cells[0].Text = "333";
-			tbl.Rows[1].Cells[1].Text = "444";
-
-			try 
-			{
-				base.GHTSubTestBegin("Clear cells");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows[0].Cells.Clear();
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx
deleted file mode 100644
index 79e47089215..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_CopyTo_AI.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_CopyTo_AI" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_CopyTo_AI</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx.cs
deleted file mode 100644
index d914a0a098c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_CopyTo_AI
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[1].Cells[0].Text = "333";
-			tbl.Rows[1].Cells[1].Text = "444";
-
-			TableCell[] arrCells = new TableCell[5];
-
-
-			try 
-			{
-				base.GHTSubTestBegin("Copy to");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows[0].Cells.CopyTo(arrCells, 1);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-			tbl1.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			try 
-			{
-				base.GHTSubTestBegin("Copy to - check array");
-				base.GHTActiveSubTest.Controls.Add(tbl1);
-				tbl1.Rows[0].Cells.Add( (System.Web.UI.WebControls.TableCell)arrCells[1] );
-				tbl1.Rows[0].Cells.Add( (System.Web.UI.WebControls.TableCell)arrCells[2] );
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx
deleted file mode 100644
index c636bcd11f1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_Count.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_Count" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_Count</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx.cs
deleted file mode 100644
index b7bb481731e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_Count
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			//Put user code to initialize the page here
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-
-		
-			try 
-			{
-				base.GHTSubTestBegin("Count");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTSubTestAddResult("Rows(0).Cells.Count=" + tbl.Rows[0].Cells.Count.ToString());
-				base.GHTSubTestAddResult("Rows(1).Cells.Count=" + tbl.Rows[1].Cells.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx
deleted file mode 100644
index dbeb07b344b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_GetCellIndex_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_GetCellIndex_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_GetCellIndex_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx.cs
deleted file mode 100644
index 7a81f1485ae..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_GetCellIndex_T
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[1].Cells[0].Text = "333";
-			tbl.Rows[1].Cells[1].Text = "444";
-
-			System.Web.UI.WebControls.TableCell tblCell = new System.Web.UI.WebControls.TableCell();
-			try 
-			{
-				base.GHTSubTestBegin("GetCellIndex");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTSubTestAddResult("GetCellIndex=" + tbl.Rows[0].Cells.GetCellIndex(tblCell));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			tbl.Rows[0].Cells.Add(tblCell);
-			try 
-			{
-				base.GHTSubTestBegin("GetCellIndex");
-				base.GHTSubTestAddResult("GetCellIndex=" + tbl.Rows[0].Cells.GetCellIndex(tblCell));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx
deleted file mode 100644
index a64a25f5fe8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_GetEnumerator_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_GetEnumerator_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_GetEnumerator_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx.cs
deleted file mode 100644
index 0b11fb140d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_GetEnumerator_
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[0].Cells[2].Text = "333";
-			tbl.Rows[0].Cells[3].Text = "444";
-
-			System.Collections.IEnumerator Ienm = tbl.Rows[0].Cells.GetEnumerator();
-
-			System.Web.UI.WebControls.TableCell tblCell = new System.Web.UI.WebControls.TableCell();
-			try 
-			{
-				base.GHTSubTestBegin("IEnumerator - get");
-				base.GHTSubTestAddResult("IEnumerator=null? " + ((Ienm == null) ? "True" : "False"));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			try 
-			{
-				base.GHTSubTestBegin("Using IEnumerator");
-				while ( Ienm.MoveNext() )
-				{
-					base.GHTSubTestAddResult(" CellText = " + ((System.Web.UI.WebControls.TableCell)(Ienm.Current)).Text);
-				}
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx
deleted file mode 100644
index 802e879e97c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_IsReadOnly.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_IsReadOnly" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_IsReadOnly</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server" Height="64px" Width="72px">
-					<asp:TableRow>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx.cs
deleted file mode 100644
index 17f16d89048..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_IsReadOnly
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			try 
-			{
-				base.GHTSubTestBegin("IsReadOnly");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-				base.GHTSubTestAddResult("IsReadOnly=" + Table1.Rows[0].Cells.IsReadOnly.ToString());
-				base.GHTSubTestAddResult("This property always returns false to indicate that the TableCellCollection can be written to in all cases.");
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx
deleted file mode 100644
index 1ddb9ce6050..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_IsSynchronized.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_IsSynchronized" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_IsSynchronized</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server">
-					<asp:TableRow>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx.cs
deleted file mode 100644
index e3eac0bc05c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_IsSynchronized
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			try 
-			{
-				base.GHTSubTestBegin("IsSynchronized");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-				base.GHTSubTestAddResult("IsSynchronized=" + Table1.Rows[0].Cells.IsSynchronized.ToString());
-				base.GHTSubTestAddResult("This property is derived from System.Collections.ICollection and is overridden to always return false.");
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx
deleted file mode 100644
index 81c7d324162..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_Item.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_Item" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_Item</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx.cs
deleted file mode 100644
index 5ea42947367..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_Item
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[0].Cells[2].Text = "333";
-			tbl.Rows[0].Cells[3].Text = "444";
-
-     
-
-			try 
-			{
-				base.GHTSubTestBegin("Item");
-				for (int i = 0; i < tbl.Rows[0].Cells.Count; i++)
-					base.GHTSubTestAddResult(" CellText " + i.ToString() + "= " + tbl.Rows[0].Cells[i].Text);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx
deleted file mode 100644
index 9e1fdef37a7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_RemoveAt_I.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_RemoveAt_I" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_RemoveAt_I</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx.cs
deleted file mode 100644
index 30c31fa2f3d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_RemoveAt_I
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[0].Cells[2].Text = "333";
-			tbl.Rows[0].Cells[3].Text = "444";
-
-
-			try 
-			{
-				base.GHTSubTestBegin("RemoveAt");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows[0].Cells.RemoveAt(1);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx
deleted file mode 100644
index 9d4e859b094..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_Remove_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_Remove_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_Remove_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx.cs
deleted file mode 100644
index 155bcb8cb64..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_Remove_T
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[0].Cells[2].Text = "333";
-			tbl.Rows[0].Cells[3].Text = "444";
-
-   
-			try 
-			{
-				base.GHTSubTestBegin("Remove");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows[0].Cells.Remove(tbl.Rows[0].Cells[1]);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx
deleted file mode 100644
index 677896dd915..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableCellCollection_SyncRoot.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableCellCollection_SyncRoot" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableCellCollection_SyncRoot</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx.cs
deleted file mode 100644
index 8d1e1e55705..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableCellCollection_SyncRoot
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			//add new cell
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[0].Cells[2].Text = "333";
-			tbl.Rows[0].Cells[3].Text = "444";
-
-			try 
-			{
-				base.GHTSubTestBegin("Check SyncRoot, should be true");
-				GHTSubTestAddResult(ReferenceEquals(tbl.Rows[0].Cells.SyncRoot, tbl.Rows[0].Cells).ToString());
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx
deleted file mode 100644
index 0118ffede27..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableHeaderCell_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableHeaderCell_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableHeaderCell_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server" Height="152px" Width="184px">
-					<asp:TableRow>
-						<asp:TableCell Text="123"></asp:TableCell>
-						<asp:TableCell Text="123"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="123"></asp:TableCell>
-						<asp:TableCell Text="123"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx.cs
deleted file mode 100644
index fc02dfd83f7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableHeaderCell_ctor_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			try 
-			{
-				base.GHTSubTestBegin("TableHeaderCell");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-
-				// Create a header for the table.
-				System.Web.UI.WebControls.TableHeaderCell header = new System.Web.UI.WebControls.TableHeaderCell();
-				header.Text = "Table of (x,y) Values";
-
-				// Add the header row to the table.
-				Table1.Rows.AddAt(0, new TableRow());
-				Table1.Rows[0].Cells.Add(header);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx
deleted file mode 100644
index 6c393ed441c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_CopyFrom_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_CopyFrom_S" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_CopyFrom_S.aspx</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form2" method="post" runat="server">
-			<P><asp:table id="Table2" runat="server" Width="256px" Height="120px">
-					<asp:TableRow Width="100%" BorderWidth="8px" BorderColor="#804040" HorizontalAlign="Left" ForeColor="Olive">
-						<asp:TableCell BorderStyle="Double" BorderWidth="4px" VerticalAlign="Bottom" BackColor="#C0FFC0"
-							ForeColor="Blue" Height="50px" RowSpan="9" ColumnSpan="9" Font-Size="16pt" Font-Overline="True"
-							Font-Underline="True" Font-Names="FreesiaUPC" Font-Italic="True" Font-Bold="True" Font-Strikeout="True"
-							HorizontalAlign="Left" Wrap="False" BorderColor="#FF3333" Text="aaaaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow VerticalAlign="Middle" BorderWidth="7px" BorderColor="#00C000" BorderStyle="Solid"
-						HorizontalAlign="Center" ForeColor="#FF8000" BackColor="#C0C0FF" Font-Size="15pt" Font-Overline="True"
-						Font-Underline="True" Font-Names="Comic Sans MS" Font-Italic="True" Font-Bold="True" Font-Strikeout="True">
-						<asp:TableCell BackColor="#00C0C0" ForeColor="Purple" BorderColor="Silver" Text="aaaaaa"></asp:TableCell>
-						<asp:TableCell BorderStyle="Dashed" BorderWidth="4px" BackColor="#FFFF80" ForeColor="#FFE0C0" Text="aaaaaa"></asp:TableCell>
-						<asp:TableCell BorderStyle="Ridge" BorderWidth="7px" BackColor="#C0C0FF" ForeColor="Yellow" Text="aaaaaa"></asp:TableCell>
-					</asp:TableRow>
-				</asp:table></P>
-			<P><br>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Width="536px" Height="200px">
-					<asp:table id="Table1" runat="server" Height="152px" Width="304px">
-						<asp:TableRow>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaaaaa"></asp:TableCell>
-						</asp:TableRow>
-					</asp:table>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx.cs
deleted file mode 100644
index 90f79bd81c9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_CopyFrom_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table2;
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableItemStyle tableStyle = new System.Web.UI.WebControls.TableItemStyle();
-			tableStyle.CopyFrom(Table2.Rows[0].Cells[0].ControlStyle);
-			Table1.Rows[0].Cells[0].ApplyStyle(tableStyle);
-
-			tableStyle.CopyFrom(Table2.Rows[1].ControlStyle);
-			Table1.Rows[1].ApplyStyle(tableStyle);
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx
deleted file mode 100644
index 4acf6407d85..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_HorizontalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<asp:Table id="Table1" runat="server" Height="232px" Width="776px">
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-		</asp:Table>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx.cs
deleted file mode 100644
index b0c92c1767d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_HorizontalAlign
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableItemStyle myStyle = new System.Web.UI.WebControls.TableItemStyle();
-				try 
-				{
-					base.GHTSubTestBegin("TableItemStyle - HorizontalAlign");
-					base.GHTActiveSubTest.Controls.Add(Table1);
-
-					myStyle.HorizontalAlign = HorizontalAlign.Center;
-					base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-					Table1.Rows[0].Cells[0].ApplyStyle(myStyle);
-					Table1.Rows[0].ApplyStyle(myStyle);
-
-					myStyle.HorizontalAlign = HorizontalAlign.Justify;
-					base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-					Table1.Rows[0].Cells[1].ApplyStyle(myStyle);
-					Table1.Rows[1].ApplyStyle(myStyle);
-
-					myStyle.HorizontalAlign = HorizontalAlign.Left;
-					base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-					Table1.Rows[0].Cells[2].ApplyStyle(myStyle);
-					Table1.Rows[2].ApplyStyle(myStyle);
-
-					myStyle.HorizontalAlign = HorizontalAlign.NotSet;
-					base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-					Table1.Rows[0].Cells[3].ApplyStyle(myStyle);
-					Table1.Rows[3].ApplyStyle(myStyle);
-
-					myStyle.HorizontalAlign = HorizontalAlign.Right;
-					base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-					Table1.Rows[0].Cells[4].ApplyStyle(myStyle);
-					Table1.Rows[4].ApplyStyle(myStyle);
-				}
-				catch (Exception ex) 
-				{
-					base.GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx
deleted file mode 100644
index 3c89454b5a6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_MergeWith_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_MergeWith_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_MergeWith_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<asp:Table id="Table1" runat="server" Height="144px" Width="272px">
-			<asp:TableRow BorderStyle="Double" ForeColor="#804000" BackColor="#C0C0FF">
-				<asp:TableCell Text="11111111"></asp:TableCell>
-				<asp:TableCell BorderStyle="Dotted" BorderWidth="12px" VerticalAlign="Top" BackColor="#C0C000"
-					ForeColor="Blue" RowSpan="2" ColumnSpan="3" Font-Size="12pt" Font-Overline="True" Font-Underline="True"
-					Font-Names="Batang" Font-Italic="True" Font-Bold="True" Font-Strikeout="True" HorizontalAlign="Center"
-					Wrap="False" Text="blablo"></asp:TableCell>
-				<asp:TableCell Text="222222"></asp:TableCell>
-				<asp:TableCell Text="33333333"></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow BorderStyle="Ridge" ForeColor="#104040" BackColor="#C0AAFF">
-				<asp:TableCell Text="11111111"></asp:TableCell>
-				<asp:TableCell BorderStyle="Dotted" BackColor="#C0C000" ForeColor="Blue" HorizontalAlign="Center"
-					Text="blablo"></asp:TableCell>
-				<asp:TableCell Text="222222"></asp:TableCell>
-				<asp:TableCell Text="33333333"></asp:TableCell>
-			</asp:TableRow>
-		</asp:Table>
-		<P>&nbsp;</P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="553px" Height="184px">
-				<asp:Table id="Table2" Width="192px" Height="96px" runat="server">
-					<asp:TableRow ForeColor="Gray" Font-Italic="True" Font-Bold="True">
-						<asp:TableCell Text="1111"></asp:TableCell>
-						<asp:TableCell BorderStyle="Ridge" BorderWidth="5px" Font-Size="9pt" Font-Bold="True" BorderColor="#804000"
-							Text="22222"></asp:TableCell>
-						<asp:TableCell Text="33333"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="66666"></asp:TableCell>
-						<asp:TableCell VerticalAlign="Top" ForeColor="Red" HorizontalAlign="Justify" Text="7777"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest><BR>
-			<BR>
-		</P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx.cs
deleted file mode 100644
index 7ad5f3e8ace..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_MergeWith_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected System.Web.UI.WebControls.Table Table2;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableItemStyle myStyle;
-
-			// cell
-			myStyle = (TableItemStyle)Table2.Rows[0].Cells[1].ControlStyle;
-			myStyle.MergeWith(Table1.Rows[0].Cells[1].ControlStyle);
-			Table2.Rows[0].Cells[1].ApplyStyle(myStyle);
-
-			// row
-			myStyle = (TableItemStyle)Table2.Rows[1].ControlStyle;
-			myStyle.MergeWith(Table1.Rows[1].ControlStyle);
-			Table2.Rows[1].ApplyStyle(myStyle);
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx
deleted file mode 100644
index 2174a7eb0ff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_Reset_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_Reset_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_Reset_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="208px">
-				<P>&nbsp;</P>
-				<asp:Table id="Table1" runat="server" Height="128px" Width="272px">
-					<asp:TableRow BorderWidth="16px" VerticalAlign=Middle  BackColor="#FFEFC0" ForeColor="#A0FFCF">
-						<asp:TableCell BorderStyle="Ridge" Font-Overline="True" BorderWidth="2px" VerticalAlign="Middle"
-							BackColor="#FFE0C0" ForeColor="#C0FFC0" Font-Italic="True" Font-Bold="True" HorizontalAlign="Left"
-							BorderColor="#C00000" Text="blablabla"></asp:TableCell>
-						<asp:TableCell BorderWidth="6px" VerticalAlign="Bottom" BackColor="#FFE0C0" ForeColor="#A0FFC0"
-							Font-Bold="True" HorizontalAlign="Left" BorderColor="#C00600" Text="blablabla"></asp:TableCell>
-						<asp:TableCell BorderWidth="1px" VerticalAlign="Top" BackColor="#FFE0C0" ForeColor="#C0FFC0" Font-Italic="True"
-							BorderStyle="Dotted" HorizontalAlign="Left" BorderColor="#C70000" Text="blablabla"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow BorderWidth="6px" VerticalAlign="Bottom" BackColor="#EEE0C0" ForeColor="#AFFF55"
-							Font-Bold="True" HorizontalAlign="Left" BorderColor="#C00600">
-							<asp:TableCell  Text="blablabla"></asp:TableCell>
-						<asp:TableCell Text="blablabla"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<P>
-			<br>
-			&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx.cs
deleted file mode 100644
index a7ca6502952..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_Reset_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableItemStyle myStyle;
-
-			myStyle = (TableItemStyle)Table1.Rows[0].Cells[0].ControlStyle;
-			myStyle.Reset();
-			Table1.Rows[0].Cells[0].ApplyStyle(myStyle);
-
-			myStyle = (TableItemStyle)Table1.Rows[1].ControlStyle;
-			myStyle.Reset();
-			Table1.Rows[1].ApplyStyle(myStyle);
-			Table1.Rows[0].Cells[2].ControlStyle.Reset();
-			base.GHTTestEnd();
-		}
-	}
-}
-
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx
deleted file mode 100644
index 8e1188e5f93..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_VerticalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_VerticalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_VerticalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:Table id="Table1" runat="server" Height="232px" Width="776px">
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>																								
-			</asp:Table>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx.cs
deleted file mode 100644
index 8080d004469..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_VerticalAlign
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableItemStyle myStyle = new System.Web.UI.WebControls.TableItemStyle();
-				try 
-				{
-					base.GHTSubTestBegin("TableItemStyle - VerticalAlign");
-					base.GHTActiveSubTest.Controls.Add(Table1);
-
-					myStyle.VerticalAlign = VerticalAlign.Bottom;
-					base.GHTSubTestAddResult(myStyle.VerticalAlign.ToString());
-					Table1.Rows[0].Cells[0].ApplyStyle(myStyle);
-					Table1.Rows[0].ApplyStyle(myStyle);
-
-					myStyle.VerticalAlign = VerticalAlign.Middle;
-					base.GHTSubTestAddResult(myStyle.VerticalAlign.ToString());
-					Table1.Rows[0].Cells[1].ApplyStyle(myStyle);
-					Table1.Rows[1].ApplyStyle(myStyle);
-
-					myStyle.VerticalAlign = VerticalAlign.NotSet;
-					base.GHTSubTestAddResult(myStyle.VerticalAlign.ToString());
-					Table1.Rows[0].Cells[2].ApplyStyle(myStyle);
-					Table1.Rows[2].ApplyStyle(myStyle);
-
-					myStyle.VerticalAlign = VerticalAlign.Top;
-					base.GHTSubTestAddResult(myStyle.VerticalAlign.ToString());
-					Table1.Rows[0].Cells[3].ApplyStyle(myStyle);
-					Table1.Rows[3].ApplyStyle(myStyle);
-				}
-				catch (Exception ex) 
-				{
-					base.GHTSubTestUnexpectedExceptionCaught(ex);
-				}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx
deleted file mode 100644
index f763d0d150e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_Wrap.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_Wrap" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_Wrap</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:Table id="Table1" runat="server" Height="232px" Width="776px">
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell></asp:TableCell>
-					<asp:TableCell></asp:TableCell>
-				</asp:TableRow>
-			</asp:Table>&nbsp;</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx.cs
deleted file mode 100644
index 4e3ac51b60c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_Wrap
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableItemStyle myStyle = new System.Web.UI.WebControls.TableItemStyle();
-			try 
-			{
-				base.GHTSubTestBegin("TableItemStyle - Wrap");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-
-				myStyle.Wrap = false;
-				base.GHTSubTestAddResult(myStyle.Wrap.ToString());
-				Table1.Rows[0].Cells[0].ApplyStyle(myStyle);
-				Table1.Rows[0].ApplyStyle(myStyle);
-
-				myStyle.Wrap = true;
-				base.GHTSubTestAddResult(myStyle.Wrap.ToString());
-				Table1.Rows[0].Cells[1].ApplyStyle(myStyle);
-				Table1.Rows[1].ApplyStyle(myStyle);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx
deleted file mode 100644
index 74eaf7f1dae..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx.cs
deleted file mode 100644
index fcfbe4af343..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_ctor_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			try 
-			{
-				base.GHTSubTestBegin("TableItemStyle_ctor");
-				System.Web.UI.WebControls.TableItemStyle myStyle;
-				myStyle = new System.Web.UI.WebControls.TableItemStyle();
-
-				base.GHTSubTestAddResult("is (object = null)? " + ((myStyle == null) ? "True" : "False"));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx
deleted file mode 100644
index 427448353d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableItemStyle_ctor_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableItemStyle_ctor_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableItemStyle_ctor_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx.cs
deleted file mode 100644
index 89ac62f7e8b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableItemStyle_ctor_S
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			// System.Web.UI.StateBag
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			try 
-			{
-				base.GHTSubTestBegin("TableItemStyle_ctor_S");
-				System.Web.UI.WebControls.TableItemStyle myStyle;
-				myStyle = new System.Web.UI.WebControls.TableItemStyle(new System.Web.UI.StateBag(true));
-
-				base.GHTSubTestAddResult("is (object = null)? " + ((myStyle == null) ? "True" : "False"));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx
deleted file mode 100644
index 6e1f7e4d1f3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRow_Cells.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRow_Cells" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRow_Cells</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<asp:Table id="Table1" runat="server" Height="168px" Width="352px">
-			<asp:TableRow></asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell Text="12"></asp:TableCell>
-				<asp:TableCell Text="34"></asp:TableCell>
-				<asp:TableCell Text="56"></asp:TableCell>
-			</asp:TableRow>
-		</asp:Table>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx.cs
deleted file mode 100644
index 4b603ca96c6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRow_Cells
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			try 
-			{
-				base.GHTSubTestBegin("TableRow - Cells Collection");
-				base.GHTSubTestAddResult("TableRow 0 Cells Collection = nothing" + ((Table1.Rows[0].Cells == null) ? "true" : "False"));
-				base.GHTSubTestAddResult("TableRow 1 Cells Collection = nothing" + ((Table1.Rows[0].Cells == null) ? "true" : "False"));
-				base.GHTSubTestAddResult("TableRow 1 Cells Collection Count =" + Table1.Rows[1].Cells.Count);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx
deleted file mode 100644
index 46aebe9cae7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRow_CreateControlCollection_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRow_CreateControlCollection_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRow_CreateControlCollection_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx.cs
deleted file mode 100644
index 350615e729b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableRow_CreateControlCollection_
-    : GHTBaseWeb {
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx
deleted file mode 100644
index 3ca7b288e52..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRow_CreateControlStyle_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRow_CreateControlStyle_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRow_CreateControlStyle_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx.cs
deleted file mode 100644
index a1170ef4dcc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableRow_CreateControlStyle_
-    : GHTBaseWeb {
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx
deleted file mode 100644
index ffd9f2f7bd2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx
+++ /dev/null
@@ -1,75 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRow_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRow_HorizontalAlign" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRow_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="128px" Height="56px">
-				<asp:Table id="Table1" runat="server" Height="40px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="111"></asp:TableCell>
-						<asp:TableCell Text="222"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<P>
-			<br>
-			<br>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="128px">
-				<asp:Table id="Table2" runat="server" Height="40px" Width="88px">
-					<asp:TableRow HorizontalAlign="Left">
-						<asp:TableCell Text="111"></asp:TableCell>
-						<asp:TableCell Text="222"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="128px">
-				<asp:Table id="Table3" runat="server" Height="40px" Width="88px">
-					<asp:TableRow HorizontalAlign="Center">
-						<asp:TableCell Text="111"></asp:TableCell>
-						<asp:TableCell Text="222"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="128px">
-				<asp:Table id="Table4" runat="server" Height="40px" Width="88px">
-					<asp:TableRow HorizontalAlign="Right">
-						<asp:TableCell Text="111"></asp:TableCell>
-						<asp:TableCell Text="222"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="56px" Width="128px">
-				<asp:Table id="Table5" runat="server" Height="40px" Width="88px">
-					<asp:TableRow HorizontalAlign="Justify">
-						<asp:TableCell Text="111"></asp:TableCell>
-						<asp:TableCell Text="222"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx.cs
deleted file mode 100644
index 98366f1052d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableRow_HorizontalAlign
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
- 	protected System.Web.UI.WebControls.Table Table4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Table Table5;
- 	protected GHTWebControls.GHTSubTest GHTSubTest5;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx
deleted file mode 100644
index 17b5f002375..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx
+++ /dev/null
@@ -1,67 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRow_VerticalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRow_VerticalAlign" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRow_VerticalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="56px" Width="128px">
-					<asp:Table id="Table4" runat="server" Width="88px" Height="40px">
-						<asp:TableRow>
-							<asp:TableCell Text="111"></asp:TableCell>
-							<asp:TableCell Text="222"></asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="56px" Width="128px">
-					<asp:Table id="Table1" runat="server" Width="88px" Height="40px">
-						<asp:TableRow VerticalAlign="Top">
-							<asp:TableCell Text="111"></asp:TableCell>
-							<asp:TableCell Text="222"></asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="56px" Width="128px">
-					<asp:Table id="Table2" runat="server" Width="88px" Height="40px">
-						<asp:TableRow VerticalAlign="Middle">
-							<asp:TableCell Text="111"></asp:TableCell>
-							<asp:TableCell Text="222"></asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="56px" Width="128px">
-					<asp:Table id="Table3" runat="server" Width="88px" Height="40px">
-						<asp:TableRow VerticalAlign="Bottom">
-							<asp:TableCell Text="111"></asp:TableCell>
-							<asp:TableCell Text="222"></asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>&nbsp;</P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx.cs
deleted file mode 100644
index 7ed005b7590..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableRow_VerticalAlign
-    : GHTBaseWeb {
- 	protected System.Web.UI.WebControls.Table Table4;
- 	protected GHTWebControls.GHTSubTest GHTSubTest4;
- 	protected System.Web.UI.WebControls.Table Table1;
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table2;
- 	protected GHTWebControls.GHTSubTest GHTSubTest2;
- 	protected System.Web.UI.WebControls.Table Table3;
- 	protected GHTWebControls.GHTSubTest GHTSubTest3;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx
deleted file mode 100644
index b4799739d83..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRow_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRow_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRow_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body MS_POSITIONING="GridLayout">
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<asp:Table id="Table1" style="Z-INDEX: 102; LEFT: 24px; POSITION: absolute; TOP: 24px" runat="server"
-			Height="88px" Width="160px">
-			<asp:TableRow>
-				<asp:TableCell>AAAA</asp:TableCell>
-				<asp:TableCell>BBBB</asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell>CCCC</asp:TableCell>
-				<asp:TableCell>DDDD</asp:TableCell>
-				<asp:TableCell>1234</asp:TableCell>
-				<asp:TableCell>5678</asp:TableCell>
-			</asp:TableRow>
-		</asp:Table>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx.cs
deleted file mode 100644
index c96f5cc1cf9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class TableRow_ctor_
-    : GHTBaseWeb {
- 	protected GHTWebControls.GHTSubTest GHTSubTest1;
- 	protected System.Web.UI.WebControls.Table Table1;
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-
-	 }
-	 #endregion
-
-    private void Page_Load(object sender, System.EventArgs e) {
-        //Put user code to initialize the page here
-
-    }
-}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx
deleted file mode 100644
index b6105652671..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_AddAt_IT.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_AddAt_IT" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_AddAt_IT</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx.cs
deleted file mode 100644
index 7e434acc9ee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_AddAt_IT
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-			tbl1.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			try 
-			{
-				base.GHTSubTestBegin("AddAt rows");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTActiveSubTest.Controls.Add(tbl1);
-
-				// add new cell
-				tbl1.Rows.AddAt(0, new System.Web.UI.WebControls.TableRow());
-				tbl.Rows.AddAt(0, new System.Web.UI.WebControls.TableRow());
-				System.Web.UI.WebControls.TableRow tblRow = new System.Web.UI.WebControls.TableRow();
-				tbl.Rows.AddAt(1, tblRow);
-
-				// add cell from one table to another
-				tbl.Rows.AddAt(1, tbl1.Rows[0]);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx
deleted file mode 100644
index 3050f1af0e0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_AddRange_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_AddRange_T" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_AddRange_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx.cs
deleted file mode 100644
index 29b365d7bf6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_AddRange_T
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.Table myTable = new System.Web.UI.WebControls.Table();
-			int numRows = 4;
-			// Create 3 rows, each containing 2 cells.
-			System.Web.UI.WebControls.TableRow [] arrayOfTableRows = new System.Web.UI.WebControls.TableRow[numRows];
-
-			for (int j = 0; j<numRows; j++)
-			{
-				System.Web.UI.WebControls.TableRow myTableRow = new System.Web.UI.WebControls.TableRow();
-				myTableRow.Cells.Add(new System.Web.UI.WebControls.TableCell());
-				myTableRow.Cells[0].Text = "Row " + j.ToString();
-				arrayOfTableRows[j] = myTableRow;
-			}
-
-			try 
-			{
-				base.GHTSubTestBegin("AddRange Rows");
-				base.GHTActiveSubTest.Controls.Add(myTable);
-				myTable.Rows.AddRange(arrayOfTableRows);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx
deleted file mode 100644
index c4ae84a0e8a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_Add_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_Add_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_Add_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx.cs
deleted file mode 100644
index 3b4538df986..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_Add_T
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-
-			try 
-			{
-				base.GHTSubTestBegin("Add rows");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTActiveSubTest.Controls.Add(tbl1);
-
-				//add new row
-				tbl1.Rows.Add(new System.Web.UI.WebControls.TableRow());
-				tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-				System.Web.UI.WebControls.TableRow tblRow = new System.Web.UI.WebControls.TableRow();
-				tbl.Rows.Add(tblRow);
-				//add row from one table to another
-				tbl.Rows.Add(tbl1.Rows[0]);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx
deleted file mode 100644
index e57a48dbfac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_Clear_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_Clear_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_Clear_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx.cs
deleted file mode 100644
index 977330e42da..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_Clear_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			// add new rows
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[1].Cells[0].Text = "333";
-			tbl.Rows[1].Cells[1].Text = "444";
-
-			try 
-			{
-				base.GHTSubTestBegin("Clear rows");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows.Clear();
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx
deleted file mode 100644
index 6cf05bfef90..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_CopyTo_AI.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_CopyTo_AI" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_CopyTo_AI</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx.cs
deleted file mode 100644
index bb43e9e3156..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_CopyTo_AI
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			// add new rows/cells
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[1].Cells.Add(new System.Web.UI.WebControls.TableCell());
-			tbl.Rows[0].Cells[0].Text = "111";
-			tbl.Rows[0].Cells[1].Text = "222";
-			tbl.Rows[1].Cells[0].Text = "333";
-			tbl.Rows[1].Cells[1].Text = "444";
-
-			System.Web.UI.WebControls.TableRow [] arrRows = new System.Web.UI.WebControls.TableRow[4];
-
-			try 
-			{
-				base.GHTSubTestBegin("Copy to");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows.CopyTo(arrRows, 1);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-			try 
-			{
-				base.GHTSubTestBegin("Copy to - check array");
-				base.GHTActiveSubTest.Controls.Add(tbl1);
-				tbl1.Rows.Add( (System.Web.UI.WebControls.TableRow)arrRows[1] );
-				tbl1.Rows.Add( (System.Web.UI.WebControls.TableRow)arrRows[2] );
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx
deleted file mode 100644
index 7b810bbaab7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_Count.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_Count" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_Count</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx.cs
deleted file mode 100644
index 571aaae59b4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_Count
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			System.Web.UI.WebControls.Table tbl1 = new System.Web.UI.WebControls.Table();
-
-			try 
-			{
-				base.GHTSubTestBegin("Count");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTSubTestAddResult("Table1 Rows.Count=" + tbl.Rows.Count.ToString());
-				base.GHTSubTestAddResult("Table2 Rows.Count=" + tbl1.Rows.Count.ToString());
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx
deleted file mode 100644
index 0c5f718fcf2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_GetEnumerator_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_GetEnumerator_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_GetEnumerator_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx.cs
deleted file mode 100644
index b89fc3f0c2c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_GetEnumerator_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-
-
-			System.Collections.IEnumerator Ienm = tbl.Rows.GetEnumerator();
-
-			try 
-			{
-				base.GHTSubTestBegin("IEnumerator - get");
-				base.GHTSubTestAddResult("IEnumerator=null? " + ((Ienm == null) ? "True" : "False"));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			try 
-			{
-				base.GHTSubTestBegin("Using IEnumerator");
-				while ( Ienm.MoveNext() )
-					base.GHTSubTestAddResult(" RowId = " + ((System.Web.UI.WebControls.TableRow)Ienm.Current).ID);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx
deleted file mode 100644
index ce8615ba9be..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_GetRowIndex_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_GetRowIndex_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_GetRowIndex_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx.cs
deleted file mode 100644
index 14a6c2aff2b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_GetRowIndex_T
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-
-			System.Web.UI.WebControls.TableRow tblRow = new System.Web.UI.WebControls.TableRow();
-			try 
-			{
-				base.GHTSubTestBegin("GetRowIndex");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				base.GHTSubTestAddResult("GetRowIndex=" + tbl.Rows.GetRowIndex(tblRow));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			tbl.Rows.Add(tblRow);
-			try 
-			{
-				base.GHTSubTestBegin("GetRowIndex");
-				base.GHTSubTestAddResult("GetRowIndex=" + tbl.Rows.GetRowIndex(tblRow));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx
deleted file mode 100644
index e30f5e57826..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_IsReadOnly.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_IsReadOnly" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_IsReadOnly</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="216px" Width="440px">
-				<asp:Table id="Table1" runat="server" Height="184px" Width="264px"></asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx.cs
deleted file mode 100644
index d5c01a81c3e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_IsReadOnly
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			try 
-			{
-				base.GHTSubTestBegin("IsReadOnly");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-				base.GHTSubTestAddResult("IsReadOnly=" + Table1.Rows.IsReadOnly.ToString());
-				base.GHTSubTestAddResult("This property always returns false to indicate that the TableRowCollection can be written to in all cases");
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx
deleted file mode 100644
index 8c1cdc9f456..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_IsSynchronized.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_IsSynchronized" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_IsSynchronized</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server" Height="240px" Width="416px"></asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx.cs
deleted file mode 100644
index 64e6d1d41fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_IsSynchronized
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			try 
-			{
-				base.GHTSubTestBegin("IsSynchronized");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-				base.GHTSubTestAddResult("IsSynchronized=" + Table1.Rows.IsSynchronized.ToString());
-				base.GHTSubTestAddResult("This property is derived from System.Collections.ICollection and is overridden to always return false.");
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx
deleted file mode 100644
index 12f7fce5f7a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_Item.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_Item" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_Item</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px"></cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx.cs
deleted file mode 100644
index 5c2d0979bd7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_Item
-		: GHTBaseWeb 
-	{
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-
-			try 
-			{
-				base.GHTSubTestBegin("Item");
-				for (int i=0; i<tbl.Rows.Count; i++ )
-					base.GHTSubTestAddResult(" Row index =  " + i.ToString());
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx
deleted file mode 100644
index 1acb6470d54..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_RemoveAt_I.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_RemoveAt_I" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_RemoveAt_I</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx.cs
deleted file mode 100644
index e19e7d2b233..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_RemoveAt_I
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-
-			try 
-			{
-				base.GHTSubTestBegin("RemoveAt");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows.RemoveAt(0);
-				tbl.Rows.RemoveAt(3);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx
deleted file mode 100644
index 4e552ea8713..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_Remove_T.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_Remove_T" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_Remove_T</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx.cs
deleted file mode 100644
index a5945637cee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_Remove_T
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows[tbl.Rows.Count - 1].ID = tbl.Rows.Count.ToString();
-
-
-			try 
-			{
-				base.GHTSubTestBegin("Remove");
-				base.GHTActiveSubTest.Controls.Add(tbl);
-				tbl.Rows.Remove(tbl.Rows[1]);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx
deleted file mode 100644
index ffa43a92a84..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableRowCollection_SyncRoot.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableRowCollection_SyncRoot" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableRowCollection_SyncRoot</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx.cs
deleted file mode 100644
index 2c89690762b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableRowCollection_SyncRoot
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-
-			System.Web.UI.WebControls.Table tbl = new System.Web.UI.WebControls.Table();
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			tbl.Rows.Add(new System.Web.UI.WebControls.TableRow());
-			try 
-			{
-				base.GHTSubTestBegin("Check SyncRoot, should be true");
-				GHTSubTestAddResult(ReferenceEquals(tbl.Rows.SyncRoot, tbl.Rows).ToString());
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx
deleted file mode 100644
index b0d2a815d9f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_BackImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_BackImageUrl" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_BackImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="553px" Height="296px">
-				<asp:Table id="Table1" runat="server" Height="200px" Width="288px"></asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx.cs
deleted file mode 100644
index bcd8472e05f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_BackImageUrl
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle myStyle = new System.Web.UI.WebControls.TableStyle();
-			try 
-			{
-				base.GHTSubTestBegin("TableStyle - BackImageUrl");
-				base.GHTActiveSubTest.Controls.Add(Table1);
-
-				myStyle.BackImageUrl = "c:\\NoSuchImage.blabla";
-				base.GHTSubTestAddResult(myStyle.BackImageUrl.ToString());
-				Table1.ApplyStyle(myStyle);
-			}
-
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx
deleted file mode 100644
index 27e245d94f3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx
+++ /dev/null
@@ -1,78 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_CellPadding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_CellPadding" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_CellPadding</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="144px" Width="176px">
-					<asp:Table id="Table1" runat="server" Height="56px" Width="88px">
-						<asp:TableRow>
-							<asp:TableCell Text="aaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaa"></asp:TableCell>
-							<asp:TableCell Text="aaaa"></asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>bbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="144px" Width="176px">
-					<asp:Table id="Table2" runat="server" Height="56px" Width="88px">
-						<asp:TableRow>
-							<asp:TableCell Text="aaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaa"></asp:TableCell>
-							<asp:TableCell Text="aaaa"></asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>bbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="144px" Width="176px">
-					<asp:Table id="Table3" runat="server" Height="56px" Width="88px">
-						<asp:TableRow>
-							<asp:TableCell Text="aaaaa"></asp:TableCell>
-							<asp:TableCell Text="aaa"></asp:TableCell>
-							<asp:TableCell Text="aaaa"></asp:TableCell>
-						</asp:TableRow>
-						<asp:TableRow>
-							<asp:TableCell>bbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-							<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-						</asp:TableRow>
-					</asp:Table>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx.cs
deleted file mode 100644
index abca3522c91..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_CellPadding
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Table Table2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Table Table3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-				System.Web.UI.WebControls.TableStyle myStyle = new System.Web.UI.WebControls.TableStyle();
-			try 
-			{
-				base.GHTActiveSubTest = GHTSubTest1;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table1.ApplyStyle(myStyle);
-
-				myStyle.CellPadding = 0;
-				base.GHTActiveSubTest = GHTSubTest2;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table2.ApplyStyle(myStyle);
-
-				myStyle.CellPadding = 9;
-				base.GHTActiveSubTest = GHTSubTest3;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table3.ApplyStyle(myStyle);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx
deleted file mode 100644
index dab1a599e06..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx
+++ /dev/null
@@ -1,77 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_CellSpacing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_CellSpacing" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_CellSpacing</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="144px" Width="176px">
-				<asp:Table id="Table1" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<P>&nbsp;</P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="144px" Width="176px">
-				<asp:Table id="Table2" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<br>
-			<br>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="144px" Width="176px">
-				<asp:Table id="Table3" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx.cs
deleted file mode 100644
index aa793ee1806..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_CellSpacing
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Table Table2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Table Table3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle myStyle = new System.Web.UI.WebControls.TableStyle();
-			try 
-			{
-				base.GHTActiveSubTest = GHTSubTest1;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table1.ApplyStyle(myStyle);
-
-				myStyle.CellSpacing = 0;
-				base.GHTActiveSubTest = GHTSubTest2;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table2.ApplyStyle(myStyle);
-
-				myStyle.CellSpacing = 9;
-				base.GHTActiveSubTest = GHTSubTest3;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table3.ApplyStyle(myStyle);
-			}
-
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx
deleted file mode 100644
index 193d7f883db..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx
+++ /dev/null
@@ -1,64 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_CopyFrom_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_CopyFrom_S" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_CopyFrom_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-		<br>
-		<br>
-		<asp:table id="Table2" runat="server" Height="120px" Width="256px" HorizontalAlign="Right"
-			Font-Bold="True" Font-Italic="True" CellPadding="5" CellSpacing="8" BorderStyle="Groove"
-			BorderColor="#C0FFFF" BackColor="#FFFF80" Font-Names="Symbol" Font-Overline="True" Font-Size="17pt"
-			Font-Strikeout="True" Font-Underline="True" ForeColor="#C04000" GridLines="Both" BorderWidth="7px"
-			BackImageUrl="http://yadayada.kada.com">
-			<asp:TableRow Width="100%" BorderWidth="8px" BorderColor="#804040" HorizontalAlign="Left" ForeColor="Olive">
-				<asp:TableCell BorderStyle="Double" BorderColor="#FF3333" Text="aaaaaa"></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow VerticalAlign="Middle" BorderWidth="7px" BorderColor="#00C000" BorderStyle="Solid"
-				HorizontalAlign="Center">
-				<asp:TableCell BackColor="#00C0C0" ForeColor="Purple" BorderColor="Silver" Text="aaaaaa"></asp:TableCell>
-				<asp:TableCell BorderStyle="Dashed" BorderWidth="4px" BackColor="#FFFF80" ForeColor="#FFE0C0" Text="aaaaaa"></asp:TableCell>
-				<asp:TableCell BorderStyle="Ridge" BorderWidth="7px" BackColor="#C0C0FF" ForeColor="Yellow" Text="aaaaaa"></asp:TableCell>
-			</asp:TableRow>
-		</asp:table>
-		<P></P>
-		<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="200px" Width="536px">
-			<asp:table id="Table1" runat="server" Width="304px" Height="152px">
-				<asp:TableRow>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-				</asp:TableRow>
-				<asp:TableRow>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-					<asp:TableCell Text="aaaaaa"></asp:TableCell>
-				</asp:TableRow>
-			</asp:table>
-		</cc1:GHTSubTest>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx.cs
deleted file mode 100644
index ab6592c35b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_CopyFrom_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table2;
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle tableStyle = new System.Web.UI.WebControls.TableStyle();
-			tableStyle.CopyFrom(Table2.ControlStyle);
-			Table1.ApplyStyle(tableStyle);
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx
deleted file mode 100644
index afd5789dba0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_GridLines.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_GridLines" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_GridLines</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="176px" Height="144px">
-				<asp:Table id="Table1" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>&nbsp;
-		</form>
-		<P>
-			<br>
-			<br>
-			&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="144px" Width="176px">
-				<asp:Table id="Table2" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="144px" Width="176px">
-				<asp:Table id="Table3" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-		<P>
-			<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="144px" Width="176px">
-				<asp:Table id="Table4" runat="server" Height="56px" Width="88px">
-					<asp:TableRow>
-						<asp:TableCell Text="aaaaa"></asp:TableCell>
-						<asp:TableCell Text="aaa"></asp:TableCell>
-						<asp:TableCell Text="aaaa"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell>bbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbb</asp:TableCell>
-						<asp:TableCell>bbbbbbbbbbbb</asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></P>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx.cs
deleted file mode 100644
index b08234240ec..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_GridLines
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Table Table2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Table Table3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Table Table4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle myStyle = new System.Web.UI.WebControls.TableStyle();
-			try 
-			{
-
-				myStyle.GridLines = GridLines.None;
-				base.GHTActiveSubTest = GHTSubTest1;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table1.ApplyStyle(myStyle);
-
-				myStyle.GridLines = GridLines.Both;
-				base.GHTActiveSubTest = GHTSubTest2;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table2.ApplyStyle(myStyle);
-
-				myStyle.GridLines = GridLines.Horizontal;
-				base.GHTActiveSubTest = GHTSubTest3;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table3.ApplyStyle(myStyle);
-
-				myStyle.GridLines = GridLines.Vertical;
-				base.GHTActiveSubTest = GHTSubTest4;
-				base.GHTSubTestAddResult(myStyle.GridLines.ToString());
-				Table4.ApplyStyle(myStyle);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx
deleted file mode 100644
index a1744b24258..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_HorizontalAlign" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Height="120px" Width="296px">
-					<asp:Table id="Table1" runat="server" Width="160px" Height="96px"></asp:Table>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="120px" Width="296px">
-					<asp:Table id="Table2" runat="server" Width="160px" Height="96px"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="120px" Width="296px">
-					<asp:Table id="Table3" runat="server" Width="160px" Height="96px"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="120px" Width="296px">
-					<asp:Table id="Table4" runat="server" Width="160px" Height="96px"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="120px" Width="296px">
-					<asp:Table id="Table5" runat="server" Width="160px" Height="96px"></asp:Table>
-				</cc1:GHTSubTest></P>
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx.cs
deleted file mode 100644
index b9962072efd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_HorizontalAlign
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Table Table2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.Table Table3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.Table Table4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.Table Table5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle myStyle = new System.Web.UI.WebControls.TableStyle();
-			try 
-			{
-				myStyle.HorizontalAlign = HorizontalAlign.Center;
-				base.GHTActiveSubTest = GHTSubTest1;
-				base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-				Table1.ApplyStyle(myStyle);
-
-				myStyle.HorizontalAlign = HorizontalAlign.Justify;
-				base.GHTActiveSubTest = GHTSubTest2;
-				base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-				Table2.ApplyStyle(myStyle);
-
-				myStyle.HorizontalAlign = HorizontalAlign.Left;
-				base.GHTActiveSubTest = GHTSubTest3;
-				base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-				Table3.ApplyStyle(myStyle);
-
-				myStyle.HorizontalAlign = HorizontalAlign.NotSet;
-				base.GHTActiveSubTest = GHTSubTest4;
-				base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-				Table4.ApplyStyle(myStyle);
-
-				myStyle.HorizontalAlign = HorizontalAlign.Right;
-				base.GHTActiveSubTest = GHTSubTest5;
-				base.GHTSubTestAddResult(myStyle.HorizontalAlign.ToString());
-				Table5.ApplyStyle(myStyle);
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx
deleted file mode 100644
index 3b5444329f7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx
+++ /dev/null
@@ -1,75 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_MergeWith_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_MergeWith_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_MergeWith_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 112px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="457px" Height="160px">
-				<asp:Table id="Table1" runat="server" GridLines="Horizontal" BorderWidth="5px" BorderColor="Green"
-					BackColor="#C0C0FF">
-					<asp:TableRow>
-						<asp:TableCell Text="qqqqqq"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell Text="qqqq"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell Text="qqq"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell Text="qqqq"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow></asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>&nbsp;</P>
-		<P>
-			<br>
-			<br>
-			&nbsp;</P>
-		<asp:Table id="Table2" runat="server" BackColor="#FFFF80" BorderColor="#FF8080" BorderWidth="10px"
-			BorderStyle="Dotted" CellPadding="5" CellSpacing="5" Font-Bold="True" Font-Overline="True"
-			ForeColor="Purple" GridLines="Vertical" Font-Names="Aharoni" Font-Size="18pt">
-			<asp:TableRow>
-				<asp:TableCell Text="qqqqqq"></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell Text="qqqq"></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell Text="qqq"></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow>
-				<asp:TableCell></asp:TableCell>
-				<asp:TableCell Text="qqqq"></asp:TableCell>
-				<asp:TableCell></asp:TableCell>
-			</asp:TableRow>
-			<asp:TableRow></asp:TableRow>
-		</asp:Table>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx.cs
deleted file mode 100644
index 6c618d18f49..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_MergeWith_S
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.Table Table2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle myStyle = new TableStyle();
-
-			myStyle = (TableStyle)Table1.ControlStyle;
-			myStyle.MergeWith(Table2.ControlStyle);
-			Table1.ApplyStyle(myStyle);
-
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx
deleted file mode 100644
index 78fb5ccd164..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_Reset_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_Reset_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_Reset_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest1" style="Z-INDEX: 100; LEFT: 16px; POSITION: absolute; TOP: 15px"
-				runat="server" Width="488px" Height="232px">
-				<asp:Table id="Table1" runat="server" Height="128px" Width="200px" BackColor="#FFFFC0" BorderColor="Navy"
-					BorderStyle="Inset" BorderWidth="9px" CellPadding="8" CellSpacing="4" HorizontalAlign="Center"
-					GridLines="Both">
-					<asp:TableRow>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell Text="5555"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell Text="5555"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-						<asp:TableCell Text="5555"></asp:TableCell>
-						<asp:TableCell></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx.cs
deleted file mode 100644
index 42da6c561d5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_Reset_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			System.Web.UI.WebControls.TableStyle myStyle = new TableStyle();
-
-			myStyle = (TableStyle)Table1.ControlStyle;
-			myStyle.Reset();
-			Table1.Rows[0].Cells[0].ApplyStyle(myStyle);
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx
deleted file mode 100644
index 7ffc1b55f4e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_ctor_" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx.cs
deleted file mode 100644
index 660fd8c09be..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_ctor_
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			try 
-			{
-				base.GHTSubTestBegin("TableStyle_ctor");
-				System.Web.UI.WebControls.TableStyle myStyle = new System.Web.UI.WebControls.TableStyle();
-
-				base.GHTSubTestAddResult("is (object = null)? " + ((myStyle == null) ? "True" : "False"));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx
deleted file mode 100644
index 6a34ab38989..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TableStyle_ctor_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TableStyle_ctor_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TableStyle_ctor_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx.cs
deleted file mode 100644
index 950fa71deaa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TableStyle_ctor_S
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-			base.GHTTestBegin((HtmlForm)this.FindControl("Form1"));
-			try 
-			{
-				base.GHTSubTestBegin("TableStyle_ctor_S");
-				System.Web.UI.WebControls.TableStyle myStyle;
-				myStyle = new System.Web.UI.WebControls.TableStyle(new System.Web.UI.StateBag(true));
-
-				base.GHTSubTestAddResult("is (object = null)? " + ((myStyle == null) ? "True" : "False"));
-			}
-			catch (Exception ex) 
-			{
-				base.GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			base.GHTSubTestEnd();
-			base.GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx
deleted file mode 100644
index 80ec2a886c0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx
+++ /dev/null
@@ -1,76 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TemplateColumn_EditItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TemplateColumn_EditItemTemplate" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TemplateColumn_EditItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-							<EditItemTemplate>
-							</EditItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-							<EditItemTemplate>
-								Plain text
-							</EditItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-							<EditItemTemplate>
-								<b><i>HTML Template</i></b>
-							</EditItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-							<EditItemTemplate>
-								<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-							</EditItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-							<EditItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</EditItemTemplate>
-						</asp:TemplateColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx.cs
deleted file mode 100644
index 5dbaa400967..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TemplateColumn_EditItemTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.TemplateColumn c1 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c2 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c3 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c4 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c5 = new System.Web.UI.WebControls.TemplateColumn();
-
-				c1.ItemTemplate = new t_DBLitTemplate();
-				c2.ItemTemplate = new t_DBLitTemplate();
-				c3.ItemTemplate = new t_DBLitTemplate();
-				c4.ItemTemplate = new t_DBLitTemplate();
-				c5.ItemTemplate = new t_DBLitTemplate();
-
-				c1.EditItemTemplate = new t_EmptyLitTemplate();
-				c2.EditItemTemplate = new t_PlainTextLitTemplate();
-				c3.EditItemTemplate = new t_HtmlLitTemplate();
-				c4.EditItemTemplate = new t_ControlLitTemplate();
-				c5.EditItemTemplate = new t_DBLitTemplate();
-
-				DataGrid1.Columns.Add(c1);
-				DataGrid1.Columns.Add(c2);
-				DataGrid1.Columns.Add(c3);
-				DataGrid1.Columns.Add(c4);
-				DataGrid1.Columns.Add(c5);
-
-				DataGrid1.EditItemIndex = 2;
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.EditItemIndex = 2;
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx
deleted file mode 100644
index 07d9a9ac90e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx
+++ /dev/null
@@ -1,59 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TemplateColumn_FooterTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TemplateColumn_FooterTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TemplateColumn_FooterTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:TemplateColumn>
-							<FooterTemplate>
-							</FooterTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<FooterTemplate>
-								Plain text
-							</FooterTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<FooterTemplate>
-								<b><i>HTML Template</i></b>
-							</FooterTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<FooterTemplate>
-								<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-							</FooterTemplate>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-						</asp:TemplateColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx.cs
deleted file mode 100644
index 36dba41db56..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TemplateColumn_FooterTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal literal1 = (Literal) sender;
-				DataGridItem item1 = (DataGridItem) literal1.NamingContainer;
-				literal1.Text = DataBinder.Eval(item1.DataItem, "Name") + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton button1 = new HtmlInputButton();
-				button1.Value = "Control template";
-				container.Controls.Add(button1);
-			}
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.TemplateColumn c1 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c2 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c3 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c4 = new System.Web.UI.WebControls.TemplateColumn();
-
-
-				c1.FooterTemplate = new t_EmptyLitTemplate();
-				c2.FooterTemplate = new t_PlainTextLitTemplate();
-				c3.FooterTemplate = new t_HtmlLitTemplate();
-				c4.FooterTemplate = new t_ControlLitTemplate();
-				c4.ItemTemplate = new t_DBLitTemplate();
-
-				DataGrid1.Columns.Add(c1);
-				DataGrid1.Columns.Add(c2);
-				DataGrid1.Columns.Add(c3);
-				DataGrid1.Columns.Add(c4);
-				DataGrid1.ShowFooter = true;
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.ShowFooter = true;
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx
deleted file mode 100644
index 65d37313382..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx
+++ /dev/null
@@ -1,59 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TemplateColumn_HeaderTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TemplateColumn_HeaderTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TemplateColumn_HeaderTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:TemplateColumn>
-							<HeaderTemplate>
-							</HeaderTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<HeaderTemplate>
-								Plain text
-							</HeaderTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<HeaderTemplate>
-								<b><i>HTML Template</i></b>
-							</HeaderTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<HeaderTemplate>
-								<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-							</HeaderTemplate>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-						</asp:TemplateColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx.cs
deleted file mode 100644
index a5227f54cf0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TemplateColumn_HeaderTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.TemplateColumn c1 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c2 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c3 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c4 = new System.Web.UI.WebControls.TemplateColumn();
-
-				c1.HeaderTemplate = new t_EmptyLitTemplate();
-				c2.HeaderTemplate = new t_PlainTextLitTemplate();
-				c3.HeaderTemplate = new t_HtmlLitTemplate();
-				c4.HeaderTemplate = new t_ControlLitTemplate();
-				c4.ItemTemplate = new t_DBLitTemplate();
-
-				DataGrid1.Columns.Add(c1);
-				DataGrid1.Columns.Add(c2);
-				DataGrid1.Columns.Add(c3);
-				DataGrid1.Columns.Add(c4);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx
deleted file mode 100644
index cd5c4fcaa4c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TemplateColumn_InitializeCell_TIL.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TemplateColumn_InitializeCell_TIL" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TemplateColumn_InitializeCell_TIL</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx.cs
deleted file mode 100644
index 1ff01528abe..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TemplateColumn_InitializeCell_TIL
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.DataGrid1.ItemDataBound += new DataGridItemEventHandler(DataGrid1_ItemDataBound);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				RepeaterItem container;
-				container = (RepeaterItem)lc.NamingContainer;
-				lc.Text = container.DataItem + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.TemplateColumn c1 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c2 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c3 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c4 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c5 = new System.Web.UI.WebControls.TemplateColumn();
-
-				c1.ItemTemplate = new t_EmptyLitTemplate();
-				c2.ItemTemplate = new t_PlainTextLitTemplate();
-				c3.ItemTemplate = new t_HtmlLitTemplate();
-				c4.ItemTemplate = new t_ControlLitTemplate();
-				c5.ItemTemplate = new t_DBLitTemplate();
-
-				c1.HeaderTemplate = new t_EmptyLitTemplate();
-				c2.HeaderTemplate = new t_PlainTextLitTemplate();
-				c3.HeaderTemplate = new t_HtmlLitTemplate();
-				c4.HeaderTemplate = new t_ControlLitTemplate();
-				c5.HeaderTemplate = new t_ControlLitTemplate();
-
-				DataGrid1.Columns.Add(c1);
-				DataGrid1.Columns.Add(c2);
-				DataGrid1.Columns.Add(c3);
-				DataGrid1.Columns.Add(c4);
-				DataGrid1.Columns.Add(c5);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-
-		private void DataGrid1_ItemDataBound(object sender, DataGridItemEventArgs e)
-		{
-			ListItemType type1 = e.Item.ItemType;
-			if (((type1 != ListItemType.Header) && (type1 != ListItemType.Footer)) && (type1 != ListItemType.Separator))
-			{
-				TableCell cell1 = (TableCell) e.Item.Controls[1];
-				this.DataGrid1.Columns[1].InitializeCell(cell1, 1, ListItemType.Item);
-				cell1.Attributes.Add("Index", e.Item.ItemIndex.ToString());
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx
deleted file mode 100644
index 50ec7ace244..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TemplateColumn_ItemTemplate.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TemplateColumn_ItemTemplate" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TemplateColumn_ItemTemplate</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False"></asp:DataGrid>
-			</cc1:ghtsubtest>
-			<cc1:ghtsubtest id="Ghtsubtest2" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid2" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-							</ItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								Plain text
-							</ItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<b><i>HTML Template</i></b>
-							</ItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<asp:Button Width="100px" Runat="server" Text="Server control template" ID="Button1"></asp:Button>
-							</ItemTemplate>
-						</asp:TemplateColumn>
-						<asp:TemplateColumn>
-							<ItemTemplate>
-								<%# DataBinder.Eval(Container.DataItem, "Name") %>
-							</ItemTemplate>
-						</asp:TemplateColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx.cs
deleted file mode 100644
index e2c3bf2ecf7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TemplateColumn_ItemTemplate
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest Ghtsubtest2;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		#region "Template Classes"
-		public class t_DBLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div>";
-				l.DataBinding += new EventHandler(this.BindData);
-				container.Controls.Add(l);
-			}
-
-			public void BindData(object sender, EventArgs e)
-			{
-				Literal lc = (Literal)sender;
-				DataGridItem container;
-				container = (DataGridItem)lc.NamingContainer;
-				lc.Text = DataBinder.Eval(container.DataItem, "Name") + "</div>";
-			}
-
-		}
-		public class t_EmptyLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_PlainTextLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "Plain text template create at run time";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_HtmlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				Literal l = new Literal();
-				l.Text = "<div><b><i>Html template created at run time</i></b></div>";
-				container.Controls.Add(l);
-			}
-
-		}
-		public class t_ControlLitTemplate : ITemplate
-		{
-			public void InstantiateIn(Control container)
-			{
-				HtmlInputButton l = new HtmlInputButton();
-				l.Value = "Control template";
-				container.Controls.Add(l);
-			}
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				System.Web.UI.WebControls.TemplateColumn c1 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c2 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c3 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c4 = new System.Web.UI.WebControls.TemplateColumn();
-				System.Web.UI.WebControls.TemplateColumn c5 = new System.Web.UI.WebControls.TemplateColumn();
-
-				c1.ItemTemplate = new t_EmptyLitTemplate();
-				c2.ItemTemplate = new t_PlainTextLitTemplate();
-				c3.ItemTemplate = new t_HtmlLitTemplate();
-				c4.ItemTemplate = new t_ControlLitTemplate();
-				c5.ItemTemplate = new t_DBLitTemplate();
-
-				DataGrid1.Columns.Add(c1);
-				DataGrid1.Columns.Add(c2);
-				DataGrid1.Columns.Add(c3);
-				DataGrid1.Columns.Add(c4);
-				DataGrid1.Columns.Add(c5);
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTActiveSubTest = Ghtsubtest2;
-			try 
-			{
-				DataGrid2.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid2.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx
deleted file mode 100644
index a01d41534f9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TemplateColumn_ctor_.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TemplateColumn_ctor_" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TemplateColumn_ctor_</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:ghtsubtest id="GHTSubTest1" runat="server" Height="120px" Width="553px">
-				<asp:DataGrid id="DataGrid1" runat="server" AutoGenerateColumns="False">
-					<Columns>
-						<asp:BoundColumn DataField="ID"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Name"></asp:BoundColumn>
-						<asp:BoundColumn DataField="Company"></asp:BoundColumn>
-						<asp:TemplateColumn>
-							<HeaderTemplate>
-								<b>T1</b>
-							</HeaderTemplate>
-							<ItemTemplate>
-								item
-							</ItemTemplate>
-						</asp:TemplateColumn>
-					</Columns>
-				</asp:DataGrid>
-			</cc1:ghtsubtest>&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx.cs
deleted file mode 100644
index 428e114e879..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Data;
-using System.Collections;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TemplateColumn_ctor_
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-			System.Web.UI.HtmlControls.HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			GHTActiveSubTest = GHTSubTest1;
-			try 
-			{
-				DataGrid1.DataSource = GHTTests.GHDataSources.DSDataTable();
-				DataGrid1.DataBind();;
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx
deleted file mode 100644
index 0d7ef7b035e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextAlign_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextAlign_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>TextAlign_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx.cs
deleted file mode 100644
index 3a10613fcd7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextAlign_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.TextAlign");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(TextAlign));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(TextAlign));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx
deleted file mode 100644
index 297d8b660a6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_AutoPostBack.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_AutoPostBack" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_AutoPostBack</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="40px">
-					<asp:TextBox id="TextBox1" runat="server"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="40px" Width="176px">
-					<asp:TextBox id="TextBox2" runat="server" AutoPostBack="True"></asp:TextBox>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="40px" Width="176px">
-					<asp:TextBox id="TextBox3" runat="server" AutoPostBack="False"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx.cs
deleted file mode 100644
index e151234aa60..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_AutoPostBack
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx
deleted file mode 100644
index 2553176acc5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_Columns.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_Columns" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_Columns</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="168px" Height="32px">
-					<asp:TextBox id="TextBox1" runat="server"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox2" runat="server" Columns="1"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox3" runat="server" Columns="10"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox4" runat="server" Columns="100"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>&nbsp;</P>
-		</form>
-		<br>
-		<br>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx.cs
deleted file mode 100644
index a9bde706131..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_Columns
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.TextBox TextBox4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// Negative columns value - Shoud throw an exception:
-			GHTSubTestBegin("Negative columns value");
-			try 
-			{
-				System.Web.UI.WebControls.TextBox tb = new System.Web.UI.WebControls.TextBox();
-				tb.Columns = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx
deleted file mode 100644
index ab3d81389df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx
+++ /dev/null
@@ -1,68 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_MaxLength.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_MaxLength" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_MaxLength</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="168px" Height="32px">
-					<asp:TextBox id="TextBox1" runat="server"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox2" runat="server" MaxLength="1"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox3" runat="server" MaxLength="100"></asp:TextBox>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<br>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox6" runat="server" TextMode="Password"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox5" runat="server" MaxLength="1" TextMode="Password"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox4" runat="server" MaxLength="100" TextMode="Password"></asp:TextBox>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<BR>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest9" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox9" runat="server" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest8" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox8" runat="server" MaxLength="1" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest7" runat="server" Height="32px" Width="168px">
-					<asp:TextBox id="TextBox7" runat="server" MaxLength="100" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest>&nbsp;</P>
-		</form>
-		<BR>
-		<BR>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx.cs
deleted file mode 100644
index d0c1b659da6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_MaxLength
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.TextBox TextBox6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.TextBox TextBox5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.TextBox TextBox4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.TextBox TextBox9;
-		protected GHTWebControls.GHTSubTest GHTSubTest9;
-		protected System.Web.UI.WebControls.TextBox TextBox8;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		protected System.Web.UI.WebControls.TextBox TextBox7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)this.FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// Negative Maxlenght value - Shoud throw an exception:
-			GHTSubTestBegin("Negative MaxLength value");
-			try 
-			{
-				System.Web.UI.WebControls.TextBox tb = new System.Web.UI.WebControls.TextBox();
-				tb.MaxLength = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx
deleted file mode 100644
index 13c8e9dcd14..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_ReadOnly.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_ReadOnly" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_ReadOnly</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" runat="server" method="post">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="184px" Height="40px">
-					<asp:TextBox id="TextBox1" runat="server"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="40px" Width="184px">
-					<asp:TextBox id="TextBox2" runat="server" ReadOnly="True"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="40px" Width="184px">
-					<asp:TextBox id="TextBox3" runat="server" ReadOnly="False"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx.cs
deleted file mode 100644
index 5cf6f4bb838..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_ReadOnly
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx
deleted file mode 100644
index e43b0a517b8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_Rows.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_Rows" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_Rows</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="72px">
-					<asp:TextBox id="TextBox1" runat="server" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="32px" Width="176px">
-					<asp:TextBox id="TextBox2" runat="server" TextMode="MultiLine" Rows="1"></asp:TextBox>
-				</cc1:GHTSubTest>&nbsp;</P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="72px" Width="176px">
-					<asp:TextBox id="TextBox3" runat="server" TextMode="MultiLine" Rows="10"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="72px" Width="176px">
-					<asp:TextBox id="TextBox4" runat="server" Rows="5"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="72px" Width="176px">
-					<asp:TextBox id="TextBox5" runat="server" TextMode="Password" Rows="5"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx.cs
deleted file mode 100644
index 3e42af0391f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_Rows
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.TextBox TextBox4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.TextBox TextBox5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-
-			// Negative Rows value:
-			GHTSubTestBegin("Negative Rows value");
-			try 
-			{
-				System.Web.UI.WebControls.TextBox tb = new System.Web.UI.WebControls.TextBox();
-				//tb.TextMode = TextBoxMode.MultiLine
-				tb.Rows = -1;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx
deleted file mode 100644
index d60ad975b53..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_Text.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_Text" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_Text</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="288px" Height="32px">
-					<asp:TextBox id="TextBox1" runat="server" Height="24px" Width="280px">  abcdefgh ijklmnopqr  stuvwxyz    </asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="32px" Width="288px">
-					<asp:TextBox id="TextBox2" runat="server" Height="24px" Width="280px">1234567890</asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="32px" Width="288px">
-					<asp:TextBox id="TextBox3" runat="server" Height="24px" Width="280px">`~!@#$%^%&amp;*()_+-=[]\{}|;':&quot;,./&lt;&gt;?</asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="32px" Width="288px">
-					<asp:TextBox id="TextBox4" runat="server" Height="24px" Width="280px"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="32px" Width="288px">
-					<asp:TextBox id="TextBox5" runat="server" Height="24px" Width="280px"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="96px" Width="152px">
-					<asp:TextBox id="TextBox6" runat="server" Height="72px" Width="136px" TextMode="MultiLine">asdfasdfasdfadfadsfasdfasdfasdfasdfasdfasdf</asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest7" runat="server" Height="96px" Width="152px">
-					<asp:TextBox id="TextBox7" runat="server" Height="72px" Width="136px" TextMode="MultiLine" Wrap="False">asdfasdfasdfadfadsfasdfasdfasdfasdfasdfasdf</asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest8" runat="server" Height="42px" Width="152px">
-					<asp:TextBox id="TextBox8" runat="server" Height="26px" Width="136px" TextMode="Password" Wrap="False">abcdefg&amp;*</asp:TextBox>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx.cs
deleted file mode 100644
index eb0f3e365e7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_Text
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.TextBox TextBox4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		protected System.Web.UI.WebControls.TextBox TextBox5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.TextBox TextBox6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.TextBox TextBox7;
-		protected GHTWebControls.GHTSubTest GHTSubTest7;
-		protected System.Web.UI.WebControls.TextBox TextBox8;
-		protected GHTWebControls.GHTSubTest GHTSubTest8;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx
deleted file mode 100644
index 06b32e87d49..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_TextMode.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_TextMode" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_TextMode</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="32px">
-					<asp:TextBox id="TextBox1" runat="server" TextMode="SingleLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="80px" Width="176px">
-					<asp:TextBox id="TextBox2" runat="server" Height="72px" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="32px" Width="176px">
-					<asp:TextBox id="TextBox3" runat="server" TextMode="Password"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="32px" Width="176px">
-					<asp:TextBox id="TextBox4" runat="server"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx.cs
deleted file mode 100644
index 4130e75cea8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_TextMode
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.TextBox TextBox4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-      
-			// Non valid TextMode value
-			GHTSubTestBegin("Non valid TextMode value");
-			try 
-			{
-				throw new InvalidCastException();
-				//System.Web.UI.WebControls.TextBox tb = new System.Web.UI.WebControls.TextBox();
-				//tb.TextMode = "Non valid value";
-				//GHTSubTestExpectedExceptionNotCaught("InvalidCastException");
-			}
-			catch (InvalidCastException ex) 
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-
-			GHTTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx
deleted file mode 100644
index 3f54584e442..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx
+++ /dev/null
@@ -1,53 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBox_Wrap.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBox_Wrap" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>TextBox_Wrap</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest1" runat="server" Width="176px" Height="40px">
-					<asp:TextBox id="TextBox1" runat="server"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest2" runat="server" Height="40px" Width="176px">
-					<asp:TextBox id="TextBox2" runat="server" Wrap="False"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest6" runat="server" Height="40px" Width="176px">
-					<asp:TextBox id="TextBox6" runat="server" TextMode="Password"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest5" runat="server" Height="40px" Width="176px">
-					<asp:TextBox id="TextBox5" runat="server" Wrap="False" TextMode="Password"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest3" runat="server" Height="88px" Width="176px">
-					<asp:TextBox id="TextBox3" runat="server" Height="72px" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-			<P>
-				<cc1:GHTSubTest id="GHTSubTest4" runat="server" Height="88px" Width="176px">
-					<asp:TextBox id="TextBox4" runat="server" Height="72px" Wrap="False" TextMode="MultiLine"></asp:TextBox>
-				</cc1:GHTSubTest></P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx.cs
deleted file mode 100644
index e1ffc218fa7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBox_Wrap
-		: GHTBaseWeb 
-	{
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest1;
-		protected System.Web.UI.WebControls.TextBox TextBox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest2;
-		protected System.Web.UI.WebControls.TextBox TextBox6;
-		protected GHTWebControls.GHTSubTest GHTSubTest6;
-		protected System.Web.UI.WebControls.TextBox TextBox5;
-		protected GHTWebControls.GHTSubTest GHTSubTest5;
-		protected System.Web.UI.WebControls.TextBox TextBox3;
-		protected GHTWebControls.GHTSubTest GHTSubTest3;
-		protected System.Web.UI.WebControls.TextBox TextBox4;
-		protected GHTWebControls.GHTSubTest GHTSubTest4;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			//Put user code to initialize the page here
-
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx
deleted file mode 100644
index 87bfffd702b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TextBoxMode_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TextBoxMode_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>TextBoxMode_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx.cs
deleted file mode 100644
index 88ffffc2db5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TextBoxMode_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.TextBoxMode");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(TextBoxMode));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(TextBoxMode));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx
deleted file mode 100644
index 36f90cdd442..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="TitleFormat_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.TitleFormat_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>TitleFormat_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx.cs
deleted file mode 100644
index e7e354fbdc0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class TitleFormat_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.TitleFormat");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(TitleFormat));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(TitleFormat));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx
deleted file mode 100644
index cbd45711af4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="UnitType_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.UnitType_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>UnitType_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx.cs
deleted file mode 100644
index 8e552d0824c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class UnitType_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.UnitType");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(UnitType));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(UnitType));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx
deleted file mode 100644
index 3ee074311f1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ValidationCompareOperator_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ValidationCompareOperator_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ValidationCompareOperator_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx.cs
deleted file mode 100644
index 8b9df17ec4a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ValidationCompareOperator_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.ValidationCompareOperator");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ValidationCompareOperator));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ValidationCompareOperator));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx
deleted file mode 100644
index 4fd067cf9c7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ValidationDataType_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ValidationDataType_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ValidationDataType_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx.cs
deleted file mode 100644
index 391b3bebd81..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ValidationDataType_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.ValidationDataType");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ValidationDataType));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ValidationDataType));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx
deleted file mode 100644
index 3022fa14013..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ValidationSummaryDisplayMode_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ValidationSummaryDisplayMode_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>ValidationSummaryDisplayMode_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx.cs
deleted file mode 100644
index 3e181066ecc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ValidationSummaryDisplayMode_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.ValidationSummaryDisplayMode");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ValidationSummaryDisplayMode));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ValidationSummaryDisplayMode));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx
deleted file mode 100644
index b1e38eb1164..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="ValidatorDisplay_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.ValidatorDisplay_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>ValidatorDisplay_Enum</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx.cs
deleted file mode 100644
index 2f02945f47e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class ValidatorDisplay_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.ValidatorDisplay");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(ValidatorDisplay));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(ValidatorDisplay));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx
deleted file mode 100644
index 52512bf42fa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="VerticalAlign_Enum.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.VerticalAlign_Enum" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-    <HEAD>
-        <title>VerticalAlign_Enum</title>
-        <meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-        <meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-        <meta content="JavaScript" name="vs_defaultClientScript">
-        <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-        <script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-        </script>
-    </HEAD>
-    <body>
-        <form id="Form1" method="post" runat="server">
-            &nbsp;
-        </form>
-    </body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx.cs
deleted file mode 100644
index ef04b52c9c2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class VerticalAlign_Enum
-		: GHTBaseWeb 
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm = (HtmlForm)FindControl("form1");
-			GHTTestBegin(frm);
-			// Testing if the object is not nothing
-			GHTSubTestBegin("System.Web.UI.WebControls.VerticalAlign");
-			try 
-			{
-				GHTSubTestAddResult(Test());
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			GHTTestEnd();
-		}
-		public string Test()
-		{
-			string text2 = string.Empty;
-			string[] textArray1 = Enum.GetNames(typeof(VerticalAlign));
-			string[] textArray2 = textArray1;
-			for (int num3 = 0; num3 < textArray2.Length; num3++)
-			{
-				string text1 = textArray2[num3];
-				text2 = text2 + text1 + "; ";
-			}
-			int[] numArray1 = (int[]) Enum.GetValues(typeof(VerticalAlign));
-			int[] numArray2 = numArray1;
-			for (int num2 = 0; num2 < numArray2.Length; num2++)
-			{
-				int num1 = numArray2[num2];
-				text2 = text2 + num1.ToString() + "; ";
-			}
-			return text2;
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx
deleted file mode 100644
index 2e129a88775..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_AccessKey.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_AccessKey" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_AccessKey</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx.cs
deleted file mode 100644
index c44faeee04e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_AccessKey
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Empty string");
-				this.TestedControl.AccessKey = string.Empty;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception1 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "null/Nothing");
-				this.TestedControl.AccessKey = null;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception2 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Space");
-				this.TestedControl.AccessKey = " ";
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception3 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "A letter");
-				this.TestedControl.AccessKey = "A";
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception4 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "A digit");
-				this.TestedControl.AccessKey = "1";
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception5 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Non alpha-numeric charachter");
-				this.TestedControl.AccessKey = "@";
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception6 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Two charachter string");
-				this.TestedControl.AccessKey = "ab";
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				ArgumentException exception7 = exception15;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception8 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx
deleted file mode 100644
index 2743873a82a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_ApplyStyle_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_ApplyStyle_S" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_ApplyStyle_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx.cs
deleted file mode 100644
index 921cbfbcd2e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Drawing;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_ApplyStyle_S
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		#region "Data members"
-		private Style m_newStyle;
-		private Style m_oldStyle;
-		private Style m_blankStyle;
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			try 
-			{
-				InitStyles();
-			}
-			catch (Exception ex) 
-			{
-				GHTSubTestBegin("Styles initialization");
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Apply a new style:");
-				this.TestedControl.ApplyStyle(this.m_newStyle);
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Apply a blank style:");
-				this.TestedControl.ApplyStyle(this.m_oldStyle);
-				this.TestedControl.ApplyStyle(this.m_blankStyle);
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-
-		private void InitStyles()
-		{
-			this.m_blankStyle = new Style();
-			this.m_oldStyle = new Style();
-			Style style2 = this.m_oldStyle;
-			style2.BackColor = Color.Wheat;
-			style2.BorderColor = Color.DarkGreen;
-			style2.BorderStyle = BorderStyle.Double;
-			Unit unit2 = new Unit(5);
-			style2.BorderWidth = unit2;
-			style2.ForeColor = Color.DarkMagenta;
-			unit2 = new Unit(60);
-			style2.Height = unit2;
-			unit2 = new Unit(60);
-			style2.Width = unit2;
-			FontInfo info2 = style2.Font;
-			info2.Bold = false;
-			info2.Italic = false;
-			info2.Name = "Times New Roman";
-			info2.Overline = false;
-			FontUnit unit1 = new FontUnit(FontSize.Small);
-			info2.Size = unit1;
-			info2.Strikeout = false;
-			info2.Underline = false;
-			info2 = null;
-			style2 = null;
-			this.m_newStyle = new Style();
-			Style style1 = this.m_newStyle;
-			style1.BackColor = Color.AliceBlue;
-			style1.BorderColor = Color.Red;
-			style1.BorderStyle = BorderStyle.Dashed;
-			unit2 = new Unit(2);
-			style1.BorderWidth = unit2;
-			style1.ForeColor = Color.RoyalBlue;
-			unit2 = new Unit(40);
-			style1.Height = unit2;
-			unit2 = new Unit(40);
-			style1.Width = unit2;
-			FontInfo info1 = style1.Font;
-			info1.Bold = true;
-			info1.Italic = true;
-			info1.Name = "Arial";
-			info1.Overline = true;
-			unit1 = new FontUnit(FontSize.Large);
-			info1.Size = unit1;
-			info1.Strikeout = true;
-			info1.Underline = true;
-			info1 = null;
-			style1 = null;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx
deleted file mode 100644
index ada3d994ad3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx
+++ /dev/null
@@ -1,190 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Attributes.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Attributes" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Attributes</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest25" runat="server" Width="104px" Height="56px">
-				<asp:Button id="Button1" runat="server" TestAttribute="TestValue" Text="Button"></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest26" runat="server" Width="104px" Height="56px">
-				<asp:CheckBox id="CheckBox1" runat="server" TestAttribute="TestValue"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest28" runat="server" Width="104px" Height="56px">
-				<asp:HyperLink id="HyperLink1" runat="server" TestAttribute="TestValue">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest30" runat="server" Width="104px" Height="56px">
-				<asp:Image id="Image1" runat="server" TestAttribute="TestValue"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest32" runat="server" Width="104px" Height="56px">
-				<asp:ImageButton id="ImageButton1" runat="server" TestAttribute="TestValue"></asp:ImageButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest34" runat="server" Width="104px" Height="56px">
-				<asp:Label id="Label1" runat="server" TestAttribute="TestValue">Label</asp:Label>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest36" runat="server" Width="104px" Height="56px">
-				<asp:LinkButton id="LinkButton1" runat="server" TestAttribute="TestValue">LinkButton</asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest37" runat="server" Width="104px" Height="56px">
-				<asp:Panel id="Panel1" runat="server" TestAttribute="TestValue">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest38" runat="server" Width="104px" Height="56px">
-				<asp:RadioButton id="RadioButton1" runat="server" TestAttribute="TestValue"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest39" runat="server" Width="104px" Height="56px">
-				<asp:TextBox id="TextBox1" runat="server" Width="100px" TestAttribute="TestValue"></asp:TextBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest40" runat="server" Width="104px" Height="56px">
-				<asp:DropDownList id="DropDownList1" runat="server" TestAttribute="TestValue">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest41" runat="server" Width="104px" Height="56px">
-				<asp:ListBox id="ListBox1" runat="server" TestAttribute="TestValue">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest42" runat="server" Width="104px" Height="56px">
-				<asp:RadioButtonList id="RadioButtonList1" runat="server" TestAttribute="TestValue">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest43" runat="server" Width="104px" Height="56px">
-				<asp:CheckBoxList id="CheckBoxList1" runat="server" TestAttribute="TestValue">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHT_SubTest44" runat="server" Width="104px" Height="56px">
-				<asp:CompareValidator id="CompareValidator1" runat="server" TestAttribute="TestValue" ControlToValidate="TextBox1"
-					ErrorMessage="CompareValidator" ControlToCompare="ListBox1" ValueToCompare="aaa"></asp:CompareValidator>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHT_SubTest45" runat="server" Width="104px" Height="56px">
-				<asp:CustomValidator id="CustomValidator1" runat="server" TestAttribute="TestValue" ControlToValidate="TextBox1"
-					ErrorMessage="CustomValidator"></asp:CustomValidator>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHT_SubTest46" runat="server" Width="104px" Height="56px">
-				<asp:RangeValidator id="RangeValidator1" runat="server" TestAttribute="TestValue" ControlToValidate="TextBox1"
-					ErrorMessage="RangeValidator" MaximumValue="z" MinimumValue="a"></asp:RangeValidator>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHT_SubTest47" runat="server" Width="104px" Height="56px">
-				<asp:RegularExpressionValidator id="RegularExpressionValidator1" runat="server" TestAttribute="TestValue" ControlToValidate="TextBox1"
-					ErrorMessage="RegularExpressionValidator" ValidationExpression="(0( \d|\d ))?\d\d \d\d(\d \d| \d\d )\d\d"></asp:RegularExpressionValidator>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHT_SubTest48" runat="server" Width="104px" Height="56px">
-				<asp:RequiredFieldValidator id="RequiredFieldValidator1" runat="server" TestAttribute="TestValue" ControlToValidate="TextBox1"
-					ErrorMessage="RequiredFieldValidator"></asp:RequiredFieldValidator>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHT_SubTest49" runat="server" Width="104px" Height="56px">
-				<asp:ValidationSummary id="ValidationSummary1" runat="server" Height="37px" Width="144px" TestAttribute="TestValue"></asp:ValidationSummary>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest50" runat="server" Width="104px" Height="56px">
-				<asp:DataGrid id="DataGrid1" runat="server" TestAttribute="TestValue"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest51" runat="server" Width="104px" Height="56px">
-				<asp:DataGrid id="DataGrid2" runat="server">
-					<ItemStyle></ItemStyle>
-				</asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest52" runat="server" Width="104px" Height="56px">
-				<asp:DataList id="DataList1" runat="server" TestAttribute="TestValue">
-					<HeaderTemplate>
-						<b>
-							<tr>
-								<td>Id</td>
-								<td>Description</td>
-							</tr>
-						</b>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<tr>
-							<td><%#DataBinder.Eval(Container.DataItem, "Id") %></td>
-							<td><%#DataBinder.Eval(Container.DataItem, "Description") %></td>
-							<p></p>
-						</tr>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest53" runat="server" Width="104px" Height="56px">
-				<asp:DataList id="DataList2" runat="server">
-					<HeaderTemplate>
-						<b>
-							<tr>
-								<td>Id</td>
-								<td>Description</td>
-							</tr>
-						</b>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<tr TestAttribute="TestValue">
-							<td><%#DataBinder.Eval(Container.DataItem, "Id") %></td>
-							<td><%#DataBinder.Eval(Container.DataItem, "Description") %></td>
-							<p></p>
-						</tr>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest54" runat="server" Width="104px" Height="56px">
-				<asp:Table id="Table1" runat="server" TestAttribute="TestValue">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest55" runat="server" Width="104px" Height="56px">
-				<asp:Table id="Table5" runat="server">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell" TestAttribute="TestValue"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest56" runat="server" Width="104px" Height="56px">
-				<asp:Table id="Table2" runat="server">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell" TestAttribute="TestValue"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest57" runat="server" Width="104px" Height="56px">
-				<asp:Table id="Table3" runat="server">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow TestAttribute="TestValue">
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx.cs
deleted file mode 100644
index 9954a057204..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-using GHTWebControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_Attributes
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.Button Button1;
-		protected GHTWebControls.GHTSubTest GHTSubTest25;
-		protected System.Web.UI.WebControls.CheckBox CheckBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest26;
-		protected System.Web.UI.WebControls.HyperLink HyperLink1;
-		protected GHTWebControls.GHTSubTest GHTSubTest28;
-		protected System.Web.UI.WebControls.Image Image1;
-		protected GHTWebControls.GHTSubTest GHTSubTest30;
-		protected System.Web.UI.WebControls.ImageButton ImageButton1;
-		protected GHTWebControls.GHTSubTest GHTSubTest32;
-		protected System.Web.UI.WebControls.Label Label1;
-		protected GHTWebControls.GHTSubTest GHTSubTest34;
-		protected System.Web.UI.WebControls.LinkButton LinkButton1;
-		protected GHTWebControls.GHTSubTest GHTSubTest36;
-		protected System.Web.UI.WebControls.Panel Panel1;
-		protected GHTWebControls.GHTSubTest GHTSubTest37;
-		protected System.Web.UI.WebControls.RadioButton RadioButton1;
-		protected GHTWebControls.GHTSubTest GHTSubTest38;
-		protected System.Web.UI.WebControls.TextBox TextBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest39;
-		protected System.Web.UI.WebControls.DropDownList DropDownList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest40;
-		protected System.Web.UI.WebControls.ListBox ListBox1;
-		protected GHTWebControls.GHTSubTest GHTSubTest41;
-		protected System.Web.UI.WebControls.RadioButtonList RadioButtonList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest42;
-		protected System.Web.UI.WebControls.CheckBoxList CheckBoxList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest43;
-		protected System.Web.UI.WebControls.CompareValidator CompareValidator1;
-		protected GHTWebControls.GHTSubTest GHT_SubTest44;
-		protected System.Web.UI.WebControls.CustomValidator CustomValidator1;
-		protected GHTWebControls.GHTSubTest GHT_SubTest45;
-		protected System.Web.UI.WebControls.RangeValidator RangeValidator1;
-		protected GHTWebControls.GHTSubTest GHT_SubTest46;
-		protected System.Web.UI.WebControls.RegularExpressionValidator RegularExpressionValidator1;
-		protected GHTWebControls.GHTSubTest GHT_SubTest47;
-		protected System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-		protected GHTWebControls.GHTSubTest GHT_SubTest48;
-		protected System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
-		protected GHTWebControls.GHTSubTest GHT_SubTest49;
-		protected System.Web.UI.WebControls.DataGrid DataGrid1;
-		protected GHTWebControls.GHTSubTest GHTSubTest50;
-		protected System.Web.UI.WebControls.DataGrid DataGrid2;
-		protected GHTWebControls.GHTSubTest GHTSubTest51;
-		protected System.Web.UI.WebControls.DataList DataList1;
-		protected GHTWebControls.GHTSubTest GHTSubTest52;
-		protected System.Web.UI.WebControls.DataList DataList2;
-		protected GHTWebControls.GHTSubTest GHTSubTest53;
-		protected System.Web.UI.WebControls.Table Table1;
-		protected GHTWebControls.GHTSubTest GHTSubTest54;
-		protected System.Web.UI.WebControls.Table Table5;
-		protected GHTWebControls.GHTSubTest GHTSubTest55;
-		protected System.Web.UI.WebControls.Table Table2;
-		protected GHTWebControls.GHTSubTest GHTSubTest56;
-		protected System.Web.UI.WebControls.Table Table3;
-		protected GHTWebControls.GHTSubTest GHTSubTest57;
-
-		protected static Item [] m_dataSource = new Item[] { 
-															   new Item(1, "aaa"), 
-															   new Item(2, "bbb"), 
-															   new Item(3, "ccc"), 
-															   new Item(4, "ddd"), 
-															   new Item(5, "eee"), 
-															   new Item(6, "fff")};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-
-			RunDesignTimeTests();
-
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				IEnumerator enumerator1 = null;
-				this.GHTSubTestBegin(ctrlType, "Description");
-				this.TestedControl.Attributes.Add("Test", " Value");
-				try
-				{
-					enumerator1 = this.TestedControl.Attributes.Keys.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text1 = (string)(enumerator1.Current);
-						this.GHTSubTestAddResult("Attribute - Name: " + text1 + " Value: " + this.TestedControl.Attributes[text1]);
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-
-		private void RunDesignTimeTests()
-		{
-			try
-			{
-				this.DataGrid1.DataSource = WebControl_Attributes.m_dataSource;
-				this.DataGrid2.DataSource = WebControl_Attributes.m_dataSource;
-				this.DataList1.DataSource = WebControl_Attributes.m_dataSource;
-				this.DataList2.DataSource = WebControl_Attributes.m_dataSource;
-				this.DataGrid1.DataBind();
-				this.DataGrid2.DataBind();
-				this.DataList1.DataBind();
-				this.DataList2.DataBind();
-				GHTSubTest test1 = this.GHTSubTest25;
-				WebControl control1 = this.Button1;
-				this.AddAttributes(ref test1, ref control1);
-				this.Button1 = (Button) control1;
-				this.GHTSubTest25 = test1;
-				test1 = this.GHTSubTest26;
-				control1 = this.CheckBox1;
-				this.AddAttributes(ref test1, ref control1);
-				this.CheckBox1 = (CheckBox) control1;
-				this.GHTSubTest26 = test1;
-				test1 = this.GHTSubTest28;
-				control1 = this.HyperLink1;
-				this.AddAttributes(ref test1, ref control1);
-				this.HyperLink1 = (HyperLink) control1;
-				this.GHTSubTest28 = test1;
-				test1 = this.GHTSubTest30;
-				control1 = this.Image1;
-				this.AddAttributes(ref test1, ref control1);
-				this.Image1 = (Image) control1;
-				this.GHTSubTest30 = test1;
-				test1 = this.GHTSubTest32;
-				control1 = this.ImageButton1;
-				this.AddAttributes(ref test1, ref control1);
-				this.ImageButton1 = (ImageButton) control1;
-				this.GHTSubTest32 = test1;
-				test1 = this.GHTSubTest34;
-				control1 = this.Label1;
-				this.AddAttributes(ref test1, ref control1);
-				this.Label1 = (Label) control1;
-				this.GHTSubTest34 = test1;
-				test1 = this.GHTSubTest36;
-				control1 = this.LinkButton1;
-				this.AddAttributes(ref test1, ref control1);
-				this.LinkButton1 = (LinkButton) control1;
-				this.GHTSubTest36 = test1;
-				test1 = this.GHTSubTest37;
-				control1 = this.Panel1;
-				this.AddAttributes(ref test1, ref control1);
-				this.Panel1 = (Panel) control1;
-				this.GHTSubTest37 = test1;
-				test1 = this.GHTSubTest38;
-				control1 = this.RadioButton1;
-				this.AddAttributes(ref test1, ref control1);
-				this.RadioButton1 = (RadioButton) control1;
-				this.GHTSubTest38 = test1;
-				test1 = this.GHTSubTest39;
-				control1 = this.TextBox1;
-				this.AddAttributes(ref test1, ref control1);
-				this.TextBox1 = (TextBox) control1;
-				this.GHTSubTest39 = test1;
-				test1 = this.GHTSubTest40;
-				control1 = this.DropDownList1;
-				this.AddAttributes(ref test1, ref control1);
-				this.DropDownList1 = (DropDownList) control1;
-				this.GHTSubTest40 = test1;
-				test1 = this.GHTSubTest41;
-				control1 = this.ListBox1;
-				this.AddAttributes(ref test1, ref control1);
-				this.ListBox1 = (ListBox) control1;
-				this.GHTSubTest41 = test1;
-				test1 = this.GHTSubTest42;
-				control1 = this.RadioButtonList1;
-				this.AddAttributes(ref test1, ref control1);
-				this.RadioButtonList1 = (RadioButtonList) control1;
-				this.GHTSubTest42 = test1;
-				test1 = this.GHTSubTest43;
-				control1 = this.CheckBoxList1;
-				this.AddAttributes(ref test1, ref control1);
-				this.CheckBoxList1 = (CheckBoxList) control1;
-				this.GHTSubTest43 = test1;
-				test1 = this.GHTSubTest50;
-				control1 = this.DataGrid1;
-				this.AddAttributes(ref test1, ref control1);
-				this.DataGrid1 = (DataGrid) control1;
-				this.GHTSubTest50 = test1;
-				test1 = this.GHTSubTest51;
-				control1 = this.DataGrid2.Items[0];
-				this.AddAttributes(ref test1, ref control1);
-				this.GHTSubTest51 = test1;
-				test1 = this.GHTSubTest52;
-				control1 = this.DataList1;
-				this.AddAttributes(ref test1, ref control1);
-				this.DataList1 = (DataList) control1;
-				this.GHTSubTest52 = test1;
-				test1 = this.GHTSubTest53;
-				control1 = this.DataList2.Items[0];
-				this.AddAttributes(ref test1, ref control1);
-				this.GHTSubTest53 = test1;
-				test1 = this.GHTSubTest54;
-				control1 = this.Table1;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table1 = (Table) control1;
-				this.GHTSubTest54 = test1;
-				test1 = this.GHTSubTest55;
-				control1 = this.Table5;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table5 = (Table) control1;
-				this.GHTSubTest55 = test1;
-				test1 = this.GHTSubTest56;
-				control1 = this.Table2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table2 = (Table) control1;
-				this.GHTSubTest56 = test1;
-				test1 = this.GHTSubTest57;
-				control1 = this.Table3;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table3 = (Table) control1;
-				this.GHTSubTest57 = test1;
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestBegin();
-				string text1 = string.Empty + exception1.GetType().ToString();
-				text1 = text1 + " caught during preperations for design time tests.";
-				text1 = text1 + "<br>Message: ";
-				text1 = text1 + exception1.Message;
-				text1 = text1 + "<br>Trace: ";
-				text1 = text1 + exception1.StackTrace;
-				this.GHTSubTestAddResult(text1);
-				this.GHTSubTestEnd();
-				// ProjectData.ClearProjectError();
-			}
-		}
- 
-
-		private void AddAttributes(ref GHTSubTest a_currentSubTest, ref WebControl a_toTest)
-		{
-			try
-			{
-				IEnumerator enumerator1 = null;
-				base.GHTActiveSubTest = a_currentSubTest;
-				try
-				{
-					enumerator1 = a_toTest.Attributes.Keys.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text1 = (string)(enumerator1.Current);
-						this.GHTSubTestAddResult("Attribute - Name: " + text1 + " Value: " + a_toTest.Attributes[text1]);
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx
deleted file mode 100644
index 3f267804df1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_BackColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_BackColor" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_BackColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx.cs
deleted file mode 100644
index a511654de48..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_BackColor
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Named color:");
-				this.TestedControl.BackColor = Color.Goldenrod;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Color.Empty:");
-				this.TestedControl.BackColor = Color.Empty;
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default:");
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Using RGB:");
-				this.TestedControl.BackColor = Color.FromArgb(100, 0x55, 170, 0xff);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx
deleted file mode 100644
index eef25b5af03..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_BorderColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_BorderColor" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_BorderColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx.cs
deleted file mode 100644
index c93a1e9664f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_BorderColor
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Named color:");
-				unit1 = new Unit(4);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Solid;
-				this.TestedControl.BorderColor = Color.DarkBlue;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Color.Empty:");
-				unit1 = new Unit(4);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Solid;
-				this.TestedControl.BorderColor = Color.Empty;
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default:");
-				unit1 = new Unit(4);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Solid;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Using RGB:");
-				unit1 = new Unit(4);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Solid;
-				this.TestedControl.BorderColor = Color.FromArgb(200, 0xff, 0x55, 170);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx
deleted file mode 100644
index 4f0fa5f0c30..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_BorderStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_BorderStyle" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_BorderStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx.cs
deleted file mode 100644
index 073530fa6a5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_BorderStyle
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Dashed;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception1 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Dashed:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Dashed;
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception2 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Dotted:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Dotted;
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception3 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Double:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Double;
-			}
-			catch (Exception exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				Exception exception4 = exception15;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Groove:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Groove;
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception5 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Inset:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Inset;
-			}
-			catch (Exception exception17)
-			{
-				// ProjectData.SetProjectError(exception17);
-				Exception exception6 = exception17;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "None:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.None;
-			}
-			catch (Exception exception18)
-			{
-				// ProjectData.SetProjectError(exception18);
-				Exception exception7 = exception18;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "NotSet:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.NotSet;
-			}
-			catch (Exception exception19)
-			{
-				// ProjectData.SetProjectError(exception19);
-				Exception exception8 = exception19;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Outset:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Outset;
-			}
-			catch (Exception exception20)
-			{
-				// ProjectData.SetProjectError(exception20);
-				Exception exception9 = exception20;
-				this.GHTSubTestUnexpectedExceptionCaught(exception9);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Ridge:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Ridge;
-			}
-			catch (Exception exception21)
-			{
-				// ProjectData.SetProjectError(exception21);
-				Exception exception10 = exception21;
-				this.GHTSubTestUnexpectedExceptionCaught(exception10);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Solid:");
-				this.TestedControl.BorderColor = Color.Black;
-				unit1 = new Unit(2);
-				this.TestedControl.BorderWidth = unit1;
-				this.TestedControl.BorderStyle = BorderStyle.Solid;
-			}
-			catch (Exception exception22)
-			{
-				// ProjectData.SetProjectError(exception22);
-				Exception exception11 = exception22;
-				this.GHTSubTestUnexpectedExceptionCaught(exception11);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx
deleted file mode 100644
index 937fb892e2a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_BorderWidth.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_BorderWidth" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_BorderWidth</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx.cs
deleted file mode 100644
index 79de42e0894..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_BorderWidth
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default");
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception1 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to 5:");
-				unit1 = new Unit(5);
-				this.TestedControl.BorderWidth = unit1;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception2 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to Unit.Empty:");
-				this.TestedControl.BorderWidth = Unit.Empty;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception3 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to negative value:");
-				unit1 = new Unit(-5);
-				this.TestedControl.BorderWidth = unit1;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				ArgumentException exception4 = exception9;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception5 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx
deleted file mode 100644
index 1c74cb01a92..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_ControlStyle.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_ControlStyle" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_ControlStyle</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx.cs
deleted file mode 100644
index 03e4a2ef143..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_ControlStyle
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default style");
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Modified style");
-				Style style1 = new Style();
-				Style style2 = style1;
-				style2.BackColor = Color.Fuchsia;
-				style2.BorderColor = Color.DeepSkyBlue;
-				style2.BorderStyle = BorderStyle.Ridge;
-				Unit unit2 = new Unit(2);
-				style2.BorderWidth = unit2;
-				style2.ForeColor = Color.IndianRed;
-				unit2 = new Unit(30);
-				style2.Height = unit2;
-				unit2 = new Unit(40);
-				style2.Width = unit2;
-				FontInfo info1 = style2.Font;
-				info1.Bold = true;
-				info1.Italic = true;
-				info1.Name = "Times new roman";
-				info1.Overline = true;
-				FontUnit unit1 = new FontUnit(FontSize.Larger);
-				info1.Size = unit1;
-				info1.Strikeout = true;
-				info1.Underline = true;
-				info1 = null;
-				style2 = null;
-				this.TestedControl.ApplyStyle(style1);
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx
deleted file mode 100644
index 374ebe6f917..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_ControlStyleCreated.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_ControlStyleCreated" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_ControlStyleCreated</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx.cs
deleted file mode 100644
index 210dfe0c6f5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_ControlStyleCreated
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default style", false);
-				this.GHTAddToActiveForm(this.TestedControl);
-				this.GHTSubTestAddResult(this.TestedControl.ControlStyleCreated.ToString());
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Modified style", false);
-				Style style1 = new Style();
-				Style style2 = style1;
-				style2.BackColor = Color.Fuchsia;
-				style2.BorderColor = Color.DeepSkyBlue;
-				style2.BorderStyle = BorderStyle.Ridge;
-				Unit unit2 = new Unit(2);
-				style2.BorderWidth = unit2;
-				style2.ForeColor = Color.IndianRed;
-				unit2 = new Unit(30);
-				style2.Height = unit2;
-				unit2 = new Unit(40);
-				style2.Width = unit2;
-				FontInfo info1 = style2.Font;
-				info1.Bold = true;
-				info1.Italic = true;
-				info1.Name = "Times new roman";
-				info1.Overline = true;
-				FontUnit unit1 = new FontUnit(FontSize.Larger);
-				info1.Size = unit1;
-				info1.Strikeout = true;
-				info1.Underline = true;
-				info1 = null;
-				style2 = null;
-				this.TestedControl.ApplyStyle(style1);
-				this.GHTAddToActiveForm(this.TestedControl);
-				this.GHTSubTestAddResult(this.TestedControl.ControlStyleCreated.ToString());
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx
deleted file mode 100644
index 471094193af..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_CopyBaseAttributes_W.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_CopyBaseAttributes_W" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_CopyBaseAttributes_W</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script language="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:button id="btnAccessKey" accessKey="Z" runat="server" Text="Button"></asp:button><asp:button id="btnEnabled" runat="server" Text="Button" Enabled="False"></asp:button><asp:button id="btnToolTip" runat="server" Text="Button" ToolTip="ToolTip text"></asp:button><asp:button id="btnTabIndex" tabIndex="5" runat="server" Text="Button"></asp:button><asp:button id="btnAttributes" runat="server" Text="Button" TestAttribute="TestAttribute Value"></asp:button></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx.cs
deleted file mode 100644
index 7b51bd4bf93..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_CopyBaseAttributes_W
-		: GHTWebControlBase
-	{
-		protected System.Web.UI.WebControls.Button btnAccessKey;
-		protected System.Web.UI.WebControls.Button btnEnabled;
-		protected System.Web.UI.WebControls.Button btnToolTip;
-		protected System.Web.UI.WebControls.Button btnTabIndex;
-		protected System.Web.UI.WebControls.Button btnAttributes;
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "AccessKey:");
-				this.TestedControl.CopyBaseAttributes(this.btnAccessKey);
-				this.Compare(this.TestedControl.AccessKey, this.btnAccessKey.AccessKey);
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception1 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Enabled:");
-				this.TestedControl.CopyBaseAttributes(this.btnEnabled);
-				this.Compare(this.TestedControl.Enabled, this.btnEnabled.Enabled);
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception2 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "ToolTip:");
-				this.TestedControl.CopyBaseAttributes(this.btnToolTip);
-				this.Compare(this.TestedControl.ToolTip, this.btnToolTip.ToolTip);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception3 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "TabIndex:");
-				this.TestedControl.CopyBaseAttributes(this.btnTabIndex);
-				this.Compare(this.TestedControl.TabIndex, this.btnTabIndex.TabIndex);
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception4 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				IEnumerator enumerator1 = null;
-				this.GHTSubTestBegin(ctrlType, "Attributes:");
-				this.TestedControl.CopyBaseAttributes(this.btnAttributes);
-				try
-				{
-					enumerator1 = this.TestedControl.Attributes.Keys.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text1 = (string)(enumerator1.Current);
-						this.GHTSubTestAddResult("key = " + text1 + " Value = " + this.TestedControl.Attributes[text1]);
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception5 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx
deleted file mode 100644
index 4deda9f0dc3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_CssClass.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_CssClass" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_CssClass</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<!-- Styles to use in the test -->
-		<style>
-		.CssStyle1 { FONT-SIZE: large; Font-Bold: True; Font-Italic: True; ForeColor: orange; BackColor: blue; Alignment: Right; Wrapping: Wrap }
-		.CssStyle2 { FONT-SIZE: small; Font-Bold: false; Font-Italic: false; ForeColor: darkgreen; BackColor: red; Alignment: center; Wrapping: no-wrap }
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<P>&nbsp;</P>
-			<P>&nbsp;</P>
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx.cs
deleted file mode 100644
index d9df77c8e6d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_CssClass
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "CssStyle1");
-				this.TestedControl.CssClass = "CssStyle1";
-				this.GHTSubTestAddResult("CssClass = " + this.TestedControl.CssClass);
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "CssStyle2");
-				this.TestedControl.CssClass = "CssStyle2";
-				this.GHTSubTestAddResult("CssClass = " + this.TestedControl.CssClass);
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Not-existing CssClass:");
-				this.TestedControl.CssClass = "Not-existing CssClass:";
-				this.GHTSubTestAddResult("CssClass = " + this.TestedControl.CssClass);
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default CssClass:");
-				this.GHTSubTestAddResult("CssClass = " + this.TestedControl.CssClass);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx
deleted file mode 100644
index d62e0eff885..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Enabled.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Enabled" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Enabled</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx.cs
deleted file mode 100644
index d0d1804f56b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Enabled
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Enabled");
-				this.TestedControl.Enabled = true;
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Disabled");
-				this.TestedControl.Enabled = false;
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx
deleted file mode 100644
index 81825ec5bb4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Font.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Font" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Font</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx.cs
deleted file mode 100644
index b94c5c7a82c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Font
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Bold");
-				this.TestedControl.Font.Bold = true;
-				this.GHTSubTestAddResult(this.TestedControl.Font.ToString());
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception1 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Italic");
-				this.TestedControl.Font.Italic = true;
-				this.GHTSubTestAddResult(this.TestedControl.Font.ToString());
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception2 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Name ");
-				this.TestedControl.Font.Name = "Lucida Console";
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception3 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Names");
-				string[] textArray1 = new string[] { "verdana", "Lucida Console", "Courier" } ;
-				this.TestedControl.Font.Names = textArray1;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception4 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Overline");
-				this.TestedControl.Font.Overline = true;
-				this.GHTSubTestAddResult(this.TestedControl.Font.ToString());
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception5 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "FontSize");
-				FontUnit unit1 = new FontUnit(FontSize.XXLarge);
-				this.TestedControl.Font.Size = unit1;
-				this.GHTSubTestAddResult(this.TestedControl.Font.ToString());
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception6 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Strikeout");
-				this.TestedControl.Font.Strikeout = true;
-				this.GHTSubTestAddResult(this.TestedControl.Font.ToString());
-			}
-			catch (Exception exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				Exception exception7 = exception15;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Underline");
-				this.TestedControl.Font.Underline = true;
-				this.GHTSubTestAddResult(this.TestedControl.Font.ToString());
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception8 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx
deleted file mode 100644
index 94857f6928a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_ForeColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_ForeColor" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_ForeColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx.cs
deleted file mode 100644
index a487e8f598a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_ForeColor
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Named color:");
-				this.TestedControl.ForeColor = Color.Goldenrod;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Color.Empty:");
-				this.TestedControl.ForeColor = Color.Empty;
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default:");
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Using RGB:");
-				this.TestedControl.ForeColor = Color.FromArgb(100, 0x55, 170, 0xff);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx
deleted file mode 100644
index 23fc39f335d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Height.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Height" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Height</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx.cs
deleted file mode 100644
index cef3898755e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Height
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default");
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception1 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to 50:");
-				unit1 = new Unit(50);
-				this.TestedControl.Height = unit1;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception2 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to Unit.Empty:");
-				this.TestedControl.Height = Unit.Empty;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception3 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Negative value:");
-				unit1 = new Unit(-5);
-				this.TestedControl.Height = unit1;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				ArgumentException exception4 = exception9;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception5 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx
deleted file mode 100644
index ac9a5d7233d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_MergeStyle_S.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_MergeStyle_S" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_MergeStyle_S</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx.cs
deleted file mode 100644
index 2cb60103539..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_MergeStyle_S
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-#region "Data members"
-        Style [] m_styles = new Style[3];
-		enum EStyledescription 
-		{
-			blank = 0,
-			nonBlankOld,
-			nonBlankNew
-		}
-#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			try
-			{
-				this.InitStyles();
-				Type[] typeArray1 = this.TypesToTest;
-				for (int num1 = 0; num1 < typeArray1.Length; num1++)
-				{
-					Type type1 = typeArray1[num1];
-					this.GHTHeader(type1.ToString());
-					this.Test(type1);
-				}
-				this.GHTTestEnd();
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestBegin();
-				this.GHTSubTestAddResult("Failed to initialize styles needed for the test. Caught " + exception1.GetType().ToString() + " - " + exception1.Message);
-				this.GHTSubTestEnd();
-				// ProjectData.ClearProjectError();
-				return;
-			}
-			finally
-			{
-				this.GHTTestEnd();
-			}
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Empty style + Empty style:");
-				this.TestedControl.ApplyStyle(this.m_styles[0]);
-				this.TestedControl.MergeStyle(this.m_styles[0]);
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Empty style + Non-Empty style:");
-				this.TestedControl.ApplyStyle(this.m_styles[0]);
-				this.TestedControl.MergeStyle(this.m_styles[2]);
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Non-Empty style + Empty style:");
-				this.TestedControl.ApplyStyle(this.m_styles[1]);
-				this.TestedControl.MergeStyle(this.m_styles[0]);
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Non-Empty old style + Non-Empty new style:");
-				this.TestedControl.ApplyStyle(this.m_styles[1]);
-				this.TestedControl.MergeStyle(this.m_styles[2]);
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-				return;
-			}
-		}
- 
-
-
-		private void InitStyles()
-		{
-			this.m_styles[0] = new Style();
-			this.m_styles[1] = new Style();
-			Style style2 = this.m_styles[1];
-			style2.BackColor = Color.AliceBlue;
-			style2.BorderColor = Color.AliceBlue;
-			style2.BorderStyle = BorderStyle.Dashed;
-			Unit unit1 = new Unit(1);
-			style2.BorderWidth = unit1;
-			style2.ForeColor = Color.AliceBlue;
-			unit1 = new Unit(40);
-			style2.Height = unit1;
-			unit1 = new Unit(40);
-			style2.Width = unit1;
-			FontInfo info2 = style2.Font;
-			info2.Bold = false;
-			info2.Italic = false;
-			info2.Name = "Arial";
-			string[] textArray1 = new string[] { "Arial", "verdana" } ;
-			info2.Names = textArray1;
-			info2.Overline = false;
-			info2.Size = FontUnit.Small;
-			info2.Strikeout = false;
-			info2.Underline = false;
-			info2 = null;
-			style2 = null;
-			this.m_styles[2] = new Style();
-			Style style1 = this.m_styles[2];
-			style1.BackColor = Color.YellowGreen;
-			style1.BorderColor = Color.YellowGreen;
-			style1.BorderStyle = BorderStyle.Solid;
-			unit1 = new Unit(10);
-			style1.BorderWidth = unit1;
-			style1.ForeColor = Color.YellowGreen;
-			unit1 = new Unit(80);
-			style1.Height = unit1;
-			unit1 = new Unit(80);
-			style1.Width = unit1;
-			FontInfo info1 = style1.Font;
-			info1.Bold = true;
-			info1.Italic = true;
-			info1.Name = "Courier";
-			textArray1 = new string[] { "Courier", "David" } ;
-			info1.Names = textArray1;
-			info1.Overline = true;
-			info1.Size = FontUnit.XXLarge;
-			info1.Strikeout = true;
-			info1.Underline = true;
-			info1 = null;
-			style1 = null;
-		}
- 
-
-    }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx
deleted file mode 100644
index f704ea66683..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_RenderBeginTag_H.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_RenderBeginTag_H" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_RenderBeginTag_H</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx.cs
deleted file mode 100644
index e23263fa0b7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Text;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_RenderBeginTag_H
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "RenderBeginTag", false);
-				StringBuilder builder1 = new StringBuilder();
-				StringWriter writer2 = new StringWriter(builder1);
-				HtmlTextWriter writer1 = new HtmlTextWriter(writer2);
-				this.TestedControl.RenderBeginTag(writer1);
-				string text1 = builder1.ToString();
-				this.GHTSubTestAddResult(text1);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx
deleted file mode 100644
index 88018dd99b3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_RenderEndTag_H.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_RenderEndTag_H" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_RenderEndTag_H</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx.cs
deleted file mode 100644
index bb101e58b1e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Text;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_RenderEndTag_H
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "RenderEndTag", false);
-				StringBuilder builder1 = new StringBuilder();
-				StringWriter writer2 = new StringWriter(builder1);
-				HtmlTextWriter writer1 = new HtmlTextWriter(writer2);
-				this.TestedControl.RenderBeginTag(writer1);
-				builder1.Remove(0, builder1.Length);
-				this.TestedControl.RenderEndTag(writer1);
-				this.GHTSubTestAddResult(builder1.ToString(), true);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx
deleted file mode 100644
index 1cf7dd4f6dd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx
+++ /dev/null
@@ -1,184 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<cc1:GHTSubTest id="GHTSubTest24" runat="server" Height="56px" Width="104px">
-				<asp:Button id="Button2" style="COLOR: firebrick" runat="server" Width="120" Height="40" Text="Button"></asp:Button>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest25" runat="server" Height="56px" Width="104px">
-				<asp:CheckBox id="Checkbox2" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:CheckBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest26" runat="server" Height="56px" Width="104px">
-				<asp:HyperLink id="Hyperlink2" style="COLOR: firebrick" runat="server" Width="120" Height="40">HyperLink</asp:HyperLink>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest27" runat="server" Height="56px" Width="104px">
-				<asp:Image id="Image2" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:Image>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest28" runat="server" Height="56px" Width="104px">
-				<asp:ImageButton id="Imagebutton2" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:ImageButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest29" runat="server" Height="56px" Width="104px">
-				<asp:Label id="Label2" style="COLOR: firebrick" runat="server" Width="120" Height="40">Label</asp:Label>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest30" runat="server" Height="56px" Width="104px">
-				<asp:LinkButton id="Linkbutton2" style="COLOR: firebrick" runat="server" Width="120" Height="40">LinkButton</asp:LinkButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest31" runat="server" Height="56px" Width="104px">
-				<asp:Panel id="Panel2" style="COLOR: firebrick" runat="server" Width="120" Height="40">Panel</asp:Panel>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest32" runat="server" Height="56px" Width="104px">
-				<asp:RadioButton id="Radiobutton2" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:RadioButton>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest33" runat="server" Height="56px" Width="104px">
-				<asp:TextBox id="Textbox2" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:TextBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest34" runat="server" Height="56px" Width="104px">
-				<asp:DropDownList id="Dropdownlist2" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:DropDownList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest35" runat="server" Height="56px" Width="104px">
-				<asp:ListBox id="Listbox2" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:ListBox>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest36" runat="server" Height="56px" Width="104px">
-				<asp:RadioButtonList id="Radiobuttonlist2" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:RadioButtonList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest37" runat="server" Height="56px" Width="104px">
-				<asp:CheckBoxList id="Checkboxlist2" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:ListItem Value="Item1">Item1</asp:ListItem>
-					<asp:ListItem Value="Item2">Item2</asp:ListItem>
-				</asp:CheckBoxList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest38" runat="server" Height="56px" Width="104px">
-				<%--<asp:CompareValidator id="Comparevalidator2" runat="server" Width="120" Height="40" ControlToValidate="Listbox2"
-					ErrorMessage="CompareValidator" ControlToCompare="Dropdownlist2" ValueToCompare="aaa"></asp:CompareValidator>--%>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest39" runat="server" Height="56px" Width="104px">
-				<%--<asp:CustomValidator id="Customvalidator2" runat="server" Width="120" Height="40" ControlToValidate="Dropdownlist2"
-					ErrorMessage="CustomValidator"></asp:CustomValidator>--%>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest40" runat="server" Height="56px" Width="104px">
-				<%--<asp:RangeValidator id="Rangevalidator2" runat="server" Width="120" Height="40" ControlToValidate="Textbox2"
-					ErrorMessage="RangeValidator" MaximumValue="z" MinimumValue="a"></asp:RangeValidator>--%>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest41" runat="server" Height="56px" Width="104px">
-				<%--<asp:RegularExpressionValidator id="Regularexpressionvalidator2" runat="server" Width="120" Height="40" ControlToValidate="Textbox2"
-					ErrorMessage="RegularExpressionValidator" ValidationExpression="(0( \d|\d ))?\d\d \d\d(\d \d| \d\d )\d\d"></asp:RegularExpressionValidator>--%>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest42" runat="server" Height="56px" Width="104px">
-				<%--<asp:RequiredFieldValidator id="Requiredfieldvalidator2" runat="server" Width="120" Height="40" ControlToValidate="Textbox2"
-					ErrorMessage="RequiredFieldValidator"></asp:RequiredFieldValidator>--%>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest43" runat="server" Height="56px" Width="104px">
-				<%--<asp:ValidationSummary id="Validationsummary2" runat="server" Width="120" Height="40"></asp:ValidationSummary>--%>
-			</cc1:GHTSubTest>;
-			<cc1:GHTSubTest id="GHTSubTest44" runat="server" Height="56px" Width="104px">
-				<asp:DataGrid id="Datagrid3" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest45" runat="server" Height="56px" Width="104px">
-				<asp:DataGrid id="Datagrid4" style="COLOR: firebrick" runat="server" Width="120" Height="40"></asp:DataGrid>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest46" runat="server" Height="56px" Width="104px">
-				<asp:DataList id="Datalist3" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<HeaderTemplate>
-						<b>
-							<tr>
-								<td>Items</td>
-							</tr>
-						</b>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<tr>
-							<td><%#Container.DataItem%></td>
-							<p></p>
-						</tr>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest47" runat="server" Height="56px" Width="104px">
-				<asp:DataList id="Datalist4" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<HeaderTemplate>
-						<b>
-							<tr>
-								<td>items</td>
-							</tr>
-						</b>
-					</HeaderTemplate>
-					<ItemTemplate>
-						<tr>
-							<td><%#Container.DataItem%></td>
-							<p></p>
-						</tr>
-					</ItemTemplate>
-				</asp:DataList>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest48" runat="server" Width="104px" Height="56px">
-				<asp:Table id="Table4" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest49" runat="server" Height="56px" Width="104px">
-				<asp:Table id="Table6" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest50" runat="server" Height="56px" Width="104px">
-				<asp:Table id="Table7" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest>
-			<cc1:GHTSubTest id="GHTSubTest51" runat="server" Height="56px" Width="104px">
-				<asp:Table id="Table8" style="COLOR: firebrick" runat="server" Width="120" Height="40">
-					<asp:TableRow>
-						<asp:TableCell Text="Header cell"></asp:TableCell>
-					</asp:TableRow>
-					<asp:TableRow>
-						<asp:TableCell Text="Table cell"></asp:TableCell>
-					</asp:TableRow>
-				</asp:Table>
-			</cc1:GHTSubTest></form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx.cs
deleted file mode 100644
index 5d1d4110b12..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-using GHTWebControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_Style
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-
-		}
-		#endregion
-
-		protected System.Web.UI.WebControls.Button Button2;
-		protected GHTWebControls.GHTSubTest GHTSubTest24;
-		protected System.Web.UI.WebControls.CheckBox Checkbox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest25;
-		protected System.Web.UI.WebControls.HyperLink Hyperlink2;
-		protected GHTWebControls.GHTSubTest GHTSubTest26;
-		protected System.Web.UI.WebControls.Image Image2;
-		protected GHTWebControls.GHTSubTest GHTSubTest27;
-		protected System.Web.UI.WebControls.ImageButton Imagebutton2;
-		protected GHTWebControls.GHTSubTest GHTSubTest28;
-		protected System.Web.UI.WebControls.Label Label2;
-		protected GHTWebControls.GHTSubTest GHTSubTest29;
-		protected System.Web.UI.WebControls.LinkButton Linkbutton2;
-		protected GHTWebControls.GHTSubTest GHTSubTest30;
-		protected System.Web.UI.WebControls.Panel Panel2;
-		protected GHTWebControls.GHTSubTest GHTSubTest31;
-		protected System.Web.UI.WebControls.RadioButton Radiobutton2;
-		protected GHTWebControls.GHTSubTest GHTSubTest32;
-		protected System.Web.UI.WebControls.TextBox Textbox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest33;
-		protected System.Web.UI.WebControls.DropDownList Dropdownlist2;
-		protected GHTWebControls.GHTSubTest GHTSubTest34;
-		protected System.Web.UI.WebControls.ListBox Listbox2;
-		protected GHTWebControls.GHTSubTest GHTSubTest35;
-		protected System.Web.UI.WebControls.RadioButtonList Radiobuttonlist2;
-		protected GHTWebControls.GHTSubTest GHTSubTest36;
-		protected System.Web.UI.WebControls.CheckBoxList Checkboxlist2;
-		protected GHTWebControls.GHTSubTest GHTSubTest37;
-		protected GHTWebControls.GHTSubTest GHTSubTest38;
-		protected GHTWebControls.GHTSubTest GHTSubTest39;
-		protected GHTWebControls.GHTSubTest GHTSubTest40;
-		protected GHTWebControls.GHTSubTest GHTSubTest41;
-		protected GHTWebControls.GHTSubTest GHTSubTest42;
-		protected GHTWebControls.GHTSubTest GHTSubTest43;
-		protected System.Web.UI.WebControls.DataGrid Datagrid3;
-		protected GHTWebControls.GHTSubTest GHTSubTest44;
-		protected System.Web.UI.WebControls.DataGrid Datagrid4;
-		protected GHTWebControls.GHTSubTest GHTSubTest45;
-		protected System.Web.UI.WebControls.DataList Datalist3;
-		protected GHTWebControls.GHTSubTest GHTSubTest46;
-		protected System.Web.UI.WebControls.DataList Datalist4;
-		protected GHTWebControls.GHTSubTest GHTSubTest47;
-		protected System.Web.UI.WebControls.Table Table4;
-		protected GHTWebControls.GHTSubTest GHTSubTest48;
-		protected System.Web.UI.WebControls.Table Table6;
-		protected GHTWebControls.GHTSubTest GHTSubTest49;
-		protected System.Web.UI.WebControls.Table Table7;
-		protected GHTWebControls.GHTSubTest GHTSubTest50;
-		protected System.Web.UI.WebControls.Table Table8;
-		protected GHTWebControls.GHTSubTest GHTSubTest51;
-
-		protected static string [] m_dataSource = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff"};
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			RunDesignTimeTests();
-
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default attributes");
-				this.TestedControl.Style.Add("AddedStyleAttribute", "Value");
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-		}
- 
-
-		private void RunDesignTimeTests()
-		{
-			try
-			{
-				this.Datagrid3.DataSource = WebControl_Style.m_dataSource;
-				this.Datagrid4.DataSource = WebControl_Style.m_dataSource;
-				this.Datalist3.DataSource = WebControl_Style.m_dataSource;
-				this.Datalist4.DataSource = WebControl_Style.m_dataSource;
-				this.Datagrid3.DataBind();
-				this.Datagrid4.DataBind();
-				this.Datalist3.DataBind();
-				this.Datalist4.DataBind();
-				GHTSubTest test1 = this.GHTSubTest24;
-				WebControl control1 = this.Button2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Button2 = (Button) control1;
-				this.GHTSubTest24 = test1;
-				test1 = this.GHTSubTest25;
-				control1 = this.Checkbox2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Checkbox2 = (CheckBox) control1;
-				this.GHTSubTest25 = test1;
-				test1 = this.GHTSubTest26;
-				control1 = this.Hyperlink2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Hyperlink2 = (HyperLink) control1;
-				this.GHTSubTest26 = test1;
-				test1 = this.GHTSubTest27;
-				control1 = this.Image2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Image2 = (Image) control1;
-				this.GHTSubTest27 = test1;
-				test1 = this.GHTSubTest28;
-				control1 = this.Imagebutton2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Imagebutton2 = (ImageButton) control1;
-				this.GHTSubTest28 = test1;
-				test1 = this.GHTSubTest29;
-				control1 = this.Label2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Label2 = (Label) control1;
-				this.GHTSubTest29 = test1;
-				test1 = this.GHTSubTest30;
-				control1 = this.Linkbutton2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Linkbutton2 = (LinkButton) control1;
-				this.GHTSubTest30 = test1;
-				test1 = this.GHTSubTest31;
-				control1 = this.Panel2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Panel2 = (Panel) control1;
-				this.GHTSubTest31 = test1;
-				test1 = this.GHTSubTest32;
-				control1 = this.Radiobutton2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Radiobutton2 = (RadioButton) control1;
-				this.GHTSubTest32 = test1;
-				test1 = this.GHTSubTest33;
-				control1 = this.Textbox2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Textbox2 = (TextBox) control1;
-				this.GHTSubTest33 = test1;
-				test1 = this.GHTSubTest34;
-				control1 = this.Dropdownlist2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Dropdownlist2 = (DropDownList) control1;
-				this.GHTSubTest34 = test1;
-				test1 = this.GHTSubTest35;
-				control1 = this.Listbox2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Listbox2 = (ListBox) control1;
-				this.GHTSubTest35 = test1;
-				test1 = this.GHTSubTest36;
-				control1 = this.Radiobuttonlist2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Radiobuttonlist2 = (RadioButtonList) control1;
-				this.GHTSubTest36 = test1;
-				test1 = this.GHTSubTest37;
-				control1 = this.Checkboxlist2;
-				this.AddAttributes(ref test1, ref control1);
-				this.Checkboxlist2 = (CheckBoxList) control1;
-				this.GHTSubTest37 = test1;
-				test1 = this.GHTSubTest44;
-				control1 = this.Datagrid3;
-				this.AddAttributes(ref test1, ref control1);
-				this.Datagrid3 = (DataGrid) control1;
-				this.GHTSubTest44 = test1;
-				test1 = this.GHTSubTest45;
-				control1 = this.Datagrid4.Items[0];
-				this.AddAttributes(ref test1, ref control1);
-				this.GHTSubTest45 = test1;
-				test1 = this.GHTSubTest46;
-				control1 = this.Datalist3;
-				this.AddAttributes(ref test1, ref control1);
-				this.Datalist3 = (DataList) control1;
-				this.GHTSubTest46 = test1;
-				test1 = this.GHTSubTest47;
-				control1 = this.Datalist4.Items[0];
-				this.AddAttributes(ref test1, ref control1);
-				this.GHTSubTest47 = test1;
-				test1 = this.GHTSubTest48;
-				control1 = this.Table4;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table4 = (Table) control1;
-				this.GHTSubTest48 = test1;
-				test1 = this.GHTSubTest49;
-				control1 = this.Table6;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table6 = (Table) control1;
-				this.GHTSubTest49 = test1;
-				test1 = this.GHTSubTest50;
-				control1 = this.Table7;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table7 = (Table) control1;
-				this.GHTSubTest50 = test1;
-				test1 = this.GHTSubTest51;
-				control1 = this.Table8;
-				this.AddAttributes(ref test1, ref control1);
-				this.Table8 = (Table) control1;
-				this.GHTSubTest51 = test1;
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestBegin();
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				this.GHTSubTestEnd();
-				// ProjectData.ClearProjectError();
-			}
-		}
- 
-		private void AddAttributes(ref GHTSubTest a_currentSubTest, ref WebControl a_toTest)
-		{
-			try
-			{
-				IEnumerator enumerator1 = null;
-				base.GHTActiveSubTest = a_currentSubTest;
-				try
-				{
-					enumerator1 = a_toTest.Style.Keys.GetEnumerator();
-					while (enumerator1.MoveNext())
-					{
-						string text1 = (string)(enumerator1.Current);
-						this.GHTSubTestAddResult("Key: " + text1 + " Value: " + a_toTest.Style[text1]);
-					}
-				}
-				finally
-				{
-					if (enumerator1 is IDisposable)
-					{
-						((IDisposable) enumerator1).Dispose();
-					}
-				}
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-		}
- 
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx
deleted file mode 100644
index 2bf55ea0ec9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_BackColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_BackColor" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_BackColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> 
-			.CssClass1 { BACKGROUND-COLOR: gray;}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx.cs
deleted file mode 100644
index a00c7bc009a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_BackColor
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-        // This tests that the style attribute renders o.k. on all  webcontrols.
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set color once");
-				this.TestedControl.ControlStyle.BackColor = Color.Cyan;
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception1 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set color twice");
-				this.TestedControl.ControlStyle.BackColor = Color.Cyan;
-				this.TestedControl.ControlStyle.BackColor = Color.Purple;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception2 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set empty color.");
-				this.TestedControl.ControlStyle.BackColor = Color.RoyalBlue;
-				this.TestedControl.ControlStyle.BackColor = Color.Empty;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception3 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set transparent color.");
-				this.TestedControl.ControlStyle.BackColor = Color.ForestGreen;
-				this.TestedControl.ControlStyle.BackColor = Color.Transparent;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception4 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set color and CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-				this.TestedControl.ControlStyle.BackColor = Color.ForestGreen;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception5 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx
deleted file mode 100644
index fcc18d81518..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Border.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Border" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Border</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> 
-			.CssClass1 { BORDER-RIGHT: blue 10px solid; BORDER-TOP: blue 10px solid; BORDER-LEFT:  blue 10px solid; BORDER-BOTTOM:  blue 10px solid}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server" >
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx.cs
deleted file mode 100644
index 697febba082..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_Border
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Normal Values.");
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.Ridge;
-				this.TestedControl.ControlStyle.BorderColor = Color.Sienna;
-				unit1 = new Unit(9);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception1 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "BorderStyle = none.");
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.None;
-				this.TestedControl.ControlStyle.BorderColor = Color.Turquoise;
-				unit1 = new Unit(12);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception2 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "BorderStyle = NotSet.");
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.NotSet;
-				this.TestedControl.ControlStyle.BorderColor = Color.Fuchsia;
-				unit1 = new Unit(20);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception3 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "BorderColor = Empty.");
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.Inset;
-				this.TestedControl.ControlStyle.BorderColor = Color.Empty;
-				unit1 = new Unit(12);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception4 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "BorderColor = Transparent.");
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.Groove;
-				this.TestedControl.ControlStyle.BorderColor = Color.Transparent;
-				unit1 = new Unit(12);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception5 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "BorderWidth = 0.");
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.Double;
-				this.TestedControl.ControlStyle.BorderColor = Color.Tomato;
-				unit1 = new Unit(0);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				Exception exception6 = exception15;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set BorderWidth and CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-				unit1 = new Unit(20);
-				this.TestedControl.ControlStyle.BorderWidth = unit1;
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception7 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set BorderStyle and CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-				this.TestedControl.ControlStyle.BorderStyle = BorderStyle.Dotted;
-			}
-			catch (Exception exception17)
-			{
-				// ProjectData.SetProjectError(exception17);
-				Exception exception8 = exception17;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set BorderColor and CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-				this.TestedControl.ControlStyle.BorderColor = Color.Silver;
-			}
-			catch (Exception exception18)
-			{
-				// ProjectData.SetProjectError(exception18);
-				Exception exception9 = exception18;
-				this.GHTSubTestUnexpectedExceptionCaught(exception9);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx
deleted file mode 100644
index 5d76b3bf784..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_CssClass.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_CssClass" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_CssClass</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> 
-			.CssClass1 { FONT-WEIGHT: bold; FONT-SIZE: xx-small; VERTICAL-ALIGN: super; TEXT-TRANSFORM: uppercase; COLOR: blue; FONT-STYLE: italic; FONT-FAMILY: Aharoni, Andalus; POSITION: static; BACKGROUND-COLOR: gray; TEXT-ALIGN: left; FONT-VARIANT: normal; TEXT-DECORATION: underline}
-			.CssClass2 { FONT-WEIGHT: normal; FONT-SIZE: xx-large; VERTICAL-ALIGN: sub; TEXT-TRANSFORM: lowercase; COLOR: teal; FONT-STYLE: normal; FONT-FAMILY: 'Arial Black', Batang; BACKGROUND-COLOR: yellow; TEXT-ALIGN: right; FONT-VARIANT: normal; TEXT-DECORATION: overline line-through}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx.cs
deleted file mode 100644
index dd3c2ea4a70..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_CssClass
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "CssClass1");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "CssClass2");
-				this.TestedControl.ControlStyle.CssClass = "CssClass2";
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Empty string");
-				this.TestedControl.ControlStyle.CssClass = "Empty string";
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Non existing CssClass");
-				this.TestedControl.ControlStyle.CssClass = "Non existing CssClass";
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx
deleted file mode 100644
index e2ecd04572c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_Bold.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_Bold" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_Bold</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> 
-			.CssClass1 { FONT-WEIGHT: bold}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx.cs
deleted file mode 100644
index 8e067b0900c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_Font_Bold
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Bold = true.");
-				this.TestedControl.ControlStyle.Font.Bold = true;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Bold = False.");
-				this.TestedControl.ControlStyle.Font.Bold = false;
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set twice.");
-				this.TestedControl.ControlStyle.Font.Bold = true;
-				this.TestedControl.ControlStyle.Font.Bold = false;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Bold + CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-				this.TestedControl.ControlStyle.Font.Bold = false;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx
deleted file mode 100644
index 906010e054f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_Italic.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_Italic" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_Italic</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.CssClass1{FONT-STYLE: italic}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx.cs
deleted file mode 100644
index 92df89c7387..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class WebControl_Style_Font_Italic
-        : GHTWebControlBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-	 private void Test(Type ctrlType)
-	 {
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Italic = true.");
-			 this.TestedControl.ControlStyle.Font.Italic = true;
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Italic = False.");
-			 this.TestedControl.ControlStyle.Font.Italic = false;
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set twice.");
-			 this.TestedControl.ControlStyle.Font.Italic = true;
-			 this.TestedControl.ControlStyle.Font.Italic = false;
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set Italic + CssClass.");
-			 this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			 this.TestedControl.ControlStyle.Font.Italic = false;
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx
deleted file mode 100644
index af88ca43316..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_Name.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_Name" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_Name</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.NameCssClass {FONT-FAMILY: Aharoni}
-			.NamesCssClass {FONT-FAMILY: Aharoni, David, 'Courier New'}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx.cs
deleted file mode 100644
index b699b5f53b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_Font_Name
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			string[] textArray1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set a legal name.");
-				this.TestedControl.ControlStyle.Font.Name = "Arial";
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception1 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set a legal name twice.");
-				this.TestedControl.ControlStyle.Font.Name = "Arial";
-				this.TestedControl.ControlStyle.Font.Name = "David";
-			}
-			catch (Exception exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				Exception exception2 = exception15;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default is String.empty.");
-				this.GHTSubTestAddResult(this.TestedControl.ControlStyle.Font.Name);
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception3 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Null throws exception.");
-				this.TestedControl.ControlStyle.Font.Name = null;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception17)
-			{
-				// ProjectData.SetProjectError(exception17);
-				ArgumentException exception4 = exception17;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception18)
-			{
-				// ProjectData.SetProjectError(exception18);
-				Exception exception5 = exception18;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Name in code + Name in CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "NameCssClass";
-				this.TestedControl.ControlStyle.Font.Name = "Times New Roman";
-			}
-			catch (ArgumentException exception19)
-			{
-				// ProjectData.SetProjectError(exception19);
-				ArgumentException exception6 = exception19;
-				this.GHTSubTestExpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception20)
-			{
-				// ProjectData.SetProjectError(exception20);
-				Exception exception7 = exception20;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Name in code + Name in CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "NamesCssClass";
-				this.TestedControl.ControlStyle.Font.Name = "Times New Roman";
-			}
-			catch (ArgumentException exception21)
-			{
-				// ProjectData.SetProjectError(exception21);
-				ArgumentException exception8 = exception21;
-				this.GHTSubTestExpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception22)
-			{
-				// ProjectData.SetProjectError(exception22);
-				Exception exception9 = exception22;
-				this.GHTSubTestUnexpectedExceptionCaught(exception9);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Names, See that Name is changed accordingly.");
-				this.TestedControl.ControlStyle.Font.Name = "Times New Roman";
-				textArray1 = new string[] { "Aharoni", "Courier New", "David" } ;
-				this.TestedControl.ControlStyle.Font.Names = textArray1;
-				this.Compare(this.TestedControl.ControlStyle.Font.Name, this.TestedControl.ControlStyle.Font.Names[0]);
-			}
-			catch (ArgumentException exception23)
-			{
-				// ProjectData.SetProjectError(exception23);
-				ArgumentException exception10 = exception23;
-				this.GHTSubTestExpectedExceptionCaught(exception10);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception24)
-			{
-				// ProjectData.SetProjectError(exception24);
-				Exception exception11 = exception24;
-				this.GHTSubTestUnexpectedExceptionCaught(exception11);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Names, See that Name is changed accordingly.");
-				FontInfo info1 = this.TestedControl.ControlStyle.Font;
-				info1.Name = "Times New Roman";
-				textArray1 = new string[] { "Aharoni", "Courier New", "David" } ;
-				info1.Names = textArray1;
-				string text1 = info1.Names[0];
-				info1.Names[0] = info1.Names[1];
-				info1.Names[1] = text1;
-				info1 = null;
-				this.Compare(this.TestedControl.ControlStyle.Font.Name, this.TestedControl.ControlStyle.Font.Names[0]);
-			}
-			catch (ArgumentException exception25)
-			{
-				// ProjectData.SetProjectError(exception25);
-				ArgumentException exception12 = exception25;
-				this.GHTSubTestExpectedExceptionCaught(exception12);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception26)
-			{
-				// ProjectData.SetProjectError(exception26);
-				Exception exception13 = exception26;
-				this.GHTSubTestUnexpectedExceptionCaught(exception13);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx
deleted file mode 100644
index 8ea5584f6a0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx
+++ /dev/null
@@ -1,33 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_Names.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_Names" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_Names</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.NameCssClass {FONT-FAMILY: Aharoni}
-			.NamesCssClass {FONT-FAMILY: Aharoni, David, 'Courier New'}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx.cs
deleted file mode 100644
index 4b99e5d0d53..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_Font_Names
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-            GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			string[] textArray2;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set legal value");
-				textArray2 = new string[] { "David", "Times New Roman", "Courier New" } ;
-				this.TestedControl.ControlStyle.Font.Names = textArray2;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception1 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Change Order");
-				FontInfo info1 = this.TestedControl.ControlStyle.Font;
-				textArray2 = new string[] { "David", "Times New Roman", "Courier New" } ;
-				info1.Names = textArray2;
-				string text1 = info1.Names[1];
-				info1.Names[1] = info1.Names[0];
-				info1.Names[0] = text1;
-				info1 = null;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception2 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Setting Name changes Names.");
-				textArray2 = new string[] { "David", "Times New Roman", "Courier New" } ;
-				this.TestedControl.ControlStyle.Font.Names = textArray2;
-				this.TestedControl.ControlStyle.Font.Name = "Arial";
-				string text2 = string.Empty;
-				string[] textArray1 = this.TestedControl.ControlStyle.Font.Names;
-				for (int num1 = 0; num1 < textArray1.Length; num1++)
-				{
-					string text3 = textArray1[num1];
-					text2 = text2 + text3;
-				}
-				this.Compare(text2, this.TestedControl.ControlStyle.Font.Name);
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception3 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Names in code + Names in CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "NamesCssClass";
-				textArray2 = new string[] { "Times New Roman", "Arial", "Courier New" } ;
-				this.TestedControl.ControlStyle.Font.Names = textArray2;
-			}
-			catch (ArgumentException exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				ArgumentException exception4 = exception11;
-				this.GHTSubTestExpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception5 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set Names in code + Name in CssClass.");
-				this.TestedControl.ControlStyle.CssClass = "NameCssClass";
-				textArray2 = new string[] { "Times New Roman", "Arial", "Courier New" } ;
-				this.TestedControl.ControlStyle.Font.Names = textArray2;
-			}
-			catch (ArgumentException exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				ArgumentException exception6 = exception13;
-				this.GHTSubTestExpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception7 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx
deleted file mode 100644
index ad3d2747d89..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_OverLine.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_OverLine" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_OverLine</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.CssClass1{TEXT-DECORATION: overline}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx.cs
deleted file mode 100644
index 2c2f1070cea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class WebControl_Style_Font_OverLine
-        : GHTWebControlBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-	 private void Test(Type ctrlType)
-	 {
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Overline = true.");
-			 this.TestedControl.ControlStyle.Font.Overline = true;
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Overline = False.");
-			 this.TestedControl.ControlStyle.Font.Overline = false;
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set twice.");
-			 this.TestedControl.ControlStyle.Font.Overline = true;
-			 this.TestedControl.ControlStyle.Font.Overline = false;
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set Overline + CssClass.");
-			 this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			 this.TestedControl.ControlStyle.Font.Overline = false;
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx
deleted file mode 100644
index 129cac076f5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_Size.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_Size" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_Size</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> .CssClass1{FONT-SIZE: 12px}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx.cs
deleted file mode 100644
index fdea2ec22f8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_Font_Size
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			FontUnit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set legal absolute size.");
-				unit1 = new FontUnit(12);
-				this.TestedControl.ControlStyle.Font.Size = unit1;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception1 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set legal relative size.");
-				unit1 = new FontUnit(FontSize.Larger);
-				this.TestedControl.ControlStyle.Font.Size = unit1;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception2 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to negative size.");
-				unit1 = new FontUnit(-10);
-				this.TestedControl.ControlStyle.Font.Size = unit1;
-				this.GHTSubTestExpectedExceptionNotCaught("argumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				ArgumentOutOfRangeException exception3 = exception9;
-				this.GHTSubTestExpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception4 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to zero.");
-				unit1 = new FontUnit(FontSize.NotSet);
-				this.TestedControl.ControlStyle.Font.Size = unit1;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception5 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set size in code and in CssClass.");
-				unit1 = new FontUnit(0x19);
-				this.TestedControl.ControlStyle.Font.Size = unit1;
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception6 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx
deleted file mode 100644
index 09c65a1fdf4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_StrikeOut.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_StrikeOut" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_StrikeOut</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.CssClass1{TEXT-DECORATION: line-through}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server" >
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx.cs
deleted file mode 100644
index 592d4d82313..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class WebControl_Style_Font_StrikeOut
-        : GHTWebControlBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-	 private void Test(Type ctrlType)
-	 {
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "StrikOut = true.");
-			 this.TestedControl.ControlStyle.Font.Strikeout = true;
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "StrikeOut = False.");
-			 this.TestedControl.ControlStyle.Font.Strikeout = false;
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set twice.");
-			 this.TestedControl.ControlStyle.Font.Strikeout = true;
-			 this.TestedControl.ControlStyle.Font.Strikeout = false;
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set StrikeOut + CssClass.");
-			 this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			 this.TestedControl.ControlStyle.Font.Strikeout = false;
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx
deleted file mode 100644
index 4009414a718..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Font_UnderLine.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Font_UnderLine" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Font_UnderLine</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.CssClass1{TEXT-DECORATION: underline}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx.cs
deleted file mode 100644
index 8b75fcaaf2b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class WebControl_Style_Font_UnderLine
-        : GHTWebControlBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-	 private void Test(Type ctrlType)
-	 {
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "UnderLine = true.");
-			 this.TestedControl.ControlStyle.Font.Underline = true;
-		 }
-		 catch (Exception exception5)
-		 {
-			 // ProjectData.SetProjectError(exception5);
-			 Exception exception1 = exception5;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "UnderLine = False.");
-			 this.TestedControl.ControlStyle.Font.Underline = false;
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception2 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set twice.");
-			 this.TestedControl.ControlStyle.Font.Underline = true;
-			 this.TestedControl.ControlStyle.Font.Underline = false;
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception3 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set UnderLine + CssClass.");
-			 this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			 this.TestedControl.ControlStyle.Font.Underline = false;
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception4 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx
deleted file mode 100644
index b46267a1f6b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_ForeColor.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_ForeColor" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_ForeColor</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> 
-			.CssClass1 { COLOR: gray;}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server" >
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx.cs
deleted file mode 100644
index cee08bc861c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Drawing;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class WebControl_Style_ForeColor
-        : GHTWebControlBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-        // This tests that the style attribute renders o.k. on all  webcontrols.
-	 private void Test(Type ctrlType)
-	 {
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set color once");
-			 this.TestedControl.ControlStyle.ForeColor = Color.Cyan;
-		 }
-		 catch (Exception exception6)
-		 {
-			 // ProjectData.SetProjectError(exception6);
-			 Exception exception1 = exception6;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set color twice");
-			 this.TestedControl.ControlStyle.ForeColor = Color.Cyan;
-			 this.TestedControl.ControlStyle.ForeColor = Color.Purple;
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception2 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set empty color.");
-			 this.TestedControl.ControlStyle.ForeColor = Color.RoyalBlue;
-			 this.TestedControl.ControlStyle.ForeColor = Color.Empty;
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception3 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set transparent color.");
-			 this.TestedControl.ControlStyle.ForeColor = Color.ForestGreen;
-			 this.TestedControl.ControlStyle.ForeColor = Color.Transparent;
-		 }
-		 catch (Exception exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 Exception exception4 = exception9;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set color and CssClass.");
-			 this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			 this.TestedControl.ControlStyle.ForeColor = Color.ForestGreen;
-		 }
-		 catch (Exception exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 Exception exception5 = exception10;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx
deleted file mode 100644
index 22065242672..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Hight.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Hight" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Hight</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style> .CssClass1{ HEIGHT: 10px }
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx.cs
deleted file mode 100644
index e1496804397..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_Style_Hight
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Legal value");
-				unit1 = new Unit(30);
-				this.TestedControl.ControlStyle.Height = unit1;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception1 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set twice");
-				unit1 = new Unit(30);
-				this.TestedControl.ControlStyle.Height = unit1;
-				unit1 = new Unit(10);
-				this.TestedControl.ControlStyle.Height = unit1;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception2 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to 0");
-				unit1 = new Unit(0);
-				this.TestedControl.ControlStyle.Height = unit1;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception3 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set to negative value");
-				unit1 = new Unit(-10);
-				this.TestedControl.ControlStyle.Height = unit1;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				ArgumentOutOfRangeException exception4 = exception10;
-				this.GHTSubTestExpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception5 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set height and a CssClass");
-				this.TestedControl.ControlStyle.CssClass = "CssClass1";
-				unit1 = new Unit(30);
-				this.TestedControl.ControlStyle.Height = unit1;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception6 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx
deleted file mode 100644
index 46d2eb8da0f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Style_Width.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Style_Width" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Style_Width</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-			<style> .CssClass1{ WIDTH: 10px }
-		</style>
-</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx.cs
deleted file mode 100644
index 73bd2d43093..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{public class WebControl_Style_Width
-        : GHTWebControlBase
- {
-	 #region Web Form Designer generated code
-	 override protected void OnInit(EventArgs e) {
-		 //
-		 // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-		 //
-		 InitializeComponent();
-		 base.OnInit(e);
-	 }
-		
-	 /// <summary>
-	 /// Required method for Designer support - do not modify
-	 /// the contents of this method with the code editor.
-	 /// </summary>
-	 private void InitializeComponent() {    
-		 this.Load += new System.EventHandler(this.Page_Load);
-	 }
-	 #endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-	 private void Test(Type ctrlType)
-	 {
-		 Unit unit1;
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Legal value");
-			 unit1 = new Unit(30);
-			 this.TestedControl.ControlStyle.Width = unit1;
-		 }
-		 catch (Exception exception7)
-		 {
-			 // ProjectData.SetProjectError(exception7);
-			 Exception exception1 = exception7;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception1);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set twice");
-			 unit1 = new Unit(30);
-			 this.TestedControl.ControlStyle.Width = unit1;
-			 unit1 = new Unit(10);
-			 this.TestedControl.ControlStyle.Width = unit1;
-		 }
-		 catch (Exception exception8)
-		 {
-			 // ProjectData.SetProjectError(exception8);
-			 Exception exception2 = exception8;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception2);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set to 0");
-			 unit1 = new Unit(0);
-			 this.TestedControl.ControlStyle.Width = unit1;
-		 }
-		 catch (Exception exception9)
-		 {
-			 // ProjectData.SetProjectError(exception9);
-			 Exception exception3 = exception9;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception3);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set to negative value");
-			 unit1 = new Unit(-10);
-			 this.TestedControl.ControlStyle.Width = unit1;
-			 this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-		 }
-		 catch (ArgumentOutOfRangeException exception10)
-		 {
-			 // ProjectData.SetProjectError(exception10);
-			 ArgumentOutOfRangeException exception4 = exception10;
-			 this.GHTSubTestExpectedExceptionCaught(exception4);
-			 // ProjectData.ClearProjectError();
-		 }
-		 catch (Exception exception11)
-		 {
-			 // ProjectData.SetProjectError(exception11);
-			 Exception exception5 = exception11;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception5);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-		 try
-		 {
-			 this.GHTSubTestBegin(ctrlType, "Set Width and a CssClass");
-			 this.TestedControl.ControlStyle.CssClass = "CssClass1";
-			 unit1 = new Unit(30);
-			 this.TestedControl.ControlStyle.Width = unit1;
-		 }
-		 catch (Exception exception12)
-		 {
-			 // ProjectData.SetProjectError(exception12);
-			 Exception exception6 = exception12;
-			 this.GHTSubTestUnexpectedExceptionCaught(exception6);
-			 // ProjectData.ClearProjectError();
-		 }
-		 this.GHTSubTestEnd();
-	 }
- 
- }
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx
deleted file mode 100644
index 33c798f896e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TabIndex.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TabIndex" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TabIndex</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx.cs
deleted file mode 100644
index 4a0a93628c0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_TabIndex
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        private void Page_Load(object sender, System.EventArgs e) {
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			int num1 = 11;
-			Type[] typeArray1 = this.TypesToTest;
-			for (int num2 = 0; num2 < typeArray1.Length; num2++)
-			{
-				Type type1 = typeArray1[num2];
-				this.GHTHeader(type1.ToString());
-				this.Test(ref type1, ref num1);
-			}
-			this.GHTTestEnd();
-		}
-
-		private void Test(ref Type ctrlType, ref int conseqIndex)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Valid value - Positive");
-				this.TestedControl.TabIndex = 10;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Valid value - Negative");
-				this.TestedControl.TabIndex = -5;
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default value");
-				this.GHTSubTestAddResult("Tab index = " + this.TestedControl.TabIndex.ToString());
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception3 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Controls with consecutive numbers");
-				this.TestedControl.TabIndex = (short) (conseqIndex + 1);
-				this.GHTActiveSubtestControlClone(ctrlType, true);
-				this.TestedControl.TabIndex = (short) conseqIndex;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			finally
-			{
-				conseqIndex += 2;
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx
deleted file mode 100644
index 15b795440f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableItemStyle_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableItemStyle_HorizontalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableItemStyle_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx.cs
deleted file mode 100644
index 351e2ef9f50..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_TableItemStyle_HorizontalAlign
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-        //Overrides GHTWebControlBase.InitTypes
-        //This method initializes the types that will be contained in the TypesToTest array.
-        //This only controls that are relevant for TableItemStyle will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(TableRow));
-			base.m_derivedTypes.Add(typeof(TableCell));
-			base.m_derivedTypes.Add(typeof(DataListItem));
-		}
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm form1 = (HtmlForm) (HtmlForm)this.FindControl("Form1");
-			this.GHTTestBegin(form1);
-			Type[] typeArray1 = this.TypesToTest;
-			for (int num1 = 0; num1 < typeArray1.Length; num1++)
-			{
-				Type type1 = typeArray1[num1];
-				this.GHTHeader(type1.ToString());
-				this.Test(type1);
-			}
-			this.GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			TableItemStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Test default value.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(((int) style1.HorizontalAlign).ToString());
-			}
-			catch (Exception exception9)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception9);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Center'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Center;
-			}
-			catch (Exception exception10)
-			{
-				this.GHTSubTestUnexpectedExceptionCaught(exception10);
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Justify'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Justify;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception3 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Left'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Left;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception4 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'NotSet'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.NotSet;
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception5 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Right'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Right;
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception6 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Throws exception for illegal HorizontalAlign values.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = (HorizontalAlign) 13;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				ArgumentException exception7 = exception15;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception8 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx
deleted file mode 100644
index c7784225d32..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableItemStyle_VerticalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableItemStyle_VerticalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableItemStyle_VerticalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx.cs
deleted file mode 100644
index 4cb8da918fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_TableItemStyle_VerticalAlign
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-        // Overrides GHTWebControlBase.InitTypes
-        // This method initializes the types that will be contained in the TypesToTest array.
-        // This only controls that are relevant for TableItemStyle, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(TableRow));
-			base.m_derivedTypes.Add(typeof(TableCell));
-			base.m_derivedTypes.Add(typeof(DataListItem));
-		}
- 
-
-        private void Page_Load(object sender, System.EventArgs e) 
-		{
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			TableItemStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Test default value.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(((int) style1.VerticalAlign).ToString());
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception1 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Bottom'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.VerticalAlign = VerticalAlign.Bottom;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception2 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Middle'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.VerticalAlign = VerticalAlign.Middle;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception3 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'NotSet'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.VerticalAlign = VerticalAlign.NotSet;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception4 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Top'.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.VerticalAlign = VerticalAlign.Top;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception5 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Throws exception for illegal VerticalAlign values.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.VerticalAlign = (VerticalAlign) 11;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				// ArgumentException exception6 = exception13;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception7 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx
deleted file mode 100644
index 6404905d220..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableItemStyle_Wrap.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableItemStyle_Wrap" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableItemStyle_Wrap</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx.cs
deleted file mode 100644
index 93cf1b6552a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_TableItemStyle_Wrap
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-        //Overrides GHTWebControlBase.InitTypes
-        //This method initializes the types that will be contained in the TypesToTest array.
-        //This only controls that TableItemStyle is relevant for, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(TableRow));
-			base.m_derivedTypes.Add(typeof(TableCell));
-			base.m_derivedTypes.Add(typeof(DataListItem));
-		}
- 
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			TableItemStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set True.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.Wrap = true;
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception1 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set False.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				style1.Wrap = false;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception2 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Get default value.");
-				style1 = (TableItemStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(style1.Wrap.ToString());
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception3 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx
deleted file mode 100644
index 76111b81e0f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableStyle_BackImageUrl.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableStyle_BackImageUrl" %>
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableStyle_BackImageUrl</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.CssClass1{BACKGROUND-IMAGE: url(http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/WebControl/cat.jpg)}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server" >
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx.cs
deleted file mode 100644
index 37b5fc650f0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_TableStyle_BackImageUrl
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        //Overrides GHTWebControlBase.InitTypes
-        //This method initializes the types that will be contained in the TypesToTest array.
-        //This only controls that TableStyle is relevant for, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(RadioButtonList));
-			base.m_derivedTypes.Add(typeof(CheckBoxList));
-			base.m_derivedTypes.Add(typeof(DataGrid));
-			base.m_derivedTypes.Add(typeof(DataList));
-			base.m_derivedTypes.Add(typeof(Table));
-		}
- 
-
-
-        private void Page_Load(object sender, System.EventArgs e) 
-		{
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Relative path");
-				TableStyle style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.BackImageUrl = "cat.jpg";
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception1 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "absolute path");
-				TableStyle style2 = (TableStyle) this.TestedControl.ControlStyle;
-				style2.BackImageUrl = "http://localhost:/System_Web_dll/System_Web_UI_WebControls/WebControl/cat.jpg";
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception2 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Defied only in CssClass");
-				TableStyle style3 = (TableStyle) this.TestedControl.ControlStyle;
-				style3.CssClass = "CssClass1";
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception3 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Defied only in CssClass");
-				TableStyle style4 = (TableStyle) this.TestedControl.ControlStyle;
-				style4.CssClass = "CssClass1";
-				style4.BackImageUrl = "http://localhost:/System_Web_dll/System_Web_UI_WebControls/WebControl/dog.jpg";
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception4 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default value");
-				TableStyle style5 = (TableStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(style5.BackImageUrl);
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception5 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Throws exception on null value");
-				TableStyle style6 = (TableStyle) this.TestedControl.ControlStyle;
-				style6.BackImageUrl = null;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentNullException");
-			}
-			catch (ArgumentNullException exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				ArgumentNullException exception6 = exception13;
-				this.GHTSubTestExpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception7 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx
deleted file mode 100644
index c968deccf53..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableStyle_CellPadding.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableStyle_CellPadding" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableStyle_CellPadding</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-		<style>
-			.CssClass1{PADDING-RIGHT: 5px; PADDING-LEFT: 5px; PADDING-BOTTOM: 5px; PADDING-TOP: 5px}
-		</style>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx.cs
deleted file mode 100644
index 46b734f2006..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_TableStyle_CellPadding
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		//Overrides GHTWebControlBase.InitTypes
-		//This method initializes the types that will be contained in the TypesToTest array.
-		//This only controls that TableStyle is relevant for, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(RadioButtonList));
-			base.m_derivedTypes.Add(typeof(CheckBoxList));
-			base.m_derivedTypes.Add(typeof(DataGrid));
-			base.m_derivedTypes.Add(typeof(DataList));
-			base.m_derivedTypes.Add(typeof(Table));
-		}
- 
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			TableStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Legal value.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellPadding = 10;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception1 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Zero.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellPadding = 0;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception2 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "-1.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellPadding = -1;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception3 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "check that default is -1.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(style1.CellPadding.ToString());
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception4 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set only in CssClass.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CssClass = "CssClass1";
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception5 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set both in CssClass and in code.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CssClass = "CssClass1";
-				style1.CellPadding = 20;
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception6 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Throws an exception if set to less then -1.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellPadding = -2;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				ArgumentOutOfRangeException exception7 = exception15;
-				this.GHTSubTestExpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception8 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx
deleted file mode 100644
index 4b76b82f363..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableStyle_CellSpacing.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableStyle_CellSpacing" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableStyle_CellSpacing</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx.cs
deleted file mode 100644
index 492107e673f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_TableStyle_CellSpacing
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		//Overrides GHTWebControlBase.InitTypes
-		//This method initializes the types that will be contained in the TypesToTest array.
-		//This only controls that TableStyle is relevant for, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(RadioButtonList));
-			base.m_derivedTypes.Add(typeof(CheckBoxList));
-			base.m_derivedTypes.Add(typeof(DataGrid));
-			base.m_derivedTypes.Add(typeof(DataList));
-			base.m_derivedTypes.Add(typeof(Table));
-		}
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			TableStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Legal value.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellSpacing = 10;
-			}
-			catch (Exception exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				Exception exception1 = exception7;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Zero.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellSpacing = 0;
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception2 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "-1.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellSpacing = -1;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception3 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "check that default is -1.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(style1.CellSpacing.ToString());
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception4 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Throws an exception if set to less then -1.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.CellSpacing = -2;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				ArgumentOutOfRangeException exception5 = exception11;
-				this.GHTSubTestExpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception6 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx
deleted file mode 100644
index 18823da1065..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableStyle_GridLines.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableStyle_GridLines" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableStyle_GridLines</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx.cs
deleted file mode 100644
index 538bf107285..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_TableStyle_GridLines
-        : GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-        //Overrides GHTWebControlBase.InitTypes
-        //This method initializes the types that will be contained in the TypesToTest array.
-        //This only controls that TableStyle is relevant for, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(RadioButtonList));
-			base.m_derivedTypes.Add(typeof(CheckBoxList));
-			base.m_derivedTypes.Add(typeof(DataGrid));
-			base.m_derivedTypes.Add(typeof(DataList));
-			base.m_derivedTypes.Add(typeof(Table));
-		}
- 
-
-        private void Page_Load(object sender, System.EventArgs e) 
-		{
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-        }
-
-		private void Test(Type ctrlType)
-		{
-			TableStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default value");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(((int) style1.GridLines).ToString());
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception1 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Both'");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.GridLines = GridLines.Both;
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception2 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Horizontal'");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.GridLines = GridLines.Horizontal;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception3 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'None'");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.GridLines = GridLines.None;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception4 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Vertical'");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.GridLines = GridLines.Vertical;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception5 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Causes ArgumentException if set to a non-valid GridLine value.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.GridLines = (GridLines) 12;
-				this.GHTSubTestExpectedExceptionNotCaught("argumentException");
-			}
-			catch (ArgumentException exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				ArgumentException exception6 = exception13;
-				this.GHTSubTestExpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception7 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx
deleted file mode 100644
index 1ea6842cf5e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_TableStyle_HorizontalAlign.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_TableStyle_HorizontalAlign" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_TableStyle_HorizontalAlign</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx.cs
deleted file mode 100644
index 892a55c73d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.Collections;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_TableStyle_HorizontalAlign
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-		//Overrides GHTWebControlBase.InitTypes
-		//This method initializes the types that will be contained in the TypesToTest array.
-		//This only controls that TableStyle is relevant for, will be tested.
-		protected override void InitTypes()
-		{
-			base.m_derivedTypes = new ArrayList();
-			base.m_derivedTypes.Add(typeof(RadioButtonList));
-			base.m_derivedTypes.Add(typeof(CheckBoxList));
-			base.m_derivedTypes.Add(typeof(DataGrid));
-			base.m_derivedTypes.Add(typeof(DataList));
-			base.m_derivedTypes.Add(typeof(Table));
-		}
- 
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			TableStyle style1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default value", false);
-				this.AddTestedControlToPage();
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				this.GHTSubTestAddResult(((int) style1.HorizontalAlign).ToString());
-			}
-			catch (Exception exception9)
-			{
-				// ProjectData.SetProjectError(exception9);
-				Exception exception1 = exception9;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Center'", false);
-				this.AddTestedControlToPage();
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Center;
-			}
-			catch (Exception exception10)
-			{
-				// ProjectData.SetProjectError(exception10);
-				Exception exception2 = exception10;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Justify'", false);
-				this.AddTestedControlToPage();
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Justify;
-			}
-			catch (Exception exception11)
-			{
-				// ProjectData.SetProjectError(exception11);
-				Exception exception3 = exception11;
-				this.GHTSubTestUnexpectedExceptionCaught(exception3);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Left'", false);
-				this.AddTestedControlToPage();
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Left;
-			}
-			catch (Exception exception12)
-			{
-				// ProjectData.SetProjectError(exception12);
-				Exception exception4 = exception12;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'NotSet'", false);
-				this.AddTestedControlToPage();
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.NotSet;
-			}
-			catch (Exception exception13)
-			{
-				// ProjectData.SetProjectError(exception13);
-				Exception exception5 = exception13;
-				this.GHTSubTestUnexpectedExceptionCaught(exception5);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Set 'Right'", false);
-				this.AddTestedControlToPage();
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = HorizontalAlign.Right;
-			}
-			catch (Exception exception14)
-			{
-				// ProjectData.SetProjectError(exception14);
-				Exception exception6 = exception14;
-				this.GHTSubTestUnexpectedExceptionCaught(exception6);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Causes ArgumentException if set to a non-valid GridLine value.");
-				style1 = (TableStyle) this.TestedControl.ControlStyle;
-				style1.HorizontalAlign = (HorizontalAlign) 13;
-				this.GHTSubTestExpectedExceptionNotCaught("argumentException");
-			}
-			catch (ArgumentException exception15)
-			{
-				// ProjectData.SetProjectError(exception15);
-				ArgumentException exception7 = exception15;
-				this.GHTSubTestExpectedExceptionCaught(exception7);
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception16)
-			{
-				// ProjectData.SetProjectError(exception16);
-				Exception exception8 = exception16;
-				this.GHTSubTestUnexpectedExceptionCaught(exception8);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-
-		//Adds the tested control to a HorizontalAlign, and the HorizontalAlign to the form.
-		//if the tested control is added directly to the form, then the HorizontalAlign property
-		//relates to the whole page, which causes the test to look bad.
-		private void AddTestedControlToPage()
-		{
-			Panel panel1 = new Panel();
-			Unit unit1 = new Unit(400);
-			panel1.Width = unit1;
-			base.GHTActiveForm.Controls.Add(panel1);
-			panel1.Controls.Add(this.TestedControl);
-		}
- 
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx
deleted file mode 100644
index 6c8f9154384..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_ToolTip.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_ToolTip" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_ToolTip</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx.cs
deleted file mode 100644
index 5f4b292ff28..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_ToolTip
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default value");
-				this.GHTSubTestAddResult(this.TestedControl.ToolTip);
-			}
-			catch (Exception exception3)
-			{
-				// ProjectData.SetProjectError(exception3);
-				Exception exception1 = exception3;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Valid value");
-				this.TestedControl.ToolTip = "ToolTip valid value";
-			}
-			catch (Exception exception4)
-			{
-				// ProjectData.SetProjectError(exception4);
-				Exception exception2 = exception4;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx
deleted file mode 100644
index aeba93a4500..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_Width.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_Width" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_Width</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx.cs
deleted file mode 100644
index 181c7b26b1a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-	public class WebControl_Width
-		: GHTWebControlBase
-	{
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) 
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() 
-		{    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-		private void Page_Load(object sender, System.EventArgs e) 
-		{
-			HtmlForm frm  = (HtmlForm)FindControl("Form1");
-			GHTTestBegin(frm);
-			foreach (Type currentType in TypesToTest)
-			{
-				GHTHeader(currentType.ToString());
-				Test(currentType);
-			}
-			GHTTestEnd();
-		}
-
-		private void Test(Type ctrlType)
-		{
-			Unit unit1;
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Valid value");
-				unit1 = new Unit(120);
-				this.TestedControl.Width = unit1;
-			}
-			catch (Exception exception5)
-			{
-				// ProjectData.SetProjectError(exception5);
-				Exception exception1 = exception5;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Default value");
-				unit1 = this.TestedControl.Width;
-				this.GHTSubTestAddResult("Default width = " + unit1.ToString());
-			}
-			catch (Exception exception6)
-			{
-				// ProjectData.SetProjectError(exception6);
-				Exception exception2 = exception6;
-				this.GHTSubTestUnexpectedExceptionCaught(exception2);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-			try
-			{
-				this.GHTSubTestBegin(ctrlType, "Negative value");
-				unit1 = new Unit(-10);
-				this.TestedControl.Width = unit1;
-				this.GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException exception7)
-			{
-				// ProjectData.SetProjectError(exception7);
-				// ArgumentException exception3 = exception7;
-				this.GHTSubTestAddResult("Test passed. Expected ArgumentException exception was caught.");
-				// ProjectData.ClearProjectError();
-			}
-			catch (Exception exception8)
-			{
-				// ProjectData.SetProjectError(exception8);
-				Exception exception4 = exception8;
-				this.GHTSubTestUnexpectedExceptionCaught(exception4);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx
deleted file mode 100644
index 3caaf3be364..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Register TagPrefix="cc1" Namespace="GHTWebControls" Assembly="MainsoftWebApp" %>
-<%@ Page Language="c#" AutoEventWireup="false" Codebehind="WebControl_ctor_H.aspx.cs" Inherits="GHTTests.System_Web_dll.System_Web_UI_WebControls.WebControl_ctor_H" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-	<HEAD>
-		<title>WebControl_ctor_H</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="Visual Basic .NET 7.1" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-		<script LANGUAGE="JavaScript">
-        function ScriptTest()
-        {
-            var theform;
-		    if (window.navigator.appName.toLowerCase().indexOf("netscape") > -1) {
-			    theform = document.forms["Form1"];
-		    }
-		    else {
-			    theform = document.Form1;
-		    }
-        }
-		</script>
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			&nbsp;
-		</form>
-	</body>
-</HTML>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx.cs
deleted file mode 100644
index 34d69dfe9ae..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//
-//
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace GHTTests.System_Web_dll.System_Web_UI_WebControls
-{
-    public class WebControl_ctor_H
-        : GHTBaseWeb {
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e) {
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent() {    
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		#endregion
-
-        int m_ctrlCounter = 0;
-        private void Page_Load(object sender, System.EventArgs e) {
-            HtmlForm frm  = (HtmlForm)FindControl("Form1");
-            GHTTestBegin(frm);
-			int num1 = 1;
-			do
-			{
-				if (!((num1 == 0x4f) | (num1 == 0x49)))
-				{
-					HtmlTextWriterTag tag1 = (HtmlTextWriterTag) num1;
-					this.Test(ref tag1);
-					num1 = (int) tag1;
-				}
-				num1++;
-			}
-			while (num1 <= 0x60);
-			GHTTestEnd();
-        }
-
-		private void Test(ref HtmlTextWriterTag testTag)
-		{
-			try
-			{
-				this.GHTSubTestBegin("Tag = " + ((HtmlTextWriterTag) testTag).ToString());
-				WebControl control1 = new WebControl(testTag);
-				this.m_ctrlCounter++;
-				control1.ID = "ctrl_" + this.m_ctrlCounter.ToString();
-				base.GHTActiveSubTest.Controls.Add(control1);
-			}
-			catch (Exception exception2)
-			{
-				// ProjectData.SetProjectError(exception2);
-				Exception exception1 = exception2;
-				this.GHTSubTestUnexpectedExceptionCaught(exception1);
-				// ProjectData.ClearProjectError();
-			}
-			this.GHTSubTestEnd();
-		}
- 	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/cat.jpg b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/cat.jpg
deleted file mode 100755
index 83d18b11e86..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/cat.jpg
+++ /dev/null
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/dog.jpg b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/dog.jpg
deleted file mode 100755
index 76db4962ea6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/System_Web_UI_WebControls/WebControl/dog.jpg
+++ /dev/null
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/WEB-INF/web.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/WEB-INF/web.xml
deleted file mode 100755
index e04615eafe7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/WEB-INF/web.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>

-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">

-<web-app>

-

-    <display-name>Visual MainWin application</display-name>

-    <description>Visual MainWin application.</description>

-

-    <listener>

-        <listener-class>system.Web.GH.SessionListener</listener-class>

-    </listener>

-    

-    <servlet>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <servlet-class>GhDynamicHttpServlet</servlet-class>

-        <init-param>

-            <param-name>EnableSessionPersistency</param-name>

-            <param-value>False</param-value>

-        </init-param>

-        <init-param>

-            <param-name>WebFileSystemAccess</param-name>

-            <param-value>Virtual</param-value>

-        </init-param>       

-    </servlet>

-    <servlet>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <servlet-class>GhStaticHttpServlet</servlet-class>

-    </servlet>

-

-    <servlet-mapping>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <url-pattern>*.aspx</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <url-pattern>*.asmx</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <url-pattern>*.invoke</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <url-pattern>*.soap</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <url-pattern>*.rem</url-pattern>

-    </servlet-mapping>

-

-   <servlet-mapping>

-        <servlet-name>VmwDynamicServlet</servlet-name>

-        <url-pattern>*.axd</url-pattern>

-    </servlet-mapping>

-

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.gif</url-pattern>

-    </servlet-mapping>

-    

-     <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.jpeg</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.jpg</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.png</url-pattern>

-    </servlet-mapping>

-

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.html</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.htm</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.bmp</url-pattern>

-    </servlet-mapping>

-

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.css</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.js</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.vbs</url-pattern>

-    </servlet-mapping>

-    

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.inc</url-pattern>

-    </servlet-mapping>

-

-    <servlet-mapping>

-        <servlet-name>VmwStaticServlet</servlet-name>

-        <url-pattern>*.swf</url-pattern>

-    </servlet-mapping>

-    

-    <session-config>

-        <session-timeout>20</session-timeout>

-    </session-config>

-    

-    <welcome-file-list>

-        <welcome-file>Default.aspx</welcome-file>

-    </welcome-file-list>

-    

-</web-app>

diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Web.config b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Web.config
deleted file mode 100644
index f603d1a63b4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Web.config
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <system.web>
-    <!--clientTarget>
-      <add alias="ie5" userAgent="Unknown" />
-    </clientTarget-->
-    <!--  DYNAMIC DEBUG COMPILATION
-          Set compilation debug="true" to enable ASPX debugging.  Otherwise, setting this value to
-          false will improve runtime performance of this application. 
-          Set compilation debug="true" to insert debugging symbols (.pdb information)
-          into the compiled page. Because this creates a larger file that executes
-          more slowly, you should set this value to true only when debugging and to
-          false at all other times. For more information, refer to the documentation about
-          debugging ASP.NET files.
-    -->
-    <compilation defaultLanguage="c#" debug="true" />
-    <!--  CUSTOM ERROR MESSAGES
-          Set customErrors mode="On" or "RemoteOnly" to enable custom error messages, "Off" to disable. 
-          Add <error> tags for each of the errors you want to handle.
-
-          "On" Always display custom (friendly) messages.
-          "Off" Always display detailed ASP.NET error information.
-          "RemoteOnly" Display custom (friendly) messages only to users not running 
-           on the local Web server. This setting is recommended for security purposes, so 
-           that you do not display application detail information to remote clients.
-    -->
-    <!-- customErrors mode="RemoteOnly" /-->
-    <!--  AUTHENTICATION 
-          This section sets the authentication policies of the application. Possible modes are "Windows", 
-          "Forms", "Passport" and "None"
-
-          "None" No authentication is performed. 
-          "Windows" IIS performs authentication (Basic, Digest, or Integrated Windows) according to 
-           its settings for the application. Anonymous access must be disabled in IIS. 
-          "Forms" You provide a custom form (Web page) for users to enter their credentials, and then 
-           you authenticate them in your application. A user credential token is stored in a cookie.
-          "Passport" Authentication is performed via a centralized authentication service provided
-           by Microsoft that offers a single logon and core profile services for member sites.
-    -->
-    <authentication mode="None" />
-    <!--  AUTHORIZATION 
-          This section sets the authorization policies of the application. You can allow or deny access
-          to application resources by user or role. Wildcards: "*" mean everyone, "?" means anonymous 
-          (unauthenticated) users.
-    -->
-    <authorization>
-      <allow users="*" />
-      <!-- Allow all users -->
-      <!--  <allow     users="[comma separated list of users]"
-                             roles="[comma separated list of roles]"/>
-                  <deny      users="[comma separated list of users]"
-                             roles="[comma separated list of roles]"/>
-            -->
-    </authorization>
-    <!--  APPLICATION-LEVEL TRACE LOGGING
-          Application-level tracing enables trace log output for every page within an application. 
-          Set trace enabled="true" to enable application trace logging.  If pageOutput="true", the
-          trace information will be displayed at the bottom of each page.  Otherwise, you can view the 
-          application trace log by browsing the "trace.axd" page from your web application
-          root. 
-    -->
-    <trace enabled="false" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <!--  SESSION STATE SETTINGS
-          By default ASP.NET uses cookies to identify which requests belong to a particular session. 
-          If cookies are not available, a session can be tracked by adding a session identifier to the URL. 
-          To disable cookies, set sessionState cookieless="true".
-    -->
-    <!-- sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" /-->
-    <!--  GLOBALIZATION
-          This section sets the globalization settings of the application. 
-    -->
-    <globalization requestEncoding="utf-8" responseEncoding="utf-8" />
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/make.sh b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/make.sh
deleted file mode 100755
index 036a7d4d36f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/make.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-mcs -out:./bin/MainsoftWebApp.dll -target:library -recurse:./*.cs -r:System.Web.dll -r:System.Data.dll -r:System.Drawing.dll
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/run.sh b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/run.sh
deleted file mode 100755
index 336f582be0b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-xsp --port 8088 --applications /MainsoftWebApp:./ --nonstop &
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHDataSources.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHDataSources.cs
deleted file mode 100644
index 25d275223a7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHDataSources.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Data;
-using System.Collections;
-
-namespace GHTTests
-{
-	/// <summary>
-	/// Summary description for GHDataSources.
-	/// </summary>
-	public class GHDataSources
-	{
-		public GHDataSources()
-		{
-			//
-			// TODO: Add constructor logic here
-			//
-		}
-		public static Array DSArray()
-		{
-			return new string[] { "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten" } ;
-		}
-		
-		public static ArrayList DSArrayHash()
-		{
-			ArrayList list1 = new ArrayList();
-			ArrayList list3 = DSArrayList();
-			IEnumerator enumerator1 = list3.GetEnumerator();
-			while (enumerator1.MoveNext())
-			{
-				Hashtable hashtable1 = new Hashtable();
-				hashtable1.Add("number", enumerator1.Current.ToString());
-				hashtable1.Add("number_up", enumerator1.Current.ToString().ToUpper());
-				hashtable1.Add("number_number", enumerator1.Current.ToString() + "_" + enumerator1.Current.ToString());
-				list1.Add(hashtable1);
-			}
-			return list1;
-		}
-		
-		public static ArrayList DSArrayList()
-		{
-			ArrayList list1 = new ArrayList();
-			list1.Add("one");
-			list1.Add("two");
-			list1.Add("three");
-			list1.Add("four");
-			list1.Add("five");
-			list1.Add("six");
-			list1.Add("seven");
-			list1.Add("eight");
-			list1.Add("nine");
-			list1.Add("ten");
-			return list1;
-		}
-
-		public static DataTable DSDataTable()
-		{
-			return DSDataTable(0, 1);
-		}
-		public static DataTable DSDataTable(int startPage, int pages)
-		{
-			return DSDataTable(startPage, pages, "");
-		}
-		public static DataTable DSDataTable(int startPage, int pages, string text)
-		{
-			return DSDataTable(startPage, pages, text, true);
-		}
-		public static DataTable DSDataTable(int startPage, int pages, string text, bool numPages)
-		{
-			DataTable table2 = new DataTable("Customers");
-			DataColumn column1 = table2.Columns.Add("ID", typeof(int));
-			column1.AllowDBNull = false;
-			column1.AutoIncrement = true;
-			column1.AutoIncrementSeed = 1;
-			column1.AutoIncrementStep = 1;
-			column1.Unique = true;
-			DataColumn[] columnArray1 = new DataColumn[] { column1 } ;
-			table2.PrimaryKey = columnArray1;
-			column1 = table2.Columns.Add("Name", typeof(string));
-			column1.MaxLength = 100;
-			column1.DefaultValue = "nobody";
-			column1 = table2.Columns.Add("Company", typeof(string));
-			column1.MaxLength = 100;
-			column1.DefaultValue = "nonexistent";
-			ArrayList list1 = DSArrayList();
-			IEnumerator enumerator1 = list1.GetEnumerator();
-			for (int i = startPage; i < startPage+pages; i++)
-			{
-				enumerator1.Reset();
-				while (enumerator1.MoveNext())
-				{
-					string page_num = "";
-					if (numPages)
-						page_num = i.ToString() + "_";
-
-					DataRow row1 = table2.NewRow();
-					row1["Name"] = text + "n_" + page_num + (string)(enumerator1.Current);
-					row1["Company"] = text + "c_" + page_num + (string)(enumerator1.Current);
-					table2.Rows.Add(row1);
-				}
-			}
-			return table2;
-		}
-
-		public static DataSet DSDataSet()
-		{
-			DataSet set1 = new DataSet("CustOrdersDS");
-			DataTable table1 = new DataTable("Customers");
-			set1.Tables.Add(table1);
-			DataTable table2 = new DataTable("Orders");
-			set1.Tables.Add(table2);
-			DataColumn column1 = table1.Columns.Add("ID", typeof(int));
-			column1.AllowDBNull = false;
-			column1.AutoIncrement = true;
-			column1.AutoIncrementSeed = 1;
-			column1.AutoIncrementStep = 1;
-			column1.Unique = true;
-			DataColumn[] columnArray1 = new DataColumn[] { column1 } ;
-			table1.PrimaryKey = columnArray1;
-			column1 = table1.Columns.Add("Name", typeof(string));
-			column1.MaxLength = 14;
-			column1.DefaultValue = "nobody";
-			column1 = table1.Columns.Add("Company", typeof(string));
-			column1.MaxLength = 14;
-			column1.DefaultValue = "nonexistent";
-			ArrayList list1 = DSArrayList();
-			IEnumerator enumerator1 = list1.GetEnumerator();
-			while (enumerator1.MoveNext())
-			{
-				DataRow row1 = table1.NewRow();
-				row1["Name"] = "n_" + (string)(enumerator1.Current);
-				row1["Company"] = "c_" + (string)(enumerator1.Current);
-				table1.Rows.Add(row1);
-			}
-			column1 = table2.Columns.Add("ID", typeof(int));
-			column1.AllowDBNull = false;
-			column1.AutoIncrement = true;
-			column1.AutoIncrementSeed = 1;
-			column1.AutoIncrementStep = 1;
-			column1.Unique = true;
-			table2.Columns.Add("CustID", typeof(int));
-			table2.Columns.Add("Date", typeof(DateTime));
-			table2.Columns.Add("Total", typeof(decimal));
-			int num1 = 1;
-			do
-			{
-				DataRow row2 = table2.NewRow();
-				row2["CustID"] = num1;
-				row2["Date"] = new DateTime(0x3aac5ed800);
-				row2["Total"] = num1 * num1;
-				table2.Rows.Add(row2);
-				num1++;
-			}
-			while (num1 <= 10);
-			columnArray1 = new DataColumn[] { column1 } ;
-			table2.PrimaryKey = columnArray1;
-			return set1;
-		}
-
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTBaseWeb.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTBaseWeb.cs
deleted file mode 100644
index ff0ff9ae741..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTBaseWeb.cs
+++ /dev/null
@@ -1,406 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-using GHTWebControls;
-
-namespace GHTTests
-{
-    /// <summary>
-    /// Summary description for GHTBaseWeb.
-    /// </summary>
-    public class GHTBaseWeb : System.Web.UI.Page
-    {
-        public HtmlForm GHTActiveForm;
-        public Control GHTActiveSubTest;
-        public int GHTActiveSubTestId = 0;
-
-        protected override void OnInit(System.EventArgs e)
-        {
-            base.OnInit(e);
-        }
-
-        /// <summary>
-        /// Save a reference to the Form.
-        /// </summary>
-        public virtual void GHTTestBegin(HtmlForm theForm)
-        {
-            GHTActiveForm = theForm;
-        }
-
-        /// <summary>
-        /// not implemented yet. use it as a stub
-        /// </summary>
-        public void GHTTestEnd()
-        {
-            
-        }
- 
-        /// <summary>
-        /// 
-        /// </summary>
-        public void GHTSubTestBegin()
-        {
-            GHTSubTestBegin("");
-        }
-        public void GHTSubTestBegin(string Description)
-        {
-            GHTSubTestCreateNew(Description);
-        }
-
-        /// <summary>
-        /// not implemented yet. use it as a stub
-        /// </summary>
-        public void GHTSubTestEnd()
-        {
-            
-        }
- 
-        /// <summary>
-        /// Add a result to Sub Test.
-        /// </summary>
-        /// <param name="SubTestControl">The SubTestControl to add the result to.</param>
-        /// <param name="TraceText">The text to add.</param>
-        /// <param name="asText">Whether to include as plain text, or to interpret special HTML charachters as HTML.</param>
-		public void GHTSubTestAddResult(Control SubTestControl, string TraceText, bool asText)
-        {
-			if (asText)
-			{
-				TraceText = GHTHtmlToText(TraceText);
-			}
-			
-			Label lbl = new Label();
-			lbl.Text = "<br>" + TraceText;
-			SubTestControl.Controls.Add(lbl);
-
-//				TableCell tempCell = new TableCell();
-//				TableRow tempRow = new TableRow();
-//				tempCell.Controls.Add( new LiteralControl(TraceText));
-//				tempRow.Controls.Add(tempCell); 
-//				SubTestControl.Controls.Add(tempRow);
-
-        }
-		public void GHTSubTestAddResult(string TraceText)
-		{
-			GHTSubTestAddResult(TraceText, false);
-		}
-		public void GHTSubTestAddResult(string TraceText, bool asText)
-		{
-			GHTSubTestAddResult(GHTActiveSubTest, TraceText, asText);
-		}
-		public void GHTSubTestAddResult(Control SubTestControl, string TraceText)
-		{
-			GHTSubTestAddResult(SubTestControl, TraceText,false);
-		}
-		// Replaces Html special charachters to escape charachters in the returned string:
-		// Orig --> Result
-		//-----		   ------
-		//  <				&lt;
-		//	 >				&gt;
-		//	 "				&quot;
-		// &				&amp;
-		public string GHTHtmlToText(string a_text)
-		{
-			string res = string.Empty;
-			res = a_text.Replace("<", "&lt;");
-			res = res.Replace(">", "&gt;");
-			res = res.Replace("\"", "&quot;");
-			return res;
-		}
-
-		protected void GHTSubTestExpectedExceptionCaught(System.Exception ex)
-		{
-			GHTSubTestAddResult("Test passed. Expected exception was caught.");
-		}
-		protected void GHTSubTestExpectedExceptionNotCaught(string ExceptionName)
-		{
-			GHTSubTestAddResult("Test failed. Expected " + ExceptionName + " exception was not caught.");
-		}
-		protected void GHTSubTestUnexpectedExceptionCaught(System.Exception ex)
-		{
-			string traceText = string.Empty;
-			traceText += "Test Failed. Unxpected ";
-			traceText += ex.GetType().Name;
-			traceText += " exception was caught";
-			traceText += "<br>Stack Trace: ";
-			traceText += ex.ToString();
-
-			GHTSubTestAddResult(traceText);
-		}
-
-		protected void Compare(Object Result, Object ExpectedResult)
-		{
-			if (Result.Equals(ExpectedResult))
-				GHTSubTestAddResult("Test Passed.");
-			else
-				GHTSubTestAddResult("Test Failed. Result:" + GHTNormalizeToString(Result.ToString()) + ". Expected Result:" + GHTNormalizeToString(ExpectedResult.ToString()));
-											 
-		}
-        /// <summary>
-        /// Create a new SubTest conteiner.
-        /// </summary>
-        protected GHTWebControls.GHTSubTest GHTSubTestCreateNew()
-        {
-            return GHTSubTestCreateNew("");
-        }
-        protected GHTWebControls.GHTSubTest GHTSubTestCreateNew(string Description)
-        {
-            return GHTSubTestCreateNew(GHTActiveForm, Description);
-        }
-        protected GHTWebControls.GHTSubTest GHTSubTestCreateNew(HtmlForm theForm, string Description)
-        {
-			if (GHTActiveSubTestId == 0)
-			{
-				GHTActiveSubTestId++;
-			}
-
-			while (theForm.FindControl("GHTSubTest" + GHTActiveSubTestId) != null)
-			{
-				GHTActiveSubTestId++;
-			}
-
-            GHTActiveForm = theForm;
-            GHTWebControls.GHTSubTest subtest = new GHTWebControls.GHTSubTest();
-            subtest.ID = "GHTSubTest" + GHTActiveSubTestId;
-			subtest.Description = Description;
-			subtest.Attributes.Add("TestName",Description);
-            theForm.Controls.Add(subtest);
-            GHTActiveSubTest = subtest;
-            return subtest;
-        }
-        
-        /// <summary>
-        /// Create a new Element (e.g. Control).
-        /// </summary>
-        protected Object GHTElementClone(Type type)
-        {
-            return type.GetConstructor(Type.EmptyTypes).Invoke(null);
-        }
-
-        /// <summary>
-        /// Common Tests of WebControl.
-        /// </summary>
-        protected void GHTTestCommon_WebControl(WebControl obj, string MemberName)
-        {
-            WebControl objNew;
-            bool bExceptionCaught = false;
-            MemberName = MemberName.ToLower();
-
-            //AccessKey
-            if (MemberName.CompareTo("AccessKey".ToLower())== 0)
-            {
-                //Press Alt-Y to get focus here
-                obj.AccessKey = ""; //empty is ok
-                obj.AccessKey = "Y";
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                // test Exceptions
-                try
-                {
-                    objNew.AccessKey = "XX";
-                    GHTActiveSubTest.Controls.Add(objNew);
-                }
-                catch (ArgumentException)
-                {
-                    bExceptionCaught = true;
-                }
-                if (bExceptionCaught == true)
-                {
-                    GHTSubTestAddResult(GHTActiveSubTest, MemberName + " ArgumentException OK");
-                }
-                bExceptionCaught = false;
-                
-            }
-
-            //Attributes tested at System.Web.UI.AttributeCollection
-
-            //BackColor
-            if (MemberName.CompareTo("BackColor".ToLower())== 0)
-            {
-                obj.BackColor = System.Drawing.Color.AliceBlue;
-                
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.BackColor = System.Drawing.Color.Magenta;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //BorderColor
-            if (MemberName.CompareTo("BorderColor".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.BorderColor = System.Drawing.Color.AliceBlue;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //BorderStyle
-            if (MemberName.CompareTo("BorderStyle".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.BorderStyle = System.Web.UI.WebControls.BorderStyle.Dotted;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //BorderWidth
-            if (MemberName.CompareTo("BorderWidth".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.BorderWidth = 10;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            // ControlStyle
-            // ControlStyleCreated
-            
-            //CssClass
-            if (MemberName.CompareTo("CssClass".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.CssClass = "zoobie";
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //Enabled
-            if (MemberName.CompareTo("Enabled".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.Enabled = true;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //Font
-            if (MemberName.CompareTo("Font".ToLower())== 0)
-            {
-                GHTSubTestAddResult(GHTActiveSubTest, MemberName + " " + obj.Font.ToString());
-            }
-
-            //ForeColor
-            if (MemberName.CompareTo("ForeColor".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.ForeColor = System.Drawing.Color.Cornsilk;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //Height
-            if (MemberName.CompareTo("Height".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.Height = 30;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //Style
-            if (MemberName.CompareTo("Style".ToLower())== 0)
-            {
-                GHTSubTestAddResult(GHTActiveSubTest, MemberName + " " + obj.Style.ToString());
-            }
-
-            //            if (MemberName.CompareTo("TagKey".ToLower())== 0)
-            //            {
-            //                obj.TagKey = "TagKey";
-            //            }
-            //            if (MemberName.CompareTo("TagName".ToLower())== 0)
-            //            {
-            //                obj.TagName = "TagName";
-            //            }
-
-            //TabIndex
-            if (MemberName.CompareTo("TabIndex".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.TabIndex = 2;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //ToolTip
-            if (MemberName.CompareTo("ToolTip".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.ToolTip = "ToolTip";
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-            //Width
-            if (MemberName.CompareTo("Width".ToLower())== 0)
-            {
-                objNew = (WebControl)GHTElementClone(obj.GetType());
-                objNew.Width = 60;
-                GHTActiveSubTest.Controls.Add(objNew);
-            }
-
-        }
-
-		protected void GHTHeader(string text)
-			{
-				Label  header = new Label();
-				header.Text = "<br>" + text + "<br>";
-				header.Font.Bold = true;
-				header.Font.Underline = true;
-				header.Font.Size = new FontUnit(FontSize.Larger);
-				GHTActiveForm.Controls.Add(header);
-			}
-
-		/// <summary>
-		/// Removes tarailing @... and preceding '_' from strings if they are found
-		/// </summary>
-		/// <param name="orig">The original ToString result.</param>
-		/// <returns>Normalized string.</returns>
-		public string GHTNormalizeToString(string a_toNormalize)
-		{
-			//Remove the @ at the end of the tostring.
-			int atIndex = a_toNormalize.LastIndexOf('@');
-			if (atIndex > -1)
-			{
-				a_toNormalize = a_toNormalize.Remove(atIndex, a_toNormalize.Length - atIndex);
-			}
-			//remove the preceding '_'
-			if (a_toNormalize.StartsWith("_") )
-			{
-				a_toNormalize = a_toNormalize.Substring(1);
-			}
-			return a_toNormalize;
-		}
-		/// <summary>
-		/// Returns the normalized to string of this page.
-		/// </summary>
-		/// <returns></returns>
-		public override string ToString()
-		{
-			return GHTNormalizeToString(base.ToString());
-		}
-    }
-}
-
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTControlBase.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTControlBase.cs
deleted file mode 100644
index 442fec97341..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTControlBase.cs
+++ /dev/null
@@ -1,905 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Web.UI;
-using System.Web.UI.HtmlControls;
-using System.Web.UI.WebControls;
-using System.Collections;
-using System.Data;
-
-namespace GHTTests
-{
-	/// <summary>
-	/// Provides basic functionalities for testing System.Web.UI.Control derived classes.
-	/// </summary>
-	public class GHTControlBase : GHTBaseWeb
-	{
-		#region "Data members"
-		protected Control m_cToTest;				//The control that is currently being tested.
-		protected TextBox m_tbToValidate;		//will be used by validation controls as the control to validate.
-		protected Item[] m_aDataSource;			//Array data source to use in data bound objects.
-		protected DataTable m_dtDataSource;//DataTable data source to use in data bound objects.
-		protected  ArrayList m_derivedTypes;	//The array that wil contain all types that are derived from Control, and need to be tested.
-		protected long m_controlsCounter;		//Used to generate a unique id for each of the controls created using GHTActiveSubTestControlClone
-		#endregion
-
-		#region "Construction"
-		/// <summary>
-		/// Default c'tor.
-		/// handles basic initialization of the page, and contents.
-		/// </summary>
-		public GHTControlBase()
-		{
-			InitTypes();
-			InitDataSource();
-			InitTbToValidate();
-			m_controlsCounter = 0;
-		}
-		#endregion
-
-		#region "Properties"
-		protected Control TestedControl
-		{
-			get
-			{
-				return m_cToTest;
-			}
-		}
-		public  Type[] TypesToTest
-		{
-			get
-			{
-				return (System.Type[])(m_derivedTypes.ToArray(typeof(System.Type)));
-			}
-		}
-		#endregion
-
-		#region "Methods"
-		/// <summary>
-		/// Initializes all the derived types that need to be tested.
-		/// </summary>
-		protected virtual  void InitTypes()
-		{
-			m_derivedTypes = new ArrayList();
-
-			//System.Web.UI:
-			//				typeof(System.Web.UI.PartialCachingControl),						Excluded from test.
-			//				typeof(System.Web.UI.StaticPartialCachingControl),		Excluded from test.
-			//				typeof(System.Web.UI.DataBoundLiteralControl),				Excluded from test.
-			m_derivedTypes.Add(typeof(System.Web.UI.LiteralControl));
-			m_derivedTypes.Add(typeof(System.Web.UI.Page));
-			m_derivedTypes.Add(typeof(System.Web.UI.UserControl));
-
-			//System.Web.UI.HtmlControls:
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlAnchor));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlButton));
-			//				typeof(System.Web.UI.HtmlControls.HtmlForm),				Excluded from test.
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlGenericControl));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlImage));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputCheckBox));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputFile));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputHidden));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputImage));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputRadioButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlInputText));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlSelect));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlTable));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlTableCell));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlTableRow));
-			m_derivedTypes.Add(typeof(System.Web.UI.HtmlControls.HtmlTextArea));
-
-			//System.Web.UI.WebControls basic:
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Button));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CheckBox));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.HyperLink));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Image));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.ImageButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Label));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.LinkButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Literal));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Panel));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.PlaceHolder));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RadioButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TextBox));
-
-			//System.Web.UI.WebControls basic list controls:
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DropDownList));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.ListBox));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RadioButtonList));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CheckBoxList));
-
-			//System.Web.UI.WebControls validation controls:
-#if KNOWN_BUG //BUG_NUM:935
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CompareValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CustomValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RangeValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RegularExpressionValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RequiredFieldValidator));
-#endif
-#if KNOWN_BUG //BUG_NUM:1195
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.ValidationSummary));
-#endif
-			//System.Web.UI.WebControls rich controls (currently not supported):
-//			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.AdRotator));
-//			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Calendar));
-
-			//System.Web.UI.WebControls advanced list controls:
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataGrid));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataGridItem));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataList));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataListItem));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Repeater));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RepeaterItem));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Table));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TableCell));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TableHeaderCell));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TableRow));
-			//m_derivedTypes.Add(typeof( System.Web.UI.WebControls.Xml));
-		}
-
-		/// <summary>
-		/// Adds a control to page.
-		/// If the control is in the context of other control (Have a parent) 
-		/// (e.g.) TableCell, then the parent control is added to the page.
-		/// </summary>
-		/// <param name="a_toAdd">The control to add to the page.</param>
-		protected void GHTAddToActiveForm(Control a_toAdd)
-		{
-			if (a_toAdd.Parent == null)
-			{
-				GHTActiveForm.Controls.Add(a_toAdd);
-			}
-			else
-			{
-				GHTAddToActiveForm(a_toAdd.Parent);
-			}
-		}
-		
-
-		/// <summary>
-		/// Creates a control to test, and adds it to a new subtest.
-		/// </summary>
-		/// <param name="ctrlType">Type of control to test.</param>
-		/// <param name="description">description to add to subtest.</param>
-		protected void GHTSubTestBegin(Type ctrlType, string description)
-		{
-			GHTSubTestBegin(ctrlType, description, true);
-		}
-
-		/// <summary>
-		/// Creates a new subtest, and a control to test.
-		/// </summary>
-		/// <param name="ctrlType">Type of control to test.</param>
-		/// <param name="description">description to add to subtest.</param>
-		/// <param name="a_AddToPage">Whether to add the control to the subtest continer.</param>
-		protected void GHTSubTestBegin(Type a_ctrlType, string description, bool a_addToPage)
-		{
-			base.GHTSubTestBegin(a_ctrlType.ToString() + ": " + description);
-			GHTActiveSubtestControlClone(a_ctrlType, a_addToPage);
-		}
-		/// <summary>
-		/// Clones a control within its context, and adds it to the active subtest.
-		/// e.g. if the control is a table cell, then a table will be created to wrap the table cell.
-		/// The table will be added to the active subtest, and the cell will be referened by m_m_cToTest.
-		/// </summary>
-		/// <param name="a_ctrlType">Type of control to test.</param>
-		/// <param name="a_addToPage">Whether to add the control to the subtest continer.</param>
-		protected void GHTActiveSubtestControlClone(Type a_ctrlType, bool a_addToPage)
-		{
-			if (IsListControlDerived(a_ctrlType))
-			{
-				m_cToTest = GetListControlDerived(a_ctrlType, a_addToPage);
-			}
-			else if (IsIterativeControlControl(a_ctrlType))
-			{
-				m_cToTest = GetIterativeControl(a_ctrlType, a_addToPage);
-			}
-			else if (IsIterativeControlControlItem(a_ctrlType))
-			{
-				m_cToTest = GetIterativeControlItem(a_ctrlType, a_addToPage);
-			}
-			else if (IsTableRelated(a_ctrlType))
-			{
-				m_cToTest = GetTableRelated(a_ctrlType, a_addToPage);
-			}
-			else if (IsHTMLTableRelated(a_ctrlType))
-			{
-				m_cToTest = GetHtmlTableRelated(a_ctrlType, a_addToPage);
-			}
-			else
-			{
-				m_cToTest = (Control)GHTElementClone(a_ctrlType);
-				if (a_addToPage)
-				{
-					GHTActiveSubTest.Controls.Add(m_cToTest);
-				}
-			}
-			HandleValidationControls();	
-			HandleCausesValidation();
-			SetId();	//Set a unique id to the control.
-		}
-
-		/// <summary>
-		/// checks if a given type is derived from ListControl, and thus should be bound to data in order to display content.
-		/// </summary>
-		/// <param name="ctrlType">The type to test.</param>
-		/// <returns>True if the ctrlType is derived from ListControl, otherwise false.</returns>
-		private bool IsListControlDerived(Type ctrlType)
-		{
-			return ctrlType.IsSubclassOf(typeof(ListControl));
-		}
-
-		/// <summary>
-		/// Creates a control of the specified type, if it is a ListControl derived, then bounds it to data source.
-		/// </summary>
-		/// <param name="ctrlType">Type of control to create.</param>
-		private Control GetListControlDerived(Type ctrlType, bool a_AddToPage)
-		{
-			ListControl l_listcontrol = GHTElementClone(ctrlType) as ListControl;
-			if (l_listcontrol != null)
-			{
-				l_listcontrol.DataSource = m_aDataSource;
-				l_listcontrol.DataTextField = "Description";
-				l_listcontrol.DataValueField = "Id";
-				l_listcontrol.DataBind();
-				if (a_AddToPage)
-				{
-					GHTActiveSubTest.Controls.Add(l_listcontrol);
-				}
-				return l_listcontrol;
-			}
-			else
-			{
-				throw new ArgumentOutOfRangeException("ctrlType", ctrlType, "Must be a ListControl derived type.");
-			}
-		}
-
-		/// <summary>
-		/// checks if a given type is an item of an iterative control, and thus should be checked in tis controls context.
-		/// </summary>
-		/// <param name="ctrlType">The type to test.</param>
-		/// <returns>True if the ctrlType is an iteative control item, otherwise false.</returns>
-		private bool IsIterativeControlControlItem(Type ctrlType)
-		{
-			if ( ctrlType.Equals(typeof(RepeaterItem)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(DataListItem)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(DataGridItem)))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Creates an iterative control Item, included inside an iterative control..
-		/// </summary>
-		/// <param name="ctrlType">Type of control to create.</param>
-		private Control GetIterativeControlItem(Type ctrlType, bool a_AddToPage)
-		{
-			if (ctrlType.Equals(typeof(RepeaterItem)))
-			{
-				Repeater l_rep = GetIterativeControl(typeof(Repeater), a_AddToPage) as Repeater;
-				SetId(l_rep);
-				return l_rep.Items[0];
-			}
-
-			if (ctrlType.Equals(typeof(DataListItem)))
-			{
-				DataList l_datalist = GetIterativeControl(typeof(DataList), a_AddToPage) as DataList;
-				SetId(l_datalist);
-				return l_datalist.Items[0];
-			}
-		
-			if (ctrlType.Equals(typeof(DataGridItem)))
-			{
-				DataGrid l_datagrid = GetIterativeControl(typeof(DataGrid), a_AddToPage) as DataGrid;
-				SetId(l_datagrid);
-				return l_datagrid.Items[0];
-			}
-			else
-			{
-				throw new ArgumentOutOfRangeException("ctrlType", ctrlType, "Allowed types are RepeaterItem, DataListItem or DataGridItem");
-			}
-		}
-
-		/// <summary>
-		/// Checks if a given type is an iterative control, and thus should be boud to data.
-		/// </summary>
-		/// <param name="ctrlType">The type to test.</param>
-		/// <returns>True if the ctrlType is an iteative control, otherwise false.</returns>
-		private bool IsIterativeControlControl(Type ctrlType)
-		{
-			if ( ctrlType.Equals(typeof(Repeater)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(DataList)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(DataGrid)))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Creates an iterative control.
-		/// </summary>
-		/// <param name="ctrlType">Type of control to create.</param>
-		protected Control GetIterativeControl(Type ctrlType, bool a_AddToPage)
-		{
-			if (ctrlType.Equals(typeof(Repeater)))
-			{
-					Repeater l_rep = new Repeater();
-					l_rep.ItemTemplate = new RepeaterTemplate();
-					l_rep.DataSource = m_aDataSource;
-					l_rep.DataBind();
-					if (a_AddToPage)
-					{
-						GHTActiveSubTest.Controls.Add(l_rep);
-					}
-					return l_rep;
-			}
-			else if (ctrlType.Equals(typeof(DataList)))
-			{
-				DataList l_dataList = new DataList();
-				l_dataList.ItemTemplate =  new DataListTemplate();
-				l_dataList.DataSource = m_aDataSource;
-				l_dataList.DataBind();
-				if (a_AddToPage)
-				{
-					GHTActiveSubTest.Controls.Add(l_dataList);
-				}
-				return l_dataList;
-			}
-			else if (ctrlType.Equals(typeof(DataGrid)))
-			{
-				DataGrid l_dataGrid = new DataGrid();
-				l_dataGrid.DataSource = m_dtDataSource;
-				l_dataGrid.DataBind();
-				if (a_AddToPage)
-				{
-					GHTActiveSubTest.Controls.Add(l_dataGrid);
-				}
-				return l_dataGrid;
-			}
-			else
-			{
-				throw new ArgumentOutOfRangeException("ctrlType", ctrlType, "Allowed types are Repeater, DataList or DataGrid");
-			}
-		}
-
-		/// <summary>
-		/// checks if a given type is a control that should be tested in the context of a HtmlTable.
-		/// </summary>
-		/// <param name="ctrlType">The type to test.</param>
-		/// <returns>True if the ctrlType is a HtmlTable related type, otherwise false.</returns>
-		private bool IsHTMLTableRelated(Type ctrlType)
-		{
-			if ( ctrlType.Equals(typeof(HtmlTable)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(HtmlTableRow)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(HtmlTableCell)))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Creates a new table, and adds it to the GHTActivesubTest.
-		/// </summary>
-		/// <param name="ctrlType">The type of the ctrl to test. must be one of </param>
-		/// <param name="description"></param>
-		/// <returns></returns>
-		protected Control GetHtmlTableRelated(Type ctrlType, bool a_AddToPage)
-		{
-			HtmlTable l_table = new HtmlTable();
-			HtmlTableRow l_row = new HtmlTableRow();
-			HtmlTableCell l_cell = new HtmlTableCell();
-			
-			if (a_AddToPage)
-			{
-				GHTActiveSubTest.Controls.Add(l_table);
-			}
-			l_table.Rows.Add(l_row);
-			l_row.Cells.Add(l_cell);			
-
-			l_cell.InnerText = "Cell";
-
-			if ( l_table.GetType() == ctrlType)
-			{
-				return l_table;
-			}
-			else if (l_row.GetType() == ctrlType)
-			{
-				return l_row;
-			}
-			else if (l_cell.GetType() == ctrlType)
-			{
-				return l_cell;
-			}
-			else
-			{
-				throw new ArgumentException("Should be HtmlTable related type.", "ctrlType = " + ctrlType.ToString() );
-			}
-
-		}
-		/// <summary>
-		/// checks if a given type is a control that should be tested in the context of a table.
-		/// </summary>
-		/// <param name="ctrlType">The type to test.</param>
-		/// <returns>True if the ctrlType is a table related type, otherwise false.</returns>
-		private bool IsTableRelated(Type ctrlType)
-		{
-			if ( ctrlType.Equals(typeof(Table)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(TableRow)))
-			{
-				return true;
-			}
-			else if (ctrlType.Equals(typeof(TableCell)))
-			{
-				return true;
-			}
-			else if(ctrlType.Equals(typeof(TableHeaderCell)))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Creates a new table, and adds it to the GHTActivesubTest.
-		/// </summary>
-		/// <param name="ctrlType">The type of the ctrl to test. must be one of </param>
-		/// <param name="description"></param>
-		/// <returns></returns>
-		protected Control GetTableRelated(Type ctrlType, bool a_AddToPage)
-		{
-			Table l_table = new Table();
-			TableRow l_headerRow = new TableRow();
-			TableRow l_row = new TableRow();
-			TableCell l_cell = new TableCell();
-			TableHeaderCell l_headerCell = new TableHeaderCell();
-			
-			if (a_AddToPage)
-			{
-				GHTActiveSubTest.Controls.Add(l_table);
-			}
-
-			l_table.Rows.Add(l_headerRow);
-			l_table.Rows.Add(l_row);
-
-			l_headerRow.Cells.Add(l_headerCell);
-			l_row.Cells.Add(l_cell);		
-	
-			l_headerCell.Text = "Header cell";
-			l_cell.Text = "Table cell";
-
-			if ( l_table.GetType() == ctrlType)
-			{
-				return l_table;
-			}
-			else if (l_row.GetType() == ctrlType)
-			{
-				return l_row;
-			}
-			else if (l_cell.GetType() == ctrlType)
-			{
-				return l_cell;
-			}
-			else if(l_headerCell.GetType() == ctrlType)
-			{
-				return l_headerCell;
-			}
-			else
-			{
-				throw new ArgumentException("Should be table related type.", "ctrlType = " + ctrlType.ToString() );
-			}
-
-		}
-
-		/// <summary>
-		/// All validation controls must be assigned a control to validate before the page is loaded:
-		/// </summary>
-		protected void HandleValidationControls(Control l_toTest)
-		{
-			BaseValidator l_validator = l_toTest as BaseValidator;
-			if (l_validator == null)
-			{
-				return;
-			}
-			l_validator.ControlToValidate = "m_tbToValidate";
-			HandleCompareValidator(l_toTest);
-		}
-		/// <summary>
-		/// All validation controls must be assigned a control to validate before the page is loaded:
-		/// </summary>
-		protected void HandleValidationControls()
-		{
-			HandleValidationControls(m_cToTest);
-		}
-
-		/// <summary>
-		/// Compare validator must have either ValueToCompare or ControlToCompare set, before the page is loaded.
-		/// </summary>
-		private void HandleCompareValidator(Control l_cToTest)
-		{
-			CompareValidator l_compareValidator = l_cToTest as CompareValidator;
-			if (l_compareValidator == null)
-			{
-				return;
-			}
-			l_compareValidator.ValueToCompare = "value to compare";
-		}
-		/// <summary>
-		/// Compare validator must have either ValueToCompare or ControlToCompare set, before the page is loaded.
-		/// </summary>
-		private void HandleCompareValidator()
-		{
-			HandleCompareValidator(m_cToTest);
-		}
-
-		/// <summary>
-		/// Sets the causes validation property to false, if such a property exists in the m_cToTest.
-		/// This is needed because for controls that cause validation, the ValidationControls on the page
-		/// generate a client side script.
-		/// That feature is not working properly in GrassHopper, and is not the main issue of this test.
-		/// It will be testes specificly in the Validation control tests.
-		/// </summary>
-		private void HandleCausesValidation()
-		{
-			//HtmlButton:
-			HtmlButton hButton  = m_cToTest as HtmlButton;
-			if (hButton != null)
-			{
-				hButton.CausesValidation = false;
-			}
-			//HtmlInputButton
-			HtmlInputButton hInputButton  = m_cToTest as HtmlInputButton;
-			if (hInputButton != null)
-			{
-				hInputButton.CausesValidation = false;
-			}
-			//HtmlInputImage
-			HtmlInputImage hInputImage = m_cToTest as HtmlInputImage;
-			if (hInputImage != null)
-			{
-				hInputImage.CausesValidation = false;
-			}
-			//Button:
-			Button button  = m_cToTest as Button;
-			if (button != null)
-			{
-				button.CausesValidation = false;
-			}
-			//ImageButton
-			ImageButton imageButton  = m_cToTest as ImageButton;
-			if (imageButton != null)
-			{
-				imageButton.CausesValidation = false;
-			}
-			//LinkButton
-			LinkButton linkButton  = m_cToTest as LinkButton;
-			if (linkButton != null)
-			{
-				linkButton.CausesValidation = false;
-			}
-		}
-		/// <summary>
-		/// Creates a textbox, and adds it to the page as not visable.
-		/// Creates a Required Field validator, and adds it to the page as not visible.
-		/// </summary>
-		private void InitTbToValidate()
-		{
-			m_tbToValidate = new TextBox();
-			m_tbToValidate.Visible = false;
-			m_tbToValidate.ID = "m_tbToValidate";
-			this.Controls.Add(m_tbToValidate);
-		}
-
-		/// <summary>
-		/// Creates the data sources to bind to.
-		/// </summary>
-		private void InitDataSource()
-		{
-			InitDataArray();
-			InitDataTable();
-		}
-
-		/// <summary>
-		/// Creates an array to be used as a data source.
-		/// </summary>
-		private void InitDataArray()
-		{
-			m_aDataSource = new Item[] {	new Item(1,"aaaa"),
-										  new Item(2,"bbbb"),
-										  new Item(3,"cccc"),
-										  new Item(4,"dddd")};
-		}
-
-		/// <summary>
-		/// creates a data table to be used as a data source.
-		/// </summary>
-		private void InitDataTable()
-		{
-			m_dtDataSource = new DataTable("SourceTable");
-
-			DataColumn l_dcId = new DataColumn("Id", typeof(int));
-			DataColumn l_dcDescription = new DataColumn("Description", typeof(string));
-
-			m_dtDataSource.Columns.Add(l_dcId);
-			m_dtDataSource.Columns.Add(l_dcDescription);
-			
-			for (int i=0; i<m_aDataSource.Length; i++)
-			{
-				DataRow l_drCurrent = m_dtDataSource.NewRow();
-				l_drCurrent["Id"] = m_aDataSource[i].Id;
-				l_drCurrent["Description"] = m_aDataSource[i].Description;
-				m_dtDataSource.Rows.Add(l_drCurrent);
-			}
-		}
-		
-		/// <summary>
-		/// Sets a unique unified id to the tested control based on the count of controls produced by this base.
-		/// </summary>
-		private void SetId()
-		{
-			SetId(m_cToTest);
-		}
-
-		/// <summary>
-		/// Sets a unique unified id to a control based on the count of controls produced by this base.
-		/// </summary>
-		private void SetId(Control a_toSet)
-		{
-			a_toSet.ID = "ctrl_" + m_controlsCounter.ToString();
-			m_controlsCounter++;
-		}
-		#endregion
-
-		/// <summary>
-		/// Used as an array item, for the data source of data bound controls in this test.
-		/// </summary>
-		public class Item
-		{
-			#region "Construction"
-			public Item() : this(0, String.Empty)
-			{
-			}
-
-			public Item(int a_id, string a_description)
-			{
-				m_id = a_id;
-				m_description = a_description;
-			}
-			#endregion
-
-			#region "Data Members"
-			private int m_id;
-			private string m_description;
-			#endregion
-
-			#region "Properties"
-			public int Id 
-			{
-				get
-				{
-					return m_id;
-				}
-				set
-				{
-					m_id = value;
-				}
-			}
-
-			public string Description
-			{
-				get
-				{
-					return m_description;
-				}
-				set
-				{
-					m_description = value;
-				}
-			}
-
-			#endregion
-
-			#region "Overrides"
-			public override string ToString()
-			{
-				return this.Id + " " + this.Description;
-			}
-
-#endregion
-		}
-	
-		/// <summary>
-		/// The templte used by repeater to render its items.
-		/// </summary>
-		public class RepeaterTemplate : ITemplate
-		{
-			#region ITemplate Members
-			/// <summary>
-			/// Implements ITemplate.instantiateIn(..)
-			/// Adds an item to the repeater.
-			/// </summary>
-			/// <param name="a_container">The controls to add the templated item to.</param>
-			public void InstantiateIn(Control a_container)
-			{
-				//Header labels:				
-				//~~~~~~~~~~~
-				Label l_lIdHeader = new Label();
-				l_lIdHeader.Text = "ID: ";
-				l_lIdHeader.Font.Bold = true;
-				Label l_lDescrptionHeader = new Label();
-				l_lDescrptionHeader.Text = "	Description: ";
-				l_lDescrptionHeader.Font.Bold = true;
-
-				//Data labels:
-				//~~~~~~~~~
-				Label l_lIdData = new Label();
-				l_lIdData.DataBinding += new EventHandler(this.BindId);
-				Label l_lDescriptionData = new Label();
-				l_lDescriptionData.DataBinding += new EventHandler(this.BindDescription);
-
-				//The complete panel.
-				Panel l_pItemPanel = new Panel();
-				l_pItemPanel.Controls.Add(l_lIdHeader);
-				l_pItemPanel.Controls.Add(l_lIdData);
-				l_pItemPanel.Controls.Add(l_lDescrptionHeader);
-				l_pItemPanel.Controls.Add(l_lDescriptionData);
-
-				a_container.Controls.Add(l_pItemPanel);
-			}
-			#endregion
-
-			/// <summary>
-			/// Handles the data binding event of the Id label in the templated item.
-			/// </summary>
-			/// <param name="sender">The source of the event.</param>
-			/// <param name="args">Additional information about the event.</param>
-			private void BindId(Object sender, EventArgs args)
-			{
-				Label l_lIddata = (Label)sender;
-				RepeaterItem l_riContainer = (RepeaterItem)l_lIddata.NamingContainer;
-				l_lIddata.Text = (DataBinder.Eval(l_riContainer.DataItem, "Id")).ToString();
-			}
-
-			/// <summary>
-			/// Handles the data binding event of the Description label in the templated item.
-			/// </summary>
-			/// <param name="sender">The source of the event.</param>
-			/// <param name="args">Additional information about the event.</param>
-			private void BindDescription(Object sender, EventArgs args)
-			{
-				Label l_lDescriptionData = (Label)sender;
-				RepeaterItem l_riContainer = (RepeaterItem)l_lDescriptionData.NamingContainer;
-				l_lDescriptionData.Text = (DataBinder.Eval(l_riContainer.DataItem, "Description")).ToString();
-			}
-		}
-
-		/// <summary>
-		/// The templte used by DataList to render its items.
-		/// </summary>
-		public class DataListTemplate : ITemplate
-		{
-			#region ITemplate Members
-			/// <summary>
-			/// Implements ITemplate.instantiateIn(..)
-			/// Adds an item to the data list.
-			/// </summary>
-			/// <param name="a_container">The controls to add the templated item to.</param>
-			public void InstantiateIn(Control a_container)
-			{
-				//Header labels:				
-				//~~~~~~~~~~~
-				Label l_lIdHeader = new Label();
-				l_lIdHeader.Text = "ID: ";
-				l_lIdHeader.Font.Bold = true;
-				Label l_lDescrptionHeader = new Label();
-				l_lDescrptionHeader.Text = "	Description: ";
-				l_lDescrptionHeader.Font.Bold = true;
-
-				//Data labels:
-				//~~~~~~~~~
-				Label l_lIdData = new Label();
-				l_lIdData.DataBinding += new EventHandler(this.BindId);
-				Label l_lDescriptionData = new Label();
-				l_lDescriptionData.DataBinding += new EventHandler(this.BindDescription);
-
-				//The complete panel.
-				Panel l_pItemPanel = new Panel();
-				l_pItemPanel.Controls.Add(l_lIdHeader);
-				l_pItemPanel.Controls.Add(l_lIdData);
-				l_pItemPanel.Controls.Add(l_lDescrptionHeader);
-				l_pItemPanel.Controls.Add(l_lDescriptionData);
-
-				a_container.Controls.Add(l_pItemPanel);
-			}
-			#endregion
-
-			/// <summary>
-			/// Handles the data binding event of the Id label in the templated item.
-			/// </summary>
-			/// <param name="sender">The source of the event.</param>
-			/// <param name="args">Additional information about the event.</param>
-			private void BindId(Object sender, EventArgs args)
-			{
-				Label l_lIddata = (Label)sender;
-				DataListItem l_dliContainer = (DataListItem)l_lIddata.NamingContainer;
-				l_lIddata.Text = (DataBinder.Eval(l_dliContainer.DataItem, "Id")).ToString();
-			}
-
-			/// <summary>
-			/// Handles the data binding event of the Description label in the templated item.
-			/// </summary>
-			/// <param name="sender">The source of the event.</param>
-			/// <param name="args">Additional information about the event.</param>
-			private void BindDescription(Object sender, EventArgs args)
-			{
-				Label l_lDescriptionData = (Label)sender;
-				DataListItem l_dliContainer = (DataListItem)l_lDescriptionData.NamingContainer;
-				l_lDescriptionData.Text = (DataBinder.Eval(l_dliContainer.DataItem, "Description")).ToString();
-			}
-		}
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTDataListBase.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTDataListBase.cs
deleted file mode 100644
index 67796161b7e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTDataListBase.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using GHTWebControls;
-using System.Drawing;
-using System.Data;
-
-namespace GHTTests
-{
-
-	/// <summary>
-	/// Summary description for GHTDataListBase.
-	/// </summary>
-	public class GHTDataListBase:GHTBaseWeb
-	{
-		BaseDataList mActiveDataList;
-		public GHTDataListBase():base()
-		{
-				
-		}
-		#region Tests
-		protected static DataTable GHTGetSampleDataSource()
-		{
-			DataTable SampleDT;
-
-			SampleDT = new DataTable("Sample");
-			DataColumn col = new DataColumn("colA",typeof(System.String));
-			SampleDT.Columns.Add (col);
-			col = new DataColumn("colB",typeof(System.Int32));
-			SampleDT.Columns.Add (col);
-			col = new DataColumn("colC",typeof(System.DateTime));
-			SampleDT.Columns.Add (col);
-			SampleDT.Rows.Add(new object[]{"row 1",11111,"01/01/2003"});
-			SampleDT.Rows.Add(new object[]{"row 22222",2,"02/02/2004"});
-			//					SampleDT.Rows.Add(new object[]{"row 1",1});
-			//					SampleDT.Rows.Add(new object[]{"row 2",2});
-
-			//				}
-			return SampleDT;
-		}
-		protected static DataSet GHTGetSampleDataSourceDS()
-		{
-
-			DataSet SampleDS = new DataSet("SampleDS");
-			SampleDS.Tables.Add( GHTGetSampleDataSource());
-			return SampleDS;
-
-		}
-		protected static string[] GHTGetSampleDataSourceArray()
-		{
-			return new string[]{"A","B","C"};
-
-		}
-		protected static Hashtable GHTGetSampleDataSourceCol()
-		{
-			Hashtable col = new Hashtable();
-			col.Add ("Key A","Value A");
-			col.Add ("Key B","Value B");
-			col.Add ("Key C","Value C");
-			return col;	
-		}
-		#endregion
-		protected void GHTBuildUnboundSampleDataList(BaseDataList ctl)
-		{
-			DataList lst = (DataList)ctl;
-			lst.ItemTemplate = new MyItemTemplate();
-		}			  
-		protected void GHTBuildSampleDataList(BaseDataList ctl)
-		{
-			DataList lst = (DataList)ctl;
-			lst.ItemTemplate = new MyItemTemplate();
-			lst.DataSource = GHTGetSampleDataSource();
-			lst.DataBind();
-		}			  
-		protected void GHTBuildUnboundSampleDataGrid(BaseDataList ctl)
-		{
-			DataGrid grid = (DataGrid)ctl;
-			BoundColumn col = new BoundColumn();
-			col.DataField = "colA";
-			grid.Columns.Add(col);
-			col = new BoundColumn();
-			col.DataField = "colB";
-			grid.Columns.Add(col);
-			col = new BoundColumn();
-			col.DataField = "colC";
-			grid.Columns.Add(col);
-			grid.AutoGenerateColumns =false;
-
-		}
-		protected void GHTBuildSampleDataGrid(BaseDataList ctl)
-		{
-			DataGrid grid = (DataGrid)ctl;
-			BoundColumn col = new BoundColumn();
-			col.DataField = "colA";
-			grid.Columns.Add(col);
-
-			col = new BoundColumn();
-			col.DataField = "colB";
-			grid.Columns.Add(col);
-
-			col = new BoundColumn();
-			col.DataField = "colC";
-			grid.Columns.Add(col);
-
-			grid.AutoGenerateColumns =false;
-			col = new BoundColumn();
-			grid.DataSource = GHTGetSampleDataSource();
-			grid.DataBind();
-
-		}
-		private class MyItemTemplate : ITemplate
-		{
-
-			public void InstantiateIn(Control container ) 
-			{
-				TextBox ctl1 = new  TextBox();
-				ctl1.ID = "MyTextBox1";
-				ctl1.DataBinding +=new EventHandler(BindColA);
-				container.Controls.Add(ctl1);
-				TextBox ctl2 = new  TextBox();
-				ctl2.ID = "MyTextBox2";
-				ctl2.DataBinding +=new EventHandler(BindColB);
-				container.Controls.Add(ctl2);
-			}
-			private void BindColA(Object sender ,EventArgs e )
-			{
-				TextBox ctl = (TextBox)sender;
-				DataListItem DLI = (DataListItem)ctl.NamingContainer;
-				DataRowView drv = (DataRowView)DLI.DataItem;
-				ctl.Text = drv["colA"].ToString();
-			}
-			private void BindColB(Object sender ,EventArgs e )
-			{
-				TextBox ctl = (TextBox)sender;
-				DataListItem DLI = (DataListItem)ctl.NamingContainer;
-				DataRowView drv = (DataRowView)DLI.DataItem;
-				ctl.Text = drv["colB"].ToString();
-			}
-		}
-		private class DataSourceClass
-		{
-			private string mcolA;
-			private string mcolB;
-			private string mcolC;
-			public DataSourceClass(string colA, string colB, string colC)
-			{
-				mcolA = colA;
-				mcolB = colB;
-				mcolC = colC;
-			}
-			internal string colA
-			{
-				get {return mcolA;}
-			}
-			internal string colB
-			{
-				get {return mcolB;}
-			}
-			internal string colC
-			{
-				get {return mcolC;}
-			}
-		}
-
-		#region Private Methods
-		// helper utility to create a new sub test
-		private void GHTDataListSubTestBegin(Type ctrlType, string description)
-		{
-			mActiveDataList = (BaseDataList)GHTElementClone(ctrlType);
-			GHTSubTestBegin(description);
-			GHTActiveSubTest.Controls.Add(mActiveDataList);
-		}
-		#endregion
-	}
-	public class GHTDataListSampleClass
-	{
-		public string colA;
-		public int colB;
-		public DateTime colC;
-		public GHTDataListSampleClass(string lcolA, int lcolB, DateTime lcolC)
-		{
-			colA = lcolA;
-			colB = lcolB;
-			colC = lcolC;
-		}
-		//			public string colA
-		//			{
-		//				get{return mcolA;}
-		//				set {mcolA = value;}
-		//			}
-		//			public int colB
-		//			{
-		//				get{return mcolB;}
-		//				set {mcolB = value;}
-		//			}
-		//			public DateTime colC
-		//			{
-		//				get{return mcolC;}
-		//				set {mcolC = value;}
-		//			}
-
-
-
-	}
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTListControlBase.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTListControlBase.cs
deleted file mode 100644
index b5b3153bb0f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTListControlBase.cs
+++ /dev/null
@@ -1,971 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using GHTWebControls;
-using System.Drawing;
-using System.Data;
- 
-namespace GHTTests
-{
-	/// <summary>
-	/// Summary description for GHTListControlBase.
-	/// </summary>
-	public class GHTListControlBase : GHTBaseWeb
-	{
-		#region "Tests"
-		protected void ListControl_AutoPostBack(Type ctrlType)
-		{
-			#region "Setting to true"
-			GHTListContorlSubTestBegin(ctrlType, "AutoPostBack = True");
-			try
-			{
-				m_lcToTest.AutoPostBack = true;
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			#endregion
-			#region "Getting true:"
-			GHTListContorlSubTestBegin(ctrlType, "Get AutoPostBack true");
-			try
-			{
-				m_lcToTest.AutoPostBack = true;
-				Compare(m_lcToTest.AutoPostBack, true);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "Setting to false"
-			GHTListContorlSubTestBegin(ctrlType, "AutoPostBack = false");
-			try
-			{
-				m_lcToTest.AutoPostBack = false;
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			#endregion
-			#region "Getting false:"
-			GHTListContorlSubTestBegin(ctrlType, "Get AutoPostBack false");
-			try
-			{
-				m_lcToTest.AutoPostBack = false;
-				Compare(m_lcToTest.AutoPostBack, false);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-		}
-		protected void ListControl_ClearSelection(Type ctrlType)
-		{
-			#region "No item selected"
-			GHTListContorlSubTestBegin(ctrlType, "No ite, selected");
-			try
-			{
-				m_lcToTest.Items.Add("A");
-				m_lcToTest.Items.Add("B");
-				m_lcToTest.Items.Add("C");
-				m_lcToTest.ClearSelection();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			GHTSubTestEnd();
-			#endregion
-			#region "One item selected"
-			GHTListContorlSubTestBegin(ctrlType, "One item selected");
-			try
-			{
-				m_lcToTest.Items.Add("A");
-				m_lcToTest.Items.Add("B");
-				m_lcToTest.Items.Add("C");
-				m_lcToTest.SelectedIndex = 1;
-				m_lcToTest.ClearSelection();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-		}
-		protected void ListControl_DataMember(Type ctrlType)
-		{
-			InitDataSet();
-			#region "Existing Table"
-			GHTListContorlSubTestBegin(ctrlType, "Existing table");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataMember = "Second";
-				m_lcToTest.DataTextField = "double Column";
-				m_lcToTest.DataBind();
-				Compare(m_lcToTest.DataMember, "Second");
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Null"
-			GHTListContorlSubTestBegin(ctrlType, "Null");
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataMember = null;
-				m_lcToTest.DataTextField = "char Column";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			#endregion
-			#region "Non existing table in a dataset"
-			GHTListContorlSubTestBegin(ctrlType, "Non existing table in a dataset");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataMember = "not a table name";
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "DataSource is not a dataset - set"
-			GHTListContorlSubTestBegin(ctrlType, "DataSource is not a dataset");
-			
-			try
-			{
-				InitArray();
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataMember = "not a table name";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-		}
-
-		protected void ListControl_DataSource(Type ctrlType)
-		{
-			InitDataSet();
-			InitArray();
-			#region "DataSource that implements IEnumerable"
-			GHTListContorlSubTestBegin(ctrlType, "DataSource that implements IEnumerable");
-			
-			try
-			{
-				IEnumerable dataSource = m_items;
-				m_lcToTest.DataSource = dataSource;
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "DataSource that implements IListSource"
-			GHTListContorlSubTestBegin(ctrlType, "DataSource that implements IListSource");
-			
-			try
-			{
-				IListSource dataSource = m_dsData;
-				m_lcToTest.DataSource = dataSource;
-				m_lcToTest.DataTextField = "char Column";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "DataSource that does not implement IListSource or IEnumerable"
-			GHTListContorlSubTestBegin(ctrlType, "DataSource that does not implement IListSource or IEnumerable");
-			
-			try
-			{
-				DataItem dataSource = new DataItem(1, "aaa");
-				m_lcToTest.DataSource = dataSource;
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("ArgumentException");
-			}
-			catch (ArgumentException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-		}
-
-		protected void ListControl_DataTextField(Type ctrlType)
-		{
-			InitArray();
-			InitDataSet();
-			#region "string.empty - user defined items"
-			GHTListContorlSubTestBegin(ctrlType, "string.empty");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = string.Empty;
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-
-//The result is ToString of DataRow which is default Object.ToString()
-//In Java we get @addres at the end.
-//			#region "string.empty - bound to a table"
-//			GHTListContorlSubTestBegin(ctrlType, "string.empty - bound to a table");
-//			
-//			try
-//			{
-//				m_lcToTest.DataSource = m_dsData;
-//				m_lcToTest.DataTextField = string.Empty;
-//				m_lcToTest.DataBind();
-//			}
-//			catch (Exception ex)
-//			{
-//				GHTSubTestUnexpectedExceptionCaught(ex);
-//			}
-//
-//			GHTSubTestEnd();
-//			#endregion
-			#region "Name of an items property"
-			GHTListContorlSubTestBegin(ctrlType, "Name of an items property");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of an item non-existing property"
-			GHTListContorlSubTestBegin(ctrlType, "Name of an item non-existing property");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "non-existing property";
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of a column"
-			GHTListContorlSubTestBegin(ctrlType, "Name of a column");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataTextField = "int Column";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of a non-existing column"
-			GHTListContorlSubTestBegin(ctrlType, "Name of a non-existing column");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataTextField = "non-existing column";
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-		}
-
-		protected void ListControl_DataTextFormatString(Type ctrlType)
-		{
-			InitArray();
-			#region "string.empty"
-			GHTListContorlSubTestBegin(ctrlType, "string.empty");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataTextFormatString = string.Empty;
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Valid format"
-			GHTListContorlSubTestBegin(ctrlType, "Valid format");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataTextFormatString = "format {0} format";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Invalid format"
-			GHTListContorlSubTestBegin(ctrlType, "Invalid format");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataTextFormatString = "{invalid format}";
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("FormatException");
-			}
-			catch (FormatException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-		}
-
-		protected void ListControl_Items(Type ctrlType)
-		{
-			InitArray();
-			GHTListContorlSubTestBegin(ctrlType, "Type & contents");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataValueField = "Id";
-				m_lcToTest.DataBind();
-				//Check the type:
-				Compare(m_lcToTest.Items.GetType().ToString(), typeof(ListItemCollection).ToString());
-				//Check all the items.
-				for (int i=0; i<7; i++)
-				{
-					Compare(m_lcToTest.Items[i].Text, m_items[i].Name);
-					Compare(m_lcToTest.Items[i].Value.ToString(), m_items[i].Id.ToString());
-				}
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-		}
-
-		protected void ListControl_DataValueField(Type ctrlType)
-		{
-			InitArray();
-			InitDataSet();
-			#region "string.empty - user defined items"
-			GHTListContorlSubTestBegin(ctrlType, "string.empty");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataValueField = string.Empty;
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "string.empty - bound to a table"
-			GHTListContorlSubTestBegin(ctrlType, "string.empty - bound to a table");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataValueField= string.Empty;
-				m_lcToTest.DataTextField = "char Column";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of an items property"
-			GHTListContorlSubTestBegin(ctrlType, "Name of an items property");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataValueField = "Id";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of an item non-existing property"
-			GHTListContorlSubTestBegin(ctrlType, "Name of an item non-existing property");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataValueField = "non-existing property";
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of a column"
-			GHTListContorlSubTestBegin(ctrlType, "Name of a column");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataValueField = "int Column";
-				m_lcToTest.DataBind();
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-			#region "Name of a non-existing column"
-			GHTListContorlSubTestBegin(ctrlType, "Name of a non-existing column");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_dsData;
-				m_lcToTest.DataValueField = "non-existing column";
-				m_lcToTest.DataBind();
-				GHTSubTestExpectedExceptionNotCaught("HttpException");
-			}
-			catch (HttpException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			GHTSubTestEnd();
-			#endregion
-		}
-		protected void ListControl_SelectedIndex(Type ctrlType)
-		{
-			InitArray();
-			#region "None selected"
-			GHTListContorlSubTestBegin(ctrlType, "None selected");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = -1;
-				GHTSubTestAddResult(m_lcToTest.SelectedIndex.ToString());
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "valid value"
-			GHTListContorlSubTestBegin(ctrlType, "valid value");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = 5;
-				GHTSubTestAddResult(m_lcToTest.SelectedIndex.ToString());
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "Invalid value - above length of items."
-			GHTListContorlSubTestBegin(ctrlType, "Invalid value - above length of items.");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = 10;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "Invalid value - below -1."
-			GHTListContorlSubTestBegin(ctrlType, "Invalid value - below -1.");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = -2;
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-		}
-
-		protected void ListControl_SelectedItem(Type ctrlType)
-		{
-			InitArray();
-			#region "None selected"
-			GHTListContorlSubTestBegin(ctrlType, "None selected");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = -1;
-				if (m_lcToTest.SelectedItem == null)
-				{
-					GHTSubTestAddResult("Test passed: SelectedItem is null");
-				}
-				else
-				{
-					GHTSubTestAddResult("Test failede: SelectedItem is not null");
-				}
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "Single Item selected"
-			GHTListContorlSubTestBegin(ctrlType, "valid value");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = 5;
-				Compare(m_lcToTest.SelectedItem.Text, m_items[5].Name );
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "multiple Items selected"
-			GHTListContorlSubTestBegin(ctrlType, "multiple Items selected");
-			if (m_lcToTest is DropDownList)
-			{
-				return;
-			}
-			if (m_lcToTest is ListBox)
-			{
-				((ListBox)m_lcToTest).SelectionMode = ListSelectionMode.Multiple;
-			}
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataTextField = "Name";
-				m_lcToTest.DataBind();
-				m_lcToTest.Items[2].Selected = true;
-				m_lcToTest.Items[4].Selected = true;
-				m_lcToTest.Items[6].Selected = true;
-				Compare(m_lcToTest.SelectedItem.Text, m_items[2].Name );
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-
-			#endregion
-		}
-
-		protected void ListControl_SelectedValue(Type ctrlType)
-		{
-			InitArray();
-			#region "None selected - get"
-			GHTListContorlSubTestBegin(ctrlType, "None selected - get");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataValueField = "Id";
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = -1;
-				Compare(m_lcToTest.SelectedValue, string.Empty);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "valid value - get"
-			GHTListContorlSubTestBegin(ctrlType, "valid value - get");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataValueField = "Id";
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedIndex = 5;
-				Compare(m_lcToTest.SelectedValue, m_items[5].Id.ToString());
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "valid value - set"
-			GHTListContorlSubTestBegin(ctrlType, "valid value - set");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataValueField = "Id";
-				m_lcToTest.DataBind();
-				m_lcToTest.SelectedValue = "5";
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-			#region "Invalid value - set"
-			GHTListContorlSubTestBegin(ctrlType, "Invalid value - set");
-			
-			try
-			{
-				m_lcToTest.DataSource = m_items;
-				m_lcToTest.DataBind();
-				m_lcToTest.DataValueField = "Id";
-				m_lcToTest.SelectedValue = "10";
-				GHTSubTestExpectedExceptionNotCaught("ArgumentOutOfRangeException");
-			}
-			catch (ArgumentOutOfRangeException ex)
-			{
-				GHTSubTestExpectedExceptionCaught(ex);
-			}
-			catch (Exception ex)
-			{
-				GHTSubTestUnexpectedExceptionCaught(ex);
-			}
-			#endregion
-		}
-
-		#endregion
-
-		#region "Construction"
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public GHTListControlBase()
-		{
-		}
-		/// <summary>
-		/// Static constructor.
-		/// Initializes the static field m_types[].
-		/// </summary>
-		static GHTListControlBase()
-		{
-			initTypes();
-		}
-		#endregion
-		
-		#region "properties"
-		public static Type[] TestedTypes
-		{
-			get
-			{
-				return (Type[])(m_types.ToArray(typeof(Type)));
-			}
-		}
-		#endregion
-
-		#region "members"
-		/// <summary>
-		/// Holds the ListControl that is tested in the current subtest.
-		/// </summary>
-		private ListControl m_lcToTest;
-		private int m_controlsCounter = 0;
-
-		/// <summary>
-		/// Holds all the types that are derived from ListControl, and should be tested.
-		/// </summary>
-		private  static readonly  ArrayList m_types = new ArrayList();
-		/// <summary>
-		/// Two data set to use while testing.
-		/// Initialize this dataset using InitDataSet()
-		/// </summary>
-		private DataSet m_dsData;
-		private DataTable m_dtFirst;
-		private DataTable m_dtSecond;
-
-		/// <summary>
-		/// An array of Item objects that can be used as a datasource.
-		/// initialize the array using InitArray()
-		/// </summary>
-		private DataItem[] m_items;
-		#endregion
-
-		#region "Private methods"
-		/// <summary>
-		/// Initializes the collection of types derived from ListControl.
-		/// </summary>
-		private static void initTypes()
-		{
-			m_types.Add(typeof(ListBox));
-			m_types.Add(typeof(DropDownList));
-			m_types.Add(typeof(RadioButtonList));
-			m_types.Add(typeof(CheckBoxList));
-		}
-		/// <summary>
-		/// Creates new sub test and adds a new ListControl to it.
-		/// </summary>
-		/// <param name="ctrlType">Actual type of the tested control</param>
-		/// <param name="description">subtests description</param>
-		private void GHTListContorlSubTestBegin(Type ctrlType, string description)
-		{
-			m_lcToTest = (ListControl)GHTElementClone(ctrlType);
-			m_lcToTest.ID = "_ctrl" + m_controlsCounter;
-			m_controlsCounter++;
-			GHTSubTestBegin(description);
-			GHTActiveSubTest.Controls.Add(m_lcToTest);
-		}
-		
-		/// <summary>
-		/// Initializes both m_dtFirst, and m_dtSecond with names ("First", "Second"), columns, and data.
-		/// </summary>
-		private void InitDataSet()
-		{
-			m_dtFirst = new DataTable("First");
-			m_dtFirst.Columns.Add("int Column", typeof(int));
-			m_dtFirst.Columns.Add("bool Column", typeof(bool));
-			m_dtFirst.Columns.Add("char Column", typeof(char));
-
-			m_dtSecond = new DataTable("Second");
-			m_dtSecond.Columns.Add("double Column", typeof(int));
-			m_dtSecond.Columns.Add("byte Column", typeof(bool));
-			m_dtSecond.Columns.Add("time Column", typeof(DateTime));
-
-			for (int i=0; i<10; i++)
-			{
-				DataRow dr1 = m_dtFirst.NewRow();
-				dr1["int Column"] = i;
-				dr1["bool Column"] = ( i % 2  == 0 ) ? true : false;
-				dr1["char Column"] = (char)(i + 'a');
-				m_dtFirst.Rows.Add(dr1);
-
-				DataRow dr2 = m_dtSecond.NewRow();
-				dr2["double Column"] = double.Epsilon * i;
-				dr2["byte Column"] = (byte)( i % 10);
-				dr2["time Column"] = DateTime.Now;
-				m_dtSecond.Rows.Add(dr2);
-			}
-
-			m_dsData = new DataSet("Test dataset");
-			m_dsData.Tables.Add(m_dtFirst);
-			m_dsData.Tables.Add(m_dtSecond);
-		}
-
-
-		private void InitArray()
-		{
-			m_items = new DataItem[] {	new DataItem(1, "aaa"),
-																					new DataItem(2, "bbb"),
-																					new DataItem(3, "ccc"),
-																					new DataItem(4, "ddd"),
-																					new DataItem(5, "eee"),
-																					new DataItem(6, "fff"),
-																					new DataItem(7, "ggg")};
-		}
-
-		/// <summary>
-		/// Nested class, to use as the items of the m_items array.
-		/// </summary>
-		private class DataItem
-		{
-			public DataItem(int a_id, string a_name)
-			{
-				id = a_id;
-				name = a_name;
-			}
-
-			private int id;
-			private string name;
-
-			public int Id
-			{
-				get
-				{
-					return id;
-				}
-				set
-				{
-					id = value;
-				}
-			}
-
-			public string Name
-			{
-				get
-				{
-					return name;
-				}
-				set
-				{
-					name = value;
-				}
-
-			}
-
-
-			public override string ToString()
-			{
-				return id.ToString() + name;
-			}
-		}
-	}
-	#endregion
-
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTSubTest.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTSubTest.cs
deleted file mode 100644
index 0deaebc883d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTSubTest.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.ComponentModel;
-
-namespace GHTWebControls
-{
-	/// <summary>
-	/// Summary description for WebCustomControl1.
-	/// </summary>
-	[DefaultProperty("Text"),
-	ToolboxData("<{0}:GHTSubTest runat=server></{0}:GHTSubTest>")]
-	// since we have a bug 4020, For FireFox GH render Panel as DIV instead where .Net render as TABLE,
-	// we replaced the use of Panel in Table.	public class GHTSubTest : System.Web.UI.WebControls.Table//.HtmlGenericControl
-	public class GHTSubTest : System.Web.UI.WebControls.Panel//System.Web.UI.HtmlControls.HtmlGenericControl //
-	{
-		string mDescription="";
-		[Browsable(true)]
-		public string Description
-		{
-			get 
-			{
-				return mDescription;
-			}
-			set
-			{
-				mDescription = value;
-			}
-		}
-		protected override void Render(HtmlTextWriter writer)
-		{
-			writer.WriteFullBeginTag("br");
-			writer.WriteFullBeginTag("u");
-			writer.WriteFullBeginTag("b");
-			if (mDescription != "") 
-				writer.Write(mDescription);
-			else if (this.ID !=null)
-				writer.Write(this.ID.ToString());
-			else
-				writer.Write("GHTSubTest.ID not set. Can not display the sub test id");
-			writer.WriteEndTag("b");
-			writer.WriteEndTag("u");
-
-			base.Render (writer);
-			Literal lbl = new Literal();
-			lbl.Text=this.ID;
-			this.Controls.Add (lbl);
-		}
-  	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTWebControlBase.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTWebControlBase.cs
deleted file mode 100644
index a2eff53459b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/utils/GHTWebControlBase.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Web.UI;
-using System.Collections;
-using System.Web.UI.WebControls;
-
-namespace GHTTests
-{
-	/// <summary>
-	/// Summary description for GHTWebControlBase.
-	/// </summary>
-	public class GHTWebControlBase : GHTControlBase
-	{
-		#region "Properties"
-		protected new WebControl TestedControl
-		{
-			get
-			{
-				return (WebControl) m_cToTest;
-			}
-		}
-		public new Type[] TypesToTest
-		{
-			get
-			{
-				return (System.Type[])(m_derivedTypes.ToArray(typeof(System.Type)));
-			}
-		}
-		#endregion
-
-		#region "Methods"
-		/// <summary>
-		/// Initializes all the derived types that need to be tested.
-		/// </summary>
-		protected override  void InitTypes()
-		{
-			m_derivedTypes = new ArrayList();
-
-
-			//System.Web.UI.WebControls basic:
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Button));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CheckBox));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.HyperLink));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Image));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.ImageButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Label));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.LinkButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Panel));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RadioButton));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TextBox));
-
-			//System.Web.UI.WebControls basic list controls:
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DropDownList));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.ListBox));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RadioButtonList));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CheckBoxList));
-
-			//System.Web.UI.WebControls validation controls:
-#if KNOWN_BUG //BUG_NUM:935
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CompareValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.CustomValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RangeValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RegularExpressionValidator));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.RequiredFieldValidator));
-#endif
-#if KNOWN_BUG //BUG_NUM:1195
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.ValidationSummary));
-#endif
-			//System.Web.UI.WebControls rich controls (currently not supported):
-			//			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.AdRotator));
-			//			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Calendar));
-
-			//System.Web.UI.WebControls advanced list controls:
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataGrid));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataGridItem));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataList));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.DataListItem));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.Table));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TableCell));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TableHeaderCell));
-			m_derivedTypes.Add(typeof(System.Web.UI.WebControls.TableRow));
-			//m_derivedTypes.Add(typeof( System.Web.UI.WebControls.Xml));
-		}
-
-		#endregion
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/App.config b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/App.config
deleted file mode 100644
index 80b3dd7ff61..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/App.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="ExpResBaseUrl" value="http://localhost:80/MainsoftWebApp"/>
-    <add key="TestBaseUrl" value="http://localhost:8088/MainsoftWebApp"/>
-    <add key="OutputDir" value="../reference"/>
-    <add key="AlmostList" value="./almost_config.xml"/>
-    <add key="TestCatalog" value="./test_catalog.xml"/>
-    <add key="DisableAlmost" value="false"/>
-    <add key="RunExcluded" value="false"/>
-  </appSettings>
-</configuration>
-
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/App.gh.config b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/App.gh.config
deleted file mode 100755
index 466b0fa7775..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/App.gh.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="ExpResBaseUrl" value="http://localhost:80/MainsoftWebApp"/>
-    <add key="TestBaseUrl" value="http://localhost:8080/MainsoftWebApp"/>
-    <add key="OutputDir" value="../reference"/>
-    <add key="AlmostList" value="./almost_config.xml"/>
-    <add key="TestCatalog" value="./test_catalog.xml"/>
-    <add key="DisableAlmost" value="false"/>
-    <add key="RunExcluded" value="false"/>
-  </appSettings>
-</configuration>
-
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/ChangeLog b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/ChangeLog
deleted file mode 100644
index 2b7d5f0cd5b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2006-02-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* test_catalog.xml: fixed not working tests
-
-2006-02-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* added SystemWebTest.vmwcsproj, GH project file
-
-2006-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
-
-	* XmlComparer.cs: fixed AreEqualAttribs, to make attributes
-	compare case insensitive
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/Harness.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/Harness.cs
deleted file mode 100644
index d5b08eb6bb9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/Harness.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Configuration;
-using System.Xml;
-using System.Collections;
-using System.Net;
-using System.IO;
-#if NUNIT
-using NUnit.Framework;
-using NUnit.Core;
-#endif
-
-namespace MonoTests.stand_alone.WebHarness
-{
-	public class Harness
-	{
-		static string _ignoreListFile = "";
-		static string _catalogFile = "";
-		static string _outputPath = "";
-		static string _baseUrlExp = "";
-		static string _baseUrlTst = "";
-		static bool _disableAlmost = false;
-		static bool _runExcluded = false;
-
-		static void Main(string[] args)
-		{
-			ParseCommandLineAgrs(args);
-
-			if (_baseUrlExp != "")
-			{
-				//baseUrl = "http://localhost:80/System_Web_dll";
-				CreateExpectedResults(_baseUrlExp);
-			}
-
-			if (_baseUrlTst != "")
-			{
-				//baseUrl = "http://localhost:8080/System_Web_dll";
-				RunTests(_baseUrlTst);
-			}
-		}
-
-#if NUNIT
-		[Suite]
-		static public TestSuite Suite 
-		{
-			get 
-			{
-				ParseAppConfigFile();
-
-				TestSuite suite = new TestSuite ("SystemWebTests");
-				TestsCatalog tc = new TestsCatalog();
-				foreach (TestInfo ti in tc)
-				{
-					suite.Add(new SingleWebTest(ti, _baseUrlTst));
-				}
-				
-				return suite;
-			}
-		}
-#endif
-
-		#region "Cmd line"
-
-		static string GetParameterByName(string name, string[] args)
-		{
-			int i = Array.IndexOf(args, name);
-			if (i >= 0)
-			{
-				if (i < args.Length - 1)
-				{
-					return args[i+1];
-				}
-			}
-			return "";
-		}
-
-		static bool IsParameterSet(string name, string[] args)
-		{
-			int i = Array.IndexOf(args, name);
-			return (i >= 0);
-		}
-
-		static void ParseAppConfigFile()
-		{
-			_disableAlmost = Convert.ToBoolean(ConfigurationSettings.AppSettings["DisableAlmost"]);
-			_runExcluded = Convert.ToBoolean(ConfigurationSettings.AppSettings["RunExcluded"]);
-			_ignoreListFile = ConfigurationSettings.AppSettings["AlmostList"];
-			_catalogFile = ConfigurationSettings.AppSettings["TestCatalog"];
-			_outputPath = ConfigurationSettings.AppSettings["OutputDir"];
-			if ((!_outputPath.EndsWith("\\")) && (!_outputPath.EndsWith("/")))
-			{
-				_outputPath += Path.DirectorySeparatorChar;
-			}
-
-			_baseUrlExp = ConfigurationSettings.AppSettings["ExpResBaseUrl"];
-			_baseUrlTst = ConfigurationSettings.AppSettings["TestBaseUrl"];
-		}
-
-		static void ParseCommandLineAgrs(string [] args)
-		{
-			_disableAlmost = IsParameterSet("-na", args);
-			_runExcluded = IsParameterSet("-x", args);
-			
-			// specifies the almost config xml file
-			// default is almost_config.xml in current folder
-			_ignoreListFile = GetParameterByName("-i", args);
-			if (_ignoreListFile == "")
-			{
-				_ignoreListFile = "almost_config.xml";
-			}
-			
-			// specifies tests catalog xml file
-			// default is test_catalog.xml in current folder
-			_catalogFile = GetParameterByName("-c", args);
-			if (_catalogFile == "")
-			{
-				_catalogFile = "test_catalog.xml";
-			}
-			
-			// specifies the folder where expected results will be stored
-			// by default is current folder
-			_outputPath = GetParameterByName("-o", args);
-			if (_outputPath != "")
-			{
-				if ((!_outputPath.EndsWith("\\")) && (!_outputPath.EndsWith("/")))
-				{
-					_outputPath += Path.DirectorySeparatorChar;
-				}
-			}
-
-			// specifies the base url for all tests
-			// no default value
-			_baseUrlExp = GetParameterByName("-e", args);
-			_baseUrlTst = GetParameterByName("-t", args);
-		}
-		#endregion
-
-		#region "Tests run routines"
-
-		static void CreateExpectedResults(string baseUrl)
-		{
-			TestsCatalog tc = new TestsCatalog(_catalogFile, _runExcluded);
-			WebTest wt = new WebTest();
-			wt.TestsBaseUrl = baseUrl;
-			wt.IgnoreListFile = _ignoreListFile;
-
-			if ((_outputPath != "") && (!Directory.Exists(_outputPath)))
-			{
-				Directory.CreateDirectory(_outputPath);
-			}
-
-			Console.WriteLine("Running expected results...");
-			foreach (TestInfo ti in tc)
-			{
-				Console.WriteLine("Running...  " + ti.Url);
-				XmlDocument d = wt.GetTestXml( ti );
-				d.Save(_outputPath + ti.Url.Replace("/", "_") + ".xml");
-			}
-		}
-
-		static void RunTests(string baseUrl)
-		{
-			TestsCatalog tc = new TestsCatalog(_catalogFile, _runExcluded);
-			foreach (TestInfo ti in tc)
-			{
-				try {
-					RunSingleTest(baseUrl, ti);
-				}
-				catch (Exception e) {
-					Console.WriteLine(e.Message);
-				}
-			}
-		}
-
-		public static bool RunSingleTest(string baseUrl, TestInfo ti)
-		{
-			WebTest wt = new WebTest();
-			wt.TestsBaseUrl = baseUrl;
-			wt.IgnoreListFile = _ignoreListFile;
-
-			XmlDocument d1 = new XmlDocument();
-			d1.Load(_outputPath + ti.Url.Replace("/", "_") + ".xml");
-			
-			XmlDocument d2 = wt.GetTestXml( ti );
-			bool fp = wt.XmlCompare(d1, d2, _disableAlmost);
-			if (fp == false) {
-				throw new Exception("Url: " + ti.Url + "\nCompare failed:\n" + wt.CompareStatus + "\n");
-			}
-			return fp;
-		}
-
-		#endregion
-	}
-
-	#region "NUnit"
-
-#if NUNIT
-	public class SingleWebTest : NUnit.Core.TestCase 
-	{
-		TestInfo _testInfo = null;
-		string _baseUrl = "";
-		public SingleWebTest (TestInfo testInfo, string baseUrl) : base (null, testInfo.Url) 
-		{
-			_testInfo = testInfo;
-			_baseUrl = baseUrl;
-		}
-
-		public override void Run (TestCaseResult res) 
-		{
-			try
-			{
-				Harness.RunSingleTest(_baseUrl, _testInfo);
-			}
-			catch (Exception e)
-			{
-				res.Failure(e.Message, null);
-				return;
-			}
-			res.Success();
-		}
-	}
-#endif
-
-	#endregion
-
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
deleted file mode 100644
index 65ddb468432..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-#if DEBUG
-[assembly: AssemblyTitle("Html Agility Pack - Debug")] //Description
-#else // release
-#if TRACE
-[assembly: AssemblyTitle("Html Agility Pack - ReleaseTrace")] //Description
-#else
-[assembly: AssemblyTitle("Html Agility Pack - Release")] //Description
-#endif
-#endif
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Simon Mourier")]
-[assembly: AssemblyProduct("Html Agility Pack")]
-[assembly: AssemblyCopyright("Simon Mourier")] 
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("1.3.1.1")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/Header.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/Header.cs
deleted file mode 100644
index a88c963df64..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/Header.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Collections;
-
-namespace HtmlAgilityPack
-{
-	internal class NameValuePair
-	{
-		internal readonly string Name;
-		internal string Value;
-
-		internal NameValuePair()
-		{
-		}
-
-		internal NameValuePair(string name):
-			this()
-		{
-			Name = name;
-		}
-
-		internal NameValuePair(string name, string value):
-			this(name)
-		{
-			Value = value;
-		}
-	}
-
-	internal class NameValuePairList
-	{
-		internal readonly string Text;
-		private ArrayList _allPairs;
-		private Hashtable _pairsWithName;
-
-		internal NameValuePairList():
-			this(null)
-		{
-		}
-
-		internal NameValuePairList(string text)
-		{
-			Text = text;
-			_allPairs = new ArrayList();
-			_pairsWithName = new Hashtable();
-
-			Parse(text);
-		}
-
-		internal string GetNameValuePairValue(string name)
-		{
-			if (name==null)
-				throw new ArgumentNullException();
-			ArrayList al = GetNameValuePairs(name);
-			if (al==null)
-				return null;
-
-			// return first item
-			NameValuePair nvp = al[0] as NameValuePair;
-			return nvp.Value;
-		}
-
-		internal ArrayList GetNameValuePairs(string name)
-		{
-			if (name==null)
-				return _allPairs;
-			return _pairsWithName[name] as ArrayList;
-		}
-
-		private void Parse(string text)
-		{
-			_allPairs.Clear();
-			_pairsWithName.Clear();
-			if (text==null)
-				return;
-
-			string[] p = text.Split(';');
-			if (p==null)
-				return;
-			foreach(string pv in p)
-			{
-				if (pv.Length==0)
-					continue;
-				string[] onep = pv.Split(new char[]{'='}, 2);
-				if (onep==null)
-					continue;
-				NameValuePair nvp = new NameValuePair(onep[0].Trim().ToLower());
-				if (onep.Length<2)
-					nvp.Value = "";
-				else
-					nvp.Value = onep[1];
-
-				_allPairs.Add(nvp);
-
-				// index by name
-				ArrayList al = _pairsWithName[nvp.Name] as ArrayList;
-				if (al==null)
-				{
-					al = new ArrayList();
-					_pairsWithName[nvp.Name] = al;
-				}
-				al.Add(nvp);
-			}
-		}
-
-		internal static string GetNameValuePairsValue(string text, string name)
-		{
-			NameValuePairList l = new NameValuePairList(text);
-			return l.GetNameValuePairValue(name);
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlAttribute.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlAttribute.cs
deleted file mode 100644
index 19726e82925..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlAttribute.cs
+++ /dev/null
@@ -1,468 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Collections;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// Represents an HTML attribute.
-	/// </summary>
-	public class HtmlAttribute: IComparable
-	{
-		internal int _line = 0;
-		internal int _lineposition = 0;
-		internal int _streamposition = 0;
-		internal int _namestartindex = 0;
-		internal int _namelength = 0;
-		internal int _valuestartindex = 0;
-		internal int _valuelength = 0;
-		internal HtmlDocument _ownerdocument; // attribute can exists without a node
-		internal HtmlNode _ownernode;
-		internal string _name;
-		internal string _value;
-
-		internal HtmlAttribute(HtmlDocument ownerdocument)
-		{
-			_ownerdocument = ownerdocument;
-		}
-
-		/// <summary>
-		/// Creates a duplicate of this attribute.
-		/// </summary>
-		/// <returns>The cloned attribute.</returns>
-		public HtmlAttribute Clone()
-		{
-			HtmlAttribute att = new HtmlAttribute(_ownerdocument);
-			att.Name = Name;
-			att.Value = Value;
-			return att;
-		}
-
-		/// <summary>
-		/// Compares the current instance with another attribute. Comparison is based on attributes' name.
-		/// </summary>
-		/// <param name="obj">An attribute to compare with this instance.</param>
-		/// <returns>A 32-bit signed integer that indicates the relative order of the names comparison.</returns>
-		public int CompareTo(object obj)
-		{
-			HtmlAttribute att = obj as HtmlAttribute;
-			if (att == null)
-			{
-				throw new ArgumentException("obj");
-			}
-			return Name.CompareTo(att.Name);
-		}
-
-		internal string XmlName
-		{
-			get
-			{
-				return HtmlDocument.GetXmlName(Name);
-			}
-		}
-
-		internal string XmlValue
-		{
-			get
-			{
-				return Value;
-			}
-		}
-
-		/// <summary>
-		/// Gets the qualified name of the attribute.
-		/// </summary>
-		public string Name
-		{
-			get
-			{
-				if (_name == null)
-				{
-					_name = _ownerdocument._text.Substring(_namestartindex, _namelength).ToLower();
-				}
-				return _name;
-			}
-			set
-			{
-				if (value == null)
-				{
-					throw new ArgumentNullException("value");
-				}
-				_name = value.ToLower();
-				if (_ownernode != null)
-				{
-					_ownernode._innerchanged = true;
-					_ownernode._outerchanged = true;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the value of the attribute.
-		/// </summary>
-		public string Value
-		{
-			get
-			{
-				if (_value == null)
-				{
-					_value = _ownerdocument._text.Substring(_valuestartindex, _valuelength);
-				}
-				return _value;
-			}
-			set
-			{
-				_value = value;
-				if (_ownernode != null)
-				{
-					_ownernode._innerchanged = true;
-					_ownernode._outerchanged = true;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets the line number of this attribute in the document.
-		/// </summary>
-		public int Line
-		{
-			get
-			{
-				return _line;
-			}
-		}
-
-		/// <summary>
-		/// Gets the column number of this attribute in the document.
-		/// </summary>
-		public int LinePosition
-		{
-			get
-			{
-				return _lineposition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the stream position of this attribute in the document, relative to the start of the document.
-		/// </summary>
-		public int StreamPosition
-		{
-			get
-			{
-				return _streamposition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the HTML node to which this attribute belongs.
-		/// </summary>
-		public HtmlNode OwnerNode
-		{
-			get
-			{
-				return _ownernode;
-			}
-		}
-
-		/// <summary>
-		/// Gets the HTML document to which this attribute belongs.
-		/// </summary>
-		public HtmlDocument OwnerDocument
-		{
-			get
-			{
-				return _ownerdocument;
-			}
-		}
-
-	}
-
-	/// <summary>
-	/// Represents a combined list and collection of HTML nodes.
-	/// </summary>
-	public class HtmlAttributeCollection: IEnumerable
-	{
-		internal Hashtable _hashitems = new Hashtable();
-		private ArrayList _items = new ArrayList();
-		private HtmlNode _ownernode;
-
-		internal HtmlAttributeCollection(HtmlNode ownernode)
-		{
-			_ownernode = ownernode;
-		}
-
-		/// <summary>
-		/// Inserts the specified attribute as the last attribute in the collection.
-		/// </summary>
-		/// <param name="newAttribute">The attribute to insert. May not be null.</param>
-		/// <returns>The appended attribute.</returns>
-		public HtmlAttribute Append(HtmlAttribute newAttribute)
-		{
-			if (newAttribute == null)
-			{
-				throw new ArgumentNullException("newAttribute");
-			}
-
-			_hashitems[newAttribute.Name] = newAttribute;
-			newAttribute._ownernode = _ownernode;
-			_items.Add(newAttribute);
-
-			_ownernode._innerchanged = true;
-			_ownernode._outerchanged = true;
-			return newAttribute;
-		}
-
-		/// <summary>
-		/// Creates and inserts a new attribute as the last attribute in the collection.
-		/// </summary>
-		/// <param name="name">The name of the attribute to insert.</param>
-		/// <returns>The appended attribute.</returns>
-		public HtmlAttribute Append(string name)
-		{
-			HtmlAttribute att = _ownernode._ownerdocument.CreateAttribute(name);
-			return Append(att);
-		}
-
-		/// <summary>
-		/// Creates and inserts a new attribute as the last attribute in the collection.
-		/// </summary>
-		/// <param name="name">The name of the attribute to insert.</param>
-		/// <param name="value">The value of the attribute to insert.</param>
-		/// <returns>The appended attribute.</returns>
-		public HtmlAttribute Append(string name, string value)
-		{
-			HtmlAttribute att = _ownernode._ownerdocument.CreateAttribute(name, value);
-			return Append(att);
-		}
-
-		/// <summary>
-		/// Inserts the specified attribute as the first node in the collection.
-		/// </summary>
-		/// <param name="newAttribute">The attribute to insert. May not be null.</param>
-		/// <returns>The prepended attribute.</returns>
-		public HtmlAttribute Prepend(HtmlAttribute newAttribute)
-		{
-			if (newAttribute == null)
-			{
-				throw new ArgumentNullException("newAttribute");
-			}
-
-			_hashitems[newAttribute.Name] = newAttribute;
-			newAttribute._ownernode = _ownernode;
-			_items.Insert(0, newAttribute);
-
-			_ownernode._innerchanged = true;
-			_ownernode._outerchanged = true;
-			return newAttribute;
-		}
-
-		/// <summary>
-		/// Removes the attribute at the specified index.
-		/// </summary>
-		/// <param name="index">The index of the attribute to remove.</param>
-		public void RemoveAt(int index)
-		{
-			HtmlAttribute att = (HtmlAttribute)_items[index];
-			_hashitems.Remove(att.Name);
-			_items.RemoveAt(index);
-
-			_ownernode._innerchanged = true;
-			_ownernode._outerchanged = true;
-		}
-
-		/// <summary>
-		/// Removes a given attribute from the list.
-		/// </summary>
-		/// <param name="attribute">The attribute to remove. May not be null.</param>
-		public void Remove(HtmlAttribute attribute)
-		{
-			if (attribute == null)
-			{
-				throw new ArgumentNullException("attribute");
-			}
-			int index = GetAttributeIndex(attribute);
-			if (index == -1)
-			{
-				throw new IndexOutOfRangeException();
-			}
-			RemoveAt(index);
-		}
-
-		/// <summary>
-		/// Removes an attribute from the list, using its name. If there are more than one attributes with this name, they will all be removed.
-		/// </summary>
-		/// <param name="name">The attribute's name. May not be null.</param>
-		public void Remove(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			string lname = name.ToLower();
-			for(int i=0;i<_items.Count;i++)
-			{
-				HtmlAttribute att = (HtmlAttribute)_items[i];
-				if (att.Name == lname)
-				{
-					RemoveAt(i);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Remove all attributes in the list.
-		/// </summary>
-		public void RemoveAll()
-		{
-			_hashitems.Clear();
-			_items.Clear();
-
-			_ownernode._innerchanged = true;
-			_ownernode._outerchanged = true;
-		}
-
-		/// <summary>
-		/// Gets the number of elements actually contained in the list.
-		/// </summary>
-		public int Count
-		{
-			get
-			{
-				return _items.Count;
-			}
-		}
-
-		internal int GetAttributeIndex(HtmlAttribute attribute)
-		{
-			if (attribute == null)
-			{
-				throw new ArgumentNullException("attribute");
-			}
-			for(int i=0;i<_items.Count;i++)
-			{
-				if (((HtmlAttribute)_items[i])==attribute)
-					return i;
-			}
-			return -1;
-		}
-
-		internal int GetAttributeIndex(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-			string lname = name.ToLower();
-			for(int i=0;i<_items.Count;i++)
-			{
-				if (((HtmlAttribute)_items[i]).Name==lname)
-					return i;
-			}
-			return -1;
-		}
-
-		/// <summary>
-		/// Gets a given attribute from the list using its name.
-		/// </summary>
-		public HtmlAttribute this[string name]
-		{
-			get
-			{
-				if (name == null)
-				{
-					throw new ArgumentNullException("name");
-				}
-				return _hashitems[name.ToLower()] as HtmlAttribute;
-			}
-		}
-
-		/// <summary>
-		/// Gets the attribute at the specified index.
-		/// </summary>
-		public HtmlAttribute this[int index]
-		{
-			get
-			{
-				return _items[index] as HtmlAttribute;
-			}
-		}
-
-		internal void Clear()
-		{
-			_hashitems.Clear();
-			_items.Clear();
-		}
-
-		/// <summary>
-		/// Returns an enumerator that can iterate through the list.
-		/// </summary>
-		/// <returns>An IEnumerator for the entire list.</returns>
-		public HtmlAttributeEnumerator GetEnumerator() 
-		{
-			return new HtmlAttributeEnumerator(_items);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator() 
-		{
-			return GetEnumerator();
-		}
-
-		/// <summary>
-		/// Represents an enumerator that can iterate through the list.
-		/// </summary>
-		public class HtmlAttributeEnumerator: IEnumerator 
-		{
-			int _index;
-			ArrayList _items;
-
-			internal HtmlAttributeEnumerator(ArrayList items) 
-			{
-				_items = items;
-				_index = -1;
-			}
-
-			/// <summary>
-			/// Sets the enumerator to its initial position, which is before the first element in the collection.
-			/// </summary>
-			public void Reset() 
-			{
-				_index = -1;
-			}
-
-			/// <summary>
-			/// Advances the enumerator to the next element of the collection.
-			/// </summary>
-			/// <returns>true if the enumerator was successfully advanced to the next element, false if the enumerator has passed the end of the collection.</returns>
-			public bool MoveNext() 
-			{
-				_index++;
-				return (_index<_items.Count);
-			}
-
-			/// <summary>
-			/// Gets the current element in the collection.
-			/// </summary>
-			public HtmlAttribute Current 
-			{
-				get 
-				{
-					return (HtmlAttribute)(_items[_index]);
-				}
-			}
-
-			/// <summary>
-			/// Gets the current element in the collection.
-			/// </summary>
-			object IEnumerator.Current 
-			{
-				get 
-				{
-					return (Current);
-				}
-			}
-		}
-	}
-
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlDocument.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlDocument.cs
deleted file mode 100644
index f79fab47996..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlDocument.cs
+++ /dev/null
@@ -1,2079 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.IO;
-using System.Text;
-using System.Diagnostics;
-using System.Collections;
-using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.XPath;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// Represents the type of parsing error.
-	/// </summary>
-	public enum HtmlParseErrorCode
-	{
-		/// <summary>
-		/// A tag was not closed.
-		/// </summary>
-		TagNotClosed,
-
-		/// <summary>
-		/// A tag was not opened.
-		/// </summary>
-		TagNotOpened,
-
-		/// <summary>
-		/// There is a charset mismatch between stream and declared (META) encoding.
-		/// </summary>
-		CharsetMismatch,
-
-		/// <summary>
-		/// An end tag was not required.
-		/// </summary>
-		EndTagNotRequired,
-
-		/// <summary>
-		/// An end tag is invalid at this position.
-		/// </summary>
-		EndTagInvalidHere
-	}
-
-	/// <summary>
-	/// Represents a parsing error found during document parsing.
-	/// </summary>
-	public class HtmlParseError
-	{
-		private HtmlParseErrorCode _code;
-		private int _line;
-		private int _linePosition;
-		private int _streamPosition;
-		private string _sourceText;
-		private string _reason;
-
-		internal HtmlParseError(
-			HtmlParseErrorCode code,
-			int line,
-			int linePosition,
-			int streamPosition,
-			string sourceText,
-			string reason)
-		{
-			_code = code;
-			_line = line;
-			_linePosition = linePosition;
-			_streamPosition = streamPosition;
-			_sourceText = sourceText;
-			_reason = reason;
-		}
-
-		/// <summary>
-		/// Gets the type of error.
-		/// </summary>
-		public HtmlParseErrorCode Code
-		{
-			get
-			{
-				return _code;
-			}
-		}
-
-		/// <summary>
-		/// Gets the line number of this error in the document.
-		/// </summary>
-		public int Line
-		{
-			get
-			{
-				return _line;
-			}
-		}
-
-		/// <summary>
-		/// Gets the column number of this error in the document.
-		/// </summary>
-		public int LinePosition
-		{
-			get
-			{
-				return _linePosition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the absolute stream position of this error in the document, relative to the start of the document.
-		/// </summary>
-		public int StreamPosition
-		{
-			get
-			{
-				return _streamPosition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the the full text of the line containing the error.
-		/// </summary>
-		public string SourceText
-		{
-			get
-			{
-				return _sourceText;
-				}
-		}
-
-		/// <summary>
-		/// Gets a description for the error.
-		/// </summary>
-		public string Reason
-		{
-			get
-			{
-				return _reason;
-			}
-		}
-	}
-	
-	/// <summary>
-	/// Represents a complete HTML document.
-	/// </summary>
-	public class HtmlDocument: IXPathNavigable
-	{
-		internal static readonly string HtmlExceptionRefNotChild = "Reference node must be a child of this node";
-		internal static readonly string HtmlExceptionUseIdAttributeFalse = "You need to set UseIdAttribute property to true to enable this feature";
-
-		internal Hashtable _openednodes;
-		internal Hashtable _lastnodes = new Hashtable();
-		internal Hashtable _nodesid;
-		private HtmlNode _documentnode;
-		internal string _text;
-		private string _remainder;
-		private int _remainderOffset;
-		private HtmlNode _currentnode;
-		private HtmlNode _lastparentnode;
-		private HtmlAttribute _currentattribute;
-		private int _index;
-		private int _line;
-		private int _lineposition, _maxlineposition;
-		private int _c;
-		private bool _fullcomment;
-		private System.Text.Encoding _streamencoding;
-		private System.Text.Encoding _declaredencoding;
-		private ArrayList _parseerrors = new ArrayList();
-		private ParseState _state, _oldstate;
-		private Crc32 _crc32 = null;
-		private bool _onlyDetectEncoding = false;
-
-		// public props
-
-		/// <summary>
-		/// Defines if a checksum must be computed for the document while parsing. Default is false.
-		/// </summary>
-		public bool OptionComputeChecksum = false;
-
-		/// <summary>
-		/// Defines if declared encoding must be read from the document.
-		/// Declared encoding is determined using the meta http-equiv="content-type" content="text/html;charset=XXXXX" html node.
-		/// Default is true.
-		/// </summary>
-		public bool OptionReadEncoding = true;
-
-
-		/// <summary>
-		/// Defines if non closed nodes will be checked at the end of parsing. Default is true.
-		/// </summary>
-		public bool OptionCheckSyntax = true;
-
-		/// <summary>
-		/// Defines if the 'id' attribute must be specifically used. Default is true.
-		/// </summary>
-		public bool OptionUseIdAttribute = true;
-
-		/// <summary>
-		/// Defines if empty nodes must be written as closed during output. Default is false.
-		/// </summary>
-		public bool OptionWriteEmptyNodes = false;
-
-		/// <summary>
-		/// Defines if output must conform to XML, instead of HTML.
-		/// </summary>
-		public bool OptionOutputAsXml = false;
-
-		/// <summary>
-		/// Defines if name must be output in uppercase. Default is false.
-		/// </summary>
-		public bool OptionOutputUpperCase = false;
-
-		/// <summary>
-		/// Defines if attribute value output must be optimized (not bound with double quotes if it is possible). Default is false.
-		/// </summary>
-		public bool OptionOutputOptimizeAttributeValues = false;
-
-		/// <summary>
-		/// Adds Debugging attributes to node. Default is false.
-		/// </summary>
-		public bool OptionAddDebuggingAttributes = false;
-
-		/// <summary>
-		/// Defines if source text must be extracted while parsing errors.
-		/// If the document has a lot of errors, or cascading errors, parsing performance can be dramatically affected if set to true.
-		/// Default is false.
-		/// </summary>
-		public bool OptionExtractErrorSourceText = false; // turning this on can dramatically slow performance if a lot of errors are detected
-
-		/// <summary>
-		/// Defines if closing for non closed nodes must be done at the end or directly in the document.
-		/// Setting this to true can actually change how browsers render the page. Default is false.
-		/// </summary>
-		public bool OptionAutoCloseOnEnd = false; // close errors at the end
-
-		/// <summary>
-		/// Defines if LI, TR, TH, TD tags must be partially fixed when nesting errors are detected. Default is false.
-		/// </summary>
-		public bool OptionFixNestedTags = false; // fix li, tr, th, td tags
-
-		/// <summary>
-		/// Defines the maximum length of source text or parse errors. Default is 100.
-		/// </summary>
-		public int OptionExtractErrorSourceTextMaxLength = 100;
-
-		/// <summary>
-		/// Defines the default stream encoding to use. Default is System.Text.Encoding.Default.
-		/// </summary>
-		public System.Text.Encoding OptionDefaultStreamEncoding = System.Text.Encoding.Default;
-
-		/// <summary>
-		/// Defines the name of a node that will throw the StopperNodeException when found as an end node. Default is null.
-		/// </summary>
-		public string OptionStopperNodeName = null;
-
-		/// <summary>
-		/// Gets the remaining text.
-		/// Will always be null if OptionStopperNodeName is null.
-		/// </summary>
-		public string Remainder
-		{
-			get
-			{
-				return _remainder;
-			}
-		}
-
-		/// <summary>
-		/// Gets the offset of Remainder in the original Html text.
-		/// If OptionStopperNodeName is null, this will return the length of the original Html text.
-		/// </summary>
-		public int RemainderOffset
-		{
-			get
-			{
-				return _remainderOffset;
-			}
-		}
-
-		/// <summary>
-		/// Gets a list of parse errors found in the document.
-		/// </summary>
-		public ArrayList ParseErrors
-		{
-			get
-			{
-				return _parseerrors;
-			}
-		}
-
-		/// <summary>
-		/// Gets the document's stream encoding.
-		/// </summary>
-		public System.Text.Encoding StreamEncoding
-		{
-			get
-			{
-				return _streamencoding;
-			}
-		}
-
-		/// <summary>
-		/// Gets the document's declared encoding.
-		/// Declared encoding is determined using the meta http-equiv="content-type" content="text/html;charset=XXXXX" html node.
-		/// </summary>
-		public System.Text.Encoding DeclaredEncoding
-		{
-			get
-			{
-				return _declaredencoding;
-			}
-		}
-
-		/// <summary>
-		/// Creates an instance of an HTML document.
-		/// </summary>
-		public HtmlDocument()
-		{
-			_documentnode = CreateNode(HtmlNodeType.Document, 0);
-		}
-
-		internal HtmlNode GetXmlDeclaration()
-		{
-			if (!_documentnode.HasChildNodes)
-			{
-				return null;
-			}
-
-			foreach(HtmlNode node in _documentnode._childnodes)
-			{
-				if (node.Name == "?xml") // it's ok, names are case sensitive
-				{
-					return node;
-				}
-			}
-			return null;
-		}
-
-		/// <summary>
-		/// Applies HTML encoding to a specified string.
-		/// </summary>
-		/// <param name="html">The input string to encode. May not be null.</param>
-		/// <returns>The encoded string.</returns>
-		public static string HtmlEncode(string html)
-		{
-			if (html == null)
-			{
-				throw new ArgumentNullException("html");
-			}
-			// replace & by &amp; but only once!
-			Regex rx = new Regex("&(?!(amp;)|(lt;)|(gt;)|(quot;))", RegexOptions.IgnoreCase);
-			return rx.Replace(html, "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("\"", "&quot;");
-		}
-
-		/// <summary>
-		/// Detects the encoding of an HTML stream.
-		/// </summary>
-		/// <param name="stream">The input stream. May not be null.</param>
-		/// <returns>The detected encoding.</returns>
-		public Encoding DetectEncoding(Stream stream)
-		{
-			if (stream == null)
-			{
-				throw new ArgumentNullException("stream");
-			}
-			return DetectEncoding(new StreamReader(stream));
-		}
-
-		/// <summary>
-		/// Detects the encoding of an HTML file.
-		/// </summary>
-		/// <param name="path">Path for the file containing the HTML document to detect. May not be null.</param>
-		/// <returns>The detected encoding.</returns>
-		public Encoding DetectEncoding(string path)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			StreamReader sr = new StreamReader(path, OptionDefaultStreamEncoding);
-			Encoding encoding = DetectEncoding(sr);
-			sr.Close();
-			return encoding;
-		}
-
-		/// <summary>
-		/// Detects the encoding of an HTML text.
-		/// </summary>
-		/// <param name="html">The input html text. May not be null.</param>
-		/// <returns>The detected encoding.</returns>
-		public Encoding DetectEncodingHtml(string html)
-		{
-			if (html == null)
-			{
-				throw new ArgumentNullException("html");
-			}
-			StringReader sr = new StringReader(html);
-			Encoding encoding = DetectEncoding(sr);
-			sr.Close();
-			return encoding;
-		}
-
-		/// <summary>
-		/// Detects the encoding of an HTML text provided on a TextReader.
-		/// </summary>
-		/// <param name="reader">The TextReader used to feed the HTML. May not be null.</param>
-		/// <returns>The detected encoding.</returns>
-		public Encoding DetectEncoding(TextReader reader)
-		{
-			if (reader == null)
-			{
-				throw new ArgumentNullException("reader");
-			}
-			_onlyDetectEncoding = true;
-			if (OptionCheckSyntax)
-			{
-				_openednodes = new Hashtable();
-			}
-			else
-			{
-				_openednodes = null;
-			}
-
-			if (OptionUseIdAttribute)
-			{
-				_nodesid = new Hashtable();
-			}
-			else
-			{
-				_nodesid = null;
-			}
-
-			StreamReader sr = reader as StreamReader;
-			if (sr != null)
-			{
-				_streamencoding = sr.CurrentEncoding;
-			}
-			else
-			{
-				_streamencoding = null;
-			}
-			_declaredencoding = null;
-
-			_text = reader.ReadToEnd();
-			_documentnode = CreateNode(HtmlNodeType.Document, 0);
-
-			// this is almost a hack, but it allows us not to muck with the original parsing code
-			try
-			{
-				Parse();
-			}
-			catch(EncodingFoundException ex)
-			{
-				return ex.Encoding;
-			}
-			return null;
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		public void Load(Stream stream)
-		{
-			Load(new StreamReader(stream, OptionDefaultStreamEncoding));
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
-		public void Load(Stream stream, bool detectEncodingFromByteOrderMarks)
-		{
-			Load(new StreamReader(stream, detectEncodingFromByteOrderMarks));
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public void Load(Stream stream, Encoding encoding)
-		{
-			Load(new StreamReader(stream, encoding));
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
-		public void Load(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
-		{
-			Load(new StreamReader(stream, encoding, detectEncodingFromByteOrderMarks));
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
-		/// <param name="buffersize">The minimum buffer size.</param>
-		public void Load(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
-		{
-			Load(new StreamReader(stream, encoding, detectEncodingFromByteOrderMarks, buffersize));
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read. May not be null.</param>
-		public void Load(string path)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			StreamReader sr = new StreamReader(path, OptionDefaultStreamEncoding);
-			Load(sr);
-			sr.Close();
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read. May not be null.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public void Load(string path, bool detectEncodingFromByteOrderMarks)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			StreamReader sr = new StreamReader(path, detectEncodingFromByteOrderMarks);
-			Load(sr);
-			sr.Close();
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read. May not be null.</param>
-		/// <param name="encoding">The character encoding to use. May not be null.</param>
-		public void Load(string path, Encoding encoding)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			if (encoding == null)
-			{
-				throw new ArgumentNullException("encoding");
-			}
-			StreamReader sr = new StreamReader(path, encoding);
-			Load(sr);
-			sr.Close();
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read. May not be null.</param>
-		/// <param name="encoding">The character encoding to use. May not be null.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public void Load(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			if (encoding == null)
-			{
-				throw new ArgumentNullException("encoding");
-			}
-			StreamReader sr = new StreamReader(path, encoding, detectEncodingFromByteOrderMarks);
-			Load(sr);
-			sr.Close();
-		}
-
-		/// <summary>
-		/// Loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read. May not be null.</param>
-		/// <param name="encoding">The character encoding to use. May not be null.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		/// <param name="buffersize">The minimum buffer size.</param>
-		public void Load(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			if (encoding == null)
-			{
-				throw new ArgumentNullException("encoding");
-			}
-			StreamReader sr = new StreamReader(path, encoding, detectEncodingFromByteOrderMarks, buffersize);
-			Load(sr);
-			sr.Close();
-		}
-
-		/// <summary>
-		/// Loads the HTML document from the specified string.
-		/// </summary>
-		/// <param name="html">String containing the HTML document to load. May not be null.</param>
-		public void LoadHtml(string html)
-		{
-			if (html == null)
-			{
-				throw new ArgumentNullException("html");
-			}
-			StringReader sr = new StringReader(html);
-			Load(sr);
-			sr.Close();
-		}
-
-		/// <summary>
-		/// Detects the encoding of an HTML document from a file first, and then loads the file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		public void DetectEncodingAndLoad(string path)
-		{
-			DetectEncodingAndLoad(path, true);
-		}
-
-		/// <summary>
-		/// Detects the encoding of an HTML document from a file first, and then loads the file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read. May not be null.</param>
-		/// <param name="detectEncoding">true to detect encoding, false otherwise.</param>
-		public void DetectEncodingAndLoad(string path, bool detectEncoding)
-		{
-			if (path == null)
-			{
-				throw new ArgumentNullException("path");
-			}
-			System.Text.Encoding enc;
-			if (detectEncoding)
-			{
-				enc = DetectEncoding(path);
-			}
-			else
-			{
-				enc = null;
-			}
-
-			if (enc == null)
-			{
-				Load(path);
-			}
-			else
-			{
-				Load(path, enc);
-			}
-		}
-
-		/// <summary>
-		/// Loads the HTML document from the specified TextReader.
-		/// </summary>
-		/// <param name="reader">The TextReader used to feed the HTML data into the document. May not be null.</param>
-		public void Load(TextReader reader)
-		{
-			// all Load methods pass down to this one
-			if (reader == null)
-			{
-				throw new ArgumentNullException("reader");
-			}
-
-			_onlyDetectEncoding = false;
-
-			if (OptionCheckSyntax)
-			{
-				_openednodes = new Hashtable();
-			}
-			else
-			{
-				_openednodes = null;
-			}
-
-			if (OptionUseIdAttribute)
-			{
-				_nodesid = new Hashtable();
-			}
-			else
-			{
-				_nodesid = null;
-			}
-
-			StreamReader sr = reader as StreamReader;
-			if (sr != null)
-			{
-				try
-				{
-					// trigger bom read if needed
-					sr.Peek();
-				}
-				catch
-				{
-					// void on purpose
-				}
-				_streamencoding = sr.CurrentEncoding;
-			}
-			else
-			{
-				_streamencoding = null;
-			}
-			_declaredencoding = null;
-
-			_text = reader.ReadToEnd();
-			_documentnode = CreateNode(HtmlNodeType.Document, 0);
-			Parse();
-
-			if (OptionCheckSyntax)
-			{
-				foreach(HtmlNode node in _openednodes.Values)
-				{
-					if (!node._starttag)	// already reported
-					{
-						continue;
-					}
-
-					string html;
-					if (OptionExtractErrorSourceText)
-					{
-						html = node.OuterHtml;
-						if (html.Length > OptionExtractErrorSourceTextMaxLength)
-						{
-							html = html.Substring(0, OptionExtractErrorSourceTextMaxLength);
-						}
-					}
-					else
-					{
-						html = string.Empty;
-					}
-					AddError(
-						HtmlParseErrorCode.TagNotClosed,
-						node._line, node._lineposition,
-						node._streamposition, html,
-						"End tag </" + node.Name + "> was not found");
-				}
-
-				// we don't need this anymore
-				_openednodes.Clear();
-			}
-		}
-
-		internal System.Text.Encoding GetOutEncoding()
-		{
-			// when unspecified, use the stream encoding first
-			if (_declaredencoding != null)
-			{
-				return _declaredencoding;
-			}
-			else
-			{
-				if (_streamencoding != null)
-				{
-					return _streamencoding;
-				}
-			}
-			return OptionDefaultStreamEncoding;
-		}
-
-
-		/// <summary>
-		/// Gets the document's output encoding.
-		/// </summary>
-		public System.Text.Encoding Encoding
-		{
-			get
-			{
-				return GetOutEncoding();
-			}
-		}
-
-		/// <summary>
-		/// Saves the HTML document to the specified stream.
-		/// </summary>
-		/// <param name="outStream">The stream to which you want to save.</param>
-		public void Save(Stream outStream)
-		{
-			StreamWriter sw = new StreamWriter(outStream, GetOutEncoding());
-			Save(sw);
-		}
-
-		/// <summary>
-		/// Saves the HTML document to the specified stream.
-		/// </summary>
-		/// <param name="outStream">The stream to which you want to save. May not be null.</param>
-		/// <param name="encoding">The character encoding to use. May not be null.</param>
-		public void Save(Stream outStream, System.Text.Encoding encoding)
-		{
-			if (outStream == null)
-			{
-				throw new ArgumentNullException("outStream");
-			}
-			if (encoding == null)
-			{
-				throw new ArgumentNullException("encoding");
-			}
-			StreamWriter sw = new StreamWriter(outStream, encoding);
-			Save(sw);
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified file.
-		/// </summary>
-		/// <param name="filename">The location of the file where you want to save the document.</param>
-		public void Save(string filename)
-		{
-			StreamWriter sw = new StreamWriter(filename, false, GetOutEncoding());
-			Save(sw);
-			sw.Close();
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified file.
-		/// </summary>
-		/// <param name="filename">The location of the file where you want to save the document. May not be null.</param>
-		/// <param name="encoding">The character encoding to use. May not be null.</param>
-		public void Save(string filename, System.Text.Encoding encoding)
-		{
-			if (filename == null)
-			{
-				throw new ArgumentNullException("filename");
-			}
-			if (encoding == null)
-			{
-				throw new ArgumentNullException("encoding");
-			}
-			StreamWriter sw = new StreamWriter(filename, false, encoding);
-			Save(sw);
-			sw.Close();
-		}
-
-		/// <summary>
-		/// Saves the HTML document to the specified StreamWriter.
-		/// </summary>
-		/// <param name="writer">The StreamWriter to which you want to save.</param>
-		public void Save(StreamWriter writer)
-		{
-			Save((TextWriter)writer);
-		}
-
-		/// <summary>
-		/// Saves the HTML document to the specified TextWriter.
-		/// </summary>
-		/// <param name="writer">The TextWriter to which you want to save. May not be null.</param>
-		public void Save(TextWriter writer)
-		{
-			if (writer == null)
-			{
-				throw new ArgumentNullException("writer");
-			}
-			DocumentNode.WriteTo(writer);
-		}
-
-		/// <summary>
-		/// Saves the HTML document to the specified XmlWriter.
-		/// </summary>
-		/// <param name="writer">The XmlWriter to which you want to save.</param>
-		public void Save(XmlWriter writer)
-		{
-			DocumentNode.WriteTo(writer);
-			writer.Flush();
-		}
-
-		/// <summary>
-		/// Creates a new XPathNavigator object for navigating this HTML document.
-		/// </summary>
-		/// <returns>An XPathNavigator object. The XPathNavigator is positioned on the root of the document.</returns>
-		public XPathNavigator CreateNavigator()
-		{
-			return new HtmlNodeNavigator(this, _documentnode);
-		}
-
-		/// <summary>
-		/// Gets a valid XML name.
-		/// </summary>
-		/// <param name="name">Any text.</param>
-		/// <returns>A string that is a valid XML name.</returns>
-		public static string GetXmlName(string name)
-		{
-			string xmlname = string.Empty;
-			bool nameisok = true;
-			for(int i=0;i<name.Length;i++)
-			{
-				// names are lcase
-				// note: we are very limited here, too much?
-				if (((name[i]>='a') && (name[i]<='z')) ||
-					((name[i]>='0') && (name[i]<='9')) ||
-					//					(name[i]==':') || (name[i]=='_') || (name[i]=='-') || (name[i]=='.')) // these are bads in fact
-					(name[i]=='_') || (name[i]=='-') || (name[i]=='.'))
-				{
-					xmlname += name[i];
-				}
-				else
-				{
-					nameisok = false;
-					byte[] bytes = System.Text.Encoding.UTF8.GetBytes(new char[]{name[i]});
-					for(int j=0;j<bytes.Length;j++)
-					{
-						xmlname += bytes[j].ToString("x2");
-					}
-					xmlname += "_";
-				}
-															  
-			}
-			if (nameisok)
-			{
-				return xmlname;
-			}
-			return "_" + xmlname;
-		}
-
-		internal void SetIdForNode(HtmlNode node, string id)
-		{
-			if (!OptionUseIdAttribute)
-			{
-				return;
-			}
-
-			if ((_nodesid == null) || (id == null))
-			{
-				return;
-			}
-
-			if (node == null)
-			{
-				_nodesid.Remove(id.ToLower());
-			}
-			else
-			{
-				_nodesid[id.ToLower()] = node;
-			}
-		}
-
-		/// <summary>
-		/// Gets the HTML node with the specified 'id' attribute value.
-		/// </summary>
-		/// <param name="id">The attribute id to match. May not be null.</param>
-		/// <returns>The HTML node with the matching id or null if not found.</returns>
-		public HtmlNode GetElementbyId(string id)
-		{
-			if (id == null)
-			{
-				throw new ArgumentNullException("id");
-			}
-			if (_nodesid == null)
-			{
-				throw new Exception(HtmlExceptionUseIdAttributeFalse);
-			}
-
-			return _nodesid[id.ToLower()] as HtmlNode;
-		}
-
-		/// <summary>
-		/// Creates an HTML element node with the specified name.
-		/// </summary>
-		/// <param name="name">The qualified name of the element. May not be null.</param>
-		/// <returns>The new HTML node.</returns>
-		public HtmlNode CreateElement(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-			HtmlNode node = CreateNode(HtmlNodeType.Element);
-			node._name = name;
-			return node;
-		}
-
-		/// <summary>
-		/// Creates an HTML comment node.
-		/// </summary>
-		/// <returns>The new HTML comment node.</returns>
-		public HtmlCommentNode CreateComment()
-		{
-			return (HtmlCommentNode)CreateNode(HtmlNodeType.Comment);
-		}
-
-		/// <summary>
-		/// Creates an HTML comment node with the specified comment text.
-		/// </summary>
-		/// <param name="comment">The comment text. May not be null.</param>
-		/// <returns>The new HTML comment node.</returns>
-		public HtmlCommentNode CreateComment(string comment)
-		{
-			if (comment == null)
-			{
-				throw new ArgumentNullException("comment");
-			}
-			HtmlCommentNode c = CreateComment();
-			c.Comment = comment;
-			return c;
-		}
-
-		/// <summary>
-		/// Creates an HTML text node.
-		/// </summary>
-		/// <returns>The new HTML text node.</returns>
-		public HtmlTextNode CreateTextNode()
-		{
-			return (HtmlTextNode)CreateNode(HtmlNodeType.Text);
-		}
-
-		/// <summary>
-		/// Creates an HTML text node with the specified text.
-		/// </summary>
-		/// <param name="text">The text of the node. May not be null.</param>
-		/// <returns>The new HTML text node.</returns>
-		public HtmlTextNode CreateTextNode(string text)
-		{
-			if (text == null)
-			{
-				throw new ArgumentNullException("text");
-			}
-			HtmlTextNode t = CreateTextNode();
-			t.Text = text;
-			return t;
-		}
-
-		internal HtmlNode CreateNode(HtmlNodeType type)
-		{
-			return CreateNode(type, -1);
-		}
-
-		internal HtmlNode CreateNode(HtmlNodeType type, int index)
-		{
-			switch (type)
-			{
-				case HtmlNodeType.Comment:
-					return new HtmlCommentNode(this, index);
-
-				case HtmlNodeType.Text:
-					return new HtmlTextNode(this, index);
-
-				default:
-					return new HtmlNode(type, this, index);
-			}
-		}
-
-		internal HtmlAttribute CreateAttribute()
-		{
-			return new HtmlAttribute(this);
-		}
-
-		/// <summary>
-		/// Creates an HTML attribute with the specified name.
-		/// </summary>
-		/// <param name="name">The name of the attribute. May not be null.</param>
-		/// <returns>The new HTML attribute.</returns>
-		public HtmlAttribute CreateAttribute(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-			HtmlAttribute att = CreateAttribute();
-			att.Name = name;
-			return att;
-		}
-
-		/// <summary>
-		/// Creates an HTML attribute with the specified name.
-		/// </summary>
-		/// <param name="name">The name of the attribute. May not be null.</param>
-		/// <param name="value">The value of the attribute.</param>
-		/// <returns>The new HTML attribute.</returns>
-		public HtmlAttribute CreateAttribute(string name, string value)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-			HtmlAttribute att = CreateAttribute(name);
-			att.Value = value;
-			return att;
-		}
-
-		/// <summary>
-		/// Gets the root node of the document.
-		/// </summary>
-		public HtmlNode DocumentNode
-		{
-			get
-			{
-				return _documentnode;
-			}
-		}
-
-		/// <summary>
-		/// Gets the document CRC32 checksum if OptionComputeChecksum was set to true before parsing, 0 otherwise.
-		/// </summary>
-		public int CheckSum
-		{
-			get
-			{
-				if (_crc32 == null)
-				{
-					return 0;
-				}
-				else
-				{
-					return (int)_crc32.CheckSum;
-				}
-			}
-		}
-
-		private HtmlParseError AddError(
-				HtmlParseErrorCode code,
-				int line,
-				int linePosition,
-				int streamPosition,
-				string sourceText,
-				string reason)
-			{
-			HtmlParseError err = new HtmlParseError(code, line, linePosition, streamPosition, sourceText, reason);
-			_parseerrors.Add(err);
-			return err;
-		}
-
-
-		private enum ParseState
-		{
-			Text,
-			WhichTag,
-			Tag,
-			BetweenAttributes,
-			EmptyTag,
-			AttributeName,
-			AttributeBeforeEquals,
-			AttributeAfterEquals,
-			AttributeValue,
-			Comment,
-			QuotedAttributeValue,
-			ServerSideCode,
-			PcData
-		}
-
-		private void IncrementPosition()
-		{
-			if (_crc32 != null)
-			{
-				// REVIEW: should we add some checksum code in DecrementPosition too?
-				_crc32.AddToCRC32(_c);
-			}
-
-			_index++;
-			_maxlineposition = _lineposition;
-			if (_c == 10)
-			{
-				_lineposition = 1;
-				_line++;
-			}
-			else
-			{
-				_lineposition++;
-			}
-		}
-
-		private void DecrementPosition()
-		{
-			_index--;
-			if (_lineposition == 1)
-			{
-				_lineposition = _maxlineposition;
-				_line--;
-			}
-			else
-			{
-				_lineposition--;
-			}
-		}
-
-		private void Parse()
-		{
-			int lastquote = 0;
-			if (OptionComputeChecksum)
-			{
-				_crc32 = new Crc32();
-			}
-
-			_lastnodes = new Hashtable();
-			_c = 0;
-			_fullcomment = false;
-			_parseerrors = new ArrayList();
-			_line = 1;
-			_lineposition = 1;
-			_maxlineposition = 1;
-
-			_state = ParseState.Text;
-			_oldstate = _state;
-			_documentnode._innerlength = _text.Length;
-			_documentnode._outerlength = _text.Length;
-			_remainderOffset = _text.Length;
-
-			_lastparentnode = _documentnode;
-			_currentnode = CreateNode(HtmlNodeType.Text, 0);
-			_currentattribute = null;
-
-			_index = 0;
-			PushNodeStart(HtmlNodeType.Text, 0);
-			while (_index<_text.Length)
-			{
-				_c = _text[_index];
-				IncrementPosition();
-
-				switch(_state)
-				{
-					case ParseState.Text:
-						if (NewCheck())
-							continue;
-						break;
-
-					case ParseState.WhichTag:
-						if (NewCheck())
-							continue;
-						if (_c == '/')
-						{
-							PushNodeNameStart(false, _index);
-						}
-						else
-						{
-							PushNodeNameStart(true, _index-1);
-							DecrementPosition();
-						}
-						_state = ParseState.Tag;
-						break;
-
-					case ParseState.Tag:
-						if (NewCheck())
-							continue;
-						if (IsWhiteSpace(_c))
-						{
-							PushNodeNameEnd(_index-1);
-							if (_state != ParseState.Tag)
-								continue;
-							_state = ParseState.BetweenAttributes;
-							continue;
-						}
-						if (_c == '/')
-						{
-							PushNodeNameEnd(_index-1);
-							if (_state != ParseState.Tag)
-								continue;
-							_state = ParseState.EmptyTag;
-							continue;
-						}
-						if (_c == '>')
-						{
-							PushNodeNameEnd(_index-1);
-							if (_state != ParseState.Tag)
-								continue;
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-							if (_state != ParseState.Tag)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-						}
-						break;
-
-					case ParseState.BetweenAttributes:
-						if (NewCheck())
-							continue;
-
-						if (IsWhiteSpace(_c))
-							continue;
-
-						if ((_c == '/') || (_c == '?'))
-						{
-							_state = ParseState.EmptyTag;
-							continue;
-						}
-
-						if (_c == '>')
-						{
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-									
-							if (_state != ParseState.BetweenAttributes)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-
-						PushAttributeNameStart(_index-1);
-						_state = ParseState.AttributeName;
-						break;
-
-					case ParseState.EmptyTag:
-						if (NewCheck())
-							continue;
-
-						if (_c == '>')
-						{
-							if (!PushNodeEnd(_index, true))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-
-							if (_state != ParseState.EmptyTag)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-						_state = ParseState.BetweenAttributes;
-						break;
-
-					case ParseState.AttributeName:
-						if (NewCheck())
-							continue;
-
-						if (IsWhiteSpace(_c))
-						{
-							PushAttributeNameEnd(_index-1);
-							_state = ParseState.AttributeBeforeEquals;
-							continue;
-						}
-						if (_c == '=')
-						{
-							PushAttributeNameEnd(_index-1);
-							_state = ParseState.AttributeAfterEquals;
-							continue;
-						}
-						if (_c == '>')
-						{
-							PushAttributeNameEnd(_index-1);
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-							if (_state != ParseState.AttributeName)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-						break;
-
-					case ParseState.AttributeBeforeEquals:
-						if (NewCheck())
-							continue;
-
-						if (IsWhiteSpace(_c))
-							continue;
-						if (_c == '>')
-						{
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-							if (_state != ParseState.AttributeBeforeEquals)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-						if (_c == '=')
-						{
-							_state = ParseState.AttributeAfterEquals;
-							continue;
-						}
-						// no equals, no whitespace, it's a new attrribute starting
-						_state = ParseState.BetweenAttributes;
-						DecrementPosition();
-						break;
-
-					case ParseState.AttributeAfterEquals:
-						if (NewCheck())
-							continue;
-
-						if (IsWhiteSpace(_c))
-							continue;
-
-						if ((_c == '\'') || (_c == '"'))
-						{
-							_state = ParseState.QuotedAttributeValue;
-							PushAttributeValueStart(_index);
-							lastquote = _c;
-							continue;
-						}
-						if (_c == '>')
-						{
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-							if (_state != ParseState.AttributeAfterEquals)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-						PushAttributeValueStart(_index-1);
-						_state = ParseState.AttributeValue;
-						break;
-
-					case ParseState.AttributeValue:
-						if (NewCheck())
-							continue;
-
-						if (IsWhiteSpace(_c))
-						{
-							PushAttributeValueEnd(_index-1);
-							_state = ParseState.BetweenAttributes;
-							continue;
-						}
-
-						if (_c == '>')
-						{
-							PushAttributeValueEnd(_index-1);
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-							if (_state != ParseState.AttributeValue)
-								continue;
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-						break;
-
-					case ParseState.QuotedAttributeValue:
-						if (_c == lastquote)
-						{
-							PushAttributeValueEnd(_index-1);
-							_state = ParseState.BetweenAttributes;
-							continue;
-						}
-						if (_c == '<')
-						{
-							if (_index<_text.Length)
-							{
-								if (_text[_index] == '%')
-								{
-									_oldstate = _state;
-									_state = ParseState.ServerSideCode;
-									continue;
-								}
-							}
-						}
-						break;
-
-					case ParseState.Comment:
-						if (_c == '>')
-						{
-							if (_fullcomment)
-							{
-								if ((_text[_index-2] != '-') ||
-									(_text[_index-3] != '-'))
-								{
-									continue;
-								}
-							}
-							if (!PushNodeEnd(_index, false))
-							{
-								// stop parsing
-								_index = _text.Length;
-								break;
-							}
-							_state = ParseState.Text;
-							PushNodeStart(HtmlNodeType.Text, _index);
-							continue;
-						}
-						break;
-
-					case ParseState.ServerSideCode:
-						if (_c == '%')
-						{
-							if (_index<_text.Length)
-							{
-								if (_text[_index] == '>')
-								{
-									switch(_oldstate)
-									{
-										case ParseState.AttributeAfterEquals:
-											_state = ParseState.AttributeValue;
-											break;
-
-										case ParseState.BetweenAttributes:
-											PushAttributeNameEnd(_index+1);
-											_state = ParseState.BetweenAttributes;
-											break;
-
-										default:
-											_state = _oldstate;
-											break;
-									}
-									IncrementPosition();
-								}
-							}
-						}
-						break;
-
-					case ParseState.PcData:
-						// look for </tag + 1 char
-
-						// check buffer end
-						if ((_currentnode._namelength+3)<=(_text.Length-(_index-1)))
-						{
-							if (string.Compare(_text.Substring(_index-1, _currentnode._namelength+2),
-								"</" + _currentnode.Name, true) == 0)
-							{
-								int c = _text[_index-1 + 2 + _currentnode.Name.Length];
-								if ((c == '>') || (IsWhiteSpace(c)))
-								{
-									// add the script as a text node
-									HtmlNode script = CreateNode(HtmlNodeType.Text,
-										_currentnode._outerstartindex + _currentnode._outerlength);
-									script._outerlength = _index-1 - script._outerstartindex;
-									_currentnode.AppendChild(script);
-
-
-									PushNodeStart(HtmlNodeType.Element, _index-1);
-									PushNodeNameStart(false, _index-1 +2);
-									_state = ParseState.Tag;
-									IncrementPosition();
-								}
-							}
-						}
-						break;
-				}
-			}
-
-			// finish the current work
-			if (_currentnode._namestartindex > 0)
-			{
-				PushNodeNameEnd(_index);
-			}
-			PushNodeEnd(_index, false);
-
-			// we don't need this anymore
-			_lastnodes.Clear();
-		}
-
-		private bool NewCheck()
-		{
-			if (_c != '<')
-			{
-				return false;
-			}
-			if (_index<_text.Length)
-			{
-				if (_text[_index] == '%')
-				{
-					switch(_state)
-					{
-						case ParseState.AttributeAfterEquals:
-                            PushAttributeValueStart(_index-1);
-							break;
-
-						case ParseState.BetweenAttributes:
-							PushAttributeNameStart(_index-1);
-							break;
-
-						case ParseState.WhichTag:
-							PushNodeNameStart(true, _index-1);
-							_state = ParseState.Tag;
-							break;
-					}
-					_oldstate = _state;
-					_state = ParseState.ServerSideCode;
-					return true;
-				}
-			}
-
-			if (!PushNodeEnd(_index-1, true))
-			{
-				// stop parsing
-				_index = _text.Length;
-				return true;
-			}
-			_state = ParseState.WhichTag;
-			if ((_index-1) <= (_text.Length-2))
-			{
-				if (_text[_index] == '!')
-				{
-					PushNodeStart(HtmlNodeType.Comment, _index-1);
-					PushNodeNameStart(true, _index);
-					PushNodeNameEnd(_index+1);
-					_state = ParseState.Comment;
-					if (_index<(_text.Length-2))
-					{
-						if ((_text[_index+1] == '-') &&
-							(_text[_index+2] == '-'))
-						{
-							_fullcomment = true;
-						}
-						else
-						{
-							_fullcomment = false;
-						}
-					}
-					return true;
-				}
-			}
-			PushNodeStart(HtmlNodeType.Element, _index-1);
-			return true;
-		}
-
-		private void ReadDocumentEncoding(HtmlNode node)
-		{
-			if (!OptionReadEncoding)
-				return;
-			// format is 
-			// <meta http-equiv="content-type" content="text/html;charset=iso-8859-1" />
-			
-			// when we append a child, we are in node end, so attributes are already populated
-			if (node._namelength == 4)	// quick check, avoids string alloc
-			{
-				if (node.Name == "meta") // all nodes names are lowercase
-				{
-					HtmlAttribute att = node.Attributes["http-equiv"];
-					if (att != null)
-					{
-						if (string.Compare(att.Value, "content-type", true) == 0)
-						{
-							HtmlAttribute content = node.Attributes["content"];
-							if (content != null)
-							{
-								string charset = NameValuePairList.GetNameValuePairsValue(content.Value, "charset");
-								if (charset != null)
-								{
-									_declaredencoding = Encoding.GetEncoding(charset);
-									if (_onlyDetectEncoding)
-									{
-										throw new EncodingFoundException(_declaredencoding);
-									}
-
-									if (_streamencoding != null)
-									{
-										if (_declaredencoding.WindowsCodePage != _streamencoding.WindowsCodePage)
-										{
-											AddError(
-												HtmlParseErrorCode.CharsetMismatch,
-												_line, _lineposition,
-												_index, node.OuterHtml,
-												"Encoding mismatch between StreamEncoding: " +
-												_streamencoding.WebName + " and DeclaredEncoding: " + _declaredencoding.WebName);
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		private void PushAttributeNameStart(int index)
-		{
-			_currentattribute = CreateAttribute();
-			_currentattribute._namestartindex = index;
-			_currentattribute._line = _line;
-			_currentattribute._lineposition = _lineposition;
-			_currentattribute._streamposition = index;
-		}
-
-		private void PushAttributeNameEnd(int index)
-		{
-			_currentattribute._namelength = index - _currentattribute._namestartindex;
-			_currentnode.Attributes.Append(_currentattribute);
-		}
-
-		private void PushAttributeValueStart(int index)
-		{
-			_currentattribute._valuestartindex = index;
-		}
-
-		private void PushAttributeValueEnd(int index)
-		{
-			_currentattribute._valuelength = index - _currentattribute._valuestartindex;
-		}
-
-		private void PushNodeStart(HtmlNodeType type, int index)
-		{
-			_currentnode = CreateNode(type, index);
-			_currentnode._line = _line;
-			_currentnode._lineposition = _lineposition;
-			if (type == HtmlNodeType.Element)
-			{
-				_currentnode._lineposition--;
-			}
-			_currentnode._streamposition = index;
-		}
-
-		private bool PushNodeEnd(int index, bool close)
-		{
-			_currentnode._outerlength = index - _currentnode._outerstartindex;
-
-			if ((_currentnode._nodetype == HtmlNodeType.Text) ||
-				(_currentnode._nodetype == HtmlNodeType.Comment))
-			{
-				// forget about void nodes
-				if (_currentnode._outerlength>0)
-				{
-					_currentnode._innerlength = _currentnode._outerlength;
-					_currentnode._innerstartindex = _currentnode._outerstartindex;
-					if (_lastparentnode != null)
-					{
-						_lastparentnode.AppendChild(_currentnode);
-					}
-				}
-			}
-			else
-			{
-				if ((_currentnode._starttag) && (_lastparentnode != _currentnode))
-				{
-					// add to parent node
-					if (_lastparentnode != null)
-					{
-						_lastparentnode.AppendChild(_currentnode);
-					}
-
-					ReadDocumentEncoding(_currentnode);
-
-					// remember last node of this kind
-					HtmlNode prev = (HtmlNode)_lastnodes[_currentnode.Name];
-					_currentnode._prevwithsamename = prev;
-					_lastnodes[_currentnode.Name] = _currentnode;
-
-					// change parent?
-					if ((_currentnode.NodeType == HtmlNodeType.Document) ||
-						(_currentnode.NodeType == HtmlNodeType.Element))
-					{
-						_lastparentnode = _currentnode;
-					}
-
-					if (HtmlNode.IsCDataElement(CurrentNodeName()))
-					{
-						_state = ParseState.PcData;
-						return true;
-					}
-
-					if ((HtmlNode.IsClosedElement(_currentnode.Name)) ||
-						(HtmlNode.IsEmptyElement(_currentnode.Name)))
-					{
-						close = true;
-					}
-				}
-			}
-
-			if ((close) || (!_currentnode._starttag))
-			{
-				if ((OptionStopperNodeName != null) && (_remainder == null) &&
-					(string.Compare(_currentnode.Name, OptionStopperNodeName, true) == 0))
-				{
-					_remainderOffset = index;
-					_remainder = _text.Substring(_remainderOffset);
-					CloseCurrentNode();
-					return false; // stop parsing
-				}
-				CloseCurrentNode();
-			}
-			return true;
-		}
-
-		private void PushNodeNameStart(bool starttag, int index)
-		{
-			_currentnode._starttag = starttag;
-			_currentnode._namestartindex = index;
-		}
-
-		private string[] GetResetters(string name)
-		{
-			switch (name)
-			{
-				case "li":
-					return new string[]{"ul"};
-
-				case "tr":
-					return new string[]{"table"};
-
-				case "th":
-				case "td":
-					return new string[]{"tr", "table"};
-
-				default:
-					return null;
-			}
-		}
-
-		private void FixNestedTags()
-		{
-			// we are only interested by start tags, not closing tags
-			if (!_currentnode._starttag)
-				return;
-
-			string name = CurrentNodeName().ToLower();
-			FixNestedTag(name, GetResetters(name));
-		}
-		
-		private void FixNestedTag(string name, string[] resetters)
-		{
-			if (resetters == null)
-				return;
-
-			HtmlNode prev;
-					
-			// if we find a previous unclosed same name node, without a resetter node between, we must close it
-			prev = (HtmlNode)_lastnodes[name];
-			if ((prev != null) && (!prev.Closed))
-			{
-
-				// try to find a resetter node, if found, we do nothing
-				if (FindResetterNodes(prev, resetters))
-				{
-					return;
-				}
-
-				// ok we need to close the prev now
-				// create a fake closer node
-				HtmlNode close = new HtmlNode(prev.NodeType, this, -1);
-				close._endnode = close;
-				prev.CloseNode(close);
-
-			}
-		}
-
-		private bool FindResetterNodes(HtmlNode node, string[] names)
-		{
-			if (names == null)
-			{
-				return false;
-			}
-			for(int i=0;i<names.Length;i++)
-			{
-				if (FindResetterNode(node, names[i]) != null)
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-
-		private HtmlNode FindResetterNode(HtmlNode node, string name)
-		{
-			HtmlNode resetter = (HtmlNode)_lastnodes[name];
-			if (resetter == null)
-				return null;
-			if (resetter.Closed)
-			{
-				return null;
-			}
-			if (resetter._streamposition<node._streamposition)
-			{
-				return null;
-			}
-			return resetter;
-		}
-
-		private void PushNodeNameEnd(int index)
-		{
-			_currentnode._namelength = index - _currentnode._namestartindex;
-			if (OptionFixNestedTags)
-			{
-				FixNestedTags();
-			}
-		}
-
-		private void CloseCurrentNode()
-		{
-			if (_currentnode.Closed) // text or document are by def closed
-				return;
-
-			bool error = false;
-
-			// find last node of this kind
-			HtmlNode prev = (HtmlNode)_lastnodes[_currentnode.Name];
-			if (prev == null)
-			{
-				if (HtmlNode.IsClosedElement(_currentnode.Name))
-				{
-					// </br> will be seen as <br>
-					_currentnode.CloseNode(_currentnode);
-
-					// add to parent node
-					if (_lastparentnode != null)
-					{
-						HtmlNode foundNode = null;
-						Stack futureChild = new Stack();
-						for (HtmlNode node = _lastparentnode.LastChild; node != null; node = node.PreviousSibling)
-						{
-							if ((node.Name == _currentnode.Name) && (! node.HasChildNodes))
-							{
-								foundNode = node;
-								break;
-							}
-							futureChild.Push(node);
-						}
-						if (foundNode != null)
-						{
-							HtmlNode node = null;
-							while(futureChild.Count != 0) 
-							{
-								node = (HtmlNode)futureChild.Pop();
-								_lastparentnode.RemoveChild(node);
-								foundNode.AppendChild(node);
-							}
-						}
-						else
-						{
-							_lastparentnode.AppendChild(_currentnode);
-						}
-
-					}
-				}
-				else
-				{
-					// node has no parent
-					// node is not a closed node
-
-					if (HtmlNode.CanOverlapElement(_currentnode.Name))
-					{
-						// this is a hack: add it as a text node
-						HtmlNode closenode = CreateNode(HtmlNodeType.Text, _currentnode._outerstartindex);
-						closenode._outerlength = _currentnode._outerlength;
-						((HtmlTextNode)closenode).Text = ((HtmlTextNode)closenode).Text.ToLower();
-						if (_lastparentnode != null)
-						{
-							_lastparentnode.AppendChild(closenode);
-						}
-
-					}
-					else
-					{
-						if (HtmlNode.IsEmptyElement(_currentnode.Name))
-						{
-							AddError(
-								HtmlParseErrorCode.EndTagNotRequired,
-								_currentnode._line, _currentnode._lineposition,
-								_currentnode._streamposition, _currentnode.OuterHtml,
-								"End tag </" + _currentnode.Name + "> is not required");
-						}
-						else
-						{
-							// node cannot overlap, node is not empty
-							AddError(
-								HtmlParseErrorCode.TagNotOpened,
-								_currentnode._line, _currentnode._lineposition,
-								_currentnode._streamposition, _currentnode.OuterHtml,
-								"Start tag <" + _currentnode.Name + "> was not found");
-							error = true;
-						}
-					}
-				}
-			}
-			else
-			{
-				if (OptionFixNestedTags)
-				{
-					if (FindResetterNodes(prev, GetResetters(_currentnode.Name)))
-					{
-						AddError(
-							HtmlParseErrorCode.EndTagInvalidHere,
-							_currentnode._line, _currentnode._lineposition,
-							_currentnode._streamposition, _currentnode.OuterHtml,
-							"End tag </" + _currentnode.Name + "> invalid here");
-						error = true;					
-					}
-				}
-
-				if (!error)
-				{
-					_lastnodes[_currentnode.Name] = prev._prevwithsamename;
-					prev.CloseNode(_currentnode);
-				}
-			}
-
-
-			// we close this node, get grandparent
-			if (!error)
-			{
-				if ((_lastparentnode != null) &&
-					((!HtmlNode.IsClosedElement(_currentnode.Name)) || 
-					(_currentnode._starttag)))
-				{
-					UpdateLastParentNode();
-				}
-			}
-		}
-
-		internal void UpdateLastParentNode()
-		{
-			do
-			{
-				if (_lastparentnode.Closed)
-				{
-					_lastparentnode = _lastparentnode.ParentNode;
-				}
-			}
-			while ((_lastparentnode != null) && (_lastparentnode.Closed));
-			if (_lastparentnode == null)
-			{
-				_lastparentnode = _documentnode;
-			}
-		}
-		
-		private string CurrentAttributeName()
-		{
-			return _text.Substring(_currentattribute._namestartindex, _currentattribute._namelength);
-		}
-
-		private string CurrentAttributeValue()
-		{
-			return _text.Substring(_currentattribute._valuestartindex, _currentattribute._valuelength);
-		}
-
-		private string CurrentNodeName()
-		{
-			return _text.Substring(_currentnode._namestartindex, _currentnode._namelength);
-		}
-
-		private string CurrentNodeOuter()
-		{
-			return _text.Substring(_currentnode._outerstartindex, _currentnode._outerlength);
-		}
-
-		private string CurrentNodeInner()
-		{
-			return _text.Substring(_currentnode._innerstartindex, _currentnode._innerlength);
-		}
-
-		/// <summary>
-		/// Determines if the specified character is considered as a whitespace character.
-		/// </summary>
-		/// <param name="c">The character to check.</param>
-		/// <returns>true if if the specified character is considered as a whitespace character.</returns>
-		public static bool IsWhiteSpace(int c)
-		{
-			if ((c == 10) || (c == 13) || (c == 32) || (c == 9))
-			{
-				return true;
-			}
-			return false;
-		}
-
-	}
-
-	internal class EncodingFoundException: Exception
-	{
-		private Encoding _encoding;
-
-		internal EncodingFoundException(Encoding encoding)
-		{
-			_encoding = encoding;
-		}
-
-		internal Encoding Encoding
-		{
-			get
-			{
-				return _encoding;
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlEntity.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlEntity.cs
deleted file mode 100644
index f45b0dfa5a0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlEntity.cs
+++ /dev/null
@@ -1,802 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Collections;
-using System.Text;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// A utility class to replace special characters by entities and vice-versa.
-	/// Follows HTML 4.0 specification found at http://www.w3.org/TR/html4/sgml/entities.html
-	/// </summary>
-	public class HtmlEntity
-	{
-		private static Hashtable _entityName;
-		private static Hashtable _entityValue;
-		private static readonly int _maxEntitySize;
-
-		private HtmlEntity()
-		{
-		}
-
-		static HtmlEntity()
-		{
-			_entityName = new Hashtable();
-			_entityValue = new Hashtable();
-
-			#region Entities Definition
-			_entityValue.Add("nbsp", 160);	// no-break space = non-breaking space, U+00A0 ISOnum 
-			_entityName.Add(160, "nbsp");
-			_entityValue.Add("iexcl", 161);	// inverted exclamation mark, U+00A1 ISOnum 
-			_entityName.Add(161, "iexcl");
-			_entityValue.Add("cent", 162);	// cent sign, U+00A2 ISOnum 
-			_entityName.Add(162, "cent");
-			_entityValue.Add("pound", 163);	// pound sign, U+00A3 ISOnum 
-			_entityName.Add(163, "pound");
-			_entityValue.Add("curren", 164);	// currency sign, U+00A4 ISOnum 
-			_entityName.Add(164, "curren");
-			_entityValue.Add("yen", 165);	// yen sign = yuan sign, U+00A5 ISOnum 
-			_entityName.Add(165, "yen");
-			_entityValue.Add("brvbar", 166);	// broken bar = broken vertical bar, U+00A6 ISOnum 
-			_entityName.Add(166, "brvbar");
-			_entityValue.Add("sect", 167);	// section sign, U+00A7 ISOnum 
-			_entityName.Add(167, "sect");
-			_entityValue.Add("uml", 168);	// diaeresis = spacing diaeresis, U+00A8 ISOdia 
-			_entityName.Add(168, "uml");
-			_entityValue.Add("copy", 169);	// copyright sign, U+00A9 ISOnum 
-			_entityName.Add(169, "copy");
-			_entityValue.Add("ordf", 170);	// feminine ordinal indicator, U+00AA ISOnum 
-			_entityName.Add(170, "ordf");
-			_entityValue.Add("laquo", 171);	// left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum 
-			_entityName.Add(171, "laquo");
-			_entityValue.Add("not", 172);	// not sign, U+00AC ISOnum 
-			_entityName.Add(172, "not");
-			_entityValue.Add("shy", 173);	// soft hyphen = discretionary hyphen, U+00AD ISOnum 
-			_entityName.Add(173, "shy");
-			_entityValue.Add("reg", 174);	// registered sign = registered trade mark sign, U+00AE ISOnum 
-			_entityName.Add(174, "reg");
-			_entityValue.Add("macr", 175);	// macron = spacing macron = overline = APL overbar, U+00AF ISOdia 
-			_entityName.Add(175, "macr");
-			_entityValue.Add("deg", 176);	// degree sign, U+00B0 ISOnum 
-			_entityName.Add(176, "deg");
-			_entityValue.Add("plusmn", 177);	// plus-minus sign = plus-or-minus sign, U+00B1 ISOnum 
-			_entityName.Add(177, "plusmn");
-			_entityValue.Add("sup2", 178);	// superscript two = superscript digit two = squared, U+00B2 ISOnum 
-			_entityName.Add(178, "sup2");
-			_entityValue.Add("sup3", 179);	// superscript three = superscript digit three = cubed, U+00B3 ISOnum 
-			_entityName.Add(179, "sup3");
-			_entityValue.Add("acute", 180);	// acute accent = spacing acute, U+00B4 ISOdia 
-			_entityName.Add(180, "acute");
-			_entityValue.Add("micro", 181);	// micro sign, U+00B5 ISOnum 
-			_entityName.Add(181, "micro");
-			_entityValue.Add("para", 182);	// pilcrow sign = paragraph sign, U+00B6 ISOnum 
-			_entityName.Add(182, "para");
-			_entityValue.Add("middot", 183);	// middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum 
-			_entityName.Add(183, "middot");
-			_entityValue.Add("cedil", 184);	// cedilla = spacing cedilla, U+00B8 ISOdia 
-			_entityName.Add(184, "cedil");
-			_entityValue.Add("sup1", 185);	// superscript one = superscript digit one, U+00B9 ISOnum 
-			_entityName.Add(185, "sup1");
-			_entityValue.Add("ordm", 186);	// masculine ordinal indicator, U+00BA ISOnum 
-			_entityName.Add(186, "ordm");
-			_entityValue.Add("raquo", 187);	// right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum 
-			_entityName.Add(187, "raquo");
-			_entityValue.Add("frac14", 188);	// vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum 
-			_entityName.Add(188, "frac14");
-			_entityValue.Add("frac12", 189);	// vulgar fraction one half = fraction one half, U+00BD ISOnum 
-			_entityName.Add(189, "frac12");
-			_entityValue.Add("frac34", 190);	// vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum 
-			_entityName.Add(190, "frac34");
-			_entityValue.Add("iquest", 191);	// inverted question mark = turned question mark, U+00BF ISOnum 
-			_entityName.Add(191, "iquest");
-			_entityValue.Add("Agrave", 192);	// latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1 
-			_entityName.Add(192, "Agrave");
-			_entityValue.Add("Aacute", 193);	// latin capital letter A with acute, U+00C1 ISOlat1 
-			_entityName.Add(193, "Aacute");
-			_entityValue.Add("Acirc", 194);	// latin capital letter A with circumflex, U+00C2 ISOlat1 
-			_entityName.Add(194, "Acirc");
-			_entityValue.Add("Atilde", 195);	// latin capital letter A with tilde, U+00C3 ISOlat1 
-			_entityName.Add(195, "Atilde");
-			_entityValue.Add("Auml", 196);	// latin capital letter A with diaeresis, U+00C4 ISOlat1 
-			_entityName.Add(196, "Auml");
-			_entityValue.Add("Aring", 197);	// latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1 
-			_entityName.Add(197, "Aring");
-			_entityValue.Add("AElig", 198);	// latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1 
-			_entityName.Add(198, "AElig");
-			_entityValue.Add("Ccedil", 199);	// latin capital letter C with cedilla, U+00C7 ISOlat1 
-			_entityName.Add(199, "Ccedil");
-			_entityValue.Add("Egrave", 200);	// latin capital letter E with grave, U+00C8 ISOlat1 
-			_entityName.Add(200, "Egrave");
-			_entityValue.Add("Eacute", 201);	// latin capital letter E with acute, U+00C9 ISOlat1 
-			_entityName.Add(201, "Eacute");
-			_entityValue.Add("Ecirc", 202);	// latin capital letter E with circumflex, U+00CA ISOlat1 
-			_entityName.Add(202, "Ecirc");
-			_entityValue.Add("Euml", 203);	// latin capital letter E with diaeresis, U+00CB ISOlat1 
-			_entityName.Add(203, "Euml");
-			_entityValue.Add("Igrave", 204);	// latin capital letter I with grave, U+00CC ISOlat1 
-			_entityName.Add(204, "Igrave");
-			_entityValue.Add("Iacute", 205);	// latin capital letter I with acute, U+00CD ISOlat1 
-			_entityName.Add(205, "Iacute");
-			_entityValue.Add("Icirc", 206);	// latin capital letter I with circumflex, U+00CE ISOlat1 
-			_entityName.Add(206, "Icirc");
-			_entityValue.Add("Iuml", 207);	// latin capital letter I with diaeresis, U+00CF ISOlat1 
-			_entityName.Add(207, "Iuml");
-			_entityValue.Add("ETH", 208);	// latin capital letter ETH, U+00D0 ISOlat1 
-			_entityName.Add(208, "ETH");
-			_entityValue.Add("Ntilde", 209);	// latin capital letter N with tilde, U+00D1 ISOlat1 
-			_entityName.Add(209, "Ntilde");
-			_entityValue.Add("Ograve", 210);	// latin capital letter O with grave, U+00D2 ISOlat1 
-			_entityName.Add(210, "Ograve");
-			_entityValue.Add("Oacute", 211);	// latin capital letter O with acute, U+00D3 ISOlat1 
-			_entityName.Add(211, "Oacute");
-			_entityValue.Add("Ocirc", 212);	// latin capital letter O with circumflex, U+00D4 ISOlat1 
-			_entityName.Add(212, "Ocirc");
-			_entityValue.Add("Otilde", 213);	// latin capital letter O with tilde, U+00D5 ISOlat1 
-			_entityName.Add(213, "Otilde");
-			_entityValue.Add("Ouml", 214);	// latin capital letter O with diaeresis, U+00D6 ISOlat1 
-			_entityName.Add(214, "Ouml");
-			_entityValue.Add("times", 215);	// multiplication sign, U+00D7 ISOnum 
-			_entityName.Add(215, "times");
-			_entityValue.Add("Oslash", 216);	// latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1 
-			_entityName.Add(216, "Oslash");
-			_entityValue.Add("Ugrave", 217);	// latin capital letter U with grave, U+00D9 ISOlat1 
-			_entityName.Add(217, "Ugrave");
-			_entityValue.Add("Uacute", 218);	// latin capital letter U with acute, U+00DA ISOlat1 
-			_entityName.Add(218, "Uacute");
-			_entityValue.Add("Ucirc", 219);	// latin capital letter U with circumflex, U+00DB ISOlat1 
-			_entityName.Add(219, "Ucirc");
-			_entityValue.Add("Uuml", 220);	// latin capital letter U with diaeresis, U+00DC ISOlat1 
-			_entityName.Add(220, "Uuml");
-			_entityValue.Add("Yacute", 221);	// latin capital letter Y with acute, U+00DD ISOlat1 
-			_entityName.Add(221, "Yacute");
-			_entityValue.Add("THORN", 222);	// latin capital letter THORN, U+00DE ISOlat1 
-			_entityName.Add(222, "THORN");
-			_entityValue.Add("szlig", 223);	// latin small letter sharp s = ess-zed, U+00DF ISOlat1 
-			_entityName.Add(223, "szlig");
-			_entityValue.Add("agrave", 224);	// latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1 
-			_entityName.Add(224, "agrave");
-			_entityValue.Add("aacute", 225);	// latin small letter a with acute, U+00E1 ISOlat1 
-			_entityName.Add(225, "aacute");
-			_entityValue.Add("acirc", 226);	// latin small letter a with circumflex, U+00E2 ISOlat1 
-			_entityName.Add(226, "acirc");
-			_entityValue.Add("atilde", 227);	// latin small letter a with tilde, U+00E3 ISOlat1 
-			_entityName.Add(227, "atilde");
-			_entityValue.Add("auml", 228);	// latin small letter a with diaeresis, U+00E4 ISOlat1 
-			_entityName.Add(228, "auml");
-			_entityValue.Add("aring", 229);	// latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1 
-			_entityName.Add(229, "aring");
-			_entityValue.Add("aelig", 230);	// latin small letter ae = latin small ligature ae, U+00E6 ISOlat1 
-			_entityName.Add(230, "aelig");
-			_entityValue.Add("ccedil", 231);	// latin small letter c with cedilla, U+00E7 ISOlat1 
-			_entityName.Add(231, "ccedil");
-			_entityValue.Add("egrave", 232);	// latin small letter e with grave, U+00E8 ISOlat1 
-			_entityName.Add(232, "egrave");
-			_entityValue.Add("eacute", 233);	// latin small letter e with acute, U+00E9 ISOlat1 
-			_entityName.Add(233, "eacute");
-			_entityValue.Add("ecirc", 234);	// latin small letter e with circumflex, U+00EA ISOlat1 
-			_entityName.Add(234, "ecirc");
-			_entityValue.Add("euml", 235);	// latin small letter e with diaeresis, U+00EB ISOlat1 
-			_entityName.Add(235, "euml");
-			_entityValue.Add("igrave", 236);	// latin small letter i with grave, U+00EC ISOlat1 
-			_entityName.Add(236, "igrave");
-			_entityValue.Add("iacute", 237);	// latin small letter i with acute, U+00ED ISOlat1 
-			_entityName.Add(237, "iacute");
-			_entityValue.Add("icirc", 238);	// latin small letter i with circumflex, U+00EE ISOlat1 
-			_entityName.Add(238, "icirc");
-			_entityValue.Add("iuml", 239);	// latin small letter i with diaeresis, U+00EF ISOlat1 
-			_entityName.Add(239, "iuml");
-			_entityValue.Add("eth", 240);	// latin small letter eth, U+00F0 ISOlat1 
-			_entityName.Add(240, "eth");
-			_entityValue.Add("ntilde", 241);	// latin small letter n with tilde, U+00F1 ISOlat1 
-			_entityName.Add(241, "ntilde");
-			_entityValue.Add("ograve", 242);	// latin small letter o with grave, U+00F2 ISOlat1 
-			_entityName.Add(242, "ograve");
-			_entityValue.Add("oacute", 243);	// latin small letter o with acute, U+00F3 ISOlat1 
-			_entityName.Add(243, "oacute");
-			_entityValue.Add("ocirc", 244);	// latin small letter o with circumflex, U+00F4 ISOlat1 
-			_entityName.Add(244, "ocirc");
-			_entityValue.Add("otilde", 245);	// latin small letter o with tilde, U+00F5 ISOlat1 
-			_entityName.Add(245, "otilde");
-			_entityValue.Add("ouml", 246);	// latin small letter o with diaeresis, U+00F6 ISOlat1 
-			_entityName.Add(246, "ouml");
-			_entityValue.Add("divide", 247);	// division sign, U+00F7 ISOnum 
-			_entityName.Add(247, "divide");
-			_entityValue.Add("oslash", 248);	// latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1 
-			_entityName.Add(248, "oslash");
-			_entityValue.Add("ugrave", 249);	// latin small letter u with grave, U+00F9 ISOlat1 
-			_entityName.Add(249, "ugrave");
-			_entityValue.Add("uacute", 250);	// latin small letter u with acute, U+00FA ISOlat1 
-			_entityName.Add(250, "uacute");
-			_entityValue.Add("ucirc", 251);	// latin small letter u with circumflex, U+00FB ISOlat1 
-			_entityName.Add(251, "ucirc");
-			_entityValue.Add("uuml", 252);	// latin small letter u with diaeresis, U+00FC ISOlat1 
-			_entityName.Add(252, "uuml");
-			_entityValue.Add("yacute", 253);	// latin small letter y with acute, U+00FD ISOlat1 
-			_entityName.Add(253, "yacute");
-			_entityValue.Add("thorn", 254);	// latin small letter thorn, U+00FE ISOlat1 
-			_entityName.Add(254, "thorn");
-			_entityValue.Add("yuml", 255);	// latin small letter y with diaeresis, U+00FF ISOlat1 
-			_entityName.Add(255, "yuml");
-			_entityValue.Add("fnof", 402);	// latin small f with hook = function = florin, U+0192 ISOtech 
-			_entityName.Add(402, "fnof");
-			_entityValue.Add("Alpha", 913);	// greek capital letter alpha, U+0391 
-			_entityName.Add(913, "Alpha");
-			_entityValue.Add("Beta", 914);	// greek capital letter beta, U+0392 
-			_entityName.Add(914, "Beta");
-			_entityValue.Add("Gamma", 915);	// greek capital letter gamma, U+0393 ISOgrk3 
-			_entityName.Add(915, "Gamma");
-			_entityValue.Add("Delta", 916);	// greek capital letter delta, U+0394 ISOgrk3 
-			_entityName.Add(916, "Delta");
-			_entityValue.Add("Epsilon", 917);	// greek capital letter epsilon, U+0395 
-			_entityName.Add(917, "Epsilon");
-			_entityValue.Add("Zeta", 918);	// greek capital letter zeta, U+0396 
-			_entityName.Add(918, "Zeta");
-			_entityValue.Add("Eta", 919);	// greek capital letter eta, U+0397 
-			_entityName.Add(919, "Eta");
-			_entityValue.Add("Theta", 920);	// greek capital letter theta, U+0398 ISOgrk3 
-			_entityName.Add(920, "Theta");
-			_entityValue.Add("Iota", 921);	// greek capital letter iota, U+0399 
-			_entityName.Add(921, "Iota");
-			_entityValue.Add("Kappa", 922);	// greek capital letter kappa, U+039A 
-			_entityName.Add(922, "Kappa");
-			_entityValue.Add("Lambda", 923);	// greek capital letter lambda, U+039B ISOgrk3 
-			_entityName.Add(923, "Lambda");
-			_entityValue.Add("Mu", 924);	// greek capital letter mu, U+039C 
-			_entityName.Add(924, "Mu");
-			_entityValue.Add("Nu", 925);	// greek capital letter nu, U+039D 
-			_entityName.Add(925, "Nu");
-			_entityValue.Add("Xi", 926);	// greek capital letter xi, U+039E ISOgrk3 
-			_entityName.Add(926, "Xi");
-			_entityValue.Add("Omicron", 927);	// greek capital letter omicron, U+039F 
-			_entityName.Add(927, "Omicron");
-			_entityValue.Add("Pi", 928);	// greek capital letter pi, U+03A0 ISOgrk3 
-			_entityName.Add(928, "Pi");
-			_entityValue.Add("Rho", 929);	// greek capital letter rho, U+03A1 
-			_entityName.Add(929, "Rho");
-			_entityValue.Add("Sigma", 931);	// greek capital letter sigma, U+03A3 ISOgrk3 
-			_entityName.Add(931, "Sigma");
-			_entityValue.Add("Tau", 932);	// greek capital letter tau, U+03A4 
-			_entityName.Add(932, "Tau");
-			_entityValue.Add("Upsilon", 933);	// greek capital letter upsilon, U+03A5 ISOgrk3 
-			_entityName.Add(933, "Upsilon");
-			_entityValue.Add("Phi", 934);	// greek capital letter phi, U+03A6 ISOgrk3 
-			_entityName.Add(934, "Phi");
-			_entityValue.Add("Chi", 935);	// greek capital letter chi, U+03A7 
-			_entityName.Add(935, "Chi");
-			_entityValue.Add("Psi", 936);	// greek capital letter psi, U+03A8 ISOgrk3 
-			_entityName.Add(936, "Psi");
-			_entityValue.Add("Omega", 937);	// greek capital letter omega, U+03A9 ISOgrk3 
-			_entityName.Add(937, "Omega");
-			_entityValue.Add("alpha", 945);	// greek small letter alpha, U+03B1 ISOgrk3 
-			_entityName.Add(945, "alpha");
-			_entityValue.Add("beta", 946);	// greek small letter beta, U+03B2 ISOgrk3 
-			_entityName.Add(946, "beta");
-			_entityValue.Add("gamma", 947);	// greek small letter gamma, U+03B3 ISOgrk3 
-			_entityName.Add(947, "gamma");
-			_entityValue.Add("delta", 948);	// greek small letter delta, U+03B4 ISOgrk3 
-			_entityName.Add(948, "delta");
-			_entityValue.Add("epsilon", 949);	// greek small letter epsilon, U+03B5 ISOgrk3 
-			_entityName.Add(949, "epsilon");
-			_entityValue.Add("zeta", 950);	// greek small letter zeta, U+03B6 ISOgrk3 
-			_entityName.Add(950, "zeta");
-			_entityValue.Add("eta", 951);	// greek small letter eta, U+03B7 ISOgrk3 
-			_entityName.Add(951, "eta");
-			_entityValue.Add("theta", 952);	// greek small letter theta, U+03B8 ISOgrk3 
-			_entityName.Add(952, "theta");
-			_entityValue.Add("iota", 953);	// greek small letter iota, U+03B9 ISOgrk3 
-			_entityName.Add(953, "iota");
-			_entityValue.Add("kappa", 954);	// greek small letter kappa, U+03BA ISOgrk3 
-			_entityName.Add(954, "kappa");
-			_entityValue.Add("lambda", 955);	// greek small letter lambda, U+03BB ISOgrk3 
-			_entityName.Add(955, "lambda");
-			_entityValue.Add("mu", 956);	// greek small letter mu, U+03BC ISOgrk3 
-			_entityName.Add(956, "mu");
-			_entityValue.Add("nu", 957);	// greek small letter nu, U+03BD ISOgrk3 
-			_entityName.Add(957, "nu");
-			_entityValue.Add("xi", 958);	// greek small letter xi, U+03BE ISOgrk3 
-			_entityName.Add(958, "xi");
-			_entityValue.Add("omicron", 959);	// greek small letter omicron, U+03BF NEW 
-			_entityName.Add(959, "omicron");
-			_entityValue.Add("pi", 960);	// greek small letter pi, U+03C0 ISOgrk3 
-			_entityName.Add(960, "pi");
-			_entityValue.Add("rho", 961);	// greek small letter rho, U+03C1 ISOgrk3 
-			_entityName.Add(961, "rho");
-			_entityValue.Add("sigmaf", 962);	// greek small letter final sigma, U+03C2 ISOgrk3 
-			_entityName.Add(962, "sigmaf");
-			_entityValue.Add("sigma", 963);	// greek small letter sigma, U+03C3 ISOgrk3 
-			_entityName.Add(963, "sigma");
-			_entityValue.Add("tau", 964);	// greek small letter tau, U+03C4 ISOgrk3 
-			_entityName.Add(964, "tau");
-			_entityValue.Add("upsilon", 965);	// greek small letter upsilon, U+03C5 ISOgrk3 
-			_entityName.Add(965, "upsilon");
-			_entityValue.Add("phi", 966);	// greek small letter phi, U+03C6 ISOgrk3 
-			_entityName.Add(966, "phi");
-			_entityValue.Add("chi", 967);	// greek small letter chi, U+03C7 ISOgrk3 
-			_entityName.Add(967, "chi");
-			_entityValue.Add("psi", 968);	// greek small letter psi, U+03C8 ISOgrk3 
-			_entityName.Add(968, "psi");
-			_entityValue.Add("omega", 969);	// greek small letter omega, U+03C9 ISOgrk3 
-			_entityName.Add(969, "omega");
-			_entityValue.Add("thetasym", 977);	// greek small letter theta symbol, U+03D1 NEW 
-			_entityName.Add(977, "thetasym");
-			_entityValue.Add("upsih", 978);	// greek upsilon with hook symbol, U+03D2 NEW 
-			_entityName.Add(978, "upsih");
-			_entityValue.Add("piv", 982);	// greek pi symbol, U+03D6 ISOgrk3 
-			_entityName.Add(982, "piv");
-			_entityValue.Add("bull", 8226);	// bullet = black small circle, U+2022 ISOpub 
-			_entityName.Add(8226, "bull");
-			_entityValue.Add("hellip", 8230);	// horizontal ellipsis = three dot leader, U+2026 ISOpub 
-			_entityName.Add(8230, "hellip");
-			_entityValue.Add("prime", 8242);	// prime = minutes = feet, U+2032 ISOtech 
-			_entityName.Add(8242, "prime");
-			_entityValue.Add("Prime", 8243);	// double prime = seconds = inches, U+2033 ISOtech 
-			_entityName.Add(8243, "Prime");
-			_entityValue.Add("oline", 8254);	// overline = spacing overscore, U+203E NEW 
-			_entityName.Add(8254, "oline");
-			_entityValue.Add("frasl", 8260);	// fraction slash, U+2044 NEW 
-			_entityName.Add(8260, "frasl");
-			_entityValue.Add("weierp", 8472);	// script capital P = power set = Weierstrass p, U+2118 ISOamso 
-			_entityName.Add(8472, "weierp");
-			_entityValue.Add("image", 8465);	// blackletter capital I = imaginary part, U+2111 ISOamso 
-			_entityName.Add(8465, "image");
-			_entityValue.Add("real", 8476);	// blackletter capital R = real part symbol, U+211C ISOamso 
-			_entityName.Add(8476, "real");
-			_entityValue.Add("trade", 8482);	// trade mark sign, U+2122 ISOnum 
-			_entityName.Add(8482, "trade");
-			_entityValue.Add("alefsym", 8501);	// alef symbol = first transfinite cardinal, U+2135 NEW 
-			_entityName.Add(8501, "alefsym");
-			_entityValue.Add("larr", 8592);	// leftwards arrow, U+2190 ISOnum 
-			_entityName.Add(8592, "larr");
-			_entityValue.Add("uarr", 8593);	// upwards arrow, U+2191 ISOnum
-			_entityName.Add(8593, "uarr");
-			_entityValue.Add("rarr", 8594);	// rightwards arrow, U+2192 ISOnum 
-			_entityName.Add(8594, "rarr");
-			_entityValue.Add("darr", 8595);	// downwards arrow, U+2193 ISOnum 
-			_entityName.Add(8595, "darr");
-			_entityValue.Add("harr", 8596);	// left right arrow, U+2194 ISOamsa 
-			_entityName.Add(8596, "harr");
-			_entityValue.Add("crarr", 8629);	// downwards arrow with corner leftwards = carriage return, U+21B5 NEW 
-			_entityName.Add(8629, "crarr");
-			_entityValue.Add("lArr", 8656);	// leftwards double arrow, U+21D0 ISOtech 
-			_entityName.Add(8656, "lArr");
-			_entityValue.Add("uArr", 8657);	// upwards double arrow, U+21D1 ISOamsa 
-			_entityName.Add(8657, "uArr");
-			_entityValue.Add("rArr", 8658);	// rightwards double arrow, U+21D2 ISOtech 
-			_entityName.Add(8658, "rArr");
-			_entityValue.Add("dArr", 8659);	// downwards double arrow, U+21D3 ISOamsa 
-			_entityName.Add(8659, "dArr");
-			_entityValue.Add("hArr", 8660);	// left right double arrow, U+21D4 ISOamsa 
-			_entityName.Add(8660, "hArr");
-			_entityValue.Add("forall", 8704);	// for all, U+2200 ISOtech 
-			_entityName.Add(8704, "forall");
-			_entityValue.Add("part", 8706);	// partial differential, U+2202 ISOtech 
-			_entityName.Add(8706, "part");
-			_entityValue.Add("exist", 8707);	// there exists, U+2203 ISOtech 
-			_entityName.Add(8707, "exist");
-			_entityValue.Add("empty", 8709);	// empty set = null set = diameter, U+2205 ISOamso 
-			_entityName.Add(8709, "empty");
-			_entityValue.Add("nabla", 8711);	// nabla = backward difference, U+2207 ISOtech 
-			_entityName.Add(8711, "nabla");
-			_entityValue.Add("isin", 8712);	// element of, U+2208 ISOtech 
-			_entityName.Add(8712, "isin");
-			_entityValue.Add("notin", 8713);	// not an element of, U+2209 ISOtech 
-			_entityName.Add(8713, "notin");
-			_entityValue.Add("ni", 8715);	// contains as member, U+220B ISOtech 
-			_entityName.Add(8715, "ni");
-			_entityValue.Add("prod", 8719);	// n-ary product = product sign, U+220F ISOamsb 
-			_entityName.Add(8719, "prod");
-			_entityValue.Add("sum", 8721);	// n-ary sumation, U+2211 ISOamsb 
-			_entityName.Add(8721, "sum");
-			_entityValue.Add("minus", 8722);	// minus sign, U+2212 ISOtech 
-			_entityName.Add(8722, "minus");
-			_entityValue.Add("lowast", 8727);	// asterisk operator, U+2217 ISOtech 
-			_entityName.Add(8727, "lowast");
-			_entityValue.Add("radic", 8730);	// square root = radical sign, U+221A ISOtech 
-			_entityName.Add(8730, "radic");
-			_entityValue.Add("prop", 8733);	// proportional to, U+221D ISOtech 
-			_entityName.Add(8733, "prop");
-			_entityValue.Add("infin", 8734);	// infinity, U+221E ISOtech 
-			_entityName.Add(8734, "infin");
-			_entityValue.Add("ang", 8736);	// angle, U+2220 ISOamso 
-			_entityName.Add(8736, "ang");
-			_entityValue.Add("and", 8743);	// logical and = wedge, U+2227 ISOtech 
-			_entityName.Add(8743, "and");
-			_entityValue.Add("or", 8744);	// logical or = vee, U+2228 ISOtech 
-			_entityName.Add(8744, "or");
-			_entityValue.Add("cap", 8745);	// intersection = cap, U+2229 ISOtech 
-			_entityName.Add(8745, "cap");
-			_entityValue.Add("cup", 8746);	// union = cup, U+222A ISOtech 
-			_entityName.Add(8746, "cup");
-			_entityValue.Add("int", 8747);	// integral, U+222B ISOtech 
-			_entityName.Add(8747, "int");
-			_entityValue.Add("there4", 8756);	// therefore, U+2234 ISOtech 
-			_entityName.Add(8756, "there4");
-			_entityValue.Add("sim", 8764);	// tilde operator = varies with = similar to, U+223C ISOtech 
-			_entityName.Add(8764, "sim");
-			_entityValue.Add("cong", 8773);	// approximately equal to, U+2245 ISOtech 
-			_entityName.Add(8773, "cong");
-			_entityValue.Add("asymp", 8776);	// almost equal to = asymptotic to, U+2248 ISOamsr 
-			_entityName.Add(8776, "asymp");
-			_entityValue.Add("ne", 8800);	// not equal to, U+2260 ISOtech 
-			_entityName.Add(8800, "ne");
-			_entityValue.Add("equiv", 8801);	// identical to, U+2261 ISOtech 
-			_entityName.Add(8801, "equiv");
-			_entityValue.Add("le", 8804);	// less-than or equal to, U+2264 ISOtech 
-			_entityName.Add(8804, "le");
-			_entityValue.Add("ge", 8805);	// greater-than or equal to, U+2265 ISOtech 
-			_entityName.Add(8805, "ge");
-			_entityValue.Add("sub", 8834);	// subset of, U+2282 ISOtech 
-			_entityName.Add(8834, "sub");
-			_entityValue.Add("sup", 8835);	// superset of, U+2283 ISOtech 
-			_entityName.Add(8835, "sup");
-			_entityValue.Add("nsub", 8836);	// not a subset of, U+2284 ISOamsn 
-			_entityName.Add(8836, "nsub");
-			_entityValue.Add("sube", 8838);	// subset of or equal to, U+2286 ISOtech 
-			_entityName.Add(8838, "sube");
-			_entityValue.Add("supe", 8839);	// superset of or equal to, U+2287 ISOtech 
-			_entityName.Add(8839, "supe");
-			_entityValue.Add("oplus", 8853);	// circled plus = direct sum, U+2295 ISOamsb 
-			_entityName.Add(8853, "oplus");
-			_entityValue.Add("otimes", 8855);	// circled times = vector product, U+2297 ISOamsb 
-			_entityName.Add(8855, "otimes");
-			_entityValue.Add("perp", 8869);	// up tack = orthogonal to = perpendicular, U+22A5 ISOtech 
-			_entityName.Add(8869, "perp");
-			_entityValue.Add("sdot", 8901);	// dot operator, U+22C5 ISOamsb 
-			_entityName.Add(8901, "sdot");
-			_entityValue.Add("lceil", 8968);	// left ceiling = apl upstile, U+2308 ISOamsc 
-			_entityName.Add(8968, "lceil");
-			_entityValue.Add("rceil", 8969);	// right ceiling, U+2309 ISOamsc 
-			_entityName.Add(8969, "rceil");
-			_entityValue.Add("lfloor", 8970);	// left floor = apl downstile, U+230A ISOamsc 
-			_entityName.Add(8970, "lfloor");
-			_entityValue.Add("rfloor", 8971);	// right floor, U+230B ISOamsc 
-			_entityName.Add(8971, "rfloor");
-			_entityValue.Add("lang", 9001);	// left-pointing angle bracket = bra, U+2329 ISOtech 
-			_entityName.Add(9001, "lang");
-			_entityValue.Add("rang", 9002);	// right-pointing angle bracket = ket, U+232A ISOtech 
-			_entityName.Add(9002, "rang");
-			_entityValue.Add("loz", 9674);	// lozenge, U+25CA ISOpub 
-			_entityName.Add(9674, "loz");
-			_entityValue.Add("spades", 9824);	// black spade suit, U+2660 ISOpub 
-			_entityName.Add(9824, "spades");
-			_entityValue.Add("clubs", 9827);	// black club suit = shamrock, U+2663 ISOpub 
-			_entityName.Add(9827, "clubs");
-			_entityValue.Add("hearts", 9829);	// black heart suit = valentine, U+2665 ISOpub 
-			_entityName.Add(9829, "hearts");
-			_entityValue.Add("diams", 9830);	// black diamond suit, U+2666 ISOpub 
-			_entityName.Add(9830, "diams");
-			_entityValue.Add("quot", 34);	// quotation mark = APL quote, U+0022 ISOnum 
-			_entityName.Add(34, "quot");
-			_entityValue.Add("amp", 38);	// ampersand, U+0026 ISOnum 
-			_entityName.Add(38, "amp");
-			_entityValue.Add("lt", 60);	// less-than sign, U+003C ISOnum 
-			_entityName.Add(60, "lt");
-			_entityValue.Add("gt", 62);	// greater-than sign, U+003E ISOnum 
-			_entityName.Add(62, "gt");
-			_entityValue.Add("OElig", 338);	// latin capital ligature OE, U+0152 ISOlat2 
-			_entityName.Add(338, "OElig");
-			_entityValue.Add("oelig", 339);	// latin small ligature oe, U+0153 ISOlat2 
-			_entityName.Add(339, "oelig");
-			_entityValue.Add("Scaron", 352);	// latin capital letter S with caron, U+0160 ISOlat2 
-			_entityName.Add(352, "Scaron");
-			_entityValue.Add("scaron", 353);	// latin small letter s with caron, U+0161 ISOlat2 
-			_entityName.Add(353, "scaron");
-			_entityValue.Add("Yuml", 376);	// latin capital letter Y with diaeresis, U+0178 ISOlat2 
-			_entityName.Add(376, "Yuml");
-			_entityValue.Add("circ", 710);	// modifier letter circumflex accent, U+02C6 ISOpub 
-			_entityName.Add(710, "circ");
-			_entityValue.Add("tilde", 732);	// small tilde, U+02DC ISOdia 
-			_entityName.Add(732, "tilde");
-			_entityValue.Add("ensp", 8194);	// en space, U+2002 ISOpub 
-			_entityName.Add(8194, "ensp");
-			_entityValue.Add("emsp", 8195);	// em space, U+2003 ISOpub 
-			_entityName.Add(8195, "emsp");
-			_entityValue.Add("thinsp", 8201);	// thin space, U+2009 ISOpub 
-			_entityName.Add(8201, "thinsp");
-			_entityValue.Add("zwnj", 8204);	// zero width non-joiner, U+200C NEW RFC 2070 
-			_entityName.Add(8204, "zwnj");
-			_entityValue.Add("zwj", 8205);	// zero width joiner, U+200D NEW RFC 2070 
-			_entityName.Add(8205, "zwj");
-			_entityValue.Add("lrm", 8206);	// left-to-right mark, U+200E NEW RFC 2070 
-			_entityName.Add(8206, "lrm");
-			_entityValue.Add("rlm", 8207);	// right-to-left mark, U+200F NEW RFC 2070 
-			_entityName.Add(8207, "rlm");
-			_entityValue.Add("ndash", 8211);	// en dash, U+2013 ISOpub 
-			_entityName.Add(8211, "ndash");
-			_entityValue.Add("mdash", 8212);	// em dash, U+2014 ISOpub 
-			_entityName.Add(8212, "mdash");
-			_entityValue.Add("lsquo", 8216);	// left single quotation mark, U+2018 ISOnum 
-			_entityName.Add(8216, "lsquo");
-			_entityValue.Add("rsquo", 8217);	// right single quotation mark, U+2019 ISOnum 
-			_entityName.Add(8217, "rsquo");
-			_entityValue.Add("sbquo", 8218);	// single low-9 quotation mark, U+201A NEW 
-			_entityName.Add(8218, "sbquo");
-			_entityValue.Add("ldquo", 8220);	// left double quotation mark, U+201C ISOnum 
-			_entityName.Add(8220, "ldquo");
-			_entityValue.Add("rdquo", 8221);	// right double quotation mark, U+201D ISOnum 
-			_entityName.Add(8221, "rdquo");
-			_entityValue.Add("bdquo", 8222);	// double low-9 quotation mark, U+201E NEW 
-			_entityName.Add(8222, "bdquo");
-			_entityValue.Add("dagger", 8224);	// dagger, U+2020 ISOpub 
-			_entityName.Add(8224, "dagger");
-			_entityValue.Add("Dagger", 8225);	// double dagger, U+2021 ISOpub 
-			_entityName.Add(8225, "Dagger");
-			_entityValue.Add("permil", 8240);	// per mille sign, U+2030 ISOtech 
-			_entityName.Add(8240, "permil");
-			_entityValue.Add("lsaquo", 8249);	// single left-pointing angle quotation mark, U+2039 ISO proposed 
-			_entityName.Add(8249, "lsaquo");
-			_entityValue.Add("rsaquo", 8250);	// single right-pointing angle quotation mark, U+203A ISO proposed 
-			_entityName.Add(8250, "rsaquo");
-			_entityValue.Add("euro", 8364);	// euro sign, U+20AC NEW 
-			_entityName.Add(8364, "euro");
-
-			_maxEntitySize = 8 + 1; // we add the # char
-			#endregion
-		}
-
-		/// <summary>
-		/// A collection of entities indexed by name.
-		/// </summary>
-		public static Hashtable EntityName
-		{
-			get
-			{
-				return _entityName;
-			}
-		}
-
-		/// <summary>
-		/// A collection of entities indexed by value.
-		/// </summary>
-		public static Hashtable EntityValue
-		{
-			get
-			{
-				return _entityValue;
-			}
-		}
-
-		/// <summary>
-		/// Clone and entitize an HtmlNode. This will affect attribute values and nodes' text. It will also entitize all child nodes.
-		/// </summary>
-		/// <param name="node">The node to entitize.</param>
-		/// <returns>An entitized cloned node.</returns>
-		public static HtmlNode Entitize(HtmlNode node)
-		{
-			if (node == null)
-			{
-				throw new ArgumentNullException("node");
-			}
-			HtmlNode result = node.CloneNode(true);
-			if (result.HasAttributes)
-				Entitize(result.Attributes);
-
-			if (result.HasChildNodes)
-			{
-				Entitize(result.ChildNodes);
-			}
-			else
-			{
-				if (result.NodeType == HtmlNodeType.Text)
-				{
-					((HtmlTextNode)result).Text = Entitize(((HtmlTextNode)result).Text, true, true);
-				}
-			}
-			return result;
-		}
-
-		private static void Entitize(HtmlAttributeCollection collection)
-		{
-			foreach(HtmlAttribute at in collection)
-			{
-				at.Value = Entitize(at.Value);
-			}
-		}
-
-		private static void Entitize(HtmlNodeCollection collection)
-		{
-			foreach(HtmlNode node in collection)
-			{
-				if (node.HasAttributes)
-					Entitize(node.Attributes);
-
-				if (node.HasChildNodes)
-				{
-					Entitize(node.ChildNodes);
-				}
-				else
-				{
-					if (node.NodeType == HtmlNodeType.Text)
-					{
-						((HtmlTextNode)node).Text = Entitize(((HtmlTextNode)node).Text, true, true);
-					}
-				}
-			}
-		}
-
-
-		/// <summary>
-		/// Replace characters above 127 by entities.
-		/// </summary>
-		/// <param name="text">The source text.</param>
-		/// <returns>The result text.</returns>
-		public static string Entitize(string text)
-		{
-			return Entitize(text, true);
-		}
-
-		/// <summary>
-		/// Replace characters above 127 by entities.
-		/// </summary>
-		/// <param name="text">The source text.</param>
-		/// <param name="useNames">If set to false, the function will not use known entities name. Default is true.</param>
-		/// <returns>The result text.</returns>
-		public static string Entitize(string text, bool useNames)
-		{
-			return Entitize( text, useNames, false);
-		}
-		/// <summary>
-		/// Replace characters above 127 by entities.
-		/// </summary>
-		/// <param name="text">The source text.</param>
-		/// <param name="useNames">If set to false, the function will not use known entities name. Default is true.</param>
-		/// <param name="entitizeQuotAmpAndLtGt">If set to true, the [quote], [ampersand], [lower than] and [greather than] characters will be entitized.</param>
-		/// <returns>The result text</returns>
-		public static string Entitize(string text, bool useNames, bool entitizeQuotAmpAndLtGt)
-//		_entityValue.Add("quot", 34);	// quotation mark = APL quote, U+0022 ISOnum 
-//		_entityName.Add(34, "quot");
-//		_entityValue.Add("amp", 38);	// ampersand, U+0026 ISOnum 
-//		_entityName.Add(38, "amp");
-//		_entityValue.Add("lt", 60);	// less-than sign, U+003C ISOnum 
-//		_entityName.Add(60, "lt");
-//		_entityValue.Add("gt", 62);	// greater-than sign, U+003E ISOnum 
-//		_entityName.Add(62, "gt");
-		{
-			if (text == null)
-				return null;
-
-			if (text.Length == 0)
-				return text;
-
-			StringBuilder sb = new StringBuilder(text.Length);
-			for(int i=0;i<text.Length;i++)
-			{
-				int code = (int)text[i];
-				if ((code>127) || (entitizeQuotAmpAndLtGt && ((code == 34) || (code == 38) || (code == 60) || (code == 62))))
-				{
-					string entity = _entityName[code] as string;
-					if ((entity == null) || (!useNames))
-					{
-						sb.Append("&#" + code + ";");
-					}
-					else
-					{
-						sb.Append("&" + entity + ";");
-					}
-				}
-				else
-				{
-					sb.Append(text[i]);
-				}
-			}
-
-			return sb.ToString();
-		}
-
-		/// <summary>
-		/// Replace known entities by characters.
-		/// </summary>
-		/// <param name="text">The source text.</param>
-		/// <returns>The result text.</returns>
-		public static string DeEntitize(string text)
-		{
-			if (text == null)
-				return null;
-
-			if (text.Length == 0)
-				return text;
-
-			StringBuilder sb = new StringBuilder(text.Length);
-			ParseState state = ParseState.Text;
-			StringBuilder entity = new StringBuilder(10);
-			
-			for(int i=0;i<text.Length;i++)
-			{
-				switch(state)
-				{
-					case ParseState.Text:
-						switch(text[i])
-						{
-							case '&':
-								state = ParseState.EntityStart;
-								break;
-
-							default:
-								sb.Append(text[i]);
-								break;
-
-						}
-						break;
-
-					case ParseState.EntityStart:
-						switch(text[i])
-						{
-							case ';':
-								if (entity.Length == 0)
-								{
-									sb.Append("&;");
-								}
-								else
-								{
-									if (entity[0] == '#')
-									{
-										string e = entity.ToString();
-										try
-										{
-											int code = Convert.ToInt32(e.Substring(1, e.Length-1));
-											sb.Append(Convert.ToChar(code));
-										}
-										catch
-										{
-											sb.Append("&#" + e + ";");
-										}
-									}
-									else
-									{
-										// named entity?
-										int code;
-										object o = _entityValue[entity.ToString()];
-										if (o == null)
-										{
-											// nope
-											sb.Append("&" + entity + ";");
-										}
-										else
-										{
-											// we found one
-											code = (int)o;
-											sb.Append(Convert.ToChar(code));
-										}
-									}
-									entity.Remove(0, entity.Length);
-								}
-								state = ParseState.Text;
-								break;
-
-							case '&':
-								// new entity start without end, it was not an entity...
-								sb.Append("&" + entity);
-								entity.Remove(0, entity.Length);
-								break;
-
-							default:
-								entity.Append(text[i]);
-								if (entity.Length>_maxEntitySize)
-								{
-									// unknown stuff, just don't touch it
-									state = ParseState.Text;
-									sb.Append("&" + entity);
-									entity.Remove(0, entity.Length);
-								}
-								break;
-
-						}
-						break;
-				}
-			}
-
-			// finish the work
-			if (state == ParseState.EntityStart)
-			{
-				sb.Append("&" + entity);
-			}
-			return sb.ToString();
-		}
-
-		private enum ParseState
-		{
-			Text,
-			EntityStart
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlNode.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlNode.cs
deleted file mode 100644
index 2ae9c051069..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlNode.cs
+++ /dev/null
@@ -1,2259 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Xml.XPath;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// Flags that describe the behavior of an Element node.
-	/// </summary>
-	public enum HtmlElementFlag
-	{
-		/// <summary>
-		/// The node is a CDATA node.
-		/// </summary>
-		CData = 1,
-
-		/// <summary>
-		/// The node is empty. META or IMG are example of such nodes.
-		/// </summary>
-		Empty = 2,
-
-		/// <summary>
-		/// The node will automatically be closed during parsing.
-		/// </summary>
-		Closed = 4,
-
-		/// <summary>
-		/// The node can overlap.
-		/// </summary>
-		CanOverlap = 8
-	}
-
-	/// <summary>
-	/// Represents the type of a node.
-	/// </summary>
-	public enum HtmlNodeType
-	{
-		/// <summary>
-		/// The root of a document.
-		/// </summary>
-		Document,
-
-		/// <summary>
-		/// An HTML element.
-		/// </summary>
-		Element,
-
-		/// <summary>
-		/// An HTML comment.
-		/// </summary>
-		Comment,
-
-		/// <summary>
-		/// A text node is always the child of an element or a document node.
-		/// </summary>
-		Text,
-	}
-
-	/// <summary>
-	/// Represents an HTML node.
-	/// </summary>
-	public class HtmlNode: IXPathNavigable
-	{
-		/// <summary>
-		/// Gets the name of a comment node. It is actually defined as '#comment'.
-		/// </summary>
-		public static readonly string HtmlNodeTypeNameComment = "#comment";
-
-		/// <summary>
-		/// Gets the name of the document node. It is actually defined as '#document'.
-		/// </summary>
-		public static readonly string HtmlNodeTypeNameDocument = "#document";
-
-		/// <summary>
-		/// Gets the name of a text node. It is actually defined as '#text'.
-		/// </summary>
-		public static readonly string HtmlNodeTypeNameText = "#text";
-
-		/// <summary>
-		/// Gets a collection of flags that define specific behaviors for specific element nodes.
-		/// The table contains a DictionaryEntry list with the lowercase tag name as the Key, and a combination of HtmlElementFlags as the Value.
-		/// </summary>
-		public static Hashtable ElementsFlags;
-
-		internal HtmlNodeType _nodetype;
-		internal HtmlNode _nextnode;
-		internal HtmlNode _prevnode;
-		internal HtmlNode _parentnode;
-		internal HtmlDocument _ownerdocument;
-		internal HtmlNodeCollection _childnodes;
-		internal HtmlAttributeCollection _attributes;
-		internal int _line = 0;
-		internal int _lineposition = 0;
-		internal int _streamposition = 0;
-		internal int _innerstartindex = 0;
-		internal int _innerlength = 0;
-		internal int _outerstartindex = 0;
-		internal int _outerlength = 0;
-		internal int _namestartindex = 0;
-		internal int _namelength = 0;
-		internal bool _starttag = false;
-		internal string _name;
-		internal HtmlNode _prevwithsamename = null;
-		internal HtmlNode _endnode;
-
-		internal bool _innerchanged = false;
-		internal bool _outerchanged = false;
-		internal string _innerhtml;
-		internal string _outerhtml;
-
-		static HtmlNode()
-		{
-			// tags whose content may be anything
-			ElementsFlags = new Hashtable();
-			ElementsFlags.Add("script", HtmlElementFlag.CData);
-			ElementsFlags.Add("style", HtmlElementFlag.CData);
-			ElementsFlags.Add("noxhtml", HtmlElementFlag.CData);
-
-			// tags that can not contain other tags
-			ElementsFlags.Add("base", HtmlElementFlag.Empty);
-			ElementsFlags.Add("link", HtmlElementFlag.Empty);
-			ElementsFlags.Add("meta", HtmlElementFlag.Empty);
-			ElementsFlags.Add("isindex", HtmlElementFlag.Empty);
-			ElementsFlags.Add("hr", HtmlElementFlag.Empty);
-			ElementsFlags.Add("col", HtmlElementFlag.Empty);
-			ElementsFlags.Add("img", HtmlElementFlag.Empty);
-			ElementsFlags.Add("param", HtmlElementFlag.Empty);
-			ElementsFlags.Add("embed", HtmlElementFlag.Empty);
-			ElementsFlags.Add("frame", HtmlElementFlag.Empty);
-			ElementsFlags.Add("wbr", HtmlElementFlag.Empty);
-			ElementsFlags.Add("bgsound", HtmlElementFlag.Empty);
-			ElementsFlags.Add("spacer", HtmlElementFlag.Empty);
-			ElementsFlags.Add("keygen", HtmlElementFlag.Empty);
-			ElementsFlags.Add("area", HtmlElementFlag.Empty);
-			ElementsFlags.Add("input", HtmlElementFlag.Empty);
-			ElementsFlags.Add("basefont", HtmlElementFlag.Empty);
-
-			ElementsFlags.Add("form", HtmlElementFlag.CanOverlap | HtmlElementFlag.Empty);
-
-			// they sometimes contain, and sometimes they don 't...
-			ElementsFlags.Add("option", HtmlElementFlag.Empty);
-
-			// tag whose closing tag is equivalent to open tag:
-			// <p>bla</p>bla will be transformed into <p>bla</p>bla
-			// <p>bla<p>bla will be transformed into <p>bla<p>bla and not <p>bla></p><p>bla</p> or <p>bla<p>bla</p></p>
-			//<br> see above
-			ElementsFlags.Add("br", HtmlElementFlag.Empty | HtmlElementFlag.Closed);
-			ElementsFlags.Add("p", HtmlElementFlag.Empty | HtmlElementFlag.Closed);
-		}
-
-		/// <summary>
-		/// Determines if an element node is closed.
-		/// </summary>
-		/// <param name="name">The name of the element node to check. May not be null.</param>
-		/// <returns>true if the name is the name of a closed element node, false otherwise.</returns>
-		public static bool IsClosedElement(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			object flag = ElementsFlags[name.ToLower()];
-			if (flag == null)
-			{
-				return false;
-			}
-			return (((HtmlElementFlag)flag)&HtmlElementFlag.Closed) != 0;
-		}
-
-		/// <summary>
-		/// Determines if an element node can be kept overlapped.
-		/// </summary>
-		/// <param name="name">The name of the element node to check. May not be null.</param>
-		/// <returns>true if the name is the name of an element node that can be kept overlapped, false otherwise.</returns>
-		public static bool CanOverlapElement(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			object flag = ElementsFlags[name.ToLower()];
-			if (flag == null)
-			{
-				return false;
-			}
-			return (((HtmlElementFlag)flag)&HtmlElementFlag.CanOverlap) != 0;
-		}
-
-		/// <summary>
-		/// Determines if a text corresponds to the closing tag of an node that can be kept overlapped.
-		/// </summary>
-		/// <param name="text">The text to check. May not be null.</param>
-		/// <returns>true or false.</returns>
-		public static bool IsOverlappedClosingElement(string text)
-		{
-			if (text == null)
-			{
-				throw new ArgumentNullException("text");
-			}
-			// min is </x>: 4
-			if (text.Length <= 4)
-				return false;
-
-			if ((text[0] != '<') ||
-				(text[text.Length - 1] != '>') ||
-				(text[1] != '/'))
-				return false;
-
-			string name = text.Substring(2, text.Length - 3);
-			return CanOverlapElement(name);
-		}
-
-		/// <summary>
-		/// Determines if an element node is a CDATA element node.
-		/// </summary>
-		/// <param name="name">The name of the element node to check. May not be null.</param>
-		/// <returns>true if the name is the name of a CDATA element node, false otherwise.</returns>
-		public static bool IsCDataElement(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			object flag = ElementsFlags[name.ToLower()];
-			if (flag == null)
-			{
-				return false;
-			}
-			return (((HtmlElementFlag)flag)&HtmlElementFlag.CData) != 0;
-		}
-
-		/// <summary>
-		/// Determines if an element node is defined as empty.
-		/// </summary>
-		/// <param name="name">The name of the element node to check. May not be null.</param>
-		/// <returns>true if the name is the name of an empty element node, false otherwise.</returns>
-		public static bool IsEmptyElement(string name)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			if (name.Length == 0)
-			{
-				return true;
-			}
-
-			// <!DOCTYPE ...
-			if ('!' == name[0])
-			{
-				return true;
-			}
-			
-			// <?xml ...
-			if ('?' == name[0])
-			{
-				return true;
-			}
-			
-			object flag = ElementsFlags[name.ToLower()];
-			if (flag == null)
-			{
-				return false;
-			}
-			return (((HtmlElementFlag)flag)&HtmlElementFlag.Empty) != 0;
-		}
-
-		/// <summary>
-		/// Creates an HTML node from a string representing literal HTML.
-		/// </summary>
-		/// <param name="html">The HTML text.</param>
-		/// <returns>The newly created node instance.</returns>
-		public static HtmlNode CreateNode(string html)
-		{
-			// REVIEW: this is *not* optimum...
-			HtmlDocument doc = new HtmlDocument();
-			doc.LoadHtml(html);
-			return doc.DocumentNode.FirstChild;
-		}
-
-		/// <summary>
-		/// Creates a duplicate of the node and the subtree under it.
-		/// </summary>
-		/// <param name="node">The node to duplicate. May not be null.</param>
-		public void CopyFrom(HtmlNode node)
-		{
-			CopyFrom(node, true);
-		}
-
-		/// <summary>
-		/// Creates a duplicate of the node.
-		/// </summary>
-		/// <param name="node">The node to duplicate. May not be null.</param>
-		/// <param name="deep">true to recursively clone the subtree under the specified node, false to clone only the node itself.</param>
-		public void CopyFrom(HtmlNode node, bool deep)
-		{
-			if (node == null)
-			{
-				throw new ArgumentNullException("node");
-			}
-
-			Attributes.RemoveAll();
-			if (node.HasAttributes)
-			{
-				foreach(HtmlAttribute att in node.Attributes)
-				{
-					SetAttributeValue(att.Name, att.Value);
-				}
-			}
-
-			if (!deep)
-			{
-				RemoveAllChildren();
-				if (node.HasChildNodes)
-				{
-					foreach(HtmlNode child in node.ChildNodes)
-					{
-						AppendChild(child.CloneNode(true));
-					}
-				}
-			}
-		}
-
-		internal HtmlNode(HtmlNodeType type, HtmlDocument ownerdocument, int index)
-		{
-			_nodetype = type;
-			_ownerdocument = ownerdocument;
-			_outerstartindex = index;
-
-			switch(type)
-			{
-				case HtmlNodeType.Comment:
-					_name = HtmlNodeTypeNameComment;
-					_endnode = this;
-					break;
-
-				case HtmlNodeType.Document:
-					_name = HtmlNodeTypeNameDocument;
-					_endnode = this;
-					break;
-
-				case HtmlNodeType.Text:
-					_name = HtmlNodeTypeNameText;
-					_endnode = this;
-					break;
-			}
-
-			if (_ownerdocument._openednodes != null)
-			{
-				if (!Closed)
-				{
-					// we use the index as the key
-
-					// -1 means the node comes from public
-					if (-1 != index)
-					{
-						_ownerdocument._openednodes.Add(index, this);
-					}
-				}
-			}
-			
-			if ((-1 == index) && (type != HtmlNodeType.Comment) && (type != HtmlNodeType.Text))
-			{
-				// innerhtml and outerhtml must be calculated
-				_outerchanged = true;
-				_innerchanged = true;
-			}
-		}
-
-		internal void CloseNode(HtmlNode endnode)
-		{
-			if (!_ownerdocument.OptionAutoCloseOnEnd)
-			{
-				// close all children
-				if (_childnodes != null)
-				{
-					foreach(HtmlNode child in _childnodes)
-					{
-						if (child.Closed)
-							continue;
-
-						// create a fake closer node
-						HtmlNode close = new HtmlNode(NodeType, _ownerdocument, -1);
-						close._endnode = close;
-						child.CloseNode(close);
-					}
-				}
-			}
-
-			if (!Closed)
-			{
-				_endnode = endnode;
-
-				if (_ownerdocument._openednodes != null)
-				{
-					_ownerdocument._openednodes.Remove(_outerstartindex);
-				}
-
-				HtmlNode self = _ownerdocument._lastnodes[Name] as HtmlNode;
-				if (self == this)
-				{
-					_ownerdocument._lastnodes.Remove(Name);
-					_ownerdocument.UpdateLastParentNode();
-				}
-
-				if (endnode == this)
-					return;
-
-				// create an inner section
-				_innerstartindex = _outerstartindex + _outerlength;
-				_innerlength = endnode._outerstartindex - _innerstartindex;
-
-				// update full length
-				_outerlength = (endnode._outerstartindex + endnode._outerlength) - _outerstartindex;
-			}
-		}
-
-		internal HtmlNode EndNode
-		{
-			get
-			{
-				return _endnode;
-			}
-		}
-
-		internal string GetId()
-		{
-			HtmlAttribute att = Attributes["id"];
-			if (att == null)
-			{
-				return null;
-			}
-			return att.Value;
-		}
-
-		internal void SetId(string id)
-		{
-			HtmlAttribute att = Attributes["id"];
-			if (att == null)
-			{
-				att = _ownerdocument.CreateAttribute("id");
-			}
-			att.Value = id;
-			_ownerdocument.SetIdForNode(this, att.Value);
-			_outerchanged = true;
-		}
-
-		/// <summary>
-		/// Creates a new XPathNavigator object for navigating this HTML node.
-		/// </summary>
-		/// <returns>An XPathNavigator object. The XPathNavigator is positioned on the node from which the method was called. It is not positioned on the root of the document.</returns>
-		public XPathNavigator CreateNavigator()
-		{
-			return new HtmlNodeNavigator(_ownerdocument, this);
-		}
-
-		/// <summary>
-		/// Selects the first XmlNode that matches the XPath expression.
-		/// </summary>
-		/// <param name="xpath">The XPath expression. May not be null.</param>
-		/// <returns>The first HtmlNode that matches the XPath query or a null reference if no matching node was found.</returns>
-		public HtmlNode SelectSingleNode(string xpath)
-		{
-			if (xpath == null)
-			{
-				throw new ArgumentNullException("xpath");
-			}
-
-			HtmlNodeNavigator nav = new HtmlNodeNavigator(_ownerdocument, this);
-			XPathNodeIterator it = nav.Select(xpath);
-			if (!it.MoveNext())
-			{
-				return null;
-			}
-
-			HtmlNodeNavigator node = (HtmlNodeNavigator)it.Current;
-			return node.CurrentNode;
-		}
-
-		/// <summary>
-		/// Selects a list of nodes matching the XPath expression.
-		/// </summary>
-		/// <param name="xpath">The XPath expression.</param>
-		/// <returns>An HtmlNodeCollection containing a collection of nodes matching the XPath query, or null if no node matched the XPath expression.</returns>
-		public HtmlNodeCollection SelectNodes(string xpath)
-		{
-			HtmlNodeCollection list = new HtmlNodeCollection(null);
-
-			HtmlNodeNavigator nav = new HtmlNodeNavigator(_ownerdocument, this);
-			XPathNodeIterator it = nav.Select(xpath);
-			while (it.MoveNext())
-			{
-				HtmlNodeNavigator n = (HtmlNodeNavigator)it.Current;
-				list.Add(n.CurrentNode);
-			}
-			if (list.Count == 0)
-			{
-				return null;
-			}
-			return list;
-		}
-
-		/// <summary>
-		/// Gets or sets the value of the 'id' HTML attribute. The document must have been parsed using the OptionUseIdAttribute set to true.
-		/// </summary>
-		public string Id
-		{
-			get
-			{
-				if (_ownerdocument._nodesid == null)
-				{
-					throw new Exception(HtmlDocument.HtmlExceptionUseIdAttributeFalse);
-				}
-				return GetId();
-			}
-			set
-			{
-				if (_ownerdocument._nodesid == null)
-				{
-					throw new Exception(HtmlDocument.HtmlExceptionUseIdAttributeFalse);
-				}
-				
-				if (value == null)
-				{
-					throw new ArgumentNullException("value");
-				}
-				SetId(value);
-			}
-		}
-
-		/// <summary>
-		/// Gets the line number of this node in the document.
-		/// </summary>
-		public int Line
-		{
-			get
-			{
-				return _line;
-			}
-		}
-
-		/// <summary>
-		/// Gets the column number of this node in the document.
-		/// </summary>
-		public int LinePosition
-		{
-			get
-			{
-				return _lineposition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the stream position of this node in the document, relative to the start of the document.
-		/// </summary>
-		public int StreamPosition
-		{
-			get
-			{
-				return _streamposition;
-			}
-		}
-
-		/// <summary>
-		/// Gets a value indicating if this node has been closed or not.
-		/// </summary>
-		public bool Closed
-		{
-			get
-			{
-				return (_endnode != null);
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets this node's name.
-		/// </summary>
-		public string Name
-		{
-			get
-			{
-				if (_name == null)
-				{
-					_name = _ownerdocument._text.Substring(_namestartindex, _namelength).ToLower();
-				}
-				return _name;
-			}
-			set
-			{
-				_name = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the text between the start and end tags of the object.
-		/// </summary>
-		public virtual string InnerText
-		{
-			get
-			{
-				if (_nodetype == HtmlNodeType.Text)
-				{
-					return ((HtmlTextNode)this).Text;
-				}
-
-				if (_nodetype == HtmlNodeType.Comment)
-				{
-					return ((HtmlCommentNode)this).Comment;
-				}
-
-				// note: right now, this method is *slow*, because we recompute everything.
-				// it could be optimised like innerhtml
-				if (!HasChildNodes)
-				{
-					return string.Empty;
-				}
-
-				string s = null;
-				foreach(HtmlNode node in ChildNodes)
-				{
-					s += node.InnerText;
-				}
-				return s;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the HTML between the start and end tags of the object.
-		/// </summary>
-		public virtual string InnerHtml
-		{
-			get
-			{
-				if (_innerchanged)
-				{
-					_innerhtml = WriteContentTo();
-					_innerchanged = false;
-					return _innerhtml;
-				}
-				if (_innerhtml != null)
-				{
-					return _innerhtml;
-				}
-
-				if (_innerstartindex < 0)
-				{
-					return string.Empty;
-				}
-
-				return _ownerdocument._text.Substring(_innerstartindex, _innerlength);
-			}
-			set
-			{
-				HtmlDocument doc = new HtmlDocument();
-				doc.LoadHtml(value);
-
-				RemoveAllChildren();
-				AppendChildren(doc.DocumentNode.ChildNodes);
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the object and its content in HTML.
-		/// </summary>
-		public virtual string OuterHtml
-		{
-			get
-			{
-				if (_outerchanged)
-				{
-					_outerhtml = WriteTo();
-					_outerchanged = false;
-					return _outerhtml;
-				}
-
-				if (_outerhtml != null)
-				{
-					return _outerhtml;
-				}
-
-				if (_outerstartindex < 0)
-				{
-					return string.Empty;
-				}
-
-				return _ownerdocument._text.Substring(_outerstartindex, _outerlength);
-			}
-		}
-
-		/// <summary>
-		/// Creates a duplicate of the node
-		/// </summary>
-		/// <returns></returns>
-		public HtmlNode Clone()
-		{
-			return CloneNode(true);
-		}
-
-		/// <summary>
-		/// Creates a duplicate of the node and changes its name at the same time.
-		/// </summary>
-		/// <param name="newName">The new name of the cloned node. May not be null.</param>
-		/// <returns>The cloned node.</returns>
-		public HtmlNode CloneNode(string newName)
-		{
-			return CloneNode(newName, true);
-		}
-
-		/// <summary>
-		/// Creates a duplicate of the node and changes its name at the same time.
-		/// </summary>
-		/// <param name="newName">The new name of the cloned node. May not be null.</param>
-		/// <param name="deep">true to recursively clone the subtree under the specified node; false to clone only the node itself.</param>
-		/// <returns>The cloned node.</returns>
-		public HtmlNode CloneNode(string newName, bool deep)
-		{
-			if (newName == null)
-			{
-				throw new ArgumentNullException("newName");
-			}
-
-			HtmlNode node = CloneNode(deep);
-			node._name = newName;
-			return node;
-		}
-
-		/// <summary>
-		/// Creates a duplicate of the node.
-		/// </summary>
-		/// <param name="deep">true to recursively clone the subtree under the specified node; false to clone only the node itself.</param>
-		/// <returns>The cloned node.</returns>
-		public HtmlNode CloneNode(bool deep)
-		{
-			HtmlNode node = _ownerdocument.CreateNode(_nodetype);
-			node._name = Name;
-
-			switch(_nodetype)
-			{
-				case HtmlNodeType.Comment:
-					((HtmlCommentNode)node).Comment = ((HtmlCommentNode)this).Comment;
-					return node;
-		
-				case HtmlNodeType.Text:
-					((HtmlTextNode)node).Text = ((HtmlTextNode)this).Text;
-					return node;
-			}
-
-			// attributes
-			if (HasAttributes)
-			{
-				foreach(HtmlAttribute att in _attributes)
-				{
-					HtmlAttribute newatt = att.Clone();
-					node.Attributes.Append(newatt);
-				}
-			}
-
-			// closing attributes
-			if (HasClosingAttributes)
-			{
-				node._endnode = _endnode.CloneNode(false);
-				foreach(HtmlAttribute att in _endnode._attributes)
-				{
-					HtmlAttribute newatt = att.Clone();
-					node._endnode._attributes.Append(newatt);
-				}
-			}
-			if (!deep)
-			{
-				return node;
-			}
-
-			if (!HasChildNodes)
-			{
-				return node;
-			}
-
-			// child nodes
-			foreach(HtmlNode child in _childnodes)
-			{
-				HtmlNode newchild = child.Clone();
-				node.AppendChild(newchild);
-			}
-			return node;
-		}
-
-		/// <summary>
-		/// Gets the HTML node immediately following this element.
-		/// </summary>
-		public HtmlNode NextSibling
-		{
-			get
-			{
-				return _nextnode;
-			}
-		}
-
-		/// <summary>
-		/// Gets the node immediately preceding this node.
-		/// </summary>
-		public HtmlNode PreviousSibling
-		{
-			get
-			{
-				return _prevnode;
-			}
-		}
-
-		/// <summary>
-		/// Removes all the children and/or attributes of the current node.
-		/// </summary>
-		public void RemoveAll()
-		{
-			RemoveAllChildren();
-
-			if (HasAttributes)
-			{
-				_attributes.Clear();
-			}
-
-			if ((_endnode != null) && (_endnode != this))
-			{
-				if (_endnode._attributes != null)
-				{
-					_endnode._attributes.Clear();
-				}
-			}
-			_outerchanged = true;
-			_innerchanged = true;
-		}
-
-		/// <summary>
-		/// Removes all the children of the current node.
-		/// </summary>
-		public void RemoveAllChildren()
-		{
-			if (!HasChildNodes)
-			{
-				return;
-			}
-
-			if (_ownerdocument.OptionUseIdAttribute)
-			{
-				// remove nodes from id list
-				foreach(HtmlNode node in _childnodes)
-				{
-					_ownerdocument.SetIdForNode(null, node.GetId());
-				}
-			}
-			_childnodes.Clear();
-			_outerchanged = true;
-			_innerchanged = true;
-		}
-
-		/// <summary>
-		/// Removes the specified child node.
-		/// </summary>
-		/// <param name="oldChild">The node being removed. May not be null.</param>
-		/// <returns>The node removed.</returns>
-		public HtmlNode RemoveChild(HtmlNode oldChild)
-		{
-			if (oldChild == null)
-			{
-				throw new ArgumentNullException("oldChild");
-			}
-
-			int index = -1;
-
-			if (_childnodes != null)
-			{
-				index = _childnodes[oldChild];
-			}
-
-			if (index == -1)
-			{
-				throw new ArgumentException(HtmlDocument.HtmlExceptionRefNotChild);
-			}
-
-			_childnodes.Remove(index);
-
-			_ownerdocument.SetIdForNode(null, oldChild.GetId());
-			_outerchanged = true;
-			_innerchanged = true;
-			return oldChild;
-		}
-
-		/// <summary>
-		/// Removes the specified child node.
-		/// </summary>
-		/// <param name="oldChild">The node being removed. May not be null.</param>
-		/// <param name="keepGrandChildren">true to keep grand children of the node, false otherwise.</param>
-		/// <returns>The node removed.</returns>
-		public HtmlNode RemoveChild(HtmlNode oldChild, bool keepGrandChildren)
-		{
-			if (oldChild == null)
-			{
-				throw new ArgumentNullException("oldChild");
-			}
-
-			if ((oldChild._childnodes != null) && keepGrandChildren)
-			{
-				// get prev sibling
-				HtmlNode prev = oldChild.PreviousSibling;
-
-				// reroute grand children to ourselves
-				foreach(HtmlNode grandchild in oldChild._childnodes)
-				{
-					InsertAfter(grandchild, prev);
-				}
-			}
-			RemoveChild(oldChild);
-			_outerchanged = true;
-			_innerchanged = true;
-			return oldChild;
-		}
-
-		/// <summary>
-		/// Replaces the child node oldChild with newChild node.
-		/// </summary>
-		/// <param name="newChild">The new node to put in the child list.</param>
-		/// <param name="oldChild">The node being replaced in the list.</param>
-		/// <returns>The node replaced.</returns>
-		public HtmlNode ReplaceChild(HtmlNode newChild, HtmlNode oldChild)
-		{
-			if (newChild == null)
-			{
-				return RemoveChild(oldChild);
-			}
-
-			if (oldChild == null)
-			{
-				return AppendChild(newChild);
-			}
-
-			int index = -1;
-
-			if (_childnodes != null)
-			{
-				index = _childnodes[oldChild];
-			}
-
-			if (index == -1)
-			{
-				throw new ArgumentException(HtmlDocument.HtmlExceptionRefNotChild);
-			}
-
-			_childnodes.Replace(index, newChild);
-
-			_ownerdocument.SetIdForNode(null, oldChild.GetId());
-			_ownerdocument.SetIdForNode(newChild, newChild.GetId());
-			_outerchanged = true;
-			_innerchanged = true;
-			return newChild;
-		}
-
-		/// <summary>
-		/// Inserts the specified node immediately before the specified reference node.
-		/// </summary>
-		/// <param name="newChild">The node to insert. May not be null.</param>
-		/// <param name="refChild">The node that is the reference node. The newChild is placed before this node.</param>
-		/// <returns>The node being inserted.</returns>
-		public HtmlNode InsertBefore(HtmlNode newChild, HtmlNode refChild)
-		{
-			if (newChild == null)
-			{
-				throw new ArgumentNullException("newChild");
-			}
-
-			if (refChild == null)
-			{
-				return AppendChild(newChild);
-			}
-
-			if (newChild == refChild)
-			{
-				return newChild;
-			}
-
-			int index = -1;
-
-			if (_childnodes != null)
-			{
-				index = _childnodes[refChild];
-			}
-
-			if (index == -1)
-			{
-				throw new ArgumentException(HtmlDocument.HtmlExceptionRefNotChild);
-			}
-
-			_childnodes.Insert(index, newChild);
-
-			_ownerdocument.SetIdForNode(newChild, newChild.GetId());
-			_outerchanged = true;
-			_innerchanged = true;
-			return newChild;
-		}
-
-		/// <summary>
-		/// Inserts the specified node immediately after the specified reference node.
-		/// </summary>
-		/// <param name="newChild">The node to insert. May not be null.</param>
-		/// <param name="refChild">The node that is the reference node. The newNode is placed after the refNode.</param>
-		/// <returns>The node being inserted.</returns>
-		public HtmlNode InsertAfter(HtmlNode newChild, HtmlNode refChild)
-		{
-			if (newChild == null)
-			{
-				throw new ArgumentNullException("newChild");
-			}
-
-			if (refChild == null)
-			{
-				return PrependChild(newChild);
-			}
-
-			if (newChild == refChild)
-			{
-				return newChild;
-			}
-
-			int index = -1;
-
-			if (_childnodes != null)
-			{
-				index = _childnodes[refChild];
-			}
-			if (index == -1)
-			{
-				throw new ArgumentException(HtmlDocument.HtmlExceptionRefNotChild);
-			}
-
-			_childnodes.Insert(index + 1, newChild);
-
-			_ownerdocument.SetIdForNode(newChild, newChild.GetId());
-			_outerchanged = true;
-			_innerchanged = true;
-			return newChild;
-		}
-
-		/// <summary>
-		/// Gets the first child of the node.
-		/// </summary>
-		public HtmlNode FirstChild
-		{
-			get
-			{
-				if (!HasChildNodes)
-				{
-					return null;
-				}
-				return _childnodes[0];
-			}
-		}
-
-		/// <summary>
-		/// Gets the last child of the node.
-		/// </summary>
-		public HtmlNode LastChild
-		{
-			get
-			{
-				if (!HasChildNodes)
-				{
-					return null;
-				}
-				return _childnodes[_childnodes.Count-1];
-			}
-		}
-
-		/// <summary>
-		/// Gets the type of this node.
-		/// </summary>
-		public HtmlNodeType NodeType
-		{
-			get
-			{
-				return _nodetype;
-			}
-		}
-
-		/// <summary>
-		/// Gets the parent of this node (for nodes that can have parents).
-		/// </summary>
-		public HtmlNode ParentNode
-		{
-			get
-			{
-				return _parentnode;
-			}
-		}
-
-		/// <summary>
-		/// Gets the HtmlDocument to which this node belongs.
-		/// </summary>
-		public HtmlDocument OwnerDocument
-		{
-			get
-			{
-				return _ownerdocument;
-			}
-		}
-
-		/// <summary>
-		/// Gets all the children of the node.
-		/// </summary>
-		public HtmlNodeCollection ChildNodes
-		{
-			get
-			{
-				if (_childnodes == null)
-				{
-					_childnodes = new HtmlNodeCollection(this);
-				}
-				return _childnodes;
-			}
-		}
-
-		/// <summary>
-		/// Adds the specified node to the beginning of the list of children of this node.
-		/// </summary>
-		/// <param name="newChild">The node to add. May not be null.</param>
-		/// <returns>The node added.</returns>
-		public HtmlNode PrependChild(HtmlNode newChild)
-		{
-			if (newChild == null)
-			{
-				throw new ArgumentNullException("newChild");
-			}
-			ChildNodes.Prepend(newChild);
-			_ownerdocument.SetIdForNode(newChild, newChild.GetId());
-			_outerchanged = true;
-			_innerchanged = true;
-			return newChild;
-		}
-
-		/// <summary>
-		/// Adds the specified node list to the beginning of the list of children of this node.
-		/// </summary>
-		/// <param name="newChildren">The node list to add. May not be null.</param>
-		public void PrependChildren(HtmlNodeCollection newChildren)
-		{
-			if (newChildren == null)
-			{
-				throw new ArgumentNullException("newChildren");
-			}
-
-			foreach(HtmlNode newChild in newChildren)
-			{
-				PrependChild(newChild);
-			}
-		}
-
-		/// <summary>
-		/// Adds the specified node to the end of the list of children of this node.
-		/// </summary>
-		/// <param name="newChild">The node to add. May not be null.</param>
-		/// <returns>The node added.</returns>
-		public HtmlNode AppendChild(HtmlNode newChild)
-		{
-			if (newChild == null)
-			{
-				throw new ArgumentNullException("newChild");
-			}
-
-			ChildNodes.Append(newChild);
-			_ownerdocument.SetIdForNode(newChild, newChild.GetId());
-			_outerchanged = true;
-			_innerchanged = true;
-			return newChild;
-		}
-
-		/// <summary>
-		/// Adds the specified node to the end of the list of children of this node.
-		/// </summary>
-		/// <param name="newChildren">The node list to add. May not be null.</param>
-		public void AppendChildren(HtmlNodeCollection newChildren)
-		{
-			if (newChildren == null)
-				throw new ArgumentNullException("newChildrend");
-
-			foreach(HtmlNode newChild in newChildren)
-			{
-				AppendChild(newChild);
-			}
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current node has any attributes.
-		/// </summary>
-		public bool HasAttributes
-		{
-			get
-			{
-				if (_attributes == null)
-				{
-					return false;
-				}
-
-				if (_attributes.Count <= 0)
-				{
-					return false;
-				}
-				return true;
-			}
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current node has any attributes on the closing tag.
-		/// </summary>
-		public bool HasClosingAttributes
-		{
-			get
-			{
-				if ((_endnode == null) || (_endnode == this))
-				{
-					return false;
-				}
-
-				if (_endnode._attributes == null)
-				{
-					return false;
-				}
-
-				if (_endnode._attributes.Count <= 0)
-				{
-					return false;
-				}
-				return true;
-			}
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether this node has any child nodes.
-		/// </summary>
-		public bool HasChildNodes
-		{
-			get
-			{
-				if (_childnodes == null)
-				{
-					return false;
-				}
-
-				if (_childnodes.Count <= 0)
-				{
-					return false;
-				}
-				return true;
-			}
-		}
-
-		/// <summary>
-		/// Helper method to get the value of an attribute of this node. If the attribute is not found, the default value will be returned.
-		/// </summary>
-		/// <param name="name">The name of the attribute to get. May not be null.</param>
-		/// <param name="def">The default value to return if not found.</param>
-		/// <returns>The value of the attribute if found, the default value if not found.</returns>
-		public string GetAttributeValue(string name, string def)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			if (!HasAttributes)
-			{
-				return def;
-			}
-			HtmlAttribute att = Attributes[name];
-			if (att == null)
-			{
-				return def;
-			}
-			return att.Value;
-		}
-
-		/// <summary>
-		/// Helper method to get the value of an attribute of this node. If the attribute is not found, the default value will be returned.
-		/// </summary>
-		/// <param name="name">The name of the attribute to get. May not be null.</param>
-		/// <param name="def">The default value to return if not found.</param>
-		/// <returns>The value of the attribute if found, the default value if not found.</returns>
-		public int GetAttributeValue(string name, int def)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			if (!HasAttributes)
-			{
-				return def;
-			}
-			HtmlAttribute att = Attributes[name];
-			if (att == null)
-			{
-				return def;
-			}
-			try
-			{
-				return Convert.ToInt32(att.Value);
-			}
-			catch
-			{
-				return def;
-			}
-		}
-
-		/// <summary>
-		/// Helper method to get the value of an attribute of this node. If the attribute is not found, the default value will be returned.
-		/// </summary>
-		/// <param name="name">The name of the attribute to get. May not be null.</param>
-		/// <param name="def">The default value to return if not found.</param>
-		/// <returns>The value of the attribute if found, the default value if not found.</returns>
-		public bool GetAttributeValue(string name, bool def)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-
-			if (!HasAttributes)
-			{
-				return def;
-			}
-			HtmlAttribute att = Attributes[name];
-			if (att == null)
-			{
-				return def;
-			}
-			try
-			{
-				return Convert.ToBoolean(att.Value);
-			}
-			catch
-			{
-				return def;
-			}
-		}
-
-		/// <summary>
-		/// Helper method to set the value of an attribute of this node. If the attribute is not found, it will be created automatically.
-		/// </summary>
-		/// <param name="name">The name of the attribute to set. May not be null.</param>
-		/// <param name="value">The value for the attribute.</param>
-		/// <returns>The corresponding attribute instance.</returns>
-		public HtmlAttribute SetAttributeValue(string name, string value)
-		{
-			if (name == null)
-			{
-				throw new ArgumentNullException("name");
-			}
-			HtmlAttribute att = Attributes[name];
-			if (att == null)
-			{
-				return Attributes.Append(_ownerdocument.CreateAttribute(name, value));
-			}
-			att.Value = value;
-			return att;
-		}
-
-		/// <summary>
-		/// Gets the collection of HTML attributes for this node. May not be null.
-		/// </summary>
-		public HtmlAttributeCollection Attributes
-		{
-			get
-			{
-				if (!HasAttributes)
-				{
-					_attributes = new HtmlAttributeCollection(this);
-				}
-				return _attributes;
-			}
-		}
-
-		/// <summary>
-		/// Gets the collection of HTML attributes for the closing tag. May not be null.
-		/// </summary>
-		public HtmlAttributeCollection ClosingAttributes
-		{
-			get
-			{
-				if (!HasClosingAttributes)
-				{
-					return new HtmlAttributeCollection(this);
-				}
-				return _endnode.Attributes;
-			}
-		}
-
-		internal void WriteAttribute(TextWriter outText, HtmlAttribute att)
-		{
-			string name;
-
-			if (_ownerdocument.OptionOutputAsXml)
-			{
-				if (_ownerdocument.OptionOutputUpperCase)
-				{
-					name = att.XmlName.ToUpper();
-				}
-				else
-				{
-					name = att.XmlName;
-				}
-
-				outText.Write(" " + name + "=\"" + HtmlDocument.HtmlEncode(att.XmlValue) + "\"");
-			}
-			else
-			{
-				if (_ownerdocument.OptionOutputUpperCase)
-				{
-					name = att.Name.ToUpper();
-				}
-				else
-				{
-					name = att.Name;
-				}
-
-				if (att.Name.Length >= 4)
-				{
-					if ((att.Name[0] == '<') && (att.Name[1] == '%') &&
-						(att.Name[att.Name.Length-1] == '>') && (att.Name[att.Name.Length-2] == '%'))
-					{
-						outText.Write(" " + name);
-						return;
-					}
-				}
-				if (_ownerdocument.OptionOutputOptimizeAttributeValues)
-				{
-					if (att.Value.IndexOfAny(new Char[]{(char)10, (char)13, (char)9, ' '}) < 0)
-					{
-						outText.Write(" " + name + "=" + att.Value);
-					}
-					else
-					{
-						outText.Write(" " + name + "=\"" + att.Value + "\"");
-					}
-				}
-				else
-				{
-					outText.Write(" " + name + "=\"" + att.Value + "\"");
-				}
-			}
-		}
-
-		internal static void WriteAttributes(XmlWriter writer, HtmlNode node)
-		{
-			if (!node.HasAttributes)
-			{
-				return;
-			}
-			// we use _hashitems to make sure attributes are written only once
-			foreach(HtmlAttribute att in node.Attributes._hashitems.Values)
-			{
-				writer.WriteAttributeString(att.XmlName, att.Value);
-			}
-		}
-
-		internal void WriteAttributes(TextWriter outText, bool closing)
-		{
-			if (_ownerdocument.OptionOutputAsXml)
-			{
-				if (_attributes == null)
-				{
-					return;
-				}
-				// we use _hashitems to make sure attributes are written only once
-				foreach(HtmlAttribute att in _attributes._hashitems.Values)
-				{
-					WriteAttribute(outText, att);
-				}
-				return;
-			}
-
-			if (!closing)
-			{
-				if (_attributes != null)
-				{
-
-					foreach(HtmlAttribute att in _attributes)
-					{
-						WriteAttribute(outText, att);
-					}
-				}
-				if (_ownerdocument.OptionAddDebuggingAttributes)
-				{
-					WriteAttribute(outText, _ownerdocument.CreateAttribute("_closed", Closed.ToString()));
-					WriteAttribute(outText, _ownerdocument.CreateAttribute("_children", ChildNodes.Count.ToString()));
-
-					int i = 0;
-					foreach(HtmlNode n in ChildNodes)
-					{
-						WriteAttribute(outText, _ownerdocument.CreateAttribute("_child_" + i,
-							n.Name));
-						i++;
-					}
-				}
-			}
-			else
-			{
-				if (_endnode == null)
-				{
-					return;
-				}
-
-				if (_endnode._attributes == null)
-				{
-					return;
-				}
-
-				if (_endnode == this)
-				{
-					return;
-				}
-
-				foreach(HtmlAttribute att in _endnode._attributes)
-				{
-					WriteAttribute(outText, att);
-				}
-				if (_ownerdocument.OptionAddDebuggingAttributes)
-				{
-					WriteAttribute(outText, _ownerdocument.CreateAttribute("_closed", Closed.ToString()));
-					WriteAttribute(outText, _ownerdocument.CreateAttribute("_children", ChildNodes.Count.ToString()));
-				}
-			}
-		}
-
-		internal static string GetXmlComment(HtmlCommentNode comment)
-		{
-			string s = comment.Comment;
-			return s.Substring(4, s.Length-7).Replace("--", " - -");
-		}
-
-		/// <summary>
-		/// Saves the current node to the specified TextWriter.
-		/// </summary>
-		/// <param name="outText">The TextWriter to which you want to save.</param>
-		public void WriteTo(TextWriter outText)
-		{
-			string html;
-			switch(_nodetype)
-			{
-				case HtmlNodeType.Comment:
-					html = ((HtmlCommentNode)this).Comment;
-					if (_ownerdocument.OptionOutputAsXml)
-					{
-						outText.Write("<!--" + GetXmlComment((HtmlCommentNode)this) + " -->");
-					}
-					else
-					{
-						outText.Write(html);
-					}
-					break;
-
-				case HtmlNodeType.Document:
-					if (_ownerdocument.OptionOutputAsXml)
-					{
-						outText.Write("<?xml version=\"1.0\" encoding=\"" + _ownerdocument.GetOutEncoding().BodyName + "\"?>");
-
-						// check there is a root element
-						if (_ownerdocument.DocumentNode.HasChildNodes)
-						{
-							int rootnodes = _ownerdocument.DocumentNode._childnodes.Count;
-							if (rootnodes > 0)
-							{
-								HtmlNode xml = _ownerdocument.GetXmlDeclaration();
-								if (xml != null)
-								{
-									rootnodes --;
-								}
-
-								if (rootnodes > 1)
-								{
-									if (_ownerdocument.OptionOutputUpperCase)
-									{
-										outText.Write("<SPAN>");
-										WriteContentTo(outText);
-										outText.Write("</SPAN>");
-									}
-									else
-									{
-										outText.Write("<span>");
-										WriteContentTo(outText);
-										outText.Write("</span>");
-									}
-									break;
-								}
-							}
-						}
-					}
-					WriteContentTo(outText);
-					break;
-
-				case HtmlNodeType.Text:
-					html = ((HtmlTextNode)this).Text;
-					if (_ownerdocument.OptionOutputAsXml)
-					{
-						outText.Write(HtmlDocument.HtmlEncode(html));
-					}
-					else
-					{
-						outText.Write(html);
-					}
-					break;
-
-				case HtmlNodeType.Element:
-					string name;
-					if (_ownerdocument.OptionOutputUpperCase)
-					{
-						name = Name.ToUpper();
-					}
-					else
-					{
-						name = Name;
-					}
-
-					if (_ownerdocument.OptionOutputAsXml)
-					{
-						if (name.Length > 0)
-						{
-							if (name[0] == '?')
-							{
-								// forget this one, it's been done at the document level
-								break;
-							}
-
-							if (name.Trim().Length == 0)
-							{
-								break;
-							}
-							name = HtmlDocument.GetXmlName(name);
-						}
-						else
-						{
-							break;
-						}
-					}
-
-					outText.Write("<" + name);
-					WriteAttributes(outText, false);
-
-					if (!HasChildNodes)
-					{
-						if (HtmlNode.IsEmptyElement(Name))
-						{
-							if ((_ownerdocument.OptionWriteEmptyNodes) || (_ownerdocument.OptionOutputAsXml))
-							{
-								outText.Write(" />");
-							}
-							else
-							{
-								if (Name.Length > 0)
-								{
-									if (Name[0] == '?')
-									{
-										outText.Write("?");
-									}
-								}
-
-								outText.Write(">");
-							}
-						}
-						else
-						{
-							outText.Write("></" + name + ">");
-						}
-					}
-					else
-					{
-						outText.Write(">");
-						bool cdata = false;
-						if (_ownerdocument.OptionOutputAsXml)
-						{
-							if (HtmlNode.IsCDataElement(Name))
-							{
-								// this code and the following tries to output things as nicely as possible for old browsers.
-								cdata = true;
-								outText.Write("\r\n//<![CDATA[\r\n");
-							}
-						}
-
-						if (cdata)
-						{
-							if (HasChildNodes)
-							{
-								// child must be a text
-								ChildNodes[0].WriteTo(outText);
-							}
-							outText.Write("\r\n//]]>//\r\n");
-						}
-						else
-						{
-							WriteContentTo(outText);
-						}
-
-						outText.Write("</" + name);
-						if (!_ownerdocument.OptionOutputAsXml)
-						{
-							WriteAttributes(outText, true);
-						}
-						outText.Write(">");
-					}
-					break;
-			}
-		}
-
-		/// <summary>
-		/// Saves the current node to the specified XmlWriter.
-		/// </summary>
-		/// <param name="writer">The XmlWriter to which you want to save.</param>
-		public void WriteTo(XmlWriter writer)
-		{
-			string html;
-			switch(_nodetype)
-			{
-				case HtmlNodeType.Comment:
-					writer.WriteComment(GetXmlComment((HtmlCommentNode)this));
-					break;
-
-				case HtmlNodeType.Document:
-					writer.WriteProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + _ownerdocument.GetOutEncoding().BodyName + "\"");
-					if (HasChildNodes)
-					{
-						foreach(HtmlNode subnode in ChildNodes)
-						{
-							subnode.WriteTo(writer);
-						}
-					}
-					break;
-
-				case HtmlNodeType.Text:
-					html = ((HtmlTextNode)this).Text;
-					writer.WriteString(html);
-					break;
-
-				case HtmlNodeType.Element:
-					string name;
-					if (_ownerdocument.OptionOutputUpperCase)
-					{
-						name = Name.ToUpper();
-					}
-					else
-					{
-						name = Name;
-					}
-					writer.WriteStartElement(name);
-					WriteAttributes(writer, this);
-
-					if (HasChildNodes)
-					{
-						foreach(HtmlNode subnode in ChildNodes)
-						{
-							subnode.WriteTo(writer);
-						}
-					}
-					writer.WriteEndElement();
-					break;
-			}
-		}
-
-		/// <summary>
-		/// Saves all the children of the node to the specified TextWriter.
-		/// </summary>
-		/// <param name="outText">The TextWriter to which you want to save.</param>
-		public void WriteContentTo(TextWriter outText)
-		{
-			if (_childnodes == null)
-			{
-				return;
-			}
-
-			foreach(HtmlNode node in _childnodes)
-			{
-				node.WriteTo(outText);
-			}
-		}
-
-		/// <summary>
-		/// Saves the current node to a string.
-		/// </summary>
-		/// <returns>The saved string.</returns>
-		public string WriteTo()
-		{
-			StringWriter sw = new StringWriter();
-			WriteTo(sw);
-			sw.Flush();
-			return sw.ToString();
-		}
-
-		/// <summary>
-		/// Saves all the children of the node to a string.
-		/// </summary>
-		/// <returns>The saved string.</returns>
-		public string WriteContentTo()
-		{
-			StringWriter sw = new StringWriter();
-			WriteContentTo(sw);
-			sw.Flush();
-			return sw.ToString();
-		}
-	}
-
-	/// <summary>
-	/// Represents a combined list and collection of HTML nodes.
-	/// </summary>
-	public class HtmlNodeCollection: IEnumerable
-	{
-		private ArrayList _items = new ArrayList();
-		private HtmlNode _parentnode;
-
-		internal HtmlNodeCollection(HtmlNode parentnode)
-		{
-			_parentnode = parentnode; // may be null
-		}
-
-		/// <summary>
-		/// Gets the number of elements actually contained in the list.
-		/// </summary>
-		public int Count
-		{
-			get
-			{
-				return _items.Count;
-			}
-		}
-
-		internal void Clear()
-		{
-			foreach(HtmlNode node in _items)
-			{
-				node._parentnode = null;
-				node._nextnode = null;
-				node._prevnode = null;
-			}
-			_items.Clear();
-		}
-
-		internal void Remove(int index)
-		{
-			HtmlNode next = null;
-			HtmlNode prev = null;
-			HtmlNode oldnode = (HtmlNode)_items[index];
-
-			if (index > 0)
-			{
-				prev = (HtmlNode)_items[index-1];
-			}
-
-			if (index < (_items.Count-1))
-			{
-				next = (HtmlNode)_items[index+1];
-			}
-
-			_items.RemoveAt(index);
-			
-			if (prev != null)
-			{
-				if (next == prev)
-				{
-					throw new InvalidProgramException("Unexpected error.");
-				}
-				prev._nextnode = next;
-			}
-
-			if (next != null)
-			{
-				next._prevnode = prev;
-			}
-
-			oldnode._prevnode = null;
-			oldnode._nextnode = null;
-			oldnode._parentnode = null;
-		}
-
-		internal void Replace(int index, HtmlNode node)
-		{
-			HtmlNode next = null;
-			HtmlNode prev = null;
-			HtmlNode oldnode = (HtmlNode)_items[index];
-
-			if (index>0)
-			{
-				prev = (HtmlNode)_items[index-1];
-			}
-
-			if (index<(_items.Count-1))
-			{
-				next = (HtmlNode)_items[index+1];
-			}
-
-			_items[index] = node;
-			
-			if (prev != null)
-			{
-				if (node == prev)
-				{
-					throw new InvalidProgramException("Unexpected error.");
-				}
-				prev._nextnode = node;
-			}
-
-			if (next!=null)
-			{
-				next._prevnode = node;
-			}
-
-			node._prevnode = prev;
-			if (next == node)
-			{
-				throw new InvalidProgramException("Unexpected error.");
-			}
-			node._nextnode = next;
-			node._parentnode = _parentnode;
-
-			oldnode._prevnode = null;
-			oldnode._nextnode = null;
-			oldnode._parentnode = null;
-		}
-
-		internal void Insert(int index, HtmlNode node)
-		{
-			HtmlNode next = null;
-			HtmlNode prev = null;
-
-			if (index>0)
-			{
-				prev = (HtmlNode)_items[index-1];
-			}
-
-			if (index<_items.Count)
-			{
-				next = (HtmlNode)_items[index];
-			}
-
-			_items.Insert(index, node);
-
-			if (prev != null)
-			{
-				if (node == prev)
-				{
-					throw new InvalidProgramException("Unexpected error.");
-				}
-				prev._nextnode = node;
-			}
-
-			if (next != null)
-			{
-				next._prevnode = node;
-			}
-
-			node._prevnode = prev;
-
-			if (next == node)
-			{
-				throw new InvalidProgramException("Unexpected error.");
-			}
-
-			node._nextnode = next;
-			node._parentnode = _parentnode;
-		}
-
-		internal void Append(HtmlNode node)
-		{
-			HtmlNode last = null;
-			if (_items.Count > 0)
-			{
-				last = (HtmlNode)_items[_items.Count-1];
-			}
-
-			_items.Add(node);
-			node._prevnode = last;
-			node._nextnode = null;
-			node._parentnode = _parentnode;
-			if (last != null)
-			{
-				if (last == node)
-				{
-					throw new InvalidProgramException("Unexpected error.");
-				}
-				last._nextnode = node;
-			}
-		}
-
-		internal void Prepend(HtmlNode node)
-		{
-			HtmlNode first = null;
-			if (_items.Count > 0)
-			{
-				first = (HtmlNode)_items[0];
-			}
-
-			_items.Insert(0, node);
-
-			if (node == first)
-			{
-				throw new InvalidProgramException("Unexpected error.");
-			}
-			node._nextnode = first;
-			node._prevnode = null;
-			node._parentnode = _parentnode;
-			if (first != null)
-			{
-				first._prevnode = node;
-			}
-		}
-
-		internal void Add(HtmlNode node)
-		{
-			_items.Add(node);
-		}
-
-		/// <summary>
-		/// Gets the node at the specified index.
-		/// </summary>
-		public HtmlNode this[int index]
-		{
-			get
-			{
-				return _items[index] as HtmlNode;
-			}
-		}
-
-		internal int GetNodeIndex(HtmlNode node)
-		{
-			// TODO: should we rewrite this? what would be the key of a node?
-			for(int i=0;i<_items.Count;i++)
-			{
-				if (node == ((HtmlNode)_items[i]))
-				{
-					return i;
-				}
-			}
-			return -1;
-		}
-
-		/// <summary>
-		/// Gets a given node from the list.
-		/// </summary>
-		public int this[HtmlNode node]
-		{
-			get
-			{
-				int index = GetNodeIndex(node);
-				if (index == -1)
-				{
-					throw new ArgumentOutOfRangeException("node", "Node \"" + node.CloneNode(false).OuterHtml + "\" was not found in the collection");
-				}
-				return index;
-			}
-		}
-
-		/// <summary>
-		/// Returns an enumerator that can iterate through the list.
-		/// </summary>
-		/// <returns>An IEnumerator for the entire list.</returns>
-		public HtmlNodeEnumerator GetEnumerator() 
-		{
-			return new HtmlNodeEnumerator(_items);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator() 
-		{
-			return GetEnumerator();
-		}
-
-		/// <summary>
-		/// Represents an enumerator that can iterate through the list.
-		/// </summary>
-		public class HtmlNodeEnumerator: IEnumerator 
-		{
-			int _index;
-			ArrayList _items;
-
-			internal HtmlNodeEnumerator(ArrayList items) 
-			{
-				_items = items;
-				_index = -1;
-			}
-
-			/// <summary>
-			/// Sets the enumerator to its initial position, which is before the first element in the collection.
-			/// </summary>
-			public void Reset() 
-			{
-				_index = -1;
-			}
-
-			/// <summary>
-			/// Advances the enumerator to the next element of the collection.
-			/// </summary>
-			/// <returns>true if the enumerator was successfully advanced to the next element, false if the enumerator has passed the end of the collection.</returns>
-			public bool MoveNext() 
-			{
-				_index++;
-				return (_index<_items.Count);
-			}
-
-			/// <summary>
-			/// Gets the current element in the collection.
-			/// </summary>
-			public HtmlNode Current 
-			{
-				get 
-				{
-					return (HtmlNode)(_items[_index]);
-				}
-			}
-
-			/// <summary>
-			/// Gets the current element in the collection.
-			/// </summary>
-			object IEnumerator.Current 
-			{
-				get 
-				{
-					return (Current);
-				}
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents an HTML text node.
-	/// </summary>
-	public class HtmlTextNode: HtmlNode
-	{
-		private string _text;
-
-		internal HtmlTextNode(HtmlDocument ownerdocument, int index):
-			base(HtmlNodeType.Text, ownerdocument, index)
-		{
-		}
-
-		/// <summary>
-		/// Gets or Sets the HTML between the start and end tags of the object. In the case of a text node, it is equals to OuterHtml.
-		/// </summary>
-		public override string InnerHtml
-		{
-			get
-			{
-				return OuterHtml;
-			}
-			set
-			{
-				_text = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the object and its content in HTML.
-		/// </summary>
-		public override string OuterHtml
-		{
-			get
-			{
-				if (_text == null)
-				{
-					return base.OuterHtml;
-				}
-				return _text;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the text of the node.
-		/// </summary>
-		public string Text
-		{
-			get
-			{
-				if (_text == null)
-				{
-					return base.OuterHtml;
-				}
-				return _text;
-			}
-			set
-			{
-				_text = value;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents an HTML comment.
-	/// </summary>
-	public class HtmlCommentNode: HtmlNode
-	{
-		private string _comment;
-
-		internal HtmlCommentNode(HtmlDocument ownerdocument, int index):
-			base(HtmlNodeType.Comment, ownerdocument, index)
-		{
-		}
-
-		/// <summary>
-		/// Gets or Sets the HTML between the start and end tags of the object. In the case of a text node, it is equals to OuterHtml.
-		/// </summary>
-		public override string InnerHtml
-		{
-			get
-			{
-				if (_comment == null)
-				{
-					return base.InnerHtml;
-				}
-				return _comment;
-			}
-			set
-			{
-				_comment = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the object and its content in HTML.
-		/// </summary>
-		public override string OuterHtml
-		{
-			get
-			{
-				if (_comment == null)
-				{
-					return base.OuterHtml;
-				}
-				return "<!--" + _comment + "-->";
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the comment text of the node.
-		/// </summary>
-		public string Comment
-		{
-			get
-			{
-				if (_comment == null)
-				{
-					return base.InnerHtml;
-				}
-				return _comment;
-			}
-			set
-			{
-				_comment = value;
-			}
-		}
-	}
-
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlNodeNavigator.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlNodeNavigator.cs
deleted file mode 100644
index cdfc510f0ba..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlNodeNavigator.cs
+++ /dev/null
@@ -1,806 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Diagnostics;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.XPath;
-
-namespace HtmlAgilityPack
-{
-	internal class HtmlNameTable: XmlNameTable
-	{
-		private NameTable _nametable = new NameTable();
-
-		internal HtmlNameTable()
-		{
-		}
-
-		internal string GetOrAdd(string array)
-		{
-			string s = Get(array);
-			if (s == null)
-			{
-				return Add(array);
-			}
-			return s;
-		}
-
-		public override string Add(string array)
-		{
-			return _nametable.Add(array);
-		}
-
-		public override string Get(string array)
-		{
-			return _nametable.Get(array);
-		}
-
-		public override string Get(char[] array, int offset, int length)
-		{
-			return _nametable.Get(array, offset, length);
-		}
-
-		public override string Add(char[] array, int offset, int length)
-		{
-			return _nametable.Add(array, offset, length);
-		}
-	}
-
-	/// <summary>
-	/// Represents an HTML navigator on an HTML document seen as a data store.
-	/// </summary>
-	public class HtmlNodeNavigator: XPathNavigator
-	{
-		private HtmlDocument _doc = new HtmlDocument();
-		private HtmlNode _currentnode;
-		private int _attindex;
-		private HtmlNameTable _nametable = new HtmlNameTable();
-
-		internal bool Trace = false;
-
-		internal HtmlNodeNavigator()
-		{
-			Reset();
-		}
-
-		private void Reset()
-		{
-			InternalTrace(null);
-			_currentnode = _doc.DocumentNode;
-			_attindex = -1;
-		}
-
-		[Conditional("TRACE")]
-		internal void InternalTrace(object Value)
-		{
-			if (!Trace)
-			{
-				return;
-			}
-			string name = null;
-			StackFrame sf = new StackFrame(1, true);
-			name = sf.GetMethod().Name;
-			string nodename;
-			if (_currentnode == null)
-			{
-				nodename = "(null)";
-			}
-			else
-			{
-				nodename = _currentnode.Name;
-			}
-			string nodevalue;
-			if (_currentnode == null)
-			{
-				nodevalue = "(null)";
-			}
-			else
-			{
-				switch(_currentnode.NodeType)
-				{
-					case HtmlNodeType.Comment:
-						nodevalue = ((HtmlCommentNode)_currentnode).Comment;
-						break;
-
-					case HtmlNodeType.Document:
-						nodevalue = "";
-						break;
-
-					case HtmlNodeType.Text:
-						nodevalue = ((HtmlTextNode)_currentnode).Text;
-						break;
-
-					default:
-						nodevalue = _currentnode.CloneNode(false).OuterHtml;
-						break;
-
-				}
-			}
-			System.Diagnostics.Trace.WriteLine("oid=" + GetHashCode()
-				+ ",n=" + nodename
-				+ ",a=" + _attindex + ","
-				+ ",v=" + nodevalue + ","
-				+ Value, "N!"+ name);
-		}
-
-		internal HtmlNodeNavigator(HtmlDocument doc, HtmlNode currentNode)
-		{
-			if (currentNode == null)
-			{
-				throw new ArgumentNullException("currentNode");
-			}
-			if (currentNode.OwnerDocument != doc)
-			{
-				throw new ArgumentException(HtmlDocument.HtmlExceptionRefNotChild);
-			}
-			InternalTrace(null);
-
-			_doc = doc;
-			Reset();
-			_currentnode = currentNode;
-		}
-
-		private HtmlNodeNavigator(HtmlNodeNavigator nav)
-		{
-			if (nav == null)
-			{
-				throw new ArgumentNullException("nav");
-			}
-			InternalTrace(null);
-			
-			_doc = nav._doc;
-			_currentnode = nav._currentnode;
-			_attindex = nav._attindex;
-			_nametable = nav._nametable; // REVIEW: should we do this?
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		public HtmlNodeNavigator(Stream stream)
-		{
-			_doc.Load(stream);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
-		public HtmlNodeNavigator(Stream stream, bool detectEncodingFromByteOrderMarks)
-		{
-			_doc.Load(stream, detectEncodingFromByteOrderMarks);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public HtmlNodeNavigator(Stream stream, Encoding encoding)
-		{
-			_doc.Load(stream, encoding);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
-		public HtmlNodeNavigator(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
-		{
-			_doc.Load(stream, encoding, detectEncodingFromByteOrderMarks);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the stream.</param>
-		/// <param name="buffersize">The minimum buffer size.</param>
-		public HtmlNodeNavigator(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
-		{
-			_doc.Load(stream, encoding, detectEncodingFromByteOrderMarks, buffersize);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a TextReader.
-		/// </summary>
-		/// <param name="reader">The TextReader used to feed the HTML data into the document.</param>
-		public HtmlNodeNavigator(TextReader reader)
-		{
-			_doc.Load(reader);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		public HtmlNodeNavigator(string path)
-		{
-			_doc.Load(path);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public HtmlNodeNavigator(string path, bool detectEncodingFromByteOrderMarks)
-		{
-			_doc.Load(path, detectEncodingFromByteOrderMarks);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public HtmlNodeNavigator(string path, Encoding encoding)
-		{
-			_doc.Load(path, encoding);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public HtmlNodeNavigator(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
-		{
-			_doc.Load(path, encoding, detectEncodingFromByteOrderMarks);
-			Reset();
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the HtmlNavigator and loads an HTML document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		/// <param name="buffersize">The minimum buffer size.</param>
-		public HtmlNodeNavigator(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
-		{
-			_doc.Load(path, encoding, detectEncodingFromByteOrderMarks, buffersize);
-			Reset();
-		}
-
-		/// <summary>
-		/// Gets the name of the current HTML node without the namespace prefix.
-		/// </summary>
-		public override string LocalName
-		{
-			get
-			{
-				if (_attindex != -1)
-				{
-					InternalTrace("att>" + _currentnode.Attributes[_attindex].Name);
-					return _nametable.GetOrAdd(_currentnode.Attributes[_attindex].Name);
-				}
-				else
-				{
-					InternalTrace("node>" + _currentnode.Name);
-					return _nametable.GetOrAdd(_currentnode.Name);
-				}
-			} 
-		}
-
-		/// <summary>
-		/// Gets the namespace URI (as defined in the W3C Namespace Specification) of the current node.
-		/// Always returns string.Empty in the case of HtmlNavigator implementation.
-		/// </summary>
-		public override string NamespaceURI
-		{
-			get
-			{
-				InternalTrace(">");
-				return _nametable.GetOrAdd(string.Empty);
-			} 
-		}
-
-		/// <summary>
-		/// Gets the qualified name of the current node.
-		/// </summary>
-		public override string Name
-		{
-			get
-			{
-				InternalTrace(">" + _currentnode.Name);
-				return _nametable.GetOrAdd(_currentnode.Name);
-			} 
-		}
-
-		/// <summary>
-		/// Gets the prefix associated with the current node.
-		/// Always returns string.Empty in the case of HtmlNavigator implementation.
-		/// </summary>
-		public override string Prefix
-		{
-			get
-			{
-				InternalTrace(null);
-				return _nametable.GetOrAdd(string.Empty);
-			} 
-		}
-
-		/// <summary>
-		/// Gets the type of the current node.
-		/// </summary>
-		public override XPathNodeType NodeType
-		{
-			get
-			{
-				switch(_currentnode.NodeType)
-				{
-					case HtmlNodeType.Comment:
-						InternalTrace(">" + XPathNodeType.Comment);
-						return XPathNodeType.Comment;
-
-					case HtmlNodeType.Document:
-						InternalTrace(">" + XPathNodeType.Root);
-						return XPathNodeType.Root;
-
-					case HtmlNodeType.Text:
-						InternalTrace(">" + XPathNodeType.Text);
-						return XPathNodeType.Text;
-
-					case HtmlNodeType.Element:
-					{
-						if (_attindex != -1)
-						{
-							InternalTrace(">" + XPathNodeType.Attribute);
-							return XPathNodeType.Attribute;
-						}
-						InternalTrace(">" + XPathNodeType.Element);
-						return XPathNodeType.Element;
-					}
-
-					default:
-						throw new NotImplementedException("Internal error: Unhandled HtmlNodeType: " + _currentnode.NodeType);
-				}
-			} 
-		}
-
-		/// <summary>
-		/// Gets the text value of the current node.
-		/// </summary>
-		public override string Value
-		{
-			get
-			{
-				InternalTrace("nt=" + _currentnode.NodeType);
-				switch(_currentnode.NodeType)
-				{
-					case HtmlNodeType.Comment:
-						InternalTrace(">" + ((HtmlCommentNode)_currentnode).Comment);
-						return ((HtmlCommentNode)_currentnode).Comment;
-
-					case HtmlNodeType.Document:
-						InternalTrace(">");
-						return "";
-
-					case HtmlNodeType.Text:
-						InternalTrace(">" + ((HtmlTextNode)_currentnode).Text);
-						return ((HtmlTextNode)_currentnode).Text;
-
-					case HtmlNodeType.Element:
-					{
-						if (_attindex != -1)
-						{
-							InternalTrace(">" + _currentnode.Attributes[_attindex].Value);
-							return _currentnode.Attributes[_attindex].Value;
-						}
-						return _currentnode.InnerText;
-					}
-
-					default:
-						throw new NotImplementedException("Internal error: Unhandled HtmlNodeType: " + _currentnode.NodeType);
-				}
-			} 
-		}
-
-		/// <summary>
-		/// Gets the base URI for the current node.
-		/// Always returns string.Empty in the case of HtmlNavigator implementation.
-		/// </summary>
-		public override string BaseURI
-		{
-			get
-			{
-				InternalTrace(">");
-				return _nametable.GetOrAdd(string.Empty);
-			} 
-		}
-
-		/// <summary>
-		/// Gets the xml:lang scope for the current node.
-		/// Always returns string.Empty in the case of HtmlNavigator implementation.
-		/// </summary>
-		public override string XmlLang
-		{
-			get
-			{
-				InternalTrace(null);
-				return _nametable.GetOrAdd(string.Empty);
-			} 
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current node is an empty element.
-		/// </summary>
-		public override bool IsEmptyElement
-		{
-			get
-			{
-				InternalTrace(">" + !HasChildren);
-				// REVIEW: is this ok?
-				return !HasChildren;
-			} 
-		}
-
-		/// <summary>
-		/// Gets the XmlNameTable associated with this implementation.
-		/// </summary>
-		public override XmlNameTable NameTable
-		{
-			get
-			{
-				InternalTrace(null);
-				return _nametable;
-			} 
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current node has child nodes.
-		/// </summary>
-		public override bool HasAttributes
-		{
-			get
-			{
-				InternalTrace(">" + (_currentnode.Attributes.Count>0));
-				return (_currentnode.Attributes.Count>0);
-			} 
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current node has child nodes.
-		/// </summary>
-		public override bool HasChildren
-		{
-			get
-			{
-				InternalTrace(">" + (_currentnode.ChildNodes.Count>0));
-				return (_currentnode.ChildNodes.Count>0);
-			} 
-		}
-
-		/// <summary>
-		/// Moves to the next sibling of the current node.
-		/// </summary>
-		/// <returns>true if the navigator is successful moving to the next sibling node, false if there are no more siblings or if the navigator is currently positioned on an attribute node. If false, the position of the navigator is unchanged.</returns>
-		public override bool MoveToNext()
-		{
-			if (_currentnode.NextSibling == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			InternalTrace("_c=" + _currentnode.CloneNode(false).OuterHtml);
-			InternalTrace("_n=" + _currentnode.NextSibling.CloneNode(false).OuterHtml);
-			_currentnode = _currentnode.NextSibling;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Moves to the previous sibling of the current node.
-		/// </summary>
-		/// <returns>true if the navigator is successful moving to the previous sibling node, false if there is no previous sibling or if the navigator is currently positioned on an attribute node.</returns>
-		public override bool MoveToPrevious()
-		{
-			if (_currentnode.PreviousSibling == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_currentnode = _currentnode.PreviousSibling;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Moves to the first sibling of the current node.
-		/// </summary>
-		/// <returns>true if the navigator is successful moving to the first sibling node, false if there is no first sibling or if the navigator is currently positioned on an attribute node.</returns>
-		public override bool MoveToFirst()
-		{
-			if (_currentnode.ParentNode == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			if (_currentnode.ParentNode.FirstChild == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_currentnode = _currentnode.ParentNode.FirstChild;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Moves to the first child of the current node.
-		/// </summary>
-		/// <returns>true if there is a first child node, otherwise false.</returns>
-		public override bool MoveToFirstChild()
-		{
-			if (!_currentnode.HasChildNodes)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_currentnode = _currentnode.ChildNodes[0];
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Moves to the parent of the current node.
-		/// </summary>
-		/// <returns>true if there is a parent node, otherwise false.</returns>
-		public override bool MoveToParent()
-		{
-			if (_currentnode.ParentNode == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_currentnode = _currentnode.ParentNode;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Moves to the root node to which the current node belongs.
-		/// </summary>
-		public override void MoveToRoot()
-		{
-			_currentnode = _doc.DocumentNode;
-			InternalTrace(null);
-		}
-
-		/// <summary>
-		/// Moves to the same position as the specified HtmlNavigator.
-		/// </summary>
-		/// <param name="other">The HtmlNavigator positioned on the node that you want to move to.</param>
-		/// <returns>true if successful, otherwise false. If false, the position of the navigator is unchanged.</returns>
-		public override bool MoveTo(XPathNavigator other)
-		{
-			HtmlNodeNavigator nav = other as HtmlNodeNavigator;
-			if (nav == null)
-			{
-				InternalTrace(">false (nav is not an HtmlNodeNavigator)");
-				return false;
-			}
-			InternalTrace("moveto oid=" + nav.GetHashCode()
-				+ ", n:" + nav._currentnode.Name
-				+ ", a:" + nav._attindex);
-
-			if (nav._doc == _doc)
-			{
-				_currentnode = nav._currentnode;
-				_attindex = nav._attindex;
-				InternalTrace(">true");
-				return true;
-			}
-			// we don't know how to handle that
-			InternalTrace(">false (???)");
-			return false;
-		}
-
-		/// <summary>
-		/// Moves to the node that has an attribute of type ID whose value matches the specified string.
-		/// </summary>
-		/// <param name="id">A string representing the ID value of the node to which you want to move. This argument does not need to be atomized.</param>
-		/// <returns>true if the move was successful, otherwise false. If false, the position of the navigator is unchanged.</returns>
-		public override bool MoveToId(string id)
-		{
-			InternalTrace("id=" + id);
-			HtmlNode node = _doc.GetElementbyId(id);
-			if (node == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_currentnode = node;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Determines whether the current HtmlNavigator is at the same position as the specified HtmlNavigator.
-		/// </summary>
-		/// <param name="other">The HtmlNavigator that you want to compare against.</param>
-		/// <returns>true if the two navigators have the same position, otherwise, false.</returns>
-		public override bool IsSamePosition(XPathNavigator other)
-		{
-			HtmlNodeNavigator nav = other as HtmlNodeNavigator;
-			if (nav == null)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			InternalTrace(">" + (nav._currentnode == _currentnode));
-			return (nav._currentnode == _currentnode);
-		}
-
-		/// <summary>
-		/// Creates a new HtmlNavigator positioned at the same node as this HtmlNavigator.
-		/// </summary>
-		/// <returns>A new HtmlNavigator object positioned at the same node as the original HtmlNavigator.</returns>
-		public override XPathNavigator Clone()
-		{
-			InternalTrace(null);
-			return new HtmlNodeNavigator(this);
-		}
-
-		/// <summary>
-		/// Gets the value of the HTML attribute with the specified LocalName and NamespaceURI.
-		/// </summary>
-		/// <param name="localName">The local name of the HTML attribute.</param>
-		/// <param name="namespaceURI">The namespace URI of the attribute. Unsupported with the HtmlNavigator implementation.</param>
-		/// <returns>The value of the specified HTML attribute. String.Empty or null if a matching attribute is not found or if the navigator is not positioned on an element node.</returns>
-		public override string GetAttribute(string localName, string namespaceURI)
-		{
-			InternalTrace("localName=" + localName + ", namespaceURI=" + namespaceURI);
-			HtmlAttribute att = _currentnode.Attributes[localName];
-			if (att == null)
-			{
-				InternalTrace(">null");
-				return null;
-			}
-			InternalTrace(">" + att.Value);
-			return att.Value;
-		}
-
-		/// <summary>
-		/// Moves to the HTML attribute with matching LocalName and NamespaceURI.
-		/// </summary>
-		/// <param name="localName">The local name of the HTML attribute.</param>
-		/// <param name="namespaceURI">The namespace URI of the attribute. Unsupported with the HtmlNavigator implementation.</param>
-		/// <returns>true if the HTML attribute is found, otherwise, false. If false, the position of the navigator does not change.</returns>
-		public override bool MoveToAttribute(string localName, string namespaceURI)
-		{
-			InternalTrace("localName=" + localName + ", namespaceURI=" + namespaceURI);
-			int index = _currentnode.Attributes.GetAttributeIndex(localName);
-			if (index == -1)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_attindex = index;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Moves to the first HTML attribute.
-		/// </summary>
-		/// <returns>true if the navigator is successful moving to the first HTML attribute, otherwise, false.</returns>
-		public override bool MoveToFirstAttribute()
-		{
-			if (!HasAttributes)
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_attindex = 0;
-			InternalTrace(">true");
-			return true;
-		}
-	
-		/// <summary>
-		/// Moves to the next HTML attribute.
-		/// </summary>
-		/// <returns></returns>
-		public override bool MoveToNextAttribute()		
-		{
-			InternalTrace(null);
-			if (_attindex>=(_currentnode.Attributes.Count-1))
-			{
-				InternalTrace(">false");
-				return false;
-			}
-			_attindex++;
-			InternalTrace(">true");
-			return true;
-		}
-
-		/// <summary>
-		/// Returns the value of the namespace node corresponding to the specified local name.
-		/// Always returns string.Empty for the HtmlNavigator implementation.
-		/// </summary>
-		/// <param name="name">The local name of the namespace node.</param>
-		/// <returns>Always returns string.Empty for the HtmlNavigator implementation.</returns>
-		public override string GetNamespace(string name)		
-		{
-			InternalTrace("name=" + name);
-			return string.Empty;
-		}
-
-		/// <summary>
-		/// Moves the XPathNavigator to the namespace node with the specified local name. 
-		/// Always returns false for the HtmlNavigator implementation.
-		/// </summary>
-		/// <param name="name">The local name of the namespace node.</param>
-		/// <returns>Always returns false for the HtmlNavigator implementation.</returns>
-		public override bool MoveToNamespace(string name)		
-		{
-			InternalTrace("name=" + name);
-			return false;
-		}
-
-		/// <summary>
-		/// Moves the XPathNavigator to the first namespace node of the current element.
-		/// Always returns false for the HtmlNavigator implementation.
-		/// </summary>
-		/// <param name="scope">An XPathNamespaceScope value describing the namespace scope.</param>
-		/// <returns>Always returns false for the HtmlNavigator implementation.</returns>
-		public override bool MoveToFirstNamespace(XPathNamespaceScope scope)		
-		{
-			InternalTrace(null);
-			return false;
-		}
-
-		/// <summary>
-		/// Moves the XPathNavigator to the next namespace node.
-		/// Always returns falsefor the HtmlNavigator implementation.
-		/// </summary>
-		/// <param name="scope">An XPathNamespaceScope value describing the namespace scope.</param>
-		/// <returns>Always returns false for the HtmlNavigator implementation.</returns>
-		public override bool MoveToNextNamespace(XPathNamespaceScope scope)		
-		{
-			InternalTrace(null);
-			return false;
-		}
-
-		/// <summary>
-		/// Gets the current HTML node.
-		/// </summary>
-		public HtmlNode CurrentNode
-		{
-			get
-			{
-				return _currentnode;
-			}
-		}
-
-		/// <summary>
-		/// Gets the current HTML document.
-		/// </summary>
-		public HtmlDocument CurrentDocument
-		{
-			get
-			{
-				return _doc;
-			}
-		}
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlWeb.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlWeb.cs
deleted file mode 100644
index dc16a3a65d4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlWeb.cs
+++ /dev/null
@@ -1,824 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.IO;
-using System.Net;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Xml.Xsl;
-using Microsoft.Win32;
-
-#if !JAVA
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// A utility class to get HTML document from HTTP.
-	/// </summary>
-	public class HtmlWeb
-	{
-		/// <summary>
-		/// Represents the method that will handle the PreRequest event.
-		/// </summary>
-		public delegate bool PreRequestHandler(HttpWebRequest request);
-
-		/// <summary>
-		/// Represents the method that will handle the PostResponse event.
-		/// </summary>
-		public delegate void PostResponseHandler(HttpWebRequest request, HttpWebResponse response);
-
-		/// <summary>
-		/// Represents the method that will handle the PreHandleDocument event.
-		/// </summary>
-		public delegate void PreHandleDocumentHandler(HtmlDocument document);
-
-		private int _streamBufferSize = 1024;
-		private string _cachePath;
-		private bool _usingCache;
-		private bool _fromCache;
-		private bool _cacheOnly;
-		private bool _useCookies;
-		private int _requestDuration;
-		private bool _autoDetectEncoding = true;
-		private HttpStatusCode _statusCode = HttpStatusCode.OK;
-		private Uri _responseUri;
-
-		/// <summary>
-		/// Occurs before an HTTP request is executed.
-		/// </summary>
-		public PreRequestHandler PreRequest;
-
-		/// <summary>
-		/// Occurs after an HTTP request has been executed.
-		/// </summary>
-		public PostResponseHandler PostResponse;
-
-		/// <summary>
-		/// Occurs before an HTML document is handled.
-		/// </summary>
-		public PreHandleDocumentHandler PreHandleDocument;
-
-		/// <summary>
-		/// Creates an instance of an HtmlWeb class.
-		/// </summary>
-		public HtmlWeb()
-		{
-		}
-
-		/// <summary>
-		/// Gets an HTML document from an Internet resource and saves it to the specified file.
-		/// </summary>
-		/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="path">The location of the file where you want to save the document.</param>
-		public void Get(string url, string path)
-		{
-			Get(url, path, "GET");
-		}
-			
-		/// <summary>
-		/// Gets an HTML document from an Internet resource and saves it to the specified file.
-		/// </summary>
-		/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="path">The location of the file where you want to save the document.</param>
-		/// <param name="method">The HTTP method used to open the connection, such as GET, POST, PUT, or PROPFIND.</param>
-		public void Get(string url, string path, string method)
-		{
-			Uri uri = new Uri(url);
-			if ((uri.Scheme == Uri.UriSchemeHttps) ||
-				(uri.Scheme == Uri.UriSchemeHttp))
-			{
-				Get(uri, method, path, null);
-			}
-			else
-			{
-				throw new HtmlWebException("Unsupported uri scheme: '" + uri.Scheme + "'.");
-			}
-		}
-
-		/// <summary>
-		/// Gets an HTML document from an Internet resource.
-		/// </summary>
-		/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <returns>A new HTML document.</returns>
-		public HtmlDocument Load(string url)
-		{
-			return Load(url, "GET");
-		}
-
-		/// <summary>
-		/// Loads an HTML document from an Internet resource.
-		/// </summary>
-		/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="method">The HTTP method used to open the connection, such as GET, POST, PUT, or PROPFIND.</param>
-		/// <returns>A new HTML document.</returns>
-		public HtmlDocument Load(string url, string method)
-		{
-			Uri uri = new Uri(url);
-			HtmlDocument doc;
-			if ((uri.Scheme == Uri.UriSchemeHttps) ||
-				(uri.Scheme == Uri.UriSchemeHttp))
-			{
-				doc = LoadUrl(uri, method);
-			}
-			else
-			{
-
-				if (uri.Scheme == Uri.UriSchemeFile)
-				{
-					doc = new HtmlDocument();
-					doc.OptionAutoCloseOnEnd = false;
-					doc.OptionAutoCloseOnEnd = true;
-					doc.DetectEncodingAndLoad(url, _autoDetectEncoding);
-				}
-				else
-				{
-					throw new HtmlWebException("Unsupported uri scheme: '" + uri.Scheme + "'.");
-				}
-			}
-			if (PreHandleDocument != null)
-			{
-				PreHandleDocument(doc);
-			}
-			return doc;
-		}
-
-		private bool IsCacheHtmlContent(string path)
-		{
-			string ct = GetContentTypeForExtension(Path.GetExtension(path), null);
-			return IsHtmlContent(ct);
-		}
-
-		private bool IsHtmlContent(string contentType)
-		{
-			return contentType.ToLower().StartsWith("text/html");
-		}
-
-		private string GetCacheHeadersPath(Uri uri)
-		{
-			//return Path.Combine(GetCachePath(uri), ".h.xml");
-			return GetCachePath(uri) + ".h.xml";
-		}
-
-		/// <summary>
-		/// Gets the cache file path for a specified url.
-		/// </summary>
-		/// <param name="uri">The url fo which to retrieve the cache path. May not be null.</param>
-		/// <returns>The cache file path.</returns>
-		public string GetCachePath(Uri uri)
-		{
-			if (uri == null)
-			{
-				throw new ArgumentNullException("uri");
-			}
-			if (!UsingCache)
-			{
-				throw new HtmlWebException("Cache is not enabled. Set UsingCache to true first.");
-			}
-			string cachePath;
-			if (uri.AbsolutePath == "/")
-			{
-				cachePath = Path.Combine(_cachePath, ".htm");
-			}
-			else
-			{
-				cachePath = Path.Combine(_cachePath, (uri.Host + uri.AbsolutePath).Replace('/', '\\'));
-			}
-			return cachePath;
-		}
-
-		/// <summary>
-		/// Gets a value indicating if the last document was retrieved from the cache.
-		/// </summary>
-		public bool FromCache
-		{
-			get
-			{
-				return _fromCache;
-			}
-		}
-
-		/// <summary>
-		/// Gets the URI of the Internet resource that actually responded to the request.
-		/// </summary>
-		public Uri ResponseUri
-		{
-			get
-			{
-				return _responseUri;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets a value indicating whether to get document only from the cache.
-		/// If this is set to true and document is not found in the cache, nothing will be loaded.
-		/// </summary>
-		public bool CacheOnly
-		{
-			get
-			{
-				return _cacheOnly;
-			}
-			set
-			{
-				if ((value) && !UsingCache)
-				{
-					throw new HtmlWebException("Cache is not enabled. Set UsingCache to true first.");
-				}
-				_cacheOnly = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets a value indicating if cookies will be stored.
-		/// </summary>
-		public bool UseCookies
-		{
-			get
-			{
-				return _useCookies;
-			}
-			set
-			{
-				_useCookies = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets the last request duration in milliseconds.
-		/// </summary>
-		public int RequestDuration
-		{
-			get
-			{
-				return _requestDuration;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets a value indicating if document encoding must be automatically detected.
-		/// </summary>
-		public bool AutoDetectEncoding
-		{
-			get
-			{
-				return _autoDetectEncoding;
-			}
-			set
-			{
-				_autoDetectEncoding = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets the last request status.
-		/// </summary>
-		public HttpStatusCode StatusCode
-		{
-			get
-			{
-				return _statusCode;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets the size of the buffer used for memory operations.
-		/// </summary>
-		public int StreamBufferSize
-		{
-			get
-			{
-				return _streamBufferSize;
-			}
-			set
-			{
-				if (_streamBufferSize <= 0)
-				{
-					throw new ArgumentException("Size must be greater than zero.");
-				}
-				_streamBufferSize = value;
-			}
-		}
-
-		private HtmlDocument LoadUrl(Uri uri, string method)
-		{
-			HtmlDocument doc = new HtmlDocument();
-			doc.OptionAutoCloseOnEnd = false;
-			doc.OptionFixNestedTags = true;
-			_statusCode = Get(uri, method, null, doc);
-			if (_statusCode == HttpStatusCode.NotModified)
-			{
-				// read cached encoding
-				doc.DetectEncodingAndLoad(GetCachePath(uri));
-			}
-			return doc;
-		}
-
-		private HttpStatusCode Get(Uri uri, string method, string path, HtmlDocument doc)
-		{
-			string cachePath = null;
-			HttpWebRequest req;
-			bool oldFile = false;
-
-			req = WebRequest.Create(uri) as HttpWebRequest;
-			req.Method = method;
-
-			_fromCache = false;
-			_requestDuration = 0;
-			int tc = Environment.TickCount;
-			if (UsingCache)
-			{
-				cachePath = GetCachePath(req.RequestUri);
-				if (File.Exists(cachePath))
-				{
-					req.IfModifiedSince = File.GetLastAccessTime(cachePath);
-					oldFile = true;
-				}
-			}
-
-			if (_cacheOnly)
-			{
-				if (!File.Exists(cachePath))
-				{
-					throw new HtmlWebException("File was not found at cache path: '" + cachePath + "'");
-				}
-
-				if (path != null)
-				{
-					IOLibrary.CopyAlways(cachePath, path);
-					// touch the file
-					File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
-				}
-				_fromCache = true;
-				return HttpStatusCode.NotModified;
-			}
-
-			if (_useCookies)
-			{
-				req.CookieContainer = new CookieContainer();
-			}
-
-			if (PreRequest != null)
-			{
-				// allow our user to change the request at will
-				if (!PreRequest(req))
-				{
-					return HttpStatusCode.ResetContent;
-				}
-
-				// dump cookie
-//				if (_useCookies)
-//				{
-//					foreach(Cookie cookie in req.CookieContainer.GetCookies(req.RequestUri))
-//					{
-//						HtmlLibrary.Trace("Cookie " + cookie.Name + "=" + cookie.Value + " path=" + cookie.Path + " domain=" + cookie.Domain);
-//					}
-//				}
-			}
-
-			HttpWebResponse resp;
-
-			try
-			{
-				resp = req.GetResponse() as HttpWebResponse;
-			}
-			catch (WebException we)
-			{
-				_requestDuration = Environment.TickCount - tc;
-				resp = (HttpWebResponse)we.Response;
-				if (resp == null)
-				{
-					if (oldFile)
-					{
-						if (path != null)
-						{
-							IOLibrary.CopyAlways(cachePath, path);
-							// touch the file
-							File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
-						}
-						return HttpStatusCode.NotModified;
-					}
-					throw;
-				}
-			}
-			catch(Exception)
-			{
-				_requestDuration = Environment.TickCount - tc;
-				throw;
-			}
-
-			// allow our user to get some info from the response
-			if (PostResponse != null)
-			{
-				PostResponse(req, resp);
-			}
-
-			_requestDuration = Environment.TickCount - tc;
-			_responseUri = resp.ResponseUri;
-			
-			bool html = IsHtmlContent(resp.ContentType);
-			System.Text.Encoding respenc;
-
-			if ((resp.ContentEncoding != null) && (resp.ContentEncoding.Length>0))
-			{
-				respenc = System.Text.Encoding.GetEncoding(resp.ContentEncoding);
-			}
-			else
-			{
-				respenc = null;
-			}
-
-			if (resp.StatusCode == HttpStatusCode.NotModified)
-			{
-				if (UsingCache)
-				{
-					_fromCache = true;
-					if (path != null)
-					{
-						IOLibrary.CopyAlways(cachePath, path);
-						// touch the file
-						File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
-					}
-					return resp.StatusCode;
-				}
-				else
-				{
-					// this should *never* happen...
-					throw new HtmlWebException("Server has send a NotModifed code, without cache enabled.");
-				}
-			}
-			Stream s = resp.GetResponseStream();
-			if (s != null)
-			{
-				if (UsingCache)
-				{
-					// NOTE: LastModified does not contain milliseconds, so we remove them to the file
-					SaveStream(s, cachePath, RemoveMilliseconds(resp.LastModified), _streamBufferSize);
-
-					// save headers
-					SaveCacheHeaders(req.RequestUri, resp);
-
-					if (path != null)
-					{
-						// copy and touch the file
-						IOLibrary.CopyAlways(cachePath, path);
-						File.SetLastWriteTime(path, File.GetLastWriteTime(cachePath));
-					}
-				}
-				else
-				{
-					// try to work in-memory
-					if ((doc != null) && (html))
-					{
-						if (respenc != null)
-						{
-							doc.Load(s,respenc);
-						}
-						else
-						{
-							doc.Load(s);
-						}
-					}
-				}
-				resp.Close();
-			}
-			return resp.StatusCode;
-		}
-
-		private string GetCacheHeader(Uri requestUri, string name, string def)
-		{
-			// note: some headers are collection (ex: www-authenticate)
-			// we don't handle that here
-			XmlDocument doc = new XmlDocument();
-			doc.Load(GetCacheHeadersPath(requestUri));
-			XmlNode node = doc.SelectSingleNode("//h[translate(@n, 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')='" + name.ToUpper() + "']");
-			if (node == null)
-			{
-				return def;
-			}
-			// attribute should exist
-			return node.Attributes[name].Value;
-		}
-
-		private void SaveCacheHeaders(Uri requestUri, HttpWebResponse resp)
-		{
-			// we cache the original headers aside the cached document.
-			string file = GetCacheHeadersPath(requestUri);
-			XmlDocument doc = new XmlDocument();
-			doc.LoadXml("<c></c>");
-			XmlNode cache = doc.FirstChild;
-			foreach(string header in resp.Headers)
-			{
-				XmlNode entry = doc.CreateElement("h");
-				XmlAttribute att = doc.CreateAttribute("n");
-				att.Value = header;
-				entry.Attributes.Append(att);
-
-				att = doc.CreateAttribute("v");
-				att.Value = resp.Headers[header];
-				entry.Attributes.Append(att);
-
-				cache.AppendChild(entry);
-			}
-			doc.Save(file);
-		}
-
-		private static long SaveStream(Stream stream, string path, DateTime touchDate, int streamBufferSize)
-		{
-			FilePreparePath(path);
-			FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write);
-			BinaryReader br = null;
-			BinaryWriter bw = null;
-			long len;
-			try
-			{
-				br = new BinaryReader(stream);
-				bw = new BinaryWriter(fs);
-				len = 0;
-				byte[] buffer;
-				do
-				{
-					buffer = br.ReadBytes(streamBufferSize);
-					len += buffer.Length;
-					if (buffer.Length>0)
-					{
-						bw.Write(buffer);
-					}
-				}
-				while (buffer.Length>0);
-			}
-			finally
-			{
-				if (br != null)
-				{
-					br.Close();
-				}
-				if (bw != null)
-				{
-					bw.Flush();
-					bw.Close();
-				}
-				if (fs != null)
-				{
-					fs.Close();
-				}
-			}
-			File.SetLastWriteTime(path, touchDate);
-			return len;
-		}
-
-		private static void FilePreparePath(string target)
-		{
-			if (File.Exists(target))
-			{
-				FileAttributes atts = File.GetAttributes(target);
-				File.SetAttributes(target, atts & ~FileAttributes.ReadOnly);
-			}
-			else
-			{
-				string dir = Path.GetDirectoryName(target);
-				if (!Directory.Exists(dir))
-				{
-					Directory.CreateDirectory(dir);
-				}
-			}
-		}
-
-		private static DateTime RemoveMilliseconds(DateTime t)
-		{
-			return new DateTime(t.Year, t.Month, t.Day, t.Hour, t.Minute, t.Second, 0);
-		}
-
-		/// <summary>
-		/// Gets the path extension for a given MIME content type.
-		/// </summary>
-		/// <param name="contentType">The input MIME content type.</param>
-		/// <param name="def">The default path extension to return if any error occurs.</param>
-		/// <returns>The MIME content type's path extension.</returns>
-		public static string GetExtensionForContentType(string contentType, string def)
-		{
-			if ((contentType == null) || (contentType.Length == 0))
-			{
-				return def;
-			}
-			string ext;
-			try
-			{
-				RegistryKey reg = Registry.ClassesRoot;
-				reg = reg.OpenSubKey(@"MIME\Database\Content Type\" + contentType, false);
-				ext = (string)reg.GetValue("Extension", def);
-			}
-			catch(Exception)
-			{
-				ext =  def;
-			}
-			return ext;
-		}
-
-		/// <summary>
-		/// Gets the MIME content type for a given path extension.
-		/// </summary>
-		/// <param name="extension">The input path extension.</param>
-		/// <param name="def">The default content type to return if any error occurs.</param>
-		/// <returns>The path extention's MIME content type.</returns>
-		public static string GetContentTypeForExtension(string extension, string def)
-		{
-			if ((extension == null) || (extension.Length == 0))
-			{
-				return def;
-			}
-			string contentType;
-			try
-			{
-				RegistryKey reg = Registry.ClassesRoot;
-				reg = reg.OpenSubKey(extension, false);
-				contentType = (string)reg.GetValue("", def);
-			}
-			catch(Exception)
-			{
-				contentType =  def;
-			}
-			return contentType;
-		}
-
-		/// <summary>
-		/// Loads an HTML document from an Internet resource and saves it to the specified XmlTextWriter.
-		/// </summary>
-		/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="writer">The XmlTextWriter to which you want to save.</param>
-		public void LoadHtmlAsXml(string htmlUrl, XmlTextWriter writer)
-		{
-			HtmlDocument doc = Load(htmlUrl);
-			doc.Save(writer);
-		}
-
-		/// <summary>
-		/// Loads an HTML document from an Internet resource and saves it to the specified XmlTextWriter, after an XSLT transformation.
-		/// </summary>
-		/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
-		/// <param name="xsltArgs">An XsltArgumentList containing the namespace-qualified arguments used as input to the transform.</param>
-		/// <param name="writer">The XmlTextWriter to which you want to save.</param>
-		public void LoadHtmlAsXml(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, XmlTextWriter writer)
-		{
-			LoadHtmlAsXml(htmlUrl, xsltUrl, xsltArgs, writer, null);
-		}
-
-		/// <summary>
-		/// Loads an HTML document from an Internet resource and saves it to the specified XmlTextWriter, after an XSLT transformation.
-		/// </summary>
-		/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp". May not be null.</param>
-		/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
-		/// <param name="xsltArgs">An XsltArgumentList containing the namespace-qualified arguments used as input to the transform.</param>
-		/// <param name="writer">The XmlTextWriter to which you want to save.</param>
-		/// <param name="xmlPath">A file path where the temporary XML before transformation will be saved. Mostly used for debugging purposes.</param>
-		public void LoadHtmlAsXml(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, XmlTextWriter writer, string xmlPath)
-		{
-			if (htmlUrl == null)
-			{
-				throw new ArgumentNullException("htmlUrl");
-			}
-
-			HtmlDocument doc = Load(htmlUrl);
-
-			if (xmlPath != null)
-			{
-				XmlTextWriter w = new XmlTextWriter(xmlPath, doc.Encoding);
-				doc.Save(w);
-				w.Close();
-			}
-			if (xsltArgs == null)
-			{
-				xsltArgs = new XsltArgumentList();
-			}
-			
-			// add some useful variables to the xslt doc
-			xsltArgs.AddParam("url", "", htmlUrl);
-			xsltArgs.AddParam("requestDuration", "", RequestDuration);
-			xsltArgs.AddParam("fromCache", "", FromCache);
-
-			XslTransform xslt = new XslTransform();
-			xslt.Load(xsltUrl);
-			xslt.Transform(doc, xsltArgs, writer, null);
-		}
-
-		/// <summary>
-		/// Creates an instance of the given type from the specified Internet resource.
-		/// </summary>
-		/// <param name="url">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="type">The requested type.</param>
-		/// <returns>An newly created instance.</returns>
-		public object CreateInstance(string url, Type type)
-		{
-			return CreateInstance(url, null, null, type);
-		}
-
-		/// <summary>
-		/// Creates an instance of the given type from the specified Internet resource.
-		/// </summary>
-		/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
-		/// <param name="xsltArgs">An XsltArgumentList containing the namespace-qualified arguments used as input to the transform.</param>
-		/// <param name="type">The requested type.</param>
-		/// <returns>An newly created instance.</returns>
-		public object CreateInstance(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, Type type)
-		{
-			return CreateInstance(htmlUrl, xsltUrl, xsltArgs, type, null);
-		}
-
-		/// <summary>
-		/// Creates an instance of the given type from the specified Internet resource.
-		/// </summary>
-		/// <param name="htmlUrl">The requested URL, such as "http://Myserver/Mypath/Myfile.asp".</param>
-		/// <param name="xsltUrl">The URL that specifies the XSLT stylesheet to load.</param>
-		/// <param name="xsltArgs">An XsltArgumentList containing the namespace-qualified arguments used as input to the transform.</param>
-		/// <param name="type">The requested type.</param>
-		/// <param name="xmlPath">A file path where the temporary XML before transformation will be saved. Mostly used for debugging purposes.</param>
-		/// <returns>An newly created instance.</returns>
-		public object CreateInstance(string htmlUrl, string xsltUrl, XsltArgumentList xsltArgs, Type type, string xmlPath)
-		{
-			StringWriter sw = new StringWriter();
-			XmlTextWriter writer = new XmlTextWriter(sw);
-			if (xsltUrl == null)
-			{
-				LoadHtmlAsXml(htmlUrl, writer);
-			}
-			else
-			{
-				if (xmlPath == null)
-				{
-					LoadHtmlAsXml(htmlUrl, xsltUrl, xsltArgs, writer);
-				}
-				else
-				{
-					LoadHtmlAsXml(htmlUrl, xsltUrl, xsltArgs, writer, xmlPath);
-				}
-			}
-			writer.Flush();
-			StringReader sr = new StringReader(sw.ToString());
-			XmlTextReader reader = new XmlTextReader(sr);
-			XmlSerializer serializer = new XmlSerializer(type);
-			object o = null;
-			try
-			{
-				o = serializer.Deserialize(reader);
-			}
-			catch(InvalidOperationException ex)
-			{
-				throw new Exception(ex.ToString() + ", --- xml:" + sw.ToString());
-			}
-			return o;
-		}
-
-		/// <summary>
-		/// Gets or Sets the cache path. If null, no caching mechanism will be used.
-		/// </summary>
-		public string CachePath
-		{
-			get
-			{
-				return _cachePath;
-			}
-			set
-			{
-				_cachePath = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or Sets a value indicating whether the caching mechanisms should be used or not.
-		/// </summary>
-		public bool UsingCache
-		{
-			get
-			{
-				if (_cachePath == null)
-				{
-					return false;
-				}
-				return _usingCache;
-			}
-			set
-			{
-				if ((value) && (_cachePath == null))
-				{
-					throw new HtmlWebException("You need to define a CachePath first.");
-				}
-				_usingCache = value;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents an exception thrown by the HtmlWeb utility class.
-	/// </summary>
-	public class HtmlWebException: Exception
-	{
-		/// <summary>
-		/// Creates an instance of the HtmlWebException.
-		/// </summary>
-		/// <param name="message">The exception's message.</param>
-		public HtmlWebException(string message)
-			:base(message)
-		{
-		}
-	}
-}
-#endif
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/MixedCodeDocument.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/MixedCodeDocument.cs
deleted file mode 100644
index 096f3826c49..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/MixedCodeDocument.cs
+++ /dev/null
@@ -1,799 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.IO;
-using System.Text;
-using System.Collections;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// Represents the type of fragement in a mixed code document.
-	/// </summary>
-	public enum MixedCodeDocumentFragmentType
-	{
-		/// <summary>
-		/// The fragment contains code.
-		/// </summary>
-		Code,
-
-		/// <summary>
-		/// The fragment contains text.
-		/// </summary>
-		Text,
-	}
-
-	/// <summary>
-	/// Represents a fragment of code in a mixed code document.
-	/// </summary>
-	public class MixedCodeDocumentCodeFragment: MixedCodeDocumentFragment
-	{
-		internal string _code;
-
-		internal MixedCodeDocumentCodeFragment(MixedCodeDocument doc):
-			base(doc, MixedCodeDocumentFragmentType.Code)
-		{
-		}
-
-		/// <summary>
-		/// Gets the fragment code text.
-		/// </summary>
-		public string Code
-		{
-			get
-			{
-				if (_code == null)
-				{
-					_code = FragmentText.Substring(_doc.TokenCodeStart.Length,
-						FragmentText.Length - _doc.TokenCodeEnd.Length - _doc.TokenCodeStart.Length -1).Trim();
-					if (_code.StartsWith("="))
-					{
-						_code = _doc.TokenResponseWrite + _code.Substring(1, _code.Length-1);
-					}
-				}
-				return _code;
-			}
-			set
-			{
-				_code = value;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a fragment of text in a mixed code document.
-	/// </summary>
-	public class MixedCodeDocumentTextFragment: MixedCodeDocumentFragment
-	{
-		internal MixedCodeDocumentTextFragment(MixedCodeDocument doc):
-			base(doc, MixedCodeDocumentFragmentType.Text)
-		{
-		}
-
-		/// <summary>
-		/// Gets the fragment text.
-		/// </summary>
-		public string Text
-		{
-			get
-			{
-				return FragmentText;
-			}
-			set
-			{
-				base._fragmenttext = value;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a base class for fragments in a mixed code document.
-	/// </summary>
-	public abstract class MixedCodeDocumentFragment
-	{
-		internal MixedCodeDocumentFragmentType _type;
-		internal MixedCodeDocument _doc;
-		internal int _index;
-		internal int _length;
-		internal int _line;
-		internal int _lineposition;
-		internal string _fragmenttext;
-
-		internal MixedCodeDocumentFragment(MixedCodeDocument doc, MixedCodeDocumentFragmentType type)
-		{
-			_doc = doc;
-			_type = type;
-			switch(type)
-			{
-				case MixedCodeDocumentFragmentType.Text:
-					_doc._textfragments.Append(this);
-					break;
-
-				case MixedCodeDocumentFragmentType.Code:
-					_doc._codefragments.Append(this);
-					break;
-			}
-			_doc._fragments.Append(this);
-		}
-
-		/// <summary>
-		/// Gets the type of fragment.
-		/// </summary>
-		public MixedCodeDocumentFragmentType FragmentType
-		{
-			get
-			{
-				return _type;
-			}
-		}
-
-		/// <summary>
-		/// Gets the fragment position in the document's stream.
-		/// </summary>
-		public int StreamPosition
-		{
-			get
-			{
-				return _index;
-			}
-		}
-
-		/// <summary>
-		/// Gets the line number of the fragment.
-		/// </summary>
-		public int Line
-		{
-			get
-			{
-				return _line;
-			}
-		}
-
-		/// <summary>
-		/// Gets the line position (column) of the fragment.
-		/// </summary>
-		public int LinePosition
-		{
-			get
-			{
-				return _lineposition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the fragement text.
-		/// </summary>
-		public string FragmentText
-		{
-			get
-			{
-				if (_fragmenttext == null)
-				{
-					_fragmenttext = _doc._text.Substring(_index, _length);
-				}
-				return _fragmenttext;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a list of mixed code fragments.
-	/// </summary>
-	public class MixedCodeDocumentFragmentList: IEnumerable
-	{
-		private MixedCodeDocument _doc;
-		private ArrayList _items = new ArrayList();
-
-		internal MixedCodeDocumentFragmentList(MixedCodeDocument doc)
-		{
-			_doc = doc;
-		}
-
-		/// <summary>
-		/// Appends a fragment to the list of fragments.
-		/// </summary>
-		/// <param name="newFragment">The fragment to append. May not be null.</param>
-		public void Append(MixedCodeDocumentFragment newFragment)
-		{
-			if (newFragment == null)
-			{
-				throw new ArgumentNullException("newFragment");
-			}
-			_items.Add(newFragment);
-		}
-
-		/// <summary>
-		/// Prepends a fragment to the list of fragments.
-		/// </summary>
-		/// <param name="newFragment">The fragment to append. May not be null.</param>
-		public void Prepend(MixedCodeDocumentFragment newFragment)
-		{
-			if (newFragment == null)
-			{
-				throw new ArgumentNullException("newFragment");
-			}
-			_items.Insert(0, newFragment);
-		}
-
-		/// <summary>
-		/// Remove a fragment from the list of fragments. If this fragment was not in the list, an exception will be raised.
-		/// </summary>
-		/// <param name="fragment">The fragment to remove. May not be null.</param>
-		public void Remove(MixedCodeDocumentFragment fragment)
-		{
-			if (fragment == null)
-			{
-				throw new ArgumentNullException("fragment");
-			}
-			int index = GetFragmentIndex(fragment);
-			if (index == -1)
-			{
-				throw new IndexOutOfRangeException();
-			}
-			RemoveAt(index);
-		}
-
-		/// <summary>
-		/// Remove a fragment from the list of fragments, using its index in the list.
-		/// </summary>
-		/// <param name="index">The index of the fragment to remove.</param>
-		public void RemoveAt(int index)
-		{
-			MixedCodeDocumentFragment frag = (MixedCodeDocumentFragment)_items[index];
-			_items.RemoveAt(index);
-		}
-
-		/// <summary>
-		/// Remove all fragments from the list.
-		/// </summary>
-		public void RemoveAll()
-		{
-			_items.Clear();
-		}
-
-		/// <summary>
-		/// Gets the number of fragments contained in the list.
-		/// </summary>
-		public int Count
-		{
-			get
-			{
-				return _items.Count;
-			}
-		}
-
-		internal int GetFragmentIndex(MixedCodeDocumentFragment fragment)
-		{
-			if (fragment == null)
-			{
-				throw new ArgumentNullException("fragment");
-			}
-			for(int i=0;i<_items.Count;i++)
-			{
-				if (((MixedCodeDocumentFragment)_items[i])==fragment)
-				{
-					return i;
-				}
-			}
-			return -1;
-		}
-
-		/// <summary>
-		/// Gets a fragment from the list using its index.
-		/// </summary>
-		public MixedCodeDocumentFragment this[int index]
-		{
-			get
-			{
-				return _items[index] as MixedCodeDocumentFragment;
-			}
-		}
-
-		internal void Clear()
-		{
-			_items.Clear();
-		}
-
-		/// <summary>
-		/// Gets an enumerator that can iterate through the fragment list.
-		/// </summary>
-		public MixedCodeDocumentFragmentEnumerator GetEnumerator() 
-		{
-			return new MixedCodeDocumentFragmentEnumerator(_items);
-		}
-
-		/// <summary>
-		/// Gets an enumerator that can iterate through the fragment list.
-		/// </summary>
-		IEnumerator IEnumerable.GetEnumerator() 
-		{
-			return GetEnumerator();
-		}
-
-		/// <summary>
-		/// Represents a fragment enumerator.
-		/// </summary>
-		public class MixedCodeDocumentFragmentEnumerator: IEnumerator 
-		{
-			int _index;
-			ArrayList _items;
-
-			internal MixedCodeDocumentFragmentEnumerator(ArrayList items) 
-			{
-				_items = items;
-				_index = -1;
-			}
-
-			/// <summary>
-			/// Sets the enumerator to its initial position, which is before the first element in the collection.
-			/// </summary>
-			public void Reset() 
-			{
-				_index = -1;
-			}
-
-			/// <summary>
-			/// Advances the enumerator to the next element of the collection.
-			/// </summary>
-			/// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
-			public bool MoveNext() 
-			{
-				_index++;
-				return (_index<_items.Count);
-			}
-
-			/// <summary>
-			/// Gets the current element in the collection.
-			/// </summary>
-			public MixedCodeDocumentFragment Current 
-			{
-				get 
-				{
-					return (MixedCodeDocumentFragment)(_items[_index]);
-				}
-			}
-
-			/// <summary>
-			/// Gets the current element in the collection.
-			/// </summary>
-			object IEnumerator.Current 
-			{
-				get 
-				{
-					return (Current);
-				}
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a document with mixed code and text. ASP, ASPX, JSP, are good example of such documents.
-	/// </summary>
-	public class MixedCodeDocument
-	{
-		private System.Text.Encoding _streamencoding = null;
-		internal string _text;
-		internal MixedCodeDocumentFragmentList _fragments;
-		internal MixedCodeDocumentFragmentList _codefragments;
-		internal MixedCodeDocumentFragmentList _textfragments;
-		private ParseState _state;
-		private int _index;
-		private int _c;
-		private int _line;
-		private int _lineposition;
-		private MixedCodeDocumentFragment _currentfragment;
-
-		/// <summary>
-		/// Gets or sets the token representing code start.
-		/// </summary>
-		public string TokenCodeStart = "<%";
-
-		/// <summary>
-		/// Gets or sets the token representing code end.
-		/// </summary>
-		public string TokenCodeEnd = "%>";
-
-		/// <summary>
-		/// Gets or sets the token representing code directive.
-		/// </summary>
-		public string TokenDirective = "@";
-
-		/// <summary>
-		/// Gets or sets the token representing response write directive.
-		/// </summary>
-		public string TokenResponseWrite = "Response.Write ";
-
-
-		private string TokenTextBlock = "TextBlock({0})";
-
-		/// <summary>
-		/// Creates a mixed code document instance.
-		/// </summary>
-		public MixedCodeDocument()
-		{
-			_codefragments = new MixedCodeDocumentFragmentList(this);
-			_textfragments = new MixedCodeDocumentFragmentList(this);
-			_fragments = new MixedCodeDocumentFragmentList(this);
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		public void Load(Stream stream)
-		{
-			Load(new StreamReader(stream));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public void Load(Stream stream, bool detectEncodingFromByteOrderMarks)
-		{
-			Load(new StreamReader(stream, detectEncodingFromByteOrderMarks));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public void Load(Stream stream, Encoding encoding)
-		{
-			Load(new StreamReader(stream, encoding));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public void Load(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
-		{
-			Load(new StreamReader(stream, encoding, detectEncodingFromByteOrderMarks));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		/// <param name="buffersize">The minimum buffer size.</param>
-		public void Load(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
-		{
-			Load(new StreamReader(stream, encoding, detectEncodingFromByteOrderMarks, buffersize));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		public void Load(string path)
-		{
-			Load(new StreamReader(path));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public void Load(string path, bool detectEncodingFromByteOrderMarks)
-		{
-			Load(new StreamReader(path, detectEncodingFromByteOrderMarks));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public void Load(string path, Encoding encoding)
-		{
-			Load(new StreamReader(path, encoding));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		public void Load(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
-		{
-			Load(new StreamReader(path, encoding, detectEncodingFromByteOrderMarks));
-		}
-
-		/// <summary>
-		/// Loads a mixed code document from a file.
-		/// </summary>
-		/// <param name="path">The complete file path to be read.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="detectEncodingFromByteOrderMarks">Indicates whether to look for byte order marks at the beginning of the file.</param>
-		/// <param name="buffersize">The minimum buffer size.</param>
-		public void Load(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int buffersize)
-		{
-			Load(new StreamReader(path, encoding, detectEncodingFromByteOrderMarks, buffersize));
-		}
-
-		/// <summary>
-		/// Loads a mixed document from a text
-		/// </summary>
-		/// <param name="html">The text to load.</param>
-		public void LoadHtml(string html)
-		{
-			Load(new StringReader(html));
-		}
-
-		/// <summary>
-		/// Loads the mixed code document from the specified TextReader.
-		/// </summary>
-		/// <param name="reader">The TextReader used to feed the HTML data into the document.</param>
-		public void Load(TextReader reader)
-		{
-			_codefragments.Clear();
-			_textfragments.Clear();
-
-			// all pseudo constructors get down to this one
-			StreamReader sr = reader as StreamReader;
-			if (sr != null)
-			{
-				_streamencoding = sr.CurrentEncoding;
-			}
-
-			_text = reader.ReadToEnd();
-			reader.Close();
-			Parse();
-		}
-
-		internal System.Text.Encoding GetOutEncoding()
-		{
-			if (_streamencoding != null)
-				return _streamencoding;
-			return System.Text.Encoding.Default;
-		}
-
-		/// <summary>
-		/// Gets the encoding of the stream used to read the document.
-		/// </summary>
-		public System.Text.Encoding StreamEncoding
-		{
-			get
-			{
-				return _streamencoding;
-			}
-		}
-
-		/// <summary>
-		/// Gets the list of code fragments in the document.
-		/// </summary>
-		public MixedCodeDocumentFragmentList CodeFragments
-		{
-			get
-			{
-				return _codefragments;
-			}
-		}
-
-		/// <summary>
-		/// Gets the list of text fragments in the document.
-		/// </summary>
-		public MixedCodeDocumentFragmentList TextFragments
-		{
-			get
-			{
-				return _textfragments;
-			}
-		}
-
-		/// <summary>
-		/// Gets the list of all fragments in the document.
-		/// </summary>
-		public MixedCodeDocumentFragmentList Fragments
-		{
-			get
-			{
-				return _fragments;
-			}
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified stream.
-		/// </summary>
-		/// <param name="outStream">The stream to which you want to save.</param>
-		public void Save(Stream outStream)
-		{
-			StreamWriter sw = new StreamWriter(outStream, GetOutEncoding());
-			Save(sw);
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified stream.
-		/// </summary>
-		/// <param name="outStream">The stream to which you want to save.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public void Save(Stream outStream, System.Text.Encoding encoding)
-		{
-			StreamWriter sw = new StreamWriter(outStream, encoding);
-			Save(sw);
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified file.
-		/// </summary>
-		/// <param name="filename">The location of the file where you want to save the document.</param>
-		public void Save(string filename)
-		{
-			StreamWriter sw = new StreamWriter(filename, false, GetOutEncoding());
-			Save(sw);
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified file.
-		/// </summary>
-		/// <param name="filename">The location of the file where you want to save the document.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		public void Save(string filename, System.Text.Encoding encoding)
-		{
-			StreamWriter sw = new StreamWriter(filename, false, encoding);
-			Save(sw);
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified StreamWriter.
-		/// </summary>
-		/// <param name="writer">The StreamWriter to which you want to save.</param>
-		public void Save(StreamWriter writer)
-		{
-			Save((TextWriter)writer);
-		}
-
-		/// <summary>
-		/// Saves the mixed document to the specified TextWriter.
-		/// </summary>
-		/// <param name="writer">The TextWriter to which you want to save.</param>
-		public void Save(TextWriter writer)
-		{
-
-			writer.Flush();
-		}
-
-		/// <summary>
-		/// Gets the code represented by the mixed code document seen as a template.
-		/// </summary>
-		public string Code
-		{
-			get
-			{
-				string s = "";
-				int i = 0;
-				foreach(MixedCodeDocumentFragment frag in _fragments)
-				{
-					switch(frag._type)
-					{
-						case MixedCodeDocumentFragmentType.Text:
-							s += TokenResponseWrite + string.Format(TokenTextBlock, i) + "\n";
-							i++;
-							break;
-
-						case MixedCodeDocumentFragmentType.Code:
-							s += ((MixedCodeDocumentCodeFragment)frag).Code + "\n";
-							break;
-					}
-				}
-				return s;
-			}
-		}
-
-		/// <summary>
-		/// Create a text fragment instances.
-		/// </summary>
-		/// <returns>The newly created text fragment instance.</returns>
-		public MixedCodeDocumentTextFragment CreateTextFragment()
-		{
-			return (MixedCodeDocumentTextFragment)CreateFragment(MixedCodeDocumentFragmentType.Text);
-		}
-
-		/// <summary>
-		/// Create a code fragment instances.
-		/// </summary>
-		/// <returns>The newly created code fragment instance.</returns>
-		public MixedCodeDocumentCodeFragment CreateCodeFragment()
-		{
-			return (MixedCodeDocumentCodeFragment)CreateFragment(MixedCodeDocumentFragmentType.Code);
-		}
-
-		internal MixedCodeDocumentFragment CreateFragment(MixedCodeDocumentFragmentType type)
-		{
-			switch(type)
-			{
-				case MixedCodeDocumentFragmentType.Text:
-					return new MixedCodeDocumentTextFragment(this);
-
-				case MixedCodeDocumentFragmentType.Code:
-					return new MixedCodeDocumentCodeFragment(this);
-
-				default:
-					throw new NotSupportedException();
-			}
-		}
-
-		private void SetPosition()
-		{
-			_currentfragment._line = _line;
-			_currentfragment._lineposition = _lineposition;
-			_currentfragment._index = _index - 1;
-			_currentfragment._length = 0;
-		}
-
-		private void IncrementPosition()
-		{
-			_index++;
-			if (_c == 10)
-			{
-				_lineposition = 1;
-				_line++;
-			}
-			else
-				_lineposition++;
-		}
-
-		private enum ParseState
-		{
-			Text,
-			Code
-		}
-
-		private void Parse()
-		{
-			_state = ParseState.Text;
-			_index = 0;
-			_currentfragment = CreateFragment(MixedCodeDocumentFragmentType.Text);
-
-			while (_index<_text.Length)
-			{
-				_c = _text[_index];
-				IncrementPosition();
-
-				switch(_state)
-				{
-					case ParseState.Text:
-						if (_index+TokenCodeStart.Length<_text.Length)
-						{
-							if (_text.Substring(_index-1, TokenCodeStart.Length) == TokenCodeStart)
-							{
-								_state = ParseState.Code;
-								_currentfragment._length = _index -1 - _currentfragment._index;
-								_currentfragment = CreateFragment(MixedCodeDocumentFragmentType.Code);
-								SetPosition();
-								continue;
-							}
-						}
-						break;
-
-					case ParseState.Code:
-						if (_index+TokenCodeEnd.Length<_text.Length)
-						{
-							if (_text.Substring(_index-1, TokenCodeEnd.Length) == TokenCodeEnd)
-							{
-								_state = ParseState.Text;
-								_currentfragment._length = _index + TokenCodeEnd.Length - _currentfragment._index;
-								_index += TokenCodeEnd.Length;
-								_lineposition += TokenCodeEnd.Length;
-								_currentfragment = CreateFragment(MixedCodeDocumentFragmentType.Text);
-								SetPosition();
-								continue;
-							}
-						}
-						break;
-				}
-			}
-
-			_currentfragment._length = _index - _currentfragment._index;
-		}
-
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/ParseReader.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/ParseReader.cs
deleted file mode 100644
index 19142444fc7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/ParseReader.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-// HtmlAgilityPack V1.3.1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// Represents a rewindable buffered TextReader specifically well suited for parsing operations.
-	/// </summary>
-	public class ParseReader: Stream
-	{
-		private StringBuilder _sb;
-		private int _baseReaderPosition;
-		private int _maxReaderPosition;
-		private int _position;
-		private TextReader _baseReader;
-
-		/// <summary>
-		/// Initializes an instance of the ParserReader class, based on an existing TextReader instance.
-		/// </summary>
-		/// <param name="baseReader">The TextReader to base parsing on. Must not be null.</param>
-		public ParseReader(TextReader baseReader)
-		{
-			if (baseReader == null)
-				throw new ArgumentNullException("baseReader");
-
-			_baseReader = baseReader;
-			_sb = new StringBuilder();
-			_position = 0;
-			_baseReaderPosition = 0;
-			_maxReaderPosition = int.MaxValue;
-		}
-
-		/// <summary>
-		/// Gets the length in bytes of the stream.
-		/// Always throws a NotSupportedException for the ParserReader class.
-		/// </summary>
-		public override long Length
-		{
-			get
-			{
-				throw new NotSupportedException();
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the position within the stream.
-		/// </summary>
-		public override long Position
-		{
-			get
-			{
-				return _position;
-			}
-			set
-			{
-				if (value < 0)
-					throw new ArgumentException("value is negative: " + value + ".");
-				if (value > int.MaxValue)
-					throw new ArgumentException("value must not be larger than int32 MaxValue.");
-				_position = (int)value;
-			}
-		}
-
-		/// <summary>
-		/// Checks the length of the underlying stream.
-		/// </summary>
-		/// <param name="length">The required length.</param>
-		/// <returns>true if the underlying stream's length is greater than the required length, false otherwise.</returns>
-		public bool CheckLength(int length)
-		{
-			if (length <= 0)
-				throw new ArgumentException("length must be greater than zero.");
-
-			if (BufferedTextLength >= length)
-				return true;
-
-			Seek(length, SeekOrigin.Begin);
-			return (BufferedTextLength >= length);
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current stream supports seeking.
-		/// Always returns true for the ParserReader class.
-		/// </summary>
-		public override bool CanSeek
-		{
-			get
-			{
-				return true;
-			}
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current stream supports reading.
-		/// Always returns true for the ParserReader class.
-		/// </summary>
-		public override bool CanRead
-		{
-			get
-			{
-				return true;
-			}
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current stream supports writing.
-		/// Always returns false for the ParserReader class.
-		/// </summary>
-		public override bool CanWrite
-		{
-			get
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Sets the length of the current stream.
-		/// Always throws a NotSupportedException for the ParserReader class.
-		/// </summary>
-		/// <param name="value">The desired length of the current stream in bytes.</param>
-		public override void SetLength(long value)
-		{
-			throw new NotSupportedException();
-		}
-
-		/// <summary>
-		/// Clears all buffers for this stream and causes any buffered data to be written to the underlying device.
-		/// </summary>
-		public override void Flush()
-		{
-			// nothing to do
-		}
-
-		/// <summary>
-		/// Gets the position within the underlying stream.
-		/// </summary>
-		public int BaseReaderPosition
-		{
-			get
-			{
-				return _baseReaderPosition;
-			}
-		}
-
-		/// <summary>
-		/// Gets the maximum position within the underlying stream.
-		/// </summary>
-		public int MaxReaderPosition
-		{
-			get
-			{
-				return _maxReaderPosition;
-			}
-		}
-
-		private void CheckBaseReader()
-		{
-			if (_baseReader == null)
-				throw new InvalidOperationException("Cannot read from a closed ParseReader.");
-		}
-
-		/// <summary>
-		/// Closes the current underlying stream.
-		/// </summary>
-		public void CloseBaseReader()
-		{
-			if (_maxReaderPosition != int.MaxValue) // we have already closed it
-				return;
-
-			CheckBaseReader();
-
-			_baseReader.Close();
-			_baseReader = null;
-		}
-
-		private void InternalCloseBaseReader()
-		{
-			CloseBaseReader();
-			_maxReaderPosition = _position;
-		}
-
-		/// <summary>
-		/// Returns the next available character but does not consume it.
-		/// </summary>
-		/// <returns>The next character to be read, or -1 if no more characters are available.</returns>
-		public int Peek()
-		{
-			if (_position < _baseReaderPosition)
-				return Convert.ToInt32(this[_position]);
-
-			if (_position == _maxReaderPosition)
-				return -1;
-
-			CheckBaseReader();
-			int i = _baseReader.Peek();
-			if (i < 0)
-			{
-				InternalCloseBaseReader();
-				return i;
-			}
-
-			Debug.Assert(_position >= _baseReaderPosition);
-			if (_position == _baseReaderPosition)
-			{
-				if (_sb.Length < (_position + 1))
-				{
-					_sb.Append(Convert.ToChar(i));
-				}
-			}
-			return i;
-		}
-
-		/// <summary>
-		/// Reads the next character and advances the character position by one character.
-		/// </summary>
-		/// <returns>The next character represented as an Int32, or -1 if no more characters are available.</returns>
-		public int Read()
-		{
-			int i;
-			if (_position < _baseReaderPosition)
-			{
-				i =  Convert.ToInt32(_sb[_position]);
-				_position++;
-				return i;
-			}
-
-			if (_position == _maxReaderPosition)
-				return -1;
-
-			CheckBaseReader();
-			i = _baseReader.Read();
-			if (i < 0)
-			{
-				InternalCloseBaseReader();
-				return i;
-			}
-
-			if (_position >= _baseReaderPosition)
-			{
-				if (_sb.Length < (_position + 1))
-				{
-					_sb.Append(Convert.ToChar(i));
-				}
-			}
-			_baseReaderPosition++;
-			_position++;
-			return i;
-		}
-
-		/// <summary>
-		/// Move the position starting from the current position.
-		/// </summary>
-		/// <param name="count">A character offset relative to the current position.</param>
-		/// <returns>The new position.</returns>
-		public int Seek(int count)
-		{
-			int i;
-			if (count < 0)
-			{
-				if ((_position + count ) < 0)
-				{
-					i = _position;
-					_position = 0;
-					return i;
-				}
-				else
-				{
-					_position += count;
-					return - count;
-				}
-			}
-			for(i=0;i<count;i++)
-			{
-				int c = Read();
-				if (c < 0)
-				{
-					break;
-				}
-			}
-			return i;
-		}
-
-		/// <summary>
-		/// Reads a string from the current position.
-		/// </summary>
-		/// <param name="count">The number of characters to read.</param>
-		/// <returns>The read string or null, if an error occurred.</returns>
-		public string ReadString(int count)
-		{
-			int first = (int)Position;
-			Seek(count);
-			int last = (int)Position;
-			if (first >= _sb.Length)
-				return null;
-			return _sb.ToString(first, last - first);
-		}
-
-		/// <summary>
-		/// Reads a string, represented as an array of System.Int32, from the current position.
-		/// </summary>
-		/// <param name="count">The number of characters to read.</param>
-		/// <returns>The read string or null, if an error occurred.</returns>
-		public int[] Read(int count)
-		{
-			string s = ReadString(count);
-			if (s == null)
-				return null;
-			char[] chars = s.ToCharArray();
-			int[] ints = new int[chars.Length];
-			chars.CopyTo(ints, 0);
-			return ints;
-		}
-
-		/// <summary>
-		/// reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
-		/// </summary>
-		/// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between offset and (offset + count- 1) replaced by the bytes read from the current source.</param>
-		/// <param name="offset">The zero-based byte offset in buffer at which to begin storing the data read from the current stream.</param>
-		/// <param name="count">The maximum number of bytes to be read from the current stream.</param>
-		/// <returns>The total number of bytes read into the buffer. This can be less than the number of bytes requested if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.</returns>
-		public override int Read(byte[] buffer, int offset, int count)
-		{
-			if (buffer == null)
-				throw new ArgumentNullException("buffer");
-
-			// we don't really know how to read count bytes... so we read count chars
-			string s = ReadString(count);
-			if (s == null)
-				return 0;
-			byte[] bytes = System.Text.Encoding.Unicode.GetBytes(s); // probably around 2*count bytes
-			int read = 0;
-			for(int i=0;i<bytes.Length;i++)
-			{
-				buffer[offset + i] = bytes[i];
-				read++;
-				if (read == count) // enough?
-					break;
-			}
-			return read;
-		}
-
-		/// <summary>
-		/// Writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
-		/// Always throws a NotSupportedException for the ParserReader class.
-		/// </summary>
-		/// <param name="buffer">An array of bytes. This method copies count bytes from buffer to the current stream.</param>
-		/// <param name="offset">The zero-based byte offset in buffer at which to begin copying bytes to the current stream.</param>
-		/// <param name="count">The number of bytes to be written to the current stream.</param>
-		public override void Write(byte[] buffer, int offset, int count)
-		{
-			throw new NotSupportedException();
-		}
-
-		/// <summary>
-		/// Sets the position within the current stream.
-		/// </summary>
-		/// <param name="offset">A byte offset relative to the origin parameter.</param>
-		/// <param name="origin">A value of type SeekOrigin indicating the reference point used to obtain the new position.</param>
-		/// <returns>The new position within the current stream.</returns>
-		public override long Seek(long offset, SeekOrigin origin)
-		{
-			if (offset > int.MaxValue)
-				throw new ArgumentException("offset must not be larger than int32 MaxValue.");
-
-			switch(origin)
-			{
-				case SeekOrigin.Begin:
-					_position = 0;
-					break;
-
-				case SeekOrigin.End:
-					Seek(int.MaxValue);
-					break;
-
-				case SeekOrigin.Current:
-					break;
-			}
-			return Seek((int)offset);
-		}
-
-		/// <summary>
-		/// Gets the character at the specified index or -1 if no more characters are available.
-		/// </summary>
-		public int this[int index]
-		{
-			get
-			{
-				if (index >= _baseReaderPosition)
-				{
-					int count = Seek(index - _baseReaderPosition);
-					if (count < (index - _baseReaderPosition))
-						return -1;
-					int i = Peek();
-					if (i < 0)
-						return -1;
-				}
-				return _sb[index];
-			}
-		}
-
-		/// <summary>
-		/// Gets the length of the currently buffered text.
-		/// </summary>
-		public int BufferedTextLength
-		{
-			get
-			{
-				return _sb.Length;
-			}
-		}
-
-		/// <summary>
-		/// Gets the currently buffered text.
-		/// </summary>
-		public string BufferedText
-		{
-			get
-			{
-				return _sb.ToString();
-			}
-		}
-
-		/// <summary>
-		/// Extracts a string out of the buffered text.
-		/// </summary>
-		/// <param name="offset">The zero-based byte offset in buffered text at which to begin extracting.</param>
-		/// <param name="length">The maximum number of bytes to be read from the buffered text.</param>
-		/// <returns></returns>
-		public string GetBufferedString(int offset, int length)
-		{
-			if (offset > BufferedTextLength)
-			{
-				return null;
-			}
-			if ((offset + length) > BufferedTextLength)
-			{
-				length -= (offset + length) - BufferedTextLength;
-			}
-			return BufferedText.Substring(offset, length);
-		}
-
-	}
-
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs
deleted file mode 100644
index 918dac723e7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.IO;
-
-namespace HtmlAgilityPack
-{
-	/// <summary>
-	/// A utility class to compute CRC32.
-	/// </summary>
-	public class Crc32
-	{
-		private uint _crc32 = 0;
-		static private uint[] crc_32_tab =  // CRC polynomial 0xedb88320 
-			{
-				0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-				0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-				0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-				0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-				0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-				0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-				0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-				0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-				0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-				0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-				0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-				0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-				0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-				0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-				0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-				0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-				0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-				0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-				0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-				0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-				0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-				0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-				0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-				0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-				0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-				0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-				0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-				0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-				0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-				0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-				0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-				0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-				0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-				0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-				0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-				0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-				0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-				0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-				0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-				0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-				0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-				0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-				0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d 
-			};			
-
-		static private uint UPDC32(byte octet, uint crc)
-		{
-			return (crc_32_tab[((crc)^((byte)octet)) & 0xff] ^ ((crc) >> 8));
-		}
-
-		internal uint CheckSum
-		{
-			get
-			{
-				return _crc32;
-			}
-			set
-			{
-				_crc32 = value;
-			}
-		}
-
-		internal uint AddToCRC32(int c)
-		{
-			return AddToCRC32((ushort)c);
-		}
-
-		internal uint AddToCRC32(ushort c)
-		{
-			byte lowByte, hiByte;
-			lowByte = (byte)(c & 0x00ff);
-			hiByte = (byte)(c >> 8);
-			_crc32 = UPDC32(hiByte, _crc32);
-			_crc32 = UPDC32(lowByte, _crc32);
-			return ~_crc32;
-		}
-
-		/// <summary>
-		/// Compute a checksum for a given string.
-		/// </summary>
-		/// <param name="text">The string to compute the checksum for.</param>
-		/// <returns>The computed checksum.</returns>
-		static public uint CRC32String(string text)
-		{
-			uint oldcrc32;
-			oldcrc32 = 0xFFFFFFFF;				
-			int len = text.Length;
-			ushort uCharVal;
-			byte lowByte, hiByte;
-				
-			for ( int i=0; len>0; i++)
-			{
-				--len;
-				uCharVal = text[len];
-				unchecked
-				{
-					lowByte = (byte)(uCharVal & 0x00ff);
-					hiByte = (byte)(uCharVal >> 8);
-				}
-				oldcrc32 = UPDC32(hiByte, oldcrc32);
-				oldcrc32 = UPDC32(lowByte, oldcrc32);
-			}
-
-			return ~oldcrc32;
-		}
-
-		/// <summary>
-		/// Compute a checksum for a given array of bytes.
-		/// </summary>
-		/// <param name="bytes">The array of bytes to compute the checksum for.</param>
-		/// <returns>The computed checksum.</returns>
-		static public uint CRC32Bytes(byte[] bytes)
-		{
-			uint oldcrc32;
-			oldcrc32 = 0xFFFFFFFF;				
-			int len = bytes.Length;
-				
-			for ( int i=0; len>0; i++)
-			{
-				--len;
-				oldcrc32 = UPDC32(bytes[len], oldcrc32);
-			}
-			return ~oldcrc32;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/readme.txt b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/readme.txt
deleted file mode 100644
index 069ce4135db..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-HTML Agility Pack V1.3.0.0
-
-This directory contains the HtmlAgilityPack solution and source code and this readme file. The other directories are:
-
-+ Doc			Contains the HtmlAgilityPack assembly documentation as a .CHM file
-+ Samples		Contains some HtmlAgilityPack samples
- + GetDocLinks		A sample that determines all linked files and references of a givn HTML document
- + Html2Txt		A sample that converts an HTML document into a plain text .txt file
- + Html2Xml		A sample that converts an HTML document into an XML file
- + HtmlToRss		A sample that converts an HTML file into an RSS feed. Two methods are demonstrated.
-
-Simon Mourier
-June 2003
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/tools.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/tools.cs
deleted file mode 100644
index 87209529d8f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/tools.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-// HtmlAgilityPack V1.0 - Simon Mourier <simonm@microsoft.com>
-using System;
-using System.Diagnostics;
-using System.IO;
-
-namespace HtmlAgilityPack
-{
-	internal struct IOLibrary
-	{
-		internal static void MakeWritable(string path)
-		{
-			if (!File.Exists(path))
-				return;
-			File.SetAttributes(path, File.GetAttributes(path) & ~FileAttributes.ReadOnly);
-		}
-
-		internal static void CopyAlways(string source, string target)
-		{
-			if (!File.Exists(source))
-				return;
-			Directory.CreateDirectory(Path.GetDirectoryName(target));
-			MakeWritable(target);
-			File.Copy(source, target, true);
-		}
-    }
-#if !MONO
-    internal struct HtmlLibrary
-	{
-		[Conditional("DEBUG")]
-		internal static void GetVersion(out string version)
-		{
-			System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(1, true);
-			version = sf.GetMethod().DeclaringType.Assembly.GetName().Version.ToString();
-		}
-
-		[Conditional("DEBUG")]
-		[Conditional("TRACE")]
-		internal static void Trace(object Value)
-		{
-			// category is the method
-			string name = null;
-			GetCurrentMethodName(2, out name);
-			System.Diagnostics.Trace.WriteLine(Value, name);
-		}
-
-		[Conditional("DEBUG")]
-		[Conditional("TRACE")]
-		internal static void TraceStackFrame(int steps)
-		{
-			string name = null;
-			GetCurrentMethodName(2, out name);
-			string trace = "";
-			for(int i=1;i<steps;i++)
-			{
-				System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(i, true);
-				trace += sf.ToString();
-			}
-			System.Diagnostics.Trace.WriteLine(trace, name);
-			System.Diagnostics.Trace.WriteLine("");
-		}
-
-		[Conditional("DEBUG")]
-		internal static void GetCurrentMethodName(out string name)
-		{
-			name = null;
-			GetCurrentMethodName(2, out name);
-		}
-
-		[Conditional("DEBUG")]
-		internal static void GetCurrentMethodName(int skipframe, out string name)
-		{
-			StackFrame sf = new StackFrame(skipframe, true);
-			name = sf.GetMethod().DeclaringType.Name + "." + sf.GetMethod().Name;
-		}
-
-    }
-#endif
-    
-    internal class HtmlCmdLine
-	{
-		static internal bool Help;
-
-		static HtmlCmdLine()
-		{
-			Help = false;
-			ParseArgs();
-		}
-
-		internal static string GetOption(string name, string def)
-		{
-			string p = def;
-			string[] args = Environment.GetCommandLineArgs();
-			for (int i=1;i<args.Length;i++)
-			{
-				GetStringArg(args[i], name, ref p);
-			}
-			return p;
-		}
-
-		internal static string GetOption(int index, string def)
-		{
-			string p = def;
-			string[] args = Environment.GetCommandLineArgs();
-			int j = 0;
-			for (int i=1;i<args.Length;i++)
-			{
-				if (GetStringArg(args[i], ref p))
-				{
-					if (index==j)
-						return p;
-					else
-						p = def;
-					j++;
-				}
-			}
-			return p;
-		}
-
-		internal static bool GetOption(string name, bool def)
-		{
-			bool p = def;
-			string[] args = Environment.GetCommandLineArgs();
-			for (int i=1;i<args.Length;i++)
-			{
-				GetBoolArg(args[i], name, ref p);
-			}
-			return p;
-		}
-
-		internal static int GetOption(string name, int def)
-		{
-			int p = def;
-			string[] args = Environment.GetCommandLineArgs();
-			for (int i=1;i<args.Length;i++)
-			{
-				GetIntArg(args[i], name, ref p);
-			}
-			return p;
-		}
-
-		private static void ParseArgs()
-		{
-			string[] args = Environment.GetCommandLineArgs();
-			for (int i=1;i<args.Length;i++)
-			{
-				// help
-				GetBoolArg(args[i], "?", ref Help);
-				GetBoolArg(args[i], "h", ref Help);
-				GetBoolArg(args[i], "help", ref Help);
-			}
-		}
-
-		private static bool GetStringArg(string Arg, ref string ArgValue)
-		{
-			if (('/'==Arg[0]) || ('-'==Arg[0]))
-				return false;
-			ArgValue = Arg;
-			return true;
-		}
-
-		private static void GetStringArg(string Arg, string Name, ref string ArgValue)
-		{
-			if (Arg.Length<(Name.Length+3)) // -name:x is 3 more than name
-				return;
-			if (('/'!=Arg[0]) && ('-'!=Arg[0]))	// not a param
-				return;
-			if (Arg.Substring(1, Name.Length).ToLower()==Name.ToLower())
-				ArgValue = Arg.Substring(Name.Length+2, Arg.Length-Name.Length-2);
-		}
-
-		private static void GetBoolArg(string Arg, string Name, ref bool ArgValue)
-		{
-			if (Arg.Length<(Name.Length+1)) // -name is 1 more than name
-				return;
-			if (('/'!=Arg[0]) && ('-'!=Arg[0]))	// not a param
-				return;
-			if (Arg.Substring(1, Name.Length).ToLower()==Name.ToLower())
-				ArgValue = true;
-		}
-
-		private static void GetIntArg(string Arg, string Name, ref int ArgValue)
-		{
-			if (Arg.Length<(Name.Length+3)) // -name:12 is 3 more than name
-				return;
-			if (('/'!=Arg[0]) && ('-'!=Arg[0]))	// not a param
-				return;
-			if (Arg.Substring(1, Name.Length).ToLower()==Name.ToLower())
-			{
-				try
-				{
-					ArgValue = Convert.ToInt32(Arg.Substring(Name.Length+2, Arg.Length-Name.Length-2));
-				}
-				catch
-				{
-				}
-				
-			}
-		}
-	}
-
-	internal class HtmlConsoleListener: System.Diagnostics.TraceListener
-	{
-		public override void WriteLine(string Message)
-		{
-			Write(Message + "\n");
-		}
-
-		public override void Write(string Message)
-		{
-			Write(Message, "");
-		}
-	
-		public override void Write(string Message, string Category)
-		{
-			Console.Write("T:" + Category + ": " + Message);
-		}
-
-		public override void WriteLine(string Message, string Category)
-		{
-			Write(Message + "\n", Category);
-		}
-	}
-
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/SystemWebTest.vmwcsproj b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/SystemWebTest.vmwcsproj
deleted file mode 100755
index d1e4813b88f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/SystemWebTest.vmwcsproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{3FB09545-9389-4F42-B80D-4855A2FA5B5C}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="SystemWebTest" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="SystemWebTest" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;NUNIT" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug_Java_NUnit" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;NUNIT" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-				<Reference Name="nunit.core" AssemblyName="nunit.core" HintPath="..\..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.dll" Private="True"/>

-				<Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.dll" Private="True"/>

-				<Reference Name="nunit.util" AssemblyName="nunit.util" HintPath="..\..\..\..\..\nunit20\util\bin\Debug_Java\nunit.util.dll" Private="True"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="almost_config.xml" BuildAction="Content"/>

-				<File RelPath="App.config" BuildAction="None"/>

-				<File RelPath="Harness.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="readme.txt" BuildAction="Content"/>

-				<File RelPath="test_catalog.xml" BuildAction="Content"/>

-				<File RelPath="TestsCatalog.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="WebTest.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="XmlComparer.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\crc32.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\Header.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\HtmlAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\HtmlDocument.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\HtmlEntity.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\HtmlNode.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\HtmlNodeNavigator.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\HtmlWeb.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\MixedCodeDocument.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\ParseReader.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\readme.txt" BuildAction="Content"/>

-				<File RelPath="HtmlAgilityPack\tools.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="HtmlAgilityPack\.svn\empty-file" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\entries" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\format" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\README.txt" BuildAction="Content"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\AssemblyInfo.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\crc32.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\Header.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\HtmlAttribute.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\HtmlDocument.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\HtmlEntity.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\HtmlNode.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\HtmlNodeNavigator.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\HtmlWeb.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\MixedCodeDocument.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\ParseReader.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\readme.txt.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\prop-base\tools.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\AssemblyInfo.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\crc32.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\Header.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\HtmlAttribute.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\HtmlDocument.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\HtmlEntity.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\HtmlNode.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\HtmlNodeNavigator.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\HtmlWeb.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\MixedCodeDocument.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\ParseReader.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\readme.txt.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\props\tools.cs.svn-work" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\AssemblyInfo.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\crc32.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\Header.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\HtmlAttribute.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\HtmlDocument.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\HtmlEntity.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\HtmlNode.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\HtmlNodeNavigator.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\HtmlWeb.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\MixedCodeDocument.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\ParseReader.cs.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\readme.txt.svn-base" BuildAction="None"/>

-				<File RelPath="HtmlAgilityPack\.svn\text-base\tools.cs.svn-base" BuildAction="None"/>

-				<Folder RelPath="HtmlAgilityPack\.svn\tmp\prop-base\"/>

-				<Folder RelPath="HtmlAgilityPack\.svn\tmp\props\"/>

-				<Folder RelPath="HtmlAgilityPack\.svn\tmp\text-base\"/>

-				<Folder RelPath="HtmlAgilityPack\.svn\tmp\wcprops\"/>

-				<Folder RelPath="HtmlAgilityPack\.svn\wcprops\"/>

-			</Include>

-		</Files>

-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" REFS.JarPath.system.xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.nunit.core="..\..\..\..\..\nunit20\core\bin\nunit.core.jar" REFS.JarPath.nunit.framework="..\..\..\..\..\nunit20\framework\bin\nunit.framework.jar" REFS.JarPath.nunit.util="..\..\..\..\..\nunit20\util\bin\nunit.util.jar"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="-e http://localhost:80/System_Web_dll -t http://localhost:8080/System_Web_dll -o 123" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="-t http://localhost:8080/System_Web_dll -o C:\dev\vladimirk_view2\studio\GH\DevQA\utils\SystemWebTests\bin\dotnet -x" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="-e http://localhost:80/System_Web_dll -t http://localhost:8080/System_Web_dll -o 123" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java_NUnit"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/TestsCatalog.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/TestsCatalog.cs
deleted file mode 100644
index c6f58b02e31..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/TestsCatalog.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.Xml;
-
-namespace MonoTests.stand_alone.WebHarness
-{
-	public class TestInfo
-	{
-		private string _url;
-		private string _name;
-
-		public string Url
-		{
-			get {return _url;}
-			set {_url = value;}
-		}
-		public string Name
-		{
-			get {return _name;}
-			set {_name = value;}
-		}
-	}
-
-	public class TestsCatalog : IEnumerator, IEnumerable
-	{
-		private XmlDocument _testsListXml = null;
-		private IEnumerator _tests = null;
-
-		public TestsCatalog() : this("")
-		{
-		}
-		public TestsCatalog(string catalogName) : this(catalogName, false)
-		{
-		}
-
-		public TestsCatalog(string catalogName, bool collectExluded)
-		{
-			if (catalogName == "")
-			{
-				catalogName = "test_catalog.xml";
-			}
-
-			try
-			{
-				_testsListXml = new XmlDocument();
-				_testsListXml.Load(catalogName);
-			}
-			catch(Exception e)
-			{
-				throw e;
-			}
-
-			try
-			{
-				if (collectExluded)
-					_tests = _testsListXml.SelectNodes("/TestCases/TestCase").GetEnumerator();
-				else
-					_tests = _testsListXml.SelectNodes("/TestCases/TestCase[@Exclude='N']").GetEnumerator();
-			}
-			catch(Exception e)
-			{
-				throw e;
-			}
-		}
-
-		public IEnumerator GetEnumerator()
-		{
-			return this;
-		}
-
-		public object Current
-		{
-			get {return GetCurrentTestInfo();}
-		}
-
-		public bool MoveNext()
-		{
-			return _tests.MoveNext();
-		}
-
-		public void Reset()
-		{
-			_tests.Reset();
-		}
-
-		private TestInfo GetCurrentTestInfo()
-		{
-			XmlNode n = (XmlNode)_tests.Current;
-			TestInfo ti = new TestInfo();
-			ti.Name = n.Attributes["name"].Value;
-			ti.Url = n.Attributes["url"].Value;
-			return ti;
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/WebTest.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/WebTest.cs
deleted file mode 100644
index 79e72216a6c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/WebTest.cs
+++ /dev/null
@@ -1,378 +0,0 @@
-//
-// Authors:
-//   Rafael Mizrahi   <rafim@mainsoft.com>
-//   Erez Lotan       <erezl@mainsoft.com>
-//   Vladimir Krasnov <vladimirk@mainsoft.com>
-//   
-// 
-// Copyright (c) 2002-2005 Mainsoft Corporation.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.IO;
-using System.Xml;
-using System.Net;
-using System.Text;
-using System.Collections;
-
-namespace MonoTests.stand_alone.WebHarness
-{
-	public abstract class XmlComparableTest
-	{
-		public abstract XmlDocument GetTestXml(TestInfo testInfo);
-		public abstract bool XmlCompare(XmlDocument d1, XmlDocument d2, bool ignoreAlmost);
-	}
-
-	public class WebTest : XmlComparableTest
-	{
-		private string _testsBaseUrl = "";
-		private string _ignoreListFile = "";
-		private XmlDocument _xmlIgnoreList = null;
-		private string _compareStatus = "";
-
-		public WebTest()
-		{
-		}
-
-		public string TestsBaseUrl
-		{
-			get {return _testsBaseUrl;}
-			set {_testsBaseUrl = value;}
-		}
-		public string IgnoreListFile
-		{
-			get {return _ignoreListFile;}
-			set {_ignoreListFile = value;}
-		}
-		public string CompareStatus
-		{
-			get {return _compareStatus.ToString();}
-		}
-
-		public override XmlDocument GetTestXml(TestInfo testInfo)
-		{
-			return BuildXml( GetSubTests( GetUrl(testInfo.Url) ), testInfo );
-		}
-
-		public override bool XmlCompare(XmlDocument d1, XmlDocument d2, bool ignoreAlmost)
-		{
-			XmlComparer comparer = new XmlComparer();
-			if (ignoreAlmost == false)
-			{
-				DoAlmost(d1);
-				DoAlmost(d2);
-			}
-			bool c = comparer.AreEqual(d1, d2);
-			_compareStatus = comparer.LastCompare;
-			return c;
-		}
-
-		//============================================================================
-		//
-
-		private string GetUrl(string url)
-		{
-			try
-			{
-				HttpWebRequest request = (HttpWebRequest)WebRequest.Create(_testsBaseUrl + url);
-				request.UserAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)";
-				request.Accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, application/x-shockwave-flash, */*";
-
-				HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-
-				Stream responseStream = response.GetResponseStream();
-				StreamReader sr = new StreamReader(responseStream);
-
-				string s = sr.ReadToEnd();
-				sr.Close();
-
-				return s;
-			}
-			catch(Exception e)
-			{
-				Console.WriteLine("Cannot retrieve document from url " + _testsBaseUrl + url);
-				Console.WriteLine(e.Message);
-			}
-
-			return "";
-		}
-
-		private ArrayList GetSubTests(string s)
-		{
-			ArrayList subTestList = new ArrayList();
-			int startIndex = 0;
-			string subTest = FindSubTest(s, startIndex);
-			
-			while (subTest != "")
-			{
-				if (subTest.ToLower().IndexOf("ghtsubtest") != -1)
-					subTestList.Add(subTest);
-				subTest = FindSubTest(s, s.IndexOf(subTest) + subTest.Length);
-			}
-
-			return subTestList;
-		}
-		#region "Sub Test extraction routines"
-		private string FindSubTest(string s, int startIndex)
-		{
-			int tagBeginCount = 0;
-			int stringPosition = startIndex;
-			int tagPosition = 0;
-
-			tagPosition = GetNextDivPosition(s, stringPosition);
-			if (tagPosition == -1) return "";
-
-			if (isBeginTag(s, tagPosition))
-				tagBeginCount++;
-			else
-				return "";
-
-			startIndex = tagPosition;
-
-			while (tagBeginCount > 0)
-			{
-				stringPosition = tagPosition + 1;
-				tagPosition = GetNextDivPosition(s, stringPosition);
-				if (tagPosition == -1) return "";
-
-				if (isBeginTag(s, tagPosition))
-					tagBeginCount++;
-				else
-					tagBeginCount--;
-			}
-
-			return s.Substring(startIndex, tagPosition - startIndex + 6);
-		}
-
-		private int GetNextDivPosition(string s, int startIndex)
-		{
-			int tagBeginPos = GetBeginDivPosition(s, startIndex);
-			int tagEndPos = GetEndDivPosition(s, startIndex);
-
-			if ((tagBeginPos == -1) && (tagEndPos == -1)) return -1;
-			if ((tagBeginPos > 0) && (tagEndPos > 0))
-			{
-				if (tagBeginPos < tagEndPos)
-					return tagBeginPos;
-				else
-					return tagEndPos;
-			}
-			else
-			{
-				if (tagBeginPos > tagEndPos)
-					return tagBeginPos;
-				else
-					return tagEndPos;
-			}
-		}
-
-		private int GetBeginDivPosition(string s, int startIndex)
-		{
-			return s.IndexOf("<div id", startIndex);
-		}
-
-		private int GetEndDivPosition(string s, int startIndex)
-		{
-			return s.IndexOf("</div", startIndex);
-		}
-
-		private bool isBeginTag(string tag, int pos)
-		{
-			return tag.Substring(pos).StartsWith("<div");
-		}
-		private bool isEndTag(string tag, int pos)
-		{
-			return tag.Substring(pos).StartsWith("</div");
-		}
-		#endregion
-
-		private XmlDocument BuildXml(ArrayList subTests, TestInfo ti)
-		{
-			StringBuilder xmltext = new StringBuilder();
-			xmltext.Append("<TestResults name=\"" + ti.Name + "\">");
-			foreach(string st in subTests)
-			{
-				xmltext.Append(st);
-			}
-			xmltext.Append("</TestResults>");
-
-			XmlDocument r = new XmlDocument();
-			r.LoadXml(HtmltoXml(xmltext.ToString()));
-			return r;
-		}
-
-		private string HtmltoXml(string html)
-		{
-			HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
-			doc.LoadHtml(html);
-
-			StringBuilder fixedxml = new StringBuilder();
-			StringWriter sw = new StringWriter(fixedxml);
-
-			try
-			{
-				StringBuilder tempxml = new StringBuilder();
-				StringWriter tsw = new StringWriter(tempxml);
-
-				doc.OptionOutputAsXml = true;
-				doc.Save(tsw);
-
-				// fix style attribute
-				// the reason is that style attribute name-value pairs come in different order
-				// in .NET and GH
-				// Here I will sort the values of style attribute
-				XmlDocument tempDoc = new XmlDocument();
-				tempDoc.LoadXml(tempxml.ToString());
-
-				XmlNodeList allNodes = tempDoc.SelectNodes("//*");
-				foreach (XmlNode n in allNodes)
-				{
-					if (n.Attributes["style"] != null)
-					{
-						string att = n.Attributes["style"].Value;
-						string [] style = att.Trim(new char[]{' ', ';'}).Split(';');
-
-						for (int styleIndex=0; styleIndex<style.Length; styleIndex++)
-						{
-							style[styleIndex] = FixStyleNameValue(style[styleIndex]);
-						}
-						Array.Sort(style);
-						n.Attributes["style"].Value = string.Join(";", style);
-					}
-				}
-				tempDoc.Save(sw);
-			}
-			catch (Exception)
-			{
-				Console.WriteLine("Error parsing html response...");
-				Console.WriteLine("Test case aborted");
-				return "<TestCaseAborted></TestCaseAborted>";
-			}
-			return fixedxml.ToString();
-		}
-
-		private string FixStyleNameValue(string nameValue)
-		{
-			string [] nv = nameValue.Split(':');
-			// value may contain spaces in case of
-			// multiple values for one key
-			string [] nvalue = nv[1].Trim().Split(' ');
-			Array.Sort(nvalue);
-			nv[1] = string.Join(" ", nvalue);
-			return nv[0].Trim().ToLower() + ":" + nv[1].Trim().ToLower();
-		}
-
-		private void DoAlmost(XmlDocument xmlDocument)
-		{
-			XmlNode XmlIgnoreNode;
-			IEnumerator xmlIgnoreEnum;
-
-			if (_xmlIgnoreList == null)
-			{
-				_xmlIgnoreList = new XmlDocument();
-				_xmlIgnoreList.Load(_ignoreListFile);
-			}
-
-			// Remove by Id or Name
-			// search by tag and if id or name match, remove all attributes
-			// must be the first almost since the following almost delete the id and name
-			xmlIgnoreEnum = _xmlIgnoreList.SelectSingleNode("Almost/RemoveById").GetEnumerator();
-			while (xmlIgnoreEnum.MoveNext())
-			{
-				XmlNodeList DocNodeList;
-				XmlIgnoreNode = (XmlNode)xmlIgnoreEnum.Current;
-				DocNodeList = xmlDocument.GetElementsByTagName("*");
-				if (DocNodeList != null)
-				{
-					foreach (XmlElement tmpXmlElement in DocNodeList)
-					{
-						foreach (XmlAttribute tmpIgnoreAttr in XmlIgnoreNode.Attributes)
-						{
-							if (tmpXmlElement.Name.ToLower() == XmlIgnoreNode.Name.ToLower()) 
-							{
-								if (tmpXmlElement.Attributes[tmpIgnoreAttr.Name] != null )
-								{
-									if (tmpXmlElement.Attributes[tmpIgnoreAttr.Name].Value.ToLower() == tmpIgnoreAttr.Value.ToLower())
-									{
-										tmpXmlElement.RemoveAllAttributes();
-									}
-								}
-							}
-						}
-					}
-				}	
-			}
-			// remove ignored attributes
-			// search for tag and remove it's attributes
-			xmlIgnoreEnum = _xmlIgnoreList.SelectSingleNode("Almost/IgnoreList").GetEnumerator(); //FirstChild.GetEnumerator
-			while (xmlIgnoreEnum.MoveNext())
-			{
-				XmlIgnoreNode = (XmlNode)xmlIgnoreEnum.Current;
-				XmlNodeList DocNodeList;
-				//clean specific element
-
-				DocNodeList = xmlDocument.GetElementsByTagName("*");
-				if (DocNodeList != null)
-				{
-					foreach (XmlElement tmpXmlElement in DocNodeList)
-					{
-						if (tmpXmlElement.Name.ToLower() == XmlIgnoreNode.Name.ToLower()) 
-						{
-							foreach (XmlAttribute tmpIgnoreAttr in XmlIgnoreNode.Attributes)
-							{
-								tmpXmlElement.RemoveAttribute(tmpIgnoreAttr.Name);
-							}
-						}
-					}
-				}
-			}
-
-			// clean javascript attribute value
-			xmlIgnoreEnum = _xmlIgnoreList.SelectSingleNode("Almost/CleanJavaScriptValueList").GetEnumerator(); //FirstChild.GetEnumerator
-			while (xmlIgnoreEnum.MoveNext())
-			{
-				XmlIgnoreNode = (XmlNode)xmlIgnoreEnum.Current;
-				XmlNodeList DocNodeList;
-				//clean Java Script attribute values
-				DocNodeList = xmlDocument.GetElementsByTagName("*");
-				if (DocNodeList != null)
-				{
-					foreach (XmlElement tmpXmlElement in DocNodeList)
-					{
-						if (tmpXmlElement.Name.ToLower() == XmlIgnoreNode.Name.ToLower()) 
-						{
-							foreach (XmlAttribute tmpIgnoreAttr in XmlIgnoreNode.Attributes)
-							{
-								if (tmpXmlElement.Attributes[tmpIgnoreAttr.Name] != null )
-								{
-									if (tmpXmlElement.Attributes[tmpIgnoreAttr.Name].Value.ToLower().IndexOf("javascript") >= 0 )
-									{
-										tmpXmlElement.SetAttribute(tmpIgnoreAttr.Name, "");
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/XmlComparer.cs b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/XmlComparer.cs
deleted file mode 100644
index d4132ae2564..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/XmlComparer.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Xml;
-
-namespace MonoTests.stand_alone.WebHarness
-{
-	/// <summary>
-	/// Summary description for XmlComparer.
-	/// </summary>
-	public class XmlComparer
-	{
-		[Flags]
-		public enum Flags {
-			IgnoreNone=0,
-			IgnoreAttribOrder=1,
-		}
-		Flags flags;
-		bool ignoreWS = true;
-		string lastCompare = "";
-		
-		public XmlComparer (Flags flags, bool ignoreWS) 
-		{
-			this.flags = flags;
-			this.ignoreWS = ignoreWS;
-		}
-
-		public XmlComparer (Flags flags) : this (flags, true)
-		{
-		}
-
-		public XmlComparer () : this (Flags.IgnoreAttribOrder)
-		{
-		}
-
-		public bool AreEqualAttribs (XmlAttributeCollection attrs1, XmlAttributeCollection attrs2)
-		{
-			if (attrs1.Count != attrs2.Count)
-				return false;
-			for (int i=0; i<attrs1.Count; i++) {
-				if ((flags & Flags.IgnoreAttribOrder) != 0) {
-					string ln = attrs1[i].LocalName;
-					string ns = attrs1[i].NamespaceURI;
-					string val = attrs1[i].Value;
-					XmlAttribute atr2 = attrs2[ln, ns];
-					if (atr2 == null || atr2.Value.Trim().ToLower() != val.Trim().ToLower())
-						return false;
-				} else {
-					if (attrs1 [i].LocalName != attrs2 [i].LocalName)
-						return false;
-					if (attrs1 [i].NamespaceURI != attrs2 [i].NamespaceURI)
-						return false;
-					if (attrs1 [i].Value.Trim().ToLower() != attrs2 [i].Value.Trim().ToLower())
-						return false;
-				}
-			}
-			return true;
-		}
-
-		public bool AreEqualNodeList (XmlNodeList lst1, XmlNodeList lst2)
-		{
-			if (lst1.Count != lst2.Count)
-				return false;
-			for (int i=0; i<lst1.Count; i++) {
-				if (!AreEqual (lst1[i], lst2[i]))
-					return false;
-			}
-			return true;
-		}
-
-		public bool AreEqual (XmlNode node1, XmlNode node2)
-		{
-			lastCompare = node1.OuterXml + "\n" + node2.OuterXml;
-			// skip XmlDeclaration
-			if ((node1.NodeType == XmlNodeType.XmlDeclaration) &&
-				(node2.NodeType == XmlNodeType.XmlDeclaration))
-				return true;
-			if (node1.NodeType != node2.NodeType)
-				return false;
-			if (node1.LocalName != node2.LocalName)
-				return false;
-			if (node1.NamespaceURI != node2.NamespaceURI)
-				return false;
-			if (node1.Attributes != null && node2.Attributes != null) {
-				if (!AreEqualAttribs (node1.Attributes, node2.Attributes))
-					return false;
-			}
-			else //one of nodes has no attrs
-				if (node1.Attributes != null || node2.Attributes != null)
-					return false;//and another has some
-			if (!node1.HasChildNodes && !node2.HasChildNodes) {
-				string val1 = node1.Value;
-				string val2 = node2.Value;
-				if (ignoreWS) //ignore white spaces
-				{ 
-					if (val1 != null)
-						val1 = val1.Trim().Replace("\r\n", "\n");
-					if (val2 != null)
-						val2 = val2.Trim().Replace("\r\n", "\n");
-				}
-				return val1 == val2;
-			}
-			else {//one of nodes has some children
-				if (!node1.HasChildNodes || !node2.HasChildNodes)
-					return false;//and another has none
-				return AreEqualNodeList (node1.ChildNodes, node2.ChildNodes);
-			}
-		}
-
-		public string LastCompare 
-		{
-			get {return lastCompare;}
-		}
-	}
-}
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/almost_config.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/almost_config.xml
deleted file mode 100644
index 51470aaae60..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/almost_config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Almost>
-	<IgnoreList>
-		<div id="" visible="" name=""/>
-		<span id="" visible="" name=""/>
-		<input id="" visible="" name="" __EVENTARGUMENT="" __EVENTTARGET="" __VIEWSTATE="" causesvalidation=""/>
-		<table id="" visible="" name=""/>
-		<td id="" visible="" name=""/>
-		<th id="" visible="" name=""/>
-		<tr id="" visible="" name=""/>
-		<table id="" visible="" name=""/>
-		<img id="" visible="" name=""/>
-		<a id="" visible="" name=""/>
-		<select id="" visible="" name=""/>
-		<textarea id="" visible="" name=""/>
-		<button id="" visible="" name="" causesvalidation=""/>
-		<p visible=""/>
-		<form visible=""/>
-		<label for=""/>
-	</IgnoreList>
-
-	<!--delete Java Script attribute value-->
-	<CleanJavaScriptValueList>
-		<a href=""/>
-		<a onclick=""/>
-	</CleanJavaScriptValueList>
-
-	<!--remove tags by attribute Id or name-->
-	<RemoveById>
-		<input id="__VIEWSTATE" name="__VIEWSTATE"/>
-	</RemoveById>
-</Almost>
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/make.sh b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/make.sh
deleted file mode 100755
index f50371ebafb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/make.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-MCS_ROOT=/monobuild/mcs
-
-mcs -out:./bin/HtmlAgilityPack.dll -target:library -define:MONO HtmlAgilityPack/*.cs 
-mcs -out:./bin/MainsoftWebTest.exe -r:./bin/HtmlAgilityPack.dll *.cs 
-mcs -out:./bin/MainsoftWebTest.dll -target:library -define:MONO -define:NUNIT-r:$MCS_ROOT/class/lib/default/nunit.framework.dll -r:$MCS_ROOT/class/lib/default/nunit.core.dll -r:./bin/HtmlAgilityPack.dll *.cs
-cp ./almost_config.xml ./bin/ 
-cp ./test_catalog.xml ./bin/ 
-cp ./App.config ./bin/MainsoftWebTest.exe.config
-cp ./App.config ./bin/MainsoftWebTest.dll.config
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/readme.txt b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/readme.txt
deleted file mode 100644
index d504556c600..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/readme.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-System.Web test harness
-============================
-
-This harness is a part of System.Web tests set. It's target to run web tests deployed in application 
-server and compare with predefined results. (Web tests are web application)
-
-Harness usage:
-
-SystemWebTest.exe [-e | -t <web tests base url>] [-c <tests catalog>] [-i <ignore list>] [-o <output dir>]
-
--e		This will collect expected results for future test runs. Expected results should be
-		collected from the same tests web application deployed in IIS on windows system.
-		Parameter baseUrl must be provided.
-
--t		This will run all tests. Expected results must be exist at this stage.
-
--o		Specifies folder where expected results will be placed during collecting or where from 
-		expected results will be taken during tests run. The default vaule is current folder.
-		
--i		Specifies xml file with ignore filters list. Default value is almost_config.xml
-
--c		Specifies xml file with test cases catalog. Default value is test_catalog.xml
-
--na		Run without almost mechanizm.
-
--x		Run exluded tests. These tests have EXCLUDE="Y" attribute in test_catalog.xml file.
-
-Examples: 
-
-SystemWebTest.exe -t http://localhost/MainsoftWebApp
-This will collect results from local web serer and store it in current folder.
-
-SystemWebTest.exe -e http://iissite/System_Web_dll -t http://localhost:8080/MainsoftWebApp -o test123
-This will collect results from iissite and store it in folder test123 then run tests on local web server.
-
-Running with NUnit:
-
-Build this harness with -define:NUNIT compilation constant. 
-Run nunit-console.exe with /fixture:MonoTests.stand_alone.WebHarness.Harness parameter.
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_BeginInvoke_OEAOAO.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_BeginInvoke_OEAOAO.aspx.xml
deleted file mode 100644
index 4effc5eef77..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_BeginInvoke_OEAOAO.aspx.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_Invoke_OEAO.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_Invoke_OEAO.aspx.xml
deleted file mode 100644
index c324c63b63e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_Invoke_OEAO.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_ctor_OI.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_ctor_OI.aspx.xml
deleted file mode 100644
index c324c63b63e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_BeginEventHandler_BeginEventHandler_ctor_OI.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Add_SO.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Add_SO.aspx.xml
deleted file mode 100644
index d6a007b527b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Add_SO.aspx.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Application("var1") = variable1</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-    <span>
-      <br />Application("var4") = </span>
-    <span>
-      <br />Application("") = variable5</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-    <span>
-      <br />Application("var4") = </span>
-    <span>
-      <br />Application("") = variable5</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-    <span>
-      <br />Application("var4") = </span>
-    <span>
-      <br />Application("") = variable5</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-    <span>
-      <br />Application("int1") = 1</span>
-    <span>
-      <br />Application("int2") = -1</span>
-    <span>
-      <br />Application("nothing1") = Nothing</span>
-  </div>
-  <div id="GHTSubTest6" testname="GHTSubTest6">
-    <span>
-      <br />System.DateTime</span>
-  </div>
-  <div id="GHTSubTest7" testname="GHTSubTest7">
-    <span>
-      <br />GHTTests.System_Web_dll.System_Web.HttpApplicationState_Add_SO+CustomClass</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_AllKeys.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_AllKeys.aspx.xml
deleted file mode 100644
index c1b5976d702..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_AllKeys.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />("var1") = variable1</span>
-    <span>
-      <br />("var2") = variable2</span>
-    <span>
-      <br />("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />("var1") = variable1</span>
-    <span>
-      <br />("var2") = variable2</span>
-    <span>
-      <br />("var3") = variable3</span>
-    <span>
-      <br />("var4") = </span>
-    <span>
-      <br />("") = variable5</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Clear_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Clear_.aspx.xml
deleted file mode 100644
index 207e6b130f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Clear_.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Contents.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Contents.aspx.xml
deleted file mode 100644
index ea92c28ba05..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Contents.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />System.Web.HttpApplicationState</span>
-    <span>
-      <br />Objects are equal</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Count.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Count.aspx.xml
deleted file mode 100644
index 2e40d97c877..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Count.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />3</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />7</span>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest4">
-    <span>
-      <br />10</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_GetKey_I.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_GetKey_I.aspx.xml
deleted file mode 100644
index 9f82bfa35d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_GetKey_I.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />var1</span>
-    <span>
-      <br />var2</span>
-    <span>
-      <br />var3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Item.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Item.aspx.xml
deleted file mode 100644
index f890a130925..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Item.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Application.Item(0) = variable1</span>
-    <span>
-      <br />Application.Item(1) = variable2</span>
-    <span>
-      <br />Application.Item(2) = variable3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Item_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Item_S.aspx.xml
deleted file mode 100644
index 29a46c8e134..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Item_S.aspx.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var2") = variable2</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-    <span>
-      <br />Application("") = </span>
-    <span>
-      <br />Application("Nothing") = null</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Application("var1_var1")  = null</span>
-    <span>
-      <br />Application("var2_var2")  = null</span>
-    <span>
-      <br />Application("var3_var3")  = null</span>
-    <span>
-      <br />Application("_")  = null</span>
-    <span>
-      <br />Application("Nothing_Nothing")  = null</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_RemoveAll_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_RemoveAll_.aspx.xml
deleted file mode 100644
index 13c6f723558..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_RemoveAll_.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_RemoveAt_I.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_RemoveAt_I.aspx.xml
deleted file mode 100644
index 306bc4c4d85..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_RemoveAt_I.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Application.Item(0) = variable1</span>
-    <span>
-      <br />Application.Item(1) = variable2</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Remove_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Remove_S.aspx.xml
deleted file mode 100644
index 002081bb7c5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpApplicationState_HttpApplicationState_Remove_S.aspx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Application("var1") = variable1</span>
-    <span>
-      <br />Application("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Application.Item(0) = variable1</span>
-    <span>
-      <br />Application.Item(1) = variable3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpCacheRevalidation_HttpCacheRevalidation_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpCacheRevalidation_HttpCacheRevalidation_Enum.aspx.xml
deleted file mode 100644
index 00a9f8c9cdd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpCacheRevalidation_HttpCacheRevalidation_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.HttpCacheRevalidation">
-    <span>
-      <br />AllCaches; ProxyCaches; None; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpCacheability_HttpCacheability_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpCacheability_HttpCacheability_Enum.aspx.xml
deleted file mode 100644
index 00a9f8c9cdd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpCacheability_HttpCacheability_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.HttpCacheRevalidation">
-    <span>
-      <br />AllCaches; ProxyCaches; None; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_AcceptTypes.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_AcceptTypes.aspx.xml
deleted file mode 100644
index b9bb78a6fc1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_AcceptTypes.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AcceptedTypes1">
-    <span>
-      <br />Accept Type 0: image/gif<br /></span>
-    <span>
-      <br />Accept Type 1: image/x-xbitmap<br /></span>
-    <span>
-      <br />Accept Type 2: image/jpeg<br /></span>
-    <span>
-      <br />Accept Type 3: image/pjpeg<br /></span>
-    <span>
-      <br />Accept Type 4: application/vnd.ms-excel<br /></span>
-    <span>
-      <br />Accept Type 5: application/vnd.ms-powerpoint<br /></span>
-    <span>
-      <br />Accept Type 6: application/msword<br /></span>
-    <span>
-      <br />Accept Type 7: application/x-shockwave-flash<br /></span>
-    <span>
-      <br />Accept Type 8: */*<br /></span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ApplicationPath.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ApplicationPath.aspx.xml
deleted file mode 100644
index e019615fad0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ApplicationPath.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AppPath1">
-    <span>
-      <br />/MainsoftWebApp</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Browser.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Browser.aspx.xml
deleted file mode 100644
index d9b44c64c7c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Browser.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Request.Browser1">
-    <span>
-      <br />Success</span>
-  </div>
-  <div id="GHTSubTest2" testname="Request.Browser2">
-    <span>
-      <br />success</span>
-  </div>
-  <div id="GHTSubTest3" testname="Request.Browser3">
-    <span>
-      <br />IE</span>
-  </div>
-  <div id="GHTSubTest4" testname="Request.Browser4">
-    <span>
-      <br />6.0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ClientCertificate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ClientCertificate.aspx.xml
deleted file mode 100644
index c0e908535b9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ClientCertificate.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="ClinetCertficate1">
-    <span>
-      <br />Success</span>
-  </div>
-  <div id="GHTSubTest2" testname="ClinetCertficate2">
-    <span>
-      <br />success</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ContentEncoding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ContentEncoding.aspx.xml
deleted file mode 100644
index dab4e2b2500..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ContentEncoding.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Request.ContentEncoding1">
-    <span>
-      <br />Success</span>
-  </div>
-  <div id="GHTSubTest2" testname="Request.ContentEncoding2">
-    <span>
-      <br />success</span>
-  </div>
-  <div id="GHTSubTest3" testname="Request.ContentEncoding3">
-    <span>
-      <br />Unicode (UTF-8)</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Cookies.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Cookies.aspx.xml
deleted file mode 100644
index c707f0fdf14..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Cookies.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Request.Cookies1">
-    <span>
-      <br />Success</span>
-  </div>
-  <div id="GHTSubTest2" testname="Request.Cookies2">
-    <span>
-      <br />success</span>
-  </div>
-  <div id="GHTSubTest3" testname="Request.Cookies3">
-    <span>
-      <br />Unxpected InvalidCastException exception was caught-Specified cast is not valid.</span>
-  </div>
-  <div id="GHTSubTest4" testname="Request.Cookies4">
-    <span>
-      <br />MyCookie - MyCookieValue</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_CurrentExecutionFilePath.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_CurrentExecutionFilePath.aspx.xml
deleted file mode 100644
index 4c70edbe684..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_CurrentExecutionFilePath.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Request.CurrentExecutionFilePath1">
-    <span>
-      <br />/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx</span>
-  </div>
-  <div id="GHTSubTest2" testname="Request.FilePath1">
-    <span>
-      <br />/MainsoftWebApp/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Headers.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Headers.aspx.xml
deleted file mode 100644
index 31d279691a7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_Headers.aspx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Request.Headers1">
-    <span>
-      <br />Success</span>
-  </div>
-  <div id="GHTSubTest2" testname="Request.Headers2">
-    <span>
-      <br />success</span>
-  </div>
-  <div id="GHTSubTest3" testname="Request.Headers3">
-    <span>
-      <br />Accept</span>
-    <span>
-      <br />Host</span>
-    <span>
-      <br />User-Agent</span>
-  </div>
-  <div id="GHTSubTest4" testname="Request.Headers4">
-    <span>
-      <br />Accept</span>
-    <span>
-      <br />Host</span>
-    <span>
-      <br />User-Agent</span>
-  </div>
-  <div id="GHTSubTest5" testname="Request.Headers5">
-    <span>
-      <br />Accept=image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, application/x-shockwave-flash, */*<br /></span>
-    <span>
-      <br />User-Agent=Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)<br /></span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_MapPath_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_MapPath_S.aspx.xml
deleted file mode 100644
index e58d177f058..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_MapPath_S.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Request.MapPath1">
-    <span>
-      <br />c:\inetpub\wwwroot\</span>
-  </div>
-  <div id="GHTSubTest2" testname="Request.MapPath2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="Request.MapPath3">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest4" testname="Request.MapPath4">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest5" testname="Request.MapPath5">
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ServerVariables.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ServerVariables.aspx.xml
deleted file mode 100644
index 51548e8a913..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRequest_HttpRequest_ServerVariables.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="All keys:">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRuntime_HttpRuntime_AppDomainAppPath.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRuntime_HttpRuntime_AppDomainAppPath.aspx.xml
deleted file mode 100644
index 8c1ecb57145..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRuntime_HttpRuntime_AppDomainAppPath.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AppDomainAppPath">
-    <span>
-      <br />c:/Visual MainWin Projects/MainsoftWebApp/</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRuntime_HttpRuntime_AppDomainAppPath_MapPath.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRuntime_HttpRuntime_AppDomainAppPath_MapPath.aspx.xml
deleted file mode 100644
index f2e5b1fa3fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpRuntime_HttpRuntime_AppDomainAppPath_MapPath.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AppDomainAppPath">
-    <span>
-      <br />c:/Visual MainWin Projects/MainsoftWebApp/</span>
-    <span>
-      <br />c:/Visual MainWin Projects/MainsoftWebApp/System_Web/HttpRuntime</span>
-    <span>
-      <br />Not Identical</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpValidationStatus_HttpValidationStatus_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpValidationStatus_HttpValidationStatus_Enum.aspx.xml
deleted file mode 100644
index 7c2b0cb0276..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_HttpValidationStatus_HttpValidationStatus_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.HttpValidationStatus">
-    <span>
-      <br />Invalid; IgnoreThisRequest; Valid; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_ProcessShutdownReason_ProcessShutdownReason_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_ProcessShutdownReason_ProcessShutdownReason_Enum.aspx.xml
deleted file mode 100644
index 56c0bc1846d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_ProcessShutdownReason_ProcessShutdownReason_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.ProcessShutdownReason">
-    <span>
-      <br />None; Unexpected; RequestsLimit; RequestQueueLimit; Timeout; IdleTimeout; MemoryLimitExceeded; PingFailed; DeadlockSuspected; 0; 1; 2; 3; 4; 5; 6; 7; 8; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_ProcessStatus_ProcessStatus_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_ProcessStatus_ProcessStatus_Enum.aspx.xml
deleted file mode 100644
index 8648ecacb7d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_ProcessStatus_ProcessStatus_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.ProcessStatus">
-    <span>
-      <br />Alive; ShuttingDown; ShutDown; Terminated; 1; 2; 3; 4; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Add_Nothing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Add_Nothing.aspx.xml
deleted file mode 100644
index 7afe233d8cc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Add_Nothing.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session("s_nothing") is really Nothing</span>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Session("name") is really Nothing</span>
-    <span>
-      <br />1</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest1">
-    <span>
-      <br />Session(0) is really Nothing</span>
-    <span>
-      <br />1</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Add_SO.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Add_SO.aspx.xml
deleted file mode 100644
index 6e6f3141372..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Add_SO.aspx.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session("var1") = variable1</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Session("var1") = variable1</span>
-    <span>
-      <br />Session("var2") = variable2</span>
-    <span>
-      <br />Session("var3") = variable3</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Session("var1") = variable1</span>
-    <span>
-      <br />Session("var2") = variable2</span>
-    <span>
-      <br />Session("var3") = variable3</span>
-    <span>
-      <br />Session("var4") = </span>
-    <span>
-      <br />Session("") = variable5</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Session("var1") = variable1</span>
-    <span>
-      <br />Session("var2") = variable2</span>
-    <span>
-      <br />Session("var3") = variable3</span>
-    <span>
-      <br />Session("var4") = </span>
-    <span>
-      <br />Session("") = variable5</span>
-    <span>
-      <br />Session("int1") = 1</span>
-    <span>
-      <br />Session("int2") = -1</span>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <span>
-      <br />System.DateTime</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Clear_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Clear_.aspx.xml
deleted file mode 100644
index d711983331f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Clear_.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />3</span>
-    <span>
-      <br />Session("v1") = v1</span>
-    <span>
-      <br />Session("v2") = v2</span>
-    <span>
-      <br />Session("v3") = v3</span>
-    <span>
-      <br />0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_CodePage.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_CodePage.aspx.xml
deleted file mode 100644
index c0a3dffcdde..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_CodePage.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />65001</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest4">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Contents.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Contents.aspx.xml
deleted file mode 100644
index 4479575a97a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Contents.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />System.Web.SessionState.HttpSessionState</span>
-    <span>
-      <br />Objects are equal</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_CopyTo_AI.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_CopyTo_AI.aspx.xml
deleted file mode 100644
index ad3dc01cd6c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_CopyTo_AI.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />v1</span>
-    <span>
-      <br />v2</span>
-    <span>
-      <br />v3</span>
-    <span>
-      <br />v4</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Count.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Count.aspx.xml
deleted file mode 100644
index 2e40d97c877..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Count.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />3</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />7</span>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest4">
-    <span>
-      <br />10</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_GetEnumerator_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_GetEnumerator_.aspx.xml
deleted file mode 100644
index d2e8214adee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_GetEnumerator_.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session("v1") = value1</span>
-    <span>
-      <br />Session("v2") = value2</span>
-    <span>
-      <br />Session("v3") = value3</span>
-    <span>
-      <br />Session("v4") = value4</span>
-    <span>
-      <br />Session("v5") = value5</span>
-    <span>
-      <br />Session("v6") = value6</span>
-    <span>
-      <br />Session("v7") = value7</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsCookieless.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsCookieless.aspx.xml
deleted file mode 100644
index 7fa939086f5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsCookieless.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsReadOnly.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsReadOnly.aspx.xml
deleted file mode 100644
index 8e6cd94e1fa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsReadOnly.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session.IsReadOnly = False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsReadOnly2.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsReadOnly2.aspx.xml
deleted file mode 100644
index c202be5ac5a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_IsReadOnly2.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session.IsReadOnly = True</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Session("v_ro1") = Test String1</span>
-    <span>
-      <br />Session("v_ro2") = Test String3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item.aspx.xml
deleted file mode 100644
index 1e962fa701f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item.aspx.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />var1</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />changed var1</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />1</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item_I.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item_I.aspx.xml
deleted file mode 100644
index 67f385357a7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item_I.aspx.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />variable1</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />variable1</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />changed variable1</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest6" testname="GHTSubTest6">
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Test failed. Expected ArgumentOutOfRangeException exception was not caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item_S.aspx.xml
deleted file mode 100644
index d75db6cc53e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Item_S.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />variable1</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />changed variable1</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Keys.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Keys.aspx.xml
deleted file mode 100644
index 56a8043735b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Keys.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session("v1") = value1</span>
-    <span>
-      <br />Session("v2") = value2</span>
-    <span>
-      <br />Session("v3") = value3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_LCID.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_LCID.aspx.xml
deleted file mode 100644
index 9ec03dca794..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_LCID.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />1033</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_RemoveAll_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_RemoveAll_.aspx.xml
deleted file mode 100644
index 13c6f723558..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_RemoveAll_.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_RemoveAt_I.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_RemoveAt_I.aspx.xml
deleted file mode 100644
index 273afe58132..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_RemoveAt_I.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session("var1") = var1</span>
-    <span>
-      <br />Session("var3") = var3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Session("var1") = var1</span>
-    <span>
-      <br />Session("var3") = var3</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Remove_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Remove_S.aspx.xml
deleted file mode 100644
index 220d7c1b073..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Remove_S.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />Session("var1") = var1</span>
-    <span>
-      <br />Session("var3") = var3</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />Session("var1") = var1</span>
-    <span>
-      <br />Session("var3") = var3</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Session("var1") = var1</span>
-    <span>
-      <br />Session("var2") = var2</span>
-    <span>
-      <br />Session("var3") = var3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_SessionID.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_SessionID.aspx.xml
deleted file mode 100644
index 13c23cb4111..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_SessionID.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />System.String</span>
-    <span>
-      <br />length is &gt; 0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Timeout.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Timeout.aspx.xml
deleted file mode 100644
index f80ef1f9e58..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_SessionState_HttpSessionState_HttpSessionState_Timeout.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest2" testname="GHTSubTest2">
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_TraceMode_TraceMode_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_TraceMode_TraceMode_Enum.aspx.xml
deleted file mode 100644
index e43dd5a5fa8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_TraceMode_TraceMode_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.TraceMode">
-    <span>
-      <br />SortByTime; SortByCategory; Default; 0; 1; 2; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ClientID.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ClientID.aspx.xml
deleted file mode 100644
index a55daa47d0c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ClientID.aspx.xml
+++ /dev/null
@@ -1,534 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.LiteralControl: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.LiteralControl: ClientId - overriden by Id property">
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.Page: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.Page: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.Page: ClientId - overriden by Id property">
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.UserControl: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.UserControl: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.UserControl: ClientId - overriden by Id property">
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlAnchor: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlAnchor: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlAnchor: ClientId - overriden by Id property">
-    <a id="System.Web.UI.HtmlControls.HtmlAnchor_Id">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlButton: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlButton: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlButton: ClientId - overriden by Id property">
-    <button id="System.Web.UI.HtmlControls.HtmlButton_Id">
-    </button>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlGenericControl: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlGenericControl: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlGenericControl: ClientId - overriden by Id property">
-    <span id="System.Web.UI.HtmlControls.HtmlGenericControl_Id">
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlImage: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.HtmlControls.HtmlImage: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.HtmlControls.HtmlImage: ClientId - overriden by Id property">
-    <img id="System.Web.UI.HtmlControls.HtmlImage_Id" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.HtmlControls.HtmlInputButton: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.HtmlControls.HtmlInputButton: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.HtmlControls.HtmlInputButton: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputButton_Id" type="button" name="System.Web.UI.HtmlControls.HtmlInputButton_Id" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputCheckBox_Id" type="checkbox" name="System.Web.UI.HtmlControls.HtmlInputCheckBox_Id" />
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.HtmlControls.HtmlInputFile: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.HtmlControls.HtmlInputFile: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.HtmlControls.HtmlInputFile: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputFile_Id" type="file" name="System.Web.UI.HtmlControls.HtmlInputFile_Id" />
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.HtmlControls.HtmlInputHidden: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.HtmlControls.HtmlInputHidden: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.HtmlControls.HtmlInputHidden: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputHidden_Id" type="hidden" name="System.Web.UI.HtmlControls.HtmlInputHidden_Id" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.HtmlControls.HtmlInputImage: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.HtmlControls.HtmlInputImage: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.HtmlControls.HtmlInputImage: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputImage_Id" type="image" name="System.Web.UI.HtmlControls.HtmlInputImage_Id" />
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputRadioButton_Id" value="System.Web.UI.HtmlControls.HtmlInputRadioButton_Id" name="" type="radio" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.HtmlControls.HtmlInputText: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.HtmlControls.HtmlInputText: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.HtmlControls.HtmlInputText: ClientId - overriden by Id property">
-    <input id="System.Web.UI.HtmlControls.HtmlInputText_Id" type="text" name="System.Web.UI.HtmlControls.HtmlInputText_Id" />
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.HtmlControls.HtmlSelect: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.HtmlControls.HtmlSelect: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.HtmlControls.HtmlSelect: ClientId - overriden by Id property">
-    <select id="System.Web.UI.HtmlControls.HtmlSelect_Id" name="System.Web.UI.HtmlControls.HtmlSelect_Id">
-    </select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.HtmlControls.HtmlTable: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.HtmlControls.HtmlTable: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.HtmlControls.HtmlTable: ClientId - overriden by Id property">
-    <table id="System.Web.UI.HtmlControls.HtmlTable_Id">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.HtmlControls.HtmlTableCell: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.HtmlControls.HtmlTableCell: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.HtmlControls.HtmlTableCell: ClientId - overriden by Id property">
-    <table>
-      <tr>
-        <td id="System.Web.UI.HtmlControls.HtmlTableCell_Id">Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.HtmlControls.HtmlTableRow: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.HtmlControls.HtmlTableRow: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.HtmlControls.HtmlTableRow: ClientId - overriden by Id property">
-    <table>
-      <tr id="System.Web.UI.HtmlControls.HtmlTableRow_Id">
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.HtmlControls.HtmlTextArea: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.HtmlControls.HtmlTextArea: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.HtmlControls.HtmlTextArea: ClientId - overriden by Id property">
-    <textarea id="System.Web.UI.HtmlControls.HtmlTextArea_Id" name="System.Web.UI.HtmlControls.HtmlTextArea_Id">
-    </textarea>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.Button: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.Button: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.Button: ClientId - overriden by Id property">
-    <input value="" type="submit" name="System.Web.UI.WebControls.Button_Id" id="System.Web.UI.WebControls.Button_Id" />
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.CheckBox: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.CheckBox: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.CheckBox: ClientId - overriden by Id property">
-    <input id="System.Web.UI.WebControls.CheckBox_Id" type="checkbox" name="System.Web.UI.WebControls.CheckBox_Id" />
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.HyperLink: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.HyperLink: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.HyperLink: ClientId - overriden by Id property">
-    <a id="System.Web.UI.WebControls.HyperLink_Id">
-    </a>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.Image: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.Image: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.Image: ClientId - overriden by Id property">
-    <img id="System.Web.UI.WebControls.Image_Id" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.ImageButton: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.ImageButton: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.ImageButton: ClientId - overriden by Id property">
-    <input id="System.Web.UI.WebControls.ImageButton_Id" alt="" border="0" type="image" name="System.Web.UI.WebControls.ImageButton_Id" />
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.Label: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.Label: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.Label: ClientId - overriden by Id property">
-    <span id="System.Web.UI.WebControls.Label_Id">
-    </span>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.LinkButton: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.LinkButton: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.LinkButton: ClientId - overriden by Id property">
-    <a href="javascript:__doPostBack('System.Web.UI.WebControls.LinkButton_Id','')" id="System.Web.UI.WebControls.LinkButton_Id">
-    </a>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.Literal: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.Literal: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.Literal: ClientId - overriden by Id property">
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.WebControls.Panel: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.WebControls.Panel: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.WebControls.Panel: ClientId - overriden by Id property">
-    <div id="System.Web.UI.WebControls.Panel_Id">
-    </div>
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.WebControls.PlaceHolder: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.WebControls.PlaceHolder: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.WebControls.PlaceHolder: ClientId - overriden by Id property">
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.WebControls.RadioButton: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.WebControls.RadioButton: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.WebControls.RadioButton: ClientId - overriden by Id property">
-    <input id="System.Web.UI.WebControls.RadioButton_Id" type="radio" name="System.Web.UI.WebControls.RadioButton_Id" value="System.Web.UI.WebControls.RadioButton_Id" />
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.WebControls.TextBox: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.WebControls.TextBox: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.WebControls.TextBox: ClientId - overriden by Id property">
-    <input id="System.Web.UI.WebControls.TextBox_Id" type="text" name="System.Web.UI.WebControls.TextBox_Id" />
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.WebControls.DropDownList: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.WebControls.DropDownList: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.WebControls.DropDownList: ClientId - overriden by Id property">
-    <select id="System.Web.UI.WebControls.DropDownList_Id" name="System.Web.UI.WebControls.DropDownList_Id">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.WebControls.ListBox: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.WebControls.ListBox: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.WebControls.ListBox: ClientId - overriden by Id property">
-    <select id="System.Web.UI.WebControls.ListBox_Id" size="4" name="System.Web.UI.WebControls.ListBox_Id">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.WebControls.RadioButtonList: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.WebControls.RadioButtonList: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.WebControls.RadioButtonList: ClientId - overriden by Id property">
-    <table id="System.Web.UI.WebControls.RadioButtonList_Id" border="0">
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList_Id_0" type="radio" name="System.Web.UI.WebControls.RadioButtonList_Id" value="1" />
-          <label for="System.Web.UI.WebControls.RadioButtonList_Id_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList_Id_1" type="radio" name="System.Web.UI.WebControls.RadioButtonList_Id" value="2" />
-          <label for="System.Web.UI.WebControls.RadioButtonList_Id_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList_Id_2" type="radio" name="System.Web.UI.WebControls.RadioButtonList_Id" value="3" />
-          <label for="System.Web.UI.WebControls.RadioButtonList_Id_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList_Id_3" type="radio" name="System.Web.UI.WebControls.RadioButtonList_Id" value="4" />
-          <label for="System.Web.UI.WebControls.RadioButtonList_Id_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.WebControls.CheckBoxList: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.WebControls.CheckBoxList: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.WebControls.CheckBoxList: ClientId - overriden by Id property">
-    <table id="System.Web.UI.WebControls.CheckBoxList_Id" border="0">
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList_Id_0" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList_Id:0" />
-          <label for="System.Web.UI.WebControls.CheckBoxList_Id_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList_Id_1" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList_Id:1" />
-          <label for="System.Web.UI.WebControls.CheckBoxList_Id_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList_Id_2" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList_Id:2" />
-          <label for="System.Web.UI.WebControls.CheckBoxList_Id_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList_Id_3" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList_Id:3" />
-          <label for="System.Web.UI.WebControls.CheckBoxList_Id_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.WebControls.DataGrid: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.WebControls.DataGrid: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.WebControls.DataGrid: ClientId - overriden by Id property">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="System.Web.UI.WebControls.DataGrid_Id">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.WebControls.DataGridItem: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.WebControls.DataGridItem: ClientId - Id property set to String.empty">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.WebControls.DataGridItem: ClientId - overriden by Id property">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_112">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_112_System.Web.UI.WebControls.DataGridItem_Id">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.WebControls.DataList: ClientId - server generated">
-    <span>
-      <br />Passed, ClientID is set by the server.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Dispose_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Dispose_.aspx.xml
deleted file mode 100644
index c8329974a3f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Dispose_.aspx.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Dispose.">
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.Page: Dispose.">
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.UserControl: Dispose.">
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.HtmlControls.HtmlAnchor: Dispose.">
-    <a id="ctrl_3">
-    </a>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.HtmlControls.HtmlButton: Dispose.">
-    <button id="ctrl_4">
-    </button>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Dispose.">
-    <span id="ctrl_5">
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlImage: Dispose.">
-    <img id="ctrl_6" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlInputButton: Dispose.">
-    <input id="ctrl_7" type="button" name="ctrl_7" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Dispose.">
-    <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlInputFile: Dispose.">
-    <input id="ctrl_9" type="file" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Dispose.">
-    <input id="ctrl_10" type="hidden" name="ctrl_10" />
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlInputImage: Dispose.">
-    <input id="ctrl_11" type="image" name="ctrl_11" />
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Dispose.">
-    <input id="ctrl_12" value="ctrl_12" name="" type="radio" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlInputText: Dispose.">
-    <input id="ctrl_13" type="text" name="ctrl_13" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlSelect: Dispose.">
-    <select id="ctrl_14" name="ctrl_14">
-    </select>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlTable: Dispose.">
-    <table id="ctrl_15">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlTableCell: Dispose.">
-    <table>
-      <tr>
-        <td id="ctrl_16">Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlTableRow: Dispose.">
-    <table>
-      <tr id="ctrl_17">
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlTextArea: Dispose.">
-    <textarea id="ctrl_18" name="ctrl_18">
-    </textarea>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Button: Dispose.">
-    <input value="" type="submit" name="ctrl_19" id="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.CheckBox: Dispose.">
-    <input id="ctrl_20" type="checkbox" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: Dispose.">
-    <a id="ctrl_21">
-    </a>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Image: Dispose.">
-    <img id="ctrl_22" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Dispose.">
-    <input id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Label: Dispose.">
-    <span id="ctrl_24">
-    </span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Dispose.">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Literal: Dispose.">
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Panel: Dispose.">
-    <div id="ctrl_27">
-    </div>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.PlaceHolder: Dispose.">
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.RadioButton: Dispose.">
-    <input id="ctrl_29" type="radio" name="ctrl_29" value="ctrl_29" />
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.TextBox: Dispose.">
-    <input id="ctrl_30" type="text" name="ctrl_30" />
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DropDownList: Dispose.">
-    <select id="ctrl_31" name="ctrl_31">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ListBox: Dispose.">
-    <select id="ctrl_32" size="4" name="ctrl_32">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButtonList: Dispose.">
-    <table id="ctrl_33" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_33_0" type="radio" name="ctrl_33" value="1" />
-          <label for="ctrl_33_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_1" type="radio" name="ctrl_33" value="2" />
-          <label for="ctrl_33_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_2" type="radio" name="ctrl_33" value="3" />
-          <label for="ctrl_33_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_3" type="radio" name="ctrl_33" value="4" />
-          <label for="ctrl_33_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.CheckBoxList: Dispose.">
-    <table id="ctrl_34" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_34_0" type="checkbox" name="ctrl_34:0" />
-          <label for="ctrl_34_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_1" type="checkbox" name="ctrl_34:1" />
-          <label for="ctrl_34_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_2" type="checkbox" name="ctrl_34:2" />
-          <label for="ctrl_34_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_3" type="checkbox" name="ctrl_34:3" />
-          <label for="ctrl_34_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.DataGrid: Dispose.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_35">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.DataGridItem: Dispose.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_36">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_36_ctrl_37">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.DataList: Dispose.">
-    <table id="ctrl_38" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_FindControl_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_FindControl_S.aspx.xml
deleted file mode 100644
index fcbe6ec74c2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_FindControl_S.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="find control - Testing empty parameter">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ID.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ID.aspx.xml
deleted file mode 100644
index e6bf87defb1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ID.aspx.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Id - valid string">
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.Page: Id - valid string">
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.UserControl: Id - valid string">
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.HtmlControls.HtmlAnchor: Id - valid string">
-    <a id="System.Web.UI.HtmlControls.HtmlAnchor - valid id">
-    </a>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.HtmlControls.HtmlButton: Id - valid string">
-    <button id="System.Web.UI.HtmlControls.HtmlButton - valid id">
-    </button>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Id - valid string">
-    <span id="System.Web.UI.HtmlControls.HtmlGenericControl - valid id">
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlImage: Id - valid string">
-    <img id="System.Web.UI.HtmlControls.HtmlImage - valid id" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlInputButton: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputButton - valid id" type="button" name="System.Web.UI.HtmlControls.HtmlInputButton - valid id" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputCheckBox - valid id" type="checkbox" name="System.Web.UI.HtmlControls.HtmlInputCheckBox - valid id" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlInputFile: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputFile - valid id" type="file" name="System.Web.UI.HtmlControls.HtmlInputFile - valid id" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputHidden - valid id" type="hidden" name="System.Web.UI.HtmlControls.HtmlInputHidden - valid id" />
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlInputImage: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputImage - valid id" type="image" name="System.Web.UI.HtmlControls.HtmlInputImage - valid id" />
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputRadioButton - valid id" value="System.Web.UI.HtmlControls.HtmlInputRadioButton - valid id" name="" type="radio" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlInputText: Id - valid string">
-    <input id="System.Web.UI.HtmlControls.HtmlInputText - valid id" type="text" name="System.Web.UI.HtmlControls.HtmlInputText - valid id" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlSelect: Id - valid string">
-    <select id="System.Web.UI.HtmlControls.HtmlSelect - valid id" name="System.Web.UI.HtmlControls.HtmlSelect - valid id">
-    </select>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlTable: Id - valid string">
-    <table id="System.Web.UI.HtmlControls.HtmlTable - valid id">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlTableCell: Id - valid string">
-    <table>
-      <tr>
-        <td id="System.Web.UI.HtmlControls.HtmlTableCell - valid id">Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlTableRow: Id - valid string">
-    <table>
-      <tr id="System.Web.UI.HtmlControls.HtmlTableRow - valid id">
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlTextArea: Id - valid string">
-    <textarea id="System.Web.UI.HtmlControls.HtmlTextArea - valid id" name="System.Web.UI.HtmlControls.HtmlTextArea - valid id">
-    </textarea>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Button: Id - valid string">
-    <input value="" type="submit" name="System.Web.UI.WebControls.Button - valid id" id="System.Web.UI.WebControls.Button - valid id" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.CheckBox: Id - valid string">
-    <input id="System.Web.UI.WebControls.CheckBox - valid id" type="checkbox" name="System.Web.UI.WebControls.CheckBox - valid id" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: Id - valid string">
-    <a id="System.Web.UI.WebControls.HyperLink - valid id">
-    </a>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Image: Id - valid string">
-    <img id="System.Web.UI.WebControls.Image - valid id" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Id - valid string">
-    <input id="System.Web.UI.WebControls.ImageButton - valid id" alt="" border="0" type="image" name="System.Web.UI.WebControls.ImageButton - valid id" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Label: Id - valid string">
-    <span id="System.Web.UI.WebControls.Label - valid id">
-    </span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Id - valid string">
-    <a href="javascript:__doPostBack('System.Web.UI.WebControls.LinkButton - valid id','')" id="System.Web.UI.WebControls.LinkButton - valid id">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Literal: Id - valid string">
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Panel: Id - valid string">
-    <div id="System.Web.UI.WebControls.Panel - valid id">
-    </div>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.PlaceHolder: Id - valid string">
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.RadioButton: Id - valid string">
-    <input id="System.Web.UI.WebControls.RadioButton - valid id" type="radio" name="System.Web.UI.WebControls.RadioButton - valid id" value="System.Web.UI.WebControls.RadioButton - valid id" />
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.TextBox: Id - valid string">
-    <input id="System.Web.UI.WebControls.TextBox - valid id" type="text" name="System.Web.UI.WebControls.TextBox - valid id" />
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DropDownList: Id - valid string">
-    <select id="System.Web.UI.WebControls.DropDownList - valid id" name="System.Web.UI.WebControls.DropDownList - valid id">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ListBox: Id - valid string">
-    <select id="System.Web.UI.WebControls.ListBox - valid id" size="4" name="System.Web.UI.WebControls.ListBox - valid id">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButtonList: Id - valid string">
-    <table id="System.Web.UI.WebControls.RadioButtonList - valid id" border="0">
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList - valid id_0" type="radio" name="System.Web.UI.WebControls.RadioButtonList - valid id" value="1" />
-          <label for="System.Web.UI.WebControls.RadioButtonList - valid id_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList - valid id_1" type="radio" name="System.Web.UI.WebControls.RadioButtonList - valid id" value="2" />
-          <label for="System.Web.UI.WebControls.RadioButtonList - valid id_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList - valid id_2" type="radio" name="System.Web.UI.WebControls.RadioButtonList - valid id" value="3" />
-          <label for="System.Web.UI.WebControls.RadioButtonList - valid id_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.RadioButtonList - valid id_3" type="radio" name="System.Web.UI.WebControls.RadioButtonList - valid id" value="4" />
-          <label for="System.Web.UI.WebControls.RadioButtonList - valid id_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.CheckBoxList: Id - valid string">
-    <table id="System.Web.UI.WebControls.CheckBoxList - valid id" border="0">
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList - valid id_0" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList - valid id:0" />
-          <label for="System.Web.UI.WebControls.CheckBoxList - valid id_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList - valid id_1" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList - valid id:1" />
-          <label for="System.Web.UI.WebControls.CheckBoxList - valid id_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList - valid id_2" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList - valid id:2" />
-          <label for="System.Web.UI.WebControls.CheckBoxList - valid id_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="System.Web.UI.WebControls.CheckBoxList - valid id_3" type="checkbox" name="System.Web.UI.WebControls.CheckBoxList - valid id:3" />
-          <label for="System.Web.UI.WebControls.CheckBoxList - valid id_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.DataGrid: Id - valid string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="System.Web.UI.WebControls.DataGrid - valid id">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.DataGridItem: Id - valid string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_36">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_36_System.Web.UI.WebControls.DataGridItem - valid id">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.DataList: Id - valid string">
-    <table id="System.Web.UI.WebControls.DataList - valid id" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Init.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Init.aspx.xml
deleted file mode 100644
index 30c29eb7569..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Init.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-  </div>
-  <div id="GHTSubTest2" testname="New Inherits TextBox">
-    <input id="MyTextBox1" type="text" name="MyTextBox1" />
-    <span>
-      <br />MyTextBox1</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Load_wo_CodeBehind.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Load_wo_CodeBehind.aspx.xml
deleted file mode 100644
index c0c336f076d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Load_wo_CodeBehind.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span id="Label1">Page_Load event was not raised</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_NamingContainer.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_NamingContainer.aspx.xml
deleted file mode 100644
index c8602106df6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_NamingContainer.aspx.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Default naming container">
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.LiteralControl: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.LiteralControlcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.Page: Default naming container">
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.Page: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.Pagecustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.UserControl: Default naming container">
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.UserControl: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.UserControlcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlAnchor: Default naming container">
-    <a id="ctrl_6">
-    </a>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlAnchor: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlAnchorcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlButton: Default naming container">
-    <button id="ctrl_8">
-    </button>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlButton: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlButtoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Default naming container">
-    <span id="ctrl_10">
-    </span>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlGenericControlcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlImage: Default naming container">
-    <img id="ctrl_12" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlImage: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlImagecustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlInputButton: Default naming container">
-    <input id="ctrl_14" type="button" name="ctrl_14" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlInputButton: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputButtoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Default naming container">
-    <input id="ctrl_16" type="checkbox" name="ctrl_16" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputCheckBoxcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlInputFile: Default naming container">
-    <input id="ctrl_18" type="file" name="ctrl_18" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.HtmlControls.HtmlInputFile: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputFilecustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Default naming container">
-    <input id="ctrl_20" type="hidden" name="ctrl_20" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputHiddencustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.HtmlControls.HtmlInputImage: Default naming container">
-    <input id="ctrl_22" type="image" name="ctrl_22" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.HtmlControls.HtmlInputImage: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputImagecustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Default naming container">
-    <input id="ctrl_24" value="ctrl_24" name="" type="radio" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputRadioButtoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.HtmlControls.HtmlInputText: Default naming container">
-    <input id="ctrl_26" type="text" name="ctrl_26" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.HtmlControls.HtmlInputText: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlInputTextcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.HtmlControls.HtmlSelect: Default naming container">
-    <select id="ctrl_28" name="ctrl_28">
-    </select>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.HtmlControls.HtmlSelect: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlSelectcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.HtmlControls.HtmlTable: Default naming container">
-    <table id="ctrl_30">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.HtmlControls.HtmlTable: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlTablecustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.HtmlControls.HtmlTableCell: Default naming container">
-    <table>
-      <tr>
-        <td id="ctrl_32">Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.HtmlControls.HtmlTableCell: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlTableCellcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.HtmlControls.HtmlTableRow: Default naming container">
-    <table>
-      <tr id="ctrl_34">
-        <td>Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.HtmlControls.HtmlTableRow: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlTableRowcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.HtmlControls.HtmlTextArea: Default naming container">
-    <textarea id="ctrl_36" name="ctrl_36">
-    </textarea>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.HtmlControls.HtmlTextArea: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.HtmlControls.HtmlTextAreacustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Button: Default naming container">
-    <input value="" type="submit" name="ctrl_38" id="ctrl_38" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Button: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.Buttoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.CheckBox: Default naming container">
-    <input id="ctrl_40" type="checkbox" name="ctrl_40" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.CheckBox: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.CheckBoxcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.HyperLink: Default naming container">
-    <a id="ctrl_42">
-    </a>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.HyperLink: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.HyperLinkcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.Image: Default naming container">
-    <img id="ctrl_44" alt="" border="0" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.Image: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.Imagecustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ImageButton: Default naming container">
-    <input id="ctrl_46" alt="" border="0" type="image" name="ctrl_46" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ImageButton: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.ImageButtoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.Label: Default naming container">
-    <span id="ctrl_48">
-    </span>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.Label: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.Labelcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.LinkButton: Default naming container">
-    <a href="javascript:__doPostBack('ctrl_50','')" id="ctrl_50">
-    </a>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.LinkButton: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.LinkButtoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.Literal: Default naming container">
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.Literal: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.Literalcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.Panel: Default naming container">
-    <div id="ctrl_54">
-    </div>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.Panel: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.Panelcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.PlaceHolder: Default naming container">
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.PlaceHolder: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.PlaceHoldercustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.RadioButton: Default naming container">
-    <input id="ctrl_58" type="radio" name="ctrl_58" value="ctrl_58" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.RadioButton: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.RadioButtoncustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.TextBox: Default naming container">
-    <input id="ctrl_60" type="text" name="ctrl_60" />
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.TextBox: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.TextBoxcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DropDownList: Default naming container">
-    <select id="ctrl_62" name="ctrl_62">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DropDownList: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.DropDownListcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.ListBox: Default naming container">
-    <select id="ctrl_64" size="4" name="ctrl_64">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.ListBox: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.ListBoxcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.RadioButtonList: Default naming container">
-    <table id="ctrl_66" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="radio" name="ctrl_66" value="1" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="radio" name="ctrl_66" value="2" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="radio" name="ctrl_66" value="3" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="radio" name="ctrl_66" value="4" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.RadioButtonList: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.RadioButtonListcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Default naming container">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.CheckBoxListcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Default naming container">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Control_NamingContainer</span>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.DataGridcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGridItem: Default naming container">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_72_ctrl_73">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />ctrl_72</span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGridItem: Custom naming container">
-    <span>
-      <br />NamingContainer.UniqueID: System.Web.UI.WebControls.DataGridItemcustom_test_naming_container</span>
-    <span>
-      <br />NamingContainer.Type: GHTTests.System_Web_dll.System_Web_UI.TestNamingContainer</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataList: Default naming container">
-    <table id="ctrl_76" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Page.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Page.aspx.xml
deleted file mode 100644
index e68b4c7949e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Page.aspx.xml
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: ">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.Page: ">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.UserControl: ">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.HtmlControls.HtmlAnchor: ">
-    <a id="ctrl_3">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.HtmlControls.HtmlButton: ">
-    <button id="ctrl_4">
-    </button>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.HtmlControls.HtmlGenericControl: ">
-    <span id="ctrl_5">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlImage: ">
-    <img id="ctrl_6" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlInputButton: ">
-    <input id="ctrl_7" type="button" name="ctrl_7" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: ">
-    <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlInputFile: ">
-    <input id="ctrl_9" type="file" name="ctrl_9" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlInputHidden: ">
-    <input id="ctrl_10" type="hidden" name="ctrl_10" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlInputImage: ">
-    <input id="ctrl_11" type="image" name="ctrl_11" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: ">
-    <input id="ctrl_12" value="ctrl_12" name="" type="radio" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlInputText: ">
-    <input id="ctrl_13" type="text" name="ctrl_13" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlSelect: ">
-    <select id="ctrl_14" name="ctrl_14">
-    </select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlTable: ">
-    <table id="ctrl_15">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlTableCell: ">
-    <table>
-      <tr>
-        <td id="ctrl_16">Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlTableRow: ">
-    <table>
-      <tr id="ctrl_17">
-        <td>Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlTextArea: ">
-    <textarea id="ctrl_18" name="ctrl_18">
-    </textarea>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Button: ">
-    <input value="" type="submit" name="ctrl_19" id="ctrl_19" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.CheckBox: ">
-    <input id="ctrl_20" type="checkbox" name="ctrl_20" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: ">
-    <a id="ctrl_21">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Image: ">
-    <img id="ctrl_22" alt="" border="0" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: ">
-    <input id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Label: ">
-    <span id="ctrl_24">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: ">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Literal: ">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Panel: ">
-    <div id="ctrl_27">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.PlaceHolder: ">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.RadioButton: ">
-    <input id="ctrl_29" type="radio" name="ctrl_29" value="ctrl_29" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.TextBox: ">
-    <input id="ctrl_30" type="text" name="ctrl_30" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DropDownList: ">
-    <select id="ctrl_31" name="ctrl_31">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ListBox: ">
-    <select id="ctrl_32" size="4" name="ctrl_32">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButtonList: ">
-    <table id="ctrl_33" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_33_0" type="radio" name="ctrl_33" value="1" />
-          <label for="ctrl_33_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_1" type="radio" name="ctrl_33" value="2" />
-          <label for="ctrl_33_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_2" type="radio" name="ctrl_33" value="3" />
-          <label for="ctrl_33_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_3" type="radio" name="ctrl_33" value="4" />
-          <label for="ctrl_33_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.CheckBoxList: ">
-    <table id="ctrl_34" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_34_0" type="checkbox" name="ctrl_34:0" />
-          <label for="ctrl_34_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_1" type="checkbox" name="ctrl_34:1" />
-          <label for="ctrl_34_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_2" type="checkbox" name="ctrl_34:2" />
-          <label for="ctrl_34_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_3" type="checkbox" name="ctrl_34:3" />
-          <label for="ctrl_34_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.DataGrid: ">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_35">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.DataGridItem: ">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_36">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_36_ctrl_37">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.DataList: ">
-    <table id="ctrl_38" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Parent.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Parent.aspx.xml
deleted file mode 100644
index 756ee5869de..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Parent.aspx.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Basic functionality">
-    <span>
-      <br />GHTSubTest1</span>
-  </div>
-  <div id="GHTSubTest2" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.Page: Basic functionality">
-    <span>
-      <br />GHTSubTest3</span>
-  </div>
-  <div id="GHTSubTest4" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.UserControl: Basic functionality">
-    <span>
-      <br />GHTSubTest5</span>
-  </div>
-  <div id="GHTSubTest6" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlAnchor: Basic functionality">
-    <a id="ctrl_3">
-    </a>
-    <span>
-      <br />GHTSubTest7</span>
-  </div>
-  <div id="GHTSubTest8" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlButton: Basic functionality">
-    <button id="ctrl_4">
-    </button>
-    <span>
-      <br />GHTSubTest9</span>
-  </div>
-  <div id="GHTSubTest10" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Basic functionality">
-    <span id="ctrl_5">
-    </span>
-    <span>
-      <br />GHTSubTest11</span>
-  </div>
-  <div id="GHTSubTest12" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlImage: Basic functionality">
-    <img id="ctrl_6" />
-    <span>
-      <br />GHTSubTest13</span>
-  </div>
-  <div id="GHTSubTest14" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlInputButton: Basic functionality">
-    <input id="ctrl_7" type="button" name="ctrl_7" />
-    <span>
-      <br />GHTSubTest15</span>
-  </div>
-  <div id="GHTSubTest16" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Basic functionality">
-    <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    <span>
-      <br />GHTSubTest17</span>
-  </div>
-  <div id="GHTSubTest18" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlInputFile: Basic functionality">
-    <input id="ctrl_9" type="file" name="ctrl_9" />
-    <span>
-      <br />GHTSubTest19</span>
-  </div>
-  <div id="GHTSubTest20" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Basic functionality">
-    <input id="ctrl_10" type="hidden" name="ctrl_10" />
-    <span>
-      <br />GHTSubTest21</span>
-  </div>
-  <div id="GHTSubTest22" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.HtmlControls.HtmlInputImage: Basic functionality">
-    <input id="ctrl_11" type="image" name="ctrl_11" />
-    <span>
-      <br />GHTSubTest23</span>
-  </div>
-  <div id="GHTSubTest24" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Basic functionality">
-    <input id="ctrl_12" value="ctrl_12" name="" type="radio" />
-    <span>
-      <br />GHTSubTest25</span>
-  </div>
-  <div id="GHTSubTest26" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.HtmlControls.HtmlInputText: Basic functionality">
-    <input id="ctrl_13" type="text" name="ctrl_13" />
-    <span>
-      <br />GHTSubTest27</span>
-  </div>
-  <div id="GHTSubTest28" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.HtmlControls.HtmlSelect: Basic functionality">
-    <select id="ctrl_14" name="ctrl_14">
-    </select>
-    <span>
-      <br />GHTSubTest29</span>
-  </div>
-  <div id="GHTSubTest30" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.HtmlControls.HtmlTable: Basic functionality">
-    <table id="ctrl_15">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />GHTSubTest31</span>
-  </div>
-  <div id="GHTSubTest32" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.HtmlControls.HtmlTableCell: Basic functionality">
-    <table>
-      <tr>
-        <td id="ctrl_16">Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.HtmlControls.HtmlTableRow: Basic functionality">
-    <table>
-      <tr id="ctrl_17">
-        <td>Cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.HtmlControls.HtmlTextArea: Basic functionality">
-    <textarea id="ctrl_18" name="ctrl_18">
-    </textarea>
-    <span>
-      <br />GHTSubTest37</span>
-  </div>
-  <div id="GHTSubTest38" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Button: Basic functionality">
-    <input value="" type="submit" name="ctrl_19" id="ctrl_19" />
-    <span>
-      <br />GHTSubTest39</span>
-  </div>
-  <div id="GHTSubTest40" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.CheckBox: Basic functionality">
-    <input id="ctrl_20" type="checkbox" name="ctrl_20" />
-    <span>
-      <br />GHTSubTest41</span>
-  </div>
-  <div id="GHTSubTest42" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.HyperLink: Basic functionality">
-    <a id="ctrl_21">
-    </a>
-    <span>
-      <br />GHTSubTest43</span>
-  </div>
-  <div id="GHTSubTest44" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.Image: Basic functionality">
-    <img id="ctrl_22" alt="" border="0" />
-    <span>
-      <br />GHTSubTest45</span>
-  </div>
-  <div id="GHTSubTest46" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ImageButton: Basic functionality">
-    <input id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-    <span>
-      <br />GHTSubTest47</span>
-  </div>
-  <div id="GHTSubTest48" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.Label: Basic functionality">
-    <span id="ctrl_24">
-    </span>
-    <span>
-      <br />GHTSubTest49</span>
-  </div>
-  <div id="GHTSubTest50" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.LinkButton: Basic functionality">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-    <span>
-      <br />GHTSubTest51</span>
-  </div>
-  <div id="GHTSubTest52" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.Literal: Basic functionality">
-    <span>
-      <br />GHTSubTest53</span>
-  </div>
-  <div id="GHTSubTest54" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.Panel: Basic functionality">
-    <div id="ctrl_27">
-    </div>
-    <span>
-      <br />GHTSubTest55</span>
-  </div>
-  <div id="GHTSubTest56" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.PlaceHolder: Basic functionality">
-    <span>
-      <br />GHTSubTest57</span>
-  </div>
-  <div id="GHTSubTest58" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.RadioButton: Basic functionality">
-    <input id="ctrl_29" type="radio" name="ctrl_29" value="ctrl_29" />
-    <span>
-      <br />GHTSubTest59</span>
-  </div>
-  <div id="GHTSubTest60" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.TextBox: Basic functionality">
-    <input id="ctrl_30" type="text" name="ctrl_30" />
-    <span>
-      <br />GHTSubTest61</span>
-  </div>
-  <div id="GHTSubTest62" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DropDownList: Basic functionality">
-    <select id="ctrl_31" name="ctrl_31">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />GHTSubTest63</span>
-  </div>
-  <div id="GHTSubTest64" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.ListBox: Basic functionality">
-    <select id="ctrl_32" size="4" name="ctrl_32">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />GHTSubTest65</span>
-  </div>
-  <div id="GHTSubTest66" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.RadioButtonList: Basic functionality">
-    <table id="ctrl_33" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_33_0" type="radio" name="ctrl_33" value="1" />
-          <label for="ctrl_33_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_1" type="radio" name="ctrl_33" value="2" />
-          <label for="ctrl_33_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_2" type="radio" name="ctrl_33" value="3" />
-          <label for="ctrl_33_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_33_3" type="radio" name="ctrl_33" value="4" />
-          <label for="ctrl_33_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />GHTSubTest67</span>
-  </div>
-  <div id="GHTSubTest68" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Basic functionality">
-    <table id="ctrl_34" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_34_0" type="checkbox" name="ctrl_34:0" />
-          <label for="ctrl_34_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_1" type="checkbox" name="ctrl_34:1" />
-          <label for="ctrl_34_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_2" type="checkbox" name="ctrl_34:2" />
-          <label for="ctrl_34_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_34_3" type="checkbox" name="ctrl_34:3" />
-          <label for="ctrl_34_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />GHTSubTest69</span>
-  </div>
-  <div id="GHTSubTest70" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Basic functionality">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_35">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />GHTSubTest71</span>
-  </div>
-  <div id="GHTSubTest72" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGridItem: Basic functionality">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_36">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_36_ctrl_37">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest74" testname="No parent set">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataList: Basic functionality">
-    <table id="ctrl_38" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ResolveUrl_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ResolveUrl_S.aspx.xml
deleted file mode 100644
index 36f4e5b237e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ResolveUrl_S.aspx.xml
+++ /dev/null
@@ -1,1524 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.LiteralControl: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.LiteralControl: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.LiteralControl: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.LiteralControl: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.LiteralControl: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.LiteralControl: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.LiteralControl: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.LiteralControl: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.LiteralControl: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.Page: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.Page: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.Page: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.Page: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.Page: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.Page: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.Page: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.Page: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.Page: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.Page: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.UserControl: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.UserControl: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.UserControl: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.UserControl: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.UserControl: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.UserControl: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.UserControl: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.UserControl: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.UserControl: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.UserControl: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.HtmlControls.HtmlAnchor: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.HtmlControls.HtmlAnchor: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.HtmlControls.HtmlAnchor: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.HtmlControls.HtmlAnchor: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.HtmlControls.HtmlAnchor: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.HtmlControls.HtmlAnchor: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.HtmlControls.HtmlAnchor: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.HtmlControls.HtmlAnchor: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.HtmlControls.HtmlAnchor: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.HtmlControls.HtmlAnchor: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.HtmlControls.HtmlButton: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.HtmlControls.HtmlButton: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.HtmlControls.HtmlButton: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.HtmlControls.HtmlButton: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.HtmlControls.HtmlButton: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.HtmlControls.HtmlButton: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.HtmlControls.HtmlButton: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.HtmlControls.HtmlButton: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.HtmlControls.HtmlButton: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.HtmlControls.HtmlButton: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.HtmlControls.HtmlGenericControl: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.HtmlControls.HtmlGenericControl: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.HtmlControls.HtmlGenericControl: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.HtmlControls.HtmlImage: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.HtmlControls.HtmlImage: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.HtmlControls.HtmlImage: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.HtmlControls.HtmlImage: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.HtmlControls.HtmlImage: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.HtmlControls.HtmlImage: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.HtmlControls.HtmlImage: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.HtmlControls.HtmlImage: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.HtmlControls.HtmlImage: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.HtmlControls.HtmlImage: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.HtmlControls.HtmlInputButton: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.HtmlControls.HtmlInputButton: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.HtmlControls.HtmlInputButton: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.HtmlControls.HtmlInputButton: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.HtmlControls.HtmlInputButton: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.HtmlControls.HtmlInputButton: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.HtmlControls.HtmlInputButton: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.HtmlControls.HtmlInputButton: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.HtmlControls.HtmlInputButton: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.HtmlControls.HtmlInputButton: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.HtmlControls.HtmlInputFile: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.HtmlControls.HtmlInputFile: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.HtmlControls.HtmlInputFile: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.HtmlControls.HtmlInputFile: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.HtmlControls.HtmlInputFile: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.HtmlControls.HtmlInputFile: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.HtmlControls.HtmlInputFile: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.HtmlControls.HtmlInputFile: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.HtmlControls.HtmlInputFile: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.HtmlControls.HtmlInputFile: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.HtmlControls.HtmlInputHidden: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.HtmlControls.HtmlInputHidden: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.HtmlControls.HtmlInputHidden: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.HtmlControls.HtmlInputImage: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.HtmlControls.HtmlInputImage: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest113" testname="System.Web.UI.HtmlControls.HtmlInputImage: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest114" testname="System.Web.UI.HtmlControls.HtmlInputImage: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest115" testname="System.Web.UI.HtmlControls.HtmlInputImage: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest116" testname="System.Web.UI.HtmlControls.HtmlInputImage: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest117" testname="System.Web.UI.HtmlControls.HtmlInputImage: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest118" testname="System.Web.UI.HtmlControls.HtmlInputImage: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest119" testname="System.Web.UI.HtmlControls.HtmlInputImage: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest120" testname="System.Web.UI.HtmlControls.HtmlInputImage: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest121" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest122" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest123" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest124" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest125" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest126" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest127" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest128" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest129" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest130" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest131" testname="System.Web.UI.HtmlControls.HtmlInputText: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest132" testname="System.Web.UI.HtmlControls.HtmlInputText: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest133" testname="System.Web.UI.HtmlControls.HtmlInputText: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest134" testname="System.Web.UI.HtmlControls.HtmlInputText: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest135" testname="System.Web.UI.HtmlControls.HtmlInputText: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest136" testname="System.Web.UI.HtmlControls.HtmlInputText: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest137" testname="System.Web.UI.HtmlControls.HtmlInputText: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest138" testname="System.Web.UI.HtmlControls.HtmlInputText: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest139" testname="System.Web.UI.HtmlControls.HtmlInputText: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest140" testname="System.Web.UI.HtmlControls.HtmlInputText: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest141" testname="System.Web.UI.HtmlControls.HtmlSelect: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest142" testname="System.Web.UI.HtmlControls.HtmlSelect: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest143" testname="System.Web.UI.HtmlControls.HtmlSelect: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest144" testname="System.Web.UI.HtmlControls.HtmlSelect: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest145" testname="System.Web.UI.HtmlControls.HtmlSelect: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest146" testname="System.Web.UI.HtmlControls.HtmlSelect: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest147" testname="System.Web.UI.HtmlControls.HtmlSelect: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest148" testname="System.Web.UI.HtmlControls.HtmlSelect: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest149" testname="System.Web.UI.HtmlControls.HtmlSelect: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest150" testname="System.Web.UI.HtmlControls.HtmlSelect: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest151" testname="System.Web.UI.HtmlControls.HtmlTable: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest152" testname="System.Web.UI.HtmlControls.HtmlTable: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest153" testname="System.Web.UI.HtmlControls.HtmlTable: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest154" testname="System.Web.UI.HtmlControls.HtmlTable: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest155" testname="System.Web.UI.HtmlControls.HtmlTable: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest156" testname="System.Web.UI.HtmlControls.HtmlTable: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest157" testname="System.Web.UI.HtmlControls.HtmlTable: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest158" testname="System.Web.UI.HtmlControls.HtmlTable: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest159" testname="System.Web.UI.HtmlControls.HtmlTable: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest160" testname="System.Web.UI.HtmlControls.HtmlTable: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest161" testname="System.Web.UI.HtmlControls.HtmlTableCell: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest162" testname="System.Web.UI.HtmlControls.HtmlTableCell: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest163" testname="System.Web.UI.HtmlControls.HtmlTableCell: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest164" testname="System.Web.UI.HtmlControls.HtmlTableCell: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest165" testname="System.Web.UI.HtmlControls.HtmlTableCell: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest166" testname="System.Web.UI.HtmlControls.HtmlTableCell: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest167" testname="System.Web.UI.HtmlControls.HtmlTableCell: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest168" testname="System.Web.UI.HtmlControls.HtmlTableCell: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest169" testname="System.Web.UI.HtmlControls.HtmlTableCell: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest170" testname="System.Web.UI.HtmlControls.HtmlTableCell: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest171" testname="System.Web.UI.HtmlControls.HtmlTableRow: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest172" testname="System.Web.UI.HtmlControls.HtmlTableRow: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest173" testname="System.Web.UI.HtmlControls.HtmlTableRow: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest174" testname="System.Web.UI.HtmlControls.HtmlTableRow: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest175" testname="System.Web.UI.HtmlControls.HtmlTableRow: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest176" testname="System.Web.UI.HtmlControls.HtmlTableRow: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest177" testname="System.Web.UI.HtmlControls.HtmlTableRow: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest178" testname="System.Web.UI.HtmlControls.HtmlTableRow: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest179" testname="System.Web.UI.HtmlControls.HtmlTableRow: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest180" testname="System.Web.UI.HtmlControls.HtmlTableRow: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest181" testname="System.Web.UI.HtmlControls.HtmlTextArea: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest182" testname="System.Web.UI.HtmlControls.HtmlTextArea: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest183" testname="System.Web.UI.HtmlControls.HtmlTextArea: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest184" testname="System.Web.UI.HtmlControls.HtmlTextArea: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest185" testname="System.Web.UI.HtmlControls.HtmlTextArea: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest186" testname="System.Web.UI.HtmlControls.HtmlTextArea: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest187" testname="System.Web.UI.HtmlControls.HtmlTextArea: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest188" testname="System.Web.UI.HtmlControls.HtmlTextArea: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest189" testname="System.Web.UI.HtmlControls.HtmlTextArea: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest190" testname="System.Web.UI.HtmlControls.HtmlTextArea: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest191" testname="System.Web.UI.WebControls.Button: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest192" testname="System.Web.UI.WebControls.Button: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest193" testname="System.Web.UI.WebControls.Button: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest194" testname="System.Web.UI.WebControls.Button: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest195" testname="System.Web.UI.WebControls.Button: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest196" testname="System.Web.UI.WebControls.Button: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest197" testname="System.Web.UI.WebControls.Button: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest198" testname="System.Web.UI.WebControls.Button: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest199" testname="System.Web.UI.WebControls.Button: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest200" testname="System.Web.UI.WebControls.Button: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest201" testname="System.Web.UI.WebControls.CheckBox: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest202" testname="System.Web.UI.WebControls.CheckBox: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest203" testname="System.Web.UI.WebControls.CheckBox: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest204" testname="System.Web.UI.WebControls.CheckBox: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest205" testname="System.Web.UI.WebControls.CheckBox: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest206" testname="System.Web.UI.WebControls.CheckBox: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest207" testname="System.Web.UI.WebControls.CheckBox: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest208" testname="System.Web.UI.WebControls.CheckBox: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest209" testname="System.Web.UI.WebControls.CheckBox: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest210" testname="System.Web.UI.WebControls.CheckBox: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest211" testname="System.Web.UI.WebControls.HyperLink: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest212" testname="System.Web.UI.WebControls.HyperLink: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest213" testname="System.Web.UI.WebControls.HyperLink: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest214" testname="System.Web.UI.WebControls.HyperLink: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest215" testname="System.Web.UI.WebControls.HyperLink: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest216" testname="System.Web.UI.WebControls.HyperLink: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest217" testname="System.Web.UI.WebControls.HyperLink: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest218" testname="System.Web.UI.WebControls.HyperLink: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest219" testname="System.Web.UI.WebControls.HyperLink: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest220" testname="System.Web.UI.WebControls.HyperLink: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest221" testname="System.Web.UI.WebControls.Image: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest222" testname="System.Web.UI.WebControls.Image: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest223" testname="System.Web.UI.WebControls.Image: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest224" testname="System.Web.UI.WebControls.Image: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest225" testname="System.Web.UI.WebControls.Image: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest226" testname="System.Web.UI.WebControls.Image: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest227" testname="System.Web.UI.WebControls.Image: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest228" testname="System.Web.UI.WebControls.Image: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest229" testname="System.Web.UI.WebControls.Image: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest230" testname="System.Web.UI.WebControls.Image: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest231" testname="System.Web.UI.WebControls.ImageButton: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest232" testname="System.Web.UI.WebControls.ImageButton: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest233" testname="System.Web.UI.WebControls.ImageButton: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest234" testname="System.Web.UI.WebControls.ImageButton: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest235" testname="System.Web.UI.WebControls.ImageButton: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest236" testname="System.Web.UI.WebControls.ImageButton: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest237" testname="System.Web.UI.WebControls.ImageButton: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest238" testname="System.Web.UI.WebControls.ImageButton: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest239" testname="System.Web.UI.WebControls.ImageButton: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest240" testname="System.Web.UI.WebControls.ImageButton: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest241" testname="System.Web.UI.WebControls.Label: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest242" testname="System.Web.UI.WebControls.Label: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest243" testname="System.Web.UI.WebControls.Label: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest244" testname="System.Web.UI.WebControls.Label: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest245" testname="System.Web.UI.WebControls.Label: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest246" testname="System.Web.UI.WebControls.Label: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest247" testname="System.Web.UI.WebControls.Label: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest248" testname="System.Web.UI.WebControls.Label: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest249" testname="System.Web.UI.WebControls.Label: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest250" testname="System.Web.UI.WebControls.Label: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest251" testname="System.Web.UI.WebControls.LinkButton: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest252" testname="System.Web.UI.WebControls.LinkButton: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest253" testname="System.Web.UI.WebControls.LinkButton: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest254" testname="System.Web.UI.WebControls.LinkButton: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest255" testname="System.Web.UI.WebControls.LinkButton: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest256" testname="System.Web.UI.WebControls.LinkButton: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest257" testname="System.Web.UI.WebControls.LinkButton: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest258" testname="System.Web.UI.WebControls.LinkButton: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest259" testname="System.Web.UI.WebControls.LinkButton: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest260" testname="System.Web.UI.WebControls.LinkButton: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest261" testname="System.Web.UI.WebControls.Literal: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest262" testname="System.Web.UI.WebControls.Literal: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest263" testname="System.Web.UI.WebControls.Literal: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest264" testname="System.Web.UI.WebControls.Literal: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest265" testname="System.Web.UI.WebControls.Literal: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest266" testname="System.Web.UI.WebControls.Literal: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest267" testname="System.Web.UI.WebControls.Literal: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest268" testname="System.Web.UI.WebControls.Literal: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest269" testname="System.Web.UI.WebControls.Literal: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest270" testname="System.Web.UI.WebControls.Literal: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest271" testname="System.Web.UI.WebControls.Panel: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest272" testname="System.Web.UI.WebControls.Panel: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest273" testname="System.Web.UI.WebControls.Panel: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest274" testname="System.Web.UI.WebControls.Panel: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest275" testname="System.Web.UI.WebControls.Panel: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest276" testname="System.Web.UI.WebControls.Panel: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest277" testname="System.Web.UI.WebControls.Panel: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest278" testname="System.Web.UI.WebControls.Panel: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest279" testname="System.Web.UI.WebControls.Panel: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest280" testname="System.Web.UI.WebControls.Panel: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest281" testname="System.Web.UI.WebControls.PlaceHolder: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest282" testname="System.Web.UI.WebControls.PlaceHolder: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest283" testname="System.Web.UI.WebControls.PlaceHolder: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest284" testname="System.Web.UI.WebControls.PlaceHolder: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest285" testname="System.Web.UI.WebControls.PlaceHolder: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest286" testname="System.Web.UI.WebControls.PlaceHolder: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest287" testname="System.Web.UI.WebControls.PlaceHolder: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest288" testname="System.Web.UI.WebControls.PlaceHolder: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest289" testname="System.Web.UI.WebControls.PlaceHolder: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest290" testname="System.Web.UI.WebControls.PlaceHolder: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest291" testname="System.Web.UI.WebControls.RadioButton: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest292" testname="System.Web.UI.WebControls.RadioButton: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest293" testname="System.Web.UI.WebControls.RadioButton: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest294" testname="System.Web.UI.WebControls.RadioButton: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest295" testname="System.Web.UI.WebControls.RadioButton: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest296" testname="System.Web.UI.WebControls.RadioButton: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest297" testname="System.Web.UI.WebControls.RadioButton: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest298" testname="System.Web.UI.WebControls.RadioButton: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest299" testname="System.Web.UI.WebControls.RadioButton: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest300" testname="System.Web.UI.WebControls.RadioButton: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest301" testname="System.Web.UI.WebControls.TextBox: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest302" testname="System.Web.UI.WebControls.TextBox: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest303" testname="System.Web.UI.WebControls.TextBox: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest304" testname="System.Web.UI.WebControls.TextBox: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest305" testname="System.Web.UI.WebControls.TextBox: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest306" testname="System.Web.UI.WebControls.TextBox: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest307" testname="System.Web.UI.WebControls.TextBox: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest308" testname="System.Web.UI.WebControls.TextBox: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest309" testname="System.Web.UI.WebControls.TextBox: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest310" testname="System.Web.UI.WebControls.TextBox: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest311" testname="System.Web.UI.WebControls.DropDownList: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest312" testname="System.Web.UI.WebControls.DropDownList: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest313" testname="System.Web.UI.WebControls.DropDownList: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest314" testname="System.Web.UI.WebControls.DropDownList: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest315" testname="System.Web.UI.WebControls.DropDownList: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest316" testname="System.Web.UI.WebControls.DropDownList: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest317" testname="System.Web.UI.WebControls.DropDownList: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest318" testname="System.Web.UI.WebControls.DropDownList: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest319" testname="System.Web.UI.WebControls.DropDownList: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest320" testname="System.Web.UI.WebControls.DropDownList: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest321" testname="System.Web.UI.WebControls.ListBox: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest322" testname="System.Web.UI.WebControls.ListBox: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest323" testname="System.Web.UI.WebControls.ListBox: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest324" testname="System.Web.UI.WebControls.ListBox: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest325" testname="System.Web.UI.WebControls.ListBox: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest326" testname="System.Web.UI.WebControls.ListBox: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest327" testname="System.Web.UI.WebControls.ListBox: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest328" testname="System.Web.UI.WebControls.ListBox: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest329" testname="System.Web.UI.WebControls.ListBox: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest330" testname="System.Web.UI.WebControls.ListBox: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest331" testname="System.Web.UI.WebControls.RadioButtonList: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest332" testname="System.Web.UI.WebControls.RadioButtonList: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest333" testname="System.Web.UI.WebControls.RadioButtonList: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest334" testname="System.Web.UI.WebControls.RadioButtonList: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest335" testname="System.Web.UI.WebControls.RadioButtonList: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest336" testname="System.Web.UI.WebControls.RadioButtonList: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest337" testname="System.Web.UI.WebControls.RadioButtonList: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest338" testname="System.Web.UI.WebControls.RadioButtonList: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest339" testname="System.Web.UI.WebControls.RadioButtonList: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest340" testname="System.Web.UI.WebControls.RadioButtonList: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest341" testname="System.Web.UI.WebControls.CheckBoxList: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest342" testname="System.Web.UI.WebControls.CheckBoxList: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest343" testname="System.Web.UI.WebControls.CheckBoxList: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest344" testname="System.Web.UI.WebControls.CheckBoxList: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest345" testname="System.Web.UI.WebControls.CheckBoxList: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest346" testname="System.Web.UI.WebControls.CheckBoxList: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest347" testname="System.Web.UI.WebControls.CheckBoxList: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest348" testname="System.Web.UI.WebControls.CheckBoxList: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest349" testname="System.Web.UI.WebControls.CheckBoxList: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest350" testname="System.Web.UI.WebControls.CheckBoxList: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest351" testname="System.Web.UI.WebControls.DataGrid: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest352" testname="System.Web.UI.WebControls.DataGrid: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest353" testname="System.Web.UI.WebControls.DataGrid: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest354" testname="System.Web.UI.WebControls.DataGrid: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest355" testname="System.Web.UI.WebControls.DataGrid: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest356" testname="System.Web.UI.WebControls.DataGrid: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest357" testname="System.Web.UI.WebControls.DataGrid: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest358" testname="System.Web.UI.WebControls.DataGrid: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest359" testname="System.Web.UI.WebControls.DataGrid: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest360" testname="System.Web.UI.WebControls.DataGrid: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest361" testname="System.Web.UI.WebControls.DataGridItem: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest362" testname="System.Web.UI.WebControls.DataGridItem: Absolute url without protocol:">
-    <span>
-      <br />/GHTTests/</span>
-  </div>
-  <div id="GHTSubTest363" testname="System.Web.UI.WebControls.DataGridItem: Relative url:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb</span>
-  </div>
-  <div id="GHTSubTest364" testname="System.Web.UI.WebControls.DataGridItem: Relative url with a leading ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/aa/bb</span>
-  </div>
-  <div id="GHTSubTest365" testname="System.Web.UI.WebControls.DataGridItem: Relative url only  ../:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/</span>
-  </div>
-  <div id="GHTSubTest366" testname="System.Web.UI.WebControls.DataGridItem: Relative url higher then root:">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest367" testname="System.Web.UI.WebControls.DataGridItem: A url  that uses \:">
-    <span>
-      <br />/MainsoftWebApp/System_Web_UI/Control/aa/bb/cc</span>
-  </div>
-  <div id="GHTSubTest368" testname="System.Web.UI.WebControls.DataGridItem: A file path:">
-    <span>
-      <br />c:\GHTests\file.vb</span>
-  </div>
-  <div id="GHTSubTest369" testname="System.Web.UI.WebControls.DataGridItem: Empty string:">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest370" testname="System.Web.UI.WebControls.DataGridItem: A url that contains invalid charachters:">
-    <span>
-      <br />~!@#$%^&amp;*()_+-=[]\{}|;':,./?</span>
-  </div>
-  <div id="GHTSubTest371" testname="System.Web.UI.WebControls.DataList: Absolute url with protocol:">
-    <span>
-      <br />http://localhost/GHTTests/</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_TemplateSourceDirectory.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_TemplateSourceDirectory.aspx.xml
deleted file mode 100644
index dfe0c549499..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_TemplateSourceDirectory.aspx.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.Page: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.UserControl: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.HtmlControls.HtmlAnchor: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.HtmlControls.HtmlButton: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlImage: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlInputButton: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlInputFile: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlInputImage: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlInputText: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlSelect: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlTable: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlTableCell: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlTableRow: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlTextArea: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Button: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.CheckBox: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Image: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Label: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Literal: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Panel: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.PlaceHolder: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.RadioButton: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.TextBox: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DropDownList: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ListBox: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButtonList: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.CheckBoxList: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.DataGrid: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.DataGridItem: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.DataList: Default value:">
-    <span>
-      <br />/mainsoftwebapp/system_web_ui/control</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_UniqueID.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_UniqueID.aspx.xml
deleted file mode 100644
index d6875da1433..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_UniqueID.aspx.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Default value:">
-    <span>
-      <br />ctrl_0</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.Page: Default value:">
-    <span>
-      <br />ctrl_1</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.UserControl: Default value:">
-    <span>
-      <br />ctrl_2</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.HtmlControls.HtmlAnchor: Default value:">
-    <span>
-      <br />ctrl_3</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.HtmlControls.HtmlButton: Default value:">
-    <span>
-      <br />ctrl_4</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Default value:">
-    <span>
-      <br />ctrl_5</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlImage: Default value:">
-    <span>
-      <br />ctrl_6</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlInputButton: Default value:">
-    <span>
-      <br />ctrl_7</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Default value:">
-    <span>
-      <br />ctrl_8</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlInputFile: Default value:">
-    <span>
-      <br />ctrl_9</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Default value:">
-    <span>
-      <br />ctrl_10</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlInputImage: Default value:">
-    <span>
-      <br />ctrl_11</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Default value:">
-    <span>
-      <br />ctrl_12</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlInputText: Default value:">
-    <span>
-      <br />ctrl_13</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlSelect: Default value:">
-    <span>
-      <br />ctrl_14</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlTable: Default value:">
-    <span>
-      <br />ctrl_15</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlTableCell: Default value:">
-    <span>
-      <br />ctrl_16</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlTableRow: Default value:">
-    <span>
-      <br />ctrl_17</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlTextArea: Default value:">
-    <span>
-      <br />ctrl_18</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Button: Default value:">
-    <span>
-      <br />ctrl_19</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.CheckBox: Default value:">
-    <span>
-      <br />ctrl_20</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: Default value:">
-    <span>
-      <br />ctrl_21</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Image: Default value:">
-    <span>
-      <br />ctrl_22</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Default value:">
-    <span>
-      <br />ctrl_23</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Label: Default value:">
-    <span>
-      <br />ctrl_24</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Default value:">
-    <span>
-      <br />ctrl_25</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Literal: Default value:">
-    <span>
-      <br />ctrl_26</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Panel: Default value:">
-    <span>
-      <br />ctrl_27</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.PlaceHolder: Default value:">
-    <span>
-      <br />ctrl_28</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.RadioButton: Default value:">
-    <span>
-      <br />ctrl_29</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.TextBox: Default value:">
-    <span>
-      <br />ctrl_30</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DropDownList: Default value:">
-    <span>
-      <br />ctrl_31</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ListBox: Default value:">
-    <span>
-      <br />ctrl_32</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButtonList: Default value:">
-    <span>
-      <br />ctrl_33</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.CheckBoxList: Default value:">
-    <span>
-      <br />ctrl_34</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.DataGrid: Default value:">
-    <span>
-      <br />ctrl_35</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.DataGridItem: Default value:">
-    <span>
-      <br />ctrl_36:ctrl_37</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.DataList: Default value:">
-    <span>
-      <br />ctrl_38</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ViewState.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ViewState.aspx.xml
deleted file mode 100644
index 2fdaa79f304..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_ViewState.aspx.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Check PostBack">
-  </div>
-  <div id="GHTSubTest2" testname="AdRotator.KeywordFilter,Target">
-  </div>
-  <div id="GHTSubTest3" testname="Style.BorderColor,BorderWidth,BorderStyle,CssClass,ForeColor,Height,Width,BackColor">
-  </div>
-  <div id="GHTSubTest4" testname="FontInfo.Underline,Italic,Names,Overline,Size,Strikeout,Bold">
-    <span>
-      <br />Unxpected IndexOutOfRangeException exception was caught-Index was outside the bounds of the array.</span>
-  </div>
-  <div id="GHTSubTest5" testname="Control.Visible">
-  </div>
-  <div id="GHTSubTest6" testname="WebControl.AccessKey,Enabled,TabIndex,ToolTip">
-  </div>
-  <div id="GHTSubTest7" testname="Button.CausesValidation,CommandArgument,CommandName,Text">
-  </div>
-  <div id="GHTSubTest8" testname="BoundColumn.All">
-  </div>
-  <div id="GHTSubTest9" testname="HyperLinkColumn.All">
-  </div>
-  <div id="GHTSubTest10" testname="ButtonColumn.All">
-  </div>
-  <div id="GHTSubTest11" testname="EditCommandColumn.All">
-  </div>
-  <div id="GHTSubTest12" testname="Calendar.All">
-  </div>
-  <div id="GHTSubTest13" testname="CheckBox.TextAlign,Text,Checked,AutoPostBack">
-  </div>
-  <div id="GHTSubTest14" testname="CheckBoxList.RepeatColumns">
-  </div>
-  <div id="GHTSubTest15" testname="CheckBoxList.TextAlign">
-  </div>
-  <div id="GHTSubTest16" testname="CheckBoxList.RepeatDirection">
-  </div>
-  <div id="GHTSubTest17" testname="CheckBoxList.RepeatLayout">
-  </div>
-  <div id="GHTSubTest18" testname="CompareValidator.Operator">
-  </div>
-  <div id="GHTSubTest19" testname="CompareValidator.ControlToCompare">
-  </div>
-  <div id="GHTSubTest20" testname="CompareValidator.ValueToCompare">
-  </div>
-  <div id="GHTSubTest21" testname="HtmlButton.CausesValidation">
-  </div>
-  <div id="GHTSubTest22" testname="HtmlInputImage.CausesValidation">
-  </div>
-  <div id="GHTSubTest23" testname="HtmlInputButton.CausesValidation">
-  </div>
-  <div id="GHTSubTest24" testname="HyperLink.Text">
-  </div>
-  <div id="GHTSubTest25" testname="HyperLink.Target">
-  </div>
-  <div id="GHTSubTest26" testname="HyperLink.ImageUrl">
-  </div>
-  <div id="GHTSubTest27" testname="HyperLink.NavigateUrl">
-  </div>
-  <div id="GHTSubTest28" testname="Image.AlternateText">
-  </div>
-  <div id="GHTSubTest29" testname="Image.ImageAlign">
-  </div>
-  <div id="GHTSubTest30" testname="Image.ImageUrl">
-  </div>
-  <div id="GHTSubTest31" testname="ImageButton.CommandName">
-  </div>
-  <div id="GHTSubTest32" testname="ImageButton.CommandArgument">
-  </div>
-  <div id="GHTSubTest33" testname="ImageButton.CommandName">
-  </div>
-  <div id="GHTSubTest34" testname="Label.Text">
-  </div>
-  <div id="GHTSubTest35" testname="LinkButton.CausesValidation">
-  </div>
-  <div id="GHTSubTest36" testname="LinkButton.CommandName">
-  </div>
-  <div id="GHTSubTest37" testname="LinkButton.CommandArgument">
-  </div>
-  <div id="GHTSubTest38" testname="LinkButton.Text">
-  </div>
-  <div id="GHTSubTest39" testname="ListBox.All">
-  </div>
-  <div id="GHTSubTest40" testname="ListControl.All">
-  </div>
-  <div id="GHTSubTest41" testname="Literal.Text">
-  </div>
-  <div id="GHTSubTest42" testname="Panel.All">
-  </div>
-  <div id="GHTSubTest43" testname="RadioButton.GroupName">
-  </div>
-  <div id="GHTSubTest44" testname="RadioButtonList.RepeatColumns">
-  </div>
-  <div id="GHTSubTest45" testname="RadioButtonList.RepeatDirection">
-  </div>
-  <div id="GHTSubTest46" testname="RadioButtonList.TextAlign">
-  </div>
-  <div id="GHTSubTest47" testname="RadioButtonList.RepeatLayout">
-  </div>
-  <div id="GHTSubTest48" testname="TextBox.ReadOnly,AutoPostBack,Columns,Wrap,Text,Rows,MaxLength,TextMode">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Visible.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Visible.aspx.xml
deleted file mode 100644
index 05c79eaed83..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Control_Control_Visible.aspx.xml
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.LiteralControl: Visible = true:">
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.LiteralControl: Visible = false:">
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.Page: Visible = true:">
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.Page: Visible = false:">
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.UserControl: Visible = true:">
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.UserControl: Visible = false:">
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.HtmlControls.HtmlAnchor: Visible = true:">
-    <a id="ctrl_6">
-    </a>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.HtmlControls.HtmlAnchor: Visible = false:">
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.HtmlControls.HtmlButton: Visible = true:">
-    <button id="ctrl_8">
-    </button>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.HtmlControls.HtmlButton: Visible = false:">
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Visible = true:">
-    <span id="ctrl_10">
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.HtmlControls.HtmlGenericControl: Visible = false:">
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.HtmlControls.HtmlImage: Visible = true:">
-    <img id="ctrl_12" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.HtmlControls.HtmlImage: Visible = false:">
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.HtmlControls.HtmlInputButton: Visible = true:">
-    <input id="ctrl_14" type="button" name="ctrl_14" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.HtmlControls.HtmlInputButton: Visible = false:">
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Visible = true:">
-    <input id="ctrl_16" type="checkbox" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.HtmlControls.HtmlInputCheckBox: Visible = false:">
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.HtmlControls.HtmlInputFile: Visible = true:">
-    <input id="ctrl_18" type="file" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.HtmlControls.HtmlInputFile: Visible = false:">
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Visible = true:">
-    <input id="ctrl_20" type="hidden" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.HtmlControls.HtmlInputHidden: Visible = false:">
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.HtmlControls.HtmlInputImage: Visible = true:">
-    <input id="ctrl_22" type="image" name="ctrl_22" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.HtmlControls.HtmlInputImage: Visible = false:">
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Visible = true:">
-    <input id="ctrl_24" value="ctrl_24" name="" type="radio" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.HtmlControls.HtmlInputRadioButton: Visible = false:">
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.HtmlControls.HtmlInputText: Visible = true:">
-    <input id="ctrl_26" type="text" name="ctrl_26" />
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.HtmlControls.HtmlInputText: Visible = false:">
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.HtmlControls.HtmlSelect: Visible = true:">
-    <select id="ctrl_28" name="ctrl_28">
-    </select>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.HtmlControls.HtmlSelect: Visible = false:">
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.HtmlControls.HtmlTable: Visible = true:">
-    <table id="ctrl_30">
-      <tr>
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.HtmlControls.HtmlTable: Visible = false:">
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.HtmlControls.HtmlTableCell: Visible = true:">
-    <table>
-      <tr>
-        <td id="ctrl_32">Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.HtmlControls.HtmlTableCell: Visible = false:">
-    <table>
-      <tr>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.HtmlControls.HtmlTableRow: Visible = true:">
-    <table>
-      <tr id="ctrl_34">
-        <td>Cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.HtmlControls.HtmlTableRow: Visible = false:">
-    <table>
-    </table>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.HtmlControls.HtmlTextArea: Visible = true:">
-    <textarea id="ctrl_36" name="ctrl_36">
-    </textarea>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.HtmlControls.HtmlTextArea: Visible = false:">
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Button: Visible = true:">
-    <input value="" type="submit" name="ctrl_38" id="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Button: Visible = false:">
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.CheckBox: Visible = true:">
-    <input id="ctrl_40" type="checkbox" name="ctrl_40" />
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.CheckBox: Visible = false:">
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.HyperLink: Visible = true:">
-    <a id="ctrl_42">
-    </a>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.HyperLink: Visible = false:">
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.Image: Visible = true:">
-    <img id="ctrl_44" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.Image: Visible = false:">
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ImageButton: Visible = true:">
-    <input id="ctrl_46" alt="" border="0" type="image" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ImageButton: Visible = false:">
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.Label: Visible = true:">
-    <span id="ctrl_48">
-    </span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.Label: Visible = false:">
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.LinkButton: Visible = true:">
-    <a href="javascript:__doPostBack('ctrl_50','')" id="ctrl_50">
-    </a>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.LinkButton: Visible = false:">
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.Literal: Visible = true:">
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.Literal: Visible = false:">
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.Panel: Visible = true:">
-    <div id="ctrl_54">
-    </div>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.Panel: Visible = false:">
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.PlaceHolder: Visible = true:">
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.PlaceHolder: Visible = false:">
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.RadioButton: Visible = true:">
-    <input id="ctrl_58" type="radio" name="ctrl_58" value="ctrl_58" />
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.RadioButton: Visible = false:">
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.TextBox: Visible = true:">
-    <input id="ctrl_60" type="text" name="ctrl_60" />
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.TextBox: Visible = false:">
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DropDownList: Visible = true:">
-    <select id="ctrl_62" name="ctrl_62">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DropDownList: Visible = false:">
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.ListBox: Visible = true:">
-    <select id="ctrl_64" size="4" name="ctrl_64">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.ListBox: Visible = false:">
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.RadioButtonList: Visible = true:">
-    <table id="ctrl_66" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="radio" name="ctrl_66" value="1" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="radio" name="ctrl_66" value="2" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="radio" name="ctrl_66" value="3" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="radio" name="ctrl_66" value="4" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.RadioButtonList: Visible = false:">
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Visible = true:">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Visible = false:">
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Visible = true:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Visible = false:">
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGridItem: Visible = true:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_72_ctrl_73">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGridItem: Visible = false:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataList: Visible = true:">
-    <table id="ctrl_76" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_HRef.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_HRef.aspx.xml
deleted file mode 100644
index 8b3fff21cdc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_HRef.aspx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <a href="http://localhost/ght" id="anchor1" name="anchor1">Anchor1</a>
-  </div>
-  <div id="GhtSubTest2" style="height:56px;width:553px">
-    <a href="#top" id="anchor2" name="anchor2">Anchor2</a>
-  </div>
-  <div id="GhtSubTest3" style="height:59px;width:553px">
-    <a href="874y5/........../n3th293" id="anchor3" name="anchor3">Anchor3</a>
-  </div>
-  <div id="GhtSubTest4" style="height:59px;width:553px">
-    <a href="http://localhost/ght" id="anchor4" name="anchor4">Anchor4</a>
-    <span>
-      <br />http://localhost/ght</span>
-  </div>
-  <div id="GhtSubTest5" style="height:59px;width:553px">
-    <a href="http://lo!@#$%^&amp;*()calhost/ght" id="anchor5" name="anchor5">Anchor5</a>
-    <span>
-      <br />http://lo!@#$%^&amp;*()calhost/ght</span>
-  </div>
-  <div id="GhtSubTest6" style="height:59px;width:553px">
-    <a href="123" id="anchor6" name="anchor5">Anchor6</a>
-    <span>
-      <br />123</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Name.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Name.aspx.xml
deleted file mode 100644
index 67822aa9145..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Name.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <a href="http://www.google.com" id="anchor1" name="anchor1">Anchor1</a>
-  </div>
-  <div id="Ghtsubtest2" style="height:56px;width:553px">
-    <a href="http://www.google.com" id="anchor2" name="anchor2_!@#$%^&amp;*()">
-						Anchor2</a>
-  </div>
-  <div id="Ghtsubtest3" style="height:59px;width:553px">
-    <a href="http://www.google.com" id="anchor3" name="name_anchor3">Anchor3</a>
-    <span>
-      <br />name_anchor3</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:59px;width:553px">
-    <a href="http://www.google.com" id="anchor4" name="123">Anchor4</a>
-    <span>
-      <br />123</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Target.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Target.aspx.xml
deleted file mode 100644
index 1a3458ac388..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Target.aspx.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="A1" name="anchor1">anchor1</a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="A2" name="anchor2" target="_blank">
-						anchor2</a>
-    <span>
-      <br />_blank</span>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="A3" name="anchor3" target="_self">
-						anchor3</a>
-    <span>
-      <br />_self</span>
-  </div>
-  <div id="GHTSubTest4" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="A4" name="anchor4" target="123">
-						anchor4</a>
-    <span>
-      <br />123</span>
-  </div>
-  <div id="GHTSubTest5" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="A5" name="anchor5">
-						anchor5</a>
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Title.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Title.aspx.xml
deleted file mode 100644
index 342e3b6ddf6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_Title.aspx.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="anchor1" title="title of anchor1" name="anchor1">Anchor1</a>
-    <span>
-      <br />title of anchor1</span>
-  </div>
-  <div id="GHTSubTest2" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="anchor2" title="New title" name="anchor2">Anchor2</a>
-    <span>
-      <br />New title</span>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;width:553px">
-    <a href="http://www.microsoft.com" id="anchor3" title="123" name="anchor3">Anchor3</a>
-    <span>
-      <br />123</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_ctor_.aspx.xml
deleted file mode 100644
index 0f2cf25db79..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlAnchor_HtmlAnchor_ctor_.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;width:553px">
-    <a href="telnet://192.1.1.1" id="anchor1" name="anchor1">Anchor1</a>
-  </div>
-  <div id="GHTSubTest2" style="height:64px;width:553px">
-    <a href="http://localhost/" id="anchor2" title="title" name="anchor2" target="_blank">Anchor2</a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlButton_HtmlButton_CausesValidation.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlButton_HtmlButton_CausesValidation.aspx.xml
deleted file mode 100644
index 469c8f92467..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlButton_HtmlButton_CausesValidation.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Causes validation = false">
-    <button>
-    </button>
-  </div>
-  <div id="GHTSubTest2" testname="Causes validation = true">
-    <button>
-    </button>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlButton_HtmlButton_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlButton_HtmlButton_ctor_.aspx.xml
deleted file mode 100644
index 3918f66a3a1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlButton_HtmlButton_ctor_.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:464px">
-    <input id="Button1" type="button" name="Button1" value="Button" />
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:464px">
-    <input id="Reset1" type="reset" name="Reset1" value="Reset" />
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:464px">
-    <input id="Submit1" type="submit" name="Submit1" value="Submit" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlContainerControl_HtmlContainerControl_InnerHtml.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlContainerControl_HtmlContainerControl_InnerHtml.aspx.xml
deleted file mode 100644
index 56949d66e31..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlContainerControl_HtmlContainerControl_InnerHtml.aspx.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="HTMLButton_InnerHTML_1">
-    <button>sample text</button>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest2" testname="HTMLAnchor_InnerHTML_1">
-    <a>sample text</a>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest3" testname="HtmlTextArea_InnerHTML_1">
-    <textarea name="_ctl4">sample text</textarea>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest4" testname="HtmlGenericControl_InnerHTML_1">
-    <span>sample text</span>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest5" testname="HTMLButton_InnerHTML_2">
-    <button>other text: ~!@#$%^&amp;*()_+</button>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest6" testname="HTMLAnchor_InnerHTML_2">
-    <a>other text: ~!@#$%^&amp;*()_+</a>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest7" testname="HtmlTextArea_InnerHTML_2">
-    <textarea name="_ctl12">other text: ~!@#$%^&amp;*()_+</textarea>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest8" testname="HtmlGenericControl_InnerHTML_2">
-    <span>other text: ~!@#$%^&amp;*()_+</span>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest9" testname="HTMLButton_InnerHTML_3">
-    <button>
-      <b>Bold</b>
-    </button>
-    <span>
-      <br />
-      <b>Bold</b>
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="HTMLAnchor_InnerHTML_3">
-    <a>
-      <b>Bold</b>
-    </a>
-    <span>
-      <br />
-      <b>Bold</b>
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="HtmlTextArea_InnerHTML_3">
-    <textarea name="_ctl20">
-      <b>Bold</b>
-    </textarea>
-    <span>
-      <br />
-      <b>Bold</b>
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="HtmlGenericControl_InnerHTML_3">
-    <span>
-      <b>Bold</b>
-    </span>
-    <span>
-      <br />
-      <b>Bold</b>
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="HTMLButton_InnerHTML_5">
-    <button>
-    </button>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="HTMLAnchor_InnerHTML_5">
-    <a>
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest15" testname="HtmlTextArea_InnerHTML_5">
-    <textarea name="_ctl28">
-    </textarea>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest16" testname="HtmlGenericControl_InnerHTML_5">
-    <span>
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlContainerControl_HtmlContainerControl_InnerText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlContainerControl_HtmlContainerControl_InnerText.aspx.xml
deleted file mode 100644
index 42d86c5faf9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlContainerControl_HtmlContainerControl_InnerText.aspx.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="HTMLButton_InnerText_1">
-    <button>sample text</button>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest2" testname="HTMLAnchor_InnerText_1">
-    <a>sample text</a>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest3" testname="HtmlTextArea_InnerText_1">
-    <textarea name="_ctl4">sample text</textarea>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest4" testname="HtmlGenericControl_InnerText_1">
-    <span>sample text</span>
-    <span>
-      <br />sample text</span>
-  </div>
-  <div id="GHTSubTest5" testname="HTMLButton_InnerText_2">
-    <button>other text: ~!@#$%^&amp;*()_+</button>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest6" testname="HTMLAnchor_InnerText_2">
-    <a>other text: ~!@#$%^&amp;*()_+</a>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest7" testname="HtmlTextArea_InnerText_2">
-    <textarea name="_ctl12">other text: ~!@#$%^&amp;*()_+</textarea>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest8" testname="HtmlGenericControl_InnerText_2">
-    <span>other text: ~!@#$%^&amp;*()_+</span>
-    <span>
-      <br />other text: ~!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="GHTSubTest9" testname="HTMLButton_InnerText_3">
-    <button>
-    </button>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="HTMLAnchor_InnerText_3">
-    <a>
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="HtmlTextArea_InnerText_3">
-    <textarea name="_ctl20">
-    </textarea>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="HtmlGenericControl_InnerText_3">
-    <span>
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Attributes.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Attributes.aspx.xml
deleted file mode 100644
index ed601d17564..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Attributes.aspx.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="HTMLInputButton_Attributes">
-    <input notid="ctl" id="ctl:HTMLInputButton_Attributes" space="sp a ce" type="button" name="_ctl0" no_value="" />
-    <span>
-      <br />type=button,id=ctl:HTMLInputButton_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest2" testname="HTMLButton_Attributes">
-    <button notid="ctl" id="ctl:HTMLButton_Attributes" space="sp a ce" no_value="">
-    </button>
-    <span>
-      <br />id=ctl:HTMLButton_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest3" testname="HTMLAnchor_Attributes">
-    <a notid="ctl" id="ctl:HTMLAnchor_Attributes" space="sp a ce" no_value="">
-    </a>
-    <span>
-      <br />id=ctl:HTMLAnchor_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest4" testname="HtmlInputHidden_Attributes">
-    <input notid="ctl" id="ctl:HtmlInputHidden_Attributes" space="sp a ce" type="hidden" name="_ctl6" no_value="" />
-    <span>
-      <br />type=hidden,id=ctl:HtmlInputHidden_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest5" testname="HtmlInputImage_Attributes">
-    <input notid="ctl" id="ctl:HtmlInputImage_Attributes" space="sp a ce" type="image" name="_ctl8" no_value="" />
-    <span>
-      <br />type=image,id=ctl:HtmlInputImage_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest6" testname="HtmlTextArea_Attributes">
-    <textarea notid="ctl" id="ctl:HtmlTextArea_Attributes" space="sp a ce" name="_ctl10" no_value="">
-    </textarea>
-    <span>
-      <br />id=ctl:HtmlTextArea_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest7" testname="HtmlGenericControl_Attributes">
-    <span notid="ctl" id="ctl:HtmlGenericControl_Attributes" space="sp a ce" no_value="">
-    </span>
-    <span>
-      <br />id=ctl:HtmlGenericControl_Attributes,notid=ctl,no_value=,space space=sp a ce</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Disabled.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Disabled.aspx.xml
deleted file mode 100644
index fca3f99fb5e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Disabled.aspx.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="HTMLInputButton_Disable_t">
-    <input disabled="disabled" type="button" name="_ctl0" />
-  </div>
-  <div id="GHTSubTest2" testname="HTMLInputButton_Disable_f">
-    <input type="button" name="_ctl1" />
-  </div>
-  <div id="GHTSubTest3" testname="HTMLButton_Disable_t">
-    <button disabled="disabled">
-    </button>
-  </div>
-  <div id="GHTSubTest4" testname="HTMLButton_Disable_f">
-    <button>
-    </button>
-  </div>
-  <div id="GHTSubTest5" testname="HTMLAnchor_Disable_t">
-    <a disabled="disabled">
-    </a>
-  </div>
-  <div id="GHTSubTest6" testname="HTMLAnchor_Disable_f">
-    <a>
-    </a>
-  </div>
-  <div id="GHTSubTest7" testname="HtmlInputHidden_Disable_t">
-    <input disabled="disabled" type="hidden" name="_ctl6" />
-  </div>
-  <div id="GHTSubTest8" testname="HtmlInputHidden_Disable_f">
-    <input type="hidden" name="_ctl7" />
-  </div>
-  <div id="GHTSubTest9" testname="HtmlInputImage_Disable_t">
-    <input disabled="disabled" type="image" name="_ctl8" />
-  </div>
-  <div id="GHTSubTest10" testname="HtmlInputImage_Disable_f">
-    <input type="image" name="_ctl9" />
-  </div>
-  <div id="GHTSubTest11" testname="HtmlTextArea_Disable_t">
-    <textarea disabled="disabled" name="_ctl10">
-    </textarea>
-  </div>
-  <div id="GHTSubTest12" testname="HtmlTextArea_Disable_f">
-    <textarea name="_ctl11">
-    </textarea>
-  </div>
-  <div id="GHTSubTest13" testname="HtmlGenericControl_Disable_t">
-    <span disabled="disabled">
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="HtmlGenericControl_Disable_f">
-    <span>
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Style.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Style.aspx.xml
deleted file mode 100644
index d65848011d0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_Style.aspx.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="HTMLInputButton_Style">
-    <input style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:" type="button" name="_ctl0" />
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest2" testname="HTMLButton_Style">
-    <button style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:">
-    </button>
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest3" testname="HTMLAnchor_Style">
-    <a style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:">
-    </a>
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest4" testname="HtmlInputHidden_Style">
-    <input style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:" type="hidden" name="_ctl6" />
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest5" testname="HtmlInputImage_Style">
-    <input style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:" type="image" name="_ctl8" />
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest6" testname="HtmlTextArea_Style">
-    <textarea style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:" name="_ctl10">
-    </textarea>
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-  <div id="GHTSubTest7" testname="HtmlGenericControl_Style">
-    <span style="background-color:#eeeeee;some-other-color:#eeeeee;space space:a ce sp;unknown-without-value:">
-    </span>
-    <span>
-      <br />background-color=#eeeeee,some-other-color=#eeeeee,unknown-without-value=,space space=sp a ce</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_TagName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_TagName.aspx.xml
deleted file mode 100644
index 496206f570f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlControl_HtmlControl_TagName.aspx.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="HTMLInputButton_TagName">
-    <input type="button" name="_ctl0" />
-    <span>
-      <br />input</span>
-  </div>
-  <div id="GHTSubTest2" testname="HTMLButton_TagName">
-    <button>
-    </button>
-    <span>
-      <br />button</span>
-  </div>
-  <div id="GHTSubTest3" testname="HTMLAnchor_TagName">
-    <a>
-    </a>
-    <span>
-      <br />a</span>
-  </div>
-  <div id="GHTSubTest4" testname="HtmlInputHidden_TagName">
-    <input type="hidden" name="_ctl6" />
-    <span>
-      <br />input</span>
-  </div>
-  <div id="GHTSubTest5" testname="HtmlInputImage_TagName">
-    <input type="image" name="_ctl8" />
-    <span>
-      <br />input</span>
-  </div>
-  <div id="GHTSubTest6" testname="HtmlTextArea_TagName">
-    <textarea name="_ctl10">
-    </textarea>
-    <span>
-      <br />textarea</span>
-  </div>
-  <div id="GHTSubTest7" testname="HtmlGenericControl_TagName">
-    <span>
-    </span>
-    <span>
-      <br />span</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype.aspx.xml
deleted file mode 100644
index 289231d9a4d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Enctype.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+KjTszsgsTw7M5QULW53YmBy4NS8=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype1.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype1.aspx.xml
deleted file mode 100644
index 37afb20f6b1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype1.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;width:553px">
-    <form id="myForm1" enctype="sfgs.dg.sd.f.sdf.sd.f!@#$%^*()" method="post" name="myForm1" action="HtmlForm_Enctype1.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+yqHerG/jN5npitXHwZCYfy9gf20=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype2.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype2.aspx.xml
deleted file mode 100644
index 62fb8849322..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Enctype2.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Enctype2.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+ZVVJ14koE4i3Nf0V3dOrEeTzZz0=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method.aspx.xml
deleted file mode 100644
index 754ff741b68..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Method.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+KM9ehWirB8glF+MKPqh6k/ePt30=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method1.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method1.aspx.xml
deleted file mode 100644
index 033e45035a8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method1.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="asdljhfkj.sd.sd..df." name="myForm1" action="HtmlForm_Method1.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+pYpmJlUUUTnBhDtd37sUNiIa9VY=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method2.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method2.aspx.xml
deleted file mode 100644
index 630431d7e77..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Method2.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Method2.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+4qOFAEL+VVM7qIo79Y7W/Is8ZRU=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name.aspx.xml
deleted file mode 100644
index 4ea60ad588f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Name.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+ccmPcvqLZq3iXgmLGnJY4FzdQMU=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name1.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name1.aspx.xml
deleted file mode 100644
index 7bce9adcb99..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name1.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Name1.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+cLrgXc9hSbRIgOXKKcifWOYxR28=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name2.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name2.aspx.xml
deleted file mode 100644
index 21eec1f9aef..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Name2.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Name2.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+nPIExuRKZLTUeWRm8I9thX4eJAs=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target.aspx.xml
deleted file mode 100644
index 33fbc61275b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" target="update.aspx" action="HtmlForm_Target.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+v2r6Vb8D5UZoXivxa7ZSpV71mOo=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target1.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target1.aspx.xml
deleted file mode 100644
index 1b4f684d0ca..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target1.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" target="_self" action="HtmlForm_Target1.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+FIy1b02/9sFsFjJ5Xq7wflO/EBg=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target2.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target2.aspx.xml
deleted file mode 100644
index ef5055ef8b4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlForm_HtmlForm_Target2.aspx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:152px;width:553px">
-    <form id="myForm1" enctype="application/x-www-form-urlencoded" method="post" name="myForm1" action="HtmlForm_Target2.aspx" />
-    <input value="dDwtODIyNzg3MTI3Ozs+4Ony8m9YttnMLFUZebho7vDsL1Q=" type="hidden" name="__VIEWSTATE" />
-	
-			&lt;/form&gt;
-		
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_TagName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_TagName.aspx.xml
deleted file mode 100644
index 5d95dc1b3af..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_TagName.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <span id="myDiv">text in div</span>
-    <span>
-      <br />span</span>
-  </div>
-  <div id="GHTSubTest2" style="height:88px;width:553px">
-    <unknown id="myUnknown1">text in unknown1</unknown>
-    <span>
-      <br />unknown</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:88px;width:553px">
-	
-				text in unknown2
-			<span><br /></span></div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_ctor_.aspx.xml
deleted file mode 100644
index 3a6bc14b267..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_ctor_.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <div id="myDiv1">text in div</div>
-  </div>
-  <div id="GHTSubTest2" style="height:88px;width:553px">
-    <span id="mySpan1">text in span</span>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:553px">
-    <p id="myParagraph1">text in paragraph1</p>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:553px">
-    <p id="myParagraph2">text in paragraph2</p>
-    <span>
-      <br />P</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_ctor_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_ctor_S.aspx.xml
deleted file mode 100644
index 57b748ad050..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlGenericControl_HtmlGenericControl_ctor_S.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;width:553px">
-    <div>
-    </div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputButton_HtmlInputButton_CausesValidation.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputButton_HtmlInputButton_CausesValidation.aspx.xml
deleted file mode 100644
index 47197cdb544..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputButton_HtmlInputButton_CausesValidation.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Causes validation = false">
-    <input type="button" name="_ctl0" />
-  </div>
-  <div id="GHTSubTest2" testname="Causes validation = true">
-    <input type="button" name="_ctl1" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputHidden_HtmlInputHidden_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputHidden_HtmlInputHidden_ctor_.aspx.xml
deleted file mode 100644
index a9feabcb341..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputHidden_HtmlInputHidden_ctor_.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:553px">
-    <input id="Hidden1" type="hidden" name="Hidden1" value="value" />
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:553px">
-    <input id="Hidden2" type="hidden" name="Hidden2" value="new value of hidden2" />
-    <span>
-      <br />new value of hidden2</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Align.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Align.aspx.xml
deleted file mode 100644
index 861fa842721..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Align.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <input id="Image1" src="/test.img" align="left" type="image" name="Image1" value="value of ImageInput1" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <input id="Image2" src="/test.img" align="notExist" type="image" name="Image2" value="value of ImageInput2" />
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-    <input id="Image3" src="/test.img" type="image" name="Image3" value="value of ImageInput3" />
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-    <input id="Image4" src="/test.img" align="left" type="image" name="Image4" value="value of ImageInput4" />
-    <span>
-      <br />left</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Alt.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Alt.aspx.xml
deleted file mode 100644
index 59995036330..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Alt.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <input id="Image1" alt="alt of ImageInput1" src="/test.img" type="image" name="Image1" value="value of ImageInput1" />
-  </div>
-  <div id="Ghtsubtest2" style="height:56px;width:553px">
-    <input id="Image2" src="/test.img" type="image" name="Image2" value="value of ImageInput1" />
-  </div>
-  <div id="Ghtsubtest3" style="height:56px;width:553px">
-    <input id="Image3" alt="code inserted alt" src="/test.img" type="image" name="Image3" value="value of ImageInput1" />
-    <span>
-      <br />code inserted alt</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:56px;width:553px">
-    <input id="Image4" alt="123" src="/test.img" type="image" name="Image4" value="value of ImageInput1" />
-    <span>
-      <br />123</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Border.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Border.aspx.xml
deleted file mode 100644
index 92bcfc3eefa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Border.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <input id="Image1" src="/test.img" type="image" name="Image1" border="0" value="value of ImageInput1" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <input id="Image2" src="/test.img" type="image" name="Image2" border="2" value="value of ImageInput2" />
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-    <input id="Image3" src="/test.img" type="image" name="Image3" border="2" value="value of ImageInput3" />
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-    <input id="Image4" src="/test.img" type="image" name="Image4" value="value of ImageInput4" />
-  </div>
-  <div id="Ghtsubtest5" style="height:56px;width:553px">
-    <input id="Image5" src="/test.img" type="image" name="Image5" border="7" value="value of ImageInput4" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_CausesValidation.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_CausesValidation.aspx.xml
deleted file mode 100644
index 8bad3a6ac44..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_CausesValidation.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <input id="Image1" src="/test.img" type="image" name="Image1" value="value of ImageInput1" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <input id="Image2" src="/test.img" type="image" name="Image2" value="value of ImageInput2" />
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Src.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Src.aspx.xml
deleted file mode 100644
index 116d94dae2c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_Src.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <input id="Image1" src="/test.img" type="image" name="Image1" value="value of ImageInput1" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <input id="Image2" type="image" name="Image2" value="value of ImageInput2" />
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-    <input id="Image3" src="/image.jpg" type="image" name="Image3" value="value of ImageInput3" />
-    <span>
-      <br />/image.jpg</span>
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-    <input id="Image4" src="123" type="image" name="Image4" value="value of ImageInput4" />
-    <span>
-      <br />123</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_ctor_.aspx.xml
deleted file mode 100644
index 240652110de..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlInputImage_HtmlInputImage_ctor_.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <input id="InputImage1" src="/test.img" type="image" name="InputImage1" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Cols.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Cols.aspx.xml
deleted file mode 100644
index b881afe3f5d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Cols.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA1" rows="2" name="TEXTAREA1">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <textarea cols="10" id="Textarea2" rows="2" name="Textarea2">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-    <textarea cols="0" id="Textarea3" rows="2" name="Textarea3">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-    <textarea cols="-20" id="Textarea4" rows="2" name="Textarea4">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest5" style="height:56px;width:553px">
-    <textarea cols="7" id="Textarea5" rows="2" name="Textarea5">Sample Text</textarea>
-    <span>
-      <br />7</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Name.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Name.aspx.xml
deleted file mode 100644
index c264cd13d66..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Name.aspx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA1" rows="2" name="TEXTAREA1">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA2" rows="2" name="TEXTAREA2">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA3" rows="2" name="TEXTAREA3">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA4" rows="2" name="TEXTAREA4">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest5" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA5" rows="2" name="TEXTAREA5">Sample Text</textarea>
-    <span>
-      <br />TEXTAREA5</span>
-  </div>
-  <div id="GHTSubTest6" style="height:56px;width:553px">
-    <textarea cols="20" id="Textarea6" rows="2" name="Textarea6">Sample Text</textarea>
-    <span>
-      <br />Textarea6</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Rows.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Rows.aspx.xml
deleted file mode 100644
index df4300be30a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Rows.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;width:553px">
-    <textarea cols="20" id="TEXTAREA1" rows="2" name="TEXTAREA1">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest2" style="height:64px;width:553px">
-    <textarea cols="20" id="Textarea2" rows="20" name="Textarea2">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;width:553px">
-    <textarea cols="20" id="Textarea3" rows="-20" name="Textarea3">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest4" style="height:64px;width:553px">
-    <textarea cols="20" id="Textarea4" rows="0" name="Textarea4">Sample Text</textarea>
-  </div>
-  <div id="GHTSubTest5" style="height:64px;width:553px">
-    <textarea cols="20" id="Textarea5" rows="7" name="Textarea5">Sample Text</textarea>
-    <span>
-      <br />7</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Value.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Value.aspx.xml
deleted file mode 100644
index 6af8f2d8972..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_Value.aspx.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA1" rows="2" name="TEXTAREA1">
-    </textarea>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA2" rows="2" name="TEXTAREA2">Sample Value</textarea>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA3" rows="2" name="TEXTAREA3">123</textarea>
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA4" rows="2" name="TEXTAREA4">"text text text"</textarea>
-  </div>
-  <div id="GHTSubTest5" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA5" rows="2" name="TEXTAREA5">new value</textarea>
-    <span>
-      <br />new value</span>
-  </div>
-  <div id="GHTSubTest6" style="height:56px;width:553px">
-    <textarea cols="20" id="TEXTAREA6" rows="2" name="TEXTAREA6">123</textarea>
-    <span>
-      <br />123</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_.aspx.xml
deleted file mode 100644
index f0e8cf2376b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;width:553px">
-    <textarea cols="20" id="TEXTAREA1" rows="2" name="TEXTAREA1">Sample Text</textarea>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_2.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_2.aspx.xml
deleted file mode 100644
index f6fb7c4045b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_2.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GHTSubTest1">
-    <textarea name="_ctl0">sample text</textarea>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_3.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_3.aspx.xml
deleted file mode 100644
index f0e8cf2376b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlControls_HtmlTextArea_HtmlTextArea_ctor_3.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;width:553px">
-    <textarea cols="20" id="TEXTAREA1" rows="2" name="TEXTAREA1">Sample Text</textarea>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterAttribute_HtmlTextWriterAttribute_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterAttribute_HtmlTextWriterAttribute_Enum.aspx.xml
deleted file mode 100644
index 374ca9550f0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterAttribute_HtmlTextWriterAttribute_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.HtmlTextWriterAttribute">
-    <span>
-      <br />Accesskey; Align; Alt; Background; Bgcolor; Border; Bordercolor; Cellpadding; Cellspacing; Checked; Class; Cols; Colspan; Disabled; For; Height; Href; Id; Maxlength; Multiple; Name; Nowrap; Onchange; Onclick; ReadOnly; Rows; Rowspan; Rules; Selected; Size; Src; Style; Tabindex; Target; Title; Type; Valign; Value; Width; Wrap; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; 13; 14; 15; 16; 17; 18; 19; 20; 21; 22; 23; 24; 25; 26; 27; 28; 29; 30; 31; 32; 33; 34; 35; 36; 37; 38; 39; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterStyle_HtmlTextWriterStyle_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterStyle_HtmlTextWriterStyle_Enum.aspx.xml
deleted file mode 100644
index ac7441b4643..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterStyle_HtmlTextWriterStyle_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.HtmlTextWriterStyle">
-    <span>
-      <br />BackgroundColor; BackgroundImage; BorderCollapse; BorderColor; BorderStyle; BorderWidth; Color; FontFamily; FontSize; FontStyle; FontWeight; Height; TextDecoration; Width; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; 13; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterTag_HtmlTextWriterTag_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterTag_HtmlTextWriterTag_Enum.aspx.xml
deleted file mode 100644
index 4b1bf612ded..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_HtmlTextWriterTag_HtmlTextWriterTag_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.HtmlTextWriterTag">
-    <span>
-      <br />Unknown; A; Acronym; Address; Area; B; Base; Basefont; Bdo; Bgsound; Big; Blockquote; Body; Br; Button; Caption; Center; Cite; Code; Col; Colgroup; Dd; Del; Dfn; Dir; Div; Dl; Dt; Em; Embed; Fieldset; Font; Form; Frame; Frameset; H1; H2; H3; H4; H5; H6; Head; Hr; Html; I; Iframe; Img; Input; Ins; Isindex; Kbd; Label; Legend; Li; Link; Map; Marquee; Menu; Meta; Nobr; Noframes; Noscript; Object; Ol; Option; P; Param; Pre; Q; Rt; Ruby; S; Samp; Script; Select; Small; Span; Strike; Strong; Style; Sub; Sup; Table; Tbody; Td; Textarea; Tfoot; Th; Thead; Title; Tr; Tt; U; Ul; Var; Wbr; Xml; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; 13; 14; 15; 16; 17; 18; 19; 20; 21; 22; 23; 24; 25; 26; 27; 28; 29; 30; 31; 32; 33; 34; 35; 36; 37; 38; 39; 40; 41; 42; 43; 44; 45; 46; 47; 48; 49; 50; 51; 52; 53; 54; 55; 56; 57; 58; 59; 60; 61; 62; 63; 64; 65; 66; 67; 68; 69; 70; 71; 72; 73; 74; 75; 76; 77; 78; 79; 80; 81; 82; 83; 84; 85; 86; 87; 88; 89; 90; 91; 92; 93; 94; 95; 96; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Page_Page_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Page_Page_ctor_.aspx.xml
deleted file mode 100644
index 2c21ee649fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_Page_Page_ctor_.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-	
-            aspx code is trying to access a protected variable from the code behind <br /><script language="javascript">
-//<![CDATA[
-
-					var b = False;
-				
-//]]>//
-</script><span id="Label1">#bTestAccessScopeProtected.ToString()</span></div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_ValidationPropertyAttribute_ValidationPropertyAttribute_ctor_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_ValidationPropertyAttribute_ValidationPropertyAttribute_ctor_S.aspx.xml
deleted file mode 100644
index 7cd7d0b84bb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_ValidationPropertyAttribute_ValidationPropertyAttribute_ctor_S.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="ValidationPropertyAttribute inherited into Custom Control">
-    <input id="MyTextBox2" type="text" name="MyTextBox2" />
-    <input type="text" name="_ctl1" />
-    <span>
-      <br />GHTSubTest1</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_CellPadding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_CellPadding.aspx.xml
deleted file mode 100644
index 5928544128e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_CellPadding.aspx.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:123px;width:176px" designtimedragdrop="36">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>col a</td>
-        <td>col b</td>
-        <td>col C</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div tabindex="5" id="GHTSubTest2" style="height:40px;width:277px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" cellpadding="0" rules="all" id="DataGrid2">
-      <tr>
-        <td>col a</td>
-        <td>col b</td>
-        <td>col C</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:148px;width:225px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" cellpadding="2" rules="all" id="DataGrid3">
-      <tr>
-        <td>col a</td>
-        <td>col b</td>
-        <td>col C</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div tabindex="5" id="GHTSubTest4" style="height:40px;width:215px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" style="width:86px">
-    <table id="DataList1" cellspacing="0" border="1" style="border-collapse:collapse" rules="all">
-      <tr>
-        <td>
-          <td>row 1</td>
-          <td>11111</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>row 22222</td>
-          <td>2</td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="width:86px">
-    <table id="DataList2" cellspacing="0" border="1" style="border-collapse:collapse" cellpadding="0" rules="all">
-      <tr>
-        <td>
-          <td>row 1</td>
-          <td>11111</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>row 22222</td>
-          <td>2</td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" style="width:103px">
-    <table id="DataList3" cellspacing="0" border="1" style="border-collapse:collapse" cellpadding="2" rules="all" designtimedragdrop="258">
-      <tr>
-        <td>
-          <td>row 1</td>
-          <td>11111</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>row 22222</td>
-          <td>2</td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" style="width:93px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_CellSpacing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_CellSpacing.aspx.xml
deleted file mode 100644
index dd078c79295..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_CellSpacing.aspx.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:123px;width:176px" designtimedragdrop="36">
-    <table border="1" rules="all" id="DataGrid1">
-      <tr>
-        <td>col a</td>
-        <td>col b</td>
-        <td>col C</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div tabindex="5" id="GHTSubTest2" style="height:40px;width:277px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" cellpadding="5" rules="all" id="DataGrid2">
-      <tr>
-        <td>col a</td>
-        <td>col b</td>
-        <td>col C</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:148px;width:225px">
-    <table border="1" cellspacing="2" cellpadding="0" rules="all" id="DataGrid3">
-      <tr>
-        <td>col a</td>
-        <td>col b</td>
-        <td>col C</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div tabindex="5" id="GHTSubTest4" style="height:40px;width:215px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" style="width:86px">
-    <table id="DataList1" border="1" rules="all">
-      <tr>
-        <td>
-          <input value="row 1" style="width:39px" type="text" name="DataList1:_ctl0:TextBox1" id="DataList1__ctl0_TextBox1" />
-          <input value="11111" style="width:31px" type="text" name="DataList1:_ctl0:TextBox2" id="DataList1__ctl0_TextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" style="width:39px" type="text" name="DataList1:_ctl1:TextBox1" id="DataList1__ctl1_TextBox1" />
-          <input value="2" style="width:31px" type="text" name="DataList1:_ctl1:TextBox2" id="DataList1__ctl1_TextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="width:86px">
-    <table id="DataList2" cellspacing="0" border="1" style="border-collapse:collapse" rules="all">
-      <tr>
-        <td>
-          <input value="row 1" style="width:39px" type="text" name="DataList2:_ctl0:TextBox1" id="DataList2__ctl0_TextBox1" />
-          <input value="11111" style="width:31px" type="text" name="DataList2:_ctl0:TextBox2" id="DataList2__ctl0_TextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" style="width:39px" type="text" name="DataList2:_ctl1:TextBox1" id="DataList2__ctl1_TextBox1" />
-          <input value="2" style="width:31px" type="text" name="DataList2:_ctl1:TextBox2" id="DataList2__ctl1_TextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" style="width:103px">
-    <table id="DataList3" cellspacing="2" border="1" rules="all" designtimedragdrop="258">
-      <tr>
-        <td>
-          <input value="row 1" style="width:39px" type="text" name="DataList3:_ctl0:TextBox1" id="DataList3__ctl0_TextBox1" />
-          <input value="11111" style="width:31px" type="text" name="DataList3:_ctl0:TextBox2" id="DataList3__ctl0_TextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" style="width:39px" type="text" name="DataList3:_ctl1:TextBox1" id="DataList3__ctl1_TextBox1" />
-          <input value="2" style="width:31px" type="text" name="DataList3:_ctl1:TextBox2" id="DataList3__ctl1_TextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" style="width:93px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_Controls.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_Controls.aspx.xml
deleted file mode 100644
index 6d3a23cbf1f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_Controls.aspx.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_Controls1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataList_Controls1">
-    <table id="_ctl1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl1:_ctl0:MyTextBox1" id="_ctl1__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl1:_ctl0:MyTextBox2" id="_ctl1__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl1:_ctl1:MyTextBox1" id="_ctl1__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl1:_ctl1:MyTextBox2" id="_ctl1__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataBind_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataBind_.aspx.xml
deleted file mode 100644
index 1d2ed3c07fe..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataBind_.aspx.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_DataBind1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_DataBind2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataList_DataBind1">
-    <table id="_ctl3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl3:_ctl0:MyTextBox1" id="_ctl3__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl3:_ctl0:MyTextBox2" id="_ctl3__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl3:_ctl1:MyTextBox1" id="_ctl3__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl3:_ctl1:MyTextBox2" id="_ctl3__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataList_DataBind2">
-    <table id="_ctl4" cellspacing="0" border="0" style="border-collapse:collapse">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="BaseDataList_DataGrid_DataBind3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl6">
-      <tr>
-        <td>TestId</td>
-        <td>Name</td>
-      </tr>
-      <tr>
-        <td>13266</td>
-        <td>OleDbCommand_Transaction</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataKeyField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataKeyField.aspx.xml
deleted file mode 100644
index fd014d3f99c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataKeyField.aspx.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_DataKeyField1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_DataKeyField2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-    <span>
-      <br />Result = colB</span>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataGrid_DataKeyField3">
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataList_DataKeyField1">
-    <table id="_ctl4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl4:_ctl0:MyTextBox1" id="_ctl4__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl4:_ctl0:MyTextBox2" id="_ctl4__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl4:_ctl1:MyTextBox1" id="_ctl4__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl4:_ctl1:MyTextBox2" id="_ctl4__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="BaseDataList_DataList_DataKeyField2">
-    <table id="_ctl5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl5:_ctl0:MyTextBox1" id="_ctl5__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl5:_ctl0:MyTextBox2" id="_ctl5__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl5:_ctl1:MyTextBox1" id="_ctl5__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl5:_ctl1:MyTextBox2" id="_ctl5__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Result = colB</span>
-  </div>
-  <div id="GHTSubTest6" testname="BaseDataList_DataList_DataKeyField3">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataKeys.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataKeys.aspx.xml
deleted file mode 100644
index 0094684dbc8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataKeys.aspx.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_DataKeys1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-    <span>
-      <br />DataKeys = row 1-row 22222-</span>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataList_DataKeys1">
-    <table id="_ctl2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl2:_ctl0:MyTextBox1" id="_ctl2__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl2:_ctl0:MyTextBox2" id="_ctl2__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl2:_ctl1:MyTextBox1" id="_ctl2__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl2:_ctl1:MyTextBox2" id="_ctl2__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />DataKeys = row 1-row 22222-</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataMember.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataMember.aspx.xml
deleted file mode 100644
index 3698a3fdf63..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataMember.aspx.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_DataMember1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_DataMember1">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataList_DataMember1">
-    <table id="_ctl3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl3:_ctl0:MyTextBox1" id="_ctl3__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl3:_ctl0:MyTextBox2" id="_ctl3__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl3:_ctl1:MyTextBox1" id="_ctl3__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl3:_ctl1:MyTextBox2" id="_ctl3__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataList_DataMember1">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataSource.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataSource.aspx.xml
deleted file mode 100644
index 69886dcb162..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_DataSource.aspx.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_DataSource1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_DataSource2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataGrid_DataSource3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>A</td>
-      </tr>
-      <tr>
-        <td>B</td>
-      </tr>
-      <tr>
-        <td>C</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataGrid_DataSource5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="BaseDataList_DataGrid_DataSource6">
-  </div>
-  <div id="GHTSubTest6" testname="BaseDataList_DataList_DataSource1">
-    <table id="_ctl6" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl6:_ctl0:MyTextBox1" id="_ctl6__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl6:_ctl0:MyTextBox2" id="_ctl6__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl6:_ctl1:MyTextBox1" id="_ctl6__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl6:_ctl1:MyTextBox2" id="_ctl6__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="BaseDataList_DataList_DataSource2">
-    <table id="_ctl7" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl7:_ctl0:MyTextBox1" id="_ctl7__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl7:_ctl0:MyTextBox2" id="_ctl7__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl7:_ctl1:MyTextBox1" id="_ctl7__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl7:_ctl1:MyTextBox2" id="_ctl7__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" testname="BaseDataList_DataList_DataSource3">
-    <table id="_ctl8" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="BaseDataList_DataList_DataSource5">
-    <table id="_ctl9" cellspacing="0" border="0" style="border-collapse:collapse">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest10" testname="BaseDataList_DataList_DataSource6">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_GridLines.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_GridLines.aspx.xml
deleted file mode 100644
index 2798be98ef3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_GridLines.aspx.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_GridLines1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test failed. Expected argumentOutOfRange exception was not caught.</span>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_GridLines2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="rows" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataGrid_GridLines3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="cols" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataGrid_GridLines4">
-    <table border="0" cellspacing="0" style="border-collapse:collapse" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="BaseDataList_DataGrid_GridLines5">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest6" testname="BaseDataList_DataGrid_GridLines5">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="BaseDataList_DataList_GridLines1">
-    <table id="_ctl9" cellspacing="0" border="1" style="border-collapse:collapse" rules="all">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl9:_ctl0:MyTextBox1" id="_ctl9__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl9:_ctl0:MyTextBox2" id="_ctl9__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl9:_ctl1:MyTextBox1" id="_ctl9__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl9:_ctl1:MyTextBox2" id="_ctl9__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test failed. Expected argumentOutOfRange exception was not caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="BaseDataList_DataList_GridLines2">
-    <table id="_ctl11" cellspacing="0" border="1" style="border-collapse:collapse" rules="rows">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl11:_ctl0:MyTextBox1" id="_ctl11__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl11:_ctl0:MyTextBox2" id="_ctl11__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl11:_ctl1:MyTextBox1" id="_ctl11__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl11:_ctl1:MyTextBox2" id="_ctl11__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="BaseDataList_DataList_GridLines3">
-    <table id="_ctl12" cellspacing="0" border="1" style="border-collapse:collapse" rules="cols">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl12:_ctl0:MyTextBox1" id="_ctl12__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl12:_ctl0:MyTextBox2" id="_ctl12__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl12:_ctl1:MyTextBox1" id="_ctl12__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl12:_ctl1:MyTextBox2" id="_ctl12__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="BaseDataList_DataList_GridLines4">
-    <table id="_ctl13" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl13:_ctl0:MyTextBox1" id="_ctl13__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl13:_ctl0:MyTextBox2" id="_ctl13__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl13:_ctl1:MyTextBox1" id="_ctl13__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl13:_ctl1:MyTextBox2" id="_ctl13__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="BaseDataList_DataList_GridLines5">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest12" testname="BaseDataList_DataList_GridLines5">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_HorizontalAlign.aspx.xml
deleted file mode 100644
index a1339e1e5a8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_HorizontalAlign1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" align="Center" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_HorizontalAlign2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" align="Justify" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataGrid_HorizontalAlign3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" align="Left" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataGrid_HorizontalAlign4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="BaseDataList_DataGrid_HorizontalAlign5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" align="Right" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="BaseDataList_DataGrid_HorizontalAlign6">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="BaseDataList_DataGrid_HorizontalAlign7">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="BaseDataList_DataList_HorizontalAlign1">
-    <table id="_ctl9" cellspacing="0" border="0" align="Center" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl9:_ctl0:MyTextBox1" id="_ctl9__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl9:_ctl0:MyTextBox2" id="_ctl9__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl9:_ctl1:MyTextBox1" id="_ctl9__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl9:_ctl1:MyTextBox2" id="_ctl9__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="BaseDataList_DataList_HorizontalAlign2">
-    <table id="_ctl10" cellspacing="0" border="0" align="Justify" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl10:_ctl0:MyTextBox1" id="_ctl10__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl10:_ctl0:MyTextBox2" id="_ctl10__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl10:_ctl1:MyTextBox1" id="_ctl10__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl10:_ctl1:MyTextBox2" id="_ctl10__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="BaseDataList_DataList_HorizontalAlign3">
-    <table id="_ctl11" cellspacing="0" border="0" align="Left" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl11:_ctl0:MyTextBox1" id="_ctl11__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl11:_ctl0:MyTextBox2" id="_ctl11__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl11:_ctl1:MyTextBox1" id="_ctl11__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl11:_ctl1:MyTextBox2" id="_ctl11__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="BaseDataList_DataList_HorizontalAlign4">
-    <table id="_ctl12" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl12:_ctl0:MyTextBox1" id="_ctl12__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl12:_ctl0:MyTextBox2" id="_ctl12__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl12:_ctl1:MyTextBox1" id="_ctl12__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl12:_ctl1:MyTextBox2" id="_ctl12__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="BaseDataList_DataList_HorizontalAlign5">
-    <table id="_ctl13" cellspacing="0" border="0" align="Right" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl13:_ctl0:MyTextBox1" id="_ctl13__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl13:_ctl0:MyTextBox2" id="_ctl13__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl13:_ctl1:MyTextBox1" id="_ctl13__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl13:_ctl1:MyTextBox2" id="_ctl13__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest13" testname="BaseDataList_DataList_HorizontalAlign6">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest14" testname="BaseDataList_DataList_HorizontalAlign7">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_IsBindableType_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_IsBindableType_T.aspx.xml
deleted file mode 100644
index 17025ab44c8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_IsBindableType_T.aspx.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_IsBindableType1">
-    <span>
-      <br />System.Boolean is bindable = True</span>
-    <span>
-      <br />System.Byte is bindable = True</span>
-    <span>
-      <br />System.Int16 is bindable = True</span>
-    <span>
-      <br />System.UInt16 is bindable = True</span>
-    <span>
-      <br />System.Int32 is bindable = True</span>
-    <span>
-      <br />System.UInt32 is bindable = True</span>
-    <span>
-      <br />System.Int64 is bindable = True</span>
-    <span>
-      <br />System.UInt64 is bindable = True</span>
-    <span>
-      <br />System.Char is bindable = True</span>
-    <span>
-      <br />System.Double is bindable = True</span>
-    <span>
-      <br />System.Single is bindable = True</span>
-    <span>
-      <br />System.DateTime is bindable = True</span>
-    <span>
-      <br />System.Decimal is bindable = True</span>
-    <span>
-      <br />System.SByte is bindable = True</span>
-    <span>
-      <br />GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_IsBindableType_T+MyPrivateClass is bindable = False</span>
-    <span>
-      <br />System.String is bindable = True</span>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataGrid_IsBindableType2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest3" testname="BaseDataList_DataList_IsBindableType1">
-    <span>
-      <br />System.Boolean is bindable = True</span>
-    <span>
-      <br />System.Byte is bindable = True</span>
-    <span>
-      <br />System.Int16 is bindable = True</span>
-    <span>
-      <br />System.UInt16 is bindable = True</span>
-    <span>
-      <br />System.Int32 is bindable = True</span>
-    <span>
-      <br />System.UInt32 is bindable = True</span>
-    <span>
-      <br />System.Int64 is bindable = True</span>
-    <span>
-      <br />System.UInt64 is bindable = True</span>
-    <span>
-      <br />System.Char is bindable = True</span>
-    <span>
-      <br />System.Double is bindable = True</span>
-    <span>
-      <br />System.Single is bindable = True</span>
-    <span>
-      <br />System.DateTime is bindable = True</span>
-    <span>
-      <br />System.Decimal is bindable = True</span>
-    <span>
-      <br />System.SByte is bindable = True</span>
-    <span>
-      <br />GHTTests.System_Web_dll.System_Web_UI_WebControls.BaseDataList_IsBindableType_T+MyPrivateClass is bindable = False</span>
-    <span>
-      <br />System.String is bindable = True</span>
-  </div>
-  <div id="GHTSubTest4" testname="BaseDataList_DataList_IsBindableType2">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_ctor_.aspx.xml
deleted file mode 100644
index d9c43cf2b26..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseDataList_BaseDataList_ctor_.aspx.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="BaseDataList_DataGrid_DataBind1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <caption align="Right">
-			Caption Text
-		</caption>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>row 1</td>
-        <td>11111</td>
-        <td>1/1/2003 12:00:00 AM</td>
-      </tr>
-      <tr>
-        <td>row 22222</td>
-        <td>2</td>
-        <td>2/2/2004 12:00:00 AM</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="BaseDataList_DataList_DataBind1">
-    <table id="_ctl1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <caption align="Right">
-			Caption Text
-		</caption>
-      <tr>
-        <td>
-          <input value="row 1" type="text" name="_ctl1:_ctl0:MyTextBox1" id="_ctl1__ctl0_MyTextBox1" />
-          <input value="11111" type="text" name="_ctl1:_ctl0:MyTextBox2" id="_ctl1__ctl0_MyTextBox2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="row 22222" type="text" name="_ctl1:_ctl1:MyTextBox1" id="_ctl1__ctl1_MyTextBox1" />
-          <input value="2" type="text" name="_ctl1:_ctl1:MyTextBox2" id="_ctl1__ctl1_MyTextBox2" />
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseValidator_BaseValidator_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseValidator_BaseValidator_ctor_.aspx.xml
deleted file mode 100644
index 1f474f60196..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BaseValidator_BaseValidator_ctor_.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-    <span evaluationfunction="RequiredFieldValidatorEvaluateIsValid" id="RequiredFieldValidator1" style="color:red;visibility:hidden" initialvalue="" controltovalidate="TextBox1" errormessage="RequiredFieldValidator">RequiredFieldValidator</span>
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BorderStyle_BorderStyle_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BorderStyle_BorderStyle_Enum.aspx.xml
deleted file mode 100644
index ec1d47709cf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BorderStyle_BorderStyle_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.BorderStyle">
-    <span>
-      <br />NotSet; None; Dotted; Dashed; Solid; Double; Groove; Ridge; Inset; Outset; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_DataField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_DataField.aspx.xml
deleted file mode 100644
index 9b38f187fe8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_DataField.aspx.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />ID</span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_DataFormatString.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_DataFormatString.aspx.xml
deleted file mode 100644
index f4905030482..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_DataFormatString.aspx.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>slkdjflkfslkjf slkfjsl ks jlflks d</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />slkdjflkfslkjf slkfjsl ks jlflks d</span>
-    <span>
-      <br />{0:c2}</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>sample text</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>sample text</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>sample text</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>sample text</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>sample text</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>sample text</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>sample text</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>sample text</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>sample text</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>sample text</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_InitializeCell_TIL.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_InitializeCell_TIL.aspx.xml
deleted file mode 100644
index 67cf0ad97c4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_InitializeCell_TIL.aspx.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td index="0">1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td index="1">2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td index="2">3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td index="3">4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td index="4">5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td index="5">6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td index="6">7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td index="7">8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td index="8">9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td index="9">10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_ReadOnly.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_ReadOnly.aspx.xml
deleted file mode 100644
index cfb33cfc30d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_ReadOnly.aspx.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>10</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>10</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>10</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>10</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_ctor_.aspx.xml
deleted file mode 100644
index 0eb181d38db..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_BoundColumn_BoundColumn_ctor_.aspx.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_ButtonType.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_ButtonType.aspx.xml
deleted file mode 100644
index e2e340a7465..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_ButtonType.aspx.xml
+++ /dev/null
@@ -1,753 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <input value="1" type="submit" name="DataGrid3:_ctl2:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_one" type="submit" name="DataGrid3:_ctl2:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_one" type="submit" name="DataGrid3:_ctl2:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="2" type="submit" name="DataGrid3:_ctl3:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_two" type="submit" name="DataGrid3:_ctl3:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_two" type="submit" name="DataGrid3:_ctl3:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="3" type="submit" name="DataGrid3:_ctl4:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_three" type="submit" name="DataGrid3:_ctl4:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_three" type="submit" name="DataGrid3:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="4" type="submit" name="DataGrid3:_ctl5:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_four" type="submit" name="DataGrid3:_ctl5:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_four" type="submit" name="DataGrid3:_ctl5:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="5" type="submit" name="DataGrid3:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_five" type="submit" name="DataGrid3:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_five" type="submit" name="DataGrid3:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="6" type="submit" name="DataGrid3:_ctl7:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_six" type="submit" name="DataGrid3:_ctl7:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_six" type="submit" name="DataGrid3:_ctl7:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="7" type="submit" name="DataGrid3:_ctl8:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_seven" type="submit" name="DataGrid3:_ctl8:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_seven" type="submit" name="DataGrid3:_ctl8:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="8" type="submit" name="DataGrid3:_ctl9:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_eight" type="submit" name="DataGrid3:_ctl9:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_eight" type="submit" name="DataGrid3:_ctl9:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="9" type="submit" name="DataGrid3:_ctl10:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_nine" type="submit" name="DataGrid3:_ctl10:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_nine" type="submit" name="DataGrid3:_ctl10:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="10" type="submit" name="DataGrid3:_ctl11:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_ten" type="submit" name="DataGrid3:_ctl11:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_ten" type="submit" name="DataGrid3:_ctl11:_ctl2" />
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />PushButton</span>
-    <span>
-      <br />PushButton</span>
-    <span>
-      <br />PushButton</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <input value="1" type="submit" name="DataGrid6:_ctl2:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_one" type="submit" name="DataGrid6:_ctl2:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_one" type="submit" name="DataGrid6:_ctl2:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="2" type="submit" name="DataGrid6:_ctl3:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_two" type="submit" name="DataGrid6:_ctl3:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_two" type="submit" name="DataGrid6:_ctl3:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="3" type="submit" name="DataGrid6:_ctl4:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_three" type="submit" name="DataGrid6:_ctl4:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_three" type="submit" name="DataGrid6:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="4" type="submit" name="DataGrid6:_ctl5:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_four" type="submit" name="DataGrid6:_ctl5:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_four" type="submit" name="DataGrid6:_ctl5:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="5" type="submit" name="DataGrid6:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_five" type="submit" name="DataGrid6:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_five" type="submit" name="DataGrid6:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="6" type="submit" name="DataGrid6:_ctl7:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_six" type="submit" name="DataGrid6:_ctl7:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_six" type="submit" name="DataGrid6:_ctl7:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="7" type="submit" name="DataGrid6:_ctl8:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_seven" type="submit" name="DataGrid6:_ctl8:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_seven" type="submit" name="DataGrid6:_ctl8:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="8" type="submit" name="DataGrid6:_ctl9:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_eight" type="submit" name="DataGrid6:_ctl9:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_eight" type="submit" name="DataGrid6:_ctl9:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="9" type="submit" name="DataGrid6:_ctl10:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_nine" type="submit" name="DataGrid6:_ctl10:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_nine" type="submit" name="DataGrid6:_ctl10:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="10" type="submit" name="DataGrid6:_ctl11:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_ten" type="submit" name="DataGrid6:_ctl11:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_ten" type="submit" name="DataGrid6:_ctl11:_ctl2" />
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />PushButton</span>
-    <span>
-      <br />PushButton</span>
-    <span>
-      <br />PushButton</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_CommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_CommandName.aspx.xml
deleted file mode 100644
index 5981e7da659..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_CommandName.aspx.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">n_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">n_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">n_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">n_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">n_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">n_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">n_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">n_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">n_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">n_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">n_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">n_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">n_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">n_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">n_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">n_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">n_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">n_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">n_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">n_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />MyCommand</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">1</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl0','')">2</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl0','')">3</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl0','')">4</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl0','')">5</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl0','')">6</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl0','')">7</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">8</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl0','')">9</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl0','')">10</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">1</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">2</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">3</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">4</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">5</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">6</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">7</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">8</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">9</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">10</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />MyCommand</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_DataTextField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_DataTextField.aspx.xml
deleted file mode 100644
index 2595745847d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_DataTextField.aspx.xml
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />ID</span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Name</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">
-          </a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />ID</span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Name</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl0','')">
-          </a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_DataTextFormatString.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_DataTextFormatString.aspx.xml
deleted file mode 100644
index 8da70ad6036..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_DataTextFormatString.aspx.xml
+++ /dev/null
@@ -1,507 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl2','')">$1.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl2','')">$2.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl2','')">$3.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl2','')">$4.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">$5.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl2','')">$6.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl2','')">$7.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl2','')">$8.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl2','')">$9.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl2','')">$10.00000</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl2','')">$1.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl2','')">$2.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl2','')">$3.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl2','')">$4.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl2','')">$5.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl2','')">$6.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl2','')">$7.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl2','')">$8.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl2','')">$9.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl1','')">(format str)</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl2','')">$10.00000</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_InitializeCell_TIL.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_InitializeCell_TIL.aspx.xml
deleted file mode 100644
index b63982e20cc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_InitializeCell_TIL.aspx.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td index="0">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">1</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="1">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">2</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="2">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">3</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="3">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">4</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="4">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">5</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="5">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">6</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="6">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">7</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="7">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">8</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="8">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">9</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="9">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">10</a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl3','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_Text.aspx.xml
deleted file mode 100644
index b30bef3e323..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_Text.aspx.xml
+++ /dev/null
@@ -1,713 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Text</span>
-    <span>
-      <br />Button Text with!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl3','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl4','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl5','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl3','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl4','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl5','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl3','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl4','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl5','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl3','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl4','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl5','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl3','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl4','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl5','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl3','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl4','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl5','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl3','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl4','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl5','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl3','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl4','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl5','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl3','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl4','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl5','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl3','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl4','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl5','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Text</span>
-    <span>
-      <br />Button Text with!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Text</span>
-    <span>
-      <br />Button Text with!@#$%^&amp;*()_+</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl3','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl4','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl5','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl3','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl4','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl5','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl3','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl4','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl5','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl3','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl4','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl5','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl3','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl4','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl5','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl3','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl4','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl5','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl3','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl4','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl5','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl3','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl4','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl5','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl3','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl4','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl5','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl1','')">Text</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl2','')">Button Text with!@#$%^&amp;*()_+</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl3','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl4','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl5','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Text</span>
-    <span>
-      <br />Button Text with!@#$%^&amp;*()_+</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_ctor_.aspx.xml
deleted file mode 100644
index 4cfe7337815..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ButtonColumn_ButtonColumn_ctor_.aspx.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl2','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl2','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl2','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl2','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl2','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl2','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl2','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl2','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl2','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Button_Button_CausesValidation.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Button_Button_CausesValidation.aspx.xml
deleted file mode 100644
index 7166144129d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Button_Button_CausesValidation.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;left:32px;position:absolute;top:24px;width:136px;z-index:101">
-    <input value="Button" onclick="if (typeof(Page_ClientValidate) == 'function') Page_ClientValidate(); " language="javascript" type="submit" name="Button1" id="Button1" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;left:32px;position:absolute;top:96px;width:136px;z-index:102">
-    <input value="Button" type="submit" name="Button2" id="Button2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Button_Button_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Button_Button_Text.aspx.xml
deleted file mode 100644
index 0aa8b934194..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Button_Button_Text.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;left:16px;position:absolute;top:15px;width:168px;z-index:100">
-    <input value="qwerpoiuytlkjahsdfgmnzxcbv" type="submit" name="Button1" id="Button1" />
-  </div>
-  <div id="GHTSubTest6" style="height:64px;left:16px;position:absolute;top:392px;width:168px;z-index:106">
-    <input value="" type="submit" name="Button6" id="Button6" />
-  </div>
-  <div id="GHTSubTest5" style="height:64px;left:16px;position:absolute;top:312px;width:168px;z-index:105">
-    <input value="         " type="submit" name="Button5" id="Button5" />
-  </div>
-  <div id="GHTSubTest4" style="height:64px;left:16px;position:absolute;top:232px;width:168px;z-index:104">
-    <input value="   adfasdf   asdfasdf   " type="submit" name="Button4" id="Button4" />
-  </div>
-  <div id="GHTSubTest3" style="height:64px;left:16px;position:absolute;top:160px;width:168px;z-index:102">
-    <input value="~`!@#$%^&amp;*&amp;()_+-=[]\{}|;':&quot;,./&lt;&gt;?" type="submit" name="Button3" id="Button3" />
-  </div>
-  <div id="GHTSubTest2" style="height:64px;left:16px;position:absolute;top:88px;width:168px;z-index:101">
-    <input value="1234567890" type="submit" name="Button2" id="Button2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CalendarSelectionMode_CalendarSelectionMode_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CalendarSelectionMode_CalendarSelectionMode_Enum.aspx.xml
deleted file mode 100644
index ded00ce11f2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CalendarSelectionMode_CalendarSelectionMode_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.CalendarSelectionMode">
-    <span>
-      <br />None; Day; DayWeek; DayWeekMonth; 0; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_CellPadding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_CellPadding.aspx.xml
deleted file mode 100644
index 8283059a2ca..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_CellPadding.aspx.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:80px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:80px">
-    <table id="CheckBoxList2" border="0" cellpadding="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_2" type="checkbox" name="CheckBoxList2:2" />
-          <label for="CheckBoxList2_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_3" type="checkbox" name="CheckBoxList2:3" />
-          <label for="CheckBoxList2_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:104px;width:80px">
-    <table id="CheckBoxList3" border="0" cellpadding="5">
-      <tr>
-        <td>
-          <input id="CheckBoxList3_0" type="checkbox" name="CheckBoxList3:0" />
-          <label for="CheckBoxList3_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_1" type="checkbox" name="CheckBoxList3:1" />
-          <label for="CheckBoxList3_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_2" type="checkbox" name="CheckBoxList3:2" />
-          <label for="CheckBoxList3_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_3" type="checkbox" name="CheckBoxList3:3" />
-          <label for="CheckBoxList3_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="Negative CellPading value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_CellSpacing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_CellSpacing.aspx.xml
deleted file mode 100644
index c9146145f3e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_CellSpacing.aspx.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:80px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:80px">
-    <table id="CheckBoxList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_2" type="checkbox" name="CheckBoxList2:2" />
-          <label for="CheckBoxList2_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_3" type="checkbox" name="CheckBoxList2:3" />
-          <label for="CheckBoxList2_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:104px;width:80px">
-    <table id="CheckBoxList3" cellspacing="5" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList3_0" type="checkbox" name="CheckBoxList3:0" />
-          <label for="CheckBoxList3_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_1" type="checkbox" name="CheckBoxList3:1" />
-          <label for="CheckBoxList3_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_2" type="checkbox" name="CheckBoxList3:2" />
-          <label for="CheckBoxList3_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_3" type="checkbox" name="CheckBoxList3:3" />
-          <label for="CheckBoxList3_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="Negative CellSpacing value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatColumns.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatColumns.aspx.xml
deleted file mode 100644
index 1a5e0714f42..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatColumns.aspx.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:80px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_4" type="checkbox" name="CheckBoxList1:4" />
-          <label for="CheckBoxList1_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_5" type="checkbox" name="CheckBoxList1:5" />
-          <label for="CheckBoxList1_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_6" type="checkbox" name="CheckBoxList1:6" />
-          <label for="CheckBoxList1_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:80px">
-    <table id="CheckBoxList2" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_2" type="checkbox" name="CheckBoxList2:2" />
-          <label for="CheckBoxList2_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_3" type="checkbox" name="CheckBoxList2:3" />
-          <label for="CheckBoxList2_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_4" type="checkbox" name="CheckBoxList2:4" />
-          <label for="CheckBoxList2_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_5" type="checkbox" name="CheckBoxList2:5" />
-          <label for="CheckBoxList2_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_6" type="checkbox" name="CheckBoxList2:6" />
-          <label for="CheckBoxList2_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:80px">
-    <table id="CheckBoxList3" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList3_0" type="checkbox" name="CheckBoxList3:0" />
-          <label for="CheckBoxList3_0">Item1</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_3" type="checkbox" name="CheckBoxList3:3" />
-          <label for="CheckBoxList3_3">Item4</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_5" type="checkbox" name="CheckBoxList3:5" />
-          <label for="CheckBoxList3_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_1" type="checkbox" name="CheckBoxList3:1" />
-          <label for="CheckBoxList3_1">Item2</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_4" type="checkbox" name="CheckBoxList3:4" />
-          <label for="CheckBoxList3_4">Item5</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_6" type="checkbox" name="CheckBoxList3:6" />
-          <label for="CheckBoxList3_6">Item7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList3_2" type="checkbox" name="CheckBoxList3:2" />
-          <label for="CheckBoxList3_2">Item3</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:80px">
-    <table id="CheckBoxList4" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList4_0" type="checkbox" name="CheckBoxList4:0" />
-          <label for="CheckBoxList4_0">Item1</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_1" type="checkbox" name="CheckBoxList4:1" />
-          <label for="CheckBoxList4_1">Item2</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_2" type="checkbox" name="CheckBoxList4:2" />
-          <label for="CheckBoxList4_2">Item3</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_3" type="checkbox" name="CheckBoxList4:3" />
-          <label for="CheckBoxList4_3">Item4</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_4" type="checkbox" name="CheckBoxList4:4" />
-          <label for="CheckBoxList4_4">Item5</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_5" type="checkbox" name="CheckBoxList4:5" />
-          <label for="CheckBoxList4_5">Item6</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_6" type="checkbox" name="CheckBoxList4:6" />
-          <label for="CheckBoxList4_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="Negative RepeateColumns value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatDirection.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatDirection.aspx.xml
deleted file mode 100644
index f515a7aa9d7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatDirection.aspx.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:80px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_4" type="checkbox" name="CheckBoxList1:4" />
-          <label for="CheckBoxList1_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_5" type="checkbox" name="CheckBoxList1:5" />
-          <label for="CheckBoxList1_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_6" type="checkbox" name="CheckBoxList1:6" />
-          <label for="CheckBoxList1_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:80px">
-    <table id="CheckBoxList2" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_2" type="checkbox" name="CheckBoxList2:2" />
-          <label for="CheckBoxList2_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_3" type="checkbox" name="CheckBoxList2:3" />
-          <label for="CheckBoxList2_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_4" type="checkbox" name="CheckBoxList2:4" />
-          <label for="CheckBoxList2_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_5" type="checkbox" name="CheckBoxList2:5" />
-          <label for="CheckBoxList2_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_6" type="checkbox" name="CheckBoxList2:6" />
-          <label for="CheckBoxList2_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:80px">
-    <table id="CheckBoxList3" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList3_0" type="checkbox" name="CheckBoxList3:0" />
-          <label for="CheckBoxList3_0">Item1</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_1" type="checkbox" name="CheckBoxList3:1" />
-          <label for="CheckBoxList3_1">Item2</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_2" type="checkbox" name="CheckBoxList3:2" />
-          <label for="CheckBoxList3_2">Item3</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_3" type="checkbox" name="CheckBoxList3:3" />
-          <label for="CheckBoxList3_3">Item4</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_4" type="checkbox" name="CheckBoxList3:4" />
-          <label for="CheckBoxList3_4">Item5</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_5" type="checkbox" name="CheckBoxList3:5" />
-          <label for="CheckBoxList3_5">Item6</label>
-        </td>
-        <td>
-          <input id="CheckBoxList3_6" type="checkbox" name="CheckBoxList3:6" />
-          <label for="CheckBoxList3_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest6" style="height:96px;width:80px">
-    <table id="CheckBoxList6" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList6_0" type="checkbox" name="CheckBoxList6:0" />
-          <label for="CheckBoxList6_0">Item1</label>
-        </td>
-        <td>
-          <input id="CheckBoxList6_4" type="checkbox" name="CheckBoxList6:4" />
-          <label for="CheckBoxList6_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList6_1" type="checkbox" name="CheckBoxList6:1" />
-          <label for="CheckBoxList6_1">Item2</label>
-        </td>
-        <td>
-          <input id="CheckBoxList6_5" type="checkbox" name="CheckBoxList6:5" />
-          <label for="CheckBoxList6_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList6_2" type="checkbox" name="CheckBoxList6:2" />
-          <label for="CheckBoxList6_2">Item3</label>
-        </td>
-        <td>
-          <input id="CheckBoxList6_6" type="checkbox" name="CheckBoxList6:6" />
-          <label for="CheckBoxList6_6">Item7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList6_3" type="checkbox" name="CheckBoxList6:3" />
-          <label for="CheckBoxList6_3">Item4</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest5" style="height:96px;width:80px">
-    <table id="CheckBoxList5" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList5_0" type="checkbox" name="CheckBoxList5:0" />
-          <label for="CheckBoxList5_0">Item1</label>
-        </td>
-        <td>
-          <input id="CheckBoxList5_3" type="checkbox" name="CheckBoxList5:3" />
-          <label for="CheckBoxList5_3">Item4</label>
-        </td>
-        <td>
-          <input id="CheckBoxList5_5" type="checkbox" name="CheckBoxList5:5" />
-          <label for="CheckBoxList5_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList5_1" type="checkbox" name="CheckBoxList5:1" />
-          <label for="CheckBoxList5_1">Item2</label>
-        </td>
-        <td>
-          <input id="CheckBoxList5_4" type="checkbox" name="CheckBoxList5:4" />
-          <label for="CheckBoxList5_4">Item5</label>
-        </td>
-        <td>
-          <input id="CheckBoxList5_6" type="checkbox" name="CheckBoxList5:6" />
-          <label for="CheckBoxList5_6">Item7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList5_2" type="checkbox" name="CheckBoxList5:2" />
-          <label for="CheckBoxList5_2">Item3</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:80px">
-    <table id="CheckBoxList4" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList4_0" type="checkbox" name="CheckBoxList4:0" />
-          <label for="CheckBoxList4_0">Item1</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_1" type="checkbox" name="CheckBoxList4:1" />
-          <label for="CheckBoxList4_1">Item2</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_2" type="checkbox" name="CheckBoxList4:2" />
-          <label for="CheckBoxList4_2">Item3</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_3" type="checkbox" name="CheckBoxList4:3" />
-          <label for="CheckBoxList4_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList4_4" type="checkbox" name="CheckBoxList4:4" />
-          <label for="CheckBoxList4_4">Item5</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_5" type="checkbox" name="CheckBoxList4:5" />
-          <label for="CheckBoxList4_5">Item6</label>
-        </td>
-        <td>
-          <input id="CheckBoxList4_6" type="checkbox" name="CheckBoxList4:6" />
-          <label for="CheckBoxList4_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="Non valid RepeateDirection value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="Non valid RepeateDirection value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatLayout.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatLayout.aspx.xml
deleted file mode 100644
index 384fe21b82b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_RepeatLayout.aspx.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:152px;width:104px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_4" type="checkbox" name="CheckBoxList1:4" />
-          <label for="CheckBoxList1_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_5" type="checkbox" name="CheckBoxList1:5" />
-          <label for="CheckBoxList1_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_6" type="checkbox" name="CheckBoxList1:6" />
-          <label for="CheckBoxList1_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:152px;width:104px">
-    <table id="CheckBoxList2" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_2" type="checkbox" name="CheckBoxList2:2" />
-          <label for="CheckBoxList2_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_3" type="checkbox" name="CheckBoxList2:3" />
-          <label for="CheckBoxList2_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_4" type="checkbox" name="CheckBoxList2:4" />
-          <label for="CheckBoxList2_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_5" type="checkbox" name="CheckBoxList2:5" />
-          <label for="CheckBoxList2_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_6" type="checkbox" name="CheckBoxList2:6" />
-          <label for="CheckBoxList2_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:152px;width:104px">
-    <span id="CheckBoxList3">
-      <input id="CheckBoxList3_0" type="checkbox" name="CheckBoxList3:0" />
-      <label for="CheckBoxList3_0">Item1</label>
-      <br />
-      <input id="CheckBoxList3_1" type="checkbox" name="CheckBoxList3:1" />
-      <label for="CheckBoxList3_1">Item2</label>
-      <br />
-      <input id="CheckBoxList3_2" type="checkbox" name="CheckBoxList3:2" />
-      <label for="CheckBoxList3_2">Item3</label>
-      <br />
-      <input id="CheckBoxList3_3" type="checkbox" name="CheckBoxList3:3" />
-      <label for="CheckBoxList3_3">Item4</label>
-      <br />
-      <input id="CheckBoxList3_4" type="checkbox" name="CheckBoxList3:4" />
-      <label for="CheckBoxList3_4">Item5</label>
-      <br />
-      <input id="CheckBoxList3_5" type="checkbox" name="CheckBoxList3:5" />
-      <label for="CheckBoxList3_5">Item6</label>
-      <br />
-      <input id="CheckBoxList3_6" type="checkbox" name="CheckBoxList3:6" />
-      <label for="CheckBoxList3_6">Item7</label>
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="Ilegal RepeateLayout value - not a number">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="Ilegal RepeateLayout value - out of range">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_TextAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_TextAlign.aspx.xml
deleted file mode 100644
index 76c7f73d1ff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBoxList_CheckBoxList_TextAlign.aspx.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:80px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_4" type="checkbox" name="CheckBoxList1:4" />
-          <label for="CheckBoxList1_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_5" type="checkbox" name="CheckBoxList1:5" />
-          <label for="CheckBoxList1_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_6" type="checkbox" name="CheckBoxList1:6" />
-          <label for="CheckBoxList1_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:80px">
-    <table id="CheckBoxList2" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_2" type="checkbox" name="CheckBoxList2:2" />
-          <label for="CheckBoxList2_2">Item3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_3" type="checkbox" name="CheckBoxList2:3" />
-          <label for="CheckBoxList2_3">Item4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_4" type="checkbox" name="CheckBoxList2:4" />
-          <label for="CheckBoxList2_4">Item5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_5" type="checkbox" name="CheckBoxList2:5" />
-          <label for="CheckBoxList2_5">Item6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_6" type="checkbox" name="CheckBoxList2:6" />
-          <label for="CheckBoxList2_6">Item7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:80px">
-    <table id="CheckBoxList3" border="0">
-      <tr>
-        <td>
-          <label for="CheckBoxList3_0">Item1</label>
-          <input id="CheckBoxList3_0" type="checkbox" name="CheckBoxList3:0" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label for="CheckBoxList3_1">Item2</label>
-          <input id="CheckBoxList3_1" type="checkbox" name="CheckBoxList3:1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label for="CheckBoxList3_2">Item3</label>
-          <input id="CheckBoxList3_2" type="checkbox" name="CheckBoxList3:2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label for="CheckBoxList3_3">Item4</label>
-          <input id="CheckBoxList3_3" type="checkbox" name="CheckBoxList3:3" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label for="CheckBoxList3_4">Item5</label>
-          <input id="CheckBoxList3_4" type="checkbox" name="CheckBoxList3:4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label for="CheckBoxList3_5">Item6</label>
-          <input id="CheckBoxList3_5" type="checkbox" name="CheckBoxList3:5" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label for="CheckBoxList3_6">Item7</label>
-          <input id="CheckBoxList3_6" type="checkbox" name="CheckBoxList3:6" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="Ilegal TextAlign value - not a number">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="Ilegal TextAlign value - out of range">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_AutoPostBack.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_AutoPostBack.aspx.xml
deleted file mode 100644
index 11ec8b9a0b9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_AutoPostBack.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;left:16px;position:absolute;top:15px;width:120px;z-index:101">
-    <input id="CheckBox1" onclick="__doPostBack('CheckBox1','')" language="javascript" type="checkbox" name="CheckBox1" />
-  </div>
-  <div id="GHTSubTest3" style="height:72px;left:16px;position:absolute;top:176px;width:120px;z-index:103">
-    <input id="CheckBox3" type="checkbox" name="CheckBox3" />
-  </div>
-  <div id="GHTSubTest2" style="height:72px;left:16px;position:absolute;top:96px;width:120px;z-index:102">
-    <input id="CheckBox2" type="checkbox" name="CheckBox2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Checked.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Checked.aspx.xml
deleted file mode 100644
index 4e08ff3e890..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Checked.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:15px;width:144px;z-index:101">
-    <input id="CheckBox1" checked="checked" type="checkbox" name="CheckBox1" />
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:16px;position:absolute;top:128px;width:144px;z-index:103">
-    <input id="CheckBox3" type="checkbox" name="CheckBox3" />
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:16px;position:absolute;top:72px;width:144px;z-index:102">
-    <input id="CheckBox2" type="checkbox" name="CheckBox2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Enabled.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Enabled.aspx.xml
deleted file mode 100644
index 86fde6c4dd3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Enabled.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;width:144px">
-    <input id="CheckBox1" type="checkbox" name="CheckBox1" />
-    <label for="CheckBox1">Enabled text</label>
-  </div>
-  <div id="GHTSubTest2" style="height:40px;width:144px">
-    <span disabled="disabled">
-      <input id="CheckBox2" disabled="disabled" type="checkbox" name="CheckBox2" />
-      <label for="CheckBox2">Disabled text</label>
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Text.aspx.xml
deleted file mode 100644
index ee54697790b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_Text.aspx.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:15px;width:232px;z-index:100">
-    <input id="CheckBox1" type="checkbox" name="CheckBox1" />
-    <label for="CheckBox1">  abcdefghijklmnopq  rstuvwxyz  </label>
-  </div>
-  <div id="GHTSubTest6" style="height:48px;left:16px;position:absolute;top:312px;width:176px;z-index:106">
-    <input id="CheckBox6" type="checkbox" name="CheckBox6" />
-    <label for="CheckBox6">`~!@#$%^&amp;*()_+-={}|[]\;':",./??</label>
-  </div>
-  <div id="GHTSubTest5" style="height:48px;left:16px;position:absolute;top:248px;width:176px;z-index:105">
-    <input id="CheckBox5" type="checkbox" name="CheckBox5" />
-  </div>
-  <div id="GHTSubTest4" style="height:48px;left:16px;position:absolute;top:184px;width:152px;z-index:104">
-    <span style="width:120px">
-      <input id="CheckBox4" type="checkbox" name="CheckBox4" />
-      <label for="CheckBox4">aaaaaaaaaa aaaaaaaaaaa</label>
-    </span>
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:16px;position:absolute;top:128px;width:176px;z-index:102">
-    <input id="CheckBox3" type="checkbox" name="CheckBox3" />
-    <label for="CheckBox3">
-    </label>
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:16px;position:absolute;top:72px;width:176px;z-index:101">
-    <input id="CheckBox2" type="checkbox" name="CheckBox2" />
-    <label for="CheckBox2">1234567890</label>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_TextAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_TextAlign.aspx.xml
deleted file mode 100644
index 8916755c88c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_CheckBox_CheckBox_TextAlign.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;left:16px;position:absolute;top:15px;width:160px;z-index:101">
-    <input id="CheckBox1" type="checkbox" name="CheckBox1" />
-  </div>
-  <div id="GHTSubTest3" style="height:32px;left:16px;position:absolute;top:104px;width:160px;z-index:103">
-    <input id="CheckBox3" type="checkbox" name="CheckBox3" />
-  </div>
-  <div id="GHTSubTest2" style="height:32px;left:16px;position:absolute;top:56px;width:160px;z-index:102">
-    <input id="CheckBox2" type="checkbox" name="CheckBox2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_FooterStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_FooterStyle.aspx.xml
deleted file mode 100644
index 0f3f17f4691..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_FooterStyle.aspx.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Footer</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Footer</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Footer</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Footer</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_FooterText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_FooterText.aspx.xml
deleted file mode 100644
index 1aedd1535bf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_FooterText.aspx.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderImageUrl.aspx.xml
deleted file mode 100644
index e324e8e936c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderImageUrl.aspx.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl8">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderStyle.aspx.xml
deleted file mode 100644
index 87858f9c722..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderStyle.aspx.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Header</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Header</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Header</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Header</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">Header</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderText.aspx.xml
deleted file mode 100644
index 1aedd1535bf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_HeaderText.aspx.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_ItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_ItemStyle.aspx.xml
deleted file mode 100644
index f0555bc6407..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_ItemStyle.aspx.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl1$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td align="Right" nowrap="nowrap" valign="Top">n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_SortExpression.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_SortExpression.aspx.xml
deleted file mode 100644
index e324e8e936c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_SortExpression.aspx.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl8">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_ToString_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_ToString_.aspx.xml
deleted file mode 100644
index e324e8e936c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_ToString_.aspx.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl8">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_Visible.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_Visible.aspx.xml
deleted file mode 100644
index d34a52b9c4b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridColumn_DataGridColumn_Visible.aspx.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GhtSubTest1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" testname="GhtSubTest2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl2$_ctl0','')">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl3$_ctl0','')">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl4$_ctl0','')">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl5$_ctl0','')">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl6$_ctl0','')">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl7$_ctl0','')">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl8$_ctl0','')">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl9$_ctl0','')">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl10$_ctl0','')">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl2$_ctl11$_ctl0','')">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" testname="GhtSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('_ctl4$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest4" testname="GhtSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest5" testname="GhtSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl8">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_DataItem.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_DataItem.aspx.xml
deleted file mode 100644
index 12d7be3a9b3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_DataItem.aspx.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-        <td>Name from DataItem</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-        <td>n_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-        <td>n_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-        <td>n_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-        <td>n_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-        <td>n_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-        <td>n_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-        <td>n_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-        <td>n_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-        <td>n_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-        <td>n_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-        <td>n_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-        <td>n_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-        <td>n_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-        <td>n_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-        <td>n_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-        <td>n_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-        <td>n_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-        <td>n_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-        <td>n_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-        <td>n_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-        <td>n_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-        <td>n_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-        <td>n_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-        <td>n_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-        <td>n_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-        <td>n_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-        <td>n_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-        <td>n_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-        <td>n_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-        <td>n_3_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>heh</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>heh</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>heh</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>heh</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>heh</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>heh</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>heh</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>heh</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>heh</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>heh</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>heh</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>heh</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>heh</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>heh</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>heh</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>heh</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>heh</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>heh</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>heh</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>heh</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>heh</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>heh</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>heh</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>heh</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>heh</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>heh</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>heh</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>heh</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>heh</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>heh</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_DataSetIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_DataSetIndex.aspx.xml
deleted file mode 100644
index fbeadeb7c10..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_DataSetIndex.aspx.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-        <td>-1</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-        <td>0</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-        <td>10</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-        <td>11</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-        <td>12</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-        <td>13</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-        <td>14</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-        <td>15</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-        <td>16</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-        <td>17</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-        <td>18</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-        <td>19</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-        <td>20</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-        <td>21</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-        <td>22</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-        <td>23</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-        <td>24</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-        <td>25</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-        <td>26</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-        <td>27</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-        <td>28</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-        <td>29</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-        <td>-1</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">&lt;</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">&gt;</a></td>
-        <td>-1</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_ItemIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_ItemIndex.aspx.xml
deleted file mode 100644
index 3164bb7895a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_ItemIndex.aspx.xml
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-    <span>
-      <br />1</span>
-    <span>
-      <br />2</span>
-    <span>
-      <br />3</span>
-    <span>
-      <br />4</span>
-    <span>
-      <br />5</span>
-    <span>
-      <br />6</span>
-    <span>
-      <br />7</span>
-    <span>
-      <br />8</span>
-    <span>
-      <br />9</span>
-    <span>
-      <br />10</span>
-    <span>
-      <br />11</span>
-    <span>
-      <br />12</span>
-    <span>
-      <br />13</span>
-    <span>
-      <br />14</span>
-    <span>
-      <br />15</span>
-    <span>
-      <br />16</span>
-    <span>
-      <br />17</span>
-    <span>
-      <br />18</span>
-    <span>
-      <br />19</span>
-    <span>
-      <br />20</span>
-    <span>
-      <br />21</span>
-    <span>
-      <br />22</span>
-    <span>
-      <br />23</span>
-    <span>
-      <br />24</span>
-    <span>
-      <br />25</span>
-    <span>
-      <br />26</span>
-    <span>
-      <br />27</span>
-    <span>
-      <br />28</span>
-    <span>
-      <br />29</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-        <td>-1</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-        <td>0</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-        <td>5</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-        <td>6</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-        <td>7</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-        <td>8</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-        <td>10</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-        <td>11</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-        <td>12</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-        <td>13</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-        <td>14</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-        <td>15</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-        <td>16</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-        <td>17</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-        <td>18</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-        <td>19</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-        <td>20</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-        <td>21</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-        <td>22</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-        <td>23</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-        <td>24</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-        <td>25</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-        <td>26</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-        <td>27</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-        <td>28</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-        <td>29</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-        <td>-1</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-        <td>0</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-        <td>3</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">&lt;</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl1','')">&gt;</a></td>
-        <td>-1</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_ItemType.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_ItemType.aspx.xml
deleted file mode 100644
index 4187692c439..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridItem_DataGridItem_ItemType.aspx.xml
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-    <span>
-      <br />Item</span>
-    <span>
-      <br />AlternatingItem</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-        <td>Header</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-        <td>AlternatingItem</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-        <td>AlternatingItem</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_CopyFrom_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_CopyFrom_S.aspx.xml
deleted file mode 100644
index 4cd95bf589a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_CopyFrom_S.aspx.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr style="font-weight:bold">
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr style="font-weight:bold">
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr style="font-weight:bold">
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl3','')">4</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl4','')">5</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl5','')">6</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl6','')">7</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl7','')">8</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl8','')">9</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl9','')">10</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl10','')">11</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl11','')">12</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl12','')">13</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl13','')">14</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl14','')">15</a></td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_MergeWith_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_MergeWith_S.aspx.xml
deleted file mode 100644
index 4cd95bf589a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_MergeWith_S.aspx.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr style="font-weight:bold">
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr style="font-weight:bold">
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr style="font-weight:bold">
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl3','')">4</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl4','')">5</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl5','')">6</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl6','')">7</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl7','')">8</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl8','')">9</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl9','')">10</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl10','')">11</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl11','')">12</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl12','')">13</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl13','')">14</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl14','')">15</a></td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Mode.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Mode.aspx.xml
deleted file mode 100644
index a65716fe774..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Mode.aspx.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />NextPrev</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />NextPrev</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />NumericPages</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_NextPageText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_NextPageText.aspx.xml
deleted file mode 100644
index aa636f27fbf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_NextPageText.aspx.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />&gt;</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">Next Page</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Next Page</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />&gt;</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Next</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_PageButtonCount.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_PageButtonCount.aspx.xml
deleted file mode 100644
index 08e26ce5fd8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_PageButtonCount.aspx.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl3','')">4</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl4','')">5</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl5','')">6</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl6','')">7</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl7','')">8</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl8','')">9</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl9','')">10</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl10','')">...</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />10</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl3','')">4</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl4','')">5</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl5','')">6</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl6','')">7</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl7','')">...</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />7</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl3','')">4</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl4','')">5</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl5','')">6</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl6','')">7</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl7','')">8</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl8','')">9</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl9','')">10</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl10','')">11</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl11','')">12</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl12','')">13</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl13','')">14</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl14','')">15</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />20</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Position.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Position.aspx.xml
deleted file mode 100644
index 92fbce99cc3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Position.aspx.xml
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Bottom</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Bottom</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl1$_ctl1','')">&gt;</a></td>
-      </tr>
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />Top</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl1$_ctl1','')">&gt;</a></td>
-      </tr>
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />TopAndBottom</span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Bottom</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid6$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid6$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Bottom</span>
-  </div>
-  <div id="Ghtsubtest7" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid7">
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid7$_ctl1$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid7$_ctl1$_ctl2','')">3</a></td>
-      </tr>
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />Top</span>
-  </div>
-  <div id="Ghtsubtest8" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid8">
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid8$_ctl1$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid8$_ctl1$_ctl2','')">3</a></td>
-      </tr>
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid8$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid8$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />TopAndBottom</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_PrevPageText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_PrevPageText.aspx.xml
deleted file mode 100644
index 474a436185c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_PrevPageText.aspx.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Bottom</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>Prev Page</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Prev Page</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>
-          </span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />Prev</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Reset_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Reset_.aspx.xml
deleted file mode 100644
index b18dcca651d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Reset_.aspx.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-    <span>
-      <br />&gt;</span>
-    <span>
-      <br />10</span>
-    <span>
-      <br />0</span>
-    <span>
-      <br />&lt;</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl1$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl1$_ctl2','')">3</a></td>
-      </tr>
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl2','')">3</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />1</span>
-    <span>
-      <br />N</span>
-    <span>
-      <br />7</span>
-    <span>
-      <br />2</span>
-    <span>
-      <br />P</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Visible.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Visible.aspx.xml
deleted file mode 100644
index 72cd4f9cf97..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGridPagerStyle_DataGridPagerStyle_Visible.aspx.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowCustomPaging.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowCustomPaging.aspx.xml
deleted file mode 100644
index 4faca518f46..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowCustomPaging.aspx.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl13$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl13$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl13$_ctl3','')">4</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl13$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl13$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl13$_ctl3','')">4</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>1</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl1','')">2</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl2','')">3</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl3','')">4</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl4','')">5</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl5','')">6</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl6','')">7</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl13$_ctl7','')">8</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowPaging.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowPaging.aspx.xml
deleted file mode 100644
index dbf7a439df5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowPaging.aspx.xml
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowSorting.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowSorting.aspx.xml
deleted file mode 100644
index 1b58cdd36e5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AllowSorting.aspx.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl1$_ctl0','')">ID</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl1$_ctl1','')">Name</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl1$_ctl2','')">Company</a>
-        </td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AlternatingItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AlternatingItemStyle.aspx.xml
deleted file mode 100644
index 781529e1961..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AlternatingItemStyle.aspx.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr align="Right">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr align="Right">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr align="Right">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr align="Right">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr align="Right">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AutoGenerateColumns.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AutoGenerateColumns.aspx.xml
deleted file mode 100644
index bf32011268a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_AutoGenerateColumns.aspx.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_BackImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_BackImageUrl.aspx.xml
deleted file mode 100644
index 2578d538a92..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_BackImageUrl.aspx.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-image:url(/ghttests/system_web_dll/system_web_ui_webcontrols/datagrid/123123123text);border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />/GHTTests/System_Web_dll/System_Web_UI_WebControls/DataGrid/123123123text</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-image:url(/ghttests/system_web_dll/system_web_ui_webcontrols/datagrid/asldkfjalasldfjlasdf_______!@#$%^&amp;*());border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />/GHTTests/System_Web_dll/System_Web_UI_WebControls/DataGrid/asldkfjalasldfjlasdf_______!@#$%^&amp;*()</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-image:url(http;border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />http://127.0.0.1/images/image.gif</span>
-  </div>
-  <div id="GHTSubTest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-image:url(/images/image.gif);border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />/images/image.gif</span>
-  </div>
-  <div id="GHTSubTest7" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-image:url(/ghttests/system_web_dll/system_web_ui_webcontrols/datagrid/image&gt;);border-collapse:collapse" rules="all" id="DataGrid7">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />/GHTTests/System_Web_dll/System_Web_UI_WebControls/DataGrid/image&gt;</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_CancelCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_CancelCommandName.aspx.xml
deleted file mode 100644
index b4064ed59df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_CancelCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Cancel</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_Columns.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_Columns.aspx.xml
deleted file mode 100644
index adb2fac895c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_Columns.aspx.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />System.Web.UI.WebControls.DataGridColumnCollection</span>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">edit</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">edit</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">edit</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">edit</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">edit</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">edit</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">edit</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">edit</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">edit</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">edit</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />System.Web.UI.WebControls.DataGridColumnCollection</span>
-    <span>
-      <br />1</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_CurrentPageIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_CurrentPageIndex.aspx.xml
deleted file mode 100644
index ec9a7eb93d9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_CurrentPageIndex.aspx.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl0','')">&lt;</a>&amp;nbsp;<span>&gt;</span></td>
-      </tr>
-    </table>
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <a href="javascript:__doPostBack('DataGrid6$_ctl14$_ctl0','')">&lt;</a>&amp;nbsp;<span>&gt;</span></td>
-      </tr>
-    </table>
-    <span>
-      <br />2</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_DeleteCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_DeleteCommandName.aspx.xml
deleted file mode 100644
index 2595d0f11f9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_DeleteCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Delete</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditCommandName.aspx.xml
deleted file mode 100644
index da568fab372..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Edit</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditItemIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditItemIndex.aspx.xml
deleted file mode 100644
index a04e477410d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditItemIndex.aspx.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>
-          <input value="2" type="text" name="DataGrid2:_ctl3:_ctl0" />
-        </td>
-        <td>
-          <input value="n_two" type="text" name="DataGrid2:_ctl3:_ctl1" />
-        </td>
-        <td>
-          <input value="c_two" type="text" name="DataGrid2:_ctl3:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />1</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />20</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />200</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditItemStyle.aspx.xml
deleted file mode 100644
index af586310587..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_EditItemStyle.aspx.xml
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <input value="8" type="text" name="DataGrid1:_ctl9:_ctl0" />
-        </td>
-        <td>
-          <input value="n_eight" type="text" name="DataGrid1:_ctl9:_ctl1" />
-        </td>
-        <td>
-          <input value="c_eight" type="text" name="DataGrid1:_ctl9:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />7</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr style="background-color:blue" align="Center" valign="Bottom">
-        <td>
-          <input value="5" type="text" name="DataGrid2:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_five" type="text" name="DataGrid2:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_five" type="text" name="DataGrid2:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />4</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>
-          <input value="3" type="text" name="DataGrid3:_ctl4:_ctl0" />
-        </td>
-        <td>
-          <input value="n_three" type="text" name="DataGrid3:_ctl4:_ctl1" />
-        </td>
-        <td>
-          <input value="c_three" type="text" name="DataGrid3:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">Edit</a>
-        </td>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Center" nowrap="nowrap" valign="Middle">
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">Update</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl1','')"></a></td>
-        <td>
-          <input value="8" type="text" name="DataGrid4:_ctl9:_ctl2" />
-        </td>
-        <td>
-          <input value="n_eight" type="text" name="DataGrid4:_ctl9:_ctl3" />
-        </td>
-        <td>
-          <input value="c_eight" type="text" name="DataGrid4:_ctl9:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />7</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">Edit</a>
-        </td>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">Edit</a>
-        </td>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">Edit</a>
-        </td>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">Edit</a>
-        </td>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">Update</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl1','')"></a></td>
-        <td>
-          <input value="5" type="text" name="DataGrid5:_ctl6:_ctl2" />
-        </td>
-        <td>
-          <input value="n_five" type="text" name="DataGrid5:_ctl6:_ctl3" />
-        </td>
-        <td>
-          <input value="c_five" type="text" name="DataGrid5:_ctl6:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">Edit</a>
-        </td>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">Edit</a>
-        </td>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">Edit</a>
-        </td>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">Edit</a>
-        </td>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">Edit</a>
-        </td>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />4</span>
-  </div>
-  <div id="GHTSubTest6" testname="GHTSubTest6">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl5">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr align="Right">
-        <td>
-          <input value="5" type="text" name="_ctl5:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_five" type="text" name="_ctl5:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_five" type="text" name="_ctl5:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="GHTSubTest7">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl6">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>
-          <input value="5" type="text" name="_ctl6:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_five" type="text" name="_ctl6:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_five" type="text" name="_ctl6:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_FooterStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_FooterStyle.aspx.xml
deleted file mode 100644
index ce4799c7304..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_FooterStyle.aspx.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-      <tr align="Right">
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_HeaderStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_HeaderStyle.aspx.xml
deleted file mode 100644
index 8262c0de2c7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_HeaderStyle.aspx.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr align="Right">
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemCreated.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemCreated.aspx.xml
deleted file mode 100644
index cf0b7d075a3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemCreated.aspx.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="Ghtsubtest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-color:#ffffcc;border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" bordercolor="Black" rules="all" id="DataGrid1">
-      <tr style="background-color:#cccccc">
-        <td>Added on ItemCreated event</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr style="background-color:#cccccc">
-        <td>Added on ItemCreated event</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemDataBound.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemDataBound.aspx.xml
deleted file mode 100644
index 755719c1963..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemDataBound.aspx.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="Ghtsubtest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="background-color:#ffffcc;border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" bordercolor="Black" rules="all" id="DataGrid1">
-      <tr style="background-color:#cccccc">
-        <td>Added on ItemDataBound event</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>Added on ItemDataBound event</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-      <tr style="background-color:#cccccc">
-        <td>Added on ItemDataBound event</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemStyle.aspx.xml
deleted file mode 100644
index bd15ce00271..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ItemStyle.aspx.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr style="background-color:cyan" align="Center" valign="Bottom">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr align="Right">
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr align="Right">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr align="Right">
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr align="Right">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr align="Right">
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr align="Right">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr align="Right">
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr align="Right">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr align="Right">
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr align="Right">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_Items.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_Items.aspx.xml
deleted file mode 100644
index 41331fc7553..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_Items.aspx.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />System.Web.UI.WebControls.DataGridItemCollection</span>
-    <span>
-      <br />30</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_NextPageCommandArgument.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_NextPageCommandArgument.aspx.xml
deleted file mode 100644
index f3ca00f9f2b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_NextPageCommandArgument.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Next</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageCommandName.aspx.xml
deleted file mode 100644
index 88458019902..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Page</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageCount.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageCount.aspx.xml
deleted file mode 100644
index e08b676d2bd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageCount.aspx.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />3</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />6</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />5</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageSize.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageSize.aspx.xml
deleted file mode 100644
index b748f32bf06..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PageSize.aspx.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />10</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />10</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<span>&gt;</span></td>
-      </tr>
-    </table>
-    <span>
-      <br />150</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PagerStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PagerStyle.aspx.xml
deleted file mode 100644
index 633302f7b8d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PagerStyle.aspx.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr align="Center">
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />System.Web.UI.WebControls.DataGridPagerStyle</span>
-    <span>
-      <br />NextPrev</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PrevPageCommandArgument.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PrevPageCommandArgument.aspx.xml
deleted file mode 100644
index e7e5af98bf6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_PrevPageCommandArgument.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Prev</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectCommandName.aspx.xml
deleted file mode 100644
index 9907f62db05..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Select</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedIndex.aspx.xml
deleted file mode 100644
index a95624145a7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedIndex.aspx.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr style="background-color:blue">
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />3</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />77</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedItem.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedItem.aspx.xml
deleted file mode 100644
index c324c63b63e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedItem.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedItemStyle.aspx.xml
deleted file mode 100644
index 63fbdbc4575..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SelectedItemStyle.aspx.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr style="background-color:blue" align="Center" valign="Bottom">
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr style="background-color:yellow;height:50px" align="Right" nowrap="nowrap" valign="Top">
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="GHTSubTest4">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr align="Right">
-        <td>
-          <input value="5" type="text" name="_ctl0:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_five" type="text" name="_ctl0:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_five" type="text" name="_ctl0:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="GHTSubTest5">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr align="Right" nowrap="nowrap" valign="Top">
-        <td>
-          <input value="5" type="text" name="_ctl1:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <input value="n_0_five" type="text" name="_ctl1:_ctl6:_ctl1" />
-        </td>
-        <td>
-          <input value="c_0_five" type="text" name="_ctl1:_ctl6:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ShowFooter.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ShowFooter.aspx.xml
deleted file mode 100644
index 8485d568db5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ShowFooter.aspx.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ShowHeader.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ShowHeader.aspx.xml
deleted file mode 100644
index 5ddf3a2ea1f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ShowHeader.aspx.xml
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td>11</td>
-        <td>n_2_one</td>
-        <td>c_2_one</td>
-      </tr>
-      <tr>
-        <td>12</td>
-        <td>n_2_two</td>
-        <td>c_2_two</td>
-      </tr>
-      <tr>
-        <td>13</td>
-        <td>n_2_three</td>
-        <td>c_2_three</td>
-      </tr>
-      <tr>
-        <td>14</td>
-        <td>n_2_four</td>
-        <td>c_2_four</td>
-      </tr>
-      <tr>
-        <td>15</td>
-        <td>n_2_five</td>
-        <td>c_2_five</td>
-      </tr>
-      <tr>
-        <td>16</td>
-        <td>n_2_six</td>
-        <td>c_2_six</td>
-      </tr>
-      <tr>
-        <td>17</td>
-        <td>n_2_seven</td>
-        <td>c_2_seven</td>
-      </tr>
-      <tr>
-        <td>18</td>
-        <td>n_2_eight</td>
-        <td>c_2_eight</td>
-      </tr>
-      <tr>
-        <td>19</td>
-        <td>n_2_nine</td>
-        <td>c_2_nine</td>
-      </tr>
-      <tr>
-        <td>20</td>
-        <td>n_2_ten</td>
-        <td>c_2_ten</td>
-      </tr>
-      <tr>
-        <td>21</td>
-        <td>n_3_one</td>
-        <td>c_3_one</td>
-      </tr>
-      <tr>
-        <td>22</td>
-        <td>n_3_two</td>
-        <td>c_3_two</td>
-      </tr>
-      <tr>
-        <td>23</td>
-        <td>n_3_three</td>
-        <td>c_3_three</td>
-      </tr>
-      <tr>
-        <td>24</td>
-        <td>n_3_four</td>
-        <td>c_3_four</td>
-      </tr>
-      <tr>
-        <td>25</td>
-        <td>n_3_five</td>
-        <td>c_3_five</td>
-      </tr>
-      <tr>
-        <td>26</td>
-        <td>n_3_six</td>
-        <td>c_3_six</td>
-      </tr>
-      <tr>
-        <td>27</td>
-        <td>n_3_seven</td>
-        <td>c_3_seven</td>
-      </tr>
-      <tr>
-        <td>28</td>
-        <td>n_3_eight</td>
-        <td>c_3_eight</td>
-      </tr>
-      <tr>
-        <td>29</td>
-        <td>n_3_nine</td>
-        <td>c_3_nine</td>
-      </tr>
-      <tr>
-        <td>30</td>
-        <td>n_3_ten</td>
-        <td>c_3_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SortCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SortCommandName.aspx.xml
deleted file mode 100644
index df34cd3c6b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_SortCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Sort</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_UpdateCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_UpdateCommandName.aspx.xml
deleted file mode 100644
index acf76c6e83a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_UpdateCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px" designtimedragdrop="11">
-    <span>
-      <br />Update</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_VirtualItemCount.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_VirtualItemCount.aspx.xml
deleted file mode 100644
index 45515c2dd18..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_VirtualItemCount.aspx.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<span>&gt;</span></td>
-      </tr>
-    </table>
-    <span>
-      <br />5</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<span>&gt;</span></td>
-      </tr>
-    </table>
-    <span>
-      <br />7</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <span>&lt;</span>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl13$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />30</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_1_one</td>
-        <td>c_1_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_1_two</td>
-        <td>c_1_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_1_three</td>
-        <td>c_1_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_1_four</td>
-        <td>c_1_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_1_five</td>
-        <td>c_1_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_1_six</td>
-        <td>c_1_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_1_seven</td>
-        <td>c_1_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_1_eight</td>
-        <td>c_1_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_1_nine</td>
-        <td>c_1_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_1_ten</td>
-        <td>c_1_ten</td>
-      </tr>
-      <tr>
-        <td colspan="3">
-          <a href="javascript:__doPostBack('DataGrid5$_ctl14$_ctl0','')">&lt;</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl14$_ctl1','')">&gt;</a></td>
-      </tr>
-    </table>
-    <span>
-      <br />70</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ctor_.aspx.xml
deleted file mode 100644
index c092db7aa31..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataGrid_DataGrid_ctor_.aspx.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>ID</td>
-        <td>CustID</td>
-        <td>Date</td>
-        <td>Total</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>1</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>2</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>4</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>3</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>9</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>4</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>16</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>5</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>25</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>6</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>36</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>7</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>49</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>8</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>64</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>9</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>81</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>10</td>
-        <td>1/1/0001 7:00:00 AM</td>
-        <td>100</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="GHTSubTest3">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="_ctl0">
-      <tr>
-        <td>ID</td>
-        <td>Name</td>
-        <td>Company</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_one</td>
-        <td>c_one</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_two</td>
-        <td>c_two</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_three</td>
-        <td>c_three</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_four</td>
-        <td>c_four</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_five</td>
-        <td>c_five</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_six</td>
-        <td>c_six</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_seven</td>
-        <td>c_seven</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_eight</td>
-        <td>c_eight</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_nine</td>
-        <td>c_nine</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_ten</td>
-        <td>c_ten</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_DataItem.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_DataItem.aspx.xml
deleted file mode 100644
index 3b91c891494..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_DataItem.aspx.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />bbb</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:144px">
-    <span>
-      <br />ccc</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:144px">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:144px">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest5" style="height:96px;width:144px">
-    <span>
-      <br />aaa</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:96px;width:144px">
-  </div>
-  <div id="Ghtsubtest7" style="height:96px;width:144px">
-    <span>
-      <br />ddd</span>
-  </div>
-  <div id="Ghtsubtest8" style="height:96px;width:144px">
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ItemIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ItemIndex.aspx.xml
deleted file mode 100644
index 401b2f93eaa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ItemIndex.aspx.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />1</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:144px">
-    <span>
-      <br />2</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:144px">
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:144px">
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="Ghtsubtest5" style="height:96px;width:144px">
-    <span>
-      <br />0</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:96px;width:144px">
-  </div>
-  <div id="Ghtsubtest7" style="height:96px;width:144px">
-    <span>
-      <br />3</span>
-  </div>
-  <div id="Ghtsubtest8" style="height:96px;width:144px">
-    <span>
-      <br />0</span>
-    <span>
-      <br />1</span>
-    <span>
-      <br />2</span>
-    <span>
-      <br />3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ItemType.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ItemType.aspx.xml
deleted file mode 100644
index ac7d4f46d63..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ItemType.aspx.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />1</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:144px">
-    <span>
-      <br />2</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:144px">
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:144px">
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="Ghtsubtest8" style="height:96px;width:144px">
-    <span>
-      <br />0</span>
-    <span>
-      <br />1</span>
-    <span>
-      <br />2</span>
-    <span>
-      <br />3</span>
-  </div>
-  <div id="Ghtsubtest7" style="height:96px;width:144px">
-    <span>
-      <br />3</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:96px;width:144px">
-  </div>
-  <div id="Ghtsubtest5" style="height:96px;width:144px">
-    <span>
-      <br />0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ctor_IL.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ctor_IL.aspx.xml
deleted file mode 100644
index 591990ccae1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataListItem_DataListItem_ctor_IL.aspx.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AlternatingItem">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="EditItem">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="Footer">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="Header">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest5" testname="Item">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest6" testname="Pager">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest7" testname="SelectedItem">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest8" testname="Separator">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="Positive index">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest10" testname="Negative index">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest11" testname="-1">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_AlternatingItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_AlternatingItemStyle.aspx.xml
deleted file mode 100644
index ee5eac75165..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_AlternatingItemStyle.aspx.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:144px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:red;border-color:navy;border-style:solid;border-width:2px;color:yellow;font-family:batang;font-size:medium" align="Left" valign="Top">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:red;border-color:navy;border-style:solid;border-width:2px;color:yellow;font-family:batang;font-size:medium" align="Left" valign="Top">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:red;border-color:navy;border-style:solid;border-width:2px;color:yellow;font-family:batang;font-size:medium" align="Left" valign="Top">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td style="background-color:#ffff80;border-color:lime;border-style:dotted;border-width:1px;color:purple;font-family:fixed miriam" align="Right" valign="Bottom">
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:red;border-color:navy;border-style:solid;border-width:2px;color:yellow;font-family:batang;font-size:medium" align="Left" valign="Top">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffff80;border-color:lime;border-style:dotted;border-width:1px;color:purple;font-family:fixed miriam" align="Right" valign="Bottom">
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:red;border-color:navy;border-style:solid;border-width:2px;color:yellow;font-family:batang;font-size:medium" align="Left" valign="Top">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffff80;border-color:lime;border-style:dotted;border-width:1px;color:purple;font-family:fixed miriam" align="Right" valign="Bottom">
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:red;border-color:navy;border-style:solid;border-width:2px;color:yellow;font-family:batang;font-size:medium" align="Left" valign="Top">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffff80;border-color:lime;border-style:dotted;border-width:1px;color:purple;font-family:fixed miriam" align="Right" valign="Bottom">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_AlternatingItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_AlternatingItemTemplate.aspx.xml
deleted file mode 100644
index 4787cb44d2c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_AlternatingItemTemplate.aspx.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:104px;width:176px">
-    <table id="Datalist2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="aaa" type="text" name="Datalist3:_ctl0:TextBox1" id="Datalist3__ctl0_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="submit" name="Datalist3:_ctl1:Button1" id="Datalist3__ctl1_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="text" name="Datalist3:_ctl2:TextBox1" id="Datalist3__ctl2_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="submit" name="Datalist3:_ctl3:Button1" id="Datalist3__ctl3_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="text" name="Datalist3:_ctl4:TextBox1" id="Datalist3__ctl4_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="submit" name="Datalist3:_ctl5:Button1" id="Datalist3__ctl5_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="text" name="Datalist3:_ctl6:TextBox1" id="Datalist3__ctl6_TextBox1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:coral">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ggg</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_CancelCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_CancelCommandName.aspx.xml
deleted file mode 100644
index 21fc2541630..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_CancelCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />Cancel</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_DeleteCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_DeleteCommandName.aspx.xml
deleted file mode 100644
index 01a9e66a216..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_DeleteCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />Delete</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditCommandName.aspx.xml
deleted file mode 100644
index a2e9fe1fa17..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />Edit</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemIndex.aspx.xml
deleted file mode 100644
index b741d81b839..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemIndex.aspx.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:112px;width:232px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse;height:112px;width:136px">
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:112px;width:232px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse;height:120px;width:144px">
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Selected for editing!
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:112px;width:232px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse;height:122px;width:136px">
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:112px;width:232px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemStyle.aspx.xml
deleted file mode 100644
index 2aeaa7ce6fc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemStyle.aspx.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:109px;width:152px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:144px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:96px;width:144px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="height:96px;width:144px">
-    <table id="DataList6" cellspacing="0" border="0" bordercolor="#000040" style="background-color:#ffc0c0;border-collapse:collapse;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemTemplate.aspx.xml
deleted file mode 100644
index 5ba55aff5d6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_EditItemTemplate.aspx.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <p>fixed text
-						</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:104px;width:176px">
-    <table id="Datalist2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="aaa" type="submit" name="Datalist3:_ctl0:Button1" id="Datalist3__ctl0_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="submit" name="Datalist3:_ctl1:Button1" id="Datalist3__ctl1_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="submit" name="Datalist3:_ctl2:Button1" id="Datalist3__ctl2_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="text" name="Datalist3:_ctl3:TextBox1" id="Datalist3__ctl3_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="submit" name="Datalist3:_ctl4:Button1" id="Datalist3__ctl4_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="submit" name="Datalist3:_ctl5:Button1" id="Datalist3__ctl5_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="submit" name="Datalist3:_ctl6:Button1" id="Datalist3__ctl6_Button1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:coral">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ggg</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ExtractTemplateRows.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ExtractTemplateRows.aspx.xml
deleted file mode 100644
index 60a4f40e2a8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ExtractTemplateRows.aspx.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:310px;width:280px">
-    <table id="DataList1" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid" rules="all">
-      <tr>
-        <td>
-          <table id="DataList1__ctl0_Table1" border="1" rules="all" style="background-color:Blue">
-            <tr>
-              <td>Item 0</td>
-              <td>$1.23</td>
-              <td rowspan="2">Description for Item 0</td>
-            </tr>
-            <tr>
-              <td colspan="2">1.234568E+008</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td style="background-color:gray">
-          <table id="DataList1__ctl1_Table1" border="1" rules="all" style="background-color:Blue">
-            <tr>
-              <td>Item 1</td>
-              <td>$2.46</td>
-              <td rowspan="2">Description for Item 1</td>
-            </tr>
-            <tr>
-              <td colspan="2">2.469136E+008</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <table id="DataList1__ctl2_Table1" border="1" rules="all" style="background-color:Blue">
-            <tr>
-              <td>Item 2</td>
-              <td>$3.69</td>
-              <td rowspan="2">Description for Item 2</td>
-            </tr>
-            <tr>
-              <td colspan="2">3.703704E+008</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td style="background-color:gray">
-          <table id="DataList1__ctl3_Table1" border="1" rules="all" style="background-color:Blue">
-            <tr>
-              <td>Item 3</td>
-              <td>$4.92</td>
-              <td rowspan="2">Description for Item 3</td>
-            </tr>
-            <tr>
-              <td colspan="2">4.938272E+008</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:250px;width:280px">
-    <table id="DataList2" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid" rules="all">
-      <tr>
-        <td>Item 0</td>
-        <td>$1.23</td>
-        <td rowspan="2">Description for Item 0</td>
-      </tr>
-      <tr>
-        <td colspan="2">1.234568E+008</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td>Item 1</td>
-        <td>$2.46</td>
-        <td rowspan="2">Description for Item 1</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td colspan="2">2.469136E+008</td>
-      </tr>
-      <tr>
-        <td>Item 2</td>
-        <td>$3.69</td>
-        <td rowspan="2">Description for Item 2</td>
-      </tr>
-      <tr>
-        <td colspan="2">3.703704E+008</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td>Item 3</td>
-        <td>$4.92</td>
-        <td rowspan="2">Description for Item 3</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td colspan="2">4.938272E+008</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:256px;width:280px">
-    <table id="DataList3" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid" rules="all">
-      <tr>
-        <td>Item 0</td>
-        <td>$1.23</td>
-        <td rowspan="2">Description for Item 0</td>
-      </tr>
-      <tr>
-        <td colspan="2">1.234568E+008</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td>Item 1</td>
-        <td>$2.46</td>
-        <td rowspan="2">Description for Item 1</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td colspan="2">2.469136E+008</td>
-      </tr>
-      <tr>
-        <td>Item 2</td>
-        <td>$3.69</td>
-        <td rowspan="2">Description for Item 2</td>
-      </tr>
-      <tr>
-        <td colspan="2">3.703704E+008</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td>Item 3</td>
-        <td>$4.92</td>
-        <td rowspan="2">Description for Item 3</td>
-      </tr>
-      <tr style="background-color:gray">
-        <td colspan="2">4.938272E+008</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:710px;width:120px">
-    <table id="DataList4" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid" rules="all">
-      <tr>
-        <td>
-          <table id="DataList4__ctl0_Table2" border="1" rules="all">
-            <tr>
-              <td>Item 0</td>
-              <td>$1.23</td>
-              <td rowspan="2">Description for Item 0</td>
-            </tr>
-            <tr>
-              <td colspan="2">1.234568E+008</td>
-            </tr>
-          </table>
-          <p>
-            <input value="Button" type="submit" name="DataList4:_ctl0:Button1" id="DataList4__ctl0_Button1" />
-            <img id="DataList4__ctl0_Image1" alt="" border="0" />Palin Text</p>
-          <div ms_positioning="FlowLayout" style="display:inline;height:26px;width:146px">
-            <strong>
-              <em>
-                <u>
-                  <font color="#ff0000">Html 
-												formatted text</font>
-                </u>
-              </em>
-            </strong>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td style="background-color:gray">
-          <table id="DataList4__ctl1_Table2" border="1" rules="all">
-            <tr>
-              <td>Item 1</td>
-              <td>$2.46</td>
-              <td rowspan="2">Description for Item 1</td>
-            </tr>
-            <tr>
-              <td colspan="2">2.469136E+008</td>
-            </tr>
-          </table>
-          <p>
-            <input value="Button" type="submit" name="DataList4:_ctl1:Button1" id="DataList4__ctl1_Button1" />
-            <img id="DataList4__ctl1_Image1" alt="" border="0" />Palin Text</p>
-          <div ms_positioning="FlowLayout" style="display:inline;height:26px;width:146px">
-            <strong>
-              <em>
-                <u>
-                  <font color="#ff0000">Html 
-												formatted text</font>
-                </u>
-              </em>
-            </strong>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <table id="DataList4__ctl2_Table2" border="1" rules="all">
-            <tr>
-              <td>Item 2</td>
-              <td>$3.69</td>
-              <td rowspan="2">Description for Item 2</td>
-            </tr>
-            <tr>
-              <td colspan="2">3.703704E+008</td>
-            </tr>
-          </table>
-          <p>
-            <input value="Button" type="submit" name="DataList4:_ctl2:Button1" id="DataList4__ctl2_Button1" />
-            <img id="DataList4__ctl2_Image1" alt="" border="0" />Palin Text</p>
-          <div ms_positioning="FlowLayout" style="display:inline;height:26px;width:146px">
-            <strong>
-              <em>
-                <u>
-                  <font color="#ff0000">Html 
-												formatted text</font>
-                </u>
-              </em>
-            </strong>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td style="background-color:gray">
-          <table id="DataList4__ctl3_Table2" border="1" rules="all">
-            <tr>
-              <td>Item 3</td>
-              <td>$4.92</td>
-              <td rowspan="2">Description for Item 3</td>
-            </tr>
-            <tr>
-              <td colspan="2">4.938272E+008</td>
-            </tr>
-          </table>
-          <p>
-            <input value="Button" type="submit" name="DataList4:_ctl3:Button1" id="DataList4__ctl3_Button1" />
-            <img id="DataList4__ctl3_Image1" alt="" border="0" />Palin Text</p>
-          <div ms_positioning="FlowLayout" style="display:inline;height:26px;width:146px">
-            <strong>
-              <em>
-                <u>
-                  <font color="#ff0000">Html 
-												formatted text</font>
-                </u>
-              </em>
-            </strong>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_FooterStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_FooterStyle.aspx.xml
deleted file mode 100644
index 587310ed6a4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_FooterStyle.aspx.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:104px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-      <tr>
-        <td>
-						Footer
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:104px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>Footer</p>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:104px">
-    <table id="DataList3" cellspacing="0" border="1" bordercolor="#FFFFC0" style="background-color:#ff8080;border-collapse:collapse;border-color:#ffffc0;border-style:groove;color:darkred;font-family:angsanaupc" rules="all">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-      <tr>
-        <td>
-						Footer
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:104px">
-    <table id="DataList4" cellspacing="0" border="1" bordercolor="#FFFFC0" style="background-color:#ff8080;border-collapse:collapse;border-color:#ffffc0;border-style:groove;color:darkred;font-family:angsanaupc" rules="all">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						Footer
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_FooterTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_FooterTemplate.aspx.xml
deleted file mode 100644
index e2934194767..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_FooterTemplate.aspx.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:176px">
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="aaa" type="text" name="Datalist3:_ctl0:TextBox1" id="Datalist3__ctl0_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="text" name="Datalist3:_ctl1:TextBox1" id="Datalist3__ctl1_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="text" name="Datalist3:_ctl2:TextBox1" id="Datalist3__ctl2_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="text" name="Datalist3:_ctl3:TextBox1" id="Datalist3__ctl3_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="text" name="Datalist3:_ctl4:TextBox1" id="Datalist3__ctl4_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="text" name="Datalist3:_ctl5:TextBox1" id="Datalist3__ctl5_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="text" name="Datalist3:_ctl6:TextBox1" id="Datalist3__ctl6_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="Footer" type="submit" name="Datalist3:_ctl7:Button1" id="Datalist3__ctl7_Button1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>Footer</td>
-            <td>Footer</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:coral">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ggg</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Footer text</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_GridLines.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_GridLines.aspx.xml
deleted file mode 100644
index adeb9dd0d87..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_GridLines.aspx.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:504px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse;border-style:none;width:544px">
-      <tr>
-        <td>
-          <tr style="color:navy;font-weight:bold;text-align:center;text-decoration:underline;text-transform:capitalize">
-            <td>StringValue</td>
-            <td>PriceValue</td>
-            <td>DescriptionValue</td>
-            <td>ExponentialValue</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 0</td>
-            <td>$1.23</td>
-            <td>Description for Item 0</td>
-            <td>1.234568E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 1</td>
-            <td>$2.46</td>
-            <td>Description for Item 1</td>
-            <td>2.469136E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 2</td>
-            <td>$3.69</td>
-            <td>Description for Item 2</td>
-            <td>3.703704E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 3</td>
-            <td>$4.92</td>
-            <td>Description for Item 3</td>
-            <td>4.938272E+008</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:144px">
-    <table id="DataList2" cellspacing="0" border="1" style="border-collapse:collapse;border-style:none;width:552px" rules="rows">
-      <tr>
-        <td>
-          <tr style="color:navy;font-weight:bold;text-align:center;text-decoration:underline;text-transform:capitalize">
-            <td>StringValue</td>
-            <td>PriceValue</td>
-            <td>DescriptionValue</td>
-            <td>ExponentialValue</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 0</td>
-            <td>$1.23</td>
-            <td>Description for Item 0</td>
-            <td>1.234568E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 1</td>
-            <td>$2.46</td>
-            <td>Description for Item 1</td>
-            <td>2.469136E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 2</td>
-            <td>$3.69</td>
-            <td>Description for Item 2</td>
-            <td>3.703704E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 3</td>
-            <td>$4.92</td>
-            <td>Description for Item 3</td>
-            <td>4.938272E+008</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="1" style="border-collapse:collapse;border-style:none;width:552px" rules="cols">
-      <tr>
-        <td>
-          <tr style="color:navy;font-weight:bold;text-align:center;text-decoration:underline;text-transform:capitalize">
-            <td>StringValue</td>
-            <td>PriceValue</td>
-            <td>DescriptionValue</td>
-            <td>ExponentialValue</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 0</td>
-            <td>$1.23</td>
-            <td>Description for Item 0</td>
-            <td>1.234568E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 1</td>
-            <td>$2.46</td>
-            <td>Description for Item 1</td>
-            <td>2.469136E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 2</td>
-            <td>$3.69</td>
-            <td>Description for Item 2</td>
-            <td>3.703704E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 3</td>
-            <td>$4.92</td>
-            <td>Description for Item 3</td>
-            <td>4.938272E+008</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:144px">
-    <table id="DataList4" cellspacing="0" border="1" style="border-collapse:collapse;border-style:none;width:552px" rules="all">
-      <tr>
-        <td>
-          <tr style="color:navy;font-weight:bold;text-align:center;text-decoration:underline;text-transform:capitalize">
-            <td>StringValue</td>
-            <td>PriceValue</td>
-            <td>DescriptionValue</td>
-            <td>ExponentialValue</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 0</td>
-            <td>$1.23</td>
-            <td>Description for Item 0</td>
-            <td>1.234568E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 1</td>
-            <td>$2.46</td>
-            <td>Description for Item 1</td>
-            <td>2.469136E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 2</td>
-            <td>$3.69</td>
-            <td>Description for Item 2</td>
-            <td>3.703704E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 3</td>
-            <td>$4.92</td>
-            <td>Description for Item 3</td>
-            <td>4.938272E+008</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:96px;width:144px">
-    <span id="DataList5" style="border-style:none;width:552px">
-      <span>
-        <tr style="color:navy;font-weight:bold;text-align:center;text-decoration:underline;text-transform:capitalize">
-          <td>
-									StringValue
-								</td>
-          <td>
-									PriceValue
-								</td>
-          <td>
-									DescriptionValue
-								</td>
-          <td>
-									ExponentialValue
-								</td>
-        </tr>
-      </span>
-      <br />
-      <span>
-        <tr style="text-align:center">
-          <td>
-									Item 0
-								</td>
-          <td>
-									$1.23
-								</td>
-          <td>
-									Description for Item 0
-								</td>
-          <td>
-									1.234568E+008
-								</td>
-        </tr>
-      </span>
-      <br />
-      <span>
-        <tr style="text-align:center">
-          <td>
-									Item 1
-								</td>
-          <td>
-									$2.46
-								</td>
-          <td>
-									Description for Item 1
-								</td>
-          <td>
-									2.469136E+008
-								</td>
-        </tr>
-      </span>
-      <br />
-      <span>
-        <tr style="text-align:center">
-          <td>
-									Item 2
-								</td>
-          <td>
-									$3.69
-								</td>
-          <td>
-									Description for Item 2
-								</td>
-          <td>
-									3.703704E+008
-								</td>
-        </tr>
-      </span>
-      <br />
-      <span>
-        <tr style="text-align:center">
-          <td>
-									Item 3
-								</td>
-          <td>
-									$4.92
-								</td>
-          <td>
-									Description for Item 3
-								</td>
-          <td>
-									4.938272E+008
-								</td>
-        </tr>
-      </span>
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="Default value">
-    <table id="_ctl0" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr style="color:navy;font-weight:bold;text-align:center;text-decoration:underline;text-transform:capitalize">
-            <td>StringValue</td>
-            <td>PriceValue</td>
-            <td>DescriptionValue</td>
-            <td>ExponentialValue</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 0</td>
-            <td>$1.23</td>
-            <td>Description for Item 0</td>
-            <td>1.234568E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 1</td>
-            <td>$2.46</td>
-            <td>Description for Item 1</td>
-            <td>2.469136E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 2</td>
-            <td>$3.69</td>
-            <td>Description for Item 2</td>
-            <td>3.703704E+008</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr style="text-align:center">
-            <td>Item 3</td>
-            <td>$4.92</td>
-            <td>Description for Item 3</td>
-            <td>4.938272E+008</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_HeaderStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_HeaderStyle.aspx.xml
deleted file mode 100644
index c5a5245a495..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_HeaderStyle.aspx.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:104px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						header
-					</td>
-      </tr>
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:104px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>header</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:104px">
-    <table id="DataList3" cellspacing="0" border="1" bordercolor="#FFFFC0" style="background-color:#ff8080;border-collapse:collapse;border-color:#ffffc0;border-style:groove;color:darkred;font-family:angsanaupc" rules="all">
-      <tr>
-        <td>
-						header
-					</td>
-      </tr>
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:104px">
-    <table id="DataList4" cellspacing="0" border="1" bordercolor="#FFFFC0" style="background-color:#ff8080;border-collapse:collapse;border-color:#ffffc0;border-style:groove;color:darkred;font-family:angsanaupc" rules="all">
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						header
-					</td>
-      </tr>
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest5" style="height:96px;width:104px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <td align="center">Header</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-          <td>aaa</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-          <td>bbb</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-          <td>ccc</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-          <td>ddd</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-          <td>eee</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-          <td>fff</td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-          <td>ggg</td>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_HeaderTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_HeaderTemplate.aspx.xml
deleted file mode 100644
index aa8f13ffa85..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_HeaderTemplate.aspx.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:176px">
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="header" type="submit" name="Datalist3:_ctl0:Button1" id="Datalist3__ctl0_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="aaa" type="text" name="Datalist3:_ctl1:TextBox1" id="Datalist3__ctl1_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="text" name="Datalist3:_ctl2:TextBox1" id="Datalist3__ctl2_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="text" name="Datalist3:_ctl3:TextBox1" id="Datalist3__ctl3_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="text" name="Datalist3:_ctl4:TextBox1" id="Datalist3__ctl4_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="text" name="Datalist3:_ctl5:TextBox1" id="Datalist3__ctl5_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="text" name="Datalist3:_ctl6:TextBox1" id="Datalist3__ctl6_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="text" name="Datalist3:_ctl7:TextBox1" id="Datalist3__ctl7_TextBox1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>header</td>
-            <td>header</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">header text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ggg</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ItemStyle.aspx.xml
deleted file mode 100644
index af49b9aa4a7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ItemStyle.aspx.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:109px;width:152px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="0" bordercolor="#000040" style="background-color:#ffc0c0;border-collapse:collapse;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ItemTemplate.aspx.xml
deleted file mode 100644
index 421a1cd0c07..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ItemTemplate.aspx.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:104px;width:176px">
-    <table id="Datalist2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="aaa" type="text" name="Datalist3:_ctl0:TextBox1" id="Datalist3__ctl0_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="text" name="Datalist3:_ctl1:TextBox1" id="Datalist3__ctl1_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="text" name="Datalist3:_ctl2:TextBox1" id="Datalist3__ctl2_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="text" name="Datalist3:_ctl3:TextBox1" id="Datalist3__ctl3_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="text" name="Datalist3:_ctl4:TextBox1" id="Datalist3__ctl4_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="text" name="Datalist3:_ctl5:TextBox1" id="Datalist3__ctl5_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="text" name="Datalist3:_ctl6:TextBox1" id="Datalist3__ctl6_TextBox1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">ggg</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_Items.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_Items.aspx.xml
deleted file mode 100644
index b36e6c0e71c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_Items.aspx.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span id="DataList1__ctl0_ItemLabel">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span id="DataList1__ctl1_ItemLabel">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span id="DataList1__ctl2_ItemLabel">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span id="DataList1__ctl3_ItemLabel">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span id="DataList1__ctl4_ItemLabel">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span id="DataList1__ctl5_ItemLabel">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span id="DataList1__ctl6_ItemLabel">ggg</span>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Item: aaa</span>
-    <span>
-      <br />Item: bbb</span>
-    <span>
-      <br />Item: ccc</span>
-    <span>
-      <br />Item: ddd</span>
-    <span>
-      <br />Item: eee</span>
-    <span>
-      <br />Item: fff</span>
-    <span>
-      <br />Item: ggg</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatColumns.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatColumns.aspx.xml
deleted file mode 100644
index 9305c2c0489..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatColumns.aspx.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:128px;width:120px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:128px;width:120px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:128px;width:120px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="height:128px;width:120px">
-    <table id="DataList6" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:128px;width:120px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:128px;width:120px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" style="height:128px;width:120px">
-    <table id="DataList7" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" style="height:128px;width:120px">
-    <table id="DataList8" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" style="height:128px;width:120px">
-    <table id="DataList9" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" style="height:128px;width:120px">
-    <table id="DataList12" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" style="height:128px;width:120px">
-    <table id="DataList10" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" style="height:128px;width:120px">
-    <table id="DataList11" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatDirection.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatDirection.aspx.xml
deleted file mode 100644
index 433855e89bd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatDirection.aspx.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:144px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:144px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:96px;width:144px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="height:96px;width:144px">
-    <table id="DataList6" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatLayout.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatLayout.aspx.xml
deleted file mode 100644
index 5f2e9f977b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_RepeatLayout.aspx.xml
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:128px;width:104px">
-    <table id="DataList1" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:130px;width:104px">
-    <table id="DataList2" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:100px;width:216px">
-    <table id="DataList3" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:130px;width:120px">
-    <span id="DataList4" style="border-color:black;border-style:solid;border-width:1px;height:75px">
-      <span>
-							aaa
-						</span>
-      <span>
-							ddd
-						</span>
-      <span>
-							fff
-						</span>
-      <br />
-      <span>
-							bbb
-						</span>
-      <span>
-							eee
-						</span>
-      <span>
-							ggg
-						</span>
-      <br />
-      <span>
-							ccc
-						</span>
-    </span>
-  </div>
-  <div id="GHTSubTest5" style="height:80px;width:40px">
-    <table id="DataList5" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="height:130px;width:104px">
-    <span id="DataList6" style="border-color:black;border-style:solid;border-width:1px">
-      <span>
-							aaa
-						</span>
-      <span>
-							bbb
-						</span>
-      <span>
-							ccc
-						</span>
-      <span>
-							ddd
-						</span>
-      <span>
-							eee
-						</span>
-      <span>
-							fff
-						</span>
-      <span>
-							ggg
-						</span>
-    </span>
-  </div>
-  <div id="Ghtsubtest7" style="height:140px;width:104px">
-    <table id="Datalist7" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-      </tr>
-      <tr>
-        <td>
-							bbb
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-      </tr>
-      <tr>
-        <td>
-							eee
-						</td>
-      </tr>
-      <tr>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest8" style="height:202px;width:88px">
-    <span id="Datalist8" style="border-color:black;border-style:solid;border-width:1px">
-      <span>
-							aaa
-						</span>
-      <br />
-      <span>
-							bbb
-						</span>
-      <br />
-      <span>
-							ccc
-						</span>
-      <br />
-      <span>
-							ddd
-						</span>
-      <br />
-      <span>
-							eee
-						</span>
-      <br />
-      <span>
-							fff
-						</span>
-      <br />
-      <span>
-							ggg
-						</span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest9" style="height:90px;width:216px">
-    <table id="Datalist9" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-      </tr>
-      <tr>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest10" style="height:80px;width:40px">
-    <span id="Datalist10" style="border-color:black;border-style:solid;border-width:1px;height:136px;width:120px">
-      <span>
-							aaa
-						</span>
-      <span>
-							bbb
-						</span>
-      <span>
-							ccc
-						</span>
-      <br />
-      <span>
-							ddd
-						</span>
-      <span>
-							eee
-						</span>
-      <span>
-							fff
-						</span>
-      <br />
-      <span>
-							ggg
-						</span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest11" style="height:102px;width:360px">
-    <table id="Datalist11" cellspacing="0" border="1" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:1px" rules="all">
-      <tr>
-        <td>
-							aaa
-						</td>
-        <td>
-							bbb
-						</td>
-        <td>
-							ccc
-						</td>
-        <td>
-							ddd
-						</td>
-        <td>
-							eee
-						</td>
-        <td>
-							fff
-						</td>
-        <td>
-							ggg
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest12" style="height:138px;width:120px">
-    <span id="Datalist12" style="border-color:black;border-style:solid;border-width:1px">
-      <span>
-							aaa
-						</span>
-      <span>
-							bbb
-						</span>
-      <span>
-							ccc
-						</span>
-      <span>
-							ddd
-						</span>
-      <span>
-							eee
-						</span>
-      <span>
-							fff
-						</span>
-      <span>
-							ggg
-						</span>
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectCommandName.aspx.xml
deleted file mode 100644
index c6abb31e058..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />Select</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedIndex.aspx.xml
deleted file mode 100644
index f41c4ef1d20..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedIndex.aspx.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:112px;width:232px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse;height:112px;width:136px">
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:112px;width:232px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse;height:120px;width:144px">
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Selected Item!
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:112px;width:232px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse;height:122px;width:136px">
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-      <tr>
-        <td>
-							Regular item.
-						</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:112px;width:232px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItem.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItem.aspx.xml
deleted file mode 100644
index 33e06731a3a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItem.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Result: null</span>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:144px">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItemStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItemStyle.aspx.xml
deleted file mode 100644
index 67ca09924cb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItemStyle.aspx.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:109px;width:152px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:144px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:96px;width:144px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#ffc0c0;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" style="height:96px;width:144px">
-    <table id="DataList6" cellspacing="0" border="0" bordercolor="#000040" style="background-color:#ffc0c0;border-collapse:collapse;border-color:#000040;border-style:double;border-width:2px;color:maroon;font-family:aharoni">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:turquoise;border-color:red;border-style:solid;border-width:1px;color:maroon;font-family:david">
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItemTemplate.aspx.xml
deleted file mode 100644
index 5ba55aff5d6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SelectedItemTemplate.aspx.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <p>fixed text
-						</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:104px;width:176px">
-    <table id="Datalist2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="aaa" type="submit" name="Datalist3:_ctl0:Button1" id="Datalist3__ctl0_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="submit" name="Datalist3:_ctl1:Button1" id="Datalist3__ctl1_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="submit" name="Datalist3:_ctl2:Button1" id="Datalist3__ctl2_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="text" name="Datalist3:_ctl3:TextBox1" id="Datalist3__ctl3_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="submit" name="Datalist3:_ctl4:Button1" id="Datalist3__ctl4_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="submit" name="Datalist3:_ctl5:Button1" id="Datalist3__ctl5_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="submit" name="Datalist3:_ctl6:Button1" id="Datalist3__ctl6_Button1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:coral">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ggg</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SeparatorStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SeparatorStyle.aspx.xml
deleted file mode 100644
index 368d44f1147..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SeparatorStyle.aspx.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:104px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:96px;width:104px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>separator</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>separator</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>separator</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>separator</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>separator</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:purple;border-color:lime;border-style:double;border-width:3px;color:#004000;font-family:arial narrow;font-style:italic;font-weight:bold;text-decoration:line-through overline underline">
-          <p>separator</p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:96px;width:104px">
-    <table id="DataList3" cellspacing="0" border="1" bordercolor="#FFFFC0" style="background-color:#ff8080;border-collapse:collapse;border-color:#ffffc0;border-style:groove;color:darkred;font-family:angsanaupc" rules="all">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest4" style="height:96px;width:104px">
-    <table id="DataList4" cellspacing="0" border="1" bordercolor="#FFFFC0" style="background-color:#ff8080;border-collapse:collapse;border-color:#ffffc0;border-style:groove;color:darkred;font-family:angsanaupc" rules="all">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td style="background-color:#8080ff;border-color:#000040;border-style:dotted;color:purple;font-family:batang">
-						separator
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SeparatorTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SeparatorTemplate.aspx.xml
deleted file mode 100644
index 51934949e73..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_SeparatorTemplate.aspx.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:176px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-						fixed text
-					</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:176px">
-  </div>
-  <div id="Ghtsubtest3" style="height:104px;width:176px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input value="aaa" type="text" name="Datalist3:_ctl0:TextBox1" id="Datalist3__ctl0_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="separator" type="submit" name="Datalist3:_ctl1:Button1" id="Datalist3__ctl1_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="bbb" type="text" name="Datalist3:_ctl2:TextBox1" id="Datalist3__ctl2_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="separator" type="submit" name="Datalist3:_ctl3:Button1" id="Datalist3__ctl3_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ccc" type="text" name="Datalist3:_ctl4:TextBox1" id="Datalist3__ctl4_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="separator" type="submit" name="Datalist3:_ctl5:Button1" id="Datalist3__ctl5_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ddd" type="text" name="Datalist3:_ctl6:TextBox1" id="Datalist3__ctl6_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="separator" type="submit" name="Datalist3:_ctl7:Button1" id="Datalist3__ctl7_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="eee" type="text" name="Datalist3:_ctl8:TextBox1" id="Datalist3__ctl8_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="separator" type="submit" name="Datalist3:_ctl9:Button1" id="Datalist3__ctl9_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="fff" type="text" name="Datalist3:_ctl10:TextBox1" id="Datalist3__ctl10_TextBox1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="separator" type="submit" name="Datalist3:_ctl11:Button1" id="Datalist3__ctl11_Button1" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="ggg" type="text" name="Datalist3:_ctl12:TextBox1" id="Datalist3__ctl12_TextBox1" />
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:176px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>aaa</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>separator</td>
-            <td>separator</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>bbb</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>separator</td>
-            <td>separator</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ccc</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>separator</td>
-            <td>separator</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ddd</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>separator</td>
-            <td>separator</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>eee</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>separator</td>
-            <td>separator</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>fff</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ThreeDFace">
-            <td>separator</td>
-            <td>separator</td>
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr bgcolor="ActiveCaption">
-            <td>ggg</td>
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:104px;width:176px">
-    <table id="DataList5" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <span style="background-color:coral">aaa</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Separator text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">bbb</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Separator text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ccc</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Separator text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ddd</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Separator text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">eee</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Separator text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">fff</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:aquamarine">Separator text</span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span style="background-color:coral">ggg</span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ShowFooter.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ShowFooter.aspx.xml
deleted file mode 100644
index 302b8e8cd45..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ShowFooter.aspx.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-      <tr>
-        <td>
-						Footer
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:144px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:144px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ShowHeader.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ShowHeader.aspx.xml
deleted file mode 100644
index 309b15f7493..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_ShowHeader.aspx.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						header
-					</td>
-      </tr>
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:144px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:144px">
-    <table id="DataList3" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:96px;width:144px">
-    <table id="DataList4" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-						aaa
-					</td>
-      </tr>
-      <tr>
-        <td>
-						bbb
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ccc
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ddd
-					</td>
-      </tr>
-      <tr>
-        <td>
-						eee
-					</td>
-      </tr>
-      <tr>
-        <td>
-						fff
-					</td>
-      </tr>
-      <tr>
-        <td>
-						ggg
-					</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_UpdateCommandName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_UpdateCommandName.aspx.xml
deleted file mode 100644
index 3d799927ef6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DataList_DataList_UpdateCommandName.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:144px">
-    <span>
-      <br />Update</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DayNameFormat_DayNameFormat_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DayNameFormat_DayNameFormat_Enum.aspx.xml
deleted file mode 100644
index 3e008400c0e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DayNameFormat_DayNameFormat_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.DayNameFormat">
-    <span>
-      <br />Full; Short; FirstLetter; FirstTwoLetters; 0; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderColor.aspx.xml
deleted file mode 100644
index 06c793d3f8f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderColor.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;left:16px;position:absolute;top:15px;width:128px;z-index:100">
-    <select id="DropDownList1" style="border-color:fuchsia;width:120px" name="DropDownList1">
-    </select>
-  </div>
-  <div id="GHTSubTest5" style="height:32px;left:16px;position:absolute;top:232px;width:128px;z-index:105">
-    <select id="DropDownList5" style="border-color:#be7b1a;width:120px" name="DropDownList5">
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:32px;left:16px;position:absolute;top:184px;width:128px;z-index:104">
-    <select id="DropDownList4" style="border-color:navy;width:120px" name="DropDownList4">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:32px;left:16px;position:absolute;top:128px;width:128px;z-index:103">
-    <select id="DropDownList3" style="border-color:limegreen;width:120px" name="DropDownList3">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:32px;left:16px;position:absolute;top:72px;width:128px;z-index:101">
-    <select id="DropDownList2" style="border-color:#d4d0c8;width:120px" name="DropDownList2">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderStyle.aspx.xml
deleted file mode 100644
index 7d9c7248917..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderStyle.aspx.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;left:16px;position:absolute;top:15px;width:120px;z-index:100">
-    <select id="DropDownList1" style="border-style:dashed;width:96px" name="DropDownList1">
-    </select>
-  </div>
-  <div id="GHTSubTest10" style="height:32px;left:16px;position:absolute;top:376px;width:120px;z-index:110">
-    <select id="DropDownList10" style="border-style:dotted;width:96px" name="DropDownList10">
-    </select>
-  </div>
-  <div id="GHTSubTest7" style="height:32px;left:16px;position:absolute;top:256px;width:120px;z-index:106">
-    <select id="DropDownList7" style="border-style:double;width:96px" name="DropDownList7">
-    </select>
-  </div>
-  <div id="GHTSubTest6" style="height:32px;left:16px;position:absolute;top:216px;width:120px;z-index:105">
-    <select id="DropDownList6" style="border-style:groove;width:96px" name="DropDownList6">
-    </select>
-  </div>
-  <div id="GHTSubTest5" style="height:32px;left:16px;position:absolute;top:176px;width:120px;z-index:104">
-    <select id="DropDownList5" style="border-style:inset;width:96px" name="DropDownList5">
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:32px;left:16px;position:absolute;top:136px;width:120px;z-index:103">
-    <select id="DropDownList4" style="border-style:none;width:96px" name="DropDownList4">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:32px;left:16px;position:absolute;top:96px;width:120px;z-index:102">
-    <select id="DropDownList3" style="width:96px" name="DropDownList3">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:32px;left:16px;position:absolute;top:56px;width:120px;z-index:101">
-    <select id="DropDownList2" style="border-style:outset;width:96px" name="DropDownList2">
-    </select>
-  </div>
-  <div id="GHTSubTest9" style="height:32px;left:16px;position:absolute;top:336px;width:120px;z-index:109">
-    <select id="DropDownList9" style="border-style:ridge;width:96px" name="DropDownList9">
-    </select>
-  </div>
-  <div id="GHTSubTest8" style="height:32px;left:16px;position:absolute;top:296px;width:120px;z-index:108">
-    <select id="DropDownList8" style="border-style:solid;width:96px" name="DropDownList8">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderWidth.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderWidth.aspx.xml
deleted file mode 100644
index 026b1df9712..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_BorderWidth.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;left:16px;position:absolute;top:15px;width:128px;z-index:101">
-    <select id="DropDownList1" style="border-style:solid;border-width:10px;height:32px;width:112px" name="DropDownList1">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:32px;left:16px;position:absolute;top:56px;width:128px;z-index:102">
-    <select id="DropDownList2" style="border-style:solid;border-width:10px;height:32px;width:112px" name="DropDownList2">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_SelectedIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_SelectedIndex.aspx.xml
deleted file mode 100644
index 2c2ab39e46a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_SelectedIndex.aspx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest2" style="height:40px;width:96px">
-    <select id="DropDownList2" style="width:88px" name="DropDownList2">
-      <option value="Item1" />Item1
-		<option value="Item2" />Item2
-		<option value="Item3" selected="selected" />Item3
-		<option value="Item4" />Item4
-		<option value="Item5" />Item5
-		<option value="Item6" />Item6
-
-	</select>
-  </div>
-  <div id="GHTSubTest1" style="height:32px;width:96px">
-    <select id="DropDownList1" style="width:88px" name="DropDownList1">
-      <option value="Item1" />Item1
-		<option value="Item2" />Item2
-		<option value="Item3" />Item3
-		<option value="Item4" selected="selected" />Item4
-		<option value="Item5" />Item5
-		<option value="Item6" />Item6
-
-	</select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_ToolTip.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_ToolTip.aspx.xml
deleted file mode 100644
index e666044c1c9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_DropDownList_DropDownList_ToolTip.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:344px">
-    <select id="DropDownList1" name="DropDownList1">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:344px">
-    <select id="DropDownList2" name="DropDownList2">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:344px">
-    <select id="DropDownList3" name="DropDownList3">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_ButtonType.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_ButtonType.aspx.xml
deleted file mode 100644
index cd42727b8f9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_ButtonType.aspx.xml
+++ /dev/null
@@ -1,729 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl2:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl1','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl3:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl1','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl4:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl1','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl5:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl1','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl1','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl7:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl1','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl8:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl1','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl9:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl1','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl10:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl1','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid3:_ctl11:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl1','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />PushButton</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl1','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl3','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl1','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl3','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl3','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl1','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl3','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl1','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl3','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl1','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl3','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl1','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl3','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl1','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl3','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl1','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl3','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl1','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl3','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl1','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl3','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl1','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl3','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl1','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl3','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl1','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl3','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl1','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl3','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl1','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl3','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl1','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl3','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl1','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl3','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl1','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl3','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl1','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl3','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />LinkButton</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl2:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl1','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl3','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl3:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl3$_ctl1','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl3$_ctl3','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl4:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl1','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl3','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl5:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl5$_ctl1','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl5$_ctl3','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl6:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl6$_ctl1','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl6$_ctl3','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl7:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl7$_ctl1','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl7$_ctl3','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl8:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl8$_ctl1','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl8$_ctl3','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl9:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl9$_ctl1','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl9$_ctl3','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl10:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl10$_ctl1','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl10$_ctl3','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input value="edit this row" type="submit" name="DataGrid6:_ctl11:_ctl0" />
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl11$_ctl1','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl11$_ctl3','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />PushButton</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_CancelText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_CancelText.aspx.xml
deleted file mode 100644
index ac28b654f92..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_CancelText.aspx.xml
+++ /dev/null
@@ -1,542 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid1:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">cancel edit this row</a></td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid2:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />cancel edit this row</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl1','')">cancel text with !@#$%^&amp;*()_+_+</a></td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid3:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />cancel text with !@#$%^&amp;*()_+_+</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="3" type="text" name="DataGrid4:_ctl4:_ctl2" />
-        </td>
-        <td>
-          <input value="n_0_three" type="text" name="DataGrid4:_ctl4:_ctl3" />
-        </td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid4:_ctl4:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl1','')">cancel edit this row</a></td>
-        <td>
-          <input value="3" type="text" name="DataGrid5:_ctl4:_ctl2" />
-        </td>
-        <td>
-          <input value="n_0_three" type="text" name="DataGrid5:_ctl4:_ctl3" />
-        </td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid5:_ctl4:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />cancel edit this row</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl1','')">cancel text with !@#$%^&amp;*()_+_+</a></td>
-        <td>
-          <input value="3" type="text" name="DataGrid6:_ctl4:_ctl2" />
-        </td>
-        <td>
-          <input value="n_0_three" type="text" name="DataGrid6:_ctl4:_ctl3" />
-        </td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid6:_ctl4:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />cancel text with !@#$%^&amp;*()_+_+</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_EditText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_EditText.aspx.xml
deleted file mode 100644
index dce0ac94b44..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_EditText.aspx.xml
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />edit this row</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />edit text with !@#$%^&amp;*()_+_+</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">
-          </a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">edit edit this row</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />edit edit this row</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl3$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl5$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl6$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl7$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl8$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl9$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl10$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl11$_ctl0','')">edit text with !@#$%^&amp;*()_+_+</a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />edit text with !@#$%^&amp;*()_+_+</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_InitializeCell_TIL.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_InitializeCell_TIL.aspx.xml
deleted file mode 100644
index e8a8cb65e52..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_InitializeCell_TIL.aspx.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td index="-1">&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td index="0">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl3','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">n_0_one</a>
-        </td>
-        <td>
-          <a>c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="1">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl3','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">n_0_two</a>
-        </td>
-        <td>
-          <a>c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="2">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl3','')">
-          </a>
-        </td>
-        <td>3</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">n_0_three</a>
-        </td>
-        <td>
-          <a>c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="3">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl3','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">n_0_four</a>
-        </td>
-        <td>
-          <a>c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="4">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl3','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">n_0_five</a>
-        </td>
-        <td>
-          <a>c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="5">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl3','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">n_0_six</a>
-        </td>
-        <td>
-          <a>c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="6">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl3','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">n_0_seven</a>
-        </td>
-        <td>
-          <a>c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="7">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl3','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">n_0_eight</a>
-        </td>
-        <td>
-          <a>c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="8">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl3','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">n_0_nine</a>
-        </td>
-        <td>
-          <a>c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="9">
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">
-          </a>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl3','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">n_0_ten</a>
-        </td>
-        <td>
-          <a>c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_UpdateText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_UpdateText.aspx.xml
deleted file mode 100644
index 938613be7df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_UpdateText.aspx.xml
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid1:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">update edit this row</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid2:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />update edit this row</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl0','')">update text with !@#$%^&amp;*()_+_+</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid3$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid3:_ctl4:_ctl2" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid3$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />update text with !@#$%^&amp;*()_+_+</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl0','')">
-          </a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid4$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="3" type="text" name="DataGrid4:_ctl4:_ctl2" />
-        </td>
-        <td>
-          <input value="n_0_three" type="text" name="DataGrid4:_ctl4:_ctl3" />
-        </td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid4:_ctl4:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid4$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="Ghtsubtest5" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid5">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl0','')">update edit this row</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid5$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="3" type="text" name="DataGrid5:_ctl4:_ctl2" />
-        </td>
-        <td>
-          <input value="n_0_three" type="text" name="DataGrid5:_ctl4:_ctl3" />
-        </td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid5:_ctl4:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid5$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />update edit this row</span>
-  </div>
-  <div id="Ghtsubtest6" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid6">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl2$_ctl0','')">
-          </a>
-        </td>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl3$_ctl0','')">
-          </a>
-        </td>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl0','')">update text with !@#$%^&amp;*()_+_+</a>&amp;nbsp;<a href="javascript:__doPostBack('DataGrid6$_ctl4$_ctl1','')"></a></td>
-        <td>
-          <input value="3" type="text" name="DataGrid6:_ctl4:_ctl2" />
-        </td>
-        <td>
-          <input value="n_0_three" type="text" name="DataGrid6:_ctl4:_ctl3" />
-        </td>
-        <td>
-          <input value="c_0_three" type="text" name="DataGrid6:_ctl4:_ctl4" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl5$_ctl0','')">
-          </a>
-        </td>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl6$_ctl0','')">
-          </a>
-        </td>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl7$_ctl0','')">
-          </a>
-        </td>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl8$_ctl0','')">
-          </a>
-        </td>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl9$_ctl0','')">
-          </a>
-        </td>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl10$_ctl0','')">
-          </a>
-        </td>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid6$_ctl11$_ctl0','')">
-          </a>
-        </td>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-      </tr>
-    </table>
-    <span>
-      <br />update text with !@#$%^&amp;*()_+_+</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_ctor_.aspx.xml
deleted file mode 100644
index 70ea9d12220..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_EditCommandColumn_EditCommandColumn_ctor_.aspx.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl1','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl2$_ctl3','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl1','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl3$_ctl3','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl1','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl4$_ctl3','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl1','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl5$_ctl3','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl1','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl6$_ctl3','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl1','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl7$_ctl3','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl1','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl8$_ctl3','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl1','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl9$_ctl3','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl1','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl10$_ctl3','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl1','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid1$_ctl11$_ctl3','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl1','')">1</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl2','')">n_0_one</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl2$_ctl3','')">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl1','')">2</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl2','')">n_0_two</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl3$_ctl3','')">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl1','')">3</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl2','')">n_0_three</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl4$_ctl3','')">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl1','')">4</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl2','')">n_0_four</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl5$_ctl3','')">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl1','')">5</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl2','')">n_0_five</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl6$_ctl3','')">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl1','')">6</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl2','')">n_0_six</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl7$_ctl3','')">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl1','')">7</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl2','')">n_0_seven</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl8$_ctl3','')">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl1','')">8</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl2','')">n_0_eight</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl9$_ctl3','')">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl1','')">9</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl2','')">n_0_nine</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl10$_ctl3','')">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl0','')">edit this row</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl1','')">10</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl2','')">n_0_ten</a>
-        </td>
-        <td>
-          <a href="javascript:__doPostBack('DataGrid2$_ctl11$_ctl3','')">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_FirstDayOfWeek_FirstDayOfWeek_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_FirstDayOfWeek_FirstDayOfWeek_Enum.aspx.xml
deleted file mode 100644
index 0d4e08eef54..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_FirstDayOfWeek_FirstDayOfWeek_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.FirstDayOfWeek">
-    <span>
-      <br />Sunday; Monday; Tuesday; Wednesday; Thursday; Friday; Saturday; Default; 0; 1; 2; 3; 4; 5; 6; 7; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_FontSize_FontSize_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_FontSize_FontSize_Enum.aspx.xml
deleted file mode 100644
index c3e16520a63..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_FontSize_FontSize_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.FontSize">
-    <span>
-      <br />NotSet; AsUnit; Smaller; Larger; XXSmall; XSmall; Small; Medium; Large; XLarge; XXLarge; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_GridLines_GridLines_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_GridLines_GridLines_Enum.aspx.xml
deleted file mode 100644
index 63a9e799f0a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_GridLines_GridLines_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.GridLines">
-    <span>
-      <br />None; Horizontal; Vertical; Both; 0; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HorizontalAlign_HorizontalAlign_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HorizontalAlign_HorizontalAlign_Enum.aspx.xml
deleted file mode 100644
index 6e4bd9158c6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HorizontalAlign_HorizontalAlign_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.HorizontalAlign">
-    <span>
-      <br />NotSet; Left; Center; Right; Justify; 0; 1; 2; 3; 4; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataNavigateUrlField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataNavigateUrlField.aspx.xml
deleted file mode 100644
index faf10ce2c34..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataNavigateUrlField.aspx.xml
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_one">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_one">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_two">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_two">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_three">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_three">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_four">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_four">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_five">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_five">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_six">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_six">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_seven">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_seven">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_eight">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_eight">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_nine">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_nine">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_ten">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_ten">123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_one">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_one">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_two">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_two">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_three">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_three">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_four">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_four">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_five">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_five">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_six">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_six">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_seven">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_seven">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_eight">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_eight">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_nine">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_nine">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="http://n_0_ten">123</a>
-        </td>
-        <td>
-          <a href="http://c_0_ten">123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataNavigateUrlFormatString.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataNavigateUrlFormatString.aspx.xml
deleted file mode 100644
index fb3e41501de..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataNavigateUrlFormatString.aspx.xml
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_one">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_two">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_three">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_four">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_five">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_six">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_seven">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_eight">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_nine">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_ten">123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$1.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$2.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$3.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$4.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$5.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$6.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$7.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$8.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$9.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="$10.00000">123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="1">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_one">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="2">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_two">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="3">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_three">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="4">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_four">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="5">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_five">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="6">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_six">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="7">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_seven">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="8">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_eight">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="9">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_nine">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="10">123</a>
-        </td>
-        <td>
-          <a href="(format str)">123</a>
-        </td>
-        <td>
-          <a href="c_0_ten">123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="1">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$1.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="2">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$2.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="3">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$3.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="4">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$4.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="5">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$5.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="6">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$6.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="7">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$7.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="8">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$8.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="9">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$9.00000">123</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="10">123</a>
-        </td>
-        <td>
-          <a href="(format)">123</a>
-        </td>
-        <td>
-          <a href="$10.00000">123</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataTextField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataTextField.aspx.xml
deleted file mode 100644
index 54b6792395a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataTextField.aspx.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_one</a>
-        </td>
-        <td>
-          <a>http://c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_two</a>
-        </td>
-        <td>
-          <a>http://c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_three</a>
-        </td>
-        <td>
-          <a>http://c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_four</a>
-        </td>
-        <td>
-          <a>http://c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_five</a>
-        </td>
-        <td>
-          <a>http://c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_six</a>
-        </td>
-        <td>
-          <a>http://c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_seven</a>
-        </td>
-        <td>
-          <a>http://c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_eight</a>
-        </td>
-        <td>
-          <a>http://c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_nine</a>
-        </td>
-        <td>
-          <a>http://c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a>http://n_0_ten</a>
-        </td>
-        <td>
-          <a>http://c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>
-          </a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_one</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_two</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_three</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_four</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_five</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_six</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_seven</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_eight</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_nine</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://n_0_ten</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">http://c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Name</span>
-    <span>
-      <br />Company</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">
-          </a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataTextFormatString.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataTextFormatString.aspx.xml
deleted file mode 100644
index 902513499ac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_DataTextFormatString.aspx.xml
+++ /dev/null
@@ -1,450 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://www.google.com">(format str)</a>
-        </td>
-        <td>
-          <a href="http://www.google.com">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$1.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$2.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$3.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$4.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$5.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$6.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$7.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$8.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$9.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">$10.00000</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest3" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid3">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">1</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">2</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">3</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">4</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">5</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">6</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">7</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">8</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">9</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">10</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format str)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format str)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-  <div id="Ghtsubtest4" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid4">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">1</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$1.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">2</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$2.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">3</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$3.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">4</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$4.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">5</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$5.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">6</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$6.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">7</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$7.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">8</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$8.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">9</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$9.00000</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">10</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">(format)</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">$10.00000</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />(format)</span>
-    <span>
-      <br />{0:c5}</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_InitializeCell_TIL.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_InitializeCell_TIL.aspx.xml
deleted file mode 100644
index aba1b3a2fee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_InitializeCell_TIL.aspx.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td index="0">
-          <a href="http://www.google.com">1</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_one">http://n_0_one</a>
-        </td>
-        <td>
-          <a href="http://c_0_one">http://c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="1">
-          <a href="http://www.google.com">2</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_two">http://n_0_two</a>
-        </td>
-        <td>
-          <a href="http://c_0_two">http://c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="2">
-          <a href="http://www.google.com">3</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_three">http://n_0_three</a>
-        </td>
-        <td>
-          <a href="http://c_0_three">http://c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="3">
-          <a href="http://www.google.com">4</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_four">http://n_0_four</a>
-        </td>
-        <td>
-          <a href="http://c_0_four">http://c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="4">
-          <a href="http://www.google.com">5</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_five">http://n_0_five</a>
-        </td>
-        <td>
-          <a href="http://c_0_five">http://c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="5">
-          <a href="http://www.google.com">6</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_six">http://n_0_six</a>
-        </td>
-        <td>
-          <a href="http://c_0_six">http://c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="6">
-          <a href="http://www.google.com">7</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_seven">http://n_0_seven</a>
-        </td>
-        <td>
-          <a href="http://c_0_seven">http://c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="7">
-          <a href="http://www.google.com">8</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_eight">http://n_0_eight</a>
-        </td>
-        <td>
-          <a href="http://c_0_eight">http://c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="8">
-          <a href="http://www.google.com">9</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_nine">http://n_0_nine</a>
-        </td>
-        <td>
-          <a href="http://c_0_nine">http://c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td index="9">
-          <a href="http://www.google.com">10</a>
-          <a>
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_ten">http://n_0_ten</a>
-        </td>
-        <td>
-          <a href="http://c_0_ten">http://c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_NavigateUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_NavigateUrl.aspx.xml
deleted file mode 100644
index a81d1e20e37..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_NavigateUrl.aspx.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>1</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_one</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>2</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_two</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>3</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_three</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>4</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_four</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>5</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_five</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>6</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_six</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>7</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_seven</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>8</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_eight</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>9</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_nine</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>10</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_ten</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk</span>
-    <span>
-      <br />123.123.123.123/sdkh/........./sjhfg</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a>1</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_one</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>2</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_two</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>3</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_three</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>4</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_four</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>5</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_five</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>6</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_six</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>7</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_seven</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>8</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_eight</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>9</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_nine</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a>10</a>
-        </td>
-        <td>
-          <a href="http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk">n_0_ten</a>
-        </td>
-        <td>
-          <a href="123.123.123.123/sdkh/........./sjhfg">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />http://localhost/asdjkaffd/asdkjhkgss/.sdfkjhsdkf/f/f/f/f/fsdfkjh///skjdk</span>
-    <span>
-      <br />123.123.123.123/sdkh/........./sjhfg</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_Target.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_Target.aspx.xml
deleted file mode 100644
index cd02449b516..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_Target.aspx.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">1</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_one</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">2</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_two</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">3</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_three</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">4</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_four</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">5</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_five</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">6</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_six</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">7</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_seven</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">8</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_eight</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">9</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_nine</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://www.google.com">10</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="_blank">n_0_ten</a>
-        </td>
-        <td>
-          <a href="http://www.google.com" target="skjfh skjf hkjd">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />_blank</span>
-    <span>
-      <br />skjfh skjf hkjd</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">1</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_one</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_one</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">2</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_two</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_two</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">3</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_three</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_three</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">4</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_four</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_four</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">5</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_five</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_five</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">6</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_six</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_six</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">7</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_seven</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_seven</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">8</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_eight</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_eight</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">9</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_nine</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_nine</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="&quot;http://www.google.com&quot;">10</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="_blank">n_0_ten</a>
-        </td>
-        <td>
-          <a href="&quot;http://www.google.com&quot;" target="klasjd lkajsd lkajsd">c_0_ten</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />"http://www.google.com"</span>
-    <span>
-      <br />"http://www.google.com"</span>
-    <span>
-      <br />"http://www.google.com"</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_Text.aspx.xml
deleted file mode 100644
index 8d228cf9be1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLinkColumn_HyperLinkColumn_Text.aspx.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_one">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_one">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_one">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_two">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_two">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_two">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_three">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_three">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_three">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_four">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_four">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_four">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_five">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_five">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_five">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_six">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_six">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_six">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_seven">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_seven">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_seven">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_eight">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_eight">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_eight">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_nine">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_nine">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_nine">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://n_0_ten">
-          </a>
-        </td>
-        <td>
-          <a href="http://n_0_ten">simple text</a>
-        </td>
-        <td>
-          <a href="http://n_0_ten">text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />simple text</span>
-    <span>
-      <br />text with !@#$%^&amp;*()_+</span>
-  </div>
-  <div id="Ghtsubtest2" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_one.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://1.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://1.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_two.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://2.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://2.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_three.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://3.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://3.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_four.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://4.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://4.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_five.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://5.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://5.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_six.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://6.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://6.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_seven.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://7.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://7.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_eight.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://8.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://8.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_nine.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://9.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://9.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <a href="http://http://n_0_ten.com">
-          </a>
-        </td>
-        <td>
-          <a href="http://10.com">Simple text</a>
-        </td>
-        <td>
-          <a href="http://10.com">Text with !@#$%^&amp;*()_+</a>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-    <span>
-      <br />Simple text</span>
-    <span>
-      <br />Text with !@#$%^&amp;*()_+</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_ImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_ImageUrl.aspx.xml
deleted file mode 100644
index e657c53a73f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_ImageUrl.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;left:16px;position:absolute;top:15px;width:128px;z-index:100">
-    <a id="HyperLink1">
-      <img alt="HyperLink" src="http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/HyperLink/Car.jpg" border="0" />
-    </a>
-  </div>
-  <div id="GHTSubTest4" style="height:64px;left:16px;position:absolute;top:216px;width:128px;z-index:104">
-    <a id="HyperLink4">HyperLink</a>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;left:16px;position:absolute;top:144px;width:128px;z-index:103">
-    <a id="HyperLink3">
-      <img alt="HyperLink" src="/GHTTests/System_Web_dll/System_Web_UI_WebControls/HyperLink/Car.jpg" border="0" />
-    </a>
-  </div>
-  <div id="GHTSubTest2" style="height:64px;left:16px;position:absolute;top:80px;width:128px;z-index:102">
-    <a id="HyperLink2">
-      <img alt="HyperLink" src="Car.jpg" border="0" />
-    </a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_NavigateUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_NavigateUrl.aspx.xml
deleted file mode 100644
index e53e3dc581f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_NavigateUrl.aspx.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:64px;left:16px;position:absolute;top:16px;width:136px;z-index:100">
-    <a href="http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx" id="HyperLink1">HyperLink</a>
-  </div>
-  <div id="GHTSubTest5" style="height:64px;left:16px;position:absolute;top:304px;width:136px;z-index:105">
-    <a id="HyperLink5">HyperLink</a>
-  </div>
-  <div id="GHTSubTest4" style="height:64px;left:16px;position:absolute;top:232px;width:136px;z-index:104">
-    <a href="HyperLink_ImageUrl.aspx" id="HyperLink4">HyperLink</a>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;left:16px;position:absolute;top:160px;width:136px;z-index:103">
-    <a href="../CheckBox/CheckBox_Checked.aspx" id="HyperLink3">HyperLink</a>
-  </div>
-  <div id="GHTSubTest2" style="height:64px;left:16px;position:absolute;top:88px;width:136px;z-index:101">
-    <a href="/GHTTests/System_Web_dll/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx" id="HyperLink2">HyperLink</a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_Target.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_Target.aspx.xml
deleted file mode 100644
index 5deb8388af1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_Target.aspx.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:15px;width:88px;z-index:100">
-    <a id="HyperLink1" target="_blank">HyperLink</a>
-  </div>
-  <div id="GHTSubTest9" style="height:40px;left:16px;position:absolute;top:400px;width:88px;z-index:109">
-    <a id="HyperLink9" target="         ">HyperLink</a>
-  </div>
-  <div id="GHTSubTest8" style="height:40px;left:16px;position:absolute;top:352px;width:88px;z-index:108">
-    <a id="HyperLink8">HyperLink</a>
-  </div>
-  <div id="GHTSubTest7" style="height:40px;left:16px;position:absolute;top:304px;width:88px;z-index:106">
-    <a id="HyperLink7" target="Frame1">HyperLink</a>
-  </div>
-  <div id="GHTSubTest6" style="height:40px;left:16px;position:absolute;top:256px;width:88px;z-index:105">
-    <a id="HyperLink6" target="_New">HyperLink</a>
-  </div>
-  <div id="GHTSubTest5" style="height:40px;left:16px;position:absolute;top:208px;width:88px;z-index:104">
-    <a id="HyperLink5" target="_top">HyperLink</a>
-  </div>
-  <div id="GHTSubTest4" style="height:40px;left:16px;position:absolute;top:160px;width:88px;z-index:103">
-    <a id="HyperLink4" target="_self">HyperLink</a>
-  </div>
-  <div id="GHTSubTest3" style="height:40px;left:16px;position:absolute;top:112px;width:88px;z-index:102">
-    <a id="HyperLink3" target="_search">HyperLink</a>
-  </div>
-  <div id="GHTSubTest2" style="height:40px;left:16px;position:absolute;top:64px;width:88px;z-index:101">
-    <a id="HyperLink2" target="_parent">HyperLink</a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_Text.aspx.xml
deleted file mode 100644
index 2f4bb648168..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_HyperLink_HyperLink_Text.aspx.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;left:16px;position:absolute;top:15px;width:200px;z-index:100">
-    <a id="HyperLink1">   abcdefghijkl    mnopqrstuvwxyz   </a>
-  </div>
-  <div id="GHTSubTest4" style="height:24px;left:16px;position:absolute;top:184px;width:200px;z-index:104">
-    <a id="HyperLink4">
-    </a>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;left:16px;position:absolute;top:120px;width:200px;z-index:103">
-    <a id="HyperLink3">1234567890-=`~!@#$%^&amp;*()_+[]\{}|;':",./?</a>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;left:16px;position:absolute;top:56px;width:176px;z-index:101">
-    <a id="HyperLink2">   abcdefghijkl    mnopqrstuvwxyz   </a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ImageAlign_ImageAlign_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ImageAlign_ImageAlign_Enum.aspx.xml
deleted file mode 100644
index aea835cef09..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ImageAlign_ImageAlign_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ImageAlign">
-    <span>
-      <br />NotSet; Left; Right; Baseline; Top; Middle; Bottom; AbsBottom; AbsMiddle; TextTop; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ImageButton_ImageButton_CausesValidation.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ImageButton_ImageButton_CausesValidation.aspx.xml
deleted file mode 100644
index 46a6cace2c0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ImageButton_ImageButton_CausesValidation.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:15px;width:40px;z-index:101">
-    <input id="ImageButton1" alt="" border="0" type="image" name="ImageButton1" />
-  </div>
-  <div id="GHTSubTest3" style="height:40px;left:16px;position:absolute;top:112px;width:40px;z-index:105">
-    <input id="ImageButton3" alt="" border="0" type="image" name="ImageButton3" />
-  </div>
-  <div id="GHTSubTest2" style="height:40px;left:16px;position:absolute;top:64px;width:40px;z-index:102">
-    <input language="javascript" onclick="if (typeof(Page_ClientValidate) == 'function') Page_ClientValidate(); " alt="" type="image" name="ImageButton2" border="0" id="ImageButton2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_AlternateText.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_AlternateText.aspx.xml
deleted file mode 100644
index e7b90a63e0c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_AlternateText.aspx.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:15px;width:144px;z-index:100">
-    <img id="Image1" alt="     abcdefghijklmn opqrstuvwxyz           " border="0" />
-  </div>
-  <div id="GHTSubTest5" style="height:56px;left:16px;position:absolute;top:256px;width:304px;z-index:105">
-    <img id="Image5" alt="" border="0" style="height:32px;width:256px" />
-  </div>
-  <div id="GHTSubTest4" style="height:56px;left:16px;position:absolute;top:192px;width:304px;z-index:104">
-    <img id="Image4" alt="         " border="0" style="height:32px;width:256px" />
-  </div>
-  <div id="GHTSubTest3" style="height:56px;left:16px;position:absolute;top:128px;width:304px;z-index:103">
-    <img id="Image3" alt="`1234567890-=[]\;',./~!@#$%^&amp;*()_+{}|:&quot;&lt;&gt;?" border="0" style="height:32px;width:256px" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;left:16px;position:absolute;top:64px;width:144px;z-index:101">
-    <img id="Image2" alt="     abcdefghijklmn opqrstuvwxyz           " border="0" style="height:40px;width:144px" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_Enabled.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_Enabled.aspx.xml
deleted file mode 100644
index f383c334755..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_Enabled.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:15px;width:72px;z-index:101">
-    <img id="Image1" alt="" border="0" disabled="disabled" />
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:16px;position:absolute;top:128px;width:72px;z-index:103">
-    <img id="Image3" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:16px;position:absolute;top:72px;width:72px;z-index:102">
-    <img id="Image2" alt="" border="0" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_Font.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_Font.aspx.xml
deleted file mode 100644
index e4772e36112..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_Font.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:15px;width:40px;z-index:101">
-    <img id="Image1" alt="" border="0" style="font-family:david;font-size:12pt" />
-  </div>
-  <div id="GHTSubTest6" style="height:40px;left:16px;position:absolute;top:72px;width:40px;z-index:106">
-    <img id="Image6" alt="" border="0" style="font-family:david,tahoma,arial;font-size:12pt;font-style:italic;font-weight:bold;text-decoration:line-through overline underline" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_ImageAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_ImageAlign.aspx.xml
deleted file mode 100644
index 1e799482f5b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_ImageAlign.aspx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:15px;width:40px;z-index:100">
-    <img id="Image1" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest10" style="height:40px;left:88px;position:absolute;top:208px;width:40px;z-index:110">
-    <img id="Image10" alt="" border="0" align="TextTop" />
-  </div>
-  <div id="GHTSubTest9" style="height:40px;left:88px;position:absolute;top:160px;width:40px;z-index:109">
-    <img id="Image9" alt="" border="0" align="AbsMiddle" />
-  </div>
-  <div id="GHTSubTest8" style="height:40px;left:88px;position:absolute;top:112px;width:40px;z-index:107">
-    <img id="Image8" alt="" border="0" align="AbsBottom" />
-  </div>
-  <div id="GHTSubTest7" style="height:40px;left:88px;position:absolute;top:64px;width:40px;z-index:106">
-    <img id="Image7" alt="" border="0" align="Bottom" />
-  </div>
-  <div id="GHTSubTest6" style="height:40px;left:88px;position:absolute;top:16px;width:40px;z-index:105">
-    <img id="Image6" alt="" border="0" align="Middle" />
-  </div>
-  <div id="GHTSubTest5" style="height:40px;left:16px;position:absolute;top:208px;width:40px;z-index:104">
-    <img id="Image5" alt="" border="0" align="Top" />
-  </div>
-  <div id="GHTSubTest4" style="height:40px;left:16px;position:absolute;top:160px;width:40px;z-index:103">
-    <img id="Image4" alt="" border="0" align="Baseline" />
-  </div>
-  <div id="GHTSubTest3" style="height:40px;left:16px;position:absolute;top:112px;width:40px;z-index:102">
-    <img id="Image3" alt="" border="0" align="Right" />
-  </div>
-  <div id="GHTSubTest2" style="height:40px;left:16px;position:absolute;top:64px;width:40px;z-index:101">
-    <img id="Image2" alt="" border="0" align="Left" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_ImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_ImageUrl.aspx.xml
deleted file mode 100644
index 924f84febe0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Image_Image_ImageUrl.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;left:16px;position:absolute;top:15px;width:104px;z-index:101">
-    <img id="Image1" alt="" src="http://localhost:/GHTTests/System_Web_dll/System_Web_UI_WebControls/Image/Car.jpg" border="0" />
-  </div>
-  <div id="GHTSubTest4" style="height:56px;left:16px;position:absolute;top:208px;width:104px;z-index:104">
-    <img id="Image4" alt="" src="..\HyperLink\Car.jpg" border="0" />
-  </div>
-  <div id="GHTSubTest3" style="height:56px;left:16px;position:absolute;top:144px;width:104px;z-index:103">
-    <img id="Image3" alt="" src="Car.jpg" border="0" />
-  </div>
-  <div id="GHTSubTest2" style="height:56px;left:16px;position:absolute;top:80px;width:104px;z-index:102">
-    <img id="Image2" alt="" src="/GHTTests/System_Web_dll/System_Web_UI_WebControls/Image/Car.jpg" border="0" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Label_Label_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Label_Label_Text.aspx.xml
deleted file mode 100644
index 269d7d34480..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Label_Label_Text.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;width:120px">
-    <span id="Label1">    abcdefghijklm nopqrstuvw xyz    </span>
-  </div>
-  <div id="GHTSubTest6" style="height:48px;width:120px">
-    <span id="Label6">Disabled control text</span>
-  </div>
-  <div id="GHTSubTest2" style="height:48px;width:208px">
-    <span id="Label2" disabled="disabled">    abcdefghijklm nopqrstuvw xyz    </span>
-  </div>
-  <div id="GHTSubTest3" style="height:48px;width:208px">
-    <span id="Label3">`1234567890-=[]\;',./~!@#$%^&amp;*()_+{}|:"?</span>
-  </div>
-  <div id="GHTSubTest4" style="height:48px;width:208px">
-    <span id="Label4">
-    </span>
-  </div>
-  <div id="GHTSubTest5" style="height:48px;width:208px">
-    <span id="Label5">
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Label_Label_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Label_Label_ctor_.aspx.xml
deleted file mode 100644
index f7dc4def212..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Label_Label_ctor_.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:152px;width:424px">
-    <label for="Button1" id="Label1">this is label1</label>
-    <input value="Button" type="submit" name="Button1" id="Button1" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_LinkButton_LinkButton_CausesValidation.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_LinkButton_LinkButton_CausesValidation.aspx.xml
deleted file mode 100644
index 255c9837f88..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_LinkButton_LinkButton_CausesValidation.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:16px;width:40px;z-index:106">
-    <a href="javascript:__doPostBack('LinkButton1','')" id="LinkButton1">
-    </a>
-  </div>
-  <div id="GHTSubTest3" style="height:40px;left:16px;position:absolute;top:112px;width:40px;z-index:105">
-    <a href="javascript:__doPostBack('LinkButton3','')" id="LinkButton3">
-    </a>
-  </div>
-  <div id="GHTSubTest2" style="height:40px;left:16px;position:absolute;top:64px;width:40px;z-index:102">
-    <a href="javascript:{if (typeof(Page_ClientValidate) != 'function' ||  Page_ClientValidate()) __doPostBack('LinkButton2','')} " id="LinkButton2">
-    </a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_LinkButton_LinkButton_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_LinkButton_LinkButton_Text.aspx.xml
deleted file mode 100644
index 8825680e39f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_LinkButton_LinkButton_Text.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:16px;width:120px;z-index:106">
-    <a href="javascript:__doPostBack('LinkButton1','')" id="LinkButton1">    abcdefghijklm nopqrstuvw xyz    </a>
-  </div>
-  <div id="GHTSubTest5" style="height:48px;left:16px;position:absolute;top:248px;width:208px;z-index:105">
-    <a href="javascript:__doPostBack('LinkButton5','')" id="LinkButton5">
-    </a>
-  </div>
-  <div id="GHTSubTest4" style="height:48px;left:16px;position:absolute;top:184px;width:208px;z-index:104">
-    <a href="javascript:__doPostBack('LinkButton4','')" id="LinkButton4">
-    </a>
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:16px;position:absolute;top:128px;width:208px;z-index:103">
-    <a href="javascript:__doPostBack('LinkButton3','')" id="LinkButton3">`1234567890-=[]\;',./~!@#$%^&amp;*()_+{}|:"?</a>
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:16px;position:absolute;top:72px;width:208px;z-index:102">
-    <a href="javascript:__doPostBack('LinkButton2','')" id="LinkButton2">    abcdefghijklm nopqrstuvw xyz    </a>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderColor.aspx.xml
deleted file mode 100644
index da11150566c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderColor.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:16px;width:88px;z-index:100">
-    <select id="ListBox1" style="border-color:#33ffcc;height:40px;width:80px" size="4" name="ListBox1">
-    </select>
-  </div>
-  <div id="GHTSubTest5" style="height:48px;left:16px;position:absolute;top:272px;width:88px;z-index:105">
-    <select id="ListBox5" style="border-color:yellow;height:40px;width:80px" size="4" name="ListBox5">
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:48px;left:16px;position:absolute;top:208px;width:88px;z-index:103">
-    <select id="ListBox4" style="border-color:cornflowerblue;height:40px;width:80px" size="4" name="ListBox4">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:16px;position:absolute;top:144px;width:88px;z-index:102">
-    <select id="ListBox3" style="border-color:#93a070;height:40px;width:80px" size="4" name="ListBox3">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:16px;position:absolute;top:80px;width:88px;z-index:101">
-    <select id="ListBox2" style="border-color:#9d1173;height:40px;width:80px" size="4" name="ListBox2">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderStyle.aspx.xml
deleted file mode 100644
index 7905df9ae11..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderStyle.aspx.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest9" style="height:48px;left:16px;position:absolute;top:320px;width:88px;z-index:109">
-    <select id="ListBox9" style="border-style:dotted;height:40px;width:80px" size="4" name="ListBox9">
-    </select>
-  </div>
-  <div id="GHTSubTest8" style="height:48px;left:16px;position:absolute;top:192px;width:88px;z-index:104">
-    <select id="ListBox8" style="border-style:double;height:40px;width:80px" size="4" name="ListBox8">
-    </select>
-  </div>
-  <div id="GHTSubTest7" style="height:48px;left:16px;position:absolute;top:128px;width:88px;z-index:103">
-    <select id="ListBox7" style="border-style:groove;height:40px;width:80px" size="4" name="ListBox7">
-    </select>
-  </div>
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:64px;width:88px;z-index:101">
-    <select id="ListBox6" style="border-style:inset;height:40px;width:80px" size="4" name="ListBox6">
-    </select>
-  </div>
-  <div id="GHTSubTest6" style="height:48px;left:16px;position:absolute;top:8px;width:88px;z-index:108">
-    <select id="ListBox1" style="border-style:dashed;height:40px;width:80px" size="4" name="ListBox1">
-    </select>
-  </div>
-  <div id="GHTSubTest10" style="height:48px;left:16px;position:absolute;top:376px;width:88px;z-index:110">
-    <select id="ListBox10" style="border-style:solid;height:40px;width:80px" size="4" name="ListBox10">
-    </select>
-  </div>
-  <div id="GHTSubTest5" style="height:48px;left:16px;position:absolute;top:256px;width:88px;z-index:106">
-    <select id="ListBox5" style="border-style:none;height:40px;width:80px" size="4" name="ListBox5">
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:48px;left:16px;position:absolute;top:192px;width:88px;z-index:105">
-    <select id="ListBox4" style="height:40px;width:80px" size="4" name="ListBox4">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:16px;position:absolute;top:128px;width:88px;z-index:102">
-    <select id="ListBox3" style="border-style:outset;height:40px;width:80px" size="4" name="ListBox3">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:16px;position:absolute;top:64px;width:88px;z-index:100">
-    <select id="ListBox2" style="border-style:ridge;height:40px;width:80px" size="4" name="ListBox2">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderWidth.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderWidth.aspx.xml
deleted file mode 100644
index 08ff2ed3ccc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_BorderWidth.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;left:16px;position:absolute;top:15px;width:112px;z-index:101">
-    <select id="ListBox1" style="border-style:solid;border-width:10px;height:48px;width:88px" size="4" name="ListBox1">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;left:16px;position:absolute;top:80px;width:112px;z-index:102">
-    <select id="ListBox2" style="border-style:solid;border-width:10px;height:48px;width:88px" size="4" name="ListBox2">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_Rows.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_Rows.aspx.xml
deleted file mode 100644
index 85008600b51..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_Rows.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:184px;left:16px;position:absolute;top:15px;width:96px;z-index:101">
-    <select id="ListBox1" size="10" name="ListBox1">
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:360px;left:392px;position:absolute;top:16px;width:168px;z-index:104">
-    <select id="ListBox4" style="height:128px;width:120px" size="2" name="ListBox4">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:48px;left:256px;position:absolute;top:16px;width:96px;z-index:103">
-    <select id="ListBox3" size="100" name="ListBox3">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:48px;left:136px;position:absolute;top:16px;width:96px;z-index:102">
-    <select id="ListBox2" size="1" name="ListBox2">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_SelectionMode.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_SelectionMode.aspx.xml
deleted file mode 100644
index 3e31e149ded..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_SelectionMode.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:96px" designtimedragdrop="8">
-    <select id="ListBox1" size="4" name="ListBox1">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:88px;width:96px">
-    <select id="ListBox2" size="4" name="ListBox2">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:88px;width:96px">
-    <select multiple="multiple" id="ListBox3" size="4" name="ListBox3">
-      <option value="" />
-      <option value="" selected="selected" />
-      <option value="" selected="selected" />
-      <option value="" selected="selected" />
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_ToolTip.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_ToolTip.aspx.xml
deleted file mode 100644
index 5af6da8f664..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListBox_ListBox_ToolTip.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:416px">
-    <select id="ListBox1" size="4" name="ListBox1">
-    </select>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:416px">
-    <select id="ListBox2" size="4" name="ListBox2">
-    </select>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:416px">
-    <select id="ListBox3" size="4" name="ListBox3">
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_AutoPostBack.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_AutoPostBack.aspx.xml
deleted file mode 100644
index 2400dcb98ac..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_AutoPostBack.aspx.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AutoPostBack = True">
-    <select language="javascript" size="4" onchange="__doPostBack('_ctrl0','')" name="_ctrl0" id="_ctrl0">
-    </select>
-  </div>
-  <div id="GHTSubTest2" testname="Get AutoPostBack true">
-    <select language="javascript" size="4" onchange="__doPostBack('_ctrl1','')" name="_ctrl1" id="_ctrl1">
-    </select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="AutoPostBack = false">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-    </select>
-  </div>
-  <div id="GHTSubTest4" testname="Get AutoPostBack false">
-    <select id="_ctrl3" size="4" name="_ctrl3">
-    </select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest5" testname="AutoPostBack = True">
-    <select language="javascript" onchange="__doPostBack('_ctrl4','')" name="_ctrl4" id="_ctrl4">
-    </select>
-  </div>
-  <div id="GHTSubTest6" testname="Get AutoPostBack true">
-    <select language="javascript" onchange="__doPostBack('_ctrl5','')" name="_ctrl5" id="_ctrl5">
-    </select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest7" testname="AutoPostBack = false">
-    <select id="_ctrl6" name="_ctrl6">
-    </select>
-  </div>
-  <div id="GHTSubTest8" testname="Get AutoPostBack false">
-    <select id="_ctrl7" name="_ctrl7">
-    </select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="AutoPostBack = True">
-    <table id="_ctrl8" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="Get AutoPostBack true">
-    <table id="_ctrl9" border="0">
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest11" testname="AutoPostBack = false">
-    <table id="_ctrl10" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="Get AutoPostBack false">
-    <table id="_ctrl11" border="0">
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest13" testname="AutoPostBack = True">
-    <table id="_ctrl12" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="Get AutoPostBack true">
-    <table id="_ctrl13" border="0">
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest15" testname="AutoPostBack = false">
-    <table id="_ctrl14" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="Get AutoPostBack false">
-    <table id="_ctrl15" border="0">
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_ClearSelection_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_ClearSelection_.aspx.xml
deleted file mode 100644
index ef46ff2cffc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_ClearSelection_.aspx.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="No ite, selected">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="A" />A
-		<option value="B" />B
-		<option value="C" />C
-
-	</select>
-  </div>
-  <div id="GHTSubTest2" testname="One item selected">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="A" />A
-		<option value="B" />B
-		<option value="C" />C
-
-	</select>
-  </div>
-  <div id="GHTSubTest3" testname="No ite, selected">
-    <select id="_ctrl2" name="_ctrl2">
-      <option value="A" />A
-		<option value="B" />B
-		<option value="C" />C
-
-	</select>
-  </div>
-  <div id="GHTSubTest4" testname="One item selected">
-    <select id="_ctrl3" name="_ctrl3">
-      <option value="A" />A
-		<option value="B" />B
-		<option value="C" />C
-
-	</select>
-  </div>
-  <div id="GHTSubTest5" testname="No ite, selected">
-    <table id="_ctrl4" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl4_0" type="radio" name="_ctrl4" value="A" />
-          <label for="_ctrl4_0">A</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl4_1" type="radio" name="_ctrl4" value="B" />
-          <label for="_ctrl4_1">B</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl4_2" type="radio" name="_ctrl4" value="C" />
-          <label for="_ctrl4_2">C</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="One item selected">
-    <table id="_ctrl5" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl5_0" type="radio" name="_ctrl5" value="A" />
-          <label for="_ctrl5_0">A</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl5_1" type="radio" name="_ctrl5" value="B" />
-          <label for="_ctrl5_1">B</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl5_2" type="radio" name="_ctrl5" value="C" />
-          <label for="_ctrl5_2">C</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="No ite, selected">
-    <table id="_ctrl6" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl6_0" type="checkbox" name="_ctrl6:0" />
-          <label for="_ctrl6_0">A</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_1" type="checkbox" name="_ctrl6:1" />
-          <label for="_ctrl6_1">B</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_2" type="checkbox" name="_ctrl6:2" />
-          <label for="_ctrl6_2">C</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" testname="One item selected">
-    <table id="_ctrl7" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl7_0" type="checkbox" name="_ctrl7:0" />
-          <label for="_ctrl7_0">A</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_1" type="checkbox" name="_ctrl7:1" />
-          <label for="_ctrl7_1">B</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_2" type="checkbox" name="_ctrl7:2" />
-          <label for="_ctrl7_2">C</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="Clear multiple selection">
-    <select multiple="multiple" size="4" name="_ctl0">
-      <option value="A" />A
-		<option value="B" />B
-		<option value="C" />C
-		<option value="D" />D
-
-	</select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataMember.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataMember.aspx.xml
deleted file mode 100644
index 8261e1533d1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataMember.aspx.xml
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Existing table">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="Null">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="a" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-		<option value="h" />h
-		<option value="i" />i
-		<option value="j" />j
-
-	</select>
-  </div>
-  <div id="GHTSubTest3" testname="Non existing table in a dataset">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="DataSource is not a dataset">
-    <select id="_ctrl3" size="4" name="_ctrl3">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest5" testname="Existing table">
-    <select id="_ctrl4" name="_ctrl4">
-      <option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-		<option value="0" />0
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest6" testname="Null">
-    <select id="_ctrl5" name="_ctrl5">
-      <option value="a" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-		<option value="h" />h
-		<option value="i" />i
-		<option value="j" />j
-
-	</select>
-  </div>
-  <div id="GHTSubTest7" testname="Non existing table in a dataset">
-    <select id="_ctrl6" name="_ctrl6">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="DataSource is not a dataset">
-    <select id="_ctrl7" name="_ctrl7">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest9" testname="Existing table">
-    <table id="_ctrl8" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl8_0" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_1" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_1">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_2" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_2">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_3" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_3">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_4" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_4">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_5" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_5">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_6" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_6">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_7" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_7">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_8" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_8">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_9" type="radio" name="_ctrl8" value="0" />
-          <label for="_ctrl8_9">0</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest10" testname="Null">
-    <table id="_ctrl9" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl9_0" type="radio" name="_ctrl9" value="a" />
-          <label for="_ctrl9_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_1" type="radio" name="_ctrl9" value="b" />
-          <label for="_ctrl9_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_2" type="radio" name="_ctrl9" value="c" />
-          <label for="_ctrl9_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_3" type="radio" name="_ctrl9" value="d" />
-          <label for="_ctrl9_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_4" type="radio" name="_ctrl9" value="e" />
-          <label for="_ctrl9_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_5" type="radio" name="_ctrl9" value="f" />
-          <label for="_ctrl9_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_6" type="radio" name="_ctrl9" value="g" />
-          <label for="_ctrl9_6">g</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_7" type="radio" name="_ctrl9" value="h" />
-          <label for="_ctrl9_7">h</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_8" type="radio" name="_ctrl9" value="i" />
-          <label for="_ctrl9_8">i</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_9" type="radio" name="_ctrl9" value="j" />
-          <label for="_ctrl9_9">j</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="Non existing table in a dataset">
-    <table id="_ctrl10" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest12" testname="DataSource is not a dataset">
-    <table id="_ctrl11" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl11_0" type="radio" name="_ctrl11" value="1aaa" />
-          <label for="_ctrl11_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_1" type="radio" name="_ctrl11" value="2bbb" />
-          <label for="_ctrl11_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_2" type="radio" name="_ctrl11" value="3ccc" />
-          <label for="_ctrl11_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_3" type="radio" name="_ctrl11" value="4ddd" />
-          <label for="_ctrl11_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_4" type="radio" name="_ctrl11" value="5eee" />
-          <label for="_ctrl11_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_5" type="radio" name="_ctrl11" value="6fff" />
-          <label for="_ctrl11_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_6" type="radio" name="_ctrl11" value="7ggg" />
-          <label for="_ctrl11_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest13" testname="Existing table">
-    <table id="_ctrl12" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl12_0" type="checkbox" name="_ctrl12:0" />
-          <label for="_ctrl12_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_1" type="checkbox" name="_ctrl12:1" />
-          <label for="_ctrl12_1">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_2" type="checkbox" name="_ctrl12:2" />
-          <label for="_ctrl12_2">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_3" type="checkbox" name="_ctrl12:3" />
-          <label for="_ctrl12_3">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_4" type="checkbox" name="_ctrl12:4" />
-          <label for="_ctrl12_4">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_5" type="checkbox" name="_ctrl12:5" />
-          <label for="_ctrl12_5">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_6" type="checkbox" name="_ctrl12:6" />
-          <label for="_ctrl12_6">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_7" type="checkbox" name="_ctrl12:7" />
-          <label for="_ctrl12_7">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_8" type="checkbox" name="_ctrl12:8" />
-          <label for="_ctrl12_8">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_9" type="checkbox" name="_ctrl12:9" />
-          <label for="_ctrl12_9">0</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest14" testname="Null">
-    <table id="_ctrl13" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl13_0" type="checkbox" name="_ctrl13:0" />
-          <label for="_ctrl13_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_1" type="checkbox" name="_ctrl13:1" />
-          <label for="_ctrl13_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_2" type="checkbox" name="_ctrl13:2" />
-          <label for="_ctrl13_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_3" type="checkbox" name="_ctrl13:3" />
-          <label for="_ctrl13_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_4" type="checkbox" name="_ctrl13:4" />
-          <label for="_ctrl13_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_5" type="checkbox" name="_ctrl13:5" />
-          <label for="_ctrl13_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_6" type="checkbox" name="_ctrl13:6" />
-          <label for="_ctrl13_6">g</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_7" type="checkbox" name="_ctrl13:7" />
-          <label for="_ctrl13_7">h</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_8" type="checkbox" name="_ctrl13:8" />
-          <label for="_ctrl13_8">i</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_9" type="checkbox" name="_ctrl13:9" />
-          <label for="_ctrl13_9">j</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest15" testname="Non existing table in a dataset">
-    <table id="_ctrl14" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest16" testname="DataSource is not a dataset">
-    <table id="_ctrl15" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl15_0" type="checkbox" name="_ctrl15:0" />
-          <label for="_ctrl15_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_1" type="checkbox" name="_ctrl15:1" />
-          <label for="_ctrl15_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_2" type="checkbox" name="_ctrl15:2" />
-          <label for="_ctrl15_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_3" type="checkbox" name="_ctrl15:3" />
-          <label for="_ctrl15_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_4" type="checkbox" name="_ctrl15:4" />
-          <label for="_ctrl15_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_5" type="checkbox" name="_ctrl15:5" />
-          <label for="_ctrl15_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_6" type="checkbox" name="_ctrl15:6" />
-          <label for="_ctrl15_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataSource.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataSource.aspx.xml
deleted file mode 100644
index 8d12a9bb4e6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataSource.aspx.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="DataSource that implements IEnumerable">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest2" testname="DataSource that implements IListSource">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="a" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-		<option value="h" />h
-		<option value="i" />i
-		<option value="j" />j
-
-	</select>
-  </div>
-  <div id="GHTSubTest3" testname="DataSource that does not implement IListSource or IEnumerable">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="DataSource that implements IEnumerable">
-    <select id="_ctrl3" name="_ctrl3">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest5" testname="DataSource that implements IListSource">
-    <select id="_ctrl4" name="_ctrl4">
-      <option value="a" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-		<option value="h" />h
-		<option value="i" />i
-		<option value="j" />j
-
-	</select>
-  </div>
-  <div id="GHTSubTest6" testname="DataSource that does not implement IListSource or IEnumerable">
-    <select id="_ctrl5" name="_ctrl5">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="DataSource that implements IEnumerable">
-    <table id="_ctrl6" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl6_0" type="radio" name="_ctrl6" value="1aaa" />
-          <label for="_ctrl6_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_1" type="radio" name="_ctrl6" value="2bbb" />
-          <label for="_ctrl6_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_2" type="radio" name="_ctrl6" value="3ccc" />
-          <label for="_ctrl6_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_3" type="radio" name="_ctrl6" value="4ddd" />
-          <label for="_ctrl6_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_4" type="radio" name="_ctrl6" value="5eee" />
-          <label for="_ctrl6_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_5" type="radio" name="_ctrl6" value="6fff" />
-          <label for="_ctrl6_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_6" type="radio" name="_ctrl6" value="7ggg" />
-          <label for="_ctrl6_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" testname="DataSource that implements IListSource">
-    <table id="_ctrl7" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl7_0" type="radio" name="_ctrl7" value="a" />
-          <label for="_ctrl7_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_1" type="radio" name="_ctrl7" value="b" />
-          <label for="_ctrl7_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_2" type="radio" name="_ctrl7" value="c" />
-          <label for="_ctrl7_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_3" type="radio" name="_ctrl7" value="d" />
-          <label for="_ctrl7_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_4" type="radio" name="_ctrl7" value="e" />
-          <label for="_ctrl7_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_5" type="radio" name="_ctrl7" value="f" />
-          <label for="_ctrl7_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_6" type="radio" name="_ctrl7" value="g" />
-          <label for="_ctrl7_6">g</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_7" type="radio" name="_ctrl7" value="h" />
-          <label for="_ctrl7_7">h</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_8" type="radio" name="_ctrl7" value="i" />
-          <label for="_ctrl7_8">i</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_9" type="radio" name="_ctrl7" value="j" />
-          <label for="_ctrl7_9">j</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="DataSource that does not implement IListSource or IEnumerable">
-    <table id="_ctrl8" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest10" testname="DataSource that implements IEnumerable">
-    <table id="_ctrl9" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl9_0" type="checkbox" name="_ctrl9:0" />
-          <label for="_ctrl9_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_1" type="checkbox" name="_ctrl9:1" />
-          <label for="_ctrl9_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_2" type="checkbox" name="_ctrl9:2" />
-          <label for="_ctrl9_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_3" type="checkbox" name="_ctrl9:3" />
-          <label for="_ctrl9_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_4" type="checkbox" name="_ctrl9:4" />
-          <label for="_ctrl9_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_5" type="checkbox" name="_ctrl9:5" />
-          <label for="_ctrl9_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_6" type="checkbox" name="_ctrl9:6" />
-          <label for="_ctrl9_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="DataSource that implements IListSource">
-    <table id="_ctrl10" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl10_0" type="checkbox" name="_ctrl10:0" />
-          <label for="_ctrl10_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_1" type="checkbox" name="_ctrl10:1" />
-          <label for="_ctrl10_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_2" type="checkbox" name="_ctrl10:2" />
-          <label for="_ctrl10_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_3" type="checkbox" name="_ctrl10:3" />
-          <label for="_ctrl10_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_4" type="checkbox" name="_ctrl10:4" />
-          <label for="_ctrl10_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_5" type="checkbox" name="_ctrl10:5" />
-          <label for="_ctrl10_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_6" type="checkbox" name="_ctrl10:6" />
-          <label for="_ctrl10_6">g</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_7" type="checkbox" name="_ctrl10:7" />
-          <label for="_ctrl10_7">h</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_8" type="checkbox" name="_ctrl10:8" />
-          <label for="_ctrl10_8">i</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_9" type="checkbox" name="_ctrl10:9" />
-          <label for="_ctrl10_9">j</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="DataSource that does not implement IListSource or IEnumerable">
-    <table id="_ctrl11" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataTextField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataTextField.aspx.xml
deleted file mode 100644
index 668f52e4afa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataTextField.aspx.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="string.empty">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest2" testname="Name of an items property">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" />fff
-		<option value="ggg" />ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest3" testname="Name of an item non-existing property">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="Name of a column">
-    <select id="_ctrl3" size="4" name="_ctrl3">
-      <option value="0" />0
-		<option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-		<option value="8" />8
-		<option value="9" />9
-
-	</select>
-  </div>
-  <div id="GHTSubTest5" testname="Name of a non-existing column">
-    <select id="_ctrl4" size="4" name="_ctrl4">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest6" testname="string.empty">
-    <select id="_ctrl5" name="_ctrl5">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest7" testname="Name of an items property">
-    <select id="_ctrl6" name="_ctrl6">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" />fff
-		<option value="ggg" />ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest8" testname="Name of an item non-existing property">
-    <select id="_ctrl7" name="_ctrl7">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest9" testname="Name of a column">
-    <select id="_ctrl8" name="_ctrl8">
-      <option value="0" />0
-		<option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-		<option value="8" />8
-		<option value="9" />9
-
-	</select>
-  </div>
-  <div id="GHTSubTest10" testname="Name of a non-existing column">
-    <select id="_ctrl9" name="_ctrl9">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest11" testname="string.empty">
-    <table id="_ctrl10" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl10_0" type="radio" name="_ctrl10" value="1aaa" />
-          <label for="_ctrl10_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_1" type="radio" name="_ctrl10" value="2bbb" />
-          <label for="_ctrl10_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_2" type="radio" name="_ctrl10" value="3ccc" />
-          <label for="_ctrl10_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_3" type="radio" name="_ctrl10" value="4ddd" />
-          <label for="_ctrl10_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_4" type="radio" name="_ctrl10" value="5eee" />
-          <label for="_ctrl10_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_5" type="radio" name="_ctrl10" value="6fff" />
-          <label for="_ctrl10_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_6" type="radio" name="_ctrl10" value="7ggg" />
-          <label for="_ctrl10_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="Name of an items property">
-    <table id="_ctrl11" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl11_0" type="radio" name="_ctrl11" value="aaa" />
-          <label for="_ctrl11_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_1" type="radio" name="_ctrl11" value="bbb" />
-          <label for="_ctrl11_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_2" type="radio" name="_ctrl11" value="ccc" />
-          <label for="_ctrl11_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_3" type="radio" name="_ctrl11" value="ddd" />
-          <label for="_ctrl11_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_4" type="radio" name="_ctrl11" value="eee" />
-          <label for="_ctrl11_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_5" type="radio" name="_ctrl11" value="fff" />
-          <label for="_ctrl11_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_6" type="radio" name="_ctrl11" value="ggg" />
-          <label for="_ctrl11_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest13" testname="Name of an item non-existing property">
-    <table id="_ctrl12" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest14" testname="Name of a column">
-    <table id="_ctrl13" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl13_0" type="radio" name="_ctrl13" value="0" />
-          <label for="_ctrl13_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_1" type="radio" name="_ctrl13" value="1" />
-          <label for="_ctrl13_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_2" type="radio" name="_ctrl13" value="2" />
-          <label for="_ctrl13_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_3" type="radio" name="_ctrl13" value="3" />
-          <label for="_ctrl13_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_4" type="radio" name="_ctrl13" value="4" />
-          <label for="_ctrl13_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_5" type="radio" name="_ctrl13" value="5" />
-          <label for="_ctrl13_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_6" type="radio" name="_ctrl13" value="6" />
-          <label for="_ctrl13_6">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_7" type="radio" name="_ctrl13" value="7" />
-          <label for="_ctrl13_7">7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_8" type="radio" name="_ctrl13" value="8" />
-          <label for="_ctrl13_8">8</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_9" type="radio" name="_ctrl13" value="9" />
-          <label for="_ctrl13_9">9</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest15" testname="Name of a non-existing column">
-    <table id="_ctrl14" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest16" testname="string.empty">
-    <table id="_ctrl15" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl15_0" type="checkbox" name="_ctrl15:0" />
-          <label for="_ctrl15_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_1" type="checkbox" name="_ctrl15:1" />
-          <label for="_ctrl15_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_2" type="checkbox" name="_ctrl15:2" />
-          <label for="_ctrl15_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_3" type="checkbox" name="_ctrl15:3" />
-          <label for="_ctrl15_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_4" type="checkbox" name="_ctrl15:4" />
-          <label for="_ctrl15_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_5" type="checkbox" name="_ctrl15:5" />
-          <label for="_ctrl15_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_6" type="checkbox" name="_ctrl15:6" />
-          <label for="_ctrl15_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="Name of an items property">
-    <table id="_ctrl16" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl16_0" type="checkbox" name="_ctrl16:0" />
-          <label for="_ctrl16_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_1" type="checkbox" name="_ctrl16:1" />
-          <label for="_ctrl16_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_2" type="checkbox" name="_ctrl16:2" />
-          <label for="_ctrl16_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_3" type="checkbox" name="_ctrl16:3" />
-          <label for="_ctrl16_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_4" type="checkbox" name="_ctrl16:4" />
-          <label for="_ctrl16_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_5" type="checkbox" name="_ctrl16:5" />
-          <label for="_ctrl16_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_6" type="checkbox" name="_ctrl16:6" />
-          <label for="_ctrl16_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest18" testname="Name of an item non-existing property">
-    <table id="_ctrl17" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="Name of a column">
-    <table id="_ctrl18" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl18_0" type="checkbox" name="_ctrl18:0" />
-          <label for="_ctrl18_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_1" type="checkbox" name="_ctrl18:1" />
-          <label for="_ctrl18_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_2" type="checkbox" name="_ctrl18:2" />
-          <label for="_ctrl18_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_3" type="checkbox" name="_ctrl18:3" />
-          <label for="_ctrl18_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_4" type="checkbox" name="_ctrl18:4" />
-          <label for="_ctrl18_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_5" type="checkbox" name="_ctrl18:5" />
-          <label for="_ctrl18_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_6" type="checkbox" name="_ctrl18:6" />
-          <label for="_ctrl18_6">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_7" type="checkbox" name="_ctrl18:7" />
-          <label for="_ctrl18_7">7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_8" type="checkbox" name="_ctrl18:8" />
-          <label for="_ctrl18_8">8</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_9" type="checkbox" name="_ctrl18:9" />
-          <label for="_ctrl18_9">9</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest20" testname="Name of a non-existing column">
-    <table id="_ctrl19" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataTextFormatString.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataTextFormatString.aspx.xml
deleted file mode 100644
index 9d5023f02ea..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataTextFormatString.aspx.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="string.empty">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" />fff
-		<option value="ggg" />ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest2" testname="Valid format">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="format aaa format" />format aaa format
-		<option value="format bbb format" />format bbb format
-		<option value="format ccc format" />format ccc format
-		<option value="format ddd format" />format ddd format
-		<option value="format eee format" />format eee format
-		<option value="format fff format" />format fff format
-		<option value="format ggg format" />format ggg format
-
-	</select>
-  </div>
-  <div id="GHTSubTest3" testname="Invalid format">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="string.empty">
-    <select id="_ctrl3" name="_ctrl3">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" />fff
-		<option value="ggg" />ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest5" testname="Valid format">
-    <select id="_ctrl4" name="_ctrl4">
-      <option value="format aaa format" />format aaa format
-		<option value="format bbb format" />format bbb format
-		<option value="format ccc format" />format ccc format
-		<option value="format ddd format" />format ddd format
-		<option value="format eee format" />format eee format
-		<option value="format fff format" />format fff format
-		<option value="format ggg format" />format ggg format
-
-	</select>
-  </div>
-  <div id="GHTSubTest6" testname="Invalid format">
-    <select id="_ctrl5" name="_ctrl5">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="string.empty">
-    <table id="_ctrl6" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl6_0" type="radio" name="_ctrl6" value="aaa" />
-          <label for="_ctrl6_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_1" type="radio" name="_ctrl6" value="bbb" />
-          <label for="_ctrl6_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_2" type="radio" name="_ctrl6" value="ccc" />
-          <label for="_ctrl6_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_3" type="radio" name="_ctrl6" value="ddd" />
-          <label for="_ctrl6_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_4" type="radio" name="_ctrl6" value="eee" />
-          <label for="_ctrl6_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_5" type="radio" name="_ctrl6" value="fff" />
-          <label for="_ctrl6_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_6" type="radio" name="_ctrl6" value="ggg" />
-          <label for="_ctrl6_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" testname="Valid format">
-    <table id="_ctrl7" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl7_0" type="radio" name="_ctrl7" value="format aaa format" />
-          <label for="_ctrl7_0">format aaa format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_1" type="radio" name="_ctrl7" value="format bbb format" />
-          <label for="_ctrl7_1">format bbb format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_2" type="radio" name="_ctrl7" value="format ccc format" />
-          <label for="_ctrl7_2">format ccc format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_3" type="radio" name="_ctrl7" value="format ddd format" />
-          <label for="_ctrl7_3">format ddd format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_4" type="radio" name="_ctrl7" value="format eee format" />
-          <label for="_ctrl7_4">format eee format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_5" type="radio" name="_ctrl7" value="format fff format" />
-          <label for="_ctrl7_5">format fff format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_6" type="radio" name="_ctrl7" value="format ggg format" />
-          <label for="_ctrl7_6">format ggg format</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="Invalid format">
-    <table id="_ctrl8" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest10" testname="string.empty">
-    <table id="_ctrl9" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl9_0" type="checkbox" name="_ctrl9:0" />
-          <label for="_ctrl9_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_1" type="checkbox" name="_ctrl9:1" />
-          <label for="_ctrl9_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_2" type="checkbox" name="_ctrl9:2" />
-          <label for="_ctrl9_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_3" type="checkbox" name="_ctrl9:3" />
-          <label for="_ctrl9_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_4" type="checkbox" name="_ctrl9:4" />
-          <label for="_ctrl9_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_5" type="checkbox" name="_ctrl9:5" />
-          <label for="_ctrl9_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_6" type="checkbox" name="_ctrl9:6" />
-          <label for="_ctrl9_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="Valid format">
-    <table id="_ctrl10" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl10_0" type="checkbox" name="_ctrl10:0" />
-          <label for="_ctrl10_0">format aaa format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_1" type="checkbox" name="_ctrl10:1" />
-          <label for="_ctrl10_1">format bbb format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_2" type="checkbox" name="_ctrl10:2" />
-          <label for="_ctrl10_2">format ccc format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_3" type="checkbox" name="_ctrl10:3" />
-          <label for="_ctrl10_3">format ddd format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_4" type="checkbox" name="_ctrl10:4" />
-          <label for="_ctrl10_4">format eee format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_5" type="checkbox" name="_ctrl10:5" />
-          <label for="_ctrl10_5">format fff format</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_6" type="checkbox" name="_ctrl10:6" />
-          <label for="_ctrl10_6">format ggg format</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="Invalid format">
-    <table id="_ctrl11" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataValueField.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataValueField.aspx.xml
deleted file mode 100644
index b90c503da62..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_DataValueField.aspx.xml
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="string.empty">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest2" testname="string.empty - bound to a table">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="a" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-		<option value="h" />h
-		<option value="i" />i
-		<option value="j" />j
-
-	</select>
-  </div>
-  <div id="GHTSubTest3" testname="Name of an items property">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-
-	</select>
-  </div>
-  <div id="GHTSubTest4" testname="Name of an item non-existing property">
-    <select id="_ctrl3" size="4" name="_ctrl3">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="Name of a column">
-    <select id="_ctrl4" size="4" name="_ctrl4">
-      <option value="0" />0
-		<option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-		<option value="8" />8
-		<option value="9" />9
-
-	</select>
-  </div>
-  <div id="GHTSubTest6" testname="Name of a non-existing column">
-    <select id="_ctrl5" size="4" name="_ctrl5">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="string.empty">
-    <select id="_ctrl6" name="_ctrl6">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-  </div>
-  <div id="GHTSubTest8" testname="string.empty - bound to a table">
-    <select id="_ctrl7" name="_ctrl7">
-      <option value="a" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-		<option value="h" />h
-		<option value="i" />i
-		<option value="j" />j
-
-	</select>
-  </div>
-  <div id="GHTSubTest9" testname="Name of an items property">
-    <select id="_ctrl8" name="_ctrl8">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-
-	</select>
-  </div>
-  <div id="GHTSubTest10" testname="Name of an item non-existing property">
-    <select id="_ctrl9" name="_ctrl9">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest11" testname="Name of a column">
-    <select id="_ctrl10" name="_ctrl10">
-      <option value="0" />0
-		<option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-		<option value="8" />8
-		<option value="9" />9
-
-	</select>
-  </div>
-  <div id="GHTSubTest12" testname="Name of a non-existing column">
-    <select id="_ctrl11" name="_ctrl11">
-    </select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="string.empty">
-    <table id="_ctrl12" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl12_0" type="radio" name="_ctrl12" value="1aaa" />
-          <label for="_ctrl12_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_1" type="radio" name="_ctrl12" value="2bbb" />
-          <label for="_ctrl12_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_2" type="radio" name="_ctrl12" value="3ccc" />
-          <label for="_ctrl12_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_3" type="radio" name="_ctrl12" value="4ddd" />
-          <label for="_ctrl12_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_4" type="radio" name="_ctrl12" value="5eee" />
-          <label for="_ctrl12_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_5" type="radio" name="_ctrl12" value="6fff" />
-          <label for="_ctrl12_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_6" type="radio" name="_ctrl12" value="7ggg" />
-          <label for="_ctrl12_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="string.empty - bound to a table">
-    <table id="_ctrl13" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl13_0" type="radio" name="_ctrl13" value="a" />
-          <label for="_ctrl13_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_1" type="radio" name="_ctrl13" value="b" />
-          <label for="_ctrl13_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_2" type="radio" name="_ctrl13" value="c" />
-          <label for="_ctrl13_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_3" type="radio" name="_ctrl13" value="d" />
-          <label for="_ctrl13_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_4" type="radio" name="_ctrl13" value="e" />
-          <label for="_ctrl13_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_5" type="radio" name="_ctrl13" value="f" />
-          <label for="_ctrl13_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_6" type="radio" name="_ctrl13" value="g" />
-          <label for="_ctrl13_6">g</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_7" type="radio" name="_ctrl13" value="h" />
-          <label for="_ctrl13_7">h</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_8" type="radio" name="_ctrl13" value="i" />
-          <label for="_ctrl13_8">i</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_9" type="radio" name="_ctrl13" value="j" />
-          <label for="_ctrl13_9">j</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest15" testname="Name of an items property">
-    <table id="_ctrl14" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl14_0" type="radio" name="_ctrl14" value="1" />
-          <label for="_ctrl14_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_1" type="radio" name="_ctrl14" value="2" />
-          <label for="_ctrl14_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_2" type="radio" name="_ctrl14" value="3" />
-          <label for="_ctrl14_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_3" type="radio" name="_ctrl14" value="4" />
-          <label for="_ctrl14_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_4" type="radio" name="_ctrl14" value="5" />
-          <label for="_ctrl14_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_5" type="radio" name="_ctrl14" value="6" />
-          <label for="_ctrl14_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_6" type="radio" name="_ctrl14" value="7" />
-          <label for="_ctrl14_6">7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="Name of an item non-existing property">
-    <table id="_ctrl15" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest17" testname="Name of a column">
-    <table id="_ctrl16" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl16_0" type="radio" name="_ctrl16" value="0" />
-          <label for="_ctrl16_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_1" type="radio" name="_ctrl16" value="1" />
-          <label for="_ctrl16_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_2" type="radio" name="_ctrl16" value="2" />
-          <label for="_ctrl16_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_3" type="radio" name="_ctrl16" value="3" />
-          <label for="_ctrl16_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_4" type="radio" name="_ctrl16" value="4" />
-          <label for="_ctrl16_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_5" type="radio" name="_ctrl16" value="5" />
-          <label for="_ctrl16_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_6" type="radio" name="_ctrl16" value="6" />
-          <label for="_ctrl16_6">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_7" type="radio" name="_ctrl16" value="7" />
-          <label for="_ctrl16_7">7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_8" type="radio" name="_ctrl16" value="8" />
-          <label for="_ctrl16_8">8</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl16_9" type="radio" name="_ctrl16" value="9" />
-          <label for="_ctrl16_9">9</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest18" testname="Name of a non-existing column">
-    <table id="_ctrl17" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="string.empty">
-    <table id="_ctrl18" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl18_0" type="checkbox" name="_ctrl18:0" />
-          <label for="_ctrl18_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_1" type="checkbox" name="_ctrl18:1" />
-          <label for="_ctrl18_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_2" type="checkbox" name="_ctrl18:2" />
-          <label for="_ctrl18_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_3" type="checkbox" name="_ctrl18:3" />
-          <label for="_ctrl18_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_4" type="checkbox" name="_ctrl18:4" />
-          <label for="_ctrl18_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_5" type="checkbox" name="_ctrl18:5" />
-          <label for="_ctrl18_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl18_6" type="checkbox" name="_ctrl18:6" />
-          <label for="_ctrl18_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest20" testname="string.empty - bound to a table">
-    <table id="_ctrl19" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl19_0" type="checkbox" name="_ctrl19:0" />
-          <label for="_ctrl19_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_1" type="checkbox" name="_ctrl19:1" />
-          <label for="_ctrl19_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_2" type="checkbox" name="_ctrl19:2" />
-          <label for="_ctrl19_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_3" type="checkbox" name="_ctrl19:3" />
-          <label for="_ctrl19_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_4" type="checkbox" name="_ctrl19:4" />
-          <label for="_ctrl19_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_5" type="checkbox" name="_ctrl19:5" />
-          <label for="_ctrl19_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_6" type="checkbox" name="_ctrl19:6" />
-          <label for="_ctrl19_6">g</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_7" type="checkbox" name="_ctrl19:7" />
-          <label for="_ctrl19_7">h</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_8" type="checkbox" name="_ctrl19:8" />
-          <label for="_ctrl19_8">i</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl19_9" type="checkbox" name="_ctrl19:9" />
-          <label for="_ctrl19_9">j</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest21" testname="Name of an items property">
-    <table id="_ctrl20" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl20_0" type="checkbox" name="_ctrl20:0" />
-          <label for="_ctrl20_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl20_1" type="checkbox" name="_ctrl20:1" />
-          <label for="_ctrl20_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl20_2" type="checkbox" name="_ctrl20:2" />
-          <label for="_ctrl20_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl20_3" type="checkbox" name="_ctrl20:3" />
-          <label for="_ctrl20_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl20_4" type="checkbox" name="_ctrl20:4" />
-          <label for="_ctrl20_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl20_5" type="checkbox" name="_ctrl20:5" />
-          <label for="_ctrl20_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl20_6" type="checkbox" name="_ctrl20:6" />
-          <label for="_ctrl20_6">7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest22" testname="Name of an item non-existing property">
-    <table id="_ctrl21" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest23" testname="Name of a column">
-    <table id="_ctrl22" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl22_0" type="checkbox" name="_ctrl22:0" />
-          <label for="_ctrl22_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_1" type="checkbox" name="_ctrl22:1" />
-          <label for="_ctrl22_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_2" type="checkbox" name="_ctrl22:2" />
-          <label for="_ctrl22_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_3" type="checkbox" name="_ctrl22:3" />
-          <label for="_ctrl22_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_4" type="checkbox" name="_ctrl22:4" />
-          <label for="_ctrl22_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_5" type="checkbox" name="_ctrl22:5" />
-          <label for="_ctrl22_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_6" type="checkbox" name="_ctrl22:6" />
-          <label for="_ctrl22_6">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_7" type="checkbox" name="_ctrl22:7" />
-          <label for="_ctrl22_7">7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_8" type="checkbox" name="_ctrl22:8" />
-          <label for="_ctrl22_8">8</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl22_9" type="checkbox" name="_ctrl22:9" />
-          <label for="_ctrl22_9">9</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest24" testname="Name of a non-existing column">
-    <table id="_ctrl23" border="0">
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_Items.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_Items.aspx.xml
deleted file mode 100644
index 68d751e3938..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_Items.aspx.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Type &amp; contents">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="1" />aaa
-		<option value="2" />bbb
-		<option value="3" />ccc
-		<option value="4" />ddd
-		<option value="5" />eee
-		<option value="6" />fff
-		<option value="7" />ggg
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="Type &amp; contents">
-    <select id="_ctrl1" name="_ctrl1">
-      <option value="1" />aaa
-		<option value="2" />bbb
-		<option value="3" />ccc
-		<option value="4" />ddd
-		<option value="5" />eee
-		<option value="6" />fff
-		<option value="7" />ggg
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="Type &amp; contents">
-    <table id="_ctrl2" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl2_0" type="radio" name="_ctrl2" value="1" />
-          <label for="_ctrl2_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl2_1" type="radio" name="_ctrl2" value="2" />
-          <label for="_ctrl2_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl2_2" type="radio" name="_ctrl2" value="3" />
-          <label for="_ctrl2_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl2_3" type="radio" name="_ctrl2" value="4" />
-          <label for="_ctrl2_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl2_4" type="radio" name="_ctrl2" value="5" />
-          <label for="_ctrl2_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl2_5" type="radio" name="_ctrl2" value="6" />
-          <label for="_ctrl2_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl2_6" type="radio" name="_ctrl2" value="7" />
-          <label for="_ctrl2_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="Type &amp; contents">
-    <table id="_ctrl3" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl3_0" type="checkbox" name="_ctrl3:0" />
-          <label for="_ctrl3_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl3_1" type="checkbox" name="_ctrl3:1" />
-          <label for="_ctrl3_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl3_2" type="checkbox" name="_ctrl3:2" />
-          <label for="_ctrl3_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl3_3" type="checkbox" name="_ctrl3:3" />
-          <label for="_ctrl3_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl3_4" type="checkbox" name="_ctrl3:4" />
-          <label for="_ctrl3_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl3_5" type="checkbox" name="_ctrl3:5" />
-          <label for="_ctrl3_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl3_6" type="checkbox" name="_ctrl3:6" />
-          <label for="_ctrl3_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedIndex.aspx.xml
deleted file mode 100644
index c6c5d459807..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedIndex.aspx.xml
+++ /dev/null
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:56px">
-    <table id="CheckBoxList1" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_2" checked="checked" type="checkbox" name="CheckBoxList1:2" />
-          <label for="CheckBoxList1_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_3" type="checkbox" name="CheckBoxList1:3" />
-          <label for="CheckBoxList1_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_4" checked="checked" type="checkbox" name="CheckBoxList1:4" />
-          <label for="CheckBoxList1_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_5" type="checkbox" name="CheckBoxList1:5" />
-          <label for="CheckBoxList1_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_6" checked="checked" type="checkbox" name="CheckBoxList1:6" />
-          <label for="CheckBoxList1_6">g</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest2" style="height:88px;width:56px">
-    <table id="RadioButtonList1" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="a" />
-          <label for="RadioButtonList1_0">a</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="b" />
-          <label for="RadioButtonList1_1">b</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_2" checked="checked" type="radio" name="RadioButtonList1" value="c" />
-          <label for="RadioButtonList1_2">c</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_3" type="radio" name="RadioButtonList1" value="d" />
-          <label for="RadioButtonList1_3">d</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_4" checked="checked" type="radio" name="RadioButtonList1" value="e" />
-          <label for="RadioButtonList1_4">e</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_5" type="radio" name="RadioButtonList1" value="f" />
-          <label for="RadioButtonList1_5">f</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_6" checked="checked" type="radio" name="RadioButtonList1" value="g" />
-          <label for="RadioButtonList1_6">g</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest3" style="height:88px;width:56px">
-    <select multiple="multiple" id="ListBox1" style="height:190px" size="4" name="ListBox1">
-      <option value="a" selected="selected" />a
-		<option value="b" />b
-		<option value="c" />c
-		<option value="d" />d
-		<option value="e" />e
-		<option value="f" />f
-		<option value="g" />g
-
-	</select>
-    <span>
-      <br />2</span>
-  </div>
-  <div id="GHTSubTest4" testname="None selected">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest5" testname="valid value">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" selected="selected" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />5</span>
-  </div>
-  <div id="GHTSubTest6" testname="Invalid value - above length of items.">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="Invalid value - below -1.">
-    <select id="_ctrl3" size="4" name="_ctrl3">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="None selected">
-    <select id="_ctrl4" name="_ctrl4">
-      <option value="1aaa" selected="selected" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest9" testname="valid value">
-    <select id="_ctrl5" name="_ctrl5">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" selected="selected" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />5</span>
-  </div>
-  <div id="GHTSubTest10" testname="Invalid value - above length of items.">
-    <select id="_ctrl6" name="_ctrl6">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest11" testname="Invalid value - below -1.">
-    <select id="_ctrl7" name="_ctrl7">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest12" testname="None selected">
-    <table id="_ctrl8" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl8_0" type="radio" name="_ctrl8" value="1aaa" />
-          <label for="_ctrl8_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_1" type="radio" name="_ctrl8" value="2bbb" />
-          <label for="_ctrl8_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_2" type="radio" name="_ctrl8" value="3ccc" />
-          <label for="_ctrl8_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_3" type="radio" name="_ctrl8" value="4ddd" />
-          <label for="_ctrl8_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_4" type="radio" name="_ctrl8" value="5eee" />
-          <label for="_ctrl8_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_5" type="radio" name="_ctrl8" value="6fff" />
-          <label for="_ctrl8_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_6" type="radio" name="_ctrl8" value="7ggg" />
-          <label for="_ctrl8_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest13" testname="valid value">
-    <table id="_ctrl9" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl9_0" type="radio" name="_ctrl9" value="1aaa" />
-          <label for="_ctrl9_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_1" type="radio" name="_ctrl9" value="2bbb" />
-          <label for="_ctrl9_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_2" type="radio" name="_ctrl9" value="3ccc" />
-          <label for="_ctrl9_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_3" type="radio" name="_ctrl9" value="4ddd" />
-          <label for="_ctrl9_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_4" type="radio" name="_ctrl9" value="5eee" />
-          <label for="_ctrl9_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_5" checked="checked" type="radio" name="_ctrl9" value="6fff" />
-          <label for="_ctrl9_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_6" type="radio" name="_ctrl9" value="7ggg" />
-          <label for="_ctrl9_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />5</span>
-  </div>
-  <div id="GHTSubTest14" testname="Invalid value - above length of items.">
-    <table id="_ctrl10" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl10_0" type="radio" name="_ctrl10" value="1aaa" />
-          <label for="_ctrl10_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_1" type="radio" name="_ctrl10" value="2bbb" />
-          <label for="_ctrl10_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_2" type="radio" name="_ctrl10" value="3ccc" />
-          <label for="_ctrl10_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_3" type="radio" name="_ctrl10" value="4ddd" />
-          <label for="_ctrl10_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_4" type="radio" name="_ctrl10" value="5eee" />
-          <label for="_ctrl10_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_5" type="radio" name="_ctrl10" value="6fff" />
-          <label for="_ctrl10_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_6" type="radio" name="_ctrl10" value="7ggg" />
-          <label for="_ctrl10_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="Invalid value - below -1.">
-    <table id="_ctrl11" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl11_0" type="radio" name="_ctrl11" value="1aaa" />
-          <label for="_ctrl11_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_1" type="radio" name="_ctrl11" value="2bbb" />
-          <label for="_ctrl11_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_2" type="radio" name="_ctrl11" value="3ccc" />
-          <label for="_ctrl11_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_3" type="radio" name="_ctrl11" value="4ddd" />
-          <label for="_ctrl11_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_4" type="radio" name="_ctrl11" value="5eee" />
-          <label for="_ctrl11_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_5" type="radio" name="_ctrl11" value="6fff" />
-          <label for="_ctrl11_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_6" type="radio" name="_ctrl11" value="7ggg" />
-          <label for="_ctrl11_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest16" testname="None selected">
-    <table id="_ctrl12" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl12_0" type="checkbox" name="_ctrl12:0" />
-          <label for="_ctrl12_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_1" type="checkbox" name="_ctrl12:1" />
-          <label for="_ctrl12_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_2" type="checkbox" name="_ctrl12:2" />
-          <label for="_ctrl12_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_3" type="checkbox" name="_ctrl12:3" />
-          <label for="_ctrl12_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_4" type="checkbox" name="_ctrl12:4" />
-          <label for="_ctrl12_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_5" type="checkbox" name="_ctrl12:5" />
-          <label for="_ctrl12_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_6" type="checkbox" name="_ctrl12:6" />
-          <label for="_ctrl12_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest17" testname="valid value">
-    <table id="_ctrl13" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl13_0" type="checkbox" name="_ctrl13:0" />
-          <label for="_ctrl13_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_1" type="checkbox" name="_ctrl13:1" />
-          <label for="_ctrl13_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_2" type="checkbox" name="_ctrl13:2" />
-          <label for="_ctrl13_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_3" type="checkbox" name="_ctrl13:3" />
-          <label for="_ctrl13_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_4" type="checkbox" name="_ctrl13:4" />
-          <label for="_ctrl13_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_5" checked="checked" type="checkbox" name="_ctrl13:5" />
-          <label for="_ctrl13_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_6" type="checkbox" name="_ctrl13:6" />
-          <label for="_ctrl13_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />5</span>
-  </div>
-  <div id="GHTSubTest18" testname="Invalid value - above length of items.">
-    <table id="_ctrl14" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl14_0" type="checkbox" name="_ctrl14:0" />
-          <label for="_ctrl14_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_1" type="checkbox" name="_ctrl14:1" />
-          <label for="_ctrl14_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_2" type="checkbox" name="_ctrl14:2" />
-          <label for="_ctrl14_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_3" type="checkbox" name="_ctrl14:3" />
-          <label for="_ctrl14_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_4" type="checkbox" name="_ctrl14:4" />
-          <label for="_ctrl14_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_5" type="checkbox" name="_ctrl14:5" />
-          <label for="_ctrl14_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_6" type="checkbox" name="_ctrl14:6" />
-          <label for="_ctrl14_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="Invalid value - below -1.">
-    <table id="_ctrl15" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl15_0" type="checkbox" name="_ctrl15:0" />
-          <label for="_ctrl15_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_1" type="checkbox" name="_ctrl15:1" />
-          <label for="_ctrl15_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_2" type="checkbox" name="_ctrl15:2" />
-          <label for="_ctrl15_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_3" type="checkbox" name="_ctrl15:3" />
-          <label for="_ctrl15_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_4" type="checkbox" name="_ctrl15:4" />
-          <label for="_ctrl15_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_5" type="checkbox" name="_ctrl15:5" />
-          <label for="_ctrl15_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_6" type="checkbox" name="_ctrl15:6" />
-          <label for="_ctrl15_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-    <span>
-      <br />no exception should be raised</span>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedItem.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedItem.aspx.xml
deleted file mode 100644
index 477056e6642..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedItem.aspx.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="None selected">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" />fff
-		<option value="ggg" />ggg
-
-	</select>
-    <span>
-      <br />Test passed: SelectedItem is null</span>
-  </div>
-  <div id="GHTSubTest2" testname="valid value">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" selected="selected" />fff
-		<option value="ggg" />ggg
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="multiple Items selected">
-    <select multiple="multiple" id="_ctrl2" size="4" name="_ctrl2">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" selected="selected" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" selected="selected" />eee
-		<option value="fff" />fff
-		<option value="ggg" selected="selected" />ggg
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="None selected">
-    <select id="_ctrl3" name="_ctrl3">
-      <option value="aaa" selected="selected" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" />fff
-		<option value="ggg" />ggg
-
-	</select>
-    <span>
-      <br />Test failede: SelectedItem is not null</span>
-  </div>
-  <div id="GHTSubTest5" testname="valid value">
-    <select id="_ctrl4" name="_ctrl4">
-      <option value="aaa" />aaa
-		<option value="bbb" />bbb
-		<option value="ccc" />ccc
-		<option value="ddd" />ddd
-		<option value="eee" />eee
-		<option value="fff" selected="selected" />fff
-		<option value="ggg" />ggg
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest6" testname="multiple Items selected">
-    <select id="_ctrl5" name="_ctrl5">
-    </select>
-  </div>
-  <div id="GHTSubTest7" testname="None selected">
-    <table id="_ctrl6" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl6_0" type="radio" name="_ctrl6" value="aaa" />
-          <label for="_ctrl6_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_1" type="radio" name="_ctrl6" value="bbb" />
-          <label for="_ctrl6_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_2" type="radio" name="_ctrl6" value="ccc" />
-          <label for="_ctrl6_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_3" type="radio" name="_ctrl6" value="ddd" />
-          <label for="_ctrl6_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_4" type="radio" name="_ctrl6" value="eee" />
-          <label for="_ctrl6_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_5" type="radio" name="_ctrl6" value="fff" />
-          <label for="_ctrl6_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl6_6" type="radio" name="_ctrl6" value="ggg" />
-          <label for="_ctrl6_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed: SelectedItem is null</span>
-  </div>
-  <div id="GHTSubTest8" testname="valid value">
-    <table id="_ctrl7" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl7_0" type="radio" name="_ctrl7" value="aaa" />
-          <label for="_ctrl7_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_1" type="radio" name="_ctrl7" value="bbb" />
-          <label for="_ctrl7_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_2" type="radio" name="_ctrl7" value="ccc" />
-          <label for="_ctrl7_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_3" type="radio" name="_ctrl7" value="ddd" />
-          <label for="_ctrl7_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_4" type="radio" name="_ctrl7" value="eee" />
-          <label for="_ctrl7_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_5" checked="checked" type="radio" name="_ctrl7" value="fff" />
-          <label for="_ctrl7_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl7_6" type="radio" name="_ctrl7" value="ggg" />
-          <label for="_ctrl7_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="multiple Items selected">
-    <table id="_ctrl8" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl8_0" type="radio" name="_ctrl8" value="aaa" />
-          <label for="_ctrl8_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_1" type="radio" name="_ctrl8" value="bbb" />
-          <label for="_ctrl8_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_2" checked="checked" type="radio" name="_ctrl8" value="ccc" />
-          <label for="_ctrl8_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_3" type="radio" name="_ctrl8" value="ddd" />
-          <label for="_ctrl8_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_4" checked="checked" type="radio" name="_ctrl8" value="eee" />
-          <label for="_ctrl8_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_5" type="radio" name="_ctrl8" value="fff" />
-          <label for="_ctrl8_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_6" checked="checked" type="radio" name="_ctrl8" value="ggg" />
-          <label for="_ctrl8_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest10" testname="None selected">
-    <table id="_ctrl9" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl9_0" type="checkbox" name="_ctrl9:0" />
-          <label for="_ctrl9_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_1" type="checkbox" name="_ctrl9:1" />
-          <label for="_ctrl9_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_2" type="checkbox" name="_ctrl9:2" />
-          <label for="_ctrl9_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_3" type="checkbox" name="_ctrl9:3" />
-          <label for="_ctrl9_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_4" type="checkbox" name="_ctrl9:4" />
-          <label for="_ctrl9_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_5" type="checkbox" name="_ctrl9:5" />
-          <label for="_ctrl9_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_6" type="checkbox" name="_ctrl9:6" />
-          <label for="_ctrl9_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed: SelectedItem is null</span>
-  </div>
-  <div id="GHTSubTest11" testname="valid value">
-    <table id="_ctrl10" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl10_0" type="checkbox" name="_ctrl10:0" />
-          <label for="_ctrl10_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_1" type="checkbox" name="_ctrl10:1" />
-          <label for="_ctrl10_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_2" type="checkbox" name="_ctrl10:2" />
-          <label for="_ctrl10_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_3" type="checkbox" name="_ctrl10:3" />
-          <label for="_ctrl10_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_4" type="checkbox" name="_ctrl10:4" />
-          <label for="_ctrl10_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_5" checked="checked" type="checkbox" name="_ctrl10:5" />
-          <label for="_ctrl10_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_6" type="checkbox" name="_ctrl10:6" />
-          <label for="_ctrl10_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest12" testname="multiple Items selected">
-    <table id="_ctrl11" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl11_0" type="checkbox" name="_ctrl11:0" />
-          <label for="_ctrl11_0">aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_1" type="checkbox" name="_ctrl11:1" />
-          <label for="_ctrl11_1">bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_2" checked="checked" type="checkbox" name="_ctrl11:2" />
-          <label for="_ctrl11_2">ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_3" type="checkbox" name="_ctrl11:3" />
-          <label for="_ctrl11_3">ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_4" checked="checked" type="checkbox" name="_ctrl11:4" />
-          <label for="_ctrl11_4">eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_5" type="checkbox" name="_ctrl11:5" />
-          <label for="_ctrl11_5">fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_6" checked="checked" type="checkbox" name="_ctrl11:6" />
-          <label for="_ctrl11_6">ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedValue.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedValue.aspx.xml
deleted file mode 100644
index ef4c2110ba5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListControl_ListControl_SelectedValue.aspx.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="None selected - get">
-    <select id="_ctrl0" size="4" name="_ctrl0">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="valid value - get">
-    <select id="_ctrl1" size="4" name="_ctrl1">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" selected="selected" />6
-		<option value="7" />7
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="valid value - set">
-    <select id="_ctrl2" size="4" name="_ctrl2">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" selected="selected" />5
-		<option value="6" />6
-		<option value="7" />7
-
-	</select>
-  </div>
-  <div id="GHTSubTest4" testname="Invalid value - set">
-    <select id="_ctrl3" size="4" name="_ctrl3">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="None selected - get">
-    <select id="_ctrl4" name="_ctrl4">
-      <option value="1" selected="selected" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" />6
-		<option value="7" />7
-
-	</select>
-    <span>
-      <br />Test Failed. Result:1. Expected Result:</span>
-  </div>
-  <div id="GHTSubTest6" testname="valid value - get">
-    <select id="_ctrl5" name="_ctrl5">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" />5
-		<option value="6" selected="selected" />6
-		<option value="7" />7
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest7" testname="valid value - set">
-    <select id="_ctrl6" name="_ctrl6">
-      <option value="1" />1
-		<option value="2" />2
-		<option value="3" />3
-		<option value="4" />4
-		<option value="5" selected="selected" />5
-		<option value="6" />6
-		<option value="7" />7
-
-	</select>
-  </div>
-  <div id="GHTSubTest8" testname="Invalid value - set">
-    <select id="_ctrl7" name="_ctrl7">
-      <option value="1aaa" />1aaa
-		<option value="2bbb" />2bbb
-		<option value="3ccc" />3ccc
-		<option value="4ddd" />4ddd
-		<option value="5eee" />5eee
-		<option value="6fff" />6fff
-		<option value="7ggg" />7ggg
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest9" testname="None selected - get">
-    <table id="_ctrl8" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl8_0" type="radio" name="_ctrl8" value="1" />
-          <label for="_ctrl8_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_1" type="radio" name="_ctrl8" value="2" />
-          <label for="_ctrl8_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_2" type="radio" name="_ctrl8" value="3" />
-          <label for="_ctrl8_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_3" type="radio" name="_ctrl8" value="4" />
-          <label for="_ctrl8_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_4" type="radio" name="_ctrl8" value="5" />
-          <label for="_ctrl8_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_5" type="radio" name="_ctrl8" value="6" />
-          <label for="_ctrl8_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl8_6" type="radio" name="_ctrl8" value="7" />
-          <label for="_ctrl8_6">7</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest10" testname="valid value - get">
-    <table id="_ctrl9" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl9_0" type="radio" name="_ctrl9" value="1" />
-          <label for="_ctrl9_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_1" type="radio" name="_ctrl9" value="2" />
-          <label for="_ctrl9_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_2" type="radio" name="_ctrl9" value="3" />
-          <label for="_ctrl9_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_3" type="radio" name="_ctrl9" value="4" />
-          <label for="_ctrl9_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_4" type="radio" name="_ctrl9" value="5" />
-          <label for="_ctrl9_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_5" checked="checked" type="radio" name="_ctrl9" value="6" />
-          <label for="_ctrl9_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl9_6" type="radio" name="_ctrl9" value="7" />
-          <label for="_ctrl9_6">7</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest11" testname="valid value - set">
-    <table id="_ctrl10" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl10_0" type="radio" name="_ctrl10" value="1" />
-          <label for="_ctrl10_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_1" type="radio" name="_ctrl10" value="2" />
-          <label for="_ctrl10_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_2" type="radio" name="_ctrl10" value="3" />
-          <label for="_ctrl10_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_3" type="radio" name="_ctrl10" value="4" />
-          <label for="_ctrl10_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_4" checked="checked" type="radio" name="_ctrl10" value="5" />
-          <label for="_ctrl10_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_5" type="radio" name="_ctrl10" value="6" />
-          <label for="_ctrl10_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl10_6" type="radio" name="_ctrl10" value="7" />
-          <label for="_ctrl10_6">7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="Invalid value - set">
-    <table id="_ctrl11" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl11_0" type="radio" name="_ctrl11" value="1aaa" />
-          <label for="_ctrl11_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_1" type="radio" name="_ctrl11" value="2bbb" />
-          <label for="_ctrl11_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_2" type="radio" name="_ctrl11" value="3ccc" />
-          <label for="_ctrl11_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_3" type="radio" name="_ctrl11" value="4ddd" />
-          <label for="_ctrl11_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_4" type="radio" name="_ctrl11" value="5eee" />
-          <label for="_ctrl11_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_5" type="radio" name="_ctrl11" value="6fff" />
-          <label for="_ctrl11_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl11_6" type="radio" name="_ctrl11" value="7ggg" />
-          <label for="_ctrl11_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="None selected - get">
-    <table id="_ctrl12" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl12_0" type="checkbox" name="_ctrl12:0" />
-          <label for="_ctrl12_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_1" type="checkbox" name="_ctrl12:1" />
-          <label for="_ctrl12_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_2" type="checkbox" name="_ctrl12:2" />
-          <label for="_ctrl12_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_3" type="checkbox" name="_ctrl12:3" />
-          <label for="_ctrl12_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_4" type="checkbox" name="_ctrl12:4" />
-          <label for="_ctrl12_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_5" type="checkbox" name="_ctrl12:5" />
-          <label for="_ctrl12_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl12_6" type="checkbox" name="_ctrl12:6" />
-          <label for="_ctrl12_6">7</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest14" testname="valid value - get">
-    <table id="_ctrl13" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl13_0" type="checkbox" name="_ctrl13:0" />
-          <label for="_ctrl13_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_1" type="checkbox" name="_ctrl13:1" />
-          <label for="_ctrl13_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_2" type="checkbox" name="_ctrl13:2" />
-          <label for="_ctrl13_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_3" type="checkbox" name="_ctrl13:3" />
-          <label for="_ctrl13_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_4" type="checkbox" name="_ctrl13:4" />
-          <label for="_ctrl13_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_5" checked="checked" type="checkbox" name="_ctrl13:5" />
-          <label for="_ctrl13_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl13_6" type="checkbox" name="_ctrl13:6" />
-          <label for="_ctrl13_6">7</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest15" testname="valid value - set">
-    <table id="_ctrl14" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl14_0" type="checkbox" name="_ctrl14:0" />
-          <label for="_ctrl14_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_1" type="checkbox" name="_ctrl14:1" />
-          <label for="_ctrl14_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_2" type="checkbox" name="_ctrl14:2" />
-          <label for="_ctrl14_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_3" type="checkbox" name="_ctrl14:3" />
-          <label for="_ctrl14_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_4" checked="checked" type="checkbox" name="_ctrl14:4" />
-          <label for="_ctrl14_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_5" type="checkbox" name="_ctrl14:5" />
-          <label for="_ctrl14_5">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl14_6" type="checkbox" name="_ctrl14:6" />
-          <label for="_ctrl14_6">7</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="Invalid value - set">
-    <table id="_ctrl15" border="0">
-      <tr>
-        <td>
-          <input id="_ctrl15_0" type="checkbox" name="_ctrl15:0" />
-          <label for="_ctrl15_0">1aaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_1" type="checkbox" name="_ctrl15:1" />
-          <label for="_ctrl15_1">2bbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_2" type="checkbox" name="_ctrl15:2" />
-          <label for="_ctrl15_2">3ccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_3" type="checkbox" name="_ctrl15:3" />
-          <label for="_ctrl15_3">4ddd</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_4" type="checkbox" name="_ctrl15:4" />
-          <label for="_ctrl15_4">5eee</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_5" type="checkbox" name="_ctrl15:5" />
-          <label for="_ctrl15_5">6fff</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="_ctrl15_6" type="checkbox" name="_ctrl15:6" />
-          <label for="_ctrl15_6">7ggg</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItemType_ListItemType_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItemType_ListItemType_Enum.aspx.xml
deleted file mode 100644
index 60b418a86c6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItemType_ListItemType_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ListItemType">
-    <span>
-      <br />Header; Footer; Item; AlternatingItem; SelectedItem; EditItem; Separator; Pager; 0; 1; 2; 3; 4; 5; 6; 7; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Attributes.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Attributes.aspx.xml
deleted file mode 100644
index 3359372fd48..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Attributes.aspx.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <select id="ListBox1" style="height:64px;width:56px" size="4" name="ListBox1">
-      <option value="0" />item 0
-		<option value="1" />item 1
-		<option value="2" />item 2
-
-	</select>
-    <p />
-  </div>
-  <div id="GHTSubTest2" testname="Attributes Keys count">
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest3" testname="Attributes Values count">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="Attributes Keys+Values ">
-    <span>
-      <br />
-      <attributecontainer>
-      </attributecontainer>
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="Attributes Keys count">
-    <span>
-      <br />1</span>
-  </div>
-  <div id="GHTSubTest6" testname="Attributes Values count">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="Attributes Keys+Values ">
-    <span>
-      <br />
-      <attributecontainer attributekey="AttributeValue">
-      </attributecontainer>
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="Attributes Keys count">
-    <span>
-      <br />13</span>
-  </div>
-  <div id="GHTSubTest9" testname="Attributes Values count">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="Attributes Keys+Values ">
-    <span>
-      <br />
-      <attributecontainer attributekey5="AttributeValue5" attributekey4="AttributeValue4" attributekey7="AttributeValue7" attributekey6="AttributeValue6" attributekey9="AttributeValue9" attributekey8="AttributeValue8" attributekey1="AttributeValue1" attributekey10="AttributeValue10" attributekey11="AttributeValue11" attributekey2="AttributeValue2" attributekey13="AttributeValue13" attributekey3="AttributeValue3" attributekey12="AttributeValue12">
-      </attributecontainer>
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Equals_O.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Equals_O.aspx.xml
deleted file mode 100644
index 2c5b3adee77..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Equals_O.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Reference equality">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="Text &amp; Value equal, but selected is not equal">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="Values are not equal">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="Texts are not equal">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest5" testname="FakeListItem">
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_FromString_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_FromString_S.aspx.xml
deleted file mode 100644
index 75448cd6d57..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_FromString_S.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="use as instance method">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="use as class method">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="Empty string">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_GetHashCode_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_GetHashCode_.aspx.xml
deleted file mode 100644
index 7c42ab9762f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_GetHashCode_.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Two calls by the same object.">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest2" testname="Equal items ">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest3" testname="Not equal items ">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest4" testname="Not equal items ">
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Selected.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Selected.aspx.xml
deleted file mode 100644
index 280a9a764a2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Selected.aspx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest2" style="height:64px;width:88px">
-    <table id="CheckBoxList2" border="0">
-      <tr>
-        <td>
-          <input id="CheckBoxList2_0" type="checkbox" name="CheckBoxList2:0" />
-          <label for="CheckBoxList2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList2_1" checked="checked" type="checkbox" name="CheckBoxList2:1" />
-          <label for="CheckBoxList2_1">Item2</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest1" testname="Selected - Get">
-    <span>
-      <br />True</span>
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Text.aspx.xml
deleted file mode 100644
index c5f1fce9cdb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Text.aspx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:144px">
-    <table id="RadioButtonList1" style="width:128px" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="   abcd efg hijkl nmopqrst   uvwxyz    " />
-          <label for="RadioButtonList1_0">   abcd efg hijkl nmopqrst   uvwxyz    </label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:144px">
-    <table id="RadioButtonList2" style="width:128px" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:&quot;&lt;&gt;?" />
-          <label for="RadioButtonList2_0">`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:"?</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;width:136px">
-    <select id="DropDownList1" name="DropDownList1">
-      <option value="                               " />
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:64px;width:136px">
-    <select id="DropDownList2" name="DropDownList2">
-      <option value="" />
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ToString_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ToString_.aspx.xml
deleted file mode 100644
index 75bb3acd9cf..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ToString_.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="RadioButtonList1.Items(0).ToString()">
-    <span>
-      <br />   abcd efg hijkl nmopqrst   uvwxyz    </span>
-  </div>
-  <div id="GHTSubTest2" testname="RadioButtonList2.Items(0).ToString()">
-    <span>
-      <br />`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:"?</span>
-  </div>
-  <div id="GHTSubTest3" testname="DropDownList1.Items(0).ToString()">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="DropDownList2.Items(0).ToString()">
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Value.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Value.aspx.xml
deleted file mode 100644
index c5f1fce9cdb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_Value.aspx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:144px">
-    <table id="RadioButtonList1" style="width:128px" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="   abcd efg hijkl nmopqrst   uvwxyz    " />
-          <label for="RadioButtonList1_0">   abcd efg hijkl nmopqrst   uvwxyz    </label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:144px">
-    <table id="RadioButtonList2" style="width:128px" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:&quot;&lt;&gt;?" />
-          <label for="RadioButtonList2_0">`1234567890-= ~!@#$%^&amp;*()_+ []\;',./ {}|:"?</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:64px;width:136px">
-    <select id="DropDownList1" name="DropDownList1">
-      <option value="                               " />
-    </select>
-  </div>
-  <div id="GHTSubTest4" style="height:64px;width:136px">
-    <select id="DropDownList2" name="DropDownList2">
-      <option value="" />
-    </select>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_.aspx.xml
deleted file mode 100644
index b9b5139718b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Default values">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_S.aspx.xml
deleted file mode 100644
index 8fe5bc4991f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_S.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_SS.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_SS.aspx.xml
deleted file mode 100644
index 8fe5bc4991f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListItem_ListItem_ctor_SS.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="">
-    <span>
-      <br />Test Passed.</span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListSelectionMode_ListSelectionMode_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListSelectionMode_ListSelectionMode_Enum.aspx.xml
deleted file mode 100644
index bf64e569c92..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ListSelectionMode_ListSelectionMode_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ListSelectionMode">
-    <span>
-      <br />Single; Multiple; 0; 1; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Literal_Literal_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Literal_Literal_Text.aspx.xml
deleted file mode 100644
index 0b8b54a63c1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Literal_Literal_Text.aspx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;left:16px;position:absolute;top:15px;width:120px;z-index:100">
-	
-				   abcdefghijklm nopqrstuvwxyz       
-			
-</div>
-  <div id="GHTSubTest6" style="height:40px;left:24px;position:absolute;top:312px;width:192px;z-index:106">
-  </div>
-  <div id="GHTSubTest5" style="height:40px;left:24px;position:absolute;top:256px;width:192px;z-index:105">
-  </div>
-  <div id="GHTSubTest4" style="height:40px;left:16px;position:absolute;top:200px;width:192px;z-index:104">
-	
-				~!@#$%^&amp;*()_+{}|:"?`[]\-=,./
-			
-</div>
-  <div id="GHTSubTest3" style="height:40px;left:16px;position:absolute;top:144px;width:192px;z-index:102">
-	
-				134567890
-			
-</div>
-  <div id="GHTSubTest2" style="height:40px;left:16px;position:absolute;top:88px;width:192px;z-index:101">
-	
-				   abcdefghijklm nopqrstuvwxyz       
-			
-</div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_NextPrevFormat_NextPrevFormat_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_NextPrevFormat_NextPrevFormat_Enum.aspx.xml
deleted file mode 100644
index 4c7dc5a7dfb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_NextPrevFormat_NextPrevFormat_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.NextPrevFormat">
-    <span>
-      <br />CustomText; ShortMonth; FullMonth; 0; 1; 2; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_BackImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_BackImageUrl.aspx.xml
deleted file mode 100644
index 62bc4472e7f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_BackImageUrl.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;left:16px;position:absolute;top:15px;width:136px;z-index:101">
-    <div id="Panel1" style="background-image:url(http;height:72px;width:128px">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest4" style="height:80px;left:16px;position:absolute;top:352px;width:136px;z-index:104">
-    <div id="Panel4" style="background-image:url(../hyperlink/car.jpg);height:72px;width:128px">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest3" style="height:80px;left:16px;position:absolute;top:248px;width:136px;z-index:103">
-    <div id="Panel3" style="background-image:url(/ghttests/system_web_dll/system_web_ui_webcontrols/panel/car.jpg);height:72px;width:128px">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest2" style="height:80px;left:16px;position:absolute;top:128px;width:136px;z-index:102">
-    <div id="Panel2" style="background-image:url(car.jpg);height:72px;width:128px">
-		Panel
-	</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_HorizontalAlign.aspx.xml
deleted file mode 100644
index 707b6cc58fd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;left:16px;position:absolute;top:15px;width:136px;z-index:100">
-    <div id="Panel1" style="height:48px;width:112px">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest6" style="height:40px;left:16px;position:absolute;top:416px;width:136px;z-index:106">
-    <div id="Panel6" style="height:48px;width:112px">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest5" style="height:40px;left:16px;position:absolute;top:336px;width:136px;z-index:105">
-    <div id="Panel5" style="height:48px;width:112px" align="Justify">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest4" style="height:40px;left:16px;position:absolute;top:256px;width:136px;z-index:104">
-    <div id="Panel4" style="height:48px;width:112px" align="Right">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest3" style="height:40px;left:16px;position:absolute;top:176px;width:136px;z-index:102">
-    <div id="Panel3" style="height:48px;width:112px" align="Center">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest2" style="height:40px;left:16px;position:absolute;top:96px;width:136px;z-index:101">
-    <div id="Panel2" style="height:48px;width:112px" align="Left">
-		Panel
-	</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_Wrap.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_Wrap.aspx.xml
deleted file mode 100644
index 148654046da..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Panel_Panel_Wrap.aspx.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:160px">
-    <div id="Panel1" style="height:56px;width:112px">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:160px">
-    <div id="Panel2" style="height:56px;width:112px" nowrap="nowrap">
-		Panel
-	</div>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:160px">
-    <div id="Panel3" style="height:56px;width:112px">
-		Panel
-	</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_PlaceHolder_PlaceHolder_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_PlaceHolder_PlaceHolder_ctor_.aspx.xml
deleted file mode 100644
index 8588f5189f7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_PlaceHolder_PlaceHolder_ctor_.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;left:16px;position:absolute;top:15px;width:168px;z-index:100">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_CellPadding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_CellPadding.aspx.xml
deleted file mode 100644
index 8db683a2d3e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_CellPadding.aspx.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:40px">
-    <table id="RadioButtonList2" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="1" />
-          <label for="RadioButtonList2_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_1" type="radio" name="RadioButtonList2" value="2" />
-          <label for="RadioButtonList2_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_2" type="radio" name="RadioButtonList2" value="3" />
-          <label for="RadioButtonList2_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_3" type="radio" name="RadioButtonList2" value="4" />
-          <label for="RadioButtonList2_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_4" type="radio" name="RadioButtonList2" value="5" />
-          <label for="RadioButtonList2_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_5" type="radio" name="RadioButtonList2" value="6" />
-          <label for="RadioButtonList2_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:104px;width:40px">
-    <table id="RadioButtonList1" border="0" cellpadding="1">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="1" />
-          <label for="RadioButtonList1_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="2" />
-          <label for="RadioButtonList1_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_2" type="radio" name="RadioButtonList1" value="3" />
-          <label for="RadioButtonList1_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_3" type="radio" name="RadioButtonList1" value="4" />
-          <label for="RadioButtonList1_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_4" type="radio" name="RadioButtonList1" value="5" />
-          <label for="RadioButtonList1_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_5" type="radio" name="RadioButtonList1" value="6" />
-          <label for="RadioButtonList1_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:104px;width:40px">
-    <table id="RadioButtonList3" border="0" cellpadding="5">
-      <tr>
-        <td>
-          <input id="RadioButtonList3_0" type="radio" name="RadioButtonList3" value="1" />
-          <label for="RadioButtonList3_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_1" type="radio" name="RadioButtonList3" value="2" />
-          <label for="RadioButtonList3_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_2" type="radio" name="RadioButtonList3" value="3" />
-          <label for="RadioButtonList3_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_3" type="radio" name="RadioButtonList3" value="4" />
-          <label for="RadioButtonList3_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_4" type="radio" name="RadioButtonList3" value="5" />
-          <label for="RadioButtonList3_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_5" type="radio" name="RadioButtonList3" value="6" />
-          <label for="RadioButtonList3_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:104px;width:40px">
-    <table id="RadioButtonList4" border="0" cellpadding="50">
-      <tr>
-        <td>
-          <input id="RadioButtonList4_0" type="radio" name="RadioButtonList4" value="1" />
-          <label for="RadioButtonList4_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList4_1" type="radio" name="RadioButtonList4" value="2" />
-          <label for="RadioButtonList4_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList4_2" type="radio" name="RadioButtonList4" value="3" />
-          <label for="RadioButtonList4_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList4_3" type="radio" name="RadioButtonList4" value="4" />
-          <label for="RadioButtonList4_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList4_4" type="radio" name="RadioButtonList4" value="5" />
-          <label for="RadioButtonList4_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList4_5" type="radio" name="RadioButtonList4" value="6" />
-          <label for="RadioButtonList4_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="Negative CellPadding value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_CellSpacing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_CellSpacing.aspx.xml
deleted file mode 100644
index 2f791166778..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_CellSpacing.aspx.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:128px;width:48px">
-    <table id="RadioButtonList1" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="1" />
-          <label for="RadioButtonList1_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="2" />
-          <label for="RadioButtonList1_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_2" type="radio" name="RadioButtonList1" value="3" />
-          <label for="RadioButtonList1_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_3" type="radio" name="RadioButtonList1" value="4" />
-          <label for="RadioButtonList1_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_4" type="radio" name="RadioButtonList1" value="5" />
-          <label for="RadioButtonList1_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_5" type="radio" name="RadioButtonList1" value="6" />
-          <label for="RadioButtonList1_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:128px;width:48px">
-    <table id="RadioButtonList2" cellspacing="5" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="1" />
-          <label for="RadioButtonList2_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_1" type="radio" name="RadioButtonList2" value="2" />
-          <label for="RadioButtonList2_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_2" type="radio" name="RadioButtonList2" value="3" />
-          <label for="RadioButtonList2_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_3" type="radio" name="RadioButtonList2" value="4" />
-          <label for="RadioButtonList2_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_4" type="radio" name="RadioButtonList2" value="5" />
-          <label for="RadioButtonList2_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_5" type="radio" name="RadioButtonList2" value="6" />
-          <label for="RadioButtonList2_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:128px;width:48px">
-    <table id="RadioButtonList3" cellspacing="50" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList3_0" type="radio" name="RadioButtonList3" value="1" />
-          <label for="RadioButtonList3_0">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_1" type="radio" name="RadioButtonList3" value="2" />
-          <label for="RadioButtonList3_1">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_2" type="radio" name="RadioButtonList3" value="3" />
-          <label for="RadioButtonList3_2">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_3" type="radio" name="RadioButtonList3" value="4" />
-          <label for="RadioButtonList3_3">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_4" type="radio" name="RadioButtonList3" value="5" />
-          <label for="RadioButtonList3_4">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_5" type="radio" name="RadioButtonList3" value="6" />
-          <label for="RadioButtonList3_5">6</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="Negative CellSpacing value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatColumns.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatColumns.aspx.xml
deleted file mode 100644
index 809f84c9e89..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatColumns.aspx.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:136px;width:64px">
-    <table id="RadioButtonList1" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="0" />
-          <label for="RadioButtonList1_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="1" />
-          <label for="RadioButtonList1_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_2" type="radio" name="RadioButtonList1" value="2" />
-          <label for="RadioButtonList1_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_3" type="radio" name="RadioButtonList1" value="3" />
-          <label for="RadioButtonList1_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_4" type="radio" name="RadioButtonList1" value="4" />
-          <label for="RadioButtonList1_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_5" type="radio" name="RadioButtonList1" value="5" />
-          <label for="RadioButtonList1_5">5</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:136px;width:64px">
-    <table id="RadioButtonList2" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="0" />
-          <label for="RadioButtonList2_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_1" type="radio" name="RadioButtonList2" value="1" />
-          <label for="RadioButtonList2_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_2" type="radio" name="RadioButtonList2" value="2" />
-          <label for="RadioButtonList2_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_3" type="radio" name="RadioButtonList2" value="3" />
-          <label for="RadioButtonList2_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_4" type="radio" name="RadioButtonList2" value="4" />
-          <label for="RadioButtonList2_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_5" type="radio" name="RadioButtonList2" value="5" />
-          <label for="RadioButtonList2_5">5</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:85px;width:88px">
-    <table id="RadioButtonList3" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList3_0" type="radio" name="RadioButtonList3" value="0" />
-          <label for="RadioButtonList3_0">0</label>
-        </td>
-        <td>
-          <input id="RadioButtonList3_3" type="radio" name="RadioButtonList3" value="3" />
-          <label for="RadioButtonList3_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_1" type="radio" name="RadioButtonList3" value="1" />
-          <label for="RadioButtonList3_1">1</label>
-        </td>
-        <td>
-          <input id="RadioButtonList3_4" type="radio" name="RadioButtonList3" value="4" />
-          <label for="RadioButtonList3_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_2" type="radio" name="RadioButtonList3" value="2" />
-          <label for="RadioButtonList3_2">2</label>
-        </td>
-        <td>
-          <input id="RadioButtonList3_5" type="radio" name="RadioButtonList3" value="5" />
-          <label for="RadioButtonList3_5">5</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:47px;width:88px">
-    <table id="RadioButtonList4" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList4_0" type="radio" name="RadioButtonList4" value="0" />
-          <label for="RadioButtonList4_0">0</label>
-        </td>
-        <td>
-          <input id="RadioButtonList4_2" type="radio" name="RadioButtonList4" value="2" />
-          <label for="RadioButtonList4_2">2</label>
-        </td>
-        <td>
-          <input id="RadioButtonList4_4" type="radio" name="RadioButtonList4" value="4" />
-          <label for="RadioButtonList4_4">4</label>
-        </td>
-        <td>
-          <input id="RadioButtonList4_5" type="radio" name="RadioButtonList4" value="5" />
-          <label for="RadioButtonList4_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList4_1" type="radio" name="RadioButtonList4" value="1" />
-          <label for="RadioButtonList4_1">1</label>
-        </td>
-        <td>
-          <input id="RadioButtonList4_3" type="radio" name="RadioButtonList4" value="3" />
-          <label for="RadioButtonList4_3">3</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:47px;width:88px">
-    <table id="RadioButtonList5" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList5_0" type="radio" name="RadioButtonList5" value="0" />
-          <label for="RadioButtonList5_0">0</label>
-        </td>
-        <td>
-          <input id="RadioButtonList5_1" type="radio" name="RadioButtonList5" value="1" />
-          <label for="RadioButtonList5_1">1</label>
-        </td>
-        <td>
-          <input id="RadioButtonList5_2" type="radio" name="RadioButtonList5" value="2" />
-          <label for="RadioButtonList5_2">2</label>
-        </td>
-        <td>
-          <input id="RadioButtonList5_3" type="radio" name="RadioButtonList5" value="3" />
-          <label for="RadioButtonList5_3">3</label>
-        </td>
-        <td>
-          <input id="RadioButtonList5_4" type="radio" name="RadioButtonList5" value="4" />
-          <label for="RadioButtonList5_4">4</label>
-        </td>
-        <td>
-          <input id="RadioButtonList5_5" type="radio" name="RadioButtonList5" value="5" />
-          <label for="RadioButtonList5_5">5</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="Non valid RepeatColumns value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatDirection.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatDirection.aspx.xml
deleted file mode 100644
index a1aa13fc003..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatDirection.aspx.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:248px;width:112px">
-    <table id="RadioButtonList1" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="0" />
-          <label for="RadioButtonList1_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="1" />
-          <label for="RadioButtonList1_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_2" type="radio" name="RadioButtonList1" value="2" />
-          <label for="RadioButtonList1_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_3" type="radio" name="RadioButtonList1" value="3" />
-          <label for="RadioButtonList1_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_4" type="radio" name="RadioButtonList1" value="4" />
-          <label for="RadioButtonList1_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_5" type="radio" name="RadioButtonList1" value="5" />
-          <label for="RadioButtonList1_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_6" type="radio" name="RadioButtonList1" value="6" />
-          <label for="RadioButtonList1_6">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_7" type="radio" name="RadioButtonList1" value="7" />
-          <label for="RadioButtonList1_7">7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_8" type="radio" name="RadioButtonList1" value="8" />
-          <label for="RadioButtonList1_8">8</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:296px">
-    <table id="RadioButtonList2" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="0" />
-          <label for="RadioButtonList2_0">0</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_1" type="radio" name="RadioButtonList2" value="1" />
-          <label for="RadioButtonList2_1">1</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_2" type="radio" name="RadioButtonList2" value="2" />
-          <label for="RadioButtonList2_2">2</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_3" type="radio" name="RadioButtonList2" value="3" />
-          <label for="RadioButtonList2_3">3</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_4" type="radio" name="RadioButtonList2" value="4" />
-          <label for="RadioButtonList2_4">4</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_5" type="radio" name="RadioButtonList2" value="5" />
-          <label for="RadioButtonList2_5">5</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_6" type="radio" name="RadioButtonList2" value="6" />
-          <label for="RadioButtonList2_6">6</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_7" type="radio" name="RadioButtonList2" value="7" />
-          <label for="RadioButtonList2_7">7</label>
-        </td>
-        <td>
-          <input id="RadioButtonList2_8" type="radio" name="RadioButtonList2" value="8" />
-          <label for="RadioButtonList2_8">8</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:112px">
-    <table id="RadioButtonList3" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList3_0" type="radio" name="RadioButtonList3" value="0" />
-          <label for="RadioButtonList3_0">0</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_1" type="radio" name="RadioButtonList3" value="1" />
-          <label for="RadioButtonList3_1">1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_2" type="radio" name="RadioButtonList3" value="2" />
-          <label for="RadioButtonList3_2">2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_3" type="radio" name="RadioButtonList3" value="3" />
-          <label for="RadioButtonList3_3">3</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_4" type="radio" name="RadioButtonList3" value="4" />
-          <label for="RadioButtonList3_4">4</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_5" type="radio" name="RadioButtonList3" value="5" />
-          <label for="RadioButtonList3_5">5</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_6" type="radio" name="RadioButtonList3" value="6" />
-          <label for="RadioButtonList3_6">6</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_7" type="radio" name="RadioButtonList3" value="7" />
-          <label for="RadioButtonList3_7">7</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList3_8" type="radio" name="RadioButtonList3" value="8" />
-          <label for="RadioButtonList3_8">8</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="Non valid RepeateDirection value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatLayout.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatLayout.aspx.xml
deleted file mode 100644
index 3b726290b20..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_RepeatLayout.aspx.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:88px">
-    <table id="RadioButtonList1" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="item1" />
-          <label for="RadioButtonList1_0">item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="item2" />
-          <label for="RadioButtonList1_1">item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_2" type="radio" name="RadioButtonList1" value="item3" />
-          <label for="RadioButtonList1_2">item3</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:96px;width:88px">
-    <table id="RadioButtonList2" style="height:72px;width:80px" border="0">
-      <tr>
-        <td>
-          <input id="RadioButtonList2_0" type="radio" name="RadioButtonList2" value="item1" />
-          <label for="RadioButtonList2_0">item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_1" type="radio" name="RadioButtonList2" value="item2" />
-          <label for="RadioButtonList2_1">item2</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList2_2" type="radio" name="RadioButtonList2" value="item3" />
-          <label for="RadioButtonList2_2">item3</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:96px;width:88px">
-    <span id="RadioButtonList3" style="height:72px;width:80px">
-      <input id="RadioButtonList3_0" type="radio" name="RadioButtonList3" value="item1" />
-      <label for="RadioButtonList3_0">item1</label>
-      <br />
-      <input id="RadioButtonList3_1" type="radio" name="RadioButtonList3" value="item2" />
-      <label for="RadioButtonList3_1">item2</label>
-      <br />
-      <input id="RadioButtonList3_2" type="radio" name="RadioButtonList3" value="item3" />
-      <label for="RadioButtonList3_2">item3</label>
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="Non valid RepeateLayout value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_TextAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_TextAlign.aspx.xml
deleted file mode 100644
index abc4a244c7e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButtonList_RadioButtonList_TextAlign.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;width:96px">
-    <table id="RadioButtonList1" border="0">
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:80px;width:96px">
-    <table id="RadioButtonList2" border="0">
-    </table>
-  </div>
-  <div id="Ghtsubtest4" style="height:80px;width:96px">
-    <table id="RadioButtonList6" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="Illegal text align value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButton_RadioButton_GroupName.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButton_RadioButton_GroupName.aspx.xml
deleted file mode 100644
index 24840a31ce0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RadioButton_RadioButton_GroupName.aspx.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:24px;left:16px;position:absolute;top:15px;width:136px;z-index:101">
-    <input id="RadioButton1" type="radio" name="RadioButton1" value="RadioButton1" />
-  </div>
-  <div id="GHTSubTest7" style="height:24px;left:16px;position:absolute;top:64px;width:136px;z-index:107">
-    <input id="RadioButton7" type="radio" name="RadioButton7" value="RadioButton7" />
-  </div>
-  <div id="GHTSubTest6" style="height:24px;left:16px;position:absolute;top:192px;width:136px;z-index:106">
-    <input id="RadioButton6" type="radio" name="Group11" value="RadioButton6" />
-  </div>
-  <div id="GHTSubTest5" style="height:24px;left:16px;position:absolute;top:360px;width:136px;z-index:105">
-    <input id="RadioButton5" type="radio" name="Group2" value="RadioButton5" />
-  </div>
-  <div id="GHTSubTest4" style="height:24px;left:16px;position:absolute;top:320px;width:136px;z-index:104">
-    <input id="RadioButton4" type="radio" name="Group2" value="RadioButton4" />
-  </div>
-  <div id="GHTSubTest3" style="height:24px;left:16px;position:absolute;top:280px;width:136px;z-index:103">
-    <input id="RadioButton3" type="radio" name="Group2" value="RadioButton3" />
-  </div>
-  <div id="GHTSubTest2" style="height:24px;left:16px;position:absolute;top:136px;width:136px;z-index:102">
-    <input id="RadioButton2" type="radio" name="Group1" value="RadioButton2" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeatDirection_RepeatDirection_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeatDirection_RepeatDirection_Enum.aspx.xml
deleted file mode 100644
index c7e80779358..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeatDirection_RepeatDirection_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RepeatDirection">
-    <span>
-      <br />Horizontal; Vertical; 0; 1; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeatLayout_RepeatLayout_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeatLayout_RepeatLayout_Enum.aspx.xml
deleted file mode 100644
index e64fab1d77f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeatLayout_RepeatLayout_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RepeatLayout">
-    <span>
-      <br />Table; Flow; 0; 1; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_DataItem.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_DataItem.aspx.xml
deleted file mode 100644
index 1606ebc9bf8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_DataItem.aspx.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <div>
-      <div>one</div>
-    </div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemIndex.aspx.xml
deleted file mode 100644
index 80b631623d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemIndex.aspx.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <div>
-					
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-						</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemType.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemType.aspx.xml
deleted file mode 100644
index 80b631623d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemType.aspx.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <div>
-					
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-						</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemType_Manual.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemType_Manual.aspx.xml
deleted file mode 100644
index 044a032801e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_RepeaterItem_RepeaterItem_ItemType_Manual.aspx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <div>
-						
-							one
-						
-							two
-						<input id="Repeater1__ctl2__ctl0" type="checkbox" name="Repeater1:_ctl2:_ctl0" /><br />
-							three
-						
-							four
-						<input id="Repeater1__ctl4__ctl0" type="checkbox" name="Repeater1:_ctl4:_ctl0" /><br />
-							five
-						
-							six
-						<input id="Repeater1__ctl6__ctl0" type="checkbox" name="Repeater1:_ctl6:_ctl0" /><br />
-							seven
-						
-							eight
-						<input id="Repeater1__ctl8__ctl0" type="checkbox" name="Repeater1:_ctl8:_ctl0" /><br />
-							nine
-						
-							ten
-						<input id="Repeater1__ctl10__ctl0" type="checkbox" name="Repeater1:_ctl10:_ctl0" /><br /></div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_AlternatingItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_AlternatingItemTemplate.aspx.xml
deleted file mode 100644
index c26f53deab0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_AlternatingItemTemplate.aspx.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-	
-				
-						one
-					
-					
-						three
-					
-					
-						five
-					
-					
-						seven
-					
-					
-						nine
-					
-					
-			
-</div>
-  <div id="GHTSubTest2" style="height:88px;width:553px">
-	
-				
-						one
-					
-						plain text as alternative item template
-					
-						three
-					
-						plain text as alternative item template
-					
-						five
-					
-						plain text as alternative item template
-					
-						seven
-					
-						plain text as alternative item template
-					
-						nine
-					
-						plain text as alternative item template
-					
-			
-</div>
-  <div id="GHTSubTest3" style="height:88px;width:553px">
-	
-				
-						one
-					
-						<div><span><b><i>html as alternating item template</i></b></span></div></div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataBind_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataBind_.aspx.xml
deleted file mode 100644
index 2e9f094269d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataBind_.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:96px;width:553px">
-    <div>one</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataMember.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataMember.aspx.xml
deleted file mode 100644
index 5fc50e82485..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataMember.aspx.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;width:553px">
-	
-				
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-			<span><br /></span></div>
-  <div id="GHTSubTest2" style="height:56px;width:553px">
-	
-				
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-			<span><br /></span></div>
-  <div id="GHTSubTest3" style="height:56px;width:553px">
-	
-				
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-			<span><br />NonExistValue</span></div>
-  <div id="GHTSubTest4" style="height:56px;width:553px">
-	
-				
-						1
-					
-						2
-					
-						3
-					
-						4
-					
-						5
-					
-						6
-					
-						7
-					
-						8
-					
-						9
-					
-						10
-					
-			<span><br />Not Name Of Table</span></div>
-  <div id="GHTSubTest5" style="height:56px;width:553px">
-	
-				
-						1
-					
-						2
-					
-						3
-					
-						4
-					
-						5
-					
-						6
-					
-						7
-					
-						8
-					
-						9
-					
-						10
-					
-			<span><br />Customers</span></div>
-  <div id="GHTSubTest6" style="height:56px;width:553px">
-	
-				
-						1
-					
-						2
-					
-						3
-					
-						4
-					
-						5
-					
-						6
-					
-						7
-					
-						8
-					
-						9
-					
-						10
-					
-			<span><br /></span></div>
-  <div id="GHTSubTest7" style="height:56px;width:553px">
-	
-				
-						1
-					
-						2
-					
-						3
-					
-						4
-					
-						5
-					
-						6
-					
-						7
-					
-						8
-					
-						9
-					
-						10
-					
-			<span><br />Customers</span></div>
-  <div id="GHTSubTest8" style="height:56px;width:553px">
-	
-				
-						1
-					
-						2
-					
-						3
-					
-						4
-					
-						5
-					
-						6
-					
-						7
-					
-						8
-					
-						9
-					
-						10
-					
-			<span><br />Orders</span></div>
-  <div id="GHTSubTest9" style="height:56px;width:553px">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataSource.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataSource.aspx.xml
deleted file mode 100644
index 80b631623d2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_DataSource.aspx.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:88px;width:553px">
-    <div>
-					
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-						</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_FooterTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_FooterTemplate.aspx.xml
deleted file mode 100644
index 78c6a665128..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_FooterTemplate.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;width:553px">
-    <div>one</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_HeaderTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_HeaderTemplate.aspx.xml
deleted file mode 100644
index 408680d0f4f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_HeaderTemplate.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:24px;width:553px">
-    <div>one</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ItemDataBound.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ItemDataBound.aspx.xml
deleted file mode 100644
index 1cb406d1c68..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ItemDataBound.aspx.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:553px">
-    <a href="http://www.google.com/" id="Repeater1__ctl0_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl1_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl2_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl3_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl4_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl5_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl6_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl7_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl8_hl_name">hehe</a>
-    <a href="http://www.google.com/" id="Repeater1__ctl9_hl_name">hehe</a>
-    <span>
-      <br />
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ItemTemplate.aspx.xml
deleted file mode 100644
index 69d4a1722ce..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ItemTemplate.aspx.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:553px">
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:553px">
-	
-				
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-						plain text
-					
-			
-</div>
-  <div id="GHTSubTest3" style="height:72px;width:553px">
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-    <b>html</b>
-  </div>
-  <div id="GHTSubTest4" style="height:72px;width:553px">
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl0:Button1" id="Repeater4__ctl0_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl1:Button1" id="Repeater4__ctl1_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl2:Button1" id="Repeater4__ctl2_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl3:Button1" id="Repeater4__ctl3_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl4:Button1" id="Repeater4__ctl4_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl5:Button1" id="Repeater4__ctl5_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl6:Button1" id="Repeater4__ctl6_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl7:Button1" id="Repeater4__ctl7_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl8:Button1" id="Repeater4__ctl8_Button1" />
-    <input value="Server control template" style="width:100px" type="submit" name="Repeater4:_ctl9:Button1" id="Repeater4__ctl9_Button1" />
-  </div>
-  <div id="GHTSubTest5" style="height:72px;width:553px">
-	
-				
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-			
-</div>
-  <div id="GHTSubTest6" style="height:72px;width:553px">
-    <input id="Repeater6__ctl0__ctl0" type="checkbox" name="Repeater6:_ctl0:_ctl0" />
-    <label for="Repeater6__ctl0__ctl0">one</label>
-    <input id="Repeater6__ctl1__ctl0" type="checkbox" name="Repeater6:_ctl1:_ctl0" />
-    <label for="Repeater6__ctl1__ctl0">two</label>
-    <input id="Repeater6__ctl2__ctl0" type="checkbox" name="Repeater6:_ctl2:_ctl0" />
-    <label for="Repeater6__ctl2__ctl0">three</label>
-    <input id="Repeater6__ctl3__ctl0" type="checkbox" name="Repeater6:_ctl3:_ctl0" />
-    <label for="Repeater6__ctl3__ctl0">four</label>
-    <input id="Repeater6__ctl4__ctl0" type="checkbox" name="Repeater6:_ctl4:_ctl0" />
-    <label for="Repeater6__ctl4__ctl0">five</label>
-    <input id="Repeater6__ctl5__ctl0" type="checkbox" name="Repeater6:_ctl5:_ctl0" />
-    <label for="Repeater6__ctl5__ctl0">six</label>
-    <input id="Repeater6__ctl6__ctl0" type="checkbox" name="Repeater6:_ctl6:_ctl0" />
-    <label for="Repeater6__ctl6__ctl0">seven</label>
-    <input id="Repeater6__ctl7__ctl0" type="checkbox" name="Repeater6:_ctl7:_ctl0" />
-    <label for="Repeater6__ctl7__ctl0">eight</label>
-    <input id="Repeater6__ctl8__ctl0" type="checkbox" name="Repeater6:_ctl8:_ctl0" />
-    <label for="Repeater6__ctl8__ctl0">nine</label>
-    <input id="Repeater6__ctl9__ctl0" type="checkbox" name="Repeater6:_ctl9:_ctl0" />
-    <label for="Repeater6__ctl9__ctl0">ten</label>
-  </div>
-  <div id="GHTSubTest7" style="height:72px;width:553px">
-	
-				
-						one
-						one
-						one
-						one
-						one
-						one
-						one
-					
-						two
-						two
-						two
-						two
-						two
-						two
-						two
-					
-						three
-						three
-						three
-						three
-						three
-						three
-						three
-					
-						four
-						four
-						four
-						four
-						four
-						four
-						four
-					
-						five
-						five
-						five
-						five
-						five
-						five
-						five
-					
-						six
-						six
-						six
-						six
-						six
-						six
-						six
-					
-						seven
-						seven
-						seven
-						seven
-						seven
-						seven
-						seven
-					
-						eight
-						eight
-						eight
-						eight
-						eight
-						eight
-						eight
-					
-						nine
-						nine
-						nine
-						nine
-						nine
-						nine
-						nine
-					
-						ten
-						ten
-						ten
-						ten
-						ten
-						ten
-						ten
-					
-			
-</div>
-  <div id="GHTSubTest8" testname="Code base template 1">
-  </div>
-  <div id="GHTSubTest9" testname="Code base template 2">
-	Plain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run timePlain text template create at run time
-</div>
-  <div id="GHTSubTest10" testname="Code base template 3">
-    <div>
-      <b>
-        <i>Html template created at run time</i>
-      </b>
-    </div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_Items.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_Items.aspx.xml
deleted file mode 100644
index 62861781bbb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_Items.aspx.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:553px">
-	
-				
-						one
-					
-						two
-					
-						three
-					
-						four
-					
-						five
-					
-						six
-					
-						seven
-					
-						eight
-					
-						nine
-					
-						ten
-					
-			<span><br />System.Web.UI.WebControls.RepeaterItemCollection</span><span><br />0,Item,
-						one
-					</span><span><br />1,AlternatingItem,
-						two
-					</span><span><br />2,Item,
-						three
-					</span><span><br />3,AlternatingItem,
-						four
-					</span><span><br />4,Item,
-						five
-					</span><span><br />5,AlternatingItem,
-						six
-					</span><span><br />6,Item,
-						seven
-					</span><span><br />7,AlternatingItem,
-						eight
-					</span><span><br />8,Item,
-						nine
-					</span><span><br />9,AlternatingItem,
-						ten
-					</span></div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_SeparatorTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_SeparatorTemplate.aspx.xml
deleted file mode 100644
index df7444f38f7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_SeparatorTemplate.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:104px;width:553px">
-    <div>one</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ctor_.aspx.xml
deleted file mode 100644
index 6bda245b626..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Repeater_Repeater_ctor_.aspx.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <div>one</div>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_AddRange_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_AddRange_T.aspx.xml
deleted file mode 100644
index 7d395ca7ffa..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_AddRange_T.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="AddRange cells">
-    <table border="0">
-      <tr>
-        <td>[Cell 0]</td>
-        <td>[Cell 1]</td>
-        <td>[Cell 2]</td>
-        <td>[Cell 3]</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Add_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Add_T.aspx.xml
deleted file mode 100644
index c755ef35e2b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Add_T.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Add cells">
-    <table border="0">
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <table border="0">
-      <tr>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Clear_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Clear_.aspx.xml
deleted file mode 100644
index f0beb241b25..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Clear_.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Clear cells">
-    <table border="0">
-      <tr>
-      </tr>
-      <tr>
-        <td>333</td>
-        <td>444</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_CopyTo_AI.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_CopyTo_AI.aspx.xml
deleted file mode 100644
index 1fe35994e28..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_CopyTo_AI.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Copy to">
-    <table border="0">
-      <tr>
-      </tr>
-      <tr>
-        <td>333</td>
-        <td>444</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="Copy to - check array">
-    <table border="0">
-      <tr>
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Count.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Count.aspx.xml
deleted file mode 100644
index f0eb087b4e7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Count.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="Count">
-    <table border="0">
-      <tr>
-        <td>111</td>
-        <td>222</td>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-    <span>
-      <br />Rows(0).Cells.Count=2</span>
-    <span>
-      <br />Rows(1).Cells.Count=0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_GetCellIndex_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_GetCellIndex_T.aspx.xml
deleted file mode 100644
index 18f79a26710..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_GetCellIndex_T.aspx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="GetCellIndex">
-    <table border="0">
-      <tr>
-        <td>111</td>
-        <td>222</td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>333</td>
-        <td>444</td>
-      </tr>
-    </table>
-    <span>
-      <br />GetCellIndex=-1</span>
-  </div>
-  <div id="GHTSubTest3" testname="GetCellIndex">
-    <span>
-      <br />GetCellIndex=2</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_GetEnumerator_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_GetEnumerator_.aspx.xml
deleted file mode 100644
index d68e1e5a35a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_GetEnumerator_.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="IEnumerator - get">
-    <span>
-      <br />IEnumerator=null? False</span>
-  </div>
-  <div id="GHTSubTest3" testname="Using IEnumerator">
-    <span>
-      <br /> CellText = 111</span>
-    <span>
-      <br /> CellText = 222</span>
-    <span>
-      <br /> CellText = 333</span>
-    <span>
-      <br /> CellText = 444</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_IsReadOnly.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_IsReadOnly.aspx.xml
deleted file mode 100644
index 2bb3aef5be9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_IsReadOnly.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="IsReadOnly">
-    <table id="Table1" style="height:64px;width:72px" border="0">
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />IsReadOnly=False</span>
-    <span>
-      <br />This property always returns false to indicate that the TableCellCollection can be written to in all cases.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_IsSynchronized.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_IsSynchronized.aspx.xml
deleted file mode 100644
index 2f6fc624246..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_IsSynchronized.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="IsSynchronized">
-    <table id="Table1" border="0">
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />IsSynchronized=False</span>
-    <span>
-      <br />This property is derived from System.Collections.ICollection and is overridden to always return false.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Item.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Item.aspx.xml
deleted file mode 100644
index 5b105f6e1d7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Item.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="Item">
-    <span>
-      <br /> CellText 0= 111</span>
-    <span>
-      <br /> CellText 1= 222</span>
-    <span>
-      <br /> CellText 2= 333</span>
-    <span>
-      <br /> CellText 3= 444</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_RemoveAt_I.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_RemoveAt_I.aspx.xml
deleted file mode 100644
index 0d61293fce1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_RemoveAt_I.aspx.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="RemoveAt">
-    <table border="0">
-      <tr>
-        <td>111</td>
-        <td>333</td>
-        <td>444</td>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Remove_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Remove_T.aspx.xml
deleted file mode 100644
index 635cf3af979..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_Remove_T.aspx.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="Remove">
-    <table border="0">
-      <tr>
-        <td>111</td>
-        <td>333</td>
-        <td>444</td>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_SyncRoot.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_SyncRoot.aspx.xml
deleted file mode 100644
index b1cc1bf3ec2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCellCollection_TableCellCollection_SyncRoot.aspx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="Check SyncRoot, should be true">
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_ColumnSpan.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_ColumnSpan.aspx.xml
deleted file mode 100644
index 25f9bcc6003..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_ColumnSpan.aspx.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:176px">
-    <table id="Table1" style="height:120px;width:248px" border="0">
-      <tr>
-        <td colspan="50">123</td>
-        <td colspan="12">123</td>
-      </tr>
-      <tr>
-        <td colspan="30">123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:176px">
-    <table id="Table2" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>123</td>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:176px">
-    <table id="Table3" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_HorizontalAlign.aspx.xml
deleted file mode 100644
index cc11125f8a3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:176px">
-    <table id="Table1" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:176px">
-    <table id="Table2" style="height:120px;width:248px" border="0">
-      <tr>
-        <td align="Left">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:176px">
-    <table id="Table3" style="height:120px;width:248px" border="0">
-      <tr>
-        <td align="Center">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:72px;width:176px">
-    <table id="Table4" style="height:120px;width:248px" border="0">
-      <tr>
-        <td align="Right">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:72px;width:176px">
-    <table id="Table5" style="height:120px;width:248px" border="0">
-      <tr>
-        <td align="Justify">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_RowSpan.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_RowSpan.aspx.xml
deleted file mode 100644
index d2d85f6765c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_RowSpan.aspx.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:176px">
-    <table id="Table1" style="height:120px;width:248px" border="0">
-      <tr>
-        <td rowspan="50">123</td>
-        <td rowspan="12">123</td>
-      </tr>
-      <tr>
-        <td rowspan="30">123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:176px">
-    <table id="Table2" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>123</td>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:176px">
-    <table id="Table3" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_Text.aspx.xml
deleted file mode 100644
index 6d16f21e174..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_Text.aspx.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:176px">
-    <table id="Table1" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>1234569.1233 -995</td>
-        <td>ASMVBKFIRJKSMNDJF DFDFD</td>
-      </tr>
-      <tr>
-        <td>!@#$%^&amp;*()_+|~</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:176px">
-    <table id="Table2" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>!@#$%^&amp;*() ASAD			3333_+|~</td>
-        <td>123 !@#	$%^&amp;	*()_+|gggtgtg */~</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_VerticalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_VerticalAlign.aspx.xml
deleted file mode 100644
index 163d76cb3b2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_VerticalAlign.aspx.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:176px">
-    <table id="Table1" style="height:120px;width:248px" border="0">
-      <tr>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:72px;width:176px">
-    <table id="Table2" style="height:120px;width:248px" border="0">
-      <tr>
-        <td valign="Bottom">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:176px">
-    <table id="Table3" style="height:120px;width:248px" border="0">
-      <tr>
-        <td valign="Middle">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:72px;width:176px">
-    <table id="Table4" style="height:120px;width:248px" border="0">
-      <tr>
-        <td valign="Top">123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_Wrap.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_Wrap.aspx.xml
deleted file mode 100644
index dd4f55c987d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_Wrap.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-    <table id="Table1" style="height:200px;width:48px" border="0">
-      <tr>
-        <td nowrap="nowrap">*A 123456790123456790123456790123456790123456790123456790123456790123456790*</td>
-        <td>*B 123456790123456790123456790123456790123456790123456790123456790123456790*</td>
-        <td>*C 123456790123456790123456790123456790123456790123456790123456790123456790*</td>
-        <td>*D 123456790				123456790				123456790			123456790*</td>
-      </tr>
-      <tr>
-        <td>*D 	123456790	123456790	123456790	123456790*</td>
-        <td>*E  123456790   123456790   123456790   123456790*</td>
-        <td nowrap="nowrap">*F 123456790123456790123456790123456790123456790123456790123456790123456790*</td>
-        <td nowrap="nowrap">*G 123456790123456790123456790123456790123456790123456790123456790123456790*</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_ctor_.aspx.xml
deleted file mode 100644
index 99e44af7733..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableCell_TableCell_ctor_.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:152px;left:16px;position:absolute;top:15px;width:432px;z-index:100">
-    <table id="Table1" style="height:88px;width:160px" border="0">
-      <tr>
-        <td>AAAA</td>
-        <td>BBBB</td>
-      </tr>
-      <tr>
-        <td>CCCC</td>
-        <td>DDDD</td>
-        <td>1234</td>
-        <td>5678</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableHeaderCell_TableHeaderCell_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableHeaderCell_TableHeaderCell_ctor_.aspx.xml
deleted file mode 100644
index bb8a82a6d8e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableHeaderCell_TableHeaderCell_ctor_.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="TableHeaderCell">
-    <table id="Table1" style="height:152px;width:184px" border="0">
-      <tr>
-        <th>Table of (x,y) Values</th>
-      </tr>
-      <tr>
-        <td>123</td>
-        <td>123</td>
-      </tr>
-      <tr>
-        <td>123</td>
-        <td>123</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_CopyFrom_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_CopyFrom_S.aspx.xml
deleted file mode 100644
index ece6dc89e30..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_CopyFrom_S.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest2" style="height:200px;width:536px">
-    <table id="Table1" style="height:152px;width:304px" border="0">
-      <tr>
-        <td style="background-color:#c0ffc0;border-color:#ff3333;border-style:double;border-width:4px;color:blue;font-family:freesiaupc;font-size:16pt;font-style:italic;font-weight:bold;height:50px;text-decoration:line-through overline underline" align="Left" nowrap="nowrap" valign="Bottom">aaaaaa</td>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-      </tr>
-      <tr style="background-color:#c0c0ff;border-color:#00c000;border-style:solid;border-width:7px;color:#ff8000;font-family:comic ms sans;font-size:15pt;font-style:italic;font-weight:bold;height:50px;text-decoration:line-through overline underline" align="Center" nowrap="nowrap" valign="Middle">
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-      </tr>
-      <tr>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_HorizontalAlign.aspx.xml
deleted file mode 100644
index 4446d4601f6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableItemStyle - HorizontalAlign">
-    <table id="Table1" style="height:232px;width:776px" border="0">
-      <tr align="Center">
-        <td align="Center">
-        </td>
-        <td align="Justify">
-        </td>
-        <td align="Left">
-        </td>
-        <td>
-        </td>
-        <td align="Right">
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr align="Justify">
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr align="Left">
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr align="Right">
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Center</span>
-    <span>
-      <br />Justify</span>
-    <span>
-      <br />Left</span>
-    <span>
-      <br />NotSet</span>
-    <span>
-      <br />Right</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_MergeWith_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_MergeWith_S.aspx.xml
deleted file mode 100644
index 42a43ec4fb8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_MergeWith_S.aspx.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:184px;width:553px">
-    <table id="Table2" style="height:96px;width:192px" border="0">
-      <tr style="color:gray;font-style:italic;font-weight:bold">
-        <td>1111</td>
-        <td style="background-color:#c0c000;border-color:#804000;border-style:ridge;border-width:5px;color:blue;font-family:batang;font-size:9pt;font-style:italic;font-weight:bold;text-decoration:line-through overline underline" align="Center" nowrap="nowrap" valign="Top">22222</td>
-        <td>33333</td>
-      </tr>
-      <tr style="background-color:#c0aaff;border-style:ridge;color:#104040">
-        <td>66666</td>
-        <td style="color:red" align="Justify" valign="Top">7777</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_Reset_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_Reset_.aspx.xml
deleted file mode 100644
index 727dcb3e06a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_Reset_.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:208px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-    <p>&amp;nbsp;</p>
-    <table id="Table1" style="height:128px;width:272px" border="0">
-      <tr style="background-color:#ffefc0;border-style:solid;border-width:16px;color:#a0ffcf" valign="Middle">
-        <td>blablabla</td>
-        <td style="background-color:#ffe0c0;border-color:#c00600;border-style:solid;border-width:6px;color:#a0ffc0;font-weight:bold" align="Left" valign="Bottom">blablabla</td>
-        <td>blablabla</td>
-      </tr>
-      <tr>
-        <td>blablabla</td>
-        <td>blablabla</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_VerticalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_VerticalAlign.aspx.xml
deleted file mode 100644
index 435fd7fe55c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_VerticalAlign.aspx.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableItemStyle - VerticalAlign">
-    <table id="Table1" style="height:232px;width:776px" border="0">
-      <tr valign="Bottom">
-        <td valign="Bottom">
-        </td>
-        <td valign="Middle">
-        </td>
-        <td>
-        </td>
-        <td valign="Top">
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr valign="Middle">
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr valign="Top">
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Bottom</span>
-    <span>
-      <br />Middle</span>
-    <span>
-      <br />NotSet</span>
-    <span>
-      <br />Top</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_Wrap.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_Wrap.aspx.xml
deleted file mode 100644
index 0d6d6f43ff3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_Wrap.aspx.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableItemStyle - Wrap">
-    <table id="Table1" style="height:232px;width:776px" border="0">
-      <tr nowrap="nowrap">
-        <td nowrap="nowrap">
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />False</span>
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_ctor_.aspx.xml
deleted file mode 100644
index f104c651c83..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_ctor_.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableItemStyle_ctor">
-    <span>
-      <br />is (object = null)? False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_ctor_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_ctor_S.aspx.xml
deleted file mode 100644
index 725662334ba..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableItemStyle_TableItemStyle_ctor_S.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableItemStyle_ctor_S">
-    <span>
-      <br />is (object = null)? False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_AddAt_IT.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_AddAt_IT.aspx.xml
deleted file mode 100644
index 21a351f9375..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_AddAt_IT.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="AddAt rows">
-    <table border="0">
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-    <table border="0">
-      <tr>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_AddRange_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_AddRange_T.aspx.xml
deleted file mode 100644
index cbde7caa96b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_AddRange_T.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="AddRange Rows">
-    <table border="0">
-      <tr>
-        <td>Row 0</td>
-      </tr>
-      <tr>
-        <td>Row 1</td>
-      </tr>
-      <tr>
-        <td>Row 2</td>
-      </tr>
-      <tr>
-        <td>Row 3</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Add_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Add_T.aspx.xml
deleted file mode 100644
index 8248a17151b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Add_T.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="Add rows">
-    <table border="0">
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-    <table border="0">
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Clear_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Clear_.aspx.xml
deleted file mode 100644
index a321f579ac1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Clear_.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Clear rows">
-    <table border="0">
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_CopyTo_AI.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_CopyTo_AI.aspx.xml
deleted file mode 100644
index f5acb770df0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_CopyTo_AI.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Copy to">
-    <table border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="Copy to - check array">
-    <table border="0">
-      <tr>
-        <td>111</td>
-        <td>222</td>
-      </tr>
-      <tr>
-        <td>333</td>
-        <td>444</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Count.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Count.aspx.xml
deleted file mode 100644
index a37150b926a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Count.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Count">
-    <table border="0">
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-    <span>
-      <br />Table1 Rows.Count=3</span>
-    <span>
-      <br />Table2 Rows.Count=0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_GetEnumerator_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_GetEnumerator_.aspx.xml
deleted file mode 100644
index c401d51d778..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_GetEnumerator_.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="IEnumerator - get">
-    <span>
-      <br />IEnumerator=null? False</span>
-  </div>
-  <div id="GHTSubTest2" testname="Using IEnumerator">
-    <span>
-      <br /> RowId = 1</span>
-    <span>
-      <br /> RowId = 2</span>
-    <span>
-      <br /> RowId = 3</span>
-    <span>
-      <br /> RowId = 4</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_GetRowIndex_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_GetRowIndex_T.aspx.xml
deleted file mode 100644
index 38e700a89df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_GetRowIndex_T.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="GetRowIndex">
-    <table border="0">
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-    <span>
-      <br />GetRowIndex=-1</span>
-  </div>
-  <div id="GHTSubTest2" testname="GetRowIndex">
-    <span>
-      <br />GetRowIndex=2</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_IsReadOnly.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_IsReadOnly.aspx.xml
deleted file mode 100644
index b92c88c6e32..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_IsReadOnly.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:216px;width:440px">
-  </div>
-  <div id="GHTSubTest2" testname="IsReadOnly">
-    <table id="Table1" style="height:184px;width:264px" border="0">
-    </table>
-    <span>
-      <br />IsReadOnly=False</span>
-    <span>
-      <br />This property always returns false to indicate that the TableRowCollection can be written to in all cases</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_IsSynchronized.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_IsSynchronized.aspx.xml
deleted file mode 100644
index 6a9b02a3bad..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_IsSynchronized.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="IsSynchronized">
-    <table id="Table1" style="height:240px;width:416px" border="0">
-    </table>
-    <span>
-      <br />IsSynchronized=False</span>
-    <span>
-      <br />This property is derived from System.Collections.ICollection and is overridden to always return false.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Item.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Item.aspx.xml
deleted file mode 100644
index 0a2d61e5af7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Item.aspx.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="Item">
-    <span>
-      <br /> Row index =  0</span>
-    <span>
-      <br /> Row index =  1</span>
-    <span>
-      <br /> Row index =  2</span>
-    <span>
-      <br /> Row index =  3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_RemoveAt_I.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_RemoveAt_I.aspx.xml
deleted file mode 100644
index d3f35a4971f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_RemoveAt_I.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="RemoveAt">
-    <table border="0">
-      <tr id="2">
-      </tr>
-      <tr id="3">
-      </tr>
-      <tr id="4">
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Remove_T.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Remove_T.aspx.xml
deleted file mode 100644
index 26e9c767a72..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_Remove_T.aspx.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Remove">
-    <table border="0">
-      <tr id="1">
-      </tr>
-      <tr id="3">
-      </tr>
-      <tr id="4">
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_SyncRoot.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_SyncRoot.aspx.xml
deleted file mode 100644
index 662e62d5da6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRowCollection_TableRowCollection_SyncRoot.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Check SyncRoot, should be true">
-    <span>
-      <br />True</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_Cells.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_Cells.aspx.xml
deleted file mode 100644
index b455c55eb37..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_Cells.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableRow - Cells Collection">
-    <span>
-      <br />TableRow 0 Cells Collection = nothingFalse</span>
-    <span>
-      <br />TableRow 1 Cells Collection = nothingFalse</span>
-    <span>
-      <br />TableRow 1 Cells Collection Count =3</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_CreateControlCollection_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_CreateControlCollection_.aspx.xml
deleted file mode 100644
index c324c63b63e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_CreateControlCollection_.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_CreateControlStyle_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_CreateControlStyle_.aspx.xml
deleted file mode 100644
index c324c63b63e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_CreateControlStyle_.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_HorizontalAlign.aspx.xml
deleted file mode 100644
index 394510f759d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:56px;left:16px;position:absolute;top:15px;width:128px;z-index:100">
-    <table id="Table1" style="height:40px;width:88px" border="0">
-      <tr>
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:128px">
-    <table id="Table2" style="height:40px;width:88px" border="0">
-      <tr align="Left">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:128px">
-    <table id="Table3" style="height:40px;width:88px" border="0">
-      <tr align="Center">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:56px;width:128px">
-    <table id="Table4" style="height:40px;width:88px" border="0">
-      <tr align="Right">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:56px;width:128px">
-    <table id="Table5" style="height:40px;width:88px" border="0">
-      <tr align="Justify">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_VerticalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_VerticalAlign.aspx.xml
deleted file mode 100644
index 2c79a993559..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_VerticalAlign.aspx.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest4" style="height:56px;width:128px">
-    <table id="Table4" style="height:40px;width:88px" border="0">
-      <tr>
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest1" style="height:56px;width:128px">
-    <table id="Table1" style="height:40px;width:88px" border="0">
-      <tr valign="Top">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;width:128px">
-    <table id="Table2" style="height:40px;width:88px" border="0">
-      <tr valign="Middle">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:56px;width:128px">
-    <table id="Table3" style="height:40px;width:88px" border="0">
-      <tr valign="Bottom">
-        <td>111</td>
-        <td>222</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_ctor_.aspx.xml
deleted file mode 100644
index 91aebef1f26..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableRow_TableRow_ctor_.aspx.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:101">
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_BackImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_BackImageUrl.aspx.xml
deleted file mode 100644
index 8f665949806..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_BackImageUrl.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-  </div>
-  <div id="GHTSubTest2" testname="TableStyle - BackImageUrl">
-    <table id="Table1" style="background-image:url(c;height:200px;width:288px" border="0">
-    </table>
-    <span>
-      <br />c:\NoSuchImage.blabla</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CellPadding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CellPadding.aspx.xml
deleted file mode 100644
index 592dd3a9a85..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CellPadding.aspx.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:144px;width:176px">
-    <table id="Table1" style="height:56px;width:88px" border="0">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-  <div id="GHTSubTest2" style="height:144px;width:176px">
-    <table id="Table2" style="height:56px;width:88px" border="0" cellpadding="0">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-  <div id="GHTSubTest3" style="height:144px;width:176px">
-    <table id="Table3" style="height:56px;width:88px" border="0" cellpadding="9">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CellSpacing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CellSpacing.aspx.xml
deleted file mode 100644
index f3fee7aeb8e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CellSpacing.aspx.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:144px;width:176px">
-    <table id="Table1" style="height:56px;width:88px" border="0">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-  <div id="GHTSubTest2" style="height:144px;width:176px">
-    <table id="Table2" cellspacing="0" border="0" style="border-collapse:collapse;height:56px;width:88px">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-  <div id="GHTSubTest3" style="height:144px;width:176px">
-    <table id="Table3" cellspacing="9" border="0" style="height:56px;width:88px">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CopyFrom_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CopyFrom_S.aspx.xml
deleted file mode 100644
index 84f6dfc32f5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_CopyFrom_S.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest2" style="height:200px;width:536px">
-    <table border="7" cellspacing="8" cellpadding="5" style="background-color:#ffff80;background-image:url(http;border-color:#c0ffff;border-style:groove;border-width:7px;color:#c04000;font-family:symbol;font-size:17pt;font-style:italic;font-weight:bold;height:120px;text-decoration:line-through overline underline;width:256px" align="Right" bordercolor="#C0FFFF" rules="all" id="Table1">
-      <tr>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-      </tr>
-      <tr>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-      </tr>
-      <tr>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-        <td>aaaaaa</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_GridLines.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_GridLines.aspx.xml
deleted file mode 100644
index 1129ff3c2b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_GridLines.aspx.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:144px;left:16px;position:absolute;top:15px;width:176px;z-index:100">
-    <table id="Table1" style="height:56px;width:88px" border="0">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />None</span>
-  </div>
-  <div id="GHTSubTest2" style="height:144px;width:176px">
-    <table id="Table2" style="height:56px;width:88px" border="1" rules="all">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />Both</span>
-  </div>
-  <div id="GHTSubTest3" style="height:144px;width:176px">
-    <table id="Table3" style="height:56px;width:88px" border="1" rules="rows">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />Horizontal</span>
-  </div>
-  <div id="GHTSubTest4" style="height:144px;width:176px">
-    <table id="Table4" style="height:56px;width:88px" border="1" rules="cols">
-      <tr>
-        <td>aaaaa</td>
-        <td>aaa</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>bbbbbb</td>
-        <td>bbbbbbbb</td>
-        <td>bbbbbbbbbb</td>
-        <td>bbbbbbbbbbbb</td>
-      </tr>
-    </table>
-    <span>
-      <br />Vertical</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_HorizontalAlign.aspx.xml
deleted file mode 100644
index 975059dbd9e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:296px">
-    <table id="Table1" style="height:96px;width:160px" border="0" align="Center">
-    </table>
-    <span>
-      <br />Center</span>
-  </div>
-  <div id="GHTSubTest2" style="height:120px;width:296px">
-    <table id="Table2" style="height:96px;width:160px" border="0" align="Justify">
-    </table>
-    <span>
-      <br />Justify</span>
-  </div>
-  <div id="GHTSubTest3" style="height:120px;width:296px">
-    <table id="Table3" style="height:96px;width:160px" border="0" align="Left">
-    </table>
-    <span>
-      <br />Left</span>
-  </div>
-  <div id="GHTSubTest4" style="height:120px;width:296px">
-    <table id="Table4" style="height:96px;width:160px" border="0">
-    </table>
-    <span>
-      <br />NotSet</span>
-  </div>
-  <div id="GHTSubTest5" style="height:120px;width:296px">
-    <table id="Table5" style="height:96px;width:160px" border="0" align="Right">
-    </table>
-    <span>
-      <br />Right</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_MergeWith_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_MergeWith_S.aspx.xml
deleted file mode 100644
index 5c8674b3d9f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_MergeWith_S.aspx.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:160px;left:112px;position:absolute;top:15px;width:457px;z-index:100">
-    <table id="Table1" cellspacing="5" border="5" bordercolor="Green" style="background-color:#c0c0ff;border-color:green;border-style:dotted;border-width:5px;color:purple;font-family:aharoni;font-size:18pt;font-weight:bold;text-decoration:overline" cellpadding="5" rules="rows">
-      <tr>
-        <td>qqqqqq</td>
-        <td>
-        </td>
-        <td>qqqq</td>
-        <td>
-        </td>
-        <td>qqq</td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>qqqq</td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_Reset_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_Reset_.aspx.xml
deleted file mode 100644
index 14b3ef24444..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_Reset_.aspx.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:232px;left:16px;position:absolute;top:15px;width:488px;z-index:100">
-    <table id="Table1" border="0">
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>5555</td>
-        <td>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>5555</td>
-        <td>
-        </td>
-        <td>5555</td>
-        <td>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_ctor_.aspx.xml
deleted file mode 100644
index 18715d10561..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_ctor_.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableStyle_ctor">
-    <span>
-      <br />is (object = null)? False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_ctor_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_ctor_S.aspx.xml
deleted file mode 100644
index 6c1763eb273..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TableStyle_TableStyle_ctor_S.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="TableStyle_ctor_S">
-    <span>
-      <br />is (object = null)? False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_BackImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_BackImageUrl.aspx.xml
deleted file mode 100644
index c235a4b4ac2..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_BackImageUrl.aspx.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:16px;width:553px;z-index:100">
-    <table id="Table1" style="background-image:url(myimage.jpg);height:176px;width:360px" border="0">
-      <tr>
-        <td>1</td>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>4</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest2" style="height:296px;width:553px">
-    <table id="Table2" style="background-image:url(!@##$%$^%^&amp;*(myimage.&amp;^**&amp;jpg);height:176px;width:360px" border="0">
-      <tr>
-        <td>1</td>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>4</td>
-      </tr>
-    </table>
-  </div>
-  <div id="Ghtsubtest3" style="height:296px;width:553px">
-    <table id="Table3" style="background-image:url(c;height:176px;width:360px" border="0">
-      <tr>
-        <td>1</td>
-        <td>2</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>4</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_CellPadding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_CellPadding.aspx.xml
deleted file mode 100644
index b79ee1e03df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_CellPadding.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:80px;left:16px;position:absolute;top:15px;width:152px;z-index:100">
-    <table id="Table1" style="height:88px;width:232px" border="0" cellpadding="5">
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:80px;width:152px">
-    <table id="Table2" style="height:88px;width:232px" border="0" cellpadding="99">
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_CellSpacing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_CellSpacing.aspx.xml
deleted file mode 100644
index abe41995a79..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_CellSpacing.aspx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;left:16px;position:absolute;top:15px;width:168px;z-index:101">
-    <table id="Table1" cellspacing="5" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:56px;left:120px;position:absolute;top:232px;width:168px;z-index:102">
-    <table id="Table2" cellspacing="99" border="0" style="height:147px;width:410px">
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_GridLines.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_GridLines.aspx.xml
deleted file mode 100644
index a9fbfbcfdf1..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_GridLines.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:48px;width:144px">
-    <table id="Table1" border="1" rules="rows">
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:40px;width:136px">
-    <table id="Table2" border="1" rules="cols">
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:40px;width:136px">
-    <table id="Table3" border="1" rules="all">
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:40px;width:144px">
-    <table id="Table4" border="0">
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_HorizontalAlign.aspx.xml
deleted file mode 100644
index 765a3876a64..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:112px;width:200px">
-    <table id="Table1" border="0">
-    </table>
-  </div>
-  <div id="GHTSubTest2" style="height:112px;width:200px">
-    <table id="Table2" border="0" align="Left">
-    </table>
-  </div>
-  <div id="GHTSubTest3" style="height:112px;width:200px">
-    <table id="Table3" border="0" align="Center">
-    </table>
-  </div>
-  <div id="GHTSubTest4" style="height:112px;width:200px">
-    <table id="Table4" border="0" align="Right">
-    </table>
-  </div>
-  <div id="GHTSubTest5" style="height:112px;width:200px">
-    <table id="Table5" border="0" align="Justify">
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_Rows.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_Rows.aspx.xml
deleted file mode 100644
index 89d9f9c4a3c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_Rows.aspx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-    <table id="Table1" border="0">
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="Table Rows Collection - Get">
-    <span>
-      <br />Table1.Rows.Count=5</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_ctor_.aspx.xml
deleted file mode 100644
index c5097a8f8df..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_Table_Table_ctor_.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:296px;left:16px;position:absolute;top:15px;width:553px;z-index:100">
-    <table id="Table1" style="height:48px;width:128px" border="0">
-    </table>
-    <table id="Table2" style="height:120px;width:312px" border="0">
-      <caption align="Bottom">
-			Caption Text
-		</caption>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_EditItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_EditItemTemplate.aspx.xml
deleted file mode 100644
index 9d9997f2459..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_EditItemTemplate.aspx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_FooterTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_FooterTemplate.aspx.xml
deleted file mode 100644
index 760dd519b20..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_FooterTemplate.aspx.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>
-        </td>
-        <td>n_0_one</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_HeaderTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_HeaderTemplate.aspx.xml
deleted file mode 100644
index bb0feeb9bcc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_HeaderTemplate.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>
-        </td>
-        <td>Plain text template create at run time</td>
-        <td>
-          <div>
-            <b>
-              <i>Html template created at run time</i>
-            </b>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_InitializeCell_TIL.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_InitializeCell_TIL.aspx.xml
deleted file mode 100644
index bb0feeb9bcc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_InitializeCell_TIL.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>
-        </td>
-        <td>Plain text template create at run time</td>
-        <td>
-          <div>
-            <b>
-              <i>Html template created at run time</i>
-            </b>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_ItemTemplate.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_ItemTemplate.aspx.xml
deleted file mode 100644
index 2dafb214eee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_ItemTemplate.aspx.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td>Plain text template create at run time</td>
-        <td>
-          <div>
-            <b>
-              <i>Html template created at run time</i>
-            </b>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_ctor_.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_ctor_.aspx.xml
deleted file mode 100644
index 6351448ea39..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TemplateColumn_TemplateColumn_ctor_.aspx.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:120px;width:553px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid1">
-      <tr>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>&amp;nbsp;</td>
-        <td>
-          <b>T1</b>
-        </td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>n_0_one</td>
-        <td>c_0_one</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>n_0_two</td>
-        <td>c_0_two</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>n_0_three</td>
-        <td>c_0_three</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>n_0_four</td>
-        <td>c_0_four</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>n_0_five</td>
-        <td>c_0_five</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>n_0_six</td>
-        <td>c_0_six</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>n_0_seven</td>
-        <td>c_0_seven</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>n_0_eight</td>
-        <td>c_0_eight</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>n_0_nine</td>
-        <td>c_0_nine</td>
-        <td>
-								item
-							</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>n_0_ten</td>
-        <td>c_0_ten</td>
-        <td>
-								item
-							</td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextAlign_TextAlign_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextAlign_TextAlign_Enum.aspx.xml
deleted file mode 100644
index ab86be6e156..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextAlign_TextAlign_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.TextAlign">
-    <span>
-      <br />Left; Right; 1; 2; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBoxMode_TextBoxMode_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBoxMode_TextBoxMode_Enum.aspx.xml
deleted file mode 100644
index 76cc3dc5bb0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBoxMode_TextBoxMode_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.TextBoxMode">
-    <span>
-      <br />SingleLine; MultiLine; Password; 0; 1; 2; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_AutoPostBack.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_AutoPostBack.aspx.xml
deleted file mode 100644
index dae213f034c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_AutoPostBack.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;width:176px">
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:40px;width:176px">
-    <input language="javascript" type="text" name="TextBox2" onchange="__doPostBack('TextBox2','')" id="TextBox2" />
-  </div>
-  <div id="GHTSubTest3" style="height:40px;width:176px">
-    <input id="TextBox3" type="text" name="TextBox3" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Columns.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Columns.aspx.xml
deleted file mode 100644
index 49c2d014c2d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Columns.aspx.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;width:168px">
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:32px;width:168px">
-    <input id="TextBox2" size="1" type="text" name="TextBox2" />
-  </div>
-  <div id="GHTSubTest3" style="height:32px;width:168px">
-    <input id="TextBox3" size="10" type="text" name="TextBox3" />
-  </div>
-  <div id="GHTSubTest4" style="height:32px;width:168px">
-    <input id="TextBox4" size="100" type="text" name="TextBox4" />
-  </div>
-  <div id="GHTSubTest5" testname="Negative columns value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_MaxLength.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_MaxLength.aspx.xml
deleted file mode 100644
index 078d2035cdb..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_MaxLength.aspx.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;width:168px">
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:32px;width:168px">
-    <input maxlength="1" type="text" name="TextBox2" id="TextBox2" />
-  </div>
-  <div id="GHTSubTest3" style="height:32px;width:168px">
-    <input maxlength="100" type="text" name="TextBox3" id="TextBox3" />
-  </div>
-  <div id="GHTSubTest6" style="height:32px;width:168px">
-    <input id="TextBox6" type="password" name="TextBox6" />
-  </div>
-  <div id="GHTSubTest5" style="height:32px;width:168px">
-    <input maxlength="1" type="password" name="TextBox5" id="TextBox5" />
-  </div>
-  <div id="GHTSubTest4" style="height:32px;width:168px">
-    <input maxlength="100" type="password" name="TextBox4" id="TextBox4" />
-  </div>
-  <div id="GHTSubTest9" style="height:32px;width:168px">
-    <textarea id="TextBox9" name="TextBox9">
-    </textarea>
-  </div>
-  <div id="GHTSubTest8" style="height:32px;width:168px">
-    <textarea id="TextBox8" name="TextBox8">
-    </textarea>
-  </div>
-  <div id="GHTSubTest7" style="height:32px;width:168px">
-    <textarea id="TextBox7" name="TextBox7">
-    </textarea>
-  </div>
-  <div id="GHTSubTest10" testname="Negative MaxLength value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_ReadOnly.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_ReadOnly.aspx.xml
deleted file mode 100644
index bdeed9d0a94..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_ReadOnly.aspx.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;width:184px">
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:40px;width:184px">
-    <input id="TextBox2" readonly="readonly" type="text" name="TextBox2" />
-  </div>
-  <div id="GHTSubTest3" style="height:40px;width:184px">
-    <input id="TextBox3" type="text" name="TextBox3" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Rows.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Rows.aspx.xml
deleted file mode 100644
index a7168128040..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Rows.aspx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:72px;width:176px">
-    <textarea id="TextBox1" name="TextBox1">
-    </textarea>
-  </div>
-  <div id="GHTSubTest2" style="height:32px;width:176px">
-    <textarea id="TextBox2" rows="1" name="TextBox2">
-    </textarea>
-  </div>
-  <div id="GHTSubTest3" style="height:72px;width:176px">
-    <textarea id="TextBox3" rows="10" name="TextBox3">
-    </textarea>
-  </div>
-  <div id="GHTSubTest4" style="height:72px;width:176px">
-    <input id="TextBox4" type="text" name="TextBox4" />
-  </div>
-  <div id="GHTSubTest5" style="height:72px;width:176px">
-    <input id="TextBox5" type="password" name="TextBox5" />
-  </div>
-  <div id="GHTSubTest6" testname="Negative Rows value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Text.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Text.aspx.xml
deleted file mode 100644
index 6aaddbf09a3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Text.aspx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;width:288px">
-    <input value="  abcdefgh ijklmnopqr  stuvwxyz    " style="height:24px;width:280px" type="text" name="TextBox1" id="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:32px;width:288px">
-    <input value="1234567890" style="height:24px;width:280px" type="text" name="TextBox2" id="TextBox2" />
-  </div>
-  <div id="GHTSubTest3" style="height:32px;width:288px">
-    <input value="`~!@#$%^%&amp;*()_+-=[]\{}|;':&quot;,./&lt;&gt;?" style="height:24px;width:280px" type="text" name="TextBox3" id="TextBox3" />
-  </div>
-  <div id="GHTSubTest4" style="height:32px;width:288px">
-    <input id="TextBox4" style="height:24px;width:280px" type="text" name="TextBox4" />
-  </div>
-  <div id="GHTSubTest5" style="height:32px;width:288px">
-    <input id="TextBox5" style="height:24px;width:280px" type="text" name="TextBox5" />
-  </div>
-  <div id="GHTSubTest6" style="height:96px;width:152px">
-    <textarea id="TextBox6" style="height:72px;width:136px" name="TextBox6">asdfasdfasdfadfadsfasdfasdfasdfasdfasdfasdf</textarea>
-  </div>
-  <div id="GHTSubTest7" style="height:96px;width:152px">
-    <textarea id="TextBox7" style="height:72px;width:136px" name="TextBox7" wrap="off">asdfasdfasdfadfadsfasdfasdfasdfasdfasdfasdf</textarea>
-  </div>
-  <div id="GHTSubTest8" style="height:42px;width:152px">
-    <input id="TextBox8" style="height:26px;width:136px" type="password" name="TextBox8" />
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_TextMode.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_TextMode.aspx.xml
deleted file mode 100644
index 2be3de69f5a..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_TextMode.aspx.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:32px;width:176px">
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:80px;width:176px">
-    <textarea id="TextBox2" style="height:72px" name="TextBox2">
-    </textarea>
-  </div>
-  <div id="GHTSubTest3" style="height:32px;width:176px">
-    <input id="TextBox3" type="password" name="TextBox3" />
-  </div>
-  <div id="GHTSubTest4" style="height:32px;width:176px">
-    <input id="TextBox4" type="text" name="TextBox4" />
-  </div>
-  <div id="GHTSubTest5" testname="Non valid TextMode value">
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Wrap.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Wrap.aspx.xml
deleted file mode 100644
index bda8ad7c2b7..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TextBox_TextBox_Wrap.aspx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" style="height:40px;width:176px">
-    <input id="TextBox1" type="text" name="TextBox1" />
-  </div>
-  <div id="GHTSubTest2" style="height:40px;width:176px">
-    <input id="TextBox2" type="text" name="TextBox2" />
-  </div>
-  <div id="GHTSubTest6" style="height:40px;width:176px">
-    <input id="TextBox6" type="password" name="TextBox6" />
-  </div>
-  <div id="GHTSubTest5" style="height:40px;width:176px">
-    <input id="TextBox5" type="password" name="TextBox5" />
-  </div>
-  <div id="GHTSubTest3" style="height:88px;width:176px">
-    <textarea id="TextBox3" style="height:72px" name="TextBox3">
-    </textarea>
-  </div>
-  <div id="GHTSubTest4" style="height:88px;width:176px">
-    <textarea id="TextBox4" style="height:72px" name="TextBox4" wrap="off">
-    </textarea>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TitleFormat_TitleFormat_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TitleFormat_TitleFormat_Enum.aspx.xml
deleted file mode 100644
index fb3613d2f0f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_TitleFormat_TitleFormat_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.TitleFormat">
-    <span>
-      <br />Month; MonthYear; 0; 1; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_UnitType_UnitType_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_UnitType_UnitType_Enum.aspx.xml
deleted file mode 100644
index f836a93f7f0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_UnitType_UnitType_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.UnitType">
-    <span>
-      <br />Pixel; Point; Pica; Inch; Mm; Cm; Percentage; Em; Ex; 1; 2; 3; 4; 5; 6; 7; 8; 9; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationCompareOperator_ValidationCompareOperator_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationCompareOperator_ValidationCompareOperator_Enum.aspx.xml
deleted file mode 100644
index 75af26c23ba..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationCompareOperator_ValidationCompareOperator_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ValidationCompareOperator">
-    <span>
-      <br />Equal; NotEqual; GreaterThan; GreaterThanEqual; LessThan; LessThanEqual; DataTypeCheck; 0; 1; 2; 3; 4; 5; 6; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationDataType_ValidationDataType_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationDataType_ValidationDataType_Enum.aspx.xml
deleted file mode 100644
index 9e2c58f3d12..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationDataType_ValidationDataType_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ValidationDataType">
-    <span>
-      <br />String; Integer; Double; Date; Currency; 0; 1; 2; 3; 4; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationSummaryDisplayMode_ValidationSummaryDisplayMode_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationSummaryDisplayMode_ValidationSummaryDisplayMode_Enum.aspx.xml
deleted file mode 100644
index 34a83ca7570..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidationSummaryDisplayMode_ValidationSummaryDisplayMode_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ValidationSummaryDisplayMode">
-    <span>
-      <br />List; BulletList; SingleParagraph; 0; 1; 2; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidatorDisplay_ValidatorDisplay_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidatorDisplay_ValidatorDisplay_Enum.aspx.xml
deleted file mode 100644
index 51adc30e511..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_ValidatorDisplay_ValidatorDisplay_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.ValidatorDisplay">
-    <span>
-      <br />None; Static; Dynamic; 0; 1; 2; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_VerticalAlign_VerticalAlign_Enum.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_VerticalAlign_VerticalAlign_Enum.aspx.xml
deleted file mode 100644
index ec8c92e3b3d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_VerticalAlign_VerticalAlign_Enum.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.VerticalAlign">
-    <span>
-      <br />NotSet; Top; Middle; Bottom; 0; 1; 2; 3; </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_AccessKey.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_AccessKey.aspx.xml
deleted file mode 100644
index 7b1efd9cc96..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_AccessKey.aspx.xml
+++ /dev/null
@@ -1,1141 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Empty string">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: null/Nothing">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Space">
-    <input value="" accesskey=" " type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: A letter">
-    <input value="" accesskey="A" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: A digit">
-    <input value="" accesskey="1" type="submit" name="ctrl_4" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Button: Non alpha-numeric charachter">
-    <input value="" accesskey="@" type="submit" name="ctrl_5" id="ctrl_5" />
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Button: Two charachter string">
-    <input value="" type="submit" name="ctrl_6" id="ctrl_6" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Empty string">
-    <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: null/Nothing">
-    <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Space">
-    <input id="ctrl_9" accesskey=" " type="checkbox" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBox: A letter">
-    <input id="ctrl_10" accesskey="A" type="checkbox" name="ctrl_10" />
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBox: A digit">
-    <input id="ctrl_11" accesskey="1" type="checkbox" name="ctrl_11" />
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.CheckBox: Non alpha-numeric charachter">
-    <input id="ctrl_12" accesskey="@" type="checkbox" name="ctrl_12" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBox: Two charachter string">
-    <input id="ctrl_13" type="checkbox" name="ctrl_13" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Empty string">
-    <a id="ctrl_14">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.HyperLink: null/Nothing">
-    <a id="ctrl_15">
-    </a>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.HyperLink: Space">
-    <a id="ctrl_16" accesskey=" ">
-    </a>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.HyperLink: A letter">
-    <a id="ctrl_17" accesskey="A">
-    </a>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.HyperLink: A digit">
-    <a id="ctrl_18" accesskey="1">
-    </a>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.HyperLink: Non alpha-numeric charachter">
-    <a id="ctrl_19" accesskey="@">
-    </a>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.HyperLink: Two charachter string">
-    <a id="ctrl_20">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Image: Empty string">
-    <img id="ctrl_21" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Image: null/Nothing">
-    <img id="ctrl_22" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Image: Space">
-    <img id="ctrl_23" alt="" border="0" accesskey=" " />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Image: A letter">
-    <img id="ctrl_24" alt="" border="0" accesskey="A" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Image: A digit">
-    <img id="ctrl_25" alt="" border="0" accesskey="1" />
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Image: Non alpha-numeric charachter">
-    <img id="ctrl_26" alt="" border="0" accesskey="@" />
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Image: Two charachter string">
-    <img id="ctrl_27" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.ImageButton: Empty string">
-    <input id="ctrl_28" alt="" border="0" type="image" name="ctrl_28" />
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.ImageButton: null/Nothing">
-    <input id="ctrl_29" alt="" border="0" type="image" name="ctrl_29" />
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.ImageButton: Space">
-    <input id="ctrl_30" alt="" accesskey=" " type="image" name="ctrl_30" border="0" />
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.ImageButton: A letter">
-    <input id="ctrl_31" alt="" accesskey="A" type="image" name="ctrl_31" border="0" />
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ImageButton: A digit">
-    <input id="ctrl_32" alt="" accesskey="1" type="image" name="ctrl_32" border="0" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.ImageButton: Non alpha-numeric charachter">
-    <input id="ctrl_33" alt="" accesskey="@" type="image" name="ctrl_33" border="0" />
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.ImageButton: Two charachter string">
-    <input id="ctrl_34" alt="" border="0" type="image" name="ctrl_34" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Label: Empty string">
-    <span id="ctrl_35">
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Label: null/Nothing">
-    <span id="ctrl_36">
-    </span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Label: Space">
-    <span id="ctrl_37" accesskey=" ">
-    </span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Label: A letter">
-    <span id="ctrl_38" accesskey="A">
-    </span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Label: A digit">
-    <span id="ctrl_39" accesskey="1">
-    </span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.Label: Non alpha-numeric charachter">
-    <span id="ctrl_40" accesskey="@">
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.Label: Two charachter string">
-    <span id="ctrl_41">
-    </span>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.LinkButton: Empty string">
-    <a href="javascript:__doPostBack('ctrl_42','')" id="ctrl_42">
-    </a>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.LinkButton: null/Nothing">
-    <a href="javascript:__doPostBack('ctrl_43','')" id="ctrl_43">
-    </a>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.LinkButton: Space">
-    <a href="javascript:__doPostBack('ctrl_44','')" id="ctrl_44" accesskey=" ">
-    </a>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.LinkButton: A letter">
-    <a href="javascript:__doPostBack('ctrl_45','')" id="ctrl_45" accesskey="A">
-    </a>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.LinkButton: A digit">
-    <a href="javascript:__doPostBack('ctrl_46','')" id="ctrl_46" accesskey="1">
-    </a>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.LinkButton: Non alpha-numeric charachter">
-    <a href="javascript:__doPostBack('ctrl_47','')" id="ctrl_47" accesskey="@">
-    </a>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.LinkButton: Two charachter string">
-    <a href="javascript:__doPostBack('ctrl_48','')" id="ctrl_48">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.Panel: Empty string">
-    <div id="ctrl_49">
-    </div>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.Panel: null/Nothing">
-    <div id="ctrl_50">
-    </div>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.Panel: Space">
-    <div id="ctrl_51" accesskey=" ">
-    </div>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.Panel: A letter">
-    <div id="ctrl_52" accesskey="A">
-    </div>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.Panel: A digit">
-    <div id="ctrl_53" accesskey="1">
-    </div>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.Panel: Non alpha-numeric charachter">
-    <div id="ctrl_54" accesskey="@">
-    </div>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.Panel: Two charachter string">
-    <div id="ctrl_55">
-    </div>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.RadioButton: Empty string">
-    <input id="ctrl_56" type="radio" name="ctrl_56" value="ctrl_56" />
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.RadioButton: null/Nothing">
-    <input id="ctrl_57" type="radio" name="ctrl_57" value="ctrl_57" />
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.RadioButton: Space">
-    <input id="ctrl_58" accesskey=" " type="radio" name="ctrl_58" value="ctrl_58" />
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.RadioButton: A letter">
-    <input id="ctrl_59" accesskey="A" type="radio" name="ctrl_59" value="ctrl_59" />
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButton: A digit">
-    <input id="ctrl_60" accesskey="1" type="radio" name="ctrl_60" value="ctrl_60" />
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButton: Non alpha-numeric charachter">
-    <input id="ctrl_61" accesskey="@" type="radio" name="ctrl_61" value="ctrl_61" />
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButton: Two charachter string">
-    <input id="ctrl_62" type="radio" name="ctrl_62" value="ctrl_62" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.TextBox: Empty string">
-    <input id="ctrl_63" type="text" name="ctrl_63" />
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.TextBox: null/Nothing">
-    <input id="ctrl_64" type="text" name="ctrl_64" />
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.TextBox: Space">
-    <input id="ctrl_65" accesskey=" " type="text" name="ctrl_65" />
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.TextBox: A letter">
-    <input id="ctrl_66" accesskey="A" type="text" name="ctrl_66" />
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.TextBox: A digit">
-    <input id="ctrl_67" accesskey="1" type="text" name="ctrl_67" />
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.TextBox: Non alpha-numeric charachter">
-    <input id="ctrl_68" accesskey="@" type="text" name="ctrl_68" />
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.TextBox: Two charachter string">
-    <input id="ctrl_69" type="text" name="ctrl_69" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DropDownList: Empty string">
-    <select id="ctrl_70" name="ctrl_70">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DropDownList: null/Nothing">
-    <select id="ctrl_71" name="ctrl_71">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DropDownList: Space">
-    <select id="ctrl_72" accesskey=" " name="ctrl_72">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DropDownList: A letter">
-    <select id="ctrl_73" accesskey="A" name="ctrl_73">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DropDownList: A digit">
-    <select id="ctrl_74" accesskey="1" name="ctrl_74">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DropDownList: Non alpha-numeric charachter">
-    <select id="ctrl_75" accesskey="@" name="ctrl_75">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DropDownList: Two charachter string">
-    <select id="ctrl_76" name="ctrl_76">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.ListBox: Empty string">
-    <select id="ctrl_77" size="4" name="ctrl_77">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.ListBox: null/Nothing">
-    <select id="ctrl_78" size="4" name="ctrl_78">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.ListBox: Space">
-    <select id="ctrl_79" size="4" accesskey=" " name="ctrl_79">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.ListBox: A letter">
-    <select id="ctrl_80" size="4" accesskey="A" name="ctrl_80">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.WebControls.ListBox: A digit">
-    <select id="ctrl_81" size="4" accesskey="1" name="ctrl_81">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.WebControls.ListBox: Non alpha-numeric charachter">
-    <select id="ctrl_82" size="4" accesskey="@" name="ctrl_82">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.WebControls.ListBox: Two charachter string">
-    <select id="ctrl_83" size="4" name="ctrl_83">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.WebControls.RadioButtonList: Empty string">
-    <table id="ctrl_84" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_84_0" type="radio" name="ctrl_84" value="1" />
-          <label for="ctrl_84_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_84_1" type="radio" name="ctrl_84" value="2" />
-          <label for="ctrl_84_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_84_2" type="radio" name="ctrl_84" value="3" />
-          <label for="ctrl_84_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_84_3" type="radio" name="ctrl_84" value="4" />
-          <label for="ctrl_84_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.WebControls.RadioButtonList: null/Nothing">
-    <table id="ctrl_85" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_85_0" type="radio" name="ctrl_85" value="1" />
-          <label for="ctrl_85_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_85_1" type="radio" name="ctrl_85" value="2" />
-          <label for="ctrl_85_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_85_2" type="radio" name="ctrl_85" value="3" />
-          <label for="ctrl_85_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_85_3" type="radio" name="ctrl_85" value="4" />
-          <label for="ctrl_85_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.WebControls.RadioButtonList: Space">
-    <table id="ctrl_86" border="0" accesskey=" ">
-      <tr>
-        <td>
-          <input id="ctrl_86_0" type="radio" name="ctrl_86" value="1" />
-          <label for="ctrl_86_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_86_1" type="radio" name="ctrl_86" value="2" />
-          <label for="ctrl_86_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_86_2" type="radio" name="ctrl_86" value="3" />
-          <label for="ctrl_86_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_86_3" type="radio" name="ctrl_86" value="4" />
-          <label for="ctrl_86_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.WebControls.RadioButtonList: A letter">
-    <table id="ctrl_87" border="0" accesskey="A">
-      <tr>
-        <td>
-          <input id="ctrl_87_0" type="radio" name="ctrl_87" value="1" />
-          <label for="ctrl_87_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_87_1" type="radio" name="ctrl_87" value="2" />
-          <label for="ctrl_87_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_87_2" type="radio" name="ctrl_87" value="3" />
-          <label for="ctrl_87_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_87_3" type="radio" name="ctrl_87" value="4" />
-          <label for="ctrl_87_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.WebControls.RadioButtonList: A digit">
-    <table id="ctrl_88" border="0" accesskey="1">
-      <tr>
-        <td>
-          <input id="ctrl_88_0" type="radio" name="ctrl_88" value="1" />
-          <label for="ctrl_88_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_88_1" type="radio" name="ctrl_88" value="2" />
-          <label for="ctrl_88_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_88_2" type="radio" name="ctrl_88" value="3" />
-          <label for="ctrl_88_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_88_3" type="radio" name="ctrl_88" value="4" />
-          <label for="ctrl_88_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.WebControls.RadioButtonList: Non alpha-numeric charachter">
-    <table id="ctrl_89" border="0" accesskey="@">
-      <tr>
-        <td>
-          <input id="ctrl_89_0" type="radio" name="ctrl_89" value="1" />
-          <label for="ctrl_89_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_89_1" type="radio" name="ctrl_89" value="2" />
-          <label for="ctrl_89_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_89_2" type="radio" name="ctrl_89" value="3" />
-          <label for="ctrl_89_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_89_3" type="radio" name="ctrl_89" value="4" />
-          <label for="ctrl_89_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.WebControls.RadioButtonList: Two charachter string">
-    <table id="ctrl_90" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_90_0" type="radio" name="ctrl_90" value="1" />
-          <label for="ctrl_90_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_90_1" type="radio" name="ctrl_90" value="2" />
-          <label for="ctrl_90_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_90_2" type="radio" name="ctrl_90" value="3" />
-          <label for="ctrl_90_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_90_3" type="radio" name="ctrl_90" value="4" />
-          <label for="ctrl_90_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.WebControls.CheckBoxList: Empty string">
-    <table id="ctrl_91" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_91_0" type="checkbox" name="ctrl_91:0" />
-          <label for="ctrl_91_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_91_1" type="checkbox" name="ctrl_91:1" />
-          <label for="ctrl_91_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_91_2" type="checkbox" name="ctrl_91:2" />
-          <label for="ctrl_91_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_91_3" type="checkbox" name="ctrl_91:3" />
-          <label for="ctrl_91_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.WebControls.CheckBoxList: null/Nothing">
-    <table id="ctrl_92" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_92_0" type="checkbox" name="ctrl_92:0" />
-          <label for="ctrl_92_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_92_1" type="checkbox" name="ctrl_92:1" />
-          <label for="ctrl_92_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_92_2" type="checkbox" name="ctrl_92:2" />
-          <label for="ctrl_92_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_92_3" type="checkbox" name="ctrl_92:3" />
-          <label for="ctrl_92_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.WebControls.CheckBoxList: Space">
-    <table id="ctrl_93" border="0" accesskey=" ">
-      <tr>
-        <td>
-          <input id="ctrl_93_0" type="checkbox" name="ctrl_93:0" />
-          <label for="ctrl_93_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_93_1" type="checkbox" name="ctrl_93:1" />
-          <label for="ctrl_93_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_93_2" type="checkbox" name="ctrl_93:2" />
-          <label for="ctrl_93_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_93_3" type="checkbox" name="ctrl_93:3" />
-          <label for="ctrl_93_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.WebControls.CheckBoxList: A letter">
-    <table id="ctrl_94" border="0" accesskey="A">
-      <tr>
-        <td>
-          <input id="ctrl_94_0" type="checkbox" name="ctrl_94:0" />
-          <label for="ctrl_94_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_94_1" type="checkbox" name="ctrl_94:1" />
-          <label for="ctrl_94_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_94_2" type="checkbox" name="ctrl_94:2" />
-          <label for="ctrl_94_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_94_3" type="checkbox" name="ctrl_94:3" />
-          <label for="ctrl_94_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.WebControls.CheckBoxList: A digit">
-    <table id="ctrl_95" border="0" accesskey="1">
-      <tr>
-        <td>
-          <input id="ctrl_95_0" type="checkbox" name="ctrl_95:0" />
-          <label for="ctrl_95_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_95_1" type="checkbox" name="ctrl_95:1" />
-          <label for="ctrl_95_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_95_2" type="checkbox" name="ctrl_95:2" />
-          <label for="ctrl_95_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_95_3" type="checkbox" name="ctrl_95:3" />
-          <label for="ctrl_95_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.WebControls.CheckBoxList: Non alpha-numeric charachter">
-    <table id="ctrl_96" border="0" accesskey="@">
-      <tr>
-        <td>
-          <input id="ctrl_96_0" type="checkbox" name="ctrl_96:0" />
-          <label for="ctrl_96_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_1" type="checkbox" name="ctrl_96:1" />
-          <label for="ctrl_96_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_2" type="checkbox" name="ctrl_96:2" />
-          <label for="ctrl_96_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_3" type="checkbox" name="ctrl_96:3" />
-          <label for="ctrl_96_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.WebControls.CheckBoxList: Two charachter string">
-    <table id="ctrl_97" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_97_0" type="checkbox" name="ctrl_97:0" />
-          <label for="ctrl_97_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_1" type="checkbox" name="ctrl_97:1" />
-          <label for="ctrl_97_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_2" type="checkbox" name="ctrl_97:2" />
-          <label for="ctrl_97_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_3" type="checkbox" name="ctrl_97:3" />
-          <label for="ctrl_97_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.WebControls.DataGrid: Empty string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_98">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.WebControls.DataGrid: null/Nothing">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_99">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.WebControls.DataGrid: Space">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" accesskey=" " rules="all" id="ctrl_100">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.WebControls.DataGrid: A letter">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" accesskey="A" rules="all" id="ctrl_101">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.WebControls.DataGrid: A digit">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" accesskey="1" rules="all" id="ctrl_102">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.WebControls.DataGrid: Non alpha-numeric charachter">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" accesskey="@" rules="all" id="ctrl_103">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.WebControls.DataGrid: Two charachter string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_104">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.WebControls.DataGridItem: Empty string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_105">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_105_ctrl_106">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.WebControls.DataGridItem: null/Nothing">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_107">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_107_ctrl_108">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.WebControls.DataGridItem: Space">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_109">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_109_ctrl_110" accesskey=" ">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.WebControls.DataGridItem: A letter">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_111">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_111_ctrl_112" accesskey="A">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.WebControls.DataGridItem: A digit">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_113">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_113_ctrl_114" accesskey="1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.WebControls.DataGridItem: Non alpha-numeric charachter">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_115">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_115_ctrl_116" accesskey="@">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.WebControls.DataGridItem: Two charachter string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_117">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_117_ctrl_118">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest113" testname="System.Web.UI.WebControls.DataList: Empty string">
-    <table id="ctrl_119" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ApplyStyle_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ApplyStyle_S.aspx.xml
deleted file mode 100644
index 3c47b8a1634..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ApplyStyle_S.aspx.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Apply a new style:">
-    <input value="" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Apply a blank style:">
-    <input value="" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.CheckBox: Apply a new style:">
-    <span style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-      <input id="ctrl_2" type="checkbox" name="ctrl_2" />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.CheckBox: Apply a blank style:">
-    <span style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-      <input id="ctrl_3" type="checkbox" name="ctrl_3" />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.HyperLink: Apply a new style:">
-    <a id="ctrl_4" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.HyperLink: Apply a blank style:">
-    <a id="ctrl_5" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-    </a>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Image: Apply a new style:">
-    <img id="ctrl_6" alt="" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Image: Apply a blank style:">
-    <img id="ctrl_7" alt="" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.ImageButton: Apply a new style:">
-    <input id="ctrl_8" alt="" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" type="image" name="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.ImageButton: Apply a blank style:">
-    <input id="ctrl_9" alt="" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" type="image" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Label: Apply a new style:">
-    <span id="ctrl_10" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.Label: Apply a blank style:">
-    <span id="ctrl_11" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.LinkButton: Apply a new style:">
-    <a href="javascript:__doPostBack('ctrl_12','')" id="ctrl_12" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.LinkButton: Apply a blank style:">
-    <a href="javascript:__doPostBack('ctrl_13','')" id="ctrl_13" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Panel: Apply a new style:">
-    <div id="ctrl_14" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </div>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Panel: Apply a blank style:">
-    <div id="ctrl_15" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-    </div>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.RadioButton: Apply a new style:">
-    <span style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-      <input id="ctrl_16" type="radio" name="ctrl_16" value="ctrl_16" />
-    </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.RadioButton: Apply a blank style:">
-    <span style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-      <input id="ctrl_17" type="radio" name="ctrl_17" value="ctrl_17" />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.TextBox: Apply a new style:">
-    <input id="ctrl_18" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" type="text" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.TextBox: Apply a blank style:">
-    <input id="ctrl_19" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" type="text" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.DropDownList: Apply a new style:">
-    <select id="ctrl_20" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" name="ctrl_20">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.DropDownList: Apply a blank style:">
-    <select id="ctrl_21" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" name="ctrl_21">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ListBox: Apply a new style:">
-    <select id="ctrl_22" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" size="4" name="ctrl_22">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ListBox: Apply a blank style:">
-    <select id="ctrl_23" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" size="4" name="ctrl_23">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.RadioButtonList: Apply a new style:">
-    <table id="ctrl_24" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" border="0" bordercolor="Red">
-      <tr>
-        <td>
-          <input id="ctrl_24_0" type="radio" name="ctrl_24" value="1" />
-          <label for="ctrl_24_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_1" type="radio" name="ctrl_24" value="2" />
-          <label for="ctrl_24_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_2" type="radio" name="ctrl_24" value="3" />
-          <label for="ctrl_24_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_3" type="radio" name="ctrl_24" value="4" />
-          <label for="ctrl_24_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.RadioButtonList: Apply a blank style:">
-    <table id="ctrl_25" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" border="0" bordercolor="DarkGreen">
-      <tr>
-        <td>
-          <input id="ctrl_25_0" type="radio" name="ctrl_25" value="1" />
-          <label for="ctrl_25_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_1" type="radio" name="ctrl_25" value="2" />
-          <label for="ctrl_25_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_2" type="radio" name="ctrl_25" value="3" />
-          <label for="ctrl_25_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_3" type="radio" name="ctrl_25" value="4" />
-          <label for="ctrl_25_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.CheckBoxList: Apply a new style:">
-    <table id="ctrl_26" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" border="0" bordercolor="Red">
-      <tr>
-        <td>
-          <input id="ctrl_26_0" type="checkbox" name="ctrl_26:0" />
-          <label for="ctrl_26_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_1" type="checkbox" name="ctrl_26:1" />
-          <label for="ctrl_26_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_2" type="checkbox" name="ctrl_26:2" />
-          <label for="ctrl_26_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_3" type="checkbox" name="ctrl_26:3" />
-          <label for="ctrl_26_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.CheckBoxList: Apply a blank style:">
-    <table id="ctrl_27" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" border="0" bordercolor="DarkGreen">
-      <tr>
-        <td>
-          <input id="ctrl_27_0" type="checkbox" name="ctrl_27:0" />
-          <label for="ctrl_27_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_1" type="checkbox" name="ctrl_27:1" />
-          <label for="ctrl_27_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_2" type="checkbox" name="ctrl_27:2" />
-          <label for="ctrl_27_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_3" type="checkbox" name="ctrl_27:3" />
-          <label for="ctrl_27_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.DataGrid: Apply a new style:">
-    <table border="2" cellspacing="0" style="background-color:aliceblue;border-collapse:collapse;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" bordercolor="Red" rules="all" id="ctrl_28">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.DataGrid: Apply a blank style:">
-    <table border="5" cellspacing="0" style="background-color:wheat;border-collapse:collapse;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px" bordercolor="DarkGreen" rules="all" id="ctrl_29">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.DataGridItem: Apply a new style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_30">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_30_ctrl_31" style="background-color:aliceblue;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DataGridItem: Apply a blank style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_32">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_32_ctrl_33" style="background-color:wheat;border-color:darkgreen;border-style:double;border-width:5px;color:darkmagenta;font-family:new roman times;font-size:small;height:60px;width:60px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.DataList: Apply a new style:">
-    <table id="ctrl_34" cellspacing="0" border="0" bordercolor="Red" style="background-color:aliceblue;border-collapse:collapse;border-color:red;border-style:dashed;border-width:2px;color:royalblue;font-family:arial;font-size:large;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Attributes.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Attributes.aspx.xml
deleted file mode 100644
index 113d999f9a8..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Attributes.aspx.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest25" style="height:56px;width:104px">
-    <input testattribute="TestValue" value="Button" onclick="if (typeof(Page_ClientValidate) == 'function') Page_ClientValidate(); " language="javascript" type="submit" name="Button1" id="Button1" />
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest26" style="height:56px;width:104px">
-    <span testattribute="TestValue">
-      <input id="CheckBox1" type="checkbox" name="CheckBox1" />
-    </span>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest28" style="height:56px;width:104px">
-    <a id="HyperLink1" testattribute="TestValue">HyperLink</a>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest30" style="height:56px;width:104px">
-    <img id="Image1" alt="" border="0" testattribute="TestValue" />
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest32" style="height:56px;width:104px">
-    <input type="image" testattribute="TestValue" name="ImageButton1" alt="" onclick="if (typeof(Page_ClientValidate) == 'function') Page_ClientValidate(); " border="0" id="ImageButton1" language="javascript" />
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest34" style="height:56px;width:104px">
-    <span id="Label1" testattribute="TestValue">Label</span>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest36" style="height:56px;width:104px">
-    <a href="javascript:{if (typeof(Page_ClientValidate) != 'function' ||  Page_ClientValidate()) __doPostBack('LinkButton1','')} " id="LinkButton1" testattribute="TestValue">LinkButton</a>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest37" style="height:56px;width:104px">
-    <div id="Panel1" testattribute="TestValue">
-		Panel
-	</div>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest38" style="height:56px;width:104px">
-    <span testattribute="TestValue">
-      <input id="RadioButton1" type="radio" name="RadioButton1" value="RadioButton1" />
-    </span>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest39" style="height:56px;width:104px">
-    <input id="TextBox1" style="width:100px" type="text" name="TextBox1" testattribute="TestValue" />
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest40" style="height:56px;width:104px">
-    <select id="DropDownList1" name="DropDownList1" testattribute="TestValue">
-      <option value="Item1" />Item1
-		<option value="Item2" />Item2
-
-	</select>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest41" style="height:56px;width:104px">
-    <select id="ListBox1" size="4" name="ListBox1" testattribute="TestValue">
-      <option value="Item1" />Item1
-		<option value="Item2" />Item2
-
-	</select>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest42" style="height:56px;width:104px">
-    <table id="RadioButtonList1" border="0" testattribute="TestValue">
-      <tr>
-        <td>
-          <input id="RadioButtonList1_0" type="radio" name="RadioButtonList1" value="Item1" />
-          <label for="RadioButtonList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="RadioButtonList1_1" type="radio" name="RadioButtonList1" value="Item2" />
-          <label for="RadioButtonList1_1">Item2</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest43" style="height:56px;width:104px">
-    <table id="CheckBoxList1" border="0" testattribute="TestValue">
-      <tr>
-        <td>
-          <input id="CheckBoxList1_0" type="checkbox" name="CheckBoxList1:0" />
-          <label for="CheckBoxList1_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="CheckBoxList1_1" type="checkbox" name="CheckBoxList1:1" />
-          <label for="CheckBoxList1_1">Item2</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest50" style="height:56px;width:104px">
-    <table border="1" cellspacing="0" id="DataGrid1" style="border-collapse:collapse" rules="all" testattribute="TestValue">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>ccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>ddd</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>eee</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>fff</td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest51" style="height:56px;width:104px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="DataGrid2">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>ccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>ddd</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>eee</td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>fff</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" style="height:56px;width:104px">
-    <table id="DataList1" cellspacing="0" border="0" style="border-collapse:collapse" testattribute="TestValue">
-      <tr>
-        <td>
-          <b>
-            <tr>
-              <td>Id</td>
-              <td>Description</td>
-            </tr>
-          </b>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>1</td>
-            <td>aaa</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>2</td>
-            <td>bbb</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>3</td>
-            <td>ccc</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>4</td>
-            <td>ddd</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>5</td>
-            <td>eee</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>6</td>
-            <td>fff</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest53" style="height:56px;width:104px">
-    <table id="DataList2" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <b>
-            <tr>
-              <td>Id</td>
-              <td>Description</td>
-            </tr>
-          </b>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr testattribute="TestValue">
-            <td>1</td>
-            <td>aaa</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr testattribute="TestValue">
-            <td>2</td>
-            <td>bbb</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr testattribute="TestValue">
-            <td>3</td>
-            <td>ccc</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr testattribute="TestValue">
-            <td>4</td>
-            <td>ddd</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr testattribute="TestValue">
-            <td>5</td>
-            <td>eee</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr testattribute="TestValue">
-            <td>6</td>
-            <td>fff</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" style="height:56px;width:104px">
-    <table id="Table1" border="0" testattribute="TestValue">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr>
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: TestAttribute Value: TestValue</span>
-  </div>
-  <div id="GHTSubTest55" style="height:56px;width:104px">
-    <table id="Table5" border="0">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr>
-        <td testattribute="TestValue">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" style="height:56px;width:104px">
-    <table id="Table2" border="0">
-      <tr>
-        <td testattribute="TestValue">Header cell</td>
-      </tr>
-      <tr>
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" style="height:56px;width:104px">
-    <table id="Table3" border="0">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr testattribute="TestValue">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Description">
-    <input test=" Value" value="" type="submit" name="ctrl_0" id="ctrl_0" />
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.CheckBox: Description">
-    <span test=" Value">
-      <input id="ctrl_1" type="checkbox" name="ctrl_1" />
-    </span>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.HyperLink: Description">
-    <a test=" Value" id="ctrl_2">
-    </a>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Image: Description">
-    <img test=" Value" id="ctrl_3" alt="" border="0" />
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.ImageButton: Description">
-    <input test=" Value" id="ctrl_4" alt="" border="0" type="image" name="ctrl_4" />
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Label: Description">
-    <span test=" Value" id="ctrl_5">
-    </span>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.LinkButton: Description">
-    <a href="javascript:__doPostBack('ctrl_6','')" test=" Value" id="ctrl_6">
-    </a>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Panel: Description">
-    <div test=" Value" id="ctrl_7">
-    </div>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.RadioButton: Description">
-    <span test=" Value">
-      <input id="ctrl_8" type="radio" name="ctrl_8" value="ctrl_8" />
-    </span>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.TextBox: Description">
-    <input test=" Value" id="ctrl_9" type="text" name="ctrl_9" />
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.DropDownList: Description">
-    <select test=" Value" id="ctrl_10" name="ctrl_10">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.ListBox: Description">
-    <select test=" Value" id="ctrl_11" size="4" name="ctrl_11">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.RadioButtonList: Description">
-    <table test=" Value" id="ctrl_12" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_12_0" type="radio" name="ctrl_12" value="1" />
-          <label for="ctrl_12_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_1" type="radio" name="ctrl_12" value="2" />
-          <label for="ctrl_12_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_2" type="radio" name="ctrl_12" value="3" />
-          <label for="ctrl_12_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_3" type="radio" name="ctrl_12" value="4" />
-          <label for="ctrl_12_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBoxList: Description">
-    <table test=" Value" id="ctrl_13" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_13_0" type="checkbox" name="ctrl_13:0" />
-          <label for="ctrl_13_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_1" type="checkbox" name="ctrl_13:1" />
-          <label for="ctrl_13_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_2" type="checkbox" name="ctrl_13:2" />
-          <label for="ctrl_13_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_3" type="checkbox" name="ctrl_13:3" />
-          <label for="ctrl_13_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: Description">
-    <table test=" Value" border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_14">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataGridItem: Description">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_15">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr test=" Value" id="ctrl_15_ctrl_16">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Attribute - Name: Test Value:  Value</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.DataList: Description">
-    <table test=" Value" id="ctrl_17" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BackColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BackColor.aspx.xml
deleted file mode 100644
index 46cc30f87f3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BackColor.aspx.xml
+++ /dev/null
@@ -1,653 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Named color:">
-    <input value="" style="background-color:goldenrod" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Color.Empty:">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Default:">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Using RGB:">
-    <input value="" style="background-color:#55aaff" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Named color:">
-    <span style="background-color:goldenrod">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Color.Empty:">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Default:">
-    <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Using RGB:">
-    <span style="background-color:#55aaff">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Named color:">
-    <a id="ctrl_8" style="background-color:goldenrod">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Color.Empty:">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Default:">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Using RGB:">
-    <a id="ctrl_11" style="background-color:#55aaff">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Named color:">
-    <img id="ctrl_12" alt="" border="0" style="background-color:goldenrod" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Color.Empty:">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Default:">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Using RGB:">
-    <img id="ctrl_15" alt="" border="0" style="background-color:#55aaff" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Named color:">
-    <input id="ctrl_16" alt="" border="0" style="background-color:goldenrod" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Color.Empty:">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Default:">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Using RGB:">
-    <input id="ctrl_19" alt="" border="0" style="background-color:#55aaff" type="image" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Named color:">
-    <span id="ctrl_20" style="background-color:goldenrod">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Color.Empty:">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Default:">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Using RGB:">
-    <span id="ctrl_23" style="background-color:#55aaff">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Named color:">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="background-color:goldenrod">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Color.Empty:">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Default:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Using RGB:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" style="background-color:#55aaff">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Named color:">
-    <div id="ctrl_28" style="background-color:goldenrod">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Color.Empty:">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Default:">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Using RGB:">
-    <div id="ctrl_31" style="background-color:#55aaff">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Named color:">
-    <span style="background-color:goldenrod">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Color.Empty:">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Default:">
-    <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Using RGB:">
-    <span style="background-color:#55aaff">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Named color:">
-    <input id="ctrl_36" style="background-color:goldenrod" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Color.Empty:">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Default:">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Using RGB:">
-    <input id="ctrl_39" style="background-color:#55aaff" type="text" name="ctrl_39" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Named color:">
-    <select id="ctrl_40" style="background-color:goldenrod" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Color.Empty:">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Default:">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Using RGB:">
-    <select id="ctrl_43" style="background-color:#55aaff" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Named color:">
-    <select id="ctrl_44" style="background-color:goldenrod" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Color.Empty:">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Default:">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Using RGB:">
-    <select id="ctrl_47" style="background-color:#55aaff" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Named color:">
-    <table id="ctrl_48" style="background-color:goldenrod" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Color.Empty:">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Default:">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Using RGB:">
-    <table id="ctrl_51" style="background-color:#55aaff" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Named color:">
-    <table id="ctrl_52" style="background-color:goldenrod" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Color.Empty:">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Default:">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Using RGB:">
-    <table id="ctrl_55" style="background-color:#55aaff" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Named color:">
-    <table border="1" cellspacing="0" style="background-color:goldenrod;border-collapse:collapse" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Color.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Default:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Using RGB:">
-    <table border="1" cellspacing="0" style="background-color:#55aaff;border-collapse:collapse" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Named color:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="background-color:goldenrod">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Color.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Default:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Using RGB:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" style="background-color:#55aaff">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Named color:">
-    <table id="ctrl_68" cellspacing="0" border="0" style="background-color:goldenrod;border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderColor.aspx.xml
deleted file mode 100644
index 7e42e04d7b6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderColor.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Named color:">
-    <input value="" style="border-color:darkblue;border-style:solid;border-width:4px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Color.Empty:">
-    <input value="" style="border-style:solid;border-width:4px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Default:">
-    <input value="" style="border-style:solid;border-width:4px" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Using RGB:">
-    <input value="" style="border-color:#ff55aa;border-style:solid;border-width:4px" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Named color:">
-    <span style="border-color:darkblue;border-style:solid;border-width:4px">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Color.Empty:">
-    <span style="border-style:solid;border-width:4px">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Default:">
-    <span style="border-style:solid;border-width:4px">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Using RGB:">
-    <span style="border-color:#ff55aa;border-style:solid;border-width:4px">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Named color:">
-    <a id="ctrl_8" style="border-color:darkblue;border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Color.Empty:">
-    <a id="ctrl_9" style="border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Default:">
-    <a id="ctrl_10" style="border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Using RGB:">
-    <a id="ctrl_11" style="border-color:#ff55aa;border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Named color:">
-    <img id="ctrl_12" alt="" style="border-color:darkblue;border-style:solid;border-width:4px" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Color.Empty:">
-    <img id="ctrl_13" alt="" style="border-style:solid;border-width:4px" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Default:">
-    <img id="ctrl_14" alt="" style="border-style:solid;border-width:4px" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Using RGB:">
-    <img id="ctrl_15" alt="" style="border-color:#ff55aa;border-style:solid;border-width:4px" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Named color:">
-    <input id="ctrl_16" alt="" style="border-color:darkblue;border-style:solid;border-width:4px" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Color.Empty:">
-    <input id="ctrl_17" alt="" style="border-style:solid;border-width:4px" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Default:">
-    <input id="ctrl_18" alt="" style="border-style:solid;border-width:4px" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Using RGB:">
-    <input id="ctrl_19" alt="" style="border-color:#ff55aa;border-style:solid;border-width:4px" type="image" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Named color:">
-    <span id="ctrl_20" style="border-color:darkblue;border-style:solid;border-width:4px">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Color.Empty:">
-    <span id="ctrl_21" style="border-style:solid;border-width:4px">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Default:">
-    <span id="ctrl_22" style="border-style:solid;border-width:4px">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Using RGB:">
-    <span id="ctrl_23" style="border-color:#ff55aa;border-style:solid;border-width:4px">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Named color:">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="border-color:darkblue;border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Color.Empty:">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25" style="border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Default:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26" style="border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Using RGB:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" style="border-color:#ff55aa;border-style:solid;border-width:4px">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Named color:">
-    <div id="ctrl_28" style="border-color:darkblue;border-style:solid;border-width:4px">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Color.Empty:">
-    <div id="ctrl_29" style="border-style:solid;border-width:4px">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Default:">
-    <div id="ctrl_30" style="border-style:solid;border-width:4px">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Using RGB:">
-    <div id="ctrl_31" style="border-color:#ff55aa;border-style:solid;border-width:4px">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Named color:">
-    <span style="border-color:darkblue;border-style:solid;border-width:4px">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Color.Empty:">
-    <span style="border-style:solid;border-width:4px">
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Default:">
-    <span style="border-style:solid;border-width:4px">
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Using RGB:">
-    <span style="border-color:#ff55aa;border-style:solid;border-width:4px">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Named color:">
-    <input id="ctrl_36" style="border-color:darkblue;border-style:solid;border-width:4px" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Color.Empty:">
-    <input id="ctrl_37" style="border-style:solid;border-width:4px" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Default:">
-    <input id="ctrl_38" style="border-style:solid;border-width:4px" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Using RGB:">
-    <input id="ctrl_39" style="border-color:#ff55aa;border-style:solid;border-width:4px" type="text" name="ctrl_39" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Named color:">
-    <select id="ctrl_40" style="border-color:darkblue;border-style:solid;border-width:4px" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Color.Empty:">
-    <select id="ctrl_41" style="border-style:solid;border-width:4px" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Default:">
-    <select id="ctrl_42" style="border-style:solid;border-width:4px" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Using RGB:">
-    <select id="ctrl_43" style="border-color:#ff55aa;border-style:solid;border-width:4px" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Named color:">
-    <select id="ctrl_44" style="border-color:darkblue;border-style:solid;border-width:4px" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Color.Empty:">
-    <select id="ctrl_45" style="border-style:solid;border-width:4px" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Default:">
-    <select id="ctrl_46" style="border-style:solid;border-width:4px" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Using RGB:">
-    <select id="ctrl_47" style="border-color:#ff55aa;border-style:solid;border-width:4px" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Named color:">
-    <table id="ctrl_48" style="border-color:darkblue;border-style:solid;border-width:4px" border="0" bordercolor="DarkBlue">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Color.Empty:">
-    <table id="ctrl_49" style="border-style:solid;border-width:4px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Default:">
-    <table id="ctrl_50" style="border-style:solid;border-width:4px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Using RGB:">
-    <table id="ctrl_51" style="border-color:#ff55aa;border-style:solid;border-width:4px" border="0" bordercolor="#FF55AA">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Named color:">
-    <table id="ctrl_52" style="border-color:darkblue;border-style:solid;border-width:4px" border="0" bordercolor="DarkBlue">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Color.Empty:">
-    <table id="ctrl_53" style="border-style:solid;border-width:4px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Default:">
-    <table id="ctrl_54" style="border-style:solid;border-width:4px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Using RGB:">
-    <table id="ctrl_55" style="border-color:#ff55aa;border-style:solid;border-width:4px" border="0" bordercolor="#FF55AA">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Named color:">
-    <table border="4" cellspacing="0" style="border-collapse:collapse;border-color:darkblue;border-style:solid;border-width:4px" bordercolor="DarkBlue" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Color.Empty:">
-    <table border="4" cellspacing="0" style="border-collapse:collapse;border-style:solid;border-width:4px" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Default:">
-    <table border="4" cellspacing="0" style="border-collapse:collapse;border-style:solid;border-width:4px" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Using RGB:">
-    <table border="4" cellspacing="0" style="border-collapse:collapse;border-color:#ff55aa;border-style:solid;border-width:4px" bordercolor="#FF55AA" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Named color:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="border-color:darkblue;border-style:solid;border-width:4px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Color.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63" style="border-style:solid;border-width:4px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Default:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65" style="border-style:solid;border-width:4px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Using RGB:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" style="border-color:#ff55aa;border-style:solid;border-width:4px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Named color:">
-    <table id="ctrl_68" cellspacing="0" border="0" bordercolor="DarkBlue" style="border-collapse:collapse;border-color:darkblue;border-style:solid;border-width:4px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderStyle.aspx.xml
deleted file mode 100644
index 8a943e56423..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderStyle.aspx.xml
+++ /dev/null
@@ -1,1777 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default:">
-    <input value="" style="border-color:black;border-style:dashed;border-width:2px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Dashed:">
-    <input value="" style="border-color:black;border-style:dashed;border-width:2px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Dotted:">
-    <input value="" style="border-color:black;border-style:dotted;border-width:2px" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Double:">
-    <input value="" style="border-color:black;border-style:double;border-width:2px" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Groove:">
-    <input value="" style="border-color:black;border-style:groove;border-width:2px" type="submit" name="ctrl_4" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Button: Inset:">
-    <input value="" style="border-color:black;border-style:inset;border-width:2px" type="submit" name="ctrl_5" id="ctrl_5" />
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Button: None:">
-    <input value="" style="border-color:black;border-style:none;border-width:2px" type="submit" name="ctrl_6" id="ctrl_6" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Button: NotSet:">
-    <input value="" style="border-color:black;border-style:solid;border-width:2px" type="submit" name="ctrl_7" id="ctrl_7" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.Button: Outset:">
-    <input value="" style="border-color:black;border-style:outset;border-width:2px" type="submit" name="ctrl_8" id="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.Button: Ridge:">
-    <input value="" style="border-color:black;border-style:ridge;border-width:2px" type="submit" name="ctrl_9" id="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Button: Solid:">
-    <input value="" style="border-color:black;border-style:solid;border-width:2px" type="submit" name="ctrl_10" id="ctrl_10" />
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBox: Default:">
-    <span style="border-color:black;border-style:dashed;border-width:2px">
-      <input id="ctrl_11" type="checkbox" name="ctrl_11" />
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.CheckBox: Dashed:">
-    <span style="border-color:black;border-style:dashed;border-width:2px">
-      <input id="ctrl_12" type="checkbox" name="ctrl_12" />
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBox: Dotted:">
-    <span style="border-color:black;border-style:dotted;border-width:2px">
-      <input id="ctrl_13" type="checkbox" name="ctrl_13" />
-    </span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.CheckBox: Double:">
-    <span style="border-color:black;border-style:double;border-width:2px">
-      <input id="ctrl_14" type="checkbox" name="ctrl_14" />
-    </span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.CheckBox: Groove:">
-    <span style="border-color:black;border-style:groove;border-width:2px">
-      <input id="ctrl_15" type="checkbox" name="ctrl_15" />
-    </span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.CheckBox: Inset:">
-    <span style="border-color:black;border-style:inset;border-width:2px">
-      <input id="ctrl_16" type="checkbox" name="ctrl_16" />
-    </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.CheckBox: None:">
-    <span style="border-color:black;border-style:none;border-width:2px">
-      <input id="ctrl_17" type="checkbox" name="ctrl_17" />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.CheckBox: NotSet:">
-    <span style="border-color:black;border-style:solid;border-width:2px">
-      <input id="ctrl_18" type="checkbox" name="ctrl_18" />
-    </span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.CheckBox: Outset:">
-    <span style="border-color:black;border-style:outset;border-width:2px">
-      <input id="ctrl_19" type="checkbox" name="ctrl_19" />
-    </span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.CheckBox: Ridge:">
-    <span style="border-color:black;border-style:ridge;border-width:2px">
-      <input id="ctrl_20" type="checkbox" name="ctrl_20" />
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.CheckBox: Solid:">
-    <span style="border-color:black;border-style:solid;border-width:2px">
-      <input id="ctrl_21" type="checkbox" name="ctrl_21" />
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.HyperLink: Default:">
-    <a id="ctrl_22" style="border-color:black;border-style:dashed;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.HyperLink: Dashed:">
-    <a id="ctrl_23" style="border-color:black;border-style:dashed;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.HyperLink: Dotted:">
-    <a id="ctrl_24" style="border-color:black;border-style:dotted;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.HyperLink: Double:">
-    <a id="ctrl_25" style="border-color:black;border-style:double;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.HyperLink: Groove:">
-    <a id="ctrl_26" style="border-color:black;border-style:groove;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.HyperLink: Inset:">
-    <a id="ctrl_27" style="border-color:black;border-style:inset;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.HyperLink: None:">
-    <a id="ctrl_28" style="border-color:black;border-style:none;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.HyperLink: NotSet:">
-    <a id="ctrl_29" style="border-color:black;border-style:solid;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.HyperLink: Outset:">
-    <a id="ctrl_30" style="border-color:black;border-style:outset;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.HyperLink: Ridge:">
-    <a id="ctrl_31" style="border-color:black;border-style:ridge;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.HyperLink: Solid:">
-    <a id="ctrl_32" style="border-color:black;border-style:solid;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.Image: Default:">
-    <img id="ctrl_33" alt="" style="border-color:black;border-style:dashed;border-width:2px" />
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.Image: Dashed:">
-    <img id="ctrl_34" alt="" style="border-color:black;border-style:dashed;border-width:2px" />
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Image: Dotted:">
-    <img id="ctrl_35" alt="" style="border-color:black;border-style:dotted;border-width:2px" />
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Image: Double:">
-    <img id="ctrl_36" alt="" style="border-color:black;border-style:double;border-width:2px" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Image: Groove:">
-    <img id="ctrl_37" alt="" style="border-color:black;border-style:groove;border-width:2px" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Image: Inset:">
-    <img id="ctrl_38" alt="" style="border-color:black;border-style:inset;border-width:2px" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Image: None:">
-    <img id="ctrl_39" alt="" style="border-color:black;border-style:none;border-width:2px" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.Image: NotSet:">
-    <img id="ctrl_40" alt="" style="border-color:black;border-style:solid;border-width:2px" />
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.Image: Outset:">
-    <img id="ctrl_41" alt="" style="border-color:black;border-style:outset;border-width:2px" />
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.Image: Ridge:">
-    <img id="ctrl_42" alt="" style="border-color:black;border-style:ridge;border-width:2px" />
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.Image: Solid:">
-    <img id="ctrl_43" alt="" style="border-color:black;border-style:solid;border-width:2px" />
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ImageButton: Default:">
-    <input id="ctrl_44" alt="" style="border-color:black;border-style:dashed;border-width:2px" type="image" name="ctrl_44" />
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ImageButton: Dashed:">
-    <input id="ctrl_45" alt="" style="border-color:black;border-style:dashed;border-width:2px" type="image" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ImageButton: Dotted:">
-    <input id="ctrl_46" alt="" style="border-color:black;border-style:dotted;border-width:2px" type="image" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ImageButton: Double:">
-    <input id="ctrl_47" alt="" style="border-color:black;border-style:double;border-width:2px" type="image" name="ctrl_47" />
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.ImageButton: Groove:">
-    <input id="ctrl_48" alt="" style="border-color:black;border-style:groove;border-width:2px" type="image" name="ctrl_48" />
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.ImageButton: Inset:">
-    <input id="ctrl_49" alt="" style="border-color:black;border-style:inset;border-width:2px" type="image" name="ctrl_49" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.ImageButton: None:">
-    <input id="ctrl_50" alt="" style="border-color:black;border-style:none;border-width:2px" type="image" name="ctrl_50" />
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.ImageButton: NotSet:">
-    <input id="ctrl_51" alt="" style="border-color:black;border-style:solid;border-width:2px" type="image" name="ctrl_51" />
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.ImageButton: Outset:">
-    <input id="ctrl_52" alt="" style="border-color:black;border-style:outset;border-width:2px" type="image" name="ctrl_52" />
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.ImageButton: Ridge:">
-    <input id="ctrl_53" alt="" style="border-color:black;border-style:ridge;border-width:2px" type="image" name="ctrl_53" />
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.ImageButton: Solid:">
-    <input id="ctrl_54" alt="" style="border-color:black;border-style:solid;border-width:2px" type="image" name="ctrl_54" />
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.Label: Default:">
-    <span id="ctrl_55" style="border-color:black;border-style:dashed;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.Label: Dashed:">
-    <span id="ctrl_56" style="border-color:black;border-style:dashed;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.Label: Dotted:">
-    <span id="ctrl_57" style="border-color:black;border-style:dotted;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.Label: Double:">
-    <span id="ctrl_58" style="border-color:black;border-style:double;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.Label: Groove:">
-    <span id="ctrl_59" style="border-color:black;border-style:groove;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.Label: Inset:">
-    <span id="ctrl_60" style="border-color:black;border-style:inset;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.Label: None:">
-    <span id="ctrl_61" style="border-color:black;border-style:none;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.Label: NotSet:">
-    <span id="ctrl_62" style="border-color:black;border-style:solid;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.Label: Outset:">
-    <span id="ctrl_63" style="border-color:black;border-style:outset;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.Label: Ridge:">
-    <span id="ctrl_64" style="border-color:black;border-style:ridge;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.Label: Solid:">
-    <span id="ctrl_65" style="border-color:black;border-style:solid;border-width:2px">
-    </span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.LinkButton: Default:">
-    <a href="javascript:__doPostBack('ctrl_66','')" id="ctrl_66" style="border-color:black;border-style:dashed;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.LinkButton: Dashed:">
-    <a href="javascript:__doPostBack('ctrl_67','')" id="ctrl_67" style="border-color:black;border-style:dashed;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.LinkButton: Dotted:">
-    <a href="javascript:__doPostBack('ctrl_68','')" id="ctrl_68" style="border-color:black;border-style:dotted;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.LinkButton: Double:">
-    <a href="javascript:__doPostBack('ctrl_69','')" id="ctrl_69" style="border-color:black;border-style:double;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.LinkButton: Groove:">
-    <a href="javascript:__doPostBack('ctrl_70','')" id="ctrl_70" style="border-color:black;border-style:groove;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.LinkButton: Inset:">
-    <a href="javascript:__doPostBack('ctrl_71','')" id="ctrl_71" style="border-color:black;border-style:inset;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.LinkButton: None:">
-    <a href="javascript:__doPostBack('ctrl_72','')" id="ctrl_72" style="border-color:black;border-style:none;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.LinkButton: NotSet:">
-    <a href="javascript:__doPostBack('ctrl_73','')" id="ctrl_73" style="border-color:black;border-style:solid;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.LinkButton: Outset:">
-    <a href="javascript:__doPostBack('ctrl_74','')" id="ctrl_74" style="border-color:black;border-style:outset;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.LinkButton: Ridge:">
-    <a href="javascript:__doPostBack('ctrl_75','')" id="ctrl_75" style="border-color:black;border-style:ridge;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.LinkButton: Solid:">
-    <a href="javascript:__doPostBack('ctrl_76','')" id="ctrl_76" style="border-color:black;border-style:solid;border-width:2px">
-    </a>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.Panel: Default:">
-    <div id="ctrl_77" style="border-color:black;border-style:dashed;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.Panel: Dashed:">
-    <div id="ctrl_78" style="border-color:black;border-style:dashed;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.Panel: Dotted:">
-    <div id="ctrl_79" style="border-color:black;border-style:dotted;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.Panel: Double:">
-    <div id="ctrl_80" style="border-color:black;border-style:double;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.WebControls.Panel: Groove:">
-    <div id="ctrl_81" style="border-color:black;border-style:groove;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.WebControls.Panel: Inset:">
-    <div id="ctrl_82" style="border-color:black;border-style:inset;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.WebControls.Panel: None:">
-    <div id="ctrl_83" style="border-color:black;border-style:none;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.WebControls.Panel: NotSet:">
-    <div id="ctrl_84" style="border-color:black;border-style:solid;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.WebControls.Panel: Outset:">
-    <div id="ctrl_85" style="border-color:black;border-style:outset;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.WebControls.Panel: Ridge:">
-    <div id="ctrl_86" style="border-color:black;border-style:ridge;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.WebControls.Panel: Solid:">
-    <div id="ctrl_87" style="border-color:black;border-style:solid;border-width:2px">
-    </div>
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.WebControls.RadioButton: Default:">
-    <span style="border-color:black;border-style:dashed;border-width:2px">
-      <input id="ctrl_88" type="radio" name="ctrl_88" value="ctrl_88" />
-    </span>
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.WebControls.RadioButton: Dashed:">
-    <span style="border-color:black;border-style:dashed;border-width:2px">
-      <input id="ctrl_89" type="radio" name="ctrl_89" value="ctrl_89" />
-    </span>
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.WebControls.RadioButton: Dotted:">
-    <span style="border-color:black;border-style:dotted;border-width:2px">
-      <input id="ctrl_90" type="radio" name="ctrl_90" value="ctrl_90" />
-    </span>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.WebControls.RadioButton: Double:">
-    <span style="border-color:black;border-style:double;border-width:2px">
-      <input id="ctrl_91" type="radio" name="ctrl_91" value="ctrl_91" />
-    </span>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.WebControls.RadioButton: Groove:">
-    <span style="border-color:black;border-style:groove;border-width:2px">
-      <input id="ctrl_92" type="radio" name="ctrl_92" value="ctrl_92" />
-    </span>
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.WebControls.RadioButton: Inset:">
-    <span style="border-color:black;border-style:inset;border-width:2px">
-      <input id="ctrl_93" type="radio" name="ctrl_93" value="ctrl_93" />
-    </span>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.WebControls.RadioButton: None:">
-    <span style="border-color:black;border-style:none;border-width:2px">
-      <input id="ctrl_94" type="radio" name="ctrl_94" value="ctrl_94" />
-    </span>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.WebControls.RadioButton: NotSet:">
-    <span style="border-color:black;border-style:solid;border-width:2px">
-      <input id="ctrl_95" type="radio" name="ctrl_95" value="ctrl_95" />
-    </span>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.WebControls.RadioButton: Outset:">
-    <span style="border-color:black;border-style:outset;border-width:2px">
-      <input id="ctrl_96" type="radio" name="ctrl_96" value="ctrl_96" />
-    </span>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.WebControls.RadioButton: Ridge:">
-    <span style="border-color:black;border-style:ridge;border-width:2px">
-      <input id="ctrl_97" type="radio" name="ctrl_97" value="ctrl_97" />
-    </span>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.WebControls.RadioButton: Solid:">
-    <span style="border-color:black;border-style:solid;border-width:2px">
-      <input id="ctrl_98" type="radio" name="ctrl_98" value="ctrl_98" />
-    </span>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.WebControls.TextBox: Default:">
-    <input id="ctrl_99" style="border-color:black;border-style:dashed;border-width:2px" type="text" name="ctrl_99" />
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.WebControls.TextBox: Dashed:">
-    <input id="ctrl_100" style="border-color:black;border-style:dashed;border-width:2px" type="text" name="ctrl_100" />
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.WebControls.TextBox: Dotted:">
-    <input id="ctrl_101" style="border-color:black;border-style:dotted;border-width:2px" type="text" name="ctrl_101" />
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.WebControls.TextBox: Double:">
-    <input id="ctrl_102" style="border-color:black;border-style:double;border-width:2px" type="text" name="ctrl_102" />
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.WebControls.TextBox: Groove:">
-    <input id="ctrl_103" style="border-color:black;border-style:groove;border-width:2px" type="text" name="ctrl_103" />
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.WebControls.TextBox: Inset:">
-    <input id="ctrl_104" style="border-color:black;border-style:inset;border-width:2px" type="text" name="ctrl_104" />
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.WebControls.TextBox: None:">
-    <input id="ctrl_105" style="border-color:black;border-style:none;border-width:2px" type="text" name="ctrl_105" />
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.WebControls.TextBox: NotSet:">
-    <input id="ctrl_106" style="border-color:black;border-style:solid;border-width:2px" type="text" name="ctrl_106" />
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.WebControls.TextBox: Outset:">
-    <input id="ctrl_107" style="border-color:black;border-style:outset;border-width:2px" type="text" name="ctrl_107" />
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.WebControls.TextBox: Ridge:">
-    <input id="ctrl_108" style="border-color:black;border-style:ridge;border-width:2px" type="text" name="ctrl_108" />
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.WebControls.TextBox: Solid:">
-    <input id="ctrl_109" style="border-color:black;border-style:solid;border-width:2px" type="text" name="ctrl_109" />
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.WebControls.DropDownList: Default:">
-    <select id="ctrl_110" style="border-color:black;border-style:dashed;border-width:2px" name="ctrl_110">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.WebControls.DropDownList: Dashed:">
-    <select id="ctrl_111" style="border-color:black;border-style:dashed;border-width:2px" name="ctrl_111">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest113" testname="System.Web.UI.WebControls.DropDownList: Dotted:">
-    <select id="ctrl_112" style="border-color:black;border-style:dotted;border-width:2px" name="ctrl_112">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest114" testname="System.Web.UI.WebControls.DropDownList: Double:">
-    <select id="ctrl_113" style="border-color:black;border-style:double;border-width:2px" name="ctrl_113">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest115" testname="System.Web.UI.WebControls.DropDownList: Groove:">
-    <select id="ctrl_114" style="border-color:black;border-style:groove;border-width:2px" name="ctrl_114">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest116" testname="System.Web.UI.WebControls.DropDownList: Inset:">
-    <select id="ctrl_115" style="border-color:black;border-style:inset;border-width:2px" name="ctrl_115">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest117" testname="System.Web.UI.WebControls.DropDownList: None:">
-    <select id="ctrl_116" style="border-color:black;border-style:none;border-width:2px" name="ctrl_116">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest118" testname="System.Web.UI.WebControls.DropDownList: NotSet:">
-    <select id="ctrl_117" style="border-color:black;border-style:solid;border-width:2px" name="ctrl_117">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest119" testname="System.Web.UI.WebControls.DropDownList: Outset:">
-    <select id="ctrl_118" style="border-color:black;border-style:outset;border-width:2px" name="ctrl_118">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest120" testname="System.Web.UI.WebControls.DropDownList: Ridge:">
-    <select id="ctrl_119" style="border-color:black;border-style:ridge;border-width:2px" name="ctrl_119">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest121" testname="System.Web.UI.WebControls.DropDownList: Solid:">
-    <select id="ctrl_120" style="border-color:black;border-style:solid;border-width:2px" name="ctrl_120">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest122" testname="System.Web.UI.WebControls.ListBox: Default:">
-    <select id="ctrl_121" style="border-color:black;border-style:dashed;border-width:2px" size="4" name="ctrl_121">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest123" testname="System.Web.UI.WebControls.ListBox: Dashed:">
-    <select id="ctrl_122" style="border-color:black;border-style:dashed;border-width:2px" size="4" name="ctrl_122">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest124" testname="System.Web.UI.WebControls.ListBox: Dotted:">
-    <select id="ctrl_123" style="border-color:black;border-style:dotted;border-width:2px" size="4" name="ctrl_123">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest125" testname="System.Web.UI.WebControls.ListBox: Double:">
-    <select id="ctrl_124" style="border-color:black;border-style:double;border-width:2px" size="4" name="ctrl_124">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest126" testname="System.Web.UI.WebControls.ListBox: Groove:">
-    <select id="ctrl_125" style="border-color:black;border-style:groove;border-width:2px" size="4" name="ctrl_125">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest127" testname="System.Web.UI.WebControls.ListBox: Inset:">
-    <select id="ctrl_126" style="border-color:black;border-style:inset;border-width:2px" size="4" name="ctrl_126">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest128" testname="System.Web.UI.WebControls.ListBox: None:">
-    <select id="ctrl_127" style="border-color:black;border-style:none;border-width:2px" size="4" name="ctrl_127">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest129" testname="System.Web.UI.WebControls.ListBox: NotSet:">
-    <select id="ctrl_128" style="border-color:black;border-style:solid;border-width:2px" size="4" name="ctrl_128">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest130" testname="System.Web.UI.WebControls.ListBox: Outset:">
-    <select id="ctrl_129" style="border-color:black;border-style:outset;border-width:2px" size="4" name="ctrl_129">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest131" testname="System.Web.UI.WebControls.ListBox: Ridge:">
-    <select id="ctrl_130" style="border-color:black;border-style:ridge;border-width:2px" size="4" name="ctrl_130">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest132" testname="System.Web.UI.WebControls.ListBox: Solid:">
-    <select id="ctrl_131" style="border-color:black;border-style:solid;border-width:2px" size="4" name="ctrl_131">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest133" testname="System.Web.UI.WebControls.RadioButtonList: Default:">
-    <table id="ctrl_132" style="border-color:black;border-style:dashed;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_132_0" type="radio" name="ctrl_132" value="1" />
-          <label for="ctrl_132_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_132_1" type="radio" name="ctrl_132" value="2" />
-          <label for="ctrl_132_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_132_2" type="radio" name="ctrl_132" value="3" />
-          <label for="ctrl_132_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_132_3" type="radio" name="ctrl_132" value="4" />
-          <label for="ctrl_132_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest134" testname="System.Web.UI.WebControls.RadioButtonList: Dashed:">
-    <table id="ctrl_133" style="border-color:black;border-style:dashed;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_133_0" type="radio" name="ctrl_133" value="1" />
-          <label for="ctrl_133_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_133_1" type="radio" name="ctrl_133" value="2" />
-          <label for="ctrl_133_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_133_2" type="radio" name="ctrl_133" value="3" />
-          <label for="ctrl_133_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_133_3" type="radio" name="ctrl_133" value="4" />
-          <label for="ctrl_133_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest135" testname="System.Web.UI.WebControls.RadioButtonList: Dotted:">
-    <table id="ctrl_134" style="border-color:black;border-style:dotted;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_134_0" type="radio" name="ctrl_134" value="1" />
-          <label for="ctrl_134_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_134_1" type="radio" name="ctrl_134" value="2" />
-          <label for="ctrl_134_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_134_2" type="radio" name="ctrl_134" value="3" />
-          <label for="ctrl_134_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_134_3" type="radio" name="ctrl_134" value="4" />
-          <label for="ctrl_134_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest136" testname="System.Web.UI.WebControls.RadioButtonList: Double:">
-    <table id="ctrl_135" style="border-color:black;border-style:double;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_135_0" type="radio" name="ctrl_135" value="1" />
-          <label for="ctrl_135_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_135_1" type="radio" name="ctrl_135" value="2" />
-          <label for="ctrl_135_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_135_2" type="radio" name="ctrl_135" value="3" />
-          <label for="ctrl_135_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_135_3" type="radio" name="ctrl_135" value="4" />
-          <label for="ctrl_135_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest137" testname="System.Web.UI.WebControls.RadioButtonList: Groove:">
-    <table id="ctrl_136" style="border-color:black;border-style:groove;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_136_0" type="radio" name="ctrl_136" value="1" />
-          <label for="ctrl_136_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_136_1" type="radio" name="ctrl_136" value="2" />
-          <label for="ctrl_136_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_136_2" type="radio" name="ctrl_136" value="3" />
-          <label for="ctrl_136_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_136_3" type="radio" name="ctrl_136" value="4" />
-          <label for="ctrl_136_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest138" testname="System.Web.UI.WebControls.RadioButtonList: Inset:">
-    <table id="ctrl_137" style="border-color:black;border-style:inset;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_137_0" type="radio" name="ctrl_137" value="1" />
-          <label for="ctrl_137_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_137_1" type="radio" name="ctrl_137" value="2" />
-          <label for="ctrl_137_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_137_2" type="radio" name="ctrl_137" value="3" />
-          <label for="ctrl_137_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_137_3" type="radio" name="ctrl_137" value="4" />
-          <label for="ctrl_137_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest139" testname="System.Web.UI.WebControls.RadioButtonList: None:">
-    <table id="ctrl_138" style="border-color:black;border-style:none;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_138_0" type="radio" name="ctrl_138" value="1" />
-          <label for="ctrl_138_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_138_1" type="radio" name="ctrl_138" value="2" />
-          <label for="ctrl_138_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_138_2" type="radio" name="ctrl_138" value="3" />
-          <label for="ctrl_138_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_138_3" type="radio" name="ctrl_138" value="4" />
-          <label for="ctrl_138_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest140" testname="System.Web.UI.WebControls.RadioButtonList: NotSet:">
-    <table id="ctrl_139" style="border-color:black;border-style:solid;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_139_0" type="radio" name="ctrl_139" value="1" />
-          <label for="ctrl_139_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_139_1" type="radio" name="ctrl_139" value="2" />
-          <label for="ctrl_139_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_139_2" type="radio" name="ctrl_139" value="3" />
-          <label for="ctrl_139_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_139_3" type="radio" name="ctrl_139" value="4" />
-          <label for="ctrl_139_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest141" testname="System.Web.UI.WebControls.RadioButtonList: Outset:">
-    <table id="ctrl_140" style="border-color:black;border-style:outset;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_140_0" type="radio" name="ctrl_140" value="1" />
-          <label for="ctrl_140_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_140_1" type="radio" name="ctrl_140" value="2" />
-          <label for="ctrl_140_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_140_2" type="radio" name="ctrl_140" value="3" />
-          <label for="ctrl_140_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_140_3" type="radio" name="ctrl_140" value="4" />
-          <label for="ctrl_140_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest142" testname="System.Web.UI.WebControls.RadioButtonList: Ridge:">
-    <table id="ctrl_141" style="border-color:black;border-style:ridge;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_141_0" type="radio" name="ctrl_141" value="1" />
-          <label for="ctrl_141_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_141_1" type="radio" name="ctrl_141" value="2" />
-          <label for="ctrl_141_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_141_2" type="radio" name="ctrl_141" value="3" />
-          <label for="ctrl_141_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_141_3" type="radio" name="ctrl_141" value="4" />
-          <label for="ctrl_141_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest143" testname="System.Web.UI.WebControls.RadioButtonList: Solid:">
-    <table id="ctrl_142" style="border-color:black;border-style:solid;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_142_0" type="radio" name="ctrl_142" value="1" />
-          <label for="ctrl_142_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_142_1" type="radio" name="ctrl_142" value="2" />
-          <label for="ctrl_142_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_142_2" type="radio" name="ctrl_142" value="3" />
-          <label for="ctrl_142_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_142_3" type="radio" name="ctrl_142" value="4" />
-          <label for="ctrl_142_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest144" testname="System.Web.UI.WebControls.CheckBoxList: Default:">
-    <table id="ctrl_143" style="border-color:black;border-style:dashed;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_143_0" type="checkbox" name="ctrl_143:0" />
-          <label for="ctrl_143_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_143_1" type="checkbox" name="ctrl_143:1" />
-          <label for="ctrl_143_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_143_2" type="checkbox" name="ctrl_143:2" />
-          <label for="ctrl_143_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_143_3" type="checkbox" name="ctrl_143:3" />
-          <label for="ctrl_143_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest145" testname="System.Web.UI.WebControls.CheckBoxList: Dashed:">
-    <table id="ctrl_144" style="border-color:black;border-style:dashed;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_144_0" type="checkbox" name="ctrl_144:0" />
-          <label for="ctrl_144_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_144_1" type="checkbox" name="ctrl_144:1" />
-          <label for="ctrl_144_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_144_2" type="checkbox" name="ctrl_144:2" />
-          <label for="ctrl_144_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_144_3" type="checkbox" name="ctrl_144:3" />
-          <label for="ctrl_144_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest146" testname="System.Web.UI.WebControls.CheckBoxList: Dotted:">
-    <table id="ctrl_145" style="border-color:black;border-style:dotted;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_145_0" type="checkbox" name="ctrl_145:0" />
-          <label for="ctrl_145_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_145_1" type="checkbox" name="ctrl_145:1" />
-          <label for="ctrl_145_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_145_2" type="checkbox" name="ctrl_145:2" />
-          <label for="ctrl_145_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_145_3" type="checkbox" name="ctrl_145:3" />
-          <label for="ctrl_145_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest147" testname="System.Web.UI.WebControls.CheckBoxList: Double:">
-    <table id="ctrl_146" style="border-color:black;border-style:double;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_146_0" type="checkbox" name="ctrl_146:0" />
-          <label for="ctrl_146_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_146_1" type="checkbox" name="ctrl_146:1" />
-          <label for="ctrl_146_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_146_2" type="checkbox" name="ctrl_146:2" />
-          <label for="ctrl_146_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_146_3" type="checkbox" name="ctrl_146:3" />
-          <label for="ctrl_146_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest148" testname="System.Web.UI.WebControls.CheckBoxList: Groove:">
-    <table id="ctrl_147" style="border-color:black;border-style:groove;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_147_0" type="checkbox" name="ctrl_147:0" />
-          <label for="ctrl_147_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_147_1" type="checkbox" name="ctrl_147:1" />
-          <label for="ctrl_147_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_147_2" type="checkbox" name="ctrl_147:2" />
-          <label for="ctrl_147_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_147_3" type="checkbox" name="ctrl_147:3" />
-          <label for="ctrl_147_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest149" testname="System.Web.UI.WebControls.CheckBoxList: Inset:">
-    <table id="ctrl_148" style="border-color:black;border-style:inset;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_148_0" type="checkbox" name="ctrl_148:0" />
-          <label for="ctrl_148_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_148_1" type="checkbox" name="ctrl_148:1" />
-          <label for="ctrl_148_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_148_2" type="checkbox" name="ctrl_148:2" />
-          <label for="ctrl_148_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_148_3" type="checkbox" name="ctrl_148:3" />
-          <label for="ctrl_148_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest150" testname="System.Web.UI.WebControls.CheckBoxList: None:">
-    <table id="ctrl_149" style="border-color:black;border-style:none;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_149_0" type="checkbox" name="ctrl_149:0" />
-          <label for="ctrl_149_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_149_1" type="checkbox" name="ctrl_149:1" />
-          <label for="ctrl_149_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_149_2" type="checkbox" name="ctrl_149:2" />
-          <label for="ctrl_149_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_149_3" type="checkbox" name="ctrl_149:3" />
-          <label for="ctrl_149_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest151" testname="System.Web.UI.WebControls.CheckBoxList: NotSet:">
-    <table id="ctrl_150" style="border-color:black;border-style:solid;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_150_0" type="checkbox" name="ctrl_150:0" />
-          <label for="ctrl_150_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_150_1" type="checkbox" name="ctrl_150:1" />
-          <label for="ctrl_150_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_150_2" type="checkbox" name="ctrl_150:2" />
-          <label for="ctrl_150_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_150_3" type="checkbox" name="ctrl_150:3" />
-          <label for="ctrl_150_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest152" testname="System.Web.UI.WebControls.CheckBoxList: Outset:">
-    <table id="ctrl_151" style="border-color:black;border-style:outset;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_151_0" type="checkbox" name="ctrl_151:0" />
-          <label for="ctrl_151_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_151_1" type="checkbox" name="ctrl_151:1" />
-          <label for="ctrl_151_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_151_2" type="checkbox" name="ctrl_151:2" />
-          <label for="ctrl_151_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_151_3" type="checkbox" name="ctrl_151:3" />
-          <label for="ctrl_151_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest153" testname="System.Web.UI.WebControls.CheckBoxList: Ridge:">
-    <table id="ctrl_152" style="border-color:black;border-style:ridge;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_152_0" type="checkbox" name="ctrl_152:0" />
-          <label for="ctrl_152_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_152_1" type="checkbox" name="ctrl_152:1" />
-          <label for="ctrl_152_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_152_2" type="checkbox" name="ctrl_152:2" />
-          <label for="ctrl_152_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_152_3" type="checkbox" name="ctrl_152:3" />
-          <label for="ctrl_152_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest154" testname="System.Web.UI.WebControls.CheckBoxList: Solid:">
-    <table id="ctrl_153" style="border-color:black;border-style:solid;border-width:2px" border="0" bordercolor="Black">
-      <tr>
-        <td>
-          <input id="ctrl_153_0" type="checkbox" name="ctrl_153:0" />
-          <label for="ctrl_153_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_153_1" type="checkbox" name="ctrl_153:1" />
-          <label for="ctrl_153_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_153_2" type="checkbox" name="ctrl_153:2" />
-          <label for="ctrl_153_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_153_3" type="checkbox" name="ctrl_153:3" />
-          <label for="ctrl_153_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest155" testname="System.Web.UI.WebControls.DataGrid: Default:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:dashed;border-width:2px" bordercolor="Black" rules="all" id="ctrl_154">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest156" testname="System.Web.UI.WebControls.DataGrid: Dashed:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:dashed;border-width:2px" bordercolor="Black" rules="all" id="ctrl_155">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest157" testname="System.Web.UI.WebControls.DataGrid: Dotted:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:dotted;border-width:2px" bordercolor="Black" rules="all" id="ctrl_156">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest158" testname="System.Web.UI.WebControls.DataGrid: Double:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:double;border-width:2px" bordercolor="Black" rules="all" id="ctrl_157">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest159" testname="System.Web.UI.WebControls.DataGrid: Groove:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:groove;border-width:2px" bordercolor="Black" rules="all" id="ctrl_158">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest160" testname="System.Web.UI.WebControls.DataGrid: Inset:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:inset;border-width:2px" bordercolor="Black" rules="all" id="ctrl_159">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest161" testname="System.Web.UI.WebControls.DataGrid: None:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:none;border-width:2px" bordercolor="Black" rules="all" id="ctrl_160">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest162" testname="System.Web.UI.WebControls.DataGrid: NotSet:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:2px" bordercolor="Black" rules="all" id="ctrl_161">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest163" testname="System.Web.UI.WebControls.DataGrid: Outset:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:outset;border-width:2px" bordercolor="Black" rules="all" id="ctrl_162">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest164" testname="System.Web.UI.WebControls.DataGrid: Ridge:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:ridge;border-width:2px" bordercolor="Black" rules="all" id="ctrl_163">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest165" testname="System.Web.UI.WebControls.DataGrid: Solid:">
-    <table border="2" cellspacing="0" style="border-collapse:collapse;border-color:black;border-style:solid;border-width:2px" bordercolor="Black" rules="all" id="ctrl_164">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest166" testname="System.Web.UI.WebControls.DataGridItem: Default:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_165">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_165_ctrl_166" style="border-color:black;border-style:dashed;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest167" testname="System.Web.UI.WebControls.DataGridItem: Dashed:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_167">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_167_ctrl_168" style="border-color:black;border-style:dashed;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest168" testname="System.Web.UI.WebControls.DataGridItem: Dotted:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_169">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_169_ctrl_170" style="border-color:black;border-style:dotted;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest169" testname="System.Web.UI.WebControls.DataGridItem: Double:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_171">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_171_ctrl_172" style="border-color:black;border-style:double;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest170" testname="System.Web.UI.WebControls.DataGridItem: Groove:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_173">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_173_ctrl_174" style="border-color:black;border-style:groove;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest171" testname="System.Web.UI.WebControls.DataGridItem: Inset:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_175">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_175_ctrl_176" style="border-color:black;border-style:inset;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest172" testname="System.Web.UI.WebControls.DataGridItem: None:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_177">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_177_ctrl_178" style="border-color:black;border-style:none;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest173" testname="System.Web.UI.WebControls.DataGridItem: NotSet:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_179">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_179_ctrl_180" style="border-color:black;border-style:solid;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest174" testname="System.Web.UI.WebControls.DataGridItem: Outset:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_181">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_181_ctrl_182" style="border-color:black;border-style:outset;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest175" testname="System.Web.UI.WebControls.DataGridItem: Ridge:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_183">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_183_ctrl_184" style="border-color:black;border-style:ridge;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest176" testname="System.Web.UI.WebControls.DataGridItem: Solid:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_185">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_185_ctrl_186" style="border-color:black;border-style:solid;border-width:2px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest177" testname="System.Web.UI.WebControls.DataList: Default:">
-    <table id="ctrl_187" cellspacing="0" border="0" bordercolor="Black" style="border-collapse:collapse;border-color:black;border-style:dashed;border-width:2px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderWidth.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderWidth.aspx.xml
deleted file mode 100644
index fb0fe0d60c5..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_BorderWidth.aspx.xml
+++ /dev/null
@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set to 5:">
-    <input value="" style="border-style:solid;border-width:5px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set to Unit.Empty:">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set to negative value:">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Default">
-    <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Set to 5:">
-    <span style="border-style:solid;border-width:5px">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set to Unit.Empty:">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set to negative value:">
-    <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Default">
-    <a id="ctrl_8">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Set to 5:">
-    <a id="ctrl_9" style="border-style:solid;border-width:5px">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set to Unit.Empty:">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set to negative value:">
-    <a id="ctrl_11">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Default">
-    <img id="ctrl_12" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Set to 5:">
-    <img id="ctrl_13" alt="" style="border-style:solid;border-width:5px" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set to Unit.Empty:">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set to negative value:">
-    <img id="ctrl_15" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Default">
-    <input id="ctrl_16" alt="" border="0" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Set to 5:">
-    <input id="ctrl_17" alt="" style="border-style:solid;border-width:5px" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set to Unit.Empty:">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Set to negative value:">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Default">
-    <span id="ctrl_20">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Set to 5:">
-    <span id="ctrl_21" style="border-style:solid;border-width:5px">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set to Unit.Empty:">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Set to negative value:">
-    <span id="ctrl_23">
-    </span>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Default">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Set to 5:">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25" style="border-style:solid;border-width:5px">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set to Unit.Empty:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Set to negative value:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Default">
-    <div id="ctrl_28">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Set to 5:">
-    <div id="ctrl_29" style="border-style:solid;border-width:5px">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set to Unit.Empty:">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Set to negative value:">
-    <div id="ctrl_31">
-    </div>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Default">
-    <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Set to 5:">
-    <span style="border-style:solid;border-width:5px">
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set to Unit.Empty:">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Set to negative value:">
-    <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Default">
-    <input id="ctrl_36" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Set to 5:">
-    <input id="ctrl_37" style="border-style:solid;border-width:5px" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set to Unit.Empty:">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Set to negative value:">
-    <input id="ctrl_39" type="text" name="ctrl_39" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Default">
-    <select id="ctrl_40" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Set to 5:">
-    <select id="ctrl_41" style="border-style:solid;border-width:5px" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set to Unit.Empty:">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Set to negative value:">
-    <select id="ctrl_43" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Default">
-    <select id="ctrl_44" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Set to 5:">
-    <select id="ctrl_45" style="border-style:solid;border-width:5px" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set to Unit.Empty:">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Set to negative value:">
-    <select id="ctrl_47" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Default">
-    <table id="ctrl_48" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Set to 5:">
-    <table id="ctrl_49" style="border-style:solid;border-width:5px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set to Unit.Empty:">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Set to negative value:">
-    <table id="ctrl_51" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Default">
-    <table id="ctrl_52" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Set to 5:">
-    <table id="ctrl_53" style="border-style:solid;border-width:5px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set to Unit.Empty:">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Set to negative value:">
-    <table id="ctrl_55" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Default">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Set to 5:">
-    <table border="5" cellspacing="0" style="border-collapse:collapse;border-style:solid;border-width:5px" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set to Unit.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Set to negative value:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Default">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Set to 5:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63" style="border-style:solid;border-width:5px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set to Unit.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Set to negative value:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Default">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ControlStyle.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ControlStyle.aspx.xml
deleted file mode 100644
index 46941394f1f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ControlStyle.aspx.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default style">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Modified style">
-    <input value="" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.CheckBox: Default style">
-    <input id="ctrl_2" type="checkbox" name="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.CheckBox: Modified style">
-    <span style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-      <input id="ctrl_3" type="checkbox" name="ctrl_3" />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.HyperLink: Default style">
-    <a id="ctrl_4">
-    </a>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.HyperLink: Modified style">
-    <a id="ctrl_5" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Image: Default style">
-    <img id="ctrl_6" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Image: Modified style">
-    <img id="ctrl_7" alt="" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.ImageButton: Default style">
-    <input id="ctrl_8" alt="" border="0" type="image" name="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.ImageButton: Modified style">
-    <input id="ctrl_9" alt="" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" type="image" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Label: Default style">
-    <span id="ctrl_10">
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.Label: Modified style">
-    <span id="ctrl_11" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.LinkButton: Default style">
-    <a href="javascript:__doPostBack('ctrl_12','')" id="ctrl_12">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.LinkButton: Modified style">
-    <a href="javascript:__doPostBack('ctrl_13','')" id="ctrl_13" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Panel: Default style">
-    <div id="ctrl_14">
-    </div>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Panel: Modified style">
-    <div id="ctrl_15" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-    </div>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.RadioButton: Default style">
-    <input id="ctrl_16" type="radio" name="ctrl_16" value="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.RadioButton: Modified style">
-    <span style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-      <input id="ctrl_17" type="radio" name="ctrl_17" value="ctrl_17" />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.TextBox: Default style">
-    <input id="ctrl_18" type="text" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.TextBox: Modified style">
-    <input id="ctrl_19" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" type="text" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.DropDownList: Default style">
-    <select id="ctrl_20" name="ctrl_20">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.DropDownList: Modified style">
-    <select id="ctrl_21" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" name="ctrl_21">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ListBox: Default style">
-    <select id="ctrl_22" size="4" name="ctrl_22">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ListBox: Modified style">
-    <select id="ctrl_23" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" size="4" name="ctrl_23">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.RadioButtonList: Default style">
-    <table id="ctrl_24" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_24_0" type="radio" name="ctrl_24" value="1" />
-          <label for="ctrl_24_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_1" type="radio" name="ctrl_24" value="2" />
-          <label for="ctrl_24_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_2" type="radio" name="ctrl_24" value="3" />
-          <label for="ctrl_24_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_3" type="radio" name="ctrl_24" value="4" />
-          <label for="ctrl_24_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.RadioButtonList: Modified style">
-    <table id="ctrl_25" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" border="0" bordercolor="DeepSkyBlue">
-      <tr>
-        <td>
-          <input id="ctrl_25_0" type="radio" name="ctrl_25" value="1" />
-          <label for="ctrl_25_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_1" type="radio" name="ctrl_25" value="2" />
-          <label for="ctrl_25_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_2" type="radio" name="ctrl_25" value="3" />
-          <label for="ctrl_25_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_3" type="radio" name="ctrl_25" value="4" />
-          <label for="ctrl_25_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.CheckBoxList: Default style">
-    <table id="ctrl_26" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_26_0" type="checkbox" name="ctrl_26:0" />
-          <label for="ctrl_26_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_1" type="checkbox" name="ctrl_26:1" />
-          <label for="ctrl_26_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_2" type="checkbox" name="ctrl_26:2" />
-          <label for="ctrl_26_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_3" type="checkbox" name="ctrl_26:3" />
-          <label for="ctrl_26_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.CheckBoxList: Modified style">
-    <table id="ctrl_27" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" border="0" bordercolor="DeepSkyBlue">
-      <tr>
-        <td>
-          <input id="ctrl_27_0" type="checkbox" name="ctrl_27:0" />
-          <label for="ctrl_27_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_1" type="checkbox" name="ctrl_27:1" />
-          <label for="ctrl_27_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_2" type="checkbox" name="ctrl_27:2" />
-          <label for="ctrl_27_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_3" type="checkbox" name="ctrl_27:3" />
-          <label for="ctrl_27_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.DataGrid: Default style">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_28">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.DataGrid: Modified style">
-    <table border="2" cellspacing="0" style="background-color:fuchsia;border-collapse:collapse;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px" bordercolor="DeepSkyBlue" rules="all" id="ctrl_29">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.DataGridItem: Default style">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_30">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_30_ctrl_31">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DataGridItem: Modified style">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_32">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_32_ctrl_33" style="background-color:fuchsia;border-color:deepskyblue;border-style:ridge;border-width:2px;color:indianred;font-family:new roman times;font-size:larger;font-style:italic;font-weight:bold;height:30px;text-decoration:line-through overline underline;width:40px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.DataList: Default style">
-    <table id="ctrl_34" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ControlStyleCreated.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ControlStyleCreated.aspx.xml
deleted file mode 100644
index ccb8e3a61f0..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ControlStyleCreated.aspx.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.CheckBox: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.CheckBox: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.HyperLink: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.HyperLink: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Image: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Image: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.ImageButton: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.ImageButton: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Label: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.Label: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.LinkButton: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.LinkButton: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Panel: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Panel: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.RadioButton: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.RadioButton: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.TextBox: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.TextBox: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.DropDownList: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.DropDownList: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ListBox: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ListBox: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.RadioButtonList: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.RadioButtonList: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.CheckBoxList: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.CheckBoxList: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.DataGrid: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.DataGrid: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.DataGridItem: Default style">
-    <span>
-      <br />False</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DataGridItem: Modified style">
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.DataList: Default style">
-    <span>
-      <br />False</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_CopyBaseAttributes_W.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_CopyBaseAttributes_W.aspx.xml
deleted file mode 100644
index 4ae0db99cbd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_CopyBaseAttributes_W.aspx.xml
+++ /dev/null
@@ -1,985 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: AccessKey:">
-    <input value="" accesskey="Z" type="submit" name="ctrl_0" id="ctrl_0" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Enabled:">
-    <input value="" disabled="disabled" type="submit" name="ctrl_1" id="ctrl_1" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: ToolTip:">
-    <input value="" title="ToolTip text" type="submit" name="ctrl_2" id="ctrl_2" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: TabIndex:">
-    <input tabindex="5" value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Attributes:">
-    <input testattribute="TestAttribute Value" value="" type="submit" name="ctrl_4" id="ctrl_4" />
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: AccessKey:">
-    <input id="ctrl_5" accesskey="Z" type="checkbox" name="ctrl_5" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Enabled:">
-    <span disabled="disabled">
-      <input id="ctrl_6" disabled="disabled" type="checkbox" name="ctrl_6" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: ToolTip:">
-    <span title="ToolTip text">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: TabIndex:">
-    <input tabindex="5" id="ctrl_8" type="checkbox" name="ctrl_8" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Attributes:">
-    <span testattribute="TestAttribute Value">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: AccessKey:">
-    <a id="ctrl_10" accesskey="Z">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Enabled:">
-    <a id="ctrl_11" disabled="disabled">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: ToolTip:">
-    <a id="ctrl_12" title="ToolTip text">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: TabIndex:">
-    <a tabindex="5" id="ctrl_13">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Attributes:">
-    <a id="ctrl_14" testattribute="TestAttribute Value">
-    </a>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: AccessKey:">
-    <img id="ctrl_15" alt="" border="0" accesskey="Z" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Enabled:">
-    <img id="ctrl_16" alt="" border="0" disabled="disabled" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: ToolTip:">
-    <img id="ctrl_17" alt="" border="0" title="ToolTip text" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: TabIndex:">
-    <img tabindex="5" id="ctrl_18" alt="" border="0" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Attributes:">
-    <img id="ctrl_19" alt="" border="0" testattribute="TestAttribute Value" />
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: AccessKey:">
-    <input id="ctrl_20" alt="" accesskey="Z" type="image" name="ctrl_20" border="0" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Enabled:">
-    <input id="ctrl_21" alt="" border="0" disabled="disabled" type="image" name="ctrl_21" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: ToolTip:">
-    <input id="ctrl_22" alt="" border="0" title="ToolTip text" type="image" name="ctrl_22" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: TabIndex:">
-    <input tabindex="5" id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Attributes:">
-    <input id="ctrl_24" alt="" border="0" type="image" name="ctrl_24" testattribute="TestAttribute Value" />
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: AccessKey:">
-    <span id="ctrl_25" accesskey="Z">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Enabled:">
-    <span id="ctrl_26" disabled="disabled">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: ToolTip:">
-    <span id="ctrl_27" title="ToolTip text">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: TabIndex:">
-    <span tabindex="5" id="ctrl_28">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Attributes:">
-    <span id="ctrl_29" testattribute="TestAttribute Value">
-    </span>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: AccessKey:">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" accesskey="Z">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Enabled:">
-    <a id="ctrl_31" disabled="disabled">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: ToolTip:">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32" title="ToolTip text">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: TabIndex:">
-    <a href="javascript:__doPostBack('ctrl_33','')" tabindex="5" id="ctrl_33">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Attributes:">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" testattribute="TestAttribute Value">
-    </a>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: AccessKey:">
-    <div id="ctrl_35" accesskey="Z">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Enabled:">
-    <div id="ctrl_36" disabled="disabled">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: ToolTip:">
-    <div id="ctrl_37" title="ToolTip text">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: TabIndex:">
-    <div tabindex="5" id="ctrl_38">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Attributes:">
-    <div id="ctrl_39" testattribute="TestAttribute Value">
-    </div>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: AccessKey:">
-    <input id="ctrl_40" accesskey="Z" type="radio" name="ctrl_40" value="ctrl_40" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Enabled:">
-    <span disabled="disabled">
-      <input id="ctrl_41" disabled="disabled" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: ToolTip:">
-    <span title="ToolTip text">
-      <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: TabIndex:">
-    <input tabindex="5" id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Attributes:">
-    <span testattribute="TestAttribute Value">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: AccessKey:">
-    <input id="ctrl_45" accesskey="Z" type="text" name="ctrl_45" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Enabled:">
-    <input id="ctrl_46" disabled="disabled" type="text" name="ctrl_46" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: ToolTip:">
-    <input id="ctrl_47" title="ToolTip text" type="text" name="ctrl_47" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: TabIndex:">
-    <input tabindex="5" id="ctrl_48" type="text" name="ctrl_48" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Attributes:">
-    <input id="ctrl_49" type="text" name="ctrl_49" testattribute="TestAttribute Value" />
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: AccessKey:">
-    <select id="ctrl_50" accesskey="Z" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Enabled:">
-    <select id="ctrl_51" disabled="disabled" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: ToolTip:">
-    <select id="ctrl_52" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Failed. Result:. Expected Result:ToolTip text</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: TabIndex:">
-    <select tabindex="5" id="ctrl_53" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Attributes:">
-    <select id="ctrl_54" name="ctrl_54" testattribute="TestAttribute Value">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: AccessKey:">
-    <select id="ctrl_55" size="4" accesskey="Z" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Enabled:">
-    <select id="ctrl_56" size="4" disabled="disabled" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: ToolTip:">
-    <select id="ctrl_57" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Failed. Result:. Expected Result:ToolTip text</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: TabIndex:">
-    <select tabindex="5" id="ctrl_58" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Attributes:">
-    <select id="ctrl_59" size="4" name="ctrl_59" testattribute="TestAttribute Value">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: AccessKey:">
-    <table id="ctrl_60" border="0" accesskey="Z">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Enabled:">
-    <table id="ctrl_61" border="0" disabled="disabled">
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_61_0" disabled="disabled" type="radio" name="ctrl_61" value="1" />
-            <label for="ctrl_61_0">aaaa</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_61_1" disabled="disabled" type="radio" name="ctrl_61" value="2" />
-            <label for="ctrl_61_1">bbbb</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_61_2" disabled="disabled" type="radio" name="ctrl_61" value="3" />
-            <label for="ctrl_61_2">cccc</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_61_3" disabled="disabled" type="radio" name="ctrl_61" value="4" />
-            <label for="ctrl_61_3">dddd</label>
-          </span>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: ToolTip:">
-    <table id="ctrl_62" border="0" title="ToolTip text">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: TabIndex:">
-    <table id="ctrl_63" border="0">
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Attributes:">
-    <table id="ctrl_64" border="0" testattribute="TestAttribute Value">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: AccessKey:">
-    <table id="ctrl_65" border="0" accesskey="Z">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Enabled:">
-    <table id="ctrl_66" border="0" disabled="disabled">
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_66_0" disabled="disabled" type="checkbox" name="ctrl_66:0" />
-            <label for="ctrl_66_0">aaaa</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_66_1" disabled="disabled" type="checkbox" name="ctrl_66:1" />
-            <label for="ctrl_66_1">bbbb</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_66_2" disabled="disabled" type="checkbox" name="ctrl_66:2" />
-            <label for="ctrl_66_2">cccc</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_66_3" disabled="disabled" type="checkbox" name="ctrl_66:3" />
-            <label for="ctrl_66_3">dddd</label>
-          </span>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: ToolTip:">
-    <table id="ctrl_67" border="0" title="ToolTip text">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: TabIndex:">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="5" id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Attributes:">
-    <table id="ctrl_69" border="0" testattribute="TestAttribute Value">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: AccessKey:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" accesskey="Z" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Enabled:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" disabled="disabled" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: ToolTip:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" title="ToolTip text" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: TabIndex:">
-    <table tabindex="5" border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Attributes:">
-    <table border="1" cellspacing="0" id="ctrl_74" style="border-collapse:collapse" rules="all" testattribute="TestAttribute Value">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: AccessKey:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" accesskey="Z">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Enabled:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" disabled="disabled">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: ToolTip:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80" title="ToolTip text">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: TabIndex:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr tabindex="5" id="ctrl_81_ctrl_82">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Attributes:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" testattribute="TestAttribute Value">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />key = TestAttribute Value = TestAttribute Value</span>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: AccessKey:">
-    <table id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse" accesskey="Z">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_CssClass.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_CssClass.aspx.xml
deleted file mode 100644
index 9fecb916f0e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_CssClass.aspx.xml
+++ /dev/null
@@ -1,781 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: CssStyle1">
-    <input value="" type="submit" name="ctrl_0" class="CssStyle1" id="ctrl_0" />
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: CssStyle2">
-    <input value="" type="submit" name="ctrl_1" class="CssStyle2" id="ctrl_1" />
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Not-existing CssClass:">
-    <input value="" type="submit" name="ctrl_2" class="Not-existing CssClass:" id="ctrl_2" />
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Default CssClass:">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: CssStyle1">
-    <span class="CssStyle1">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: CssStyle2">
-    <span class="CssStyle2">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Not-existing CssClass:">
-    <span class="Not-existing CssClass:">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Default CssClass:">
-    <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: CssStyle1">
-    <a id="ctrl_8" class="CssStyle1">
-    </a>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: CssStyle2">
-    <a id="ctrl_9" class="CssStyle2">
-    </a>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Not-existing CssClass:">
-    <a id="ctrl_10" class="Not-existing CssClass:">
-    </a>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Default CssClass:">
-    <a id="ctrl_11">
-    </a>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: CssStyle1">
-    <img id="ctrl_12" alt="" border="0" class="CssStyle1" />
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: CssStyle2">
-    <img id="ctrl_13" alt="" border="0" class="CssStyle2" />
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Not-existing CssClass:">
-    <img id="ctrl_14" alt="" border="0" class="Not-existing CssClass:" />
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Default CssClass:">
-    <img id="ctrl_15" alt="" border="0" />
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: CssStyle1">
-    <input id="ctrl_16" alt="" border="0" type="image" name="ctrl_16" class="CssStyle1" />
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: CssStyle2">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" class="CssStyle2" />
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Not-existing CssClass:">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" class="Not-existing CssClass:" />
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Default CssClass:">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" />
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: CssStyle1">
-    <span id="ctrl_20" class="CssStyle1">
-    </span>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: CssStyle2">
-    <span id="ctrl_21" class="CssStyle2">
-    </span>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Not-existing CssClass:">
-    <span id="ctrl_22" class="Not-existing CssClass:">
-    </span>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Default CssClass:">
-    <span id="ctrl_23">
-    </span>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: CssStyle1">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" class="CssStyle1">
-    </a>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: CssStyle2">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25" class="CssStyle2">
-    </a>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Not-existing CssClass:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26" class="Not-existing CssClass:">
-    </a>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Default CssClass:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27">
-    </a>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: CssStyle1">
-    <div id="ctrl_28" class="CssStyle1">
-    </div>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: CssStyle2">
-    <div id="ctrl_29" class="CssStyle2">
-    </div>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Not-existing CssClass:">
-    <div id="ctrl_30" class="Not-existing CssClass:">
-    </div>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Default CssClass:">
-    <div id="ctrl_31">
-    </div>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: CssStyle1">
-    <span class="CssStyle1">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: CssStyle2">
-    <span class="CssStyle2">
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Not-existing CssClass:">
-    <span class="Not-existing CssClass:">
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Default CssClass:">
-    <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: CssStyle1">
-    <input id="ctrl_36" type="text" name="ctrl_36" class="CssStyle1" />
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: CssStyle2">
-    <input id="ctrl_37" type="text" name="ctrl_37" class="CssStyle2" />
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Not-existing CssClass:">
-    <input id="ctrl_38" type="text" name="ctrl_38" class="Not-existing CssClass:" />
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Default CssClass:">
-    <input id="ctrl_39" type="text" name="ctrl_39" />
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: CssStyle1">
-    <select id="ctrl_40" name="ctrl_40" class="CssStyle1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: CssStyle2">
-    <select id="ctrl_41" name="ctrl_41" class="CssStyle2">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Not-existing CssClass:">
-    <select id="ctrl_42" name="ctrl_42" class="Not-existing CssClass:">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Default CssClass:">
-    <select id="ctrl_43" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: CssStyle1">
-    <select id="ctrl_44" size="4" name="ctrl_44" class="CssStyle1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: CssStyle2">
-    <select id="ctrl_45" size="4" name="ctrl_45" class="CssStyle2">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Not-existing CssClass:">
-    <select id="ctrl_46" size="4" name="ctrl_46" class="Not-existing CssClass:">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Default CssClass:">
-    <select id="ctrl_47" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: CssStyle1">
-    <table id="ctrl_48" border="0" class="CssStyle1">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: CssStyle2">
-    <table id="ctrl_49" border="0" class="CssStyle2">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Not-existing CssClass:">
-    <table id="ctrl_50" border="0" class="Not-existing CssClass:">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Default CssClass:">
-    <table id="ctrl_51" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: CssStyle1">
-    <table id="ctrl_52" border="0" class="CssStyle1">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: CssStyle2">
-    <table id="ctrl_53" border="0" class="CssStyle2">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Not-existing CssClass:">
-    <table id="ctrl_54" border="0" class="Not-existing CssClass:">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Default CssClass:">
-    <table id="ctrl_55" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: CssStyle1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssStyle1" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: CssStyle2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssStyle2" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Not-existing CssClass:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="Not-existing CssClass:" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Default CssClass:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: CssStyle1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" class="CssStyle1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle1</span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: CssStyle2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63" class="CssStyle2">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = CssStyle2</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Not-existing CssClass:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65" class="Not-existing CssClass:">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = Not-existing CssClass:</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Default CssClass:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />CssClass = </span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: CssStyle1">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse" class="CssStyle1">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Enabled.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Enabled.aspx.xml
deleted file mode 100644
index 615ca3c9d7c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Enabled.aspx.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Enabled">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Disabled">
-    <input value="" disabled="disabled" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.CheckBox: Enabled">
-    <input id="ctrl_2" type="checkbox" name="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.CheckBox: Disabled">
-    <span disabled="disabled">
-      <input id="ctrl_3" disabled="disabled" type="checkbox" name="ctrl_3" />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.HyperLink: Enabled">
-    <a id="ctrl_4">
-    </a>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.HyperLink: Disabled">
-    <a id="ctrl_5" disabled="disabled">
-    </a>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Image: Enabled">
-    <img id="ctrl_6" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Image: Disabled">
-    <img id="ctrl_7" alt="" border="0" disabled="disabled" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.ImageButton: Enabled">
-    <input id="ctrl_8" alt="" border="0" type="image" name="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.ImageButton: Disabled">
-    <input id="ctrl_9" alt="" border="0" disabled="disabled" type="image" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Label: Enabled">
-    <span id="ctrl_10">
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.Label: Disabled">
-    <span id="ctrl_11" disabled="disabled">
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.LinkButton: Enabled">
-    <a href="javascript:__doPostBack('ctrl_12','')" id="ctrl_12">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.LinkButton: Disabled">
-    <a id="ctrl_13" disabled="disabled">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Panel: Enabled">
-    <div id="ctrl_14">
-    </div>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Panel: Disabled">
-    <div id="ctrl_15" disabled="disabled">
-    </div>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.RadioButton: Enabled">
-    <input id="ctrl_16" type="radio" name="ctrl_16" value="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.RadioButton: Disabled">
-    <span disabled="disabled">
-      <input id="ctrl_17" disabled="disabled" type="radio" name="ctrl_17" value="ctrl_17" />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.TextBox: Enabled">
-    <input id="ctrl_18" type="text" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.TextBox: Disabled">
-    <input id="ctrl_19" disabled="disabled" type="text" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.DropDownList: Enabled">
-    <select id="ctrl_20" name="ctrl_20">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.DropDownList: Disabled">
-    <select id="ctrl_21" disabled="disabled" name="ctrl_21">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ListBox: Enabled">
-    <select id="ctrl_22" size="4" name="ctrl_22">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ListBox: Disabled">
-    <select id="ctrl_23" size="4" disabled="disabled" name="ctrl_23">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.RadioButtonList: Enabled">
-    <table id="ctrl_24" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_24_0" type="radio" name="ctrl_24" value="1" />
-          <label for="ctrl_24_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_1" type="radio" name="ctrl_24" value="2" />
-          <label for="ctrl_24_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_2" type="radio" name="ctrl_24" value="3" />
-          <label for="ctrl_24_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_3" type="radio" name="ctrl_24" value="4" />
-          <label for="ctrl_24_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.RadioButtonList: Disabled">
-    <table id="ctrl_25" border="0" disabled="disabled">
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_25_0" disabled="disabled" type="radio" name="ctrl_25" value="1" />
-            <label for="ctrl_25_0">aaaa</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_25_1" disabled="disabled" type="radio" name="ctrl_25" value="2" />
-            <label for="ctrl_25_1">bbbb</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_25_2" disabled="disabled" type="radio" name="ctrl_25" value="3" />
-            <label for="ctrl_25_2">cccc</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_25_3" disabled="disabled" type="radio" name="ctrl_25" value="4" />
-            <label for="ctrl_25_3">dddd</label>
-          </span>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.CheckBoxList: Enabled">
-    <table id="ctrl_26" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_26_0" type="checkbox" name="ctrl_26:0" />
-          <label for="ctrl_26_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_1" type="checkbox" name="ctrl_26:1" />
-          <label for="ctrl_26_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_2" type="checkbox" name="ctrl_26:2" />
-          <label for="ctrl_26_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_3" type="checkbox" name="ctrl_26:3" />
-          <label for="ctrl_26_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.CheckBoxList: Disabled">
-    <table id="ctrl_27" border="0" disabled="disabled">
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_27_0" disabled="disabled" type="checkbox" name="ctrl_27:0" />
-            <label for="ctrl_27_0">aaaa</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_27_1" disabled="disabled" type="checkbox" name="ctrl_27:1" />
-            <label for="ctrl_27_1">bbbb</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_27_2" disabled="disabled" type="checkbox" name="ctrl_27:2" />
-            <label for="ctrl_27_2">cccc</label>
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <span disabled="disabled">
-            <input id="ctrl_27_3" disabled="disabled" type="checkbox" name="ctrl_27:3" />
-            <label for="ctrl_27_3">dddd</label>
-          </span>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.DataGrid: Enabled">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_28">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.DataGrid: Disabled">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" disabled="disabled" rules="all" id="ctrl_29">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.DataGridItem: Enabled">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_30">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_30_ctrl_31">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DataGridItem: Disabled">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_32">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_32_ctrl_33" disabled="disabled">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.DataList: Enabled">
-    <table id="ctrl_34" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Font.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Font.aspx.xml
deleted file mode 100644
index 85ef693b63d..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Font.aspx.xml
+++ /dev/null
@@ -1,1569 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Bold">
-    <input value="" style="font-weight:bold" type="submit" name="ctrl_0" id="ctrl_0" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Italic">
-    <input value="" style="font-style:italic" type="submit" name="ctrl_1" id="ctrl_1" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Name ">
-    <input value="" style="font-family:console lucida" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Names">
-    <input value="" style="font-family:console,courier verdana,lucida" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Overline">
-    <input value="" style="text-decoration:overline" type="submit" name="ctrl_4" id="ctrl_4" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Button: FontSize">
-    <input value="" style="font-size:xx-large" type="submit" name="ctrl_5" id="ctrl_5" />
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Button: Strikeout">
-    <input value="" style="text-decoration:line-through" type="submit" name="ctrl_6" id="ctrl_6" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Button: Underline">
-    <input value="" style="text-decoration:underline" type="submit" name="ctrl_7" id="ctrl_7" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Bold">
-    <span style="font-weight:bold">
-      <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Italic">
-    <span style="font-style:italic">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBox: Name ">
-    <span style="font-family:console lucida">
-      <input id="ctrl_10" type="checkbox" name="ctrl_10" />
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBox: Names">
-    <span style="font-family:console,courier verdana,lucida">
-      <input id="ctrl_11" type="checkbox" name="ctrl_11" />
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.CheckBox: Overline">
-    <span style="text-decoration:overline">
-      <input id="ctrl_12" type="checkbox" name="ctrl_12" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBox: FontSize">
-    <span style="font-size:xx-large">
-      <input id="ctrl_13" type="checkbox" name="ctrl_13" />
-    </span>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.CheckBox: Strikeout">
-    <span style="text-decoration:line-through">
-      <input id="ctrl_14" type="checkbox" name="ctrl_14" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.CheckBox: Underline">
-    <span style="text-decoration:underline">
-      <input id="ctrl_15" type="checkbox" name="ctrl_15" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.HyperLink: Bold">
-    <a id="ctrl_16" style="font-weight:bold">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.HyperLink: Italic">
-    <a id="ctrl_17" style="font-style:italic">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.HyperLink: Name ">
-    <a id="ctrl_18" style="font-family:console lucida">
-    </a>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.HyperLink: Names">
-    <a id="ctrl_19" style="font-family:console,courier verdana,lucida">
-    </a>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.HyperLink: Overline">
-    <a id="ctrl_20" style="text-decoration:overline">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: FontSize">
-    <a id="ctrl_21" style="font-size:xx-large">
-    </a>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.HyperLink: Strikeout">
-    <a id="ctrl_22" style="text-decoration:line-through">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.HyperLink: Underline">
-    <a id="ctrl_23" style="text-decoration:underline">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Image: Bold">
-    <img id="ctrl_24" alt="" border="0" style="font-weight:bold" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Image: Italic">
-    <img id="ctrl_25" alt="" border="0" style="font-style:italic" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Image: Name ">
-    <img id="ctrl_26" alt="" border="0" style="font-family:console lucida" />
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Image: Names">
-    <img id="ctrl_27" alt="" border="0" style="font-family:console,courier verdana,lucida" />
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Image: Overline">
-    <img id="ctrl_28" alt="" border="0" style="text-decoration:overline" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Image: FontSize">
-    <img id="ctrl_29" alt="" border="0" style="font-size:xx-large" />
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Image: Strikeout">
-    <img id="ctrl_30" alt="" border="0" style="text-decoration:line-through" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Image: Underline">
-    <img id="ctrl_31" alt="" border="0" style="text-decoration:underline" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ImageButton: Bold">
-    <input id="ctrl_32" alt="" border="0" style="font-weight:bold" type="image" name="ctrl_32" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.ImageButton: Italic">
-    <input id="ctrl_33" alt="" border="0" style="font-style:italic" type="image" name="ctrl_33" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.ImageButton: Name ">
-    <input id="ctrl_34" alt="" border="0" style="font-family:console lucida" type="image" name="ctrl_34" />
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.ImageButton: Names">
-    <input id="ctrl_35" alt="" border="0" style="font-family:console,courier verdana,lucida" type="image" name="ctrl_35" />
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.ImageButton: Overline">
-    <input id="ctrl_36" alt="" border="0" style="text-decoration:overline" type="image" name="ctrl_36" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.ImageButton: FontSize">
-    <input id="ctrl_37" alt="" border="0" style="font-size:xx-large" type="image" name="ctrl_37" />
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.ImageButton: Strikeout">
-    <input id="ctrl_38" alt="" border="0" style="text-decoration:line-through" type="image" name="ctrl_38" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.ImageButton: Underline">
-    <input id="ctrl_39" alt="" border="0" style="text-decoration:underline" type="image" name="ctrl_39" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.Label: Bold">
-    <span id="ctrl_40" style="font-weight:bold">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.Label: Italic">
-    <span id="ctrl_41" style="font-style:italic">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.Label: Name ">
-    <span id="ctrl_42" style="font-family:console lucida">
-    </span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.Label: Names">
-    <span id="ctrl_43" style="font-family:console,courier verdana,lucida">
-    </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.Label: Overline">
-    <span id="ctrl_44" style="text-decoration:overline">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.Label: FontSize">
-    <span id="ctrl_45" style="font-size:xx-large">
-    </span>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.Label: Strikeout">
-    <span id="ctrl_46" style="text-decoration:line-through">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.Label: Underline">
-    <span id="ctrl_47" style="text-decoration:underline">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.LinkButton: Bold">
-    <a href="javascript:__doPostBack('ctrl_48','')" id="ctrl_48" style="font-weight:bold">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.LinkButton: Italic">
-    <a href="javascript:__doPostBack('ctrl_49','')" id="ctrl_49" style="font-style:italic">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.LinkButton: Name ">
-    <a href="javascript:__doPostBack('ctrl_50','')" id="ctrl_50" style="font-family:console lucida">
-    </a>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.LinkButton: Names">
-    <a href="javascript:__doPostBack('ctrl_51','')" id="ctrl_51" style="font-family:console,courier verdana,lucida">
-    </a>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.LinkButton: Overline">
-    <a href="javascript:__doPostBack('ctrl_52','')" id="ctrl_52" style="text-decoration:overline">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.LinkButton: FontSize">
-    <a href="javascript:__doPostBack('ctrl_53','')" id="ctrl_53" style="font-size:xx-large">
-    </a>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.LinkButton: Strikeout">
-    <a href="javascript:__doPostBack('ctrl_54','')" id="ctrl_54" style="text-decoration:line-through">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.LinkButton: Underline">
-    <a href="javascript:__doPostBack('ctrl_55','')" id="ctrl_55" style="text-decoration:underline">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.Panel: Bold">
-    <div id="ctrl_56" style="font-weight:bold">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.Panel: Italic">
-    <div id="ctrl_57" style="font-style:italic">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.Panel: Name ">
-    <div id="ctrl_58" style="font-family:console lucida">
-    </div>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.Panel: Names">
-    <div id="ctrl_59" style="font-family:console,courier verdana,lucida">
-    </div>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.Panel: Overline">
-    <div id="ctrl_60" style="text-decoration:overline">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.Panel: FontSize">
-    <div id="ctrl_61" style="font-size:xx-large">
-    </div>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.Panel: Strikeout">
-    <div id="ctrl_62" style="text-decoration:line-through">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.Panel: Underline">
-    <div id="ctrl_63" style="text-decoration:underline">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButton: Bold">
-    <span style="font-weight:bold">
-      <input id="ctrl_64" type="radio" name="ctrl_64" value="ctrl_64" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.RadioButton: Italic">
-    <span style="font-style:italic">
-      <input id="ctrl_65" type="radio" name="ctrl_65" value="ctrl_65" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.RadioButton: Name ">
-    <span style="font-family:console lucida">
-      <input id="ctrl_66" type="radio" name="ctrl_66" value="ctrl_66" />
-    </span>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.RadioButton: Names">
-    <span style="font-family:console,courier verdana,lucida">
-      <input id="ctrl_67" type="radio" name="ctrl_67" value="ctrl_67" />
-    </span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.RadioButton: Overline">
-    <span style="text-decoration:overline">
-      <input id="ctrl_68" type="radio" name="ctrl_68" value="ctrl_68" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.RadioButton: FontSize">
-    <span style="font-size:xx-large">
-      <input id="ctrl_69" type="radio" name="ctrl_69" value="ctrl_69" />
-    </span>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.RadioButton: Strikeout">
-    <span style="text-decoration:line-through">
-      <input id="ctrl_70" type="radio" name="ctrl_70" value="ctrl_70" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.RadioButton: Underline">
-    <span style="text-decoration:underline">
-      <input id="ctrl_71" type="radio" name="ctrl_71" value="ctrl_71" />
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.TextBox: Bold">
-    <input id="ctrl_72" style="font-weight:bold" type="text" name="ctrl_72" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.TextBox: Italic">
-    <input id="ctrl_73" style="font-style:italic" type="text" name="ctrl_73" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.TextBox: Name ">
-    <input id="ctrl_74" style="font-family:console lucida" type="text" name="ctrl_74" />
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.TextBox: Names">
-    <input id="ctrl_75" style="font-family:console,courier verdana,lucida" type="text" name="ctrl_75" />
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.TextBox: Overline">
-    <input id="ctrl_76" style="text-decoration:overline" type="text" name="ctrl_76" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.TextBox: FontSize">
-    <input id="ctrl_77" style="font-size:xx-large" type="text" name="ctrl_77" />
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.TextBox: Strikeout">
-    <input id="ctrl_78" style="text-decoration:line-through" type="text" name="ctrl_78" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.TextBox: Underline">
-    <input id="ctrl_79" style="text-decoration:underline" type="text" name="ctrl_79" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DropDownList: Bold">
-    <select id="ctrl_80" style="font-weight:bold" name="ctrl_80">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.WebControls.DropDownList: Italic">
-    <select id="ctrl_81" style="font-style:italic" name="ctrl_81">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.WebControls.DropDownList: Name ">
-    <select id="ctrl_82" style="font-family:console lucida" name="ctrl_82">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.WebControls.DropDownList: Names">
-    <select id="ctrl_83" style="font-family:console,courier verdana,lucida" name="ctrl_83">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.WebControls.DropDownList: Overline">
-    <select id="ctrl_84" style="text-decoration:overline" name="ctrl_84">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.WebControls.DropDownList: FontSize">
-    <select id="ctrl_85" style="font-size:xx-large" name="ctrl_85">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.WebControls.DropDownList: Strikeout">
-    <select id="ctrl_86" style="text-decoration:line-through" name="ctrl_86">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.WebControls.DropDownList: Underline">
-    <select id="ctrl_87" style="text-decoration:underline" name="ctrl_87">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.WebControls.ListBox: Bold">
-    <select id="ctrl_88" style="font-weight:bold" size="4" name="ctrl_88">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.WebControls.ListBox: Italic">
-    <select id="ctrl_89" style="font-style:italic" size="4" name="ctrl_89">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.WebControls.ListBox: Name ">
-    <select id="ctrl_90" style="font-family:console lucida" size="4" name="ctrl_90">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.WebControls.ListBox: Names">
-    <select id="ctrl_91" style="font-family:console,courier verdana,lucida" size="4" name="ctrl_91">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.WebControls.ListBox: Overline">
-    <select id="ctrl_92" style="text-decoration:overline" size="4" name="ctrl_92">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.WebControls.ListBox: FontSize">
-    <select id="ctrl_93" style="font-size:xx-large" size="4" name="ctrl_93">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.WebControls.ListBox: Strikeout">
-    <select id="ctrl_94" style="text-decoration:line-through" size="4" name="ctrl_94">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.WebControls.ListBox: Underline">
-    <select id="ctrl_95" style="text-decoration:underline" size="4" name="ctrl_95">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.WebControls.RadioButtonList: Bold">
-    <table id="ctrl_96" style="font-weight:bold" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_96_0" type="radio" name="ctrl_96" value="1" />
-          <label for="ctrl_96_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_1" type="radio" name="ctrl_96" value="2" />
-          <label for="ctrl_96_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_2" type="radio" name="ctrl_96" value="3" />
-          <label for="ctrl_96_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_3" type="radio" name="ctrl_96" value="4" />
-          <label for="ctrl_96_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.WebControls.RadioButtonList: Italic">
-    <table id="ctrl_97" style="font-style:italic" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_97_0" type="radio" name="ctrl_97" value="1" />
-          <label for="ctrl_97_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_1" type="radio" name="ctrl_97" value="2" />
-          <label for="ctrl_97_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_2" type="radio" name="ctrl_97" value="3" />
-          <label for="ctrl_97_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_3" type="radio" name="ctrl_97" value="4" />
-          <label for="ctrl_97_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.WebControls.RadioButtonList: Name ">
-    <table id="ctrl_98" style="font-family:console lucida" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_98_0" type="radio" name="ctrl_98" value="1" />
-          <label for="ctrl_98_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_98_1" type="radio" name="ctrl_98" value="2" />
-          <label for="ctrl_98_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_98_2" type="radio" name="ctrl_98" value="3" />
-          <label for="ctrl_98_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_98_3" type="radio" name="ctrl_98" value="4" />
-          <label for="ctrl_98_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.WebControls.RadioButtonList: Names">
-    <table id="ctrl_99" style="font-family:console,courier verdana,lucida" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_99_0" type="radio" name="ctrl_99" value="1" />
-          <label for="ctrl_99_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_99_1" type="radio" name="ctrl_99" value="2" />
-          <label for="ctrl_99_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_99_2" type="radio" name="ctrl_99" value="3" />
-          <label for="ctrl_99_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_99_3" type="radio" name="ctrl_99" value="4" />
-          <label for="ctrl_99_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.WebControls.RadioButtonList: Overline">
-    <table id="ctrl_100" style="text-decoration:overline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_100_0" type="radio" name="ctrl_100" value="1" />
-          <label for="ctrl_100_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_100_1" type="radio" name="ctrl_100" value="2" />
-          <label for="ctrl_100_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_100_2" type="radio" name="ctrl_100" value="3" />
-          <label for="ctrl_100_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_100_3" type="radio" name="ctrl_100" value="4" />
-          <label for="ctrl_100_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.WebControls.RadioButtonList: FontSize">
-    <table id="ctrl_101" style="font-size:xx-large" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_101_0" type="radio" name="ctrl_101" value="1" />
-          <label for="ctrl_101_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_101_1" type="radio" name="ctrl_101" value="2" />
-          <label for="ctrl_101_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_101_2" type="radio" name="ctrl_101" value="3" />
-          <label for="ctrl_101_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_101_3" type="radio" name="ctrl_101" value="4" />
-          <label for="ctrl_101_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.WebControls.RadioButtonList: Strikeout">
-    <table id="ctrl_102" style="text-decoration:line-through" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_102_0" type="radio" name="ctrl_102" value="1" />
-          <label for="ctrl_102_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_102_1" type="radio" name="ctrl_102" value="2" />
-          <label for="ctrl_102_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_102_2" type="radio" name="ctrl_102" value="3" />
-          <label for="ctrl_102_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_102_3" type="radio" name="ctrl_102" value="4" />
-          <label for="ctrl_102_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.WebControls.RadioButtonList: Underline">
-    <table id="ctrl_103" style="text-decoration:underline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_103_0" type="radio" name="ctrl_103" value="1" />
-          <label for="ctrl_103_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_103_1" type="radio" name="ctrl_103" value="2" />
-          <label for="ctrl_103_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_103_2" type="radio" name="ctrl_103" value="3" />
-          <label for="ctrl_103_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_103_3" type="radio" name="ctrl_103" value="4" />
-          <label for="ctrl_103_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.WebControls.CheckBoxList: Bold">
-    <table id="ctrl_104" style="font-weight:bold" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_104_0" type="checkbox" name="ctrl_104:0" />
-          <label for="ctrl_104_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_104_1" type="checkbox" name="ctrl_104:1" />
-          <label for="ctrl_104_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_104_2" type="checkbox" name="ctrl_104:2" />
-          <label for="ctrl_104_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_104_3" type="checkbox" name="ctrl_104:3" />
-          <label for="ctrl_104_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.WebControls.CheckBoxList: Italic">
-    <table id="ctrl_105" style="font-style:italic" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_105_0" type="checkbox" name="ctrl_105:0" />
-          <label for="ctrl_105_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_105_1" type="checkbox" name="ctrl_105:1" />
-          <label for="ctrl_105_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_105_2" type="checkbox" name="ctrl_105:2" />
-          <label for="ctrl_105_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_105_3" type="checkbox" name="ctrl_105:3" />
-          <label for="ctrl_105_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.WebControls.CheckBoxList: Name ">
-    <table id="ctrl_106" style="font-family:console lucida" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_106_0" type="checkbox" name="ctrl_106:0" />
-          <label for="ctrl_106_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_106_1" type="checkbox" name="ctrl_106:1" />
-          <label for="ctrl_106_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_106_2" type="checkbox" name="ctrl_106:2" />
-          <label for="ctrl_106_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_106_3" type="checkbox" name="ctrl_106:3" />
-          <label for="ctrl_106_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.WebControls.CheckBoxList: Names">
-    <table id="ctrl_107" style="font-family:console,courier verdana,lucida" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_107_0" type="checkbox" name="ctrl_107:0" />
-          <label for="ctrl_107_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_107_1" type="checkbox" name="ctrl_107:1" />
-          <label for="ctrl_107_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_107_2" type="checkbox" name="ctrl_107:2" />
-          <label for="ctrl_107_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_107_3" type="checkbox" name="ctrl_107:3" />
-          <label for="ctrl_107_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.WebControls.CheckBoxList: Overline">
-    <table id="ctrl_108" style="text-decoration:overline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_108_0" type="checkbox" name="ctrl_108:0" />
-          <label for="ctrl_108_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_1" type="checkbox" name="ctrl_108:1" />
-          <label for="ctrl_108_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_2" type="checkbox" name="ctrl_108:2" />
-          <label for="ctrl_108_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_3" type="checkbox" name="ctrl_108:3" />
-          <label for="ctrl_108_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.WebControls.CheckBoxList: FontSize">
-    <table id="ctrl_109" style="font-size:xx-large" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_109_0" type="checkbox" name="ctrl_109:0" />
-          <label for="ctrl_109_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_1" type="checkbox" name="ctrl_109:1" />
-          <label for="ctrl_109_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_2" type="checkbox" name="ctrl_109:2" />
-          <label for="ctrl_109_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_3" type="checkbox" name="ctrl_109:3" />
-          <label for="ctrl_109_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.WebControls.CheckBoxList: Strikeout">
-    <table id="ctrl_110" style="text-decoration:line-through" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_110_0" type="checkbox" name="ctrl_110:0" />
-          <label for="ctrl_110_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_1" type="checkbox" name="ctrl_110:1" />
-          <label for="ctrl_110_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_2" type="checkbox" name="ctrl_110:2" />
-          <label for="ctrl_110_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_3" type="checkbox" name="ctrl_110:3" />
-          <label for="ctrl_110_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.WebControls.CheckBoxList: Underline">
-    <table id="ctrl_111" style="text-decoration:underline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_111_0" type="checkbox" name="ctrl_111:0" />
-          <label for="ctrl_111_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_1" type="checkbox" name="ctrl_111:1" />
-          <label for="ctrl_111_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_2" type="checkbox" name="ctrl_111:2" />
-          <label for="ctrl_111_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_3" type="checkbox" name="ctrl_111:3" />
-          <label for="ctrl_111_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest113" testname="System.Web.UI.WebControls.DataGrid: Bold">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-weight:bold" rules="all" id="ctrl_112">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest114" testname="System.Web.UI.WebControls.DataGrid: Italic">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-style:italic" rules="all" id="ctrl_113">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest115" testname="System.Web.UI.WebControls.DataGrid: Name ">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:console lucida" rules="all" id="ctrl_114">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest116" testname="System.Web.UI.WebControls.DataGrid: Names">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:console,courier verdana,lucida" rules="all" id="ctrl_115">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest117" testname="System.Web.UI.WebControls.DataGrid: Overline">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;text-decoration:overline" rules="all" id="ctrl_116">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest118" testname="System.Web.UI.WebControls.DataGrid: FontSize">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-size:xx-large" rules="all" id="ctrl_117">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest119" testname="System.Web.UI.WebControls.DataGrid: Strikeout">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;text-decoration:line-through" rules="all" id="ctrl_118">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest120" testname="System.Web.UI.WebControls.DataGrid: Underline">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;text-decoration:underline" rules="all" id="ctrl_119">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest121" testname="System.Web.UI.WebControls.DataGridItem: Bold">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_120">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_120_ctrl_121" style="font-weight:bold">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest122" testname="System.Web.UI.WebControls.DataGridItem: Italic">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_122">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_122_ctrl_123" style="font-style:italic">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest123" testname="System.Web.UI.WebControls.DataGridItem: Name ">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_124">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_124_ctrl_125" style="font-family:console lucida">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest124" testname="System.Web.UI.WebControls.DataGridItem: Names">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_126">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_126_ctrl_127" style="font-family:console,courier verdana,lucida">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest125" testname="System.Web.UI.WebControls.DataGridItem: Overline">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_128">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_128_ctrl_129" style="text-decoration:overline">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest126" testname="System.Web.UI.WebControls.DataGridItem: FontSize">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_130">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_130_ctrl_131" style="font-size:xx-large">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />XX-Large</span>
-  </div>
-  <div id="GHTSubTest127" testname="System.Web.UI.WebControls.DataGridItem: Strikeout">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_132">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_132_ctrl_133" style="text-decoration:line-through">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest128" testname="System.Web.UI.WebControls.DataGridItem: Underline">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_134">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_134_ctrl_135" style="text-decoration:underline">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest129" testname="System.Web.UI.WebControls.DataList: Bold">
-    <table id="ctrl_136" cellspacing="0" border="0" style="border-collapse:collapse;font-weight:bold">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ForeColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ForeColor.aspx.xml
deleted file mode 100644
index 63444f23208..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ForeColor.aspx.xml
+++ /dev/null
@@ -1,653 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Named color:">
-    <input value="" style="color:goldenrod" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Color.Empty:">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Default:">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Using RGB:">
-    <input value="" style="color:#55aaff" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Named color:">
-    <span style="color:goldenrod">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Color.Empty:">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Default:">
-    <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Using RGB:">
-    <span style="color:#55aaff">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Named color:">
-    <a id="ctrl_8" style="color:goldenrod">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Color.Empty:">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Default:">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Using RGB:">
-    <a id="ctrl_11" style="color:#55aaff">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Named color:">
-    <img id="ctrl_12" alt="" border="0" style="color:goldenrod" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Color.Empty:">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Default:">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Using RGB:">
-    <img id="ctrl_15" alt="" border="0" style="color:#55aaff" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Named color:">
-    <input id="ctrl_16" alt="" border="0" style="color:goldenrod" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Color.Empty:">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Default:">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Using RGB:">
-    <input id="ctrl_19" alt="" border="0" style="color:#55aaff" type="image" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Named color:">
-    <span id="ctrl_20" style="color:goldenrod">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Color.Empty:">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Default:">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Using RGB:">
-    <span id="ctrl_23" style="color:#55aaff">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Named color:">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="color:goldenrod">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Color.Empty:">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Default:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Using RGB:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" style="color:#55aaff">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Named color:">
-    <div id="ctrl_28" style="color:goldenrod">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Color.Empty:">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Default:">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Using RGB:">
-    <div id="ctrl_31" style="color:#55aaff">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Named color:">
-    <span style="color:goldenrod">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Color.Empty:">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Default:">
-    <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Using RGB:">
-    <span style="color:#55aaff">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Named color:">
-    <input id="ctrl_36" style="color:goldenrod" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Color.Empty:">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Default:">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Using RGB:">
-    <input id="ctrl_39" style="color:#55aaff" type="text" name="ctrl_39" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Named color:">
-    <select id="ctrl_40" style="color:goldenrod" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Color.Empty:">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Default:">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Using RGB:">
-    <select id="ctrl_43" style="color:#55aaff" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Named color:">
-    <select id="ctrl_44" style="color:goldenrod" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Color.Empty:">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Default:">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Using RGB:">
-    <select id="ctrl_47" style="color:#55aaff" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Named color:">
-    <table id="ctrl_48" style="color:goldenrod" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Color.Empty:">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Default:">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Using RGB:">
-    <table id="ctrl_51" style="color:#55aaff" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Named color:">
-    <table id="ctrl_52" style="color:goldenrod" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Color.Empty:">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Default:">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Using RGB:">
-    <table id="ctrl_55" style="color:#55aaff" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Named color:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:goldenrod" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Color.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Default:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Using RGB:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:#55aaff" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Named color:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="color:goldenrod">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Color.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Default:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Using RGB:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" style="color:#55aaff">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Named color:">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse;color:goldenrod">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Height.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Height.aspx.xml
deleted file mode 100644
index 52626aef1ee..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Height.aspx.xml
+++ /dev/null
@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set to 50:">
-    <input value="" style="height:50px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set to Unit.Empty:">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Negative value:">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Default">
-    <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Set to 50:">
-    <span style="height:50px">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set to Unit.Empty:">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Negative value:">
-    <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Default">
-    <a id="ctrl_8">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Set to 50:">
-    <a id="ctrl_9" style="height:50px">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set to Unit.Empty:">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Negative value:">
-    <a id="ctrl_11">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Default">
-    <img id="ctrl_12" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Set to 50:">
-    <img id="ctrl_13" alt="" border="0" style="height:50px" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set to Unit.Empty:">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Negative value:">
-    <img id="ctrl_15" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Default">
-    <input id="ctrl_16" alt="" border="0" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Set to 50:">
-    <input id="ctrl_17" alt="" border="0" style="height:50px" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set to Unit.Empty:">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Negative value:">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Default">
-    <span id="ctrl_20">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Set to 50:">
-    <span id="ctrl_21" style="height:50px">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set to Unit.Empty:">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Negative value:">
-    <span id="ctrl_23">
-    </span>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Default">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Set to 50:">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25" style="height:50px">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set to Unit.Empty:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Negative value:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Default">
-    <div id="ctrl_28">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Set to 50:">
-    <div id="ctrl_29" style="height:50px">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set to Unit.Empty:">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Negative value:">
-    <div id="ctrl_31">
-    </div>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Default">
-    <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Set to 50:">
-    <span style="height:50px">
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set to Unit.Empty:">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Negative value:">
-    <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Default">
-    <input id="ctrl_36" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Set to 50:">
-    <input id="ctrl_37" style="height:50px" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set to Unit.Empty:">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Negative value:">
-    <input id="ctrl_39" type="text" name="ctrl_39" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Default">
-    <select id="ctrl_40" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Set to 50:">
-    <select id="ctrl_41" style="height:50px" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set to Unit.Empty:">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Negative value:">
-    <select id="ctrl_43" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Default">
-    <select id="ctrl_44" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Set to 50:">
-    <select id="ctrl_45" style="height:50px" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set to Unit.Empty:">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Negative value:">
-    <select id="ctrl_47" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Default">
-    <table id="ctrl_48" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Set to 50:">
-    <table id="ctrl_49" style="height:50px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set to Unit.Empty:">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Negative value:">
-    <table id="ctrl_51" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Default">
-    <table id="ctrl_52" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Set to 50:">
-    <table id="ctrl_53" style="height:50px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set to Unit.Empty:">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Negative value:">
-    <table id="ctrl_55" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Default">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Set to 50:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;height:50px" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set to Unit.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Negative value:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Default">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Set to 50:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63" style="height:50px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set to Unit.Empty:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Negative value:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Default">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_MergeStyle_S.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_MergeStyle_S.aspx.xml
deleted file mode 100644
index 69e045cec74..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_MergeStyle_S.aspx.xml
+++ /dev/null
@@ -1,653 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Empty style + Empty style:">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Empty style + Non-Empty style:">
-    <input value="" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Non-Empty style + Empty style:">
-    <input value="" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Non-Empty old style + Non-Empty new style:">
-    <input value="" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Empty style + Empty style:">
-    <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Empty style + Non-Empty style:">
-    <span style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Non-Empty style + Empty style:">
-    <span style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Non-Empty old style + Non-Empty new style:">
-    <span style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Empty style + Empty style:">
-    <a id="ctrl_8">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Empty style + Non-Empty style:">
-    <a id="ctrl_9" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Non-Empty style + Empty style:">
-    <a id="ctrl_10" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Non-Empty old style + Non-Empty new style:">
-    <a id="ctrl_11" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Empty style + Empty style:">
-    <img id="ctrl_12" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Empty style + Non-Empty style:">
-    <img id="ctrl_13" alt="" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Non-Empty style + Empty style:">
-    <img id="ctrl_14" alt="" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Non-Empty old style + Non-Empty new style:">
-    <img id="ctrl_15" alt="" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Empty style + Empty style:">
-    <input id="ctrl_16" alt="" border="0" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Empty style + Non-Empty style:">
-    <input id="ctrl_17" alt="" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Non-Empty style + Empty style:">
-    <input id="ctrl_18" alt="" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Non-Empty old style + Non-Empty new style:">
-    <input id="ctrl_19" alt="" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" type="image" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Empty style + Empty style:">
-    <span id="ctrl_20">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Empty style + Non-Empty style:">
-    <span id="ctrl_21" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Non-Empty style + Empty style:">
-    <span id="ctrl_22" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Non-Empty old style + Non-Empty new style:">
-    <span id="ctrl_23" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Empty style + Empty style:">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Empty style + Non-Empty style:">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Non-Empty style + Empty style:">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Non-Empty old style + Non-Empty new style:">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Empty style + Empty style:">
-    <div id="ctrl_28">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Empty style + Non-Empty style:">
-    <div id="ctrl_29" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Non-Empty style + Empty style:">
-    <div id="ctrl_30" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Non-Empty old style + Non-Empty new style:">
-    <div id="ctrl_31" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Empty style + Empty style:">
-    <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Empty style + Non-Empty style:">
-    <span style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Non-Empty style + Empty style:">
-    <span style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Non-Empty old style + Non-Empty new style:">
-    <span style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Empty style + Empty style:">
-    <input id="ctrl_36" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Empty style + Non-Empty style:">
-    <input id="ctrl_37" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Non-Empty style + Empty style:">
-    <input id="ctrl_38" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Non-Empty old style + Non-Empty new style:">
-    <input id="ctrl_39" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" type="text" name="ctrl_39" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Empty style + Empty style:">
-    <select id="ctrl_40" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Empty style + Non-Empty style:">
-    <select id="ctrl_41" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Non-Empty style + Empty style:">
-    <select id="ctrl_42" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Non-Empty old style + Non-Empty new style:">
-    <select id="ctrl_43" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" name="ctrl_43">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Empty style + Empty style:">
-    <select id="ctrl_44" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Empty style + Non-Empty style:">
-    <select id="ctrl_45" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Non-Empty style + Empty style:">
-    <select id="ctrl_46" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Non-Empty old style + Non-Empty new style:">
-    <select id="ctrl_47" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" size="4" name="ctrl_47">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Empty style + Empty style:">
-    <table id="ctrl_48" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Empty style + Non-Empty style:">
-    <table id="ctrl_49" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" border="0" bordercolor="YellowGreen">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Non-Empty style + Empty style:">
-    <table id="ctrl_50" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" border="0" bordercolor="AliceBlue">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Non-Empty old style + Non-Empty new style:">
-    <table id="ctrl_51" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" border="0" bordercolor="AliceBlue">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Empty style + Empty style:">
-    <table id="ctrl_52" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Empty style + Non-Empty style:">
-    <table id="ctrl_53" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" border="0" bordercolor="YellowGreen">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Non-Empty style + Empty style:">
-    <table id="ctrl_54" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" border="0" bordercolor="AliceBlue">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Non-Empty old style + Non-Empty new style:">
-    <table id="ctrl_55" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" border="0" bordercolor="AliceBlue">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Empty style + Empty style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Empty style + Non-Empty style:">
-    <table border="10" cellspacing="0" style="background-color:yellowgreen;border-collapse:collapse;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px" bordercolor="YellowGreen" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Non-Empty style + Empty style:">
-    <table border="1" cellspacing="0" style="background-color:aliceblue;border-collapse:collapse;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px" bordercolor="AliceBlue" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Non-Empty old style + Non-Empty new style:">
-    <table border="1" cellspacing="0" style="background-color:aliceblue;border-collapse:collapse;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px" bordercolor="AliceBlue" rules="all" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Empty style + Empty style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Empty style + Non-Empty style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63" style="background-color:yellowgreen;border-color:yellowgreen;border-style:solid;border-width:10px;color:yellowgreen;font-family:courier,david;font-size:xx-large;font-style:italic;font-weight:bold;height:80px;text-decoration:line-through overline underline;width:80px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Non-Empty style + Empty style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;height:40px;width:40px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Non-Empty old style + Non-Empty new style:">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" style="background-color:aliceblue;border-color:aliceblue;border-style:dashed;border-width:1px;color:aliceblue;font-family:arial,verdana;font-size:small;font-style:italic;font-weight:bold;height:40px;text-decoration:line-through overline underline;width:40px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Empty style + Empty style:">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_RenderBeginTag_H.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_RenderBeginTag_H.aspx.xml
deleted file mode 100644
index a3ad6cc0b52..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_RenderBeginTag_H.aspx.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: RenderBeginTag">
-    <span>
-      <br />
-      <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.CheckBox: RenderBeginTag">
-    <span>
-      <br />
-      <input id="ctrl_1" />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.HyperLink: RenderBeginTag">
-    <span>
-      <br />
-      <a id="ctrl_2">
-      </a>
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Image: RenderBeginTag">
-    <span>
-      <br />
-      <img id="ctrl_3" alt="" border="0" />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.ImageButton: RenderBeginTag">
-    <span>
-      <br />
-      <input id="ctrl_4" alt="" border="0" type="image" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Label: RenderBeginTag">
-    <span>
-      <br />
-      <span id="ctrl_5">
-      </span>
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.LinkButton: RenderBeginTag">
-    <span>
-      <br />
-      <a id="ctrl_6">
-      </a>
-    </span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_RenderEndTag_H.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_RenderEndTag_H.aspx.xml
deleted file mode 100644
index 3045f0fa863..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_RenderEndTag_H.aspx.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: RenderEndTag">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.CheckBox: RenderEndTag">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.HyperLink: RenderEndTag">
-    <span>
-      <br />&lt;/a&gt;</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Image: RenderEndTag">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.ImageButton: RenderEndTag">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Label: RenderEndTag">
-    <span>
-      <br />&lt;/span&gt;</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.LinkButton: RenderEndTag">
-    <span>
-      <br />&lt;/a&gt;</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Panel: RenderEndTag">
-    <span>
-      <br />
-&lt;/div&gt;</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.RadioButton: RenderEndTag">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.TextBox: RenderEndTag">
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.DropDownList: RenderEndTag">
-    <span>
-      <br />
-&lt;/select&gt;</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.ListBox: RenderEndTag">
-    <span>
-      <br />
-&lt;/select&gt;</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.RadioButtonList: RenderEndTag">
-    <span>
-      <br />
-&lt;/select&gt;</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBoxList: RenderEndTag">
-    <span>
-      <br />
-&lt;/select&gt;</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: RenderEndTag">
-    <span>
-      <br />&lt;/span&gt;</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataGridItem: RenderEndTag">
-    <span>
-      <br />
-&lt;/tr&gt;</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.DataList: RenderEndTag">
-    <span>
-      <br />&lt;/span&gt;</span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.DataListItem: RenderEndTag">
-    <span>
-      <br />&lt;/span&gt;</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Table: RenderEndTag">
-    <span>
-      <br />
-&lt;/table&gt;</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.TableCell: RenderEndTag">
-    <span>
-      <br />&lt;/td&gt;</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.TableHeaderCell: RenderEndTag">
-    <span>
-      <br />&lt;/th&gt;</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.TableRow: RenderEndTag">
-    <span>
-      <br />
-&lt;/tr&gt;</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style.aspx.xml
deleted file mode 100644
index df74e57ce75..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style.aspx.xml
+++ /dev/null
@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest24" style="height:56px;width:104px">
-    <input value="Button" style="color:firebrick;height:40px;width:120px" type="submit" name="Button2" id="Button2" />
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest25" style="height:56px;width:104px">
-    <span style="color:firebrick;height:40px;width:120px">
-      <input id="Checkbox2" type="checkbox" name="Checkbox2" />
-    </span>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest26" style="height:56px;width:104px">
-    <a id="Hyperlink2" style="color:firebrick;height:40px;width:120px">HyperLink</a>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest27" style="height:56px;width:104px">
-    <img id="Image2" alt="" border="0" style="color:firebrick;height:40px;width:120px" />
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest28" style="height:56px;width:104px">
-    <input id="Imagebutton2" alt="" border="0" style="color:firebrick;height:40px;width:120px" type="image" name="Imagebutton2" />
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest29" style="height:56px;width:104px">
-    <span id="Label2" style="color:firebrick;height:40px;width:120px">Label</span>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest30" style="height:56px;width:104px">
-    <a href="javascript:__doPostBack('Linkbutton2','')" id="Linkbutton2" style="color:firebrick;height:40px;width:120px">LinkButton</a>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest31" style="height:56px;width:104px">
-    <div id="Panel2" style="color:firebrick;height:40px;width:120px">
-		Panel
-	</div>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest32" style="height:56px;width:104px">
-    <span style="color:firebrick;height:40px;width:120px">
-      <input id="Radiobutton2" type="radio" name="Radiobutton2" value="Radiobutton2" />
-    </span>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest33" style="height:56px;width:104px">
-    <input id="Textbox2" style="color:firebrick;height:40px;width:120px" type="text" name="Textbox2" />
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest34" style="height:56px;width:104px">
-    <select id="Dropdownlist2" style="color:firebrick;height:40px;width:120px" name="Dropdownlist2">
-      <option value="Item1" />Item1
-		<option value="Item2" />Item2
-
-	</select>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest35" style="height:56px;width:104px">
-    <select id="Listbox2" style="color:firebrick;height:40px;width:120px" size="4" name="Listbox2">
-      <option value="Item1" />Item1
-		<option value="Item2" />Item2
-
-	</select>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest36" style="height:56px;width:104px">
-    <table id="Radiobuttonlist2" style="color:firebrick;height:40px;width:120px" border="0">
-      <tr>
-        <td>
-          <input id="Radiobuttonlist2_0" type="radio" name="Radiobuttonlist2" value="Item1" />
-          <label for="Radiobuttonlist2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="Radiobuttonlist2_1" type="radio" name="Radiobuttonlist2" value="Item2" />
-          <label for="Radiobuttonlist2_1">Item2</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest37" style="height:56px;width:104px">
-    <table id="Checkboxlist2" style="color:firebrick;height:40px;width:120px" border="0">
-      <tr>
-        <td>
-          <input id="Checkboxlist2_0" type="checkbox" name="Checkboxlist2:0" />
-          <label for="Checkboxlist2_0">Item1</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="Checkboxlist2_1" type="checkbox" name="Checkboxlist2:1" />
-          <label for="Checkboxlist2_1">Item2</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest38" style="height:56px;width:104px">
-  </div>
-  <div id="GHTSubTest39" style="height:56px;width:104px">
-  </div>
-  <div id="GHTSubTest40" style="height:56px;width:104px">
-  </div>
-  <div id="GHTSubTest41" style="height:56px;width:104px">
-  </div>
-  <div id="GHTSubTest42" style="height:56px;width:104px">
-  </div>
-  <div id="GHTSubTest43" style="height:56px;width:104px">
-  </div>
-  <div id="GHTSubTest44" style="height:56px;width:104px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:firebrick;height:40px;width:120px" rules="all" id="Datagrid3">
-      <tr>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>aaa</td>
-      </tr>
-      <tr>
-        <td>bbb</td>
-      </tr>
-      <tr>
-        <td>ccc</td>
-      </tr>
-      <tr>
-        <td>ddd</td>
-      </tr>
-      <tr>
-        <td>eee</td>
-      </tr>
-      <tr>
-        <td>fff</td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest45" style="height:56px;width:104px">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:firebrick;height:40px;width:120px" rules="all" id="Datagrid4">
-      <tr>
-        <td>Item</td>
-      </tr>
-      <tr>
-        <td>aaa</td>
-      </tr>
-      <tr>
-        <td>bbb</td>
-      </tr>
-      <tr>
-        <td>ccc</td>
-      </tr>
-      <tr>
-        <td>ddd</td>
-      </tr>
-      <tr>
-        <td>eee</td>
-      </tr>
-      <tr>
-        <td>fff</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest46" style="height:56px;width:104px">
-    <table id="Datalist3" cellspacing="0" border="0" style="border-collapse:collapse;color:firebrick;height:40px;width:120px">
-      <tr>
-        <td>
-          <b>
-            <tr>
-              <td>Items</td>
-            </tr>
-          </b>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>aaa</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>bbb</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>ccc</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>ddd</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>eee</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>fff</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest47" style="height:56px;width:104px">
-    <table id="Datalist4" cellspacing="0" border="0" style="border-collapse:collapse;color:firebrick;height:40px;width:120px">
-      <tr>
-        <td>
-          <b>
-            <tr>
-              <td>items</td>
-            </tr>
-          </b>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>aaa</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>bbb</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>ccc</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>ddd</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>eee</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <tr>
-            <td>fff</td>
-            <p />
-          </tr>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest48" style="height:56px;width:104px">
-    <table id="Table4" style="color:firebrick;height:40px;width:120px" border="0">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr>
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest49" style="height:56px;width:104px">
-    <table id="Table6" style="color:firebrick;height:40px;width:120px" border="0">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr>
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest50" style="height:56px;width:104px">
-    <table id="Table7" style="color:firebrick;height:40px;width:120px" border="0">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr>
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest51" style="height:56px;width:104px">
-    <table id="Table8" style="color:firebrick;height:40px;width:120px" border="0">
-      <tr>
-        <td>Header cell</td>
-      </tr>
-      <tr>
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Key: COLOR Value: firebrick</span>
-  </div>
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default attributes">
-    <input value="" style="addedstyleattribute:value" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.CheckBox: Default attributes">
-    <span style="addedstyleattribute:value">
-      <input id="ctrl_1" type="checkbox" name="ctrl_1" />
-    </span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.HyperLink: Default attributes">
-    <a id="ctrl_2" style="addedstyleattribute:value">
-    </a>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Image: Default attributes">
-    <img id="ctrl_3" alt="" border="0" style="addedstyleattribute:value" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.ImageButton: Default attributes">
-    <input id="ctrl_4" alt="" border="0" style="addedstyleattribute:value" type="image" name="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Label: Default attributes">
-    <span id="ctrl_5" style="addedstyleattribute:value">
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.LinkButton: Default attributes">
-    <a href="javascript:__doPostBack('ctrl_6','')" id="ctrl_6" style="addedstyleattribute:value">
-    </a>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Panel: Default attributes">
-    <div id="ctrl_7" style="addedstyleattribute:value">
-    </div>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.RadioButton: Default attributes">
-    <span style="addedstyleattribute:value">
-      <input id="ctrl_8" type="radio" name="ctrl_8" value="ctrl_8" />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.TextBox: Default attributes">
-    <input id="ctrl_9" style="addedstyleattribute:value" type="text" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.DropDownList: Default attributes">
-    <select id="ctrl_10" style="addedstyleattribute:value" name="ctrl_10">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.ListBox: Default attributes">
-    <select id="ctrl_11" style="addedstyleattribute:value" size="4" name="ctrl_11">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.RadioButtonList: Default attributes">
-    <table id="ctrl_12" style="addedstyleattribute:value" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_12_0" type="radio" name="ctrl_12" value="1" />
-          <label for="ctrl_12_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_1" type="radio" name="ctrl_12" value="2" />
-          <label for="ctrl_12_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_2" type="radio" name="ctrl_12" value="3" />
-          <label for="ctrl_12_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_3" type="radio" name="ctrl_12" value="4" />
-          <label for="ctrl_12_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBoxList: Default attributes">
-    <table id="ctrl_13" style="addedstyleattribute:value" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_13_0" type="checkbox" name="ctrl_13:0" />
-          <label for="ctrl_13_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_1" type="checkbox" name="ctrl_13:1" />
-          <label for="ctrl_13_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_2" type="checkbox" name="ctrl_13:2" />
-          <label for="ctrl_13_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_3" type="checkbox" name="ctrl_13:3" />
-          <label for="ctrl_13_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: Default attributes">
-    <table border="1" cellspacing="0" style="addedstyleattribute:value;border-collapse:collapse" rules="all" id="ctrl_14">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataGridItem: Default attributes">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_15">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_15_ctrl_16" style="addedstyleattribute:value">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.DataList: Default attributes">
-    <table id="ctrl_17" cellspacing="0" border="0" style="addedstyleattribute:value;border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_BackColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_BackColor.aspx.xml
deleted file mode 100644
index e719875336e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_BackColor.aspx.xml
+++ /dev/null
@@ -1,817 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Set color once">
-    <input value="" style="background-color:cyan" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set color twice">
-    <input value="" style="background-color:purple" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set empty color.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set transparent color.">
-    <input value="" style="background-color:transparent" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set color and CssClass.">
-    <input value="" style="background-color:forestgreen" type="submit" name="ctrl_4" class="CssClass1" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Set color once">
-    <span style="background-color:cyan">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set color twice">
-    <span style="background-color:purple">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set empty color.">
-    <span>
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set transparent color.">
-    <span style="background-color:transparent">
-      <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set color and CssClass.">
-    <span style="background-color:forestgreen" class="CssClass1">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set color once">
-    <a id="ctrl_10" style="background-color:cyan">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set color twice">
-    <a id="ctrl_11" style="background-color:purple">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: Set empty color.">
-    <a id="ctrl_12">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: Set transparent color.">
-    <a id="ctrl_13" style="background-color:transparent">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Set color and CssClass.">
-    <a id="ctrl_14" style="background-color:forestgreen" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set color once">
-    <img id="ctrl_15" alt="" border="0" style="background-color:cyan" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Set color twice">
-    <img id="ctrl_16" alt="" border="0" style="background-color:purple" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: Set empty color.">
-    <img id="ctrl_17" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: Set transparent color.">
-    <img id="ctrl_18" alt="" border="0" style="background-color:transparent" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Set color and CssClass.">
-    <img id="ctrl_19" alt="" border="0" style="background-color:forestgreen" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: Set color once">
-    <input id="ctrl_20" alt="" border="0" style="background-color:cyan" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Set color twice">
-    <input id="ctrl_21" alt="" border="0" style="background-color:purple" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: Set empty color.">
-    <input id="ctrl_22" alt="" border="0" type="image" name="ctrl_22" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Set transparent color.">
-    <input id="ctrl_23" alt="" border="0" style="background-color:transparent" type="image" name="ctrl_23" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Set color and CssClass.">
-    <input id="ctrl_24" alt="" border="0" style="background-color:forestgreen" type="image" name="ctrl_24" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: Set color once">
-    <span id="ctrl_25" style="background-color:cyan">
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Set color twice">
-    <span id="ctrl_26" style="background-color:purple">
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: Set empty color.">
-    <span id="ctrl_27">
-    </span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: Set transparent color.">
-    <span id="ctrl_28" style="background-color:transparent">
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Set color and CssClass.">
-    <span id="ctrl_29" style="background-color:forestgreen" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: Set color once">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" style="background-color:cyan">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Set color twice">
-    <a href="javascript:__doPostBack('ctrl_31','')" id="ctrl_31" style="background-color:purple">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: Set empty color.">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32">
-    </a>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: Set transparent color.">
-    <a href="javascript:__doPostBack('ctrl_33','')" id="ctrl_33" style="background-color:transparent">
-    </a>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Set color and CssClass.">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" style="background-color:forestgreen" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: Set color once">
-    <div id="ctrl_35" style="background-color:cyan">
-    </div>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Set color twice">
-    <div id="ctrl_36" style="background-color:purple">
-    </div>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: Set empty color.">
-    <div id="ctrl_37">
-    </div>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: Set transparent color.">
-    <div id="ctrl_38" style="background-color:transparent">
-    </div>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Set color and CssClass.">
-    <div id="ctrl_39" style="background-color:forestgreen" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: Set color once">
-    <span style="background-color:cyan">
-      <input id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Set color twice">
-    <span style="background-color:purple">
-      <input id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: Set empty color.">
-    <span>
-      <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    </span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: Set transparent color.">
-    <span style="background-color:transparent">
-      <input id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Set color and CssClass.">
-    <span style="background-color:forestgreen" class="CssClass1">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: Set color once">
-    <input id="ctrl_45" style="background-color:cyan" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Set color twice">
-    <input id="ctrl_46" style="background-color:purple" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: Set empty color.">
-    <input id="ctrl_47" type="text" name="ctrl_47" />
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: Set transparent color.">
-    <input id="ctrl_48" style="background-color:transparent" type="text" name="ctrl_48" />
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Set color and CssClass.">
-    <input id="ctrl_49" style="background-color:forestgreen" type="text" name="ctrl_49" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: Set color once">
-    <select id="ctrl_50" style="background-color:cyan" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Set color twice">
-    <select id="ctrl_51" style="background-color:purple" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: Set empty color.">
-    <select id="ctrl_52" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: Set transparent color.">
-    <select id="ctrl_53" style="background-color:transparent" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Set color and CssClass.">
-    <select id="ctrl_54" style="background-color:forestgreen" name="ctrl_54" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: Set color once">
-    <select id="ctrl_55" style="background-color:cyan" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Set color twice">
-    <select id="ctrl_56" style="background-color:purple" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: Set empty color.">
-    <select id="ctrl_57" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: Set transparent color.">
-    <select id="ctrl_58" style="background-color:transparent" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Set color and CssClass.">
-    <select id="ctrl_59" style="background-color:forestgreen" size="4" name="ctrl_59" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: Set color once">
-    <table id="ctrl_60" style="background-color:cyan" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Set color twice">
-    <table id="ctrl_61" style="background-color:purple" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: Set empty color.">
-    <table id="ctrl_62" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: Set transparent color.">
-    <table id="ctrl_63" style="background-color:transparent" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Set color and CssClass.">
-    <table id="ctrl_64" style="background-color:forestgreen" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: Set color once">
-    <table id="ctrl_65" style="background-color:cyan" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Set color twice">
-    <table id="ctrl_66" style="background-color:purple" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: Set empty color.">
-    <table id="ctrl_67" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Set transparent color.">
-    <table id="ctrl_68" style="background-color:transparent" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Set color and CssClass.">
-    <table id="ctrl_69" style="background-color:forestgreen" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Set color once">
-    <table border="1" cellspacing="0" style="background-color:cyan;border-collapse:collapse" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Set color twice">
-    <table border="1" cellspacing="0" style="background-color:purple;border-collapse:collapse" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: Set empty color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: Set transparent color.">
-    <table border="1" cellspacing="0" style="background-color:transparent;border-collapse:collapse" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Set color and CssClass.">
-    <table border="1" cellspacing="0" style="background-color:forestgreen;border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: Set color once">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" style="background-color:cyan">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Set color twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" style="background-color:purple">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: Set empty color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: Set transparent color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_81_ctrl_82" style="background-color:transparent">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Set color and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" style="background-color:forestgreen" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: Set color once">
-    <table id="ctrl_85" cellspacing="0" border="0" style="background-color:cyan;border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Border.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Border.aspx.xml
deleted file mode 100644
index 27f81a269ab..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Border.aspx.xml
+++ /dev/null
@@ -1,1457 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Normal Values.">
-    <input value="" style="border-color:sienna;border-style:ridge;border-width:9px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: BorderStyle = none.">
-    <input value="" style="border-color:turquoise;border-style:none;border-width:12px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: BorderStyle = NotSet.">
-    <input value="" style="border-color:fuchsia;border-style:solid;border-width:20px" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: BorderColor = Empty.">
-    <input value="" style="border-style:inset;border-width:12px" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: BorderColor = Transparent.">
-    <input value="" style="border-color:transparent;border-style:groove;border-width:12px" type="submit" name="ctrl_4" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Button: BorderWidth = 0.">
-    <input value="" style="border-color:tomato;border-style:double;border-width:0px" type="submit" name="ctrl_5" id="ctrl_5" />
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Button: Set BorderWidth and CssClass.">
-    <input value="" style="border-style:solid;border-width:20px" type="submit" name="ctrl_6" class="CssClass1" id="ctrl_6" />
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Button: Set BorderStyle and CssClass.">
-    <input value="" style="border-style:dotted" type="submit" name="ctrl_7" class="CssClass1" id="ctrl_7" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.Button: Set BorderColor and CssClass.">
-    <input value="" style="border-color:silver" type="submit" name="ctrl_8" class="CssClass1" id="ctrl_8" />
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Normal Values.">
-    <span style="border-color:sienna;border-style:ridge;border-width:9px">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBox: BorderStyle = none.">
-    <span style="border-color:turquoise;border-style:none;border-width:12px">
-      <input id="ctrl_10" type="checkbox" name="ctrl_10" />
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBox: BorderStyle = NotSet.">
-    <span style="border-color:fuchsia;border-style:solid;border-width:20px">
-      <input id="ctrl_11" type="checkbox" name="ctrl_11" />
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.CheckBox: BorderColor = Empty.">
-    <span style="border-style:inset;border-width:12px">
-      <input id="ctrl_12" type="checkbox" name="ctrl_12" />
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBox: BorderColor = Transparent.">
-    <span style="border-color:transparent;border-style:groove;border-width:12px">
-      <input id="ctrl_13" type="checkbox" name="ctrl_13" />
-    </span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.CheckBox: BorderWidth = 0.">
-    <span style="border-color:tomato;border-style:double;border-width:0px">
-      <input id="ctrl_14" type="checkbox" name="ctrl_14" />
-    </span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.CheckBox: Set BorderWidth and CssClass.">
-    <span style="border-style:solid;border-width:20px" class="CssClass1">
-      <input id="ctrl_15" type="checkbox" name="ctrl_15" />
-    </span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.CheckBox: Set BorderStyle and CssClass.">
-    <span style="border-style:dotted" class="CssClass1">
-      <input id="ctrl_16" type="checkbox" name="ctrl_16" />
-    </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.CheckBox: Set BorderColor and CssClass.">
-    <span style="border-color:silver" class="CssClass1">
-      <input id="ctrl_17" type="checkbox" name="ctrl_17" />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.HyperLink: Normal Values.">
-    <a id="ctrl_18" style="border-color:sienna;border-style:ridge;border-width:9px">
-    </a>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.HyperLink: BorderStyle = none.">
-    <a id="ctrl_19" style="border-color:turquoise;border-style:none;border-width:12px">
-    </a>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.HyperLink: BorderStyle = NotSet.">
-    <a id="ctrl_20" style="border-color:fuchsia;border-style:solid;border-width:20px">
-    </a>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: BorderColor = Empty.">
-    <a id="ctrl_21" style="border-style:inset;border-width:12px">
-    </a>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.HyperLink: BorderColor = Transparent.">
-    <a id="ctrl_22" style="border-color:transparent;border-style:groove;border-width:12px">
-    </a>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.HyperLink: BorderWidth = 0.">
-    <a id="ctrl_23" style="border-color:tomato;border-style:double;border-width:0px">
-    </a>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.HyperLink: Set BorderWidth and CssClass.">
-    <a id="ctrl_24" style="border-style:solid;border-width:20px" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.HyperLink: Set BorderStyle and CssClass.">
-    <a id="ctrl_25" style="border-style:dotted" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.HyperLink: Set BorderColor and CssClass.">
-    <a id="ctrl_26" style="border-color:silver" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Image: Normal Values.">
-    <img id="ctrl_27" alt="" style="border-color:sienna;border-style:ridge;border-width:9px" />
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Image: BorderStyle = none.">
-    <img id="ctrl_28" alt="" style="border-color:turquoise;border-style:none;border-width:12px" />
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Image: BorderStyle = NotSet.">
-    <img id="ctrl_29" alt="" style="border-color:fuchsia;border-style:solid;border-width:20px" />
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Image: BorderColor = Empty.">
-    <img id="ctrl_30" alt="" style="border-style:inset;border-width:12px" />
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Image: BorderColor = Transparent.">
-    <img id="ctrl_31" alt="" style="border-color:transparent;border-style:groove;border-width:12px" />
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.Image: BorderWidth = 0.">
-    <img id="ctrl_32" alt="" style="border-color:tomato;border-style:double;border-width:0px" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.Image: Set BorderWidth and CssClass.">
-    <img id="ctrl_33" alt="" style="border-style:solid;border-width:20px" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.Image: Set BorderStyle and CssClass.">
-    <img id="ctrl_34" alt="" border="0" style="border-style:dotted" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Image: Set BorderColor and CssClass.">
-    <img id="ctrl_35" alt="" border="0" style="border-color:silver" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.ImageButton: Normal Values.">
-    <input id="ctrl_36" alt="" style="border-color:sienna;border-style:ridge;border-width:9px" type="image" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.ImageButton: BorderStyle = none.">
-    <input id="ctrl_37" alt="" style="border-color:turquoise;border-style:none;border-width:12px" type="image" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.ImageButton: BorderStyle = NotSet.">
-    <input id="ctrl_38" alt="" style="border-color:fuchsia;border-style:solid;border-width:20px" type="image" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.ImageButton: BorderColor = Empty.">
-    <input id="ctrl_39" alt="" style="border-style:inset;border-width:12px" type="image" name="ctrl_39" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.ImageButton: BorderColor = Transparent.">
-    <input id="ctrl_40" alt="" style="border-color:transparent;border-style:groove;border-width:12px" type="image" name="ctrl_40" />
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.ImageButton: BorderWidth = 0.">
-    <input id="ctrl_41" alt="" style="border-color:tomato;border-style:double;border-width:0px" type="image" name="ctrl_41" />
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.ImageButton: Set BorderWidth and CssClass.">
-    <input id="ctrl_42" alt="" style="border-style:solid;border-width:20px" type="image" name="ctrl_42" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.ImageButton: Set BorderStyle and CssClass.">
-    <input id="ctrl_43" alt="" border="0" style="border-style:dotted" type="image" name="ctrl_43" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ImageButton: Set BorderColor and CssClass.">
-    <input id="ctrl_44" alt="" border="0" style="border-color:silver" type="image" name="ctrl_44" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.Label: Normal Values.">
-    <span id="ctrl_45" style="border-color:sienna;border-style:ridge;border-width:9px">
-    </span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.Label: BorderStyle = none.">
-    <span id="ctrl_46" style="border-color:turquoise;border-style:none;border-width:12px">
-    </span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.Label: BorderStyle = NotSet.">
-    <span id="ctrl_47" style="border-color:fuchsia;border-style:solid;border-width:20px">
-    </span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.Label: BorderColor = Empty.">
-    <span id="ctrl_48" style="border-style:inset;border-width:12px">
-    </span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.Label: BorderColor = Transparent.">
-    <span id="ctrl_49" style="border-color:transparent;border-style:groove;border-width:12px">
-    </span>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.Label: BorderWidth = 0.">
-    <span id="ctrl_50" style="border-color:tomato;border-style:double;border-width:0px">
-    </span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.Label: Set BorderWidth and CssClass.">
-    <span id="ctrl_51" style="border-style:solid;border-width:20px" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.Label: Set BorderStyle and CssClass.">
-    <span id="ctrl_52" style="border-style:dotted" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.Label: Set BorderColor and CssClass.">
-    <span id="ctrl_53" style="border-color:silver" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.LinkButton: Normal Values.">
-    <a href="javascript:__doPostBack('ctrl_54','')" id="ctrl_54" style="border-color:sienna;border-style:ridge;border-width:9px">
-    </a>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.LinkButton: BorderStyle = none.">
-    <a href="javascript:__doPostBack('ctrl_55','')" id="ctrl_55" style="border-color:turquoise;border-style:none;border-width:12px">
-    </a>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.LinkButton: BorderStyle = NotSet.">
-    <a href="javascript:__doPostBack('ctrl_56','')" id="ctrl_56" style="border-color:fuchsia;border-style:solid;border-width:20px">
-    </a>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.LinkButton: BorderColor = Empty.">
-    <a href="javascript:__doPostBack('ctrl_57','')" id="ctrl_57" style="border-style:inset;border-width:12px">
-    </a>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.LinkButton: BorderColor = Transparent.">
-    <a href="javascript:__doPostBack('ctrl_58','')" id="ctrl_58" style="border-color:transparent;border-style:groove;border-width:12px">
-    </a>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.LinkButton: BorderWidth = 0.">
-    <a href="javascript:__doPostBack('ctrl_59','')" id="ctrl_59" style="border-color:tomato;border-style:double;border-width:0px">
-    </a>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.LinkButton: Set BorderWidth and CssClass.">
-    <a href="javascript:__doPostBack('ctrl_60','')" id="ctrl_60" style="border-style:solid;border-width:20px" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.LinkButton: Set BorderStyle and CssClass.">
-    <a href="javascript:__doPostBack('ctrl_61','')" id="ctrl_61" style="border-style:dotted" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.LinkButton: Set BorderColor and CssClass.">
-    <a href="javascript:__doPostBack('ctrl_62','')" id="ctrl_62" style="border-color:silver" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.Panel: Normal Values.">
-    <div id="ctrl_63" style="border-color:sienna;border-style:ridge;border-width:9px">
-    </div>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.Panel: BorderStyle = none.">
-    <div id="ctrl_64" style="border-color:turquoise;border-style:none;border-width:12px">
-    </div>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.Panel: BorderStyle = NotSet.">
-    <div id="ctrl_65" style="border-color:fuchsia;border-style:solid;border-width:20px">
-    </div>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.Panel: BorderColor = Empty.">
-    <div id="ctrl_66" style="border-style:inset;border-width:12px">
-    </div>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.Panel: BorderColor = Transparent.">
-    <div id="ctrl_67" style="border-color:transparent;border-style:groove;border-width:12px">
-    </div>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.Panel: BorderWidth = 0.">
-    <div id="ctrl_68" style="border-color:tomato;border-style:double;border-width:0px">
-    </div>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.Panel: Set BorderWidth and CssClass.">
-    <div id="ctrl_69" style="border-style:solid;border-width:20px" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.Panel: Set BorderStyle and CssClass.">
-    <div id="ctrl_70" style="border-style:dotted" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.Panel: Set BorderColor and CssClass.">
-    <div id="ctrl_71" style="border-color:silver" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.RadioButton: Normal Values.">
-    <span style="border-color:sienna;border-style:ridge;border-width:9px">
-      <input id="ctrl_72" type="radio" name="ctrl_72" value="ctrl_72" />
-    </span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.RadioButton: BorderStyle = none.">
-    <span style="border-color:turquoise;border-style:none;border-width:12px">
-      <input id="ctrl_73" type="radio" name="ctrl_73" value="ctrl_73" />
-    </span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.RadioButton: BorderStyle = NotSet.">
-    <span style="border-color:fuchsia;border-style:solid;border-width:20px">
-      <input id="ctrl_74" type="radio" name="ctrl_74" value="ctrl_74" />
-    </span>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.RadioButton: BorderColor = Empty.">
-    <span style="border-style:inset;border-width:12px">
-      <input id="ctrl_75" type="radio" name="ctrl_75" value="ctrl_75" />
-    </span>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.RadioButton: BorderColor = Transparent.">
-    <span style="border-color:transparent;border-style:groove;border-width:12px">
-      <input id="ctrl_76" type="radio" name="ctrl_76" value="ctrl_76" />
-    </span>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.RadioButton: BorderWidth = 0.">
-    <span style="border-color:tomato;border-style:double;border-width:0px">
-      <input id="ctrl_77" type="radio" name="ctrl_77" value="ctrl_77" />
-    </span>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.RadioButton: Set BorderWidth and CssClass.">
-    <span style="border-style:solid;border-width:20px" class="CssClass1">
-      <input id="ctrl_78" type="radio" name="ctrl_78" value="ctrl_78" />
-    </span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.RadioButton: Set BorderStyle and CssClass.">
-    <span style="border-style:dotted" class="CssClass1">
-      <input id="ctrl_79" type="radio" name="ctrl_79" value="ctrl_79" />
-    </span>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.RadioButton: Set BorderColor and CssClass.">
-    <span style="border-color:silver" class="CssClass1">
-      <input id="ctrl_80" type="radio" name="ctrl_80" value="ctrl_80" />
-    </span>
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.WebControls.TextBox: Normal Values.">
-    <input id="ctrl_81" style="border-color:sienna;border-style:ridge;border-width:9px" type="text" name="ctrl_81" />
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.WebControls.TextBox: BorderStyle = none.">
-    <input id="ctrl_82" style="border-color:turquoise;border-style:none;border-width:12px" type="text" name="ctrl_82" />
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.WebControls.TextBox: BorderStyle = NotSet.">
-    <input id="ctrl_83" style="border-color:fuchsia;border-style:solid;border-width:20px" type="text" name="ctrl_83" />
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.WebControls.TextBox: BorderColor = Empty.">
-    <input id="ctrl_84" style="border-style:inset;border-width:12px" type="text" name="ctrl_84" />
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.WebControls.TextBox: BorderColor = Transparent.">
-    <input id="ctrl_85" style="border-color:transparent;border-style:groove;border-width:12px" type="text" name="ctrl_85" />
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.WebControls.TextBox: BorderWidth = 0.">
-    <input id="ctrl_86" style="border-color:tomato;border-style:double;border-width:0px" type="text" name="ctrl_86" />
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.WebControls.TextBox: Set BorderWidth and CssClass.">
-    <input id="ctrl_87" style="border-style:solid;border-width:20px" type="text" name="ctrl_87" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.WebControls.TextBox: Set BorderStyle and CssClass.">
-    <input id="ctrl_88" style="border-style:dotted" type="text" name="ctrl_88" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.WebControls.TextBox: Set BorderColor and CssClass.">
-    <input id="ctrl_89" style="border-color:silver" type="text" name="ctrl_89" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.WebControls.DropDownList: Normal Values.">
-    <select id="ctrl_90" style="border-color:sienna;border-style:ridge;border-width:9px" name="ctrl_90">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.WebControls.DropDownList: BorderStyle = none.">
-    <select id="ctrl_91" style="border-color:turquoise;border-style:none;border-width:12px" name="ctrl_91">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.WebControls.DropDownList: BorderStyle = NotSet.">
-    <select id="ctrl_92" style="border-color:fuchsia;border-style:solid;border-width:20px" name="ctrl_92">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.WebControls.DropDownList: BorderColor = Empty.">
-    <select id="ctrl_93" style="border-style:inset;border-width:12px" name="ctrl_93">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.WebControls.DropDownList: BorderColor = Transparent.">
-    <select id="ctrl_94" style="border-color:transparent;border-style:groove;border-width:12px" name="ctrl_94">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.WebControls.DropDownList: BorderWidth = 0.">
-    <select id="ctrl_95" style="border-color:tomato;border-style:double;border-width:0px" name="ctrl_95">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.WebControls.DropDownList: Set BorderWidth and CssClass.">
-    <select id="ctrl_96" style="border-style:solid;border-width:20px" name="ctrl_96" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.WebControls.DropDownList: Set BorderStyle and CssClass.">
-    <select id="ctrl_97" style="border-style:dotted" name="ctrl_97" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.WebControls.DropDownList: Set BorderColor and CssClass.">
-    <select id="ctrl_98" style="border-color:silver" name="ctrl_98" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.WebControls.ListBox: Normal Values.">
-    <select id="ctrl_99" style="border-color:sienna;border-style:ridge;border-width:9px" size="4" name="ctrl_99">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.WebControls.ListBox: BorderStyle = none.">
-    <select id="ctrl_100" style="border-color:turquoise;border-style:none;border-width:12px" size="4" name="ctrl_100">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.WebControls.ListBox: BorderStyle = NotSet.">
-    <select id="ctrl_101" style="border-color:fuchsia;border-style:solid;border-width:20px" size="4" name="ctrl_101">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.WebControls.ListBox: BorderColor = Empty.">
-    <select id="ctrl_102" style="border-style:inset;border-width:12px" size="4" name="ctrl_102">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.WebControls.ListBox: BorderColor = Transparent.">
-    <select id="ctrl_103" style="border-color:transparent;border-style:groove;border-width:12px" size="4" name="ctrl_103">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.WebControls.ListBox: BorderWidth = 0.">
-    <select id="ctrl_104" style="border-color:tomato;border-style:double;border-width:0px" size="4" name="ctrl_104">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.WebControls.ListBox: Set BorderWidth and CssClass.">
-    <select id="ctrl_105" style="border-style:solid;border-width:20px" size="4" name="ctrl_105" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.WebControls.ListBox: Set BorderStyle and CssClass.">
-    <select id="ctrl_106" style="border-style:dotted" size="4" name="ctrl_106" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.WebControls.ListBox: Set BorderColor and CssClass.">
-    <select id="ctrl_107" style="border-color:silver" size="4" name="ctrl_107" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.WebControls.RadioButtonList: Normal Values.">
-    <table id="ctrl_108" style="border-color:sienna;border-style:ridge;border-width:9px" border="0" bordercolor="Sienna">
-      <tr>
-        <td>
-          <input id="ctrl_108_0" type="radio" name="ctrl_108" value="1" />
-          <label for="ctrl_108_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_1" type="radio" name="ctrl_108" value="2" />
-          <label for="ctrl_108_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_2" type="radio" name="ctrl_108" value="3" />
-          <label for="ctrl_108_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_3" type="radio" name="ctrl_108" value="4" />
-          <label for="ctrl_108_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.WebControls.RadioButtonList: BorderStyle = none.">
-    <table id="ctrl_109" style="border-color:turquoise;border-style:none;border-width:12px" border="0" bordercolor="Turquoise">
-      <tr>
-        <td>
-          <input id="ctrl_109_0" type="radio" name="ctrl_109" value="1" />
-          <label for="ctrl_109_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_1" type="radio" name="ctrl_109" value="2" />
-          <label for="ctrl_109_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_2" type="radio" name="ctrl_109" value="3" />
-          <label for="ctrl_109_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_3" type="radio" name="ctrl_109" value="4" />
-          <label for="ctrl_109_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.WebControls.RadioButtonList: BorderStyle = NotSet.">
-    <table id="ctrl_110" style="border-color:fuchsia;border-style:solid;border-width:20px" border="0" bordercolor="Fuchsia">
-      <tr>
-        <td>
-          <input id="ctrl_110_0" type="radio" name="ctrl_110" value="1" />
-          <label for="ctrl_110_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_1" type="radio" name="ctrl_110" value="2" />
-          <label for="ctrl_110_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_2" type="radio" name="ctrl_110" value="3" />
-          <label for="ctrl_110_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_3" type="radio" name="ctrl_110" value="4" />
-          <label for="ctrl_110_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.WebControls.RadioButtonList: BorderColor = Empty.">
-    <table id="ctrl_111" style="border-style:inset;border-width:12px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_111_0" type="radio" name="ctrl_111" value="1" />
-          <label for="ctrl_111_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_1" type="radio" name="ctrl_111" value="2" />
-          <label for="ctrl_111_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_2" type="radio" name="ctrl_111" value="3" />
-          <label for="ctrl_111_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_3" type="radio" name="ctrl_111" value="4" />
-          <label for="ctrl_111_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest113" testname="System.Web.UI.WebControls.RadioButtonList: BorderColor = Transparent.">
-    <table id="ctrl_112" style="border-color:transparent;border-style:groove;border-width:12px" border="0" bordercolor="Transparent">
-      <tr>
-        <td>
-          <input id="ctrl_112_0" type="radio" name="ctrl_112" value="1" />
-          <label for="ctrl_112_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_112_1" type="radio" name="ctrl_112" value="2" />
-          <label for="ctrl_112_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_112_2" type="radio" name="ctrl_112" value="3" />
-          <label for="ctrl_112_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_112_3" type="radio" name="ctrl_112" value="4" />
-          <label for="ctrl_112_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest114" testname="System.Web.UI.WebControls.RadioButtonList: BorderWidth = 0.">
-    <table id="ctrl_113" style="border-color:tomato;border-style:double;border-width:0px" border="0" bordercolor="Tomato">
-      <tr>
-        <td>
-          <input id="ctrl_113_0" type="radio" name="ctrl_113" value="1" />
-          <label for="ctrl_113_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_113_1" type="radio" name="ctrl_113" value="2" />
-          <label for="ctrl_113_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_113_2" type="radio" name="ctrl_113" value="3" />
-          <label for="ctrl_113_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_113_3" type="radio" name="ctrl_113" value="4" />
-          <label for="ctrl_113_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest115" testname="System.Web.UI.WebControls.RadioButtonList: Set BorderWidth and CssClass.">
-    <table id="ctrl_114" style="border-style:solid;border-width:20px" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_114_0" type="radio" name="ctrl_114" value="1" />
-          <label for="ctrl_114_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_114_1" type="radio" name="ctrl_114" value="2" />
-          <label for="ctrl_114_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_114_2" type="radio" name="ctrl_114" value="3" />
-          <label for="ctrl_114_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_114_3" type="radio" name="ctrl_114" value="4" />
-          <label for="ctrl_114_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest116" testname="System.Web.UI.WebControls.RadioButtonList: Set BorderStyle and CssClass.">
-    <table id="ctrl_115" style="border-style:dotted" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_115_0" type="radio" name="ctrl_115" value="1" />
-          <label for="ctrl_115_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_115_1" type="radio" name="ctrl_115" value="2" />
-          <label for="ctrl_115_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_115_2" type="radio" name="ctrl_115" value="3" />
-          <label for="ctrl_115_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_115_3" type="radio" name="ctrl_115" value="4" />
-          <label for="ctrl_115_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest117" testname="System.Web.UI.WebControls.RadioButtonList: Set BorderColor and CssClass.">
-    <table id="ctrl_116" style="border-color:silver" border="0" bordercolor="Silver" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_116_0" type="radio" name="ctrl_116" value="1" />
-          <label for="ctrl_116_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_116_1" type="radio" name="ctrl_116" value="2" />
-          <label for="ctrl_116_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_116_2" type="radio" name="ctrl_116" value="3" />
-          <label for="ctrl_116_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_116_3" type="radio" name="ctrl_116" value="4" />
-          <label for="ctrl_116_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest118" testname="System.Web.UI.WebControls.CheckBoxList: Normal Values.">
-    <table id="ctrl_117" style="border-color:sienna;border-style:ridge;border-width:9px" border="0" bordercolor="Sienna">
-      <tr>
-        <td>
-          <input id="ctrl_117_0" type="checkbox" name="ctrl_117:0" />
-          <label for="ctrl_117_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_117_1" type="checkbox" name="ctrl_117:1" />
-          <label for="ctrl_117_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_117_2" type="checkbox" name="ctrl_117:2" />
-          <label for="ctrl_117_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_117_3" type="checkbox" name="ctrl_117:3" />
-          <label for="ctrl_117_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest119" testname="System.Web.UI.WebControls.CheckBoxList: BorderStyle = none.">
-    <table id="ctrl_118" style="border-color:turquoise;border-style:none;border-width:12px" border="0" bordercolor="Turquoise">
-      <tr>
-        <td>
-          <input id="ctrl_118_0" type="checkbox" name="ctrl_118:0" />
-          <label for="ctrl_118_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_118_1" type="checkbox" name="ctrl_118:1" />
-          <label for="ctrl_118_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_118_2" type="checkbox" name="ctrl_118:2" />
-          <label for="ctrl_118_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_118_3" type="checkbox" name="ctrl_118:3" />
-          <label for="ctrl_118_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest120" testname="System.Web.UI.WebControls.CheckBoxList: BorderStyle = NotSet.">
-    <table id="ctrl_119" style="border-color:fuchsia;border-style:solid;border-width:20px" border="0" bordercolor="Fuchsia">
-      <tr>
-        <td>
-          <input id="ctrl_119_0" type="checkbox" name="ctrl_119:0" />
-          <label for="ctrl_119_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_119_1" type="checkbox" name="ctrl_119:1" />
-          <label for="ctrl_119_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_119_2" type="checkbox" name="ctrl_119:2" />
-          <label for="ctrl_119_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_119_3" type="checkbox" name="ctrl_119:3" />
-          <label for="ctrl_119_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest121" testname="System.Web.UI.WebControls.CheckBoxList: BorderColor = Empty.">
-    <table id="ctrl_120" style="border-style:inset;border-width:12px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_120_0" type="checkbox" name="ctrl_120:0" />
-          <label for="ctrl_120_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_120_1" type="checkbox" name="ctrl_120:1" />
-          <label for="ctrl_120_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_120_2" type="checkbox" name="ctrl_120:2" />
-          <label for="ctrl_120_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_120_3" type="checkbox" name="ctrl_120:3" />
-          <label for="ctrl_120_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest122" testname="System.Web.UI.WebControls.CheckBoxList: BorderColor = Transparent.">
-    <table id="ctrl_121" style="border-color:transparent;border-style:groove;border-width:12px" border="0" bordercolor="Transparent">
-      <tr>
-        <td>
-          <input id="ctrl_121_0" type="checkbox" name="ctrl_121:0" />
-          <label for="ctrl_121_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_121_1" type="checkbox" name="ctrl_121:1" />
-          <label for="ctrl_121_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_121_2" type="checkbox" name="ctrl_121:2" />
-          <label for="ctrl_121_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_121_3" type="checkbox" name="ctrl_121:3" />
-          <label for="ctrl_121_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest123" testname="System.Web.UI.WebControls.CheckBoxList: BorderWidth = 0.">
-    <table id="ctrl_122" style="border-color:tomato;border-style:double;border-width:0px" border="0" bordercolor="Tomato">
-      <tr>
-        <td>
-          <input id="ctrl_122_0" type="checkbox" name="ctrl_122:0" />
-          <label for="ctrl_122_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_122_1" type="checkbox" name="ctrl_122:1" />
-          <label for="ctrl_122_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_122_2" type="checkbox" name="ctrl_122:2" />
-          <label for="ctrl_122_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_122_3" type="checkbox" name="ctrl_122:3" />
-          <label for="ctrl_122_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest124" testname="System.Web.UI.WebControls.CheckBoxList: Set BorderWidth and CssClass.">
-    <table id="ctrl_123" style="border-style:solid;border-width:20px" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_123_0" type="checkbox" name="ctrl_123:0" />
-          <label for="ctrl_123_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_123_1" type="checkbox" name="ctrl_123:1" />
-          <label for="ctrl_123_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_123_2" type="checkbox" name="ctrl_123:2" />
-          <label for="ctrl_123_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_123_3" type="checkbox" name="ctrl_123:3" />
-          <label for="ctrl_123_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest125" testname="System.Web.UI.WebControls.CheckBoxList: Set BorderStyle and CssClass.">
-    <table id="ctrl_124" style="border-style:dotted" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_124_0" type="checkbox" name="ctrl_124:0" />
-          <label for="ctrl_124_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_124_1" type="checkbox" name="ctrl_124:1" />
-          <label for="ctrl_124_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_124_2" type="checkbox" name="ctrl_124:2" />
-          <label for="ctrl_124_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_124_3" type="checkbox" name="ctrl_124:3" />
-          <label for="ctrl_124_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest126" testname="System.Web.UI.WebControls.CheckBoxList: Set BorderColor and CssClass.">
-    <table id="ctrl_125" style="border-color:silver" border="0" bordercolor="Silver" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_125_0" type="checkbox" name="ctrl_125:0" />
-          <label for="ctrl_125_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_125_1" type="checkbox" name="ctrl_125:1" />
-          <label for="ctrl_125_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_125_2" type="checkbox" name="ctrl_125:2" />
-          <label for="ctrl_125_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_125_3" type="checkbox" name="ctrl_125:3" />
-          <label for="ctrl_125_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest127" testname="System.Web.UI.WebControls.DataGrid: Normal Values.">
-    <table border="9" cellspacing="0" style="border-collapse:collapse;border-color:sienna;border-style:ridge;border-width:9px" bordercolor="Sienna" rules="all" id="ctrl_126">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest128" testname="System.Web.UI.WebControls.DataGrid: BorderStyle = none.">
-    <table border="12" cellspacing="0" style="border-collapse:collapse;border-color:turquoise;border-style:none;border-width:12px" bordercolor="Turquoise" rules="all" id="ctrl_127">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest129" testname="System.Web.UI.WebControls.DataGrid: BorderStyle = NotSet.">
-    <table border="20" cellspacing="0" style="border-collapse:collapse;border-color:fuchsia;border-style:solid;border-width:20px" bordercolor="Fuchsia" rules="all" id="ctrl_128">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest130" testname="System.Web.UI.WebControls.DataGrid: BorderColor = Empty.">
-    <table border="12" cellspacing="0" style="border-collapse:collapse;border-style:inset;border-width:12px" rules="all" id="ctrl_129">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest131" testname="System.Web.UI.WebControls.DataGrid: BorderColor = Transparent.">
-    <table border="12" cellspacing="0" style="border-collapse:collapse;border-color:transparent;border-style:groove;border-width:12px" bordercolor="Transparent" rules="all" id="ctrl_130">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest132" testname="System.Web.UI.WebControls.DataGrid: BorderWidth = 0.">
-    <table border="0" cellspacing="0" style="border-collapse:collapse;border-color:tomato;border-style:double;border-width:0px" bordercolor="Tomato" rules="all" id="ctrl_131">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest133" testname="System.Web.UI.WebControls.DataGrid: Set BorderWidth and CssClass.">
-    <table border="20" cellspacing="0" style="border-collapse:collapse;border-style:solid;border-width:20px" rules="all" class="CssClass1" id="ctrl_132">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest134" testname="System.Web.UI.WebControls.DataGrid: Set BorderStyle and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;border-style:dotted" rules="all" class="CssClass1" id="ctrl_133">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest135" testname="System.Web.UI.WebControls.DataGrid: Set BorderColor and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;border-color:silver" bordercolor="Silver" rules="all" class="CssClass1" id="ctrl_134">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest136" testname="System.Web.UI.WebControls.DataGridItem: Normal Values.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_135">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_135_ctrl_136" style="border-color:sienna;border-style:ridge;border-width:9px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest137" testname="System.Web.UI.WebControls.DataGridItem: BorderStyle = none.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_137">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_137_ctrl_138" style="border-color:turquoise;border-style:none;border-width:12px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest138" testname="System.Web.UI.WebControls.DataGridItem: BorderStyle = NotSet.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_139">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_139_ctrl_140" style="border-color:fuchsia;border-style:solid;border-width:20px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest139" testname="System.Web.UI.WebControls.DataGridItem: BorderColor = Empty.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_141">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_141_ctrl_142" style="border-style:inset;border-width:12px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest140" testname="System.Web.UI.WebControls.DataGridItem: BorderColor = Transparent.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_143">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_143_ctrl_144" style="border-color:transparent;border-style:groove;border-width:12px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest141" testname="System.Web.UI.WebControls.DataGridItem: BorderWidth = 0.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_145">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_145_ctrl_146" style="border-color:tomato;border-style:double;border-width:0px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest142" testname="System.Web.UI.WebControls.DataGridItem: Set BorderWidth and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_147">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_147_ctrl_148" style="border-style:solid;border-width:20px" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest143" testname="System.Web.UI.WebControls.DataGridItem: Set BorderStyle and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_149">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_149_ctrl_150" style="border-style:dotted" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest144" testname="System.Web.UI.WebControls.DataGridItem: Set BorderColor and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_151">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_151_ctrl_152" style="border-color:silver" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest145" testname="System.Web.UI.WebControls.DataList: Normal Values.">
-    <table id="ctrl_153" cellspacing="0" border="0" bordercolor="Sienna" style="border-collapse:collapse;border-color:sienna;border-style:ridge;border-width:9px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_CssClass.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_CssClass.aspx.xml
deleted file mode 100644
index 3097f958fff..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_CssClass.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: CssClass1">
-    <input value="" type="submit" name="ctrl_0" class="CssClass1" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: CssClass2">
-    <input value="" type="submit" name="ctrl_1" class="CssClass2" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Empty string">
-    <input value="" type="submit" name="ctrl_2" class="Empty string" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Non existing CssClass">
-    <input value="" type="submit" name="ctrl_3" class="Non existing CssClass" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: CssClass1">
-    <span class="CssClass1">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: CssClass2">
-    <span class="CssClass2">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Empty string">
-    <span class="Empty string">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Non existing CssClass">
-    <span class="Non existing CssClass">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: CssClass1">
-    <a id="ctrl_8" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: CssClass2">
-    <a id="ctrl_9" class="CssClass2">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Empty string">
-    <a id="ctrl_10" class="Empty string">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Non existing CssClass">
-    <a id="ctrl_11" class="Non existing CssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: CssClass1">
-    <img id="ctrl_12" alt="" border="0" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: CssClass2">
-    <img id="ctrl_13" alt="" border="0" class="CssClass2" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Empty string">
-    <img id="ctrl_14" alt="" border="0" class="Empty string" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Non existing CssClass">
-    <img id="ctrl_15" alt="" border="0" class="Non existing CssClass" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: CssClass1">
-    <input id="ctrl_16" alt="" border="0" type="image" name="ctrl_16" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: CssClass2">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" class="CssClass2" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Empty string">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" class="Empty string" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Non existing CssClass">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" class="Non existing CssClass" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: CssClass1">
-    <span id="ctrl_20" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: CssClass2">
-    <span id="ctrl_21" class="CssClass2">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Empty string">
-    <span id="ctrl_22" class="Empty string">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Non existing CssClass">
-    <span id="ctrl_23" class="Non existing CssClass">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: CssClass1">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: CssClass2">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25" class="CssClass2">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Empty string">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26" class="Empty string">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Non existing CssClass">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" class="Non existing CssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: CssClass1">
-    <div id="ctrl_28" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: CssClass2">
-    <div id="ctrl_29" class="CssClass2">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Empty string">
-    <div id="ctrl_30" class="Empty string">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Non existing CssClass">
-    <div id="ctrl_31" class="Non existing CssClass">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: CssClass1">
-    <span class="CssClass1">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: CssClass2">
-    <span class="CssClass2">
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Empty string">
-    <span class="Empty string">
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Non existing CssClass">
-    <span class="Non existing CssClass">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: CssClass1">
-    <input id="ctrl_36" type="text" name="ctrl_36" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: CssClass2">
-    <input id="ctrl_37" type="text" name="ctrl_37" class="CssClass2" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Empty string">
-    <input id="ctrl_38" type="text" name="ctrl_38" class="Empty string" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Non existing CssClass">
-    <input id="ctrl_39" type="text" name="ctrl_39" class="Non existing CssClass" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: CssClass1">
-    <select id="ctrl_40" name="ctrl_40" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: CssClass2">
-    <select id="ctrl_41" name="ctrl_41" class="CssClass2">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Empty string">
-    <select id="ctrl_42" name="ctrl_42" class="Empty string">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Non existing CssClass">
-    <select id="ctrl_43" name="ctrl_43" class="Non existing CssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: CssClass1">
-    <select id="ctrl_44" size="4" name="ctrl_44" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: CssClass2">
-    <select id="ctrl_45" size="4" name="ctrl_45" class="CssClass2">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Empty string">
-    <select id="ctrl_46" size="4" name="ctrl_46" class="Empty string">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Non existing CssClass">
-    <select id="ctrl_47" size="4" name="ctrl_47" class="Non existing CssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: CssClass1">
-    <table id="ctrl_48" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: CssClass2">
-    <table id="ctrl_49" border="0" class="CssClass2">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Empty string">
-    <table id="ctrl_50" border="0" class="Empty string">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Non existing CssClass">
-    <table id="ctrl_51" border="0" class="Non existing CssClass">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: CssClass1">
-    <table id="ctrl_52" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: CssClass2">
-    <table id="ctrl_53" border="0" class="CssClass2">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Empty string">
-    <table id="ctrl_54" border="0" class="Empty string">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Non existing CssClass">
-    <table id="ctrl_55" border="0" class="Non existing CssClass">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: CssClass1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: CssClass2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass2" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Empty string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="Empty string" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Non existing CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="Non existing CssClass" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: CssClass1">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: CssClass2">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63" class="CssClass2">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Empty string">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65" class="Empty string">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Non existing CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" class="Non existing CssClass">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: CssClass1">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse" class="CssClass1">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Bold.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Bold.aspx.xml
deleted file mode 100644
index e9f7bc298fe..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Bold.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Bold = true.">
-    <input value="" style="font-weight:bold" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Bold = False.">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set twice.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set Bold + CssClass.">
-    <input value="" type="submit" name="ctrl_3" class="CssClass1" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Bold = true.">
-    <span style="font-weight:bold">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Bold = False.">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice.">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set Bold + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Bold = true.">
-    <a id="ctrl_8" style="font-weight:bold">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Bold = False.">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set twice.">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set Bold + CssClass.">
-    <a id="ctrl_11" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Bold = true.">
-    <img id="ctrl_12" alt="" border="0" style="font-weight:bold" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Bold = False.">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set twice.">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set Bold + CssClass.">
-    <img id="ctrl_15" alt="" border="0" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Bold = true.">
-    <input id="ctrl_16" alt="" border="0" style="font-weight:bold" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Bold = False.">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set twice.">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Set Bold + CssClass.">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Bold = true.">
-    <span id="ctrl_20" style="font-weight:bold">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Bold = False.">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set twice.">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Set Bold + CssClass.">
-    <span id="ctrl_23" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Bold = true.">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="font-weight:bold">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Bold = False.">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set twice.">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Set Bold + CssClass.">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Bold = true.">
-    <div id="ctrl_28" style="font-weight:bold">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Bold = False.">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set twice.">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Set Bold + CssClass.">
-    <div id="ctrl_31" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Bold = true.">
-    <span style="font-weight:bold">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Bold = False.">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set twice.">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Set Bold + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Bold = true.">
-    <input id="ctrl_36" style="font-weight:bold" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Bold = False.">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set twice.">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Set Bold + CssClass.">
-    <input id="ctrl_39" type="text" name="ctrl_39" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Bold = true.">
-    <select id="ctrl_40" style="font-weight:bold" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Bold = False.">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set twice.">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Set Bold + CssClass.">
-    <select id="ctrl_43" name="ctrl_43" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Bold = true.">
-    <select id="ctrl_44" style="font-weight:bold" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Bold = False.">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set twice.">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Set Bold + CssClass.">
-    <select id="ctrl_47" size="4" name="ctrl_47" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Bold = true.">
-    <table id="ctrl_48" style="font-weight:bold" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Bold = False.">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set twice.">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Set Bold + CssClass.">
-    <table id="ctrl_51" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Bold = true.">
-    <table id="ctrl_52" style="font-weight:bold" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Bold = False.">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set twice.">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Set Bold + CssClass.">
-    <table id="ctrl_55" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Bold = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-weight:bold" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Bold = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Set Bold + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Bold = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="font-weight:bold">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Bold = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Set Bold + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Bold = true.">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse;font-weight:bold">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Italic.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Italic.aspx.xml
deleted file mode 100644
index 5d0f5309074..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Italic.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Italic = true.">
-    <input value="" style="font-style:italic" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Italic = False.">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set twice.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set Italic + CssClass.">
-    <input value="" type="submit" name="ctrl_3" class="CssClass1" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Italic = true.">
-    <span style="font-style:italic">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Italic = False.">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice.">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set Italic + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Italic = true.">
-    <a id="ctrl_8" style="font-style:italic">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Italic = False.">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set twice.">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set Italic + CssClass.">
-    <a id="ctrl_11" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Italic = true.">
-    <img id="ctrl_12" alt="" border="0" style="font-style:italic" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Italic = False.">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set twice.">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set Italic + CssClass.">
-    <img id="ctrl_15" alt="" border="0" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Italic = true.">
-    <input id="ctrl_16" alt="" border="0" style="font-style:italic" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Italic = False.">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set twice.">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Set Italic + CssClass.">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Italic = true.">
-    <span id="ctrl_20" style="font-style:italic">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Italic = False.">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set twice.">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Set Italic + CssClass.">
-    <span id="ctrl_23" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Italic = true.">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="font-style:italic">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Italic = False.">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set twice.">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Set Italic + CssClass.">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Italic = true.">
-    <div id="ctrl_28" style="font-style:italic">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Italic = False.">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set twice.">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Set Italic + CssClass.">
-    <div id="ctrl_31" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Italic = true.">
-    <span style="font-style:italic">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Italic = False.">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set twice.">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Set Italic + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Italic = true.">
-    <input id="ctrl_36" style="font-style:italic" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Italic = False.">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set twice.">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Set Italic + CssClass.">
-    <input id="ctrl_39" type="text" name="ctrl_39" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Italic = true.">
-    <select id="ctrl_40" style="font-style:italic" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Italic = False.">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set twice.">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Set Italic + CssClass.">
-    <select id="ctrl_43" name="ctrl_43" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Italic = true.">
-    <select id="ctrl_44" style="font-style:italic" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Italic = False.">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set twice.">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Set Italic + CssClass.">
-    <select id="ctrl_47" size="4" name="ctrl_47" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Italic = true.">
-    <table id="ctrl_48" style="font-style:italic" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Italic = False.">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set twice.">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Set Italic + CssClass.">
-    <table id="ctrl_51" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Italic = true.">
-    <table id="ctrl_52" style="font-style:italic" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Italic = False.">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set twice.">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Set Italic + CssClass.">
-    <table id="ctrl_55" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Italic = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-style:italic" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Italic = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Set Italic + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Italic = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="font-style:italic">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Italic = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Set Italic + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Italic = true.">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse;font-style:italic">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Name.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Name.aspx.xml
deleted file mode 100644
index 8dfeb3b160e..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Name.aspx.xml
+++ /dev/null
@@ -1,1433 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Set a legal name.">
-    <input value="" style="font-family:arial" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set a legal name twice.">
-    <input value="" style="font-family:david" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Default is String.empty.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Null throws exception.">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set Name in code + Name in CssClass.">
-    <input value="" style="font-family:new roman times" type="submit" name="ctrl_4" class="NameCssClass" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.Button: Set Name in code + Name in CssClass.">
-    <input value="" style="font-family:new roman times" type="submit" name="ctrl_5" class="NamesCssClass" id="ctrl_5" />
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Button: Set Names, See that Name is changed accordingly.">
-    <input value="" style="font-family:aharoni,courier new,david" type="submit" name="ctrl_6" id="ctrl_6" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Button: Set Names, See that Name is changed accordingly.">
-    <input value="" style="font-family:courier new,aharoni,david" type="submit" name="ctrl_7" id="ctrl_7" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set a legal name.">
-    <span style="font-family:arial">
-      <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set a legal name twice.">
-    <span style="font-family:david">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBox: Default is String.empty.">
-    <input id="ctrl_10" type="checkbox" name="ctrl_10" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBox: Null throws exception.">
-    <input id="ctrl_11" type="checkbox" name="ctrl_11" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.CheckBox: Set Name in code + Name in CssClass.">
-    <span style="font-family:new roman times" class="NameCssClass">
-      <input id="ctrl_12" type="checkbox" name="ctrl_12" />
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBox: Set Name in code + Name in CssClass.">
-    <span style="font-family:new roman times" class="NamesCssClass">
-      <input id="ctrl_13" type="checkbox" name="ctrl_13" />
-    </span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.CheckBox: Set Names, See that Name is changed accordingly.">
-    <span style="font-family:aharoni,courier new,david">
-      <input id="ctrl_14" type="checkbox" name="ctrl_14" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.CheckBox: Set Names, See that Name is changed accordingly.">
-    <span style="font-family:courier new,aharoni,david">
-      <input id="ctrl_15" type="checkbox" name="ctrl_15" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.HyperLink: Set a legal name.">
-    <a id="ctrl_16" style="font-family:arial">
-    </a>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.HyperLink: Set a legal name twice.">
-    <a id="ctrl_17" style="font-family:david">
-    </a>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.HyperLink: Default is String.empty.">
-    <a id="ctrl_18">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.HyperLink: Null throws exception.">
-    <a id="ctrl_19">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.HyperLink: Set Name in code + Name in CssClass.">
-    <a id="ctrl_20" style="font-family:new roman times" class="NameCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.HyperLink: Set Name in code + Name in CssClass.">
-    <a id="ctrl_21" style="font-family:new roman times" class="NamesCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.HyperLink: Set Names, See that Name is changed accordingly.">
-    <a id="ctrl_22" style="font-family:aharoni,courier new,david">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.HyperLink: Set Names, See that Name is changed accordingly.">
-    <a id="ctrl_23" style="font-family:courier new,aharoni,david">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.Image: Set a legal name.">
-    <img id="ctrl_24" alt="" border="0" style="font-family:arial" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Image: Set a legal name twice.">
-    <img id="ctrl_25" alt="" border="0" style="font-family:david" />
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Image: Default is String.empty.">
-    <img id="ctrl_26" alt="" border="0" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Image: Null throws exception.">
-    <img id="ctrl_27" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Image: Set Name in code + Name in CssClass.">
-    <img id="ctrl_28" alt="" border="0" style="font-family:new roman times" class="NameCssClass" />
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Image: Set Name in code + Name in CssClass.">
-    <img id="ctrl_29" alt="" border="0" style="font-family:new roman times" class="NamesCssClass" />
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Image: Set Names, See that Name is changed accordingly.">
-    <img id="ctrl_30" alt="" border="0" style="font-family:aharoni,courier new,david" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Image: Set Names, See that Name is changed accordingly.">
-    <img id="ctrl_31" alt="" border="0" style="font-family:courier new,aharoni,david" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.ImageButton: Set a legal name.">
-    <input id="ctrl_32" alt="" border="0" style="font-family:arial" type="image" name="ctrl_32" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.ImageButton: Set a legal name twice.">
-    <input id="ctrl_33" alt="" border="0" style="font-family:david" type="image" name="ctrl_33" />
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.ImageButton: Default is String.empty.">
-    <input id="ctrl_34" alt="" border="0" type="image" name="ctrl_34" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.ImageButton: Null throws exception.">
-    <input id="ctrl_35" alt="" border="0" type="image" name="ctrl_35" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.ImageButton: Set Name in code + Name in CssClass.">
-    <input id="ctrl_36" alt="" border="0" style="font-family:new roman times" type="image" name="ctrl_36" class="NameCssClass" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.ImageButton: Set Name in code + Name in CssClass.">
-    <input id="ctrl_37" alt="" border="0" style="font-family:new roman times" type="image" name="ctrl_37" class="NamesCssClass" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.ImageButton: Set Names, See that Name is changed accordingly.">
-    <input id="ctrl_38" alt="" border="0" style="font-family:aharoni,courier new,david" type="image" name="ctrl_38" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.ImageButton: Set Names, See that Name is changed accordingly.">
-    <input id="ctrl_39" alt="" border="0" style="font-family:courier new,aharoni,david" type="image" name="ctrl_39" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.Label: Set a legal name.">
-    <span id="ctrl_40" style="font-family:arial">
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.Label: Set a legal name twice.">
-    <span id="ctrl_41" style="font-family:david">
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.Label: Default is String.empty.">
-    <span id="ctrl_42">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.Label: Null throws exception.">
-    <span id="ctrl_43">
-    </span>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.Label: Set Name in code + Name in CssClass.">
-    <span id="ctrl_44" style="font-family:new roman times" class="NameCssClass">
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.Label: Set Name in code + Name in CssClass.">
-    <span id="ctrl_45" style="font-family:new roman times" class="NamesCssClass">
-    </span>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.Label: Set Names, See that Name is changed accordingly.">
-    <span id="ctrl_46" style="font-family:aharoni,courier new,david">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.Label: Set Names, See that Name is changed accordingly.">
-    <span id="ctrl_47" style="font-family:courier new,aharoni,david">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.LinkButton: Set a legal name.">
-    <a href="javascript:__doPostBack('ctrl_48','')" id="ctrl_48" style="font-family:arial">
-    </a>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.LinkButton: Set a legal name twice.">
-    <a href="javascript:__doPostBack('ctrl_49','')" id="ctrl_49" style="font-family:david">
-    </a>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.LinkButton: Default is String.empty.">
-    <a href="javascript:__doPostBack('ctrl_50','')" id="ctrl_50">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.LinkButton: Null throws exception.">
-    <a href="javascript:__doPostBack('ctrl_51','')" id="ctrl_51">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.LinkButton: Set Name in code + Name in CssClass.">
-    <a href="javascript:__doPostBack('ctrl_52','')" id="ctrl_52" style="font-family:new roman times" class="NameCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.LinkButton: Set Name in code + Name in CssClass.">
-    <a href="javascript:__doPostBack('ctrl_53','')" id="ctrl_53" style="font-family:new roman times" class="NamesCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.LinkButton: Set Names, See that Name is changed accordingly.">
-    <a href="javascript:__doPostBack('ctrl_54','')" id="ctrl_54" style="font-family:aharoni,courier new,david">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.LinkButton: Set Names, See that Name is changed accordingly.">
-    <a href="javascript:__doPostBack('ctrl_55','')" id="ctrl_55" style="font-family:courier new,aharoni,david">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.Panel: Set a legal name.">
-    <div id="ctrl_56" style="font-family:arial">
-    </div>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.Panel: Set a legal name twice.">
-    <div id="ctrl_57" style="font-family:david">
-    </div>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.Panel: Default is String.empty.">
-    <div id="ctrl_58">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.Panel: Null throws exception.">
-    <div id="ctrl_59">
-    </div>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.Panel: Set Name in code + Name in CssClass.">
-    <div id="ctrl_60" style="font-family:new roman times" class="NameCssClass">
-    </div>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.Panel: Set Name in code + Name in CssClass.">
-    <div id="ctrl_61" style="font-family:new roman times" class="NamesCssClass">
-    </div>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.Panel: Set Names, See that Name is changed accordingly.">
-    <div id="ctrl_62" style="font-family:aharoni,courier new,david">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.Panel: Set Names, See that Name is changed accordingly.">
-    <div id="ctrl_63" style="font-family:courier new,aharoni,david">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButton: Set a legal name.">
-    <span style="font-family:arial">
-      <input id="ctrl_64" type="radio" name="ctrl_64" value="ctrl_64" />
-    </span>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.RadioButton: Set a legal name twice.">
-    <span style="font-family:david">
-      <input id="ctrl_65" type="radio" name="ctrl_65" value="ctrl_65" />
-    </span>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.RadioButton: Default is String.empty.">
-    <input id="ctrl_66" type="radio" name="ctrl_66" value="ctrl_66" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.RadioButton: Null throws exception.">
-    <input id="ctrl_67" type="radio" name="ctrl_67" value="ctrl_67" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.RadioButton: Set Name in code + Name in CssClass.">
-    <span style="font-family:new roman times" class="NameCssClass">
-      <input id="ctrl_68" type="radio" name="ctrl_68" value="ctrl_68" />
-    </span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.RadioButton: Set Name in code + Name in CssClass.">
-    <span style="font-family:new roman times" class="NamesCssClass">
-      <input id="ctrl_69" type="radio" name="ctrl_69" value="ctrl_69" />
-    </span>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.RadioButton: Set Names, See that Name is changed accordingly.">
-    <span style="font-family:aharoni,courier new,david">
-      <input id="ctrl_70" type="radio" name="ctrl_70" value="ctrl_70" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.RadioButton: Set Names, See that Name is changed accordingly.">
-    <span style="font-family:courier new,aharoni,david">
-      <input id="ctrl_71" type="radio" name="ctrl_71" value="ctrl_71" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.TextBox: Set a legal name.">
-    <input id="ctrl_72" style="font-family:arial" type="text" name="ctrl_72" />
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.TextBox: Set a legal name twice.">
-    <input id="ctrl_73" style="font-family:david" type="text" name="ctrl_73" />
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.TextBox: Default is String.empty.">
-    <input id="ctrl_74" type="text" name="ctrl_74" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.TextBox: Null throws exception.">
-    <input id="ctrl_75" type="text" name="ctrl_75" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.TextBox: Set Name in code + Name in CssClass.">
-    <input id="ctrl_76" style="font-family:new roman times" type="text" name="ctrl_76" class="NameCssClass" />
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.TextBox: Set Name in code + Name in CssClass.">
-    <input id="ctrl_77" style="font-family:new roman times" type="text" name="ctrl_77" class="NamesCssClass" />
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.TextBox: Set Names, See that Name is changed accordingly.">
-    <input id="ctrl_78" style="font-family:aharoni,courier new,david" type="text" name="ctrl_78" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.TextBox: Set Names, See that Name is changed accordingly.">
-    <input id="ctrl_79" style="font-family:courier new,aharoni,david" type="text" name="ctrl_79" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DropDownList: Set a legal name.">
-    <select id="ctrl_80" style="font-family:arial" name="ctrl_80">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest82" testname="System.Web.UI.WebControls.DropDownList: Set a legal name twice.">
-    <select id="ctrl_81" style="font-family:david" name="ctrl_81">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest83" testname="System.Web.UI.WebControls.DropDownList: Default is String.empty.">
-    <select id="ctrl_82" name="ctrl_82">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest84" testname="System.Web.UI.WebControls.DropDownList: Null throws exception.">
-    <select id="ctrl_83" name="ctrl_83">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest85" testname="System.Web.UI.WebControls.DropDownList: Set Name in code + Name in CssClass.">
-    <select id="ctrl_84" style="font-family:new roman times" name="ctrl_84" class="NameCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest86" testname="System.Web.UI.WebControls.DropDownList: Set Name in code + Name in CssClass.">
-    <select id="ctrl_85" style="font-family:new roman times" name="ctrl_85" class="NamesCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest87" testname="System.Web.UI.WebControls.DropDownList: Set Names, See that Name is changed accordingly.">
-    <select id="ctrl_86" style="font-family:aharoni,courier new,david" name="ctrl_86">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest88" testname="System.Web.UI.WebControls.DropDownList: Set Names, See that Name is changed accordingly.">
-    <select id="ctrl_87" style="font-family:courier new,aharoni,david" name="ctrl_87">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest89" testname="System.Web.UI.WebControls.ListBox: Set a legal name.">
-    <select id="ctrl_88" style="font-family:arial" size="4" name="ctrl_88">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest90" testname="System.Web.UI.WebControls.ListBox: Set a legal name twice.">
-    <select id="ctrl_89" style="font-family:david" size="4" name="ctrl_89">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest91" testname="System.Web.UI.WebControls.ListBox: Default is String.empty.">
-    <select id="ctrl_90" size="4" name="ctrl_90">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest92" testname="System.Web.UI.WebControls.ListBox: Null throws exception.">
-    <select id="ctrl_91" size="4" name="ctrl_91">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest93" testname="System.Web.UI.WebControls.ListBox: Set Name in code + Name in CssClass.">
-    <select id="ctrl_92" style="font-family:new roman times" size="4" name="ctrl_92" class="NameCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest94" testname="System.Web.UI.WebControls.ListBox: Set Name in code + Name in CssClass.">
-    <select id="ctrl_93" style="font-family:new roman times" size="4" name="ctrl_93" class="NamesCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest95" testname="System.Web.UI.WebControls.ListBox: Set Names, See that Name is changed accordingly.">
-    <select id="ctrl_94" style="font-family:aharoni,courier new,david" size="4" name="ctrl_94">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest96" testname="System.Web.UI.WebControls.ListBox: Set Names, See that Name is changed accordingly.">
-    <select id="ctrl_95" style="font-family:courier new,aharoni,david" size="4" name="ctrl_95">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest97" testname="System.Web.UI.WebControls.RadioButtonList: Set a legal name.">
-    <table id="ctrl_96" style="font-family:arial" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_96_0" type="radio" name="ctrl_96" value="1" />
-          <label for="ctrl_96_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_1" type="radio" name="ctrl_96" value="2" />
-          <label for="ctrl_96_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_2" type="radio" name="ctrl_96" value="3" />
-          <label for="ctrl_96_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_96_3" type="radio" name="ctrl_96" value="4" />
-          <label for="ctrl_96_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest98" testname="System.Web.UI.WebControls.RadioButtonList: Set a legal name twice.">
-    <table id="ctrl_97" style="font-family:david" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_97_0" type="radio" name="ctrl_97" value="1" />
-          <label for="ctrl_97_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_1" type="radio" name="ctrl_97" value="2" />
-          <label for="ctrl_97_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_2" type="radio" name="ctrl_97" value="3" />
-          <label for="ctrl_97_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_97_3" type="radio" name="ctrl_97" value="4" />
-          <label for="ctrl_97_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest99" testname="System.Web.UI.WebControls.RadioButtonList: Default is String.empty.">
-    <table id="ctrl_98" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_98_0" type="radio" name="ctrl_98" value="1" />
-          <label for="ctrl_98_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_98_1" type="radio" name="ctrl_98" value="2" />
-          <label for="ctrl_98_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_98_2" type="radio" name="ctrl_98" value="3" />
-          <label for="ctrl_98_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_98_3" type="radio" name="ctrl_98" value="4" />
-          <label for="ctrl_98_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest100" testname="System.Web.UI.WebControls.RadioButtonList: Null throws exception.">
-    <table id="ctrl_99" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_99_0" type="radio" name="ctrl_99" value="1" />
-          <label for="ctrl_99_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_99_1" type="radio" name="ctrl_99" value="2" />
-          <label for="ctrl_99_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_99_2" type="radio" name="ctrl_99" value="3" />
-          <label for="ctrl_99_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_99_3" type="radio" name="ctrl_99" value="4" />
-          <label for="ctrl_99_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest101" testname="System.Web.UI.WebControls.RadioButtonList: Set Name in code + Name in CssClass.">
-    <table id="ctrl_100" style="font-family:new roman times" border="0" class="NameCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_100_0" type="radio" name="ctrl_100" value="1" />
-          <label for="ctrl_100_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_100_1" type="radio" name="ctrl_100" value="2" />
-          <label for="ctrl_100_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_100_2" type="radio" name="ctrl_100" value="3" />
-          <label for="ctrl_100_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_100_3" type="radio" name="ctrl_100" value="4" />
-          <label for="ctrl_100_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest102" testname="System.Web.UI.WebControls.RadioButtonList: Set Name in code + Name in CssClass.">
-    <table id="ctrl_101" style="font-family:new roman times" border="0" class="NamesCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_101_0" type="radio" name="ctrl_101" value="1" />
-          <label for="ctrl_101_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_101_1" type="radio" name="ctrl_101" value="2" />
-          <label for="ctrl_101_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_101_2" type="radio" name="ctrl_101" value="3" />
-          <label for="ctrl_101_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_101_3" type="radio" name="ctrl_101" value="4" />
-          <label for="ctrl_101_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest103" testname="System.Web.UI.WebControls.RadioButtonList: Set Names, See that Name is changed accordingly.">
-    <table id="ctrl_102" style="font-family:aharoni,courier new,david" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_102_0" type="radio" name="ctrl_102" value="1" />
-          <label for="ctrl_102_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_102_1" type="radio" name="ctrl_102" value="2" />
-          <label for="ctrl_102_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_102_2" type="radio" name="ctrl_102" value="3" />
-          <label for="ctrl_102_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_102_3" type="radio" name="ctrl_102" value="4" />
-          <label for="ctrl_102_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest104" testname="System.Web.UI.WebControls.RadioButtonList: Set Names, See that Name is changed accordingly.">
-    <table id="ctrl_103" style="font-family:courier new,aharoni,david" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_103_0" type="radio" name="ctrl_103" value="1" />
-          <label for="ctrl_103_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_103_1" type="radio" name="ctrl_103" value="2" />
-          <label for="ctrl_103_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_103_2" type="radio" name="ctrl_103" value="3" />
-          <label for="ctrl_103_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_103_3" type="radio" name="ctrl_103" value="4" />
-          <label for="ctrl_103_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest105" testname="System.Web.UI.WebControls.CheckBoxList: Set a legal name.">
-    <table id="ctrl_104" style="font-family:arial" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_104_0" type="checkbox" name="ctrl_104:0" />
-          <label for="ctrl_104_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_104_1" type="checkbox" name="ctrl_104:1" />
-          <label for="ctrl_104_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_104_2" type="checkbox" name="ctrl_104:2" />
-          <label for="ctrl_104_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_104_3" type="checkbox" name="ctrl_104:3" />
-          <label for="ctrl_104_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest106" testname="System.Web.UI.WebControls.CheckBoxList: Set a legal name twice.">
-    <table id="ctrl_105" style="font-family:david" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_105_0" type="checkbox" name="ctrl_105:0" />
-          <label for="ctrl_105_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_105_1" type="checkbox" name="ctrl_105:1" />
-          <label for="ctrl_105_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_105_2" type="checkbox" name="ctrl_105:2" />
-          <label for="ctrl_105_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_105_3" type="checkbox" name="ctrl_105:3" />
-          <label for="ctrl_105_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest107" testname="System.Web.UI.WebControls.CheckBoxList: Default is String.empty.">
-    <table id="ctrl_106" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_106_0" type="checkbox" name="ctrl_106:0" />
-          <label for="ctrl_106_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_106_1" type="checkbox" name="ctrl_106:1" />
-          <label for="ctrl_106_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_106_2" type="checkbox" name="ctrl_106:2" />
-          <label for="ctrl_106_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_106_3" type="checkbox" name="ctrl_106:3" />
-          <label for="ctrl_106_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest108" testname="System.Web.UI.WebControls.CheckBoxList: Null throws exception.">
-    <table id="ctrl_107" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_107_0" type="checkbox" name="ctrl_107:0" />
-          <label for="ctrl_107_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_107_1" type="checkbox" name="ctrl_107:1" />
-          <label for="ctrl_107_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_107_2" type="checkbox" name="ctrl_107:2" />
-          <label for="ctrl_107_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_107_3" type="checkbox" name="ctrl_107:3" />
-          <label for="ctrl_107_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest109" testname="System.Web.UI.WebControls.CheckBoxList: Set Name in code + Name in CssClass.">
-    <table id="ctrl_108" style="font-family:new roman times" border="0" class="NameCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_108_0" type="checkbox" name="ctrl_108:0" />
-          <label for="ctrl_108_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_1" type="checkbox" name="ctrl_108:1" />
-          <label for="ctrl_108_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_2" type="checkbox" name="ctrl_108:2" />
-          <label for="ctrl_108_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_108_3" type="checkbox" name="ctrl_108:3" />
-          <label for="ctrl_108_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest110" testname="System.Web.UI.WebControls.CheckBoxList: Set Name in code + Name in CssClass.">
-    <table id="ctrl_109" style="font-family:new roman times" border="0" class="NamesCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_109_0" type="checkbox" name="ctrl_109:0" />
-          <label for="ctrl_109_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_1" type="checkbox" name="ctrl_109:1" />
-          <label for="ctrl_109_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_2" type="checkbox" name="ctrl_109:2" />
-          <label for="ctrl_109_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_109_3" type="checkbox" name="ctrl_109:3" />
-          <label for="ctrl_109_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest111" testname="System.Web.UI.WebControls.CheckBoxList: Set Names, See that Name is changed accordingly.">
-    <table id="ctrl_110" style="font-family:aharoni,courier new,david" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_110_0" type="checkbox" name="ctrl_110:0" />
-          <label for="ctrl_110_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_1" type="checkbox" name="ctrl_110:1" />
-          <label for="ctrl_110_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_2" type="checkbox" name="ctrl_110:2" />
-          <label for="ctrl_110_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_110_3" type="checkbox" name="ctrl_110:3" />
-          <label for="ctrl_110_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest112" testname="System.Web.UI.WebControls.CheckBoxList: Set Names, See that Name is changed accordingly.">
-    <table id="ctrl_111" style="font-family:courier new,aharoni,david" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_111_0" type="checkbox" name="ctrl_111:0" />
-          <label for="ctrl_111_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_1" type="checkbox" name="ctrl_111:1" />
-          <label for="ctrl_111_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_2" type="checkbox" name="ctrl_111:2" />
-          <label for="ctrl_111_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_111_3" type="checkbox" name="ctrl_111:3" />
-          <label for="ctrl_111_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest113" testname="System.Web.UI.WebControls.DataGrid: Set a legal name.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:arial" rules="all" id="ctrl_112">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest114" testname="System.Web.UI.WebControls.DataGrid: Set a legal name twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:david" rules="all" id="ctrl_113">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest115" testname="System.Web.UI.WebControls.DataGrid: Default is String.empty.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_114">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest116" testname="System.Web.UI.WebControls.DataGrid: Null throws exception.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_115">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest117" testname="System.Web.UI.WebControls.DataGrid: Set Name in code + Name in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:new roman times" rules="all" class="NameCssClass" id="ctrl_116">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest118" testname="System.Web.UI.WebControls.DataGrid: Set Name in code + Name in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:new roman times" rules="all" class="NamesCssClass" id="ctrl_117">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest119" testname="System.Web.UI.WebControls.DataGrid: Set Names, See that Name is changed accordingly.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:aharoni,courier new,david" rules="all" id="ctrl_118">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest120" testname="System.Web.UI.WebControls.DataGrid: Set Names, See that Name is changed accordingly.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:courier new,aharoni,david" rules="all" id="ctrl_119">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest121" testname="System.Web.UI.WebControls.DataGridItem: Set a legal name.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_120">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_120_ctrl_121" style="font-family:arial">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest122" testname="System.Web.UI.WebControls.DataGridItem: Set a legal name twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_122">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_122_ctrl_123" style="font-family:david">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest123" testname="System.Web.UI.WebControls.DataGridItem: Default is String.empty.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_124">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_124_ctrl_125">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest124" testname="System.Web.UI.WebControls.DataGridItem: Null throws exception.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_126">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_126_ctrl_127">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest125" testname="System.Web.UI.WebControls.DataGridItem: Set Name in code + Name in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_128">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_128_ctrl_129" style="font-family:new roman times" class="NameCssClass">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest126" testname="System.Web.UI.WebControls.DataGridItem: Set Name in code + Name in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_130">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_130_ctrl_131" style="font-family:new roman times" class="NamesCssClass">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest127" testname="System.Web.UI.WebControls.DataGridItem: Set Names, See that Name is changed accordingly.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_132">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_132_ctrl_133" style="font-family:aharoni,courier new,david">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest128" testname="System.Web.UI.WebControls.DataGridItem: Set Names, See that Name is changed accordingly.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_134">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_134_ctrl_135" style="font-family:courier new,aharoni,david">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest129" testname="System.Web.UI.WebControls.DataList: Set a legal name.">
-    <table id="ctrl_136" cellspacing="0" border="0" style="border-collapse:collapse;font-family:arial">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Names.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Names.aspx.xml
deleted file mode 100644
index e24b46d3105..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Names.aspx.xml
+++ /dev/null
@@ -1,849 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Set legal value">
-    <input value="" style="font-family:david,times new new roman,courier" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Change Order">
-    <input value="" style="font-family:new new roman,david,courier times" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Setting Name changes Names.">
-    <input value="" style="font-family:arial" type="submit" name="ctrl_2" id="ctrl_2" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set Names in code + Names in CssClass.">
-    <input value="" style="font-family:new new roman,arial,courier times" type="submit" name="ctrl_3" class="NamesCssClass" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set Names in code + Name in CssClass.">
-    <input value="" style="font-family:new new roman,arial,courier times" type="submit" name="ctrl_4" class="NameCssClass" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Set legal value">
-    <span style="font-family:david,times new new roman,courier">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Change Order">
-    <span style="font-family:new new roman,david,courier times">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Setting Name changes Names.">
-    <span style="font-family:arial">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set Names in code + Names in CssClass.">
-    <span style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-      <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set Names in code + Name in CssClass.">
-    <span style="font-family:new new roman,arial,courier times" class="NameCssClass">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set legal value">
-    <a id="ctrl_10" style="font-family:david,times new new roman,courier">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Change Order">
-    <a id="ctrl_11" style="font-family:new new roman,david,courier times">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: Setting Name changes Names.">
-    <a id="ctrl_12" style="font-family:arial">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: Set Names in code + Names in CssClass.">
-    <a id="ctrl_13" style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Set Names in code + Name in CssClass.">
-    <a id="ctrl_14" style="font-family:new new roman,arial,courier times" class="NameCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set legal value">
-    <img id="ctrl_15" alt="" border="0" style="font-family:david,times new new roman,courier" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Change Order">
-    <img id="ctrl_16" alt="" border="0" style="font-family:new new roman,david,courier times" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: Setting Name changes Names.">
-    <img id="ctrl_17" alt="" border="0" style="font-family:arial" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: Set Names in code + Names in CssClass.">
-    <img id="ctrl_18" alt="" border="0" style="font-family:new new roman,arial,courier times" class="NamesCssClass" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Set Names in code + Name in CssClass.">
-    <img id="ctrl_19" alt="" border="0" style="font-family:new new roman,arial,courier times" class="NameCssClass" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: Set legal value">
-    <input id="ctrl_20" alt="" border="0" style="font-family:david,times new new roman,courier" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Change Order">
-    <input id="ctrl_21" alt="" border="0" style="font-family:new new roman,david,courier times" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: Setting Name changes Names.">
-    <input id="ctrl_22" alt="" border="0" style="font-family:arial" type="image" name="ctrl_22" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Set Names in code + Names in CssClass.">
-    <input id="ctrl_23" alt="" border="0" style="font-family:new new roman,arial,courier times" type="image" name="ctrl_23" class="NamesCssClass" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Set Names in code + Name in CssClass.">
-    <input id="ctrl_24" alt="" border="0" style="font-family:new new roman,arial,courier times" type="image" name="ctrl_24" class="NameCssClass" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: Set legal value">
-    <span id="ctrl_25" style="font-family:david,times new new roman,courier">
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Change Order">
-    <span id="ctrl_26" style="font-family:new new roman,david,courier times">
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: Setting Name changes Names.">
-    <span id="ctrl_27" style="font-family:arial">
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: Set Names in code + Names in CssClass.">
-    <span id="ctrl_28" style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Set Names in code + Name in CssClass.">
-    <span id="ctrl_29" style="font-family:new new roman,arial,courier times" class="NameCssClass">
-    </span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: Set legal value">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" style="font-family:david,times new new roman,courier">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Change Order">
-    <a href="javascript:__doPostBack('ctrl_31','')" id="ctrl_31" style="font-family:new new roman,david,courier times">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: Setting Name changes Names.">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32" style="font-family:arial">
-    </a>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: Set Names in code + Names in CssClass.">
-    <a href="javascript:__doPostBack('ctrl_33','')" id="ctrl_33" style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Set Names in code + Name in CssClass.">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" style="font-family:new new roman,arial,courier times" class="NameCssClass">
-    </a>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: Set legal value">
-    <div id="ctrl_35" style="font-family:david,times new new roman,courier">
-    </div>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Change Order">
-    <div id="ctrl_36" style="font-family:new new roman,david,courier times">
-    </div>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: Setting Name changes Names.">
-    <div id="ctrl_37" style="font-family:arial">
-    </div>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: Set Names in code + Names in CssClass.">
-    <div id="ctrl_38" style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-    </div>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Set Names in code + Name in CssClass.">
-    <div id="ctrl_39" style="font-family:new new roman,arial,courier times" class="NameCssClass">
-    </div>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: Set legal value">
-    <span style="font-family:david,times new new roman,courier">
-      <input id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Change Order">
-    <span style="font-family:new new roman,david,courier times">
-      <input id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: Setting Name changes Names.">
-    <span style="font-family:arial">
-      <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    </span>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: Set Names in code + Names in CssClass.">
-    <span style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-      <input id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Set Names in code + Name in CssClass.">
-    <span style="font-family:new new roman,arial,courier times" class="NameCssClass">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: Set legal value">
-    <input id="ctrl_45" style="font-family:david,times new new roman,courier" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Change Order">
-    <input id="ctrl_46" style="font-family:new new roman,david,courier times" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: Setting Name changes Names.">
-    <input id="ctrl_47" style="font-family:arial" type="text" name="ctrl_47" />
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: Set Names in code + Names in CssClass.">
-    <input id="ctrl_48" style="font-family:new new roman,arial,courier times" type="text" name="ctrl_48" class="NamesCssClass" />
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Set Names in code + Name in CssClass.">
-    <input id="ctrl_49" style="font-family:new new roman,arial,courier times" type="text" name="ctrl_49" class="NameCssClass" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: Set legal value">
-    <select id="ctrl_50" style="font-family:david,times new new roman,courier" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Change Order">
-    <select id="ctrl_51" style="font-family:new new roman,david,courier times" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: Setting Name changes Names.">
-    <select id="ctrl_52" style="font-family:arial" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: Set Names in code + Names in CssClass.">
-    <select id="ctrl_53" style="font-family:new new roman,arial,courier times" name="ctrl_53" class="NamesCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Set Names in code + Name in CssClass.">
-    <select id="ctrl_54" style="font-family:new new roman,arial,courier times" name="ctrl_54" class="NameCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: Set legal value">
-    <select id="ctrl_55" style="font-family:david,times new new roman,courier" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Change Order">
-    <select id="ctrl_56" style="font-family:new new roman,david,courier times" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: Setting Name changes Names.">
-    <select id="ctrl_57" style="font-family:arial" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: Set Names in code + Names in CssClass.">
-    <select id="ctrl_58" style="font-family:new new roman,arial,courier times" size="4" name="ctrl_58" class="NamesCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Set Names in code + Name in CssClass.">
-    <select id="ctrl_59" style="font-family:new new roman,arial,courier times" size="4" name="ctrl_59" class="NameCssClass">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: Set legal value">
-    <table id="ctrl_60" style="font-family:david,times new new roman,courier" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Change Order">
-    <table id="ctrl_61" style="font-family:new new roman,david,courier times" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: Setting Name changes Names.">
-    <table id="ctrl_62" style="font-family:arial" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: Set Names in code + Names in CssClass.">
-    <table id="ctrl_63" style="font-family:new new roman,arial,courier times" border="0" class="NamesCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Set Names in code + Name in CssClass.">
-    <table id="ctrl_64" style="font-family:new new roman,arial,courier times" border="0" class="NameCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: Set legal value">
-    <table id="ctrl_65" style="font-family:david,times new new roman,courier" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Change Order">
-    <table id="ctrl_66" style="font-family:new new roman,david,courier times" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: Setting Name changes Names.">
-    <table id="ctrl_67" style="font-family:arial" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Set Names in code + Names in CssClass.">
-    <table id="ctrl_68" style="font-family:new new roman,arial,courier times" border="0" class="NamesCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Set Names in code + Name in CssClass.">
-    <table id="ctrl_69" style="font-family:new new roman,arial,courier times" border="0" class="NameCssClass">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Set legal value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:david,times new new roman,courier" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Change Order">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:new new roman,david,courier times" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: Setting Name changes Names.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:arial" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: Set Names in code + Names in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:new new roman,arial,courier times" rules="all" class="NamesCssClass" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Set Names in code + Name in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-family:new new roman,arial,courier times" rules="all" class="NameCssClass" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: Set legal value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" style="font-family:david,times new new roman,courier">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Change Order">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" style="font-family:new new roman,david,courier times">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: Setting Name changes Names.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80" style="font-family:arial">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test Passed.</span>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: Set Names in code + Names in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_81_ctrl_82" style="font-family:new new roman,arial,courier times" class="NamesCssClass">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Set Names in code + Name in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" style="font-family:new new roman,arial,courier times" class="NameCssClass">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: Set legal value">
-    <table id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse;font-family:david,times new new roman,courier">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_OverLine.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_OverLine.aspx.xml
deleted file mode 100644
index 3ef43b3de47..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_OverLine.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Overline = true.">
-    <input value="" style="text-decoration:overline" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Overline = False.">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set twice.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set Overline + CssClass.">
-    <input value="" type="submit" name="ctrl_3" class="CssClass1" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Overline = true.">
-    <span style="text-decoration:overline">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Overline = False.">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice.">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set Overline + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Overline = true.">
-    <a id="ctrl_8" style="text-decoration:overline">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Overline = False.">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set twice.">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set Overline + CssClass.">
-    <a id="ctrl_11" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Overline = true.">
-    <img id="ctrl_12" alt="" border="0" style="text-decoration:overline" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Overline = False.">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set twice.">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set Overline + CssClass.">
-    <img id="ctrl_15" alt="" border="0" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Overline = true.">
-    <input id="ctrl_16" alt="" border="0" style="text-decoration:overline" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Overline = False.">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set twice.">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Set Overline + CssClass.">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Overline = true.">
-    <span id="ctrl_20" style="text-decoration:overline">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Overline = False.">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set twice.">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Set Overline + CssClass.">
-    <span id="ctrl_23" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Overline = true.">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="text-decoration:overline">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Overline = False.">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set twice.">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Set Overline + CssClass.">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Overline = true.">
-    <div id="ctrl_28" style="text-decoration:overline">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Overline = False.">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set twice.">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Set Overline + CssClass.">
-    <div id="ctrl_31" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Overline = true.">
-    <span style="text-decoration:overline">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Overline = False.">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set twice.">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Set Overline + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Overline = true.">
-    <input id="ctrl_36" style="text-decoration:overline" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Overline = False.">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set twice.">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Set Overline + CssClass.">
-    <input id="ctrl_39" type="text" name="ctrl_39" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Overline = true.">
-    <select id="ctrl_40" style="text-decoration:overline" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Overline = False.">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set twice.">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Set Overline + CssClass.">
-    <select id="ctrl_43" name="ctrl_43" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Overline = true.">
-    <select id="ctrl_44" style="text-decoration:overline" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Overline = False.">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set twice.">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Set Overline + CssClass.">
-    <select id="ctrl_47" size="4" name="ctrl_47" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Overline = true.">
-    <table id="ctrl_48" style="text-decoration:overline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Overline = False.">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set twice.">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Set Overline + CssClass.">
-    <table id="ctrl_51" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Overline = true.">
-    <table id="ctrl_52" style="text-decoration:overline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Overline = False.">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set twice.">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Set Overline + CssClass.">
-    <table id="ctrl_55" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Overline = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;text-decoration:overline" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Overline = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Set Overline + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Overline = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="text-decoration:overline">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Overline = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Set Overline + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Overline = true.">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse;text-decoration:overline">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Size.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Size.aspx.xml
deleted file mode 100644
index 483d8e3d0f3..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_Size.aspx.xml
+++ /dev/null
@@ -1,845 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Set legal absolute size.">
-    <input value="" style="font-size:12pt" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set legal relative size.">
-    <input value="" style="font-size:larger" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set to negative size.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set to zero.">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set size in code and in CssClass.">
-    <input value="" style="font-size:25pt" type="submit" name="ctrl_4" class="CssClass1" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Set legal absolute size.">
-    <span style="font-size:12pt">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set legal relative size.">
-    <span style="font-size:larger">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set to negative size.">
-    <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set to zero.">
-    <span>
-      <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set size in code and in CssClass.">
-    <span style="font-size:25pt" class="CssClass1">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set legal absolute size.">
-    <a id="ctrl_10" style="font-size:12pt">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set legal relative size.">
-    <a id="ctrl_11" style="font-size:larger">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: Set to negative size.">
-    <a id="ctrl_12">
-    </a>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: Set to zero.">
-    <a id="ctrl_13">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Set size in code and in CssClass.">
-    <a id="ctrl_14" style="font-size:25pt" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set legal absolute size.">
-    <img id="ctrl_15" alt="" border="0" style="font-size:12pt" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Set legal relative size.">
-    <img id="ctrl_16" alt="" border="0" style="font-size:larger" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: Set to negative size.">
-    <img id="ctrl_17" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: Set to zero.">
-    <img id="ctrl_18" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Set size in code and in CssClass.">
-    <img id="ctrl_19" alt="" border="0" style="font-size:25pt" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: Set legal absolute size.">
-    <input id="ctrl_20" alt="" border="0" style="font-size:12pt" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Set legal relative size.">
-    <input id="ctrl_21" alt="" border="0" style="font-size:larger" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: Set to negative size.">
-    <input id="ctrl_22" alt="" border="0" type="image" name="ctrl_22" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Set to zero.">
-    <input id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Set size in code and in CssClass.">
-    <input id="ctrl_24" alt="" border="0" style="font-size:25pt" type="image" name="ctrl_24" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: Set legal absolute size.">
-    <span id="ctrl_25" style="font-size:12pt">
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Set legal relative size.">
-    <span id="ctrl_26" style="font-size:larger">
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: Set to negative size.">
-    <span id="ctrl_27">
-    </span>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: Set to zero.">
-    <span id="ctrl_28">
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Set size in code and in CssClass.">
-    <span id="ctrl_29" style="font-size:25pt" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: Set legal absolute size.">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" style="font-size:12pt">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Set legal relative size.">
-    <a href="javascript:__doPostBack('ctrl_31','')" id="ctrl_31" style="font-size:larger">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: Set to negative size.">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32">
-    </a>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: Set to zero.">
-    <a href="javascript:__doPostBack('ctrl_33','')" id="ctrl_33">
-    </a>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Set size in code and in CssClass.">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" style="font-size:25pt" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: Set legal absolute size.">
-    <div id="ctrl_35" style="font-size:12pt">
-    </div>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Set legal relative size.">
-    <div id="ctrl_36" style="font-size:larger">
-    </div>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: Set to negative size.">
-    <div id="ctrl_37">
-    </div>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: Set to zero.">
-    <div id="ctrl_38">
-    </div>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Set size in code and in CssClass.">
-    <div id="ctrl_39" style="font-size:25pt" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: Set legal absolute size.">
-    <span style="font-size:12pt">
-      <input id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Set legal relative size.">
-    <span style="font-size:larger">
-      <input id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: Set to negative size.">
-    <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: Set to zero.">
-    <span>
-      <input id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Set size in code and in CssClass.">
-    <span style="font-size:25pt" class="CssClass1">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: Set legal absolute size.">
-    <input id="ctrl_45" style="font-size:12pt" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Set legal relative size.">
-    <input id="ctrl_46" style="font-size:larger" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: Set to negative size.">
-    <input id="ctrl_47" type="text" name="ctrl_47" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: Set to zero.">
-    <input id="ctrl_48" type="text" name="ctrl_48" />
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Set size in code and in CssClass.">
-    <input id="ctrl_49" style="font-size:25pt" type="text" name="ctrl_49" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: Set legal absolute size.">
-    <select id="ctrl_50" style="font-size:12pt" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Set legal relative size.">
-    <select id="ctrl_51" style="font-size:larger" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: Set to negative size.">
-    <select id="ctrl_52" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: Set to zero.">
-    <select id="ctrl_53" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Set size in code and in CssClass.">
-    <select id="ctrl_54" style="font-size:25pt" name="ctrl_54" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: Set legal absolute size.">
-    <select id="ctrl_55" style="font-size:12pt" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Set legal relative size.">
-    <select id="ctrl_56" style="font-size:larger" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: Set to negative size.">
-    <select id="ctrl_57" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: Set to zero.">
-    <select id="ctrl_58" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Set size in code and in CssClass.">
-    <select id="ctrl_59" style="font-size:25pt" size="4" name="ctrl_59" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: Set legal absolute size.">
-    <table id="ctrl_60" style="font-size:12pt" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Set legal relative size.">
-    <table id="ctrl_61" style="font-size:larger" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: Set to negative size.">
-    <table id="ctrl_62" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: Set to zero.">
-    <table id="ctrl_63" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Set size in code and in CssClass.">
-    <table id="ctrl_64" style="font-size:25pt" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: Set legal absolute size.">
-    <table id="ctrl_65" style="font-size:12pt" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Set legal relative size.">
-    <table id="ctrl_66" style="font-size:larger" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: Set to negative size.">
-    <table id="ctrl_67" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Set to zero.">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Set size in code and in CssClass.">
-    <table id="ctrl_69" style="font-size:25pt" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Set legal absolute size.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-size:12pt" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Set legal relative size.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-size:larger" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: Set to negative size.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: Set to zero.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Set size in code and in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;font-size:25pt" rules="all" class="CssClass1" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: Set legal absolute size.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" style="font-size:12pt">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Set legal relative size.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" style="font-size:larger">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: Set to negative size.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: Set to zero.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_81_ctrl_82">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Set size in code and in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" style="font-size:25pt" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: Set legal absolute size.">
-    <table id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse;font-size:12pt">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_StrikeOut.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_StrikeOut.aspx.xml
deleted file mode 100644
index 958a73fc00c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_StrikeOut.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: StrikOut = true.">
-    <input value="" style="text-decoration:line-through" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: StrikeOut = False.">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set twice.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set StrikeOut + CssClass.">
-    <input value="" type="submit" name="ctrl_3" class="CssClass1" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: StrikOut = true.">
-    <span style="text-decoration:line-through">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: StrikeOut = False.">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice.">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set StrikeOut + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: StrikOut = true.">
-    <a id="ctrl_8" style="text-decoration:line-through">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: StrikeOut = False.">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set twice.">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set StrikeOut + CssClass.">
-    <a id="ctrl_11" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: StrikOut = true.">
-    <img id="ctrl_12" alt="" border="0" style="text-decoration:line-through" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: StrikeOut = False.">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set twice.">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set StrikeOut + CssClass.">
-    <img id="ctrl_15" alt="" border="0" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: StrikOut = true.">
-    <input id="ctrl_16" alt="" border="0" style="text-decoration:line-through" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: StrikeOut = False.">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set twice.">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Set StrikeOut + CssClass.">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: StrikOut = true.">
-    <span id="ctrl_20" style="text-decoration:line-through">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: StrikeOut = False.">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set twice.">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Set StrikeOut + CssClass.">
-    <span id="ctrl_23" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: StrikOut = true.">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="text-decoration:line-through">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: StrikeOut = False.">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set twice.">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Set StrikeOut + CssClass.">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: StrikOut = true.">
-    <div id="ctrl_28" style="text-decoration:line-through">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: StrikeOut = False.">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set twice.">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Set StrikeOut + CssClass.">
-    <div id="ctrl_31" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: StrikOut = true.">
-    <span style="text-decoration:line-through">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: StrikeOut = False.">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set twice.">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Set StrikeOut + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: StrikOut = true.">
-    <input id="ctrl_36" style="text-decoration:line-through" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: StrikeOut = False.">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set twice.">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Set StrikeOut + CssClass.">
-    <input id="ctrl_39" type="text" name="ctrl_39" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: StrikOut = true.">
-    <select id="ctrl_40" style="text-decoration:line-through" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: StrikeOut = False.">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set twice.">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Set StrikeOut + CssClass.">
-    <select id="ctrl_43" name="ctrl_43" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: StrikOut = true.">
-    <select id="ctrl_44" style="text-decoration:line-through" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: StrikeOut = False.">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set twice.">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Set StrikeOut + CssClass.">
-    <select id="ctrl_47" size="4" name="ctrl_47" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: StrikOut = true.">
-    <table id="ctrl_48" style="text-decoration:line-through" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: StrikeOut = False.">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set twice.">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Set StrikeOut + CssClass.">
-    <table id="ctrl_51" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: StrikOut = true.">
-    <table id="ctrl_52" style="text-decoration:line-through" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: StrikeOut = False.">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set twice.">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Set StrikeOut + CssClass.">
-    <table id="ctrl_55" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: StrikOut = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;text-decoration:line-through" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: StrikeOut = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Set StrikeOut + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: StrikOut = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="text-decoration:line-through">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: StrikeOut = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Set StrikeOut + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: StrikOut = true.">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse;text-decoration:line-through">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_UnderLine.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_UnderLine.aspx.xml
deleted file mode 100644
index 69e7ca4fa46..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Font_UnderLine.aspx.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: UnderLine = true.">
-    <input value="" style="text-decoration:underline" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: UnderLine = False.">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set twice.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set UnderLine + CssClass.">
-    <input value="" type="submit" name="ctrl_3" class="CssClass1" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: UnderLine = true.">
-    <span style="text-decoration:underline">
-      <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: UnderLine = False.">
-    <span>
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice.">
-    <span>
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set UnderLine + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: UnderLine = true.">
-    <a id="ctrl_8" style="text-decoration:underline">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: UnderLine = False.">
-    <a id="ctrl_9">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set twice.">
-    <a id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set UnderLine + CssClass.">
-    <a id="ctrl_11" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: UnderLine = true.">
-    <img id="ctrl_12" alt="" border="0" style="text-decoration:underline" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: UnderLine = False.">
-    <img id="ctrl_13" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Set twice.">
-    <img id="ctrl_14" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set UnderLine + CssClass.">
-    <img id="ctrl_15" alt="" border="0" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: UnderLine = true.">
-    <input id="ctrl_16" alt="" border="0" style="text-decoration:underline" type="image" name="ctrl_16" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: UnderLine = False.">
-    <input id="ctrl_17" alt="" border="0" type="image" name="ctrl_17" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Set twice.">
-    <input id="ctrl_18" alt="" border="0" type="image" name="ctrl_18" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Set UnderLine + CssClass.">
-    <input id="ctrl_19" alt="" border="0" type="image" name="ctrl_19" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: UnderLine = true.">
-    <span id="ctrl_20" style="text-decoration:underline">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: UnderLine = False.">
-    <span id="ctrl_21">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Set twice.">
-    <span id="ctrl_22">
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Set UnderLine + CssClass.">
-    <span id="ctrl_23" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: UnderLine = true.">
-    <a href="javascript:__doPostBack('ctrl_24','')" id="ctrl_24" style="text-decoration:underline">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: UnderLine = False.">
-    <a href="javascript:__doPostBack('ctrl_25','')" id="ctrl_25">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Set twice.">
-    <a href="javascript:__doPostBack('ctrl_26','')" id="ctrl_26">
-    </a>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Set UnderLine + CssClass.">
-    <a href="javascript:__doPostBack('ctrl_27','')" id="ctrl_27" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: UnderLine = true.">
-    <div id="ctrl_28" style="text-decoration:underline">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: UnderLine = False.">
-    <div id="ctrl_29">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Set twice.">
-    <div id="ctrl_30">
-    </div>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Set UnderLine + CssClass.">
-    <div id="ctrl_31" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: UnderLine = true.">
-    <span style="text-decoration:underline">
-      <input id="ctrl_32" type="radio" name="ctrl_32" value="ctrl_32" />
-    </span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: UnderLine = False.">
-    <span>
-      <input id="ctrl_33" type="radio" name="ctrl_33" value="ctrl_33" />
-    </span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Set twice.">
-    <span>
-      <input id="ctrl_34" type="radio" name="ctrl_34" value="ctrl_34" />
-    </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Set UnderLine + CssClass.">
-    <span class="CssClass1">
-      <input id="ctrl_35" type="radio" name="ctrl_35" value="ctrl_35" />
-    </span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: UnderLine = true.">
-    <input id="ctrl_36" style="text-decoration:underline" type="text" name="ctrl_36" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: UnderLine = False.">
-    <input id="ctrl_37" type="text" name="ctrl_37" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Set twice.">
-    <input id="ctrl_38" type="text" name="ctrl_38" />
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Set UnderLine + CssClass.">
-    <input id="ctrl_39" type="text" name="ctrl_39" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: UnderLine = true.">
-    <select id="ctrl_40" style="text-decoration:underline" name="ctrl_40">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: UnderLine = False.">
-    <select id="ctrl_41" name="ctrl_41">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Set twice.">
-    <select id="ctrl_42" name="ctrl_42">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Set UnderLine + CssClass.">
-    <select id="ctrl_43" name="ctrl_43" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: UnderLine = true.">
-    <select id="ctrl_44" style="text-decoration:underline" size="4" name="ctrl_44">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: UnderLine = False.">
-    <select id="ctrl_45" size="4" name="ctrl_45">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Set twice.">
-    <select id="ctrl_46" size="4" name="ctrl_46">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Set UnderLine + CssClass.">
-    <select id="ctrl_47" size="4" name="ctrl_47" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: UnderLine = true.">
-    <table id="ctrl_48" style="text-decoration:underline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_48_0" type="radio" name="ctrl_48" value="1" />
-          <label for="ctrl_48_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_1" type="radio" name="ctrl_48" value="2" />
-          <label for="ctrl_48_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_2" type="radio" name="ctrl_48" value="3" />
-          <label for="ctrl_48_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_48_3" type="radio" name="ctrl_48" value="4" />
-          <label for="ctrl_48_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: UnderLine = False.">
-    <table id="ctrl_49" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_49_0" type="radio" name="ctrl_49" value="1" />
-          <label for="ctrl_49_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_1" type="radio" name="ctrl_49" value="2" />
-          <label for="ctrl_49_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_2" type="radio" name="ctrl_49" value="3" />
-          <label for="ctrl_49_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_49_3" type="radio" name="ctrl_49" value="4" />
-          <label for="ctrl_49_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Set twice.">
-    <table id="ctrl_50" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_50_0" type="radio" name="ctrl_50" value="1" />
-          <label for="ctrl_50_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_1" type="radio" name="ctrl_50" value="2" />
-          <label for="ctrl_50_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_2" type="radio" name="ctrl_50" value="3" />
-          <label for="ctrl_50_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_50_3" type="radio" name="ctrl_50" value="4" />
-          <label for="ctrl_50_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Set UnderLine + CssClass.">
-    <table id="ctrl_51" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_51_0" type="radio" name="ctrl_51" value="1" />
-          <label for="ctrl_51_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_1" type="radio" name="ctrl_51" value="2" />
-          <label for="ctrl_51_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_2" type="radio" name="ctrl_51" value="3" />
-          <label for="ctrl_51_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_51_3" type="radio" name="ctrl_51" value="4" />
-          <label for="ctrl_51_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: UnderLine = true.">
-    <table id="ctrl_52" style="text-decoration:underline" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_52_0" type="checkbox" name="ctrl_52:0" />
-          <label for="ctrl_52_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_1" type="checkbox" name="ctrl_52:1" />
-          <label for="ctrl_52_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_2" type="checkbox" name="ctrl_52:2" />
-          <label for="ctrl_52_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_52_3" type="checkbox" name="ctrl_52:3" />
-          <label for="ctrl_52_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: UnderLine = False.">
-    <table id="ctrl_53" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_53_0" type="checkbox" name="ctrl_53:0" />
-          <label for="ctrl_53_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_1" type="checkbox" name="ctrl_53:1" />
-          <label for="ctrl_53_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_2" type="checkbox" name="ctrl_53:2" />
-          <label for="ctrl_53_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_53_3" type="checkbox" name="ctrl_53:3" />
-          <label for="ctrl_53_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Set twice.">
-    <table id="ctrl_54" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_54_0" type="checkbox" name="ctrl_54:0" />
-          <label for="ctrl_54_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_1" type="checkbox" name="ctrl_54:1" />
-          <label for="ctrl_54_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_2" type="checkbox" name="ctrl_54:2" />
-          <label for="ctrl_54_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_54_3" type="checkbox" name="ctrl_54:3" />
-          <label for="ctrl_54_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Set UnderLine + CssClass.">
-    <table id="ctrl_55" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_55_0" type="checkbox" name="ctrl_55:0" />
-          <label for="ctrl_55_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_1" type="checkbox" name="ctrl_55:1" />
-          <label for="ctrl_55_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_2" type="checkbox" name="ctrl_55:2" />
-          <label for="ctrl_55_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_55_3" type="checkbox" name="ctrl_55:3" />
-          <label for="ctrl_55_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: UnderLine = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;text-decoration:underline" rules="all" id="ctrl_56">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: UnderLine = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_57">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_58">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Set UnderLine + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_59">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: UnderLine = true.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_60">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_60_ctrl_61" style="text-decoration:underline">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: UnderLine = False.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_62">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_62_ctrl_63">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Set twice.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_64">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_64_ctrl_65">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Set UnderLine + CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_66">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_66_ctrl_67" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: UnderLine = true.">
-    <table id="ctrl_68" cellspacing="0" border="0" style="border-collapse:collapse;text-decoration:underline">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_ForeColor.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_ForeColor.aspx.xml
deleted file mode 100644
index 9b6b9249edd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_ForeColor.aspx.xml
+++ /dev/null
@@ -1,817 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Set color once">
-    <input value="" style="color:cyan" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set color twice">
-    <input value="" style="color:purple" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set empty color.">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set transparent color.">
-    <input value="" style="color:transparent" type="submit" name="ctrl_3" id="ctrl_3" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set color and CssClass.">
-    <input value="" style="color:forestgreen" type="submit" name="ctrl_4" class="CssClass1" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Set color once">
-    <span style="color:cyan">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set color twice">
-    <span style="color:purple">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set empty color.">
-    <span>
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set transparent color.">
-    <span style="color:transparent">
-      <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set color and CssClass.">
-    <span style="color:forestgreen" class="CssClass1">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Set color once">
-    <a id="ctrl_10" style="color:cyan">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set color twice">
-    <a id="ctrl_11" style="color:purple">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: Set empty color.">
-    <a id="ctrl_12">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: Set transparent color.">
-    <a id="ctrl_13" style="color:transparent">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Set color and CssClass.">
-    <a id="ctrl_14" style="color:forestgreen" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Set color once">
-    <img id="ctrl_15" alt="" border="0" style="color:cyan" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Set color twice">
-    <img id="ctrl_16" alt="" border="0" style="color:purple" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: Set empty color.">
-    <img id="ctrl_17" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: Set transparent color.">
-    <img id="ctrl_18" alt="" border="0" style="color:transparent" />
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Set color and CssClass.">
-    <img id="ctrl_19" alt="" border="0" style="color:forestgreen" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: Set color once">
-    <input id="ctrl_20" alt="" border="0" style="color:cyan" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Set color twice">
-    <input id="ctrl_21" alt="" border="0" style="color:purple" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: Set empty color.">
-    <input id="ctrl_22" alt="" border="0" type="image" name="ctrl_22" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Set transparent color.">
-    <input id="ctrl_23" alt="" border="0" style="color:transparent" type="image" name="ctrl_23" />
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Set color and CssClass.">
-    <input id="ctrl_24" alt="" border="0" style="color:forestgreen" type="image" name="ctrl_24" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: Set color once">
-    <span id="ctrl_25" style="color:cyan">
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Set color twice">
-    <span id="ctrl_26" style="color:purple">
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: Set empty color.">
-    <span id="ctrl_27">
-    </span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: Set transparent color.">
-    <span id="ctrl_28" style="color:transparent">
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Set color and CssClass.">
-    <span id="ctrl_29" style="color:forestgreen" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: Set color once">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" style="color:cyan">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Set color twice">
-    <a href="javascript:__doPostBack('ctrl_31','')" id="ctrl_31" style="color:purple">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: Set empty color.">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32">
-    </a>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: Set transparent color.">
-    <a href="javascript:__doPostBack('ctrl_33','')" id="ctrl_33" style="color:transparent">
-    </a>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Set color and CssClass.">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" style="color:forestgreen" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: Set color once">
-    <div id="ctrl_35" style="color:cyan">
-    </div>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Set color twice">
-    <div id="ctrl_36" style="color:purple">
-    </div>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: Set empty color.">
-    <div id="ctrl_37">
-    </div>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: Set transparent color.">
-    <div id="ctrl_38" style="color:transparent">
-    </div>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Set color and CssClass.">
-    <div id="ctrl_39" style="color:forestgreen" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: Set color once">
-    <span style="color:cyan">
-      <input id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Set color twice">
-    <span style="color:purple">
-      <input id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: Set empty color.">
-    <span>
-      <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    </span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: Set transparent color.">
-    <span style="color:transparent">
-      <input id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Set color and CssClass.">
-    <span style="color:forestgreen" class="CssClass1">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: Set color once">
-    <input id="ctrl_45" style="color:cyan" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Set color twice">
-    <input id="ctrl_46" style="color:purple" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: Set empty color.">
-    <input id="ctrl_47" type="text" name="ctrl_47" />
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: Set transparent color.">
-    <input id="ctrl_48" style="color:transparent" type="text" name="ctrl_48" />
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Set color and CssClass.">
-    <input id="ctrl_49" style="color:forestgreen" type="text" name="ctrl_49" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: Set color once">
-    <select id="ctrl_50" style="color:cyan" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Set color twice">
-    <select id="ctrl_51" style="color:purple" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: Set empty color.">
-    <select id="ctrl_52" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: Set transparent color.">
-    <select id="ctrl_53" style="color:transparent" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Set color and CssClass.">
-    <select id="ctrl_54" style="color:forestgreen" name="ctrl_54" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: Set color once">
-    <select id="ctrl_55" style="color:cyan" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Set color twice">
-    <select id="ctrl_56" style="color:purple" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: Set empty color.">
-    <select id="ctrl_57" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: Set transparent color.">
-    <select id="ctrl_58" style="color:transparent" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Set color and CssClass.">
-    <select id="ctrl_59" style="color:forestgreen" size="4" name="ctrl_59" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: Set color once">
-    <table id="ctrl_60" style="color:cyan" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Set color twice">
-    <table id="ctrl_61" style="color:purple" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: Set empty color.">
-    <table id="ctrl_62" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: Set transparent color.">
-    <table id="ctrl_63" style="color:transparent" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Set color and CssClass.">
-    <table id="ctrl_64" style="color:forestgreen" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: Set color once">
-    <table id="ctrl_65" style="color:cyan" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Set color twice">
-    <table id="ctrl_66" style="color:purple" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: Set empty color.">
-    <table id="ctrl_67" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Set transparent color.">
-    <table id="ctrl_68" style="color:transparent" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Set color and CssClass.">
-    <table id="ctrl_69" style="color:forestgreen" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Set color once">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:cyan" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Set color twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:purple" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: Set empty color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: Set transparent color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:transparent" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Set color and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;color:forestgreen" rules="all" class="CssClass1" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: Set color once">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" style="color:cyan">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Set color twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" style="color:purple">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: Set empty color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: Set transparent color.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_81_ctrl_82" style="color:transparent">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Set color and CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" style="color:forestgreen" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: Set color once">
-    <table id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse;color:cyan">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Hight.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Hight.aspx.xml
deleted file mode 100644
index 6d363ef8dfd..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Hight.aspx.xml
+++ /dev/null
@@ -1,845 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Legal value">
-    <input value="" style="height:30px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set twice">
-    <input value="" style="height:10px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set to 0">
-    <input value="" style="height:0px" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set to negative value">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set height and a CssClass">
-    <input value="" style="height:30px" type="submit" name="ctrl_4" class="CssClass1" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Legal value">
-    <span style="height:30px">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice">
-    <span style="height:10px">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set to 0">
-    <span style="height:0px">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set to negative value">
-    <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set height and a CssClass">
-    <span style="height:30px" class="CssClass1">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Legal value">
-    <a id="ctrl_10" style="height:30px">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set twice">
-    <a id="ctrl_11" style="height:10px">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: Set to 0">
-    <a id="ctrl_12" style="height:0px">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: Set to negative value">
-    <a id="ctrl_13">
-    </a>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Set height and a CssClass">
-    <a id="ctrl_14" style="height:30px" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Legal value">
-    <img id="ctrl_15" alt="" border="0" style="height:30px" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Set twice">
-    <img id="ctrl_16" alt="" border="0" style="height:10px" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: Set to 0">
-    <img id="ctrl_17" alt="" border="0" style="height:0px" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: Set to negative value">
-    <img id="ctrl_18" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Set height and a CssClass">
-    <img id="ctrl_19" alt="" border="0" style="height:30px" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: Legal value">
-    <input id="ctrl_20" alt="" border="0" style="height:30px" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Set twice">
-    <input id="ctrl_21" alt="" border="0" style="height:10px" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: Set to 0">
-    <input id="ctrl_22" alt="" border="0" style="height:0px" type="image" name="ctrl_22" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Set to negative value">
-    <input id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Set height and a CssClass">
-    <input id="ctrl_24" alt="" border="0" style="height:30px" type="image" name="ctrl_24" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: Legal value">
-    <span id="ctrl_25" style="height:30px">
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Set twice">
-    <span id="ctrl_26" style="height:10px">
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: Set to 0">
-    <span id="ctrl_27" style="height:0px">
-    </span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: Set to negative value">
-    <span id="ctrl_28">
-    </span>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Set height and a CssClass">
-    <span id="ctrl_29" style="height:30px" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: Legal value">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" style="height:30px">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Set twice">
-    <a href="javascript:__doPostBack('ctrl_31','')" id="ctrl_31" style="height:10px">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: Set to 0">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32" style="height:0px">
-    </a>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: Set to negative value">
-    <a href="javascript:__doPostBack('ctrl_33','')" id="ctrl_33">
-    </a>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Set height and a CssClass">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" style="height:30px" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: Legal value">
-    <div id="ctrl_35" style="height:30px">
-    </div>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Set twice">
-    <div id="ctrl_36" style="height:10px">
-    </div>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: Set to 0">
-    <div id="ctrl_37" style="height:0px">
-    </div>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: Set to negative value">
-    <div id="ctrl_38">
-    </div>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Set height and a CssClass">
-    <div id="ctrl_39" style="height:30px" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: Legal value">
-    <span style="height:30px">
-      <input id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Set twice">
-    <span style="height:10px">
-      <input id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: Set to 0">
-    <span style="height:0px">
-      <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    </span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: Set to negative value">
-    <input id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Set height and a CssClass">
-    <span style="height:30px" class="CssClass1">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: Legal value">
-    <input id="ctrl_45" style="height:30px" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Set twice">
-    <input id="ctrl_46" style="height:10px" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: Set to 0">
-    <input id="ctrl_47" style="height:0px" type="text" name="ctrl_47" />
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: Set to negative value">
-    <input id="ctrl_48" type="text" name="ctrl_48" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Set height and a CssClass">
-    <input id="ctrl_49" style="height:30px" type="text" name="ctrl_49" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: Legal value">
-    <select id="ctrl_50" style="height:30px" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Set twice">
-    <select id="ctrl_51" style="height:10px" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: Set to 0">
-    <select id="ctrl_52" style="height:0px" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: Set to negative value">
-    <select id="ctrl_53" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Set height and a CssClass">
-    <select id="ctrl_54" style="height:30px" name="ctrl_54" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: Legal value">
-    <select id="ctrl_55" style="height:30px" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Set twice">
-    <select id="ctrl_56" style="height:10px" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: Set to 0">
-    <select id="ctrl_57" style="height:0px" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: Set to negative value">
-    <select id="ctrl_58" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Set height and a CssClass">
-    <select id="ctrl_59" style="height:30px" size="4" name="ctrl_59" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: Legal value">
-    <table id="ctrl_60" style="height:30px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Set twice">
-    <table id="ctrl_61" style="height:10px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: Set to 0">
-    <table id="ctrl_62" style="height:0px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: Set to negative value">
-    <table id="ctrl_63" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Set height and a CssClass">
-    <table id="ctrl_64" style="height:30px" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: Legal value">
-    <table id="ctrl_65" style="height:30px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Set twice">
-    <table id="ctrl_66" style="height:10px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: Set to 0">
-    <table id="ctrl_67" style="height:0px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Set to negative value">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Set height and a CssClass">
-    <table id="ctrl_69" style="height:30px" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Legal value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;height:30px" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Set twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;height:10px" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: Set to 0">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;height:0px" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: Set to negative value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Set height and a CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;height:30px" rules="all" class="CssClass1" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: Legal value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" style="height:30px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Set twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" style="height:10px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: Set to 0">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80" style="height:0px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: Set to negative value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_81_ctrl_82">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Set height and a CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" style="height:30px" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: Legal value">
-    <table id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse;height:30px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Width.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Width.aspx.xml
deleted file mode 100644
index d8b676d1975..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Style_Width.aspx.xml
+++ /dev/null
@@ -1,845 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Legal value">
-    <input value="" style="width:30px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Set twice">
-    <input value="" style="width:10px" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Set to 0">
-    <input value="" style="width:0px" type="submit" name="ctrl_2" id="ctrl_2" />
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Set to negative value">
-    <input value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.Button: Set Width and a CssClass">
-    <input value="" style="width:30px" type="submit" name="ctrl_4" class="CssClass1" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Legal value">
-    <span style="width:30px">
-      <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    </span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Set twice">
-    <span style="width:10px">
-      <input id="ctrl_6" type="checkbox" name="ctrl_6" />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Set to 0">
-    <span style="width:0px">
-      <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBox: Set to negative value">
-    <input id="ctrl_8" type="checkbox" name="ctrl_8" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBox: Set Width and a CssClass">
-    <span style="width:30px" class="CssClass1">
-      <input id="ctrl_9" type="checkbox" name="ctrl_9" />
-    </span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Legal value">
-    <a id="ctrl_10" style="width:30px">
-    </a>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Set twice">
-    <a id="ctrl_11" style="width:10px">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.HyperLink: Set to 0">
-    <a id="ctrl_12" style="width:0px">
-    </a>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.HyperLink: Set to negative value">
-    <a id="ctrl_13">
-    </a>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.HyperLink: Set Width and a CssClass">
-    <a id="ctrl_14" style="width:30px" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Legal value">
-    <img id="ctrl_15" alt="" border="0" style="width:30px" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Image: Set twice">
-    <img id="ctrl_16" alt="" border="0" style="width:10px" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Image: Set to 0">
-    <img id="ctrl_17" alt="" border="0" style="width:0px" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.Image: Set to negative value">
-    <img id="ctrl_18" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.Image: Set Width and a CssClass">
-    <img id="ctrl_19" alt="" border="0" style="width:30px" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.ImageButton: Legal value">
-    <input id="ctrl_20" alt="" border="0" style="width:30px" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.ImageButton: Set twice">
-    <input id="ctrl_21" alt="" border="0" style="width:10px" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ImageButton: Set to 0">
-    <input id="ctrl_22" alt="" border="0" style="width:0px" type="image" name="ctrl_22" />
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ImageButton: Set to negative value">
-    <input id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.ImageButton: Set Width and a CssClass">
-    <input id="ctrl_24" alt="" border="0" style="width:30px" type="image" name="ctrl_24" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.Label: Legal value">
-    <span id="ctrl_25" style="width:30px">
-    </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.Label: Set twice">
-    <span id="ctrl_26" style="width:10px">
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.Label: Set to 0">
-    <span id="ctrl_27" style="width:0px">
-    </span>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Label: Set to negative value">
-    <span id="ctrl_28">
-    </span>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Label: Set Width and a CssClass">
-    <span id="ctrl_29" style="width:30px" class="CssClass1">
-    </span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.LinkButton: Legal value">
-    <a href="javascript:__doPostBack('ctrl_30','')" id="ctrl_30" style="width:30px">
-    </a>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.LinkButton: Set twice">
-    <a href="javascript:__doPostBack('ctrl_31','')" id="ctrl_31" style="width:10px">
-    </a>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.LinkButton: Set to 0">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32" style="width:0px">
-    </a>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.LinkButton: Set to negative value">
-    <a href="javascript:__doPostBack('ctrl_33','')" id="ctrl_33">
-    </a>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.LinkButton: Set Width and a CssClass">
-    <a href="javascript:__doPostBack('ctrl_34','')" id="ctrl_34" style="width:30px" class="CssClass1">
-    </a>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.Panel: Legal value">
-    <div id="ctrl_35" style="width:30px">
-    </div>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.Panel: Set twice">
-    <div id="ctrl_36" style="width:10px">
-    </div>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.Panel: Set to 0">
-    <div id="ctrl_37" style="width:0px">
-    </div>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.Panel: Set to negative value">
-    <div id="ctrl_38">
-    </div>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.Panel: Set Width and a CssClass">
-    <div id="ctrl_39" style="width:30px" class="CssClass1">
-    </div>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.RadioButton: Legal value">
-    <span style="width:30px">
-      <input id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-    </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.RadioButton: Set twice">
-    <span style="width:10px">
-      <input id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-    </span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.RadioButton: Set to 0">
-    <span style="width:0px">
-      <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    </span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.RadioButton: Set to negative value">
-    <input id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.RadioButton: Set Width and a CssClass">
-    <span style="width:30px" class="CssClass1">
-      <input id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-    </span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.TextBox: Legal value">
-    <input id="ctrl_45" style="width:30px" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.TextBox: Set twice">
-    <input id="ctrl_46" style="width:10px" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.TextBox: Set to 0">
-    <input id="ctrl_47" style="width:0px" type="text" name="ctrl_47" />
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.TextBox: Set to negative value">
-    <input id="ctrl_48" type="text" name="ctrl_48" />
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.TextBox: Set Width and a CssClass">
-    <input id="ctrl_49" style="width:30px" type="text" name="ctrl_49" class="CssClass1" />
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.DropDownList: Legal value">
-    <select id="ctrl_50" style="width:30px" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.DropDownList: Set twice">
-    <select id="ctrl_51" style="width:10px" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.DropDownList: Set to 0">
-    <select id="ctrl_52" style="width:0px" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.DropDownList: Set to negative value">
-    <select id="ctrl_53" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.DropDownList: Set Width and a CssClass">
-    <select id="ctrl_54" style="width:30px" name="ctrl_54" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.ListBox: Legal value">
-    <select id="ctrl_55" style="width:30px" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.ListBox: Set twice">
-    <select id="ctrl_56" style="width:10px" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.ListBox: Set to 0">
-    <select id="ctrl_57" style="width:0px" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.ListBox: Set to negative value">
-    <select id="ctrl_58" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.ListBox: Set Width and a CssClass">
-    <select id="ctrl_59" style="width:30px" size="4" name="ctrl_59" class="CssClass1">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.RadioButtonList: Legal value">
-    <table id="ctrl_60" style="width:30px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.RadioButtonList: Set twice">
-    <table id="ctrl_61" style="width:10px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.RadioButtonList: Set to 0">
-    <table id="ctrl_62" style="width:0px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.RadioButtonList: Set to negative value">
-    <table id="ctrl_63" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.RadioButtonList: Set Width and a CssClass">
-    <table id="ctrl_64" style="width:30px" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest66" testname="System.Web.UI.WebControls.CheckBoxList: Legal value">
-    <table id="ctrl_65" style="width:30px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest67" testname="System.Web.UI.WebControls.CheckBoxList: Set twice">
-    <table id="ctrl_66" style="width:10px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest68" testname="System.Web.UI.WebControls.CheckBoxList: Set to 0">
-    <table id="ctrl_67" style="width:0px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest69" testname="System.Web.UI.WebControls.CheckBoxList: Set to negative value">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest70" testname="System.Web.UI.WebControls.CheckBoxList: Set Width and a CssClass">
-    <table id="ctrl_69" style="width:30px" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest71" testname="System.Web.UI.WebControls.DataGrid: Legal value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;width:30px" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest72" testname="System.Web.UI.WebControls.DataGrid: Set twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;width:10px" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest73" testname="System.Web.UI.WebControls.DataGrid: Set to 0">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;width:0px" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest74" testname="System.Web.UI.WebControls.DataGrid: Set to negative value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest75" testname="System.Web.UI.WebControls.DataGrid: Set Width and a CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;width:30px" rules="all" class="CssClass1" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest76" testname="System.Web.UI.WebControls.DataGridItem: Legal value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_75_ctrl_76" style="width:30px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest77" testname="System.Web.UI.WebControls.DataGridItem: Set twice">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_77_ctrl_78" style="width:10px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest78" testname="System.Web.UI.WebControls.DataGridItem: Set to 0">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80" style="width:0px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest79" testname="System.Web.UI.WebControls.DataGridItem: Set to negative value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_81_ctrl_82">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest80" testname="System.Web.UI.WebControls.DataGridItem: Set Width and a CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_83_ctrl_84" style="width:30px" class="CssClass1">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="System.Web.UI.WebControls.DataList: Legal value">
-    <table id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse;width:30px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TabIndex.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TabIndex.aspx.xml
deleted file mode 100644
index ee18d8ffaae..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TabIndex.aspx.xml
+++ /dev/null
@@ -1,797 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Valid value - Positive">
-    <input tabindex="10" value="" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Valid value - Negative">
-    <input tabindex="-5" value="" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Default value">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.Button: Controls with consecutive numbers">
-    <input tabindex="12" value="" type="submit" name="ctrl_3" id="ctrl_3" />
-    <input tabindex="11" value="" type="submit" name="ctrl_4" id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Valid value - Positive">
-    <input tabindex="10" id="ctrl_5" type="checkbox" name="ctrl_5" />
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Valid value - Negative">
-    <input tabindex="-5" id="ctrl_6" type="checkbox" name="ctrl_6" />
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBox: Default value">
-    <input id="ctrl_7" type="checkbox" name="ctrl_7" />
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBox: Controls with consecutive numbers">
-    <input tabindex="14" id="ctrl_8" type="checkbox" name="ctrl_8" />
-    <input tabindex="13" id="ctrl_9" type="checkbox" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Valid value - Positive">
-    <a tabindex="10" id="ctrl_10">
-    </a>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.HyperLink: Valid value - Negative">
-    <a tabindex="-5" id="ctrl_11">
-    </a>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.HyperLink: Default value">
-    <a id="ctrl_12">
-    </a>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.HyperLink: Controls with consecutive numbers">
-    <a tabindex="16" id="ctrl_13">
-    </a>
-    <a tabindex="15" id="ctrl_14">
-    </a>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.Image: Valid value - Positive">
-    <img tabindex="10" id="ctrl_15" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.Image: Valid value - Negative">
-    <img tabindex="-5" id="ctrl_16" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Image: Default value">
-    <img id="ctrl_17" alt="" border="0" />
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Image: Controls with consecutive numbers">
-    <img tabindex="18" id="ctrl_18" alt="" border="0" />
-    <img tabindex="17" id="ctrl_19" alt="" border="0" />
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.ImageButton: Valid value - Positive">
-    <input tabindex="10" id="ctrl_20" alt="" border="0" type="image" name="ctrl_20" />
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.ImageButton: Valid value - Negative">
-    <input tabindex="-5" id="ctrl_21" alt="" border="0" type="image" name="ctrl_21" />
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.ImageButton: Default value">
-    <input id="ctrl_22" alt="" border="0" type="image" name="ctrl_22" />
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.ImageButton: Controls with consecutive numbers">
-    <input tabindex="20" id="ctrl_23" alt="" border="0" type="image" name="ctrl_23" />
-    <input tabindex="19" id="ctrl_24" alt="" border="0" type="image" name="ctrl_24" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.Label: Valid value - Positive">
-    <span tabindex="10" id="ctrl_25">
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Label: Valid value - Negative">
-    <span tabindex="-5" id="ctrl_26">
-    </span>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Label: Default value">
-    <span id="ctrl_27">
-    </span>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Label: Controls with consecutive numbers">
-    <span tabindex="22" id="ctrl_28">
-    </span>
-    <span tabindex="21" id="ctrl_29">
-    </span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.LinkButton: Valid value - Positive">
-    <a href="javascript:__doPostBack('ctrl_30','')" tabindex="10" id="ctrl_30">
-    </a>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.LinkButton: Valid value - Negative">
-    <a href="javascript:__doPostBack('ctrl_31','')" tabindex="-5" id="ctrl_31">
-    </a>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.LinkButton: Default value">
-    <a href="javascript:__doPostBack('ctrl_32','')" id="ctrl_32">
-    </a>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.LinkButton: Controls with consecutive numbers">
-    <a href="javascript:__doPostBack('ctrl_33','')" tabindex="24" id="ctrl_33">
-    </a>
-    <a href="javascript:__doPostBack('ctrl_34','')" tabindex="23" id="ctrl_34">
-    </a>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.Panel: Valid value - Positive">
-    <div tabindex="10" id="ctrl_35">
-    </div>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.Panel: Valid value - Negative">
-    <div tabindex="-5" id="ctrl_36">
-    </div>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.Panel: Default value">
-    <div id="ctrl_37">
-    </div>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.Panel: Controls with consecutive numbers">
-    <div tabindex="26" id="ctrl_38">
-    </div>
-    <div tabindex="25" id="ctrl_39">
-    </div>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.RadioButton: Valid value - Positive">
-    <input tabindex="10" id="ctrl_40" type="radio" name="ctrl_40" value="ctrl_40" />
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.RadioButton: Valid value - Negative">
-    <input tabindex="-5" id="ctrl_41" type="radio" name="ctrl_41" value="ctrl_41" />
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.RadioButton: Default value">
-    <input id="ctrl_42" type="radio" name="ctrl_42" value="ctrl_42" />
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.RadioButton: Controls with consecutive numbers">
-    <input tabindex="28" id="ctrl_43" type="radio" name="ctrl_43" value="ctrl_43" />
-    <input tabindex="27" id="ctrl_44" type="radio" name="ctrl_44" value="ctrl_44" />
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.TextBox: Valid value - Positive">
-    <input tabindex="10" id="ctrl_45" type="text" name="ctrl_45" />
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.TextBox: Valid value - Negative">
-    <input tabindex="-5" id="ctrl_46" type="text" name="ctrl_46" />
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.TextBox: Default value">
-    <input id="ctrl_47" type="text" name="ctrl_47" />
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.TextBox: Controls with consecutive numbers">
-    <input tabindex="30" id="ctrl_48" type="text" name="ctrl_48" />
-    <input tabindex="29" id="ctrl_49" type="text" name="ctrl_49" />
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.DropDownList: Valid value - Positive">
-    <select tabindex="10" id="ctrl_50" name="ctrl_50">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.DropDownList: Valid value - Negative">
-    <select tabindex="-5" id="ctrl_51" name="ctrl_51">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DropDownList: Default value">
-    <select id="ctrl_52" name="ctrl_52">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DropDownList: Controls with consecutive numbers">
-    <select tabindex="32" id="ctrl_53" name="ctrl_53">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <select tabindex="31" id="ctrl_54" name="ctrl_54">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.ListBox: Valid value - Positive">
-    <select tabindex="10" id="ctrl_55" size="4" name="ctrl_55">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.ListBox: Valid value - Negative">
-    <select tabindex="-5" id="ctrl_56" size="4" name="ctrl_56">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.ListBox: Default value">
-    <select id="ctrl_57" size="4" name="ctrl_57">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.ListBox: Controls with consecutive numbers">
-    <select tabindex="34" id="ctrl_58" size="4" name="ctrl_58">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <select tabindex="33" id="ctrl_59" size="4" name="ctrl_59">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.RadioButtonList: Valid value - Positive">
-    <table id="ctrl_60" border="0">
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_60_0" type="radio" name="ctrl_60" value="1" />
-          <label for="ctrl_60_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_60_1" type="radio" name="ctrl_60" value="2" />
-          <label for="ctrl_60_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_60_2" type="radio" name="ctrl_60" value="3" />
-          <label for="ctrl_60_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_60_3" type="radio" name="ctrl_60" value="4" />
-          <label for="ctrl_60_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest50" testname="System.Web.UI.WebControls.RadioButtonList: Valid value - Negative">
-    <table id="ctrl_61" border="0">
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_61_0" type="radio" name="ctrl_61" value="1" />
-          <label for="ctrl_61_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_61_1" type="radio" name="ctrl_61" value="2" />
-          <label for="ctrl_61_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_61_2" type="radio" name="ctrl_61" value="3" />
-          <label for="ctrl_61_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_61_3" type="radio" name="ctrl_61" value="4" />
-          <label for="ctrl_61_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest51" testname="System.Web.UI.WebControls.RadioButtonList: Default value">
-    <table id="ctrl_62" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_62_0" type="radio" name="ctrl_62" value="1" />
-          <label for="ctrl_62_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_1" type="radio" name="ctrl_62" value="2" />
-          <label for="ctrl_62_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_2" type="radio" name="ctrl_62" value="3" />
-          <label for="ctrl_62_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_62_3" type="radio" name="ctrl_62" value="4" />
-          <label for="ctrl_62_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest52" testname="System.Web.UI.WebControls.RadioButtonList: Controls with consecutive numbers">
-    <table id="ctrl_63" border="0">
-      <tr>
-        <td>
-          <input tabindex="36" id="ctrl_63_0" type="radio" name="ctrl_63" value="1" />
-          <label for="ctrl_63_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="36" id="ctrl_63_1" type="radio" name="ctrl_63" value="2" />
-          <label for="ctrl_63_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="36" id="ctrl_63_2" type="radio" name="ctrl_63" value="3" />
-          <label for="ctrl_63_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="36" id="ctrl_63_3" type="radio" name="ctrl_63" value="4" />
-          <label for="ctrl_63_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <table id="ctrl_64" border="0">
-      <tr>
-        <td>
-          <input tabindex="35" id="ctrl_64_0" type="radio" name="ctrl_64" value="1" />
-          <label for="ctrl_64_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="35" id="ctrl_64_1" type="radio" name="ctrl_64" value="2" />
-          <label for="ctrl_64_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="35" id="ctrl_64_2" type="radio" name="ctrl_64" value="3" />
-          <label for="ctrl_64_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="35" id="ctrl_64_3" type="radio" name="ctrl_64" value="4" />
-          <label for="ctrl_64_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest53" testname="System.Web.UI.WebControls.CheckBoxList: Valid value - Positive">
-    <table id="ctrl_65" border="0">
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_65_0" type="checkbox" name="ctrl_65:0" />
-          <label for="ctrl_65_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_65_1" type="checkbox" name="ctrl_65:1" />
-          <label for="ctrl_65_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_65_2" type="checkbox" name="ctrl_65:2" />
-          <label for="ctrl_65_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="10" id="ctrl_65_3" type="checkbox" name="ctrl_65:3" />
-          <label for="ctrl_65_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest54" testname="System.Web.UI.WebControls.CheckBoxList: Valid value - Negative">
-    <table id="ctrl_66" border="0">
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_66_0" type="checkbox" name="ctrl_66:0" />
-          <label for="ctrl_66_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_66_1" type="checkbox" name="ctrl_66:1" />
-          <label for="ctrl_66_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_66_2" type="checkbox" name="ctrl_66:2" />
-          <label for="ctrl_66_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="-5" id="ctrl_66_3" type="checkbox" name="ctrl_66:3" />
-          <label for="ctrl_66_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest55" testname="System.Web.UI.WebControls.CheckBoxList: Default value">
-    <table id="ctrl_67" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_67_0" type="checkbox" name="ctrl_67:0" />
-          <label for="ctrl_67_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_1" type="checkbox" name="ctrl_67:1" />
-          <label for="ctrl_67_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_2" type="checkbox" name="ctrl_67:2" />
-          <label for="ctrl_67_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_67_3" type="checkbox" name="ctrl_67:3" />
-          <label for="ctrl_67_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest56" testname="System.Web.UI.WebControls.CheckBoxList: Controls with consecutive numbers">
-    <table id="ctrl_68" border="0">
-      <tr>
-        <td>
-          <input tabindex="38" id="ctrl_68_0" type="checkbox" name="ctrl_68:0" />
-          <label for="ctrl_68_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="38" id="ctrl_68_1" type="checkbox" name="ctrl_68:1" />
-          <label for="ctrl_68_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="38" id="ctrl_68_2" type="checkbox" name="ctrl_68:2" />
-          <label for="ctrl_68_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="38" id="ctrl_68_3" type="checkbox" name="ctrl_68:3" />
-          <label for="ctrl_68_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <table id="ctrl_69" border="0">
-      <tr>
-        <td>
-          <input tabindex="37" id="ctrl_69_0" type="checkbox" name="ctrl_69:0" />
-          <label for="ctrl_69_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="37" id="ctrl_69_1" type="checkbox" name="ctrl_69:1" />
-          <label for="ctrl_69_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="37" id="ctrl_69_2" type="checkbox" name="ctrl_69:2" />
-          <label for="ctrl_69_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input tabindex="37" id="ctrl_69_3" type="checkbox" name="ctrl_69:3" />
-          <label for="ctrl_69_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest57" testname="System.Web.UI.WebControls.DataGrid: Valid value - Positive">
-    <table tabindex="10" border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_70">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest58" testname="System.Web.UI.WebControls.DataGrid: Valid value - Negative">
-    <table tabindex="-5" border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_71">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest59" testname="System.Web.UI.WebControls.DataGrid: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_72">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest60" testname="System.Web.UI.WebControls.DataGrid: Controls with consecutive numbers">
-    <table tabindex="40" border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_73">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <table tabindex="39" border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_74">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest61" testname="System.Web.UI.WebControls.DataGridItem: Valid value - Positive">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_75">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr tabindex="10" id="ctrl_75_ctrl_76">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest62" testname="System.Web.UI.WebControls.DataGridItem: Valid value - Negative">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_77">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr tabindex="-5" id="ctrl_77_ctrl_78">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest63" testname="System.Web.UI.WebControls.DataGridItem: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_79">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_79_ctrl_80">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Tab index = 0</span>
-  </div>
-  <div id="GHTSubTest64" testname="System.Web.UI.WebControls.DataGridItem: Controls with consecutive numbers">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_81">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr tabindex="42" id="ctrl_81_ctrl_82">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_83">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr tabindex="41" id="ctrl_83_ctrl_84">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest65" testname="System.Web.UI.WebControls.DataList: Valid value - Positive">
-    <table tabindex="10" id="ctrl_85" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_HorizontalAlign.aspx.xml
deleted file mode 100644
index f094a5c5c2b..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.TableRow: Test default value.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_0">
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.TableRow: Set 'Center'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_1" align="Center">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.TableRow: Set 'Justify'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_2" align="Justify">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.TableRow: Set 'Left'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_3" align="Left">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.TableRow: Set 'NotSet'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_4">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.TableRow: Set 'Right'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_5" align="Right">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.TableRow: Throws exception for illegal HorizontalAlign values.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_6">
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.TableCell: Test default value.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_7">Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.TableCell: Set 'Center'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_8" align="Center">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.TableCell: Set 'Justify'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_9" align="Justify">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.TableCell: Set 'Left'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_10" align="Left">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.TableCell: Set 'NotSet'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_11">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.TableCell: Set 'Right'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_12" align="Right">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.TableCell: Throws exception for illegal HorizontalAlign values.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_13">Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataListItem: Test default value.">
-    <table id="ctrl_14" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_VerticalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_VerticalAlign.aspx.xml
deleted file mode 100644
index 60ecc14bbad..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_VerticalAlign.aspx.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.TableRow: Test default value.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_0">
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.TableRow: Set 'Bottom'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_1" valign="Bottom">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.TableRow: Set 'Middle'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_2" valign="Middle">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.TableRow: Set 'NotSet'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_3">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.TableRow: Set 'Top'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_4" valign="Top">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.TableRow: Throws exception for illegal VerticalAlign values.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_5">
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.TableCell: Test default value.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_6">Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.TableCell: Set 'Bottom'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_7" valign="Bottom">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.TableCell: Set 'Middle'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_8" valign="Middle">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.TableCell: Set 'NotSet'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_9">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.TableCell: Set 'Top'.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_10" valign="Top">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.TableCell: Throws exception for illegal VerticalAlign values.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_11">Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.DataListItem: Test default value.">
-    <table id="ctrl_12" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_Wrap.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_Wrap.aspx.xml
deleted file mode 100644
index 723ef6d7cb6..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableItemStyle_Wrap.aspx.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.TableRow: Set True.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_0">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.TableRow: Set False.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_1" nowrap="nowrap">
-        <td>Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.TableRow: Get default value.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr id="ctrl_2">
-        <td>Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.TableCell: Set True.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_3">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.TableCell: Set False.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_4" nowrap="nowrap">Table cell</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.TableCell: Get default value.">
-    <table border="0">
-      <tr>
-        <th>Header cell</th>
-      </tr>
-      <tr>
-        <td id="ctrl_5">Table cell</td>
-      </tr>
-    </table>
-    <span>
-      <br />True</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.DataListItem: Set True.">
-    <table id="ctrl_6" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_BackImageUrl.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_BackImageUrl.aspx.xml
deleted file mode 100644
index c271f5090bc..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_BackImageUrl.aspx.xml
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RadioButtonList: Relative path">
-    <table id="ctrl_0" style="background-image:url(cat.jpg)" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_0_0" type="radio" name="ctrl_0" value="1" />
-          <label for="ctrl_0_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_1" type="radio" name="ctrl_0" value="2" />
-          <label for="ctrl_0_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_2" type="radio" name="ctrl_0" value="3" />
-          <label for="ctrl_0_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_3" type="radio" name="ctrl_0" value="4" />
-          <label for="ctrl_0_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.RadioButtonList: absolute path">
-    <table id="ctrl_1" style="background-image:url(http" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_1_0" type="radio" name="ctrl_1" value="1" />
-          <label for="ctrl_1_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_1" type="radio" name="ctrl_1" value="2" />
-          <label for="ctrl_1_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_2" type="radio" name="ctrl_1" value="3" />
-          <label for="ctrl_1_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_3" type="radio" name="ctrl_1" value="4" />
-          <label for="ctrl_1_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.RadioButtonList: Defied only in CssClass">
-    <table id="ctrl_2" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_2_0" type="radio" name="ctrl_2" value="1" />
-          <label for="ctrl_2_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_1" type="radio" name="ctrl_2" value="2" />
-          <label for="ctrl_2_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_2" type="radio" name="ctrl_2" value="3" />
-          <label for="ctrl_2_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_3" type="radio" name="ctrl_2" value="4" />
-          <label for="ctrl_2_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.RadioButtonList: Defied only in CssClass">
-    <table id="ctrl_3" style="background-image:url(http" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_3_0" type="radio" name="ctrl_3" value="1" />
-          <label for="ctrl_3_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_1" type="radio" name="ctrl_3" value="2" />
-          <label for="ctrl_3_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_2" type="radio" name="ctrl_3" value="3" />
-          <label for="ctrl_3_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_3" type="radio" name="ctrl_3" value="4" />
-          <label for="ctrl_3_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.RadioButtonList: Default value">
-    <table id="ctrl_4" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_4_0" type="radio" name="ctrl_4" value="1" />
-          <label for="ctrl_4_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_1" type="radio" name="ctrl_4" value="2" />
-          <label for="ctrl_4_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_2" type="radio" name="ctrl_4" value="3" />
-          <label for="ctrl_4_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_3" type="radio" name="ctrl_4" value="4" />
-          <label for="ctrl_4_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.RadioButtonList: Throws exception on null value">
-    <table id="ctrl_5" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_5_0" type="radio" name="ctrl_5" value="1" />
-          <label for="ctrl_5_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_1" type="radio" name="ctrl_5" value="2" />
-          <label for="ctrl_5_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_2" type="radio" name="ctrl_5" value="3" />
-          <label for="ctrl_5_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_3" type="radio" name="ctrl_5" value="4" />
-          <label for="ctrl_5_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBoxList: Relative path">
-    <table id="ctrl_6" style="background-image:url(cat.jpg)" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_6_0" type="checkbox" name="ctrl_6:0" />
-          <label for="ctrl_6_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_1" type="checkbox" name="ctrl_6:1" />
-          <label for="ctrl_6_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_2" type="checkbox" name="ctrl_6:2" />
-          <label for="ctrl_6_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_3" type="checkbox" name="ctrl_6:3" />
-          <label for="ctrl_6_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBoxList: absolute path">
-    <table id="ctrl_7" style="background-image:url(http" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_7_0" type="checkbox" name="ctrl_7:0" />
-          <label for="ctrl_7_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_1" type="checkbox" name="ctrl_7:1" />
-          <label for="ctrl_7_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_2" type="checkbox" name="ctrl_7:2" />
-          <label for="ctrl_7_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_3" type="checkbox" name="ctrl_7:3" />
-          <label for="ctrl_7_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBoxList: Defied only in CssClass">
-    <table id="ctrl_8" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_8_0" type="checkbox" name="ctrl_8:0" />
-          <label for="ctrl_8_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_1" type="checkbox" name="ctrl_8:1" />
-          <label for="ctrl_8_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_2" type="checkbox" name="ctrl_8:2" />
-          <label for="ctrl_8_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_3" type="checkbox" name="ctrl_8:3" />
-          <label for="ctrl_8_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBoxList: Defied only in CssClass">
-    <table id="ctrl_9" style="background-image:url(http" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_9_0" type="checkbox" name="ctrl_9:0" />
-          <label for="ctrl_9_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_1" type="checkbox" name="ctrl_9:1" />
-          <label for="ctrl_9_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_2" type="checkbox" name="ctrl_9:2" />
-          <label for="ctrl_9_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_3" type="checkbox" name="ctrl_9:3" />
-          <label for="ctrl_9_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBoxList: Default value">
-    <table id="ctrl_10" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_10_0" type="checkbox" name="ctrl_10:0" />
-          <label for="ctrl_10_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_1" type="checkbox" name="ctrl_10:1" />
-          <label for="ctrl_10_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_2" type="checkbox" name="ctrl_10:2" />
-          <label for="ctrl_10_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_3" type="checkbox" name="ctrl_10:3" />
-          <label for="ctrl_10_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBoxList: Throws exception on null value">
-    <table id="ctrl_11" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_11_0" type="checkbox" name="ctrl_11:0" />
-          <label for="ctrl_11_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_1" type="checkbox" name="ctrl_11:1" />
-          <label for="ctrl_11_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_2" type="checkbox" name="ctrl_11:2" />
-          <label for="ctrl_11_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_3" type="checkbox" name="ctrl_11:3" />
-          <label for="ctrl_11_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.DataGrid: Relative path">
-    <table border="1" cellspacing="0" style="background-image:url(cat.jpg);border-collapse:collapse" rules="all" id="ctrl_12">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.DataGrid: absolute path">
-    <table border="1" cellspacing="0" style="background-image:url(http;border-collapse:collapse" rules="all" id="ctrl_13">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: Defied only in CssClass">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_14">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataGrid: Defied only in CssClass">
-    <table border="1" cellspacing="0" style="background-image:url(http;border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_15">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.DataGrid: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_16">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.DataGrid: Throws exception on null value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_17">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.DataList: Relative path">
-    <table id="ctrl_18" cellspacing="0" border="0" style="background-image:url(cat.jpg);border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_CellPadding.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_CellPadding.aspx.xml
deleted file mode 100644
index 1547dca095c..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_CellPadding.aspx.xml
+++ /dev/null
@@ -1,589 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RadioButtonList: Legal value.">
-    <table id="ctrl_0" border="0" cellpadding="10">
-      <tr>
-        <td>
-          <input id="ctrl_0_0" type="radio" name="ctrl_0" value="1" />
-          <label for="ctrl_0_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_1" type="radio" name="ctrl_0" value="2" />
-          <label for="ctrl_0_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_2" type="radio" name="ctrl_0" value="3" />
-          <label for="ctrl_0_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_3" type="radio" name="ctrl_0" value="4" />
-          <label for="ctrl_0_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.RadioButtonList: Zero.">
-    <table id="ctrl_1" border="0" cellpadding="0">
-      <tr>
-        <td>
-          <input id="ctrl_1_0" type="radio" name="ctrl_1" value="1" />
-          <label for="ctrl_1_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_1" type="radio" name="ctrl_1" value="2" />
-          <label for="ctrl_1_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_2" type="radio" name="ctrl_1" value="3" />
-          <label for="ctrl_1_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_3" type="radio" name="ctrl_1" value="4" />
-          <label for="ctrl_1_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.RadioButtonList: -1.">
-    <table id="ctrl_2" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_2_0" type="radio" name="ctrl_2" value="1" />
-          <label for="ctrl_2_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_1" type="radio" name="ctrl_2" value="2" />
-          <label for="ctrl_2_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_2" type="radio" name="ctrl_2" value="3" />
-          <label for="ctrl_2_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_3" type="radio" name="ctrl_2" value="4" />
-          <label for="ctrl_2_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.RadioButtonList: check that default is -1.">
-    <table id="ctrl_3" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_3_0" type="radio" name="ctrl_3" value="1" />
-          <label for="ctrl_3_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_1" type="radio" name="ctrl_3" value="2" />
-          <label for="ctrl_3_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_2" type="radio" name="ctrl_3" value="3" />
-          <label for="ctrl_3_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_3" type="radio" name="ctrl_3" value="4" />
-          <label for="ctrl_3_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.RadioButtonList: Set only in CssClass.">
-    <table id="ctrl_4" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_4_0" type="radio" name="ctrl_4" value="1" />
-          <label for="ctrl_4_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_1" type="radio" name="ctrl_4" value="2" />
-          <label for="ctrl_4_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_2" type="radio" name="ctrl_4" value="3" />
-          <label for="ctrl_4_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_3" type="radio" name="ctrl_4" value="4" />
-          <label for="ctrl_4_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.RadioButtonList: Set both in CssClass and in code.">
-    <table id="ctrl_5" border="0" cellpadding="20" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_5_0" type="radio" name="ctrl_5" value="1" />
-          <label for="ctrl_5_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_1" type="radio" name="ctrl_5" value="2" />
-          <label for="ctrl_5_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_2" type="radio" name="ctrl_5" value="3" />
-          <label for="ctrl_5_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_3" type="radio" name="ctrl_5" value="4" />
-          <label for="ctrl_5_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.RadioButtonList: Throws an exception if set to less then -1.">
-    <table id="ctrl_6" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_6_0" type="radio" name="ctrl_6" value="1" />
-          <label for="ctrl_6_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_1" type="radio" name="ctrl_6" value="2" />
-          <label for="ctrl_6_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_2" type="radio" name="ctrl_6" value="3" />
-          <label for="ctrl_6_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_3" type="radio" name="ctrl_6" value="4" />
-          <label for="ctrl_6_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBoxList: Legal value.">
-    <table id="ctrl_7" border="0" cellpadding="10">
-      <tr>
-        <td>
-          <input id="ctrl_7_0" type="checkbox" name="ctrl_7:0" />
-          <label for="ctrl_7_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_1" type="checkbox" name="ctrl_7:1" />
-          <label for="ctrl_7_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_2" type="checkbox" name="ctrl_7:2" />
-          <label for="ctrl_7_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_3" type="checkbox" name="ctrl_7:3" />
-          <label for="ctrl_7_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBoxList: Zero.">
-    <table id="ctrl_8" border="0" cellpadding="0">
-      <tr>
-        <td>
-          <input id="ctrl_8_0" type="checkbox" name="ctrl_8:0" />
-          <label for="ctrl_8_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_1" type="checkbox" name="ctrl_8:1" />
-          <label for="ctrl_8_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_2" type="checkbox" name="ctrl_8:2" />
-          <label for="ctrl_8_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_3" type="checkbox" name="ctrl_8:3" />
-          <label for="ctrl_8_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBoxList: -1.">
-    <table id="ctrl_9" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_9_0" type="checkbox" name="ctrl_9:0" />
-          <label for="ctrl_9_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_1" type="checkbox" name="ctrl_9:1" />
-          <label for="ctrl_9_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_2" type="checkbox" name="ctrl_9:2" />
-          <label for="ctrl_9_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_3" type="checkbox" name="ctrl_9:3" />
-          <label for="ctrl_9_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBoxList: check that default is -1.">
-    <table id="ctrl_10" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_10_0" type="checkbox" name="ctrl_10:0" />
-          <label for="ctrl_10_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_1" type="checkbox" name="ctrl_10:1" />
-          <label for="ctrl_10_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_2" type="checkbox" name="ctrl_10:2" />
-          <label for="ctrl_10_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_3" type="checkbox" name="ctrl_10:3" />
-          <label for="ctrl_10_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBoxList: Set only in CssClass.">
-    <table id="ctrl_11" border="0" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_11_0" type="checkbox" name="ctrl_11:0" />
-          <label for="ctrl_11_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_1" type="checkbox" name="ctrl_11:1" />
-          <label for="ctrl_11_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_2" type="checkbox" name="ctrl_11:2" />
-          <label for="ctrl_11_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_3" type="checkbox" name="ctrl_11:3" />
-          <label for="ctrl_11_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.CheckBoxList: Set both in CssClass and in code.">
-    <table id="ctrl_12" border="0" cellpadding="20" class="CssClass1">
-      <tr>
-        <td>
-          <input id="ctrl_12_0" type="checkbox" name="ctrl_12:0" />
-          <label for="ctrl_12_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_1" type="checkbox" name="ctrl_12:1" />
-          <label for="ctrl_12_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_2" type="checkbox" name="ctrl_12:2" />
-          <label for="ctrl_12_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_12_3" type="checkbox" name="ctrl_12:3" />
-          <label for="ctrl_12_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.CheckBoxList: Throws an exception if set to less then -1.">
-    <table id="ctrl_13" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_13_0" type="checkbox" name="ctrl_13:0" />
-          <label for="ctrl_13_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_1" type="checkbox" name="ctrl_13:1" />
-          <label for="ctrl_13_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_2" type="checkbox" name="ctrl_13:2" />
-          <label for="ctrl_13_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_13_3" type="checkbox" name="ctrl_13:3" />
-          <label for="ctrl_13_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: Legal value.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" cellpadding="10" rules="all" id="ctrl_14">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataGrid: Zero.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" cellpadding="0" rules="all" id="ctrl_15">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.DataGrid: -1.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_16">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.DataGrid: check that default is -1.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_17">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.DataGrid: Set only in CssClass.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" class="CssClass1" id="ctrl_18">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.DataGrid: Set both in CssClass and in code.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" cellpadding="20" rules="all" class="CssClass1" id="ctrl_19">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.DataGrid: Throws an exception if set to less then -1.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_20">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.DataList: Legal value.">
-    <table id="ctrl_21" cellspacing="0" border="0" style="border-collapse:collapse" cellpadding="10">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_CellSpacing.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_CellSpacing.aspx.xml
deleted file mode 100644
index 7baa97829e9..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_CellSpacing.aspx.xml
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RadioButtonList: Legal value.">
-    <table id="ctrl_0" cellspacing="10" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_0_0" type="radio" name="ctrl_0" value="1" />
-          <label for="ctrl_0_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_1" type="radio" name="ctrl_0" value="2" />
-          <label for="ctrl_0_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_2" type="radio" name="ctrl_0" value="3" />
-          <label for="ctrl_0_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_3" type="radio" name="ctrl_0" value="4" />
-          <label for="ctrl_0_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.RadioButtonList: Zero.">
-    <table id="ctrl_1" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input id="ctrl_1_0" type="radio" name="ctrl_1" value="1" />
-          <label for="ctrl_1_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_1" type="radio" name="ctrl_1" value="2" />
-          <label for="ctrl_1_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_2" type="radio" name="ctrl_1" value="3" />
-          <label for="ctrl_1_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_3" type="radio" name="ctrl_1" value="4" />
-          <label for="ctrl_1_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.RadioButtonList: -1.">
-    <table id="ctrl_2" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_2_0" type="radio" name="ctrl_2" value="1" />
-          <label for="ctrl_2_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_1" type="radio" name="ctrl_2" value="2" />
-          <label for="ctrl_2_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_2" type="radio" name="ctrl_2" value="3" />
-          <label for="ctrl_2_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_3" type="radio" name="ctrl_2" value="4" />
-          <label for="ctrl_2_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.RadioButtonList: check that default is -1.">
-    <table id="ctrl_3" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_3_0" type="radio" name="ctrl_3" value="1" />
-          <label for="ctrl_3_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_1" type="radio" name="ctrl_3" value="2" />
-          <label for="ctrl_3_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_2" type="radio" name="ctrl_3" value="3" />
-          <label for="ctrl_3_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_3" type="radio" name="ctrl_3" value="4" />
-          <label for="ctrl_3_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.RadioButtonList: Throws an exception if set to less then -1.">
-    <table id="ctrl_4" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_4_0" type="radio" name="ctrl_4" value="1" />
-          <label for="ctrl_4_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_1" type="radio" name="ctrl_4" value="2" />
-          <label for="ctrl_4_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_2" type="radio" name="ctrl_4" value="3" />
-          <label for="ctrl_4_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_3" type="radio" name="ctrl_4" value="4" />
-          <label for="ctrl_4_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBoxList: Legal value.">
-    <table id="ctrl_5" cellspacing="10" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_5_0" type="checkbox" name="ctrl_5:0" />
-          <label for="ctrl_5_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_1" type="checkbox" name="ctrl_5:1" />
-          <label for="ctrl_5_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_2" type="checkbox" name="ctrl_5:2" />
-          <label for="ctrl_5_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_3" type="checkbox" name="ctrl_5:3" />
-          <label for="ctrl_5_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBoxList: Zero.">
-    <table id="ctrl_6" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <input id="ctrl_6_0" type="checkbox" name="ctrl_6:0" />
-          <label for="ctrl_6_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_1" type="checkbox" name="ctrl_6:1" />
-          <label for="ctrl_6_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_2" type="checkbox" name="ctrl_6:2" />
-          <label for="ctrl_6_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_3" type="checkbox" name="ctrl_6:3" />
-          <label for="ctrl_6_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBoxList: -1.">
-    <table id="ctrl_7" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_7_0" type="checkbox" name="ctrl_7:0" />
-          <label for="ctrl_7_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_1" type="checkbox" name="ctrl_7:1" />
-          <label for="ctrl_7_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_2" type="checkbox" name="ctrl_7:2" />
-          <label for="ctrl_7_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_3" type="checkbox" name="ctrl_7:3" />
-          <label for="ctrl_7_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBoxList: check that default is -1.">
-    <table id="ctrl_8" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_8_0" type="checkbox" name="ctrl_8:0" />
-          <label for="ctrl_8_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_1" type="checkbox" name="ctrl_8:1" />
-          <label for="ctrl_8_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_2" type="checkbox" name="ctrl_8:2" />
-          <label for="ctrl_8_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_3" type="checkbox" name="ctrl_8:3" />
-          <label for="ctrl_8_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />-1</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBoxList: Throws an exception if set to less then -1.">
-    <table id="ctrl_9" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_9_0" type="checkbox" name="ctrl_9:0" />
-          <label for="ctrl_9_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_1" type="checkbox" name="ctrl_9:1" />
-          <label for="ctrl_9_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_2" type="checkbox" name="ctrl_9:2" />
-          <label for="ctrl_9_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_3" type="checkbox" name="ctrl_9:3" />
-          <label for="ctrl_9_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.DataGrid: Legal value.">
-    <table border="1" cellspacing="10" rules="all" id="ctrl_10">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.DataGrid: Zero.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_11">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.DataGrid: -1.">
-    <table border="1" rules="all" id="ctrl_12">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.DataGrid: check that default is -1.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_13">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: Throws an exception if set to less then -1.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_14">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataList: Legal value.">
-    <table id="ctrl_15" cellspacing="10" border="0">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_GridLines.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_GridLines.aspx.xml
deleted file mode 100644
index bbaa2624457..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_GridLines.aspx.xml
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RadioButtonList: Default value">
-    <table id="ctrl_0" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_0_0" type="radio" name="ctrl_0" value="1" />
-          <label for="ctrl_0_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_1" type="radio" name="ctrl_0" value="2" />
-          <label for="ctrl_0_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_2" type="radio" name="ctrl_0" value="3" />
-          <label for="ctrl_0_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_0_3" type="radio" name="ctrl_0" value="4" />
-          <label for="ctrl_0_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.RadioButtonList: Set 'Both'">
-    <table id="ctrl_1" border="1" rules="all">
-      <tr>
-        <td>
-          <input id="ctrl_1_0" type="radio" name="ctrl_1" value="1" />
-          <label for="ctrl_1_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_1" type="radio" name="ctrl_1" value="2" />
-          <label for="ctrl_1_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_2" type="radio" name="ctrl_1" value="3" />
-          <label for="ctrl_1_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_1_3" type="radio" name="ctrl_1" value="4" />
-          <label for="ctrl_1_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.RadioButtonList: Set 'Horizontal'">
-    <table id="ctrl_2" border="1" rules="rows">
-      <tr>
-        <td>
-          <input id="ctrl_2_0" type="radio" name="ctrl_2" value="1" />
-          <label for="ctrl_2_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_1" type="radio" name="ctrl_2" value="2" />
-          <label for="ctrl_2_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_2" type="radio" name="ctrl_2" value="3" />
-          <label for="ctrl_2_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_2_3" type="radio" name="ctrl_2" value="4" />
-          <label for="ctrl_2_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.RadioButtonList: Set 'None'">
-    <table id="ctrl_3" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_3_0" type="radio" name="ctrl_3" value="1" />
-          <label for="ctrl_3_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_1" type="radio" name="ctrl_3" value="2" />
-          <label for="ctrl_3_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_2" type="radio" name="ctrl_3" value="3" />
-          <label for="ctrl_3_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_3_3" type="radio" name="ctrl_3" value="4" />
-          <label for="ctrl_3_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.RadioButtonList: Set 'Vertical'">
-    <table id="ctrl_4" border="1" rules="cols">
-      <tr>
-        <td>
-          <input id="ctrl_4_0" type="radio" name="ctrl_4" value="1" />
-          <label for="ctrl_4_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_1" type="radio" name="ctrl_4" value="2" />
-          <label for="ctrl_4_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_2" type="radio" name="ctrl_4" value="3" />
-          <label for="ctrl_4_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_4_3" type="radio" name="ctrl_4" value="4" />
-          <label for="ctrl_4_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.RadioButtonList: Causes ArgumentException if set to a non-valid GridLine value.">
-    <table id="ctrl_5" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_5_0" type="radio" name="ctrl_5" value="1" />
-          <label for="ctrl_5_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_1" type="radio" name="ctrl_5" value="2" />
-          <label for="ctrl_5_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_2" type="radio" name="ctrl_5" value="3" />
-          <label for="ctrl_5_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_5_3" type="radio" name="ctrl_5" value="4" />
-          <label for="ctrl_5_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.CheckBoxList: Default value">
-    <table id="ctrl_6" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_6_0" type="checkbox" name="ctrl_6:0" />
-          <label for="ctrl_6_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_1" type="checkbox" name="ctrl_6:1" />
-          <label for="ctrl_6_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_2" type="checkbox" name="ctrl_6:2" />
-          <label for="ctrl_6_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_6_3" type="checkbox" name="ctrl_6:3" />
-          <label for="ctrl_6_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />0</span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.CheckBoxList: Set 'Both'">
-    <table id="ctrl_7" border="1" rules="all">
-      <tr>
-        <td>
-          <input id="ctrl_7_0" type="checkbox" name="ctrl_7:0" />
-          <label for="ctrl_7_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_1" type="checkbox" name="ctrl_7:1" />
-          <label for="ctrl_7_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_2" type="checkbox" name="ctrl_7:2" />
-          <label for="ctrl_7_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_7_3" type="checkbox" name="ctrl_7:3" />
-          <label for="ctrl_7_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.CheckBoxList: Set 'Horizontal'">
-    <table id="ctrl_8" border="1" rules="rows">
-      <tr>
-        <td>
-          <input id="ctrl_8_0" type="checkbox" name="ctrl_8:0" />
-          <label for="ctrl_8_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_1" type="checkbox" name="ctrl_8:1" />
-          <label for="ctrl_8_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_2" type="checkbox" name="ctrl_8:2" />
-          <label for="ctrl_8_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_8_3" type="checkbox" name="ctrl_8:3" />
-          <label for="ctrl_8_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.CheckBoxList: Set 'None'">
-    <table id="ctrl_9" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_9_0" type="checkbox" name="ctrl_9:0" />
-          <label for="ctrl_9_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_1" type="checkbox" name="ctrl_9:1" />
-          <label for="ctrl_9_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_2" type="checkbox" name="ctrl_9:2" />
-          <label for="ctrl_9_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_9_3" type="checkbox" name="ctrl_9:3" />
-          <label for="ctrl_9_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.CheckBoxList: Set 'Vertical'">
-    <table id="ctrl_10" border="1" rules="cols">
-      <tr>
-        <td>
-          <input id="ctrl_10_0" type="checkbox" name="ctrl_10:0" />
-          <label for="ctrl_10_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_1" type="checkbox" name="ctrl_10:1" />
-          <label for="ctrl_10_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_2" type="checkbox" name="ctrl_10:2" />
-          <label for="ctrl_10_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_10_3" type="checkbox" name="ctrl_10:3" />
-          <label for="ctrl_10_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.CheckBoxList: Causes ArgumentException if set to a non-valid GridLine value.">
-    <table id="ctrl_11" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_11_0" type="checkbox" name="ctrl_11:0" />
-          <label for="ctrl_11_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_1" type="checkbox" name="ctrl_11:1" />
-          <label for="ctrl_11_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_2" type="checkbox" name="ctrl_11:2" />
-          <label for="ctrl_11_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_11_3" type="checkbox" name="ctrl_11:3" />
-          <label for="ctrl_11_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.DataGrid: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_12">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />3</span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.DataGrid: Set 'Both'">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_13">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.DataGrid: Set 'Horizontal'">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="rows" id="ctrl_14">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.DataGrid: Set 'None'">
-    <table border="0" cellspacing="0" style="border-collapse:collapse" id="ctrl_15">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.DataGrid: Set 'Vertical'">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="cols" id="ctrl_16">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.DataGrid: Causes ArgumentException if set to a non-valid GridLine value.">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_17">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.DataList: Default value">
-    <table id="ctrl_18" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_HorizontalAlign.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_HorizontalAlign.aspx.xml
deleted file mode 100644
index 52404be2d9f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_TableStyle_HorizontalAlign.aspx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.RadioButtonList: Default value">
-    <span>
-      <br />0</span>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ToolTip.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ToolTip.aspx.xml
deleted file mode 100644
index 0b13556e2e4..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ToolTip.aspx.xml
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Default value">
-    <input value="" type="submit" name="ctrl_0" id="ctrl_0" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Valid value">
-    <input value="" title="ToolTip valid value" type="submit" name="ctrl_1" id="ctrl_1" />
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.CheckBox: Default value">
-    <input id="ctrl_2" type="checkbox" name="ctrl_2" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.CheckBox: Valid value">
-    <span title="ToolTip valid value">
-      <input id="ctrl_3" type="checkbox" name="ctrl_3" />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.HyperLink: Default value">
-    <a id="ctrl_4">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.HyperLink: Valid value">
-    <a id="ctrl_5" title="ToolTip valid value">
-    </a>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.Image: Default value">
-    <img id="ctrl_6" alt="" border="0" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.Image: Valid value">
-    <img id="ctrl_7" alt="" border="0" title="ToolTip valid value" />
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.ImageButton: Default value">
-    <input id="ctrl_8" alt="" border="0" type="image" name="ctrl_8" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.ImageButton: Valid value">
-    <input id="ctrl_9" alt="" border="0" title="ToolTip valid value" type="image" name="ctrl_9" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Label: Default value">
-    <span id="ctrl_10">
-    </span>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.Label: Valid value">
-    <span id="ctrl_11" title="ToolTip valid value">
-    </span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.LinkButton: Default value">
-    <a href="javascript:__doPostBack('ctrl_12','')" id="ctrl_12">
-    </a>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.LinkButton: Valid value">
-    <a href="javascript:__doPostBack('ctrl_13','')" id="ctrl_13" title="ToolTip valid value">
-    </a>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.Panel: Default value">
-    <div id="ctrl_14">
-    </div>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Panel: Valid value">
-    <div id="ctrl_15" title="ToolTip valid value">
-    </div>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.RadioButton: Default value">
-    <input id="ctrl_16" type="radio" name="ctrl_16" value="ctrl_16" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.RadioButton: Valid value">
-    <span title="ToolTip valid value">
-      <input id="ctrl_17" type="radio" name="ctrl_17" value="ctrl_17" />
-    </span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.TextBox: Default value">
-    <input id="ctrl_18" type="text" name="ctrl_18" />
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.TextBox: Valid value">
-    <input id="ctrl_19" title="ToolTip valid value" type="text" name="ctrl_19" />
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.DropDownList: Default value">
-    <select id="ctrl_20" name="ctrl_20">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.DropDownList: Valid value">
-    <select id="ctrl_21" name="ctrl_21">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.ListBox: Default value">
-    <select id="ctrl_22" size="4" name="ctrl_22">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.ListBox: Valid value">
-    <select id="ctrl_23" size="4" name="ctrl_23">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.RadioButtonList: Default value">
-    <table id="ctrl_24" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_24_0" type="radio" name="ctrl_24" value="1" />
-          <label for="ctrl_24_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_1" type="radio" name="ctrl_24" value="2" />
-          <label for="ctrl_24_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_2" type="radio" name="ctrl_24" value="3" />
-          <label for="ctrl_24_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_24_3" type="radio" name="ctrl_24" value="4" />
-          <label for="ctrl_24_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.RadioButtonList: Valid value">
-    <table id="ctrl_25" border="0" title="ToolTip valid value">
-      <tr>
-        <td>
-          <input id="ctrl_25_0" type="radio" name="ctrl_25" value="1" />
-          <label for="ctrl_25_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_1" type="radio" name="ctrl_25" value="2" />
-          <label for="ctrl_25_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_2" type="radio" name="ctrl_25" value="3" />
-          <label for="ctrl_25_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_25_3" type="radio" name="ctrl_25" value="4" />
-          <label for="ctrl_25_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.CheckBoxList: Default value">
-    <table id="ctrl_26" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_26_0" type="checkbox" name="ctrl_26:0" />
-          <label for="ctrl_26_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_1" type="checkbox" name="ctrl_26:1" />
-          <label for="ctrl_26_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_2" type="checkbox" name="ctrl_26:2" />
-          <label for="ctrl_26_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_26_3" type="checkbox" name="ctrl_26:3" />
-          <label for="ctrl_26_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.CheckBoxList: Valid value">
-    <table id="ctrl_27" border="0" title="ToolTip valid value">
-      <tr>
-        <td>
-          <input id="ctrl_27_0" type="checkbox" name="ctrl_27:0" />
-          <label for="ctrl_27_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_1" type="checkbox" name="ctrl_27:1" />
-          <label for="ctrl_27_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_2" type="checkbox" name="ctrl_27:2" />
-          <label for="ctrl_27_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_27_3" type="checkbox" name="ctrl_27:3" />
-          <label for="ctrl_27_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.DataGrid: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_28">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.DataGrid: Valid value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" title="ToolTip valid value" rules="all" id="ctrl_29">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.DataGridItem: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_30">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_30_ctrl_31">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />
-    </span>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DataGridItem: Valid value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_32">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_32_ctrl_33" title="ToolTip valid value">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.DataList: Default value">
-    <table id="ctrl_34" cellspacing="0" border="0" style="border-collapse:collapse">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Width.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Width.aspx.xml
deleted file mode 100644
index 240146d7f21..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_Width.aspx.xml
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="System.Web.UI.WebControls.Button: Valid value">
-    <input value="" style="width:120px" type="submit" name="ctrl_0" id="ctrl_0" />
-  </div>
-  <div id="GHTSubTest2" testname="System.Web.UI.WebControls.Button: Default value">
-    <input value="" type="submit" name="ctrl_1" id="ctrl_1" />
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest3" testname="System.Web.UI.WebControls.Button: Negative value">
-    <input value="" type="submit" name="ctrl_2" id="ctrl_2" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest4" testname="System.Web.UI.WebControls.CheckBox: Valid value">
-    <span style="width:120px">
-      <input id="ctrl_3" type="checkbox" name="ctrl_3" />
-    </span>
-  </div>
-  <div id="GHTSubTest5" testname="System.Web.UI.WebControls.CheckBox: Default value">
-    <input id="ctrl_4" type="checkbox" name="ctrl_4" />
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest6" testname="System.Web.UI.WebControls.CheckBox: Negative value">
-    <input id="ctrl_5" type="checkbox" name="ctrl_5" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest7" testname="System.Web.UI.WebControls.HyperLink: Valid value">
-    <a id="ctrl_6" style="width:120px">
-    </a>
-  </div>
-  <div id="GHTSubTest8" testname="System.Web.UI.WebControls.HyperLink: Default value">
-    <a id="ctrl_7">
-    </a>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest9" testname="System.Web.UI.WebControls.HyperLink: Negative value">
-    <a id="ctrl_8">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest10" testname="System.Web.UI.WebControls.Image: Valid value">
-    <img id="ctrl_9" alt="" border="0" style="width:120px" />
-  </div>
-  <div id="GHTSubTest11" testname="System.Web.UI.WebControls.Image: Default value">
-    <img id="ctrl_10" alt="" border="0" />
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest12" testname="System.Web.UI.WebControls.Image: Negative value">
-    <img id="ctrl_11" alt="" border="0" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest13" testname="System.Web.UI.WebControls.ImageButton: Valid value">
-    <input id="ctrl_12" alt="" border="0" style="width:120px" type="image" name="ctrl_12" />
-  </div>
-  <div id="GHTSubTest14" testname="System.Web.UI.WebControls.ImageButton: Default value">
-    <input id="ctrl_13" alt="" border="0" type="image" name="ctrl_13" />
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest15" testname="System.Web.UI.WebControls.ImageButton: Negative value">
-    <input id="ctrl_14" alt="" border="0" type="image" name="ctrl_14" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest16" testname="System.Web.UI.WebControls.Label: Valid value">
-    <span id="ctrl_15" style="width:120px">
-    </span>
-  </div>
-  <div id="GHTSubTest17" testname="System.Web.UI.WebControls.Label: Default value">
-    <span id="ctrl_16">
-    </span>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest18" testname="System.Web.UI.WebControls.Label: Negative value">
-    <span id="ctrl_17">
-    </span>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest19" testname="System.Web.UI.WebControls.LinkButton: Valid value">
-    <a href="javascript:__doPostBack('ctrl_18','')" id="ctrl_18" style="width:120px">
-    </a>
-  </div>
-  <div id="GHTSubTest20" testname="System.Web.UI.WebControls.LinkButton: Default value">
-    <a href="javascript:__doPostBack('ctrl_19','')" id="ctrl_19">
-    </a>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest21" testname="System.Web.UI.WebControls.LinkButton: Negative value">
-    <a href="javascript:__doPostBack('ctrl_20','')" id="ctrl_20">
-    </a>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest22" testname="System.Web.UI.WebControls.Panel: Valid value">
-    <div id="ctrl_21" style="width:120px">
-    </div>
-  </div>
-  <div id="GHTSubTest23" testname="System.Web.UI.WebControls.Panel: Default value">
-    <div id="ctrl_22">
-    </div>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest24" testname="System.Web.UI.WebControls.Panel: Negative value">
-    <div id="ctrl_23">
-    </div>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest25" testname="System.Web.UI.WebControls.RadioButton: Valid value">
-    <span style="width:120px">
-      <input id="ctrl_24" type="radio" name="ctrl_24" value="ctrl_24" />
-    </span>
-  </div>
-  <div id="GHTSubTest26" testname="System.Web.UI.WebControls.RadioButton: Default value">
-    <input id="ctrl_25" type="radio" name="ctrl_25" value="ctrl_25" />
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest27" testname="System.Web.UI.WebControls.RadioButton: Negative value">
-    <input id="ctrl_26" type="radio" name="ctrl_26" value="ctrl_26" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest28" testname="System.Web.UI.WebControls.TextBox: Valid value">
-    <input id="ctrl_27" style="width:120px" type="text" name="ctrl_27" />
-  </div>
-  <div id="GHTSubTest29" testname="System.Web.UI.WebControls.TextBox: Default value">
-    <input id="ctrl_28" type="text" name="ctrl_28" />
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest30" testname="System.Web.UI.WebControls.TextBox: Negative value">
-    <input id="ctrl_29" type="text" name="ctrl_29" />
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest31" testname="System.Web.UI.WebControls.DropDownList: Valid value">
-    <select id="ctrl_30" style="width:120px" name="ctrl_30">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest32" testname="System.Web.UI.WebControls.DropDownList: Default value">
-    <select id="ctrl_31" name="ctrl_31">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest33" testname="System.Web.UI.WebControls.DropDownList: Negative value">
-    <select id="ctrl_32" name="ctrl_32">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest34" testname="System.Web.UI.WebControls.ListBox: Valid value">
-    <select id="ctrl_33" style="width:120px" size="4" name="ctrl_33">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-  </div>
-  <div id="GHTSubTest35" testname="System.Web.UI.WebControls.ListBox: Default value">
-    <select id="ctrl_34" size="4" name="ctrl_34">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest36" testname="System.Web.UI.WebControls.ListBox: Negative value">
-    <select id="ctrl_35" size="4" name="ctrl_35">
-      <option value="1" />aaaa
-		<option value="2" />bbbb
-		<option value="3" />cccc
-		<option value="4" />dddd
-
-	</select>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest37" testname="System.Web.UI.WebControls.RadioButtonList: Valid value">
-    <table id="ctrl_36" style="width:120px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_36_0" type="radio" name="ctrl_36" value="1" />
-          <label for="ctrl_36_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_36_1" type="radio" name="ctrl_36" value="2" />
-          <label for="ctrl_36_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_36_2" type="radio" name="ctrl_36" value="3" />
-          <label for="ctrl_36_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_36_3" type="radio" name="ctrl_36" value="4" />
-          <label for="ctrl_36_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest38" testname="System.Web.UI.WebControls.RadioButtonList: Default value">
-    <table id="ctrl_37" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_37_0" type="radio" name="ctrl_37" value="1" />
-          <label for="ctrl_37_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_37_1" type="radio" name="ctrl_37" value="2" />
-          <label for="ctrl_37_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_37_2" type="radio" name="ctrl_37" value="3" />
-          <label for="ctrl_37_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_37_3" type="radio" name="ctrl_37" value="4" />
-          <label for="ctrl_37_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest39" testname="System.Web.UI.WebControls.RadioButtonList: Negative value">
-    <table id="ctrl_38" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_38_0" type="radio" name="ctrl_38" value="1" />
-          <label for="ctrl_38_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_38_1" type="radio" name="ctrl_38" value="2" />
-          <label for="ctrl_38_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_38_2" type="radio" name="ctrl_38" value="3" />
-          <label for="ctrl_38_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_38_3" type="radio" name="ctrl_38" value="4" />
-          <label for="ctrl_38_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest40" testname="System.Web.UI.WebControls.CheckBoxList: Valid value">
-    <table id="ctrl_39" style="width:120px" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_39_0" type="checkbox" name="ctrl_39:0" />
-          <label for="ctrl_39_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_39_1" type="checkbox" name="ctrl_39:1" />
-          <label for="ctrl_39_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_39_2" type="checkbox" name="ctrl_39:2" />
-          <label for="ctrl_39_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_39_3" type="checkbox" name="ctrl_39:3" />
-          <label for="ctrl_39_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest41" testname="System.Web.UI.WebControls.CheckBoxList: Default value">
-    <table id="ctrl_40" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_40_0" type="checkbox" name="ctrl_40:0" />
-          <label for="ctrl_40_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_40_1" type="checkbox" name="ctrl_40:1" />
-          <label for="ctrl_40_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_40_2" type="checkbox" name="ctrl_40:2" />
-          <label for="ctrl_40_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_40_3" type="checkbox" name="ctrl_40:3" />
-          <label for="ctrl_40_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest42" testname="System.Web.UI.WebControls.CheckBoxList: Negative value">
-    <table id="ctrl_41" border="0">
-      <tr>
-        <td>
-          <input id="ctrl_41_0" type="checkbox" name="ctrl_41:0" />
-          <label for="ctrl_41_0">aaaa</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_41_1" type="checkbox" name="ctrl_41:1" />
-          <label for="ctrl_41_1">bbbb</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_41_2" type="checkbox" name="ctrl_41:2" />
-          <label for="ctrl_41_2">cccc</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input id="ctrl_41_3" type="checkbox" name="ctrl_41:3" />
-          <label for="ctrl_41_3">dddd</label>
-        </td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest43" testname="System.Web.UI.WebControls.DataGrid: Valid value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse;width:120px" rules="all" id="ctrl_42">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest44" testname="System.Web.UI.WebControls.DataGrid: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_43">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest45" testname="System.Web.UI.WebControls.DataGrid: Negative value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_44">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr>
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest46" testname="System.Web.UI.WebControls.DataGridItem: Valid value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_45">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_45_ctrl_46" style="width:120px">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-  </div>
-  <div id="GHTSubTest47" testname="System.Web.UI.WebControls.DataGridItem: Default value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_47">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_47_ctrl_48">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Default width = </span>
-  </div>
-  <div id="GHTSubTest48" testname="System.Web.UI.WebControls.DataGridItem: Negative value">
-    <table border="1" cellspacing="0" style="border-collapse:collapse" rules="all" id="ctrl_49">
-      <tr>
-        <td>Id</td>
-        <td>Description</td>
-      </tr>
-      <tr id="ctrl_49_ctrl_50">
-        <td>1</td>
-        <td>aaaa</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>bbbb</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>cccc</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>dddd</td>
-      </tr>
-    </table>
-    <span>
-      <br />Test passed. Expected ArgumentException exception was caught.</span>
-  </div>
-  <div id="GHTSubTest49" testname="System.Web.UI.WebControls.DataList: Valid value">
-    <table id="ctrl_51" cellspacing="0" border="0" style="border-collapse:collapse;width:120px">
-      <tr>
-        <td>
-          <div>
-            <span style="font-weight:bold">ID: </span>
-            <span>1</span>
-            <span style="font-weight:bold">	Description: </span>
-            <span>aaaa</span>
-          </div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ctor_H.aspx.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ctor_H.aspx.xml
deleted file mode 100644
index 92f0e3f1831..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/reference/_System_Web_UI_WebControls_WebControl_WebControl_ctor_H.aspx.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<testresults name="">
-  <div id="GHTSubTest1" testname="Tag = A">
-    <a id="ctrl_1">
-    </a>
-  </div>
-  <div id="GHTSubTest2" testname="Tag = Acronym">
-    <acronym id="ctrl_2">
-    </acronym>
-  </div>
-  <div id="GHTSubTest3" testname="Tag = Address">
-    <address id="ctrl_3">
-    </address>
-  </div>
-  <div id="GHTSubTest4" testname="Tag = Area">
-    <area id="ctrl_4" />
-  </div>
-  <div id="GHTSubTest5" testname="Tag = B">
-    <b id="ctrl_5">
-    </b>
-  </div>
-  <div id="GHTSubTest6" testname="Tag = Base">
-    <base id="ctrl_6" />
-  </div>
-  <div id="GHTSubTest7" testname="Tag = Basefont">
-    <basefont id="ctrl_7" />
-  </div>
-  <div id="GHTSubTest8" testname="Tag = Bdo">
-    <bdo id="ctrl_8">
-    </bdo>
-  </div>
-  <div id="GHTSubTest9" testname="Tag = Bgsound">
-    <bgsound id="ctrl_9" />
-  </div>
-  <div id="GHTSubTest10" testname="Tag = Big">
-    <big id="ctrl_10">
-    </big>
-  </div>
-  <div id="GHTSubTest11" testname="Tag = Blockquote">
-    <blockquote id="ctrl_11">
-    </blockquote>
-  </div>
-  <div id="GHTSubTest12" testname="Tag = Body">
-    <body id="ctrl_12">
-    </body>
-  </div>
-  <div id="GHTSubTest13" testname="Tag = Br">
-    <br id="ctrl_13">
-    </br>
-  </div>
-  <div id="GHTSubTest14" testname="Tag = Button">
-    <button id="ctrl_14">
-    </button>
-  </div>
-  <div id="GHTSubTest15" testname="Tag = Caption">
-    <caption id="ctrl_15">
-    </caption>
-  </div>
-  <div id="GHTSubTest16" testname="Tag = Center">
-    <center id="ctrl_16">
-    </center>
-  </div>
-  <div id="GHTSubTest17" testname="Tag = Cite">
-    <cite id="ctrl_17">
-    </cite>
-  </div>
-  <div id="GHTSubTest18" testname="Tag = Code">
-    <code id="ctrl_18">
-    </code>
-  </div>
-  <div id="GHTSubTest19" testname="Tag = Col">
-    <col id="ctrl_19" />
-  </div>
-  <div id="GHTSubTest20" testname="Tag = Colgroup">
-    <colgroup id="ctrl_20">
-    </colgroup>
-  </div>
-  <div id="GHTSubTest21" testname="Tag = Dd">
-    <dd id="ctrl_21">
-    </dd>
-  </div>
-  <div id="GHTSubTest22" testname="Tag = Del">
-    <del id="ctrl_22">
-    </del>
-  </div>
-  <div id="GHTSubTest23" testname="Tag = Dfn">
-    <dfn id="ctrl_23">
-    </dfn>
-  </div>
-  <div id="GHTSubTest24" testname="Tag = Dir">
-    <dir id="ctrl_24">
-    </dir>
-  </div>
-  <div id="GHTSubTest25" testname="Tag = Div">
-    <div id="ctrl_25">
-    </div>
-  </div>
-  <div id="GHTSubTest26" testname="Tag = Dl">
-    <dl id="ctrl_26">
-    </dl>
-  </div>
-  <div id="GHTSubTest27" testname="Tag = Dt">
-    <dt id="ctrl_27">
-    </dt>
-  </div>
-  <div id="GHTSubTest28" testname="Tag = Em">
-    <em id="ctrl_28">
-    </em>
-  </div>
-  <div id="GHTSubTest29" testname="Tag = Embed">
-    <embed id="ctrl_29" />
-  </div>
-  <div id="GHTSubTest30" testname="Tag = Fieldset">
-    <fieldset id="ctrl_30">
-    </fieldset>
-  </div>
-  <div id="GHTSubTest31" testname="Tag = Font">
-    <font id="ctrl_31">
-    </font>
-  </div>
-  <div id="GHTSubTest32" testname="Tag = Form">
-    <form id="ctrl_32" />
-
-	&lt;/form&gt;
-</div>
-  <div id="GHTSubTest33" testname="Tag = Frame">
-    <frame id="ctrl_33" />
-  </div>
-  <div id="GHTSubTest34" testname="Tag = Frameset">
-    <frameset id="ctrl_34">
-    </frameset>
-  </div>
-  <div id="GHTSubTest35" testname="Tag = H1">
-    <h1 id="ctrl_35">
-    </h1>
-  </div>
-  <div id="GHTSubTest36" testname="Tag = H2">
-    <h2 id="ctrl_36">
-    </h2>
-  </div>
-  <div id="GHTSubTest37" testname="Tag = H3">
-    <h3 id="ctrl_37">
-    </h3>
-  </div>
-  <div id="GHTSubTest38" testname="Tag = H4">
-    <h4 id="ctrl_38">
-    </h4>
-  </div>
-  <div id="GHTSubTest39" testname="Tag = H5">
-    <h5 id="ctrl_39">
-    </h5>
-  </div>
-  <div id="GHTSubTest40" testname="Tag = H6">
-    <h6 id="ctrl_40">
-    </h6>
-  </div>
-  <div id="GHTSubTest41" testname="Tag = Head">
-    <head id="ctrl_41">
-    </head>
-  </div>
-  <div id="GHTSubTest42" testname="Tag = Hr">
-    <hr id="ctrl_42" />
-  </div>
-  <div id="GHTSubTest43" testname="Tag = Html">
-    <html id="ctrl_43">
-    </html>
-  </div>
-  <div id="GHTSubTest44" testname="Tag = I">
-    <i id="ctrl_44">
-    </i>
-  </div>
-  <div id="GHTSubTest45" testname="Tag = Iframe">
-    <iframe id="ctrl_45">
-    </iframe>
-  </div>
-  <div id="GHTSubTest46" testname="Tag = Img">
-    <img id="ctrl_46" />
-  </div>
-  <div id="GHTSubTest47" testname="Tag = Input">
-    <input id="ctrl_47" />
-  </div>
-  <div id="GHTSubTest48" testname="Tag = Ins">
-    <ins id="ctrl_48">
-    </ins>
-  </div>
-  <div id="GHTSubTest49" testname="Tag = Isindex">
-    <isindex id="ctrl_49" />
-  </div>
-  <div id="GHTSubTest50" testname="Tag = Kbd">
-    <kbd id="ctrl_50">
-    </kbd>
-  </div>
-  <div id="GHTSubTest51" testname="Tag = Label">
-    <label id="ctrl_51">
-    </label>
-  </div>
-  <div id="GHTSubTest52" testname="Tag = Legend">
-    <legend id="ctrl_52">
-    </legend>
-  </div>
-  <div id="GHTSubTest53" testname="Tag = Li">
-    <li id="ctrl_53">
-    </li>
-  </div>
-  <div id="GHTSubTest54" testname="Tag = Link">
-    <link id="ctrl_54" />
-  </div>
-  <div id="GHTSubTest55" testname="Tag = Map">
-    <map id="ctrl_55">
-    </map>
-  </div>
-  <div id="GHTSubTest56" testname="Tag = Marquee">
-    <marquee id="ctrl_56">
-    </marquee>
-  </div>
-  <div id="GHTSubTest57" testname="Tag = Menu">
-    <menu id="ctrl_57">
-    </menu>
-  </div>
-  <div id="GHTSubTest58" testname="Tag = Meta">
-    <meta id="ctrl_58" />
-  </div>
-  <div id="GHTSubTest59" testname="Tag = Nobr">
-    <nobr id="ctrl_59">
-    </nobr>
-  </div>
-  <div id="GHTSubTest60" testname="Tag = Noframes">
-    <noframes id="ctrl_60">
-    </noframes>
-  </div>
-  <div id="GHTSubTest61" testname="Tag = Noscript">
-    <noscript id="ctrl_61">
-    </noscript>
-  </div>
-  <div id="GHTSubTest62" testname="Tag = Object">
-    <object id="ctrl_62">
-    </object>
-  </div>
-  <div id="GHTSubTest63" testname="Tag = Ol">
-    <ol id="ctrl_63">
-    </ol>
-  </div>
-  <div id="GHTSubTest64" testname="Tag = Option">
-    <option id="ctrl_64" />
-  </div>
-  <div id="GHTSubTest65" testname="Tag = P">
-    <p id="ctrl_65" />
-  </div>
-  <div id="GHTSubTest66" testname="Tag = Param">
-    <param id="ctrl_66" />
-  </div>
-  <div id="GHTSubTest67" testname="Tag = Pre">
-    <pre id="ctrl_67">
-    </pre>
-  </div>
-  <div id="GHTSubTest68" testname="Tag = Q">
-    <q id="ctrl_68">
-    </q>
-  </div>
-  <div id="GHTSubTest69" testname="Tag = Rt">
-    <rt id="ctrl_69">
-    </rt>
-  </div>
-  <div id="GHTSubTest70" testname="Tag = Ruby">
-    <ruby id="ctrl_70">
-    </ruby>
-  </div>
-  <div id="GHTSubTest71" testname="Tag = S">
-    <s id="ctrl_71">
-    </s>
-  </div>
-  <div id="GHTSubTest72" testname="Tag = Samp">
-    <samp id="ctrl_72">
-    </samp>
-  </div>
-  <div id="GHTSubTest73" testname="Tag = Select">
-    <select id="ctrl_73">
-    </select>
-  </div>
-  <div id="GHTSubTest74" testname="Tag = Small">
-    <small id="ctrl_74">
-    </small>
-  </div>
-  <div id="GHTSubTest75" testname="Tag = Span">
-    <span id="ctrl_75">
-    </span>
-  </div>
-  <div id="GHTSubTest76" testname="Tag = Strike">
-    <strike id="ctrl_76">
-    </strike>
-  </div>
-  <div id="GHTSubTest77" testname="Tag = Strong">
-    <strong id="ctrl_77">
-    </strong>
-  </div>
-  <div id="GHTSubTest78" testname="Tag = Sub">
-    <sub id="ctrl_78">
-    </sub>
-  </div>
-  <div id="GHTSubTest79" testname="Tag = Sup">
-    <sup id="ctrl_79">
-    </sup>
-  </div>
-  <div id="GHTSubTest80" testname="Tag = Table">
-    <table id="ctrl_80">
-    </table>
-  </div>
-  <div id="GHTSubTest81" testname="Tag = Tbody">
-    <tbody id="ctrl_81">
-    </tbody>
-  </div>
-  <div id="GHTSubTest82" testname="Tag = Td">
-    <td id="ctrl_82">
-    </td>
-  </div>
-  <div id="GHTSubTest83" testname="Tag = Textarea">
-    <textarea id="ctrl_83">
-    </textarea>
-  </div>
-  <div id="GHTSubTest84" testname="Tag = Tfoot">
-    <tfoot id="ctrl_84">
-    </tfoot>
-  </div>
-  <div id="GHTSubTest85" testname="Tag = Th">
-    <th id="ctrl_85">
-    </th>
-  </div>
-  <div id="GHTSubTest86" testname="Tag = Thead">
-    <thead id="ctrl_86">
-    </thead>
-  </div>
-  <div id="GHTSubTest87" testname="Tag = Title">
-    <title id="ctrl_87">
-    </title>
-  </div>
-  <div id="GHTSubTest88" testname="Tag = Tr">
-    <tr id="ctrl_88">
-    </tr>
-  </div>
-  <div id="GHTSubTest89" testname="Tag = Tt">
-    <tt id="ctrl_89">
-    </tt>
-  </div>
-  <div id="GHTSubTest90" testname="Tag = U">
-    <u id="ctrl_90">
-    </u>
-  </div>
-  <div id="GHTSubTest91" testname="Tag = Ul">
-    <ul id="ctrl_91">
-    </ul>
-  </div>
-  <div id="GHTSubTest92" testname="Tag = Var">
-    <var id="ctrl_92">
-    </var>
-  </div>
-  <div id="GHTSubTest93" testname="Tag = Wbr">
-    <wbr id="ctrl_93" />
-  </div>
-  <div id="GHTSubTest94" testname="Tag = Xml">
-    <xml id="ctrl_94">
-    </xml>
-  </div>
-</testresults>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/test_catalog.xml b/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/test_catalog.xml
deleted file mode 100644
index 00a63fddf53..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/test_catalog.xml
+++ /dev/null
@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TestCases>
-  <TestCase url="/System_Web/BeginEventHandler/BeginEventHandler_BeginInvoke_OEAOAO.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/BeginEventHandler/BeginEventHandler_ctor_OI.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/BeginEventHandler/BeginEventHandler_Invoke_OEAO.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Add_SO.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_AllKeys.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Clear_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Contents.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Count.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_GetKey_I.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Item.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Item_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_Remove_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_RemoveAll_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpApplicationState/HttpApplicationState_RemoveAt_I.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpCacheability/HttpCacheability_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpCacheRevalidation/HttpCacheRevalidation_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_AcceptTypes.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_ApplicationPath.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_Browser.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_ClientCertificate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_ContentEncoding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_Cookies.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_CurrentExecutionFilePath.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_Headers.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_MapPath_S.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpRequest/HttpRequest_ServerVariables.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpRuntime/HttpRuntime_AppDomainAppPath_MapPath.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web/HttpValidationStatus/HttpValidationStatus_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/ProcessShutdownReason/ProcessShutdownReason_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/ProcessStatus/ProcessStatus_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web/TraceMode/TraceMode_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_Nothing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Add_SO.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Clear_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_CodePage.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Contents.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_CopyTo_AI.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Count.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_GetEnumerator_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_IsCookieless.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_IsReadOnly2.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Item.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_I.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Item_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Keys.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_LCID.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Remove_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAll_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_RemoveAt_I.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_SessionID.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_SessionState/HttpSessionState/HttpSessionState_Timeout.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_ClientID.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_Dispose_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_FindControl_S.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI/Control/Control_ID.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_Init.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_Load_wo_CodeBehind.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_NamingContainer.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_Page.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_Parent.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_ResolveUrl_S.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI/Control/Control_TemplateSourceDirectory.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI/Control/Control_UniqueID.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_ViewState.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Control/Control_Visible.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/HtmlTextWriterAttribute/HtmlTextWriterAttribute_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/HtmlTextWriterStyle/HtmlTextWriterStyle_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/HtmlTextWriterTag/HtmlTextWriterTag_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/Page/Page_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI/ValidationPropertyAttribute/ValidationPropertyAttribute_ctor_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_HRef.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Name.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Target.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlAnchor/HtmlAnchor_Title.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_CausesValidation.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlButton/HtmlButton_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerHtml.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlContainerControl/HtmlContainerControl_InnerText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Attributes.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Disabled.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_Style.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlControl/HtmlControl_TagName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype1.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Enctype2.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method1.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Method2.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name1.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Name2.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target1.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlForm/HtmlForm_Target2.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_ctor_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlGenericControl/HtmlGenericControl_TagName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputButton/HtmlInputButton_CausesValidation.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputHidden/HtmlInputHidden_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Align.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Alt.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Border.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_CausesValidation.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlInputImage/HtmlInputImage_Src.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Cols.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_2.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_ctor_3.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Name.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Rows.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_HtmlControls/HtmlTextArea/HtmlTextArea_Value.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellPadding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_CellSpacing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_Controls.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataBind_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeyField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataKeys.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataMember.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_DataSource.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_GridLines.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseDataList/BaseDataList_IsBindableType_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BaseValidator/BaseValidator_ctor_.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/BorderStyle/BorderStyle_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BoundColumn/BoundColumn_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BoundColumn/BoundColumn_DataFormatString.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BoundColumn/BoundColumn_InitializeCell_TIL.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/BoundColumn/BoundColumn_ReadOnly.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Button/Button_CausesValidation.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Button/Button_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ButtonType.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_CommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_DataTextFormatString.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_InitializeCell_TIL.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ButtonColumn/ButtonColumn_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CalendarSelectionMode/CalendarSelectionMode_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBox/CheckBox_AutoPostBack.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBox/CheckBox_Checked.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBox/CheckBox_Enabled.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBox/CheckBox_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBox/CheckBox_TextAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellPadding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_CellSpacing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatColumns.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatDirection.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_RepeatLayout.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/CheckBoxList/CheckBoxList_TextAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_AllowCustomPaging.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_AllowPaging.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_AllowSorting.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_AlternatingItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_AutoGenerateColumns.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_BackImageUrl.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_CancelCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_Columns.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_CurrentPageIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_DeleteCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_EditCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_EditItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_FooterStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_HeaderStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_ItemCreated.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_ItemDataBound.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_Items.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_ItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_NextPageCommandArgument.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_PageCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_PageCount.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_PagerStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_PageSize.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_PrevPageCommandArgument.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_SelectCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItem.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_SelectedItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_ShowFooter.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_ShowHeader.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_SortCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_UpdateCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGrid/DataGrid_VirtualItemCount.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_FooterText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderImageUrl.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_HeaderText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_SortExpression.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_ToString_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridColumn/DataGridColumn_Visible.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataItem.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridItem/DataGridItem_DataSetIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridItem/DataGridItem_ItemType.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_CopyFrom_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_MergeWith_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Mode.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_NextPageText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PageButtonCount.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Position.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_PrevPageText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Reset_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataGridPagerStyle/DataGridPagerStyle_Visible.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_AlternatingItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_AlternatingItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_CancelCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_DeleteCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_EditCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_EditItemIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_EditItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_EditItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_ExtractTemplateRows.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_FooterStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_FooterTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_GridLines.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_HeaderStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_HeaderTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_Items.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_ItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_ItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_RepeatColumns.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_RepeatDirection.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_RepeatLayout.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SelectCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SelectedIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SelectedItem.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SelectedItemStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SelectedItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SeparatorStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_SeparatorTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_ShowFooter.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_ShowHeader.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataList/DataList_UpdateCommandName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataListItem/DataListItem_ctor_IL.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataListItem/DataListItem_DataItem.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataListItem/DataListItem_ItemIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DataListItem/DataListItem_ItemType.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DayNameFormat/DayNameFormat_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DropDownList/DropDownList_BorderColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DropDownList/DropDownList_BorderStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DropDownList/DropDownList_BorderWidth.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DropDownList/DropDownList_SelectedIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/DropDownList/DropDownList_ToolTip.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ButtonType.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_CancelText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_EditText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_InitializeCell_TIL.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/EditCommandColumn/EditCommandColumn_UpdateText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/FirstDayOfWeek/FirstDayOfWeek_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/FontSize/FontSize_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/GridLines/GridLines_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HorizontalAlign/HorizontalAlign_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLink/HyperLink_ImageUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLink/HyperLink_NavigateUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLink/HyperLink_Target.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLink/HyperLink_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataNavigateUrlFormatString.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_DataTextFormatString.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_InitializeCell_TIL.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_NavigateUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Target.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/HyperLinkColumn/HyperLinkColumn_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Image/Image_AlternateText.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Image/Image_Enabled.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Image/Image_Font.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Image/Image_ImageAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Image/Image_ImageUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/ImageAlign/ImageAlign_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ImageButton/ImageButton_CausesValidation.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Label/Label_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Label/Label_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/LinkButton/LinkButton_CausesValidation.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/LinkButton/LinkButton_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListBox/ListBox_BorderColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListBox/ListBox_BorderStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListBox/ListBox_BorderWidth.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListBox/ListBox_Rows.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListBox/ListBox_SelectionMode.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListBox/ListBox_ToolTip.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_AutoPostBack.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_ClearSelection_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_DataMember.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_DataSource.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_DataTextField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_DataTextFormatString.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_DataValueField.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_Items.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_SelectedIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_SelectedItem.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListControl/ListControl_SelectedValue.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_Attributes.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_ctor_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_ctor_SS.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_Equals_O.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_FromString_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_GetHashCode_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_Selected.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_ToString_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItem/ListItem_Value.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListItemType/ListItemType_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ListSelectionMode/ListSelectionMode_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Literal/Literal_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/NextPrevFormat/NextPrevFormat_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Panel/Panel_BackImageUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/Panel/Panel_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Panel/Panel_Wrap.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/PlaceHolder/PlaceHolder_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButton/RadioButton_GroupName.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellPadding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_CellSpacing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatColumns.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatDirection.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_RepeatLayout.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RadioButtonList/RadioButtonList_TextAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RepeatDirection/RepeatDirection_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_AlternatingItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_DataBind_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_DataMember.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_DataSource.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_FooterTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_HeaderTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_ItemDataBound.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_Items.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_ItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Repeater/Repeater_SeparatorTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_DataItem.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RepeaterItem/RepeaterItem_ItemType_Manual.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/RepeatLayout/RepeatLayout_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_BackImageUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_CellPadding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_CellSpacing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_GridLines.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/Table/Table_Rows.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_ColumnSpan.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_RowSpan.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_VerticalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCell/TableCell_Wrap.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Add_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_AddRange_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Clear_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_CopyTo_AI.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Count.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetCellIndex_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_GetEnumerator_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsReadOnly.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_IsSynchronized.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Item.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_Remove_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_RemoveAt_I.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableCellCollection/TableCellCollection_SyncRoot.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableHeaderCell/TableHeaderCell_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_CopyFrom_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_ctor_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_MergeWith_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Reset_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_VerticalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableItemStyle/TableItemStyle_Wrap.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRow/TableRow_Cells.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRow/TableRow_CreateControlCollection_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRow/TableRow_CreateControlStyle_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRow/TableRow_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRow/TableRow_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRow/TableRow_VerticalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Add_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddAt_IT.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_AddRange_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Clear_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_CopyTo_AI.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Count.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetEnumerator_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_GetRowIndex_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsReadOnly.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_IsSynchronized.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Item.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_Remove_T.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_RemoveAt_I.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableRowCollection/TableRowCollection_SyncRoot.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_BackImageUrl.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_CellPadding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_CellSpacing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_CopyFrom_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_ctor_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_GridLines.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_MergeWith_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TableStyle/TableStyle_Reset_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ctor_.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_EditItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_FooterTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_HeaderTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_InitializeCell_TIL.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TemplateColumn/TemplateColumn_ItemTemplate.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextAlign/TextAlign_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_AutoPostBack.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_Columns.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_MaxLength.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_ReadOnly.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_Rows.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_Text.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_TextMode.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBox/TextBox_Wrap.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TextBoxMode/TextBoxMode_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/TitleFormat/TitleFormat_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/UnitType/UnitType_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ValidationCompareOperator/ValidationCompareOperator_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ValidationDataType/ValidationDataType_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ValidationSummaryDisplayMode/ValidationSummaryDisplayMode_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/ValidatorDisplay/ValidatorDisplay_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/VerticalAlign/VerticalAlign_Enum.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_AccessKey.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_ApplyStyle_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Attributes.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_BackColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_BorderColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_BorderStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_BorderWidth.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_ControlStyle.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_ControlStyleCreated.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_CopyBaseAttributes_W.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_CssClass.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_ctor_H.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Enabled.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Font.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_ForeColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Height.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_MergeStyle_S.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_RenderBeginTag_H.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_RenderEndTag_H.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_BackColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Border.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_CssClass.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Bold.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Italic.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Name.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Names.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_OverLine.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_Size.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_StrikeOut.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Font_UnderLine.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_ForeColor.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Hight.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Style_Width.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TabIndex.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_VerticalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableItemStyle_Wrap.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_BackImageUrl.aspx" name="" Exclude="Y" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellPadding.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_CellSpacing.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_GridLines.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_TableStyle_HorizontalAlign.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_ToolTip.aspx" name="" Exclude="N" />
-  <TestCase url="/System_Web_UI_WebControls/WebControl/WebControl_Width.aspx" name="" Exclude="N" />
-</TestCases>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/mainsoft/run-test.bat b/mcs/class/System.Web/Test/mainsoft/run-test.bat
deleted file mode 100755
index 7e7ab6c244f..00000000000
--- a/mcs/class/System.Web/Test/mainsoft/run-test.bat
+++ /dev/null
@@ -1,85 +0,0 @@
-@ECHO OFF 

-

-rem =================================================

-set JAVA_HOME=c:\j2sdk1.4.2_09

-set JGAC_PATH=c:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110

-

-rem =================================================

-echo Hiding svn...

-pushd MainsoftWebApp

-FOR /R %%f IN (.svn) DO IF EXIST "%%f" ( 

-ATTRIB -h "%%f" 

-RENAME "%%f" _svn 

-) 

-

-rem =================================================

-if "%1"=="JBoss" (

-echo Building JBoss web project...

-"%VS71COMNTOOLS%..\IDE\devenv.com" MainsoftWebApp.JBoss.vmwcsproj /build Debug_Java

-) else (

-echo Building Tomcat web project...

-"%VS71COMNTOOLS%..\IDE\devenv.com" MainsoftWebApp.Tomcat.vmwcsproj /build Debug_Java

-)

-

-

-rem =================================================

-echo Restoring svn...

-FOR /R %%f IN (_svn) DO IF EXIST "%%f" ( 

-RENAME "%%f" .svn 

-ATTRIB +h "%%~pf\.svn" 

-) 

-popd

-

-rem =================================================

-echo Build NUnit...

-pushd ..\..\..\..\nunit20\

-"%VS71COMNTOOLS%..\IDE\devenv.com" nunit.java.sln /build Debug_Java

-popd

-

-rem =================================================

-echo Build System.Web test client side...

-pushd MainsoftWebTest

-"%VS71COMNTOOLS%..\IDE\devenv.com" SystemWebTest.vmwcsproj /build Debug_Java_NUnit

-popd

-

-rem =================================================

-copy MainsoftWebTest\almost_config.xml MainsoftWebTest\bin\almost_config.xml /Y

-copy MainsoftWebTest\test_catalog.xml MainsoftWebTest\bin\test_catalog.xml /Y

-copy MainsoftWebTest\App.gh.config MainsoftWebTest\bin\nunit-console.exe.config /Y

-copy ..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.jar MainsoftWebTest\bin\nunit.core.jar /Y

-copy ..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.jar MainsoftWebTest\bin\nunit.framework.jar /Y

-copy ..\..\..\..\nunit20\util\bin\Debug_Java\nunit.util.jar MainsoftWebTest\bin\nunit.util.jar /Y

-copy ..\..\..\..\nunit20\nunit-console\bin\Debug_Java\nunit-console.jar MainsoftWebTest\bin\nunit-console.jar /Y

-

-rem =================================================

-echo Buildinig xmltool...

-pushd ..\..\..\..\tools\mono-xmltool

-"%VS71COMNTOOLS%..\IDE\devenv.com" XmlTool.sln /build Debug_Java

-popd

-copy ..\..\..\..\tools\mono-xmltool\bin\Debug_Java\xmltool.exe MainsoftWebTest\bin\xmltool.exe

-copy ..\..\..\..\tools\mono-xmltool\nunit_transform.xslt MainsoftWebTest\bin\nunit_transform.xslt

-

-rem =================================================

-echo Running...

-

-set GH_CP=%JGAC_PATH%\mscorlib.jar

-set GH_CP=%GH_CP%;%JGAC_PATH%\System.jar

-set GH_CP=%GH_CP%;%JGAC_PATH%\System.Xml.jar

-set GH_CP=%GH_CP%;%JGAC_PATH%\J2SE.Helpers.jar

-set GH_CP=%GH_CP%;%JGAC_PATH%\vmwutils.jar

-

-set GH_CP=%GH_CP%;nunit.core.jar

-set GH_CP=%GH_CP%;nunit.framework.jar

-set GH_CP=%GH_CP%;nunit.util.jar

-set GH_CP=%GH_CP%;nunit-console.jar

-

-set logfile=logfile.xml

-

-pushd MainsoftWebTest\bin

-%JAVA_HOME%\bin\java.exe -cp .;"%GH_CP%" NUnit.Console.ConsoleUi SystemWebTest.jar /xml=%logfile% /fixture:MonoTests.stand_alone.WebHarness.Harness

-

-echo Finished...

-xmltool.exe --transform nunit_transform.xslt %logfile%

-

-popd

-

diff --git a/mcs/class/System.Web/Test/standalone/configuration/dumper.cs b/mcs/class/System.Web/Test/standalone/configuration/dumper.cs
new file mode 100644
index 00000000000..689641cad83
--- /dev/null
+++ b/mcs/class/System.Web/Test/standalone/configuration/dumper.cs
@@ -0,0 +1,196 @@
+using System;
+
+using System.Collections;
+using System.Configuration;
+using System.Reflection;
+using System.Web.Configuration;
+
+public class Dumper {
+	object[] things = {
+		new AnonymousIdentificationSection (),
+		new AssemblyCollection (),
+		new AssemblyInfo ("foo"),
+		new AuthenticationSection (),
+		new AuthorizationRuleCollection (),
+		new AuthorizationRule (AuthorizationRuleAction.Allow),
+		new AuthorizationSection (),
+		new BufferModesCollection (),
+		new BufferModeSettings ("name", 10, 10, 10, TimeSpan.FromMinutes (1), TimeSpan.FromMinutes(1), 10),
+		new BuildProviderCollection (),
+		new BuildProvider (".cs", "CSharpProvider"),
+		new CacheSection (),
+		new ClientTargetCollection (),
+		new ClientTarget ("alias", "userAgent"),
+		new ClientTargetSection (),
+		new CodeSubDirectoriesCollection (),
+		new CodeSubDirectory ("dirname"),
+		new CompilationSection (),
+		new CompilerCollection (),
+		new Compiler ("options", "ext", "lang", "type", 1),
+		new CustomErrorCollection (),
+		new CustomError (404, "redirect"),
+		new CustomErrorsSection (),
+		new DeploymentSection (),
+		new EventMappingSettingsCollection (),
+		new EventMappingSettings ("name", "type"),
+		new ExpressionBuilderCollection (),
+		new ExpressionBuilder ("prefix", "type"),
+		new FormsAuthenticationConfiguration (),
+		new FormsAuthenticationCredentials (),
+		new FormsAuthenticationUserCollection (),
+		new FormsAuthenticationUser ("name", "password"),
+		new GlobalizationSection (),
+		new HealthMonitoringSection (),
+		new HostingEnvironmentSection (),
+		new HttpCookiesSection (),
+		new HttpHandlerActionCollection (),
+		new HttpHandlerAction ("path", "type", "verb"),
+		new HttpHandlersSection (),
+		new HttpModuleActionCollection (),
+		new HttpModuleAction ("name", "type"),
+		new HttpModulesSection (),
+		new HttpRuntimeSection (),
+		new IdentitySection (),
+		new MachineKeySection (),
+		new MembershipSection (),
+		new NamespaceCollection (),
+		new NamespaceInfo ("name"),
+		new OutputCacheProfileCollection (),
+		new OutputCacheProfile ("name"),
+		new OutputCacheSection (),
+		new OutputCacheSettingsSection (),
+		new PagesSection (),
+		new PassportAuthentication (),
+		new ProcessModelSection (),
+		new ProfileGroupSettingsCollection (),
+		new ProfileGroupSettings ("name"),
+		new ProfilePropertySettingsCollection (),
+		new ProfilePropertySettings ("name"),
+		new ProfileSettingsCollection (),
+		new ProfileSettings ("name"),
+		new RoleManagerSection (),
+		new RootProfilePropertySettingsCollection (),
+		new RuleSettingsCollection (),
+		new RuleSettings ("name", "event", "provider", "profile", 1, 1, TimeSpan.FromMinutes (5), "custom"),
+		new SecurityPolicySection (),
+		new SessionPageStateSection (),
+		new SessionStateSection (),
+		new SqlCacheDependencyDatabaseCollection (),
+		new SqlCacheDependencyDatabase ("name", "connectionStringName"),
+		new SqlCacheDependencySection (),
+		new TagMapCollection (),
+		new TagMapInfo ("tagType", "mappedTag"),
+		new TagPrefixCollection (),
+		new TagPrefixInfo ("tagPrefix", "nameSpace", "assembly", "tagName", "source"),
+		new TraceSection (),
+		new TransformerInfoCollection (),
+		new TransformerInfo ("name", "type"),
+		new TrustLevelCollection (),
+		new TrustLevel ("name", "policyFile"),
+		new TrustSection (),
+		new UrlMappingCollection (),
+		new UrlMapping ("~/url", "~/mappedUrl"), /* UrlMapping uses a callback validator to validate the url(s) */
+		new UrlMappingsSection (),
+		new VirtualDirectoryMappingCollection (),
+		//		new VirtualDirectoryMapping ("\\phys\\dir", true),  /* PhysicalDirectory seems to validate its input without using a Validator (decorator, anyway..)*/
+		new WebControlsSection (),
+		new WebPartsPersonalizationAuthorization (),
+		new WebPartsPersonalization (),
+		new WebPartsSection (),
+		new XhtmlConformanceSection (),
+	};
+
+	public Dumper ()
+	{
+	}
+
+	public void DumpProperties ()
+	{
+		foreach (object o in things) {
+			Type type = o.GetType ();
+			PropertyInfo pinfo = type.GetProperty ("Properties", BindingFlags.Instance | BindingFlags.NonPublic);
+
+			if (pinfo == null)
+				continue;
+
+			ConfigurationPropertyCollection col = (ConfigurationPropertyCollection)pinfo.GetValue (o, null);
+			foreach (ConfigurationProperty p in col) {
+				if (p.Validator != null && p.Validator.GetType () != typeof (DefaultValidator))
+					Console.WriteLine ("{0}.{1} (Validator) = {2} ", type, p.Name, p.Validator);
+			}
+		}
+	}
+
+	public void DumpConverters ()
+	{
+		foreach (object o in things) {
+			Type type = o.GetType ();
+			PropertyInfo pinfo = type.GetProperty ("Properties", BindingFlags.Instance | BindingFlags.NonPublic);
+
+			if (pinfo == null)
+				continue;
+
+			ConfigurationPropertyCollection col = (ConfigurationPropertyCollection)pinfo.GetValue (o, null);
+			foreach (ConfigurationProperty p in col) {
+				if (p.Converter != null)
+					Console.WriteLine ("{0}.{1} (Converter) = {2} ", type, p.Name, p.Converter);
+			}
+		}
+	}
+
+	public void DumpElementProperties ()
+	{
+		foreach (object o in things) {
+			Type type = o.GetType ();
+			PropertyInfo pinfo = type.GetProperty ("ElementProperty", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+
+			if (pinfo == null)
+				continue;
+
+			ConfigurationElementProperty p = (ConfigurationElementProperty)pinfo.GetValue (o, null);
+			if (p == null)
+				Console.WriteLine ("{0}.ElementProperty = null", type);
+			else if (p.Validator == null)
+				Console.WriteLine ("{0}.ElementProperty (Validator) = null", type);
+			else
+				Console.WriteLine ("{0}.ElementProperty (Validator) = {1} ({2})", type, p.Validator, p.Validator.CanValidate (type));
+		}
+	}
+
+	public void DumpRuntimeObjects ()
+	{
+		foreach (object o in things) {
+			Type type = o.GetType ();
+			MethodInfo minfo = type.GetMethod ("GetRuntimeObject", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+
+			if (minfo == null)
+				continue;
+
+			object ro = minfo.Invoke (o, null);
+
+			if (ro == null)
+				Console.WriteLine ("{0}.GetRuntimeObject() = null", type);
+			else
+				Console.WriteLine ("{0}.GetRuntimeObject() = {1} ({2})", type, ro.GetType(), ro == o);
+			if (ro.GetType() == typeof (Hashtable)) {
+				foreach (object key in ((Hashtable)ro).Keys)
+					Console.WriteLine (" hash[{0}] = {1}", key, ((Hashtable)ro)[key]);
+			}
+		}
+	}
+
+	public static void Main (string[] args) {
+		Dumper d = new Dumper ();
+
+		try {
+			d.DumpProperties ();
+			d.DumpConverters ();
+			d.DumpElementProperties ();
+			d.DumpRuntimeObjects ();
+		}
+		catch (Exception e) {
+			Console.WriteLine (e);
+		}
+	}
+
+}
diff --git a/mcs/class/System.Web/Test/standalone/configuration/dumper.out.microsoft b/mcs/class/System.Web/Test/standalone/configuration/dumper.out.microsoft
new file mode 100644
index 00000000000..2f5e69cd83d
--- /dev/null
+++ b/mcs/class/System.Web/Test/standalone/configuration/dumper.out.microsoft
@@ -0,0 +1,486 @@
+ hash[clientScriptsLocation] = /aspnet_client/{0}/{1}/
+System.Web.Configuration.AnonymousIdentificationSection.cookieless (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookieName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookieName (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.AnonymousIdentificationSection.cookiePath (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookiePath (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.AnonymousIdentificationSection.cookieProtection (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookieRequireSSL (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookieSlidingExpiration (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookieTimeout (Converter) = System.Configuration.TimeSpanMinutesOrInfiniteConverter 
+System.Web.Configuration.AnonymousIdentificationSection.cookieTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.AnonymousIdentificationSection.domain (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.AnonymousIdentificationSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AnonymousIdentificationSection.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.AnonymousIdentificationSection.GetRuntimeObject() = System.Web.Configuration.AnonymousIdentificationSection (True)
+System.Web.Configuration.AssemblyCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AssemblyInfo.assembly (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.AssemblyInfo.assembly (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.AssemblyInfo.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AuthenticationSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AuthenticationSection.GetRuntimeObject() = System.Web.Configuration.AuthenticationSection (True)
+System.Web.Configuration.AuthenticationSection.mode (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.AuthorizationRuleCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AuthorizationRule.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AuthorizationRule.roles (Converter) = System.Configuration.CommaDelimitedStringCollectionConverter 
+System.Web.Configuration.AuthorizationRule.users (Converter) = System.Configuration.CommaDelimitedStringCollectionConverter 
+System.Web.Configuration.AuthorizationRule.verbs (Converter) = System.Configuration.CommaDelimitedStringCollectionConverter 
+System.Web.Configuration.AuthorizationSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.AuthorizationSection.GetRuntimeObject() = System.Web.Configuration.AuthorizationSection (True)
+System.Web.Configuration.BufferModesCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.BufferModeSettings.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.BufferModeSettings.maxBufferSize (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.BufferModeSettings.maxBufferSize (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.BufferModeSettings.maxBufferThreads (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.BufferModeSettings.maxBufferThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.BufferModeSettings.maxFlushSize (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.BufferModeSettings.maxFlushSize (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.BufferModeSettings.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.BufferModeSettings.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.BufferModeSettings.regularFlushInterval (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.BufferModeSettings.regularFlushInterval (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.BufferModeSettings.urgentFlushInterval (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.BufferModeSettings.urgentFlushThreshold (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.BufferModeSettings.urgentFlushThreshold (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.BuildProviderCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.BuildProvider.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.BuildProvider.extension (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.BuildProvider.extension (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.BuildProvider.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.BuildProvider.type (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.CacheSection.disableExpiration (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CacheSection.disableMemoryCollection (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CacheSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CacheSection.GetRuntimeObject() = System.Web.Configuration.CacheSection (True)
+System.Web.Configuration.CacheSection.percentagePhysicalMemoryUsedLimit (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.CacheSection.percentagePhysicalMemoryUsedLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.CacheSection.privateBytesLimit (Converter) = System.ComponentModel.Int64Converter 
+System.Web.Configuration.CacheSection.privateBytesLimit (Validator) = System.Configuration.LongValidator 
+System.Web.Configuration.CacheSection.privateBytesPollTime (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.CacheSection.privateBytesPollTime (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.ClientTarget.alias (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ClientTarget.alias (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.ClientTargetCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ClientTarget.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ClientTargetSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ClientTargetSection.GetRuntimeObject() = System.Web.Configuration.ClientTargetSection (True)
+System.Web.Configuration.ClientTarget.userAgent (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ClientTarget.userAgent (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.CodeSubDirectoriesCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CodeSubDirectory.directoryName (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.CodeSubDirectory.directoryName (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.CodeSubDirectory.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CompilationSection.assemblyPostProcessorType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.CompilationSection.batch (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CompilationSection.batchTimeout (Converter) = System.Configuration.TimeSpanSecondsOrInfiniteConverter 
+System.Web.Configuration.CompilationSection.batchTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.CompilationSection.debug (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CompilationSection.defaultLanguage (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.CompilationSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CompilationSection.explicit (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CompilationSection.GetRuntimeObject() = System.Web.Configuration.CompilationSection (True)
+System.Web.Configuration.CompilationSection.maxBatchGeneratedFileSize (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.CompilationSection.maxBatchSize (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.CompilationSection.numRecompilesBeforeAppRestart (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.CompilationSection.strict (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CompilationSection.tempDirectory (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.CompilationSection.urlLinePragmas (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.CompilerCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.Compiler.compilerOptions (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.Compiler.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.Compiler.extension (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.Compiler.language (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.Compiler.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.Compiler.warningLevel (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.Compiler.warningLevel (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.CustomErrorCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CustomError.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CustomError.redirect (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.CustomError.redirect (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.CustomErrorsSection.defaultRedirect (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.CustomErrorsSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.CustomErrorsSection.GetRuntimeObject() = System.Web.Configuration.CustomErrorsSection (True)
+System.Web.Configuration.CustomErrorsSection.mode (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.CustomError.statusCode (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.CustomError.statusCode (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.DeploymentSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.DeploymentSection.GetRuntimeObject() = System.Web.Configuration.DeploymentSection (True)
+System.Web.Configuration.DeploymentSection.retail (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.EventMappingSettingsCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.EventMappingSettings.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.EventMappingSettings.endEventCode (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.EventMappingSettings.endEventCode (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.EventMappingSettings.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.EventMappingSettings.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.EventMappingSettings.startEventCode (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.EventMappingSettings.startEventCode (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.EventMappingSettings.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ExpressionBuilderCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ExpressionBuilder.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ExpressionBuilder.expressionPrefix (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ExpressionBuilder.expressionPrefix (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.ExpressionBuilder.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ExpressionBuilder.type (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.FormsAuthenticationConfiguration.cookieless (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.defaultUrl (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.defaultUrl (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.FormsAuthenticationConfiguration.domain (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.FormsAuthenticationConfiguration.enableCrossAppRedirects (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.loginUrl (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.loginUrl (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.FormsAuthenticationConfiguration.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.FormsAuthenticationConfiguration.path (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.path (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.FormsAuthenticationConfiguration.protection (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.requireSSL (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.slidingExpiration (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.timeout (Converter) = System.Configuration.TimeSpanMinutesConverter 
+System.Web.Configuration.FormsAuthenticationConfiguration.timeout (Validator) = System.Configuration.TimeSpanValidator 
+System.Web.Configuration.FormsAuthenticationCredentials.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.FormsAuthenticationCredentials.passwordFormat (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.FormsAuthenticationUserCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.FormsAuthenticationUser.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.FormsAuthenticationUser.name (Converter) = System.Web.Configuration.LowerCaseStringConverter 
+System.Web.Configuration.FormsAuthenticationUser.password (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.culture (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.GlobalizationSection.enableBestFitResponseEncoding (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.GlobalizationSection.enableClientBasedCulture (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.GlobalizationSection.fileEncoding (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.GetRuntimeObject() = System.Web.Configuration.GlobalizationSection (True)
+System.Web.Configuration.GlobalizationSection.requestEncoding (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.resourceProviderFactoryType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.responseEncoding (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.responseHeaderEncoding (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.GlobalizationSection.uiCulture (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HealthMonitoringSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HealthMonitoringSection.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HealthMonitoringSection.GetRuntimeObject() = System.Web.Configuration.HealthMonitoringSection (True)
+System.Web.Configuration.HealthMonitoringSection.heartbeatInterval (Converter) = System.Configuration.TimeSpanSecondsConverter 
+System.Web.Configuration.HealthMonitoringSection.heartbeatInterval (Validator) = System.Configuration.TimeSpanValidator 
+System.Web.Configuration.HostingEnvironmentSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HostingEnvironmentSection.GetRuntimeObject() = System.Web.Configuration.HostingEnvironmentSection (True)
+System.Web.Configuration.HostingEnvironmentSection.idleTimeout (Converter) = System.Configuration.TimeSpanMinutesOrInfiniteConverter 
+System.Web.Configuration.HostingEnvironmentSection.idleTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.HostingEnvironmentSection.shadowCopyBinAssemblies (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HostingEnvironmentSection.shutdownTimeout (Converter) = System.Configuration.TimeSpanSecondsConverter 
+System.Web.Configuration.HostingEnvironmentSection.shutdownTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.HttpCookiesSection.domain (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HttpCookiesSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpCookiesSection.GetRuntimeObject() = System.Web.Configuration.HttpCookiesSection (True)
+System.Web.Configuration.HttpCookiesSection.httpOnlyCookies (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpCookiesSection.requireSSL (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpHandlerActionCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpHandlerAction.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpHandlerAction.path (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HttpHandlerAction.path (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.HttpHandlerAction.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HttpHandlerAction.type (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.HttpHandlerAction.validate (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpHandlerAction.verb (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HttpHandlerAction.verb (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.HttpHandlersSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpHandlersSection.GetRuntimeObject() = System.Web.Configuration.HttpHandlersSection (True)
+System.Web.Configuration.HttpModuleActionCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpModuleAction.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.HttpModuleAction.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HttpModuleAction.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.HttpModuleAction.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.HttpModulesSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpModulesSection.GetRuntimeObject() = System.Web.Configuration.HttpModulesSection (True)
+System.Web.Configuration.HttpRuntimeSection.apartmentThreading (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.appRequestQueueLimit (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.appRequestQueueLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.HttpRuntimeSection.delayNotificationTimeout (Converter) = System.Configuration.TimeSpanSecondsConverter 
+System.Web.Configuration.HttpRuntimeSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.HttpRuntimeSection.enable (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.enableHeaderChecking (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.enableKernelOutputCache (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.enableVersionHeader (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.executionTimeout (Converter) = System.Configuration.TimeSpanSecondsConverter 
+System.Web.Configuration.HttpRuntimeSection.executionTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.HttpRuntimeSection.GetRuntimeObject() = System.Web.Configuration.HttpRuntimeSection (True)
+System.Web.Configuration.HttpRuntimeSection.maxRequestLength (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.maxRequestLength (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.HttpRuntimeSection.maxWaitChangeNotification (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.maxWaitChangeNotification (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.HttpRuntimeSection.minFreeThreads (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.minFreeThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.HttpRuntimeSection.minLocalRequestFreeThreads (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.minLocalRequestFreeThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.HttpRuntimeSection.requestLengthDiskThreshold (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.requestLengthDiskThreshold (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.HttpRuntimeSection.requireRootedSaveAsPath (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.sendCacheControlHeader (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.shutdownTimeout (Converter) = System.Configuration.TimeSpanSecondsConverter 
+System.Web.Configuration.HttpRuntimeSection.useFullyQualifiedRedirectUrl (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.HttpRuntimeSection.waitChangeNotification (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.HttpRuntimeSection.waitChangeNotification (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.IdentitySection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.IdentitySection.GetRuntimeObject() = System.Web.Configuration.IdentitySection (True)
+System.Web.Configuration.IdentitySection.impersonate (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.IdentitySection.password (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.IdentitySection.userName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.MachineKeySection.decryption (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.MachineKeySection.decryptionKey (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.MachineKeySection.decryptionKey (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.MachineKeySection.decryption (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.MachineKeySection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.MachineKeySection.GetRuntimeObject() = System.Web.Configuration.MachineKeySection (True)
+System.Web.Configuration.MachineKeySection.validation (Converter) = System.Web.Configuration.MachineKeyValidationConverter 
+System.Web.Configuration.MachineKeySection.validationKey (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.MachineKeySection.validationKey (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.MembershipSection.defaultProvider (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.MembershipSection.defaultProvider (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.MembershipSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.MembershipSection.GetRuntimeObject() = System.Web.Configuration.MembershipSection (True)
+System.Web.Configuration.MembershipSection.hashAlgorithmType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.MembershipSection.userIsOnlineTimeWindow (Converter) = System.Configuration.TimeSpanMinutesConverter 
+System.Web.Configuration.MembershipSection.userIsOnlineTimeWindow (Validator) = System.Configuration.TimeSpanValidator 
+System.Web.Configuration.NamespaceCollection.autoImportVBNamespace (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.NamespaceCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.NamespaceInfo.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.NamespaceInfo.namespace (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.NamespaceInfo.namespace (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.OutputCacheProfileCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.OutputCacheProfile.duration (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.OutputCacheProfile.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.OutputCacheProfile.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.OutputCacheProfile.location (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.OutputCacheProfile.name (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.OutputCacheProfile.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.OutputCacheProfile.noStore (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.OutputCacheProfile.sqlDependency (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.OutputCacheProfile.varyByControl (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.OutputCacheProfile.varyByCustom (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.OutputCacheProfile.varyByHeader (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.OutputCacheProfile.varyByParam (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.OutputCacheSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.OutputCacheSection.enableFragmentCache (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.OutputCacheSection.enableOutputCache (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.OutputCacheSection.GetRuntimeObject() = System.Web.Configuration.OutputCacheSection (True)
+System.Web.Configuration.OutputCacheSection.omitVaryStar (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.OutputCacheSection.sendCacheControlHeader (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.OutputCacheSettingsSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.OutputCacheSettingsSection.GetRuntimeObject() = System.Web.Configuration.OutputCacheSettingsSection (True)
+System.Web.Configuration.PagesSection.asyncTimeout (Converter) = System.Configuration.TimeSpanSecondsConverter 
+System.Web.Configuration.PagesSection.asyncTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.PagesSection.autoEventWireup (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.buffer (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.compilationMode (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.PagesSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.PagesSection.enableEventValidation (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.enableSessionState (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.enableViewState (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.enableViewStateMac (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.GetRuntimeObject() = System.Web.Configuration.PagesSection (True)
+System.Web.Configuration.PagesSection.maintainScrollPositionOnPostBack (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.masterPageFile (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.maxPageStateFieldLength (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.PagesSection.pageBaseType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.pageParserFilterType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.smartNavigation (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.styleSheetTheme (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.theme (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.userControlBaseType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.PagesSection.validateRequest (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.PagesSection.viewStateEncryptionMode (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.PassportAuthentication.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.PassportAuthentication.redirectUrl (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProcessModelSection.autoConfig (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.ProcessModelSection.clientConnectedCheck (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.comAuthenticationLevel (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.ProcessModelSection.comImpersonationLevel (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.ProcessModelSection.cpuMask (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProcessModelSection.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.ProcessModelSection.enable (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.ProcessModelSection.GetRuntimeObject() = System.Web.Configuration.ProcessModelSection (True)
+System.Web.Configuration.ProcessModelSection.idleTimeout (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.logLevel (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.ProcessModelSection.maxAppDomains (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProcessModelSection.maxAppDomains (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.maxIoThreads (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProcessModelSection.maxIoThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.maxWorkerThreads (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProcessModelSection.maxWorkerThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.memoryLimit (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProcessModelSection.minIoThreads (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProcessModelSection.minIoThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.minWorkerThreads (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProcessModelSection.minWorkerThreads (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.password (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProcessModelSection.pingFrequency (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.pingTimeout (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.requestLimit (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.ProcessModelSection.requestLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.requestQueueLimit (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.ProcessModelSection.requestQueueLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.responseDeadlockInterval (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.responseDeadlockInterval (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.ProcessModelSection.responseRestartDeadlockInterval (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.restartQueueLimit (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.ProcessModelSection.restartQueueLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProcessModelSection.serverErrorMessageFile (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProcessModelSection.shutdownTimeout (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.shutdownTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.ProcessModelSection.timeout (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProcessModelSection.userName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProcessModelSection.webGarden (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.ProfileGroupSettingsCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ProfileGroupSettings.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ProfileGroupSettings.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfileGroupSettings.name (Validator) = System.Web.Configuration.ProfilePropertyNameValidator 
+System.Web.Configuration.ProfilePropertySettings.allowAnonymous (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.ProfilePropertySettingsCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ProfilePropertySettings.customProviderData (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfilePropertySettings.defaultValue (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfilePropertySettings.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ProfilePropertySettings.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfilePropertySettings.name (Validator) = System.Web.Configuration.ProfilePropertyNameValidator 
+System.Web.Configuration.ProfilePropertySettings.provider (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfilePropertySettings.readOnly (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.ProfilePropertySettings.serializeAs (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.ProfilePropertySettings.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfileSettingsCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ProfileSettings.custom (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfileSettings.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.ProfileSettings.maxLimit (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.ProfileSettings.maxLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProfileSettings.minInstances (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.ProfileSettings.minInstances (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.ProfileSettings.minInterval (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.ProfileSettings.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.ProfileSettings.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.RoleManagerSection.cacheRolesInCookie (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.RoleManagerSection.cookieName (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.RoleManagerSection.cookieName (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.RoleManagerSection.cookiePath (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.RoleManagerSection.cookiePath (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.RoleManagerSection.cookieProtection (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.RoleManagerSection.cookieRequireSSL (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.RoleManagerSection.cookieSlidingExpiration (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.RoleManagerSection.cookieTimeout (Converter) = System.Configuration.TimeSpanMinutesOrInfiniteConverter 
+System.Web.Configuration.RoleManagerSection.cookieTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.RoleManagerSection.createPersistentCookie (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.RoleManagerSection.defaultProvider (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.RoleManagerSection.defaultProvider (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.RoleManagerSection.domain (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.RoleManagerSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.RoleManagerSection.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.RoleManagerSection.GetRuntimeObject() = System.Web.Configuration.RoleManagerSection (True)
+System.Web.Configuration.RoleManagerSection.maxCachedResults (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.RootProfilePropertySettingsCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.RuleSettingsCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.RuleSettings.custom (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.RuleSettings.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.RuleSettings.eventName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.RuleSettings.maxLimit (Converter) = System.Configuration.InfiniteIntConverter 
+System.Web.Configuration.RuleSettings.maxLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.RuleSettings.minInstances (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.RuleSettings.minInstances (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.RuleSettings.minInterval (Converter) = System.Configuration.InfiniteTimeSpanConverter 
+System.Web.Configuration.RuleSettings.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.RuleSettings.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.RuleSettings.profile (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.RuleSettings.provider (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SecurityPolicySection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.SecurityPolicySection.GetRuntimeObject() = System.Web.Configuration.SecurityPolicySection (True)
+System.Web.Configuration.SessionPageStateSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.SessionPageStateSection.GetRuntimeObject() = System.Web.Configuration.SessionPageStateSection (True)
+System.Web.Configuration.SessionPageStateSection.historySize (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.SessionPageStateSection.historySize (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.SessionStateSection.allowCustomSqlDatabase (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.SessionStateSection.cookieless (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.cookieName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.customProvider (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.SessionStateSection.GetRuntimeObject() = System.Web.Configuration.SessionStateSection (True)
+System.Web.Configuration.SessionStateSection.mode (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.SessionStateSection.partitionResolverType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.regenerateExpiredSessionId (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.SessionStateSection.sessionIDManagerType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.sqlCommandTimeout (Converter) = System.Configuration.TimeSpanSecondsOrInfiniteConverter 
+System.Web.Configuration.SessionStateSection.sqlConnectionString (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.stateConnectionString (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SessionStateSection.stateNetworkTimeout (Converter) = System.Configuration.TimeSpanSecondsOrInfiniteConverter 
+System.Web.Configuration.SessionStateSection.stateNetworkTimeout (Validator) = System.Configuration.PositiveTimeSpanValidator 
+System.Web.Configuration.SessionStateSection.timeout (Converter) = System.Configuration.TimeSpanMinutesOrInfiniteConverter 
+System.Web.Configuration.SessionStateSection.timeout (Validator) = System.Configuration.TimeSpanValidator 
+System.Web.Configuration.SessionStateSection.useHostingIdentity (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.SqlCacheDependencyDatabaseCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.SqlCacheDependencyDatabase.connectionStringName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SqlCacheDependencyDatabase.connectionStringName (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.SqlCacheDependencyDatabase.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.SqlCacheDependencyDatabase.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.SqlCacheDependencyDatabase.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.SqlCacheDependencyDatabase.pollTime (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.SqlCacheDependencySection.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.SqlCacheDependencySection.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.SqlCacheDependencySection.GetRuntimeObject() = System.Web.Configuration.SqlCacheDependencySection (True)
+System.Web.Configuration.SqlCacheDependencySection.pollTime (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.TagMapCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TagMapInfo.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TagMapInfo.mappedTagType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagMapInfo.mappedTagType (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TagMapInfo.tagType (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagMapInfo.tagType (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TagPrefixCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TagPrefixInfo.assembly (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagPrefixInfo.ElementProperty (Validator) = System.Configuration.CallbackValidator (True)
+System.Web.Configuration.TagPrefixInfo.namespace (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagPrefixInfo.src (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagPrefixInfo.tagName (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagPrefixInfo.tagPrefix (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TagPrefixInfo.tagPrefix (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TraceSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TraceSection.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.TraceSection.GetRuntimeObject() = System.Web.Configuration.TraceSection (True)
+System.Web.Configuration.TraceSection.localOnly (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.TraceSection.mostRecent (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.TraceSection.pageOutput (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.TraceSection.requestLimit (Converter) = System.ComponentModel.Int32Converter 
+System.Web.Configuration.TraceSection.requestLimit (Validator) = System.Configuration.IntegerValidator 
+System.Web.Configuration.TraceSection.traceMode (Converter) = System.Configuration.GenericEnumConverter 
+System.Web.Configuration.TraceSection.writeToDiagnosticsTrace (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.TransformerInfoCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TransformerInfo.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TransformerInfo.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TransformerInfo.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TransformerInfo.type (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TransformerInfo.type (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TrustLevelCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TrustLevel.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TrustLevel.name (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TrustLevel.name (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TrustLevel.policyFile (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TrustSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.TrustSection.GetRuntimeObject() = System.Web.Configuration.TrustSection (True)
+System.Web.Configuration.TrustSection.level (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TrustSection.level (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.TrustSection.originUrl (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.TrustSection.processRequestInApplicationTrust (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.UrlMappingCollection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.UrlMapping.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.UrlMapping.mappedUrl (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.UrlMapping.mappedUrl (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.UrlMappingsSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.UrlMappingsSection.enabled (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.UrlMappingsSection.GetRuntimeObject() = System.Web.Configuration.UrlMappingsSection (True)
+System.Web.Configuration.UrlMapping.url (Converter) = System.Configuration.WhiteSpaceTrimStringConverter 
+System.Web.Configuration.UrlMapping.url (Validator) = System.Configuration.CallbackValidator 
+System.Web.Configuration.WebControlsSection.clientScriptsLocation (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.WebControlsSection.clientScriptsLocation (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.WebControlsSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.WebControlsSection.GetRuntimeObject() = System.Collections.Hashtable (False)
+System.Web.Configuration.WebPartsPersonalizationAuthorization.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.WebPartsPersonalization.defaultProvider (Converter) = System.ComponentModel.StringConverter 
+System.Web.Configuration.WebPartsPersonalization.defaultProvider (Validator) = System.Configuration.StringValidator 
+System.Web.Configuration.WebPartsPersonalization.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.WebPartsSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.WebPartsSection.enableExport (Converter) = System.ComponentModel.BooleanConverter 
+System.Web.Configuration.WebPartsSection.GetRuntimeObject() = System.Web.Configuration.WebPartsSection (True)
+System.Web.Configuration.XhtmlConformanceSection.ElementProperty (Validator) = System.Configuration.DefaultValidator (True)
+System.Web.Configuration.XhtmlConformanceSection.GetRuntimeObject() = System.Web.Configuration.XhtmlConformanceSection (True)
+System.Web.Configuration.XhtmlConformanceSection.mode (Converter) = System.Configuration.GenericEnumConverter 
diff --git a/mcs/class/System.Web/Test/standalone/configuration/twolevel/index.aspx b/mcs/class/System.Web/Test/standalone/configuration/twolevel/index.aspx
deleted file mode 100644
index dd2ca4b7e20..00000000000
--- a/mcs/class/System.Web/Test/standalone/configuration/twolevel/index.aspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Import namespace="System.Web.Configuration" %>
-
-<script runat="server">
-
-void Page_Load ()
-{
-	lbl.Text = WebConfigurationManager.AppSettings["testSetting"];
-}
-
-</script>
-
-<asp:Label id="lbl" runat="server" />
diff --git a/mcs/class/System.Web/Test/standalone/configuration/twolevel/subdir/index.aspx b/mcs/class/System.Web/Test/standalone/configuration/twolevel/subdir/index.aspx
deleted file mode 100644
index d1e67a63f60..00000000000
--- a/mcs/class/System.Web/Test/standalone/configuration/twolevel/subdir/index.aspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Import namespace="System.Web.Configuration" %>
-
-<script runat="server">
-
-void Page_Load ()
-{
-	string value = "";
-	System.Configuration.Configuration c = WebConfigurationManager.OpenWebConfiguration("/toshok/configuration/twolevel");
-	lbl.Text = String.Format ("{0} (c.FilePath = {1}", c.AppSettings.Settings["testSetting"].Value, c.FilePath);
-	lbl2.Text = WebConfigurationManager.AppSettings["testSetting"];
-
-	object s = WebConfigurationManager.GetSection ("appSettings");
-	if (s is NameValueCollection) {
-		NameValueCollection col = (NameValueCollection)s;
-		value = String.Format ("{0} (section type = NameValueCollection)", col["testSetting"]);
-	}
-	else if (s is AppSettingsSection) {
-		AppSettingsSection sect = (AppSettingsSection)s;
-		value = String.Format ("{0} (section type = AppSettingsSection)", sect.Settings["testSetting"].Value);
-	}
-	lbl3.Text = value;
-
-	s = WebConfigurationManager.GetSection ("appSettings", "/toshok/configuration/twolevel");
-	if (s is NameValueCollection) {
-		NameValueCollection col = (NameValueCollection)s;
-		value = String.Format ("{0} (section type = NameValueCollection)", col["testSetting"]);
-	}
-	else if (s is AppSettingsSection) {
-		AppSettingsSection sect = (AppSettingsSection)s;
-		value = String.Format ("{0} (section type = AppSettingsSection)", sect.Settings["testSetting"].Value);
-	}
-	lbl4.Text = value;
-}
-
-</script>
-
-<table>
-<tr><td>WebConfigurationManager.OpenWebConfiguration <td><asp:Label id="lbl" runat="server" /></tr>
-<tr><td>WebConfigurationManager.AppSettings <td><asp:Label id="lbl2" runat="server" /> </tr>
-<tr><td>WebConfigurationManager.GetSection(string) <td><asp:Label id="lbl3" runat="server" /> </tr>
-<tr><td>WebConfigurationManager.GetSection(string,string) <td><asp:Label id="lbl4" runat="server" /> </tr>
-</table>
-
diff --git a/mcs/class/System.Web/Test/standalone/configuration/twolevel/subdir/web.config b/mcs/class/System.Web/Test/standalone/configuration/twolevel/subdir/web.config
deleted file mode 100644
index 69f442d461e..00000000000
--- a/mcs/class/System.Web/Test/standalone/configuration/twolevel/subdir/web.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<configuration>
-<appSettings>
-  <clear />
-  <add key="testSetting" value="hey!" />
-</appSettings>
-</configuration>
diff --git a/mcs/class/System.Web/Test/standalone/configuration/twolevel/web.config b/mcs/class/System.Web/Test/standalone/configuration/twolevel/web.config
deleted file mode 100644
index 71fc18a2594..00000000000
--- a/mcs/class/System.Web/Test/standalone/configuration/twolevel/web.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration>
-<appSettings>
-  <add key="testSetting" value="hi" />
-</appSettings>
-</configuration>
diff --git a/mcs/class/System.Web/Test/standalone/dropdownlist/ddl-databind-append.aspx b/mcs/class/System.Web/Test/standalone/dropdownlist/ddl-databind-append.aspx
deleted file mode 100644
index 8c604708fd6..00000000000
--- a/mcs/class/System.Web/Test/standalone/dropdownlist/ddl-databind-append.aspx
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- Inspired by bug #42246 -->
-
-<%@ Page Language="C#" %>
-<%@ Import Namespace="System" %>
-<%@ Import Namespace="System.Data" %>
-
-<script runat="server">
-	void Page_Load (object s, EventArgs e)
-	{
-		if (IsPostBack) {
-			txt.Text = ddl.SelectedItem.Value;
-			return;
-		}
-		
-		DataTable t = new DataTable ("t");
-		
-		t.Columns.Add (new DataColumn ("Symbol", typeof (string)));
-		t.Columns.Add (new DataColumn ("Company", typeof (string)));
-		t.Columns.Add (new DataColumn ("Price", typeof (double)));
-
-		DataSet ds = new DataSet ("ds");
-
-		ds.Tables.Add (t);
-		AddStock (t, "MSFT", "Microsoft Corp.", 25.81);
-		AddStock (t, "NOVL", "Novell Inc.", 6.17);
-		AddStock (t, "GOOG", "Google", 300.95);
-
-		ddl.DataSource = ds;
-		ddl.DataTextField = "Company";
-		ddl.DataBind ();		
-	}
-
-	void AddStock (DataTable dt, string symbol, string co, double price)
-	{
-		DataRow dr = dt.NewRow ();
-		dr [0] = symbol;
-		dr [1] = co;
-		dr [2] = price;
-		dt.Rows.Add (dr);
-	}
-</script>
-
-<html>
-<body>
-<form runat="server">
-
-<asp:dropdownlist appenddatabounditems="true" id="ddl" runat="server">
-    <asp:ListItem Text="(Select a Ticker)" Value="" />   
-</asp:dropdownlist>
-
-<asp:button id="lookup" Text="Lookup Ticker" runat="server" />
-
-<asp:requiredfieldvalidator ControlToValidate="ddl" ErrorMessage="Please select a ticker" runat="server" />
-
-<asp:label id="txt" runat="server" />
-</form>
-</body>
-</html>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/75402/content.aspx b/mcs/class/System.Web/Test/standalone/masterpages/75402/content.aspx
deleted file mode 100644
index cf867be27f1..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/75402/content.aspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="True" MasterPageFile="~/dico.master" %>
-<script language="C#" runat="server">
-</script>
-<html>
-<head />
-<body>
-   <form runat="server">
-   </form>
-</body>
-</html>
-
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/75402/dico.master b/mcs/class/System.Web/Test/standalone/masterpages/75402/dico.master
deleted file mode 100644
index e8ba00b098f..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/75402/dico.master
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ master Language="C#" masterpagefile="~/suivicom.master" %>
-<script>
-
-</script>
-<html>
-<body>
-<ASP:ContentPlaceHolder id="DicoTitre">Titre du dictionnaire</ASP:ContentPlaceHolder>
-</body>
-</html>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/75402/suivicom.master b/mcs/class/System.Web/Test/standalone/masterpages/75402/suivicom.master
deleted file mode 100644
index eaec7e7804c..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/75402/suivicom.master
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@ Master Language="C#" %>
-<script runat="server">
-<html>
-<head />
-<body>
-<form runat="server">
-    <asp:contentplaceholder id="body" runat="server"></asp:contentplaceholder>
-</form>
-</body>
-</html>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/77278/TestConfig.aspx b/mcs/class/System.Web/Test/standalone/masterpages/77278/TestConfig.aspx
deleted file mode 100644
index 09649bfa55d..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/77278/TestConfig.aspx
+++ /dev/null
@@ -1,59 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="simple.master" %>

-

-<script runat="server">

-

-

-override protected void OnPreInit(EventArgs e)

-{

-

-    //this is another bug if you uncomment this

-    //it works as expected on windows but

-    //causes a null reference in the page load event on mono

-    

-    base.OnPreInit(e);

-    this.MasterPageFile = "simple2.master";

-}

-

-override protected void OnInit(EventArgs e)

-{

-

-    base.OnInit(e);

-}

-

-

-private void Page_PreInit (object sender, EventArgs e)

-{

-	this.MasterPageFile = "simple2.master";

-}

-

-

-private void Page_Load (object sender, EventArgs e)

-{

-	lblHelloWeb.Text = "Hello Web!";

-	

-	//TestKey

-

-}

-

-private void btnTestConfig_Click (object sender, EventArgs e)

-{

-	//this displays the value on windows but not on mono  r55575

-	this.lblTestConfig.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("TestKey");

-	

-	

-

-}

-

-

-</script>

-

-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="server">

-

-Contents go here

-<hr />

-<asp:Label id="lblHelloWeb" runat="server" />

-<hr />

-<asp:Button id="btnTestConfig" runat="server" OnClick="btnTestConfig_Click" Text="Test Config"  />

-<asp:Label id="lblTestConfig" runat="server" />

-

-</asp:Content>

diff --git a/mcs/class/System.Web/Test/standalone/masterpages/77278/Web.Config b/mcs/class/System.Web/Test/standalone/masterpages/77278/Web.Config
deleted file mode 100644
index fa90d1a314a..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/77278/Web.Config
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>

-<!-- 

-    Note: As an alternative to hand editing this file you can use the 

-    web admin tool to configure settings for your application. Use

-    the Website->Asp.Net Configuration option in Visual Studio.

-    A full list of settings and comments can be found in 

-    machine.config.comments usually located in 

-    \Windows\Microsoft.Net\Framework\v2.x\Config 

--->

-<configuration>

-	<appSettings>

-	

-	<add key="TestKey" value="this is coming from the web.config" />

-	

-	</appSettings>

-	<connectionStrings/>

-	

-	<system.web>

-		<!-- 

-            Set compilation debug="true" to insert debugging 

-            symbols into the compiled page. Because this 

-            affects performance, set this value to true only 

-            during development.

-        -->

-		<compilation debug="true"/>

-		<!--

-            The <authentication> section enables configuration 

-            of the security authentication mode used by 

-            ASP.NET to identify an incoming user. 

-        -->

-		<authentication mode="Windows"/>

-		<!--

-            The <customErrors> section enables configuration 

-            of what to do if/when an unhandled error occurs 

-            during the execution of a request. Specifically, 

-            it enables developers to configure html error pages 

-            to be displayed in place of a error stack trace.

-

-        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

-            <error statusCode="403" redirect="NoAccess.htm" />

-            <error statusCode="404" redirect="FileNotFound.htm" />

-        </customErrors>

-        -->

-	</system.web>

-</configuration>

diff --git a/mcs/class/System.Web/Test/standalone/masterpages/77278/simple.master b/mcs/class/System.Web/Test/standalone/masterpages/77278/simple.master
deleted file mode 100644
index 0d0843bd802..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/77278/simple.master
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ Master Language="C#"%>

-

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

-

-<html xmlns="http://www.w3.org/1999/xhtml" >

-<head runat="server">

-    <title>Simple Master Page</title>

-</head>

-<body>

-    <form id="form1" runat="server">

-    <div>

-		What's inside the following box is a placeholder:

-		<div style='border:solid 2px red; padding:10px'>

-        <asp:contentplaceholder id="ContentPlaceHolder1" runat="server"></asp:contentplaceholder>

-		</div>

-		That's all!

-    </form>

-</body>

-</html>

diff --git a/mcs/class/System.Web/Test/standalone/masterpages/77278/simple2.master b/mcs/class/System.Web/Test/standalone/masterpages/77278/simple2.master
deleted file mode 100644
index 48201c1facb..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/77278/simple2.master
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ Master Language="C#"%>

-

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

-

-<html xmlns="http://www.w3.org/1999/xhtml" >

-<head runat="server">

-    <title>Simple Master Page</title>

-</head>

-<body>

-    <form id="form1" runat="server">

-    <h3>Simple2</h3>

-    <div>

-		What's inside the following box is a placeholder:

-		<div style='border:solid 2px red; padding:10px'>

-        <asp:contentplaceholder id="ContentPlaceHolder1" runat="server"></asp:contentplaceholder>

-		</div>

-		That's all!

-    </form>

-</body>

-</html>

diff --git a/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/otc.master b/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/otc.master
deleted file mode 100644
index 4939b3b2838..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/otc.master
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ Master Language="C#" %>
- 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-            "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-  <title>Untitled Page</title>
-  <link href="~/StyleSheet.css" rel="Stylesheet" type="text/css" />
-</head>
- 
-<body>
-  <form id="form1" runat="server">
-    <div>
-      <div id="main">
-        <asp:ContentPlaceHolder ID="mainContent" runat="server" />
-      </div>
-      <div id="right">
-        <asp:ContentPlaceHolder ID="sideContent" runat="server" />
-      </div>
-      <div id="footer">
-        <asp:Literal ID="Footer" runat="server" Text="OdeToCode.com" />
-      </div>
-    </div>
-  </form>
-</body>
-</html>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/otcchild.master b/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/otcchild.master
deleted file mode 100644
index 52b620aa611..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/otcchild.master
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Master Language="C#" MasterPageFile="otc.master" %>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="mainContent" runat="Server">
-  <div>
-    <asp:ContentPlaceHolder ID="mainContent" runat="server" />
-  </div>
-  <div>
-    <asp:ContentPlaceHolder ID="main2" runat="server" />
-  </div>
-</asp:Content>
-
-<asp:Content ID="Content2" ContentPlaceHolderID="sideContent" runat="Server">
-  <asp:ContentPlaceHolder ID="side1" runat="server" />
-</asp:Content>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/page.aspx b/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/page.aspx
deleted file mode 100644
index 676c21d5c99..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/conflicting-nested/page.aspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="otcchild.master" AutoEventWireup="false" %>
-
-<asp:Content ID="mainContent" ContentPlaceHolderID="mainContent" Runat="Server">
-  <h4>Content1</h4>
-</asp:Content>
-
-<asp:Content ID="main2" ContentPlaceHolderID="main2" Runat="Server">
-  <h4>Content2</h4>
-</asp:Content>
-
-<asp:Content ID="side1" ContentPlaceHolderID="side1" Runat="Server">
-  <h4>Content3</h4>
-</asp:Content>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/otc/otc.master b/mcs/class/System.Web/Test/standalone/masterpages/otc/otc.master
deleted file mode 100644
index 4939b3b2838..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/otc/otc.master
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ Master Language="C#" %>
- 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-            "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-  <title>Untitled Page</title>
-  <link href="~/StyleSheet.css" rel="Stylesheet" type="text/css" />
-</head>
- 
-<body>
-  <form id="form1" runat="server">
-    <div>
-      <div id="main">
-        <asp:ContentPlaceHolder ID="mainContent" runat="server" />
-      </div>
-      <div id="right">
-        <asp:ContentPlaceHolder ID="sideContent" runat="server" />
-      </div>
-      <div id="footer">
-        <asp:Literal ID="Footer" runat="server" Text="OdeToCode.com" />
-      </div>
-    </div>
-  </form>
-</body>
-</html>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/otc/otcchild.master b/mcs/class/System.Web/Test/standalone/masterpages/otc/otcchild.master
deleted file mode 100644
index c5ed904bed1..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/otc/otcchild.master
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Master Language="C#" MasterPageFile="otc.master" %>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="mainContent" runat="Server">
-  <div>
-    <asp:ContentPlaceHolder ID="main1" runat="server" />
-  </div>
-  <div>
-    <asp:ContentPlaceHolder ID="main2" runat="server" />
-  </div>
-</asp:Content>
-
-<asp:Content ID="Content2" ContentPlaceHolderID="sideContent" runat="Server">
-  <asp:ContentPlaceHolder ID="side1" runat="server" />
-</asp:Content>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/otc/page.aspx b/mcs/class/System.Web/Test/standalone/masterpages/otc/page.aspx
deleted file mode 100644
index 1780df8c9e5..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/otc/page.aspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="otcchild.master" AutoEventWireup="false" %>
-
-<asp:Content ID="main1" ContentPlaceHolderID="main1" Runat="Server">
-  <h4>Content1</h4>
-</asp:Content>
-
-<asp:Content ID="main2" ContentPlaceHolderID="main2" Runat="Server">
-  <h4>Content2</h4>
-</asp:Content>
-
-<asp:Content ID="side1" ContentPlaceHolderID="side1" Runat="Server">
-  <h4>Content3</h4>
-</asp:Content>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/title/master.master b/mcs/class/System.Web/Test/standalone/masterpages/title/master.master
deleted file mode 100644
index 74c291d2d38..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/title/master.master
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Master Language="C#" %>
-<head runat="server">
-<title>This is the Master Page's title</title>
-</head>
-<body>
-
-<asp:contentplaceholder ID="TitlePlaceholder" runat="server">
-<form runat="server">
-This is the master page's heading <br/>
-<asp:Button runat="server" id="foo" Text="Foo" />
-</form>
-</asp:contentplaceholder>
-
-</body>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/title/page.aspx b/mcs/class/System.Web/Test/standalone/masterpages/title/page.aspx
deleted file mode 100644
index 6d7b644fa20..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/title/page.aspx
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ Page Language="C#" Title="This is the Page's title" MasterPageFile="master.master" %>
-<asp:content ID="title" ContentPlaceholderID="TitlePlaceholder" runat="server">
-This is the Page's heading
-</asp:content>
diff --git a/mcs/class/System.Web/Test/standalone/masterpages/title/page2.aspx b/mcs/class/System.Web/Test/standalone/masterpages/title/page2.aspx
deleted file mode 100644
index bbd24bfb6bb..00000000000
--- a/mcs/class/System.Web/Test/standalone/masterpages/title/page2.aspx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Page Language="C#" Title="This is the Page's title" MasterPageFile="master.master" %>
diff --git a/mcs/class/System.Web/jar.resources b/mcs/class/System.Web/jar.resources
deleted file mode 100644
index fd256ba939d..00000000000
--- a/mcs/class/System.Web/jar.resources
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-	<add key="browscap.ini"			value="/browscap.ini" />
-	<add key="WebUIValidation.js"	value="/WebUIValidation.js" />
-</resources>
-
diff --git a/mcs/class/System.Web/resources/ChangeLog b/mcs/class/System.Web/resources/ChangeLog
index d769d3b1439..72966261ff0 100644
--- a/mcs/class/System.Web/resources/ChangeLog
+++ b/mcs/class/System.Web/resources/ChangeLog
@@ -1,10 +1,3 @@
-2006-01-15  Robert Jordan  <robertj@gmx.net>
-
-	* WebUIValidation.js (CustomValidatorEvaluateIsValid):
-	  Allow empty/missing ControlToValidate attributes.
-	* WebUIValidation.js (ValidatorSucceeded):
-  	  Hide validator's view. Fixes bug #77261.
-
 2005-10-18  Chris Toshok  <toshok@ximian.com>
 
 	* WebUIValidation.js: fix handling for validation_result so that
diff --git a/mcs/class/System.Web/resources/WebUIValidation.js b/mcs/class/System.Web/resources/WebUIValidation.js
index 30cc0b83f61..a3957d5a31b 100644
--- a/mcs/class/System.Web/resources/WebUIValidation.js
+++ b/mcs/class/System.Web/resources/WebUIValidation.js
@@ -308,12 +308,6 @@ function CustomValidatorEvaluateIsValid (validator)
 {
 	var InitialValue = validator.getAttribute ("initialvalue");
 	var ControlToValidate = validator.getAttribute ("controltovalidate");
-
-	if (!ControlToValidate) {
-		ValidatorSucceeded (validator);
-		return true;
-	}
-
 	var evaluationfunc = validator.getAttribute ("clientvalidationfunction");
 
 	var ctrl_value = ValidatorTrim (ValidatorGetValue (ControlToValidate));
@@ -395,7 +389,7 @@ function ValidatorSucceeded (v)
 {
 	v.innerHTML = "";
 
-	ValidatorUpdateDisplay (v, true);
+	ValidatorUpdateDisplay (v, false);
 }
 
 function GetElement(id)
diff --git a/mcs/class/System.XML/ChangeLog b/mcs/class/System.XML/ChangeLog
index bc40014505f..0f63644a417 100644
--- a/mcs/class/System.XML/ChangeLog
+++ b/mcs/class/System.XML/ChangeLog
@@ -1,26 +1,3 @@
-2006-02-20  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* System.Xml.dll.sources : removed XmlTextWriterOpenElement.cs and 
-	  XmlTextWriter.cs. Added XmlTextWriter2.cs, to be renamed to
-	  XmlTextWriter.cs in a few days or weeks.
-
-2006-02-17  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* System.Xml.dll.sources : removed DTDValidatingReader and added
-	  DTDValidatingReader2.cs and EntityResolvingXmlReader.cs.
-
-2006-02-16  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* System.Xml.dll.sources : added IHasXmlChildNode.cs.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* System.Xml_test.dll.Sources: Added XmlSerializationReaderTests.cs.
-
-2006-01-27  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* System.Xml.dll.sources : added XmlIteratorNodeList.cs.
-
 2006-01-10  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* System.Xml_test.dll.sources : added XmlSchemaTypeTests.cs.
diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
index c36b4efe2a5..270f7f81d96 100644
--- a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
@@ -1,11 +1,3 @@
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XsdValidatingReader.cs : when DTD did not appear in 
-	  DTDValidatingReader, it almost makes no sense to use it, so just
-	  use its internal EntityResolvingXmlReader (it is required to
-	  detect "undeclared entity in use" well-formedness violation).
-	  It could double processing speed (or more).
-
 2006-01-13  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XsdValidatingReader.cs : whitespace nodes should be allowed inside
diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
index c36d86f2008..a84f88c3602 100644
--- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
@@ -1541,39 +1541,30 @@ namespace Mono.Xml.Schema
 			currentDefaultAttribute = -1;
 			defaultAttributeConsumed = false;
 			currentAttrType = null;
+#region ID Constraints
+			if (this.checkIdentity)
+				idManager.OnStartElement ();
+#endregion
 			defaultAttributes = emptyAttributeArray;
 
 			bool result = reader.Read ();
+#region ID Constraints
+			// 3.3.4 ElementLocallyValidElement 7 = Root Valid.
+			if (!result && this.checkIdentity &&
+				idManager.HasMissingIDReferences ())
+				HandleError ("There are missing ID references: " + idManager.GetMissingIDString ());
+#endregion
 
 			// FIXME: schemaLocation could be specified 
 			// at any Depth.
 			if (reader.Depth == 0 &&
-				reader.NodeType == XmlNodeType.Element) {
-				// If the reader is DTDValidatingReader (it
-				// is the default behavior of 
-				// XmlValidatingReader) and DTD didn't appear,
-				// we could just use its source XmlReader.
-				DTDValidatingReader dtdr = reader as DTDValidatingReader;
-				if (dtdr != null && dtdr.DTD == null)
-					reader = dtdr.Source;
-
+				reader.NodeType == XmlNodeType.Element)
 				ExamineAdditionalSchema ();
-			}
 			if (schemas.Count == 0)
 				return result;
 			if (!schemas.IsCompiled)
 				schemas.Compile ();
 
-#region ID Constraints
-			if (this.checkIdentity)
-				idManager.OnStartElement ();
-
-			// 3.3.4 ElementLocallyValidElement 7 = Root Valid.
-			if (!result && this.checkIdentity &&
-				idManager.HasMissingIDReferences ())
-				HandleError ("There are missing ID references: " + idManager.GetMissingIDString ());
-#endregion
-
 			switch (reader.NodeType) {
 			case XmlNodeType.Element:
 #region Key Constraints
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
index 8f2c5677555..2e038e25d5a 100644
--- a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
@@ -1,14 +1,3 @@
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTMXPathNavigator2.cs : removed valueBuilder field (create 
-	  StringBuilder dynamically).
-
-2006-02-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTMXPathDocument2.cs, DTMXPathNavigator2.cs :
-	  Do not store mutable XPathDocument fields in every navigators.
-	  It saves memory a lot.
-
 2005-12-14  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XPathNavigatorReader.cs : oh, so it used to compile under 1.x.
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs
index 4bcc077c8f4..43fa3d80759 100644
--- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs
@@ -50,15 +50,14 @@ namespace Mono.Xml.XPath
 			string [] nonAtomicStringPool,
 			Hashtable idTable)
 		{
-			this.Nodes = nodes;
-			this.Attributes = attributes;
-			this.Namespaces = namespaces;
-			this.AtomicStringPool = atomicStringPool;
-			this.NonAtomicStringPool = nonAtomicStringPool;
-			this.IdTable = idTable;
-			this.NameTable = nameTable;
-
-			root = new DTMXPathNavigator2 (this);
+			root = new DTMXPathNavigator2 (this,
+				nameTable,
+				nodes,
+				attributes,
+				namespaces,
+				atomicStringPool,
+				nonAtomicStringPool,
+				idTable);
 		}
 
 		public XPathNavigator CreateNavigator ()
@@ -66,20 +65,7 @@ namespace Mono.Xml.XPath
 			return root.Clone ();
 		}
 
-		readonly XPathNavigator root;
-
-		internal readonly XmlNameTable NameTable;
-
-		internal readonly DTMXPathLinkedNode2 [] Nodes;
-		internal readonly DTMXPathAttributeNode2 [] Attributes;
-		internal readonly DTMXPathNamespaceNode2 [] Namespaces;
-
-		// String pool
-		internal readonly string [] AtomicStringPool;
-		internal readonly string [] NonAtomicStringPool;
-
-		// ID table
-		internal readonly Hashtable IdTable;
+		XPathNavigator root;
 	}
 }
 
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNavigator2.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNavigator2.cs
index 1981ed85a48..6280e3d1bba 100644
--- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNavigator2.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathNavigator2.cs
@@ -44,16 +44,33 @@ namespace Mono.Xml.XPath
 		class DTMXPathNavigator2 : XPathNavigator, IXmlLineInfo
 	{
 
-		public DTMXPathNavigator2 (DTMXPathDocument2 document)
+		public DTMXPathNavigator2 (DTMXPathDocument2 document,
+			XmlNameTable nameTable,
+			DTMXPathLinkedNode2 [] nodes,
+			DTMXPathAttributeNode2 [] attributes,
+			DTMXPathNamespaceNode2 [] namespaces,
+			string [] atomicStringPool,
+			string [] nonAtomicStringPool,
+			Hashtable idTable)
 		{
+			this.nodes = nodes;
+			this.attributes = attributes;
+			this.namespaces = namespaces;
+			this.atomicStringPool = atomicStringPool;
+			this.nonAtomicStringPool = nonAtomicStringPool;
+			this.idTable = idTable;
+			this.nameTable = nameTable;
 			this.MoveToRoot ();
 			this.document = document;
 		}
 
 		// Copy constructor including position informations.
 		public DTMXPathNavigator2 (DTMXPathNavigator2 org)
+			: this (org.document, org.nameTable,
+			org.nodes, org.attributes, org.namespaces,
+			org.atomicStringPool, org.nonAtomicStringPool,
+			org.idTable)
 		{
-			document = org.document;
 			currentIsNode = org.currentIsNode;
 			currentIsAttr = org.currentIsAttr;
 
@@ -62,33 +79,21 @@ namespace Mono.Xml.XPath
 			currentNs = org.currentNs;
 		}
 
-		XmlNameTable nameTable {
-			get { return document.NameTable; }
-		}
+		XmlNameTable nameTable;
 
 		// Created XPathDocument. This is used to identify the origin of the navigator.
 		DTMXPathDocument2 document;
 
-		DTMXPathLinkedNode2 [] nodes {
-			get { return document.Nodes; }
-		}
-		DTMXPathAttributeNode2 [] attributes {
-			get { return document.Attributes; }
-		}
-		DTMXPathNamespaceNode2 [] namespaces {
-			get { return document.Namespaces; }
-		}
-		string [] atomicStringPool {
-			get { return document.AtomicStringPool; }
-		}
-		string [] nonAtomicStringPool {
-			get { return document.NonAtomicStringPool; }
-		}
+		DTMXPathLinkedNode2 [] nodes;// = new DTMXPathLinkedNode [0];
+		DTMXPathAttributeNode2 [] attributes;// = new DTMXPathAttributeNode [0];
+		DTMXPathNamespaceNode2 [] namespaces;// = new DTMXPathNamespaceNode [0];
+
+		// String pool
+		string [] atomicStringPool;
+		string [] nonAtomicStringPool;
 
 		// ID table
-		Hashtable idTable {
-			get { return document.IdTable; }
-		}
+		Hashtable idTable;
 
 		bool currentIsNode;
 		bool currentIsAttr;
@@ -97,6 +102,17 @@ namespace Mono.Xml.XPath
 		int currentAttr;
 		int currentNs;
 
+		StringBuilder valueBuilder;
+
+#region Ctor
+
+		internal DTMXPathNavigator2 (XmlNameTable nt)
+		{
+			this.nameTable = nt;
+		}
+
+#endregion
+
 #region Properties
 
 		public override string BaseURI {
@@ -217,36 +233,34 @@ namespace Mono.Xml.XPath
 				if (iter == 0)
 					return String.Empty;
 
-				StringBuilder builder = null;
-				BuildValue (iter, ref builder);
-				return builder == null ? String.Empty : builder.ToString ();
-			}
-		}
-
-		void BuildValue (int iter, ref StringBuilder valueBuilder)
-		{
-			int end = nodes [currentNode].NextSibling;
-			if (end == 0) {
-				int tmp = currentNode;
-				do {
-					tmp = nodes [tmp].Parent;
-					end = nodes [tmp].NextSibling;
-				} while (end == 0 && tmp != 0);
-				if (end == 0)
-					end = nodes.Length;
-			}
+				if (valueBuilder == null)
+					valueBuilder = new StringBuilder ();
+				else
+					valueBuilder.Length = 0;
+
+				int end = nodes [currentNode].NextSibling;
+				if (end == 0) {
+					int tmp = currentNode;
+					do {
+						tmp = nodes [tmp].Parent;
+						end = nodes [tmp].NextSibling;
+					} while (end == 0 && tmp != 0);
+					if (end == 0)
+						end = nodes.Length;
+				}
 
-			while (iter < end) {
-				switch (nodes [iter].NodeType) {
-				case XPathNodeType.Text:
-				case XPathNodeType.SignificantWhitespace:
-				case XPathNodeType.Whitespace:
-					if (valueBuilder == null)
-						valueBuilder = new StringBuilder ();
-					valueBuilder.Append (nonAtomicStringPool [nodes [iter].Value]);
-					break;
+				while (iter < end) {
+					switch (nodes [iter].NodeType) {
+					case XPathNodeType.Text:
+					case XPathNodeType.SignificantWhitespace:
+					case XPathNodeType.Whitespace:
+						valueBuilder.Append (nonAtomicStringPool [nodes [iter].Value]);
+						break;
+					}
+					iter++;
 				}
-				iter++;
+				
+				return valueBuilder.ToString ();
 			}
 		}
 
diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
index 8d692eb8ffd..43a70da5559 100644
--- a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
@@ -1,9 +1,3 @@
-2006-02-22  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ScriptCompilerInfo.cs : mbas unlike vbc references System.dll
-	  etc. by default, so don't add them as references.
-	  Set only local file name for #ExternalSource. Fixed bug #75789.
-
 2006-01-13  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* GenericOutputter.cs : When writing string, use WriteWhitespace()
diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs b/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs
index 9458290a5a0..025550ea22c 100644
--- a/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/ScriptCompilerInfo.cs
@@ -190,11 +190,10 @@ public class Script{1}
 		public VBCompilerInfo ()
 		{
 			this.CompilerCommand = "mbas";
-			this.DefaultCompilerOptions = "/t:library";
 #if MS_NET
 			this.CompilerCommand = "vbc.exe";
-			this.DefaultCompilerOptions = "/t:library  /r:System.dll /r:System.Xml.dll /r:Microsoft.VisualBasic.dll";
 #endif
+			this.DefaultCompilerOptions = "/t:library  /r:System.dll /r:System.XML.dll /r:Microsoft.VisualBasic.dll";
 		}
 
 		public override CodeDomProvider CodeDomProvider {
@@ -233,7 +232,7 @@ end namespace
 				return source;
 			return String.Format (CultureInfo.InvariantCulture,
 				"#ExternalSource (\"{1}\", {0})\n{2}\n#end ExternalSource",
-				li.LineNumber, new FileInfo (file).Name, source);
+				li.LineNumber, file.Replace ("\\", "\\\\").Replace ("\"", "\\\""), source);
 		}
 	}
 
diff --git a/mcs/class/System.XML/System.Xml.Schema/BuiltInDatatype.cs b/mcs/class/System.XML/System.Xml.Schema/BuiltInDatatype.cs
index 7f27047ddc9..419b45b30f7 100644
--- a/mcs/class/System.XML/System.Xml.Schema/BuiltInDatatype.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/BuiltInDatatype.cs
@@ -1631,30 +1631,10 @@ namespace Mono.Xml.Schema
 	{

 		public string value;

 

-		static bool HasValidScheme (string src)

-		{

-			int idx = src.IndexOf (':');

-			if (idx < 0)

-				return false;

-			for (int i = 0; i < idx; i++) {

-				switch (src [i]) {

-				case '+':

-				case '-':

-				case '.':

-					continue;

-				default:

-					if (Char.IsLetterOrDigit (src [i]))

-						continue;

-					return false;

-				}

-			}

-			return true;

-		}

-

-		// MS BUG: Some strings that contain ':' might result in 

-		// exception (MS.NET looks implemented as such).

+		// LAMESPEC: In this way, some strings that contain ':' might

+		// result in exception (MS.NET looks implemented as such).

 		public XmlSchemaUri (string src)

-			: this (src, HasValidScheme (src))

+			: this (src, src.IndexOf (':') > 0)

 		{

 		}

 

diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog
index 8b742ced204..9a53330afbe 100644
--- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog
@@ -1,18 +1,3 @@
-2006-02-28  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSchema.cs: Do not define namespace for zero-length TargetNamespace
-	and report XmlSchemaException when compiling XmlSchema with
-	zero-length TargetNamespace.
-
-2006-02-01  Atsushi Enomoto <atsushi@ximian.com>
-
-	* BuiltInDatatype.cs : anyURI could be such relative path that
-	  contains ':' in the middle. It also affects on relaxng validation.
-
-2006-01-25  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlSchemaValidationException.cs : fixed .ctor() signatures.
-
 2006-01-11  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XmlSchemaAttribute.cs, XmlSchemaElement.cs : AttributeSchemaType
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
index 10fdeedadc2..c415f13c6f8 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
@@ -337,9 +337,6 @@ namespace System.Xml.Schema
 
 			//4. targetNamespace should be of type anyURI or absent
 			if (TargetNamespace != null) {
-				if (TargetNamespace.Length == 0)
-					error (handler, "The targetNamespace attribute cannot have have empty string as its value.");
-
 				if(!XmlSchemaUtil.CheckAnyUri (TargetNamespace))
 					error(handler, TargetNamespace+" is not a valid value for targetNamespace attribute of schema");
 			}
@@ -908,7 +905,7 @@ namespace System.Xml.Schema
 				// Add the xml schema namespace. (It is done 
 				// only when no entry exists in Namespaces).
 				nss.Add ("xs", XmlSchema.Namespace);
-				if (TargetNamespace != null && TargetNamespace.Length != 0)
+				if (TargetNamespace != null)
 					nss.Add ("tns", TargetNamespace);
 			}
 
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs
index 66f65f0d9fa..25d41ae7e3a 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs
@@ -42,12 +42,12 @@ namespace System.Xml.Schema
 	{
 		object source_object;
 
-		public XmlSchemaValidationException ()
+		protected XmlSchemaValidationException ()
 			: base ()
 		{
 		}
 
-		public XmlSchemaValidationException (string message)
+		protected XmlSchemaValidationException (string message)
 			: base (message)
 		{
 		}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index 945fc9fad31..663274672ba 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,189 +1,3 @@
-2006-02-22  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* SerializationCodeGenerator.cs: Omit return statement in ReadObject
-	method if GenerateReadListElement returns null. Fixes bug #77588.
-
-2006-02-21  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* XmlSerializer.cs: Fix the previous fix.
-	
-2006-02-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* XmlSerializer.cs: Added option to avoid falling back to the
-	interpreted serializer if the code generator fails. To be used
-	in the test suite.
-
-2006-02-16  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* TypeData.cs: Fixed the following issues when dealing with Array
-	SchemaType:
-	- if a type implements IDictionary, throw a NotSupportedException
-	- if a type implements ICollection, then an Add method must exist
-	  which takes a single argument of a type to which the listitem type 
-	  is assignable (meaning a base type or an interface that it 
-	  implements). If such a method does not exist, then throw an
-	  InvalidOperationException.
-	- if a type implements IEnumerable, then the listitem type is 
-	  determined by the type of the Current property of the (IEnumerator)
-	  type returned by the GetEnumerator() method or the private 
-	  implementation of IEnumerable.GetEnumerator(). If there's no 
-          public Current property on the IEnumerator, then System.Object 
-	  is assumed as listitem type. Similar as for types implementing
-	  ICollection, an Add method must exist which takes a single argument 
-          of a type to which the listitem type is assignable (meaning a base
-	  type or an interface that it implements). If such a method does not
-          exist, then throw an InvalidOperationException.
-
-2006-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* XmlSchemaImporter.cs: Support importing complex types with
-	  simple content based on enums. Fixes bug #76848.
-
-2006-02-11  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* SoapAttributeAttribute.cs: Set eol-style to CRLF.
-	* SoapElementAttribute.cs: Same.
-	* SoapEnumAttribute.cs: Same.
-	* SoapIncludeAttribute.cs: Same.
-	* SoapSchemaMember.cs: Same.
-	* SoapTypeAttribute.cs: Same.
-	* XmlArrayAttribute.cs: Same.
-	* XmlAttributeAttribute.cs: Same.
-	* XmlChoiceIdentifierAttribute.cs: Same.
-	* XmlElementAttribute.cs: Same.
-	* XmlEnumAttribute.cs: Same.
-	* XmlRootAttribute.cs: Same.
-	* XmlSchemaImporter.cs: Same.
-	* XmlTextAttribute.cs: Same.
-	* XmlTypeAttribute.cs: Same.
-	* XmlTypeMapping.cs: Same.
-	* SoapAttributeOverrides.cs: Fixed line endings. Set eol-style to CRLF.
-	* CodeIdentifiers.cs: Same.
-	* SoapCodeExporter.cs: Same.
-	* SoapAttributes.cs: Same.
-	* SoapIgnoreAttribute.cs: Same.
-	* SoapSchemaImporter.cs: Same.
-	* TypeMember.cs: Same.
-	* UnreferencedObjectEventArgs.cs: Same.
-	* XmlAnyAttributeAttribute.cs: Same.
-	* XmlAnyElementAttributes.cs: Same.
-	* XmlArrayItemAttributes.cs: Same.
-	* XmlAttributeEventArgs.cs: Same.
-	* XmlCodeExporter.cs: Same.
-	* XmlElementAttributes.cs: Same.
-	* XmlElementEventArgs.cs: Same.
-	* XmlIgnoreAttribute.cs: Same.
-	* XmlNamespaceDeclarationsAttribute.cs: Same.
-	* XmlNodeEventArgs.cs: Same.
-	* XmlReflectionMember.cs: Same.
-	* XmlSchemas.cs: Same.
-	* XmlSerializerNamespaces.cs: Same.
-	* XmlTypeMapMemberElement.cs: Set eol-style to native.
-
-2006-02-10  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* CodeExporter.cs: Set eol-style to native.
-	* CodeGenerationOptions.cs: Same.
-	* CodeIdentifier.cs: Same.
-	* ImportContext.cs: Same.
-	* IXmlSerializable.cs: Same.
-	* IXmlSerializerImplementation.cs: Same.
-	* IXmlTextParser.cs: Same.
-	* MapCodeGenerator.cs: Same.
-	* ReflectionHelper.cs: Same. Fixed line endings.
-	* SchemaImporter.cs: Same.
-	* SchemaImporterExtensionCollection.cs: Same.
-	* SchemaImporterExtension.cs: Same.
-	* SchemaTypes.cs: Same.
-	* SerializationCodeGeneratorConfiguration.cs: Same.
-	* SerializationCodeGenerator.cs: Same.
-	* SerializationSource.cs: Same.
-	* SoapReflectionImporter.cs: Same.
-	* SoapSchemaExporter.cs: Same.
-	* TypeData.cs: Same.
-	* TypeTranslator.cs: Same.
-	* UnreferencedObjectEventHandler.cs: Same.
-	* XmlAnyElementAttribute.cs: Same.
-	* XmlArrayItemAttribute.cs: Same.
-	* XmlAttributeEventHandler.cs: Same.
-	* XmlAttributeOverrides.cs: Same.
-	* XmlAttributes.cs: Same.
-	* XmlDeserializationEvents.cs: Same.
-	* XmlElementEventHandler.cs: Same.
-	* XmlIncludeAttribute.cs: Same.
-	* XmlMapping.cs: Same.
-	* XmlMemberMapping.cs: Same.
-	* XmlMembersMapping.cs: Same.
-	* XmlNodeEventHandler.cs: Same.
-	* XmlReflectionImporter.cs: Same.
-	* XmlSchemaExporter.cs: Same.
-	* XmlSchemaProviderAttribute.cs: Same.
-	* XmlSerializationCollectionFixupCallback.cs: Same.
-	* XmlSerialiationFixupCallback.cs: Same.
-	* XmlSerializationGeneratedCode.cs: Same.
-	* XmlSerializationReadCallback.cs: Same.
-	* XmlSerializationReader.cs: Same.
-	* XmlSerializationReaderInterpreter.cs: Same.
-	* XmlSerializationWriteCallback.cs: Same.
-	* XmlSerializationWriterInterpreter.cs: Same.
-	* XmlSerializerAssemblyAttribute.cs: Same.
-	* XmlSerializer.cs: Same.
-	* XmlSerializerFactory.cs: Same.
-	* XmlSerializerVersionAttribute.cs: Same.
-	* XmlTypeMapElementInfo.cs: Same.
-	* XmlTypeMapMemberAttribute.cs: Same.
-	* XmlTypeMapMember.cs: Same.
-	* XmlTypeMapMemberNamespaces.cs: Same.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlTypeMapping.cs: Modified GetRealTypeMap to return current map
-	if map represents enum. Fixes bug #77501.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializationWriter.cs: Implemented 2.0 version of FromEnum, and
-	CreateInvalidEnumValueException. Set eol-style to native.
-	* XmlCustomerFormatter.cs: Added FromEnum overload that takes name of
-	enum for which string value must be created. Set eol-style to native.
-	Modified FromEnum to behave more like MSFT's implementation:
-	- treat value as bit field.
-	- no longer return empty string if the value matches an id for which there's no corresponding
-	name.
-	- if one of the ids has value 0 and there's a match for the enum value
-	(with a zero length XML name) or the enum value is 0, then return the 
-	corresponding XML for the id with value 0.
-	- in 2.0 profile, throw InvalidOperationException if no match is found
-	for (part of) the enum value.
-	Modifies ToEnum to match the MSFT implementation (as described in
-	.NET 2.0 SDK):
-	- Expect hashtable containing enum names as key, and corresponding
-	integral numbers as value.
-	- Do not report exception for whitespace-only value.
-	- Support space (MS docs are not clear about this) delimited list 
-	of names.
-	- typeName is only used to construct exception message.
-
-2006-02-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* System.Xml.Serialization/XmlTypeMapMemberElement.cs: When
-	looking for the correct element definition for a member,
-	based on the value type, take into account subypes of the
-	declared types. Fixes bug #77447.
-
-2006-02-07  Konstantin Triger <kostat@mainsoft.com>
-
-	* XmlReflectionImporter.cs: remove local name encoding for enums.
-
-2006-01-08  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSchemaImporter.cs: Fixed line endings (to CRLF).
-
-2006-01-07  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlTypeMapping.cs: Fixed line endings.
-	* TypeTranslator.cs: Fixed line endings.
-
 2005-12-07  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* XmlSerializationReaderInterpreter.cs: When deserializing a "flat"
diff --git a/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs b/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs
index 3355b10d397..394e7553a46 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs
@@ -6,27 +6,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System;

 using System.Collections;

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ReflectionHelper.cs b/mcs/class/System.XML/System.Xml.Serialization/ReflectionHelper.cs
index 0461aa75d9c..99e77494c1f 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/ReflectionHelper.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/ReflectionHelper.cs
@@ -4,7 +4,7 @@
 // Author:
 //   Lluis Sanchez Gual (lluis@ximian.com)
 //
-// Copyright (C) 2003 Ximian, Inc.
+// Copyright (C) 2003 Ximian, Inc.

 //
 
 //
@@ -30,14 +30,14 @@
 
 using System.Reflection;
 using System.Collections;
-
-namespace System.Xml.Serialization
-{
-	internal class ReflectionHelper
-	{
+

+namespace System.Xml.Serialization

+{

+	internal class ReflectionHelper

+	{

 		Hashtable _clrTypes = new Hashtable ();
 		Hashtable _schemaTypes = new Hashtable ();
-
+

 		public void RegisterSchemaType (XmlTypeMapping map, string xmlType, string ns)
 		{
 			string mapKey = xmlType + "/" + ns;
@@ -64,8 +64,8 @@ namespace System.Xml.Serialization
 			if (type == typeof(object)) ns = "";
 			string mapKey = type.FullName + "/" + ns;
 			return _clrTypes[mapKey] as XmlTypeMapping;
-		}	
-
+		}	

+

 		public Exception CreateError (XmlTypeMapping map, string message)
 		{
 			return new InvalidOperationException ("There was an error reflecting '" + map.TypeFullName + "': " + message);
@@ -115,5 +115,5 @@ namespace System.Xml.Serialization
 				
 			return res;
 		}
-	}
+	}

 }
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs b/mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs
index 19212279cf3..46a9f05ae73 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs
@@ -1395,9 +1395,7 @@ namespace System.Xml.Serialization
 			{
 				case SchemaTypes.Class: GenerateReadClassInstance (typeMap, isNullable, "checkType"); break;
 				case SchemaTypes.Array: 
-					string list = GenerateReadListElement (typeMap, null, isNullable, true);
-					if (list != null)
-						WriteLine ("return " + list + ";"); 
+					WriteLine ("return " + GenerateReadListElement (typeMap, null, isNullable, true) + ";"); 
 					break;
 				case SchemaTypes.XmlNode: GenerateReadXmlNodeElement (typeMap, isNullable); break;
 				case SchemaTypes.Primitive: GenerateReadPrimitiveElement (typeMap, isNullable); break;
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs
index 825ea4c7df8..8f937bf8ca9 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs
@@ -1,33 +1,33 @@
-//

-// SoapAttributeOverrides.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// SoapAttributeOverrides.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 using System.Collections;

 

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs
index 8366988c790..7a327b324cb 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs
@@ -1,33 +1,33 @@
-//

-// SoapAttributes.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// SoapAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Reflection;

 using System;

 using System.ComponentModel;

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
index 67ea1872c6b..2ba80aa4d99 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
@@ -7,27 +7,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.CodeDom;

 using System.CodeDom.Compiler;

@@ -205,4 +205,4 @@ namespace System.Xml.Serialization
 			AddCustomAttribute (codeField, "System.Xml.Serialization.SoapIgnore");

 		}

 	}

-}

+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs
index baaaafc3a7f..dc258376e68 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs
@@ -1,33 +1,33 @@
-//

-// SoapIgnoreAttribute.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// SoapIgnoreAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 

 namespace System.Xml.Serialization

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs
index 8d9d917860b..56279b31fe0 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs
@@ -7,27 +7,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.Xml;

 using System.CodeDom.Compiler;

@@ -115,4 +115,4 @@ namespace System.Xml.Serialization
 

 		#endregion // Methods

 	}

-}

+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/TypeData.cs b/mcs/class/System.XML/System.Xml.Serialization/TypeData.cs
index 4bffcecc981..e18b634a099 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/TypeData.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/TypeData.cs
@@ -31,7 +31,6 @@
 
 using System;
 using System.Collections;
-using System.Globalization;
 using System.Reflection;
 using System.Xml.Schema;
 
@@ -185,42 +184,23 @@ namespace System.Xml.Serialization
 					listItemType = type.GetElementType ();
 				else if (typeof(ICollection).IsAssignableFrom (type))
 				{
-					if (typeof (IDictionary).IsAssignableFrom (type))
-						throw new NotSupportedException (string.Format (CultureInfo.InvariantCulture,
-							"The type {0} is not supported because it implements" +
-							" IDictionary.", type.FullName));
-
 					PropertyInfo prop = GetIndexerProperty (type);
 					if (prop == null) 
 						throw new InvalidOperationException ("You must implement a default accessor on " + type.FullName + " because it inherits from ICollection");
-
-					listItemType = prop.PropertyType;
-
-					MethodInfo addMethod = type.GetMethod ("Add", new Type[] { listItemType });
-					if (addMethod == null)
-						throw CreateMissingAddMethodException (type, "ICollection",
-							listItemType);
+						
+					return prop.PropertyType;
 				}
-				else // at this point, we must be dealing with IEnumerable implementation
+				else
 				{
-					MethodInfo met = type.GetMethod ("GetEnumerator", Type.EmptyTypes);
-					if (met == null) { 
-						// get private implemenation
-						met = type.GetMethod ("System.Collections.IEnumerable.GetEnumerator",
-							BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance,
-							null, Type.EmptyTypes, null);
-					}
-					// determine ListItemType using IEnumerator.Current property
-					PropertyInfo prop = met.ReturnType.GetProperty ("Current");
-					if (prop == null)
-						listItemType = typeof (object);
-					else
-						listItemType = prop.PropertyType;
+					MethodInfo met = type.GetMethod ("Add");
+					if (met == null)
+						throw new InvalidOperationException ("The collection " + type.FullName + " must implement an Add method");
 
-					MethodInfo addMethod = type.GetMethod ("Add", new Type[] { listItemType });
-					if (addMethod == null)
-						throw CreateMissingAddMethodException (type, "IEnumerable",
-							listItemType);
+					ParameterInfo[] pars = met.GetParameters();
+					if (pars.Length != 1)
+						throw new InvalidOperationException ("The Add method of the collection " + type.FullName + " must have only one parameter");
+					
+					return pars[0].ParameterType;
 				}
 
 				return listItemType;
@@ -275,13 +255,5 @@ namespace System.Xml.Serialization
 			}
 			return null;
 		}
-
-		private static InvalidOperationException CreateMissingAddMethodException (Type type, string inheritFrom, Type argumentType) {
-			return new InvalidOperationException (string.Format(CultureInfo.InvariantCulture,
-				"To be XML serializable, types which inherit from {0} must have " +
-				"an implementation of Add({1}) at all levels of their inheritance " +
-				"hierarchy. {2} does not implement Add({1}).", inheritFrom, 
-				argumentType.FullName, type.FullName));
-		}
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs b/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs
index 4c46c2b5798..065592cc4bc 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs
@@ -1,24 +1,24 @@
-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 using System;

 using System.Collections;

 

diff --git a/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs b/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
index 9bad3e92c72..58b2b29c1da 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs
@@ -44,25 +44,25 @@ namespace System.Xml.Serialization
 		static Hashtable primitiveTypes;
 		static Hashtable primitiveArrayTypes;
 
-#if TARGET_JVM
-		const string AppDomainCacheName = "System.Xml.Serialization.TypeTranslator.AppDomainCache";
-		static Hashtable AppDomainCache {
-			get {
-				Hashtable res = (Hashtable)AppDomain.CurrentDomain.GetData(AppDomainCacheName);
-
-				if(res == null) {
-					lock(AppDomainCacheName) {
-						res = (Hashtable)AppDomain.CurrentDomain.GetData(AppDomainCacheName);
-						if (res == null) {
-							res = new Hashtable();
-							AppDomain.CurrentDomain.SetData(AppDomainCacheName, res);
-						}
-					}
-				}
-
-				return res;
-			}
-		}
+#if TARGET_JVM

+		const string AppDomainCacheName = "System.Xml.Serialization.TypeTranslator.AppDomainCache";

+		static Hashtable AppDomainCache {

+			get {

+				Hashtable res = (Hashtable)AppDomain.CurrentDomain.GetData(AppDomainCacheName);

+

+				if(res == null) {

+					lock(AppDomainCacheName) {

+						res = (Hashtable)AppDomain.CurrentDomain.GetData(AppDomainCacheName);

+						if (res == null) {

+							res = new Hashtable();

+							AppDomain.CurrentDomain.SetData(AppDomainCacheName, res);

+						}

+					}

+				}

+

+				return res;

+			}

+		}

 #endif
 
 		static TypeTranslator ()
@@ -85,7 +85,7 @@ namespace System.Xml.Serialization
 			nameCache.Add (typeof (decimal), new TypeData (typeof (decimal), "decimal", true));
 			nameCache.Add (typeof (XmlQualifiedName), new TypeData (typeof (XmlQualifiedName), "QName", true));
 			nameCache.Add (typeof (string), new TypeData (typeof (string), "string", true));
-			XmlSchemaPatternFacet guidFacet = new XmlSchemaPatternFacet();
+			XmlSchemaPatternFacet guidFacet = new XmlSchemaPatternFacet();

 			guidFacet.Value = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";
 			nameCache.Add (typeof (Guid), new TypeData (typeof (Guid), "guid", true, (TypeData)nameCache[typeof (string)], guidFacet));
 			nameCache.Add (typeof (byte), new TypeData (typeof (byte), "unsignedByte", true));
@@ -168,10 +168,10 @@ namespace System.Xml.Serialization
 				TypeData typeData = nameCache[type] as TypeData;
 				if (typeData != null) return typeData;
 
-#if TARGET_JVM
-				Hashtable dynamicCache = AppDomainCache;
-				typeData = dynamicCache[type] as TypeData;
-				if (typeData != null) return typeData;
+#if TARGET_JVM

+				Hashtable dynamicCache = AppDomainCache;

+				typeData = dynamicCache[type] as TypeData;

+				if (typeData != null) return typeData;

 #endif
 				
 				string name;
diff --git a/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs
index 02e50523b1a..c25da68e1f5 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs
@@ -1,33 +1,33 @@
-//

-// UnreferencedObjectEventArgs.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// UnreferencedObjectEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 

 namespace System.Xml.Serialization

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs
index c8ccaf33479..a327037ed2a 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs
@@ -1,33 +1,33 @@
-//

-// XmlAnyAttribute.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlAnyAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 

 namespace System.Xml.Serialization

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs
index 64923d18c82..2349563702b 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs
@@ -1,33 +1,33 @@
-//

-// XmlAnyElementAttributes.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlAnyElementAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Xml;

 using System.Xml.Serialization;

 using System.Collections;

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs
index 99d3fee0d7a..f79685eddc3 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs
@@ -1,33 +1,33 @@
-//

-// XmlArrayItemAttributes.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlArrayItemAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Xml.Serialization;

 using System.Collections;

 using System;

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs
index 648f962a0e6..b73b906b95c 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs
@@ -1,33 +1,33 @@
-//

-// XmlAttributeEventArgs.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlAttributeEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Xml;

 using System;

 

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
index 72bedd495f9..ecc2f4968ac 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
@@ -7,27 +7,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.CodeDom;

 using System.Collections;

@@ -113,7 +113,7 @@ namespace System.Xml.Serialization
 		}

 

 		public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlTypeMapping member, string ns)

-		{

+		{
 			if ( (member.TypeData.SchemaType == SchemaTypes.Primitive ||

 			      member.TypeData.SchemaType == SchemaTypes.Array) 

 				&& member.Namespace != XmlSchema.Namespace)

@@ -121,8 +121,8 @@ namespace System.Xml.Serialization
 				CodeAttributeDeclaration ratt = new CodeAttributeDeclaration ("System.Xml.Serialization.XmlRoot");

 				ratt.Arguments.Add (MapCodeGenerator.GetArg (member.ElementName));

 				ratt.Arguments.Add (MapCodeGenerator.GetArg ("Namespace", member.Namespace));

-				ratt.Arguments.Add (MapCodeGenerator.GetArg ("IsNullable", member.IsNullable));

-				metadata.Add (ratt);

+				ratt.Arguments.Add (MapCodeGenerator.GetArg ("IsNullable", member.IsNullable));
+				metadata.Add (ratt);
 			}

 		}

 

@@ -322,4 +322,4 @@ namespace System.Xml.Serialization
 		}

 

 	}

-}

+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
index 40b1c70bd41..dc3818bd360 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
@@ -76,49 +76,16 @@ namespace System.Xml.Serialization {
 
 		internal static string FromEnum (long value, string[] values, long[] ids)
 		{
-			return FromEnum (value, values, ids, (string) null);
-		}
-
-		internal static string FromEnum (long value, string[] values, long[] ids, string typeName)
-		{
-			StringBuilder sb = new StringBuilder();
 			int length = ids.Length;
-			long valueToProcess = value;
-			int zeroValue = -1;
 
 			for (int i = 0; i < length; i ++) {
-				if (ids[i] == 0) {
-					zeroValue = i;
-				} else {
-					if (valueToProcess == 0) {
-						break;
-					}
-
-					if ((ids[i] & value) == ids[i]) {
-						if (sb.Length != 0)
-							sb.Append (' ');
-						sb.Append (values[i]);
-						valueToProcess &= ~ids[i];
-					}
-				}
-			}
-
-			if (valueToProcess != 0) {
-#if NET_2_0
-				if (typeName != null)
-					throw new InvalidOperationException (string.Format (CultureInfo.CurrentCulture,
-						"'{0}' is not a valid value for {1}.", value, typeName));
-				else
-					throw new InvalidOperationException (string.Format (CultureInfo.CurrentCulture,
-						"'{0}' is not a valid value.", value));
-#else
-				return value.ToString ();
-#endif
-			}
-			if (sb.Length == 0 && zeroValue != -1) {
-				sb.Append (values[zeroValue]);
+				if (ids[i] == value) 
+					if (i >= values.Length)
+						return String.Empty;
+					else
+						return values[i].ToString ();
 			}
-			return sb.ToString ();
+			return String.Empty;
 		}
 
 		internal static string FromXmlName (string name)
@@ -174,27 +141,16 @@ namespace System.Xml.Serialization {
 			// Assuming that h contains map from value to Enumerated Name
 /*
 			You can try : 
-				return ToEnum ("One Two", h, "SomeType");
+				return ToEnum ("Element", h, "XmlNodeType");
 			where:
 				(1) no keys and values for h.
-				(2) string keys and long values.
-			
-			according to MSDN docs (for .NET 2.0) the hashtable "consists of the
-			identifiers as keys and the constants as integral numbers"
+				(2) string keys and Enum, Type, long, string value.
 */
-			long enumValue = 0;
-			string[] names = value.Split (' ');
-
-			foreach (string name in names) {
-				object nameValue = values[name];
-				if (nameValue != null) {
-					enumValue |= (long) nameValue;
-				} else if (validate && name.Length != 0) {
-					throw new InvalidOperationException (String.Format ("'{0}' is not a valid member of type {1}.", name, typeName));
-				}
-			}
+			string memberName = (string) values [value];
+			if (memberName == null)
+				throw new InvalidOperationException (String.Format ("{0} is not a valid member of type {1}", value, typeName));
 
-			return enumValue;
+			return (long) Enum.Parse (Type.GetType (typeName), memberName);
 		}
 
 		internal static string ToXmlName (string value)
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs
index 915295a5425..312761f0c47 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs
@@ -1,33 +1,33 @@
-//

-// XmlElementAttributes.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlElementAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;

 using System;

 

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs
index 37955360462..5011d8a7ccd 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs
@@ -6,27 +6,27 @@
 //

 // (C) 2002 John Donagher

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.Xml;

 using System;

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs
index 081d8ac5b78..af5cae1c55f 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs
@@ -1,33 +1,33 @@
-//

-// XmlIgnoreAttribute.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlIgnoreAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 

 namespace System.Xml.Serialization

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
index aa7f98f82b2..3487fb3aeed 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
@@ -1,33 +1,33 @@
-//

-// XmlNamespaceDeclarationsAttribute.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlNamespaceDeclarationsAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 

 namespace System.Xml.Serialization

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs
index 2fc9cec6e7f..4e8ee5270bc 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs
@@ -1,33 +1,33 @@
-//

-// XmlNodeEventArgs.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlNodeEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Xml;

 using System;

 

@@ -60,42 +60,42 @@ namespace System.Xml.Serialization
 			this.text = text;

 		}

 

-		public int LineNumber 

+		public int LineNumber 
 		{

 			get { return linenumber; } 

-		}

+		}
 		

-		public int LinePosition 

+		public int LinePosition 
 		{

 			get { return lineposition; } 

 		}

 

-		public string LocalName

+		public string LocalName
 		{

 			get { return localname; } 

 		}

 

-		public string Name 

+		public string Name 
 		{

 			get { return name; } 

 		}

 

-		public string NamespaceURI

+		public string NamespaceURI
 		{

 			get { return nsuri; } 

 		}

 

-		public XmlNodeType NodeType

+		public XmlNodeType NodeType
 		{

 			get { return nodetype; } 

 		}

 

-		public object ObjectBeingDeserialized 

+		public object ObjectBeingDeserialized 
 		{

 			get { return source; } 

 		}

 

-		public string Text

+		public string Text
 		{

 			get { return text; } 

 		}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
index 32e4603db4a..44a82a19ab7 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
@@ -558,7 +558,7 @@ namespace System.Xml.Serialization {
 				atts = mem[0].GetCustomAttributes (typeof(XmlEnumAttribute), false);
 				if (atts.Length > 0) xmlName = ((XmlEnumAttribute)atts[0]).Name;
 				if (xmlName == null) xmlName = name;
-				members.Add (new EnumMap.EnumMapMember (xmlName, name));
+				members.Add (new EnumMap.EnumMapMember (XmlConvert.EncodeLocalName (xmlName), name));
 			}
 
 			bool isFlags = type.GetCustomAttributes (typeof(FlagsAttribute),false).Length > 0;
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs
index 164fd28eb22..0b93e253424 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs
@@ -6,27 +6,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 namespace System.Xml.Serialization {

 	public class XmlReflectionMember {

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
index d687e68c70f..64f7e4f058c 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
@@ -7,27 +7,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.Xml;

 using System.Xml.Schema;

@@ -196,8 +196,8 @@ namespace System.Xml.Serialization
 			}

 			else

 			{

-				if (!LocateElement (name, out qname, out stype))

-					return null;

+				if (!LocateElement (name, out qname, out stype))
+					return null;
 			}

 

 			XmlTypeMapping map = GetRegisteredTypeMapping (qname);

@@ -211,14 +211,14 @@ namespace System.Xml.Serialization
 				return map;

 			}

 			

-			map = CreateTypeMapping (qname, SchemaTypes.Class, name);

+			map = CreateTypeMapping (qname, SchemaTypes.Class, name);
 			if (stype != null) {

-				map.Documentation = GetDocumentation (stype);

-				RegisterMapFixup (map, qname, (XmlSchemaComplexType)stype);

-			} else {

-				ClassMap cmap = new ClassMap ();

-				CodeIdentifiers classIds = new CodeIdentifiers ();

-				map.ObjectMap = cmap;

+				map.Documentation = GetDocumentation (stype);
+				RegisterMapFixup (map, qname, (XmlSchemaComplexType)stype);
+			} else {
+				ClassMap cmap = new ClassMap ();
+				CodeIdentifiers classIds = new CodeIdentifiers ();
+				map.ObjectMap = cmap;
 				AddTextMember (qname, cmap, classIds);

 			}

 			

@@ -414,10 +414,10 @@ namespace System.Xml.Serialization
 		{

 			XmlQualifiedName qname;

 			XmlSchemaType stype;

-			if (!LocateElement (name, out qname, out stype)) return null;

-			

-			if (stype == null) {

-				// Importing a primitive type

+			if (!LocateElement (name, out qname, out stype)) return null;
+			
+			if (stype == null) {
+				// Importing a primitive type
 				TypeData td = TypeTranslator.GetPrimitiveTypeData (qname.Name);

 				return ReflectType (td.Type, name.Namespace);

 			}

@@ -450,7 +450,7 @@ namespace System.Xml.Serialization
 			}

 			else

 			{

-				if (elem.SchemaTypeName.IsEmpty) return false;

+				if (elem.SchemaTypeName.IsEmpty) return false;
 				

 				object type = schemas.Find (elem.SchemaTypeName, typeof (XmlSchemaComplexType));

 				if (type == null) type = schemas.Find (elem.SchemaTypeName, typeof (XmlSchemaSimpleType));

@@ -1086,7 +1086,6 @@ namespace System.Xml.Serialization
 			XmlSchemaSimpleContentExtension ext = content.Content as XmlSchemaSimpleContentExtension;

 			ClassMap cmap = (ClassMap)map.ObjectMap;

 			XmlQualifiedName qname = GetContentBaseType (content.Content);

-			TypeData simpleType = null;

 			

 			if (!IsPrimitiveTypeNamespace (qname.Namespace))

 			{

@@ -1094,26 +1093,19 @@ namespace System.Xml.Serialization
 	

 				XmlTypeMapping baseMap = ImportType (qname, null, true);

 				BuildPendingMap (baseMap);

-				

-				if (baseMap.IsSimpleType) {

-					simpleType = baseMap.TypeData;

-				} else {

-					ClassMap baseClassMap = (ClassMap)baseMap.ObjectMap;

-		

-					foreach (XmlTypeMapMember member in baseClassMap.AllMembers)

-						cmap.AddMember (member);

-		

-					map.BaseMap = baseMap;

-					baseMap.DerivedTypes.Add (map);

-				}

+				ClassMap baseClassMap = (ClassMap)baseMap.ObjectMap;

+	

+				foreach (XmlTypeMapMember member in baseClassMap.AllMembers)

+					cmap.AddMember (member);

+	

+				map.BaseMap = baseMap;

+				baseMap.DerivedTypes.Add (map);

 			}

 			else

-				simpleType = FindBuiltInType (qname);

-				

-			if (simpleType != null) {

+			{

 				XmlTypeMapMemberElement member = new XmlTypeMapMemberElement ();

 				member.Name = classIds.AddUnique("Value", member);

-				member.TypeData = simpleType;

+				member.TypeData = FindBuiltInType (qname);

 				member.ElementInfo.Add (CreateTextElementInfo (typeQName.Namespace, member, member.TypeData));

 				member.IsXmlTextCollector = true;

 				cmap.AddMember (member);

@@ -1148,12 +1140,12 @@ namespace System.Xml.Serialization
 			if (CanBeEnum (st))

 				return ImportType (qname, null, true).TypeData;

 

-			if (st.Content is XmlSchemaSimpleTypeRestriction) {

-				XmlSchemaSimpleTypeRestriction rest = (XmlSchemaSimpleTypeRestriction) st.Content;

-				XmlQualifiedName bn = GetContentBaseType (rest);

-				if (bn == XmlQualifiedName.Empty && rest.BaseType != null)

-					return FindBuiltInType (qname, rest.BaseType);

-				else

+			if (st.Content is XmlSchemaSimpleTypeRestriction) {
+				XmlSchemaSimpleTypeRestriction rest = (XmlSchemaSimpleTypeRestriction) st.Content;
+				XmlQualifiedName bn = GetContentBaseType (rest);
+				if (bn == XmlQualifiedName.Empty && rest.BaseType != null)
+					return FindBuiltInType (qname, rest.BaseType);
+				else
 					return FindBuiltInType (bn);

 			}

 			else if (st.Content is XmlSchemaSimpleTypeList) {

@@ -1791,11 +1783,10 @@ namespace System.Xml.Serialization
 					

 			}

 			return grp;

-		}

-		

-		XmlTypeMapping ReflectType (Type type, string ns)

-		{

-			if (!encodedFormat)

+		}
+		
+		XmlTypeMapping ReflectType (Type type, string ns)
+		{
			if (!encodedFormat)

 			{

 				if (auxXmlRefImporter == null) auxXmlRefImporter = new XmlReflectionImporter ();

 				return auxXmlRefImporter.ImportTypeMapping (type, ns);

@@ -1833,4 +1824,4 @@ namespace System.Xml.Serialization
 

 		#endregion // Methods

 	}

-}

+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
index e9968b25d2c..fe0665d288c 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
@@ -6,27 +6,27 @@
 //

 // Copyright (C) Tim Coleman, 2002

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.Collections;

 using System.Xml.Schema;

@@ -213,4 +213,4 @@ namespace System.Xml.Serialization {
 

 		#endregion // Methods

 	}

-}

+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
index a54a7a8482c..304470a82e0 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
@@ -925,15 +925,16 @@ namespace System.Xml.Serialization
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		protected Exception CreateInvalidEnumValueException (object value, string typeName)
 		{
-			return new InvalidOperationException (string.Format(CultureInfo.CurrentCulture,
-				"'{0}' is not a valid value for {1}.", value, typeName));
+			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
 		protected static string FromEnum (long value, string[] values, long[] ids, string typeName)
 		{
-			return XmlCustomFormatter.FromEnum (value, values, ids, typeName);
+			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
@@ -961,7 +962,7 @@ namespace System.Xml.Serialization
 			set { throw new NotImplementedException(); }
 		}
 #endif
-
+		
 		#endregion
 
 		class WriteCallbackInfo
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
index 7a5537ec41a..d8157de54b0 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
@@ -55,7 +55,6 @@ namespace System.Xml.Serialization
 		static int generationThreshold;
 		static bool backgroundGeneration = true;
 		static bool deleteTempFiles = true;
-		static bool generatorFallback = true;
 
 		bool customSerializer;
 		XmlMapping typeMapping;
@@ -102,22 +101,6 @@ namespace System.Xml.Serialization
 		
 		static XmlSerializer ()
 		{
-			// The following options are available:
-			// MONO_XMLSERIALIZER_DEBUG: when set to something != "no", it will
-			//       it will print the name of the generated file, and it won't
-			//       be deleted.
-			// MONO_XMLSERIALIZER_THS: The code generator threshold. It can be:
-			//       no: does not use the generator, always the interpreter.
-			//       0: always use the generator, wait until the generation is done.
-			//       any number: use the interpreted serializer until the specified
-			//       number of serializations is reached. At this point the generation
-			//       of the serializer will start in the background. The interpreter
-			//       will be used while the serializer is being generated.
-			//
-			//       XmlSerializer will fall back to the interpreted serializer if
-			//       the code generation somehow fails. This can be avoided for
-			//       debugging pourposes by adding the "nofallback" option.
-			//       For example: MONO_XMLSERIALIZER_THS=0,nofallback
 			
 #if TARGET_JVM
 			string db = null;
@@ -131,21 +114,13 @@ namespace System.Xml.Serialization
 			if (th == null) {
 				generationThreshold = 50;
 				backgroundGeneration = true;
-			} else {
-				int i = th.IndexOf (',');
-				if (i != -1) {
-					if (th.Substring (i+1) == "nofallback")
-						generatorFallback = false;
-					th = th.Substring (0, i);
-				}
-				
-				if (th.ToLower(CultureInfo.InvariantCulture) == "no") 
-					generationThreshold = -1;
-				else {
-					generationThreshold = int.Parse (th, CultureInfo.InvariantCulture);
-					backgroundGeneration = (generationThreshold != 0);
-					if (generationThreshold < 1) generationThreshold = 1;
-				}
+			}
+			else if (th.ToLower(CultureInfo.InvariantCulture) == "no") 
+				generationThreshold = -1;
+			else {
+				generationThreshold = int.Parse (th, CultureInfo.InvariantCulture);
+				backgroundGeneration = (generationThreshold != 0);
+				if (generationThreshold < 1) generationThreshold = 1;
 			}
 #endif
 			deleteTempFiles = (db == null || db == "no");
@@ -572,8 +547,6 @@ namespace System.Xml.Serialization
 					writer = serializerData.CreateWriter ();
 				}
 				if (writer != null) return writer;
-				if (!generatorFallback)
-					throw new InvalidOperationException ("Error while generating serializer");
 			}
 			
 			return new XmlSerializationWriterInterpreter (typeMapping);
@@ -602,8 +575,6 @@ namespace System.Xml.Serialization
 					reader = serializerData.CreateReader ();
 				}
 				if (reader != null) return reader;
-				if (!generatorFallback)
-					throw new InvalidOperationException ("Error while generating serializer");
 			}
 			
 			return new XmlSerializationReaderInterpreter (typeMapping);
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
index 8152106b7e0..20e33955b1a 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
@@ -1,33 +1,33 @@
-//

-// XmlSerializerNamespaces.cs: 

-//

-// Author:

-//   John Donagher (john@webmeta.com)

-//

-// (C) 2002 John Donagher

-//

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

+//
+// XmlSerializerNamespaces.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;

 using System.Xml;

 using System.Collections;

@@ -95,12 +95,12 @@ namespace System.Xml.Serialization
 			}

 			return null;

 		}

-

-		internal ListDictionary Namespaces

-		{

-			get {

-				return namespaces;

-			}

-		}

+
+		internal ListDictionary Namespaces
+		{
+			get {
+				return namespaces;
+			}
+		}
 	}

 }

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
index 30b0614e97c..ff0e7fc309a 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapMemberElement.cs
@@ -84,8 +84,9 @@ namespace System.Xml.Serialization
 			{
 				if (memberValue == null)
 					return (XmlTypeMapElementInfo) _elementInfo[0];
+				Type type = memberValue.GetType();
 				foreach (XmlTypeMapElementInfo elem in _elementInfo)
-					if (elem.TypeData.Type.IsInstanceOfType (memberValue)) return elem;
+					if (elem.TypeData.Type == type) return elem;
 			}
 			return null;
 		}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
index 960b049a10d..c772e60ff86 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
@@ -7,32 +7,32 @@
 //

 // (C) 2002 John Donagher

 //

-

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System.Xml;

 using System;

 using System.Collections;

-using System.Globalization;

+using System.Globalization;
 using System.Xml.Schema;

 

 namespace System.Xml.Serialization

@@ -140,10 +140,8 @@ namespace System.Xml.Serialization
 

 		internal XmlTypeMapping GetRealTypeMap (string objectFullTypeName)

 		{

-			if (TypeData.SchemaType == SchemaTypes.Enum)

-				return this;

-

 			// Returns the map for a subtype of this map's type

+

 			objectFullTypeName = objectFullTypeName.Replace ('+','.');

 			if (TypeFullName == objectFullTypeName) return this;

 			for (int n=0; n<_derivedTypes.Count; n++) {

@@ -172,31 +170,31 @@ namespace System.Xml.Serialization
 		}

 	}

 

- 

-	// Mapping info for XmlSerializable

-	internal class XmlSerializableMapping : XmlTypeMapping

-	{

-		XmlSchema _schema;

-

-		internal XmlSerializableMapping(string elementName, string ns, TypeData typeData, string xmlType, string xmlTypeNamespace)

-			: base(elementName, ns, typeData, xmlType, xmlTypeNamespace)

-		{

-			IXmlSerializable serializable = (IXmlSerializable)Activator.CreateInstance(typeData.Type);

-			_schema = serializable.GetSchema();

-			if (_schema != null) 

-			{

-				if (_schema.Id == null || _schema.Id.Length == 0) 

-					throw new InvalidOperationException("Schema Id is missing. The schema returned from " + typeData.Type.FullName + ".GetSchema() must have an Id.");

-			}

-		}

-

-		internal XmlSchema Schema

-		{

-			get { return _schema; }

-		}

-	}

- 

-

+ 
+	// Mapping info for XmlSerializable
+	internal class XmlSerializableMapping : XmlTypeMapping
+	{
+		XmlSchema _schema;
+
+		internal XmlSerializableMapping(string elementName, string ns, TypeData typeData, string xmlType, string xmlTypeNamespace)
+			: base(elementName, ns, typeData, xmlType, xmlTypeNamespace)
+		{
+			IXmlSerializable serializable = (IXmlSerializable)Activator.CreateInstance(typeData.Type);
+			_schema = serializable.GetSchema();
+			if (_schema != null) 
+			{
+				if (_schema.Id == null || _schema.Id.Length == 0) 
+					throw new InvalidOperationException("Schema Id is missing. The schema returned from " + typeData.Type.FullName + ".GetSchema() must have an Id.");
+			}
+		}
+
+		internal XmlSchema Schema
+		{
+			get { return _schema; }
+		}
+	}
+ 
+
 	// Mapping info for classes and structs

 

 	internal class ClassMap: ObjectMap

@@ -283,9 +281,9 @@ namespace System.Xml.Serialization
 				if (_elements.ContainsKey (key)) 

 					throw new InvalidOperationException ("The XML element named '" + elem.ElementName + "' from namespace '" + elem.Namespace + "' is already present in the current scope. Use XML attributes to specify another XML name or namespace for the element.");

 				_elements.Add (key, elem);

-			}

-			

-			if (member.TypeData.IsListType && member.TypeData.Type != null && !member.TypeData.Type.IsArray) {

+			}
+			
+			if (member.TypeData.IsListType && member.TypeData.Type != null && !member.TypeData.Type.IsArray) {
 				if (_listMembers == null) _listMembers = new ArrayList ();

 				_listMembers.Add (member);

 			}

@@ -401,12 +399,12 @@ namespace System.Xml.Serialization
 		public ArrayList MembersWithDefault

 		{

 			get { return _membersWithDefault; }

-		}

-		

+		}
+		
 		public ArrayList ListMembers

 		{

 			get { return _listMembers; }

-		}

+		}
 

 		public XmlTypeMapMember XmlTextCollector

 		{

@@ -454,8 +452,8 @@ namespace System.Xml.Serialization
 	{

 		XmlTypeMapElementInfoList _itemInfo;

 		bool _gotNestedMapping;

-		XmlTypeMapping _nestedArrayMapping;

-		string _choiceMember;

+		XmlTypeMapping _nestedArrayMapping;
+		string _choiceMember;
 

 		public bool IsMultiArray

 		{

@@ -465,12 +463,12 @@ namespace System.Xml.Serialization
 			}

 		}

 

-		public string ChoiceMember

-		{

-			get { return _choiceMember; }

-			set { _choiceMember = value; }

-		}

-

+		public string ChoiceMember
+		{
+			get { return _choiceMember; }
+			set { _choiceMember = value; }
+		}
+
 		public XmlTypeMapping NestedArrayMapping

 		{

 			get

@@ -507,16 +505,16 @@ namespace System.Xml.Serialization
 		{

 			if (_itemInfo.Count == 1) 

 				return (XmlTypeMapElementInfo) _itemInfo[0];

-			else if (_choiceMember != null && index != -1)

-			{

-				Array values = (Array) XmlTypeMapMember.GetValue (ob, _choiceMember);

-				if (values == null || index >= values.Length)

-					throw new InvalidOperationException ("Invalid or missing choice enum value in member '" + _choiceMember + "'.");

-				object val = values.GetValue (index);

-				foreach (XmlTypeMapElementInfo elem in _itemInfo)

-					if (elem.ChoiceValue != null && elem.ChoiceValue.Equals (val))

-						return elem;

-			}

+			else if (_choiceMember != null && index != -1)
+			{
+				Array values = (Array) XmlTypeMapMember.GetValue (ob, _choiceMember);
+				if (values == null || index >= values.Length)
+					throw new InvalidOperationException ("Invalid or missing choice enum value in member '" + _choiceMember + "'.");
+				object val = values.GetValue (index);
+				foreach (XmlTypeMapElementInfo elem in _itemInfo)
+					if (elem.ChoiceValue != null && elem.ChoiceValue.Equals (val))
+						return elem;
+			}
 			else

 			{

 				if (memberValue == null) return null;

diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
index f320844f952..b33e228bf3b 100644
--- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
@@ -1,34 +1,3 @@
-2006-02-26  Atsushi Enomoto <atsushi@ximian.com>
-
-	* Iterator.cs : seems like MS XPathNodeIterator.MoveNext() itself does
-	  not handle XsltContext.PreserveWhitespace() unlike ours. It results
-	  in not a small performance improvement. (just removed it since it
-	  didn't cause any errors in XSLT standalone tests.)
-
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* Iterator.cs : removed extra field from AxisIterator.
-
-2006-02-14  Atsushi Enomoto <atsushi@ximian.com>
-
-	* Iterator.cs : tiny message fix (thanks to alp).
-
-2006-01-25  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XPathNavigator.cs : fixed IsNode signature found by updated
-	  corcompare.
-
-2006-01-11  Atsushi Enomoto <atsushi@ximian.com>
-
-	* Iterator.cs : Nowadays removal of cloning of the argument list
-	  in ListIterator is safe. Thanks to Joshua Tauberer for the hint.
-
-2006-01-11  Atsushi Enomoto <atsushi@ximian.com>
-
-	* Iterator.cs : (DescendantOrSelfIterator/DescendantIterator) the
-	  error message is for blaming custom XPathNavigator
-	  implementation, not us ;-) (see also #77194)
-
 2006-01-06  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XPathNavigator.cs : use WriteNode(XPathNavigator, bool)
diff --git a/mcs/class/System.XML/System.Xml.XPath/Iterator.cs b/mcs/class/System.XML/System.Xml.XPath/Iterator.cs
index 24be6d9ccf2..cb137a19c37 100644
--- a/mcs/class/System.XML/System.Xml.XPath/Iterator.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/Iterator.cs
@@ -89,6 +89,11 @@ namespace System.Xml.XPath
 			if (!MoveNextCore ())
 				return false;
 			position++;
+			if (Current != null &&
+				Current.NodeType == XPathNodeType.Whitespace &&
+				_nsm is XsltContext &&
+				!((XsltContext) _nsm).PreserveWhitespace (Current))
+				return MoveNext ();
 			return true;
 		}
 
@@ -517,7 +522,7 @@ namespace System.Xml.XPath
 					return true;
 				}
 				if (!_nav.MoveToParent ())	// should NEVER fail!
-					throw new XPathException ("Current node is removed while it should not be, or there are some bugs in the XPathNavigator implementation class: " + _nav.GetType ());
+					throw new XPathException ("There seems some bugs on the XPathNavigator implementation class.");
 				_depth --;
 			}
 			_finished = true;
@@ -564,7 +569,7 @@ namespace System.Xml.XPath
 					return true;
 				}
 				if (!_nav.MoveToParent ())	// should NEVER fail!
-					throw new XPathException ("Current node is removed while it should not be, or there are some bugs in the XPathNavigator implementation class: " + _nav.GetType ());
+					throw new XPathException ("There seems some bugs on the XPathNavigator implementation class.");
 				_depth --;
 			}
 			_finished = true;
@@ -738,14 +743,14 @@ namespace System.Xml.XPath
 		private SimpleIterator _iter;
 		private NodeTest _test;
 			
-		//string name, ns;
-		//XPathNodeType matchType;
+		string name, ns;
+		XPathNodeType matchType;
 
 		public AxisIterator (SimpleIterator iter, NodeTest test) : base (iter.NamespaceManager)
 		{
 			_iter = iter;
 			_test = test;
-			//test.GetInfo (out name, out ns, out matchType, NamespaceManager);
+			test.GetInfo (out name, out ns, out matchType, NamespaceManager);
 //			if (name != null)
 //				name = Current.NameTable.Add (name);
 
@@ -757,9 +762,9 @@ namespace System.Xml.XPath
 		{
 			_iter = (SimpleIterator) other._iter.Clone ();
 			_test = other._test;
-			//name = other.name;
-			//ns = other.ns;
-			//matchType = other.matchType;
+			name = other.name;
+			ns = other.ns;
+			matchType = other.matchType;
 		}
 		public override XPathNodeIterator Clone () { return new AxisIterator (this); }
 
@@ -1052,17 +1057,22 @@ namespace System.Xml.XPath
 
 		public ListIterator (BaseIterator iter, IList list) : base (iter.NamespaceManager)
 		{
+			if (!(list is ICloneable))
+				throw new ArgumentException ("Target enumerator must be cloneable.");
 			_list = list;
 		}
 		
 		public ListIterator (IList list, NSResolver nsm) : base (nsm)
 		{
+			if (!(list is ICloneable))
+				throw new ArgumentException ("Target enumerator must be cloneable.");
 			_list = list;
 		}
 
 		private ListIterator (ListIterator other) : base (other)
 		{
-			_list = other._list;
+			ICloneable listClone = other._list as ICloneable;
+			_list = (IList) listClone.Clone ();
 		}
 		public override XPathNodeIterator Clone () { return new ListIterator (this); }
 
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
index 04caf1dfa51..af36dba1aec 100644
--- a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
@@ -900,7 +900,7 @@ namespace System.Xml.XPath
 			}
 		}
 
-		public override sealed bool IsNode {
+		public override bool IsNode {
 			get { return true; }
 		}
 
diff --git a/mcs/class/System.XML/System.Xml.Xsl/ChangeLog b/mcs/class/System.XML/System.Xml.Xsl/ChangeLog
index e0af596e56c..296c60d0d8d 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Xsl/ChangeLog
@@ -1,14 +1,3 @@
-2006-02-22  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XsltContext.cs : don't expect that it is always XsltCompiledContext
-	  which is being evaluated in XPathExpression. Dispatch overriden
-	  methods. Fixed bug #46751.
-
-2006-01-25  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XsltContext.cs : fixed method signatures found by updated
-	  corcompare.
-
 2005-12-23  Gert Driesen  <drieseng@users.sourceforge.net>
 
 	* IXsltContextFunction.cs: Fixed line endings (all CRLF).
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
index 6fc717254df..1fe0d0699d1 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
@@ -33,12 +33,12 @@ namespace System.Xml.Xsl
 	public abstract class XsltContext : XmlNamespaceManager

 	{

 		#region Constructors

-		protected XsltContext ()

+		public XsltContext ()

 			: base (new NameTable ())

 		{

 		}

 

-		protected XsltContext (NameTable table)

+		public XsltContext (NameTable table)

 			: base (table)

 		{

 		}

@@ -55,7 +55,7 @@ namespace System.Xml.Xsl
 		#region Methods

 

 		public abstract int CompareDocument (string baseUri, string nextbaseUri);

-		public abstract IXsltContextFunction ResolveFunction (string prefix, string name, XPathResultType [] argTypes);

+		public abstract IXsltContextFunction ResolveFunction (string prefix, string name, XPathResultType [] ArgTypes);

 		public abstract IXsltContextVariable ResolveVariable (string prefix, string name);

 

 		#endregion

@@ -64,12 +64,12 @@ namespace System.Xml.Xsl
 		

 		internal virtual IXsltContextVariable ResolveVariable (XmlQualifiedName name)

 		{

-			return ResolveVariable (name.Name, name.Namespace);

+			throw new InvalidOperationException ("somehow you got into the internals of xslt!?");

 		}

 		

-		internal virtual IXsltContextFunction ResolveFunction (XmlQualifiedName name, XPathResultType [] argTypes)

+		internal virtual IXsltContextFunction ResolveFunction (XmlQualifiedName name, XPathResultType [] ArgTypes)

 		{

-			return ResolveFunction (name.Name, name.Namespace, argTypes);

+			throw new InvalidOperationException ("somehow you got into the internals of xslt!?");

 		}

 		#endregion

 	}

diff --git a/mcs/class/System.XML/System.Xml.dll.sources b/mcs/class/System.XML/System.Xml.dll.sources
index 9616558e090..26aa4233ef4 100644
--- a/mcs/class/System.XML/System.Xml.dll.sources
+++ b/mcs/class/System.XML/System.Xml.dll.sources
@@ -79,13 +79,11 @@ System.Xml/ConformanceLevel.cs
 System.Xml/DTDAutomata.cs
 System.Xml/DTDObjectModel.cs
 System.Xml/DTDReader.cs
-System.Xml/DTDValidatingReader2.cs
-System.Xml/EntityResolvingXmlReader.cs
+System.Xml/DTDValidatingReader.cs
 System.Xml/EntityHandling.cs
 System.Xml/Formatting.cs
 System.Xml/IHasXmlNode.cs
 System.Xml/IXmlLineInfo.cs
-System.Xml/IHasXmlChildNode.cs
 System.Xml/IXmlNamespaceResolver.cs
 System.Xml/MonoFIXAttribute.cs
 System.Xml/NameTable.cs
@@ -93,9 +91,10 @@ System.Xml/NewLineHandling.cs
 System.Xml/ReadState.cs
 ../../build/common/MonoTODOAttribute.cs
 System.Xml/ValidationType.cs
+System.Xml/XmlEntity.cs
 System.Xml/WhitespaceHandling.cs
 System.Xml/WriteState.cs
-System.Xml/XmlEntity.cs
+System.Xml/XmlTextWriter.cs
 System.Xml/XmlAttribute.cs
 System.Xml/XmlAttributeCollection.cs
 System.Xml/XmlCDataSection.cs
@@ -128,8 +127,6 @@ System.Xml/XmlNodeChangedEventArgs.cs
 System.Xml/XmlNodeChangedEventHandler.cs
 System.Xml/XmlNodeList.cs
 System.Xml/XmlNodeListChildren.cs
-System.Xml/XmlNodeArrayList.cs
-System.Xml/XmlIteratorNodeList.cs
 System.Xml/XmlNodeOrder.cs
 System.Xml/XmlNodeReader2.cs
 System.Xml/XmlNodeReaderImpl.cs
@@ -154,7 +151,8 @@ System.Xml/XmlValidatingReader.cs
 System.Xml/XmlWhitespace.cs
 System.Xml/XmlWriter.cs
 System.Xml/XmlWriterSettings.cs
-System.Xml/XmlTextWriter2.cs
+System.Xml/XmlTextWriterOpenElement.cs
+System.Xml/XmlNodeArrayList.cs
 System.Xml/XmlInputStream.cs
 System.Xml/XmlParserInput.cs
 System.Xml.XPath/IXPathNavigable.cs
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 0a9cd36faa3..e2552911611 100644
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,353 +1,8 @@
-2006-02-28  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlElement.cs : (WriteTo) use IsEmpty to determine which to use:
-	  WriteEndElement() and WriteFullEndElement(). Fixed sys.security
-	  regression.
-
-2006-02-24  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter2.cs :
-	  WriteRaw() has stupid second arg. Fixed bug #77623.
-	  WriteString() should raise an error when it is called immediately
-	  after WriteStartDocument().
-
-2006-02-22  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter2.cs : WriteChars() should allow Attribute state.
-
-2006-02-22  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlChar.cs : (IndexOfInvalidChar) fixed surrogate pairs handling.
-	  They were always regarded as invalid.
-	* XmlTextWriter2.cs : seems like MS XmlTextWriter outputs invalid
-	  characters as character references. It totally does not make sense
-	  but corcompare depended on that behavior.
-
-	  This "compatibility" fix causes 10% or more performance loss!!!
-
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter2.cs : (WriteStartAtribute) more == removal.
-	* XmlNode.cs : (get_InnerText) reduce extra StringBuilder creation.
-
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter2.cs : (WriteStartAttribute) reduced string == string.
-
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocument.cs : (ReadNodeCore) not public.
-
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter2.cs : (CloseStartElement)
-	  Avoid ArrayList.Clear() and culture-sensitive Contains().
-
-2006-02-21  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNamespaceManager.cs : added internal LookupPrefixExclusive()
-	  which discards "overriden" namespaces.
-	* XmlTextWriter2.cs : fresh implementation.
-	  - The source structure is simplified and cleaner.
-	  - When outputting escaped string, output directly to TextWriter.
-	  - roughly 20% performance improvement.
-
-	  (Also fixed previous perf. evaluation excess in ChangeLog.)
-
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlElement.cs : (WriteTo) make use of HasAttributes. Remove extra
-	  check. 5% speed improvement.
-
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTDValidatingReader2.cs : added Source XmlReader property for
-	  XsdValidatingReader use (see XsdValidatingReader change as well).
-
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* EntityResolvingXmlReader.cs, XmlNodeReader2.cs, XmlTextReader2.cs :
-	  in get_NodeType() entity reader existence check is faster.
-	* DTDValidatingReader2.cs : IsDefault could be avoided.
-
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNodeReaderImpl.cs : optimized Depth.
-
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlValidatingReader.cs : reducing layered ReadState invocation
-	  results in 10% speed up.
-
-2006-02-20  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNodeReaderImpl.cs : Reimplemented Read(). Points are:
-	  - reduced call to NextSibling which is very unlikely to be inlined
-	  - reorganized conditioning to avoid extra check
-	  - added description on each returning branch.
-	  - And then, removed unused code.
-	  It is 1.5x faster than before.
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlElement.cs : NextSibling could be effectively computed using
-	  LastLinkedChild, beyond previous XmlLinkedNode optimization.
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlLinkedNode.cs : In NextSibling, use LastChild directly.
-	  It improves NextSibling performance in bulky document.
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNodeReaderImpl.cs : do not compute ownerLinkedNode, just store
-	  it in Read(). Simply use state field in EOF. They result in 20%
-	  perf. boost. Expanding EOF also improved performance by 2-3%
-	  (mono --optimize=inline might work in the later stage).
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTDValidatingReader2.cs : more refactoring. Split ReadContent()
-	  into some methods. Reduced some extra MoveToElement().
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTDValidatingReader2.cs : more refactoring. Removed and simplified
-	  some error check. String += would be enough for entity-reference-
-	  mixed attributes which rarely happen, so simplify the code.
-	  Added comments on how the fields are used.
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTDValidatingReader2.cs : attribute node simplification. It now
-	  stores attribute node slots, including default attributes for
-	  further refactoring.
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTDValidatingReader2.cs, EntityResolvingXmlReader.cs :
-	  new files for refactoring DTD validating reader. As the first stage,
-	  it splits entity handling process from DTD validation step.
-
-	  (DTDValidatingReader.cs will be removed at some stage).
-
-2006-02-17  Atsushi Enomoto <atsushi@ximian.com>
-
-	* DTDObjectModel.cs : entity resolution method will be used in
-	  the next DTD validating reader in 1.x.
-
-2006-02-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* IHasXmlChildNode.cs :
-	  New internal interface to hold LastLinkedChild.
-	* XmlNodeListChildren.cs XmlEntity.cs XmlElement.cs XmlAttribute.cs
-	  XmlLinkedNode.cs XmlEntityReference.cs XmlNode.cs
-	  XmlDocumentFragment.cs XmlDocument.cs : use it. It minimizes memory
-	  consumption in XmlText, XmlWhitespace, XmlComment etc.
-
-2006-02-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlChar.cs : added IndexOfNonWhitespace() and IndexOfInvalid() (not
-	  in use yet).
-	* NewLineHandling.cs : prepared to be used internally in 1.x.
-
-2006-02-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocument.cs XmlTextReader.cs : in ReadNode(), we can avoid
-	  extraneous whitespace node creation for XmlTextReader by setting
-	  WhitespaceHandling.Significant when PreserveWhitespace is false.
-
-2006-02-16  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : atomize whitespace values. It effectively saves
-	  memory consumption when an input XML is indented.
-
-2006-02-14  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : When "Significant" is assigned to
-	  WhitespaceHandling, it should ignore non-significant whitespaces.
-
-2006-02-14  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlWriter.cs : (WriteElementString and WriteAttributeString)
-	  Skip empty string output.
-
-2006-02-14  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter.cs : WriteRaw("") is not simply ignored but process
-	  state check and closes open tag.
-
-2006-02-11  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs :
-	  Avoid extra AppendValueChar() in ReadWhitespace().
-
-2006-02-06  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : ReadTextReader() is now assured to have current
-	  node content, except for Text, CDATA and Comment. ReadName() does
-	  not use nameBuffer and reuse peekChars.
-
-2006-02-06  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : eliminated currentTagBuffer. XmlDeclaration is
-	  now once read as PI and then re-parsed from Value. DTD internal
-	  subset is now parsed as usual "value".
-
-2006-02-06  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : Expect() could be written inline and it could
-	  provide better information. ReadEndTag() could use Expect() instead
-	  of costy ReadName().
-
-2006-02-04  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : on ReadEndTag() we can avoid NameTable.Add().
-	  Store name, local name and prefix in the stack instead of just name
-	  and reuse them for EndElement.
-
-2006-02-04  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocumentNavigator.cs : make use of HasAttributes (avoid possible
-	  XmlAttributeCollection creation).
-
-2006-02-03  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : no need to call Clear() for each attribute value.
-
-2006-02-03  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocument.cs : reverted most of the previous changes. It somehow
-	  broke System.Data tests.
-
-2006-01-30  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocument.cs, XmlAttribute.cs, XmlElement.cs : Avoid unnecessary
-	  name checks in CreateElement() and CreateAttribute().
-	  get_DocumentType() could be stopped when the iterated child node
-	  is the document element.
-	* XmlNode.cs : removed commented lines.
-	* XmlNameEntry.cs : hash code for a name entry is mostly identical by
-	  its local name, so avoid extraneous GetHashCode() especially on
-	  namespaces.
-
-2006-01-30  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlReader.cs : ReadOuterXml() returns meaingful value only for
-	  element and attribute. ReadInnerXml() does not have to create
-	  XmlTextWriter for empty elements.
-
-2006-01-30  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNodeReader2.cs XmlException.cs XmlReader.cs XmlTextReader.cs
-	  XmlWriter.cs XmlTextWriter.cs XmlValidatingReader.cs
-	  XmlNodeReaderImpl.cs DTDValidatingReader.cs XmlSecureResolver.cs:
-	  cleaning up obsolete NET_1_0 code.
-
-2006-01-28  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriter.cs : avoid case-insensitive String.Compare().
-	  Use array for openElements rather than ArrayList.
-
-2006-01-28  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlElement.cs, XmlAttribute.cs :
-	  Avoid ChildNodes.Count and use FirstChild/NextSibling.
-
-2006-01-28  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNode.cs, XmlIteratorNodeList.cs :
-	  Now we can enable XmlIteratorNodeList again (mcs, incorrectly
-	  removing nodes in the node list, was fixed).
-
-2006-01-28  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocument.cs : in ReadNode() to consume element node, switched
-	  to MoveToAttribute(int) since MoveToNextAttribute() was somehow
-	  not working fine. It is needed to avoid Sys.Data test breakage
-	  and anything else should be fixed indeed.
-
-Fri Jan 27 20:39:48 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* XmlTextReader.cs, XmlChar.cs: more tweaks and speedups.
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextReader.cs : optimization patch by Paolo.
-	  Fast path optimization in PeekChar().
-	  Avoid double-evaluation of PeekChar() and ReadChar() by new
-	  Advance() method.
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNode.cs : disabled XmlIteratorNodeList optimization. It caused
-	  some kind of regression under mcs/tests/xml-025.cs.
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlAttributeCollection.cs :
-	  Replaced all Nodes.Count with Count (it could avoid extraneous
-	  ArrayList creation in XmlNamedNodeMap). ID attribute adjustment
-	  was extraneously done against all attribute nodes and thus there
-	  was a plenty of call to Value.
-	* XmlNamedNodeMap.cs : added comment on SetNamedItem() W3C spec
-	  violation.
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNode.cs,
-	  XmlDocument.cs,
-	  XmlAttribute.cs,
-	  XmlElement.cs :
-	  Added internal AppendChild() override that omites node type
-	  checking, and used it in many places.
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlDocument.cs : optimized ReadAttributeNode() to not call
-	  MoveToAttribute() unneccesarily (call it only when ReadNode() is
-	  called on an attribute node).
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNode.cs :
-	  in get_InnerText(), avoid extraneous StringBuilder creation.
-
-2006-01-27  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlIteratorNodeList.cs : new file for XmlNodeList implementation.
-	  It does not iterate all nodes in advance.
-	* XmlNode.cs : use XmlIteratorNodeList in SelectNodes().
-
-2006-01-26  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlWriter.cs : Dispose() is protected.
-
-2006-01-25  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNamedNodeMap.cs : lazily create internal ArrayList. Thanks to
-	  Joshua Tauberer for the hint.
-
 2006-01-25  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XmlConvert.cs : ToString(TimeSpan) should return valid duration
 	  for TimeSpan.Zero, rather than "P". Fixed bug #77350
 
-2006-01-24  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNameEntryCache.cs XmlNameEntry.cs :
-	  Made name entry fields as not read-only. Added Update() to reset
-	  members. Its semantics of Equals() is changed.
-	  Now entry cache is based on Hashtable rather than ArrayList.
-	  It saves heavy iteration in ArrayList.
-
-2006-01-24  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlNameEntryCache.cs XmlNameEntry.cs XmlDocument.cs :
-	  Add Hash field to find name entry quickly.
-	  In XmlNameEntryCache make use of name table (it is totally
-	  unused there though).
-
 2006-01-16  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XmlConvert.cs : handle Ticks. Fixed bug #77252.
diff --git a/mcs/class/System.XML/System.Xml/DTDObjectModel.cs b/mcs/class/System.XML/System.Xml/DTDObjectModel.cs
index 313a5f33b41..bae72caa7ba 100644
--- a/mcs/class/System.XML/System.Xml/DTDObjectModel.cs
+++ b/mcs/class/System.XML/System.Xml/DTDObjectModel.cs
@@ -246,6 +246,7 @@ namespace Mono.Xml
 			validationErrors.Add (ex);
 		}
 
+#if NET_2_0
 		internal string GenerateEntityAttributeText (string entityName)
 		{
 			DTDEntityDeclaration entity = EntityDecls [entityName] as DTDEntityDeclaration;
@@ -268,6 +269,7 @@ namespace Mono.Xml
 			else
 				return new XmlTextReaderImpl (entity.EntityValue, XmlNodeType.Element, context);
 		}
+#endif
 	}
 
 	internal class DTDCollectionBase : DictionaryBase
diff --git a/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs b/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
index 3d719d16e83..7fd1790f0f2 100644
--- a/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
+++ b/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
@@ -949,6 +949,26 @@ namespace Mono.Xml
 				return reader.ReadAttributeValue ();
 		}
 
+#if NET_1_0
+		public override string ReadInnerXml ()
+		{
+			// MS.NET 1.0 has a serious bug here. It skips validation.
+			return reader.ReadInnerXml ();
+		}
+
+		public override string ReadOuterXml ()
+		{
+			// MS.NET 1.0 has a serious bug here. It skips validation.
+			return reader.ReadOuterXml ();
+		}
+#endif
+
+		public override string ReadString ()
+		{
+			// It seems to be the same as ReadInnerXml(). 
+			return base.ReadStringInternal ();
+		}
+
 		public override void ResolveEntity ()
 		{
 			if (resolver == null)
diff --git a/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs b/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs
deleted file mode 100644
index 5376da6b64d..00000000000
--- a/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs
+++ /dev/null
@@ -1,1254 +0,0 @@
-//
-// DTDValidatingReader2.cs
-//
-// Author:
-//   Atsushi Enomoto  atsushi@ximian.com
-//
-// (C)2003 Atsushi Enomoto
-// (C)2004-2006 Novell Inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-/*
-
-Some notes:
-
-	DTDValidatingReader requires somewhat different ResolveEntity()
-	implementation because unlike other readers (XmlTextReaderImpl and
-	XmlNodeReaderImpl), DTDValidatingReader manages validation state
-	and it must not be held in each entity reader.
-	
-	Say, if there are such element and entity definitions:
-
-		<!ELEMENT root (child)>
-		<!ELEMENT child EMPTY>
-		<!ENTITY foo "<child />">
-
-	and an instance
-
-		<root>&foo;</root>
-
-	When the container XmlReader encounters "&foo;", it creates another
-	XmlReader for resolved entity "<child/>". However, the generated
-	reader must not be another standalone DTDValidatingReader since
-	<child/> must be a participant of the container's validation.
-
-	Thus, this reader handles validation, and it holds an
-	EntityResolvingXmlReader as its validation source XmlReader.
-
-TODOs:
-	IsDefault messes all around the reader, so simplify it.
-	isWhitespace/isText/blah mess the code too, so clear it as well.
-
-*/
-
-using System;
-using System.Collections;
-#if NET_2_0
-using System.Collections.Generic;
-#endif
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Schema;
-
-#if NET_2_0
-using XmlTextReaderImpl = Mono.Xml2.XmlTextReader;
-#else
-using XmlTextReaderImpl = System.Xml.XmlTextReader;
-#endif
-
-
-namespace Mono.Xml
-{
-	internal class DTDValidatingReader : XmlReader, IXmlLineInfo, 
-#if NET_2_0
-		IXmlNamespaceResolver,
-#endif
-		IHasXmlParserContext, IHasXmlSchemaInfo
-	{
-		public DTDValidatingReader (XmlReader reader)
-			: this (reader, null)
-		{
-		}
-
-		internal DTDValidatingReader (XmlReader reader,
-			XmlValidatingReader validatingReader)
-		{
-			IHasXmlParserContext container = reader as IHasXmlParserContext;
-			this.reader = new EntityResolvingXmlReader (reader,
-				container.ParserContext);
-			this.sourceTextReader = reader as XmlTextReader;
-			elementStack = new Stack ();
-			automataStack = new Stack ();
-			attributes = new AttributeSlot [10];
-			nsmgr = new XmlNamespaceManager (reader.NameTable);
-			this.validatingReader = validatingReader;
-			valueBuilder = new StringBuilder ();
-			idList = new ArrayList ();
-			missingIDReferences = new ArrayList ();
-			XmlTextReader xtReader = reader as XmlTextReader;
-			if (xtReader != null) {
-				resolver = xtReader.Resolver;
-			}
-			else
-				resolver = new XmlUrlResolver ();
-		}
-
-		// The primary xml source
-		EntityResolvingXmlReader reader;
-
-		// This is used to acquire "Normalization" property which
-		// could be dynamically changed.
-		XmlTextReader sourceTextReader;
-
-		// This field is used to get properties (such as
-		// EntityHandling) and to raise events.
-		XmlValidatingReader validatingReader;
-
-		// We hold DTDObjectModel for such case that the source
-		// XmlReader does not implement IHasXmlParerContext
-		// (especially for non-sys.xml.dll readers).
-		DTDObjectModel dtd;
-
-		// Used to resolve entities (as expected)
-		XmlResolver resolver;
-
-		// mainly used to retrieve DTDElementDeclaration
-		string currentElement;
-		AttributeSlot [] attributes;
-		int attributeCount;
-
-		// Holds MoveTo*Attribute()/ReadAttributeValue() status.
-		int currentAttribute = -1;
-		bool consumedAttribute;
-
-		// Ancestor and current node context for each depth.
-		Stack elementStack;
-		Stack automataStack;
-		bool popScope;
-
-		// Validation context.
-		bool isStandalone;
-		DTDAutomata currentAutomata;
-		DTDAutomata previousAutomata;
-		ArrayList idList;
-		ArrayList missingIDReferences;
-
-		// Holds namespace context. It must not be done in source
-		// XmlReader because default attributes could affect on it.
-		XmlNamespaceManager nsmgr;
-
-		// Those fields are used to store on-constructing text value.
-		// They are required to support entity-mixed text, so they
-		// are likely to be moved to EntityResolvingXmlReader.
-		string currentTextValue;
-		string constructingTextValue;
-		bool shouldResetCurrentTextValue;
-		bool isSignificantWhitespace;
-		bool isWhitespace;
-		bool isText;
-
-		// Utility caches.
-		Stack attributeValueEntityStack = new Stack ();
-		StringBuilder valueBuilder;
-
-		class AttributeSlot
-		{
-			public string Name;
-			public string LocalName;
-			public string NS;
-			public string Prefix;
-			public string Value; // normalized
-			public bool IsDefault;
-
-			public void Clear ()
-			{
-				Prefix = String.Empty;
-				LocalName = String.Empty;
-				NS = String.Empty;
-				Value = String.Empty;
-				IsDefault = false;
-			}
-		}
-
-		internal EntityResolvingXmlReader Source {
-			// we cannot return EntityResolvingXmlReader.source
-			// since it must check non-wellformedness error
-			// (undeclared entity in use).
-			get { return reader; }
-		}
-
-		public DTDObjectModel DTD {
-			get { return dtd; }
-		}
-
-		public EntityHandling EntityHandling {
-			get { return reader.EntityHandling; }
-			set { reader.EntityHandling = value; }
-		}
-
-		public override void Close ()
-		{
-			reader.Close ();
-		}
-
-		int GetAttributeIndex (string name)
-		{
-			for (int i = 0; i < attributeCount; i++)
-				if (attributes [i].Name == name)
-					return i;
-			return -1;
-		}
-
-		int GetAttributeIndex (string localName, string ns)
-		{
-			for (int i = 0; i < attributeCount; i++)
-				if (attributes [i].LocalName == localName &&
-				    attributes [i].NS == ns)
-					return i;
-			return -1;
-		}
-
-		// We had already done attribute validation, so can ignore name.
-		public override string GetAttribute (int i)
-		{
-			if (currentTextValue != null)
-				throw new IndexOutOfRangeException ("Specified index is out of range: " + i);
-
-			if (attributeCount <= i)
-				throw new IndexOutOfRangeException ("Specified index is out of range: " + i);
-			return attributes [i].Value;
-		}
-
-		public override string GetAttribute (string name)
-		{
-			if (currentTextValue != null)
-				return null;
-
-			int i = GetAttributeIndex (name);
-			return i < 0 ? null : attributes [i].Value;
-		}
-
-		public override string GetAttribute (string name, string ns)
-		{
-			if (currentTextValue != null)
-				return null;
-
-			int i = GetAttributeIndex (name, ns);
-			return i < 0 ? null : attributes [i].Value;
-		}
-
-#if NET_2_0
-		IDictionary<string, string> IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope)
-		{
-			IXmlNamespaceResolver res = reader as IXmlNamespaceResolver;
-			return res != null ? res.GetNamespacesInScope (scope) : new Dictionary<string, string> ();
-		}
-#endif
-
-		bool IXmlLineInfo.HasLineInfo ()
-		{
-			IXmlLineInfo ixli = reader as IXmlLineInfo;
-			if (ixli != null)
-				return ixli.HasLineInfo ();
-			else
-				return false;
-		}
-
-		public override string LookupNamespace (string prefix)
-		{
-			string s = nsmgr.LookupNamespace (NameTable.Get (prefix));
-			return s == String.Empty ? null : s;
-		}
-
-#if NET_2_0
-		string IXmlNamespaceResolver.LookupPrefix (string ns)
-		{
-			IXmlNamespaceResolver res = reader as IXmlNamespaceResolver;
-			return res != null ? res.LookupPrefix (ns) : null;
-		}
-#endif
-
-		public override void MoveToAttribute (int i)
-		{
-			if (currentTextValue != null)
-				throw new IndexOutOfRangeException ("The index is out of range.");
-
-			if (attributeCount <= i)
-				throw new IndexOutOfRangeException ("The index is out of range.");
-
-			if (i < reader.AttributeCount) // non-default attribute
-				reader.MoveToAttribute (i);
-			currentAttribute = i;
-			consumedAttribute = false;
-			return;
-		}
-
-		public override bool MoveToAttribute (string name)
-		{
-			if (currentTextValue != null)
-				return false;
-
-			int i = GetAttributeIndex (name);
-			if (i < 0)
-				return false;
-			if (i < reader.AttributeCount)
-				reader.MoveToAttribute (i);
-			currentAttribute = i;
-			consumedAttribute = false;
-			return true;
-		}
-
-		public override bool MoveToAttribute (string name, string ns)
-		{
-			if (currentTextValue != null)
-				return false;
-
-			int i = GetAttributeIndex (name, ns);
-			if (i < 0)
-				return false;
-			if (i < reader.AttributeCount)
-				reader.MoveToAttribute (i);
-			currentAttribute = i;
-			consumedAttribute = false;
-			return true;
-		}
-
-		public override bool MoveToElement ()
-		{
-			if (currentTextValue != null)
-				return false;
-
-			bool b = reader.MoveToElement ();
-			if (!b && !IsDefault)
-				return false;
-			currentAttribute = -1;
-			consumedAttribute = false;
-			return true;
-		}
-
-		public override bool MoveToFirstAttribute ()
-		{
-			if (currentTextValue != null)
-				return false;
-
-			if (attributeCount == 0)
-				return false;
-			currentAttribute = 0;
-			reader.MoveToFirstAttribute ();
-			consumedAttribute = false;
-			return true;
-		}
-
-		public override bool MoveToNextAttribute ()
-		{
-			if (currentTextValue != null)
-				return false;
-
-			if (currentAttribute == -1)
-				return MoveToFirstAttribute ();
-			if (++currentAttribute == attributeCount) {
-				currentAttribute--;
-				return false;
-			}
-
-			if (currentAttribute < reader.AttributeCount)
-				reader.MoveToAttribute (currentAttribute);
-			consumedAttribute = false;
-			return true;
-		}
-
-		public override bool Read ()
-		{
-			if (currentTextValue != null)
-				shouldResetCurrentTextValue = true;
-
-			if (currentAttribute >= 0)
-				MoveToElement ();
-
-			currentElement = null;
-			currentAttribute = -1;
-			consumedAttribute = false;
-			attributeCount = 0;
-			isWhitespace = false;
-			isSignificantWhitespace = false;
-			isText = false;
-
-			bool b = ReadContent () || currentTextValue != null;
-			if (!b && this.missingIDReferences.Count > 0) {
-				this.HandleError ("Missing ID reference was found: " +
-					String.Join (",", missingIDReferences.ToArray (typeof (string)) as string []),
-					XmlSeverityType.Error);
-				// Don't output the same errors so many times.
-				this.missingIDReferences.Clear ();
-			}
-			if (validatingReader != null)
-				EntityHandling = validatingReader.EntityHandling;
-			return b;
-		}
-
-		private bool ReadContent ()
-		{
-			if (reader.EOF)
-				return false;
-			if (popScope) {
-				nsmgr.PopScope ();
-				popScope = false;
-				if (elementStack.Count == 0)
-				// it reached to the end of document element,
-				// so reset to non-validating state.
-					currentAutomata = null;
-			}
-
-			bool b = !reader.EOF;
-			if (shouldResetCurrentTextValue) {
-				currentTextValue = null;
-				shouldResetCurrentTextValue = false;
-			}
-			else
-				b = reader.Read ();
-
-			if (!b) {
-				if (elementStack.Count != 0)
-					throw new InvalidOperationException ("Unexpected end of XmlReader.");
-				return false;
-			}
-
-			return ProcessContent ();
-		}
-
-		bool ProcessContent ()
-		{
-			switch (reader.NodeType) {
-			case XmlNodeType.XmlDeclaration:
-				FillAttributes ();
-				if (GetAttribute ("standalone") == "yes")
-					isStandalone = true;
-				break;
-
-			case XmlNodeType.DocumentType:
-				ReadDoctype ();
-				break;
-
-			case XmlNodeType.Element:
-				if (constructingTextValue != null) {
-					currentTextValue = constructingTextValue;
-					constructingTextValue = null;
-					if (isWhitespace)
-						ValidateWhitespaceNode ();
-					return true;
-				}
-				ProcessStartElement ();
-				break;
-
-			case XmlNodeType.EndElement:
-				if (constructingTextValue != null) {
-					currentTextValue = constructingTextValue;
-					constructingTextValue = null;
-					return true;
-				}
-				ProcessEndElement ();
-				break;
-
-			case XmlNodeType.CDATA:
-				isSignificantWhitespace = isWhitespace = false;
-				isText = true;
-
-				ValidateText ();
-
-				if (currentTextValue != null) {
-					currentTextValue = constructingTextValue;
-					constructingTextValue = null;
-					return true;
-				}
-				break;
-			case XmlNodeType.SignificantWhitespace:
-				if (!isText)
-					isSignificantWhitespace = true;
-				isWhitespace = false;
-				goto case XmlNodeType.DocumentFragment;
-			case XmlNodeType.Text:
-				isWhitespace = isSignificantWhitespace = false;
-				isText = true;
-				goto case XmlNodeType.DocumentFragment;
-			case XmlNodeType.DocumentFragment:
-				// it should not happen, but in case if
-				// XmlReader really returns it, just ignore.
-				if (reader.NodeType == XmlNodeType.DocumentFragment)
-					break;
-
-				ValidateText ();
-
-				break;
-			case XmlNodeType.Whitespace:
-				if (!isText && !isSignificantWhitespace)
-					isWhitespace = true;
-				goto case XmlNodeType.DocumentFragment;
-			}
-			if (isWhitespace)
-				ValidateWhitespaceNode ();
-			currentTextValue = constructingTextValue;
-			constructingTextValue = null;
-			return true;
-		}
-
-		private void FillAttributes ()
-		{
-			if (reader.MoveToFirstAttribute ()) {
-				do {
-					AttributeSlot slot = GetAttributeSlot ();
-					slot.Name = reader.Name;
-					slot.LocalName = reader.LocalName;
-					slot.Prefix = reader.Prefix;
-					slot.NS = reader.NamespaceURI;
-					slot.Value = reader.Value;
-				} while (reader.MoveToNextAttribute ());
-				reader.MoveToElement ();
-			}
-		}
-
-		private void ValidateText ()
-		{
-			if (currentAutomata == null)
-				return;
-
-			DTDElementDeclaration elem = null;
-			if (elementStack.Count > 0)
-				elem = dtd.ElementDecls [elementStack.Peek () as string];
-			// Here element should have been already validated, so
-			// if no matching declaration is found, simply ignore.
-			if (elem != null && !elem.IsMixedContent && !elem.IsAny && !isWhitespace) {
-				HandleError (String.Format ("Current element {0} does not allow character data content.", elementStack.Peek () as string),
-					XmlSeverityType.Error);
-				currentAutomata = previousAutomata;
-			}
-		}
-
-		private void ValidateWhitespaceNode ()
-		{
-			// VC Standalone Document Declaration (2.9)
-			if (this.isStandalone && DTD != null && elementStack.Count > 0) {
-				DTDElementDeclaration elem = DTD.ElementDecls [elementStack.Peek () as string];
-				if (elem != null && !elem.IsInternalSubset && !elem.IsMixedContent && !elem.IsAny && !elem.IsEmpty)
-					HandleError ("In a standalone document, whitespace cannot appear in an element which is declared to contain only element children.", XmlSeverityType.Error);
-			}
-		}
-
-		private XmlException NotWFError (string message)
-		{
-			return new XmlException (this as IXmlLineInfo, BaseURI, message);
-		}
-
-		private void HandleError (string message, XmlSeverityType severity)
-		{
-			if (validatingReader != null &&
-				validatingReader.ValidationType == ValidationType.None)
-				return;
-
-			IXmlLineInfo info = this as IXmlLineInfo;
-			bool hasLine = info.HasLineInfo ();
-			XmlSchemaException ex = new XmlSchemaException (
-				message,
-				hasLine ? info.LineNumber : 0,
-				hasLine ? info.LinePosition : 0, 
-				null,
-				BaseURI, 
-				null);
-			HandleError (ex, severity);
-		}
-
-		private void HandleError (XmlSchemaException ex, XmlSeverityType severity)
-		{
-			if (validatingReader != null &&
-				validatingReader.ValidationType == ValidationType.None)
-				return;
-
-			if (validatingReader != null)
-				this.validatingReader.OnValidationEvent (this,
-					new ValidationEventArgs (ex, ex.Message, severity));
-			else if (severity == XmlSeverityType.Error)
-				throw ex;
-		}
-
-		private void ValidateAttributes (DTDAttListDeclaration decl, bool validate)
-		{
-			DtdValidateAttributes (decl, validate);
-
-			for (int i = 0; i < attributeCount; i++) {
-				AttributeSlot slot = attributes [i];
-				if (slot.Name == "xmlns" || slot.Prefix == "xmlns")
-					nsmgr.AddNamespace (
-						slot.Prefix == "xmlns" ? slot.LocalName : String.Empty,
-						slot.Value);
-			}
-
-			for (int i = 0; i < attributeCount; i++) {
-				AttributeSlot slot = attributes [i];
-				if (slot.Name == "xmlns")
-					slot.NS = XmlNamespaceManager.XmlnsXmlns;
-				else if (slot.Prefix.Length > 0)
-					slot.NS = LookupNamespace (slot.Prefix);
-				else
-					slot.NS = String.Empty;
-			}
-		}
-
-		AttributeSlot GetAttributeSlot ()
-		{
-			if (attributeCount == attributes.Length) {
-				AttributeSlot [] tmp = new AttributeSlot [attributeCount << 1];
-				Array.Copy (attributes, tmp, attributeCount);
-				attributes = tmp;
-			}
-			if (attributes [attributeCount] == null)
-				attributes [attributeCount] = new AttributeSlot ();
-			AttributeSlot slot = attributes [attributeCount];
-			slot.Clear ();
-			attributeCount++;
-			return slot;
-		}
-
-		private void DtdValidateAttributes (DTDAttListDeclaration decl, bool validate)
-		{
-			while (reader.MoveToNextAttribute ()) {
-				string attrName = reader.Name;
-				AttributeSlot slot = GetAttributeSlot ();
-				slot.Name = reader.Name;
-				slot.LocalName = reader.LocalName;
-				slot.Prefix = reader.Prefix;
-				XmlReader targetReader = reader;
-				string attrValue = String.Empty;
-				// For attribute node, it always resolves
-				// entity references on attributes.
-				while (attributeValueEntityStack.Count >= 0) {
-					if (!targetReader.ReadAttributeValue ()) {
-						if (attributeValueEntityStack.Count > 0) {
-							targetReader = attributeValueEntityStack.Pop () as XmlReader;
-							continue;
-						} else
-							break;
-					}
-					switch (targetReader.NodeType) {
-					case XmlNodeType.EntityReference:
-						DTDEntityDeclaration edecl = DTD.EntityDecls [targetReader.Name];
-						if (edecl == null) {
-							HandleError (String.Format ("Referenced entity {0} is not declared.", targetReader.Name),
-								XmlSeverityType.Error);
-						} else {
-							XmlTextReader etr = new XmlTextReader (edecl.EntityValue, XmlNodeType.Attribute, ParserContext);
-							attributeValueEntityStack.Push (targetReader);
-							targetReader = etr;
-							continue;
-						}
-						break;
-					case XmlNodeType.EndEntity:
-						break;
-					default:
-						attrValue += targetReader.Value;
-						break;
-					}
-				}
-				
-				reader.MoveToElement ();
-				reader.MoveToAttribute (attrName);
-				slot.Value = FilterNormalization (attrName, attrValue);
-
-				if (!validate)
-					continue;
-
-				// Validation
-
-				DTDAttributeDefinition def = decl [reader.Name];
-				if (def == null) {
-					HandleError (String.Format ("Attribute {0} is not declared.", reader.Name),
-						XmlSeverityType.Error);
-					continue;
-				}
-
-				// check enumeration constraint
-				if (def.EnumeratedAttributeDeclaration.Count > 0)
-					if (!def.EnumeratedAttributeDeclaration.Contains (slot.Value))
-						HandleError (String.Format ("Attribute enumeration constraint error in attribute {0}, value {1}.",
-							reader.Name, attrValue), XmlSeverityType.Error);
-				if (def.EnumeratedNotations.Count > 0)
-					if (!def.EnumeratedNotations.Contains (
-						slot.Value))
-						HandleError (String.Format ("Attribute notation enumeration constraint error in attribute {0}, value {1}.",
-							reader.Name, attrValue), XmlSeverityType.Error);
-
-				// check type constraint
-				string normalized = null;
-				if (def.Datatype != null)
-					normalized = FilterNormalization (def.Name, attrValue);
-				else
-					normalized = attrValue;
-				DTDEntityDeclaration ent;
-
-				// Common process to get list value
-				string [] list = null;
-				switch (def.Datatype.TokenizedType) {
-				case XmlTokenizedType.IDREFS:
-				case XmlTokenizedType.ENTITIES:
-				case XmlTokenizedType.NMTOKENS:
-					try {
-						list = def.Datatype.ParseValue (normalized, NameTable, null) as string [];
-					} catch (Exception) {
-						HandleError ("Attribute value is invalid against its data type.", XmlSeverityType.Error);
-						list = new string [0];
-					}
-					break;
-				default:
-					try {
-						def.Datatype.ParseValue (normalized, NameTable, null);
-					} catch (Exception ex) {
-						HandleError (String.Format ("Attribute value is invalid against its data type '{0}'. {1}", def.Datatype, ex.Message), XmlSeverityType.Error);
-					}
-					break;
-				}
-
-				switch (def.Datatype.TokenizedType) {
-				case XmlTokenizedType.ID:
-					if (this.idList.Contains (normalized)) {
-						HandleError (String.Format ("Node with ID {0} was already appeared.", attrValue),
-							XmlSeverityType.Error);
-					} else {
-						if (missingIDReferences.Contains (normalized))
-							missingIDReferences.Remove (normalized);
-						idList.Add (normalized);
-					}
-					break;
-				case XmlTokenizedType.IDREF:
-					if (!idList.Contains (normalized))
-						missingIDReferences.Add (normalized);
-					break;
-				case XmlTokenizedType.IDREFS:
-					for (int i = 0; i < list.Length; i++) {
-						string idref = list [i];
-						if (!idList.Contains (idref))
-							missingIDReferences.Add (idref);
-					}
-					break;
-				case XmlTokenizedType.ENTITY:
-					ent = dtd.EntityDecls [normalized];
-					if (ent == null)
-						HandleError ("Reference to undeclared entity was found in attribute: " + reader.Name + ".", XmlSeverityType.Error);
-					else if (ent.NotationName == null)
-						HandleError ("The entity specified by entity type value must be an unparsed entity. The entity definition has no NDATA in attribute: " + reader.Name + ".", XmlSeverityType.Error);
-					break;
-				case XmlTokenizedType.ENTITIES:
-					for (int i = 0; i < list.Length; i++) {
-						string entref = list [i];
-						ent = dtd.EntityDecls [FilterNormalization (reader.Name, entref)];
-						if (ent == null)
-							HandleError ("Reference to undeclared entity was found in attribute: " + reader.Name + ".", XmlSeverityType.Error);
-						else if (ent.NotationName == null)
-							HandleError ("The entity specified by ENTITIES type value must be an unparsed entity. The entity definition has no NDATA in attribute: " + reader.Name + ".", XmlSeverityType.Error);
-					}
-					break;
-//				case XmlTokenizedType.NMTOKEN: nothing to do
-//				case XmlTokenizedType.NMTOKENS: nothing to do
-				}
-
-				if (isStandalone && !def.IsInternalSubset && 
-					attrValue != normalized)
-					HandleError ("In standalone document, attribute value characters must not be checked against external definition.", XmlSeverityType.Error);
-
-				if (def.OccurenceType == 
-					DTDAttributeOccurenceType.Fixed &&
-					attrValue != def.DefaultValue)
-					HandleError (String.Format ("Fixed attribute {0} in element {1} has invalid value {2}.",
-						def.Name, decl.Name, attrValue),
-						XmlSeverityType.Error);
-			}
-
-			if (validate)
-				VerifyDeclaredAttributes (decl);
-
-			MoveToElement ();
-		}
-
-		void ReadDoctype ()
-		{
-			FillAttributes ();
-
-			IHasXmlParserContext ctx = reader as IHasXmlParserContext;
-			if (ctx != null)
-				dtd = ctx.ParserContext.Dtd;
-			if (dtd == null) {
-				XmlTextReaderImpl xmlTextReader = new XmlTextReaderImpl ("", XmlNodeType.Document, null);
-				xmlTextReader.XmlResolver = resolver;
-				xmlTextReader.GenerateDTDObjectModel (reader.Name,
-					reader ["PUBLIC"], reader ["SYSTEM"], reader.Value);
-				dtd = xmlTextReader.DTD;
-			}
-			currentAutomata = dtd.RootAutomata;
-
-			// Validity Constraint Check.
-			for (int i = 0; i < DTD.Errors.Length; i++)
-				HandleError (DTD.Errors [i].Message, XmlSeverityType.Error);
-
-			// NData target exists.
-			foreach (DTDEntityDeclaration ent in dtd.EntityDecls.Values)
-				if (ent.NotationName != null && dtd.NotationDecls [ent.NotationName] == null)
-					this.HandleError ("Target notation was not found for NData in entity declaration " + ent.Name + ".",
-						XmlSeverityType.Error);
-			// NOTATION exists for attribute default values
-			foreach (DTDAttListDeclaration attListIter in dtd.AttListDecls.Values) {
-				foreach (DTDAttributeDefinition def in attListIter.Definitions) {
-					if (def.Datatype.TokenizedType != XmlTokenizedType.NOTATION)
-						continue;
-					foreach (string notation in def.EnumeratedNotations)
-						if (dtd.NotationDecls [notation] == null)
-							this.HandleError ("Target notation was not found for NOTATION typed attribute default " + def.Name + ".",
-								XmlSeverityType.Error);
-				}
-			}
-		}
-
-		void ProcessStartElement ()
-		{
-			nsmgr.PushScope ();
-			popScope = reader.IsEmptyElement;
-			elementStack.Push (reader.Name);
-
-			currentElement = Name;
-
-			// If no DTD, skip validation.
-			if (currentAutomata == null) {
-				ValidateAttributes (null, false);
-				if (reader.IsEmptyElement)
-					ProcessEndElement ();
-				return;
-			}
-
-			// StartElementDeriv
-
-			previousAutomata = currentAutomata;
-			currentAutomata = currentAutomata.TryStartElement (reader.Name);
-			if (currentAutomata == DTD.Invalid) {
-				HandleError (String.Format ("Invalid start element found: {0}", reader.Name),
-					XmlSeverityType.Error);
-				currentAutomata = previousAutomata;
-			}
-
-			DTDElementDeclaration elem =
-				DTD.ElementDecls [reader.Name];
-			if (elem == null) {
-				HandleError (String.Format ("Element {0} is not declared.", reader.Name),
-					XmlSeverityType.Error);
-				currentAutomata = previousAutomata;
-			}
-
-			automataStack.Push (currentAutomata);
-			if (elem != null)	// i.e. not invalid
-				currentAutomata = elem.ContentModel.GetAutomata ();
-
-			DTDAttListDeclaration attList = dtd.AttListDecls [currentElement];
-			if (attList != null) {
-				// check attributes
-				ValidateAttributes (attList, true);
-				currentAttribute = -1;
-			} else {
-				if (reader.HasAttributes) {
-					HandleError (String.Format (
-						"Attributes are found on element {0} while it has no attribute definitions.", currentElement),
-						XmlSeverityType.Error);
-				}
-				// SetupValidityIgnorantAttributes ();
-				ValidateAttributes (null, false);
-			}
-			// If it is empty element then directly check end element.
-			if (reader.IsEmptyElement)
-				ProcessEndElement ();
-		}
-
-		void ProcessEndElement ()
-		{
-			popScope = true;
-			elementStack.Pop ();
-
-			// If no schema specification, then skip validation.
-			if (currentAutomata == null)
-				return;
-
-			// EndElementDeriv
-			DTDElementDeclaration elem =
-				DTD.ElementDecls [reader.Name];
-			if (elem == null) {
-				HandleError (String.Format ("Element {0} is not declared.", reader.Name),
-					XmlSeverityType.Error);
-			}
-
-			previousAutomata = currentAutomata;
-			// Don't let currentAutomata
-			DTDAutomata tmpAutomata = currentAutomata.TryEndElement ();
-			if (tmpAutomata == DTD.Invalid) {
-				HandleError (String.Format ("Invalid end element found: {0}", reader.Name),
-					XmlSeverityType.Error);
-				currentAutomata = previousAutomata;
-			}
-
-			currentAutomata = automataStack.Pop () as DTDAutomata;
-		}
-
-		void VerifyDeclaredAttributes (DTDAttListDeclaration decl)
-		{
-			// Check if all required attributes exist, and/or
-			// if there is default values, then add them.
-			for (int i = 0; i < decl.Definitions.Count; i++) {
-				DTDAttributeDefinition def = (DTDAttributeDefinition) decl.Definitions [i];
-				bool exists = false;
-				for (int a = 0; a < attributeCount; a++) {
-					if (attributes [a].Name == def.Name) {
-						exists = true;
-						break;
-					}
-				}
-				if (exists)
-					continue;
-
-				if (def.OccurenceType == DTDAttributeOccurenceType.Required) {
-					HandleError (String.Format ("Required attribute {0} in element {1} not found .",
-						def.Name, decl.Name),
-						XmlSeverityType.Error);
-					continue;
-				}
-
-				else if (def.DefaultValue == null)
-					continue;
-
-				if (this.isStandalone && !def.IsInternalSubset)
-					HandleError ("In standalone document, external default value definition must not be applied.", XmlSeverityType.Error);
-
-				switch (validatingReader.ValidationType) {
-				case ValidationType.Auto:
-					if (validatingReader.Schemas.Count == 0)
-						goto case ValidationType.DTD;
-					break;
-				case ValidationType.DTD:
-				case ValidationType.None:
-					// Other than them, ignore DTD defaults.
-					AttributeSlot slot = GetAttributeSlot ();
-					slot.Name = def.Name;
-					int colonAt = def.Name.IndexOf (':');
-					slot.LocalName = colonAt < 0 ? def.Name :
-						def.Name.Substring (colonAt + 1);
-					string prefix = colonAt < 0 ?
-						String.Empty :
-						def.Name.Substring (0, colonAt);
-					slot.Prefix = prefix;
-					slot.Value = def.DefaultValue;
-					slot.IsDefault = true;
-					break;
-				}
-			}
-		}
-
-		public override bool ReadAttributeValue ()
-		{
-			if (consumedAttribute)
-				return false;
-			if (NodeType == XmlNodeType.Attribute &&
-			    EntityHandling == EntityHandling.ExpandEntities) {
-				consumedAttribute = true;
-				return true;
-			}
-			else if (IsDefault) {
-				consumedAttribute = true;
-				return true;
-			}
-			else
-				return reader.ReadAttributeValue ();
-		}
-
-		public override void ResolveEntity ()
-		{
-			reader.ResolveEntity ();
-		}
-
-		public override int AttributeCount {
-			get {
-				if (currentTextValue != null)
-					return 0;
-
-				return attributeCount;
-			}
-		}
-
-		public override string BaseURI {
-			get {
-				return reader.BaseURI;
-			}
-		}
-
-		public override bool CanResolveEntity {
-			get { return true; }
-		}
-
-		public override int Depth {
-			get {
-				int baseNum = reader.Depth;
-				if (currentTextValue != null && reader.NodeType == XmlNodeType.EndElement)
-					baseNum++;
-
-				return IsDefault ? baseNum + 1 : baseNum;
-			}
-		}
-
-		public override bool EOF {
-			get { return reader.EOF; }
-		}
-
-		public override bool HasValue {
-			get {
-				return currentAttribute >= 0 ? true :
-					currentTextValue != null ? true :
-					reader.HasValue;
-			}
-		}
-
-		public override bool IsDefault {
-			get {
-				if (currentTextValue != null)
-					return false;
-				if (currentAttribute == -1)
-					return false;
-				return attributes [currentAttribute].IsDefault;
-			}
-		}
-
-		public override bool IsEmptyElement {
-			get {
-				if (currentTextValue != null)
-					return false;
-				return reader.IsEmptyElement;
-			}
-		}
-
-		public override string this [int i] {
-			get { return GetAttribute (i); }
-		}
-
-		public override string this [string name] {
-			get { return GetAttribute (name); }
-		}
-
-		public override string this [string name, string ns] {
-			get { return GetAttribute (name, ns); }
-		}
-
-		public int LineNumber {
-			get {
-				IXmlLineInfo info = reader as IXmlLineInfo;
-				return (info != null) ? info.LineNumber : 0;
-			}
-		}
-
-		public int LinePosition {
-			get {
-				IXmlLineInfo info = reader as IXmlLineInfo;
-				return (info != null) ? info.LinePosition : 0;
-			}
-		}
-
-		public override string LocalName {
-			get {
-				if (currentTextValue != null || consumedAttribute)
-					return String.Empty;
-				else if (NodeType == XmlNodeType.Attribute)
-					return attributes [currentAttribute].LocalName;
-				else
-					return reader.LocalName;
-			}
-		}
-
-		public override string Name {
-			get {
-				if (currentTextValue != null || consumedAttribute)
-					return String.Empty;
-				else if (NodeType == XmlNodeType.Attribute)
-					return attributes [currentAttribute].Name;
-				else
-					return reader.Name;
-			}
-		}
-
-		public override string NamespaceURI {
-			get {
-				if (currentTextValue != null || consumedAttribute)
-					return String.Empty;
-				switch (NodeType) {
-				case XmlNodeType.Attribute:
-					return (string) attributes [currentAttribute].NS;
-				case XmlNodeType.Element:
-				case XmlNodeType.EndElement:
-					return nsmgr.LookupNamespace (Prefix);
-				default:
-					return String.Empty;
-				}
-			}
-		}
-
-		public override XmlNameTable NameTable {
-			get { return reader.NameTable; }
-		}
-
-		public override XmlNodeType NodeType {
-			get {
-				if (currentTextValue != null)
-					return isSignificantWhitespace ? XmlNodeType.SignificantWhitespace :
-						isWhitespace ? XmlNodeType.Whitespace :
-						XmlNodeType.Text;
-
-				// If consumedAttribute is true, then entities must be resolved.
-				return consumedAttribute ? XmlNodeType.Text :
-					IsDefault ? XmlNodeType.Attribute :
-					reader.NodeType;
-			}
-		}
-
-		public XmlParserContext ParserContext {
-			get { return XmlSchemaUtil.GetParserContext (reader); }
-		}
-
-		public override string Prefix {
-			get {
-				if (currentTextValue != null || consumedAttribute)
-					return String.Empty;
-				else if (NodeType == XmlNodeType.Attribute)
-					return attributes [currentAttribute].Prefix;
-				else
-					return reader.Prefix;
-			}
-		}
-		
-		public override char QuoteChar {
-			get {
-				// If it is not actually on an attribute, then it returns
-				// undefined value or '"'.
-				return reader.QuoteChar;
-			}
-		}
-
-		public override ReadState ReadState {
-			get {
-				if (reader.ReadState == ReadState.EndOfFile && currentTextValue != null)
-					return ReadState.Interactive;
-				return reader.ReadState;
-			}
-		}
-
-		public object SchemaType {
-			get {
-				if (DTD == null || currentAttribute == -1 ||
-				    currentElement == null)
-					return null;
-				DTDAttListDeclaration decl =
-					DTD.AttListDecls [currentElement];
-				DTDAttributeDefinition def =
-					decl != null ? decl [attributes [currentAttribute].Name] : null;
-				return def != null ? def.Datatype : null;
-			}
-		}
-
-		char [] whitespaceChars = new char [] {' '};
-		private string FilterNormalization (string attrName, string rawValue)
-		{
-			if (DTD == null || sourceTextReader == null ||
-			    !sourceTextReader.Normalization)
-				return rawValue;
-
-			DTDAttributeDefinition def = 
-				dtd.AttListDecls [currentElement].Get (attrName);
-			valueBuilder.Append (rawValue);
-			valueBuilder.Replace ('\r', ' ');
-			valueBuilder.Replace ('\n', ' ');
-			valueBuilder.Replace ('\t', ' ');
-			try {
-				if (def.Datatype.TokenizedType == XmlTokenizedType.CDATA)
-					return valueBuilder.ToString ();
-				for (int i=0; i < valueBuilder.Length; i++) {
-					if (valueBuilder [i] != ' ')
-						continue;
-					while (++i < valueBuilder.Length && valueBuilder [i] == ' ')
-						valueBuilder.Remove (i, 1);
-				}
-				return valueBuilder.ToString ().Trim (whitespaceChars);
-			} finally {
-				valueBuilder.Length = 0;
-			}
-		}
-
-		// LAMESPEC: When source XmlTextReader.Normalize is true, then
-		// every Attribute node is normalized. However, corresponding
-		// Values of attribute value Text nodes are not.
-		public override string Value {
-			get {
-				if (currentTextValue != null)
-					return currentTextValue;
-				// As to this property, MS.NET seems ignorant of EntityHandling...
-				else if (NodeType == XmlNodeType.Attribute
-					// It also covers default attribute text.
- 					|| consumedAttribute)
-					return attributes [currentAttribute].Value;
-				else
-					return reader.Value;
-			}
-		}
-
-		public override string XmlLang {
-			get {
-				string val = this ["xml:lang"];
-				return val != null ? val : reader.XmlLang;
-			}
-		}
-
-		internal XmlResolver Resolver {
-			get { return resolver; }
-		}
-
-		public XmlResolver XmlResolver {
-			set {
-				if (dtd != null)
-					dtd.XmlResolver = value;
-				resolver = value;
-			}
-		}
-
-		public override XmlSpace XmlSpace {
-			get {
-				string val = this ["xml:space"];
-				switch (val) {
-				case "preserve":
-					return XmlSpace.Preserve;
-				case "default":
-					return XmlSpace.Default;
-				default:
-					return reader.XmlSpace;
-				}
-			}
-		}
-
-	}
-}
diff --git a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
deleted file mode 100644
index ea37b4ed6f0..00000000000
--- a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
+++ /dev/null
@@ -1,462 +0,0 @@
-//
-// EntityResolvingXmlReader.cs - XmlReader that handles entity resolution
-//
-// Author:
-//   Atsushi Enomoto  (ginga@kit.hi-ho.ne.jp)
-//
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-using System.Collections.Generic;
-#endif
-using System;
-using System.Globalization;
-using System.IO;
-using System.Security.Permissions;
-using System.Text;
-using System.Xml.Schema;
-using System.Xml;
-
-namespace Mono.Xml
-{
-	[PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
-	internal class EntityResolvingXmlReader : XmlReader,
-#if NET_2_0
-		IXmlNamespaceResolver,
-#endif
-		IXmlLineInfo, IHasXmlParserContext
-	{
-		EntityResolvingXmlReader entity;
-		XmlReader source;
-		XmlParserContext context;
-		XmlResolver resolver;
-		EntityHandling entity_handling;
-		bool entity_inside_attr;
-		bool inside_attr;
-		bool do_resolve;
-
-		public EntityResolvingXmlReader (XmlReader source, XmlParserContext context)
-		{
-			this.source = source;
-			this.context = context;
-		}
-
-		EntityResolvingXmlReader (XmlReader entityContainer,
-			bool inside_attr)
-		{
-			source = entityContainer;
-			this.entity_inside_attr = inside_attr;
-		}
-
-		#region Properties
-
-		private XmlReader Current {
-			get { return entity != null && entity.ReadState != ReadState.Initial ? (XmlReader) entity : source; }
-		}
-
-#if NET_2_0
-#else
-		public override string this [int i] {
-			get { return GetAttribute (i); }
-		}
-
-		public override string this [string name] {
-			get { return GetAttribute (name); }
-		}
-
-		public override string this [string localName, string namespaceName] {
-			get { return GetAttribute (localName, namespaceName); }
-		}
-#endif
-
-		public override int AttributeCount {
-			get { return Current.AttributeCount; }
-		}
-
-		public override string BaseURI {
-			get { return Current.BaseURI; }
-		}
-
-		public override bool CanResolveEntity {
-			get { return true; }
-		}
-
-		public override int Depth {
-			get {
-				// On EndEntity, depth is the same as that 
-				// of EntityReference.
-				if (entity != null && entity.ReadState == ReadState.Interactive)
-					return source.Depth + entity.Depth + 1;
-				else
-					return source.Depth;
-			}
-		}
-
-		public override bool EOF {
-			get { return source.EOF; }
-		}
-
-		public override bool HasValue {
-			get { return Current.HasValue; }
-		}
-
-		public override bool IsDefault {
-			get { return Current.IsDefault; }
-		}
-
-		public override bool IsEmptyElement {
-			get { return Current.IsEmptyElement; }
-		}
-
-		public override string LocalName {
-			get { return Current.LocalName; }
-		}
-
-		public override string Name {
-			get { return Current.Name; }
-		}
-
-		public override string NamespaceURI {
-			get { return Current.NamespaceURI; }
-		}
-
-		public override XmlNameTable NameTable {
-			get { return Current.NameTable; }
-		}
-
-		public override XmlNodeType NodeType {
-			get {
-				if (entity != null) {
-					if (entity.ReadState == ReadState.Initial)
-						return source.NodeType;
-					return entity.EOF ? XmlNodeType.EndEntity : entity.NodeType;
-				}
-				return source.NodeType;
-			}
-		}
-
-		internal XmlParserContext ParserContext {
-			get { return context; }
-		}
-
-		XmlParserContext IHasXmlParserContext.ParserContext {
-			get { return context; }
-		}
-
-		public override string Prefix {
-			get { return Current.Prefix; }
-		}
-
-		public override char QuoteChar {
-			get { return Current.QuoteChar; }
-		}
-
-		public override ReadState ReadState {
-			get { return entity != null ? ReadState.Interactive : source.ReadState; }
-		}
-
-		public override string Value {
-			get { return Current.Value; }
-		}
-
-		public override string XmlLang {
-			get { return Current.XmlLang; }
-		}
-
-		public override XmlSpace XmlSpace {
-			get { return Current.XmlSpace; }
-		}
-
-		// non-overrides
-
-		private void CopyProperties (EntityResolvingXmlReader other)
-		{
-			context = other.context;
-			resolver = other.resolver;
-			entity_handling = other.entity_handling;
-		}
-
-		// public members
-
-		public EntityHandling EntityHandling {
-			get { return entity_handling; }
-			set {
-				if (entity != null)
-					entity.EntityHandling = value;
-				entity_handling = value;
-			}
-		}
-
-		public int LineNumber {
-			get {
-				IXmlLineInfo li = Current as IXmlLineInfo;
-				return li == null ? 0 : li.LineNumber;
-			}
-		}
-
-		public int LinePosition {
-			get {
-				IXmlLineInfo li = Current as IXmlLineInfo;
-				return li == null ? 0 : li.LinePosition;
-			}
-		}
-
-		public XmlResolver XmlResolver {
-			set {
-				if (entity != null)
-					entity.XmlResolver = value;
-				resolver = value;
-			}
-		}
-
-		#endregion
-
-		#region Methods
-
-		// overrides
-
-		public override void Close ()
-		{
-			if (entity != null)
-				entity.Close ();
-			source.Close ();
-		}
-
-		public override string GetAttribute (int i)
-		{
-			return Current.GetAttribute (i);
-		}
-
-		// MS.NET 1.0 msdn says that this method returns String.Empty
-		// for absent attribute, but in fact it returns null.
-		// This description is corrected in MS.NET 1.1 msdn.
-		public override string GetAttribute (string name)
-		{
-			return Current.GetAttribute (name);
-		}
-
-		public override string GetAttribute (string localName, string namespaceURI)
-		{
-			return Current.GetAttribute (localName, namespaceURI);
-		}
-
-#if NET_2_0
-		public IDictionary<string, string> GetNamespacesInScope (XmlNamespaceScope scope)
-		{
-			return ((IXmlNamespaceResolver) Current).GetNamespacesInScope (scope);
-		}
-
-		IDictionary<string, string> IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope)
-		{
-			return GetNamespacesInScope (scope);
-		}
-
-		string IXmlNamespaceResolver.LookupPrefix (string ns)
-		{
-			return ((IXmlNamespaceResolver) Current).LookupPrefix (ns);
-		}
-#endif
-
-		public override string LookupNamespace (string prefix)
-		{
-			return Current.LookupNamespace (prefix);
-		}
-
-		public override void MoveToAttribute (int i)
-		{
-			if (entity != null && entity_inside_attr) {
-				entity.Close ();
-				entity = null;
-			}
-			Current.MoveToAttribute (i);
-			inside_attr = true;
-		}
-
-		public override bool MoveToAttribute (string name)
-		{
-			if (entity != null && !entity_inside_attr)
-				return entity.MoveToAttribute (name);
-			if (!source.MoveToAttribute (name))
-				return false;
-			if (entity != null && entity_inside_attr) {
-				entity.Close ();
-				entity = null;
-			}
-			inside_attr = true;
-			return true;
-		}
-
-		public override bool MoveToAttribute (string localName, string namespaceName)
-		{
-			if (entity != null && !entity_inside_attr)
-				return entity.MoveToAttribute (localName, namespaceName);
-			if (!source.MoveToAttribute (localName, namespaceName))
-				return false;
-			if (entity != null && entity_inside_attr) {
-				entity.Close ();
-				entity = null;
-			}
-			inside_attr = true;
-			return true;
-		}
-
-		public override bool MoveToElement ()
-		{
-			if (entity != null && entity_inside_attr) {
-				entity.Close ();
-				entity = null;
-			}
-			if (!Current.MoveToElement ())
-				return false;
-			inside_attr = false;
-			return true;
-		}
-
-		public override bool MoveToFirstAttribute ()
-		{
-			if (entity != null && !entity_inside_attr)
-				return entity.MoveToFirstAttribute ();
-			if (!source.MoveToFirstAttribute ())
-				return false;
-			if (entity != null && entity_inside_attr) {
-				entity.Close ();
-				entity = null;
-			}
-			inside_attr = true;
-			return true;
-		}
-
-		public override bool MoveToNextAttribute ()
-		{
-			if (entity != null && !entity_inside_attr)
-				return entity.MoveToNextAttribute ();
-			if (!source.MoveToNextAttribute ())
-				return false;
-			if (entity != null && entity_inside_attr) {
-				entity.Close ();
-				entity = null;
-			}
-			inside_attr = true;
-			return true;
-		}
-
-		public override bool Read ()
-		{
-			if (do_resolve) {
-				DoResolveEntity ();
-				do_resolve = false;
-			}
-
-			inside_attr = false;
-
-			if (entity != null && (entity_inside_attr || entity.EOF)) {
-				entity.Close ();
-				entity = null;
-			}
-			if (entity != null) {
-				if (entity.Read ())
-					return true;
-				if (EntityHandling == EntityHandling.ExpandEntities) {
-					// EndEntity must be skipped
-					entity.Close ();
-					entity = null;
-					return Read ();
-				}
-				else
-					return true; // either success or EndEntity
-			}
-			else {
-				if (!source.Read ())
-					return false;
-				if (EntityHandling == EntityHandling.ExpandEntities
-					&& source.NodeType == XmlNodeType.EntityReference) {
-					ResolveEntity ();
-					return Read ();
-				}
-				return true;
-			}
-		}
-
-		public override bool ReadAttributeValue ()
-		{
-			if (entity != null && entity_inside_attr) {
-				if (entity.EOF) {
-					entity.Close ();
-					entity = null;
-				}
-				else {
-					entity.Read ();
-					return true; // either success or EndEntity
-				}
-			}
-			return Current.ReadAttributeValue ();
-		}
-
-		public override string ReadString ()
-		{
-			return base.ReadString ();
-		}
-
-		public override void ResolveEntity ()
-		{
-#if NET_2_0
-			DoResolveEntity ();
-#else
-			do_resolve = true;
-#endif
-		}
-
-		void DoResolveEntity ()
-		{
-			if (entity != null)
-				entity.ResolveEntity ();
-			else {
-				if (source.NodeType != XmlNodeType.EntityReference)
-					throw new InvalidOperationException ("The current node is not an Entity Reference");
-				if (ParserContext.Dtd == null)
-					throw new XmlException (this as IXmlLineInfo, this.BaseURI, String.Format ("Cannot resolve entity without DTD: '{0}'", source.Name));
-				XmlReader entReader = ParserContext.Dtd.GenerateEntityContentReader (
-					source.Name, ParserContext);
-				if (entReader == null)
-					throw new XmlException (this as IXmlLineInfo, this.BaseURI, String.Format ("Reference to undeclared entity '{0}'.", source.Name));
-
-				entity = new EntityResolvingXmlReader (
-					entReader, inside_attr);
-				entity.CopyProperties (this);
-			}
-		}
-
-		public override void Skip ()
-		{
-			base.Skip ();
-		}
-
-		public bool HasLineInfo ()
-		{
-			IXmlLineInfo li = Current as IXmlLineInfo;
-			return li == null ? false : li.HasLineInfo ();
-		}
-
-		#endregion
-	}
-}
diff --git a/mcs/class/System.XML/System.Xml/IHasXmlChildNode.cs b/mcs/class/System.XML/System.Xml/IHasXmlChildNode.cs
deleted file mode 100644
index ad13df39fd4..00000000000
--- a/mcs/class/System.XML/System.Xml/IHasXmlChildNode.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Xml.IHasXmlChildNode.cs
-//
-// Authors:
-//   Atsushi Enomoto (ginga@kit.hi-ho.ne.jp)
-//
-// Copyright (c) 2006 Novell, Inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Xml
-{
-	internal interface IHasXmlChildNode
-	{
-		XmlLinkedNode LastLinkedChild { get; set; }
-	}
-}
diff --git a/mcs/class/System.XML/System.Xml/NewLineHandling.cs b/mcs/class/System.XML/System.Xml/NewLineHandling.cs
index 0d215fe3fde..d6d713dfb2c 100644
--- a/mcs/class/System.XML/System.Xml/NewLineHandling.cs
+++ b/mcs/class/System.XML/System.Xml/NewLineHandling.cs
@@ -25,17 +25,14 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+#if NET_2_0
 namespace System.Xml
 {
-#if NET_2_0
-	public
-#else
-	internal
-#endif
-	enum NewLineHandling
+	public enum NewLineHandling
 	{
 		Replace,
 		Entitize,
 		None
 	}
 }
+#endif
diff --git a/mcs/class/System.XML/System.Xml/XmlAttribute.cs b/mcs/class/System.XML/System.Xml/XmlAttribute.cs
index 4ec826437bf..39fb89271ca 100644
--- a/mcs/class/System.XML/System.Xml/XmlAttribute.cs
+++ b/mcs/class/System.XML/System.Xml/XmlAttribute.cs
@@ -40,13 +40,12 @@ using System.Xml.Schema;
 
 namespace System.Xml
 {
-	public class XmlAttribute : XmlNode, IHasXmlChildNode
+	public class XmlAttribute : XmlNode
 	{
 		#region Fields
 
 		private XmlNameEntry name;
 		internal bool isDefault;
-		XmlLinkedNode lastLinkedChild;
 #if NET_2_0
 		private IXmlSchemaInfo schemaInfo;
 #endif
@@ -70,12 +69,10 @@ namespace System.Xml
 			XmlDocument doc,
 			bool atomizedNames, bool checkNamespace) : base (doc)
 		{
-			if (!atomizedNames) {
-				if (prefix == null)
-					prefix = String.Empty;
-				if (namespaceURI == null)
-					namespaceURI = String.Empty;
-			}
+			if (prefix == null)
+				prefix = String.Empty;
+			if (namespaceURI == null)
+				namespaceURI = String.Empty;
 
 			// Prefix "xml" should be also checked (http://www.w3.org/XML/xml-names-19990114-errata#NE05)
 			// but MS.NET ignores such case
@@ -87,15 +84,14 @@ namespace System.Xml
 					throw new ArgumentException ("Invalid attribute namespace for namespace declaration.");
 			}
 
-			if (!atomizedNames) {
-				// There are no means to identify the DOM is
-				// namespace-aware or not, so we can only 
-				// check Name validity.
-				if (prefix != "" && !XmlChar.IsName (prefix))
-					throw new ArgumentException ("Invalid attribute prefix.");
-				else if (!XmlChar.IsName (localName))
-					throw new ArgumentException ("Invalid attribute local name.");
+			// There are no means to identify the DOM is namespace-
+			// aware or not, so we can only check Name validity.
+			if (prefix != "" && !XmlChar.IsName (prefix))
+				throw new ArgumentException ("Invalid attribute prefix.");
+			else if (!XmlChar.IsName (localName))
+				throw new ArgumentException ("Invalid attribute local name.");
 
+			if (!atomizedNames) {
 				prefix = doc.NameTable.Add (prefix);
 				localName = doc.NameTable.Add (localName);
 				namespaceURI = doc.NameTable.Add (namespaceURI);
@@ -107,11 +103,6 @@ namespace System.Xml
 
 		#region Properties
 
-		XmlLinkedNode IHasXmlChildNode.LastLinkedChild {
-			get { return lastLinkedChild; }
-			set { lastLinkedChild = value; }
-		}
-
 		public override string BaseURI {
 			get { return OwnerElement != null ? OwnerElement.BaseURI : String.Empty; }
 		}
@@ -243,11 +234,11 @@ namespace System.Xml
 				XmlNode textChild = FirstChild as XmlCharacterData;
 				if (textChild == null) {
 					this.RemoveAll ();
-					AppendChild (OwnerDocument.CreateTextNode (value), false);
+					AppendChild (OwnerDocument.CreateTextNode (value));
 				}
 				else if (FirstChild.NextSibling != null) {
 					this.RemoveAll ();
-					AppendChild (OwnerDocument.CreateTextNode (value), false);
+					AppendChild (OwnerDocument.CreateTextNode (value));
 				}
 				else
 					textChild.Value = value;
@@ -304,8 +295,8 @@ namespace System.Xml
 			XmlNode node = new XmlAttribute (name.Prefix, name.LocalName, name.NS,
 							 OwnerDocument, true, false);
 			if (deep) {
-				for (XmlNode n = FirstChild; n != null; n = n.NextSibling)
-					node.AppendChild (n.CloneNode (deep), false);
+				for (int i = 0; i < ChildNodes.Count; i++)
+					node.AppendChild (ChildNodes [i].CloneNode (deep));
 			}
 
 			return node;
@@ -318,8 +309,8 @@ namespace System.Xml
 
 		public override void WriteContentTo (XmlWriter w)
 		{
-			for (XmlNode n = FirstChild; n != null; n = n.NextSibling)
-				n.WriteTo (w);
+			for (int i = 0; i < ChildNodes.Count; i++)
+				ChildNodes [i].WriteTo (w);
 		}
 
 		public override void WriteTo (XmlWriter w)
diff --git a/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs b/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs
index 7c4c54e7459..b6bd3ce5c51 100644
--- a/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs
+++ b/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs
@@ -111,7 +111,7 @@ namespace System.Xml
 		public void CopyTo (XmlAttribute[] array, int index)
 		{
 			// assuming that Nodes is a correct collection.
-			for(int i=0; i<Count; i++)
+			for(int i=0; i<Nodes.Count; i++)
 				array [index + i] = Nodes [i] as XmlAttribute;
 		}
 
@@ -128,14 +128,14 @@ namespace System.Xml
 #endif
 		{
 			if (refNode == null) {
-				if (Count == 0)
+				if (Nodes.Count == 0)
 					return InsertBefore (newNode, null);
 				else
 					return InsertBefore (newNode, this [0]);
 			}
-			for (int i = 0; i < Count; i++)
+			for (int i = 0; i < Nodes.Count; i++)
 				if (refNode == Nodes [i])
-					return InsertBefore (newNode, Count == i + 1 ? null : this [i + 1]);
+					return InsertBefore (newNode, Nodes.Count == i + 1 ? null : this [i + 1]);
 
 			throw new ArgumentException ("refNode not found in this collection.");
 		}
@@ -151,16 +151,16 @@ namespace System.Xml
 
 			ownerDocument.onNodeInserting (newNode, null);
 
-			int pos = Count;
+			int pos = Nodes.Count;
 			if (refNode != null) {
-				for (int i = 0; i < Count; i++) {
+				for (int i = 0; i < Nodes.Count; i++) {
 					XmlNode n = Nodes [i] as XmlNode;
 					if (n == refNode) {
 						pos = i;
 						break;
 					}
 				}
-				if (pos == Count)
+				if (pos == Nodes.Count)
 					throw new ArgumentException ("refNode not found in this collection.");
 			}
 			SetNamedItem (newNode, pos, false);
@@ -195,7 +195,7 @@ namespace System.Xml
 				throw new ArgumentException ("The specified attribute is not contained in the element.");
 
 			XmlAttribute retAttr = null;
-			for (int i = 0; i < Count; i++) {
+			for (int i = 0; i < Nodes.Count; i++) {
 				XmlAttribute attr = (XmlAttribute) Nodes [i];
 				if (attr == node) {
 					retAttr = attr;
@@ -244,7 +244,7 @@ namespace System.Xml
 		public virtual XmlAttribute RemoveAt (int i) 
 #endif
 		{
-			if(Count <= i)
+			if(Nodes.Count <= i)
 				return null;
 			return Remove ((XmlAttribute)Nodes [i]);
 		}
@@ -261,8 +261,7 @@ namespace System.Xml
 			ownerElement.OwnerDocument.onNodeInserting (node, ownerElement);
 
 			attr.AttributeOwnerElement = ownerElement;
-			XmlNode n = base.SetNamedItem (node, -1, false);
-			AdjustIdenticalAttributes (node as XmlAttribute, n == node ? null : n);
+			XmlNode n = AdjustIdenticalAttributes (node as XmlAttribute, base.SetNamedItem (node, -1, false));
 
 			ownerElement.OwnerDocument.onNodeInserted (node, ownerElement);
 
@@ -289,7 +288,7 @@ namespace System.Xml
 			if (doctype == null || doctype.DTD == null)
 				return;
 			DTDElementDeclaration elem = doctype.DTD.ElementDecls [ownerElement.Name];
-			for (int i = 0; i < Count; i++) {
+			for (int i = 0; i < Nodes.Count; i++) {
 				XmlAttribute node = (XmlAttribute) Nodes [i];
 				DTDAttributeDefinition attdef = elem == null ? null : elem.Attributes [node.Name];
 				if (attdef == null || attdef.Datatype.TokenizedType != XmlTokenizedType.ID)
@@ -313,24 +312,23 @@ namespace System.Xml
 
 		}
 
-		private void AdjustIdenticalAttributes (XmlAttribute node, XmlNode existing)
+		private XmlNode AdjustIdenticalAttributes (XmlAttribute node, XmlNode existing)
 		{
 			// If owner element is not appended to the document,
 			// ID table should not be filled.
 			if (ownerElement == null)
-				return;
+				return existing;
 
-			if (existing != null)
-				RemoveIdenticalAttribute (existing);
+			RemoveIdenticalAttribute (existing);
 
 			// Check if new attribute's datatype is ID.
 			XmlDocumentType doctype = node.OwnerDocument.DocumentType;
 			if (doctype == null || doctype.DTD == null)
-				return;
+				return existing;
 			DTDAttListDeclaration attList = doctype.DTD.AttListDecls [ownerElement.Name];
 			DTDAttributeDefinition attdef = attList == null ? null : attList.Get (node.Name);
 			if (attdef == null || attdef.Datatype.TokenizedType != XmlTokenizedType.ID)
-				return;
+				return existing;
 
 			// adding new identical attribute, but 
 			// MS.NET is pity for ID support, so I'm wondering how to correct it...
@@ -338,6 +336,8 @@ namespace System.Xml
 				throw new XmlException (String.Format (
 					"ID value {0} already exists in this document.", node.Value));
 			ownerDocument.AddIdenticalAttribute (node);
+
+			return existing;
 		}
 
 		private XmlNode RemoveIdenticalAttribute (XmlNode existing)
diff --git a/mcs/class/System.XML/System.Xml/XmlChar.cs b/mcs/class/System.XML/System.Xml/XmlChar.cs
index 299b887b2f2..dda9c7d3746 100644
--- a/mcs/class/System.XML/System.Xml/XmlChar.cs
+++ b/mcs/class/System.XML/System.Xml/XmlChar.cs
@@ -48,22 +48,16 @@ namespace System.Xml
 			return true;
 		}
 
-		public static int IndexOfNonWhitespace (string str)
-		{
-			for (int i = 0; i < str.Length; i++)
-				if (!IsWhitespace (str [i])) return i;
-			return -1;
-		}
-
 		public static bool IsFirstNameChar (int ch)
 		{
-			if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
-				return true;
-			} else if ((uint) ch <= 0xFFFF) {
-				return (nameBitmap[(firstNamePages[ch >> 8] << 3) + ((ch & 0xFF) >> 5)] & (1 << (ch & 0x1F))) != 0;
+			bool result = false;
+
+			if (ch >= 0 && ch <= 0xFFFF)
+			{
+				result = (nameBitmap[(firstNamePages[ch >> 8] << 3) + ((ch & 0xFF) >> 5)] & (1 << (ch & 0x1F))) != 0;
 			}
 
-			return false;
+			return result;
 		}
 
 		public static bool IsValid (int ch)
@@ -95,50 +89,16 @@ namespace System.Xml
 				return true;
 		}
 
-		public static int IndexOfInvalid (string s, bool allowSurrogate)
-		{
-			for (int i = 0; i < s.Length; i++)
-				if (IsInvalid (s [i])) {
-					if (!allowSurrogate ||
-					    i + 1 == s.Length ||
-					    s [i] < '\uD800' ||
-					    s [i] >= '\uDC00' ||
-					    s [i + 1] < '\uDC00' ||
-					    s [i + 1] >= '\uE000')
-						return i;
-					i++;
-				}
-			return -1;
-		}
-
-		public static int IndexOfInvalid (char [] s, int start, int length, bool allowSurrogate)
-		{
-			int end = start + length;
-			if (s.Length < end)
-				throw new ArgumentOutOfRangeException ("length");
-			for (int i = start; i < end; i++)
-				if (IsInvalid (s [i])) {
-					if (!allowSurrogate ||
-					    i + 1 == end ||
-					    s [i] < '\uD800' ||
-					    s [i] >= '\uDC00' ||
-					    s [i + 1] < '\uDC00' ||
-					    s [i + 1] >= '\uE000')
-						return i;
-					i++;
-				}
-			return -1;
-		}
-
 		public static bool IsNameChar (int ch)
 		{
-			if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
-				return true;
-			} else if ((uint) ch <= 0xFFFF) {
-				return (nameBitmap[(namePages[ch >> 8] << 3) + ((ch & 0xFF) >> 5)] & (1 << (ch & 0x1F))) != 0;
-			} else {
-				return false;
+			bool result = false;
+
+			if (ch >= 0 && ch <= 0xFFFF)
+			{
+				result = (nameBitmap[(namePages[ch >> 8] << 3) + ((ch & 0xFF) >> 5)] & (1 << (ch & 0x1F))) != 0;
 			}
+
+			return result;
 		}
 
 		public static bool IsNCNameChar (int ch)
diff --git a/mcs/class/System.XML/System.Xml/XmlDocument.cs b/mcs/class/System.XML/System.Xml/XmlDocument.cs
index 9a5873e728b..b1a967cf5d9 100644
--- a/mcs/class/System.XML/System.Xml/XmlDocument.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocument.cs
@@ -49,7 +49,7 @@ using Mono.Xml.XPath;
 
 namespace System.Xml
 {
-	public class XmlDocument : XmlNode, IHasXmlChildNode
+	public class XmlDocument : XmlNode
 	{
 		#region Fields
 
@@ -59,8 +59,7 @@ namespace System.Xml
 		bool preserveWhitespace = false;
 		XmlResolver resolver;
 		Hashtable idTable = new Hashtable ();
-		XmlNameEntryCache nameCache;
-		XmlLinkedNode lastLinkedChild;
+		XmlNameEntryCache nameCache = new XmlNameEntryCache ();
 #if NET_2_0
 		XmlSchemaSet schemas;
 		IXmlSchemaInfo schemaInfo;
@@ -96,7 +95,6 @@ namespace System.Xml
 				implementation = impl;
 
 			nameTable = (nt != null) ? nt : implementation.InternalNameTable;
-			nameCache = new XmlNameEntryCache (nameTable);
 			AddDefaultNameTableKeys ();
 			resolver = new XmlUrlResolver ();
 		}
@@ -120,11 +118,6 @@ namespace System.Xml
 
 		#region Properties
 
-		XmlLinkedNode IHasXmlChildNode.LastLinkedChild {
-			get { return lastLinkedChild; }
-			set { lastLinkedChild = value; }
-		}
-
 		public override string BaseURI {
 			get {
 				return baseURI;
@@ -147,12 +140,9 @@ namespace System.Xml
 
 		public virtual XmlDocumentType DocumentType {
 			get {
-				for (XmlNode n = FirstChild; n != null; n = n.NextSibling) {
-					if (n.NodeType == XmlNodeType.DocumentType)
-						return (XmlDocumentType) n;
-					else if (n.NodeType == XmlNodeType.Element) // document element
-						return null;
-				}
+				for (XmlNode n = FirstChild; n != null; n = n.NextSibling)
+					if(n.NodeType == XmlNodeType.DocumentType)
+						return (XmlDocumentType)n;
 
 				return null;
 			}
@@ -279,7 +269,7 @@ namespace System.Xml
 			if(deep)
 			{
 				for (XmlNode n = FirstChild; n != null; n = n.NextSibling)
-					doc.AppendChild (doc.ImportNode (n, deep), false);
+					doc.AppendChild (doc.ImportNode (n, deep));
 			}
 			return doc;
 		}
@@ -685,7 +675,7 @@ namespace System.Xml
 					if (n == null)
 						break;
 					if (preserveWhitespace || n.NodeType != XmlNodeType.Whitespace)
-						AppendChild (n, false);
+						AppendChild (n);
 				} while (true);
 #if NET_2_0
 				if (xmlReader.Settings != null)
@@ -779,13 +769,15 @@ namespace System.Xml
 			if (reader.SchemaInfo != null)
 				SchemaInfo = new XmlSchemaInfo (reader.SchemaInfo);
 #endif
-			bool isDefault = reader.IsDefault;
-
 			ReadAttributeNodeValue (reader, attribute);
 
-			if (isDefault)
+			// Keep the current reader position on attribute.
+			if (attribute.NamespaceURI == null)
+				reader.MoveToAttribute (attribute.Name);
+			else 
+				reader.MoveToAttribute (attribute.LocalName, attribute.NamespaceURI);
+			if (reader.IsDefault)
 				attribute.SetDefault ();
-
 			return attribute;
 		}
 
@@ -794,34 +786,16 @@ namespace System.Xml
 		{
 			while (reader.ReadAttributeValue ()) {
 				if (reader.NodeType == XmlNodeType.EntityReference)
-					attribute.AppendChild (CreateEntityReference (reader.Name), false); // omit node type check
+					attribute.AppendChild (CreateEntityReference (reader.Name));
 				else
 					// Children of Attribute is restricted to CharacterData and EntityReference (Comment is not allowed).
-					attribute.AppendChild (CreateTextNode (reader.Value), false); // omit node type check
+					attribute.AppendChild (CreateTextNode (reader.Value));
 			}
 		}
 
 		[PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
 		public virtual XmlNode ReadNode (XmlReader reader)
 		{
-			if (PreserveWhitespace)
-				return ReadNodeCore (reader);
-			XmlTextReader xtr = reader as XmlTextReader;
-			if (xtr != null && xtr.WhitespaceHandling ==
-			    WhitespaceHandling.All) {
-				try {
-					xtr.WhitespaceHandling = WhitespaceHandling.Significant;
-					return ReadNodeCore (reader);
-				} finally {
-					xtr.WhitespaceHandling = WhitespaceHandling.All;
-				}
-			}
-			else
-				return ReadNodeCore (reader);
-		}
-
-		XmlNode ReadNodeCore (XmlReader reader)
-		{
 			switch (reader.ReadState) {
 			case ReadState.Interactive:
 				break;
@@ -840,12 +814,7 @@ namespace System.Xml
 			switch (reader.NodeType) {
 
 			case XmlNodeType.Attribute:
-				string localName = reader.LocalName;
-				string ns = reader.NamespaceURI;
-				n = ReadAttributeNode (reader);
-				// Keep the current reader position on attribute.
-				reader.MoveToAttribute (localName, ns);
-				return n;
+				return ReadAttributeNode (reader);
 
 			case XmlNodeType.CDATA:
 				n = CreateCDataSection (reader.Value);
@@ -864,36 +833,25 @@ namespace System.Xml
 				element.IsEmpty = reader.IsEmptyElement;
 
 				// set the element's attributes.
-				for (int i = 0; i < reader.AttributeCount; i++) {
-					reader.MoveToAttribute (i);
-					element.SetAttributeNode (
-						ReadAttributeNode (reader));
-				}
-				// FIXME: the code below should be fine and
-				// in some XmlReaders it is much faster, but
-				// caused some breakage in sys.data test.
-				/*
 				if (reader.MoveToFirstAttribute ()) {
 					do {
 						element.SetAttributeNode (ReadAttributeNode (reader));
 					} while (reader.MoveToNextAttribute ());
 					reader.MoveToElement ();
 				}
-				*/
-				reader.MoveToElement ();
 
 				int depth = reader.Depth;
 
-				if (reader.IsEmptyElement) {
+				if (element.IsEmpty) {
 					n = element;
 					break;
 				}
 
 				reader.Read ();
 				while (reader.Depth > depth) {
-					n = ReadNodeCore (reader);
+					n = ReadNode (reader);
 					if (preserveWhitespace || n.NodeType != XmlNodeType.Whitespace)
-						element.AppendChild (n, false);
+						element.AppendChild (n);
 				}
 				n = element;
 				break;
diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs b/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs
index 7451e4f249d..93da7148132 100644
--- a/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs
@@ -35,9 +35,8 @@ using System.Xml.XPath;
 
 namespace System.Xml
 {
-	public class XmlDocumentFragment : XmlNode, IHasXmlChildNode
+	public class XmlDocumentFragment : XmlNode
 	{
-		XmlLinkedNode lastLinkedChild;
 
 		#region Constructor
 
@@ -50,11 +49,6 @@ namespace System.Xml
 
 		#region Properties
 
-		XmlLinkedNode IHasXmlChildNode.LastLinkedChild {
-			get { return lastLinkedChild; }
-			set { lastLinkedChild = value; }
-		}
-
 		public override string InnerXml {
 			set {
 				// Copied from XmlElement.InnerXml (in the meantime;-))
diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
index 15f75ee4eb0..b2ee93599a8 100644
--- a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
@@ -88,13 +88,10 @@ namespace System.Xml
 				if (NsNode != null)
 					return false;
 
-				XmlElement el = node as XmlElement;
-				if (el == null || !el.HasAttributes)
-					return false;
-
-				for (int i = 0; i < node.Attributes.Count; i++)
-					if (node.Attributes [i].NamespaceURI != Xmlns)
-						return true;
+				if (node.Attributes != null)
+					for (int i = 0; i < node.Attributes.Count; i++)
+						if (node.Attributes [i].NamespaceURI != Xmlns)
+							return true;
 				return false;
 			}
 		}
@@ -357,12 +354,15 @@ namespace System.Xml
 
 		public override bool MoveToAttribute (string localName, string namespaceURI)
 		{
-			if (HasAttributes) {
-				XmlAttribute attr = node.Attributes [localName, namespaceURI];
-				if (attr != null) {
-					node = attr;
-					NsNode = null;
-					return true;
+			if (node.Attributes != null) {
+				for (int i = 0; i < node.Attributes.Count; i++) {
+					XmlAttribute attr = node.Attributes [i];
+					if (attr.LocalName == localName
+						&& attr.NamespaceURI == namespaceURI) {
+						node = attr;
+						NsNode = null;
+						return true;
+					}
 				}
 			}
 			return false;
@@ -378,10 +378,9 @@ namespace System.Xml
 
 		public override bool MoveToFirstAttribute ()
 		{
+			if (node.Attributes == null)
+				return false;
 			if (NodeType == XPathNodeType.Element) {
-				XmlElement el = node as XmlElement;
-				if (!el.HasAttributes)
-					return false;
 				for (int i = 0; i < node.Attributes.Count; i++) {
 					XmlAttribute attr = node.Attributes [i];
 					if (attr.NamespaceURI != Xmlns) {
@@ -411,8 +410,8 @@ namespace System.Xml
 			if (NodeType != XPathNodeType.Element)
 				return false;
 			XmlElement el = node as XmlElement;
-			do {
-				if (el.HasAttributes) {
+			if (node.Attributes != null) {
+				do {
 					for (int i = 0; i < el.Attributes.Count; i++) {
 						XmlAttribute attr = el.Attributes [i];
 						if (attr.NamespaceURI == Xmlns) {
@@ -422,11 +421,11 @@ namespace System.Xml
 							return true;
 						}
 					}
-				}
-				if (namespaceScope == XPathNamespaceScope.Local)
-					return false;
-				el = GetParentNode (el) as XmlElement;
-			} while (el != null);
+					if (namespaceScope == XPathNamespaceScope.Local)
+						return false;
+					el = GetParentNode (el) as XmlElement;
+				} while (el != null);
+			}
 
 			if (namespaceScope == XPathNamespaceScope.All) {
 				if (CheckNsNameAppearance (nsNodeXml.Name, nsNodeXml.Value))
@@ -459,8 +458,8 @@ namespace System.Xml
 				return false;
 
 			XmlElement el = node as XmlElement;
-			do {
-				if (el.HasAttributes) {
+			if (node.Attributes != null) {
+				do {
 					for (int i = 0; i < el.Attributes.Count; i++) {
 						XmlAttribute attr = el.Attributes [i];
 						if (attr.NamespaceURI == Xmlns && attr.Name == name) {
@@ -468,9 +467,9 @@ namespace System.Xml
 							return true;
 						}
 					}
-				}
-				el = GetParentNode (node) as XmlElement;
-			} while (el != null);
+					el = GetParentNode (node) as XmlElement;
+				} while (el != null);
+			}
 			return false;
 		}
 
@@ -575,15 +574,13 @@ namespace System.Xml
 				return false;
 			owner = GetParentNode (owner) as XmlElement;
 			while (owner != null) {
-				if (owner.HasAttributes) {
-					for (int i = 0; i < owner.Attributes.Count; i++) {
-						XmlAttribute attr = owner.Attributes [i];
-						if (attr.NamespaceURI == Xmlns) {
-							if (CheckNsNameAppearance (attr.Name, attr.Value))
-								continue;
-							NsNode = attr;
-							return true;
-						}
+				for (int i = 0; i < owner.Attributes.Count; i++) {
+					XmlAttribute attr = owner.Attributes [i];
+					if (attr.NamespaceURI == Xmlns) {
+						if (CheckNsNameAppearance (attr.Name, attr.Value))
+							continue;
+						NsNode = attr;
+						return true;
 					}
 				}
 				owner = GetParentNode (owner) as XmlElement;
@@ -699,20 +696,19 @@ namespace System.Xml
 
 		private XmlNode GetPreviousSibling (XmlNode n)
 		{
-			XmlNode p = n.PreviousSibling;
-			if (p != null) {
-				switch (p.NodeType) {
+			if (n.PreviousSibling != null) {
+				switch (n.PreviousSibling.NodeType) {
 				case XmlNodeType.EntityReference:
-					XmlNode c = GetLastChild (p);
+					XmlNode c = GetLastChild (n.PreviousSibling);
 					if (c != null)
 						return c;
 					else // empty entity reference etc.
-						return GetPreviousSibling (p);
+						return GetPreviousSibling (n.PreviousSibling);
 				case XmlNodeType.XmlDeclaration:
 				case XmlNodeType.DocumentType:
-					return GetPreviousSibling (p);
+					return GetPreviousSibling (n.PreviousSibling);
 				default:
-					return p;
+					return n.PreviousSibling;
 				}
 			} else {
 				if (n.ParentNode == null || n.ParentNode.NodeType != XmlNodeType.EntityReference)
@@ -723,18 +719,17 @@ namespace System.Xml
 
 		private XmlNode GetNextSibling (XmlNode n)
 		{
-			XmlNode nx = n.NextSibling;
-			if (nx != null) {
-				switch (nx.NodeType) {
+			if (n.NextSibling != null) {
+				switch (n.NextSibling.NodeType) {
 				case XmlNodeType.EntityReference:
-					XmlNode c = GetFirstChild (nx);
+					XmlNode c = GetFirstChild (n.NextSibling);
 					if (c != null)
 						return c;
 					else // empty entity reference etc.
-						return GetNextSibling (nx);
+						return GetNextSibling (n.NextSibling);
 				case XmlNodeType.XmlDeclaration:
 				case XmlNodeType.DocumentType:
-					return GetNextSibling (nx);
+					return GetNextSibling (n.NextSibling);
 				default:
 					return n.NextSibling;
 				}
diff --git a/mcs/class/System.XML/System.Xml/XmlElement.cs b/mcs/class/System.XML/System.Xml/XmlElement.cs
index a49eb3108b9..3f90c23030d 100644
--- a/mcs/class/System.XML/System.Xml/XmlElement.cs
+++ b/mcs/class/System.XML/System.Xml/XmlElement.cs
@@ -42,13 +42,12 @@ using System.Xml.Schema;
 
 namespace System.Xml
 {
-	public class XmlElement : XmlLinkedNode, IHasXmlChildNode
+	public class XmlElement : XmlLinkedNode
 	{
 		#region Fields
 
 		private XmlAttributeCollection attributes;
 		private XmlNameEntry name;
-		XmlLinkedNode lastLinkedChild;
 
 		private bool isNotEmpty;
 #if NET_2_0
@@ -74,15 +73,17 @@ namespace System.Xml
 			XmlDocument doc,
 			bool atomizedNames) : base (doc)
 		{
-			if (!atomizedNames) {
-				XmlConvert.VerifyName (localName);
+			XmlConvert.VerifyName (localName);
 
+			if (!atomizedNames) {
 				prefix = doc.NameTable.Add (prefix);
 				localName = doc.NameTable.Add (localName);
 				namespaceURI = doc.NameTable.Add (namespaceURI);
 			}
 			name = doc.NameCache.Add (prefix, localName, namespaceURI, true);
 
+//			attributes = new XmlAttributeCollection (this);
+
 			if(doc.DocumentType != null)
 			{
 				DTDAttListDeclaration attlist = doc.DocumentType.DTD.AttListDecls [localName];
@@ -102,11 +103,6 @@ namespace System.Xml
 
 		#region Properties
 
-		XmlLinkedNode IHasXmlChildNode.LastLinkedChild {
-			get { return lastLinkedChild; }
-			set { lastLinkedChild = value; }
-		}
-
 		public override XmlAttributeCollection Attributes {
 			get {
 				if (attributes == null)
@@ -131,7 +127,7 @@ namespace System.Xml
 					while (FirstChild != null)
 						this.RemoveChild (FirstChild);
 					// creates new Text node
-					AppendChild (OwnerDocument.CreateTextNode (value), false);
+					AppendChild (OwnerDocument.CreateTextNode (value));
 				}
 			}
 		}
@@ -190,8 +186,11 @@ namespace System.Xml
 			get { return name.NS; }
 		}
 
+		// Why is this override?
 		public override XmlNode NextSibling {
-			get { return ParentNode == null || ((IHasXmlChildNode) ParentNode).LastLinkedChild == this ? null : NextLinkedSibling; }
+			get { 
+				return base.NextSibling; 
+			}
 		}
 
 		public override XmlNodeType NodeType {
@@ -259,7 +258,7 @@ namespace System.Xml
 
 			if (deep) {
 				for (int i = 0; i < ChildNodes.Count; i++)
-					node.AppendChild (ChildNodes [i].CloneNode (true), false);
+					node.AppendChild (ChildNodes [i].CloneNode (true));
 			}
 
 			return node;
@@ -408,27 +407,25 @@ namespace System.Xml
 
 		public override void WriteContentTo (XmlWriter w)
 		{
-			for (XmlNode n = FirstChild; n != null; n = n.NextSibling)
-				n.WriteTo (w);
+			int count = ChildNodes.Count;
+			for (int i = 0; i < count; i++)
+				ChildNodes [i].WriteTo (w);
 		}
 
 		public override void WriteTo (XmlWriter w)
 		{
-			w.WriteStartElement (
-				name.NS == null || name.NS.Length == 0 ? String.Empty : name.Prefix,
-				name.LocalName,
-				name.NS);
-
-			if (HasAttributes)
-				for (int i = 0; i < Attributes.Count; i++)
-					Attributes [i].WriteTo (w);
+			w.WriteStartElement (NamespaceURI == null || NamespaceURI.Length == 0 ? String.Empty : Prefix, LocalName, NamespaceURI);
 
-			WriteContentTo (w);
+			for (int i = 0; i < Attributes.Count; i++)
+				if (Attributes [i].Specified)
+					Attributes [i].WriteTo(w);
 
 			if (IsEmpty)
 				w.WriteEndElement ();
-			else
+			else {
+				WriteContentTo (w);
 				w.WriteFullEndElement ();
+			}
 		}
 
 		#endregion
diff --git a/mcs/class/System.XML/System.Xml/XmlEntity.cs b/mcs/class/System.XML/System.Xml/XmlEntity.cs
index 91268e6edaa..a1dd3f084bf 100644
--- a/mcs/class/System.XML/System.Xml/XmlEntity.cs
+++ b/mcs/class/System.XML/System.Xml/XmlEntity.cs
@@ -33,7 +33,7 @@ using Mono.Xml;
 
 namespace System.Xml
 {
-	public class XmlEntity : XmlNode, IHasXmlChildNode
+	public class XmlEntity : XmlNode
 	{
 		#region Constructors
 
@@ -57,17 +57,11 @@ namespace System.Xml
 		string publicId;
 		string systemId;
 		string baseUri;
-		XmlLinkedNode lastLinkedChild;
 
 		#endregion
 
 		#region Properties
 
-		XmlLinkedNode IHasXmlChildNode.LastLinkedChild {
-			get { return lastLinkedChild; }
-			set { lastLinkedChild = value; }
-		}
-
 		public override string BaseURI {
 			get {  return baseUri; }
 		}
diff --git a/mcs/class/System.XML/System.Xml/XmlEntityReference.cs b/mcs/class/System.XML/System.Xml/XmlEntityReference.cs
index 7126f649a14..8e8fd92b6ac 100644
--- a/mcs/class/System.XML/System.Xml/XmlEntityReference.cs
+++ b/mcs/class/System.XML/System.Xml/XmlEntityReference.cs
@@ -34,11 +34,10 @@ using Mono.Xml;
 
 namespace System.Xml
 {
-	public class XmlEntityReference : XmlLinkedNode, IHasXmlChildNode
+	public class XmlEntityReference : XmlLinkedNode
 	{
 		string entityName;
-		XmlLinkedNode lastLinkedChild;
-
+		
 		// Constructor
 		protected internal XmlEntityReference (string name, XmlDocument doc)
 			: base (doc)
@@ -49,12 +48,6 @@ namespace System.Xml
 		}
 
 		// Properties
-
-		XmlLinkedNode IHasXmlChildNode.LastLinkedChild {
-			get { return lastLinkedChild; }
-			set { lastLinkedChild = value; }
-		}
-
 		public override string BaseURI {
 			get { return base.BaseURI; }
 		}
diff --git a/mcs/class/System.XML/System.Xml/XmlException.cs b/mcs/class/System.XML/System.Xml/XmlException.cs
index 84f99759631..0af78586c54 100644
--- a/mcs/class/System.XML/System.Xml/XmlException.cs
+++ b/mcs/class/System.XML/System.Xml/XmlException.cs
@@ -47,11 +47,13 @@ namespace System.Xml
 
 		#region Constructors
 
+#if NET_1_0
+#else
 		public XmlException () 
 			: base ()
 		{
 		}
-
+#endif
 		public XmlException (string message, Exception innerException) 
 			: base (message, innerException)
 		{
@@ -65,7 +67,11 @@ namespace System.Xml
 			this.sourceUri = info.GetString ("sourceUri");
 		}
 
+#if NET_1_0
+		internal XmlException (string message)
+#else
 		public XmlException (string message)
+#endif
 			: base (message)
 		{
 		}
@@ -89,8 +95,12 @@ namespace System.Xml
 			}
 			this.sourceUri = sourceUri;
 		}
-
+		
+#if NET_1_0
+		internal XmlException (string message, Exception innerException, int lineNumber, int linePosition)
+#else
 		public XmlException (string message, Exception innerException, int lineNumber, int linePosition)
+#endif
 			: base (message, innerException)
 		{
 			this.lineNumber = lineNumber;
diff --git a/mcs/class/System.XML/System.Xml/XmlIteratorNodeList.cs b/mcs/class/System.XML/System.Xml/XmlIteratorNodeList.cs
deleted file mode 100644
index e0076d8c780..00000000000
--- a/mcs/class/System.XML/System.Xml/XmlIteratorNodeList.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// System.Xml.XmlIteratorNodeList
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// (C) 2006 Novell Inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Xml.XPath;
-
-namespace System.Xml
-{
-	internal class XmlIteratorNodeList : XmlNodeList
-	{
-		XPathNodeIterator source;
-		XPathNodeIterator iterator;
-		XmlNode previous;
-		ArrayList list;
-		bool finished;
-
-		#region Constructors
-
-		public XmlIteratorNodeList (XPathNodeIterator iter)
-		{
-			source = iter;
-			iterator = iter.Clone ();
-			list = new ArrayList ();
-		}
-
-		#endregion
-
-		#region Properties
-
-		public override int Count {
-			get {
-/*
-				// The performance on Count depends on the 
-				// iterator which is actually used. In some
-				// iterators, getting iterator.Count is much
-				// faster.
-
-				// With (current) implementation in general,
-				// those iterators that requires sorting is
-				// likely to have already-computed arrays, so
-				// for them getting Count does not impact on
-				// performance.
-				
-				// But by default, getting iterator.Count means
-				// it internally iterates all the nodes. That
-				// might result in duplicate iteration (so
-				// ineffective). So here I decided that it
-				// just collects all the nodes to the list.
-
-				if (!finished) {
-					BaseIterator iter = iterator as BaseIterator;
-					if (iter != null && iter.ReverseAxis || iter is SlashIterator)
-						return iter.Count;
-
-					while (iterator.MoveNext ())
-						list.Add (((IHasXmlNode) iterator.Current).GetNode ());
-					finished = true;
-				}
-				return list.Count;
-*/
-				// anyways such code that uses
-				// XmlNodeList.Count already gives up 
-				// performance. Also, storing things in the
-				// list causes extra memory consumption.
-				return iterator.Count;
-			}
-		}
-
-		#endregion
-
-		#region Methods
-
-		public override IEnumerator GetEnumerator ()
-		{
-			if (finished)
-				return list.GetEnumerator ();
-			else
-				return new XPathNodeIteratorNodeListIterator (source);
-//				return new XPathNodeIteratorNodeListIterator2 (this);
-		}
-
-		public override XmlNode Item (int index)
-		{
-			if (index < 0)
-				return null;
-			if (index < list.Count)
-				return (XmlNode) list [index];
-			index++;
-			while (iterator.CurrentPosition < index) {
-				if (!iterator.MoveNext ()) {
-					finished = true;
-					return null;
-				}
-				list.Add (((IHasXmlNode) iterator.Current).GetNode ());
-			}
-			return (XmlNode) list [index - 1];
-		}
-
-		#endregion
-
-		class XPathNodeIteratorNodeListIterator : IEnumerator
-		{
-			XPathNodeIterator iter;
-			XPathNodeIterator source;
-			public XPathNodeIteratorNodeListIterator (XPathNodeIterator source)
-			{
-				this.source = source;
-				Reset ();
-			}
-
-			public bool MoveNext ()
-			{
-				return iter.MoveNext ();
-			}
-
-			public object Current {
-				get { return ((IHasXmlNode) iter.Current).GetNode (); }
-			}
-
-			public void Reset ()
-			{
-				iter = source.Clone ();
-			}
-		}
-
-		/*
-		class XPathNodeIteratorNodeListIterator2 : IEnumerator
-		{
-			int current = -1;
-			XmlIteratorNodeList source;
-
-			public XPathNodeIteratorNodeListIterator2 (XmlIteratorNodeList source)
-			{
-				this.source = source;
-			}
-
-			public bool MoveNext ()
-			{
-				return source [++current] != null;
-			}
-
-			public object Current {
-				get { return source [current]; }
-			}
-
-			public void Reset ()
-			{
-				current = -1;
-			}
-		}
-		*/
-	}
-}
diff --git a/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs b/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
index bf63853625b..01a9b0a8444 100644
--- a/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
+++ b/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
@@ -58,7 +58,17 @@ namespace System.Xml
 
 		public override XmlNode NextSibling
 		{
-			get { return ParentNode == null || ParentNode.LastChild == this ? null : nextSibling; }
+			get {
+				if(ParentNode == null) {
+					return null;
+				}
+				else if (Object.ReferenceEquals(nextSibling, ParentNode.LastLinkedChild.NextLinkedSibling) == false) {
+					return nextSibling;
+				}
+				else {
+					return null;
+				}
+			}
 		}
 
 		internal XmlLinkedNode NextLinkedSibling
diff --git a/mcs/class/System.XML/System.Xml/XmlNameEntry.cs b/mcs/class/System.XML/System.Xml/XmlNameEntry.cs
index 3654804496a..a4715c226a1 100644
--- a/mcs/class/System.XML/System.Xml/XmlNameEntry.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNameEntry.cs
@@ -37,34 +37,13 @@ namespace System.Xml
 	{
 		public XmlNameEntry (string prefix, string local, string ns)
 		{
-			Update (prefix, local, ns);
-		}
-
-		public void Update (string prefix, string local, string ns)
-		{
 			Prefix = prefix;
 			LocalName = local;
 			NS = ns;
-			Hash = local.GetHashCode () + (prefix.Length > 0 ? prefix.GetHashCode () : 0);
 		}
 
-		public string Prefix;
-		public string LocalName;
-		public string NS;
-		public int Hash;
-
-		public override bool Equals (object other)
-		{
-			XmlNameEntry e = other as XmlNameEntry;
-			return e != null && e.Hash == Hash &&
-				Object.ReferenceEquals (e.LocalName, LocalName) &&
-				Object.ReferenceEquals (e.NS, NS) &&
-				Object.ReferenceEquals (e.Prefix, Prefix);
-		}
-
-		public override int GetHashCode ()
-		{
-			return Hash;
-		}
+		public readonly string Prefix;
+		public readonly string LocalName;
+		public readonly string NS;
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml/XmlNameEntryCache.cs b/mcs/class/System.XML/System.Xml/XmlNameEntryCache.cs
index 13ecd4ebf19..0bab0a24809 100644
--- a/mcs/class/System.XML/System.Xml/XmlNameEntryCache.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNameEntryCache.cs
@@ -35,27 +35,27 @@ namespace System.Xml
 {
 	internal class XmlNameEntryCache
 	{
-		Hashtable table = new Hashtable ();
-		XmlNameTable nameTable;
-		XmlNameEntry dummy = new XmlNameEntry (String.Empty, String.Empty, String.Empty);
+		ArrayList list = new ArrayList ();
+		int insertAt = 0;
 
-		public XmlNameEntryCache (XmlNameTable nameTable)
+		public XmlNameEntryCache ()
 		{
-			this.nameTable = nameTable;
 		}
 
 		public XmlNameEntry Add (string prefix, string local, string ns,
 			bool atomic)
 		{
-			if (!atomic) {
-				prefix = nameTable.Add (prefix);
-				local = nameTable.Add (local);
-				ns = nameTable.Add (ns);
-			}
-			XmlNameEntry e = GetInternal (prefix, local, ns, true);
+			XmlNameEntry e = GetInternal (prefix, local, ns, atomic);
 			if (e == null) {
 				e = new XmlNameEntry (prefix, local, ns);
-				table [e] = e;
+				// Let's just limit the maximum pool size.
+				if (list.Count < 1000)
+					list.Add (e);
+				else {
+					if (insertAt == 1000)
+						insertAt = 0;
+					list [insertAt++] = e;
+				}
 			}
 			return e;
 		}
@@ -70,15 +70,24 @@ namespace System.Xml
 		private XmlNameEntry GetInternal (string prefix, string local,
 			string ns, bool atomic)
 		{
-			if (!atomic) {
-				if (nameTable.Get (prefix) == null ||
-				    nameTable.Get (local) == null ||
-				    nameTable.Get (ns) == null)
-					return null;
+			if (atomic) {
+				for (int i = 0; i < list.Count; i++) {
+					XmlNameEntry e = (XmlNameEntry) list [i];
+					if (Object.ReferenceEquals (e.Prefix, prefix) &&
+						Object.ReferenceEquals (e.LocalName, local) &&
+						Object.ReferenceEquals (e.NS, ns))
+						return e;
+				}
+			} else {
+				for (int i = 0; i < list.Count; i++) {
+					XmlNameEntry e = (XmlNameEntry) list [i];
+					if (e.Prefix == prefix &&
+						e.LocalName == local &&
+						e.NS == ns)
+						return e;
+				}
 			}
-			dummy.Update (prefix, local, ns);
-
-			return table [dummy] as XmlNameEntry;
+			return null;
 		}
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs b/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
index 10b51f826f3..37b147954f8 100644
--- a/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
@@ -37,8 +37,6 @@ namespace System.Xml
 {
 	public class XmlNamedNodeMap : IEnumerable
 	{
-		static readonly IEnumerator emptyEnumerator = new XmlNode [0].GetEnumerator ();
-
 		XmlNode parent;
 		ArrayList nodeList;
 		bool readOnly = false;
@@ -46,32 +44,20 @@ namespace System.Xml
 		internal XmlNamedNodeMap (XmlNode parent)
 		{
 			this.parent = parent;
-		}
-
-		private ArrayList NodeList {
-			get {
-				if (nodeList == null)
-					nodeList = new ArrayList ();
-				return nodeList;
-			}
+			nodeList = new ArrayList ();
 		}
 
 		public virtual int Count {
-			get { return nodeList == null ? 0 : nodeList.Count; }
+			get { return nodeList.Count; }
 		}
 
 		public virtual IEnumerator GetEnumerator () 
 		{
-			if (nodeList == null)
-				return emptyEnumerator;
 			return nodeList.GetEnumerator ();
 		}
 
 		public virtual XmlNode GetNamedItem (string name)
 		{
-			if (nodeList == null)
-				return null;
-
 			for (int i = 0; i < nodeList.Count; i++) {
 				XmlNode node = (XmlNode) nodeList [i];
 				if (node.Name == name)
@@ -82,9 +68,6 @@ namespace System.Xml
 
 		public virtual XmlNode GetNamedItem (string localName, string namespaceURI)
 		{
-			if (nodeList == null)
-				return null;
-
 			for (int i = 0; i < nodeList.Count; i++) {
 				XmlNode node = (XmlNode) nodeList [i];
 				if ((node.LocalName == localName)
@@ -97,7 +80,7 @@ namespace System.Xml
 		
 		public virtual XmlNode Item (int index)
 		{
-			if (nodeList == null || index < 0 || index >= nodeList.Count)
+			if (index < 0 || index >= nodeList.Count)
 				return null;
 			else
 				return (XmlNode) nodeList [index];
@@ -105,9 +88,6 @@ namespace System.Xml
 
 		public virtual XmlNode RemoveNamedItem (string name)
 		{
-			if (nodeList == null)
-				return null;
-
 			for (int i = 0; i < nodeList.Count; i++) {
 				XmlNode node = (XmlNode) nodeList [i];
 				if (node.Name == name) {
@@ -135,9 +115,6 @@ namespace System.Xml
 
 		public virtual XmlNode RemoveNamedItem (string localName, string namespaceURI)
 		{
-			if (nodeList == null)
-				return null;
-
 			for (int i = 0; i < nodeList.Count; i++) {
 				XmlNode node = (XmlNode) nodeList [i];
 				if ((node.LocalName == localName)
@@ -168,7 +145,7 @@ namespace System.Xml
 				parent.OwnerDocument.onNodeInserting (node, parent);
 
 			try {
-				for (int i = 0; i < NodeList.Count; i++) {
+				for (int i = 0; i < nodeList.Count; i++) {
 					XmlNode x = (XmlNode) nodeList [i];
 					if(x.LocalName == node.LocalName && x.NamespaceURI == node.NamespaceURI) {
 						nodeList.Remove (x);
@@ -185,8 +162,6 @@ namespace System.Xml
 				else
 					nodeList.Insert (pos, node);
 
-				// LAMESPEC: It should return null here, but
-				// it just returns the input node.
 				return node;
 			} finally {
 				if (raiseEvent)
@@ -195,6 +170,6 @@ namespace System.Xml
 
 		}
 
-		internal ArrayList Nodes { get { return NodeList; } }
+		internal ArrayList Nodes { get { return nodeList; } }
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
index 50bb0401b5f..29afff1e604 100644
--- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
@@ -321,16 +321,6 @@ namespace System.Xml
 
 		internal string LookupPrefix (string uri, bool atomizedName)
 		{
-			return LookupPrefixCore (uri, atomizedName, false);
-		}
-
-		internal string LookupPrefixExclusive (string uri, bool atomizedName)
-		{
-			return LookupPrefixCore (uri, atomizedName, true);
-		}
-
-		string LookupPrefixCore (string uri, bool atomizedName, bool excludeOverriden)
-		{
 			if (uri == null)
 				return null;
 
@@ -345,8 +335,7 @@ namespace System.Xml
 
 			for (int i = declPos; i >= 0; i--) {
 				if (CompareString (decls [i].Uri, uri, atomizedName) && decls [i].Prefix.Length > 0) // we already looked for ""
-					if (!excludeOverriden || !IsOverriden (i))
-						return decls [i].Prefix;
+					return decls [i].Prefix;
 			}
 
 			// ECMA specifies that this method returns String.Empty
@@ -357,17 +346,6 @@ namespace System.Xml
 			return null;
 		}
 
-		bool IsOverriden (int idx)
-		{
-			if (idx == declPos)
-				return false;
-			string prefix = decls [idx + 1].Prefix;
-			for (int i = idx + 1; i <= declPos; i++)
-				if ((object) decls [idx].Prefix == prefix)
-					return true;
-			return false;
-		}
-
 		public virtual bool PopScope ()
 		{
 			if (scopePos == -1)
diff --git a/mcs/class/System.XML/System.Xml/XmlNode.cs b/mcs/class/System.XML/System.Xml/XmlNode.cs
index e342af583d8..6b8401b501f 100644
--- a/mcs/class/System.XML/System.Xml/XmlNode.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNode.cs
@@ -45,31 +45,11 @@ namespace System.Xml
 {
 	public abstract class XmlNode : ICloneable, IEnumerable, IXPathNavigable
 	{
-		static EmptyNodeList emptyList = new EmptyNodeList ();
-
-		class EmptyNodeList : XmlNodeList
-		{
-			static IEnumerator emptyEnumerator = new object [0].GetEnumerator ();
-
-			public override int Count {
-				get { return 0; }
-			}
-
-			public override IEnumerator GetEnumerator ()
-			{
-				return emptyEnumerator;
-			}
-
-			public override XmlNode Item (int index)
-			{
-				return null;
-			}
-		}
-
 		#region Fields
 
 		XmlDocument ownerDocument;
 		XmlNode parentNode;
+		XmlLinkedNode lastLinkedChild;
 		XmlNodeListChildren childNodes;
 
 		#endregion
@@ -105,21 +85,20 @@ namespace System.Xml
 
 		public virtual XmlNodeList ChildNodes {
 			get {
-				IHasXmlChildNode l = this as IHasXmlChildNode;
-				if (l == null)
-					return emptyList;
 				if (childNodes == null)
-					childNodes = new XmlNodeListChildren (l);
+					childNodes = new XmlNodeListChildren (this);
 				return childNodes;
 			}
 		}
 
 		public virtual XmlNode FirstChild {
 			get {
-				IHasXmlChildNode l = this as IHasXmlChildNode;
-				XmlLinkedNode c = (l == null) ?
-					null : l.LastLinkedChild;
-				return c == null ? null : c.NextLinkedSibling;
+				if (LastChild != null) {
+					return LastLinkedChild.NextLinkedSibling;
+				}
+				else {
+					return null;
+				}
 			}
 		}
 
@@ -129,28 +108,15 @@ namespace System.Xml
 
 		public virtual string InnerText {
 			get {
-				switch (NodeType) {
-				case XmlNodeType.Text:
-				case XmlNodeType.CDATA:
-				case XmlNodeType.SignificantWhitespace:
-				case XmlNodeType.Whitespace:
- 					return Value;
-					break;
-				}
-				if (FirstChild == null)
-					return String.Empty;
-				if (FirstChild == LastChild)
-					return FirstChild.InnerText;
-
-				StringBuilder builder = null;
-				AppendChildValues (ref builder);
-				return builder == null ? String.Empty : builder.ToString ();
+				StringBuilder builder = new StringBuilder ();
+				AppendChildValues (builder);
+				return builder.ToString ();
 			}
 
 			set { throw new InvalidOperationException ("This node is read only. Cannot be modified."); }
 		}
 
-		private void AppendChildValues (ref StringBuilder builder)
+		private void AppendChildValues (StringBuilder builder)
 		{
 			XmlNode node = FirstChild;
 
@@ -160,12 +126,10 @@ namespace System.Xml
 				case XmlNodeType.CDATA:
 				case XmlNodeType.SignificantWhitespace:
 				case XmlNodeType.Whitespace:
-					if (builder == null)
-						builder = new StringBuilder ();
  					builder.Append (node.Value);
 					break;
 				}
-				node.AppendChildValues (ref builder);
+				node.AppendChildValues (builder);
 				node = node.NextSibling;
 			}
 		}
@@ -244,10 +208,12 @@ namespace System.Xml
 		}
 
 		public virtual XmlNode LastChild {
-			get {
-				IHasXmlChildNode l = this as IHasXmlChildNode;
-				return l == null ? null : l.LastLinkedChild;
-			}
+			get { return LastLinkedChild; }
+		}
+
+		internal virtual XmlLinkedNode LastLinkedChild {
+			get { return lastLinkedChild; }
+			set { lastLinkedChild = value; }
 		}
 
 		public abstract string LocalName { get;	}
@@ -346,15 +312,10 @@ namespace System.Xml
 
 		public virtual XmlNode AppendChild (XmlNode newChild)
 		{
-			// AppendChild(n) is equivalent to InsertBefore(n, null)
+			// I assume that AppendChild(n) equals to InsertAfter(n, this.LastChild) or InsertBefore(n, null)
 			return InsertBefore (newChild, null);
 		}
 
-		internal XmlNode AppendChild (XmlNode newChild, bool checkNodeType)
-		{
-			return InsertBefore (newChild, null, checkNodeType, true);
-		}
-
 		public virtual XmlNode Clone ()
 		{
 			// By MS document, it is equivalent to CloneNode(true).
@@ -515,8 +476,6 @@ namespace System.Xml
 			if (checkNodeType)
 				CheckNodeInsertion (newChild, refChild);
 
-			IHasXmlChildNode l = (IHasXmlChildNode) this;
-
 			XmlDocument ownerDoc = (NodeType == XmlNodeType.Document) ? (XmlDocument) this : OwnerDocument;
 
 			if (raiseEvent)
@@ -529,6 +488,12 @@ namespace System.Xml
 				// This recursively invokes events. (It is compatible with MS implementation.)
 				while (newChild.FirstChild != null)
 					this.InsertBefore (newChild.FirstChild, refChild);
+				/*
+				int x = newChild.ChildNodes.Count;
+				for (int i = 0; i < x; i++) {
+					XmlNode n = newChild.ChildNodes [0];
+					this.InsertBefore (n, refChild);					}
+				*/
 			}
 			else {
 				XmlLinkedNode newLinkedChild = (XmlLinkedNode) newChild;
@@ -539,14 +504,14 @@ namespace System.Xml
 					// * set newChild as NextSibling of the existing lastchild
 					// * set LastChild = newChild
 					// * set NextSibling of newChild as FirstChild
-					if (l.LastLinkedChild != null) {
+					if (LastLinkedChild != null) {
 						XmlLinkedNode formerFirst = (XmlLinkedNode) FirstChild;
-						l.LastLinkedChild.NextLinkedSibling = newLinkedChild;
-						l.LastLinkedChild = newLinkedChild;
+						LastLinkedChild.NextLinkedSibling = newLinkedChild;
+						LastLinkedChild = newLinkedChild;
 						newLinkedChild.NextLinkedSibling = formerFirst;
 					} else {
-						l.LastLinkedChild = newLinkedChild;
-						l.LastLinkedChild.NextLinkedSibling = newLinkedChild;	// FirstChild
+						LastLinkedChild = newLinkedChild;
+						LastLinkedChild.NextLinkedSibling = newLinkedChild;	// FirstChild
 					}
 				} else {
 					// newChild is not the last child:
@@ -555,7 +520,7 @@ namespace System.Xml
 					// * set next of newChild to refChild
 					XmlLinkedNode prev = refChild.PreviousSibling as XmlLinkedNode;
 					if (prev == null)
-						l.LastLinkedChild.NextLinkedSibling = newLinkedChild;
+						LastLinkedChild.NextLinkedSibling = newLinkedChild;
 					else
 						prev.NextLinkedSibling = newLinkedChild;
 					newLinkedChild.NextLinkedSibling = refChild as XmlLinkedNode;
@@ -741,17 +706,15 @@ namespace System.Xml
 			if (checkNodeType)
 				CheckNodeRemoval ();
 
-			IHasXmlChildNode l = (IHasXmlChildNode) this;
-
-			if (Object.ReferenceEquals (l.LastLinkedChild, l.LastLinkedChild.NextLinkedSibling) && Object.ReferenceEquals (l.LastLinkedChild, oldChild))
+			if (Object.ReferenceEquals (LastLinkedChild, LastLinkedChild.NextLinkedSibling) && Object.ReferenceEquals (LastLinkedChild, oldChild))
 				// If there is only one children, simply clear.
-				l.LastLinkedChild = null;
+				LastLinkedChild = null;
 			else {
 				XmlLinkedNode oldLinkedChild = (XmlLinkedNode) oldChild;
-				XmlLinkedNode beforeLinkedChild = l.LastLinkedChild;
+				XmlLinkedNode beforeLinkedChild = LastLinkedChild;
 				XmlLinkedNode firstChild = (XmlLinkedNode) FirstChild;
 				
-				while (Object.ReferenceEquals (beforeLinkedChild.NextLinkedSibling, l.LastLinkedChild) == false && 
+				while (Object.ReferenceEquals (beforeLinkedChild.NextLinkedSibling, LastLinkedChild) == false && 
 					Object.ReferenceEquals (beforeLinkedChild.NextLinkedSibling, oldLinkedChild) == false)
 					beforeLinkedChild = beforeLinkedChild.NextLinkedSibling;
 
@@ -760,9 +723,9 @@ namespace System.Xml
 
 				beforeLinkedChild.NextLinkedSibling = oldLinkedChild.NextLinkedSibling;
 
-				// Each derived class may have its own l.LastLinkedChild, so we must set it explicitly.
+				// Each derived class may have its own LastLinkedChild, so we must set it explicitly.
 				if (oldLinkedChild.NextLinkedSibling == firstChild)
-					l.LastLinkedChild = beforeLinkedChild;
+					this.LastLinkedChild = beforeLinkedChild;
 
 				oldLinkedChild.NextLinkedSibling = null;
 				}
@@ -829,15 +792,12 @@ namespace System.Xml
 			if (nsmgr != null)
 				expr.SetContext (nsmgr);
 			XPathNodeIterator iter = nav.Select (expr);
-			/*
 			ArrayList rgNodes = new ArrayList ();
 			while (iter.MoveNext ())
 			{
 				rgNodes.Add (((IHasXmlNode) iter.Current).GetNode ());
 			}
 			return new XmlNodeArrayList (rgNodes);
-			*/
-			return new XmlIteratorNodeList (iter);
 		}
 
 		public XmlNode SelectSingleNode (string xpath)
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs b/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs
index 09205d251ad..16a67c7994a 100644
--- a/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs
@@ -39,11 +39,11 @@ namespace System.Xml
 
 		private class Enumerator : IEnumerator
 		{
-			IHasXmlChildNode parent;
+			XmlNode parent;
 			XmlLinkedNode currentChild;
 			bool passedLastNode;
 
-			internal Enumerator (IHasXmlChildNode parent)
+			internal Enumerator (XmlNode parent)
 			{
 				currentChild = null;
 				this.parent = parent;
@@ -94,12 +94,12 @@ namespace System.Xml
 
 		#region Fields
 
-		IHasXmlChildNode parent;
+		XmlNode parent;
 
 		#endregion
 
 		#region Constructors
-		public XmlNodeListChildren(IHasXmlChildNode parent)
+		public XmlNodeListChildren(XmlNode parent)
 		{
 			this.parent = parent;
 		}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
index 14ed365428a..12eb6d9368d 100644
--- a/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
@@ -171,11 +171,8 @@ namespace System.Xml
 
 		public override XmlNodeType NodeType {
 			get {
-				if (entity != null)
-					return entity.ReadState == ReadState.Initial ?
-						source.NodeType :
-						entity.EOF ? XmlNodeType.EndEntity :
-						entity.NodeType;
+				if (Current == entity)
+					return entity.EOF ? XmlNodeType.EndEntity : entity.NodeType;
 				else
 					return source.NodeType;
 			}
@@ -429,9 +426,21 @@ namespace System.Xml
 		}
 #endif
 
+#if NET_1_0
+		public override string ReadInnerXml ()
+		{
+			return ReadInnerXmlInternal ();
+		}
+
+		public override string ReadOuterXml ()
+		{
+			return ReadOuterXmlInternal ();
+		}
+#endif
+
 		public override string ReadString ()
 		{
-			return base.ReadString ();
+			return ReadStringInternal ();
 		}
 
 		public override void ResolveEntity ()
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs b/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs
index 7526bbb71a4..6aa42e07a4b 100644
--- a/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs
@@ -55,11 +55,21 @@ namespace System.Xml
 		XmlDocument document;
 		XmlNode startNode;
 		XmlNode current;
-		XmlNode ownerLinkedNode;
 		ReadState state = ReadState.Initial;
 		int depth;
 		bool isEndElement;
-		bool ignoreStartNode;
+		bool alreadyRead;
+
+		private XmlNode ownerLinkedNode {
+			get {
+				if (current.ParentNode != null && current.ParentNode.NodeType == XmlNodeType.Attribute)
+					return ((XmlAttribute) current.ParentNode).OwnerElement;
+				else if (current.NodeType == XmlNodeType.Attribute) 
+					return ((XmlAttribute) current).OwnerElement;
+				else
+					return current;
+			}
+		}
 
 		#region Constructor
 
@@ -79,7 +89,9 @@ namespace System.Xml
 			case XmlNodeType.Document:
 			case XmlNodeType.DocumentFragment:
 			case XmlNodeType.EntityReference:
-				ignoreStartNode = true;
+				break;
+			default:
+				alreadyRead = true;
 				break;
 			}
 
@@ -133,15 +145,22 @@ namespace System.Xml
 
 		public override int Depth {
 			get {
-				return current == null ? 0 :
-					current == ownerLinkedNode ? depth :
-					current.NodeType == XmlNodeType.Attribute ? depth + 1 :
-					depth + 2;
+				if (current == null)
+					return 0;
+				if (current.NodeType == XmlNodeType.Attribute)
+					return depth + 1;
+				if (current.ParentNode != null && current.ParentNode.NodeType == XmlNodeType.Attribute)
+					return depth + 2;
+
+				return depth;
 			}
 		}
 
 		public override bool EOF {
-			get { return state == ReadState.EndOfFile || state == ReadState.Error; }
+			get {
+				return this.ReadState == ReadState.EndOfFile 
+				|| this.ReadState == ReadState.Error;
+			}
 		}
 
 		public override bool HasAttributes {
@@ -456,12 +475,9 @@ namespace System.Xml
 		XmlParserContext IHasXmlParserContext.ParserContext {
 			get {
 				return new XmlParserContext (document.NameTable,
-					current == null ?
-						new XmlNamespaceManager (document.NameTable) :
-						current.ConstructNamespaceManager (),
+					current.ConstructNamespaceManager (),
 					document.DocumentType != null ? document.DocumentType.DTD : null,
-					current == null ? document.BaseURI : current.BaseURI,
-					XmlLang, XmlSpace, Encoding.Unicode);
+					current.BaseURI, XmlLang, XmlSpace, Encoding.Unicode);
 			}
 		}
 
@@ -629,6 +645,14 @@ namespace System.Xml
 			}
 		}
 
+		private void MoveToParentElement ()
+		{
+			// This is buggy. It is not only the case when EndElement = true.
+			isEndElement = true;
+			depth--;
+			current = current.ParentNode;
+		}
+
 		public override bool MoveToElement ()
 		{
 			if (current == null)
@@ -683,11 +707,29 @@ namespace System.Xml
 			}
 		}
 
+		private bool MoveToNextSibling ()
+		{
+			if (alreadyRead) {
+				alreadyRead = false;
+				return current != null;
+			}
+			if (current.NextSibling != null) {
+				isEndElement = false;
+				current = current.NextSibling;
+			} else {
+				MoveToParentElement ();
+			}
+			if (current == null) {
+				state = ReadState.EndOfFile;
+				return false;
+			}
+			else
+				return true;
+		}
+
 		public override bool Read ()
 		{
-			// FIXME: at some stage inlining might work effectively.
-			// if (EOF)
-			if (state == ReadState.EndOfFile || state == ReadState.Error)
+			if (EOF)
 				return false;
 
 #if NET_2_0
@@ -695,19 +737,14 @@ namespace System.Xml
 				Binary.Reset ();
 #endif
 
-			bool ret = ReadContent ();
-			ownerLinkedNode = current;
-			return ret;
-		}
-
-		bool ReadContent ()
-		{
 			if (ReadState == ReadState.Initial) {
 				current = startNode;
 				state = ReadState.Interactive;
 				// when startNode is document or fragment
-				if (ignoreStartNode)
+				if (!alreadyRead)
 					current = startNode.FirstChild;
+				else
+					alreadyRead = false;
 				if (current == null) {
 					state = ReadState.Error;
 					return false;
@@ -717,70 +754,55 @@ namespace System.Xml
 
 			MoveToElement ();
 
-			// don't step into EntityReference's children. Also
-			// avoid re-entering children of already-consumed
-			// element (i.e. when it is regarded as EndElement).
-			XmlNode firstChild =
-				!isEndElement && current.NodeType != XmlNodeType.EntityReference ?
-				current.FirstChild : null;
-			if (firstChild != null) {
-				isEndElement = false;
-				current = firstChild;
-				depth++;
-				return true;
+			if (alreadyRead) {
+				alreadyRead = false;
+				return current != null;
 			}
 
-			if (current == startNode) { // Currently it is on the start node.
-				if (IsEmptyElement || isEndElement) {
-					// The start node is already consumed.
-					isEndElement = false;
-					current = null;
-					state = ReadState.EndOfFile;
-					return false;
-				} else {
-					// The start node is the only element
-					// which should be processed. Now it
-					// is set as EndElement.
+			bool isEnd = false;
+
+			if (IsEmptyElement || isEndElement) {
+				// Then go up and move to next.
+				// If no more nodes, then set EOF.
+				isEndElement = false;
+				if (current.ParentNode == null
+					|| current.ParentNode.NodeType == XmlNodeType.Document
+					|| current.ParentNode.NodeType == XmlNodeType.DocumentFragment
+					|| current == startNode) {
+					isEnd = true;
+				} else if (current.NextSibling == null) {
+					depth--;
+					current = current.ParentNode;
 					isEndElement = true;
 					return true;
+				} else {
+					current = current.NextSibling;
+					return true;
 				}
 			}
-			if (!isEndElement && !IsEmptyElement &&
-			    current.NodeType == XmlNodeType.Element) {
-				// element, currently not EndElement, and has
-				// no child. (such as <foo></foo>, which
-				// should become EndElement).
-				isEndElement = true;
-				return true;
-			}
 
-			// If NextSibling is available, move to there.
-			XmlNode next = current.NextSibling;
-			if (next != null) {
-				isEndElement = false;
-				current = next;
-				return true;
-			}
+			if (current.NextSibling == null
+				&& current.ParentNode is XmlEntityReference)
+				isEnd = true;
 
-			// Otherwise, parent.
-			XmlNode parent = current.ParentNode;
-			if (parent == null || parent == startNode && ignoreStartNode) {
-				// Parent is not available, or reached to
-				// the start node. This reader never sets 
-				// startNode as current if it was originally 
-				// ignored (e.g. startNode is XmlDocument).
-				isEndElement = false;
+			if (isEnd) {
 				current = null;
 				state = ReadState.EndOfFile;
 				return false;
-			} else {
-				// Parent was available, so return it as
-				// EndElement.
-				current = parent;
-				depth--;
-				isEndElement = true;
-				return true;
 			}
+
+			if (!isEndElement && current.FirstChild != null && current.NodeType != XmlNodeType.EntityReference) {
+				isEndElement = false;
+				current = current.FirstChild;
+				depth++;
+			} else if (current.NodeType == XmlNodeType.Element) {
+				isEndElement = true;
+				if (current.FirstChild != null)
+					depth--;
+			} else
+				MoveToNextSibling ();
+
+			return current != null;
 		}
 
 		public override bool ReadAttributeValue ()
@@ -799,9 +821,21 @@ namespace System.Xml
 				return false;
 		}
 
+#if NET_1_0
+		public override string ReadInnerXml ()
+		{
+			return ReadInnerXmlInternal ();
+		}
+
+		public override string ReadOuterXml ()
+		{
+			return ReadOuterXmlInternal ();
+		}
+#endif
+
 		public override string ReadString ()
 		{
-			return base.ReadString ();
+			return ReadStringInternal ();
 		}
 
 		public override void ResolveEntity ()
diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
index 22c80018f59..cca9b144a37 100644
--- a/mcs/class/System.XML/System.Xml/XmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -647,18 +647,35 @@ namespace System.Xml
 			Read ();
 		}
 
+#if NET_1_0
+		public abstract string ReadInnerXml ();
+
+		public abstract string ReadOuterXml ();
+
+#else
 		public virtual string ReadInnerXml ()
 		{
+			return ReadInnerXmlInternal ();
+		}
+
+		public virtual string ReadOuterXml ()
+		{
+			return ReadOuterXmlInternal ();
+		}
+#endif
+
+		internal string ReadInnerXmlInternal ()
+		{
 			if (ReadState != ReadState.Interactive || NodeType == XmlNodeType.EndElement)
 				return String.Empty;
 
-			if (IsEmptyElement) {
-				Read ();
-				return String.Empty;
-			}
 			StringWriter sw = new StringWriter ();
 			XmlTextWriter xtw = new XmlTextWriter (sw);
 			if (NodeType == XmlNodeType.Element) {
+				if (IsEmptyElement) {
+					Read ();
+					return String.Empty;
+				}
 				int startDepth = Depth;
 				Read ();
 				while (startDepth < Depth) {
@@ -675,22 +692,15 @@ namespace System.Xml
 			return sw.ToString ();
 		}
 
-		public virtual string ReadOuterXml ()
+		internal string ReadOuterXmlInternal ()
 		{
 			if (ReadState != ReadState.Interactive || NodeType == XmlNodeType.EndElement)
 				return String.Empty;
 
-			switch (NodeType) {
-			case XmlNodeType.Element:
-			case XmlNodeType.Attribute:
-				StringWriter sw = new StringWriter ();
-				XmlTextWriter xtw = new XmlTextWriter (sw);
-				xtw.WriteNode (this, false);
-				return sw.ToString ();
-			default:
-				Skip ();
-				return String.Empty;
-			}
+			StringWriter sw = new StringWriter ();
+			XmlTextWriter xtw = new XmlTextWriter (sw);
+			xtw.WriteNode (this, false);
+			return sw.ToString ();
 		}
 
 		public virtual void ReadStartElement ()
@@ -739,8 +749,17 @@ namespace System.Xml
 			Read ();
 		}
 
+#if NET_1_0
+		public abstract string ReadString ();
+#else
 		public virtual string ReadString ()
 		{
+			return ReadStringInternal ();
+		}
+#endif
+
+		internal string ReadStringInternal ()
+		{
 			if (readStringBuffer == null)
 				readStringBuffer = new StringBuilder ();
 			readStringBuffer.Length = 0;
diff --git a/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs b/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
index 553181388ee..a2395c6bd80 100644
--- a/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
+++ b/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
@@ -1,11 +1,3 @@
-//
-// System.Xml.XmlSecureResolver.cs
-//
-// Author: Atsushi Enomoto (ginga@kit.hi-ho.ne.jp)
-//
-// (C) 2003 Atsushi Enomoto
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
 
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -27,6 +19,17 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+#if NET_1_0
+#endif
+#if NET_1_1
+//
+// System.Xml.XmlSecureResolver.cs
+//
+// Author: Atsushi Enomoto (ginga@kit.hi-ho.ne.jp)
+//
+// (C) 2003 Atsushi Enomoto
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
 
 using System.Net;
 using System.Security;
@@ -132,3 +135,4 @@ namespace System.Xml
 
 	}
 }
+#endif
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
index 26d4eb17f76..24ea805b176 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
@@ -7,7 +7,7 @@
 //   Atsushi Enomoto  (ginga@kit.hi-ho.ne.jp)
 //
 // (C) 2001, 2002 Jason Diamond  http://injektilo.org/
-// Copyright (C) 2005-2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,16 +28,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-//#define USE_NAME_BUFFER
-
-//
-// Optimization TODOs:
-//
-//	- support PushbackChar() which reverts one character read.
-//		- ReadTextReader() should always keep one pushback buffer
-//		  as pushback safety net.
-//	- Replace (peek,read) * n -> read * n + pushback
-//
 
 using System;
 using System.Collections;
@@ -444,7 +434,7 @@ namespace System.Xml
 
 		public TextReader GetRemainder ()
 		{
-			if (peekCharsLength < 0)
+			if (peekCharsIndex == peekCharsLength)
 				return reader;
 			return new StringReader (new string (peekChars, peekCharsIndex, peekCharsLength - peekCharsIndex) + reader.ReadToEnd ());
 		}
@@ -555,9 +545,6 @@ namespace System.Xml
 
 		public override bool Read ()
 		{
-			curNodePeekIndex = peekCharsIndex;
-			preserveCurrentTag = true;
-
 			if (startNodeType == XmlNodeType.Attribute) {
 				if (currentAttribute == 0)
 					return false;	// already read.
@@ -668,6 +655,23 @@ namespace System.Xml
 			return ReadCharsInternal (buffer, offset, length);
 		}
 
+#if NET_1_0
+		public override string ReadInnerXml ()
+		{
+			return ReadInnerXmlInternal ();
+		}
+
+		public override string ReadOuterXml ()
+		{
+			return ReadOuterXmlInternal ();
+		}
+
+		public override string ReadString ()
+		{
+			return ReadStringInternal ();
+		}
+#endif
+
 		public void ResetState ()
 		{
 			throw new InvalidOperationException ("Cannot call ResetState when parsing an XML fragment.");
@@ -858,21 +862,7 @@ namespace System.Xml
 
 		private bool popScope;
 
-		struct TagName
-		{
-			public TagName (string n, string l, string p)
-			{
-				Name = n;
-				LocalName = l;
-				Prefix = p;
-			}
-
-			public readonly string Name;
-			public readonly string LocalName;
-			public readonly string Prefix;
-		}
-
-		private TagName [] elementNames;
+		private string [] elementNames;
 		int elementNameStackPos;
 
 		private bool allowMultipleRoot;
@@ -882,21 +872,22 @@ namespace System.Xml
 		private bool returnEntityReference;
 		private string entityReferenceName;
 
-#if USE_NAME_BUFFER
 		private char [] nameBuffer;
 		private int nameLength;
 		private int nameCapacity;
 		private const int initialNameCapacity = 32;
-#endif
 
 		private StringBuilder valueBuffer;
 
+		private char [] currentTagBuffer;
+		private int currentTagLength;
+		private int currentTagCapacity;
+		private const int initialCurrentTagCapacity = 256;
+
 		private TextReader reader;
 		private char [] peekChars;
 		private int peekCharsIndex;
 		private int peekCharsLength;
-		private int curNodePeekIndex;
-		private bool preserveCurrentTag;
 		private const int peekCharCapacity = 1024;
 
 		private int line;
@@ -929,9 +920,6 @@ namespace System.Xml
 		private bool closeInput = true;
 		private EntityHandling entityHandling; // 2.0
 
-		private NameTable whitespacePool;
-		private char [] whitespaceCache;
-
 		private XmlException NotWFError (string message)
 		{
 			return new XmlException (this as IXmlLineInfo, BaseURI, message);
@@ -953,26 +941,27 @@ namespace System.Xml
 			depthUp = false;
 
 			popScope = allowMultipleRoot = false;
-			elementNames = new TagName [10];
+			elementNames = new string [10];
 			elementNameStackPos = 0;
 
 			isStandalone = false;
 			returnEntityReference = false;
 			entityReferenceName = String.Empty;
 
-#if USE_NAME_BUFFER
 			nameBuffer = new char [initialNameCapacity];
 			nameLength = 0;
 			nameCapacity = initialNameCapacity;
-#endif
 
 			valueBuffer = new StringBuilder ();
 
+			currentTagBuffer = new char [initialCurrentTagCapacity];
+			currentTagLength = 0;
+			currentTagCapacity = initialCurrentTagCapacity;
+
 			peekCharsIndex = 0;
+			peekCharsLength = 0;
 			if (peekChars == null)
 				peekChars = new char [peekCharCapacity];
-			peekCharsLength = -1;
-			curNodePeekIndex = -1; // read from start
 
 			line = 1;
 			column = 1;
@@ -1105,23 +1094,34 @@ namespace System.Xml
 
 		private void ClearAttributes ()
 		{
-			//for (int i = 0; i < attributeCount; i++)
-			//	attributeTokens [i].Clear ();
+			for (int i = 0; i < attributeCount; i++)
+				attributeTokens [i].Clear ();
 			attributeCount = 0;
 			currentAttribute = -1;
 			currentAttributeValue = -1;
 		}
 
-		private int PeekSurrogate (int c)
+		private int PeekChar ()
 		{
-			if (peekCharsLength <= peekCharsIndex + 1) {
+			if (peekCharsLength == peekCharsIndex) {
+				if (!ReadTextReader (-1))
+					return -1;
+				return PeekChar ();
+			}
+
+			char c = peekChars [peekCharsIndex];
+			if (c == 0)
+				return -1;
+			if (c < 0xD800 || 0xDFFF < c)
+				return c;
+			if (peekCharsLength == peekCharsIndex + 1) {
 				if (!ReadTextReader (c))
 					//FIXME: copy MS.NET behaviour when unpaired surrogate found
 					return c;
 			}
 
-			int highhalfChar = peekChars [peekCharsIndex];
-			int lowhalfChar = peekChars [peekCharsIndex+1];
+			char highhalfChar = peekChars [peekCharsIndex];
+			char lowhalfChar = peekChars [peekCharsIndex+1];
 
 			if (((highhalfChar & 0xFC00) != 0xD800) || ((lowhalfChar & 0xFC00) != 0xDC00))
 				//FIXME: copy MS.NET behaviour when unpaired surrogate found
@@ -1129,40 +1129,10 @@ namespace System.Xml
 			return 0x10000 + (highhalfChar-0xD800)*0x400 + (lowhalfChar-0xDC00);
 		}
 
-		private int PeekChar ()
-		{
-			if (peekCharsIndex < peekCharsLength) {
-				int c = peekChars [peekCharsIndex];
-				if (c == 0)
-					return -1;
-				if (c < 0xD800 || c >= 0xDFFF)
-					return c;
-				return PeekSurrogate (c);
-			} else {
-				if (!ReadTextReader (-1))
-					return -1;
-				return PeekChar ();
-			}
-		}
-
 		private int ReadChar ()
 		{
 			int ch = PeekChar ();
-			peekCharsIndex++;
-
-			if (ch >= 0x10000)
-				peekCharsIndex++; //Increment by 2 when a compound UCS-4 character was found
 
-			if (ch == '\n') {
-				line++;
-				column = 1;
-			} else if (ch != -1) {
-				column++;
-			}
-			return ch;
-		}
-
-		private void Advance (int ch) {
 			peekCharsIndex++;
 
 			if (ch >= 0x10000)
@@ -1171,59 +1141,30 @@ namespace System.Xml
 			if (ch == '\n') {
 				line++;
 				column = 1;
-			} else if (ch != -1) {
+			} else if (ch == -1) {
+				return -1;
+			} else {
 				column++;
 			}
+			if (currentState != XmlNodeType.Element)
+				AppendCurrentTagChar (ch);
+			return ch;
 		}
 
 		private bool ReadTextReader (int remained)
 		{
-			if (peekCharsLength < 0) {	// initialized buffer
-				peekCharsLength = reader.Read (peekChars, 0, peekChars.Length);
-				return peekCharsLength > 0;
-			}
-			int offset = remained >= 0 ? 1 : 0;
-			int copysize = peekCharsLength - curNodePeekIndex;
-
-			// It must assure that current tag content always exists
-			// in peekChars.
-			if (!preserveCurrentTag) {
-				curNodePeekIndex = 0;
-				peekCharsIndex = 0;
-				//copysize = 0;
-			} else if (peekCharsLength < peekChars.Length) {
-				// NonBlockingStreamReader returned less bytes
-				// than the size of the buffer. In that case,
-				// just refill the buffer.
-			} else if (curNodePeekIndex <= (peekCharsLength >> 1)) {
-				// extend the buffer
-				char [] tmp = new char [peekChars.Length * 2];
-				Array.Copy (peekChars, curNodePeekIndex,
-					tmp, 0, copysize);
-				peekChars = tmp;
-				curNodePeekIndex = 0;
-				peekCharsIndex = copysize;
-			} else {
-				Array.Copy (peekChars, curNodePeekIndex,
-					peekChars, 0, copysize);
-				curNodePeekIndex = 0;
-				peekCharsIndex = copysize;
-			}
+			peekCharsIndex = 0;
 			if (remained >= 0)
-				peekChars [peekCharsIndex] = (char) remained;
-			int count = peekChars.Length - peekCharsIndex - offset;
-			if (count > peekCharCapacity)
-				count = peekCharCapacity;
-			int read = reader.Read (
-				peekChars, peekCharsIndex + offset, count);
-			int remainingSize = offset + read;
-			peekCharsLength = peekCharsIndex + remainingSize;
-
-			return (remainingSize != 0);
+				peekChars [0] = (char) remained;
+			int offset = remained >= 0 ? 1 : 0;
+			peekCharsLength = reader.Read (peekChars, offset,
+				peekCharCapacity - offset) + offset;
+			return (peekCharsLength != 0);
 		}
 
 		private bool ReadContent ()
 		{
+			currentTagLength = 0;
 			if (popScope) {
 				parserContext.NamespaceManager.PopScope ();
 				parserContext.PopScope ();
@@ -1253,19 +1194,19 @@ namespace System.Xml
 				} else {
  	   				switch (c) {
 					case '<':
-						Advance (c);
+						ReadChar ();
 						switch (PeekChar ())
 						{
 						case '/':
-							Advance ('/');
+							ReadChar ();
 							ReadEndTag ();
 							break;
 						case '?':
-							Advance ('?');
+							ReadChar ();
 							ReadProcessingInstruction ();
 							break;
 						case '!':
-							Advance ('!');
+							ReadChar ();
 							ReadDeclaration ();
 							break;
 						default:
@@ -1277,9 +1218,13 @@ namespace System.Xml
 					case '\n':
 					case '\t':
 					case ' ':
-						if (!ReadWhitespace ())
-							// skip
+						if (whitespaceHandling == WhitespaceHandling.All ||
+							whitespaceHandling == WhitespaceHandling.Significant)
+							ReadWhitespace ();
+						else {
+							SkipWhitespace ();
 							return ReadContent ();
+						}
 						break;
 					default:
 						ReadText (true);
@@ -1362,13 +1307,13 @@ namespace System.Xml
 			}
 
 			if (PeekChar () == '/') {
-				Advance ('/');
+				ReadChar ();
 				isEmptyElement = true;
 				popScope = true;
 			}
 			else {
 				depthUp = true;
-				PushElementName (name, localName, prefix);
+				PushElementName (name);
 			}
 			parserContext.PushScope ();
 
@@ -1445,15 +1390,14 @@ namespace System.Xml
 				CheckCurrentStateUpdate ();
 		}
 
-		private void PushElementName (string name, string local, string prefix)
+		private void PushElementName (string name)
 		{
 			if (elementNames.Length == elementNameStackPos) {
-				TagName [] newArray = new TagName [elementNames.Length * 2];
+				string [] newArray = new string [elementNames.Length * 2];
 				Array.Copy (elementNames, 0, newArray, 0, elementNameStackPos);
 				elementNames = newArray;
 			}
-			elementNames [elementNameStackPos++] =
-				new TagName (name, local, prefix);
+			elementNames [elementNameStackPos++] = name;
 		}
 
 		// The reader is positioned on the first character
@@ -1466,10 +1410,13 @@ namespace System.Xml
 			currentLinkedNodeLineNumber = line;
 			currentLinkedNodeLinePosition = column;
 
+			string prefix, localName;
+			string name = ReadName (out prefix, out localName);
 			if (elementNameStackPos == 0)
 				throw NotWFError ("closing element without matching opening element");
-			TagName expected = elementNames [--elementNameStackPos];
-			Expect (expected.Name);
+			string expected = elementNames [--elementNameStackPos];
+			if (expected != name)
+				throw NotWFError (String.Format ("unmatched closing element: expected {0} but found {1}", expected, name));
 
 			ExpectAfterWhitespace ('>');
 
@@ -1477,15 +1424,15 @@ namespace System.Xml
 
 			SetProperties (
 				XmlNodeType.EndElement, // nodeType
-				expected.Name, // name
-				expected.Prefix, // prefix
-				expected.LocalName, // localName
+				name, // name
+				prefix, // prefix
+				localName, // localName
 				false, // isEmptyElement
 				null, // value
 				true // clearAttributes
 			);
-			if (expected.Prefix.Length > 0)
-				currentToken.NamespaceURI = LookupNamespace (expected.Prefix, true);
+			if (prefix.Length > 0)
+				currentToken.NamespaceURI = LookupNamespace (prefix, true);
 			else if (namespaces)
 				currentToken.NamespaceURI = parserContext.NamespaceManager.DefaultNamespace;
 
@@ -1500,7 +1447,6 @@ namespace System.Xml
 				currentState = XmlNodeType.EndElement;
 		}
 
-#if USE_NAME_BUFFER
 		private void AppendSurrogatePairNameChar (int ch)
 		{
 			nameBuffer [nameLength++] = (char) ((ch - 0x10000) / 0x400 + 0xD800);
@@ -1516,7 +1462,6 @@ namespace System.Xml
 			nameBuffer = new char [nameCapacity];
 			Array.Copy (oldNameBuffer, nameBuffer, nameLength);
 		}
-#endif
 
 		private void AppendValueChar (int ch)
 		{
@@ -1534,27 +1479,6 @@ namespace System.Xml
 
 		private string CreateValueString ()
 		{
-			// Since whitespace strings are mostly identical
-			// depending on the Depth, we make use of NameTable
-			// to atomize whitespace strings.
-			switch (NodeType) {
-			case XmlNodeType.Whitespace:
-			case XmlNodeType.SignificantWhitespace:
-				int len = valueBuffer.Length;
-				if (whitespaceCache == null)
-					whitespaceCache = new char [32];
-				if (len >= whitespaceCache.Length)
-					break;
-				if (whitespacePool == null)
-					whitespacePool = new NameTable ();
-#if NET_2_0
-				valueBuffer.CopyTo (0, whitespaceCache, 0, len);
-#else
-				for (int i = 0; i < len; i++)
-					whitespaceCache [i] = valueBuffer [i];
-#endif
-				return whitespacePool.Add (whitespaceCache, 0, valueBuffer.Length);
-			}
 			return (valueBuffer.Capacity < 100) ?
 				valueBuffer.ToString (0, valueBuffer.Length) :
 				valueBuffer.ToString ();
@@ -1565,13 +1489,34 @@ namespace System.Xml
 			valueBuffer.Length = 0;
 		}
 
+		private void AppendCurrentTagChar (int ch)
+		{
+			if (currentTagLength == currentTagCapacity)
+				ExpandCurrentTagCapacity ();
+			if (ch < Char.MaxValue)
+				currentTagBuffer [currentTagLength++] = (char) ch;
+			else {
+				currentTagBuffer [currentTagLength++] = (char) ((ch - 0x10000) / 0x400 + 0xD800);
+				if (currentTagLength == currentTagCapacity)
+					ExpandCurrentTagCapacity ();
+				currentTagBuffer [currentTagLength++] = (char) ((ch - 0x10000) % 0x400 + 0xDC00);
+			}
+		}
+
+		private void ExpandCurrentTagCapacity ()
+		{
+			currentTagCapacity = currentTagCapacity * 2;
+			char [] oldCurrentTagBuffer = currentTagBuffer;
+			currentTagBuffer = new char [currentTagCapacity];
+			Array.Copy (oldCurrentTagBuffer, currentTagBuffer, currentTagLength);
+		}
+
 		// The reader is positioned on the first character
 		// of the text.
 		private void ReadText (bool notWhitespace)
 		{
 			if (currentState != XmlNodeType.Element)
 				throw NotWFError ("Text node cannot appear in this state.");
-			preserveCurrentTag = false;
 
 			if (notWhitespace)
 				ClearValueBuffer ();
@@ -1645,7 +1590,7 @@ namespace System.Xml
 		private int ReadReference (bool ignoreEntityReferences)
 		{
 			if (PeekChar () == '#') {
-				Advance ('#');
+				ReadChar ();
 				return ReadCharacterReference ();
 			} else
 				return ReadEntityReference (ignoreEntityReferences);
@@ -1654,13 +1599,12 @@ namespace System.Xml
 		private int ReadCharacterReference ()
 		{
 			int value = 0;
-			int ch;
 
 			if (PeekChar () == 'x') {
-				Advance ('x');
+				ReadChar ();
 
-				while ((ch = PeekChar ()) != ';' && ch != -1) {
-					Advance (ch);
+				while (PeekChar () != ';' && PeekChar () != -1) {
+					int ch = ReadChar ();
 
 					if (ch >= '0' && ch <= '9')
 						value = (value << 4) + ch - '0';
@@ -1675,8 +1619,8 @@ namespace System.Xml
 								ch));
 				}
 			} else {
-				while ((ch = PeekChar ()) != ';' && ch != -1) {
-					Advance (ch);
+				while (PeekChar () != ';' && PeekChar () != -1) {
+					int ch = ReadChar ();
 
 					if (ch >= '0' && ch <= '9')
 						value = value * 10 + ch - '0';
@@ -1768,7 +1712,7 @@ namespace System.Xml
 			currentAttributeValue = -1;
 		}
 
-		private void AddAttributeWithValue (string name, string value)
+		private void AddDtdAttribute (string name, string value)
 		{
 			IncrementAttributeToken ();
 			XmlAttributeTokenInfo ati = attributeTokens [currentAttribute];
@@ -1777,6 +1721,7 @@ namespace System.Xml
 			ati.NamespaceURI = String.Empty;
 			IncrementAttributeValueToken ();
 			XmlTokenInfo vti = attributeValueTokens [currentAttributeValue];
+			vti.Value = value;
 			SetTokenProperties (vti,
 				XmlNodeType.Text,
 				String.Empty,
@@ -1785,7 +1730,6 @@ namespace System.Xml
 				false,
 				value,
 				false);
-			ati.Value = value;
 			attributeCount++;
 		}
 
@@ -1884,7 +1828,7 @@ namespace System.Xml
 					goto default;
 				case '&':
 					if (PeekChar () == '#') {
-						Advance ('#');
+						ReadChar ();
 						ch = ReadCharacterReference ();
 						AppendValueChar (ch);
 						break;
@@ -1967,21 +1911,26 @@ namespace System.Xml
 		private void ReadProcessingInstruction ()
 		{
 			string target = ReadName ();
-			if (target != "xml" && target.ToLower (CultureInfo.InvariantCulture) == "xml")
+			if (target == "xml") {
+				ReadXmlDeclaration ();
+				return;
+			} else if (target.ToLower (CultureInfo.InvariantCulture) == "xml")
 				throw NotWFError ("Not allowed processing instruction name which starts with 'X', 'M', 'L' was found.");
 
+			if (currentState == XmlNodeType.None)
+				currentState = XmlNodeType.XmlDeclaration;
+
 			if (!SkipWhitespace ())
 				if (PeekChar () != '?')
 					throw NotWFError ("Invalid processing instruction name was found.");
 
 			ClearValueBuffer ();
 
-			int ch;
-			while ((ch = PeekChar ()) != -1) {
-				Advance (ch);
+			while (PeekChar () != -1) {
+				int ch = ReadChar ();
 
 				if (ch == '?' && PeekChar () == '>') {
-					Advance ('>');
+					ReadChar ();
 					break;
 				}
 
@@ -1990,76 +1939,58 @@ namespace System.Xml
 				AppendValueChar (ch);
 			}
 
-			if (Object.ReferenceEquals (target, XmlNamespaceManager.PrefixXml))
-				VerifyXmlDeclaration ();
-			else {
-				if (currentState == XmlNodeType.None)
-					currentState = XmlNodeType.XmlDeclaration;
-
-				SetProperties (
-					XmlNodeType.ProcessingInstruction, // nodeType
-					target, // name
-					String.Empty, // prefix
-					target, // localName
-					false, // isEmptyElement
-					null, // value: create only when required
-					true // clearAttributes
-				);
-			}
+			SetProperties (
+				XmlNodeType.ProcessingInstruction, // nodeType
+				target, // name
+				String.Empty, // prefix
+				target, // localName
+				false, // isEmptyElement
+				null, // value: create only when required
+				true // clearAttributes
+			);
 		}
 
-		void VerifyXmlDeclaration ()
+		// The reader is positioned after "<?xml "
+		private void ReadXmlDeclaration ()
 		{
-			if (!allowMultipleRoot && currentState != XmlNodeType.None)
+			if (!allowMultipleRoot && currentState != XmlNodeType.None) {
 				throw NotWFError ("XML declaration cannot appear in this state.");
-
+			}
 			currentState = XmlNodeType.XmlDeclaration;
 
-			string text = CreateValueString ();
-
 			ClearAttributes ();
 
-			int idx = 0;
-
-			string encoding = null, standalone = null;
-			string name, value;
-			ParseAttributeFromString (text, ref idx, out name, out value);
-			if (name != "version" || value != "1.0")
-				throw NotWFError ("'version' is expected.");
-			name = String.Empty;
-			if (SkipWhitespaceInString (text, ref idx) && idx < text.Length)
-				ParseAttributeFromString (text, ref idx, out name, out value);
-			if (name == "encoding") {
-				if (!XmlChar.IsValidIANAEncoding (value))
-					throw NotWFError ("'encoding' must be a valid IANA encoding name.");
+			ReadAttributes (true);	// They must have "version."
+			string version = GetAttribute ("version");
+
+			string message = null;
+
+			if (attributeTokens [0].Name != "version" || version != "1.0")
+				message = "Version 1.0 declaration is required in XML Declaration.";
+			else if (attributeCount > 1 &&
+					(attributeTokens [1].Name != "encoding" &&
+					attributeTokens [1].Name != "standalone"))
+				message = "Invalid Xml Declaration markup was found.";
+			else if (attributeCount > 2 && attributeTokens [2].Name != "standalone")
+				message = "Invalid Xml Declaration markup was found.";
+			string sa = GetAttribute ("standalone");
+			if (sa != null && sa != "yes" && sa != "no")
+				message = String.Format ("Only 'yes' or 'no' is allowed for standalone. Value was '{0}'", sa);
+
+			this.isStandalone = (sa == "yes");
+
+			if (message != null)
+				throw NotWFError (message);
+
+			string encoding = GetAttribute ("encoding");
+			if (encoding != null) {
+				if (!XmlChar.IsValidIANAEncoding (encoding))
+					throw new XmlException (String.Format ("Encoding name must be a valid IANA name: {0}", encoding));
 				if (reader is XmlStreamReader)
 					parserContext.Encoding = ((XmlStreamReader) reader).Encoding;
 				else
 					parserContext.Encoding = Encoding.Unicode;
-				encoding = value;
-				name = String.Empty;
-				if (SkipWhitespaceInString (text, ref idx) && idx < text.Length)
-					ParseAttributeFromString (text, ref idx, out name, out value);
-			}
-			if (name == "standalone") {
-				this.isStandalone = value == "yes";
-				if (value != "yes" && value != "no")
-					throw NotWFError ("Only 'yes' or 'no' is allow for 'standalone'");
-				standalone = value;
-				SkipWhitespaceInString (text, ref idx);
-			}
-			else if (name.Length != 0)
-				throw NotWFError (String.Format ("Unexpected token: '{0}'", name));
-
-			if (idx < text.Length)
-				throw NotWFError ("'?' is expected.");
-
-			AddAttributeWithValue ("version", "1.0");
-			if (encoding != null)
-				AddAttributeWithValue ("encoding", encoding);
-			if (standalone != null)
-				AddAttributeWithValue ("standalone", standalone);
-			currentAttribute = currentAttributeValue = -1;
+			}
 
 			SetProperties (
 				XmlNodeType.XmlDeclaration, // nodeType
@@ -2067,51 +1998,11 @@ namespace System.Xml
 				String.Empty, // prefix
 				"xml", // localName
 				false, // isEmptyElement
-				text, // value
+				new string (currentTagBuffer, 6, currentTagLength - 6), // value
 				false // clearAttributes
 			);
-		}
-
-		bool SkipWhitespaceInString (string text, ref int idx)
-		{
-			int start = idx;
-			while (idx < text.Length && XmlChar.IsWhitespace (text [idx]))
-				idx++;
-			return idx - start > 0;
-		}
-
-		private void ParseAttributeFromString (string src,
-			ref int idx, out string name, out string value)
-		{
-			while (idx < src.Length && XmlChar.IsWhitespace (src [idx]))
-				idx++;
-
-			int start = idx;
-			while (idx < src.Length && XmlChar.IsNameChar (src [idx]))
-				idx++;
-			name = src.Substring (start, idx - start);
-
-			while (idx < src.Length && XmlChar.IsWhitespace (src [idx]))
-				idx++;
-			if (idx == src.Length || src [idx] != '=')
-				throw NotWFError (String.Format ("'=' is expected after {0}", name));
-			idx++;
-
-			while (idx < src.Length && XmlChar.IsWhitespace (src [idx]))
-				idx++;
-
-			if (idx == src.Length || src [idx] != '"' && src [idx] != '\'')
-				throw NotWFError ("'\"' or '\'' is expected.");
 
-			char quote = src [idx];
-			idx++;
-			start = idx;
-
-			while (idx < src.Length && src [idx] != quote)
-				idx++;
-			idx++;
-
-			value = src.Substring (start, idx - start - 1);
+			Expect ("?>");
 		}
 
 		private void SkipTextDeclaration ()
@@ -2237,21 +2128,18 @@ namespace System.Xml
 			if (currentState == XmlNodeType.None)
 				currentState = XmlNodeType.XmlDeclaration;
 
-			preserveCurrentTag = false;
-
 			ClearValueBuffer ();
 
-			int ch;
-			while ((ch = PeekChar ()) != -1) {
-				Advance (ch);
+			while (PeekChar () != -1) {
+				int ch = ReadChar ();
 
 				if (ch == '-' && PeekChar () == '-') {
-					Advance ('-');
+					ReadChar ();
 
 					if (PeekChar () != '>')
 						throw NotWFError ("comments cannot contain '--'");
 
-					Advance ('>');
+					ReadChar ();
 					break;
 				}
 
@@ -2278,7 +2166,6 @@ namespace System.Xml
 		{
 			if (currentState != XmlNodeType.Element)
 				throw NotWFError ("CDATA section cannot appear in this state.");
-			preserveCurrentTag = false;
 
 			ClearValueBuffer ();
 
@@ -2375,9 +2262,10 @@ namespace System.Xml
 				ReadChar ();
 				intSubsetStartLine = this.LineNumber;
 				intSubsetStartColumn = this.LinePosition;
-				ClearValueBuffer ();
+				int startPos = currentTagLength;
 				ReadInternalSubset ();
-				parserContext.InternalSubset = CreateValueString ();
+				int endPos = currentTagLength - 1;
+				parserContext.InternalSubset = new string (currentTagBuffer, startPos, endPos - startPos);
 			}
 			// end of DOCTYPE decl.
 			ExpectAfterWhitespace ('>');
@@ -2398,9 +2286,9 @@ namespace System.Xml
 				);
 
 			if (publicId != null)
-				AddAttributeWithValue ("PUBLIC", publicId);
+				AddDtdAttribute ("PUBLIC", publicId);
 			if (systemId != null)
-				AddAttributeWithValue ("SYSTEM", systemId);
+				AddDtdAttribute ("SYSTEM", systemId);
 			currentAttribute = currentAttributeValue = -1;
 		}
 
@@ -2473,31 +2361,16 @@ namespace System.Xml
 			get { return stateStack.Peek (); }
 		}
 
-		private int ReadValueChar ()
-		{
-			int ret = ReadChar ();
-			AppendValueChar (ret);
-			return ret;
-		}
-
-		private void ExpectAndAppend (string s)
-		{
-			Expect (s);
-			valueBuffer.Append (s);
-		}
-
 		// Simply read but not generate any result.
 		private void ReadInternalSubset ()
 		{
 			bool continueParse = true;
 
 			while (continueParse) {
-				switch (ReadValueChar ()) {
+				switch (ReadChar ()) {
 				case ']':
 					switch (State) {
 					case DtdInputState.Free:
-						// chop extra ']'
-						valueBuffer.Remove (valueBuffer.Length - 1, 1);
 						continueParse = false;
 						break;
 					case DtdInputState.InsideDoubleQuoted:
@@ -2517,21 +2390,21 @@ namespace System.Xml
 					case DtdInputState.Comment:
 						continue;	// well-formed
 					}
-					int c = ReadValueChar ();
+					int c = ReadChar ();
 					switch (c) {
 					case '?':
 						stateStack.Push (DtdInputState.PI);
 						break;
 					case '!':
-						switch (ReadValueChar ()) {
+						switch (ReadChar ()) {
 						case 'E':
-							switch (ReadValueChar ()) {
+							switch (ReadChar ()) {
 							case 'L':
-								ExpectAndAppend ("EMENT");
+								Expect ("EMENT");
 								stateStack.Push (DtdInputState.ElementDecl);
 								break;
 							case 'N':
-								ExpectAndAppend ("TITY");
+								Expect ("TITY");
 								stateStack.Push (DtdInputState.EntityDecl);
 								break;
 							default:
@@ -2539,15 +2412,15 @@ namespace System.Xml
 							}
 							break;
 						case 'A':
-							ExpectAndAppend ("TTLIST");
+							Expect ("TTLIST");
 							stateStack.Push (DtdInputState.AttlistDecl);
 							break;
 						case 'N':
-							ExpectAndAppend ("OTATION");
+							Expect ("OTATION");
 							stateStack.Push (DtdInputState.NotationDecl);
 							break;
 						case '-':
-							ExpectAndAppend ("-");
+							Expect ('-');
 							stateStack.Push (DtdInputState.Comment);
 							break;
 						}
@@ -2589,15 +2462,15 @@ namespace System.Xml
 					break;
 				case '?':
 					if (State == DtdInputState.PI) {
-						if (ReadValueChar () == '>')
+						if (ReadChar () == '>')
 							stateStack.Pop ();
 					}
 					break;
 				case '-':
 					if (State == DtdInputState.Comment) {
 						if (PeekChar () == '-') {
-							ReadValueChar ();
-							ExpectAndAppend (">");
+							ReadChar ();
+							Expect ('>');
 							stateStack.Pop ();
 						}
 					}
@@ -2663,54 +2536,19 @@ namespace System.Xml
 
 		private string ReadName (out string prefix, out string localName)
 		{
-#if !USE_NAME_BUFFER
-			bool savePreserve = preserveCurrentTag;
-			preserveCurrentTag = true;
+			// FIXME: need to reject non-QName names?
 
-			int startOffset = peekCharsIndex - curNodePeekIndex;
-			int ch = PeekChar ();
-			if (!XmlChar.IsFirstNameChar (ch))
-				throw NotWFError (String.Format (CultureInfo.InvariantCulture, "a name did not start with a legal character {0} ({1})", ch, (char) ch));
-			Advance (ch);
-			int length = 1;
-			int colonAt = -1;
-
-			while (XmlChar.IsNameChar ((ch = PeekChar ()))) {
-				Advance (ch);
-				if (ch == ':' && namespaces && colonAt < 0)
-					colonAt = length;
-				length++;
-			}
-
-			int start = curNodePeekIndex + startOffset;
-
-			string name = parserContext.NameTable.Add (
-				peekChars, start, length);
-
-			if (colonAt > 0) {
-				prefix = parserContext.NameTable.Add (
-					peekChars, start, colonAt);
-				localName = parserContext.NameTable.Add (
-					peekChars, start + colonAt + 1, length - colonAt - 1);
-			} else {
-				prefix = String.Empty;
-				localName = name;
-			}
-
-			preserveCurrentTag = savePreserve;
-
-			return name;
-#else
 			int ch = PeekChar ();
 			if (!XmlChar.IsFirstNameChar (ch))
 				throw NotWFError (String.Format (CultureInfo.InvariantCulture, "a name did not start with a legal character {0} ({1})", ch, (char) ch));
 
 			nameLength = 0;
 
-			Advance (ch);
+			ch = ReadChar ();
 			// AppendNameChar (ch);
 			{
-				// nameBuffer.Length is always non-0 so no need to ExpandNameCapacity () here
+				if (nameLength == nameCapacity)
+					ExpandNameCapacity ();
 				if (ch < Char.MaxValue)
 					nameBuffer [nameLength++] = (char) ch;
 				else
@@ -2719,10 +2557,10 @@ namespace System.Xml
 
 			int colonAt = -1;
 
-			while (XmlChar.IsNameChar ((ch = PeekChar ()))) {
-				Advance (ch);
+			while (XmlChar.IsNameChar (PeekChar ())) {
+				ch = ReadChar ();
 
-				if (ch == ':' && namespaces && colonAt < 0)
+				if (namespaces && colonAt < 0 && ch == ':')
 					colonAt = nameLength;
 				// AppendNameChar (ch);
 				{
@@ -2737,16 +2575,16 @@ namespace System.Xml
 
 			string name = parserContext.NameTable.Add (nameBuffer, 0, nameLength);
 
-			if (colonAt > 0) {
+			if (namespaces && colonAt > 0) {
 				prefix = parserContext.NameTable.Add (nameBuffer, 0, colonAt);
 				localName = parserContext.NameTable.Add (nameBuffer, colonAt + 1, nameLength - colonAt - 1);
-			} else {
+			}
+			else {
 				prefix = String.Empty;
 				localName = name;
 			}
 
 			return name;
-#endif
 		}
 
 		// Read the next character and compare it against the
@@ -2767,10 +2605,9 @@ namespace System.Xml
 
 		private void Expect (string expected)
 		{
-			for (int i = 0; i < expected.Length; i++)
-				if (ReadChar () != expected [i])
-					throw NotWFError (String.Format (CultureInfo.InvariantCulture, 
-						"'{0}' is expected", expected));
+			int len = expected.Length;
+			for(int i=0; i< len; i++)
+				Expect (expected[i]);
 		}
 
 		private void ExpectAfterWhitespace (char c)
@@ -2794,45 +2631,40 @@ namespace System.Xml
 			bool skipped = (ch == 0x20 || ch == 0x9 || ch == 0xA || ch == 0xD);
 			if (!skipped)
 				return false;
-			Advance (ch);
+			ReadChar ();
 			// FIXME: It should be inlined by the JIT.
 //			while (XmlChar.IsWhitespace (PeekChar ()))
 //				ReadChar ();
 			while ((ch = PeekChar ()) == 0x20 || ch == 0x9 || ch == 0xA || ch == 0xD)
-				Advance (ch);
+				ReadChar ();
 			return skipped;
 		}
 
-		private bool ReadWhitespace ()
+		private void ReadWhitespace ()
 		{
 			if (currentState == XmlNodeType.None)
 				currentState = XmlNodeType.XmlDeclaration;
 
-			bool savePreserve = preserveCurrentTag;
-			preserveCurrentTag = true;
-			int startOffset = peekCharsIndex - curNodePeekIndex; // it should be 0 for now though.
-
+			ClearValueBuffer ();
 			int ch = PeekChar ();
 			do {
-				Advance (ch);
-				ch = PeekChar ();
+				// FIXME: it might be optimized by the JIT later,
+//				AppendValueChar (ReadChar ());
+				{
+					ch = ReadChar ();
+					if (ch < Char.MaxValue)
+						valueBuffer.Append ((char) ch);
+					else
+						AppendSurrogatePairValueChar (ch);
+				}
 			// FIXME: It should be inlined by the JIT.
 //			} while ((ch = PeekChar ()) != -1 && XmlChar.IsWhitespace (ch));
+				ch = PeekChar ();
 			} while (ch == 0x20 || ch == 0x9 || ch == 0xA || ch == 0xD);
 
-			bool isText = currentState == XmlNodeType.Element && ch != -1 && ch != '<';
-
-			if (!isText && (whitespaceHandling == WhitespaceHandling.None ||
-				    whitespaceHandling == WhitespaceHandling.Significant && XmlSpace != XmlSpace.Preserve))
-				return false;
-
-			ClearValueBuffer ();
-			valueBuffer.Append (peekChars, curNodePeekIndex, peekCharsIndex - curNodePeekIndex - startOffset);
-			preserveCurrentTag = savePreserve;
-
-			if (isText) {
+			if (currentState == XmlNodeType.Element && ch != -1 && ch != '<')
 				ReadText (false);
-			} else {
+			else {
 				XmlNodeType nodeType = (this.XmlSpace == XmlSpace.Preserve) ?
 					XmlNodeType.SignificantWhitespace : XmlNodeType.Whitespace;
 				SetProperties (nodeType,
@@ -2844,7 +2676,7 @@ namespace System.Xml
 					       true);
 			}
 
-			return true;
+			return;
 		}
 
 		// Returns -1 if it should throw an error.
@@ -2859,7 +2691,7 @@ namespace System.Xml
 				case -1:
 					throw NotWFError ("Unexpected end of xml.");
 				case '<':
-					Advance (c);
+					ReadChar ();
 					if (PeekChar () != '/') {
 						buffer [bufIndex++] = '<';
 						continue;
@@ -2875,7 +2707,7 @@ namespace System.Xml
 					Read (); // move to the next node
 					return i;
 				default:
-					Advance (c);
+					ReadChar ();
 					if (c < Char.MaxValue)
 						buffer [bufIndex++] = (char) c;
 					else {
@@ -2903,10 +2735,11 @@ namespace System.Xml
 						continue;
 					ReadChar ();
 					string name = ReadName ();
-					if (name != elementNames [elementNameStackPos - 1].Name)
+					if (name != elementNames [elementNameStackPos - 1])
 						continue;
 					Expect ('>');
 					depth--;
+					elementNames [--elementNameStackPos] = null;
 					return Read ();
 				}
 			} while (true);
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
index 47bb580e0bf..da97c7c377f 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
@@ -210,11 +210,8 @@ namespace System.Xml
 
 		public override XmlNodeType NodeType {
 			get {
-				if (entity != null)
-					return entity.ReadState == ReadState.Initial ?
-						source.NodeType :
-						entity.EOF ? XmlNodeType.EndEntity :
-						entity.NodeType;
+				if (Current == entity)
+					return entity.EOF ? XmlNodeType.EndEntity : entity.NodeType;
 				else
 					return source.NodeType;
 			}
diff --git a/mcs/class/System.XML/System.Xml/XmlTextWriter.cs b/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
index 0cde4696d0c..6b9d3163e68 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
@@ -51,8 +51,7 @@ namespace System.Xml
 		bool namespaces = true;
 		bool openAttribute = false;
 		bool attributeWrittenForElement = false;
-		XmlTextWriterOpenElement [] openElements =
-			new XmlTextWriterOpenElement [20];
+		ArrayList openElements = new ArrayList ();
 		int openElementCount;
 		Formatting formatting = Formatting.None;
 		int indentation = 2;
@@ -142,11 +141,12 @@ namespace System.Xml
 				if (openElementCount == 0)
 					return false;
 				else
-					return openElements [openElementCount - 1].IndentingOverriden;
+					return ((XmlTextWriterOpenElement)
+openElements [openElementCount - 1]).IndentingOverriden;
 			}
 			set {
 				if (openElementCount > 0)
-					openElements [openElementCount - 1].IndentingOverriden = value;
+					((XmlTextWriterOpenElement) openElements [openElementCount - 1]).IndentingOverriden = value;
 			}
 		}
 
@@ -154,7 +154,7 @@ namespace System.Xml
 			get {
 				if (openElementCount < 2)
 					return false;
-				return openElements [openElementCount - 2].IndentingOverriden;
+				return ((XmlTextWriterOpenElement) openElements [openElementCount - 2]).IndentingOverriden;
 			}
 		}
 
@@ -251,7 +251,7 @@ namespace System.Xml
 				int i;
 
 				for (i = openElementCount - 1; i >= 0; i--) {
-					xmlLang = openElements [i].XmlLang;
+					xmlLang = ((XmlTextWriterOpenElement) openElements [i]).XmlLang;
 					if (xmlLang != null)
 						break;
 				}
@@ -266,7 +266,7 @@ namespace System.Xml
 				int i;
 
 				for (i = openElementCount - 1; i >= 0; i--) {
-					xmlSpace = openElements [i].XmlSpace;
+					xmlSpace = ((XmlTextWriterOpenElement)openElements [i]).XmlSpace;
 					if (xmlSpace != XmlSpace.None)
 						break;
 				}
@@ -354,7 +354,7 @@ namespace System.Xml
 		{
 #if NET_2_0
 			if (ws == WriteState.Error)
-				throw new InvalidOperationException ("Writing at state Error would result in wrong output.");
+				throw new InvalidOperationException ("Writing at state Error would result in a wrong result.");
 #endif
 			if (!openWriter) {
 				throw new InvalidOperationException ("The Writer is closed.");
@@ -565,7 +565,7 @@ namespace System.Xml
 				w.Write (xmlLang);
 				openXmlLang = false;
 				if (openElementCount > 0)
-					openElements [openElementCount - 1].XmlLang = xmlLang;
+					((XmlTextWriterOpenElement) openElements [openElementCount - 1]).XmlLang = xmlLang;
 			}
 
 			if (openXmlSpace) 
@@ -576,7 +576,7 @@ namespace System.Xml
 					w.Write ("default");
 				openXmlSpace = false;
 				if (openElementCount > 0)
-					openElements [openElementCount - 1].XmlSpace = xmlSpace;
+					((XmlTextWriterOpenElement) openElements [openElementCount - 1]).XmlSpace = xmlSpace;
 			}
 
 			w.Write (quoteChar);
@@ -642,7 +642,7 @@ namespace System.Xml
 					if (!ParentIndentingOverriden)
 						WriteIndent ();
 					w.Write ("</");
-					XmlTextWriterOpenElement el = openElements [openElementCount - 1];
+					XmlTextWriterOpenElement el = (XmlTextWriterOpenElement) openElements [openElementCount - 1];
 					if (el.Prefix != String.Empty) {
 						w.Write (el.Prefix);
 						w.Write (':');
@@ -657,7 +657,7 @@ namespace System.Xml
 			} else {
 				WriteIndent ();
 				w.Write ("</");
-				XmlTextWriterOpenElement el = openElements [openElementCount - 1];
+				XmlTextWriterOpenElement el = (XmlTextWriterOpenElement) openElements [openElementCount - 1];
 				openElementCount--;
 				if (el.Prefix != String.Empty) {
 					w.Write (el.Prefix);
@@ -760,15 +760,15 @@ namespace System.Xml
 
 		public override void WriteStartAttribute (string prefix, string localName, string ns)
 		{
-			if (prefix == null)
-				prefix = String.Empty;
-			else if (prefix == "xml") {
+			if (prefix == "xml") {
 				ns = XmlNamespaceManager.XmlnsXml;
 				if (localName == "lang")
 					openXmlLang = true;
 				else if (localName == "space")
 					openXmlSpace = true;
 			}
+			if (prefix == null)
+				prefix = String.Empty;
 
 			if (prefix.Length > 0 && (ns == null || ns.Length == 0))
 				if (prefix != "xmlns")
@@ -782,7 +782,11 @@ namespace System.Xml
 			}
 
 			// Note that null namespace with "xmlns" are allowed.
+#if NET_1_0
+			if ((prefix == "xmlns" || localName == "xmlns" && prefix == String.Empty) && ns != XmlnsNamespace)
+#else
 			if ((prefix == "xmlns" || localName == "xmlns" && prefix == String.Empty) && ns != null && ns != XmlnsNamespace)
+#endif
 				throw ArgumentError (String.Format ("The 'xmlns' attribute is bound to the reserved namespace '{0}'", XmlnsNamespace));
 
 			if (ns == XmlnsNamespace) // see bug #77083
@@ -933,10 +937,7 @@ namespace System.Xml
 			// is kind of silly implementation. See bug #77094.
 			if (Namespaces &&
 			    ns != XmlNamespaceManager.XmlnsXml &&
-			    prefix != null && prefix.Length == 3 &&
-			    (prefix [0] == 'x' || prefix [0] == 'X') &&
-			    (prefix [1] == 'm' || prefix [1] == 'M') &&
-			    (prefix [2] == 'l' || prefix [2] == 'L'))
+			    String.Compare (prefix, "xml", true) == 0)
 				throw new ArgumentException ("A prefix cannot be equivalent to \"xml\" in case-insensitive match.");
 
 			// ignore non-namespaced node's prefix.
@@ -969,18 +970,10 @@ namespace System.Xml
 			}
 			w.Write (localName);
 
-			if (openElements.Length == openElementCount) {
-				XmlTextWriterOpenElement [] tmp =
-					new XmlTextWriterOpenElement [openElementCount * 2];
-				Array.Copy (openElements, tmp, openElementCount);
-				openElements = tmp;
-			}
-			if (openElements [openElementCount] == null)
-				openElements [openElementCount] =
-					new XmlTextWriterOpenElement (prefix, localName);
+			if (openElements.Count == openElementCount)
+				openElements.Add (new XmlTextWriterOpenElement (prefix, localName));
 			else
-				openElements [openElementCount].Reset (prefix, localName);
-
+				((XmlTextWriterOpenElement) openElements [openElementCount]).Reset (prefix, localName);
 			openElementCount++;
 			ws = WriteState.Element;
 			openStartElement = true;
@@ -1111,7 +1104,7 @@ namespace System.Xml
 
 		private void WriteStringInternal (string text, bool entitize)
 		{
-			if (text == null || text.Length == 0 && entitize)
+			if (text == null || text.Length == 0)
 				return;
 			
 			CheckState ();
diff --git a/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs b/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs
deleted file mode 100644
index b1234a4e84a..00000000000
--- a/mcs/class/System.XML/System.Xml/XmlTextWriter2.cs
+++ /dev/null
@@ -1,1436 +0,0 @@
-//
-// XmlTextWriter.cs
-//
-// Author:
-//	Atsushi Enomoto  <atsushi@ximian.com>
-//
-// Copyright (C) 2006 Novell, Inc.
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml;
-
-/*
-
-This is a fresh implementation of XmlTextWriter since Mono 1.1.14.
-
-Here are some implementation notes (mostly common to previous module):
-
-- WriteProcessingInstruction() does not reject 'X' 'M' 'L'
-
-	XmlWriter violates section 2.6 of W3C XML 1.0 specification (3rd. 
-	edition) since it incorrectly allows such PI target that consists of
-	case-insensitive sequence of 'X' - 'M' - 'L'. This is XmlWriter API
-	design failure which does not provide perfect WriteStartDocument().
-
-- XmlTextWriter does not escape trailing ']' in internal subset.
-
-	The fact is as this subsection title shows. It means, to make an
-	XmlWriter compatible with other XmlWriters, it should always escape
-	the trailing ']' of the input, but XmlTextWriter runs no check.
-
-- Prefix autogeneration for global attributes
-
-	When an attribute has a non-empty namespace URI, the prefix must be
-	non-empty string (since if the prefix is empty it is regarded as a
-	local attribute). In such case, a dummy prefix must be created.
-
-	Since attributes are written to TextWriter almost immediately, the
-	same prefix might appear in the later attributes.
-
-- Namespace context
-
-	Namespace handling in XmlTextWriter is pretty nasty.
-
-	First of all, if WriteStartElement() takes null namespaceURI, then
-	the element has no explicit namespace and it is treated as if
-	Namespaces property were set as false.
-
-	Namespace context is structured by some writer methods:
-
-	- WriteStartElement() : If it has a non-empty argument prefix, then
-	  the new prefix is bound to the argument namespaceURI. If prefix
-	  is "" and namespaceURI is not empty, then it consists of a
-	  default namespace.
-
-	- WriteStartAttribute() : there are two namespace provisions here:
-	  1) like WriteStartElement() prefix and namespaceURI are not empty
-	  2) prefix is "xmlns", or localName is "xmlns" and prefix is ""
-	  If prefix is "" and namespaceURI is not empty, then the prefix is
-	  "mocked up" (since an empty prefix is not possible for attributes).
-
-	- WriteQualifiedName() : the argument name and namespaceURI creates
-	  a new namespace mapping. Note that default namespace (prefix "")
-	  is not constructed at the state of WriteState.Attribute.
-
-	Note that WriteElementString() internally calls WriteStartElement()
-	and WriteAttributeString() internally calls WriteStartAttribute().
-
-	Sometimes those namespace outputs are in conflict. For example, if
-
-		w.WriteStartElement ("p", "foo", "urn:foo");
-		w.WriteStartAttribute ("xmlns", "p", "urn:bar");
-		w.WriteEndElement ();
-
-	urn:foo will be lost.
-
-	Here are the rules:
-
-	- If either prefix or localName is explicitly "xmlns" in
-	  WriteStartAttribute(), it takes the highest precedence.
-	- For WriteStartElement(), prefix is always preserved, but
-	  namespaceURI context might not (because of the rule above).
-	- For WriteStartAttribute(), prefix is preserved only if there is
-	  no previous mapping in the local element. If it is in conflict,
-	  a new prefix is "mocked up" like an empty prefix.
-
-- DetermineAttributePrefix(): local mapping overwrite
-
-	(do not change this section title unless you also change cross
-	references in this file.)
-
-	Even if the prefix is already mapped to another namespace, it might
-	be overridable because the conflicting mapping might reside in one
-	of the ancestors.
-
-	To check it, we once try to remove existing mapping. If it is 
-	successfully removed, then the mapping is locally added. In that
-	case, we cannot override it, so mock another prefix up.
-
-
-- Attribute value preservation
-
-	Since xmlns and xml:* attributes are used to determine some public
-	behaviors such as XmlLang, XmlSpace and LookupPrefix(), it must
-	preserve what value is being written. At the same time, users might
-	call WriteString(), WhiteEntityRef() etc. separately, in such cases
-	we must preserve what is output to the stream.
-
-	This preservation is done using a "temporary preservation buffer",
-	the output Flush() behavior is different from MS. In such case that
-	XmlTextWriter uses that buffer, it won't be write anything until
-	XmlTextWriter.WriteEndAttribute() is called. If we implement it like
-	MS, it results in meaningless performance loss (it is not something 
-	people should expect. There is no solid behavior on when start tag 
-	closing '>' is written).
-
-*/
-
-
-#if NET_1_1
-namespace System.Xml
-#else
-namespace Mono.Xml
-#endif
-{
-	public class XmlTextWriter : XmlWriter
-	{
-		// Static/constant members.
-
-		const string XmlNamespace = "http://www.w3.org/XML/1998/namespace";
-		const string XmlnsNamespace = "http://www.w3.org/2000/xmlns/";
-
-		static readonly Encoding unmarked_utf8encoding =
-			new UTF8Encoding (false, false);
-		static char [] escaped_text_chars;
-		static char [] escaped_attr_chars;
-
-		// Internal classes
-
-		class XmlNodeInfo
-		{
-			public string Prefix;
-			public string LocalName;
-			public string NS;
-			public bool HasSimple;
-			public bool HasElements;
-			public string XmlLang;
-			public XmlSpace XmlSpace;
-		}
-
-		internal class StringUtil
-		{
-			static CultureInfo cul = CultureInfo.InvariantCulture;
-			static CompareInfo cmp =
-				CultureInfo.InvariantCulture.CompareInfo;
-
-			public static int IndexOf (string src, string target)
-			{
-				return cmp.IndexOf (src, target);
-			}
-
-			public static int Compare (string s1, string s2)
-			{
-				return cmp.Compare (s1, s2);
-			}
-
-			public static string Format (
-				string format, params object [] args)
-			{
-				return String.Format (cul, format, args);
-			}
-		}
-
-		// Instance fields
-
-		Stream base_stream;
-		TextWriter source; // the input TextWriter to .ctor().
-		TextWriter writer;
-		// It is used for storing xml:space, xml:lang and xmlns values.
-		StringWriter preserver;
-		string preserved_name;
-		bool is_preserved_xmlns;
-
-		bool allow_doc_fragment;
-		bool close_output_stream = true;
-		bool ignore_encoding;
-		bool namespaces = true;
-		bool output_xmldecl = false;
-
-		bool check_character_validity;
-		NewLineHandling newline_handling = NewLineHandling.None;
-
-		bool is_document_entity;
-		WriteState state = WriteState.Start;
-		XmlNodeType node_state = XmlNodeType.None;
-		XmlNamespaceManager nsmanager;
-		int open_count;
-		XmlNodeInfo [] elements = new XmlNodeInfo [10];
-		Stack new_local_namespaces = new Stack ();
-		ArrayList explicit_nsdecls = new ArrayList ();
-
-		bool indent;
-		int indent_count = 2;
-		char indent_char = ' ';
-		string indent_string = "  ";
-		string newline;
-		bool indent_attributes;
-
-		char quote_char = '"';
-
-		// Constructors
-
-		public XmlTextWriter (string filename, Encoding encoding)
-			: this (new FileStream (filename, FileMode.Create, FileAccess.Write, FileShare.None), encoding)
-		{
-		}
-
-		public XmlTextWriter (Stream stream, Encoding encoding)
-			: this (new StreamWriter (stream,
-				encoding == null ? unmarked_utf8encoding : encoding))
-		{
-			ignore_encoding = (encoding == null);
-			Initialize (writer);
-			allow_doc_fragment = true;
-		}
-
-		public XmlTextWriter (TextWriter writer)
-		{
-			Initialize (writer);
-			allow_doc_fragment = true;
-		}
-
-#if NET_2_0
-		XmlTextWriter (
-			TextWriter writer, XmlWriterSettings settings)
-		{
-			if (settings == null)
-				settings = new XmlWriterSettings ();
-
-			Initialize (writer);
-
-			close_output_stream = settings.CloseOutput;
-			allow_doc_fragment =
-				settings.ConformanceLevel != System.Xml.ConformanceLevel.Document;
-			indent_string = settings.IndentChars == null ?
-				String.Empty : settings.IndentChars;
-			if (settings.NewLineChars != null)
-				newline = settings.NewLineChars;
-			indent_attributes = settings.NewLineOnAttributes;
-
-			check_character_validity = settings.CheckCharacters;
-			newline_handling = settings.NewLineHandling;
-			if (settings.OmitXmlDeclaration)
-				output_xmldecl = false;
-		}
-#endif
-
-		void Initialize (TextWriter writer)
-		{
-			XmlNameTable name_table = new NameTable ();
-			this.writer = writer;
-			if (writer is StreamWriter)
-				base_stream = ((StreamWriter) writer).BaseStream;
-			source = writer;
-			nsmanager = new XmlNamespaceManager (name_table);
-			newline = writer.NewLine;
-
-			escaped_text_chars =
-				newline_handling != NewLineHandling.None ?
-				new char [] {'&', '<', '>', '\r', '\n'} :
-				new char [] {'&', '<', '>'};
-			escaped_attr_chars =
-				new char [] {'"', '&', '<', '>', '\r', '\n'};
-		}
-
-#if NET_2_0
-		// 2.0 XmlWriterSettings support
-
-		internal bool CheckCharacters {
-			set { check_character_validity = value; }
-		}
-
-		internal bool CloseOutput {
-			set { close_output_stream = value; }
-		}
-
-		// As for ConformanceLevel, MS.NET is inconsistent with
-		// MSDN documentation. For example, even if ConformanceLevel
-		// is set as .Auto, multiple WriteStartDocument() calls
-		// result in an error.
-		// ms-help://MS.NETFramework.v20.en/wd_xml/html/7db8802b-53d8-4735-a637-4d2d2158d643.htm
-		[MonoTODO]
-		internal ConformanceLevel ConformanceLevel {
-			set {
-				allow_doc_fragment = (value == System.Xml.ConformanceLevel.Fragment);
-			}
-		}
-
-		internal string IndentChars {
-			set { indent_string = (value == null) ? String.Empty : value; }
-		}
-
-		internal string NewLineChars {
-			set { newline = (value == null) ? String.Empty : value; }
-		}
-
-		internal bool NewLineOnAttributes {
-			set { indent_attributes = value; }
-		}
-
-		internal bool OmitXmlDeclaration {
-			set { output_xmldecl = !value; }
-		}
-#endif
-
-		// Literal Output Control
-
-		public Formatting Formatting {
-			get { return indent ? Formatting.Indented : Formatting.None; }
-			set {
-				if (state != WriteState.Start)
-					throw InvalidOperation ("Formatting must be set before it is actually used to write output.");
-				indent = (value == Formatting.Indented);
-			}
-		}
-
-		public int Indentation {
-			get { return indent_count; }
-			set {
-				if (value < 0)
-					throw ArgumentError ("Indentation must be non-negative integer.");
-				indent_count = value;
-				indent_string = value == 0 ? String.Empty :
-					new string (indent_char, indent_count);
-			}
-		}
-
-		public char IndentChar {
-			get { return indent_char; }
-			set {
-				indent_char = value;
-				indent_string = new string (indent_char, indent_count);
-			}
-		}
-
-		public char QuoteChar {
-			get { return quote_char; }
-			set {
-				if (state == WriteState.Attribute)
-					throw InvalidOperation ("QuoteChar must not be changed inside attribute value.");
-				if ((value != '\'') && (value != '\"'))
-					throw ArgumentError ("Only ' and \" are allowed as an attribute quote character.");
-				quote_char = value;
-				escaped_attr_chars [0] = quote_char;
-			}
-		}
-
-		// Context Retriever
-
-		public override string XmlLang {
-			get { return open_count == 0 ? null : elements [open_count - 1].XmlLang; }
-		}
-
-		public override XmlSpace XmlSpace {
-			get { return open_count == 0 ? XmlSpace.None : elements [open_count - 1].XmlSpace; }
-		}
-
-		public override WriteState WriteState {
-			get { return state; }
-		}
-
-		public override string LookupPrefix (string namespaceUri)
-		{
-			if (namespaceUri == null || namespaceUri == String.Empty)
-				throw ArgumentError ("The Namespace cannot be empty.");
-
-			if (namespaceUri == nsmanager.DefaultNamespace)
-				return String.Empty;
-
-			string prefix = nsmanager.LookupPrefixExclusive (
-				namespaceUri, false);
-
-			// XmlNamespaceManager has changed to return null
-			// when NSURI not found.
-			// (Contradiction to the ECMA documentation.)
-			return prefix;
-		}
-
-		// Stream Control
-
-		public Stream BaseStream {
-			get { return base_stream; }
-		}
-
-		public override void Close ()
-		{
-			if (state == WriteState.Attribute)
-				WriteEndAttribute ();
-			while (open_count > 0)
-				WriteEndElement ();
-
-			if (close_output_stream)
-				writer.Close ();
-			else
-				writer.Flush ();
-			state = WriteState.Closed;
-		}
-
-		public override void Flush ()
-		{
-			writer.Flush ();
-		}
-
-		// Misc Control
-		public bool Namespaces {
-			get { return namespaces; }
-			set {
-				if (state != WriteState.Start)
-					throw InvalidOperation ("This property must be set before writing output.");
-				namespaces = value;
-			}
-		}
-
-		// XML Declaration
-
-		public override void WriteStartDocument ()
-		{
-			WriteStartDocumentCore (false, false);
-			is_document_entity = true;
-		}
-
-		public override void WriteStartDocument (bool standalone)
-		{
-			WriteStartDocumentCore (true, standalone);
-			is_document_entity = true;
-		}
-
-		void WriteStartDocumentCore (bool outputStd, bool standalone)
-		{
-			if (state != WriteState.Start)
-				throw StateError ("XmlDeclaration");
-
-			writer.Write ("<?xml version=");
-			writer.Write (quote_char);
-			writer.Write ("1.0");
-			writer.Write (quote_char);
-			if (!ignore_encoding) {
-				writer.Write (" encoding=");
-				writer.Write (quote_char);
-				writer.Write (writer.Encoding.WebName);
-				writer.Write (quote_char);
-			}
-			if (outputStd) {
-				writer.Write (" standalone=");
-				writer.Write (quote_char);
-				writer.Write (standalone ? "yes" : "no");
-				writer.Write (quote_char);
-			}
-			writer.Write ("?>");
-
-			output_xmldecl = false;
-			state = WriteState.Prolog;
-		}
-
-		public override void WriteEndDocument ()
-		{
-			switch (state) {
-#if NET_2_0
-			case WriteState.Error:
-#endif
-			case WriteState.Closed:
-			case WriteState.Start:
-				throw StateError ("EndDocument");
-			}
-
-			if (state == WriteState.Attribute)
-				WriteEndAttribute ();
-			while (open_count > 0)
-				WriteEndElement ();
-
-			state = WriteState.Start;
-			is_document_entity = false;
-		}
-
-		// DocType Declaration
-
-		public override void WriteDocType (string name,
-			string pubid, string sysid, string subset)
-		{
-			if (name == null)
-				throw ArgumentError ("name");
-			if (!XmlChar.IsName (name))
-				throw ArgumentError ("name");
-
-			if (node_state != XmlNodeType.None)
-				throw StateError ("DocType");
-			node_state = XmlNodeType.DocumentType;
-
-			if (output_xmldecl)
-				OutputAutoStartDocument ();
-
-			WriteIndent ();
-
-			writer.Write ("<!DOCTYPE ");
-			writer.Write (name);
-			if (pubid != null) {
-				writer.Write (" PUBLIC ");
-				writer.Write (quote_char);
-				writer.Write (pubid);
-				writer.Write (quote_char);
-				writer.Write (' ');
-				writer.Write (quote_char);
-				if (sysid != null)
-					writer.Write (sysid);
-				writer.Write (quote_char);
-			}
-			else if (sysid != null) {
-				writer.Write (" SYSTEM ");
-				writer.Write (quote_char);
-				writer.Write (sysid);
-				writer.Write (quote_char);
-			}
-
-			if (subset != null) {
-				writer.Write ("[");
-				// LAMESPEC: see the top of this source.
-				writer.Write (subset);
-				writer.Write ("]");
-			}
-			writer.Write ('>');
-
-			state = WriteState.Prolog;
-		}
-
-		// StartElement
-
-		public override void WriteStartElement (
-			string prefix, string localName, string namespaceUri)
-		{
-#if NET_2_0
-			if (state == WriteState.Error || state == WriteState.Closed)
-#else
-			if (state == WriteState.Closed)
-#endif
-				throw StateError ("StartTag");
-			node_state = XmlNodeType.Element;
-
-			bool anonPrefix = (prefix == null);
-			if (prefix == null)
-				prefix = String.Empty;
-
-			// Crazy namespace check goes here.
-			//
-			// 1. if Namespaces is false, then any significant 
-			//    namespace indication is not allowed.
-			// 2. if Prefix is non-empty and NamespaceURI is
-			//    empty, it is an error in 1.x, or it is reset to
-			//    an empty string in 2.0.
-			// 3. null NamespaceURI indicates that namespace is
-			//    not considered.
-			// 4. prefix must not be equivalent to "XML" in
-			//    case-insensitive comparison.
-			if (!namespaces && namespaceUri != null && namespaceUri.Length > 0)
-				throw ArgumentError ("Namespace is disabled in this XmlTextWriter.");
-			if (!namespaces && prefix.Length > 0)
-				throw ArgumentError ("Namespace prefix is disabled in this XmlTextWriter.");
-
-			if (prefix.Length > 0 && namespaceUri == null)
-				throw ArgumentError ("Namespace URI must not be null when prefix is not an empty string.");
-			// Considering the fact that WriteStartAttribute()
-			// automatically changes argument namespaceURI, this
-			// is kind of silly implementation. See bug #77094.
-			if (namespaces &&
-			    prefix != null && prefix.Length == 3 &&
-			    namespaceUri != XmlNamespace &&
-			    (prefix [0] == 'x' || prefix [0] == 'X') &&
-			    (prefix [1] == 'm' || prefix [1] == 'M') &&
-			    (prefix [2] == 'l' || prefix [2] == 'L'))
-				throw new ArgumentException ("A prefix cannot be equivalent to \"xml\" in case-insensitive match.");
-
-
-			if (output_xmldecl)
-				OutputAutoStartDocument ();
-			if (state == WriteState.Element)
-				CloseStartElement ();
-			if (open_count > 0)
-				elements [open_count - 1].HasElements = true;
-
-			nsmanager.PushScope ();
-
-			if (namespaces && namespaceUri != null) {
-				// If namespace URI is empty, then prefix must 
-				// be empty as well.
-				if (anonPrefix && namespaceUri.Length > 0)
-					prefix = LookupPrefix (namespaceUri);
-				if (prefix == null || namespaceUri.Length == 0)
-					prefix = String.Empty;
-			}
-
-			WriteIndent ();
-
-			writer.Write ("<");
-
-			if (prefix.Length > 0) {
-				writer.Write (prefix);
-				writer.Write (':');
-			}
-			writer.Write (localName);
-
-			if (elements.Length == open_count) {
-				XmlNodeInfo [] tmp = new XmlNodeInfo [open_count << 1];
-				Array.Copy (elements, tmp, open_count);
-				elements = tmp;
-			}
-			if (elements [open_count] == null)
-				elements [open_count] =
-					new XmlNodeInfo ();
-			XmlNodeInfo info = elements [open_count];
-			info.Prefix = prefix;
-			info.LocalName = localName;
-			info.NS = namespaceUri;
-			info.HasSimple = false;
-			info.HasElements = false;
-			info.XmlLang = XmlLang;
-			info.XmlSpace = XmlSpace;
-			open_count++;
-
-			if (namespaces && namespaceUri != null) {
-				string oldns = nsmanager.LookupNamespace (prefix);
-				if (oldns != namespaceUri) {
-					nsmanager.AddNamespace (prefix, namespaceUri);
-					new_local_namespaces.Push (prefix);
-				}
-			}
-
-			state = WriteState.Element;
-		}
-
-		void CloseStartElement ()
-		{
-			CloseStartElementCore ();
-
-			if (state == WriteState.Element)
-				writer.Write ('>');
-			state = WriteState.Content;
-		}
-
-		void CloseStartElementCore ()
-		{
-			if (state == WriteState.Attribute)
-				WriteEndAttribute ();
-
-			if (new_local_namespaces.Count == 0) {
-				if (explicit_nsdecls.Count > 0)
-					explicit_nsdecls.Clear ();
-				return;
-			}
-
-			// Missing xmlns attributes are added to 
-			// explicit_nsdecls (it is cleared but this way
-			// I save another array creation).
-			int idx = explicit_nsdecls.Count;
-			while (new_local_namespaces.Count > 0) {
-				string p = (string) new_local_namespaces.Pop ();
-				bool match = false;
-				for (int i = 0; i < explicit_nsdecls.Count; i++) {
-					if ((string) explicit_nsdecls [i] == p) {
-						match = true;
-						break;
-					}
-				}
-				if (match)
-					continue;
-				explicit_nsdecls.Add (p);
-			}
-
-			for (int i = idx; i < explicit_nsdecls.Count; i++) {
-				string prefix = (string) explicit_nsdecls [i];
-				string ns = nsmanager.LookupNamespace (prefix);
-				if (ns == null)
-					continue; // superceded
-				if (prefix.Length > 0) {
-					writer.Write (" xmlns:");
-					writer.Write (prefix);
-				} else {
-					writer.Write (" xmlns");
-				}
-				writer.Write ('=');
-				writer.Write (quote_char);
-				WriteEscapedString (ns, true);
-				writer.Write (quote_char);
-			}
-			explicit_nsdecls.Clear ();
-		}
-
-		// EndElement
-
-		public override void WriteEndElement ()
-		{
-			WriteEndElementCore (false);
-		}
-
-		public override void WriteFullEndElement ()
-		{
-			WriteEndElementCore (true);
-		}
-
-		void WriteEndElementCore (bool full)
-		{
-#if NET_2_0
-			if (state == WriteState.Error || state == WriteState.Closed)
-#else
-			if (state == WriteState.Closed)
-#endif
-				throw StateError ("EndElement");
-			if (open_count == 0)
-				throw InvalidOperation ("There is no more open element.");
-
-			bool isEmpty = state != WriteState.Content;
-
-			CloseStartElementCore ();
-
-			nsmanager.PopScope ();
-			bool doIndent = !elements [open_count - 1].HasSimple;
-			if (open_count > 1)
-				doIndent &= !elements [open_count - 2].HasSimple;
-			XmlNodeInfo info = elements [--open_count];
-
-			if (full || state == WriteState.Content) {
-				if (state == WriteState.Element)
-					writer.Write ('>');
-				if (doIndent && (full || !isEmpty))
-					DoWriteIndent ();
-				writer.Write ("</");
-				if (info.Prefix.Length > 0) {
-					writer.Write (info.Prefix);
-					writer.Write (':');
-				}
-				writer.Write (info.LocalName);
-				writer.Write ('>');
-			} else {
-				writer.Write (" />");
-			}
-
-			state = WriteState.Content;
-			if (open_count == 0)
-				node_state = XmlNodeType.EndElement;
-		}
-
-		// Attribute
-
-		public override void WriteStartAttribute (
-			string prefix, string localName, string namespaceUri)
-		{
-			if (state != WriteState.Element && state != WriteState.Start)
-				throw StateError ("Attribute");
-
-			if ((object) prefix == null)
-				prefix = String.Empty;
-
-			// For xmlns URI, prefix is forced to be "xmlns"
-			bool isNSDecl = false;
-			if (namespaceUri == XmlnsNamespace) {
-				isNSDecl = true;
-				if (prefix.Length == 0 && localName != "xmlns")
-					prefix = "xmlns";
-			}
-			else
-				isNSDecl = (prefix == "xmlns" ||
-					localName == "xmlns" && prefix.Length == 0);
-
-			if (namespaces) {
-				// MS implementation is pretty hacky here. 
-				// Regardless of namespace URI it is regarded
-				// as NS URI for "xml".
-				if (prefix == "xml")
-					namespaceUri = XmlNamespace;
-				// infer namespace URI.
-				else if ((object) namespaceUri == null) {
-					if (isNSDecl)
-						namespaceUri = XmlnsNamespace;
-					else
-						namespaceUri = String.Empty;
-				}
-
-				// It is silly design - null namespace with
-				// "xmlns" are allowed (for namespace-less
-				// output; while there is Namespaces property)
-				// On the other hand, namespace "" is not 
-				// allowed.
-				if (isNSDecl && namespaceUri != XmlnsNamespace)
-					throw ArgumentError (String.Format ("The 'xmlns' attribute is bound to the reserved namespace '{0}'", XmlnsNamespace));
-
-				// If namespace URI is empty, then prefix
-				// must be empty as well.
-				if (prefix.Length > 0 && namespaceUri.Length == 0)
-					throw ArgumentError ("Namespace URI must not be null when prefix is not an empty string.");
-
-				// Dive into extremely complex procedure.
-				if (!isNSDecl && namespaceUri.Length > 0)
-					prefix = DetermineAttributePrefix (
-						prefix, localName, namespaceUri);
-			}
-
-			if (indent_attributes)
-				WriteIndent ();
-			else if (state != WriteState.Start)
-				writer.Write (' ');
-
-			if (prefix.Length > 0) {
-				writer.Write (prefix);
-				writer.Write (':');
-			}
-			writer.Write (localName);
-			writer.Write ('=');
-			writer.Write (quote_char);
-
-			if (isNSDecl || prefix == "xml") {
-				if (preserver == null)
-					preserver = new StringWriter ();
-				else
-					preserver.GetStringBuilder ().Length = 0;
-				writer = preserver;
-
-				if (!isNSDecl) {
-					is_preserved_xmlns = false;
-					preserved_name = localName;
-				} else {
-					is_preserved_xmlns = true;
-					preserved_name = localName == "xmlns" ? 
-						String.Empty : localName;
-				}
-			}
-
-			state = WriteState.Attribute;
-		}
-
-		// See also:
-		// "DetermineAttributePrefix(): local mapping overwrite"
-		string DetermineAttributePrefix (
-			string prefix, string local, string ns)
-		{
-			bool mockup = false;
-			if (prefix.Length == 0) {
-				prefix = LookupPrefix (ns);
-				if (prefix != null)
-					return prefix;
-				mockup = true;
-			} else {
-				prefix = nsmanager.NameTable.Add (prefix);
-				string existing = nsmanager.LookupNamespace (prefix);
-				if (existing == ns)
-					return prefix;
-				if (existing != null) {
-					// See code comment on the head of
-					// this source file.
-					nsmanager.RemoveNamespace (prefix, existing);
-					if (nsmanager.LookupNamespace (prefix) != existing) {
-						mockup = true;
-						nsmanager.AddNamespace (prefix, existing);
-					}
-				}
-			}
-
-			if (mockup)
-				prefix = MockupPrefix (ns, true);
-			new_local_namespaces.Push (prefix);
-			nsmanager.AddNamespace (prefix, ns);
-
-			return prefix;
-		}
-
-		string MockupPrefix (string ns, bool skipLookup)
-		{
-			string prefix = skipLookup ? null :
-				LookupPrefix (ns);
-			if (prefix != null && prefix.Length > 0)
-				return prefix;
-			for (int p = 1; ; p++) {
-				prefix = StringUtil.Format ("d{0}p{1}", open_count, p);
-				if (new_local_namespaces.Contains (prefix))
-					continue;
-				if (null != nsmanager.LookupNamespace (
-					nsmanager.NameTable.Get (prefix)))
-					continue;
-				nsmanager.AddNamespace (prefix, ns);
-				new_local_namespaces.Push (prefix);
-				return prefix;
-			}
-		}
-
-		public override void WriteEndAttribute ()
-		{
-			if (state != WriteState.Attribute)
-				throw StateError ("End of attribute");
-
-			if (writer == preserver) {
-				writer = source;
-				string value = preserver.ToString ();
-				if (is_preserved_xmlns) {
-					if (preserved_name.Length > 0 &&
-					    value.Length == 0)
-						throw ArgumentError ("Non-empty prefix must be mapped to non-empty namespace URI.");
-					string existing = nsmanager.LookupNamespace (preserved_name);
-					explicit_nsdecls.Add (preserved_name);
-					if (open_count > 0 &&
-					    elements [open_count - 1].NS == String.Empty &&
-					    elements [open_count - 1].Prefix == preserved_name)
-						; // do nothing
-					else if (existing != value)
-						nsmanager.AddNamespace (preserved_name, value);
-				} else {
-					switch (preserved_name) {
-					case "lang":
-						if (open_count > 0)
-							elements [open_count - 1].XmlLang = value;
-						break;
-					case "space":
-						switch (value) {
-						case "default":
-							if (open_count > 0)
-								elements [open_count - 1].XmlSpace = XmlSpace.Default;
-							break;
-						case "preserve":
-							if (open_count > 0)
-								elements [open_count - 1].XmlSpace = XmlSpace.Preserve;
-							break;
-						default:
-							throw ArgumentError ("Invalid value for xml:space.");
-						}
-						break;
-					}
-				}
-				writer.Write (value);
-			}
-
-			writer.Write (quote_char);
-			state = WriteState.Element;
-		}
-
-		// Non-Text Content
-
-		public override void WriteComment (string text)
-		{
-			if (text == null)
-				throw ArgumentError ("text");
-
-			WriteIndent ();
-
-			if (text.Length > 0 && text [text.Length - 1] == '-')
-				throw ArgumentError ("An input string to WriteComment method must not end with '-'. Escape it with '&#2D;'.");
-			if (StringUtil.IndexOf (text, "--") > 0)
-				throw ArgumentError ("An XML comment cannot end with \"-\".");
-
-			ShiftStateTopLevel ("Comment", false, false);
-
-			writer.Write ("<!--");
-			writer.Write (text);
-			writer.Write ("-->");
-		}
-
-		// LAMESPEC: see comments on the top of this source.
-		public override void WriteProcessingInstruction (string name, string text)
-		{
-			if (name == null)
-				throw ArgumentError ("name");
-			if (text == null)
-				throw ArgumentError ("text");
-
-			WriteIndent ();
-
-			if (!XmlChar.IsName (name))
-				throw ArgumentError ("A processing instruction name must be a valid XML name.");
-
-			if (StringUtil.IndexOf (text, "?>") > 0)
-				throw ArgumentError ("Processing instruction cannot contain \"?>\" as its value.");
-
-			ShiftStateTopLevel ("ProcessingInstruction", false, name == "xml");
-
-			writer.Write ("<?");
-			writer.Write (name);
-			writer.Write (' ');
-			writer.Write (text);
-			writer.Write ("?>");
-
-			if (state == WriteState.Start)
-				state = WriteState.Prolog;
-		}
-
-		// Text Content
-
-		public override void WriteWhitespace (string text)
-		{
-			if (text == null)
-				throw ArgumentError ("text");
-
-			// huh? Shouldn't it accept an empty string???
-			if (text.Length == 0 ||
-			    XmlChar.IndexOfNonWhitespace (text) >= 0)
-				throw ArgumentError ("WriteWhitespace method accepts only whitespaces.");
-
-			ShiftStateTopLevel ("Whitespace", true, false);
-
-			writer.Write (text);
-		}
-
-		public override void WriteCData (string text)
-		{
-			if (text == null)
-				text = String.Empty;
-			ShiftStateContent ("Text", false);
-
-			if (StringUtil.IndexOf (text, "]]>") >= 0)
-				throw ArgumentError ("CDATA section must not contain ']]>'.");
-			writer.Write ("<![CDATA[");
-			WriteCheckedString (text);
-			writer.Write ("]]>");
-		}
-
-		public override void WriteString (string text)
-		{
-			if (text == null || text.Length == 0)
-				return; // do nothing, including state transition.
-			ShiftStateContent ("Text", true);
-
-			WriteEscapedString (text, state == WriteState.Attribute);
-		}
-
-		public override void WriteRaw (string raw)
-		{
-			if (raw == null)
-				return; // do nothing, including state transition.
-
-			//WriteIndent ();
-
-			// LAMESPEC: It rejects XMLDecl while it allows
-			// DocType which could consist of non well-formed XML.
-			ShiftStateTopLevel ("Raw string", true, true);
-
-			writer.Write (raw);
-		}
-
-		public override void WriteCharEntity (char ch)
-		{
-			WriteCharacterEntity (ch, '\0', false);
-		}
-
-		public override void WriteSurrogateCharEntity (char low, char high)
-		{
-			WriteCharacterEntity (low, high, true);
-		}
-
-		void WriteCharacterEntity (char ch, char high, bool surrogate)
-		{
-			if (surrogate &&
-			    ('\uD800' > high || high > '\uDC00' ||
-			     '\uDC00' > ch || ch > '\uDFFF'))
-				throw ArgumentError (String.Format ("Invalid surrogate pair was found. Low: &#x{0:X}; High: &#x{0:X};", (int) ch, (int) high));
-			else if (check_character_validity && XmlChar.IsInvalid (ch))
-				throw ArgumentError (String.Format ("Invalid character &#x{0:X};", (int) ch));
-
-			ShiftStateContent ("Character", true);
-
-			int v = surrogate ? (high - 0xD800) * 0x400 + ch - 0xDC00 + 0x10000 : (int) ch;
-			writer.Write ("&#x");
-			writer.Write (v.ToString ("X", CultureInfo.InvariantCulture));
-			writer.Write (';');
-		}
-
-		public override void WriteEntityRef (string name)
-		{
-			if (name == null)
-				throw ArgumentError ("name");
-			if (!XmlChar.IsName (name))
-				throw ArgumentError ("Argument name must be a valid XML name.");
-
-			ShiftStateContent ("Character", true);
-
-			writer.Write ('&');
-			writer.Write (name);
-			writer.Write (';');
-		}
-
-		// Applied methods
-
-		public override void WriteName (string name)
-		{
-			if (name == null)
-				throw ArgumentError ("name");
-			if (!XmlChar.IsName (name))
-				throw ArgumentError ("Not a valid name string.");
-			WriteString (name);
-		}
-
-		public override void WriteNmToken (string nmtoken)
-		{
-			if (nmtoken == null)
-				throw ArgumentError ("nmtoken");
-			if (!XmlChar.IsNmToken (nmtoken))
-				throw ArgumentError ("Not a valid NMTOKEN string.");
-			WriteString (nmtoken);
-		}
-
-		public override void WriteQualifiedName (
-			string localName, string ns)
-		{
-			if (localName == null)
-				throw ArgumentError ("localName");
-			if (ns == null)
-				ns = String.Empty;
-
-			if (ns == XmlnsNamespace)
-				throw ArgumentError ("Prefix 'xmlns' is reserved and cannot be overriden.");
-			if (!XmlChar.IsNCName (localName))
-				throw ArgumentError ("localName must be a valid NCName.");
-
-			ShiftStateContent ("QName", true);
-
-			string prefix =
-				state == WriteState.Content || ns.Length > 0 ?
-				LookupPrefix (ns) : String.Empty;
-			if (prefix == null) {
-				if (state == WriteState.Attribute)
-					prefix = MockupPrefix (ns, false);
-				else
-					throw ArgumentError (String.Format ("Namespace '{0}' is not declared.", ns));
-			}
-
-			if (prefix != String.Empty) {
-				writer.Write (prefix);
-				writer.Write (":");
-			}
-			writer.Write (localName);
-		}
-
-		// Chunk data
-
-		void CheckChunkRange (Array buffer, int index, int count)
-		{
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (index < 0 || buffer.Length < index)
-				throw ArgumentOutOfRangeError ("index");
-			if (count < 0 || buffer.Length < index + count)
-				throw ArgumentOutOfRangeError ("count");
-		}
-
-		public override void WriteBase64 (byte [] buffer, int index, int count)
-		{
-			CheckChunkRange (buffer, index, count);
-
-			WriteString (Convert.ToBase64String (buffer, index, count));
-		}
-
-		public override void WriteBinHex (byte [] buffer, int index, int count)
-		{
-			CheckChunkRange (buffer, index, count);
-
-			ShiftStateContent ("Text", false);
-
-			XmlConvert.WriteBinHex (buffer, index, count, writer);
-		}
-
-		public override void WriteChars (char [] buffer, int index, int count)
-		{
-			CheckChunkRange (buffer, index, count);
-
-			ShiftStateContent ("Text", true);
-
-			WriteEscapedBuffer (buffer, index, count,
-				state == WriteState.Attribute);
-		}
-
-		public override void WriteRaw (char [] buffer, int index, int count)
-		{
-			CheckChunkRange (buffer, index, count);
-
-			ShiftStateContent ("Text", false);
-
-			writer.Write (buffer, index, count);
-		}
-
-		// Utilities
-
-		void WriteIndent ()
-		{
-			if (!indent || (open_count > 0 &&
-			    elements [open_count - 1].HasSimple))
-				return;
-			if (state != WriteState.Start)
-				writer.Write (newline);
-			for (int i = 0; i < open_count; i++)
-				writer.Write (indent_string);
-		}
-
-		void DoWriteIndent ()
-		{
-			if (!indent)
-				return;
-			writer.Write (newline);
-			for (int i = 0; i < open_count; i++)
-				writer.Write (indent_string);
-		}
-
-		void OutputAutoStartDocument ()
-		{
-			if (state != WriteState.Start)
-				return;
-			WriteStartDocumentCore (false, false);
-		}
-
-		void ShiftStateTopLevel (string occured, bool allowAttribute, bool dontCheckXmlDecl)
-		{
-			switch (state) {
-#if NET_2_0
-			case WriteState.Error:
-#endif
-			case WriteState.Closed:
-				throw StateError (occured);
-			case WriteState.Start:
-				if (output_xmldecl && !dontCheckXmlDecl)
-					OutputAutoStartDocument ();
-				state = WriteState.Prolog;
-				break;
-			case WriteState.Attribute:
-				if (allowAttribute)
-					break;
-				goto case WriteState.Closed;
-			case WriteState.Element:
-				CloseStartElement ();
-				break;
-			}
-
-			if (open_count > 0 &&
-			    state != WriteState.Attribute)
-				elements [open_count - 1].HasSimple = true;
-		}
-
-		void ShiftStateContent (string occured, bool allowAttribute)
-		{
-			switch (state) {
-#if NET_2_0
-			case WriteState.Error:
-#endif
-			case WriteState.Closed:
-					throw StateError (occured);
-			case WriteState.Prolog:
-			case WriteState.Start:
-				if (!allow_doc_fragment || is_document_entity)
-					goto case WriteState.Closed;
-				if (output_xmldecl)
-					OutputAutoStartDocument ();
-				state = WriteState.Content;
-				break;
-			case WriteState.Attribute:
-				if (allowAttribute)
-					break;
-				goto case WriteState.Closed;
-			case WriteState.Element:
-				CloseStartElement ();
-				break;
-			case WriteState.Content:
-				break;
-			}
-
-			if (open_count > 0 &&
-			    state != WriteState.Attribute)
-				elements [open_count - 1].HasSimple = true;
-		}
-
-		void WriteEscapedString (string text, bool isAttribute)
-		{
-			char [] escaped = isAttribute ?
-				escaped_attr_chars : escaped_text_chars;
-
-			int idx = text.IndexOfAny (escaped);
-			if (idx >= 0) {
-				char [] arr = text.ToCharArray ();
-				WriteCheckedBuffer (arr, 0, idx);
-				WriteEscapedBuffer (
-					arr, idx, arr.Length - idx, isAttribute);
-			} else {
-				WriteCheckedString (text);
-			}
-		}
-
-		void WriteCheckedString (string s)
-		{
-			int i = XmlChar.IndexOfInvalid (s, true);
-			if (i >= 0) {
-				char [] arr = s.ToCharArray ();
-				writer.Write (arr, 0, i);
-				WriteCheckedBuffer (arr, i, arr.Length - i);
-			} else {
-				// no invalid character.
-				writer.Write (s);
-			}
-		}
-
-		void WriteCheckedBuffer (char [] text, int idx, int length)
-		{
-			int start = idx;
-			int end = idx + length;
-			while ((idx = XmlChar.IndexOfInvalid (text, start, length, true)) >= 0) {
-				if (check_character_validity) // actually this is one time pass.
-					throw ArgumentError (String.Format ("Input contains invalid character at {0} : &#x{1:X};", idx, (int) text [idx]));
-				if (start < idx)
-					writer.Write (text, start, idx - start);
-				writer.Write ("&#x");
-				writer.Write (((int) text [idx]).ToString (
-					"X",
-					CultureInfo.InvariantCulture));
-				writer.Write (';');
-				length -= idx - start + 1;
-				start = idx + 1;
-			}
-			if (start < end)
-				writer.Write (text, start, end - start);
-		}
-
-		void WriteEscapedBuffer (char [] text, int index, int length,
-			bool isAttribute)
-		{
-			int start = index;
-			int end = index + length;
-			for (int i = start; i < end; i++) {
-				switch (text [i]) {
-				default:
-					continue;
-				case '&':
-				case '<':
-				case '>':
-					if (start < i)
-						WriteCheckedBuffer (text, start, i - start);
-					writer.Write ('&');
-					switch (text [i]) {
-					case '&': writer.Write ("amp;"); break;
-					case '<': writer.Write ("lt;"); break;
-					case '>': writer.Write ("gt;"); break;
-					case '\'': writer.Write ("apos;"); break;
-					case '"': writer.Write ("quot;"); break;
-					}
-					break;
-				case '"':
-				case '\'':
-					if (isAttribute && text [i] == quote_char)
-						goto case '&';
-					continue;
-				case '\r':
-					if (i + 1 < end && text [i] == '\n')
-						i++; // CRLF
-					goto case '\n';
-				case '\n':
-					if (start < i)
-						WriteCheckedBuffer (text, start, i - start);
-					if (isAttribute) {
-						writer.Write (text [i] == '\r' ?
-							"&#xD;" : "&#xA;");
-						break;
-					}
-					switch (newline_handling) {
-					case NewLineHandling.Entitize:
-						writer.Write (text [i] == '\r' ?
-							"&#xD;" : "&#xA;");
-						break;
-					case NewLineHandling.Replace:
-						writer.Write (newline);
-						break;
-					default:
-						writer.Write (text [i]);
-						break;
-					}
-					break;
-				}
-				start = i + 1;
-			}
-			if (start < end)
-				WriteCheckedBuffer (text, start, end - start);
-		}
-
-		// Exceptions
-
-		Exception ArgumentOutOfRangeError (string name)
-		{
-#if NET_2_0
-			state = WriteState.Error;
-#endif
-			return new ArgumentOutOfRangeException (name);
-		}
-
-		Exception ArgumentError (string msg)
-		{
-#if NET_2_0
-			state = WriteState.Error;
-#endif
-			return new ArgumentException (msg);
-		}
-
-		Exception InvalidOperation (string msg)
-		{
-#if NET_2_0
-			state = WriteState.Error;
-#endif
-			return new InvalidOperationException (msg);
-		}
-
-		Exception StateError (string occured)
-		{
-			return InvalidOperation (String.Format ("This XmlWriter does not accept {0} at this state {1}.", occured, state));
-		}
-	}
-}
diff --git a/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs b/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
index 033b4f7751c..4a8c3764008 100644
--- a/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
@@ -476,7 +476,7 @@ namespace System.Xml
 		[MonoTODO ("We decided not to support XDR schema that spec is obsolete.")]
 		public override bool Read ()
 		{
-			if (validatingReader == null) {
+			if (ReadState == ReadState.Initial) {
 				switch (ValidationType) {
 				case ValidationType.Auto:
 				case ValidationType.None:
@@ -512,10 +512,35 @@ namespace System.Xml
 			return validatingReader.ReadAttributeValue ();
 		}
 
+#if NET_1_0
+		// LAMESPEC: MS.NET 1.0 has critical bug here.
+		// After calling these methods, validation does not work anymore!
+		public override string ReadInnerXml ()
+		{
+			if (validatingReader == null)
+				return "";
+			return validatingReader.ReadInnerXml ();
+		}
+
+		public override string ReadOuterXml ()
+		{
+			if (validatingReader == null)
+				return "";
+			return validatingReader.ReadOuterXml ();
+		}
+#endif
+
+#if NET_1_0
+		public override string ReadString ()
+		{
+			return base.ReadStringInternal ();
+		}
+#else
 		public override string ReadString ()
 		{
 			return base.ReadString ();
 		}
+#endif
 
 		public object ReadTypedValue ()
 		{
diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs
index 55092049d2b..0010ce4c0da 100644
--- a/mcs/class/System.XML/System.Xml/XmlWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs
@@ -177,7 +177,7 @@ namespace System.Xml
 			return Create (xtw, settings);
 		}
 
-		protected virtual void Dispose (bool disposing)
+		public virtual void Dispose (bool disposing)
 		{
 			Close ();
 		}
@@ -254,9 +254,13 @@ namespace System.Xml
 			// In MS.NET (1.0), this check is done *here*, not at WriteStartAttribute.
 			// (XmlTextWriter.WriteStartAttribute("xmlns", "anyname", null) throws an exception.
 
+#if NET_1_0
+			if ((prefix == "xmlns" || (prefix == "" && localName == "xmlns")) && ns == null)
+				ns = "http://www.w3.org/2000/xmlns/";
+#endif
+
 			WriteStartAttribute (prefix, localName, ns);
-			if (value != null && value.Length > 0)
-				WriteString (value);
+			WriteString (value);
 			WriteEndAttribute ();
 		}
 
@@ -286,16 +290,14 @@ namespace System.Xml
 		public void WriteElementString (string localName, string value)
 		{
 			WriteStartElement(localName);
-			if (value != null && value.Length > 0)
-				WriteString(value);
+			WriteString(value);
 			WriteEndElement();
 		}
 
 		public void WriteElementString (string localName, string ns, string value)
 		{
 			WriteStartElement(localName, ns);
-			if (value != null && value.Length > 0)
-				WriteString(value);
+			WriteString(value);
 			WriteEndElement();
 		}
 
@@ -303,8 +305,7 @@ namespace System.Xml
 		public void WriteElementString (string prefix, string localName, string ns, string value)
 		{
 			WriteStartElement(prefix, localName, ns);
-			if (value != null && value.Length > 0)
-				WriteString(value);
+			WriteString(value);
 			WriteEndElement();
 		}
 #endif
diff --git a/mcs/class/System.XML/System.Xml_test.dll.sources b/mcs/class/System.XML/System.Xml_test.dll.sources
index a4a9de8a3fd..58842945d46 100644
--- a/mcs/class/System.XML/System.Xml_test.dll.sources
+++ b/mcs/class/System.XML/System.Xml_test.dll.sources
@@ -57,8 +57,6 @@ System.Xml.Serialization/SoapAttributeAttributeTests.cs
 System.Xml.Serialization/SoapElementAttributeTests.cs
 System.Xml.Serialization/SoapEnumAttributeTests.cs
 System.Xml.Serialization/SoapIncludeAttributeTests.cs
-System.Xml.Serialization/SoapSchemaExporterTests.cs
-System.Xml.Serialization/SoapReflectionImporterTests.cs
 System.Xml.Serialization/SoapSchemaMemberTests.cs
 System.Xml.Serialization/SoapTypeAttributeTests.cs
 System.Xml.Serialization/XmlAnyElementAttributeTests.cs
@@ -73,8 +71,6 @@ System.Xml.Serialization/XmlIncludeAttributeTests.cs
 System.Xml.Serialization/XmlReflectionImporterTests.cs
 System.Xml.Serialization/XmlRootAttributeTests.cs
 System.Xml.Serialization/XmlSchemaExporterTests.cs
-System.Xml.Serialization/XmlSchemaImporterTests.cs
-System.Xml.Serialization/XmlSerializationReaderTests.cs
 System.Xml.Serialization/XmlSerializationWriterTests.cs
 System.Xml.Serialization/XmlTextAttributeTests.cs
 System.Xml.Serialization/XmlTypeAttributeTests.cs
diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog
index bd8051de300..2f486b9cb16 100644
--- a/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog
@@ -1,37 +1,3 @@
-2006-02-28  Gert Driesen <drieseng@users.sourceforge.net>
-
-	* XmlSchemaAssertion.cs: Set eol-style to native.
-	* XmlSchemaBuiltInDatatypeTests.cs: Set eol-style to CRLF.
-	* XmlSchemaCollectionTests.cs: Set eol-style to native. Fixed line 
-	endings.
-	* XmlSchemaDatatypeTests.cs: Set eol-style to native.
-	* XmlSchemaExceptionCas.cs: Set eol-style to native.
-	* XmlSchemaLengthFacetTests.cs: Set eol-style to CRLF.
-	* XmlSchemaSetTests.cs: Set eol-style to native.
-	* XmlSchemaTests.cs: Set eol-style to native.
-	* XmlSchemaTypeTests.cs: Set eol-style to native.>
-
-2006-02-28  Gert Driesen <drieseng@users.sourceforge.net>
-
-	* XmlSchemaTests.cs: Added test for writing XmlSchema with
-	zero-length TargetNamespace. Added test for compiling XmlSchema
-	with zero-length TargetNamespace. Replaced Console.WriteLine with 
-	AssertEquals.
-
-2006-02-06  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlSchemaDatatypeTests.cs: (TestAnyType) NotDotNet -> Ignore.
-
-2006-02-06  Gert Driesen <drieseng@users.sourceforge.net>
-
-	* XmlSchemaDatatypeTests.cs: Marked TestAnyType NotDotNet on 2.0
-	profile instead of marking it NotWorking. No longer derive from 
-	Assertion.
-
-2006-02-01  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlSchemaDatatypeTests.cs : added two more anyURI tests.
-
 2006-01-10  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XmlSchemaTypeTests.cs : new file. Test for TypeCode.
diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaCollectionTests.cs b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaCollectionTests.cs
index 27d5bc4a35a..a5dae6dff27 100644
--- a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaCollectionTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaCollectionTests.cs
@@ -61,15 +61,15 @@ namespace MonoTests.System.Xml
 			col.Add (schema2);
 		}
 
-		[Test]
-		public void TestAddDoesCompilation ()
-		{
-			XmlSchema schema = new XmlSchema ();
-			Assert (!schema.IsCompiled);
-			XmlSchemaCollection col = new XmlSchemaCollection ();
-			col.Add (schema);
-			Assert (schema.IsCompiled);
-		}
+		[Test]

+		public void TestAddDoesCompilation ()

+		{

+			XmlSchema schema = new XmlSchema ();

+			Assert (!schema.IsCompiled);

+			XmlSchemaCollection col = new XmlSchemaCollection ();

+			col.Add (schema);

+			Assert (schema.IsCompiled);

+		}

 
 		[Test] // bug #75126
 		public void TestGetEnumerator ()
diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaDatatypeTests.cs b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaDatatypeTests.cs
index 71ca0e43c03..e7420bf4a67 100644
--- a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaDatatypeTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaDatatypeTests.cs
@@ -24,7 +24,7 @@ using AssertType = NUnit.Framework.Assert;
 namespace MonoTests.System.Xml
 {
 	[TestFixture]
-	public class XmlSchemaDatatypeTests
+	public class XmlSchemaDatatypeTests : Assertion
 	{
 		private XmlSchema GetSchema (string path)
 		{
@@ -41,27 +41,25 @@ namespace MonoTests.System.Xml
 		{
 			XmlSchemaElement element = schema.Items [index] as XmlSchemaElement;
 			XmlSchemaDatatype dataType = element.ElementType as XmlSchemaDatatype;
-			Assert.AreEqual (tokenizedType, dataType.TokenizedType, "#1");
-			Assert.AreEqual (type, dataType.ValueType, "#2");
-			Assert.AreEqual (parsedValue, dataType.ParseValue (rawValue, null, null), "#3");
+			AssertEquals (tokenizedType, dataType.TokenizedType);
+			AssertEquals (type, dataType.ValueType);
+			AssertEquals (parsedValue, dataType.ParseValue (rawValue, null, null));
 		}
 
 		[Test]
-		[Ignore ("The behavior has been inconsistent between versions, so it is not worthy of testing.")]
-		// Note that it could also apply to BaseTypeName (since if 
-		// it is xs:anyType and BaseType is empty, BaseTypeName
-		// should be xs:anyType).
+		[Category ("NotWorking")] // ContentTypeParticle impl. difference.
 		public void TestAnyType ()
 		{
 			XmlSchema schema = GetSchema ("Test/XmlFiles/xsd/datatypesTest.xsd");
 			schema.Compile (null);
 			XmlSchemaElement any = schema.Elements [QName ("e00", "urn:bar")] as XmlSchemaElement;
 			XmlSchemaComplexType cType = any.ElementType as XmlSchemaComplexType;
-			Assert.AreEqual (typeof (XmlSchemaComplexType), cType.GetType (), "#1");
-			Assert.IsNotNull (cType, "#2");
-			Assert.AreEqual (XmlQualifiedName.Empty, cType.QualifiedName, "#3");
-			Assert.IsNull (cType.BaseSchemaType, "#4");  // In MS.NET 2.0 its null. In 1.1 it is not null.
-			Assert.IsNotNull (cType.ContentTypeParticle, "#5");
+			AssertEquals (typeof (XmlSchemaComplexType), cType.GetType ());
+			AssertNotNull (cType);
+			AssertEquals (XmlQualifiedName.Empty, cType.QualifiedName);
+			AssertNull (cType.BaseSchemaType);
+			// In MS.NET its type is "XmlSchemaParticle.EmptyParticle"
+			AssertNotNull (cType.ContentTypeParticle);
 		}
 
 		[Test]
@@ -82,45 +80,6 @@ namespace MonoTests.System.Xml
 //			AssertDatatype (schema, 6, XmlTokenizedType.NMTOKEN, typeof (string []), "f o o", new string [] {"f",  "o",  "o"});
 		}
 
-		[Test]
-		public void AnyUriRelativePath ()
-		{
-			XmlValidatingReader vr = new XmlValidatingReader (
-				new XmlTextReader (
-					// relative path value that contains ':' should be still valid.
-					"<root>../copy/myserver/</root>", 
-					XmlNodeType.Document, null));
-			vr.Schemas.Add (XmlSchema.Read (
-				new XmlTextReader ("<xs:schema xmlns:xs='"
-					+ XmlSchema.Namespace +
-					"'><xs:element name='root' type='xs:anyURI' /></xs:schema>",
-					XmlNodeType.Document, null), null));
-			vr.Read ();
-			vr.Read ();
-			vr.Read ();
-		}
-
-		[Test]
-#if !NET_2_0
-		[Category ("NotDotNet")]
-#endif
-		public void AnyUriRelativePathContainsColon ()
-		{
-			XmlValidatingReader vr = new XmlValidatingReader (
-				new XmlTextReader (
-					// relative path value that contains ':' should be still valid.
-					"<root>../copy/myserver/c:/foo</root>", 
-					XmlNodeType.Document, null));
-			vr.Schemas.Add (XmlSchema.Read (
-				new XmlTextReader ("<xs:schema xmlns:xs='"
-					+ XmlSchema.Namespace +
-					"'><xs:element name='root' type='xs:anyURI' /></xs:schema>",
-					XmlNodeType.Document, null), null));
-			vr.Read ();
-			vr.Read ();
-			vr.Read ();
-		}
-
 #if NET_2_0
 		string [] allTypes = new string [] {
 			"string", "boolean", "float", "double", "decimal", 
diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs
index ceb0c971933..cf2e11bf26b 100644
--- a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs
@@ -132,24 +132,11 @@ namespace MonoTests.System.Xml
 
 		[Test]
 		[ExpectedException (typeof (XmlSchemaException))]
-		public void TestCompile_ZeroLength_TargetNamespace ()
-		{
-			XmlSchema schema = new XmlSchema ();
-			schema.TargetNamespace = string.Empty;
-			Assert (!schema.IsCompiled);
-
-			// MS.NET 1.x: The Namespace '' is an invalid URI.
-			// MS.NET 2.0: The targetNamespace attribute cannot have empty string as its value.
-			schema.Compile (null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (XmlSchemaException))]
 		public void TestCompileNonSchema ()
 		{
 			XmlTextReader xtr = new XmlTextReader ("<root/>", XmlNodeType.Document, null);
 			XmlSchema schema = XmlSchema.Read (xtr, null);
-			xtr.Close ();
+			xtr.Close ();

 		}
 
 		[Test]
@@ -213,17 +200,7 @@ namespace MonoTests.System.Xml
 			xw = new XmlTextWriter (sw);
 			xs.TargetNamespace = "urn:foo";
 			xs.Write (xw);
-			doc.LoadXml (sw.ToString ());
-			AssertEquals ("#2", "<xs:schema xmlns:tns=\"urn:foo\" targetNamespace=\"urn:foo\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" />", doc.DocumentElement.OuterXml);
-
-			// Zero-length TargetNamespace
-			xs = new XmlSchema ();
-			sw = new StringWriter ();
-			xw = new XmlTextWriter (sw);
-			xs.TargetNamespace = string.Empty;
-			xs.Write (xw);
-			doc.LoadXml (sw.ToString ());
-			AssertEquals ("#2b", "<xs:schema targetNamespace=\"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" />", doc.DocumentElement.OuterXml);
+			Console.WriteLine ("#2", "<xs:schema xmlns:tns=\"urn:foo\" targetNamespace=\"urn:foo\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" />", doc.DocumentElement.OuterXml);
 
 			// XmlSerializerNamespaces
 			xs = new XmlSchema ();
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
index 8ea990a0cf9..e4f27de1c65 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
@@ -1,134 +1,3 @@
-2006-02-16  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlReflectionImporter.cs: Enabled few tests for bug #77531.
-	* SoapReflectionImporter.cs: Enabled few tests for bug #77531.
-
-2006-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* XmlSchemaImporterTests.cs: Added test for bug #76848.
-
-2006-02-11  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlRootAttributeTests.cs: Set eol-style to CRLF.
-	* SoapTypeAttributeTests.cs: Same.
-	* XmlIncludeAttributeTests.cs: Same.
-	* XmlTextAttributeTests.cs: Same.
-	* XmlSerializerTests.cs: Same.
-	* SoapIncludeAttributeTests.cs: Same.
-	* XmlSerializationWriterTests.cs: Same.
-	* XmlElementAttributeTests.cs: Same.
-	* ComplexDataStructure.cs: Same.
-	* DeserializerTests.cs: Same.
-	* SoapElementAttributeTests.cs: Same.
-	* XmlChoiceIdentifierAttributeTests.cs: Same.
-	* XmlArrayItemAttributeTests.cs: Same.
-	* XmlAnyElementAttributeTests.cs: Same.
-	* XmlAttributesTests.cs: Same.
-	* XmlAttributeAttributeTests.cs: Same.
-	* XmlEnumAttributeTests.cs: Same.
-	* SoapAttributeAttributeTests.cs: Same.
-	* SoapEnumAttributeTests.cs: Same.
-	* SoapSchemaMemberTests.cs: Same.
-	* XmlArrayAttributeTests.cs: Same.
-	* XmlSerializerTestClasses.cs: Same.
-	* XmlSchemaImporterTests.cs: Set eol-style to native.
-
-2006-02-11  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlReflectionImporterTests.cs: Added test for IDictionary import.
-	Set eol style to CRLF.
-	* SoapReflectionImporterTests.cs: Added test for IDictionary import.
-
-2006-02-11  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializerTestClasses.cs: Fixed line endings (sigh).
-
-2006-02-10  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* DeserializeTests.cs: Added tests for deserialization of enums, and
-	primitive types container.
-	* XmlSerializerTests.cs: Numbered some tests.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializerTests.cs: Fixed build after failed merge.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializerTests.cs: Added test for bug #77501. Added tests for
-	XML and encoded serialization of enums.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializationWriterTests.cs: Added Reset overload that takes
-	Formatting. Added XmlNode[] tests for bug #77512, enabled tests for
-	bug #77512.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-	
-	* SoapReflectionImporterTests.cs: Marked test NotDotNet.
-
-2006-02-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* XmlSerializerTests.cs, XmlSerializerTestClasses.cs: Added test
-	for bug #77447.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializerTests.cs: Added constants for usage in new tests.
-	Added methods for encoded serialization. Fixed line endings.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializerTestClasses.cs: Added test classes.
-
-2006-02-09  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializationWriterTests.cs: Use Assert instead of deprecated
-	Assertion class. Added tests for FromEnum, WriteXsiType, 
-	WriteTypedPrimitive and WritePotentiallyReferencingElement. Changed
-	accessibility of Reset and Content on XmlSerializationWriterTester
-	and added public Execute methods for WritePotentiallyReferencingElement
-	and WriteTypedPrimitive, to allow this class to be useful for tests
-	that have effect on the prefix for other tests.
-	* XmlSerializationReaderTests.cs: Added tests for ToEnum.
-
-2006-02-08  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlTypeAttributeTests.cs: Set eol-style to native.
-
-2006-02-06  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* DeserializeTests.cs: Use Assert instead of deprecated Assertion.
-	Renumbered tests. Fixed line endings.
-
-2006-02-05  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlSerializerTests.cs: No longer derive from Assertion, fixed some
-	tests that were catching NUnit's AssertionException too.
-
-2006-02-04  Gert Driesen  <drieseng@users.sourceforge.net>
-	
-	* XmlSchemaExporterTests.cs: Reworked tests that fail on Mono
-	due to bug #77117 to pass on Mono (until that bug is fixed) and 
-	mark these tests NotDotNet.
-
-2006-01-23  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* XmlReflectionImporterTests.cs: Marked tests NotWorking until fixes
-	have landed in svn.
-	* SoapReflectionImporterTests.cs: Added numerous tests.
-	* XmlSchemaImporterTests.cs: Added numerous tests.
-	* XmlSchemaExporterTests.cs: Added numerous tests.
-	* SoapSchemaExporterTests.cs: Added numerous tests.
- 	* XmlSerializerTestClasses.cs: Added test classes for 
-	XmlSchemaExporter. Fixed line endings (to CRLF).
-
-2006-01-07  Gert Driesen  <drieseng@users.souceforge.net>
-
-	* XmlReflectionImporterTests.cs: Added numerous tests. No longer
-	derive from Assertion.
-
 2005-12-29  Gert Driesen  <drieseng@users.sourceforge.net>
 
 	* XmlSchemaExporterTests.cs: Added tests for exporting structs, and 
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
index e4ff3a85fac..1651d4f26dd 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
@@ -8,7 +8,6 @@
 //

 //

 using System;

-using System.Globalization;

 using System.IO;

 using System.Xml;

 using System.Xml.Serialization;

@@ -26,13 +25,6 @@ namespace MonoTests.System.XmlSerialization
 	[TestFixture]

 	public class DeserializationTests

 	{

-		const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";

-		const string XmlSchemaInstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";

-		const string SoapEncodingNamespace = "http://schemas.xmlsoap.org/soap/encoding/";

-		const string WsdlTypesNamespace = "http://microsoft.com/wsdl/types/";

-		const string ANamespace = "some:urn";

-		const string AnotherNamespace = "another:urn";

-

 		object result;

 

 		private object Deserialize (Type t, string xml)

@@ -69,34 +61,34 @@ namespace MonoTests.System.XmlSerialization
 		public void SimpleDeserialize ()

 		{

 			Deserialize (typeof (Sample), "<Sample><Text>Test.</Text></Sample>");

-			Assert.AreEqual (typeof (Sample), result.GetType ());

+			Assertion.AssertEquals (typeof (Sample), result.GetType ());

 			Sample sample = result as Sample;

-			Assert.AreEqual ("Test.", sample.Text);

+			Assertion.AssertEquals ("Test.", sample.Text);

 		}

 

 		[Test]

 		public void DeserializeInt ()

 		{

 			Deserialize (typeof (int), "<int>10</int>");

-			Assert.AreEqual (typeof (int), result.GetType ());

-			Assert.AreEqual (10, result);

+			Assertion.AssertEquals (typeof (int), result.GetType ());

+			Assertion.AssertEquals (10, result);

 		}

 

 		[Test]

 		public void DeserializeSimpleArray ()

 		{

 			Deserialize (typeof (Sample), "<Sample><ArrayText><string>Test1</string><string>Test2</string></ArrayText></Sample>");

-			Assert.AreEqual (typeof (Sample), result.GetType ());

+			Assertion.AssertEquals (typeof (Sample), result.GetType ());

 			Sample sample = result as Sample;

-			Assert.AreEqual ("Test1", sample.ArrayText[0]);

-			Assert.AreEqual ("Test2", sample.ArrayText[1]);

+			Assertion.AssertEquals ("Test1", sample.ArrayText [0]);

+			Assertion.AssertEquals ("Test2", sample.ArrayText [1]);

 		}

 

 		[Test]

 		public void DeserializeEmptyEnum ()

 		{

 			Field f = Deserialize (typeof (Field), "<field modifiers=\"\" />") as Field;

-			Assert.AreEqual (MapModifiers.Public, f.Modifiers);

+			Assertion.AssertEquals (MapModifiers.Public, f.Modifiers);

 		}

 		

 		[Test]

@@ -111,7 +103,7 @@ namespace MonoTests.System.XmlSerialization
 			

 			ms.Position = 0;

 			c = (Container) serializer.Deserialize (ms);

-			Assert.AreEqual (1, c.Items[0]);

+			Assertion.AssertEquals (1, c.Items[0]);

 		}

 		

 		[Test]

@@ -144,689 +136,442 @@ namespace MonoTests.System.XmlSerialization
 			DeserializeEncoded (typeof(Sample), s);

 		}

 		

-		

-		[Test]

-		public void TestDeserializeXmlNodeArray ()

-		{

-			object ob = Deserialize (typeof(object), "<anyType at=\"1\"><elem1/><elem2/></anyType>");

-			Assert.IsTrue (ob is XmlNode[], "Is node array");

-			

-			XmlNode[] nods = (XmlNode[]) ob;

-			Assert.AreEqual (3, nods.Length, "lengh");

-			Assert.IsTrue (nods[0] is XmlAttribute, "#1");

-			Assert.AreEqual ("at", ((XmlAttribute) nods[0]).LocalName, "#2");

-			Assert.AreEqual ("1", ((XmlAttribute) nods[0]).Value, "#3");

-			Assert.IsTrue (nods[1] is XmlElement, "#4");

-			Assert.AreEqual ("elem1", ((XmlElement) nods[1]).LocalName, "#5");

-			Assert.IsTrue (nods[2] is XmlElement, "#6");

-			Assert.AreEqual ("elem2", ((XmlElement) nods[2]).LocalName, "#7");

-		}

-		

-		[Test]

-		public void TestDeserializeXmlElement ()

-		{

-			object ob = Deserialize (typeof(XmlElement), "<elem/>");

-			Assert.IsTrue (ob is XmlElement, "#1");

-			Assert.AreEqual ("elem", ((XmlElement) ob).LocalName, "#2");

-		}

-		

-		[Test]

-		public void TestDeserializeXmlCDataSection ()

-		{

-			CDataContainer c = (CDataContainer) Deserialize (typeof(CDataContainer), "<CDataContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><cdata><![CDATA[data section contents]]></cdata></CDataContainer>");

-			Assert.IsNotNull (c.cdata, "#1");

-			Assert.AreEqual ("data section contents", c.cdata.Value, "#2");

+		
+		[Test]
+		public void TestDeserializeXmlNodeArray ()
+		{
+			object ob = Deserialize (typeof(object), "<anyType at=\"1\"><elem1/><elem2/></anyType>");
+			Assertion.Assert ("Is node array", ob is XmlNode[]);
+			
+			XmlNode[] nods = (XmlNode[]) ob; 
+			Assertion.AssertEquals ("lengh", 3, nods.Length);
+			Assertion.Assert ("#1", nods[0] is XmlAttribute);
+			Assertion.AssertEquals ("#2", "at", ((XmlAttribute)nods[0]).LocalName);
+			Assertion.AssertEquals ("#3", "1", ((XmlAttribute)nods[0]).Value);
+			Assertion.Assert ("#4", nods[1] is XmlElement);
+			Assertion.AssertEquals ("#5", "elem1", ((XmlElement)nods[1]).LocalName);
+			Assertion.Assert ("#6", nods[2] is XmlElement);
+			Assertion.AssertEquals ("#7", "elem2", ((XmlElement)nods[2]).LocalName);
+		}

+		
+		[Test]
+		public void TestDeserializeXmlElement ()
+		{
+			object ob = Deserialize (typeof(XmlElement), "<elem/>");
+			Assertion.Assert ("#1", ob is XmlElement);
+			Assertion.AssertEquals ("#2", "elem", ((XmlElement)ob).LocalName);
+		}

+		
+		[Test]
+		public void TestDeserializeXmlCDataSection ()
+		{
+			CDataContainer c = (CDataContainer) Deserialize (typeof(CDataContainer), "<CDataContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><cdata><![CDATA[data section contents]]></cdata></CDataContainer>");
+			Assertion.AssertNotNull ("#1", c.cdata);
+			Assertion.AssertEquals ("#2", "data section contents", c.cdata.Value);
 		}

 		

-		[Test]

-		public void TestDeserializeXmlNode ()

-		{

-			NodeContainer c = (NodeContainer) Deserialize (typeof(NodeContainer), "<NodeContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><node>text</node></NodeContainer>");

-			Assert.IsTrue (c.node is XmlText, "#1");

-			Assert.AreEqual ("text", c.node.Value, "#2");

+		[Test]
+		public void TestDeserializeXmlNode ()
+		{
+			NodeContainer c = (NodeContainer) Deserialize (typeof(NodeContainer), "<NodeContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><node>text</node></NodeContainer>");
+			Assertion.Assert ("#1", c.node is XmlText);
+			Assertion.AssertEquals ("#2", "text", c.node.Value);
 		}

 		

 		[Test]

 		public void TestDeserializeChoices ()

 		{

 			Choices ch = (Choices) Deserialize (typeof(Choices), "<Choices><ChoiceZero>choice text</ChoiceZero></Choices>");

-			Assert.AreEqual ("choice text", ch.MyChoice, "#A1");

-			Assert.AreEqual (ItemChoiceType.ChoiceZero, ch.ItemType, "#A2");

+			Assertion.AssertEquals ("#1", "choice text", ch.MyChoice);

+			Assertion.AssertEquals ("#2", ItemChoiceType.ChoiceZero, ch.ItemType);

 			

 			ch = (Choices) Deserialize (typeof(Choices), "<Choices><ChoiceOne>choice text</ChoiceOne></Choices>");

-			Assert.AreEqual ("choice text", ch.MyChoice, "#B1");

-			Assert.AreEqual (ItemChoiceType.StrangeOne, ch.ItemType, "#B2");

+			Assertion.AssertEquals ("#1", "choice text", ch.MyChoice);

+			Assertion.AssertEquals ("#2", ItemChoiceType.StrangeOne, ch.ItemType);

 			

 			ch = (Choices) Deserialize (typeof(Choices), "<Choices><ChoiceTwo>choice text</ChoiceTwo></Choices>");

-			Assert.AreEqual ("choice text", ch.MyChoice, "#C1");

-			Assert.AreEqual (ItemChoiceType.ChoiceTwo, ch.ItemType, "#C2");

-		}

+			Assertion.AssertEquals ("#1", "choice text", ch.MyChoice);

+			Assertion.AssertEquals ("#2", ItemChoiceType.ChoiceTwo, ch.ItemType);

+		}
 		

 		[Test]

 		public void TestDeserializeNamesWithSpaces ()

-		{

-			TestSpace ts = (TestSpace) Deserialize (typeof(TestSpace), "<Type_x0020_with_x0020_space xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' Attribute_x0020_with_x0020_space='5'><Element_x0020_with_x0020_space>4</Element_x0020_with_x0020_space></Type_x0020_with_x0020_space>");

-			Assert.AreEqual (4, ts.elem, "#1");

-			Assert.AreEqual (5, ts.attr, "#2");

-		}

+		{
+			TestSpace ts = (TestSpace) Deserialize (typeof(TestSpace), "<Type_x0020_with_x0020_space xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' Attribute_x0020_with_x0020_space='5'><Element_x0020_with_x0020_space>4</Element_x0020_with_x0020_space></Type_x0020_with_x0020_space>");
+			Assertion.AssertEquals ("#1", 4, ts.elem);

+			Assertion.AssertEquals ("#2", 5, ts.attr);

+		}
+		
+		[Test]

+		public void TestDeserializeDefaults ()
+		{
+			ListDefaults d2 = (ListDefaults) Deserialize (typeof(ListDefaults), "<root/>");
+	        
+	        Assertion.AssertNotNull ("list2", d2.list2);
+	        Assertion.AssertNull ("list3", d2.list3);
+	        Assertion.AssertNull ("list4", d2.list4);
+	        Assertion.AssertNotNull ("list5", d2.list5);
+	        Assertion.AssertNotNull ("ed", d2.ed);
+	        Assertion.AssertNotNull ("str", d2.str);
+	        
+			d2 = (ListDefaults) Deserialize (typeof(ListDefaults), "<root></root>");
+	        
+	        Assertion.AssertNotNull ("2 list2", d2.list2);
+	        Assertion.AssertNull ("2 list3", d2.list3);
+	        Assertion.AssertNull ("2 list4", d2.list4);
+	        Assertion.AssertNotNull ("2 list5", d2.list5);
+	        Assertion.AssertNotNull ("2 ed", d2.ed);
+	        Assertion.AssertNotNull ("2 str", d2.str);
+		}
 		

 		[Test]

-		public void TestDeserializeDefaults ()

-		{

-			ListDefaults d2 = (ListDefaults) Deserialize (typeof(ListDefaults), "<root/>");

-

-			Assert.IsNotNull (d2.list2, "#A1");

-			Assert.IsNull (d2.list3, "#A2");

-			Assert.IsNull (d2.list4, "#A3");

-			Assert.IsNotNull (d2.list5, "#A4");

-			Assert.IsNotNull (d2.ed, "#A5");

-			Assert.IsNotNull (d2.str, "#A6");

-

-			d2 = (ListDefaults) Deserialize (typeof(ListDefaults), "<root></root>");

-

-			Assert.IsNotNull (d2.list2, "#B1");

-			Assert.IsNull (d2.list3, "#B2");

-			Assert.IsNull (d2.list4, "#B3");

-			Assert.IsNotNull (d2.list5, "#B4");

-			Assert.IsNotNull (d2.ed, "#B5");

-			Assert.IsNotNull (d2.str, "#B6");

-		}

+		public void TestDeserializeChoiceArray ()
+		{
+			CompositeValueType v = (CompositeValueType) Deserialize (typeof(CompositeValueType), "<?xml version=\"1.0\" encoding=\"utf-16\"?><CompositeValueType xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><In>1</In><Es>2</Es></CompositeValueType>");
+	        Assertion.AssertNotNull ("v.Items", v.Items);
+	        Assertion.AssertNotNull ("v.ItemsElementName", v.ItemsElementName);
+			Assertion.AssertEquals ("v.Items.Length", 2, v.Items.Length);

+			Assertion.AssertEquals ("v.ItemsElementName.Length", 2, v.ItemsElementName.Length);

+			Assertion.AssertEquals ("v.Items[0]", 1, v.Items[0]);

+			Assertion.AssertEquals ("v.Items[1]", 2, v.Items[1]);

+			Assertion.AssertEquals ("v.ItemsElementName[0]", ItemsChoiceType.In, v.ItemsElementName[0]);

+			Assertion.AssertEquals ("v.ItemsElementName[1]", ItemsChoiceType.Es, v.ItemsElementName[1]);

+		}
 		

 		[Test]

-		public void TestDeserializeChoiceArray ()

-		{

-			CompositeValueType v = (CompositeValueType) Deserialize (typeof(CompositeValueType), "<?xml version=\"1.0\" encoding=\"utf-16\"?><CompositeValueType xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><In>1</In><Es>2</Es></CompositeValueType>");

-			Assert.IsNotNull (v.Items, "#1");

-			Assert.IsNotNull (v.ItemsElementName, "#2");

-			Assert.AreEqual (2, v.Items.Length, "#3");

-			Assert.AreEqual (2, v.ItemsElementName.Length, "#4");

-			Assert.AreEqual (1, v.Items[0], "#5");

-			Assert.AreEqual (2, v.Items[1], "#6");

-			Assert.AreEqual (ItemsChoiceType.In, v.ItemsElementName[0], "#7");

-			Assert.AreEqual (ItemsChoiceType.Es, v.ItemsElementName[1], "#8");

-		}

+		public void TestDeserializeCollection ()
+		{
+			string s0 = "";
+			s0+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s0+="		<Entity Name='node1'/>";
+			s0+="		<Entity Name='node2'/>";
+			s0+="	</ArrayOfEntity>";
+			
+			EntityCollection col = (EntityCollection) Deserialize (typeof(EntityCollection), s0);
+	        Assertion.AssertNotNull ("col", col);
+			Assertion.AssertEquals ("col.Count", 2, col.Count);

+	        Assertion.AssertNull ("col[0]", col[0].Parent);
+	        Assertion.AssertNull ("col[1]", col[1].Parent);
+		}
 		

 		[Test]

-		public void TestDeserializeCollection ()

-		{

-			string s0 = "";

-			s0+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s0+="		<Entity Name='node1'/>";

-			s0+="		<Entity Name='node2'/>";

-			s0+="	</ArrayOfEntity>";

+		public void TestDeserializeEmptyCollection ()
+		{
+			string s1 = "";
+			s1+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			
+			EntityCollection col = (EntityCollection) Deserialize (typeof(EntityCollection), s1);
+	        Assertion.AssertNotNull ("col", col);
+			Assertion.AssertEquals ("col.Count", 0, col.Count);
 			

-			EntityCollection col = (EntityCollection) Deserialize (typeof(EntityCollection), s0);

-			Assert.IsNotNull (col, "#1");

-			Assert.AreEqual (2, col.Count, "#2");

-			Assert.IsNull (col[0].Parent, "#3");

-			Assert.IsNull (col[1].Parent, "#4");

-		}

+			string s1_1 = "";
+			s1_1+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s1_1+="	</ArrayOfEntity>";
+			
+			col = (EntityCollection) Deserialize (typeof(EntityCollection), s1_1);
+	        Assertion.AssertNotNull ("col", col);
+			Assertion.AssertEquals ("col.Count", 0, col.Count);
+		}
 		

 		[Test]

-		public void TestDeserializeEmptyCollection ()

-		{

-			string s1 = "";

-			s1+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

+		public void TestDeserializeNilCollectionIsNotNull ()
+		{
+			string s2 = "";
+			s2+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true'/>";
+			
+			EntityCollection col = (EntityCollection) Deserialize (typeof(EntityCollection), s2);
+	        Assertion.AssertNotNull ("col", col);
+			Assertion.AssertEquals ("col.Count", 0, col.Count);

+		}
+		

+		[Test]

+		public void TestDeserializeObjectCollections ()
+		{
+			string s3 = "";
+			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection1>";
+			s3+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection2>";
+			s3+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection3>";
+			s3+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection4>";
+			s3+="</Container>";
+			
+			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s3);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1", 2, cont.Collection1.Count);
+			Assertion.AssertEquals ("cont.Collection1.Container", "assigned", cont.Collection1.Container);
+			Assertion.AssertEquals ("cont.Collection1[0].Parent", "assigned", cont.Collection1[0].Parent);
+			Assertion.AssertEquals ("cont.Collection1[1].Parent", "assigned", cont.Collection1[1].Parent);
 			

-			EntityCollection col = (EntityCollection) Deserialize (typeof(EntityCollection), s1);

-			Assert.IsNotNull (col, "#A1");

-			Assert.AreEqual (0, col.Count, "#A2");

+	        Assertion.AssertNotNull ("cont.Collection2", cont.Collection2);
+			Assertion.AssertEquals ("cont.Collection2", 2, cont.Collection2.Count);
+			Assertion.AssertEquals ("cont.Collection2.Container", "assigned", cont.Collection2.Container);
+			Assertion.AssertEquals ("cont.Collection2[0].Parent", "assigned", cont.Collection2[0].Parent);
+			Assertion.AssertEquals ("cont.Collection2[1].Parent", "assigned", cont.Collection2[1].Parent);
 			

-			string s1_1 = "";

-			s1_1+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s1_1+="	</ArrayOfEntity>";

+	        Assertion.AssertNotNull ("cont.Collection3", cont.Collection3);
+			Assertion.AssertEquals ("cont.Collection3", 2, cont.Collection3.Count);
+			Assertion.AssertEquals ("cont.Collection3.Container", "root", cont.Collection3.Container);
+			Assertion.AssertEquals ("cont.Collection3[0].Parent", "root", cont.Collection3[0].Parent);
+			Assertion.AssertEquals ("cont.Collection3[1].Parent", "root", cont.Collection3[1].Parent);
 			

-			col = (EntityCollection) Deserialize (typeof(EntityCollection), s1_1);

-			Assert.IsNotNull (col, "#B1");

-			Assert.AreEqual (0, col.Count, "#B2");

-		}

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4", 2, cont.Collection4.Count);

+			Assertion.AssertEquals ("cont.Collection4.Container", "root", cont.Collection4.Container);
+			Assertion.AssertEquals ("cont.Collection4[0].Parent", "root", cont.Collection4[0].Parent);
+			Assertion.AssertEquals ("cont.Collection4[1].Parent", "root", cont.Collection4[1].Parent);
+		}
 		

 		[Test]

-		public void TestDeserializeNilCollectionIsNotNull ()

-		{

-			string s2 = "";

-			s2+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true'/>";

+		public void TestDeserializeEmptyObjectCollections ()
+		{
+			string s4 = "";
+			s4+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s4+="</Container>";
+			
+			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s4);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1", 0, cont.Collection1.Count);
+			Assertion.AssertEquals ("cont.Collection1.Container", "assigned", cont.Collection1.Container);
 			

-			EntityCollection col = (EntityCollection) Deserialize (typeof(EntityCollection), s2);

-			Assert.IsNotNull (col, "#1");

-			Assert.AreEqual (0, col.Count, "#2");

-		}

-		

-		[Test]

-		public void TestDeserializeObjectCollections ()

-		{

-			string s3 = "";

-			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection1>";

-			s3+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection2>";

-			s3+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection3>";

-			s3+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection4>";

-			s3+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection2", cont.Collection2);
+			Assertion.AssertEquals ("cont.Collection2", 0, cont.Collection2.Count);
+			Assertion.AssertEquals ("cont.Collection2.Container", "assigned", cont.Collection2.Container);
 			

-			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s3);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNotNull (cont.Collection1, "#B1");

-			Assert.AreEqual (2, cont.Collection1.Count, "#B2");

-			Assert.AreEqual ("assigned", cont.Collection1.Container, "#B3");

-			Assert.AreEqual ("assigned", cont.Collection1[0].Parent, "#B4");

-			Assert.AreEqual ("assigned", cont.Collection1[1].Parent, "#B5");

-

-			Assert.IsNotNull (cont.Collection2, "#C1");

-			Assert.AreEqual (2, cont.Collection2.Count, "#C2");

-			Assert.AreEqual ("assigned", cont.Collection2.Container, "#C3");

-			Assert.AreEqual ("assigned", cont.Collection2[0].Parent, "#C4");

-			Assert.AreEqual ("assigned", cont.Collection2[1].Parent, "#C5");

-

-			Assert.IsNotNull (cont.Collection3, "#D1");

-			Assert.AreEqual (2, cont.Collection3.Count, "#D2");

-			Assert.AreEqual ("root", cont.Collection3.Container, "#D3");

-			Assert.AreEqual ("root", cont.Collection3[0].Parent, "#D4");

-			Assert.AreEqual ("root", cont.Collection3[1].Parent, "#D5");

-

-			Assert.IsNotNull (cont.Collection4, "#E1");

-			Assert.AreEqual (2, cont.Collection4.Count, "#E2");

-			Assert.AreEqual ("root", cont.Collection4.Container, "#E3");

-			Assert.AreEqual ("root", cont.Collection4[0].Parent, "#E4");

-			Assert.AreEqual ("root", cont.Collection4[1].Parent, "#E5");

-		}

-		

-		[Test]

-		public void TestDeserializeEmptyObjectCollections ()

-		{

-			string s4 = "";

-			s4+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s4+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection3", cont.Collection3);
+			Assertion.AssertEquals ("cont.Collection3", 0, cont.Collection3.Count);
+			Assertion.AssertEquals ("cont.Collection3.Container", "root", cont.Collection3.Container);
 			

-			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s4);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNotNull (cont.Collection1, "#B1");

-			Assert.AreEqual (0, cont.Collection1.Count, "#B2");

-			Assert.AreEqual ("assigned", cont.Collection1.Container, "#B3");

-

-			Assert.IsNotNull (cont.Collection2, "#C1");

-			Assert.AreEqual (0, cont.Collection2.Count, "#C2");

-			Assert.AreEqual ("assigned", cont.Collection2.Container, "#C3");

-

-			Assert.IsNotNull (cont.Collection3, "#D1");

-			Assert.AreEqual (0, cont.Collection3.Count, "#D2");

-			Assert.AreEqual ("root", cont.Collection3.Container, "#D3");

-

-			Assert.IsNotNull (cont.Collection4, "#E1");

-			Assert.AreEqual (0, cont.Collection4.Count, "#E2");

-			Assert.AreEqual ("root", cont.Collection4.Container, "#E3");

-		}

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4", 0, cont.Collection4.Count);

+			Assertion.AssertEquals ("cont.Collection4.Container", "root", cont.Collection4.Container);
+		}
 		

 		[Test]

-		public void TestDeserializeObjectNilCollectionsAreNotNull ()

-		{

-			string s5 = "";

-			s5+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s5+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="</Container>";

+		public void TestDeserializeObjectNilCollectionsAreNotNull ()
+		{
+			string s5 = "";
+			s5+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s5+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="</Container>";
+			
+			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s5);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1", 0, cont.Collection1.Count);
+			Assertion.AssertEquals ("cont.Collection1.Container", "assigned", cont.Collection1.Container);
 			

-			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s5);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNotNull (cont.Collection1, "#B1");

-			Assert.AreEqual (0, cont.Collection1.Count, "#B2");

-			Assert.AreEqual ("assigned", cont.Collection1.Container, "#B3");

-

-			Assert.IsNotNull (cont.Collection2, "#C1");

-			Assert.AreEqual (0, cont.Collection2.Count, "#C2");

-			Assert.AreEqual ("assigned", cont.Collection2.Container, "#C3");

-

-			Assert.IsNotNull (cont.Collection3, "#D1");

-			Assert.AreEqual (0, cont.Collection3.Count, "#D2");

-			Assert.AreEqual ("root", cont.Collection3.Container, "#D3");

-

-			Assert.IsNotNull (cont.Collection4, "#E1");

-			Assert.AreEqual (0, cont.Collection4.Count, "#E2");

-			Assert.AreEqual ("root", cont.Collection4.Container, "#E3");

-		}

-		

-		[Test]

-		public void TestDeserializeObjectEmptyCollections ()

-		{

-			string s6 = "";

-			s6+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s6+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection2", cont.Collection2);
+			Assertion.AssertEquals ("cont.Collection2", 0, cont.Collection2.Count);
+			Assertion.AssertEquals ("cont.Collection2.Container", "assigned", cont.Collection2.Container);
 			

-			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s6);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNotNull (cont.Collection1, "#B1");

-			Assert.AreEqual (0, cont.Collection1.Count, "#B2");

-			Assert.AreEqual ("assigned", cont.Collection1.Container, "#B3");

-

-			Assert.IsNotNull (cont.Collection2, "#C1");

-			Assert.AreEqual (0, cont.Collection2.Count, "#C2");

-			Assert.AreEqual ("assigned", cont.Collection2.Container, "#C3");

-

-			Assert.IsNotNull (cont.Collection3, "#D1");

-			Assert.AreEqual (0, cont.Collection3.Count, "#D2");

-			Assert.AreEqual ("root", cont.Collection3.Container, "#D3");

-

-			Assert.IsNotNull (cont.Collection4, "#E1");

-			Assert.AreEqual (0, cont.Collection4.Count, "#E2");

-			Assert.AreEqual ("root", cont.Collection4.Container, "#E3");

-		}

-		

-		[Test]

-		public void TestDeserializeObjectEmptyArrays ()

-		{

-			string s6 = "";

-			s6+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s6+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

-			s6+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection3", cont.Collection3);
+			Assertion.AssertEquals ("cont.Collection3", 0, cont.Collection3.Count);
+			Assertion.AssertEquals ("cont.Collection3.Container", "root", cont.Collection3.Container);
 			

-			ArrayEntityContainer cont = (ArrayEntityContainer) Deserialize (typeof(ArrayEntityContainer), s6);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNotNull (cont.Collection1, "#B1");

-			Assert.AreEqual (0, cont.Collection1.Length, "#B2");

-

-			Assert.IsNotNull (cont.Collection2, "#C1");

-			Assert.AreEqual (0, cont.Collection2.Length, "#C2");

-

-			Assert.IsNotNull (cont.Collection3, "#D1");

-			Assert.AreEqual (0, cont.Collection3.Length, "#D2");

-

-			Assert.IsNotNull (cont.Collection4, "#E1");

-			Assert.AreEqual (0, cont.Collection4.Length, "#E2");

-		}

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4", 0, cont.Collection4.Count);

+			Assertion.AssertEquals ("cont.Collection4.Container", "root", cont.Collection4.Container);
+		}
 		

 		[Test]

-		public void TestDeserializeEmptyObjectArrays ()

-		{

-			string s4 = "";

-			s4+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s4+="</Container>";

+		public void TestDeserializeObjectEmptyCollections ()
+		{
+			string s6 = "";
+			s6+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s6+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="</Container>";
+			
+			EntityContainer cont = (EntityContainer) Deserialize (typeof(EntityContainer), s6);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1", 0, cont.Collection1.Count);
+			Assertion.AssertEquals ("cont.Collection1.Container", "assigned", cont.Collection1.Container);
 			

-			ArrayEntityContainer cont = (ArrayEntityContainer) Deserialize (typeof(ArrayEntityContainer), s4);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNull (cont.Collection1, "#B1");

-			Assert.IsNull (cont.Collection2, "#B2");

-

-			Assert.IsNotNull (cont.Collection3, "#C1");

-			Assert.AreEqual (0, cont.Collection3.Length, "#C2");

-

-			Assert.IsNotNull (cont.Collection4, "#D1");

-			Assert.AreEqual (0, cont.Collection4.Length, "#D2");

-		}

-		

-		[Test]

-		public void TestDeserializeObjectNilArrays ()

-		{

-			string s5 = "";

-			s5+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s5+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";

-			s5+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection2", cont.Collection2);
+			Assertion.AssertEquals ("cont.Collection2", 0, cont.Collection2.Count);
+			Assertion.AssertEquals ("cont.Collection2.Container", "assigned", cont.Collection2.Container);
 			

-			ArrayEntityContainer cont = (ArrayEntityContainer) Deserialize (typeof(ArrayEntityContainer), s5);

-			Assert.IsNotNull (cont, "#A1");

-

-			Assert.IsNull (cont.Collection1, "#B1");

-			Assert.IsNull (cont.Collection2, "#B2");

-			Assert.IsNull (cont.Collection3, "#B3");

-

-			Assert.IsNotNull (cont.Collection4, "#C1");

-			Assert.AreEqual (0, cont.Collection4.Length, "#C2");

-		}

-		

-		[Test]

-		public void TestDeserializeEmptyArray ()

-		{

-			string s1 = "";

-			s1+="<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";

+	        Assertion.AssertNotNull ("cont.Collection3", cont.Collection3);
+			Assertion.AssertEquals ("cont.Collection3", 0, cont.Collection3.Count);
+			Assertion.AssertEquals ("cont.Collection3.Container", "root", cont.Collection3.Container);
 			

-			Entity[] col = (Entity[]) Deserialize (typeof(Entity[]), s1);

-			Assert.IsNotNull (col, "#A1");

-			Assert.AreEqual (0, col.Length, "#A2");

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4", 0, cont.Collection4.Count);

+			Assertion.AssertEquals ("cont.Collection4.Container", "root", cont.Collection4.Container);
+		}
+		
+		[Test]

+		public void TestDeserializeObjectEmptyArrays ()
+		{
+			string s6 = "";
+			s6+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s6+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			s6+="</Container>";
+			
+			ArrayEntityContainer cont = (ArrayEntityContainer) Deserialize (typeof(ArrayEntityContainer), s6);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1.Length", 0, cont.Collection1.Length);
 			

-			string s1_1 = "";

-			s1_1+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s1_1+="	</ArrayOfEntity>";

+	        Assertion.AssertNotNull ("cont.Collection2", cont.Collection2);
+			Assertion.AssertEquals ("cont.Collection2.Length", 0, cont.Collection2.Length);
 			

-			col = (Entity[]) Deserialize (typeof(Entity[]), s1_1);

-			Assert.IsNotNull (col, "#B1");

-			Assert.AreEqual (0, col.Length, "#B2");

-		}

-		

-		[Test]

-		public void TestDeserializeNilArray ()

-		{

-			string s2 = "";

-			s2 += "<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true'/>";

+	        Assertion.AssertNotNull ("cont.Collection3", cont.Collection3);
+			Assertion.AssertEquals ("cont.Collection3.Length", 0, cont.Collection3.Length);
 			

-			Entity[] col = (Entity[]) Deserialize (typeof(Entity[]), s2);

-			Assert.IsNull (col, "#1");

-		}

-		

-		[Test]

-		public void TestDeserializeObjectWithReadonlyCollection ()

-		{

-			string s3 = "";

-			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="	<Collection1>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection1>";

-			s3+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4.Length", 0, cont.Collection4.Length);

+		}
+		
+		[Test]

+		public void TestDeserializeEmptyObjectArrays ()
+		{
+			string s4 = "";
+			s4+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s4+="</Container>";
+			
+			ArrayEntityContainer cont = (ArrayEntityContainer) Deserialize (typeof(ArrayEntityContainer), s4);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNull ("cont.Collection1", cont.Collection1);
+	        Assertion.AssertNull ("cont.Collection2", cont.Collection2);
 			

-			ObjectWithReadonlyCollection cont = (ObjectWithReadonlyCollection) Deserialize (typeof(ObjectWithReadonlyCollection), s3);

-			Assert.IsNotNull (cont, "#1");

-			Assert.IsNotNull (cont.Collection1, "#2");

-			Assert.AreEqual (2, cont.Collection1.Count, "#3");

-			Assert.AreEqual ("root", cont.Collection1.Container, "#4");

-			Assert.AreEqual ("root", cont.Collection1[0].Parent, "#5");

-			Assert.AreEqual ("root", cont.Collection1[1].Parent, "#6");

-		}

-		

-		[Test]

-		[ExpectedException (typeof(InvalidOperationException))]

-		public void TestDeserializeObjectWithReadonlyNulCollection ()

-		{

-			string s3 = "";

-			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="	<Collection1>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection1>";

-			s3+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection3", cont.Collection3);
+			Assertion.AssertEquals ("cont.Collection3.Length", 0, cont.Collection3.Length);
 			

-			Deserialize (typeof(ObjectWithReadonlyNulCollection), s3);

-		}

-		

-		[Test]

-		public void TestDeserializeObjectWithReadonlyArray ()

-		{

-			string s3 = "";

-			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			s3+="	<Collection1>";

-			s3+="		<Entity Name='node1'/>";

-			s3+="		<Entity Name='node2'/>";

-			s3+="	</Collection1>";

-			s3+="</Container>";

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4.Length", 0, cont.Collection4.Length);

+		}
+		
+		[Test]

+		public void TestDeserializeObjectNilArrays ()
+		{
+			string s5 = "";
+			s5+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s5+="	<Collection1 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="	<Collection2 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="	<Collection3 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="	<Collection4 xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />";
+			s5+="</Container>";
+			
+			ArrayEntityContainer cont = (ArrayEntityContainer) Deserialize (typeof(ArrayEntityContainer), s5);
+	        Assertion.AssertNotNull ("cont", cont);
+	        
+	        Assertion.AssertNull ("cont.Collection1", cont.Collection1);
+	        Assertion.AssertNull ("cont.Collection2", cont.Collection2);
+	        Assertion.AssertNull ("cont.Collection3", cont.Collection3);
 			

-			ObjectWithReadonlyArray cont = (ObjectWithReadonlyArray) Deserialize (typeof(ObjectWithReadonlyArray), s3);

-			Assert.IsNotNull (cont, "#1");

-			Assert.IsNotNull (cont.Collection1, "#2");

-			Assert.AreEqual (0, cont.Collection1.Length, "#3");

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestDeserialize_EnumDefaultValue ()

-		{

-			EnumDefaultValue e;

-

-			e = (EnumDefaultValue) Deserialize (typeof (EnumDefaultValue), "<EnumDefaultValue />");

-			Assert.AreEqual (0, (int) e, "#1");

-

-			e = (EnumDefaultValue) Deserialize (typeof (EnumDefaultValue), "<EnumDefaultValue>e3</EnumDefaultValue>");

-			Assert.AreEqual (EnumDefaultValue.e3, e, "#2");

-

-			e = (EnumDefaultValue) Deserialize (typeof (EnumDefaultValue), "<EnumDefaultValue>e1 e2</EnumDefaultValue>");

-			Assert.AreEqual (EnumDefaultValue.e3, e, "#3");

-

-			e = (EnumDefaultValue) Deserialize (typeof (EnumDefaultValue), "<EnumDefaultValue>e1 e2</EnumDefaultValue>");

-			Assert.AreEqual (EnumDefaultValue.e1 | EnumDefaultValue.e2, e, "#4");

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestDeserialize_EnumDefaultValueNF ()

-		{

-			EnumDefaultValueNF e;

-

-			e = (EnumDefaultValueNF) Deserialize (typeof (EnumDefaultValueNF), "<EnumDefaultValueNF>e3</EnumDefaultValueNF>");

-			Assert.AreEqual (EnumDefaultValueNF.e3, e, "#A1");

-

-			try {

-				Deserialize (typeof (EnumDefaultValueNF), "<EnumDefaultValueNF />");

-				Assert.Fail ("#B1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2");

-				Assert.IsNotNull (ex.InnerException, "#B3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#B4");

-				Assert.IsNotNull (ex.InnerException.Message, "#B5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("''") != -1, "#B6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).Name) != -1, "#B7");

-			}

-

-			try {

-				Deserialize (typeof (EnumDefaultValueNF), "<EnumDefaultValueNF>e1 e3</EnumDefaultValueNF>");

-				Assert.Fail ("#C1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2");

-				Assert.IsNotNull (ex.InnerException, "#C3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#C4");

-				Assert.IsNotNull (ex.InnerException.Message, "#C5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'e1 e3'") != -1, "#C6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).Name) != -1, "#C7");

-			}

-

-			try {

-				Deserialize (typeof (EnumDefaultValueNF), "<EnumDefaultValueNF> e3</EnumDefaultValueNF>");

-				Assert.Fail ("#D1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#D2");

-				Assert.IsNotNull (ex.InnerException, "#D3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#D4");

-				Assert.IsNotNull (ex.InnerException.Message, "#D5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("' e3'") != -1, "#D6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).Name) != -1, "#D7");

-			}

-

-			try {

-				Deserialize (typeof (EnumDefaultValueNF), "<EnumDefaultValueNF> </EnumDefaultValueNF>");

-				Assert.Fail ("#E1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#E2");

-				Assert.IsNotNull (ex.InnerException, "#E3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#E4");

-				Assert.IsNotNull (ex.InnerException.Message, "#E5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("' '") != -1, "#E6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).Name) != -1, "#E7");

-			}

-

-			try {

-				Deserialize (typeof (EnumDefaultValueNF), "<EnumDefaultValueNF>1</EnumDefaultValueNF>");

-				Assert.Fail ("#F1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#F2");

-				Assert.IsNotNull (ex.InnerException, "#F3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#F4");

-				Assert.IsNotNull (ex.InnerException.Message, "#F5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'1'") != -1, "#F6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).Name) != -1, "#F7");

-			}

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestDeserialize_FlagEnum ()

-		{

-			FlagEnum e;

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum />");

-			Assert.AreEqual (0, (int) e, "#A1");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum>one</FlagEnum>");

-			Assert.AreEqual (FlagEnum.e1, e, "#A2");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum>one two</FlagEnum>");

-			Assert.AreEqual (FlagEnum.e1 | FlagEnum.e2, e, "#A3");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum>one two four</FlagEnum>");

-			Assert.AreEqual (FlagEnum.e1 | FlagEnum.e2 | FlagEnum.e4, e, "#A4");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum> two  four </FlagEnum>");

-			Assert.AreEqual (FlagEnum.e2 | FlagEnum.e4, e, "#A5");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum>two four two</FlagEnum>");

-			Assert.AreEqual (FlagEnum.e2 | FlagEnum.e4, e, "#A6");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum>two four two one four two one</FlagEnum>");

-			Assert.AreEqual (FlagEnum.e1 | FlagEnum.e2 | FlagEnum.e4, e, "#A7");

-

-			e = (FlagEnum) Deserialize (typeof (FlagEnum), "<FlagEnum></FlagEnum>");

-			Assert.AreEqual (0, (int) e, "#A8");

-

-			try {

-				Deserialize (typeof (FlagEnum), "<FlagEnum>1</FlagEnum>");

-				Assert.Fail ("#B1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2");

-				Assert.IsNotNull (ex.InnerException, "#B3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#B4");

-				Assert.IsNotNull (ex.InnerException.Message, "#B5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'1'") != -1, "#B6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (FlagEnum).FullName) != -1, "#B7");

-			}

-

-			try {

-				Deserialize (typeof (FlagEnum), "<FlagEnum>one,two</FlagEnum>");

-				Assert.Fail ("#C1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2");

-				Assert.IsNotNull (ex.InnerException, "#C3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#C4");

-				Assert.IsNotNull (ex.InnerException.Message, "#C5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'one,two'") != -1, "#C6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (FlagEnum).FullName) != -1, "#C7");

-			}

-

-			try {

-				Deserialize (typeof (FlagEnum), "<FlagEnum>one something</FlagEnum>");

-				Assert.Fail ("#D1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#D2");

-				Assert.IsNotNull (ex.InnerException, "#D3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#D4");

-				Assert.IsNotNull (ex.InnerException.Message, "#D5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'something'") != -1, "#D6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (FlagEnum).FullName) != -1, "#D7");

-			}

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestDeserialize_ZeroFlagEnum ()

-		{

-			ZeroFlagEnum e;

-

-			e = (ZeroFlagEnum) Deserialize (typeof (ZeroFlagEnum), "<ZeroFlagEnum />");

-			Assert.AreEqual (ZeroFlagEnum.e0, e, "#A1");

-			e = (ZeroFlagEnum) Deserialize (typeof (ZeroFlagEnum), "<ZeroFlagEnum></ZeroFlagEnum>");

-			Assert.AreEqual (ZeroFlagEnum.e0, e, "#A2");

-

-			try {

-				Deserialize (typeof (ZeroFlagEnum), "<ZeroFlagEnum>four</ZeroFlagEnum>");

-				Assert.Fail ("#B1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2");

-				Assert.IsNotNull (ex.InnerException, "#B3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#B4");

-				Assert.IsNotNull (ex.InnerException.Message, "#B5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'four'") != -1, "#B6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (ZeroFlagEnum).FullName) != -1, "#B7");

-			}

-

-			try {

-				Deserialize (typeof (ZeroFlagEnum), "<ZeroFlagEnum> o&lt;n&gt;e  four </ZeroFlagEnum>");

-				Assert.Fail ("#C1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#C2");

-				Assert.IsNotNull (ex.InnerException, "#C3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#C4");

-				Assert.IsNotNull (ex.InnerException.Message, "#C5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'four'") != -1, "#C6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (ZeroFlagEnum).FullName) != -1, "#C7");

-			}

-

-			try {

-				Deserialize (typeof (ZeroFlagEnum), "<ZeroFlagEnum>four o&lt;n&gt;e</ZeroFlagEnum>");

-				Assert.Fail ("#D1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#D2");

-				Assert.IsNotNull (ex.InnerException, "#D3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#D4");

-				Assert.IsNotNull (ex.InnerException.Message, "#D5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'four'") != -1, "#D6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (ZeroFlagEnum).FullName) != -1, "#D7");

-			}

-		}

-

-		[Test]

-		public void TestDeserialize_PrimitiveTypesContainer ()

-		{

-			Deserialize (typeof (PrimitiveTypesContainer), string.Format (CultureInfo.InvariantCulture, 

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<PrimitiveTypesContainer xmlns:xsd='{0}' xmlns:xsi='{1}' xmlns='{2}'>" +

-				"<Number xsi:type='xsd:int'>2004</Number>" +

-				"<Name xsi:type='xsd:string'>some name</Name>" +

-				"<Index xsi:type='xsd:unsignedByte'>56</Index>" +

-				"<Password xsi:type='xsd:base64Binary'>8w8=</Password>" +

-				"<PathSeparatorCharacter xmlns:q1='{3}' xsi:type='q1:char'>47</PathSeparatorCharacter>" +

-				"</PrimitiveTypesContainer>", XmlSchemaNamespace,

-				XmlSchemaInstanceNamespace, ANamespace, WsdlTypesNamespace));

-			Assert.AreEqual (typeof (PrimitiveTypesContainer), result.GetType (), "#A1");

-

-			PrimitiveTypesContainer deserialized = (PrimitiveTypesContainer) result;

-			Assert.AreEqual (2004, deserialized.Number, "#A2");

-			Assert.AreEqual ("some name", deserialized.Name, "#A3");

-			Assert.AreEqual ((byte) 56, deserialized.Index, "#A4");

-			Assert.AreEqual (new byte[] { 243, 15 }, deserialized.Password, "#A5");

-			Assert.AreEqual ('/', deserialized.PathSeparatorCharacter, "#A6");

-

-			DeserializeEncoded (typeof (PrimitiveTypesContainer), string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<q1:PrimitiveTypesContainer xmlns:xsd='{0}' xmlns:xsi='{1}' id='id1' xmlns:q1='{2}'>" +

-				"<Number xsi:type='xsd:int'>2004</Number>" +

-				"<Name xsi:type='xsd:string'>some name</Name>" +

-				"<Index xsi:type='xsd:unsignedByte'>56</Index>" +

-				"<Password xsi:type='xsd:base64Binary'>8w8=</Password>" +

-				"<PathSeparatorCharacter xmlns:q1='{3}' xsi:type='q1:char'>47</PathSeparatorCharacter>" +

-				"</q1:PrimitiveTypesContainer>", XmlSchemaNamespace,

-				XmlSchemaInstanceNamespace, AnotherNamespace, WsdlTypesNamespace));

-			Assert.AreEqual (typeof (PrimitiveTypesContainer), result.GetType (), "#B1");

-

-			deserialized = (PrimitiveTypesContainer) result;

-			Assert.AreEqual (2004, deserialized.Number, "#B2");

-			Assert.AreEqual ("some name", deserialized.Name, "#B3");

-			Assert.AreEqual ((byte) 56, deserialized.Index, "#B4");

-			Assert.AreEqual (new byte[] { 243, 15 }, deserialized.Password, "#B5");

-			Assert.AreEqual ('/', deserialized.PathSeparatorCharacter, "#B6");

-

-		}

+	        Assertion.AssertNotNull ("cont.Collection4", cont.Collection4);
+			Assertion.AssertEquals ("cont.Collection4.Length", 0, cont.Collection4.Length);

+		}
+		
+		[Test]

+		public void TestDeserializeEmptyArray ()
+		{
+			string s1 = "";
+			s1+="<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />";
+			
+			Entity[] col = (Entity[]) Deserialize (typeof(Entity[]), s1);
+	        Assertion.AssertNotNull ("col", col);
+			Assertion.AssertEquals ("col.Length", 0, col.Length);
+			

+			string s1_1 = "";
+			s1_1+="	<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s1_1+="	</ArrayOfEntity>";
+			
+			col = (Entity[]) Deserialize (typeof(Entity[]), s1_1);
+	        Assertion.AssertNotNull ("col", col);
+			Assertion.AssertEquals ("col.Length", 0, col.Length);
+		}
+		
+		[Test]

+		public void TestDeserializeNilArray ()
+		{
+			string s2 = "";
+			s2 += "<ArrayOfEntity xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true'/>";
+			
+			Entity[] col = (Entity[]) Deserialize (typeof(Entity[]), s2);
+	        Assertion.AssertNull ("col", col);
+		}
+		
+		[Test]

+		public void TestDeserializeObjectWithReadonlyCollection ()
+		{
+			string s3 = "";
+			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="	<Collection1>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection1>";
+			s3+="</Container>";
+			
+			ObjectWithReadonlyCollection cont = (ObjectWithReadonlyCollection) Deserialize (typeof(ObjectWithReadonlyCollection), s3);
+	        Assertion.AssertNotNull ("cont", cont);
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1.Count", 2, cont.Collection1.Count);
+			Assertion.AssertEquals ("cont.Collection1.Container", "root", cont.Collection1.Container);
+			Assertion.AssertEquals ("cont.Collection1[0].Parent", "root", cont.Collection1[0].Parent);
+			Assertion.AssertEquals ("cont.Collection1[1].Parent", "root", cont.Collection1[1].Parent);
+		}
+		
+		[Test]
+		[ExpectedException (typeof(InvalidOperationException))]

+		public void TestDeserializeObjectWithReadonlyNulCollection ()
+		{
+			string s3 = "";
+			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="	<Collection1>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection1>";
+			s3+="</Container>";
+			
+			Deserialize (typeof(ObjectWithReadonlyNulCollection), s3);
+		}
+		
+		[Test]
+		public void TestDeserializeObjectWithReadonlyArray ()
+		{
+			string s3 = "";
+			s3+="<Container xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";
+			s3+="	<Collection1>";
+			s3+="		<Entity Name='node1'/>";
+			s3+="		<Entity Name='node2'/>";
+			s3+="	</Collection1>";
+			s3+="</Container>";
+			
+			ObjectWithReadonlyArray cont = (ObjectWithReadonlyArray) Deserialize (typeof(ObjectWithReadonlyArray), s3);
+	        Assertion.AssertNotNull ("cont", cont);
+	        Assertion.AssertNotNull ("cont.Collection1", cont.Collection1);
+			Assertion.AssertEquals ("cont.Collection1.Length", 0, cont.Collection1.Length);
+		}
 	}

 }

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs
deleted file mode 100644
index 91f37979f14..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapReflectionImporterTests.cs
+++ /dev/null
@@ -1,1811 +0,0 @@
-//
-// System.Xml.Serialization.SoapReflectionImporterTests
-//
-// Author:
-//   Gert Driesen (drieseng@users.sourceforge.net)
-//
-// (C) 2005 Novell
-// 
-
-using System;
-using System.Collections;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-using NUnit.Framework;
-
-using MonoTests.System.Xml.TestClasses;
-
-namespace MonoTests.System.XmlSerialization
-{
-	[TestFixture]
-	public class SoapReflectionImporterTests
-	{
-		private const string SomeNamespace = "some:urn";
-		private const string AnotherNamespace = "another:urn";
-		private const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";
-		private const string WsdlTypesNamespace = "http://microsoft.com/wsdl/types/";
-
-		// these Map methods re-create the SoapReflectionImporter at every call.
-
-		private XmlTypeMapping Map (Type t)
-		{
-			SoapReflectionImporter ri = new SoapReflectionImporter ();
-			XmlTypeMapping tm = ri.ImportTypeMapping (t);
-
-			return tm;
-		}
-
-		private XmlTypeMapping Map (Type t, string ns)
-		{
-			SoapReflectionImporter ri = new SoapReflectionImporter (ns);
-			XmlTypeMapping tm = ri.ImportTypeMapping (t);
-
-			return tm;
-		}
-
-		private XmlTypeMapping Map (Type t, SoapAttributeOverrides overrides)
-		{
-			SoapReflectionImporter ri = new SoapReflectionImporter(overrides);
-			XmlTypeMapping tm = ri.ImportTypeMapping(t);
-
-			return tm;
-		}
-
-		private XmlMembersMapping MembersMap (Type t, SoapAttributeOverrides overrides, 
-			XmlReflectionMember [] members, bool inContainer, bool writeAccessors)
-		{
-			SoapReflectionImporter ri = new SoapReflectionImporter (overrides);
-			XmlMembersMapping mm = ri.ImportMembersMapping (null, null, members, 
-				inContainer, writeAccessors);
-			
-			return mm;
-		}
-		
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestIntTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (int));
-			Assert.AreEqual ("int", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Int32", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Int32", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestIntTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (int), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (int[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (int[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestIntTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (int[]));
-			Assert.AreEqual ("ArrayOfInt", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfInt32", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("Int32[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.Int32[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (int[][]));
-			Assert.AreEqual ("ArrayOfArrayOfInt", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfInt32", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("Int32[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.Int32[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestStringTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (string));
-			Assert.AreEqual ("string", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("String", tm.TypeName, "#3");
-			Assert.AreEqual ("System.String", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestStringTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (string), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (string[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (string[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestStringTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (string[]));
-			Assert.AreEqual ("ArrayOfString", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfString", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("String[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.String[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (string[][]));
-			Assert.AreEqual ("ArrayOfArrayOfString", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfString", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("String[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.String[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		public void TestObjectTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (object));
-			Assert.AreEqual ("anyType", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Object", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Object", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestObjectTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (object), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (object[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (object[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestObjectTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (object[]));
-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfObject", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("Object[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.Object[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (object[][]));
-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfObject", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("Object[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.Object[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestByteTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (byte));
-			Assert.AreEqual ("unsignedByte", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Byte", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Byte", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestByteTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (byte), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (byte[]), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (byte[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestByteTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (byte[]));
-			Assert.AreEqual ("base64Binary", tm.ElementName, "#A1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#A2");
-			Assert.AreEqual ("Byte[]", tm.TypeName, "#A3");
-			Assert.AreEqual ("System.Byte[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (byte[][]));
-			Assert.AreEqual ("ArrayOfBase64Binary", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfByte", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("Byte[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.Byte[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestBoolTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (bool));
-			Assert.AreEqual ("boolean", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Boolean", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Boolean", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestBoolTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (bool), "http://somenamespace");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (bool[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (bool[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestShortTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (short));
-			Assert.AreEqual ("short", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Int16", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Int16", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestShortTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (short), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (short[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (short[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestUnsignedShortTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (ushort));
-			Assert.AreEqual ("unsignedShort", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("UInt16", tm.TypeName, "#3");
-			Assert.AreEqual ("System.UInt16", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestUnsignedShortTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (ushort), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (ushort[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (ushort[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestUIntTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (uint));
-			Assert.AreEqual ("unsignedInt", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("UInt32", tm.TypeName, "#3");
-			Assert.AreEqual ("System.UInt32", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestUIntTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (uint), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (uint[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (uint[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestLongTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (long));
-			Assert.AreEqual ("long", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Int64", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Int64", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestLongTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (long), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (long[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (long[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestULongTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (ulong));
-			Assert.AreEqual ("unsignedLong", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("UInt64", tm.TypeName, "#3");
-			Assert.AreEqual ("System.UInt64", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestULongTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (ulong), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (ulong[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (ulong[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestFloatTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (float));
-			Assert.AreEqual ("float", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Single", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Single", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestFloatTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (float), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (float[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (float[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDoubleTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (double));
-			Assert.AreEqual ("double", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Double", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Double", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDoubleTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (double), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (double[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (double[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDateTimeTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (DateTime));
-			Assert.AreEqual ("dateTime", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("DateTime", tm.TypeName, "#3");
-			Assert.AreEqual ("System.DateTime", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDateTimeTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (DateTime), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (DateTime[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (DateTime[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDateTimeTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (DateTime[]));
-			Assert.AreEqual ("ArrayOfDateTime", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfDateTime", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("DateTime[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.DateTime[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (DateTime[][]));
-			Assert.AreEqual ("ArrayOfArrayOfDateTime", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfDateTime", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("DateTime[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.DateTime[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestGuidTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (Guid));
-			Assert.AreEqual ("guid", tm.ElementName, "#1");
-			Assert.AreEqual (WsdlTypesNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Guid", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Guid", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestGuidTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (Guid), SomeNamespace);
-			Assert.AreEqual (WsdlTypesNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (Guid[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (Guid[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestGuidTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (Guid[]));
-			Assert.AreEqual ("ArrayOfGuid", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfGuid", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("Guid[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.Guid[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (Guid[][]));
-			Assert.AreEqual ("ArrayOfArrayOfGuid", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfGuid", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("Guid[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.Guid[][]", tm.TypeFullName, "#B4");
-		}
-		
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDecimalTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (decimal));
-			Assert.AreEqual ("decimal", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Decimal", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Decimal", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestDecimalTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (decimal), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (decimal[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (decimal[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestXmlQualifiedNameTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (XmlQualifiedName));
-			Assert.AreEqual ("QName", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("XmlQualifiedName", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Xml.XmlQualifiedName", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestXmlQualifiedNameTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (XmlQualifiedName), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (XmlQualifiedName[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (XmlQualifiedName[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestXmlQualifiedNameTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (XmlQualifiedName[]));
-			Assert.AreEqual ("ArrayOfQName", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfXmlQualifiedName", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("XmlQualifiedName[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.Xml.XmlQualifiedName[]", tm.TypeFullName, "#A4");
-
-			tm  = Map (typeof (XmlQualifiedName[][]));
-			Assert.AreEqual ("ArrayOfArrayOfQName", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfXmlQualifiedName", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("XmlQualifiedName[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.Xml.XmlQualifiedName[][]", tm.TypeFullName, "#B4");
-		}
-		
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestSByteTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (sbyte));
-			Assert.AreEqual ("byte", tm.ElementName, "#1");
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("SByte", tm.TypeName, "#3");
-			Assert.AreEqual ("System.SByte", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestSByteTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (sbyte), SomeNamespace);
-			Assert.AreEqual (XmlSchemaNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (sbyte[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (sbyte[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestSByteTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (sbyte[]));
-			Assert.AreEqual ("ArrayOfByte", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfSByte", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("SByte[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.SByte[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (sbyte[][]));
-			Assert.AreEqual ("ArrayOfArrayOfByte", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfSByte", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("SByte[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.SByte[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestCharTypeMapping()
-		{
-			XmlTypeMapping tm = Map (typeof (char));
-			Assert.AreEqual ("char", tm.ElementName, "#1");
-			Assert.AreEqual (WsdlTypesNamespace, tm.Namespace, "#2");
-			Assert.AreEqual ("Char", tm.TypeName, "#3");
-			Assert.AreEqual ("System.Char", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestCharTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (char), SomeNamespace);
-			Assert.AreEqual (WsdlTypesNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (char[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (char[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestCharTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (char[]));
-			Assert.AreEqual ("ArrayOfChar", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfChar", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("Char[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.Char[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (char[][]));
-			Assert.AreEqual ("ArrayOfArrayOfChar", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfChar", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("Char[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.Char[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		public void TestXmlNodeTypeMapping ()
-		{
-			try {
-				Map (typeof (XmlNode));
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNode may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNode[]));
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNode may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNode[][]));
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNode may not be serialized with SOAP-encoded messages.
-			}
-		}
-
-		[Test]
-		public void TestXmlNodeTypeMapping_DefaultNamespace ()
-		{
-			try {
-				Map (typeof (XmlNode), SomeNamespace);
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNode may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNode[]), SomeNamespace);
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNode may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNode[][]), SomeNamespace);
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNode may not be serialized with SOAP-encoded messages.
-			}
-		}
-
-		[Test]
-		public void TestXmlElementTypeMapping ()
-		{
-			try {
-				Map (typeof (XmlElement));
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlElement may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlElement[]));
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlElement may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlElement[][]));
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlElement may not be serialized with SOAP-encoded messages.
-			}
-		}
-
-		[Test]
-		public void TestXmlElementTypeMapping_DefaultNamespace ()
-		{
-			try {
-				Map (typeof (XmlElement), SomeNamespace);
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlElement may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlElement[]), SomeNamespace);
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlElement may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlElement[][]), SomeNamespace);
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlElement may not be serialized with SOAP-encoded messages.
-			}
-		}
-
-		[Test]
-		public void TestXmlNotationTypeMapping ()
-		{
-			try {
-				Map (typeof (XmlNotation));
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNotation may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNotation[]));
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNotation may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNotation[][]));
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNotation may not be serialized with SOAP-encoded messages.
-			}
-		}
-
-		[Test]
-		public void TestXmlNotationTypeMapping_DefaultNamespace ()
-		{
-			try {
-				Map (typeof (XmlNotation), SomeNamespace);
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNotation may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNotation[]), SomeNamespace);
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNotation may not be serialized with SOAP-encoded messages.
-			}
-
-			try {
-				Map (typeof (XmlNotation[][]), SomeNamespace);
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-				// The type System.Xml.XmlNotation may not be serialized with SOAP-encoded messages.
-			}
-		}
-
-		[Test]
-		[ExpectedException (typeof (NotSupportedException))]
-		public void TestXmlSerializableTypeMapping ()
-		{
-			Map (typeof (Employee));
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		[ExpectedException (typeof (NotSupportedException))]
-		public void TestClassTypeMapping_NestedStruct ()
-		{
-			Map (typeof (NestedStruct));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void TestNullTypeMapping()
-		{
-			Map(null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void TestNullTypeMapping_DefaultNamespace ()
-		{
-			Map (null, SomeNamespace);
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestStructTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (TimeSpan));
-			Assert.AreEqual ("TimeSpan", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("TimeSpan", tm.TypeName, "#3");
-			Assert.AreEqual ("System.TimeSpan", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestStructTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (TimeSpan), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#1");
-
-			try {
-				tm = Map (typeof (TimeSpan[]), SomeNamespace);
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-			}
-
-			try {
-				tm = Map (typeof (TimeSpan[][]), SomeNamespace);
-				Assert.Fail ("#3");
-			} catch (NotSupportedException) {
-			}
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		[ExpectedException (typeof (NotSupportedException))] // Arrays of structs are not supported with encoded SOAP.
-		public void TestStructTypeMapping_Array ()
-		{
-			Map (typeof (TimeSpan[]));
-		}
-
-		[Test]
-		public void TestEnumTypeMapping ()
-		{
-			XmlTypeMapping tm = Map (typeof (AttributeTargets));
-			Assert.AreEqual ("AttributeTargets", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("AttributeTargets", tm.TypeName, "#3");
-			Assert.AreEqual ("System.AttributeTargets", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestEnumTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (AttributeTargets), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (AttributeTargets[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (AttributeTargets[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestEnumTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (AttributeTargets[]));
-			Assert.AreEqual ("ArrayOfAttributeTargets", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfAttributeTargets", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("AttributeTargets[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("System.AttributeTargets[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (AttributeTargets[][]));
-			Assert.AreEqual ("ArrayOfArrayOfAttributeTargets", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfAttributeTargets", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("AttributeTargets[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("System.AttributeTargets[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		public void TestClassTypeMapping()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClass));
-			Assert.AreEqual ("SimpleClass", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("SimpleClass", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass", tm.TypeFullName, "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestClassTypeMapping_DefaultNamespace ()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClass), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#1");
-
-			tm = Map (typeof (SimpleClass[]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");
-
-			tm = Map (typeof (SimpleClass[][]), SomeNamespace);
-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#3");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TestClassTypeMapping_Array ()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClass[]));
-			Assert.AreEqual ("ArrayOfSimpleClass", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfSimpleClass", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("SimpleClass[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (SimpleClass[][]));
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("SimpleClass[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NotSupportedException))]
-		public void TypeMapping_IDictionary ()
-		{
-			// The type MonoTests.System.Xml.TestClasses.DictionaryWithIndexer 
-			// is not supported because it implements IDictionary.
-			Map (typeof (DictionaryWithIndexer));
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TypeMapping_IEnumerable_SimpleClass ()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClassEnumerable));
-			Assert.AreEqual ("ArrayOfSimpleClass", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("SimpleClassEnumerable", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerable", tm.TypeFullName, "#4");
-
-			tm = Map (typeof (SimpleClassEnumerable[]));
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfSimpleClassEnumerable", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("SimpleClassEnumerable[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerable[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (SimpleClassEnumerable[][]));
-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassEnumerable", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("SimpleClassEnumerable[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerable[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TypeMapping_IEnumerable_Object ()
-		{
-			XmlTypeMapping tm = Map (typeof (ObjectEnumerable));
-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("ObjectEnumerable", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.ObjectEnumerable", tm.TypeFullName, "#4");
-
-			tm = Map (typeof (ObjectEnumerable[]));
-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfObjectEnumerable", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("ObjectEnumerable[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.ObjectEnumerable[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (ObjectEnumerable[][]));
-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfObjectEnumerable", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("ObjectEnumerable[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.ObjectEnumerable[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_IEnumerable_Object_NoMatchingAddMethod ()
-		{
-			Map (typeof (ObjectEnumerableNoMatchingAddMethod));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_IEnumerable_Object_NoMatchingAddMethod_Array ()
-		{
-			Map (typeof (ObjectEnumerableNoMatchingAddMethod[]));
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TypeMapping_IEnumerable_SimpleClass_PrivateCurrent ()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClassEnumerablePrivateCurrent));
-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerablePrivateCurrent", tm.TypeFullName, "#4");
-
-			tm = Map (typeof (SimpleClassEnumerablePrivateCurrent[]));
-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfSimpleClassEnumerablePrivateCurrent", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerablePrivateCurrent[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (SimpleClassEnumerablePrivateCurrent[][]));
-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassEnumerablePrivateCurrent", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerablePrivateCurrent[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-#if ONLY_1_1
-		[Category ("NotDotNet")] // results in NullReferenceException in .NET 1.1 (SP1)
-#endif
-		public void TypeMapping_IEnumerable_SimpleClass_PrivateGetEnumerator ()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator));
-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator", tm.TypeFullName, "#4");
-
-			tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator[]));
-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfSimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator[][]));
-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_Object_NoMatchingAddMethod ()
-		{
-			Map (typeof (ObjectCollectionNoMatchingAddMethod));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_Object_NoMatchingAddMethod_Array ()
-		{
-			Map (typeof (ObjectCollectionNoMatchingAddMethod[]));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_SimpleClass_NoMatchingAddMethod ()
-		{
-			Map (typeof (SimpleClassCollectionNoMatchingAddMethod));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_SimpleClass_NoMatchingAddMethod_Array ()
-		{
-			Map (typeof (SimpleClassCollectionNoMatchingAddMethod[]));
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TypeMapping_ICollection_SimpleClass ()
-		{
-			XmlTypeMapping tm = Map (typeof (SimpleClassCollection));
-			Assert.AreEqual ("ArrayOfSimpleClass", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("SimpleClassCollection", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassCollection", tm.TypeFullName, "#4");
-
-			tm = Map (typeof (SimpleClassCollection[]));
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfSimpleClassCollection", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("SimpleClassCollection[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassCollection[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (SimpleClassCollection[][]));
-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassCollection", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("SimpleClassCollection[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.SimpleClassCollection[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void TypeMapping_ICollection_Object ()
-		{
-			XmlTypeMapping tm = Map (typeof (ObjectCollection));
-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");
-			Assert.AreEqual ("ObjectCollection", tm.TypeName, "#3");
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.ObjectCollection", tm.TypeFullName, "#4");
-
-			tm = Map (typeof (ObjectCollection[]));
-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfObjectCollection", tm.TypeName, "#A3");
-#else
-			Assert.AreEqual ("ObjectCollection[]", tm.TypeName, "#A3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.ObjectCollection[]", tm.TypeFullName, "#A4");
-
-			tm = Map (typeof (ObjectCollection[][]));
-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");
-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");
-#if NET_2_0
-			Assert.AreEqual ("ArrayOfArrayOfObjectCollection", tm.TypeName, "#B3");
-#else
-			Assert.AreEqual ("ObjectCollection[][]", tm.TypeName, "#B3");
-#endif
-			Assert.AreEqual ("MonoTests.System.XmlSerialization.SoapReflectionImporterTests.ObjectCollection[][]", tm.TypeFullName, "#B4");
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_Object_NoIntIndexer ()
-		{
-			Map (typeof (ObjectCollectionNoIntIndexer));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_Object_NoIntIndexer_Array ()
-		{
-			Map (typeof (ObjectCollectionNoIntIndexer[]));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_SimpleClass_NoIntIndexer ()
-		{
-			Map (typeof (SimpleClassCollectionNoIntIndexer));
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void TypeMapping_ICollection_SimpleClass_NoIntIndexer_Array ()
-		{
-			Map (typeof (SimpleClassCollectionNoIntIndexer[]));
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		public void TestImportMembersMapping()
-		{
-			Type type = typeof (SimpleClass);
-			SoapAttributes attrs = new SoapAttributes ();
-			SoapAttributeOverrides overrides = new SoapAttributeOverrides ();
-			overrides.Add (typeof (SimpleClass), attrs);
-
-			XmlReflectionMember[] members = new XmlReflectionMember[0];
-			XmlMembersMapping mm;
-			try
-			{
-				mm = MembersMap(type, overrides, members, true, true);
-				Assert.Fail("Should not be able to fetch an empty XmlMembersMapping");
-			}
-			catch (Exception)
-			{
-			}
-			
-			XmlReflectionMember rm = new XmlReflectionMember();
-			rm.IsReturnValue = false;
-			rm.MemberName = "something";
-			rm.MemberType = typeof(string);
-			members = new XmlReflectionMember[1];
-			members[0] = rm;
-
-			mm = MembersMap(type, overrides, members, false, false);
-
-			Equals(mm.Count, 1);
-
-			XmlMemberMapping smm = mm[0];
-			Assert.IsFalse (smm.Any, "#1");
-			Assert.AreEqual ("something", smm.ElementName, "#2");
-			Assert.AreEqual ("something", smm.MemberName, "#3");
-			Assert.IsNull (smm.Namespace, "#4");
-			Assert.AreEqual ("System.String", smm.TypeFullName, "#5");
-			Assert.AreEqual ("string", smm.TypeName, "#6");
-			Assert.AreEqual (XmlSchemaNamespace, smm.TypeNamespace, "#7");
-
-			
-			rm = new XmlReflectionMember();
-			rm.IsReturnValue = false;
-			rm.MemberName = "nothing";
-			rm.MemberType = typeof(string);
-			members = new XmlReflectionMember[1];
-			members[0] = rm;
-
-			mm = MembersMap(type, overrides, members, false, false);
-			Assert.AreEqual (1 , mm.Count, "#8");
-		}
-
-		public class Employee : IXmlSerializable
-		{
-			private string _firstName;
-			private string _lastName;
-			private string _address;
-
-			public XmlSchema GetSchema ()
-			{
-				return null;
-			}
-
-			public void WriteXml (XmlWriter writer)
-			{
-				writer.WriteStartElement ("employee", "urn:devx-com");
-				writer.WriteAttributeString ("firstName", _firstName);
-				writer.WriteAttributeString ("lastName", _lastName);
-				writer.WriteAttributeString ("address", _address);
-				writer.WriteEndElement ();
-			}
-
-			public void ReadXml (XmlReader reader)
-			{
-				XmlNodeType type = reader.MoveToContent ();
-				if (type == XmlNodeType.Element && reader.LocalName == "employee") {
-					_firstName = reader["firstName"];
-					_lastName = reader["lastName"];
-					_address = reader["address"];
-				}
-			}
-		}
-
-		public class NestedStruct
-		{
-			public TimeSpan Period = TimeSpan.MaxValue;
-		}
-
-		public class ObjectEnumerable : IEnumerable
-		{
-			public void Add (int value)
-			{
-			}
-
-			public void Add (object value)
-			{
-			}
-
-			public IEnumerator GetEnumerator ()
-			{
-				return new ArrayList ().GetEnumerator ();
-			}
-		}
-
-		public class SimpleClassEnumerable : IEnumerable
-		{
-			public void Add (int value)
-			{
-			}
-
-			public void Add (object value)
-			{
-			}
-
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return GetEnumerator ();
-			}
-
-			public SimpleClassEnumerator GetEnumerator ()
-			{
-				return new SimpleClassEnumerator (new ArrayList ());
-			}
-		}
-
-		public class SimpleClassEnumerablePrivateGetEnumerator : IEnumerable
-		{
-			public void Add (object value)
-			{
-			}
-
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return new ArrayList ().GetEnumerator ();
-			}
-		}
-
-		public class SimpleClassEnumerablePrivateCurrent : IEnumerable
-		{
-			public void Add (object value)
-			{
-			}
-
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return GetEnumerator ();
-			}
-
-			public NoCurrentEnumerator GetEnumerator ()
-			{
-				return new NoCurrentEnumerator (new ArrayList ());
-			}
-		}
-
-		// GetEnumerator().Current returns object, but there's no corresponding
-		// Add (System.Object) method
-		public class ObjectEnumerableNoMatchingAddMethod : IEnumerable
-		{
-			public void Add (int value)
-			{
-			}
-
-			public IEnumerator GetEnumerator ()
-			{
-				return new ArrayList ().GetEnumerator ();
-			}
-		}
-
-		// GetEnumerator().Current returns SimpleClass, but there's no 
-		// corresponding Add (SimpleClass) method
-		public class SimpleClassCollectionNoMatchingAddMethod : ICollection
-		{
-			public SimpleClass this[int index] {
-				get {
-					return (SimpleClass) _list[index];
-				}
-			}
-
-			public int Count {
-				get { return _list.Count; }
-			}
-
-			public bool IsSynchronized {
-				get { return _list.IsSynchronized; }
-			}
-
-			public object SyncRoot {
-				get { return _list.SyncRoot; }
-			}
-
-			public void CopyTo (Array array, int index)
-			{
-				_list.CopyTo (array, index);
-			}
-
-			IEnumerator IEnumerable.GetEnumerator()
-			{
-				return GetEnumerator ();
-			}
-
-			public SimpleClassEnumerator GetEnumerator ()
-			{
-				return new SimpleClassEnumerator (_list);
-			}
-
-			private ArrayList _list = new ArrayList ();
-		}
-
-		// GetEnumerator().Current returns object, but there's no corresponding
-		// Add (System.Object) method
-		public class ObjectCollectionNoMatchingAddMethod : ICollection
-		{
-			public object this[int index] {
-				get {
-					return _list[index];
-				}
-			}
-
-			public int Count {
-				get { return _list.Count; }
-			}
-
-			public bool IsSynchronized {
-				get { return _list.IsSynchronized; }
-			}
-
-			public object SyncRoot {
-				get { return _list.SyncRoot; }
-			}
-
-			public void CopyTo (Array array, int index)
-			{
-				_list.CopyTo (array, index);
-			}
-
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return GetEnumerator ();
-			}
-
-			public IEnumerator GetEnumerator ()
-			{
-				return _list.GetEnumerator ();
-			}
-
-			private ArrayList _list = new ArrayList ();
-		}
-
-		// Does not have int indexer.
-		public class SimpleClassCollectionNoIntIndexer : ICollection
-		{
-			public SimpleClass this[string name] {
-				get {
-					return new SimpleClass ();
-				}
-			}
-
-			public int Count {
-				get { return _list.Count; }
-			}
-
-			public bool IsSynchronized {
-				get { return _list.IsSynchronized; }
-			}
-
-			public object SyncRoot {
-				get { return _list.SyncRoot; }
-			}
-
-			public void CopyTo (Array array, int index)
-			{
-				_list.CopyTo (array, index);
-			}
-
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return GetEnumerator ();
-			}
-
-			public SimpleClassEnumerator GetEnumerator ()
-			{
-				return new SimpleClassEnumerator (_list);
-			}
-
-			public void Add (SimpleClass value)
-			{
-				_list.Add (value);
-			}
-
-			private ArrayList _list = new ArrayList ();
-		}
-
-		// Does not have int indexer.
-		public class ObjectCollectionNoIntIndexer : ICollection
-		{
-			public object this[string name] {
-				get {
-					return new SimpleClass ();
-				}
-			}
-
-			public int Count {
-				get { return _list.Count; }
-			}
-
-			public bool IsSynchronized {
-				get { return _list.IsSynchronized; }
-			}
-
-			public object SyncRoot {
-				get { return _list.SyncRoot; }
-			}
-
-			public void CopyTo (Array array, int index)
-			{
-				_list.CopyTo (array, index);
-			}
-
-			public IEnumerator GetEnumerator ()
-			{
-				return _list.GetEnumerator ();
-			}
-
-			public void Add (object value)
-			{
-				_list.Add (value);
-			}
-
-			private ArrayList _list = new ArrayList ();
-		}
-
-		public class SimpleClassCollection : ICollection
-		{
-			public SimpleClass this[int index] {
-				get {
-					return (SimpleClass) _list[index];
-				}
-			}
-
-			public int Count {
-				get { return _list.Count; }
-			}
-
-			public bool IsSynchronized {
-				get { return _list.IsSynchronized; }
-			}
-
-			public object SyncRoot {
-				get { return _list.SyncRoot; }
-			}
-
-			public void CopyTo (Array array, int index)
-			{
-				_list.CopyTo (array, index);
-			}
-
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return GetEnumerator ();
-			}
-
-			public SimpleClassEnumerator GetEnumerator ()
-			{
-				return new SimpleClassEnumerator (_list);
-			}
-
-			public void Add (SimpleClass value)
-			{
-				_list.Add (value);
-			}
-
-			private ArrayList _list = new ArrayList ();
-		}
-
-		public class ObjectCollection : ICollection
-		{
-			public object this[int name] {
-				get {
-					return new SimpleClass ();
-				}
-			}
-
-			public int Count
-			{
-				get { return _list.Count; }
-			}
-
-			public bool IsSynchronized
-			{
-				get { return _list.IsSynchronized; }
-			}
-
-			public object SyncRoot
-			{
-				get { return _list.SyncRoot; }
-			}
-
-			public void CopyTo (Array array, int index)
-			{
-				_list.CopyTo (array, index);
-			}
-
-			public IEnumerator GetEnumerator ()
-			{
-				return _list.GetEnumerator ();
-			}
-
-			public void Add (object value)
-			{
-				_list.Add (value);
-			}
-
-			private ArrayList _list = new ArrayList ();
-		}
-
-		public class SimpleClassEnumerator : IEnumerator
-		{
-			internal SimpleClassEnumerator (ArrayList arguments)
-			{
-				IEnumerable temp = (IEnumerable) (arguments);
-				_baseEnumerator = temp.GetEnumerator ();
-			}
-			public SimpleClass Current
-			{
-				get { return (SimpleClass) _baseEnumerator.Current; }
-			}
-
-			object IEnumerator.Current
-			{
-				get { return _baseEnumerator.Current; }
-			}
-
-			public bool MoveNext ()
-			{
-				return _baseEnumerator.MoveNext ();
-			}
-
-			bool IEnumerator.MoveNext ()
-			{
-				return _baseEnumerator.MoveNext ();
-			}
-
-			public void Reset ()
-			{
-				_baseEnumerator.Reset ();
-			}
-
-			void IEnumerator.Reset ()
-			{
-				_baseEnumerator.Reset ();
-			}
-
-			private IEnumerator _baseEnumerator;
-		}
-
-		public class NoCurrentEnumerator : IEnumerator
-		{
-			internal NoCurrentEnumerator (ArrayList arguments)
-			{
-				IEnumerable temp = (IEnumerable) (arguments);
-				_baseEnumerator = temp.GetEnumerator ();
-			}
-
-			object IEnumerator.Current
-			{
-				get { return _baseEnumerator.Current; }
-			}
-
-			public bool MoveNext ()
-			{
-				return _baseEnumerator.MoveNext ();
-			}
-
-			bool IEnumerator.MoveNext ()
-			{
-				return _baseEnumerator.MoveNext ();
-			}
-
-			public void Reset ()
-			{
-				_baseEnumerator.Reset ();
-			}
-
-			void IEnumerator.Reset ()
-			{
-				_baseEnumerator.Reset ();
-			}
-
-			private IEnumerator _baseEnumerator;
-		}
-	}
-}
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs
deleted file mode 100644
index 78082aaadd8..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs
+++ /dev/null
@@ -1,1140 +0,0 @@
-//
-// System.Xml.Serialization.SoapSchemaExporterTests
-//
-// Author:
-//   Gert Driesen (drieseng@users.sourceforge.net)
-//
-// (C) 2005 Novell
-// 
-
-using System;
-using System.Collections;
-using System.Globalization;
-using System.IO;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-using NUnit.Framework;
-
-using MonoTests.System.Xml.TestClasses;
-
-namespace MonoTests.System.XmlSerialization
-{
-	[TestFixture]
-	public class SoapSchemaExporterTests
-	{
-		private XmlSchemas Export (Type type)
-		{
-			return Export (type, string.Empty);
-		}
-
-		private XmlSchemas Export (Type type, string defaultNamespace)
-		{
-			SoapReflectionImporter ri = new SoapReflectionImporter (defaultNamespace);
-			XmlSchemas schemas = new XmlSchemas ();
-			SoapSchemaExporter sx = new SoapSchemaExporter (schemas);
-			XmlTypeMapping tm = ri.ImportTypeMapping (type);
-			sx.ExportTypeMapping (tm);
-			return schemas;
-		}
-
-		private XmlSchemas Export (Type type, SoapAttributeOverrides overrides)
-		{
-			return Export (type, overrides, string.Empty);
-		}
-
-		private XmlSchemas Export (Type type, SoapAttributeOverrides overrides, string defaultNamespace)
-		{
-			SoapReflectionImporter ri = new SoapReflectionImporter (overrides, defaultNamespace);
-			XmlSchemas schemas = new XmlSchemas ();
-			SoapSchemaExporter sx = new SoapSchemaExporter (schemas);
-			XmlTypeMapping tm = ri.ImportTypeMapping (type);
-			sx.ExportTypeMapping (tm);
-			return schemas;
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportStruct ()
-		{
-			XmlSchemas schemas = Export (typeof (TimeSpan), "NSTimeSpan");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSTimeSpan\" elementFormDefault=\"qualified\" targetNamespace=\"NSTimeSpan\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSTimeSpan\" targetNamespace=\"NSTimeSpan\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"TimeSpan\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (TimeSpan));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"TimeSpan\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-/*
-#if NET_2_0
-		[Category ("NotWorking")] // minOccurs is 1 on Mono
-#endif
-*/
-		public void ExportClass_SimpleClass ()
-		{
-			SoapAttributeOverrides overrides = new SoapAttributeOverrides ();
-			SoapAttributes attr = new SoapAttributes ();
-			SoapElementAttribute element = new SoapElementAttribute ();
-			element.ElementName = "saying";
-			element.IsNullable = true;
-			attr.SoapElement = element;
-			overrides.Add (typeof (SimpleClass), "something", attr);
-
-			XmlSchemas schemas = Export (typeof (SimpleClass), overrides, "NSSimpleClass");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSSimpleClass\" elementFormDefault=\"qualified\" targetNamespace=\"NSSimpleClass\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSSimpleClass\" targetNamespace=\"NSSimpleClass\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"saying\" nillable=\"true\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"saying\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_StringCollection ()
-		{
-			XmlSchemas schemas = Export (typeof (StringCollection), "NSStringCollection");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSStringCollection\" elementFormDefault=\"qualified\" targetNamespace=\"NSStringCollection\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSStringCollection\" targetNamespace=\"NSStringCollection\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:string[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_StringCollectionContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (StringCollectionContainer), "NSStringCollectionContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSStringCollectionContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSStringCollectionContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSStringCollectionContainer\" targetNamespace=\"NSStringCollectionContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"StringCollectionContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"Messages\" type=\"tns:ArrayOfString\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Messages\" type=\"tns:ArrayOfString\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:string[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ArrayContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (ArrayContainer), "NSArrayContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSArrayContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSArrayContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSArrayContainer\" targetNamespace=\"NSArrayContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"ArrayContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:anyType[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ClassArrayContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (ClassArrayContainer), "NSClassArrayContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSClassArrayContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSClassArrayContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSClassArrayContainer\" targetNamespace=\"NSClassArrayContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"ClassArrayContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"items\" type=\"tns:ArrayOfSimpleClass\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"items\" type=\"tns:ArrayOfSimpleClass\" />{0}" +
-#endif
- "    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfSimpleClass\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"tns:SimpleClass[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"something\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_SimpleClassWithXmlAttributes ()
-		{
-			XmlSchemas schemas = Export (typeof (SimpleClassWithXmlAttributes), "NSSimpleClassWithXmlAttributes");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSSimpleClassWithXmlAttributes\" elementFormDefault=\"qualified\" targetNamespace=\"NSSimpleClassWithXmlAttributes\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSSimpleClassWithXmlAttributes\" targetNamespace=\"NSSimpleClassWithXmlAttributes\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"SimpleClassWithXmlAttributes\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"something\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Field ()
-		{
-			XmlSchemas schemas = Export (typeof (Field), "NSField");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSField\" elementFormDefault=\"qualified\" targetNamespace=\"NSField\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSField\" targetNamespace=\"NSField\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"Field\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers2\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers3\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers4\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"Names\" type=\"tns:ArrayOfString\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"Street\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Modifiers\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Modifiers2\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Modifiers3\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Modifiers4\" type=\"tns:MapModifiers\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Names\" type=\"tns:ArrayOfString\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Street\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"MapModifiers\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"Public\" />{0}" +
-				"          <xs:enumeration value=\"Protected\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:string[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_MyList ()
-		{
-			XmlSchemas schemas = Export (typeof (MyList), "NSMyList");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSMyList\" elementFormDefault=\"qualified\" targetNamespace=\"NSMyList\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSMyList\" targetNamespace=\"NSMyList\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:anyType[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Container ()
-		{
-			XmlSchemas schemas = Export (typeof (Container), "NSContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSContainer\" targetNamespace=\"NSContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"Container\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"Items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:anyType[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Container2 ()
-		{
-			XmlSchemas schemas = Export (typeof (Container2), "NSContainer2");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSContainer2\" elementFormDefault=\"qualified\" targetNamespace=\"NSContainer2\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSContainer2\" targetNamespace=\"NSContainer2\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"Container2\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"Items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:anyType[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NotSupportedException))]
-		public void ExportClass_MyElem ()
-		{
-			Export (typeof (MyElem), "NSMyElem");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		[ExpectedException (typeof (NotSupportedException))] // The type System.Xml.XmlCDataSection may not be serialized with SOAP-encoded messages.
-		public void ExportClass_CDataContainer ()
-		{
-			Export (typeof (CDataContainer), "NSCDataContainer");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		[ExpectedException (typeof (NotSupportedException))] // The type System.Xml.XmlCDataSection may not be serialized with SOAP-encoded messages.
-		public void ExportClass_NodeContainer ()
-		{
-			Export (typeof (NodeContainer), "NSNodeContainer");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Choices ()
-		{
-			XmlSchemas schemas = Export (typeof (Choices), "NSChoices");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSChoices\" elementFormDefault=\"qualified\" targetNamespace=\"NSChoices\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSChoices\" targetNamespace=\"NSChoices\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"Choices\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"MyChoice\" type=\"xs:string\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"ItemType\" type=\"tns:ItemChoiceType\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"MyChoice\" type=\"xs:string\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ItemType\" type=\"tns:ItemChoiceType\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"ItemChoiceType\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:enumeration value=\"ChoiceZero\" />{0}" +
-				"      <xs:enumeration value=\"StrangeOne\" />{0}" +
-				"      <xs:enumeration value=\"ChoiceTwo\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_WrongChoices ()
-		{
-			XmlSchemas schemas = Export (typeof (WrongChoices), "NSWrongChoices");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSWrongChoices\" elementFormDefault=\"qualified\" targetNamespace=\"NSWrongChoices\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSWrongChoices\" targetNamespace=\"NSWrongChoices\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"WrongChoices\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"MyChoice\" type=\"xs:string\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"ItemType\" type=\"tns:ItemChoiceType\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"MyChoice\" type=\"xs:string\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ItemType\" type=\"tns:ItemChoiceType\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"ItemChoiceType\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:enumeration value=\"ChoiceZero\" />{0}" +
-				"      <xs:enumeration value=\"StrangeOne\" />{0}" +
-				"      <xs:enumeration value=\"ChoiceTwo\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_TestSpace ()
-		{
-			XmlSchemas schemas = Export (typeof (TestSpace), "NSTestSpace");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSTestSpace\" elementFormDefault=\"qualified\" targetNamespace=\"NSTestSpace\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSTestSpace\" targetNamespace=\"NSTestSpace\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"TestSpace\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"elem\" type=\"xs:int\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"elem\" type=\"xs:int\" />{0}" +
-#endif
-#if NET_2_0
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"attr\" type=\"xs:int\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"attr\" type=\"xs:int\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ReadOnlyProperties ()
-		{
-			XmlSchemas schemas = Export (typeof (ReadOnlyProperties), "NSReadOnlyProperties");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSReadOnlyProperties\" elementFormDefault=\"qualified\" targetNamespace=\"NSReadOnlyProperties\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSReadOnlyProperties\" targetNamespace=\"NSReadOnlyProperties\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"ReadOnlyProperties\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ListDefaults ()
-		{
-			XmlSchemas schemas = Export (typeof (ListDefaults), "NSListDefaults");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSListDefaults\" elementFormDefault=\"qualified\" targetNamespace=\"NSListDefaults\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSListDefaults\" targetNamespace=\"NSListDefaults\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"ListDefaults\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"list2\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"list3\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"list4\" type=\"tns:ArrayOfString\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"list5\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"ed\" type=\"tns:SimpleClass\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"str\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"list2\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"list3\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"list4\" type=\"tns:ArrayOfString\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"list5\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"ed\" type=\"tns:SimpleClass\" />{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"str\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:anyType[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"something\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q2=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q2:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:string[]\" ref=\"q2:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ClsPerson ()
-		{
-			XmlSchemas schemas = Export (typeof (clsPerson), "NSClsPerson");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSClsPerson\" elementFormDefault=\"qualified\" targetNamespace=\"NSClsPerson\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
- "<xs:schema xmlns:tns=\"NSClsPerson\" targetNamespace=\"NSClsPerson\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
- "  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"clsPerson\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"EmailAccounts\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#else
- "      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"EmailAccounts\" type=\"tns:ArrayOfAnyType\" />{0}" +
-#endif
- "    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"xs:anyType[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ArrayClass ()
-		{
-			XmlSchemas schemas = Export (typeof (ArrayClass), "NSArrayClass");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSArrayClass\" elementFormDefault=\"qualified\" targetNamespace=\"NSArrayClass\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSArrayClass\" targetNamespace=\"NSArrayClass\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"ArrayClass\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"names\" type=\"xs:anyType\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"names\" type=\"xs:anyType\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_StructContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (StructContainer), "NSStructContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSStructContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSStructContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSStructContainer\" targetNamespace=\"NSStructContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:complexType name=\"StructContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" form=\"unqualified\" name=\"Value\" type=\"tns:EnumDefaultValue\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Value\" type=\"tns:EnumDefaultValue\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"EnumDefaultValue\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"e1\" />{0}" +
-				"          <xs:enumeration value=\"e2\" />{0}" +
-				"          <xs:enumeration value=\"e3\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
- 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-/*
-#if NET_2_0
-		[Category ("NotWorking")] // minOccurs is 1 on Mono
-#endif
- */
-		public void ExportClass_SimpleClass_Array ()
-		{
-			SoapAttributeOverrides overrides = new SoapAttributeOverrides ();
-			SoapAttributes attr = new SoapAttributes ();
-			SoapElementAttribute element = new SoapElementAttribute ();
-			element.ElementName = "saying";
-			element.IsNullable = true;
-			attr.SoapElement = element;
-			overrides.Add (typeof (SimpleClass), "something", attr);
-
-			SoapReflectionImporter ri = new SoapReflectionImporter (overrides, "NSSimpleClassArray");
-			XmlSchemas schemas = new XmlSchemas ();
-			SoapSchemaExporter sx = new SoapSchemaExporter (schemas);
-			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (SimpleClass[]));
-			sx.ExportTypeMapping (tm);
-
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSSimpleClassArray\" elementFormDefault=\"qualified\" targetNamespace=\"NSSimpleClassArray\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSSimpleClassArray\" targetNamespace=\"NSSimpleClassArray\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-				"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfSimpleClass\">{0}" +
-				"    <xs:complexContent mixed=\"false\">{0}" +
-				"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-				"        <xs:attribute d5p1:arrayType=\"tns:SimpleClass[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-				"      </xs:restriction>{0}" +
-				"    </xs:complexContent>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" form=\"unqualified\" name=\"saying\" nillable=\"true\" type=\"xs:string\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"saying\" type=\"xs:string\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportEnum ()
-		{
-			XmlSchemas schemas = Export (typeof (EnumDefaultValue), "NSEnumDefaultValue");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSEnumDefaultValue\" elementFormDefault=\"qualified\" targetNamespace=\"NSEnumDefaultValue\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSEnumDefaultValue\" targetNamespace=\"NSEnumDefaultValue\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:simpleType name=\"EnumDefaultValue\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"e1\" />{0}" +
-				"          <xs:enumeration value=\"e2\" />{0}" +
-				"          <xs:enumeration value=\"e3\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (EnumDefaultValueNF), "NSEnumDefaultValueNF");
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"NSEnumDefaultValueNF\" elementFormDefault=\"qualified\" targetNamespace=\"NSEnumDefaultValueNF\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"NSEnumDefaultValueNF\" targetNamespace=\"NSEnumDefaultValueNF\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:simpleType name=\"EnumDefaultValueNF\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:enumeration value=\"e1\" />{0}" +
-				"      <xs:enumeration value=\"e2\" />{0}" +
-				"      <xs:enumeration value=\"e3\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportXsdPrimitive ()
-		{
-			ArrayList types = new ArrayList ();
-			types.Add (new TypeDescription (typeof (object), true, "anyType", "Object"));
-			types.Add (new TypeDescription (typeof (byte), true, "unsignedByte", "Byte"));
-			types.Add (new TypeDescription (typeof (sbyte), true, "byte", "Byte"));
-			types.Add (new TypeDescription (typeof (bool), true, "boolean", "Boolean"));
-			types.Add (new TypeDescription (typeof (short), true, "short", "Short"));
-			types.Add (new TypeDescription (typeof (int), true, "int", "Int"));
-			types.Add (new TypeDescription (typeof (long), true, "long", "Long"));
-			types.Add (new TypeDescription (typeof (float), true, "float", "Float"));
-			types.Add (new TypeDescription (typeof (double), true, "double", "Double"));
-			types.Add (new TypeDescription (typeof (decimal), true, "decimal", "Decimal"));
-			types.Add (new TypeDescription (typeof (ushort), true, "unsignedShort", "UnsignedShort"));
-			types.Add (new TypeDescription (typeof (uint), true, "unsignedInt", "UnsignedInt"));
-			types.Add (new TypeDescription (typeof (ulong), true, "unsignedLong", "UnsignedLong"));
-			types.Add (new TypeDescription (typeof (DateTime), true, "dateTime", "DateTime"));
-#if NET_2_0
-			types.Add (new TypeDescription (typeof (XmlQualifiedName), true, "QName", "QName", true));
-#else
-			types.Add (new TypeDescription (typeof (XmlQualifiedName), true, "QName", "QName"));
-#endif
-			types.Add (new TypeDescription (typeof (string), true, "string", "String", true));
-
-			foreach (TypeDescription typeDesc in types) {
-				XmlSchemas schemas = Export (typeDesc.Type, typeDesc.Type.Name);
-				Assert.AreEqual (0, schemas.Count, typeDesc.Type.FullName + "#1");
-			}
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportXsdPrimitive_ByteArray ()
-		{
-			XmlSchemas schemas = Export (typeof (byte[]), "ByteArray");
-			Assert.AreEqual (0, schemas.Count, "#1");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportXsdPrimitive_Arrays ()
-		{
-			ArrayList types = new ArrayList ();
-			types.Add (new TypeDescription (typeof (object[]), true, "anyType", "AnyType"));
-			types.Add (new TypeDescription (typeof (sbyte[]), true, "byte", "Byte"));
-			types.Add (new TypeDescription (typeof (bool[]), true, "boolean", "Boolean"));
-			types.Add (new TypeDescription (typeof (short[]), true, "short", "Short"));
-			types.Add (new TypeDescription (typeof (int[]), true, "int", "Int"));
-			types.Add (new TypeDescription (typeof (long[]), true, "long", "Long"));
-			types.Add (new TypeDescription (typeof (float[]), true, "float", "Float"));
-			types.Add (new TypeDescription (typeof (double[]), true, "double", "Double"));
-			types.Add (new TypeDescription (typeof (decimal[]), true, "decimal", "Decimal"));
-			types.Add (new TypeDescription (typeof (ushort[]), true, "unsignedShort", "UnsignedShort"));
-			types.Add (new TypeDescription (typeof (uint[]), true, "unsignedInt", "UnsignedInt"));
-			types.Add (new TypeDescription (typeof (ulong[]), true, "unsignedLong", "UnsignedLong"));
-			types.Add (new TypeDescription (typeof (DateTime[]), true, "dateTime", "DateTime"));
-#if NET_2_0
-			types.Add (new TypeDescription (typeof (XmlQualifiedName[]), true, "QName", "QName", true));
-#else
-			types.Add (new TypeDescription (typeof (XmlQualifiedName[]), true, "QName", "QName"));
-#endif
-			types.Add (new TypeDescription (typeof (string[]), true, "string", "String", true));
-
-			foreach (TypeDescription typeDesc in types) {
-				XmlSchemas schemas = Export (typeDesc.Type, typeDesc.Type.Name);
-				Assert.AreEqual (1, schemas.Count, typeDesc.Type.FullName + "#1");
-
-				StringWriter sw = new StringWriter ();
-				schemas[0].Write (sw);
-
-				Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-					"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-					"<xs:schema xmlns:tns=\"{1}\" elementFormDefault=\"qualified\" targetNamespace=\"{1}\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-					"<xs:schema xmlns:tns=\"{1}\" targetNamespace=\"{1}\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-					"  <xs:import namespace=\"http://schemas.xmlsoap.org/soap/encoding/\" />{0}" +
-					"  <xs:import namespace=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-					"  <xs:complexType name=\"ArrayOf{2}\">{0}" +
-					"    <xs:complexContent mixed=\"false\">{0}" +
-					"      <xs:restriction xmlns:q1=\"http://schemas.xmlsoap.org/soap/encoding/\" base=\"q1:Array\">{0}" +
-					"        <xs:attribute d5p1:arrayType=\"xs:{3}[]\" ref=\"q1:arrayType\" xmlns:d5p1=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-					"      </xs:restriction>{0}" +
-					"    </xs:complexContent>{0}" +
-					"  </xs:complexType>{0}" +
-					"</xs:schema>", Environment.NewLine, typeDesc.Type.Name, typeDesc.ArrayType, typeDesc.XmlType, 
-					typeDesc.XsdType ? "xs" : "tns", typeDesc.IsNillable ? "nillable=\"true\" " : ""),
-					sw.ToString (), typeDesc.Type.FullName + "#2");
-			}
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportNonXsdPrimitive_Guid ()
-		{
-			XmlSchemas schemas = Export (typeof (Guid), "NSPrimGuid");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"http://microsoft.com/wsdl/types/\" elementFormDefault=\"qualified\" targetNamespace=\"http://microsoft.com/wsdl/types/\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"http://microsoft.com/wsdl/types/\" targetNamespace=\"http://microsoft.com/wsdl/types/\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:simpleType name=\"guid\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:pattern value=\"[0-9a-fA-F]{{8}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{12}}\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportNonXsdPrimitive_Char ()
-		{
-			XmlSchemas schemas = Export (typeof (Char), "NSPrimChar");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-#if NET_2_0
-				"<xs:schema xmlns:tns=\"http://microsoft.com/wsdl/types/\" elementFormDefault=\"qualified\" targetNamespace=\"http://microsoft.com/wsdl/types/\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#else
-				"<xs:schema xmlns:tns=\"http://microsoft.com/wsdl/types/\" targetNamespace=\"http://microsoft.com/wsdl/types/\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#endif
-				"  <xs:simpleType name=\"char\">{0}" +
-				"    <xs:restriction base=\"xs:unsignedShort\" />{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		public class Employee : IXmlSerializable
-		{
-			private string _firstName;
-			private string _lastName;
-			private string _address;
-
-			public XmlSchema GetSchema ()
-			{
-				return null;
-			}
-
-			public void WriteXml (XmlWriter writer)
-			{
-				writer.WriteStartElement ("employee", "urn:devx-com");
-				writer.WriteAttributeString ("firstName", _firstName);
-				writer.WriteAttributeString ("lastName", _lastName);
-				writer.WriteAttributeString ("address", _address);
-				writer.WriteEndElement ();
-			}
-
-			public void ReadXml (XmlReader reader)
-			{
-				XmlNodeType type = reader.MoveToContent ();
-				if (type == XmlNodeType.Element && reader.LocalName == "employee") {
-					_firstName = reader["firstName"];
-					_lastName = reader["lastName"];
-					_address = reader["address"];
-				}
-			}
-		}
-
-		public class StructContainer
-		{
-			public EnumDefaultValue Value;
-		}
-
-		private class TypeDescription
-		{
-			public TypeDescription (Type type, bool xsdType, string xmlType, string arrayType)
-				: this (type, xsdType, xmlType, arrayType, false)
-			{
-			}
-
-			public TypeDescription (Type type, bool xsdType, string xmlType, string arrayType, bool isNillable)
-			{
-				_type = type;
-				_xsdType = xsdType;
-				_xmlType = xmlType;
-				_arrayType = arrayType;
-				_isNillable = isNillable;
-			}
-
-			public Type Type
-			{
-				get { return _type; }
-			}
-
-			public string XmlType
-			{
-				get { return _xmlType; }
-			}
-
-			public string ArrayType
-			{
-				get { return _arrayType; }
-			}
-
-			public bool XsdType
-			{
-				get { return _xsdType; }
-			}
-
-			public bool IsNillable
-			{
-				get { return _isNillable; }
-			}
-
-			private Type _type;
-			private bool _xsdType;
-			private string _xmlType;
-			private string _arrayType;
-			private bool _isNillable;
-		}
-	}
-}
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs
index 27239a28785..1c9a34f6d18 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs
@@ -11,9 +11,7 @@
 // 

 

 using System;

-using System.Collections;

 using System.Xml;

-using System.Xml.Schema;

 using System.Xml.Serialization;

 

 using NUnit.Framework;

@@ -48,11 +46,10 @@ namespace MonoTests.System.XmlSerialization
 	}

 

 	[TestFixture]

-	public class XmlReflectionImporterTests

+	public class XmlReflectionImporterTests : Assertion

 	{

 		private const string SomeNamespace = "some:urn";

 		private const string AnotherNamespace = "another:urn";

-		private const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";

 

 		// these Map methods re-create the XmlReflectionImporter at every call.

 

@@ -82,14 +79,6 @@ namespace MonoTests.System.XmlSerialization
 			return tm;

 		}

 

-		private XmlTypeMapping Map (Type t, string ns, XmlRootAttribute root)

-		{

-			XmlReflectionImporter ri = new XmlReflectionImporter (ns);

-			XmlTypeMapping tm = ri.ImportTypeMapping (t, root);

-

-			return tm;

-		}

-

 		private XmlTypeMapping Map(Type t, XmlAttributeOverrides overrides)

 		{

 			XmlReflectionImporter ri = new XmlReflectionImporter(overrides);

@@ -112,388 +101,190 @@ namespace MonoTests.System.XmlSerialization
 		public void TestIntTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(int));

-			Assert.AreEqual ("int", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Int32", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Int32", tm.TypeFullName, "#4");

+			AssertEquals("int", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Int32", tm.TypeName);

+			AssertEquals("System.Int32", tm.TypeFullName);

 		}

 

 		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestIntTypeMapping_Array ()

+		public void TestIntArrayTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(int[]));

-			Assert.AreEqual ("ArrayOfInt", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfInt32", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("Int32[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.Int32[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (int[][]));

-			Assert.AreEqual ("ArrayOfArrayOfInt", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfInt32", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("Int32[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.Int32[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (int[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfInt", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfInt32", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("Int32[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.Int32[][][]", tm.TypeFullName, "#C4");

+			AssertEquals("ArrayOfInt", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Int32[]", tm.TypeName);

+			AssertEquals("System.Int32[]", tm.TypeFullName);

 		}

 

 		[Test]

 		public void TestStringTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(string));

-			Assert.AreEqual ("string", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("String", tm.TypeName, "#3");

-			Assert.AreEqual ("System.String", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestStringTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (string[]));

-			Assert.AreEqual ("ArrayOfString", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfString", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("String[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.String[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (string[][]));

-			Assert.AreEqual ("ArrayOfArrayOfString", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfString", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("String[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.String[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (string[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfString", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfString", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("String[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.String[][][]", tm.TypeFullName, "#C4");

+			AssertEquals("string", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("String", tm.TypeName);

+			AssertEquals("System.String", tm.TypeFullName);

 		}

 

 		[Test]

 		public void TestObjectTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(object));

-			Assert.AreEqual ("anyType", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Object", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Object", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestObjectTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (object[]));

-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfObject", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("Object[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.Object[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (object[][]));

-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfObject", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("Object[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.Object[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (object[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfObject", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("Object[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.Object[][][]", tm.TypeFullName, "#C4");

+			AssertEquals("anyType", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Object", tm.TypeName);

+			AssertEquals("System.Object", tm.TypeFullName);

 		}

 

 		[Test]

 		public void TestByteTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(byte));

-			Assert.AreEqual ("unsignedByte", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Byte", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Byte", tm.TypeFullName, "#4");

+			AssertEquals("unsignedByte", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Byte", tm.TypeName);

+			AssertEquals("System.Byte", tm.TypeFullName);

 		}

 

 		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestByteTypeMapping_Array ()

+		public void TestByteArrayTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(byte[]));

-			Assert.AreEqual ("base64Binary", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-			Assert.AreEqual ("Byte[]", tm.TypeName, "#A3");

-			Assert.AreEqual ("System.Byte[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (byte[][]));

-			Assert.AreEqual ("ArrayOfBase64Binary", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfByte", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("Byte[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.Byte[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (byte[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfBase64Binary", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfByte", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("Byte[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.Byte[][][]", tm.TypeFullName, "#C4");

+			AssertEquals("base64Binary", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Byte[]", tm.TypeName);

+			AssertEquals("System.Byte[]", tm.TypeFullName);

 		}

 

 		[Test]

 		public void TestBoolTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(bool));

-			Assert.AreEqual ("boolean", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Boolean", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Boolean", tm.TypeFullName, "#4");

+			AssertEquals("boolean", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Boolean", tm.TypeName);

+			AssertEquals("System.Boolean", tm.TypeFullName);

 		}

 

 		[Test]

 		public void TestShortTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(short));

-			Assert.AreEqual ("short", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Int16", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Int16", tm.TypeFullName, "#4");

+			AssertEquals("short", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Int16", tm.TypeName);

+			AssertEquals("System.Int16", tm.TypeFullName);

 		}

 

 		[Test]

 		public void TestUnsignedShortTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(ushort));

-			Assert.AreEqual ("unsignedShort", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("UInt16", tm.TypeName, "#3");

-			Assert.AreEqual ("System.UInt16", tm.TypeFullName, "#4");

+			AssertEquals("unsignedShort", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("UInt16", tm.TypeName);

+			AssertEquals("System.UInt16", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestUIntTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(uint));

-			Assert.AreEqual ("unsignedInt", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("UInt32", tm.TypeName, "#3");

-			Assert.AreEqual ("System.UInt32", tm.TypeFullName, "#4");

+			AssertEquals("unsignedInt", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("UInt32", tm.TypeName);

+			AssertEquals("System.UInt32", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestLongTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(long));

-			Assert.AreEqual ("long", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Int64", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Int64", tm.TypeFullName, "#4");

+			AssertEquals("long", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Int64", tm.TypeName);

+			AssertEquals("System.Int64", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestULongTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(ulong));

-			Assert.AreEqual ("unsignedLong", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("UInt64", tm.TypeName, "#3");

-			Assert.AreEqual ("System.UInt64", tm.TypeFullName, "#4");

+			AssertEquals("unsignedLong", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("UInt64", tm.TypeName);

+			AssertEquals("System.UInt64", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestFloatTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(float));

-			Assert.AreEqual ("float", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Single", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Single", tm.TypeFullName, "#4");

+			AssertEquals("float", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Single", tm.TypeName);

+			AssertEquals("System.Single", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestDoubleTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(double));

-			Assert.AreEqual ("double", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Double", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Double", tm.TypeFullName, "#4");

+			AssertEquals("double", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Double", tm.TypeName);

+			AssertEquals("System.Double", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestDateTimeTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(DateTime));

-			Assert.AreEqual ("dateTime", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("DateTime", tm.TypeName, "#3");

-			Assert.AreEqual ("System.DateTime", tm.TypeFullName, "#4");

+			AssertEquals("dateTime", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("DateTime", tm.TypeName);

+			AssertEquals("System.DateTime", tm.TypeFullName);

 		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestDateTimeTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (DateTime[]));

-			Assert.AreEqual ("ArrayOfDateTime", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfDateTime", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("DateTime[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.DateTime[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (DateTime[][]));

-			Assert.AreEqual ("ArrayOfArrayOfDateTime", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfDateTime", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("DateTime[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.DateTime[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (DateTime[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfDateTime", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfDateTime", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("DateTime[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.DateTime[][][]", tm.TypeFullName, "#C4");

-		}

-

+		

 		[Test]

 		public void TestGuidTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(Guid));

-			Assert.AreEqual ("guid", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Guid", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Guid", tm.TypeFullName, "#4");

+			AssertEquals("guid", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Guid", tm.TypeName);

+			AssertEquals("System.Guid", tm.TypeFullName);

 		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestGuidTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (Guid[]));

-			Assert.AreEqual ("ArrayOfGuid", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfGuid", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("Guid[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.Guid[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (Guid[][]));

-			Assert.AreEqual ("ArrayOfArrayOfGuid", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfGuid", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("Guid[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.Guid[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (Guid[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfGuid", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfGuid", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("Guid[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.Guid[][][]", tm.TypeFullName, "#C4");

-		}

-

+		

 		[Test]

 		public void TestDecimalTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(decimal));

-			Assert.AreEqual ("decimal", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Decimal", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Decimal", tm.TypeFullName, "#4");

+			AssertEquals("decimal", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Decimal", tm.TypeName);

+			AssertEquals("System.Decimal", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestXmlQualifiedNameTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(XmlQualifiedName));

-			Assert.AreEqual ("QName", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("XmlQualifiedName", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Xml.XmlQualifiedName", tm.TypeFullName, "#4");

+			AssertEquals("QName", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("XmlQualifiedName", tm.TypeName);

+			AssertEquals("System.Xml.XmlQualifiedName", tm.TypeFullName);

 		}

 		

 		[Test]

 		public void TestSByteTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(sbyte));

-			Assert.AreEqual ("byte", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("SByte", tm.TypeName, "#3");

-			Assert.AreEqual ("System.SByte", tm.TypeFullName, "#4");

+			AssertEquals("byte", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("SByte", tm.TypeName);

+			AssertEquals("System.SByte", tm.TypeFullName);

 		}

 		

 

@@ -501,753 +292,80 @@ namespace MonoTests.System.XmlSerialization
 		public void TestCharTypeMapping()

 		{

 			XmlTypeMapping tm = Map(typeof(char));

-			Assert.AreEqual ("char", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Char", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Char", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestCharTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (char[]));

-			Assert.AreEqual ("ArrayOfChar", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfChar", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("Char[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.Char[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (char[][]));

-			Assert.AreEqual ("ArrayOfArrayOfChar", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfChar", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("Char[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.Char[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (char[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfChar", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfChar", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("Char[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.Char[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-		public void TestXmlNodeTypeMapping ()

-		{

-			Type type = typeof (XmlNode);

-

-			XmlTypeMapping tm = Map (type);

-			Assert.AreEqual (string.Empty, tm.ElementName, "#A1");

-			Assert.IsNull (tm.Namespace, "#A2");

-			Assert.AreEqual ("XmlNode", tm.TypeName, "#A3");

-			Assert.AreEqual ("System.Xml.XmlNode", tm.TypeFullName, "#A4");

-

-			tm = Map (type, AnotherNamespace);

-			Assert.AreEqual (string.Empty, tm.ElementName, "#B1");

-			Assert.IsNull (tm.Namespace, "#B2");

-			Assert.AreEqual ("XmlNode", tm.TypeName, "#B3");

-			Assert.AreEqual ("System.Xml.XmlNode", tm.TypeFullName, "#B4");

-

-			XmlRootAttribute root = new XmlRootAttribute ("somename");

-			root.Namespace = SomeNamespace;

-			tm = Map (type, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#C1");

-			Assert.IsNull (tm.Namespace, "#C2");

-			Assert.AreEqual ("XmlNode", tm.TypeName, "#C3");

-			Assert.AreEqual ("System.Xml.XmlNode", tm.TypeFullName, "#C4");

-

-			tm = Map (type, AnotherNamespace, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#D1");

-			Assert.IsNull (tm.Namespace, "#D2");

-			Assert.AreEqual ("XmlNode", tm.TypeName, "#D3");

-			Assert.AreEqual ("System.Xml.XmlNode", tm.TypeFullName, "#D4");

-

-			root.Namespace = null;

-			tm = Map (type, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#E1");

-			Assert.IsNull (tm.Namespace, "#E2");

-			Assert.AreEqual ("XmlNode", tm.TypeName, "#E3");

-			Assert.AreEqual ("System.Xml.XmlNode", tm.TypeFullName, "#E4");

-

-			tm = Map (type, AnotherNamespace, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#F1");

-			Assert.IsNull (tm.Namespace, "#F2");

-			Assert.AreEqual ("XmlNode", tm.TypeName, "#F3");

-			Assert.AreEqual ("System.Xml.XmlNode", tm.TypeFullName, "#F4");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-		public void TestXmlElementTypeMapping ()

-		{

-			Type type = typeof (XmlElement);

-

-			XmlTypeMapping tm = Map (type);

-			Assert.AreEqual (string.Empty, tm.ElementName, "#1");

-			Assert.IsNull (tm.Namespace, "#2");

-			Assert.AreEqual ("XmlElement", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Xml.XmlElement", tm.TypeFullName, "#4");

-

-			tm = Map (type, AnotherNamespace);

-			Assert.AreEqual (string.Empty, tm.ElementName, "#B1");

-			Assert.IsNull (tm.Namespace, "#B2");

-			Assert.AreEqual ("XmlElement", tm.TypeName, "#B3");

-			Assert.AreEqual ("System.Xml.XmlElement", tm.TypeFullName, "#B4");

-

-			XmlRootAttribute root = new XmlRootAttribute ("somename");

-			root.Namespace = SomeNamespace;

-			tm = Map (type, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#C1");

-			Assert.IsNull (tm.Namespace, "#C2");

-			Assert.AreEqual ("XmlElement", tm.TypeName, "#C3");

-			Assert.AreEqual ("System.Xml.XmlElement", tm.TypeFullName, "#C4");

-

-			tm = Map (type, AnotherNamespace, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#D1");

-			Assert.IsNull (tm.Namespace, "#D2");

-			Assert.AreEqual ("XmlElement", tm.TypeName, "#D3");

-			Assert.AreEqual ("System.Xml.XmlElement", tm.TypeFullName, "#D4");

-

-			root.Namespace = null;

-			tm = Map (type, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#E1");

-			Assert.IsNull (tm.Namespace, "#E2");

-			Assert.AreEqual ("XmlElement", tm.TypeName, "#E3");

-			Assert.AreEqual ("System.Xml.XmlElement", tm.TypeFullName, "#E4");

-

-			tm = Map (type, AnotherNamespace, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#F1");

-			Assert.IsNull (tm.Namespace, "#F2");

-			Assert.AreEqual ("XmlElement", tm.TypeName, "#F3");

-			Assert.AreEqual ("System.Xml.XmlElement", tm.TypeFullName, "#F4");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-		public void TestXmlNotationTypeMapping ()

-		{

-			Type type = typeof (XmlNotation);

-

-			XmlTypeMapping tm = Map (type);

-			Assert.AreEqual (string.Empty, tm.ElementName, "#1");

-			Assert.IsNull (tm.Namespace, "#2");

-			Assert.AreEqual ("XmlNotation", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Xml.XmlNotation", tm.TypeFullName, "#4");

-

-			tm = Map (type, AnotherNamespace);

-			Assert.AreEqual (string.Empty, tm.ElementName, "#B1");

-			Assert.IsNull (tm.Namespace, "#B2");

-			Assert.AreEqual ("XmlNotation", tm.TypeName, "#B3");

-			Assert.AreEqual ("System.Xml.XmlNotation", tm.TypeFullName, "#B4");

-

-			XmlRootAttribute root = new XmlRootAttribute ("somename");

-			root.Namespace = SomeNamespace;

-			tm = Map (type, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#C1");

-			Assert.IsNull (tm.Namespace, "#C2");

-			Assert.AreEqual ("XmlNotation", tm.TypeName, "#C3");

-			Assert.AreEqual ("System.Xml.XmlNotation", tm.TypeFullName, "#C4");

-

-			tm = Map (type, AnotherNamespace, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#D1");

-			Assert.IsNull (tm.Namespace, "#D2");

-			Assert.AreEqual ("XmlNotation", tm.TypeName, "#D3");

-			Assert.AreEqual ("System.Xml.XmlNotation", tm.TypeFullName, "#D4");

-

-			root.Namespace = null;

-			tm = Map (type, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#E1");

-			Assert.IsNull (tm.Namespace, "#E2");

-			Assert.AreEqual ("XmlNotation", tm.TypeName, "#E3");

-			Assert.AreEqual ("System.Xml.XmlNotation", tm.TypeFullName, "#E4");

-

-			tm = Map (type, AnotherNamespace, root);

-			Assert.AreEqual ("somename", tm.ElementName, "#F1");

-			Assert.IsNull (tm.Namespace, "#F2");

-			Assert.AreEqual ("XmlNotation", tm.TypeName, "#F3");

-			Assert.AreEqual ("System.Xml.XmlNotation", tm.TypeFullName, "#F4");

+			AssertEquals("char", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("Char", tm.TypeName);

+			AssertEquals("System.Char", tm.TypeFullName);

 		}

 

 		[Test]

-		public void TestXmlSerializableTypeMapping ()

+		public void TestNullTypeMapping()

 		{

-			XmlTypeMapping tm = Map (typeof (Employee));

-			Assert.AreEqual ("Employee", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("Employee", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.Employee", tm.TypeFullName, "#4");

+			try

+			{

+				XmlTypeMapping tm = Map(null);

+				Fail("Should not be able to map a null type");

+			}

+			catch (Exception)

+			{

+			}

 		}

 

+	    

 		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestXmlSerializableTypeMapping_Array ()

+		public void TestInvalidClassTypeMapping()

 		{

-			XmlTypeMapping tm = Map (typeof (Employee[]));

-			Assert.AreEqual ("ArrayOfEmployee", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfEmployee", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("Employee[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.Employee[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (Employee[][]));

-			Assert.AreEqual ("ArrayOfArrayOfEmployee", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfEmployee", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("Employee[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.Employee[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (Employee[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfEmployee", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfEmployee", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("Employee[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.Employee[][][]", tm.TypeFullName, "#C4");

+			try

+			{

+				// this can use any class

+				XmlTypeMapping tm = Map(typeof(SimpleClass));

+				Fail("Should not be able to this type");

+			}

+			catch (Exception)

+			{

+			}

 		}

 

+		/*

 		[Test]

-		public void TestClassTypeMapping_NestedStruct ()

+		public void TestTypeMapping()

 		{

-			XmlTypeMapping tm = Map (typeof (NestedStruct));

-			Assert.AreEqual ("NestedStruct", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("NestedStruct", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.NestedStruct", tm.TypeFullName, "#4");

+			XmlTypeMapping tm = Map(typeof());

+			AssertEquals(tm.ElementName, "");

+			AssertEquals(tm.Namespace, "");

+			AssertEquals(tm.TypeName, "");

+			AssertEquals(tm.TypeFullName, "System.");

 		}

-

-		[Test]

-		[ExpectedException (typeof (ArgumentNullException))]

-		public void TestNullTypeMapping()

-		{

-			Map(null);

-		}

-

+		*/

+	

 		[Test]

 		public void TestIntTypeMappingWithDefaultNamespaces()

 		{

 			XmlTypeMapping tm = Map(typeof(int), SomeNamespace);

-			Assert.AreEqual ("int", tm.ElementName, "#1");

-			Assert.AreEqual (SomeNamespace, tm.Namespace, "#2");

-			Assert.AreEqual ("Int32", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Int32", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-		public void TestStructTypeMapping ()

-		{

-			XmlTypeMapping tm = Map (typeof (TimeSpan));

-			Assert.AreEqual ("TimeSpan", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("TimeSpan", tm.TypeName, "#3");

-			Assert.AreEqual ("System.TimeSpan", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-		public void TestStructTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (TimeSpan[]));

-			Assert.AreEqual ("ArrayOfTimeSpan", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfTimeSpan", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("TimeSpan[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.TimeSpan[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (TimeSpan[][]));

-			Assert.AreEqual ("ArrayOfArrayOfTimeSpan", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfTimeSpan", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("TimeSpan[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.TimeSpan[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (TimeSpan[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfTimeSpan", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfTimeSpan", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("TimeSpan[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.TimeSpan[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		public void TestEnumTypeMapping ()

-		{

-			XmlTypeMapping tm = Map (typeof (AttributeTargets));

-			Assert.AreEqual ("AttributeTargets", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("AttributeTargets", tm.TypeName, "#3");

-			Assert.AreEqual ("System.AttributeTargets", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestEnumTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (AttributeTargets[]));

-			Assert.AreEqual ("ArrayOfAttributeTargets", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfAttributeTargets", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("AttributeTargets[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("System.AttributeTargets[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (AttributeTargets[][]));

-			Assert.AreEqual ("ArrayOfArrayOfAttributeTargets", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfAttributeTargets", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("AttributeTargets[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("System.AttributeTargets[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (AttributeTargets[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAttributeTargets", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAttributeTargets", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("AttributeTargets[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("System.AttributeTargets[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		public void TestClassTypeMapping()

-		{

-			XmlTypeMapping tm = Map (typeof (SimpleClass));

-			Assert.AreEqual ("SimpleClass", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("SimpleClass", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass", tm.TypeFullName, "#4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TestClassTypeMapping_Array ()

-		{

-			XmlTypeMapping tm = Map (typeof (SimpleClass[]));

-			Assert.AreEqual ("ArrayOfSimpleClass", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfSimpleClass", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("SimpleClass[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (SimpleClass[][]));

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("SimpleClass[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (SimpleClass[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClass", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("SimpleClass[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.Xml.TestClasses.SimpleClass[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		[ExpectedException (typeof (NotSupportedException))]

-		public void TypeMapping_IDictionary ()

-		{

-			// The type MonoTests.System.Xml.TestClasses.DictionaryWithIndexer 

-			// is not supported because it implements IDictionary.

-			Map (typeof (DictionaryWithIndexer));

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TypeMapping_IEnumerable_SimpleClass ()

-		{

-			XmlTypeMapping tm = Map (typeof (SimpleClassEnumerable));

-			Assert.AreEqual ("ArrayOfSimpleClass", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("SimpleClassEnumerable", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerable", tm.TypeFullName, "#4");

-

-			tm = Map (typeof (SimpleClassEnumerable[]));

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfSimpleClassEnumerable", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerable[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerable[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (SimpleClassEnumerable[][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassEnumerable", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerable[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerable[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (SimpleClassEnumerable[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClassEnumerable", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerable[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerable[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TypeMapping_IEnumerable_Object ()

-		{

-			XmlTypeMapping tm = Map (typeof (ObjectEnumerable));

-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("ObjectEnumerable", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectEnumerable", tm.TypeFullName, "#4");

-

-			tm = Map (typeof (ObjectEnumerable[]));

-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfObjectEnumerable", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("ObjectEnumerable[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectEnumerable[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (ObjectEnumerable[][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfObjectEnumerable", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("ObjectEnumerable[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectEnumerable[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (ObjectEnumerable[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfObjectEnumerable", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("ObjectEnumerable[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectEnumerable[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_IEnumerable_Object_NoMatchingAddMethod ()

-		{

-			Map (typeof (ObjectEnumerableNoMatchingAddMethod));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_IEnumerable_Object_NoMatchingAddMethod_Array ()

-		{

-			Map (typeof (ObjectEnumerableNoMatchingAddMethod[]));

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TypeMapping_IEnumerable_SimpleClass_PrivateCurrent ()

-		{

-			XmlTypeMapping tm = Map (typeof (SimpleClassEnumerablePrivateCurrent));

-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateCurrent", tm.TypeFullName, "#4");

-

-			tm = Map (typeof (SimpleClassEnumerablePrivateCurrent[]));

-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfSimpleClassEnumerablePrivateCurrent", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateCurrent[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (SimpleClassEnumerablePrivateCurrent[][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassEnumerablePrivateCurrent", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateCurrent[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (SimpleClassEnumerablePrivateCurrent[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClassEnumerablePrivateCurrent", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerablePrivateCurrent[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateCurrent[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-#if ONLY_1_1

-		[Category ("NotDotNet")] // results in NullReferenceException in .NET 1.1 (SP1)

-#endif

-		public void TypeMapping_IEnumerable_SimpleClass_PrivateGetEnumerator ()

-		{

-			XmlTypeMapping tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator));

-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator", tm.TypeFullName, "#4");

-

-			tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator[]));

-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfSimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator[][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (SimpleClassEnumerablePrivateGetEnumerator[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClassEnumerablePrivateGetEnumerator", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("SimpleClassEnumerablePrivateGetEnumerator[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassEnumerablePrivateGetEnumerator[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_Object_NoMatchingAddMethod ()

-		{

-			Map (typeof (ObjectCollectionNoMatchingAddMethod));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_Object_NoMatchingAddMethod_Array ()

-		{

-			Map (typeof (ObjectCollectionNoMatchingAddMethod[]));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_SimpleClass_NoMatchingAddMethod ()

-		{

-			Map (typeof (SimpleClassCollectionNoMatchingAddMethod));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_SimpleClass_NoMatchingAddMethod_Array ()

-		{

-			Map (typeof (SimpleClassCollectionNoMatchingAddMethod[]));

-		}

-

-		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TypeMapping_ICollection_SimpleClass ()

-		{

-			XmlTypeMapping tm = Map (typeof (SimpleClassCollection));

-			Assert.AreEqual ("ArrayOfSimpleClass", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("SimpleClassCollection", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassCollection", tm.TypeFullName, "#4");

-

-			tm = Map (typeof (SimpleClassCollection[]));

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClass", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfSimpleClassCollection", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("SimpleClassCollection[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassCollection[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (SimpleClassCollection[][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfSimpleClassCollection", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("SimpleClassCollection[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassCollection[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (SimpleClassCollection[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfArrayOfSimpleClass", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfSimpleClassCollection", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("SimpleClassCollection[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.SimpleClassCollection[][][]", tm.TypeFullName, "#C4");

+			AssertEquals("int", tm.ElementName);

+			AssertEquals(SomeNamespace, tm.Namespace);

+			AssertEquals("Int32", tm.TypeName);

+			AssertEquals("System.Int32", tm.TypeFullName);

 		}

 

 		[Test]

-#if NET_2_0

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

-#endif

-		public void TypeMapping_ICollection_Object ()

+		public void TestValidClassTypeMapping()

 		{

-			XmlTypeMapping tm = Map (typeof (ObjectCollection));

-			Assert.AreEqual ("ArrayOfAnyType", tm.ElementName, "#1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#2");

-			Assert.AreEqual ("ObjectCollection", tm.TypeName, "#3");

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectCollection", tm.TypeFullName, "#4");

-

-			tm = Map (typeof (ObjectCollection[]));

-			Assert.AreEqual ("ArrayOfArrayOfAnyType", tm.ElementName, "#A1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#A2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfObjectCollection", tm.TypeName, "#A3");

-#else

-			Assert.AreEqual ("ObjectCollection[]", tm.TypeName, "#A3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectCollection[]", tm.TypeFullName, "#A4");

-

-			tm = Map (typeof (ObjectCollection[][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#B1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#B2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfObjectCollection", tm.TypeName, "#B3");

-#else

-			Assert.AreEqual ("ObjectCollection[][]", tm.TypeName, "#B3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectCollection[][]", tm.TypeFullName, "#B4");

-

-			tm = Map (typeof (ObjectCollection[][][]));

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfArrayOfAnyType", tm.ElementName, "#C1");

-			Assert.AreEqual (string.Empty, tm.Namespace, "#C2");

-#if NET_2_0

-			Assert.AreEqual ("ArrayOfArrayOfArrayOfObjectCollection", tm.TypeName, "#C3");

-#else

-			Assert.AreEqual ("ObjectCollection[][][]", tm.TypeName, "#C3");

-#endif

-			Assert.AreEqual ("MonoTests.System.XmlSerialization.XmlReflectionImporterTests.ObjectCollection[][][]", tm.TypeFullName, "#C4");

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_Object_NoIntIndexer ()

-		{

-			Map (typeof (ObjectCollectionNoIntIndexer));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_Object_NoIntIndexer_Array ()

-		{

-			Map (typeof (ObjectCollectionNoIntIndexer[]));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_SimpleClass_NoIntIndexer ()

-		{

-			Map (typeof (SimpleClassCollectionNoIntIndexer));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TypeMapping_ICollection_SimpleClass_NoIntIndexer_Array ()

-		{

-			Map (typeof (SimpleClassCollectionNoIntIndexer[]));

-		}

-

-		[Test]

-		[ExpectedException (typeof (InvalidOperationException))] 

-		public void TypeMapping_WrongChoices ()

-		{

-			// Type MonoTests.System.Xml.TestClasses.ItemChoiceType is missing 

-			// enumeration value 'StrangeOne' for element 'StrangeOne' from

-			// namespace ''.

-			Map (typeof (WrongChoices));

+			Type type = typeof(SimpleClass);

+			XmlAttributes attrs = new  XmlAttributes();

+			XmlAttributeOverrides overrides = new XmlAttributeOverrides();

+			overrides.Add(typeof(SimpleClass), attrs);

+			

+			XmlTypeMapping tm = Map(type, overrides);

+			AssertEquals("SimpleClass", tm.ElementName);

+			AssertEquals("", tm.Namespace);

+			AssertEquals("SimpleClass", tm.TypeName);

+			AssertEquals("MonoTests.System.Xml.TestClasses.SimpleClass", tm.TypeFullName);

 		}

 

+		

 		[Test]

-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn

+		[Category ("NotWorking")]

 		public void TestImportMembersMapping()

 		{

 			Type type = typeof(SimpleClass);

@@ -1260,7 +378,7 @@ namespace MonoTests.System.XmlSerialization
 			try

 			{

 				mm = MembersMap(type, overrides, members, true);

-				Assert.Fail("Should not be able to fetch an empty XmlMembersMapping");

+				Fail("Should not be able to fetch an empty XmlMembersMapping");

 			}

 			catch (Exception)

 			{

@@ -1278,18 +396,15 @@ namespace MonoTests.System.XmlSerialization
 			Equals(mm.Count, 1);

 

 			XmlMemberMapping smm = mm[0];

-			Assert.IsFalse (smm.Any, "#1");

-			Assert.AreEqual ("something", smm.ElementName, "#2");

-			Assert.AreEqual ("something", smm.MemberName, "#3");

-			Assert.IsNull (smm.Namespace, "#4");

-			Assert.AreEqual ("System.String", smm.TypeFullName, "#5");

-			Assert.AreEqual ("string", smm.TypeName, "#6");

-#if NET_2_0

-			Assert.AreEqual (XmlSchemaNamespace, smm.TypeNamespace, "#7");

-#else

-			Assert.IsNull (smm.TypeNamespace, "#7");

-#endif

+			AssertEquals(false, smm.Any);

+			AssertEquals("something", smm.ElementName);

+			AssertEquals("something", smm.MemberName);

+			AssertEquals(null, smm.Namespace);

+			AssertEquals("System.String", smm.TypeFullName);

+			AssertEquals("string", smm.TypeName);

+			AssertEquals(null, smm.TypeNamespace);

 

+			

 			rm = new XmlReflectionMember();

 			rm.IsReturnValue = false;

 			rm.MemberName = "nothing";

@@ -1298,7 +413,7 @@ namespace MonoTests.System.XmlSerialization
 			members[0] = rm;

 

 			mm = MembersMap(type, overrides, members, false);

-			Assert.AreEqual (1, mm.Count, "#8");

+			Equals(mm.Count, 0);

 		}

 

 		[Test]

@@ -1309,10 +424,10 @@ namespace MonoTests.System.XmlSerialization
 			root.Namespace = TheNamespace;

 			

 			XmlTypeMapping tm = Map(typeof(int), root);

-			Assert.AreEqual ("price", tm.ElementName, "#1");

-			Assert.AreEqual (TheNamespace, tm.Namespace, "#2");

-			Assert.AreEqual ("Int32", tm.TypeName, "#3");

-			Assert.AreEqual ("System.Int32", tm.TypeFullName, "#4");

+			AssertEquals("price", tm.ElementName);

+			AssertEquals(TheNamespace, tm.Namespace);

+			AssertEquals("Int32", tm.TypeName);

+			AssertEquals("System.Int32", tm.TypeFullName);

 		}

 		

 		[Test]

@@ -1321,472 +436,6 @@ namespace MonoTests.System.XmlSerialization
 		{

 			new XmlSerializer (typeof(WrongChoices));

 		}

-

-		public class Employee : IXmlSerializable

-		{

-			private string _firstName;

-			private string _lastName;

-			private string _address;

-

-			public XmlSchema GetSchema ()

-			{

-				return null;

-			}

-

-			public void WriteXml (XmlWriter writer)

-			{

-				writer.WriteStartElement ("employee", "urn:devx-com");

-				writer.WriteAttributeString ("firstName", _firstName);

-				writer.WriteAttributeString ("lastName", _lastName);

-				writer.WriteAttributeString ("address", _address);

-				writer.WriteEndElement ();

-			}

-

-			public void ReadXml (XmlReader reader)

-			{

-				XmlNodeType type = reader.MoveToContent ();

-				if (type == XmlNodeType.Element && reader.LocalName == "employee") {

-					_firstName = reader["firstName"];

-					_lastName = reader["lastName"];

-					_address = reader["address"];

-				}

-			}

-		}

-

-		public class NestedStruct

-		{

-			public TimeSpan Period = TimeSpan.MaxValue;

-		}

-

-		public class ObjectEnumerable : IEnumerable

-		{

-			public void Add (int value)

-			{

-			}

-

-			public void Add (object value)

-			{

-			}

-

-			public IEnumerator GetEnumerator ()

-			{

-				return new ArrayList ().GetEnumerator ();

-			}

-		}

-

-		public class SimpleClassEnumerable : IEnumerable

-		{

-			public void Add (int value)

-			{

-			}

-

-			public void Add (object value)

-			{

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return GetEnumerator ();

-			}

-

-			public SimpleClassEnumerator GetEnumerator ()

-			{

-				return new SimpleClassEnumerator (new ArrayList ());

-			}

-		}

-

-		public class SimpleClassEnumerablePrivateGetEnumerator : IEnumerable

-		{

-			public void Add (object value)

-			{

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return new ArrayList ().GetEnumerator ();

-			}

-		}

-

-		public class SimpleClassEnumerablePrivateCurrent : IEnumerable

-		{

-			public void Add (object value)

-			{

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return GetEnumerator ();

-			}

-

-			public NoCurrentEnumerator GetEnumerator ()

-			{

-				return new NoCurrentEnumerator (new ArrayList ());

-			}

-		}

-

-		// GetEnumerator().Current returns object, but there's no corresponding

-		// Add (System.Object) method

-		public class ObjectEnumerableNoMatchingAddMethod : IEnumerable

-		{

-			public void Add (int value)

-			{

-			}

-

-			public IEnumerator GetEnumerator ()

-			{

-				return new ArrayList ().GetEnumerator ();

-			}

-		}

-

-		// GetEnumerator().Current returns SimpleClass, but there's no 

-		// corresponding Add (SimpleClass) method

-		public class SimpleClassCollectionNoMatchingAddMethod : ICollection

-		{

-			public SimpleClass this[int index]

-			{

-				get

-				{

-					return (SimpleClass) _list[index];

-				}

-			}

-

-			public int Count

-			{

-				get { return _list.Count; }

-			}

-

-			public bool IsSynchronized

-			{

-				get { return _list.IsSynchronized; }

-			}

-

-			public object SyncRoot

-			{

-				get { return _list.SyncRoot; }

-			}

-

-			public void CopyTo (Array array, int index)

-			{

-				_list.CopyTo (array, index);

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return GetEnumerator ();

-			}

-

-			public SimpleClassEnumerator GetEnumerator ()

-			{

-				return new SimpleClassEnumerator (_list);

-			}

-

-			private ArrayList _list = new ArrayList ();

-		}

-

-		// GetEnumerator().Current returns object, but there's no corresponding

-		// Add (System.Object) method

-		public class ObjectCollectionNoMatchingAddMethod : ICollection

-		{

-			public object this[int index]

-			{

-				get

-				{

-					return _list[index];

-				}

-			}

-

-			public int Count

-			{

-				get { return _list.Count; }

-			}

-

-			public bool IsSynchronized

-			{

-				get { return _list.IsSynchronized; }

-			}

-

-			public object SyncRoot

-			{

-				get { return _list.SyncRoot; }

-			}

-

-			public void CopyTo (Array array, int index)

-			{

-				_list.CopyTo (array, index);

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return GetEnumerator ();

-			}

-

-			public IEnumerator GetEnumerator ()

-			{

-				return _list.GetEnumerator ();

-			}

-

-			private ArrayList _list = new ArrayList ();

-		}

-

-		// Does not have int indexer.

-		public class SimpleClassCollectionNoIntIndexer : ICollection

-		{

-			public SimpleClass this[string name]

-			{

-				get

-				{

-					return new SimpleClass ();

-				}

-			}

-

-			public int Count

-			{

-				get { return _list.Count; }

-			}

-

-			public bool IsSynchronized

-			{

-				get { return _list.IsSynchronized; }

-			}

-

-			public object SyncRoot

-			{

-				get { return _list.SyncRoot; }

-			}

-

-			public void CopyTo (Array array, int index)

-			{

-				_list.CopyTo (array, index);

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return GetEnumerator ();

-			}

-

-			public SimpleClassEnumerator GetEnumerator ()

-			{

-				return new SimpleClassEnumerator (_list);

-			}

-

-			public void Add (SimpleClass value)

-			{

-				_list.Add (value);

-			}

-

-			private ArrayList _list = new ArrayList ();

-		}

-

-		// Does not have int indexer.

-		public class ObjectCollectionNoIntIndexer : ICollection

-		{

-			public object this[string name]

-			{

-				get

-				{

-					return new SimpleClass ();

-				}

-			}

-

-			public int Count

-			{

-				get { return _list.Count; }

-			}

-

-			public bool IsSynchronized

-			{

-				get { return _list.IsSynchronized; }

-			}

-

-			public object SyncRoot

-			{

-				get { return _list.SyncRoot; }

-			}

-

-			public void CopyTo (Array array, int index)

-			{

-				_list.CopyTo (array, index);

-			}

-

-			public IEnumerator GetEnumerator ()

-			{

-				return _list.GetEnumerator ();

-			}

-

-			public void Add (object value)

-			{

-				_list.Add (value);

-			}

-

-			private ArrayList _list = new ArrayList ();

-		}

-

-		public class SimpleClassCollection : ICollection

-		{

-			public SimpleClass this[int index]

-			{

-				get

-				{

-					return (SimpleClass) _list[index];

-				}

-			}

-

-			public int Count

-			{

-				get { return _list.Count; }

-			}

-

-			public bool IsSynchronized

-			{

-				get { return _list.IsSynchronized; }

-			}

-

-			public object SyncRoot

-			{

-				get { return _list.SyncRoot; }

-			}

-

-			public void CopyTo (Array array, int index)

-			{

-				_list.CopyTo (array, index);

-			}

-

-			IEnumerator IEnumerable.GetEnumerator ()

-			{

-				return GetEnumerator ();

-			}

-

-			public SimpleClassEnumerator GetEnumerator ()

-			{

-				return new SimpleClassEnumerator (_list);

-			}

-

-			public void Add (SimpleClass value)

-			{

-				_list.Add (value);

-			}

-

-			private ArrayList _list = new ArrayList ();

-		}

-

-		public class ObjectCollection : ICollection

-		{

-			public object this[int name]

-			{

-				get

-				{

-					return new SimpleClass ();

-				}

-			}

-

-			public int Count

-			{

-				get { return _list.Count; }

-			}

-

-			public bool IsSynchronized

-			{

-				get { return _list.IsSynchronized; }

-			}

-

-			public object SyncRoot

-			{

-				get { return _list.SyncRoot; }

-			}

-

-			public void CopyTo (Array array, int index)

-			{

-				_list.CopyTo (array, index);

-			}

-

-			public IEnumerator GetEnumerator ()

-			{

-				return _list.GetEnumerator ();

-			}

-

-			public void Add (object value)

-			{

-				_list.Add (value);

-			}

-

-			private ArrayList _list = new ArrayList ();

-		}

-

-		public class SimpleClassEnumerator : IEnumerator

-		{

-			internal SimpleClassEnumerator (ArrayList arguments)

-			{

-				IEnumerable temp = (IEnumerable) (arguments);

-				_baseEnumerator = temp.GetEnumerator ();

-			}

-			public SimpleClass Current

-			{

-				get { return (SimpleClass) _baseEnumerator.Current; }

-			}

-

-			object IEnumerator.Current

-			{

-				get { return _baseEnumerator.Current; }

-			}

-

-			public bool MoveNext ()

-			{

-				return _baseEnumerator.MoveNext ();

-			}

-

-			bool IEnumerator.MoveNext ()

-			{

-				return _baseEnumerator.MoveNext ();

-			}

-

-			public void Reset ()

-			{

-				_baseEnumerator.Reset ();

-			}

-

-			void IEnumerator.Reset ()

-			{

-				_baseEnumerator.Reset ();

-			}

-

-			private IEnumerator _baseEnumerator;

-		}

-

-		public class NoCurrentEnumerator : IEnumerator

-		{

-			internal NoCurrentEnumerator (ArrayList arguments)

-			{

-				IEnumerable temp = (IEnumerable) (arguments);

-				_baseEnumerator = temp.GetEnumerator ();

-			}

-

-			object IEnumerator.Current

-			{

-				get { return _baseEnumerator.Current; }

-			}

-

-			public bool MoveNext ()

-			{

-				return _baseEnumerator.MoveNext ();

-			}

-

-			bool IEnumerator.MoveNext ()

-			{

-				return _baseEnumerator.MoveNext ();

-			}

-

-			public void Reset ()

-			{

-				_baseEnumerator.Reset ();

-			}

-

-			void IEnumerator.Reset ()

-			{

-				_baseEnumerator.Reset ();

-			}

-

-			private IEnumerator _baseEnumerator;

-		}

 	}

 }

 

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs
index 9d14244b4c2..0f225fc4f7b 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs
@@ -24,41 +24,16 @@ namespace MonoTests.System.XmlSerialization
 	[TestFixture]
 	public class XmlSchemaExporterTests
 	{
-		private XmlSchemas Export (Type type)
-		{
-			return Export (type, string.Empty);
-		}
-
-		private XmlSchemas Export (Type type, string defaultNamespace)
-		{
-			XmlReflectionImporter ri = new XmlReflectionImporter (defaultNamespace);
-			XmlSchemas schemas = new XmlSchemas ();
-			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
-			XmlTypeMapping tm = ri.ImportTypeMapping (type);
-			sx.ExportTypeMapping (tm);
-			return schemas;
-		}
-
-		private XmlSchemas Export (Type type, XmlAttributeOverrides overrides)
-		{
-			return Export (type, overrides, string.Empty);
-		}
-
-		private XmlSchemas Export (Type type, XmlAttributeOverrides overrides, string defaultNamespace)
+		[Test]
+		[Category ("NotWorking")] // on Mono, element is output before type
+		public void ExportStruct ()
 		{
-			XmlReflectionImporter ri = new XmlReflectionImporter (overrides, defaultNamespace);
+			XmlReflectionImporter ri = new XmlReflectionImporter ("NSTimeSpan");
 			XmlSchemas schemas = new XmlSchemas ();
 			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
-			XmlTypeMapping tm = ri.ImportTypeMapping (type);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (TimeSpan));
 			sx.ExportTypeMapping (tm);
-			return schemas;
-		}
 
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportStruct ()
-		{
-			XmlSchemas schemas = Export (typeof (TimeSpan), "NSTimeSpan");
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -70,27 +45,18 @@ namespace MonoTests.System.XmlSerialization
 				"  <xs:element name=\"TimeSpan\" type=\"tns:TimeSpan\" />{0}" +
 				"  <xs:complexType name=\"TimeSpan\" />{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (TimeSpan));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"TimeSpan\" type=\"TimeSpan\" />{0}" +
-				"  <xs:complexType name=\"TimeSpan\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // on Mono, element is output before type
 		public void ExportStruct_Array ()
 		{
-			XmlSchemas schemas = Export (typeof (TimeSpan[]), "NSTimeSpanArray");
+			XmlReflectionImporter ri = new XmlReflectionImporter ("NSTimeSpanArray");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (TimeSpan[]));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -99,38 +65,19 @@ namespace MonoTests.System.XmlSerialization
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
 				"<xs:schema xmlns:tns=\"NSTimeSpanArray\" elementFormDefault=\"qualified\" targetNamespace=\"NSTimeSpanArray\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfTimeSpan\" type=\"tns:ArrayOfTimeSpan\" />{0}" +
+				"  <xs:element name=\"ArrayOfTimeSpan\" nillable=\"true\" type=\"tns:ArrayOfTimeSpan\" />{0}" +
 				"  <xs:complexType name=\"ArrayOfTimeSpan\">{0}" +
 				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"TimeSpan\" nillable=\"true\" type=\"tns:TimeSpan\" />{0}" +
+				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"TimeSpan\" type=\"tns:TimeSpan\" />{0}" +
 				"    </xs:sequence>{0}" +
 				"  </xs:complexType>{0}" +
 				"  <xs:complexType name=\"TimeSpan\" />{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (TimeSpan[]));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfTimeSpan\" type=\"ArrayOfTimeSpan\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfTimeSpan\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"TimeSpan\" nillable=\"true\" type=\"TimeSpan\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"TimeSpan\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_SimpleClass ()
+		[Category ("NotWorking")] // on Mono, element is output before type
+		public void ExportClass ()
 		{
 			XmlAttributeOverrides overrides = new XmlAttributeOverrides ();
 			XmlAttributes attr = new XmlAttributes ();
@@ -140,735 +87,12 @@ namespace MonoTests.System.XmlSerialization
 			attr.XmlElements.Add (element);
 			overrides.Add (typeof (SimpleClass), "something", attr);
 
-			XmlSchemas schemas = Export (typeof (SimpleClass), overrides, "NSSimpleClass");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSSimpleClass\" elementFormDefault=\"qualified\" targetNamespace=\"NSSimpleClass\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"SimpleClass\" type=\"tns:SimpleClass\" />{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"saying\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (SimpleClass), overrides);
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"SimpleClass\" type=\"SimpleClass\" />{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"saying\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_StringCollection ()
-		{
-			XmlSchemas schemas = Export (typeof (StringCollection), "NSStringCollection");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSStringCollection\" elementFormDefault=\"qualified\" targetNamespace=\"NSStringCollection\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfString\" type=\"tns:ArrayOfString\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"string\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (StringCollection));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfString\" type=\"ArrayOfString\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"string\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_StringCollectionContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (StringCollectionContainer), "NSStringCollectionContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSStringCollectionContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSStringCollectionContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"StringCollectionContainer\" type=\"tns:StringCollectionContainer\" />{0}" +
-				"  <xs:complexType name=\"StringCollectionContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Messages\" type=\"tns:ArrayOfString\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"string\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (StringCollectionContainer));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"StringCollectionContainer\" type=\"StringCollectionContainer\" />{0}" +
-				"  <xs:complexType name=\"StringCollectionContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Messages\" type=\"ArrayOfString\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"string\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ArrayContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (ArrayContainer), "NSArrayContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSArrayContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSArrayContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayContainer\" type=\"tns:ArrayContainer\" />{0}" +
-				"  <xs:complexType name=\"ArrayContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (ArrayContainer));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayContainer\" type=\"ArrayContainer\" />{0}" +
-				"  <xs:complexType name=\"ArrayContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"items\" type=\"ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ClassArrayContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (ClassArrayContainer), "NSClassArrayContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSClassArrayContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSClassArrayContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ClassArrayContainer\" type=\"tns:ClassArrayContainer\" />{0}" +
-				"  <xs:complexType name=\"ClassArrayContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"items\" type=\"tns:ArrayOfSimpleClass\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfSimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"SimpleClass\" nillable=\"true\" type=\"tns:SimpleClass\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (ClassArrayContainer));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ClassArrayContainer\" type=\"ClassArrayContainer\" />{0}" +
-				"  <xs:complexType name=\"ClassArrayContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"items\" type=\"ArrayOfSimpleClass\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfSimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"SimpleClass\" nillable=\"true\" type=\"SimpleClass\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_SimpleClassWithXmlAttributes ()
-		{
-			XmlSchemas schemas = Export (typeof (SimpleClassWithXmlAttributes), "NSSimpleClassWithXmlAttributes");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSSimpleClassWithXmlAttributes\" elementFormDefault=\"qualified\" targetNamespace=\"NSSimpleClassWithXmlAttributes\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"simple\" type=\"tns:SimpleClassWithXmlAttributes\" />{0}" +
-				"  <xs:complexType name=\"SimpleClassWithXmlAttributes\">{0}" +
-				"    <xs:attribute name=\"member\" type=\"xs:string\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (SimpleClassWithXmlAttributes));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"simple\" type=\"SimpleClassWithXmlAttributes\" />{0}" +
-				"  <xs:complexType name=\"SimpleClassWithXmlAttributes\">{0}" +
-				"    <xs:attribute name=\"member\" type=\"xs:string\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono does not translate default values to corresponding enum fields
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Field ()
-		{
-			XmlSchemas schemas = Export (typeof (Field), "NSField");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSField\" elementFormDefault=\"qualified\" targetNamespace=\"NSField\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"field\" type=\"tns:Field\" />{0}" +
-				"  <xs:complexType name=\"Field\">{0}" +
-				"    <xs:attribute name=\"modifiers\" type=\"tns:MapModifiers\" use=\"required\" />{0}" +
-				"    <xs:attribute form=\"unqualified\" name=\"modifiers2\" type=\"tns:MapModifiers\" use=\"required\" />{0}" +
-				"    <xs:attribute default=\"0\" name=\"modifiers3\" type=\"tns:MapModifiers\" />{0}" +
-				"    <xs:attribute default=\"0\" form=\"unqualified\" name=\"modifiers4\" type=\"tns:MapModifiers\" />{0}" +
-				"    <xs:attribute name=\"names\">{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:list itemType=\"xs:string\" />{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:attribute>{0}" +
-				"    <xs:attribute name=\"street\" type=\"xs:string\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"MapModifiers\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"public\" />{0}" +
-				"          <xs:enumeration value=\"protected\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (Field));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"field\" type=\"Field\" />{0}" +
-				"  <xs:complexType name=\"Field\">{0}" +
-				"    <xs:attribute name=\"modifiers\" type=\"MapModifiers\" use=\"required\" />{0}" +
-				"    <xs:attribute form=\"unqualified\" name=\"modifiers2\" type=\"MapModifiers\" use=\"required\" />{0}" +
-				"    <xs:attribute default=\"0\" name=\"modifiers3\" type=\"MapModifiers\" />{0}" +
-				"    <xs:attribute default=\"0\" form=\"unqualified\" name=\"modifiers4\" type=\"MapModifiers\" />{0}" +
-				"    <xs:attribute name=\"names\">{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:list itemType=\"xs:string\" />{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:attribute>{0}" +
-				"    <xs:attribute name=\"street\" type=\"xs:string\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"MapModifiers\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"public\" />{0}" +
-				"          <xs:enumeration value=\"protected\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_MyList ()
-		{
-			XmlSchemas schemas = Export (typeof (MyList), "NSMyList");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSMyList\" elementFormDefault=\"qualified\" targetNamespace=\"NSMyList\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfAnyType\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (MyList));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfAnyType\" type=\"ArrayOfAnyType\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Container ()
-		{
-			XmlSchemas schemas = Export (typeof (Container), "NSContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Container\" type=\"tns:Container\" />{0}" +
-				"  <xs:complexType name=\"Container\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (Container));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Container\" type=\"Container\" />{0}" +
-				"  <xs:complexType name=\"Container\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Items\" type=\"ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_Container2 ()
-		{
-			XmlSchemas schemas = Export (typeof (Container2), "NSContainer2");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSContainer2\" elementFormDefault=\"qualified\" targetNamespace=\"NSContainer2\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Container2\" type=\"tns:Container2\" />{0}" +
-				"  <xs:complexType name=\"Container2\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Items\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (Container2));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Container2\" type=\"Container2\" />{0}" +
-				"  <xs:complexType name=\"Container2\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Items\" type=\"ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		[ExpectedException (typeof (InvalidOperationException))] // Cannot use wildcards at the top level of a schema.
-		public void ExportClass_MyElem ()
-		{
-			Export (typeof (MyElem), "NSMyElem");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_CDataContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (CDataContainer), "NSCDataContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSCDataContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSCDataContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"CDataContainer\" type=\"tns:CDataContainer\" />{0}" +
-				"  <xs:complexType name=\"CDataContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"cdata\">{0}" +
-				"        <xs:complexType mixed=\"true\">{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (CDataContainer));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"CDataContainer\" type=\"CDataContainer\" />{0}" +
-				"  <xs:complexType name=\"CDataContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"cdata\">{0}" +
-				"        <xs:complexType mixed=\"true\">{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_NodeContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (NodeContainer), "NSNodeContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSNodeContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSNodeContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"NodeContainer\" type=\"tns:NodeContainer\" />{0}" +
-				"  <xs:complexType name=\"NodeContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"node\">{0}" +
-				"        <xs:complexType mixed=\"true\">{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (NodeContainer));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"NodeContainer\" type=\"NodeContainer\" />{0}" +
-				"  <xs:complexType name=\"NodeContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"node\">{0}" +
-				"        <xs:complexType mixed=\"true\">{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // Mono does not generate the <xs:choice> node
-		[Category ("NotDotNet")] // Mono bug ##77117 and MS.NET randomly modifies the order of the elements!
-		public void ExportClass_Choices ()
-		{
-			XmlSchemas schemas = Export (typeof (Choices), "NSChoices");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSChoices\" elementFormDefault=\"qualified\" targetNamespace=\"NSChoices\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Choices\" type=\"tns:Choices\" />{0}" +
-				"  <xs:complexType name=\"Choices\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:choice minOccurs=\"1\" maxOccurs=\"1\">{0}" +
-				"        <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ChoiceOne\" type=\"xs:string\" />{0}" +
-				"        <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ChoiceTwo\" type=\"xs:string\" />{0}" +
-				"        <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ChoiceZero\" type=\"xs:string\" />{0}" +
-				"      </xs:choice>{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (Choices));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Choices\" type=\"Choices\" />{0}" +
-				"  <xs:complexType name=\"Choices\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:choice minOccurs=\"1\" maxOccurs=\"1\">{0}" +
-				"        <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ChoiceOne\" type=\"xs:string\" />{0}" +
-				"        <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ChoiceTwo\" type=\"xs:string\" />{0}" +
-				"        <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ChoiceZero\" type=\"xs:string\" />{0}" +
-				"      </xs:choice>{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-#if ONLY_1_1
-		[Category ("NotDotNet")] // MS.NET 1.x does not escape spaces in a type name, bug is fixed in .NET 2.0
-#else
-		[Category ("NotDotNet")] // Mono bug ##77117
-#endif
-		public void ExportClass_TestSpace ()
-		{
-			XmlSchemas schemas = Export (typeof (TestSpace), "NSTestSpace");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSTestSpace\" elementFormDefault=\"qualified\" targetNamespace=\"NSTestSpace\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Type_x0020_with_x0020_space\" type=\"tns:Type_x0020_with_x0020_space\" />{0}" +
-				"  <xs:complexType name=\"Type_x0020_with_x0020_space\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Element_x0020_with_x0020_space\" type=\"xs:int\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"    <xs:attribute name=\"Attribute_x0020_with_x0020_space\" type=\"xs:int\" use=\"required\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (TestSpace));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"Type_x0020_with_x0020_space\" type=\"Type_x0020_with_x0020_space\" />{0}" +
-				"  <xs:complexType name=\"Type_x0020_with_x0020_space\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Element_x0020_with_x0020_space\" type=\"xs:int\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"    <xs:attribute name=\"Attribute_x0020_with_x0020_space\" type=\"xs:int\" use=\"required\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ReadOnlyProperties ()
-		{
-			XmlSchemas schemas = Export (typeof (ReadOnlyProperties), "NSReadOnlyProperties");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSReadOnlyProperties\" elementFormDefault=\"qualified\" targetNamespace=\"NSReadOnlyProperties\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ReadOnlyProperties\" type=\"tns:ReadOnlyProperties\" />{0}" +
-				"  <xs:complexType name=\"ReadOnlyProperties\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (ReadOnlyProperties));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ReadOnlyProperties\" type=\"ReadOnlyProperties\" />{0}" +
-				"  <xs:complexType name=\"ReadOnlyProperties\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
+			XmlReflectionImporter ri = new XmlReflectionImporter (overrides, "NS1");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (SimpleClass));
+			sx.ExportTypeMapping (tm);
 
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ListDefaults ()
-		{
-			XmlSchemas schemas = Export (typeof (ListDefaults), "NSListDefaults");
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -876,250 +100,18 @@ namespace MonoTests.System.XmlSerialization
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSListDefaults\" elementFormDefault=\"qualified\" targetNamespace=\"NSListDefaults\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"root\" type=\"tns:ListDefaults\" />{0}" +
-				"  <xs:complexType name=\"ListDefaults\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"list2\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"list3\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"list4\" type=\"tns:ArrayOfString\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"e\" type=\"tns:SimpleClass\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ed\" type=\"tns:SimpleClass\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"str\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"string\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (ListDefaults));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"root\" type=\"ListDefaults\" />{0}" +
-				"  <xs:complexType name=\"ListDefaults\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"list2\" type=\"ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"list3\" type=\"ArrayOfAnyType\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"list4\" type=\"ArrayOfString\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"e\" type=\"SimpleClass\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"ed\" type=\"SimpleClass\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"str\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfString\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"string\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
+				"<xs:schema xmlns:tns=\"NS1\" elementFormDefault=\"qualified\" targetNamespace=\"NS1\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
+				"  <xs:element name=\"SimpleClass\" nillable=\"true\" type=\"tns:SimpleClass\" />{0}" +
 				"  <xs:complexType name=\"SimpleClass\">{0}" +
 				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"something\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ClsPerson ()
-		{
-			XmlSchemas schemas = Export (typeof (clsPerson), "NSClsPerson");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSClsPerson\" elementFormDefault=\"qualified\" targetNamespace=\"NSClsPerson\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"clsPerson\" type=\"tns:clsPerson\" />{0}" +
-				"  <xs:complexType name=\"clsPerson\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"EmailAccounts\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (clsPerson));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"clsPerson\" type=\"clsPerson\" />{0}" +
-				"  <xs:complexType name=\"clsPerson\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"EmailAccounts\" type=\"ArrayOfAnyType\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_ArrayClass ()
-		{
-			XmlSchemas schemas = Export (typeof (ArrayClass), "NSArrayClass");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSArrayClass\" elementFormDefault=\"qualified\" targetNamespace=\"NSArrayClass\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayClass\" type=\"tns:ArrayClass\" />{0}" +
-				"  <xs:complexType name=\"ArrayClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"names\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-
-			schemas = Export (typeof (ArrayClass));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayClass\" type=\"ArrayClass\" />{0}" +
-				"  <xs:complexType name=\"ArrayClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"names\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportClass_StructContainer ()
-		{
-			XmlSchemas schemas = Export (typeof (StructContainer), "NSStructContainer");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSStructContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSStructContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"StructContainer\" type=\"tns:StructContainer\" />{0}" +
-				"  <xs:complexType name=\"StructContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Value\" type=\"tns:EnumDefaultValue\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Times\" type=\"tns:ArrayOfTimeSpan\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"EnumDefaultValue\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"e1\" />{0}" +
-				"          <xs:enumeration value=\"e2\" />{0}" +
-				"          <xs:enumeration value=\"e3\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"  <xs:complexType name=\"ArrayOfTimeSpan\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"TimeSpan\" nillable=\"true\" type=\"tns:TimeSpan\" />{0}" +
+				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"saying\" nillable=\"true\" type=\"xs:string\" />{0}" +
 				"    </xs:sequence>{0}" +
 				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"TimeSpan\" />{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (StructContainer));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"StructContainer\" type=\"StructContainer\" />{0}" +
-				"  <xs:complexType name=\"StructContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"Value\" type=\"EnumDefaultValue\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Times\" type=\"ArrayOfTimeSpan\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:simpleType name=\"EnumDefaultValue\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"e1\" />{0}" +
-				"          <xs:enumeration value=\"e2\" />{0}" +
-				"          <xs:enumeration value=\"e3\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"  <xs:complexType name=\"ArrayOfTimeSpan\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"TimeSpan\" nillable=\"true\" type=\"TimeSpan\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"TimeSpan\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		[ExpectedException (typeof (InvalidOperationException))] // Cannot use wildcards at the top level of a schema.
-		public void ExportClass_XmlElement ()
-		{
-			XmlSchemas schemas = Export (typeof (XmlElement), "NS1");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // on Mono, element is output before type
 		public void ExportClass_Array ()
 		{
 			XmlAttributeOverrides overrides = new XmlAttributeOverrides ();
@@ -1130,7 +122,12 @@ namespace MonoTests.System.XmlSerialization
 			attr.XmlElements.Add (element);
 			overrides.Add (typeof (SimpleClass), "something", attr);
 
-			XmlSchemas schemas = Export (typeof (SimpleClass[]), overrides, "NSSimpleClassArray");
+			XmlReflectionImporter ri = new XmlReflectionImporter (overrides, "NSSimpleClassArray");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (SimpleClass[]));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -1139,7 +136,7 @@ namespace MonoTests.System.XmlSerialization
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
 				"<xs:schema xmlns:tns=\"NSSimpleClassArray\" elementFormDefault=\"qualified\" targetNamespace=\"NSSimpleClassArray\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfSimpleClass\" type=\"tns:ArrayOfSimpleClass\" />{0}" +
+				"  <xs:element name=\"ArrayOfSimpleClass\" nillable=\"true\" type=\"tns:ArrayOfSimpleClass\" />{0}" +
 				"  <xs:complexType name=\"ArrayOfSimpleClass\">{0}" +
 				"    <xs:sequence>{0}" +
 				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"SimpleClass\" nillable=\"true\" type=\"tns:SimpleClass\" />{0}" +
@@ -1151,35 +148,18 @@ namespace MonoTests.System.XmlSerialization
 				"    </xs:sequence>{0}" +
 				"  </xs:complexType>{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (SimpleClass[]), overrides);
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfSimpleClass\" type=\"ArrayOfSimpleClass\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfSimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"SimpleClass\" nillable=\"true\" type=\"SimpleClass\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:complexType name=\"SimpleClass\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"1\" maxOccurs=\"1\" name=\"saying\" nillable=\"true\" type=\"xs:string\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // on Mono, element is output before type
 		public void ExportEnum ()
 		{
-			XmlSchemas schemas = Export (typeof (EnumDefaultValue), "NSEnumDefaultValue");
+			XmlReflectionImporter ri = new XmlReflectionImporter ("NS2");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (EnumDefaultValue));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -1187,7 +167,7 @@ namespace MonoTests.System.XmlSerialization
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSEnumDefaultValue\" elementFormDefault=\"qualified\" targetNamespace=\"NSEnumDefaultValue\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
+				"<xs:schema xmlns:tns=\"NS2\" elementFormDefault=\"qualified\" targetNamespace=\"NS2\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
 				"  <xs:element name=\"EnumDefaultValue\" type=\"tns:EnumDefaultValue\" />{0}" +
 				"  <xs:simpleType name=\"EnumDefaultValue\">{0}" +
 				"    <xs:list>{0}" +
@@ -1201,75 +181,18 @@ namespace MonoTests.System.XmlSerialization
 				"    </xs:list>{0}" +
 				"  </xs:simpleType>{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (EnumDefaultValueNF), "NSEnumDefaultValueNF");
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0; 
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSEnumDefaultValueNF\" elementFormDefault=\"qualified\" targetNamespace=\"NSEnumDefaultValueNF\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"EnumDefaultValueNF\" type=\"tns:EnumDefaultValueNF\" />{0}" +
-				"  <xs:simpleType name=\"EnumDefaultValueNF\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:enumeration value=\"e1\" />{0}" +
-				"      <xs:enumeration value=\"e2\" />{0}" +
-				"      <xs:enumeration value=\"e3\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-
-			schemas = Export (typeof (EnumDefaultValue));
-			Assert.AreEqual (1, schemas.Count, "#5");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"EnumDefaultValue\" type=\"EnumDefaultValue\" />{0}" +
-				"  <xs:simpleType name=\"EnumDefaultValue\">{0}" +
-				"    <xs:list>{0}" +
-				"      <xs:simpleType>{0}" +
-				"        <xs:restriction base=\"xs:string\">{0}" +
-				"          <xs:enumeration value=\"e1\" />{0}" +
-				"          <xs:enumeration value=\"e2\" />{0}" +
-				"          <xs:enumeration value=\"e3\" />{0}" +
-				"        </xs:restriction>{0}" +
-				"      </xs:simpleType>{0}" +
-				"    </xs:list>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#6");
-
-			schemas = Export (typeof (EnumDefaultValueNF));
-			Assert.AreEqual (1, schemas.Count, "#7");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"EnumDefaultValueNF\" type=\"EnumDefaultValueNF\" />{0}" +
-				"  <xs:simpleType name=\"EnumDefaultValueNF\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:enumeration value=\"e1\" />{0}" +
-				"      <xs:enumeration value=\"e2\" />{0}" +
-				"      <xs:enumeration value=\"e3\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#8");
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // on Mono, element is output before type
 		public void ExportXmlSerializable ()
 		{
-			XmlSchemas schemas = Export (typeof (Employee), "NSEmployee");
+			XmlReflectionImporter ri = new XmlReflectionImporter ("NS3");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (Employee));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -1277,9 +200,9 @@ namespace MonoTests.System.XmlSerialization
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSEmployee\" elementFormDefault=\"qualified\" targetNamespace=\"NSEmployee\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
+				"<xs:schema xmlns:tns=\"NS3\" elementFormDefault=\"qualified\" targetNamespace=\"NS3\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
 				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:element name=\"Employee\">{0}" +
+				"  <xs:element name=\"Employee\" nillable=\"true\">{0}" +
 				"    <xs:complexType>{0}" +
 				"      <xs:sequence>{0}" +
 				"        <xs:element ref=\"xs:schema\" />{0}" +
@@ -1289,203 +212,27 @@ namespace MonoTests.System.XmlSerialization
 				"  </xs:element>{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
 
-			schemas = Export (typeof (Employee));
-			Assert.AreEqual (1, schemas.Count, "#3");
+			ri = new XmlReflectionImporter ("NS4");
 
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:element name=\"Employee\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportXmlSerializable_Schema ()
-		{
-			XmlSchemas schemas = Export (typeof (EmployeeSchema), "NSEmployeeSchema");
-			Assert.AreEqual (2, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSEmployeeSchema\" elementFormDefault=\"qualified\" targetNamespace=\"NSEmployeeSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#if ONLY_1_1
-				"  <xs:import namespace=\"urn:types-devx-com\" />{0}" +
-#endif
-				"  <xs:element name=\"EmployeeSchema\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"urn:types-devx-com\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[1].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"urn:types-devx-com\" targetNamespace=\"urn:types-devx-com\" id=\"EmployeeSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:complexType name=\"employeeRoot\">{0}" +
-				"    <xs:attribute name=\"firstName\" />{0}" +
-				"    <xs:attribute name=\"lastName\" />{0}" +
-				"    <xs:attribute name=\"address\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:element name=\"employee\" type=\"tns:employeeRoot\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#3");
-
-			schemas = Export (typeof (EmployeeSchema));
-			Assert.AreEqual (2, schemas.Count, "#4");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#if ONLY_1_1
-				"  <xs:import namespace=\"urn:types-devx-com\" />{0}" +
-#endif
-				"  <xs:element name=\"EmployeeSchema\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"urn:types-devx-com\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#5");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[1].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"urn:types-devx-com\" targetNamespace=\"urn:types-devx-com\" id=\"EmployeeSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:complexType name=\"employeeRoot\">{0}" +
-				"    <xs:attribute name=\"firstName\" />{0}" +
-				"    <xs:attribute name=\"lastName\" />{0}" +
-				"    <xs:attribute name=\"address\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:element name=\"employee\" type=\"tns:employeeRoot\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#6");
-
-			schemas = Export (typeof (PrimitiveSchema), "NSPrimitiveSchema");
-			Assert.AreEqual (2, schemas.Count, "#7");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSPrimitiveSchema\" elementFormDefault=\"qualified\" targetNamespace=\"NSPrimitiveSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"PrimitiveSchema\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#8");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[1].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema id=\"LuckyNumberSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"LuckyNumber\" type=\"xs:int\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#9");
-		}
-
-		[Test]
-		[ExpectedException (typeof (InvalidOperationException))] // Schema Id is missing
-		public void ExportXmlSerializable_MissingID ()
-		{
-			Export (typeof (MissingIDSchema));
-		}
-
-		[ExpectedException (typeof (InvalidOperationException))]
-		public void ExportXmlSerializable_DuplicateNamespace ()
-		{
-			try {
-				Export (typeof (PrimitiveSchema));
-				Assert.Fail ("#1");
-			} catch (InvalidOperationException) {
-				// The namespace, , is a duplicate.
-			}
-
-			try {
-				Export (typeof (XmlSerializableContainer));
-				Assert.Fail ("#2");
-			} catch (InvalidOperationException) {
-				// The namespace, , is a duplicate.
-			}
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-#if NET_2_0
-		[Category ("NotWorking")] // support for XmlSchemaProvider is not implemented
-#endif
-		public void ExportXmlSerializable_SchemaProvider ()
-		{
-			XmlSchemas schemas = Export (typeof (EmployeeSchemaProvider), "NSEmployeeSchemaProvider");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSEmployeeSchemaProvider\" elementFormDefault=\"qualified\" targetNamespace=\"NSEmployeeSchemaProvider\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#if NET_2_0
-				"  <xs:import namespace=\"urn:types-devx-com\" />{0}" +
-				"  <xs:element name=\"employeeRoot\" nillable=\"true\" xmlns:q1=\"urn:types-devx-com\" type=\"q1:employeeRoot\" />{0}" +
-#else
-				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:element name=\"EmployeeSchemaProvider\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
+			schemas = new XmlSchemas ();
+			sx = new XmlSchemaExporter (schemas);
+			tm = ri.ImportTypeMapping (typeof (EmployeeSchema));
+			sx.ExportTypeMapping (tm);
 
-			schemas = Export (typeof (EmployeeSchemaProvider));
 			Assert.AreEqual (1, schemas.Count, "#3");
 
-			sw.GetStringBuilder ().Length = 0;
+			sw = new StringWriter ();
 			schemas[0].Write (sw);
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
+				"<xs:schema xmlns:tns=\"NS4\" elementFormDefault=\"qualified\" targetNamespace=\"NS4\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
 #if NET_2_0
 				"  <xs:import namespace=\"urn:types-devx-com\" />{0}" +
 				"  <xs:element name=\"employeeRoot\" nillable=\"true\" xmlns:q1=\"urn:types-devx-com\" type=\"q1:employeeRoot\" />{0}" +
 #else
 				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:element name=\"EmployeeSchemaProvider\">{0}" +
+				"  <xs:element name=\"EmployeeSchema\" nillable=\"true\">{0}" +
 				"    <xs:complexType>{0}" +
 				"      <xs:sequence>{0}" +
 				"        <xs:element ref=\"xs:schema\" />{0}" +
@@ -1495,275 +242,10 @@ namespace MonoTests.System.XmlSerialization
 				"  </xs:element>{0}" +
 #endif
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-
-			schemas = Export (typeof (PrimitiveSchemaProvider), "NSPrimitiveSchemaProvider");
-			Assert.AreEqual (1, schemas.Count, "#5");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSPrimitiveSchemaProvider\" elementFormDefault=\"qualified\" targetNamespace=\"NSPrimitiveSchemaProvider\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#if NET_2_0
-				"  <xs:import />{0}" +
-				"  <xs:element name=\"int\" nillable=\"true\" type=\"xs:int\" />{0}" +
-#else
-				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:element name=\"PrimitiveSchemaProvider\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#6");
-
-			schemas = Export (typeof (PrimitiveSchemaProvider));
-			Assert.AreEqual (1, schemas.Count, "#7");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-#if NET_2_0
-				"  <xs:element name=\"int\" nillable=\"true\" type=\"xs:int\" />{0}" +
-#else
-				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:element name=\"PrimitiveSchemaProvider\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#8");
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-#if NET_2_0
-		[Category ("NotWorking")] // support for XmlSchemaProvider is not implemented
-#endif
-		public void ExportXmlSerializable_Container ()
-		{
-			XmlSchemas schemas = Export (typeof (XmlSerializableContainer), "NSXmlSerializableContainer");
-			Assert.AreEqual (3, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSXmlSerializableContainer\" elementFormDefault=\"qualified\" targetNamespace=\"NSXmlSerializableContainer\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-				"  <xs:import namespace=\"urn:types-devx-com\" />{0}" +
-#if NET_2_0
-				"  <xs:import />{0}" +
-#endif
-				"  <xs:element name=\"XmlSerializableContainer\" type=\"tns:XmlSerializableContainer\" />{0}" +
-				"  <xs:complexType name=\"XmlSerializableContainer\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"Slave\">{0}" +
-				"        <xs:complexType>{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:element ref=\"xs:schema\" />{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"SlaveSchema\">{0}" +
-				"        <xs:complexType>{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:any namespace=\"urn:types-devx-com\" />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"SlaveSchemaProvider\" xmlns:q1=\"urn:types-devx-com\" type=\"q1:employeeRoot\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"SlaveSchemaProvider\">{0}" +
-				"        <xs:complexType>{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:element ref=\"xs:schema\" />{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-#endif
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"NativeSchema\">{0}" +
-				"        <xs:complexType>{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:any namespace=\"\" />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-#if NET_2_0
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"NativeSchemaProvider\" type=\"xs:int\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q2=\"urn:types-devx-com\" ref=\"q2:SlaveNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q3=\"urn:types-devx-com\" ref=\"q3:SlaveSchemaNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q4=\"urn:types-devx-com\" ref=\"q4:SlaveSchemaProviderNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q5=\"urn:types-devx-com\" ref=\"q5:NativeSchemaNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q6=\"urn:types-devx-com\" ref=\"q6:NativeSchemaProviderNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q7=\"urn:types-devx-com\" ref=\"q7:SlaveNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q8=\"urn:types-devx-com\" ref=\"q8:SlaveSchemaNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q9=\"urn:types-devx-com\" ref=\"q9:SlaveSchemaProviderNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q10=\"urn:types-devx-com\" ref=\"q10:NativeSchemaNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q11=\"urn:types-devx-com\" ref=\"q11:NativeSchemaProviderNSOnly\" />{0}" +
-#else
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" name=\"NativeSchemaProvider\">{0}" +
-				"        <xs:complexType>{0}" +
-				"          <xs:sequence>{0}" +
-				"            <xs:element ref=\"xs:schema\" />{0}" +
-				"            <xs:any />{0}" +
-				"          </xs:sequence>{0}" +
-				"        </xs:complexType>{0}" +
-				"      </xs:element>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q1=\"urn:types-devx-com\" ref=\"q1:SlaveNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q2=\"urn:types-devx-com\" ref=\"q2:SlaveSchemaNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q3=\"urn:types-devx-com\" ref=\"q3:SlaveSchemaProviderNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q4=\"urn:types-devx-com\" ref=\"q4:NativeSchemaNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q5=\"urn:types-devx-com\" ref=\"q5:NativeSchemaProviderNamespace\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q6=\"urn:types-devx-com\" ref=\"q6:SlaveNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q7=\"urn:types-devx-com\" ref=\"q7:SlaveSchemaNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q8=\"urn:types-devx-com\" ref=\"q8:SlaveSchemaProviderNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q9=\"urn:types-devx-com\" ref=\"q9:NativeSchemaNSOnly\" />{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"1\" xmlns:q10=\"urn:types-devx-com\" ref=\"q10:NativeSchemaProviderNSOnly\" />{0}" +
-#endif
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[1].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"urn:types-devx-com\" targetNamespace=\"urn:types-devx-com\" id=\"EmployeeSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:import namespace=\"http://www.w3.org/2001/XMLSchema\" />{0}" +
-#if NET_2_0
-				"  <xs:import />{0}" +
-#endif
-				"  <xs:complexType name=\"employeeRoot\">{0}" +
-				"    <xs:attribute name=\"firstName\" />{0}" +
-				"    <xs:attribute name=\"lastName\" />{0}" +
-				"    <xs:attribute name=\"address\" />{0}" +
-				"  </xs:complexType>{0}" +
-				"  <xs:element name=\"employee\" type=\"tns:employeeRoot\" />{0}" +
-				"  <xs:element name=\"SlaveNamespace\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-				"  <xs:element name=\"SlaveSchemaNamespace\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"urn:types-devx-com\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#if NET_2_0
-				"  <xs:element name=\"SlaveSchemaProviderNamespace\" type=\"tns:employeeRoot\" />{0}" +
-#else
-				"  <xs:element name=\"SlaveSchemaProviderNamespace\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"  <xs:element name=\"NativeSchemaNamespace\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#if NET_2_0
-				"  <xs:element name=\"NativeSchemaProviderNamespace\" type=\"xs:int\" />{0}" +
-#else
-				"  <xs:element name=\"NativeSchemaProviderNamespace\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"  <xs:element name=\"SlaveNSOnly\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-				"  <xs:element name=\"SlaveSchemaNSOnly\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"urn:types-devx-com\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#if NET_2_0
-				 "  <xs:element name=\"SlaveSchemaProviderNSOnly\" type=\"tns:employeeRoot\" />{0}" +
-#else
-				"  <xs:element name=\"SlaveSchemaProviderNSOnly\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"  <xs:element name=\"NativeSchemaNSOnly\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:any namespace=\"\" />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#if NET_2_0
-				"  <xs:element name=\"NativeSchemaProviderNSOnly\" type=\"xs:int\" />{0}" +
-#else
-				"  <xs:element name=\"NativeSchemaProviderNSOnly\">{0}" +
-				"    <xs:complexType>{0}" +
-				"      <xs:sequence>{0}" +
-				"        <xs:element ref=\"xs:schema\" />{0}" +
-				"        <xs:any />{0}" +
-				"      </xs:sequence>{0}" +
-				"    </xs:complexType>{0}" +
-				"  </xs:element>{0}" +
-#endif
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[2].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema id=\"LuckyNumberSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"LuckyNumber\" type=\"xs:int\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // bug #77117
 		public void ExportXsdPrimitive ()
 		{
 			ArrayList types = new ArrayList ();
@@ -1788,7 +270,12 @@ namespace MonoTests.System.XmlSerialization
 			types.Add (new TypeDescription (typeof (string), true, "string", "String", true));
 
 			foreach (TypeDescription typeDesc in types) {
-				XmlSchemas schemas = Export (typeDesc.Type, typeDesc.Type.Name);
+				XmlReflectionImporter ri = new XmlReflectionImporter (typeDesc.Type.Name);
+				XmlSchemas schemas = new XmlSchemas ();
+				XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+				XmlTypeMapping tm = ri.ImportTypeMapping (typeDesc.Type);
+				sx.ExportTypeMapping (tm);
+
 				Assert.AreEqual (1, schemas.Count, typeDesc.Type.FullName + "#1");
 
 				StringWriter sw = new StringWriter ();
@@ -1798,60 +285,21 @@ namespace MonoTests.System.XmlSerialization
 					"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
 					"<xs:schema xmlns:tns=\"{1}\" elementFormDefault=\"qualified\" targetNamespace=\"{1}\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
 					"  <xs:element name=\"{2}\" {3}type=\"xs:{2}\" />{0}" +
-					"</xs:schema>", Environment.NewLine, typeDesc.Type.Name, typeDesc.XmlType, ""),
+					"</xs:schema>", Environment.NewLine, typeDesc.Type.Name, typeDesc.XmlType, typeDesc.IsNillable ? "nillable=\"true\" " : ""),
 					sw.ToString (), typeDesc.Type.FullName + "#2");
-
-				schemas = Export (typeDesc.Type);
-				Assert.AreEqual (1, schemas.Count, typeDesc.Type.FullName + "#3");
-
-				sw.GetStringBuilder ().Length = 0;
-				schemas[0].Write (sw);
-
-				Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-					"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-					"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-					"  <xs:element name=\"{1}\" {2}type=\"xs:{1}\" />{0}" +
-					"</xs:schema>", Environment.NewLine, typeDesc.XmlType, ""),
-					sw.ToString (), typeDesc.Type.FullName + "#4");
 			}
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportXsdPrimitive_Object ()
-		{
-			XmlSchemas schemas = Export (typeof (object), "NSAnyType");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSAnyType\" elementFormDefault=\"qualified\" targetNamespace=\"NSAnyType\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"anyType\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (object));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"anyType\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // bug #77117
 		public void ExportXsdPrimitive_ByteArray ()
 		{
-			XmlSchemas schemas = Export (typeof (byte[]), "NSByteArray");
+			XmlReflectionImporter ri = new XmlReflectionImporter ("ByteArray");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (byte[]));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (1, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -1859,26 +307,13 @@ namespace MonoTests.System.XmlSerialization
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSByteArray\" elementFormDefault=\"qualified\" targetNamespace=\"NSByteArray\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"base64Binary\" type=\"xs:base64Binary\" />{0}" +
+				"<xs:schema xmlns:tns=\"ByteArray\" elementFormDefault=\"qualified\" targetNamespace=\"ByteArray\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
+				"  <xs:element name=\"base64Binary\" nillable=\"true\" type=\"xs:base64Binary\" />{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (byte[]));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"base64Binary\" type=\"xs:base64Binary\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // bug #77117
 		public void ExportXsdPrimitive_Arrays ()
 		{
 			ArrayList types = new ArrayList ();
@@ -1902,7 +337,12 @@ namespace MonoTests.System.XmlSerialization
 			types.Add (new TypeDescription (typeof (string[]), true, "string", "String", true));
 
 			foreach (TypeDescription typeDesc in types) {
-				XmlSchemas schemas = Export (typeDesc.Type, typeDesc.Type.Name);
+				XmlReflectionImporter ri = new XmlReflectionImporter (typeDesc.Type.Name);
+				XmlSchemas schemas = new XmlSchemas ();
+				XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+				XmlTypeMapping tm = ri.ImportTypeMapping (typeDesc.Type);
+				sx.ExportTypeMapping (tm);
+
 				Assert.AreEqual (1, schemas.Count, typeDesc.Type.FullName + "#1");
 
 				StringWriter sw = new StringWriter ();
@@ -1911,7 +351,7 @@ namespace MonoTests.System.XmlSerialization
 				Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
 					"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
 					"<xs:schema xmlns:tns=\"{1}\" elementFormDefault=\"qualified\" targetNamespace=\"{1}\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-					"  <xs:element name=\"ArrayOf{2}\" type=\"tns:ArrayOf{2}\" />{0}" +
+					"  <xs:element name=\"ArrayOf{2}\" nillable=\"true\" type=\"tns:ArrayOf{2}\" />{0}" +
 					"  <xs:complexType name=\"ArrayOf{2}\">{0}" +
 					"    <xs:sequence>{0}" +
 					"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"{3}\" {5}type=\"{4}:{3}\" />{0}" +
@@ -1920,73 +360,19 @@ namespace MonoTests.System.XmlSerialization
 					"</xs:schema>", Environment.NewLine, typeDesc.Type.Name, typeDesc.ArrayType, typeDesc.XmlType, 
 					typeDesc.XsdType ? "xs" : "tns", typeDesc.IsNillable ? "nillable=\"true\" " : ""),
 					sw.ToString (), typeDesc.Type.FullName + "#2");
-
-				schemas = Export (typeDesc.Type);
-				Assert.AreEqual (1, schemas.Count, typeDesc.Type.FullName + "#3");
-
-				sw.GetStringBuilder ().Length = 0;
-				schemas[0].Write (sw);
-
-				Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-					"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-					"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-					"  <xs:element name=\"ArrayOf{1}\" type=\"ArrayOf{1}\" />{0}" +
-					"  <xs:complexType name=\"ArrayOf{1}\">{0}" +
-					"    <xs:sequence>{0}" +
-					"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"{2}\" {4}type=\"{3}:{2}\" />{0}" +
-					"    </xs:sequence>{0}" +
-					"  </xs:complexType>{0}" +
-					"</xs:schema>", Environment.NewLine, typeDesc.ArrayType, typeDesc.XmlType,
-					typeDesc.XsdType ? "xs" : "tns", typeDesc.IsNillable ? "nillable=\"true\" " : ""),
-					sw.ToString (), typeDesc.Type.FullName + "#4");
 			}
 		}
 
 		[Test]
-		[Category ("NotDotNet")] // Mono bug ##77117
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ExportXsdPrimitive_Object_Arrays ()
-		{
-			XmlSchemas schemas = Export (typeof (object[]), "NSArrayOfAnyType");
-			Assert.AreEqual (1, schemas.Count, "#1");
-
-			StringWriter sw = new StringWriter ();
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"NSArrayOfAnyType\" elementFormDefault=\"qualified\" targetNamespace=\"NSArrayOfAnyType\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfAnyType\" type=\"tns:ArrayOfAnyType\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
-
-			schemas = Export (typeof (object[]));
-			Assert.AreEqual (1, schemas.Count, "#3");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:element name=\"ArrayOfAnyType\" type=\"ArrayOfAnyType\" />{0}" +
-				"  <xs:complexType name=\"ArrayOfAnyType\">{0}" +
-				"    <xs:sequence>{0}" +
-				"      <xs:element minOccurs=\"0\" maxOccurs=\"unbounded\" name=\"anyType\" nillable=\"true\" />{0}" +
-				"    </xs:sequence>{0}" +
-				"  </xs:complexType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#4");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // bug #77117
 		public void ExportNonXsdPrimitive_Guid ()
 		{
-			XmlSchemas schemas = Export (typeof (Guid), "NSPrimGuid");
+			XmlReflectionImporter ri = new XmlReflectionImporter ("NSPrimGuid");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (Guid));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (2, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -1999,7 +385,7 @@ namespace MonoTests.System.XmlSerialization
 				"  <xs:element name=\"guid\" xmlns:q1=\"http://microsoft.com/wsdl/types/\" type=\"q1:guid\" />{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
 
-			sw.GetStringBuilder ().Length = 0;
+			sw = new StringWriter ();
 			schemas[1].Write (sw);
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
@@ -2011,39 +397,18 @@ namespace MonoTests.System.XmlSerialization
 				"    </xs:restriction>{0}" +
 				"  </xs:simpleType>{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#3");
-
-			schemas = Export (typeof (Guid));
-			Assert.AreEqual (2, schemas.Count, "#4");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:import namespace=\"http://microsoft.com/wsdl/types/\" />{0}" +
-				"  <xs:element name=\"guid\" xmlns:q1=\"http://microsoft.com/wsdl/types/\" type=\"q1:guid\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#5");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[1].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"http://microsoft.com/wsdl/types/\" elementFormDefault=\"qualified\" targetNamespace=\"http://microsoft.com/wsdl/types/\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:simpleType name=\"guid\">{0}" +
-				"    <xs:restriction base=\"xs:string\">{0}" +
-				"      <xs:pattern value=\"[0-9a-fA-F]{{8}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{4}}-[0-9a-fA-F]{{12}}\" />{0}" +
-				"    </xs:restriction>{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#6");
 		}
 
 		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
+		[Category ("NotWorking")] // bug #77117
 		public void ExportNonXsdPrimitive_Char ()
 		{
-			XmlSchemas schemas = Export (typeof (char), "NSPrimChar");
+			XmlReflectionImporter ri = new XmlReflectionImporter ("NSPrimChar");
+			XmlSchemas schemas = new XmlSchemas ();
+			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
+			XmlTypeMapping tm = ri.ImportTypeMapping (typeof (Char));
+			sx.ExportTypeMapping (tm);
+
 			Assert.AreEqual (2, schemas.Count, "#1");
 
 			StringWriter sw = new StringWriter ();
@@ -2056,7 +421,7 @@ namespace MonoTests.System.XmlSerialization
 				"  <xs:element name=\"char\" xmlns:q1=\"http://microsoft.com/wsdl/types/\" type=\"q1:char\" />{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#2");
 
-			sw.GetStringBuilder ().Length = 0;
+			sw = new StringWriter ();
 			schemas[1].Write (sw);
 
 			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
@@ -2066,30 +431,6 @@ namespace MonoTests.System.XmlSerialization
 				"    <xs:restriction base=\"xs:unsignedShort\" />{0}" +
 				"  </xs:simpleType>{0}" +
 				"</xs:schema>", Environment.NewLine), sw.ToString (), "#3");
-
-			schemas = Export (typeof (char));
-			Assert.AreEqual (2, schemas.Count, "#4");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[0].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:import namespace=\"http://microsoft.com/wsdl/types/\" />{0}" +
-				"  <xs:element name=\"char\" xmlns:q1=\"http://microsoft.com/wsdl/types/\" type=\"q1:char\" />{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#5");
-
-			sw.GetStringBuilder ().Length = 0;
-			schemas[1].Write (sw);
-
-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
-				"<?xml version=\"1.0\" encoding=\"utf-16\"?>{0}" +
-				"<xs:schema xmlns:tns=\"http://microsoft.com/wsdl/types/\" elementFormDefault=\"qualified\" targetNamespace=\"http://microsoft.com/wsdl/types/\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">{0}" +
-				"  <xs:simpleType name=\"char\">{0}" +
-				"    <xs:restriction base=\"xs:unsignedShort\" />{0}" +
-				"  </xs:simpleType>{0}" +
-				"</xs:schema>", Environment.NewLine), sw.ToString (), "#6");
 		}
 
 		public class Employee : IXmlSerializable
@@ -2098,7 +439,7 @@ namespace MonoTests.System.XmlSerialization
 			private string _lastName;
 			private string _address;
 
-			public virtual XmlSchema GetSchema ()
+			public XmlSchema GetSchema ()
 			{
 				return null;
 			}
@@ -2123,198 +464,45 @@ namespace MonoTests.System.XmlSerialization
 			}
 		}
 
-		public class EmployeeSchema : IXmlSerializable
+#if NET_2_0
+		[XmlSchemaProvider ("CreateEmployeeSchema")]
+#endif
+		public class EmployeeSchema : Employee
 		{
-			private string _firstName;
-			private string _lastName;
-			private string _address;
-
-			public virtual XmlSchema GetSchema ()
-			{
-				return CreateSchema ();
-			}
-
-			public void WriteXml (XmlWriter writer)
-			{
-				writer.WriteStartElement ("employee", "urn:devx-com");
-				writer.WriteAttributeString ("firstName", _firstName);
-				writer.WriteAttributeString ("lastName", _lastName);
-				writer.WriteAttributeString ("address", _address);
-				writer.WriteEndElement ();
-			}
-
-			public void ReadXml (XmlReader reader)
-			{
-				XmlNodeType type = reader.MoveToContent ();
-				if (type == XmlNodeType.Element && reader.LocalName == "employee") {
-					_firstName = reader["firstName"];
-					_lastName = reader["lastName"];
-					_address = reader["address"];
-				}
-			}
-
-			protected static XmlSchema CreateSchema ()
+#if NET_2_0
+			public static XmlQualifiedName CreateEmployeeSchema (XmlSchemaSet schemaSet)
 			{
-				XmlSchema schema = new XmlSchema ();
+				XmlSchema schema = new XmlSchema();
 				schema.Id = "EmployeeSchema";
 				schema.TargetNamespace = "urn:types-devx-com";
-
-				XmlSchemaComplexType type = new XmlSchemaComplexType ();
+			
+				XmlSchemaComplexType type = new XmlSchemaComplexType();
 				type.Name = "employeeRoot";
-				XmlSchemaAttribute firstNameAttr = new XmlSchemaAttribute ();
+				XmlSchemaAttribute firstNameAttr = new XmlSchemaAttribute();
 				firstNameAttr.Name = "firstName";
-				type.Attributes.Add (firstNameAttr);
+				type.Attributes.Add(firstNameAttr);
 
-				XmlSchemaAttribute lastNameAttr = new XmlSchemaAttribute ();
+				XmlSchemaAttribute lastNameAttr = new XmlSchemaAttribute();
 				lastNameAttr.Name = "lastName";
-				type.Attributes.Add (lastNameAttr);
+				type.Attributes.Add(lastNameAttr);
 
-				XmlSchemaAttribute addressAttr = new XmlSchemaAttribute ();
+				XmlSchemaAttribute addressAttr = new XmlSchemaAttribute();
 				addressAttr.Name = "address";
-				type.Attributes.Add (addressAttr);
+				type.Attributes.Add(addressAttr);
 
-				XmlSchemaElement employeeElement = new XmlSchemaElement ();
+				XmlSchemaElement employeeElement = new XmlSchemaElement();
 				employeeElement.Name = "employee";
-				XmlQualifiedName name = new XmlQualifiedName ("employeeRoot", "urn:types-devx-com");
+				XmlQualifiedName name = new XmlQualifiedName("employeeRoot", "urn:types-devx-com");
 				employeeElement.SchemaTypeName = name;
 
-				schema.Items.Add (type);
-				schema.Items.Add (employeeElement);
-				return schema;
-			}
-		}
-
-		public class PrimitiveSchema : IXmlSerializable
-		{
-			private string _firstName;
-			private string _lastName;
-			private string _address;
-
-			public virtual XmlSchema GetSchema ()
-			{
-				XmlSchema schema = new XmlSchema ();
-				schema.Id = "LuckyNumberSchema";
-				XmlSchemaElement luckyNumberElement = new XmlSchemaElement ();
-				luckyNumberElement.Name = "LuckyNumber";
-				luckyNumberElement.SchemaTypeName = new XmlQualifiedName ("int", "http://www.w3.org/2001/XMLSchema");
-				schema.Items.Add (luckyNumberElement);
-				return schema;
-			}
-
-			public void WriteXml (XmlWriter writer)
-			{
-				writer.WriteStartElement ("employee", "urn:devx-com");
-				writer.WriteAttributeString ("firstName", _firstName);
-				writer.WriteAttributeString ("lastName", _lastName);
-				writer.WriteAttributeString ("address", _address);
-				writer.WriteEndElement ();
-			}
-
-			public void ReadXml (XmlReader reader)
-			{
-				XmlNodeType type = reader.MoveToContent ();
-				if (type == XmlNodeType.Element && reader.LocalName == "employee") {
-					_firstName = reader["firstName"];
-					_lastName = reader["lastName"];
-					_address = reader["address"];
-				}
-			}
-		}
-
-		public class MissingIDSchema : IXmlSerializable
-		{
-			private string _firstName;
-			private string _lastName;
-			private string _address;
-
-			public virtual XmlSchema GetSchema ()
-			{
-				XmlSchema schema = new XmlSchema ();
-				XmlSchemaElement luckyNumberElement = new XmlSchemaElement ();
-				luckyNumberElement.Name = "LuckyNumber";
-				luckyNumberElement.SchemaTypeName = new XmlQualifiedName ("int", "http://www.w3.org/2001/XMLSchema");
-				return schema;
-			}
-
-			public void WriteXml (XmlWriter writer)
-			{
-				writer.WriteStartElement ("employee", "urn:devx-com");
-				writer.WriteAttributeString ("firstName", _firstName);
-				writer.WriteAttributeString ("lastName", _lastName);
-				writer.WriteAttributeString ("address", _address);
-				writer.WriteEndElement ();
-			}
-
-			public void ReadXml (XmlReader reader)
-			{
-				XmlNodeType type = reader.MoveToContent ();
-				if (type == XmlNodeType.Element && reader.LocalName == "employee") {
-					_firstName = reader["firstName"];
-					_lastName = reader["lastName"];
-					_address = reader["address"];
-				}
-			}
-		}
-
-#if NET_2_0
-		[XmlSchemaProvider ("CreateEmployeeSchema")]
-#endif
-		public class EmployeeSchemaProvider : EmployeeSchema
-		{
-#if NET_2_0
-			public static XmlQualifiedName CreateEmployeeSchema (XmlSchemaSet schemaSet)
-			{
-				schemaSet.Add (CreateSchema ());
-				return new XmlQualifiedName ("employeeRoot", "urn:types-devx-com");
-			}
-#else
-			public override XmlSchema GetSchema ()
-			{
-				return null;
+				schema.Items.Add(type);
+				schema.Items.Add(employeeElement);
+				schemaSet.Add(schema);
+				return name;
 			}
 #endif
 		}
 
-#if NET_2_0
-		[XmlSchemaProvider ("CreateLuckyNumberSchema")]
-#endif
-		public class PrimitiveSchemaProvider : IXmlSerializable
-		{
-#if NET_2_0
-			public static XmlQualifiedName CreateLuckyNumberSchema (XmlSchemaSet schemaSet)
-			{
-				XmlSchema schema = new XmlSchema ();
-
-				XmlSchemaElement luckyNumberElement = new XmlSchemaElement ();
-				luckyNumberElement.Name = "LuckyNumber";
-
-				XmlQualifiedName typeName = new XmlQualifiedName("int", "http://www.w3.org/2001/XMLSchema");
-				luckyNumberElement.SchemaTypeName = typeName;
-				schema.Items.Add (luckyNumberElement);
-
-				schemaSet.Add (schema);
-				return typeName;
-			}
-#endif
-
-			public XmlSchema GetSchema ()
-			{
-				return null;
-			}
-
-			public void WriteXml (XmlWriter writer)
-			{
-				writer.WriteElementString ("LuckyNumber", "7");
-			}
-
-			public void ReadXml (XmlReader reader)
-			{
-				XmlNodeType type = reader.MoveToContent ();
-				if (type == XmlNodeType.Element && reader.LocalName == "LuckyNumber") {
-				}
-			}
-		}
-
 		private class TypeDescription
 		{
 			public TypeDescription (Type type, bool xsdType, string xmlType, string arrayType) : this (type, xsdType, xmlType, arrayType, false)
@@ -2356,43 +544,5 @@ namespace MonoTests.System.XmlSerialization
 			private string _arrayType;
 			private bool _isNillable;
 		}
-
-		public class StructContainer
-		{
-			public EnumDefaultValue Value;
-			public TimeSpan[] Times;
-		}
-
-		public class XmlSerializableContainer
-		{
-			public Employee Slave;
-			public EmployeeSchema SlaveSchema;
-			public EmployeeSchemaProvider SlaveSchemaProvider;
-			public PrimitiveSchema NativeSchema;
-			public PrimitiveSchemaProvider NativeSchemaProvider;
-
-			[XmlElement ("SlaveNamespace", Namespace = "urn:types-devx-com")]
-			public Employee SlaveNS;
-			[XmlElement ("SlaveSchemaNamespace", Namespace = "urn:types-devx-com")]
-			public EmployeeSchema SlaveSchemaNS;
-			[XmlElement ("SlaveSchemaProviderNamespace", Namespace = "urn:types-devx-com")]
-			public EmployeeSchemaProvider SlaveSchemaProviderNS;
-			[XmlElement ("NativeSchemaNamespace", Namespace = "urn:types-devx-com")]
-			public PrimitiveSchema NativeSchemaNS;
-			[XmlElement ("NativeSchemaProviderNamespace", Namespace = "urn:types-devx-com")]
-			public PrimitiveSchemaProvider NativeSchemaProviderNS;
-
-
-			[XmlElement (Namespace = "urn:types-devx-com")]
-			public Employee SlaveNSOnly;
-			[XmlElement (Namespace = "urn:types-devx-com")]
-			public EmployeeSchema SlaveSchemaNSOnly;
-			[XmlElement (Namespace = "urn:types-devx-com")]
-			public EmployeeSchemaProvider SlaveSchemaProviderNSOnly;
-			[XmlElement (Namespace = "urn:types-devx-com")]
-			public PrimitiveSchema NativeSchemaNSOnly;
-			[XmlElement (Namespace = "urn:types-devx-com")]
-			public PrimitiveSchemaProvider NativeSchemaProviderNSOnly;
-		}
 	}
 }
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs
deleted file mode 100644
index bf17406bf32..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs
+++ /dev/null
@@ -1,522 +0,0 @@
-//
-// System.Xml.Serialization.XmlSchemaImporterTests
-//
-// Author:
-//   Gert Driesen (drieseng@users.sourceforge.net)
-//
-// (C) 2005 Novell
-// 
-
-using System;
-using System.CodeDom;
-using System.Collections;
-using System.Globalization;
-using System.IO;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-using NUnit.Framework;
-
-using MonoTests.System.Xml.TestClasses;
-
-namespace MonoTests.System.XmlSerialization
-{
-	[TestFixture]
-	public class XmlSchemaImporterTests
-	{
-		private const string WsdlTypesNamespace = "http://microsoft.com/wsdl/types/";
-
-		[Test]
-		[Category ("NotWorking")]
-		public void ImportTypeMapping_Struct ()
-		{
-			XmlSchemas schemas = ExportType (typeof (TimeSpan));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("TimeSpan", map.ElementName, "#3");
-			Assert.AreEqual ("NSTimeSpan", map.Namespace, "#4");
-			Assert.AreEqual ("TimeSpan", map.TypeFullName, "#5");
-			Assert.AreEqual ("TimeSpan", map.TypeName, "#6");
-		}
-
-		[Test]
-		[Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn
-		public void ImportTypeMapping_XsdPrimitive_AnyType ()
-		{
-			XmlSchemas schemas = ExportType (typeof (object));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("anyType", map.ElementName, "#3");
-			Assert.AreEqual ("NSObject", map.Namespace, "#4");
-			Assert.AreEqual ("System.Object", map.TypeFullName, "#5");
-			Assert.AreEqual ("Object", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Boolean ()
-		{
-			XmlSchemas schemas = ExportType (typeof (bool));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("boolean", map.ElementName, "#3");
-			Assert.AreEqual ("NSBoolean", map.Namespace, "#4");
-			Assert.AreEqual ("System.Boolean", map.TypeFullName, "#5");
-			Assert.AreEqual ("Boolean", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Short ()
-		{
-			XmlSchemas schemas = ExportType (typeof (short));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("short", map.ElementName, "#3");
-			Assert.AreEqual ("NSInt16", map.Namespace, "#4");
-			Assert.AreEqual ("System.Int16", map.TypeFullName, "#5");
-			Assert.AreEqual ("Int16", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_UnsignedShort ()
-		{
-			XmlSchemas schemas = ExportType (typeof (ushort));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("unsignedShort", map.ElementName, "#3");
-			Assert.AreEqual ("NSUInt16", map.Namespace, "#4");
-			Assert.AreEqual ("System.UInt16", map.TypeFullName, "#5");
-			Assert.AreEqual ("UInt16", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Int ()
-		{
-			XmlSchemas schemas = ExportType (typeof (int));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("int", map.ElementName, "#3");
-			Assert.AreEqual ("NSInt32", map.Namespace, "#4");
-			Assert.AreEqual ("System.Int32", map.TypeFullName, "#5");
-			Assert.AreEqual ("Int32", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_UnsignedInt ()
-		{
-			XmlSchemas schemas = ExportType (typeof (uint));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("unsignedInt", map.ElementName, "#3");
-			Assert.AreEqual ("NSUInt32", map.Namespace, "#4");
-			Assert.AreEqual ("System.UInt32", map.TypeFullName, "#5");
-			Assert.AreEqual ("UInt32", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Long ()
-		{
-			XmlSchemas schemas = ExportType (typeof (long));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("long", map.ElementName, "#3");
-			Assert.AreEqual ("NSInt64", map.Namespace, "#4");
-			Assert.AreEqual ("System.Int64", map.TypeFullName, "#5");
-			Assert.AreEqual ("Int64", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_UnsignedLong ()
-		{
-			XmlSchemas schemas = ExportType (typeof (ulong));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("unsignedLong", map.ElementName, "#3");
-			Assert.AreEqual ("NSUInt64", map.Namespace, "#4");
-			Assert.AreEqual ("System.UInt64", map.TypeFullName, "#5");
-			Assert.AreEqual ("UInt64", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Float ()
-		{
-			XmlSchemas schemas = ExportType (typeof (float));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("float", map.ElementName, "#3");
-			Assert.AreEqual ("NSSingle", map.Namespace, "#4");
-			Assert.AreEqual ("System.Single", map.TypeFullName, "#5");
-			Assert.AreEqual ("Single", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Double ()
-		{
-			XmlSchemas schemas = ExportType (typeof (double));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("double", map.ElementName, "#3");
-			Assert.AreEqual ("NSDouble", map.Namespace, "#4");
-			Assert.AreEqual ("System.Double", map.TypeFullName, "#5");
-			Assert.AreEqual ("Double", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_DateTime ()
-		{
-			XmlSchemas schemas = ExportType (typeof (DateTime));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("dateTime", map.ElementName, "#3");
-			Assert.AreEqual ("NSDateTime", map.Namespace, "#4");
-			Assert.AreEqual ("System.DateTime", map.TypeFullName, "#5");
-			Assert.AreEqual ("DateTime", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Decimal ()
-		{
-			XmlSchemas schemas = ExportType (typeof (decimal));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("decimal", map.ElementName, "#3");
-			Assert.AreEqual ("NSDecimal", map.Namespace, "#4");
-			Assert.AreEqual ("System.Decimal", map.TypeFullName, "#5");
-			Assert.AreEqual ("Decimal", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_QName ()
-		{
-			XmlSchemas schemas = ExportType (typeof (XmlQualifiedName));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("QName", map.ElementName, "#3");
-			Assert.AreEqual ("NSXmlQualifiedName", map.Namespace, "#4");
-			Assert.AreEqual ("System.Xml.XmlQualifiedName", map.TypeFullName, "#5");
-			Assert.AreEqual ("XmlQualifiedName", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_String ()
-		{
-			XmlSchemas schemas = ExportType (typeof (string));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("string", map.ElementName, "#3");
-			Assert.AreEqual ("NSString", map.Namespace, "#4");
-			Assert.AreEqual ("System.String", map.TypeFullName, "#5");
-			Assert.AreEqual ("String", map.TypeName, "#6");
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		[ExpectedException (typeof (XmlSchemaException))] // Type 'http://microsoft.com/wsdl/types/:guid' is not declared
-		public void ImportTypeMapping_XsdPrimitive_Guid ()
-		{
-			XmlSchemas schemas = ExportType (typeof (Guid));
-			GetXmlQualifiedNames (schemas);
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_UnsignedByte ()
-		{
-			XmlSchemas schemas = ExportType (typeof (byte));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("unsignedByte", map.ElementName, "#3");
-			Assert.AreEqual ("NSByte", map.Namespace, "#4");
-			Assert.AreEqual ("System.Byte", map.TypeFullName, "#5");
-			Assert.AreEqual ("Byte", map.TypeName, "#6");
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Byte ()
-		{
-			XmlSchemas schemas = ExportType (typeof (sbyte));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("byte", map.ElementName, "#3");
-			Assert.AreEqual ("NSSByte", map.Namespace, "#4");
-			Assert.AreEqual ("System.SByte", map.TypeFullName, "#5");
-			Assert.AreEqual ("SByte", map.TypeName, "#6");
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		[ExpectedException (typeof (XmlSchemaException))] // Type 'http://microsoft.com/wsdl/types/:char' is not declared
-		public void ImportTypeMapping_XsdPrimitive_Char ()
-		{
-			XmlSchemas schemas = ExportType (typeof (char));
-			GetXmlQualifiedNames (schemas);
-		}
-
-		[Test]
-		public void ImportTypeMapping_XsdPrimitive_Base64Binary ()
-		{
-			XmlSchemas schemas = ExportType (typeof (byte[]));
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#2");
-			Assert.AreEqual ("base64Binary", map.ElementName, "#3");
-			Assert.AreEqual ("NSByte[]", map.Namespace, "#4");
-			Assert.AreEqual ("System.Byte[]", map.TypeFullName, "#5");
-			Assert.AreEqual ("Byte[]", map.TypeName, "#6");
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		public void ImportTypeMapping_XsdPrimitive_Duration ()
-		{
-			string schemaFragment = "<?xml version=\"1.0\" encoding=\"utf-16\"?>" +
-				"<xs:schema xmlns:tns=\"NSDuration\" elementFormDefault=\"qualified\" targetNamespace=\"NSDuration\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
-				"  <xs:element name=\"duration\" type=\"xs:duration\" />" +
-				"</xs:schema>";
-
-			XmlSchemas schemas = new XmlSchemas ();
-			schemas.Add (XmlSchema.Read (new StringReader (schemaFragment), null));
-
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlQualifiedName qname = (XmlQualifiedName) qnames[0];
-
-			Assert.AreEqual ("duration", qname.Name, "#2");
-			Assert.AreEqual ("NSDuration", qname.Namespace, "#3");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#4");
-			Assert.AreEqual ("duration", map.ElementName, "#5");
-			Assert.AreEqual ("NSDuration", map.Namespace, "#6");
-			Assert.AreEqual ("System.String", map.TypeFullName, "#7");
-			Assert.AreEqual ("String", map.TypeName, "#8");
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		public void ImportTypeMapping_XsdPrimitive_Date ()
-		{
-			string schemaFragment = "<?xml version=\"1.0\" encoding=\"utf-16\"?>" +
-				"<xs:schema xmlns:tns=\"NSDate\" elementFormDefault=\"qualified\" targetNamespace=\"NSDate\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
-				"  <xs:element name=\"date\" type=\"xs:date\" />" +
-				"</xs:schema>";
-
-			XmlSchemas schemas = new XmlSchemas ();
-			schemas.Add (XmlSchema.Read (new StringReader (schemaFragment), null));
-
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlQualifiedName qname = (XmlQualifiedName) qnames[0];
-
-			Assert.AreEqual ("date", qname.Name, "#2");
-			Assert.AreEqual ("NSDate", qname.Namespace, "#3");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#4");
-			Assert.AreEqual ("date", map.ElementName, "#5");
-			Assert.AreEqual ("NSDate", map.Namespace, "#6");
-			Assert.AreEqual ("System.DateTime", map.TypeFullName, "#7");
-			Assert.AreEqual ("DateTime", map.TypeName, "#8");
-		}
-		
-		[Test]
-		public void ImportTypeMapping_EnumSimpleContent ()
-		{
-			string schemaFragment = "<?xml version=\"1.0\" encoding=\"utf-16\"?>" +
-				"<s:schema xmlns:tns=\"NSDate\" elementFormDefault=\"qualified\" targetNamespace=\"NSDate\" xmlns:s=\"http://www.w3.org/2001/XMLSchema\">";
-			schemaFragment += "      <s:element name=\"trans\" type=\"tns:TranslationStatus\" />";
-			schemaFragment += "      <s:complexType name=\"TranslationStatus\">";
-			schemaFragment += "        <s:simpleContent>";
-			schemaFragment += "          <s:extension base=\"tns:StatusType\">";
-			schemaFragment += "            <s:attribute name=\"Language\" type=\"s:int\" use=\"required\" />";
-			schemaFragment += "          </s:extension>";
-			schemaFragment += "        </s:simpleContent>";
-			schemaFragment += "      </s:complexType>";
-			schemaFragment += "      <s:simpleType name=\"StatusType\">";
-			schemaFragment += "        <s:restriction base=\"s:string\">";
-			schemaFragment += "          <s:enumeration value=\"Untouched\" />";
-			schemaFragment += "          <s:enumeration value=\"Touched\" />";
-			schemaFragment += "          <s:enumeration value=\"Complete\" />";
-			schemaFragment += "          <s:enumeration value=\"None\" />";
-			schemaFragment += "        </s:restriction>";
-			schemaFragment += "      </s:simpleType>";
-			schemaFragment += "</s:schema>";
-
-			XmlSchemas schemas = new XmlSchemas ();
-			schemas.Add (XmlSchema.Read (new StringReader (schemaFragment), null));
-
-			ArrayList qnames = GetXmlQualifiedNames (schemas);
-			Assert.AreEqual (1, qnames.Count, "#1");
-
-			XmlQualifiedName qname = (XmlQualifiedName) qnames[0];
-
-			Assert.AreEqual ("trans", qname.Name, "#2");
-			Assert.AreEqual ("NSDate", qname.Namespace, "#3");
-
-			XmlSchemaImporter importer = new XmlSchemaImporter (schemas);
-			XmlTypeMapping map = importer.ImportTypeMapping ((XmlQualifiedName) qnames[0]);
-
-			Assert.IsNotNull (map, "#4");
-			Assert.AreEqual ("trans", map.ElementName, "#5");
-			Assert.AreEqual ("NSDate", map.Namespace, "#6");
-			Assert.AreEqual ("TranslationStatus", map.TypeFullName, "#7");
-			Assert.AreEqual ("TranslationStatus", map.TypeName, "#8");
-			
-			CodeNamespace codeNamespace = ExportCode (map);
-			Assert.IsNotNull (codeNamespace);
-			
-			CodeTypeDeclaration type = FindType (codeNamespace, "TranslationStatus");
-			Assert.IsNotNull (type, "#9");
-			
-			CodeMemberField field = FindMember (type, "Value") as CodeMemberField;
-			Assert.IsNotNull (field, "#10");
-			Assert.AreEqual ("StatusType", field.Type.BaseType, "#11");
-			
-			field = FindMember (type, "Language") as CodeMemberField;
-			Assert.IsNotNull (field, "#12");
-			Assert.AreEqual ("System.Int32", field.Type.BaseType, "#13");
-		}
-		
-		CodeNamespace ExportCode (XmlTypeMapping map)
-		{
-			CodeNamespace codeNamespace = new CodeNamespace ();
-			XmlCodeExporter exp = new XmlCodeExporter (codeNamespace);
-			exp.ExportTypeMapping (map);
-			return codeNamespace;
-		}
-		
-		CodeTypeDeclaration FindType (CodeNamespace codeNamespace, string name)
-		{
-			foreach (CodeTypeDeclaration t in codeNamespace.Types)
-				if (t.Name == name)
-					return t;
-			return null;
-		}
-		
-		CodeTypeMember FindMember (CodeTypeDeclaration type, string name)
-		{
-			foreach (CodeTypeMember m in type.Members)
-				if (m.Name == name)
-					return m;
-			return null;
-		}
-
-		private static XmlSchemas ExportType (Type type)
-		{
-			XmlReflectionImporter ri = new XmlReflectionImporter ("NS" + type.Name);
-			XmlSchemas schemas = new XmlSchemas ();
-			XmlSchemaExporter sx = new XmlSchemaExporter (schemas);
-			XmlTypeMapping tm = ri.ImportTypeMapping (type);
-			sx.ExportTypeMapping (tm);
-			return schemas;
-		}
-
-		private static ArrayList GetXmlQualifiedNames (XmlSchemas schemas)
-		{
-			ArrayList qnames = new ArrayList ();
-
-			foreach (XmlSchema schema in schemas) {
-				if (!schema.IsCompiled) schema.Compile (null);
-				foreach (XmlSchemaObject ob in schema.Items)
-					if (ob is XmlSchemaElement)
-						qnames.Add (((XmlSchemaElement) ob).QualifiedName);
-			}
-
-			return qnames;
-		}
-	}
-}
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationReaderTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationReaderTests.cs
deleted file mode 100644
index cdd34e14804..00000000000
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationReaderTests.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// MonoTests.System.Xml.Serialization.XmlSerializationReaderTests	
-//
-// Author:
-//	Gert Driesen (drieseng@users.sourceforge.net)
-//
-//  (C) 2006 Novell
-// 
-
-using System;
-using System.Collections;
-using System.Xml.Serialization;
-
-using NUnit.Framework;
-
-using MonoTests.System.Xml.TestClasses;
-
-namespace MonoTests.System.XmlSerialization
-{
-	[TestFixture]
-	public class XmlSerializationReaderTests : XmlSerializarionReaderTester
-	{
-		[Test]
-		public void TestToEnum ()
-		{
-			Hashtable values = new Hashtable ();
-			values.Add ("One", 1L);
-			values.Add ("Two", 2L);
-			values.Add ("Four", 4L);
-
-			Assert.AreEqual (1, ToEnum ("One", values, "Some.Type.Name"), "#A1");
-			Assert.AreEqual (2, ToEnum (" Two ", values, "Some.Type.Name"), "#A2");
-			Assert.AreEqual (4, ToEnum ("Four", values, "Some.Type.Name"), "#A3");
-			Assert.AreEqual (5, ToEnum ("One Four", values, "Some.Type.Name"), "#A4");
-			Assert.AreEqual (7, ToEnum ("One Two Four", values, "Some.Type.Name"), "#A5");
-			Assert.AreEqual (0, ToEnum ("", values, "Some.Type.Name"), "#A6");
-			Assert.AreEqual (0, ToEnum ("     ", values, "Some.Type.Name"), "#A7");
-			Assert.AreEqual (2, ToEnum ("Two Two", values, "Some.Type.Name"), "#A8");
-
-			values.Add ("", 24L);
-			Assert.AreEqual (24, ToEnum ("", values, "Some.Type.Name"), "#B1");
-			Assert.AreEqual (24, ToEnum ("  ", values, "Some.Type.Name"), "#B2");
-		}
-
-		[Test]
-		public void TestToEnum_InvalidValue ()
-		{
-			try {
-				ToEnum ("SomeValue", new Hashtable (), "Some.Type.Name");
-				Assert.Fail ("#A1");
-			} catch (InvalidOperationException ex) {
-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2");
-				Assert.IsNotNull (ex.Message, "#A3");
-				Assert.IsTrue (ex.Message.IndexOf ("'SomeValue'") != -1, "#A4");
-				Assert.IsTrue (ex.Message.IndexOf ("Some.Type.Name") != -1, "#A5");
-				Assert.IsNull (ex.InnerException, "#A6");
-			}
-
-			Hashtable values = new Hashtable ();
-			values.Add ("One", 1L);
-			values.Add ("Two", 2L);
-			values.Add ("Four", 4L);
-
-			try {
-				ToEnum ("one", values, "Some.Type.Name");
-				Assert.Fail ("#B1");
-			} catch (InvalidOperationException ex) {
-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2");
-				Assert.IsNotNull (ex.Message, "#B3");
-				Assert.IsTrue (ex.Message.IndexOf ("'one'") != -1, "#B4");
-				Assert.IsTrue (ex.Message.IndexOf ("Some.Type.Name") != -1, "#B5");
-				Assert.IsNull (ex.InnerException, "#B6");
-			}
-
-			values.Clear ();
-			values.Add ("One", FlagEnum.e1);
-
-			try {
-				ToEnum ("One", values, "Some.Type.Name");
-				Assert.Fail ("#C1");
-			} catch (InvalidCastException ex) {
-			}
-
-			values.Clear ();
-			values.Add ("One", 1);
-
-			try {
-				ToEnum ("One", values, "Some.Type.Name");
-				Assert.Fail ("#D1");
-			} catch (InvalidCastException ex) {
-			}
-
-			values.Clear ();
-			values.Add ("One", null);
-
-			try {
-				ToEnum ("One", values, "Some.Type.Name");
-				Assert.Fail ("#E1");
-			} catch (InvalidOperationException ex) {
-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#E2");
-				Assert.IsNotNull (ex.Message, "#E3");
-				Assert.IsTrue (ex.Message.IndexOf ("'One'") != -1, "#E4");
-				Assert.IsTrue (ex.Message.IndexOf ("Some.Type.Name") != -1, "#E5");
-				Assert.IsNull (ex.InnerException, "#E6");
-			}
-		}
-
-		[Test]
-		[ExpectedException (typeof (NullReferenceException))]
-		public void TestToEnum_Null_Value ()
-		{
-			ToEnum ((string) null, new Hashtable (), "DoesNotMatter");
-		}
-
-		[Test]
-		[ExpectedException (typeof (NullReferenceException))]
-		public void TestToEnum_Null_Values ()
-		{
-			ToEnum ("", (Hashtable) null, "DoesNotMatter");
-		}
-	}
-
-	public class XmlSerializarionReaderTester : XmlSerializationReader
-	{
-		// appease the compiler
-		protected override void InitCallbacks ()
-		{
-		}
-
-		protected override void InitIDs ()
-		{
-		}
-	}
-}
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs
index 13679d50658..cf3a8534e4c 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs
@@ -11,15 +11,12 @@
 // 

 

 using System;

-using System.Globalization;

 using System.IO;

 using System.Xml;

 using System.Xml.Serialization;

 

 using NUnit.Framework;

 

-using MonoTests.System.Xml.TestClasses;

-

 namespace MonoTests.System.XmlSerialization

 {

 	// base, common implementation of XmlSerializationWriter test harness.

@@ -43,7 +40,7 @@ namespace MonoTests.System.XmlSerialization
 		XmlTextWriter writer;

 		

 		[SetUp]

-		public void Reset()

+		protected void Reset()

 		{

 			sw = new StringWriter ();

 			writer = new XmlTextWriter (sw);

@@ -52,24 +49,15 @@ namespace MonoTests.System.XmlSerialization
 			Writer = writer;

 		}

 

-		public string Content

+		protected string Content

 		{

 			get

 			{ 

 				string val = sw.GetStringBuilder().ToString();

+//				Console.WriteLine(val);

 				return val;

 			}

 		}

-

-		public void ExecuteWritePotentiallyReferencingElement (string name, string ns, object o, Type ambientType, bool suppressReference, bool isNullable)

-		{

-			WritePotentiallyReferencingElement (name, ns, o, ambientType, suppressReference, isNullable);

-		}

-

-		public void ExecuteWriteTypedPrimitive (string name, string ns, object o, bool xsiType)

-		{

-			WriteTypedPrimitive (name, ns, o, xsiType);

-		}

 	}

 	

 	// this class tests the methods of the XmlSerializationWriter that

@@ -77,12 +65,7 @@ namespace MonoTests.System.XmlSerialization
 	[TestFixture]

 	public class XmlSerializationWriterSimpleTests : XmlSerializarionWriterTester

 	{

-		const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";

-		const string XmlSchemaInstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";

-		const string SoapEncodingNamespace = "http://schemas.xmlsoap.org/soap/encoding/";

-		const string WsdlTypesNamespace = "http://microsoft.com/wsdl/types/";

 		const string ANamespace = "some:urn";

-		const string AnotherNamespace = "another:urn";

 

 		// These TestFrom* methods indirectly test the functionality of XmlCustomFormatter

 

@@ -94,7 +77,7 @@ namespace MonoTests.System.XmlSerialization
 			// returns a byte array.

 			// 

 			//string val = this.FromByteArrayBase64(new byte [] {143, 144, 1, 0});

-			//Assert.AreEqual (FromByteArrayBase64(null), "");

+			//Assertion.AssertEquals(FromByteArrayBase64(null), "");

 			

 			//val = FromByteArrayBase64(null);

 			//try/catch or AssertEruals?

@@ -104,143 +87,50 @@ namespace MonoTests.System.XmlSerialization
 		public void TestFromByteArrayHex()

 		{

 			byte [] vals = {143, 144, 1, 0};

-			Assert.AreEqual ("8F900100", FromByteArrayHex(vals));

-			Assert.IsNull (FromByteArrayHex (null));

+			Assertion.AssertEquals("8F900100", FromByteArrayHex(vals));

+			Assertion.AssertEquals(null, FromByteArrayHex(null));

 		}

 

 		[Test]

 		public void TestFromChar()

 		{

-			Assert.AreEqual ("97", FromChar ('a'));

-			Assert.AreEqual ("0", FromChar ('\0'));

-			Assert.AreEqual ("10", FromChar ('\n'));

-			Assert.AreEqual ("65281", FromChar ('\uFF01'));

+			Assertion.AssertEquals("97", FromChar('a'));

+			Assertion.AssertEquals("0", FromChar('\0'));

+			Assertion.AssertEquals("10", FromChar('\n'));

+			Assertion.AssertEquals("65281", FromChar('\uFF01'));

 		}

 

 		[Test]

 		public void TestFromDate()

 		{

 			DateTime d = new DateTime();

-			Assert.AreEqual ("0001-01-01", FromDate (d));

+			Assertion.AssertEquals("0001-01-01", FromDate(d));

 		}

 

 		[Test]

 		public void TestFromDateTime()

 		{

 			DateTime d = new DateTime();

-			Assert.AreEqual ("0001-01-01T00:00:00.0000000", FromDateTime (d).Substring (0, 27));

+			Assertion.AssertEquals("0001-01-01T00:00:00.0000000", FromDateTime(d).Substring (0, 27));

 		}

 

-		[Test] // bug #77500

+		[Test]

 		public void TestFromEnum()

 		{

 			long[] ids = {1, 2, 3, 4};

 			string[] values = {"one", "two", "three"};

+			

+			Assertion.AssertEquals("one", FromEnum(1, values, ids));

+			Assertion.AssertEquals("", FromEnum(0, values, ids));

 

-			Assert.AreEqual ("one", FromEnum (1, values, ids), "#1");

-			Assert.AreEqual (string.Empty, FromEnum (0, values, ids), "#2");

-			Assert.AreEqual ("one two", FromEnum (3, values, ids), "#3");

-

-			try {

+			try

+			{

 				string dummy = FromEnum(4, values, ids);

-				Assert.Fail("#4");

-			} catch (IndexOutOfRangeException) {

+				Assertion.Fail("This should fail with an array-out-of-bunds error");

 			}

-

-			string[] correctValues = {"one", "two", "three", "four"};

-			Assert.AreEqual ("four", FromEnum (4, correctValues, ids), "#5");

-			Assert.AreEqual ("one four", FromEnum (5, correctValues, ids), "#6");

-			Assert.AreEqual ("two four", FromEnum (6, correctValues, ids), "#7");

-			Assert.AreEqual ("one two three four", FromEnum (7, correctValues, ids), "#8");

-

-			string[] flagValues = {"one", "two", "four", "eight"};

-			long[] flagIDs = {1, 2, 4, 8};

-			Assert.AreEqual (string.Empty, FromEnum (0, flagValues, flagIDs), "#9");

-			Assert.AreEqual ("two", FromEnum (2, flagValues, flagIDs), "#10");

-			Assert.AreEqual ("four", FromEnum (4, flagValues, flagIDs), "#1");

-			Assert.AreEqual ("one four", FromEnum (5, flagValues, flagIDs), "#12");

-			Assert.AreEqual ("two four", FromEnum (6, flagValues, flagIDs), "#13");

-			Assert.AreEqual ("one two four", FromEnum (7, flagValues, flagIDs), "#14");

-			Assert.AreEqual ("eight", FromEnum (8, flagValues, flagIDs), "#15");

-			Assert.AreEqual ("one four eight", FromEnum (13, flagValues, flagIDs), "#16");

-

-			string[] unorderedValues = {"one", "four", "two", "zero"};

-			long[] unorderedIDs = {1, 4, 2, 0};

-

-			Assert.AreEqual (string.Empty, FromEnum (0, unorderedValues, unorderedIDs), "#17");

-			Assert.AreEqual ("two", FromEnum (2, unorderedValues, unorderedIDs), "#18");

-			Assert.AreEqual ("four", FromEnum (4, unorderedValues, unorderedIDs), "#19");

-			Assert.AreEqual ("one four", FromEnum (5, unorderedValues, unorderedIDs), "#20");

-			Assert.AreEqual ("four two", FromEnum (6, unorderedValues, unorderedIDs), "#21");

-			Assert.AreEqual ("one four two", FromEnum (7, unorderedValues, unorderedIDs), "#22");

-

-			string[] zeroValues = {"zero", "ten"};

-			long[] zeroIDs = {0, 10};

-

-			Assert.AreEqual ("zero", FromEnum (0, zeroValues, zeroIDs), "#9");

-			Assert.AreEqual ("ten", FromEnum (10, zeroValues, zeroIDs), "#9");

-

-			string[] reverseZeroValues = {"", "zero"};

-			long[] reverseZeroIDs = {4, 0};

-			Assert.AreEqual (string.Empty, FromEnum (0, reverseZeroValues, reverseZeroIDs), "#9");

-			Assert.AreEqual ("zero", FromEnum (4, reverseZeroValues, reverseZeroIDs), "#9");

-

-			string[] emptyValues = { "zero" };

-			long[] emptyIDs = {0};

-			Assert.AreEqual ("zero", FromEnum (0, emptyValues, emptyIDs), "#9");

-		}

-

-		[Test]

-		public void TestFromEnum_InvalidValue ()

-		{

-			long[] ids = {1, 2, 3, 4};

-			string[] values = {"one", "two", "three", "four"};

-

-#if NET_2_0

-			try {

-				FromEnum (8, values, ids);

-				Assert.Fail ("#A1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#A2");

-				Assert.IsNotNull (ex.Message, "#A3");

-				Assert.IsTrue (ex.Message.IndexOf ("'8'") != -1, "#A4");

-				Assert.IsNull (ex.InnerException, "#A5");

+			catch (Exception)

+			{

 			}

-#else

-			Assert.AreEqual ("8", FromEnum (8, values, ids), "#A6");

-#endif

-

-#if NET_2_0

-			try {

-				FromEnum (8, values, ids, "Some.Type.Name");

-				Assert.Fail ("#B1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#B2");

-				Assert.IsNotNull (ex.Message, "#B3");

-				Assert.IsTrue (ex.Message.IndexOf ("'8'") != -1, "#B4");

-				Assert.IsTrue (ex.Message.IndexOf ("Some.Type.Name") != -1, "#B5");

-				Assert.IsNull (ex.InnerException, "#B6");

-			}

-#endif

-		}

-

-		[Test]

-		[ExpectedException (typeof (NullReferenceException))]

-		public void TestFromEnum_Null_Values ()

-		{

-			long[] ids = { 1, 2, 3, 4 };

-			string[] values = { "one", "two", "three", "four" };

-

-			FromEnum (1, (string[]) null, ids);

-		}

-

-		[Test]

-		[ExpectedException (typeof (NullReferenceException))]

-		public void TestFromEnum_Null_IDs ()

-		{

-			string[] values = { "one", "two", "three", "four" };

-

-			FromEnum (1, values, (long[]) null);

 		}

 

 		[Test]

@@ -248,43 +138,43 @@ namespace MonoTests.System.XmlSerialization
 		{

 			DateTime d = new DateTime();

 			// Don't include time zone.

-			Assert.AreEqual ("00:00:00.0000000", FromTime (d).Substring (0, 16));

+			Assertion.AssertEquals("00:00:00.0000000", FromTime(d).Substring (0, 16));

 		}

 

 		[Test]

 		public void TestFromXmlName()

 		{

-			Assert.AreEqual ("Hello", FromXmlName ("Hello"));

-			Assert.AreEqual ("go_x0020_dogs_x0020_go", FromXmlName ("go dogs go"));

-			Assert.AreEqual ("what_x0027_s_x0020_up", FromXmlName ("what's up"));

-			Assert.AreEqual ("_x0031_23go", FromXmlName ("123go"));

-			Assert.AreEqual ("Hello_x0020_what_x0027_s.up", FromXmlName ("Hello what's.up"));

+			Assertion.AssertEquals("Hello", FromXmlName("Hello"));

+			Assertion.AssertEquals("go_x0020_dogs_x0020_go", FromXmlName("go dogs go"));

+			Assertion.AssertEquals("what_x0027_s_x0020_up", FromXmlName("what's up"));

+			Assertion.AssertEquals("_x0031_23go", FromXmlName("123go"));

+			Assertion.AssertEquals("Hello_x0020_what_x0027_s.up", FromXmlName("Hello what's.up"));

 		}

 

 		[Test]

 		public void TestFromXmlNCName()

 		{

-			Assert.AreEqual ("Hello", FromXmlNCName ("Hello"));

-			Assert.AreEqual ("go_x0020_dogs_x0020_go", FromXmlNCName ("go dogs go"));

-			Assert.AreEqual ("what_x0027_s_x0020_up", FromXmlNCName ("what's up"));

-			Assert.AreEqual ("_x0031_23go", FromXmlNCName ("123go"));

-			Assert.AreEqual ("Hello_x0020_what_x0027_s.up", FromXmlNCName ("Hello what's.up"));

+			Assertion.AssertEquals("Hello", FromXmlNCName("Hello"));

+			Assertion.AssertEquals("go_x0020_dogs_x0020_go", FromXmlNCName("go dogs go"));

+			Assertion.AssertEquals("what_x0027_s_x0020_up", FromXmlNCName("what's up"));

+			Assertion.AssertEquals("_x0031_23go", FromXmlNCName("123go"));

+			Assertion.AssertEquals("Hello_x0020_what_x0027_s.up", FromXmlNCName("Hello what's.up"));

 		}

 

 		[Test]

 		public void TestFromXmlNmToken()

 		{

-			Assert.AreEqual ("Hello", FromXmlNmToken ("Hello"));

-			Assert.AreEqual ("go_x0020_dogs_x0020_go", FromXmlNmToken ("go dogs go"));

-			Assert.AreEqual ("what_x0027_s_x0020_up", FromXmlNmToken ("what's up"));

-			Assert.AreEqual ("123go", FromXmlNmToken ("123go"));

-			Assert.AreEqual ("Hello_x0020_what_x0027_s.up", FromXmlNmToken ("Hello what's.up"));

+			Assertion.AssertEquals("Hello", FromXmlNmToken("Hello"));

+			Assertion.AssertEquals("go_x0020_dogs_x0020_go", FromXmlNmToken("go dogs go"));

+			Assertion.AssertEquals("what_x0027_s_x0020_up", FromXmlNmToken("what's up"));

+			Assertion.AssertEquals("123go", FromXmlNmToken("123go"));

+			Assertion.AssertEquals("Hello_x0020_what_x0027_s.up", FromXmlNmToken("Hello what's.up"));

 		}

 

 		[Test]

 		public void TestFromXmlNmTokens()

 		{

-			Assert.AreEqual ("Hello go dogs_go 123go what_x0027_s.up", FromXmlNmTokens ("Hello go dogs_go 123go what's.up"));

+			Assertion.AssertEquals("Hello go dogs_go 123go what_x0027_s.up", FromXmlNmTokens("Hello go dogs_go 123go what's.up"));

 		}

 

 		[Test]

@@ -293,44 +183,46 @@ namespace MonoTests.System.XmlSerialization
 			WriteStartElement("x");

 			WriteAttribute("a", "b");

 			WriteEndElement();

-			Assert.AreEqual ("<x a='b' />", Content);

+			Assertion.AssertEquals("<x a='b' />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteAttribute("a", new byte[] {1, 2, 3});

 			WriteEndElement();

-			Assert.AreEqual ("<x a='AQID' />", Content);

+			Assertion.AssertEquals("<x a='AQID' />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteAttribute("a", "<b");

 			WriteEndElement();

-			Assert.AreEqual ("<x a='&lt;b' />", Content);

+			Assertion.AssertEquals("<x a='&lt;b' />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			string typedPlaceholder = null;

 			WriteAttribute("a", typedPlaceholder);

 			WriteEndElement();

-			Assert.AreEqual ("<x />", Content);

+			Assertion.AssertEquals("<x />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteAttribute("a", "\"");

 			WriteEndElement();

-			Assert.AreEqual ("<x a='\"' />", Content);

+			Assertion.AssertEquals("<x a='\"' />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteAttribute("a", "b\nc");

 			WriteEndElement();

-			Assert.AreEqual ("<x a='b&#xA;c' />", Content);

+			Assertion.AssertEquals("<x a='b&#xA;c' />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteAttribute("a", ANamespace, "b");

 			WriteEndElement();

-			Assert.AreEqual ("<x d1p1:a='b' xmlns:d1p1='some:urn' />", Content);

+			Assertion.AssertEquals("<x d1p1:a='b' xmlns:d1p1='some:urn' />", Content);

+

+

 		}

 

 		[Test]

@@ -351,11 +243,11 @@ namespace MonoTests.System.XmlSerialization
 		public void TestWriteElementString()

 		{

 			WriteElementString("x", "a");

-			Assert.AreEqual ("<x>a</x>", Content);

+			Assertion.AssertEquals("<x>a</x>", Content);

 

 			Reset();

 			WriteElementString("x", "<a");

-			Assert.AreEqual ("<x>&lt;a</x>", Content);

+			Assertion.AssertEquals("<x>&lt;a</x>", Content);

 		}

 

 		[Test]

@@ -363,27 +255,27 @@ namespace MonoTests.System.XmlSerialization
 		{

 			byte [] placeHolderArray = null;

 			WriteElementStringRaw("x", placeHolderArray);

-			Assert.AreEqual ("", Content);

+			Assertion.AssertEquals("", Content);

 

 			Reset();

 			WriteElementStringRaw("x", new byte[] {0, 2, 4});

-			Assert.AreEqual ("<x>AAIE</x>", Content);

+			Assertion.AssertEquals("<x>AAIE</x>", Content);

 

 			Reset();

 			WriteElementStringRaw("x", new byte[] {});

-			Assert.AreEqual ("<x />", Content);

+			Assertion.AssertEquals("<x />", Content);

 

 			// Note to reader, the output is not valid xml

 			Reset();

 			WriteElementStringRaw("x", "a > 13 && a < 19");

-			Assert.AreEqual ("<x>a > 13 && a < 19</x>", Content);

+			Assertion.AssertEquals("<x>a > 13 && a < 19</x>", Content);

 		}

 

 		[Test]

 		public void TestWriteEmptyTag()

 		{

 			WriteEmptyTag("x");

-			Assert.AreEqual ("<x />", Content);

+			Assertion.AssertEquals("<x />", Content);

 		}

 

 		[Test]

@@ -394,127 +286,83 @@ namespace MonoTests.System.XmlSerialization
 			WriteStartElement("x");

 			WriteNamespaceDeclarations(ns);

 			WriteEndElement();

-			Assert.AreEqual ("<x />", Content);

+			Assertion.AssertEquals("<x />", Content);

 

 			Reset();

 			ns.Add("mypref", ANamespace);

 			WriteStartElement("x");

 			WriteNamespaceDeclarations(ns);

 			WriteEndElement();

-			Assert.AreEqual (XmlSerializerTests.Infoset("<x xmlns:mypref='some:urn' />"), XmlSerializerTests.Infoset(Content));

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x xmlns:mypref='some:urn' />"), XmlSerializerTests.Infoset(Content));

 

 			Reset();

 			ns.Add("ns2", "another:urn");

 			WriteStartElement("x");

 			WriteNamespaceDeclarations(ns);

 			WriteEndElement();

-			Assert.AreEqual (XmlSerializerTests.Infoset("<x xmlns:ns2='another:urn' xmlns:mypref='some:urn' />"), XmlSerializerTests.Infoset(Content));

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x xmlns:ns2='another:urn' xmlns:mypref='some:urn' />"), XmlSerializerTests.Infoset(Content));

 

 			Reset();

 			ns.Add("ns3", "ya:urn");

 			WriteStartElement("x");

 			WriteNamespaceDeclarations(ns);

 			WriteEndElement();

-			Assert.AreEqual (XmlSerializerTests.Infoset("<x xmlns:ns3='ya:urn' xmlns:ns2='another:urn' xmlns:mypref='some:urn' />"), XmlSerializerTests.Infoset(Content));

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x xmlns:ns3='ya:urn' xmlns:ns2='another:urn' xmlns:mypref='some:urn' />"), XmlSerializerTests.Infoset(Content));

 		}

 

 		[Test]

 		public void TestWriteNullableStringLiteral()

 		{

 			WriteNullableStringLiteral("x", null, null);

-			Assert.AreEqual (XmlSerializerTests.Infoset("<x d1p1:nil='true' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x d1p1:nil='true' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

 

 			Reset();

 			WriteNullableStringLiteral("x", null, "");

-			Assert.AreEqual ("<x />", Content);

+			Assertion.AssertEquals("<x />", Content);

 			

 			Reset();

 			WriteNullableStringLiteral("x", null, "a<b\'c");

-			Assert.AreEqual ("<x>a&lt;b\'c</x>", Content);

+			Assertion.AssertEquals("<x>a&lt;b\'c</x>", Content);

 

 			Reset();

 			WriteNullableStringLiteral("x", ANamespace, "b");

-			Assert.AreEqual ("<x xmlns='some:urn'>b</x>", Content);

+			Assertion.AssertEquals("<x xmlns='some:urn'>b</x>", Content);

 		}

 

 		[Test]

 		public void TestWriteNullableStringLiteralRaw()

 		{

 			WriteNullableStringLiteralRaw("x", null, new byte[] {1, 2, 244});

-			Assert.AreEqual ("<x>AQL0</x>", Content);

+			Assertion.AssertEquals("<x>AQL0</x>", Content);

 		}

 

 		[Test]

 		public void TestWriteNullTagEncoded()

 		{

 			WriteNullTagEncoded("x");

-			Assert.AreEqual (XmlSerializerTests.Infoset("<x d1p1:nil='true' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x d1p1:nil='true' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

 		}

 

 		[Test]

 		public void TestWriteNullTagLiteral()

 		{

 			WriteNullTagLiteral("x");

-			Assert.AreEqual (XmlSerializerTests.Infoset("<x d1p1:nil='true' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestWritePotentiallyReferencingElement ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWritePotentiallyReferencingElement ("x", ANamespace, EnumDefaultValue.e1, typeof (EnumDefaultValue), true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>1</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWritePotentiallyReferencingElement ("x", ANamespace, (int) 1, typeof (EnumDefaultValue), true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:int' xmlns:d1p1='{1}' xmlns='{2}'>1</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, ANamespace),

-				xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWritePotentiallyReferencingElement ("x", ANamespace, "something", typeof (string), true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>something</x>", ANamespace), xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWritePotentiallyReferencingElement ("x", ANamespace, "something", null, true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:string' xmlns:d1p1='{1}' xmlns='{2}'>something</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, ANamespace),

-				xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWritePotentiallyReferencingElement ("x", ANamespace, new string[] { "A", "B" }, typeof (string[]), true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<q3:Array id='id1' xmlns:q4='{0}' q3:arrayType='q4:string[2]' xmlns:q3='{1}'>" +

-				"<Item>A</Item>" +

-				"<Item>B</Item>" +

-				"</q3:Array>", XmlSchemaNamespace, SoapEncodingNamespace), xsw.Content, "#5");

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x d1p1:nil='true' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

 		}

 

 		[Test]

 		public void TestWriteSerializable()

 		{

 			// FIXME

-			//Assert.AreEqual (, "");

+			//Assertion.AssertEquals(, "");

 		}

 

-		[Test]

 		public void TestWriteStartDocument()

 		{

-			Assert.AreEqual ("", Content);

+			Assertion.AssertEquals("", Content);

 			

 			WriteStartDocument();

-			Assert.AreEqual ("<?xml version='1.0' encoding='utf-16'?>", Content);

+			Assertion.AssertEquals("<?xml version='1.0' encoding='utf-16'?>", Content);

 		}

 

 		[Test]

@@ -522,881 +370,66 @@ namespace MonoTests.System.XmlSerialization
 		{

 			WriteStartElement("x");

 			WriteEndElement();

-			Assert.AreEqual ("<x />", Content);

+			Assertion.AssertEquals("<x />", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteValue("a");

 			WriteEndElement();

-			Assert.AreEqual ("<x>a</x>", Content);

+			Assertion.AssertEquals("<x>a</x>", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteStartElement("y", "z");

 			WriteEndElement();

 			WriteEndElement();

-			Assert.AreEqual ("<x><y xmlns='z' /></x>", Content);

+			Assertion.AssertEquals("<x><y xmlns='z' /></x>", Content);

 

 			Reset();

 			WriteStartElement("x");

 			WriteStartElement("y", "z", true);

 			WriteEndElement();

 			WriteEndElement();

-			Assert.AreEqual ("<x><q1:y xmlns:q1='z' /></x>", Content);

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_Base64Binary ()

-		{

-			byte[] byteArray = new byte[] { 255, 20, 10, 5, 0, 7 };

-			string expected = "/xQKBQAH";

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", ANamespace, expected),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x>{0}</x>", expected), xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x>{0}</x>", expected), xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", XmlSchemaNamespace, expected),

-				xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", XmlSchemaInstanceNamespace, expected),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>{1}</>", ANamespace, expected), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, byteArray, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<base64Binary xmlns='{0}'>{1}</base64Binary>",

-				XmlSchemaNamespace, expected), xsw.Content, "#7");

-		}

-

-		[Test]

-		public void TestWriteTypedPrimitive_Base64Binary_XsiType ()

-		{

-			byte[] byteArray = new byte[] { 255, 20, 10, 5, 0, 7 };

-			string expected = "/xQKBQAH";

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, byteArray, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:base64Binary' xmlns:d1p1='{1}'>{2}</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, expected), 

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, byteArray, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:base64Binary' xmlns:d1p1='{1}'>{2}</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, expected),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_Boolean ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>true</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, false, false);

-			Assert.AreEqual ("<x>false</x>", xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, true, false);

-			Assert.AreEqual ("<x>true</x>", xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, false, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>false</x>", XmlSchemaNamespace), xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>true</x>", XmlSchemaInstanceNamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, false, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>false</>", ANamespace), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, true, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<boolean xmlns='{0}'>true</boolean>", XmlSchemaNamespace),

-				xsw.Content, "#7");

-		}

-

-		[Test]

-		public void TestWriteTypedPrimitive_Boolean_XsiType ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, true, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:boolean' xmlns:d1p1='{1}'>true</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, false, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:boolean' xmlns:d1p1='{1}'>false</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_Char ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, 'c', false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>99</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, 'a', false);

-			Assert.AreEqual ("<x>97</x>", xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, 'b', false);

-			Assert.AreEqual ("<x>98</x>", xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, 'd', false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>100</x>", XmlSchemaNamespace), xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, 'e', false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>101</x>", XmlSchemaInstanceNamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, ' ', false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>32</>", ANamespace), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, '0', false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<char xmlns='{0}'>48</char>", WsdlTypesNamespace),

-				xsw.Content, "#7");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // namespace should be wsdl types ns

-		public void TestWriteTypedPrimitive_Char_XsiType ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, 'c', true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:char' xmlns:d1p1='{1}'>99</x>",

-				WsdlTypesNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, 'a', true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:char' xmlns:d1p1='{1}'>97</x>",

-				WsdlTypesNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_DateTime ()

-		{

-			DateTime dateTime = new DateTime (1973, 08, 13);

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", ANamespace, FromDateTime (dateTime)),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x>{0}</x>", FromDateTime (dateTime)), xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x>{0}</x>", FromDateTime (dateTime)), xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", XmlSchemaNamespace, 

-				FromDateTime (dateTime)), xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", XmlSchemaInstanceNamespace,

-				FromDateTime (dateTime)), xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>{1}</>", ANamespace, FromDateTime (dateTime)),

-				xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, dateTime, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<dateTime xmlns='{0}'>{1}</dateTime>", XmlSchemaNamespace,

-				FromDateTime (dateTime)), xsw.Content, "#7");

-		}

-

-		[Test]

-		public void TestWriteTypedPrimitive_DateTime_XsiType ()

-		{

-			DateTime dateTime = new DateTime (1973, 08, 13);

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, dateTime, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:dateTime' xmlns:d1p1='{1}'>{2}</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, 

-				FromDateTime (dateTime)), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, dateTime, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:dateTime' xmlns:d1p1='{1}'>{2}</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace,

-				FromDateTime (dateTime)), xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // enum name is output instead of integral value

-		public void TestWriteTypedPrimitive_Enum ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, EnumDefaultValue.e1, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>1</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, EnumDefaultValue.e2, false);

-			Assert.AreEqual ("<x>2</x>", xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, EnumDefaultValue.e3, false);

-			Assert.AreEqual ("<x>3</x>", xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, EnumDefaultValue.e1, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>1</x>", XmlSchemaNamespace), xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, EnumDefaultValue.e2, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>2</x>", XmlSchemaInstanceNamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, EnumDefaultValue.e3, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>3</>", ANamespace), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, EnumDefaultValue.e2, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<int xmlns='{0}'>2</int>", XmlSchemaNamespace),

-				xsw.Content, "#7");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // InvalidOperationException is thrown

-		public void TestWriteTypedPrimitive_Enum_XsiType ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, EnumDefaultValue.e1, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:int' xmlns:d1p1='{1}'>1</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, EnumDefaultValue.e2, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:int' xmlns:d1p1='{1}'>2</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_Guid ()

-		{

-			Guid guid = new Guid ("CA761232-ED42-11CE-BACD-00AA0057B223");

-			string expectedGuid = "ca761232-ed42-11ce-bacd-00aa0057b223";

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", ANamespace, expectedGuid), 

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x>{0}</x>", expectedGuid), xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x>{0}</x>", expectedGuid), xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", XmlSchemaNamespace, expectedGuid),

-				xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>{1}</x>", XmlSchemaInstanceNamespace, expectedGuid),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>{1}</>", ANamespace, expectedGuid), 

-				xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, guid, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<guid xmlns='{0}'>{1}</guid>", WsdlTypesNamespace, 

-				expectedGuid), xsw.Content, "#7");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // namespace should be wsdl types ns

-		public void TestWriteTypedPrimitive_Guid_XsiType ()

-		{

-			Guid guid = new Guid ("CA761232-ED42-11CE-BACD-00AA0057B223");

-			string expectedGuid = "ca761232-ed42-11ce-bacd-00aa0057b223";

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, guid, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:guid' xmlns:d1p1='{1}'>{2}</x>",

-				WsdlTypesNamespace, XmlSchemaInstanceNamespace, expectedGuid),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, guid, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:guid' xmlns:d1p1='{1}'>{2}</x>",

-				WsdlTypesNamespace, XmlSchemaInstanceNamespace, expectedGuid),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_Int ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, 76665, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>76665</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, -5656, false);

-			Assert.AreEqual ("<x>-5656</x>", xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, 0, false);

-			Assert.AreEqual ("<x>0</x>", xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, 534, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>534</x>", XmlSchemaNamespace), xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, -6756, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>-6756</x>", XmlSchemaInstanceNamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, 434, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>434</>", ANamespace), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, 434, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<int xmlns='{0}'>434</int>", XmlSchemaNamespace),

-				xsw.Content, "#7");

-		}

-

-		[Test]

-		public void TestWriteTypedPrimitive_Int_XsiType ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, -6756, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:int' xmlns:d1p1='{1}'>-6756</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, 434, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:int' xmlns:d1p1='{1}'>434</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #8 fails

-		public void TestWriteTypedPrimitive_String ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, "hello", false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>hello</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, "hello", false);

-			Assert.AreEqual ("<x>hello</x>", xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, "hello", false);

-			Assert.AreEqual ("<x>hello</x>", xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, "hello", false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>hello</x>", XmlSchemaNamespace),

-				xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, "hello", false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>hello</x>", XmlSchemaInstanceNamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, string.Empty, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}' />", ANamespace), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, "<\"te'st\">", false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>&lt;\"te'st\"&gt;</>", ANamespace),

-				xsw.Content, "#7");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, "hello", false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<string xmlns='{0}'>hello</string>", XmlSchemaNamespace),

-				xsw.Content, "#8");

-		}

-

-		[Test]

-		public void TestWriteTypedPrimitive_String_XsiType ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, "hello", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:string' xmlns:d1p1='{1}'>hello</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace), 

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, "hello", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:string' xmlns:d1p1='{1}'>hello</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#2");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // order of namespace declaration differs from that of MSFT

-		public void TestWriteTypedPrimitive_String_XsiType_Namespace ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, "hello", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:string' xmlns:d1p1='{1}' xmlns='{2}'>hello</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, ANamespace),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, "hello", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='string' xmlns:d1p1='{0}' xmlns='{1}'>hello</x>",

-				XmlSchemaInstanceNamespace, XmlSchemaNamespace),

-				xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, "hello", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:string' xmlns:d1p1='{1}' xmlns='{1}'>hello</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace), xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, string.Empty, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q3='{0}' d1p1:type='q3:string' xmlns:d1p1='{1}' xmlns='{2}' />",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, ANamespace),

-				xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, "<\"te'st\">", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns:q4='{0}' d1p1:type='q4:string' xmlns:d1p1='{1}' xmlns='{2}'>&lt;\"te'st\"&gt;</>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, ANamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, "hello", true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<string d1p1:type='string' xmlns:d1p1='{0}' xmlns='{1}'>hello</string>",

-				XmlSchemaInstanceNamespace, XmlSchemaNamespace), 

-				xsw.Content, "#6");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // #7 fails

-		public void TestWriteTypedPrimitive_UnsignedByte ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, (byte) 5, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>5</x>", ANamespace), xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, (byte) 125, false);

-			Assert.AreEqual ("<x>125</x>", xsw.Content, "#2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, (byte) 0, false);

-			Assert.AreEqual ("<x>0</x>", xsw.Content, "#3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, (byte) 255, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>255</x>", XmlSchemaNamespace), xsw.Content, "#4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, (byte) 128, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>128</x>", XmlSchemaInstanceNamespace),

-				xsw.Content, "#5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, (byte) 1, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>1</>", ANamespace), xsw.Content, "#6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, (byte) 99, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<unsignedByte xmlns='{0}'>99</unsignedByte>",

-				XmlSchemaNamespace), xsw.Content, "#7");

-		}

-

-		[Test]

-		public void TestWriteTypedPrimitive_UnsignedByte_XsiType ()

-		{

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, (byte) 5, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' d1p1:type='q1:unsignedByte' xmlns:d1p1='{1}'>5</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, (byte) 99, true);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:unsignedByte' xmlns:d1p1='{1}'>99</x>",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				xsw.Content, "#2");

+			Assertion.AssertEquals("<x><q1:y xmlns:q1='z' /></x>", Content);

 		}

-

-		[Test]

-		[Category ("NotWorking")] // #A7 fails

-		public void TestWriteTypedPrimitive_XmlQualifiedName ()

+		

+		public void TestWriteTypedPrimitive()

 		{

-			XmlQualifiedName qname = new XmlQualifiedName ("something", AnotherNamespace);

-

-			XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q1='{0}' xmlns='{1}'>q1:something</x>", 

-				AnotherNamespace, ANamespace), xsw.Content, "#A1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}'>q2:something</x>",

-				AnotherNamespace), xsw.Content, "#A2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q3='{0}'>q3:something</x>", AnotherNamespace), 

-				xsw.Content, "#A3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q4='{0}' xmlns='{1}'>q4:something</x>", AnotherNamespace, 

-				XmlSchemaNamespace), xsw.Content, "#A4");

-

-			xsw.Reset ();

+			// as long as WriteTypePrimitive's last argument is false, this is OK here.

+			WriteTypedPrimitive("x", ANamespace, "hello", false);

+			Assertion.AssertEquals("<x xmlns='some:urn'>hello</x>", Content);

 

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q5='{0}' xmlns='{1}'>q5:something</x>", AnotherNamespace, 

-				XmlSchemaInstanceNamespace), xsw.Content, "#A5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns:q6='{0}' xmlns='{1}'>q6:something</>", AnotherNamespace,

-				ANamespace), xsw.Content, "#A6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<QName xmlns:q7='{0}' xmlns='{1}'>q7:something</QName>",

-				AnotherNamespace, XmlSchemaNamespace), xsw.Content, "#A7");

-

-			xsw.Reset ();

-

-			qname = new XmlQualifiedName ("else");

-

-			xsw.ExecuteWriteTypedPrimitive ("x", ANamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>else</x>", ANamespace), xsw.Content, "#B1");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", string.Empty, qname, false);

-			Assert.AreEqual ("<x>else</x>", xsw.Content, "#B2");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", null, qname, false);

-			Assert.AreEqual ("<x>else</x>", xsw.Content, "#B3");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaNamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>else</x>", XmlSchemaNamespace), xsw.Content, "#B4");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive ("x", XmlSchemaInstanceNamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}'>else</x>", XmlSchemaInstanceNamespace), 

-				xsw.Content, "#B5");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (string.Empty, ANamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"< xmlns='{0}'>else</>", ANamespace), xsw.Content, "#B6");

-

-			xsw.Reset ();

-

-			xsw.ExecuteWriteTypedPrimitive (null, ANamespace, qname, false);

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<QName xmlns='{0}'>else</QName>", XmlSchemaNamespace), 

-				xsw.Content, "#B7");

-		}

-

-		[Test]

-		[ExpectedException (typeof (NullReferenceException))]

-		public void TestWriteTypedPrimitive_Null_Value()

-		{

-			WriteTypedPrimitive("x", ANamespace, null, false);

-		}

+			Reset();

+			WriteTypedPrimitive("x", ANamespace, 10, false);

+			Assertion.AssertEquals("<x xmlns='some:urn'>10</x>", Content);

 

-		[Test]

-		[Category ("NotWorking")] // InvalidOperatinException is not thrown

-		[ExpectedException (typeof (InvalidOperationException))]

-		public void TestWriteTypedPrimitive_NonPrimitive ()

-		{

-			// The type System.Version was not expected. Use the XmlInclude

-			// or SoapInclude attribute to specify types that are not known

-			// statically.

-			WriteTypedPrimitive ("x", ANamespace, new Version (), false);

+			try

+			{

+				WriteTypedPrimitive("x", ANamespace, null, false);

+				Assertion.Fail("Should not be able to write a null primitive");

+			}

+			catch (Exception)

+			{

+			}

 		}

 

-		[Test]

 		public void TestWriteValue()

 		{

 			WriteValue("");

-			Assert.AreEqual ("", Content);

+			Assertion.AssertEquals("", Content);

 

 			Reset();

 			WriteValue("hello");

-			Assert.AreEqual ("hello", Content);

+			Assertion.AssertEquals("hello", Content);

 

 			Reset();

 			string v = null;

 			WriteValue(v);

-			Assert.AreEqual ("", Content);

+			Assertion.AssertEquals("", Content);

 

 			Reset();

 			WriteValue(new byte[] {13, 8, 99});

-			Assert.AreEqual ("DQhj", Content);

+			Assertion.AssertEquals("DQhj", Content);

 		}

 

 		public void TestWriteXmlAttribute()

@@ -1405,158 +438,12 @@ namespace MonoTests.System.XmlSerialization
 			// XmlNode related

 		}

 

-		[Test]

 		public void TestWriteXsiType()

 		{

 			WriteStartElement("x");

 			WriteXsiType("pref", null);

 			WriteEndElement();

-			Assert.AreEqual (string.Format(CultureInfo.InvariantCulture,

-				"<x d1p1:type='pref' xmlns:d1p1='{0}' />", XmlSchemaInstanceNamespace),

-				Content, "#1");

-

-			Reset ();

-

-			WriteStartElement ("x");

-			WriteXsiType ("int", XmlSchemaNamespace);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format(CultureInfo.InvariantCulture,

-				"<x xmlns:q2='{0}' d1p1:type='q2:int' xmlns:d1p1='{1}' />",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace),

-				Content, "#2");

-

-			Reset ();

-

-			WriteStartElement ("x");

-			WriteXsiType ("int", ANamespace);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q3='{0}' d1p1:type='q3:int' xmlns:d1p1='{1}' />",

-				ANamespace, XmlSchemaInstanceNamespace), Content, "#3");

-

-			Reset ();

-

-			WriteStartElement ("x");

-			WriteXsiType ("int", XmlSchemaInstanceNamespace);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q4='{0}' q4:type='q4:int' />",

-				XmlSchemaInstanceNamespace), Content, "#4");

-

-			Reset ();

-

-			WriteStartElement ("x");

-			WriteXsiType ("int", string.Empty);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='int' xmlns:d1p1='{0}' />", XmlSchemaInstanceNamespace),

-				Content, "#5");

-

-			Reset ();

-

-			WriteStartElement ("x");

-			WriteXsiType (string.Empty, null);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='' xmlns:d1p1='{0}' />", XmlSchemaInstanceNamespace),

-				Content, "#6");

-

-			Reset ();

-

-			WriteStartElement ("x");

-			WriteXsiType (null, null);

-			WriteEndElement ();

-			Assert.AreEqual ("<x />", Content, "#7");

-		}

-

-		[Test]

-		[Category ("NotWorking")] // order of namespace declaration differs from that of MSFT

-		public void TestWriteXsiType_Namespace ()

-		{

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType ("pref", null);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='pref' xmlns:d1p1='{0}' xmlns='{1}' />", 

-				XmlSchemaInstanceNamespace, ANamespace), Content, "#1");

-

-			Reset ();

-

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType ("int", XmlSchemaNamespace);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q5='{0}' d1p1:type='q5:int' xmlns:d1p1='{1}' xmlns='{2}' />",

-				XmlSchemaNamespace, XmlSchemaInstanceNamespace, ANamespace),

-				Content, "#2");

-

-			Reset ();

-

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType ("int", ANamespace);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='int' xmlns:d1p1='{1}' xmlns='{2}' />",

-				ANamespace, XmlSchemaInstanceNamespace, ANamespace), 

-				Content, "#3");

-

-			Reset ();

-

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType ("int", XmlSchemaInstanceNamespace);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns:q6='{0}' q6:type='q6:int' xmlns='{1}' />",

-				XmlSchemaInstanceNamespace, ANamespace), Content, "#4");

-

-			Reset ();

-

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType ("int", string.Empty);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='int' xmlns:d1p1='{0}' xmlns='{1}' />",

-				XmlSchemaInstanceNamespace, ANamespace), Content, "#5");

-

-			Reset ();

-

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType (string.Empty, null);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x d1p1:type='' xmlns:d1p1='{0}' xmlns='{1}' />",

-				XmlSchemaInstanceNamespace, ANamespace), Content, "#6");

-

-			Reset ();

-

-			WriteStartElement ("x", ANamespace);

-			WriteXsiType (null, null);

-			WriteEndElement ();

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<x xmlns='{0}' />", ANamespace), Content, "#7");

-		}

-

-

-#if NET_2_0

-		[Test]

-		public void TestFromEnum_Null_TypeName ()

-		{

-			string[] values = { "one", "two", "three", "four" };

-			long[] ids = { 1, 2, 3, 4 };

-

-			Assert.AreEqual ("one", FromEnum (1, values, ids, (string) null));

-		}

-

-		[Test]

-		public void TestCreateInvalidEnumValueException ()

-		{

-			Exception ex = CreateInvalidEnumValueException("AnInvalidValue", "SomeType");

-			Assert.IsNotNull (ex, "#1");

-			Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");

-			Assert.IsNotNull (ex.Message, "#3");

-			Assert.IsTrue (ex.Message.IndexOf ("AnInvalidValue") != -1, "#4");

-			Assert.IsTrue (ex.Message.IndexOf ("SomeType") != -1, "#5");

+			Assertion.AssertEquals(XmlSerializerTests.Infoset("<x d1p1:type='pref' xmlns:d1p1='http://www.w3.org/2001/XMLSchema-instance' />"), XmlSerializerTests.Infoset(Content));

 		}

-#endif

 	}

 }

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs
index e61d4cfeb7a..18284a688f3 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs
@@ -12,9 +12,8 @@
 using System;

 using System.ComponentModel;

 using System.Collections;

-using System.Xml;

-using System.Xml.Schema;

 using System.Xml.Serialization;

+using System.Xml;

 

 namespace MonoTests.System.Xml.TestClasses

 {

@@ -23,28 +22,6 @@ namespace MonoTests.System.Xml.TestClasses
 	[Flags]

 	public enum EnumDefaultValue { e1 = 1, e2 = 2, e3 = 3 }

 	public enum EnumDefaultValueNF { e1 = 1, e2 = 2, e3 = 3 }

-

-	[Flags]

-	public enum FlagEnum { 

-		[XmlEnum ("one")]

-		e1 = 1,

-		[XmlEnum ("two")]

-		e2 = 2,

-		[XmlEnum ("four")]

-		e4 = 4 }

-

-	[Flags]

-	public enum ZeroFlagEnum {

-		[XmlEnum ("zero")]

-		e0 = 0,

-		[XmlEnum ("o<n>e")]

-		e1 = 1,

-		[XmlEnum ("tns:t<w>o")]

-		e2 = 2,

-		[XmlEnum ("four")]

-		[XmlIgnore]

-		e4 = 4

-	}

 	

 	public class SimpleClass

 	{

@@ -103,23 +80,6 @@ namespace MonoTests.System.Xml.TestClasses
 	{

 		[XmlAttribute("modifiers")]

 		public MapModifiers Modifiers;

-

-		[XmlAttribute ("modifiers2", Form=XmlSchemaForm.Unqualified)]

-		public MapModifiers Modifiers2;

-

-		[XmlAttribute ("modifiers3")]

-		[DefaultValue (0)]

-		public MapModifiers Modifiers3;

-

-		[XmlAttribute ("modifiers4", Form=XmlSchemaForm.Unqualified)]

-		[DefaultValue (0)]

-		public MapModifiers Modifiers4;

-

-		[XmlAttribute ("names")]

-		public string[] Names;

-

-		[XmlAttribute ("street")]

-		public string Street;

 	}

 

 	[Flags]

@@ -130,7 +90,7 @@ namespace MonoTests.System.Xml.TestClasses
 		[XmlEnum("protected")]

 		Protected = 1,

 	}

-

+	

 	public class MyList : ArrayList

 	{

 		object container;

@@ -161,37 +121,37 @@ namespace MonoTests.System.Xml.TestClasses
 		public Container2 (bool b) {

 			Items = new MyList(this);

 		}

-	}

-

-	public class MyElem: XmlElement

-	{

-		public MyElem (XmlDocument doc): base ("","myelem","", doc)

-		{

-			SetAttribute ("aa","1");

-		}

-

-		[XmlAttribute]

-		public int kk=1;

-	}

-

-	public class MyDocument: XmlDocument

-	{

-		public MyDocument ()

-		{

-		}

-

-		[XmlAttribute]

-		public int kk=1;

-	}

-	

-	public class CDataContainer

-	{

-		public XmlCDataSection cdata;

-	}

-	

-	public class NodeContainer

-	{

-		public XmlNode node;

+	}
+

+	public class MyElem: XmlElement
+	{
+		public MyElem (XmlDocument doc): base ("","myelem","", doc)
+		{
+			SetAttribute ("aa","1");
+		}
+
+		[XmlAttribute]
+		public int kk=1;
+	}
+

+	public class MyDocument: XmlDocument
+	{
+		public MyDocument ()
+		{
+		}
+
+		[XmlAttribute]
+		public int kk=1;
+	}
+	
+	public class CDataContainer
+	{
+		public XmlCDataSection cdata;
+	}
+	
+	public class NodeContainer
+	{
+		public XmlNode node;
 	}

 	

 	public class Choices

@@ -225,72 +185,72 @@ namespace MonoTests.System.Xml.TestClasses
 

 		[XmlIgnore]

 		public ItemChoiceType ItemType;

-	}

-	

-	[XmlType ("Type with space")]

-	public class TestSpace

-	{

-	   [XmlElement (ElementName = "Element with space")]

-	   public int elem;

-	    

-	   [XmlAttribute (AttributeName = "Attribute with space")]

-	   public int attr; 

-	}

-

-	[Serializable]

-	public class ReadOnlyProperties {

-		string[] strArr = new string[2] { "string1", "string2" };

-

-		public string[] StrArr {

-			get { return strArr; }

-		}

-		

-		public string dat {

-			get { return "fff"; }

-		} 

-	}

-	

-	[XmlRoot("root")]

-	public class ListDefaults

-	{

-		public ListDefaults ()

-		{

-			ed = new SimpleClass ();

-			str = "hola";

-		}

-		

-	    public ArrayList list2;

-	    

-	    public MyList list3;

-	    

-	    public string[] list4;

-	    

-		[XmlElement("e", typeof(SimpleClass))]

-	    public ArrayList list5;

-	    

-		[DefaultValue (null)]

-	    public SimpleClass ed;

-	    

-		[DefaultValue (null)]

-	    public string str; 

-	}

-	

-	public class clsPerson

-	{

-		public IList EmailAccounts;

-	}

-	

-	public class ArrayClass

-	{

-		public object names = new object[] { "un","dos" };

-	}

-	

-	public class CompositeValueType

-	{

-		public void Init ()

-		{

-	   		Items = new object[] { 1, 2 };

-	   		ItemsElementName = new ItemsChoiceType[] { ItemsChoiceType.In, ItemsChoiceType.Es };

+	}
+	
+	[XmlType ("Type with space")]
+	public class TestSpace
+	{
+	   [XmlElement (ElementName = "Element with space")]
+	   public int elem;
+	    
+	   [XmlAttribute (AttributeName = "Attribute with space")]
+	   public int attr; 
+	}
+

+	[Serializable]
+	public class ReadOnlyProperties {
+		string[] strArr = new string[2] { "string1", "string2" };
+
+		public string[] StrArr {
+			get { return strArr; }
+		}
+		
+		public string dat {
+			get { return "fff"; }
+		} 
+	}
+	
+	[XmlRoot("root")]
+	public class ListDefaults
+	{
+		public ListDefaults ()
+		{
+			ed = new SimpleClass ();
+			str = "hola";
+		}
+		
+	    public ArrayList list2;
+	    
+	    public MyList list3;
+	    
+	    public string[] list4;
+	    
+		[XmlElement("e", typeof(SimpleClass))]
+	    public ArrayList list5;
+	    
+		[DefaultValue (null)]
+	    public SimpleClass ed;
+	    
+		[DefaultValue (null)]
+	    public string str; 
+	}
+	
+	public class clsPerson
+	{
+		public IList EmailAccounts;
+	}
+	
+	public class ArrayClass
+	{
+		public object names = new object[] { "un","dos" };
+	}
+	
+	public class CompositeValueType
+	{
+		public void Init ()
+		{
+	   		Items = new object[] { 1, 2 };
+	   		ItemsElementName = new ItemsChoiceType[] { ItemsChoiceType.In, ItemsChoiceType.Es };
 		}

 	   

 		[XmlElementAttribute("Es", typeof(int))]

@@ -302,225 +262,174 @@ namespace MonoTests.System.Xml.TestClasses
 		[XmlIgnoreAttribute()]

 		public ItemsChoiceType[] ItemsElementName;

 	}

-

+
 	public enum ItemsChoiceType {

 	   In, Es

-	}

-	

-	public class ArrayAttributeWithType

-	{

-		[XmlAttribute (DataType="anyURI")]

-		public string[] at = new string [] { "a","b" };

-

-		[XmlAttribute (DataType="base64Binary")]

-		public byte[][] bin1 = new byte[][] { new byte[]{1,2},  new byte[]{1,2}};

-		

-		[XmlAttribute (DataType="base64Binary")]

-		public byte[] bin2 = new byte[] { 1,2 };

-	}

-	

-	public class ArrayAttributeWithWrongType

-	{

-		[XmlAttribute (DataType="int")]

-		public string[] at = new string [] { "a","b" };

-	}

-	

-	[XmlType ("Container")]

-	public class EntityContainer

-	{

-		EntityCollection collection1;

-		EntityCollection collection2;

-		EntityCollection collection3 = new EntityCollection ("root");

-		EntityCollection collection4 = new EntityCollection ("root");

-		

-		[XmlArray (IsNullable=true)]

-		public EntityCollection Collection1 {

-			get { return collection1; }

-			set { collection1 = value; collection1.Container = "assigned"; }

-		}

-		

-		[XmlArray (IsNullable=false)]

-		public EntityCollection Collection2 {

-			get { return collection2; }

-			set { collection2 = value; collection2.Container = "assigned"; }

-		}

-		

-		[XmlArray (IsNullable=true)]

-		public EntityCollection Collection3 {

-			get { return collection3; }

-			set { collection3 = value; collection3.Container = "assigned"; }

-		}

-		

-		[XmlArray (IsNullable=false)]

-		public EntityCollection Collection4 {

-			get { return collection4; }

-			set { collection4 = value; collection4.Container = "assigned"; }

-		}

-	}

-	

-	[XmlType ("Container")]

-	public class ArrayEntityContainer

-	{

-		Entity[] collection1;

-		Entity[] collection2;

-		Entity[] collection3 = new Entity [0];

-		Entity[] collection4 = new Entity [0];

-		

-		[XmlArray (IsNullable=true)]

-		public Entity[] Collection1 {

-			get { return collection1; }

-			set { collection1 = value; }

-		}

-		

-		[XmlArray (IsNullable=false)]

-		public Entity[] Collection2 {

-			get { return collection2; }

-			set { collection2 = value; }

-		}

-		

-		[XmlArray (IsNullable=true)]

-		public Entity[] Collection3 {

-			get { return collection3; }

-			set { collection3 = value; }

-		}

-		

-		[XmlArray (IsNullable=false)]

-		public Entity[] Collection4 {

-			get { return collection4; }

-			set { collection4 = value; }

-		}

-	}

-	

-	public class Entity

-	{

-		private string _name = string.Empty;

-		private string _parent = null;

-

-		[XmlAttribute]

-		public string Name {

-			get { return _name; }

-			set { _name = value; }

-		}

-

-		[XmlIgnore] 

-		public string Parent {

-			get { return _parent; }

-			set { _parent = value; }

-		}

-	}

-

-	public class EntityCollection : ArrayList

-	{

-		public string _container;

-

-		public EntityCollection ()

-		{

-		}

-

-		public EntityCollection (string c)

-		{

-			_container = c;

-		}

-

-		public string Container {

-			get { return _container; }

-			set { _container = value; }

-		}

-

-		public int Add (Entity value)

-		{

-			if(_container != null)

-				value.Parent = _container;

-

-			return base.Add(value);

-		}

-

-		public new Entity this[int index]

-		{

-			get { return (Entity) base[index]; }

-			set { base[index] = value; }

-		}

-	}

-	

-	[XmlType ("Container")]

-	public class ObjectWithReadonlyCollection

-	{

-		EntityCollection collection1 = new EntityCollection ("root");

-		

-		public EntityCollection Collection1 {

-			get { return collection1; }

-		}

-	}

-	

-	[XmlType ("Container")]

-	public class ObjectWithReadonlyNulCollection

-	{

-		EntityCollection collection1;

-		

-		public EntityCollection Collection1 {

-			get { return collection1; }

-		}

-	}

-	

-	[XmlType ("Container")]

-	public class ObjectWithReadonlyArray

-	{

-		Entity[] collection1 = new Entity [0];

-		

-		public Entity[] Collection1 {

-			get { return collection1; }

-		}

-	}

-	

-	[XmlInclude (typeof(SubclassTestSub))]

-	public class SubclassTestBase

-	{

-	}

-	

-	public class SubclassTestSub: SubclassTestBase

-	{

-	}

-	

-	public class SubclassTestExtra

-	{

-	}

-	

-	public class SubclassTestContainer

-	{

-		[XmlElement ("a", typeof(SubclassTestBase))]

-		[XmlElement ("b", typeof(SubclassTestExtra))]

-		public object data;

-	}

-

-	public class DictionaryWithIndexer : DictionaryBase

-	{

-		public TimeSpan this[int index] {

-			get { return TimeSpan.MinValue; }

-		}

-

-		public void Add (TimeSpan value)

-		{

-		}

-	}

-

-	[XmlRoot(Namespace="some:urn")]

-	[SoapTypeAttribute (Namespace="another:urn")]

-	public class PrimitiveTypesContainer

-	{

-		public PrimitiveTypesContainer ()

-		{

-			Number = 2004;

-			Name = "some name";

-			Index = (byte) 56;

-			Password = new byte[] { 243, 15 };

-			PathSeparatorCharacter = '/';

-		}

-

-		public int Number;

-		public string Name;

-		public byte Index;

-		public byte[] Password;

-		public char PathSeparatorCharacter;

-	}

+	}
+	
+	public class ArrayAttributeWithType
+	{
+		[XmlAttribute (DataType="anyURI")]
+		public string[] at = new string [] { "a","b" };
+
+		[XmlAttribute (DataType="base64Binary")]
+		public byte[][] bin1 = new byte[][] { new byte[]{1,2},  new byte[]{1,2}};
+		
+		[XmlAttribute (DataType="base64Binary")]
+		public byte[] bin2 = new byte[] { 1,2 };
+	}
+	
+	public class ArrayAttributeWithWrongType
+	{
+		[XmlAttribute (DataType="int")]
+		public string[] at = new string [] { "a","b" };
+	}
+	
+	[XmlType ("Container")]
+	public class EntityContainer
+	{
+		EntityCollection collection1;
+		EntityCollection collection2;
+		EntityCollection collection3 = new EntityCollection ("root");
+		EntityCollection collection4 = new EntityCollection ("root");
+		
+		[XmlArray (IsNullable=true)]
+		public EntityCollection Collection1 {
+			get { return collection1; }
+			set { collection1 = value; collection1.Container = "assigned"; }
+		}
+		
+		[XmlArray (IsNullable=false)]
+		public EntityCollection Collection2 {
+			get { return collection2; }
+			set { collection2 = value; collection2.Container = "assigned"; }
+		}
+		
+		[XmlArray (IsNullable=true)]
+		public EntityCollection Collection3 {
+			get { return collection3; }
+			set { collection3 = value; collection3.Container = "assigned"; }
+		}
+		
+		[XmlArray (IsNullable=false)]
+		public EntityCollection Collection4 {
+			get { return collection4; }
+			set { collection4 = value; collection4.Container = "assigned"; }
+		}
+	}
+	
+	[XmlType ("Container")]
+	public class ArrayEntityContainer
+	{
+		Entity[] collection1;
+		Entity[] collection2;
+		Entity[] collection3 = new Entity [0];
+		Entity[] collection4 = new Entity [0];
+		
+		[XmlArray (IsNullable=true)]
+		public Entity[] Collection1 {
+			get { return collection1; }
+			set { collection1 = value; }
+		}
+		
+		[XmlArray (IsNullable=false)]
+		public Entity[] Collection2 {
+			get { return collection2; }
+			set { collection2 = value; }
+		}
+		
+		[XmlArray (IsNullable=true)]
+		public Entity[] Collection3 {
+			get { return collection3; }
+			set { collection3 = value; }
+		}
+		
+		[XmlArray (IsNullable=false)]
+		public Entity[] Collection4 {
+			get { return collection4; }
+			set { collection4 = value; }
+		}
+	}
+	
+	public class Entity
+	{
+		private string _name = string.Empty;
+		private string _parent = null;
+
+		[XmlAttribute]
+		public string Name {
+			get { return _name; }
+			set { _name = value; }
+		}
+
+		[XmlIgnore] 
+		public string Parent {
+			get { return _parent; }
+			set { _parent = value; }
+		}
+	}
+
+	public class EntityCollection : ArrayList
+	{
+		public string _container;
+
+		public EntityCollection ()
+		{
+		}
+
+		public EntityCollection (string c)
+		{
+			_container = c;
+		}
+
+		public string Container {
+			get { return _container; }
+			set { _container = value; }
+		}
+
+		public int Add (Entity value)
+		{
+			if(_container != null)
+				value.Parent = _container;
+
+			return base.Add(value);
+		}
+
+		public new Entity this[int index]
+		{
+			get { return (Entity) base[index]; }
+			set { base[index] = value; }
+		}
+	}
+	
+	[XmlType ("Container")]
+	public class ObjectWithReadonlyCollection
+	{
+		EntityCollection collection1 = new EntityCollection ("root");
+		
+		public EntityCollection Collection1 {
+			get { return collection1; }
+		}
+	}
+	
+	[XmlType ("Container")]
+	public class ObjectWithReadonlyNulCollection
+	{
+		EntityCollection collection1;
+		
+		public EntityCollection Collection1 {
+			get { return collection1; }
+		}
+	}
+	
+	[XmlType ("Container")]
+	public class ObjectWithReadonlyArray
+	{
+		Entity[] collection1 = new Entity [0];
+		
+		public Entity[] Collection1 {
+			get { return collection1; }
+		}
+	}
 }

-

+
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
index 674d8fd2663..722698e3b89 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
@@ -39,15 +39,8 @@ using MonoTests.System.Xml.TestClasses;
 namespace MonoTests.System.XmlSerialization

 {

 	[TestFixture]

-	public class XmlSerializerTests

+	public class XmlSerializerTests : Assertion

 	{

-		const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";

-		const string XmlSchemaInstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";

-		const string SoapEncodingNamespace = "http://schemas.xmlsoap.org/soap/encoding/";

-		const string WsdlTypesNamespace = "http://microsoft.com/wsdl/types/";

-		const string ANamespace = "some:urn";

-		const string AnotherNamespace = "another:urn";

-

 		StringWriter sw;

 		XmlTextWriter xtw;

 		XmlSerializer xs;

@@ -105,27 +98,7 @@ namespace MonoTests.System.XmlSerialization
 			xs = new XmlSerializer(o.GetType(), root);

 			xs.Serialize(xtw, o);

 		}

-

-		private void Serialize (object o, XmlTypeMapping typeMapping)

-		{

-			SetUpWriter ();

-			xs = new XmlSerializer (typeMapping);

-			xs.Serialize (xtw, o);

-		}

-

-		private void SerializeEncoded (object o)

-		{

-			SerializeEncoded (o, o.GetType ());

-		}

-

-		private void SerializeEncoded (object o, Type type)

-		{

-			XmlTypeMapping mapping = CreateSoapMapping (type);

-			SetUpWriter ();

-			xs = new XmlSerializer (mapping);

-			xs.Serialize (xtw, o);

-		}

-

+		

 		// test constructors

 #if USE_VERSION_1_1	// It doesn't pass on MS.NET 1.1.

 		[Test]

@@ -141,38 +114,38 @@ namespace MonoTests.System.XmlSerialization
 		public void TestSerializeInt()

 		{

 			Serialize(10);

-			Assert.AreEqual (Infoset("<int>10</int>"), WriterText);

+			AssertEquals(Infoset("<int>10</int>"), WriterText);

 		}

 

 		[Test]

 		public void TestSerializeBool()

 		{

 			Serialize(true);

-			Assert.AreEqual (Infoset ("<boolean>true</boolean>"), WriterText);

+			AssertEquals(Infoset("<boolean>true</boolean>"), WriterText);

 			

 			Serialize(false);

-			Assert.AreEqual (Infoset ("<boolean>false</boolean>"), WriterText);

+			AssertEquals(Infoset("<boolean>false</boolean>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeString()

 		{

 			Serialize("hello");

-			Assert.AreEqual (Infoset ("<string>hello</string>"), WriterText);

+			AssertEquals(Infoset("<string>hello</string>"), WriterText);

 		}

 

 		[Test]

 		public void TestSerializeEmptyString()

 		{

 			Serialize(String.Empty);

-			Assert.AreEqual (Infoset ("<string />"), WriterText);

+			AssertEquals(Infoset("<string />"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeNullObject()

 		{

 			Serialize(null, typeof(object));

-			Assert.AreEqual (Infoset ("<anyType xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />"), WriterText);

+			AssertEquals(Infoset("<anyType xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />"), WriterText);

 		}

 

 		[Test]

@@ -180,499 +153,100 @@ namespace MonoTests.System.XmlSerialization
 		public void TestSerializeNullString()

 		{

 			Serialize(null, typeof(string));

-			Assert.AreEqual (Infoset ("<string xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />"), WriterText);

+			Console.WriteLine (WriterText);

+			AssertEquals (Infoset("<string xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:nil='true' />"), WriterText);

 		}

 			

 		[Test]

 		public void TestSerializeIntArray()

 		{

 			Serialize(new int[] {1, 2, 3, 4});

-			Assert.AreEqual (Infoset ("<ArrayOfInt xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><int>1</int><int>2</int><int>3</int><int>4</int></ArrayOfInt>"), WriterText);

+			AssertEquals (Infoset("<ArrayOfInt xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><int>1</int><int>2</int><int>3</int><int>4</int></ArrayOfInt>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeEmptyArray()

 		{

 			Serialize(new int[] {});

-			Assert.AreEqual (Infoset ("<ArrayOfInt xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<ArrayOfInt xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeChar()

 		{

 			Serialize('A');

-			Assert.AreEqual (Infoset ("<char>65</char>"), WriterText);

+			AssertEquals(Infoset("<char>65</char>"), WriterText);

 			

 			Serialize('\0');

-			Assert.AreEqual (Infoset ("<char>0</char>"), WriterText);

+			AssertEquals(Infoset("<char>0</char>"), WriterText);

 			

 			Serialize('\n');

-			Assert.AreEqual (Infoset ("<char>10</char>"), WriterText);

+			AssertEquals(Infoset("<char>10</char>"), WriterText);

 			

 			Serialize('\uFF01');

-			Assert.AreEqual (Infoset ("<char>65281</char>"), WriterText);

+			AssertEquals(Infoset("<char>65281</char>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeFloat()

 		{

 			Serialize(10.78);

-			Assert.AreEqual (Infoset ("<double>10.78</double>"), WriterText);

+			AssertEquals(Infoset("<double>10.78</double>"), WriterText);

 			

 			Serialize(-1e8);

-			Assert.AreEqual (Infoset ("<double>-100000000</double>"), WriterText);

+			AssertEquals(Infoset("<double>-100000000</double>"), WriterText);

 			

 			// FIXME test INF and other boundary conditions that may exist with floats

 		}

-

-		[Test]

-		[Category ("NotDotNet")] // bug #77501, will fail on .NET until we output name of constant

-		public void TestSerializeEnumeration_FromValue ()

-		{

-			Serialize ((int) SimpleEnumeration.SECOND, typeof (SimpleEnumeration));

-			Assert.AreEqual (

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<SimpleEnumeration>1</SimpleEnumeration>",

-				sw.ToString ());

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumeration_FromValue_Encoded ()

-		{

-			SerializeEncoded ((int) SimpleEnumeration.SECOND, typeof (SimpleEnumeration));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<SimpleEnumeration d1p1:type='SimpleEnumeration' xmlns:d1p1='{0}'>SECOND</SimpleEnumeration>",

-				XmlSchemaInstanceNamespace), sw.ToString ());

-		}

-

+		

+		

 		[Test]

 		public void TestSerializeEnumeration()

 		{

 			Serialize(SimpleEnumeration.FIRST);

-			Assert.AreEqual (Infoset ("<SimpleEnumeration>FIRST</SimpleEnumeration>"), WriterText, "#1");

+			AssertEquals(Infoset("<SimpleEnumeration>FIRST</SimpleEnumeration>"), WriterText);

 			

 			Serialize(SimpleEnumeration.SECOND);

-			Assert.AreEqual (Infoset ("<SimpleEnumeration>SECOND</SimpleEnumeration>"), WriterText, "#2");

-		}

-

-		[Test]

-		public void TestSerializeEnumeration_Encoded()

-		{

-			SerializeEncoded (SimpleEnumeration.FIRST);

-			Assert.AreEqual (string.Format(CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<SimpleEnumeration d1p1:type='SimpleEnumeration' xmlns:d1p1='{0}'>FIRST</SimpleEnumeration>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#B1");

-

-			SerializeEncoded (SimpleEnumeration.SECOND);

-			Assert.AreEqual (string.Format(CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<SimpleEnumeration d1p1:type='SimpleEnumeration' xmlns:d1p1='{0}'>SECOND</SimpleEnumeration>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#B2");

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValue ()

-		{

-			Serialize (new EnumDefaultValue ());

-			Assert.AreEqual (Infoset ("<EnumDefaultValue />"), WriterText, "#1");

-

-			Serialize (new SimpleEnumeration ());

-			Assert.AreEqual (Infoset ("<SimpleEnumeration>FIRST</SimpleEnumeration>"), WriterText, "#2");

-

-			Serialize (3, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>e3</EnumDefaultValue>"), WriterText, "#3");

-

-			Serialize (EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>e3</EnumDefaultValue>"), WriterText, "#4");

-

-			Serialize (EnumDefaultValue.e1 | EnumDefaultValue.e2, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>e3</EnumDefaultValue>"), WriterText, "#5");

-

-			Serialize (EnumDefaultValue.e1 | EnumDefaultValue.e2 | EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>e3</EnumDefaultValue>"), WriterText, "#6");

-

-			Serialize (EnumDefaultValue.e1 | EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>e3</EnumDefaultValue>"), WriterText, "#7");

-

-			Serialize (EnumDefaultValue.e2 | EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>e3</EnumDefaultValue>"), WriterText, "#8");

-

-			Serialize (3, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>one two</FlagEnum>"), WriterText, "#9");

-

-			Serialize (5, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>one four</FlagEnum>"), WriterText, "#10");

-

-			Serialize (FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>four</FlagEnum>"), WriterText, "#11");

-

-			Serialize (FlagEnum.e1 | FlagEnum.e2, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>one two</FlagEnum>"), WriterText, "#12");

-

-			Serialize (FlagEnum.e1 | FlagEnum.e2 | FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>one two four</FlagEnum>"), WriterText, "#13");

-

-			Serialize (FlagEnum.e1 | FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>one four</FlagEnum>"), WriterText, "#14");

-

-			Serialize (FlagEnum.e2 | FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (Infoset ("<FlagEnum>two four</FlagEnum>"), WriterText, "#15");

-

-			Serialize (3, typeof (EnumDefaultValueNF));

-			Assert.AreEqual (Infoset ("<EnumDefaultValueNF>e3</EnumDefaultValueNF>"), WriterText, "#16");

-

-			Serialize (EnumDefaultValueNF.e2, typeof (EnumDefaultValueNF));

-			Assert.AreEqual (Infoset ("<EnumDefaultValueNF>e2</EnumDefaultValueNF>"), WriterText, "#17");

-

-			Serialize (2, typeof (ZeroFlagEnum));

-			Assert.AreEqual (Infoset ("<ZeroFlagEnum>tns:t&lt;w&gt;o</ZeroFlagEnum>"), WriterText, "#18");

-

-			Serialize (new ZeroFlagEnum ()); // enum actually has a field with value 0

-			Assert.AreEqual (Infoset ("<ZeroFlagEnum>zero</ZeroFlagEnum>"), WriterText, "#19");

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValue_Encoded ()

-		{

-			SerializeEncoded (new EnumDefaultValue ());

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}' />",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#1");

-

-			SerializeEncoded (new SimpleEnumeration ());

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<SimpleEnumeration d1p1:type='SimpleEnumeration' xmlns:d1p1='{0}'>FIRST</SimpleEnumeration>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#2");

-

-			SerializeEncoded (3, typeof (EnumDefaultValue));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}'>e3</EnumDefaultValue>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#3");

-

-			SerializeEncoded (EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}'>e3</EnumDefaultValue>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#4");

-

-			SerializeEncoded (EnumDefaultValue.e1 | EnumDefaultValue.e2, typeof (EnumDefaultValue));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}'>e3</EnumDefaultValue>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#5");

-

-			SerializeEncoded (EnumDefaultValue.e1 | EnumDefaultValue.e2 | EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}'>e3</EnumDefaultValue>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#6");

-

-			SerializeEncoded (EnumDefaultValue.e1 | EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}'>e3</EnumDefaultValue>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#7");

-

-			SerializeEncoded (EnumDefaultValue.e2 | EnumDefaultValue.e3, typeof (EnumDefaultValue));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValue d1p1:type='EnumDefaultValue' xmlns:d1p1='{0}'>e3</EnumDefaultValue>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#8");

-

-			SerializeEncoded (3, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e1 e2</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#9");

-

-			SerializeEncoded (5, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e1 e4</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#10");

-

-			SerializeEncoded (FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e4</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#11");

-

-			SerializeEncoded (FlagEnum.e1 | FlagEnum.e2, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e1 e2</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#12");

-

-			SerializeEncoded (FlagEnum.e1 | FlagEnum.e2 | FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e1 e2 e4</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#13");

-

-			SerializeEncoded (FlagEnum.e1 | FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e1 e4</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#14");

-

-			SerializeEncoded (FlagEnum.e2 | FlagEnum.e4, typeof (FlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<FlagEnum d1p1:type='FlagEnum' xmlns:d1p1='{0}'>e2 e4</FlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#15");

-

-			SerializeEncoded (3, typeof (EnumDefaultValueNF));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValueNF d1p1:type='EnumDefaultValueNF' xmlns:d1p1='{0}'>e3</EnumDefaultValueNF>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#16");

-

-			SerializeEncoded (EnumDefaultValueNF.e2, typeof (EnumDefaultValueNF));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<EnumDefaultValueNF d1p1:type='EnumDefaultValueNF' xmlns:d1p1='{0}'>e2</EnumDefaultValueNF>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#17");

-

-			SerializeEncoded (2, typeof (ZeroFlagEnum));

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<ZeroFlagEnum d1p1:type='ZeroFlagEnum' xmlns:d1p1='{0}'>e2</ZeroFlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#18");

-

-			SerializeEncoded (new ZeroFlagEnum ()); // enum actually has a field with value 0

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-				"<ZeroFlagEnum d1p1:type='ZeroFlagEnum' xmlns:d1p1='{0}'>e0</ZeroFlagEnum>",

-				XmlSchemaInstanceNamespace), sw.ToString (), "#19");

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValue_InvalidValue1 ()

-		{

-			try {

-				Serialize ("b", typeof (EnumDefaultValue));

-				Assert.Fail ("#A1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#A2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#A3");

-			}

-

-			try {

-				Serialize ("e1", typeof (EnumDefaultValue));

-				Assert.Fail ("#B1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#B2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#B3");

-			}

-

-			try {

-				Serialize ("e1,e2", typeof (EnumDefaultValue));

-				Assert.Fail ("#C1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#C2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#C3");

-			}

-

-			try {

-				Serialize (string.Empty, typeof (EnumDefaultValue));

-				Assert.Fail ("#D1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#D2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#D3");

-			}

-

-			try {

-				Serialize ("1", typeof (EnumDefaultValue));

-				Assert.Fail ("#E1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#E2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#E3");

-			}

-

-			try {

-				Serialize ("0", typeof (EnumDefaultValue));

-				Assert.Fail ("#F1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#F2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#F3");

-			}

-

-			try {

-				Serialize (new SimpleClass (), typeof (EnumDefaultValue));

-				Assert.Fail ("#G1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#G2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#G3");

-			}

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValue_InvalidValue2 ()

-		{

-#if NET_2_0

-			try {

-				Serialize (5, typeof (EnumDefaultValue));

-				Assert.Fail ("#1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");

-				Assert.IsNotNull (ex.InnerException, "#3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#4");

-				Assert.IsNotNull (ex.InnerException.Message, "#5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'5'") != -1, "#6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValue).FullName) != -1, "#7");

-			}

-#else

-			Serialize (5, typeof (EnumDefaultValue));

-			Assert.AreEqual (Infoset ("<EnumDefaultValue>5</EnumDefaultValue>"), WriterText);

-#endif

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValueNF_InvalidValue1 ()

-		{

-#if NET_2_0

-			try {

-				Serialize (new EnumDefaultValueNF ());

-				Assert.Fail ("#1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");

-				Assert.IsNotNull (ex.InnerException, "#3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#4");

-				Assert.IsNotNull (ex.InnerException.Message, "#5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'0'") != -1, "#6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).FullName) != -1, "#7");

-			}

-#else

-			Serialize (new EnumDefaultValueNF ());

-			Assert.AreEqual (Infoset ("<EnumDefaultValueNF>0</EnumDefaultValueNF>"), WriterText);

-#endif

+			AssertEquals(Infoset("<SimpleEnumeration>SECOND</SimpleEnumeration>"), WriterText);

 		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValueNF_InvalidValue2 ()

-		{

-#if NET_2_0

-			try {

-				Serialize (15, typeof (EnumDefaultValueNF));

-				Assert.Fail ("#1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");

-				Assert.IsNotNull (ex.InnerException, "#3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#4");

-				Assert.IsNotNull (ex.InnerException.Message, "#5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'15'") != -1, "#6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (EnumDefaultValueNF).FullName) != -1, "#7");

-			}

-#else

-			Serialize (15, typeof (EnumDefaultValueNF));

-			Assert.AreEqual (Infoset ("<EnumDefaultValueNF>15</EnumDefaultValueNF>"), WriterText);

-#endif

-		}

- 

+		

 		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeEnumDefaultValueNF_InvalidValue3 ()

-		{

-			try {

-				Serialize ("b", typeof (EnumDefaultValueNF));

-				Assert.Fail ("#A1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#A2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#A3");

-			}

-

-			try {

-				Serialize ("e2", typeof (EnumDefaultValueNF));

-				Assert.Fail ("#B1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#B2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#B3");

-			}

-

-			try {

-				Serialize (string.Empty, typeof (EnumDefaultValueNF));

-				Assert.Fail ("#C1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#C2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#C3");

-			}

-

-			try {

-				Serialize ("1", typeof (EnumDefaultValueNF));

-				Assert.Fail ("#D1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#D2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#D3");

-			}

+		public void TestSerializeEnumDefaultValue() {

+			Serialize(new EnumDefaultValue());

+			AssertEquals(Infoset("<EnumDefaultValue />"), WriterText);

+			

+			Serialize(new EnumDefaultValueNF());

+			AssertEquals(Infoset("<EnumDefaultValueNF>0</EnumDefaultValueNF>"), WriterText);

 

-			try {

-				Serialize ("0", typeof (EnumDefaultValueNF));

-				Assert.Fail ("#E1");

-			} catch (InvalidOperationException ex) {

-				Assert.IsNotNull (ex.InnerException, "#E2");

-				Assert.AreEqual (typeof (InvalidCastException), ex.InnerException.GetType (), "#E3");

-			}

-		}

-

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializeZeroFlagEnum_InvalidValue ()

-		{

-#if NET_2_0

-			try {

-				Serialize (4, typeof (ZeroFlagEnum)); // corresponding enum field is marked XmlIgnore

-				Assert.Fail ("#1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");

-				Assert.IsNotNull (ex.InnerException, "#3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#4");

-				Assert.IsNotNull (ex.InnerException.Message, "#5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'4'") != -1, "#6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (ZeroFlagEnum).FullName) != -1, "#7");

-			}

-#else

-			Serialize (4, typeof (ZeroFlagEnum)); // corresponding enum field is marked XmlIgnore

-			Assert.AreEqual (Infoset ("<ZeroFlagEnum>4</ZeroFlagEnum>"), WriterText);

-#endif

+			Serialize(new SimpleEnumeration());

+			AssertEquals(Infoset("<SimpleEnumeration>FIRST</SimpleEnumeration>"), WriterText);

 		}

 

 		[Test]

 		public void TestSerializeQualifiedName()

 		{

 			Serialize(new XmlQualifiedName("me", "home.urn"));

-			Assert.AreEqual (Infoset ("<QName xmlns:q1='home.urn'>q1:me</QName>"), WriterText);

+			AssertEquals(Infoset("<QName xmlns:q1='home.urn'>q1:me</QName>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeBytes()

 		{

 			Serialize((byte)0xAB);

-			Assert.AreEqual (Infoset ("<unsignedByte>171</unsignedByte>"), WriterText);

+			AssertEquals(Infoset("<unsignedByte>171</unsignedByte>"), WriterText);

 			

 			Serialize((byte)15);

-			Assert.AreEqual (Infoset ("<unsignedByte>15</unsignedByte>"), WriterText);

+			AssertEquals(Infoset("<unsignedByte>15</unsignedByte>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeByteArrays()

 		{

 			Serialize(new byte[] {});

-			Assert.AreEqual (Infoset ("<base64Binary />"), WriterText);

+			AssertEquals(Infoset("<base64Binary />"), WriterText);

 			

 			Serialize(new byte[] {0xAB, 0xCD});

-			Assert.AreEqual (Infoset ("<base64Binary>q80=</base64Binary>"), WriterText);

+			AssertEquals(Infoset("<base64Binary>q80=</base64Binary>"), WriterText);

 		}

 		

 		[Test]

@@ -684,7 +258,7 @@ namespace MonoTests.System.XmlSerialization
 			TimeZone tz = TimeZone.CurrentTimeZone;

 			TimeSpan off = tz.GetUtcOffset (d);

 			string sp = string.Format ("{0}{1:00}:{2:00}", off.Ticks >= 0 ? "+" : "", off.Hours, off.Minutes);

-			Assert.AreEqual (Infoset ("<dateTime>0001-01-01T00:00:00.0000000" + sp + "</dateTime>"), WriterText);

+			AssertEquals (Infoset("<dateTime>0001-01-01T00:00:00.0000000" + sp + "</dateTime>"), WriterText);

 		}

 

 		/*

@@ -697,22 +271,22 @@ namespace MonoTests.System.XmlSerialization
 		public void TestSerialize()

 		{

 			Serialize();

-			Assert.AreEqual (WriterText, "");

+			AssertEquals(WriterText, "");

 		}

 		*/

-

+		

 		// test basic class serialization /////////////////////////////////////		

 		[Test]

 		public void TestSerializeSimpleClass()

 		{

 			SimpleClass simple = new SimpleClass();

 			Serialize(simple);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			simple.something = "hello";

 			

 			Serialize(simple);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something>hello</something></SimpleClass>"), WriterText);

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something>hello</something></SimpleClass>"), WriterText);

 		}

 		

 		[Test]

@@ -720,12 +294,12 @@ namespace MonoTests.System.XmlSerialization
 		{

 			StringCollection strings = new StringCollection();

 			Serialize(strings);

-			Assert.AreEqual (Infoset ("<ArrayOfString xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<ArrayOfString xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			strings.Add("hello");

 			strings.Add("goodbye");

 			Serialize(strings);

-			Assert.AreEqual (Infoset ("<ArrayOfString xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><string>hello</string><string>goodbye</string></ArrayOfString>"), WriterText);

+			AssertEquals(Infoset("<ArrayOfString xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><string>hello</string><string>goodbye</string></ArrayOfString>"), WriterText);

 		}

 		

 		[Test]

@@ -733,12 +307,12 @@ namespace MonoTests.System.XmlSerialization
 		{

 			StringCollectionContainer container = new StringCollectionContainer();

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages /></StringCollectionContainer>"), WriterText);

+			AssertEquals(Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages /></StringCollectionContainer>"), WriterText);

 			

 			container.Messages.Add("hello");

 			container.Messages.Add("goodbye");

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages><string>hello</string><string>goodbye</string></Messages></StringCollectionContainer>"), WriterText);

+			AssertEquals(Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages><string>hello</string><string>goodbye</string></Messages></StringCollectionContainer>"), WriterText);

 		}

 

 		[Test]

@@ -746,15 +320,15 @@ namespace MonoTests.System.XmlSerialization
 		{

 			ArrayContainer container = new ArrayContainer();

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<ArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<ArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"),WriterText);

 			

 			container.items = new object[] {10, 20};

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<ArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><anyType xsi:type='xsd:int'>10</anyType><anyType xsi:type='xsd:int'>20</anyType></items></ArrayContainer>"), WriterText);

+			AssertEquals(Infoset("<ArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><anyType xsi:type='xsd:int'>10</anyType><anyType xsi:type='xsd:int'>20</anyType></items></ArrayContainer>"),WriterText);

 			

 			container.items = new object[] {10, "hello"};

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<ArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><anyType xsi:type='xsd:int'>10</anyType><anyType xsi:type='xsd:string'>hello</anyType></items></ArrayContainer>"), WriterText);

+			AssertEquals(Infoset("<ArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><anyType xsi:type='xsd:int'>10</anyType><anyType xsi:type='xsd:string'>hello</anyType></items></ArrayContainer>"),WriterText);

 		}

 		

 		[Test]

@@ -762,7 +336,7 @@ namespace MonoTests.System.XmlSerialization
 		{

 			ClassArrayContainer container = new ClassArrayContainer();

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<ClassArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<ClassArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"),WriterText);

 			

 			SimpleClass simple1 = new SimpleClass();

 			simple1.something = "hello";

@@ -772,7 +346,7 @@ namespace MonoTests.System.XmlSerialization
 			container.items[0] = simple1;

 			container.items[1] = simple2;

 			Serialize(container);

-			Assert.AreEqual (Infoset ("<ClassArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><SimpleClass><something>hello</something></SimpleClass><SimpleClass><something>hello</something></SimpleClass></items></ClassArrayContainer>"), WriterText);

+			AssertEquals(Infoset("<ClassArrayContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><SimpleClass><something>hello</something></SimpleClass><SimpleClass><something>hello</something></SimpleClass></items></ClassArrayContainer>"),WriterText);

 		}

 		

 		// test basic attributes ///////////////////////////////////////////////

@@ -781,11 +355,11 @@ namespace MonoTests.System.XmlSerialization
 		{

 			SimpleClassWithXmlAttributes simple = new SimpleClassWithXmlAttributes();

 			Serialize(simple);

-			Assert.AreEqual (Infoset ("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 

 			simple.something = "hello";

 			Serialize(simple);

-			Assert.AreEqual (Infoset ("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' member='hello' />"), WriterText);

+			AssertEquals (Infoset("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' member='hello' />"), WriterText);

 		}

 		

 		// test overrides ///////////////////////////////////////////////////////

@@ -802,7 +376,7 @@ namespace MonoTests.System.XmlSerialization
 			SimpleClassWithXmlAttributes simple = new SimpleClassWithXmlAttributes();

 			simple.something = "hello";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 		}

 

 		[Test]

@@ -824,7 +398,7 @@ namespace MonoTests.System.XmlSerialization
 			XmlSerializer xs = new XmlSerializer (schema.GetType ());

 			xs.Serialize (xtw, schema);

 

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

+			AssertEquals (string.Format(CultureInfo.InvariantCulture,

 				"<?xml version='1.0' encoding='utf-16'?>{0}" +

 				"<xsd:schema xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>{0}" +

 				"  <xsd:attribute />{0}" +

@@ -850,67 +424,31 @@ namespace MonoTests.System.XmlSerialization
 			

 			attr.XmlText = new XmlTextAttribute();

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>hello</SimpleClass>"), WriterText, "#1");

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>hello</SimpleClass>"), WriterText);

 			

 			attr.XmlText = new XmlTextAttribute(typeof(string));

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>hello</SimpleClass>"), WriterText, "#2");

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>hello</SimpleClass>"), WriterText);

 			

-			try {

+			try

+			{

 				attr.XmlText = new XmlTextAttribute(typeof(byte[]));

 				Serialize(simple, overrides);

-				Assert.Fail("XmlText.Type does not match the type it serializes: this should have failed");

-			} catch (InvalidOperationException ex) {

-				// there was an error reflecting type 'MonoTests.System.Xml.TestClasses.SimpleClass'.

-				Assert.IsNotNull (ex.Message, "#A1");

-				Assert.IsTrue (ex.Message.IndexOf (typeof (SimpleClass).FullName) != -1, "#A2");

-

-				// there was an error reflecting field 'something'.

-				Assert.IsNotNull (ex.InnerException, "#A3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#A4");

-				Assert.IsNotNull (ex.InnerException.Message, "#A5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("something") != -1, "#A6");

-

-				// the type for XmlText may not be specified for primitive types.

-				Assert.IsNotNull (ex.InnerException.InnerException, "#A7");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#A8");

-				Assert.IsNotNull (ex.InnerException.Message, "#A9");

-

-				Assert.IsNull (ex.InnerException.InnerException.InnerException, "#A10");

-			} catch (InvalidCastException ex) {

-				// FIXME: we should report InvalidOperationException

+				Fail("XmlText.Type does not match the type it serializes: this should have failed");

+			}

+			catch (Exception)

+			{

 			}

 			

-			try {

+			try

+			{

 				attr.XmlText = new XmlTextAttribute();

 				attr.XmlText.DataType = "sometype";

 				Serialize(simple, overrides);

-				Assert.Fail("XmlText.DataType does not match the type it serializes: this should have failed");

-			} catch (InvalidOperationException ex) {

-				// there was an error reflecting type 'MonoTests.System.Xml.TestClasses.SimpleClass'.

-				Assert.IsNotNull (ex.Message, "#B1");

-				Assert.IsTrue (ex.Message.IndexOf (typeof (SimpleClass).FullName) != -1, "#B2");

-

-				// there was an error reflecting field 'something'.

-				Assert.IsNotNull (ex.InnerException, "#B3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#B4");

-				Assert.IsNotNull (ex.InnerException.Message, "#B5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("something") != -1, "#B6");

-

-				// there was an error reflecting type 'System.String'.

-				Assert.IsNotNull (ex.InnerException.InnerException, "#B7");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.InnerException.GetType (), "#B8");

-				Assert.IsNotNull (ex.InnerException.InnerException.Message, "#B9");

-				Assert.IsTrue (ex.InnerException.InnerException.Message.IndexOf (typeof (string).FullName) != -1, "#B10");

-

-				// Value 'sometype' cannot be used for the XmlElementAttribute.DataType property. 

-				// The datatype 'http://www.w3.org/2001/XMLSchema:sometype' is missing.

-				Assert.IsNotNull (ex.InnerException.InnerException.InnerException, "#B11");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.InnerException.InnerException.GetType (), "#B12");

-				Assert.IsNotNull (ex.InnerException.InnerException.InnerException.Message, "#B13");

-				Assert.IsTrue (ex.InnerException.InnerException.InnerException.Message.IndexOf ("http://www.w3.org/2001/XMLSchema:sometype") != -1, "#B14");

-			} catch (NotSupportedException ex) {

-				// FIXME: we should report InvalidOperationException

+				Fail("XmlText.DataType does not match the type it serializes: this should have failed");

+			}

+			catch (Exception)

+			{

 			}

 		}

 		

@@ -924,28 +462,34 @@ namespace MonoTests.System.XmlSerialization
 			

 			SimpleClassWithXmlAttributes simpleWithAttributes = new SimpleClassWithXmlAttributes();

 			Serialize(simpleWithAttributes, root);

-			Assert.AreEqual (Infoset ("<renamed xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<renamed xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			SimpleClass simple = null;

 			root.IsNullable = false;

-			try {

+			try

+			{

 				Serialize(simple, root);

-				Assert.Fail("Cannot serialize null object if XmlRoot's IsNullable == false");

-			} catch (NullReferenceException) {

+				Fail("Cannot serialize null object if XmlRoot's IsNullable == false");

+			}

+			catch (Exception)

+			{

 			}

 			

 			root.IsNullable = true;

-			try {

+			try

+			{

 				Serialize(simple, root);

-				Assert.Fail("Cannot serialize null object if XmlRoot's IsNullable == true");

-			} catch (NullReferenceException) {

+				Fail("Cannot serialize null object if XmlRoot's IsNullable == true");

+			}

+			catch (Exception)

+			{

 			}

 			

 			simple = new SimpleClass();

 			root.ElementName = null;

 			root.Namespace = "some.urn";

 			Serialize(simple, root);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='some.urn' />"), WriterText);

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='some.urn' />"), WriterText);

 		}

 		

 		[Test]

@@ -965,7 +509,7 @@ namespace MonoTests.System.XmlSerialization
 			container.items = new SimpleClass[1];

 			container.items[0] = new SimpleClass();

 			Serialize(container, overrides);

-			Assert.AreEqual (Infoset ("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><SimpleClass /></items></simple>"), WriterText);

+			AssertEquals(Infoset("<simple xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ><items><SimpleClass /></items></simple>"),WriterText);

 			

 			// FIXME test data type

 		}

@@ -982,17 +526,17 @@ namespace MonoTests.System.XmlSerialization
 			

 			SimpleClass simple = new SimpleClass();;

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText, "#1");

+			AssertEquals("#1", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			// regular

 			simple.something = "hello";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' something='hello' />"), WriterText, "#2");

+			AssertEquals ("#2", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' something='hello' />"), WriterText);

 			

 			// AttributeName

 			attr.XmlAttribute.AttributeName = "somethingelse";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' somethingelse='hello' />"), WriterText, "#3");

+			AssertEquals ("#3", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' somethingelse='hello' />"), WriterText);

 			

 			// Type

 			// FIXME this should work, shouldnt it?

@@ -1003,7 +547,7 @@ namespace MonoTests.System.XmlSerialization
 			// Namespace

 			attr.XmlAttribute.Namespace = "some:urn";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' d1p1:somethingelse='hello' xmlns:d1p1='some:urn' />"), WriterText, "#4");

+			AssertEquals ("#4", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' d1p1:somethingelse='hello' xmlns:d1p1='some:urn' />"), WriterText);

 			

 			// FIXME DataType

 			// FIXME XmlSchemaForm Form

@@ -1026,28 +570,28 @@ namespace MonoTests.System.XmlSerialization
 			// null

 			SimpleClass simple = new SimpleClass();;

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText, "#1");

+			AssertEquals("#1", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			// not null

 			simple.something = "hello";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something>hello</something></SimpleClass>"), WriterText, "#2");

+			AssertEquals ("#2", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something>hello</something></SimpleClass>"), WriterText);

 			

 			//ElementName

 			element.ElementName = "saying";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><saying>hello</saying></SimpleClass>"), WriterText, "#3");

+			AssertEquals ("#3", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><saying>hello</saying></SimpleClass>"), WriterText);

 			

 			//IsNullable

 			element.IsNullable = false;

 			simple.something = null;

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText, "#4");

+			AssertEquals("#4", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"),WriterText);

 			

 			element.IsNullable = true;

 			simple.something = null;

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><saying xsi:nil='true' /></SimpleClass>"), WriterText, "#5");

+			AssertEquals ("#5", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><saying xsi:nil='true' /></SimpleClass>"), WriterText);

 			

 			//Namespace

 			element.ElementName = null;

@@ -1055,7 +599,7 @@ namespace MonoTests.System.XmlSerialization
 			element.Namespace = "some:urn";

 			simple.something = "hello";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something xmlns='some:urn'>hello</something></SimpleClass>"), WriterText, "#6");

+			AssertEquals ("#6", Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something xmlns='some:urn'>hello</something></SimpleClass>"), WriterText);

 			

 			//FIXME DataType

 			//FIXME Form

@@ -1083,28 +627,28 @@ namespace MonoTests.System.XmlSerialization
 			// empty collection & no type info in XmlElementAttribute

 			StringCollectionContainer container = new StringCollectionContainer();

 			Serialize(container, overrides);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText, "#1");

+			AssertEquals(Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			// non-empty collection & no type info in XmlElementAttribute

 			container.Messages.Add("hello");

 			Serialize(container, overrides);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages>hello</Messages></StringCollectionContainer>"), WriterText, "#2");

+			AssertEquals (Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages>hello</Messages></StringCollectionContainer>"), WriterText);

 			

 			// non-empty collection & only type info in XmlElementAttribute

 			element.Type = typeof(StringCollection);

 			Serialize(container, overrides);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages><string>hello</string></Messages></StringCollectionContainer>"), WriterText, "#3");

+			AssertEquals (Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages><string>hello</string></Messages></StringCollectionContainer>"), WriterText);

 			

 			// non-empty collection & only type info in XmlElementAttribute

 			element.Type = typeof(string);

 			Serialize(container, overrides);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages>hello</Messages></StringCollectionContainer>"), WriterText, "#4");

+			AssertEquals(Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages>hello</Messages></StringCollectionContainer>"), WriterText);

 			

 			// two elements

 			container.Messages.Add("goodbye");

 			element.Type = null;

 			Serialize(container, overrides);

-			Assert.AreEqual (Infoset ("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages>hello</Messages><Messages>goodbye</Messages></StringCollectionContainer>"), WriterText, "#5");

+			AssertEquals(Infoset("<StringCollectionContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><Messages>hello</Messages><Messages>goodbye</Messages></StringCollectionContainer>"), WriterText);

 		}

 		

 		// test DefaultValue /////////////////////////////////////////////////////

@@ -1121,82 +665,60 @@ namespace MonoTests.System.XmlSerialization
 			// use the default

 			SimpleClass simple = new SimpleClass();

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText, "#1");

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			// same value as default

 			simple.something = defaultValueInstance;

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText, "#2");

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 			

 			// some other value

 			simple.something = "hello";

 			Serialize(simple, overrides);

-			Assert.AreEqual (Infoset ("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something>hello</something></SimpleClass>"), WriterText, "#3");

+			AssertEquals(Infoset("<SimpleClass xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><something>hello</something></SimpleClass>"), WriterText);

 		}

 		

 		// test XmlEnum //////////////////////////////////////////////////////////

 		[Test]

 		public void TestSerializeXmlEnumAttribute()

 		{

+			// technically this has an XmlIgnore attribute, 

+			// but it is not being serialized as a member.

+			Serialize(XmlSchemaForm.None);

+			AssertEquals(Infoset("<XmlSchemaForm>0</XmlSchemaForm>"), WriterText);

+			

 			Serialize(XmlSchemaForm.Qualified);

-			Assert.AreEqual (Infoset ("<XmlSchemaForm>qualified</XmlSchemaForm>"), WriterText, "#1");

+			AssertEquals(Infoset("<XmlSchemaForm>qualified</XmlSchemaForm>"), WriterText);

 			

 			Serialize(XmlSchemaForm.Unqualified);

-			Assert.AreEqual (Infoset ("<XmlSchemaForm>unqualified</XmlSchemaForm>"), WriterText, "#2");

+			AssertEquals(Infoset("<XmlSchemaForm>unqualified</XmlSchemaForm>"), WriterText);

 		}

 		

 		[Test]

-#if NET_2_0

-		[Category ("NotWorking")]

-#endif

-		public void TestSerializeXmlEnumAttribute_IgnoredValue ()

-		{

-			// technically XmlSchemaForm.None has an XmlIgnore attribute,

-			// but it is not being serialized as a member.

-

-#if NET_2_0

-			try {

-				Serialize (XmlSchemaForm.None);

-				Assert.Fail ("#1");

-			} catch (InvalidOperationException ex) {

-				Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");

-				Assert.IsNotNull (ex.InnerException, "#3");

-				Assert.AreEqual (typeof (InvalidOperationException), ex.InnerException.GetType (), "#4");

-				Assert.IsNotNull (ex.InnerException.Message, "#5");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf ("'0'") != -1, "#6");

-				Assert.IsTrue (ex.InnerException.Message.IndexOf (typeof (XmlSchemaForm).FullName) != -1, "#7");

-			}

-#else

-			Serialize (XmlSchemaForm.None);

-			Assert.AreEqual (Infoset ("<XmlSchemaForm>0</XmlSchemaForm>"), WriterText);

-#endif

-		}

-

-		[Test]

 		public void TestSerializeXmlNodeArray ()

 		{

 			XmlDocument doc = new XmlDocument ();

-			Serialize (new XmlNode [] { doc.CreateAttribute("at"), doc.CreateElement("elem1"), doc.CreateElement("elem2") }, typeof(object));

-			Assert.AreEqual (Infoset ("<anyType at=\"\"><elem1/><elem2/></anyType>"), WriterText);

+			Serialize (new XmlNode [] { doc.CreateAttribute("at"), doc.CreateElement("elem1"), doc.CreateElement("elem2") }, typeof(object)); 

+			AssertEquals(Infoset("<anyType at=\"\"><elem1/><elem2/></anyType>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeXmlElement ()

 		{

 			XmlDocument doc = new XmlDocument ();

-			Serialize (doc.CreateElement("elem"), typeof(XmlElement));

-			Assert.AreEqual (Infoset ("<elem/>"), WriterText);

+			Serialize (doc.CreateElement("elem"), typeof(XmlElement)); 

+			AssertEquals(Infoset("<elem/>"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeXmlElementSubclass ()

 		{

 			XmlDocument doc = new XmlDocument ();

-			Serialize (new MyElem (doc), typeof(XmlElement));

-			Assert.AreEqual (Infoset ("<myelem aa=\"1\"/>"), WriterText, "#1");

+			Serialize (new MyElem (doc), typeof(XmlElement)); 

+			AssertEquals(Infoset("<myelem aa=\"1\"/>"), WriterText);

 			

-			Serialize (new MyElem (doc), typeof(MyElem));

-			Assert.AreEqual (Infoset ("<myelem aa=\"1\"/>"), WriterText, "#2");

+			Serialize (new MyElem (doc), typeof(MyElem)); 

+			AssertEquals(Infoset("<myelem aa=\"1\"/>"), WriterText);

 		}

 		

 		[Test]

@@ -1205,8 +727,8 @@ namespace MonoTests.System.XmlSerialization
 			XmlDocument doc = new XmlDocument ();

 			CDataContainer c = new CDataContainer ();

 			c.cdata = doc.CreateCDataSection("data section contents");

-			Serialize (c);

-			Assert.AreEqual (Infoset ("<CDataContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><cdata><![CDATA[data section contents]]></cdata></CDataContainer>"), WriterText);

+			Serialize (c); 

+			AssertEquals(Infoset("<CDataContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><cdata><![CDATA[data section contents]]></cdata></CDataContainer>"), WriterText);

 		}

 		

 		[Test]

@@ -1215,8 +737,8 @@ namespace MonoTests.System.XmlSerialization
 			XmlDocument doc = new XmlDocument ();

 			NodeContainer c = new NodeContainer ();

 			c.node = doc.CreateTextNode("text");

-			Serialize (c);

-			Assert.AreEqual (Infoset ("<NodeContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><node>text</node></NodeContainer>"), WriterText);

+			Serialize (c); 

+			AssertEquals(Infoset("<NodeContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><node>text</node></NodeContainer>"), WriterText);

 		}

 		

 		[Test]

@@ -1225,14 +747,14 @@ namespace MonoTests.System.XmlSerialization
 			Choices ch = new Choices ();

 			ch.MyChoice = "choice text";

 			ch.ItemType = ItemChoiceType.ChoiceZero;

-			Serialize (ch);

-			Assert.AreEqual (Infoset ("<Choices xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><ChoiceZero>choice text</ChoiceZero></Choices>"), WriterText, "#1");

+			Serialize (ch); 

+			AssertEquals(Infoset("<Choices xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><ChoiceZero>choice text</ChoiceZero></Choices>"), WriterText);

 			ch.ItemType = ItemChoiceType.StrangeOne;

-			Serialize (ch);

-			Assert.AreEqual (Infoset ("<Choices xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><ChoiceOne>choice text</ChoiceOne></Choices>"), WriterText, "#2");

+			Serialize (ch); 

+			AssertEquals(Infoset("<Choices xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><ChoiceOne>choice text</ChoiceOne></Choices>"), WriterText);

 			ch.ItemType = ItemChoiceType.ChoiceTwo;

-			Serialize (ch);

-			Assert.AreEqual (Infoset ("<Choices xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><ChoiceTwo>choice text</ChoiceTwo></Choices>"), WriterText, "#3");

+			Serialize (ch); 

+			AssertEquals(Infoset("<Choices xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><ChoiceTwo>choice text</ChoiceTwo></Choices>"), WriterText);

 		}

 		

 		[Test]

@@ -1242,7 +764,7 @@ namespace MonoTests.System.XmlSerialization
 			ts.elem = 4;

 			ts.attr = 5;

 			Serialize (ts);

-			Assert.AreEqual (Infoset ("<Type_x0020_with_x0020_space xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' Attribute_x0020_with_x0020_space='5'><Element_x0020_with_x0020_space>4</Element_x0020_with_x0020_space></Type_x0020_with_x0020_space>"), WriterText);

+			AssertEquals(Infoset("<Type_x0020_with_x0020_space xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' Attribute_x0020_with_x0020_space='5'><Element_x0020_with_x0020_space>4</Element_x0020_with_x0020_space></Type_x0020_with_x0020_space>"), WriterText);

 		}

 		

 		[Test]

@@ -1250,121 +772,71 @@ namespace MonoTests.System.XmlSerialization
 		{

 			ReadOnlyProperties ts = new ReadOnlyProperties();

 			Serialize (ts);

-			Assert.AreEqual (Infoset ("<ReadOnlyProperties xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

+			AssertEquals(Infoset("<ReadOnlyProperties xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' />"), WriterText);

 		}

 		

 		[Test]

 		public void TestSerializeIList()

 		{

-			clsPerson k = new clsPerson();

-			k.EmailAccounts = new ArrayList();

-			k.EmailAccounts.Add("a");

-			k.EmailAccounts.Add("b");

+			clsPerson k = new clsPerson();
+			k.EmailAccounts = new ArrayList();
+			k.EmailAccounts.Add("a");
+			k.EmailAccounts.Add("b");
 			Serialize (k);

-			Assert.AreEqual (Infoset ("<clsPerson xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><EmailAccounts><anyType xsi:type=\"xsd:string\">a</anyType><anyType xsi:type=\"xsd:string\">b</anyType></EmailAccounts></clsPerson>"), WriterText);

-		}

-		

-		[Test]

-		public void TestSerializeArrayEnc ()

-		{

-			SoapReflectionImporter imp = new SoapReflectionImporter ();

-			XmlTypeMapping map = imp.ImportTypeMapping (typeof(ArrayClass));

-			XmlSerializer ser = new XmlSerializer (map);

-			StringWriter sw = new StringWriter ();

-			XmlTextWriter tw = new XmlTextWriter (sw);

-			tw.WriteStartElement ("aa");

-			ser.Serialize (tw, new ArrayClass ());

-			tw.WriteEndElement ();

-		}

-		

+			AssertEquals (Infoset("<clsPerson xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><EmailAccounts><anyType xsi:type=\"xsd:string\">a</anyType><anyType xsi:type=\"xsd:string\">b</anyType></EmailAccounts></clsPerson>"), WriterText);

+		}
+		
+		[Test]
+		public void TestSerializeArrayEnc ()
+		{
+			SoapReflectionImporter imp = new SoapReflectionImporter ();
+			XmlTypeMapping map = imp.ImportTypeMapping (typeof(ArrayClass));
+			XmlSerializer ser = new XmlSerializer (map);
+			StringWriter sw = new StringWriter ();
+			XmlTextWriter tw = new XmlTextWriter (sw);
+			tw.WriteStartElement ("aa");
+			ser.Serialize (tw, new ArrayClass ());
+			tw.WriteEndElement ();
+		}
+		
 		[Test]

 		public void TestIncludeType()

-		{

-			// Test for bug #76049

-			XmlReflectionImporter imp = new XmlReflectionImporter ();

-			XmlTypeMapping map = imp.ImportTypeMapping (typeof(object));

-			imp.IncludeType (typeof(TestSpace));

-			XmlSerializer ser = new XmlSerializer (map);

-			ser.Serialize (new StringWriter (), new TestSpace ());

-		}

+		{
+			// Test for bug #76049
+			XmlReflectionImporter imp = new XmlReflectionImporter ();
+			XmlTypeMapping map = imp.ImportTypeMapping (typeof(object));
+			imp.IncludeType (typeof(TestSpace));
+			XmlSerializer ser = new XmlSerializer (map);
+			ser.Serialize (new StringWriter (), new TestSpace ());
+		}
 		

 		[Test]

 		public void TestSerializeChoiceArray()

 		{

-			CompositeValueType v = new CompositeValueType ();

-			v.Init ();

-			Serialize (v);

-			Assert.AreEqual (Infoset ("<?xml version=\"1.0\" encoding=\"utf-16\"?><CompositeValueType xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><In>1</In><Es>2</Es></CompositeValueType>"), WriterText);

-		}

-		

-		[Test]

-		public void TestArrayAttributeWithDataType ()

-		{

-			Serialize (new ArrayAttributeWithType ());

-			string res = "<ArrayAttributeWithType xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ";

+	   		CompositeValueType v = new CompositeValueType ();
+	   		v.Init ();
+	   		Serialize (v);
+			AssertEquals (Infoset("<?xml version=\"1.0\" encoding=\"utf-16\"?><CompositeValueType xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><In>1</In><Es>2</Es></CompositeValueType>"), WriterText);
+		}
+		
+		[Test]
+		public void TestArrayAttributeWithDataType ()
+		{
+			Serialize (new ArrayAttributeWithType ());
+			string res = "<ArrayAttributeWithType xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' ";
 			res += "at='a b' bin1='AQI= AQI=' bin2='AQI=' />";

-			Assert.AreEqual (Infoset (res), WriterText);

-		}

-

-		[Test]

-		public void TestSubclassElementType ()

-		{

-			SubclassTestContainer c = new SubclassTestContainer ();

-			c.data = new SubclassTestSub ();

-			Serialize (c);

-

-			string res = "<SubclassTestContainer xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>";

-			res += "<a xsi:type=\"SubclassTestSub\"/></SubclassTestContainer>";

-			Assert.AreEqual (Infoset (res), WriterText);

-		}

-		

-		[Test]

-		[ExpectedException (typeof(InvalidOperationException))]

-		public void TestArrayAttributeWithWrongDataType ()

-		{

-			Serialize (new ArrayAttributeWithWrongType ());

-		}

-		

-		[Test]

-		[Category ("NotWorking")]

-		public void TestSerializePrimitiveTypesContainer ()

-		{

-			Serialize (new PrimitiveTypesContainer ());

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-#if NET_2_0

-				"<PrimitiveTypesContainer xmlns:xsi='{1}' xmlns:xsd='{0}' xmlns='some:urn'>" +

-#else

-				"<PrimitiveTypesContainer xmlns:xsd='{0}' xmlns:xsi='{1}' xmlns='some:urn'>" +

-#endif

-				"<Number>2004</Number>" +

-				"<Name>some name</Name>" +

-				"<Index>56</Index>" +

-				"<Password>8w8=</Password>" +

-				"<PathSeparatorCharacter>47</PathSeparatorCharacter>" +

-				"</PrimitiveTypesContainer>", XmlSchemaNamespace, 

-				XmlSchemaInstanceNamespace), sw.ToString (), "#1");

-

-			SerializeEncoded (new PrimitiveTypesContainer ());

-			Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,

-				"<?xml version='1.0' encoding='utf-16'?>" +

-#if NET_2_0

-				"<q1:PrimitiveTypesContainer xmlns:xsi='{1}' xmlns:xsd='{0}' id='id1' xmlns:q1='{2}'>" +

-#else

-				"<q1:PrimitiveTypesContainer xmlns:xsd='{0}' xmlns:xsi='{1}' id='id1' xmlns:q1='{2}'>" +

-#endif

-				"<Number xsi:type='xsd:int'>2004</Number>" +

-				"<Name xsi:type='xsd:string'>some name</Name>" +

-				"<Index xsi:type='xsd:unsignedByte'>56</Index>" +

-				"<Password xsi:type='xsd:base64Binary'>8w8=</Password>" +

-				"<PathSeparatorCharacter xmlns:q2='{3}' xsi:type='q2:char'>47</PathSeparatorCharacter>" +

-				"</q1:PrimitiveTypesContainer>", XmlSchemaNamespace, 

-				XmlSchemaInstanceNamespace, AnotherNamespace, WsdlTypesNamespace), 

-				sw.ToString (), "#2");

-		}

-

-		// Helper methods

-				

+			AssertEquals (Infoset(res), WriterText);

+		}
+		
+		[Test]
+		[ExpectedException (typeof(InvalidOperationException))]
+		public void TestArrayAttributeWithWrongDataType ()
+		{
+			Serialize (new ArrayAttributeWithWrongType ());
+		}
+		
+		// Helper methods
+				
 		public static string Infoset (string sx)

 		{

 			XmlDocument doc = new XmlDocument ();

@@ -1417,11 +889,5 @@ namespace MonoTests.System.XmlSerialization
 					break;

 			}

 		}

-

-		static XmlTypeMapping CreateSoapMapping (Type type)

-		{

-			SoapReflectionImporter importer = new SoapReflectionImporter ();

-			return importer.ImportTypeMapping (type);

-		}

 	}

 }

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlTypeAttributeTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlTypeAttributeTests.cs
index fe70df3feaf..214dcf7e749 100644
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlTypeAttributeTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlTypeAttributeTests.cs
@@ -1,43 +1,43 @@
-//
-// Tests for System.Xml.Serialization.XmlTypeAttribute
-//
-// Author:
-//   Gert Driesen
-//
-// (C) 2005 Novell
-//
-
-using System.Xml.Serialization;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.XmlSerialization
-{
-	[TestFixture]
-	public class XmlTypeAttributeTests
-	{
-		[Test]
-		public void IncludeInSchemaDefault ()
-		{
-			XmlTypeAttribute attr = new XmlTypeAttribute ();
-			Assert.AreEqual (true, attr.IncludeInSchema);
-		}
-
-		[Test]
-		public void NamespaceDefault ()
-		{
-			XmlTypeAttribute attr = new XmlTypeAttribute ();
-			Assert.IsNull (attr.Namespace);
-		}
-
-		[Test]
-		public void TypeNameDefault ()
-		{
-			XmlTypeAttribute attr = new XmlTypeAttribute ();
-			Assert.AreEqual (string.Empty, attr.TypeName, "#1");
-
-			attr.TypeName = null;
-			Assert.AreEqual (string.Empty, attr.TypeName, "#2");
-		}
-	}
-}
+//

+// Tests for System.Xml.Serialization.XmlTypeAttribute

+//

+// Author:

+//   Gert Driesen

+//

+// (C) 2005 Novell

+//

+

+using System.Xml.Serialization;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.XmlSerialization

+{

+	[TestFixture]

+	public class XmlTypeAttributeTests

+	{

+		[Test]

+		public void IncludeInSchemaDefault ()

+		{

+			XmlTypeAttribute attr = new XmlTypeAttribute ();

+			Assert.AreEqual (true, attr.IncludeInSchema);

+		}

+

+		[Test]

+		public void NamespaceDefault ()

+		{

+			XmlTypeAttribute attr = new XmlTypeAttribute ();

+			Assert.IsNull (attr.Namespace);

+		}

+

+		[Test]

+		public void TypeNameDefault ()

+		{

+			XmlTypeAttribute attr = new XmlTypeAttribute ();

+			Assert.AreEqual (string.Empty, attr.TypeName, "#1");

+

+			attr.TypeName = null;

+			Assert.AreEqual (string.Empty, attr.TypeName, "#2");

+		}

+	}

+}

diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog
index 489366095e8..7b678f96e95 100644
--- a/mcs/class/System.XML/Test/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog
@@ -1,40 +1,3 @@
-2006-02-24  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriterTests.cs : added test for bug #77623. Also fixed
-	  WriteString() test which failed to fail (Assert.Fail).
-
-2006-02-22  Atsushi Enomoto <atsushi@ximian.com>
-
-	* XmlTextWriterTests.cs : added invalid character processing test.
-
-2006-02-20  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XmlReaderCommonTests.cs : added custom assertion overload that takes
-	  test label.
-	* XmlNodeReaderTests.cs : labeled some.
-	* XmlTextWriterTests.cs :
-	  Changed the semantics of AttributeNamespacesXmlnsXmlns() and
-	  removed NotDotNet (in contrast this test should fail with previous
-	  version of XmlTextWriter). See the code comment for details.
-	  Added WriteQualifiedNameXmlnsError().
-
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XmlTextReaderTests.cs : added WhitespaceHandling tests.
-
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XmlTextWriterTests.cs : tiny test name fix, as it does not actually
-	  test WriteString().
-
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XmlTextWriterTests.cs : added test WriteRaw("") closes open tag.
-
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XmlTextWriterTests.cs : numbered some tests and added some comments.
-
 2006-01-25  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* XmlConvertTests.cs : added test for bug #77350.
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlNodeReaderTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlNodeReaderTests.cs
index 25eae6f31f7..44a021e26f4 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlNodeReaderTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlNodeReaderTests.cs
@@ -181,7 +181,6 @@ namespace MonoTests.System.Xml
 			XmlNodeReader nr = new XmlNodeReader (

 				document.DocumentElement.FirstChild);

 			nr.Read ();

-			AssertEquals ("#0", true, nr.IsEmptyElement);

 			Assert ("#1", !nr.Read ());

 

 			document.LoadXml ("<root><child></child></root>");

@@ -189,7 +188,6 @@ namespace MonoTests.System.Xml
 				document.DocumentElement.FirstChild);

 			nr.Read ();

 			Assert ("#2", nr.Read ());

-			AssertEquals ("#2.2", false, nr.IsEmptyElement);

 			Assert ("#3", !nr.Read ());

 		}

 	}

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
index c2044a52058..368e889f2b8 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
@@ -59,28 +59,10 @@ namespace MonoTests.System.Xml
 			string value,

 			int attributeCount)

 		{

-			AssertNode ("", xmlReader, nodeType, depth,

-				isEmptyElement, name, prefix, localName,

-				namespaceURI, value, attributeCount);

-		}

-

-		private void AssertNode (

-			string label,

-			XmlReader xmlReader,

-			XmlNodeType nodeType,

-			int depth,

-			bool isEmptyElement,

-			string name,

-			string prefix,

-			string localName,

-			string namespaceURI,

-			string value,

-			int attributeCount)

-		{

-			Assert (label + " Read() return value", xmlReader.Read ());

-			Assert (label + " ReadState", xmlReader.ReadState == ReadState.Interactive);

-			Assert (label + " !EOF", !xmlReader.EOF);

-			AssertNodeValues (label, xmlReader, nodeType, depth,

+			Assert ("Read() return value", xmlReader.Read ());

+			Assert ("ReadState", xmlReader.ReadState == ReadState.Interactive);

+			Assert ("!EOF", !xmlReader.EOF);

+			AssertNodeValues ("", xmlReader, nodeType, depth,

 				isEmptyElement, name, prefix, localName,

 				namespaceURI, value, value != String.Empty,

 				attributeCount, attributeCount > 0);

@@ -396,7 +378,6 @@ namespace MonoTests.System.Xml
 			AssertStartDocument (xmlReader);

 

 			AssertNode (

-				"#1",

 				xmlReader, // xmlReader

 				XmlNodeType.Element, // nodeType

 				0, //depth

@@ -410,7 +391,6 @@ namespace MonoTests.System.Xml
 			);

 

 			AssertNode (

-				"#2",

 				xmlReader, // xmlReader

 				XmlNodeType.Element, // nodeType

 				1, //depth

@@ -424,7 +404,6 @@ namespace MonoTests.System.Xml
 			);

 

 			AssertNode (

-				"#3",

 				xmlReader, // xmlReader

 				XmlNodeType.EndElement, // nodeType

 				0, //depth

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs
index 0ab4f9022a2..b32ebad6337 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs
@@ -1163,53 +1163,5 @@ namespace MonoTests.System.Xml
 			xr.Read ();
 			AssertEquals ("#2", Encoding.Unicode, xr.Encoding);
 		}
-
-		[Test]
-		public void WhitespaceHandlingSignificant ()
-		{
-			XmlTextReader xtr = new XmlTextReader ("<root>  <child xml:space='preserve'>    <descendant xml:space='default'>    </descendant>   </child><child xml:space='default'>   </child>  </root>",
-				XmlNodeType.Document, null);
-			xtr.WhitespaceHandling = WhitespaceHandling.Significant;
-
-			xtr.Read (); // root
-			xtr.Read (); // child. skip whitespaces
-			AssertEquals ("#1", XmlNodeType.Element, xtr.NodeType);
-			xtr.Read (); // significant whitespaces
-			AssertEquals ("#2", XmlNodeType.SignificantWhitespace, xtr.NodeType);
-			xtr.Read ();
-			AssertEquals ("#3", "descendant", xtr.LocalName);
-			xtr.Read (); // end of descendant. skip whitespaces
-			AssertEquals ("#4", XmlNodeType.EndElement, xtr.NodeType);
-			xtr.Read (); // significant whitespaces
-			AssertEquals ("#5", XmlNodeType.SignificantWhitespace, xtr.NodeType);
-			xtr.Read (); // end of child
-			xtr.Read (); // child
-			xtr.Read (); // end of child. skip whitespaces
-			AssertEquals ("#6", XmlNodeType.EndElement, xtr.NodeType);
-			xtr.Read (); // end of root. skip whitespaces
-			AssertEquals ("#7", XmlNodeType.EndElement, xtr.NodeType);
-		}
-
-		[Test]
-		public void WhitespaceHandlingNone ()
-		{
-			XmlTextReader xtr = new XmlTextReader ("<root>  <child xml:space='preserve'>    <descendant xml:space='default'>    </descendant>   </child><child xml:space='default'>   </child>  </root>",
-				XmlNodeType.Document, null);
-			xtr.WhitespaceHandling = WhitespaceHandling.None;
-
-			xtr.Read (); // root
-			xtr.Read (); // child. skip whitespaces
-			AssertEquals ("#1", XmlNodeType.Element, xtr.NodeType);
-			xtr.Read (); // descendant. skip significant whitespaces
-			AssertEquals ("#2", "descendant", xtr.LocalName);
-			xtr.Read (); // end of descendant. skip whitespaces
-			AssertEquals ("#3", XmlNodeType.EndElement, xtr.NodeType);
-			xtr.Read (); // end of child. skip significant whitespaces
-			xtr.Read (); // child
-			xtr.Read (); // end of child. skip whitespaces
-			AssertEquals ("#6", XmlNodeType.EndElement, xtr.NodeType);
-			xtr.Read (); // end of root. skip whitespaces
-			AssertEquals ("#7", XmlNodeType.EndElement, xtr.NodeType);
-		}
 	}
 }
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs
index 5f1240cc16f..783a8ffe718 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs
@@ -250,27 +250,16 @@ namespace MonoTests.System.Xml
 		}
 
 		[Test]
+		[Category ("NotDotNet")]
 		public void AttributeNamespacesXmlnsXmlns ()
 		{
 			xtw.WriteStartElement ("foo");
-			// If XmlTextWriter conforms to "Namespaces in XML"
-			// when namespaceURI argument is null, then this
-			// is not allowed (http://www.w3.org/TR/REC-xml-names/
-			// Namespace Constraint: Prefix Declared), but seems
-			// like XmlTextWriter just ignores XML namespace
-			// constraints when namespaceURI argument is null.
-			xtw.WriteAttributeString ("xmlns", "xmlns", null, "http://abc.def");
-			//Assert.Fail ("A prefix must not start with \"xml\".");
-		}
-
-		[Test]
-		public void AttributeNamespacesXmlnsXmlns2 ()
-		{
-			// It is split from AttributeNamespacesXmlnsXmlns()
-			// because depending on XmlWriter it is likely to cause
-			// duplicate attribute error (XmlTextWriter is pretty
-			// hacky, so it does not raise such errors).
-			xtw.WriteStartElement ("foo");
+			try {
+				xtw.WriteAttributeString ("xmlns", "xmlns", null, "http://abc.def");
+				// This should not be allowed, even though MS.NET doesn't treat as an error.
+				// See http://www.w3.org/TR/REC-xml-names/ Namespace Constraint: Prefix Declared
+				Assert.Fail ("any prefix which name starts from \"xml\" must not be allowed.");
+			} catch (ArgumentException) {}
 			xtw.WriteAttributeString ("", "xmlns", null, "http://abc.def");
 		}
 
@@ -822,16 +811,16 @@ namespace MonoTests.System.Xml
 			Assert.AreEqual ("<foo>bar</foo>", StringWriterText, "WriteElementString has incorrect output.");
 
 			xtw.WriteElementString ("baz", "");
-			Assert.AreEqual ("<foo>bar</foo><baz />", StringWriterText, "#2");
+			Assert.AreEqual ("<foo>bar</foo><baz />", StringWriterText);
 
 			xtw.WriteElementString ("quux", null);
-			Assert.AreEqual ("<foo>bar</foo><baz /><quux />", StringWriterText, "#3");
+			Assert.AreEqual ("<foo>bar</foo><baz /><quux />", StringWriterText);
 
 			xtw.WriteElementString ("", "quuux");
-			Assert.AreEqual ("<foo>bar</foo><baz /><quux /><>quuux</>", StringWriterText, "#4");
+			Assert.AreEqual ("<foo>bar</foo><baz /><quux /><>quuux</>", StringWriterText);
 
 			xtw.WriteElementString (null, "quuuux");
-			Assert.AreEqual ("<foo>bar</foo><baz /><quux /><>quuux</><>quuuux</>", StringWriterText, "#5");
+			Assert.AreEqual ("<foo>bar</foo><baz /><quux /><>quuux</><>quuuux</>", StringWriterText);
 		}
 
 		[Test]
@@ -882,18 +871,18 @@ namespace MonoTests.System.Xml
 			xtw.WriteStartElement ("one");
 			xtw.WriteAttributeString ("xmlns", "foo", null, "http://abc.def");
 			xtw.WriteAttributeString ("xmlns", "bar", null, "http://ghi.jkl");
-			Assert.AreEqual ("foo", xtw.LookupPrefix ("http://abc.def"), "#1");
-			Assert.AreEqual ("bar", xtw.LookupPrefix ("http://ghi.jkl"), "#2");
+			Assert.AreEqual ("foo", xtw.LookupPrefix ("http://abc.def"));
+			Assert.AreEqual ("bar", xtw.LookupPrefix ("http://ghi.jkl"));
 			xtw.WriteEndElement ();
 
 			xtw.WriteStartElement ("two");
 			xtw.WriteAttributeString ("xmlns", "baz", null, "http://mno.pqr");
 			xtw.WriteString("quux");
-			Assert.AreEqual ("baz", xtw.LookupPrefix ("http://mno.pqr"), "#3");
-			Assert.IsNull (xtw.LookupPrefix ("http://abc.def"), "#4");
-			Assert.IsNull (xtw.LookupPrefix ("http://ghi.jkl"), "#5");
+			Assert.AreEqual ("baz", xtw.LookupPrefix ("http://mno.pqr"));
+			Assert.IsNull (xtw.LookupPrefix ("http://abc.def"));
+			Assert.IsNull (xtw.LookupPrefix ("http://ghi.jkl"));
 
-			Assert.IsNull (xtw.LookupPrefix ("http://bogus"), "#6");
+			Assert.IsNull (xtw.LookupPrefix ("http://bogus"));
 		}
 
 		[Test]
@@ -1287,9 +1276,6 @@ namespace MonoTests.System.Xml
 
 			xtw.WriteRaw("");
 			Assert.AreEqual ("&<>\"'", StringWriterText);
-
-			// bug #77623
-			xtw.WriteRaw ("{0}{1}");
 		}
 
 		[Test]
@@ -1323,7 +1309,6 @@ namespace MonoTests.System.Xml
 			xtw.WriteStartDocument ();
 			try {
 				xtw.WriteString("foo");
-				Assert.Fail ("should raise an error.");
 			} catch (InvalidOperationException) {}
 		}
 
@@ -1437,22 +1422,22 @@ namespace MonoTests.System.Xml
 		public void XmlSpaceTest ()
 		{
 			xtw.WriteStartElement ("foo");
-			Assert.AreEqual (XmlSpace.None, xtw.XmlSpace, "#1");
+			Assert.AreEqual (XmlSpace.None, xtw.XmlSpace);
 
 			xtw.WriteStartElement ("bar");
 			xtw.WriteAttributeString ("xml", "space", null, "preserve");
-			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace, "#2");
-			Assert.AreEqual ("<foo><bar xml:space='preserve'", StringWriterText, "#3");
+			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace);
+			Assert.AreEqual ("<foo><bar xml:space='preserve'", StringWriterText);
 
 			xtw.WriteStartElement ("baz");
 			xtw.WriteAttributeString ("xml", "space", null, "preserve");
-			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace, "#4");
-			Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'", StringWriterText, "#5");
+			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace);
+			Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'", StringWriterText);
 
 			xtw.WriteStartElement ("quux");
 			xtw.WriteStartAttribute ("xml", "space", null);
-			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace, "#6");
-			Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='", StringWriterText, "#7");
+			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace);
+			Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='", StringWriterText);
 
 			// Commented out there: it is implementation-dependent
 			// and incompatible between .NET 1.0 and 1.1
@@ -1461,15 +1446,15 @@ namespace MonoTests.System.Xml
 			// Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='", StringWriterText);
 			
 			xtw.WriteEndAttribute ();
-			Assert.AreEqual (XmlSpace.Default, xtw.XmlSpace, "#8");
-			Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='default'", StringWriterText, "#9");
+			Assert.AreEqual (XmlSpace.Default, xtw.XmlSpace);
+			Assert.AreEqual ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='default'", StringWriterText);
 
 			xtw.WriteEndElement ();
-			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace, "#10");
+			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace);
 			xtw.WriteEndElement ();
-			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace, "#11");
+			Assert.AreEqual (XmlSpace.Preserve, xtw.XmlSpace);
 			xtw.WriteEndElement ();
-			Assert.AreEqual (XmlSpace.None, xtw.XmlSpace, "#12");
+			Assert.AreEqual (XmlSpace.None, xtw.XmlSpace);
 
 			xtw.WriteStartElement ("quux");
 		}
@@ -1681,9 +1666,9 @@ namespace MonoTests.System.Xml
 			xtw.WriteStartDocument ();
 			xtw.WriteStartElement ("foo");
 			xtw.WriteAttributeString ("xmlns", "probe");
-			Assert.AreEqual (String.Empty, xtw.LookupPrefix ("probe"), "#1");
+			Assert.AreEqual (String.Empty, xtw.LookupPrefix ("probe"));
 			xtw.WriteStartElement ("b");
-			Assert.AreEqual (String.Empty, xtw.LookupPrefix ("probe"), "#2");
+			Assert.AreEqual (String.Empty, xtw.LookupPrefix ("probe"));
 			xtw.WriteStartElement (null, "b2", null); // *Don't* output xmlns=""
 			xtw.WriteEndElement (); // b2
 			xtw.WriteStartElement (null, "b2", ""); // *Do* output xmlns=""
@@ -1693,7 +1678,7 @@ namespace MonoTests.System.Xml
 			xtw.WriteEndDocument ();
 			xtw.Close ();
 
-			Assert.AreEqual ("<?xml version='1.0' encoding='utf-16'?><foo xmlns='probe'><b><b2 /><b2 xmlns='' /></b></foo>", StringWriterText, "#3");
+			Assert.AreEqual ("<?xml version='1.0' encoding='utf-16'?><foo xmlns='probe'><b><b2 /><b2 xmlns='' /></b></foo>", StringWriterText);
 		}
 
 		[Test]
@@ -1703,19 +1688,19 @@ namespace MonoTests.System.Xml
 			// IMPORTANT DIFFERENCE!! ns = "", not null
 			xtw.WriteStartElement ("foo", "");
 			xtw.WriteAttributeString ("xmlns", "probe");
-			Assert.IsNull (xtw.LookupPrefix ("probe"), "#1");
+			Assert.IsNull (xtw.LookupPrefix ("probe"));
 			xtw.WriteStartElement ("b");
-			Assert.IsNull (xtw.LookupPrefix ("probe"), "#2");
+			Assert.IsNull (xtw.LookupPrefix ("probe"));
 			xtw.WriteStartElement (null, "b2", null); // *Don't* output xmlns=""
 			xtw.WriteEndElement (); // b2
-			xtw.WriteStartElement (null, "b2", ""); // *Don't* output xmlns=""
+			xtw.WriteStartElement (null, "b2", ""); // *Do* output xmlns=""
 			xtw.WriteEndElement (); // b2
 			xtw.WriteEndElement (); // b
 			xtw.WriteEndElement (); // foo
 			xtw.WriteEndDocument ();
 			xtw.Close ();
 
-			Assert.AreEqual ("<?xml version='1.0' encoding='utf-16'?><foo xmlns='probe'><b><b2 /><b2 /></b></foo>", StringWriterText, "#3");
+			Assert.AreEqual ("<?xml version='1.0' encoding='utf-16'?><foo xmlns='probe'><b><b2 /><b2 /></b></foo>", StringWriterText);
 		}
 
 		[Test]
@@ -1797,9 +1782,7 @@ namespace MonoTests.System.Xml
 		[ExpectedException (typeof (ArgumentException))]
 		public void AttributeWriteEndAttributeXmlnsNullNs ()
 		{
-			// This test checks if the specified namespace URI is
-			// incorrectly empty or not. Compare it with
-			// AttributeWriteStartAttributeXmlnsNullNS().
+			// Compare with the test AttributeWriteStartAttributeXmlnsNullNS().
 			xtw.WriteStartAttribute ("xmlns", "foo", null);
 			xtw.WriteEndAttribute ();
 		}
@@ -1899,13 +1882,13 @@ namespace MonoTests.System.Xml
 			xtw.WriteEndElement ();
 			xtw.WriteEndElement ();
 			string xml = sw.ToString ();
-			Assert.IsTrue (xml.IndexOf ("p:foo='xyz'") > 0, "p:foo" + ". output is " + xml);
-			Assert.IsTrue (xml.IndexOf ("d1p1:bar='xyz'") > 0, "d1p1:bar" + ". output is " + xml);
-			Assert.IsTrue (xml.IndexOf ("d1p2:baz='xyz'") > 0, "d1p1:baz" + ". output is " + xml);
-			Assert.IsTrue (xml.IndexOf ("xmlns:d1p2='urn:baz'") > 0, "xmlns:d1p2" + ". output is " + xml);
-			Assert.IsTrue (xml.IndexOf ("xmlns:d1p1='urn:bar'") > 0, "xmlns:d1p1" + ". output is " + xml);
-			Assert.IsTrue (xml.IndexOf ("xmlns:p='urn:foo'") > 0, "xmlns:p" + ". output is " + xml);
-			Assert.IsTrue (xml.IndexOf ("<out p:foo='xyz'><out p:foo='xyz' /></out></out>") > 0, "remaining" + ". output is " + xml);
+			Assert.IsTrue (xml.IndexOf ("p:foo='xyz'") > 0, "p:foo");
+			Assert.IsTrue (xml.IndexOf ("d1p1:bar='xyz'") > 0, "d1p1:bar");
+			Assert.IsTrue (xml.IndexOf ("d1p2:baz='xyz'") > 0, "d1p1:baz");
+			Assert.IsTrue (xml.IndexOf ("xmlns:d1p2='urn:baz'") > 0, "xmlns:d1p2");
+			Assert.IsTrue (xml.IndexOf ("xmlns:d1p1='urn:bar'") > 0, "xmlns:d1p1");
+			Assert.IsTrue (xml.IndexOf ("xmlns:p='urn:foo'") > 0, "xmlns:p");
+			Assert.IsTrue (xml.IndexOf ("<out p:foo='xyz'><out p:foo='xyz' /></out></out>") > 0, "remaining");
 		}
 
 		[Test]
@@ -1932,15 +1915,6 @@ namespace MonoTests.System.Xml
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		// cannot bind any prefix to "http://www.w3.org/2000/xmlns/".
-		public void WriteQualifiedNameXmlnsError ()
-		{
-			xtw.WriteStartElement ("foo");
-			xtw.WriteQualifiedName ("", "http://www.w3.org/2000/xmlns/");
-		}
-
-		[Test]
 		public void WriteDocType ()
 		{
 			// we have the following test matrix:
@@ -2122,24 +2096,6 @@ namespace MonoTests.System.Xml
 			NUnit.Framework.Assert.AreEqual (referent, ms.ToArray ());
 		}
 
-		[Test]
-		public void InvalidCharIsWrittenAsSillyReferences ()
-		{
-			// I can't say how MS XmlTextWriter is silly. 
-			// The expected output is *not* well-formed XML.
-			// Everyone have to make sure that he or she does 
-			// not write invalid characters directly so that
-			// the output XML string can be fed by other XML
-			// processors.
-
-			// The funny thing is that XmlTextWriter spends
-			// significant performance on checking invalid
-			// characters, but results in nothing.
-			xtw.WriteElementString ("a", "\x0");
-			NUnit.Framework.Assert.AreEqual ("<a>&#x0;</a>",
-				StringWriterText);
-		}
-
 		[Test] // see also bug #77082
 		public void WriteDocTypeIndent ()
 		{
@@ -2185,20 +2141,6 @@ namespace MonoTests.System.Xml
 			xtw.WriteStartDocument ();
 		}
 
-		[Test]
-		public void WriteRawEmptyCloseStartTag ()
-		{
-			xtw.WriteStartElement ("stream", "stream","http://etherx.jabber.org/streams");
-			xtw.WriteAttributeString ("version", "1.0");
-			xtw.WriteAttributeString ("to", "me@test.com");
-			xtw.WriteAttributeString ("from", "server");
-			xtw.WriteAttributeString ("xmlns", "jabber:client");
-			xtw.WriteRaw ("");// Ensure that the tag is closed
-			xtw.Flush ();
-
-			Assert.AreEqual ("<stream:stream version='1.0' to='me@test.com' from='server' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>", StringWriterText);
-		}
-
 #if NET_2_0
 		[Test]
 		[ExpectedException (typeof (InvalidOperationException))]
diff --git a/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog b/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
index a645e2bff91..3fa61cb1cd3 100644
--- a/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
+++ b/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-11  Atsushi Enomoto <atsushi@ximian.com>
-
-	* datatypesTest.xsd : missing required file for xsd tests.
-
 2005-12-26  Atsushi Enomoto <atsushi@ximian.com>
 
 	* multi-schemaLocation.xml,
diff --git a/mcs/class/System.Xml.XLinq/ChangeLog b/mcs/class/System.Xml.XLinq/ChangeLog
index 86b16b4aab1..bc4e0dd2f33 100644
--- a/mcs/class/System.Xml.XLinq/ChangeLog
+++ b/mcs/class/System.Xml.XLinq/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-11  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : now we can depend on Alejandro's System.Query.dll.
-
 2005-09-20  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* Makefile,
diff --git a/mcs/class/System.Xml.XLinq/Makefile b/mcs/class/System.Xml.XLinq/Makefile
index ef551ae23fe..82a7d3df855 100644
--- a/mcs/class/System.Xml.XLinq/Makefile
+++ b/mcs/class/System.Xml.XLinq/Makefile
@@ -5,7 +5,6 @@ include ../../build/rules.make
 LIBRARY = System.Xml.XLinq.dll
 LIB_MCS_FLAGS = \
 	        /r:System.dll \
-	        /r:System.Query.dll \
 	        /r:System.Xml.dll \
 		/d:LIST_BASED
 
@@ -13,13 +12,4 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-# This is a .NET 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Xml.XLinq.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
 include ../../build/library.make
diff --git a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/ChangeLog b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/ChangeLog
index 6fcc5ee7c6b..2c2f0c0e238 100644
--- a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/ChangeLog
+++ b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/ChangeLog
@@ -1,10 +1,3 @@
-2006-02-11  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* XElementSequence.cs : implemented (not sure if it works).
-	* XName.cs : strict null comparison.
-	* XIterators.cs : (XFilterIterator) check attribute XName as well.
-	* System.Xml.XLinq.cs : solved FIXMEs.
-
 2005-09-20  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* XAttribute.cs, XIterators.cs, XName.cs, XElementSequence.cs,
diff --git a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/System.Xml.XLinq.cs b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/System.Xml.XLinq.cs
index ba67c809712..914c4c5b2fd 100644
--- a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/System.Xml.XLinq.cs
+++ b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/System.Xml.XLinq.cs
@@ -607,7 +607,8 @@ namespace System.Xml.XLinq
 		public static XDocument Load (string uri, bool preserveWhitespaces)
 		{
 			XmlReaderSettings s = new XmlReaderSettings ();
-			s.IgnoreWhitespace = !preserveWhitespaces;
+			// FIXME: finish System.Xml 2.0
+//			s.IgnoreWhitespaces = !preserveWhitespaces;
 			using (XmlReader r = XmlReader.Create (uri, s)) {
 				return Load (r);
 			}
@@ -621,8 +622,10 @@ namespace System.Xml.XLinq
 		public static XDocument Load (TextReader reader, bool preserveWhitespaces)
 		{
 			XmlReaderSettings s = new XmlReaderSettings ();
-			s.IgnoreWhitespace = !preserveWhitespaces;
-			using (XmlReader r = XmlReader.Create (reader, s)) {
+			// FIXME: finish System.Xml 2.0
+//			s.IgnoreWhitespaces = !preserveWhitespaces;
+//			using (XmlReader r = XmlReader.Create (reader, s)) {
+			using (XmlReader r = XmlReader.Create (reader)) {
 				return Load (r);
 			}
 		}
@@ -885,7 +888,8 @@ namespace System.Xml.XLinq
 		public static XElement Load (string uri, bool preserveWhitespaces)
 		{
 			XmlReaderSettings s = new XmlReaderSettings ();
-			s.IgnoreWhitespace = !preserveWhitespaces;
+			// FIXME: finish System.Xml 2.0
+//			s.IgnoreWhitespaces = !preserveWhitespaces;
 			using (XmlReader r = XmlReader.Create (uri, s)) {
 				return Load (r);
 			}
@@ -899,8 +903,10 @@ namespace System.Xml.XLinq
 		public static XElement Load (TextReader tr, bool preserveWhitespaces)
 		{
 			XmlReaderSettings s = new XmlReaderSettings ();
-			s.IgnoreWhitespace = !preserveWhitespaces;
-			using (XmlReader r = XmlReader.Create (tr, s)) {
+			// FIXME: finish System.Xml 2.0
+//			s.IgnoreWhitespaces = !preserveWhitespaces;
+//			using (XmlReader r = XmlReader.Create (tr, s)) {
+			using (XmlReader r = XmlReader.Create (tr)) {
 				return Load (r);
 			}
 		}
diff --git a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XElementSequence.cs b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XElementSequence.cs
index 2861bb1ece7..a8f52dd116b 100644
--- a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XElementSequence.cs
+++ b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XElementSequence.cs
@@ -3,43 +3,34 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 
 namespace System.Xml.XLinq
 {
-	[ExtensionAttribute]
+	// [ExtensionAttribute]
 	public static class XElementSequence
 	{
-		[ExtensionAttribute]
+		// [ExtensionAttribute]
 		public static IEnumerable <XElement> Ancestors (IEnumerable <XElement> source)
 		{
-			foreach (XElement item in source)
-				foreach (XElement elem in item.Ancestors ())
-					yield return elem;
+			throw new NotImplementedException ();
 		}
 
-		[ExtensionAttribute]
+		// [ExtensionAttribute]
 		public static IEnumerable <XElement> Ancestors (IEnumerable <XElement> source, XName name)
 		{
-			foreach (XElement item in source)
-				foreach (XElement elem in item.Ancestors (name))
-					yield return elem;
+			throw new NotImplementedException ();
 		}
 
-		[ExtensionAttribute]
-		public static IEnumerable <XAttribute> Attributes (IEnumerable <XElement> source)
+		// [ExtensionAttribute]
+		public static IEnumerable <XAttribute> Attributes (IEnumerable <XAttribute> source)
 		{
-			foreach (XElement item in source)
-				foreach (XAttribute attr in item.Attributes ())
-					yield return attr;
+			throw new NotImplementedException ();
 		}
 
-		[ExtensionAttribute]
-		public static IEnumerable <XAttribute> Attributes (IEnumerable <XElement> source, XName name)
+		// [ExtensionAttribute]
+		public static IEnumerable <XAttribute> Attributes (IEnumerable <XAttribute> source, XName name)
 		{
-			foreach (XElement item in source)
-				foreach (XAttribute attr in item.Attributes (name))
-					yield return attr;
+			throw new NotImplementedException ();
 		}
 	}
 }
diff --git a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XIterators.cs b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XIterators.cs
index 3e9762ccb1b..5379f4ea2cd 100644
--- a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XIterators.cs
+++ b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XIterators.cs
@@ -29,17 +29,9 @@ namespace System.Xml.XLinq
 			foreach (object o in source) {
 				if (! (o is T))
 					continue;
-				if (name != null) {
-					if (o is XElement) {
-						if (((XElement) o).Name != name)
-							continue;
-					}
-					else if (o is XAttribute) {
-						if (((XAttribute) o).Name != name)
-							continue;
-					}
-				}
-				yield return (T) o;
+				if (name != null && (! (o is XElement) || ((XElement) o).Name != name))
+					continue;
+				yield return o as T;
 			}
 		}
 
diff --git a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XName.cs b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XName.cs
index 6ca08373f0e..5f8d8ec1ba2 100644
--- a/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XName.cs
+++ b/mcs/class/System.Xml.XLinq/System.Xml.XLinq/XName.cs
@@ -89,17 +89,14 @@ namespace System.Xml.XLinq
 
 		public static bool operator == (XName n1, XName n2)
 		{
-			if ((object) n1 == null)
-				return (object) n2 == null;
-			else if ((object) n2 == null)
-				return false;
-			return object.ReferenceEquals (n1, n2) ||
+			return (object) n1 == null && (object) n2 == null ||
+				object.ReferenceEquals (n1, n2) ||
 				n1.local == n2.local && n1.ns == n2.ns;
 		}
 
 		public static implicit operator XName (string s)
 		{
-			return s == null ? null : Get (s);
+			return Get (s);
 		}
 
 		public static bool operator != (XName n1, XName n2)
diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog
index 0db8e766b44..e99dd0c4585 100644
--- a/mcs/class/System/ChangeLog
+++ b/mcs/class/System/ChangeLog
@@ -1,28 +1,3 @@
-2006-02-28  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* System.dll.sources: Forgot to add inside System.IO.Ports:
-	SerialData.cs, SerialError.cs, SerialPinChange.cs
-
-2006-02-22  Kornél Pál  <kornelpal@hotmail.com>
-
-	* System.dll.sources: Added System.IO.Ports.SerialPortStream.cs
-	  to fix build.
-
-2005-02-02  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* System.dll.sources: Add the recently added System.Net 2.0 
-	clases (FtpWebRequest, FtpWebResponse, FtpDataStream, FtpAsyncResult,
-	and also FtpStatusCode and WebRequestMethods).
-	
-2005-01-13  John Luke  <john.luke@gmail.com>
-
-	* System_test.dll.sources: add System.Net.Mail.SmtpClient tests
-	
-2006-01-09  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile (LIB_MCS_FLAGS): if we're building net_2_0, define
-	CONFIGURATION_2_0 to use the new System.Configuration api.
-
 2006-01-02  Chris Toshok  <toshok@ximian.com>
 
 	* Makefile: use an external alias (PrebuiltSystem) when building
diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index be94478c729..4ff1d716981 100644
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -31,7 +31,7 @@ CONFIGURATION_DEP := System.Configuration.dll
 CONFIGURATION_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(CONFIGURATION_DEP))
 CYCLIC_DEPS += $(SECURITY_DEP) $(CONFIGURATION_DEP)
 CYCLIC_DEP_FILES += $(SECURITY_DEP_FILE) $(CONFIGURATION_DEP_FILE)
-LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0
+LIB_MCS_FLAGS = -nowarn:618
 endif
 
 EXTRA_DISTFILES = \
diff --git a/mcs/class/System/Microsoft.VisualBasic/ChangeLog b/mcs/class/System/Microsoft.VisualBasic/ChangeLog
index be47b6e282d..2348d0a6630 100644
--- a/mcs/class/System/Microsoft.VisualBasic/ChangeLog
+++ b/mcs/class/System/Microsoft.VisualBasic/ChangeLog
@@ -1,10 +1,3 @@
-2006-02-14  Rafael Teixeira <rafaelteixeirabr@hotmail.com> 
-	* VBCodeCompiler.cs: 
-		use mbas.exe from 1.0 or 2.0, depending on NET_2_0
-		BuildArgs()
-			copy options.CompilerOptions to the resulting command line  (as pointed by Arnhoffer Károly)	
-			use Append instead of AppendFormat when possible
-			
 2005-12-07  Gert Driesen  <drieseng@users.sourceforge.net>
 
 	* VBCodeCompiler.cs: Set eol-style to native.
diff --git a/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs b/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
index 05425231c0b..fdb2dd8443d 100644
--- a/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
+++ b/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
@@ -52,6 +52,8 @@ namespace Microsoft.VisualBasic
 		static VBCodeCompiler ()
 		{
 			if (Path.DirectorySeparatorChar == '\\') {
+				// FIXME: right now we use "fixed" version 1.0
+				// mcs at any time.
 				PropertyInfo gac = typeof (Environment).GetProperty ("GacPath", BindingFlags.Static | BindingFlags.NonPublic);
 				MethodInfo get_gac = gac.GetGetMethod (true);
 				string p = Path.GetDirectoryName (
@@ -65,13 +67,8 @@ namespace Microsoft.VisualBasic
 						Path.GetDirectoryName (
 							Path.GetDirectoryName (p)),
 						"bin\\mono.exe");
-#if NET_2_0
-				windowsMbasPath =
-					Path.Combine (p, "2.0\\mbas.exe");
-#else
 				windowsMbasPath =
 					Path.Combine (p, "1.0\\mbas.exe");
-#endif
 			}
 		}
 
@@ -132,11 +129,11 @@ namespace Microsoft.VisualBasic
 		static string BuildArgs (CompilerParameters options, string[] fileNames)
 		{
 			StringBuilder args = new StringBuilder ();
-			args.Append ("/quiet ");
+			args.AppendFormat ("/quiet ");
 			if (options.GenerateExecutable)
-				args.Append ("/target:exe ");
+				args.AppendFormat ("/target:exe ");
 			else
-				args.Append ("/target:library ");
+				args.AppendFormat ("/target:library ");
 
 			/* Disabled. It causes problems now. -- Gonzalo
 			if (options.IncludeDebugInformation)
@@ -144,7 +141,7 @@ namespace Microsoft.VisualBasic
 			*/
 
 			if (options.TreatWarningsAsErrors)
-				args.Append ("/warnaserror ");
+				args.AppendFormat ("/warnaserror ");
 
 			if (options.WarningLevel != -1)
 				args.AppendFormat ("/wlevel:{0} ", options.WarningLevel);
@@ -165,16 +162,11 @@ namespace Microsoft.VisualBasic
 					args.AppendFormat ("/r:\"{0}\" ", import);
 				}
 			}
-			
 			// add standard import to Microsoft.VisualBasic if missing
 			if (!Reference2MSVBFound)
-				args.Append ("/r:\"Microsoft.VisualBasic\" ");
+				args.AppendFormat ("/r:\"{0}\" ", "Microsoft.VisualBasic");
 
-			if (options.CompilerOptions != null) {
-				args.Append (options.CompilerOptions);
-			}
-			
-			args.Append (" -- "); // makes mbas not try to process filenames as options
+			args.AppendFormat (" -- "); // makes mbas not try to process filenames as options
 
 			foreach (string source in fileNames)
 				args.AppendFormat ("\"{0}\" ", source);
diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
index 7e14c3f2d65..1d03e3e0e00 100644
--- a/mcs/class/System/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -1,21 +1,7 @@
-2006-02-26  Pedro Martinez Julia  <pedromj@gmail.com>
-
-	* HandledEventHandler.cs: Resolving a "Replaced" SVN flag.
-
-2006-02-23 Andrew Skiba <andrews@mainsoft.com>
-
-	* TypeDescriptor.cs: performance improvement for GetAttributes,
-	GetProperties and GetEvents. See the standalone test for the use case.
-
 2006-01-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* Container.cs: patch by Brian Crowell that fixes GetService().
 
-2006-01-22  Chris Toshok  <toshok@ximian.com>
-
-	* DesignerSerializationVisibilityAttribute.cs: in the 2.0 case,
-	this attribute is valid on fields and events as well.
-
 2005-11-19  Zoltan Varga  <vargaz@gmail.com>
 
 	* TypeDescriptor.cs: Small changes to make this more compliant with
diff --git a/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs b/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
index 5bb5602ffe3..8cb70785efb 100644
--- a/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
+++ b/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
@@ -33,11 +33,7 @@
 
 namespace System.ComponentModel {
 
-	[AttributeUsage (AttributeTargets.Method | AttributeTargets.Property
-#if NET_2_0
-			 | AttributeTargets.Field | AttributeTargets.Event
-#endif
-			 )]
+	[AttributeUsage (AttributeTargets.Method | AttributeTargets.Property)]
 	public sealed class DesignerSerializationVisibilityAttribute : Attribute
 	{
 
diff --git a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
index db290fe841f..4b84547bf25 100644
--- a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
+++ b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
@@ -124,7 +124,7 @@ public sealed class TypeDescriptor
 		    return ((ICustomTypeDescriptor) component).GetAttributes ();
 		} else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetAttributes ();
 			else
 				return GetTypeInfo (component.GetType()).GetAttributes ();
@@ -327,7 +327,7 @@ public sealed class TypeDescriptor
 			return ((ICustomTypeDescriptor) component).GetDefaultEvent ();
 		else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetDefaultEvent ();
 			else
 				return GetTypeInfo (component.GetType()).GetDefaultEvent ();
@@ -350,7 +350,7 @@ public sealed class TypeDescriptor
 			return ((ICustomTypeDescriptor) component).GetDefaultProperty ();
 		else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetDefaultProperty ();
 			else
 				return GetTypeInfo (component.GetType()).GetDefaultProperty ();
@@ -424,7 +424,7 @@ public sealed class TypeDescriptor
 			return ((ICustomTypeDescriptor) component).GetEvents ();
 		else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetEvents ();
 			else
 				return GetTypeInfo (component.GetType()).GetEvents ();
@@ -442,7 +442,7 @@ public sealed class TypeDescriptor
 			return ((ICustomTypeDescriptor) component).GetEvents (attributes);
 		else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetEvents (attributes);
 			else
 				return GetTypeInfo (component.GetType()).GetEvents (attributes);
@@ -473,7 +473,7 @@ public sealed class TypeDescriptor
 			return ((ICustomTypeDescriptor) component).GetProperties (attributes);
 		else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetProperties (attributes);
 			else
 				return GetTypeInfo (component.GetType()).GetProperties (attributes);
@@ -489,7 +489,7 @@ public sealed class TypeDescriptor
 			return ((ICustomTypeDescriptor) component).GetProperties ();
 		else {
 			IComponent com = component as IComponent;
-			if (com != null && com.Site != null)
+			if (com != null)
 				return GetComponentInfo (com).GetProperties ();
 			else
 				return GetTypeInfo (component.GetType()).GetProperties ();
diff --git a/mcs/class/System/System.Configuration/ChangeLog b/mcs/class/System/System.Configuration/ChangeLog
index 89e94596460..13dda585a9b 100644
--- a/mcs/class/System/System.Configuration/ChangeLog
+++ b/mcs/class/System/System.Configuration/ChangeLog
@@ -1,15 +1,3 @@
-2006-02-01  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* SettingElementCollection.cs : CollectionType is protected.
-
-2006-01-16  Chris Toshok  <toshok@ximian.com>
-
-	* ConfigurationSettings.cs (AppSettings): move back to a 1.x
-	strategy in the 2.0 case.  That is, don't hardcode the reference
-	to ConfigurationManager.AppSettings (yet).  Eventually we can move
-	back to this code, once ConfigurationManager supports reading
-	web.config for settings.
-
 2006-01-03  Chris Toshok  <toshok@ximian.com>
 
 	* ConfigurationSettings.cs (GetConfig): be nice to people using
diff --git a/mcs/class/System/System.Configuration/ConfigurationSettings.cs b/mcs/class/System/System.Configuration/ConfigurationSettings.cs
index 42b02b39de5..066d185f75c 100644
--- a/mcs/class/System/System.Configuration/ConfigurationSettings.cs
+++ b/mcs/class/System/System.Configuration/ConfigurationSettings.cs
@@ -65,28 +65,12 @@ namespace System.Configuration
 #if NET_2_0
 		[Obsolete ("This property is obsolete.  Please use System.Configuration.ConfigurationManager.AppSettings")]
 #endif
-#if NET_2_0 && CONFIGURATION_2_0
-		static NameValueCollection appSettingsCol;
-#endif
 		public static NameValueCollection AppSettings
 		{
 			get {
 #if NET_2_0 && CONFIGURATION_2_0
 #if CONFIGURATION_DEP
-				lock (lockobj) {
-					if (appSettingsCol == null) {
-						AppSettingsSection appSettings = (AppSettingsSection)GetConfig ("appSettings");
-
-						appSettingsCol = new NameValueCollection ();
-				
-						foreach (string key in appSettings.Settings.AllKeys) {
-							KeyValueConfigurationElement ele = appSettings.Settings[key];
-							appSettingsCol.Add (ele.Key, ele.Value);
-						}
-					}
-				}
-
-				return appSettingsCol;
+				return ConfigurationManager.AppSettings;
 #else
 				return null;
 #endif
@@ -109,9 +93,6 @@ namespace System.Configuration
 			lock (lockobj) {
 				IConfigurationSystem old = config;
 				config = newSystem;
-#if NET_2_0 && CONFIGURATION_2_0
-				appSettingsCol = null;
-#endif
 				return old;
 			}
 		}
diff --git a/mcs/class/System/System.Configuration/SettingElementCollection.cs b/mcs/class/System/System.Configuration/SettingElementCollection.cs
index 617c1a0e8e1..91f91e45ef6 100644
--- a/mcs/class/System/System.Configuration/SettingElementCollection.cs
+++ b/mcs/class/System/System.Configuration/SettingElementCollection.cs
@@ -78,7 +78,7 @@ namespace System.Configuration
 		}
 
 		[MonoTODO]
-		public override ConfigurationElementCollectionType CollectionType {
+		protected override ConfigurationElementCollectionType CollectionType {
 			get {
 				throw new NotImplementedException ();
 			}
diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index f8e0717e3d8..e63ff0a26ab 100644
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* ConsoleTraceListener.cs: New 2.0 class
-
 2005-11-17  Dick Porter  <dick@ximian.com>
 
 	* Process.cs: Split Start_common into Start_shell and
diff --git a/mcs/class/System/System.Diagnostics/ConsoleTraceListener.cs b/mcs/class/System/System.Diagnostics/ConsoleTraceListener.cs
deleted file mode 100644
index eb4143afed7..00000000000
--- a/mcs/class/System/System.Diagnostics/ConsoleTraceListener.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Diagnostics.ConsoleTraceListener.cs
-//
-// Authors:
-//   Ben Maurer <bmaurer@andrew.cmu.edu>
-//
-// (C) 2006 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-
-namespace System.Diagnostics {
-	public class ConsoleTraceListener : TextWriterTraceListener {
-		public ConsoleTraceListener () : this (false) {}
-		public ConsoleTraceListener (bool useErrorStream) :
-			base (useErrorStream ? Console.Error : Console.Out) {}
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/mcs/class/System/System.IO.Ports/ChangeLog b/mcs/class/System/System.IO.Ports/ChangeLog
index 1ccf92bc504..cdfe5ffcb88 100644
--- a/mcs/class/System/System.IO.Ports/ChangeLog
+++ b/mcs/class/System/System.IO.Ports/ChangeLog
@@ -1,41 +1,3 @@
-2006-02-28  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* SerialPort.cs: 
-	* SerialPortStream.cs: Cleanups and some small funcionalities
-	added. Also, some code was moved to SerialPortStream, to have a 
-	better design.
-
-2006-02-21  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* SerialPort.cs:
-	* SerialPortStream.cs: Move SerialPortStream to a new file,
-	to have a better organization.
-
-2006-02-21  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* SerialPort.cs: Little work on support the Read methods.
-
-2006-02-14  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* SerialPort.cs: Little work on default values and
-	exception report.
-	
-	* Parity.cs:
-	* Handshake.cs:
-	* StopBits.cs: New enum files (taken outside SerialPort
-	and with the right values now).
-
-2006-02-13  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* SerialPort.cs: Work on Encoding property and use it
-	in Write methods.
-	
-2006-02-10  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* SerialError.cs:
-	* SerialData.cs:
-	* SerialPinChange.cs: New enums.
-	
 2004-12-26  Zoltan Varga  <vargaz@freemail.hu>
 
 	* System.IO.Ports/SerialPort.cs: Fix build under csc.
diff --git a/mcs/class/System/System.IO.Ports/Handshake.cs b/mcs/class/System/System.IO.Ports/Handshake.cs
deleted file mode 100644
index a03cf23f7f0..00000000000
--- a/mcs/class/System/System.IO.Ports/Handshake.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//

-// System.IO.Ports.Handshake.cs

-//

-// Authors:

-//	Chris Toshok (toshok@ximian.com)

-//

-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)

-//

-

-#if NET_2_0

-

-namespace System.IO.Ports 

-{

-	public enum Handshake 

-	{

-		None,

-		XOnXOff,

-		RequestToSend,

-		RequestToSendXOnXOff

-	} 

-}

-

-#endif

-

diff --git a/mcs/class/System/System.IO.Ports/Parity.cs b/mcs/class/System/System.IO.Ports/Parity.cs
deleted file mode 100644
index 827466eb8da..00000000000
--- a/mcs/class/System/System.IO.Ports/Parity.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//

-// System.IO.Ports.Parity.cs

-//

-// Authors:

-//	Chris Toshok (toshok@ximian.com)

-//

-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)

-//

-

-#if NET_2_0

-

-namespace System.IO.Ports 

-{

-	public enum Parity 

-	{

-		None,

-		Odd,

-		Even,

-		Mark,

-		Space

-	} 

-}

-

-#endif

-

diff --git a/mcs/class/System/System.IO.Ports/SerialData.cs b/mcs/class/System/System.IO.Ports/SerialData.cs
deleted file mode 100644
index e978cbbffb0..00000000000
--- a/mcs/class/System/System.IO.Ports/SerialData.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-//

-// System.IO.Ports.SerialData.cs

-//

-// Authors:

-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)

-//

-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)

-//

-

-#if NET_2_0

-

-namespace System.IO.Ports 

-{

-	public enum SerialData 

-	{

-		Chars = 1,

-		Eof

-	} 

-}

-

-#endif

-

diff --git a/mcs/class/System/System.IO.Ports/SerialError.cs b/mcs/class/System/System.IO.Ports/SerialError.cs
deleted file mode 100644
index beefb188bc3..00000000000
--- a/mcs/class/System/System.IO.Ports/SerialError.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//

-// System.IO.Ports.SerialError.cs

-//

-// Authors:

-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)

-//

-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)

-//

-

-#if NET_2_0

-

-namespace System.IO.Ports 

-{

-	public enum SerialError 

-	{

-		RXOver = 1,

-		Overrun = 2,

-		RXParity = 4,

-		Frame = 8,

-		TXFull = 256

-	} 

-}

-

-#endif

-

diff --git a/mcs/class/System/System.IO.Ports/SerialPinChange.cs b/mcs/class/System/System.IO.Ports/SerialPinChange.cs
deleted file mode 100644
index bbb735aea6f..00000000000
--- a/mcs/class/System/System.IO.Ports/SerialPinChange.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//

-// System.IO.Ports.SerialPinChange.cs

-//

-// Authors:

-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)

-//

-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)

-//

-

-#if NET_2_0

-

-namespace System.IO.Ports 

-{

-	public enum SerialPinChange 

-	{

-		CtsChanged = 8,

-		DsrChanged = 16,

-		CDChanged = 32,

-		Break = 64,

-		Ring = 256

-	} 

-}

-

-#endif

-

diff --git a/mcs/class/System/System.IO.Ports/SerialPort.cs b/mcs/class/System/System.IO.Ports/SerialPort.cs
index 1360e544133..465043659ce 100644
--- a/mcs/class/System/System.IO.Ports/SerialPort.cs
+++ b/mcs/class/System/System.IO.Ports/SerialPort.cs
@@ -2,17 +2,50 @@
 
 #if NET_2_0
 
-using System;
 using System.Text;
 using System.Runtime.InteropServices;
 
 namespace System.IO.Ports
 {
+	public enum Handshake
+	{
+		None,                 /* No control is used for the handshake */
+		RequestToSend,        /* Request-to-Send (RTS) hardware flow
+				       * control is used. RTS is used to signal
+				       * that data is available for
+				       * transmission. */
+		RequestToSendXOnXOff, /* Both the Request-to-Send (RTS) hardware
+				       * control and the XON/XOFF software
+				       * controls are used. */
+		XOnXOff               /* The XON/XOFF software control protocol is
+				       * used.  XOFF is a software control sent to
+				       * stop the transmission of data and the XON
+				       * control is sent to resume the
+				       * transmission.  These controls are used
+				       * instead of the Request to Send (RTS) and
+				       * Clear to Send (CTS) hardware controls. */
+	}
+
+	public enum Parity
+	{
+		Even, /* Sets the parity bit so that the count of bits set is an even number */
+		Mark, /* Leaves the parity bit set to 1. */
+		None, /* No parity check occurs */
+		Odd,  /* Sets the parity bit so that the count of bits set is an odd number */
+		Space /* Leaves the parity bit set to 0 */
+	}
+
+	public enum StopBits
+	{
+		One,          /* One stop bit is used */
+		OnePointFive, /* Three stop bits are used. */
+		Two           /* Two stop bits are used. */
+	}
+
 	public class SerialPort /* : Component */
 	{
+
 		public const int InfiniteTimeout = -1;
-		const int DefaultReadBufferSize = 4096;
-		const int DefaultWriteBufferSize = 2048;
 
 		bool   isOpen     = false;
 		int    baudRate   = 9600;
@@ -21,20 +54,85 @@ namespace System.IO.Ports
 		Handshake handshake = Handshake.None;
 		int    dataBits   = 8;
 		bool   breakState = false;
-		SerialPortStream stream;
-		Encoding encoding = Encoding.ASCII;
-		string newLine    = Environment.NewLine;
+		Stream baseStream;
+		string newLine    = "\n";
 		string portName;
+		int    unixFd;
 		int    readTimeout = InfiniteTimeout;
 		int    writeTimeout = InfiniteTimeout;
-		int readBufferSize = DefaultReadBufferSize;
-		int writeBufferSize = DefaultWriteBufferSize;
-		int readBufferOffset;
-		int readBufferLength;
-		int writeBufferOffset;
-		int writeBufferLength;
-		byte [] readBuffer;
-		byte [] writeBuffer;
+
+		private class SerialPortStream : Stream
+		{
+			SerialPort port;
+
+			public SerialPortStream (SerialPort port)
+			{
+				this.port = port;
+			}
+
+			public override bool CanRead
+			{
+				get {
+					return true;
+				}
+			}
+
+			public override bool CanSeek
+			{
+				get {
+					return false;
+				}
+			}
+
+			public override bool CanWrite
+			{
+				get {
+					return true;
+				}
+			}
+
+			public override long Length
+			{
+				get {
+					return -1;
+				}
+			}
+
+			public override long Position
+			{
+				get {
+					return -1;
+				}
+				set {
+					throw new InvalidOperationException ();
+				}
+			}
+
+			public override void Flush ()
+			{
+				throw new NotImplementedException ();
+			}
+
+			public override int Read ([In,Out] byte[] buffer, int offset, int count)
+			{
+				return port.Read (buffer, offset, count);
+			}
+
+			public override long Seek (long offset, SeekOrigin origin)
+			{
+				throw new InvalidOperationException ();
+			}
+
+			public override void SetLength (long value)
+			{
+				throw new InvalidOperationException ();
+			}
+
+			public override void Write (byte[] buffer, int offset, int count)
+			{
+				port.Write (buffer, offset, count);
+			}
+		}
 
 		public SerialPort ()
 		{
@@ -73,8 +171,7 @@ namespace System.IO.Ports
 			this.dataBits = dataBits;
 		}
 
-		public SerialPort (string portName, int baudRate, Parity parity, int dataBits, StopBits stopBits) 
-		{
+		public SerialPort (string portName, int baudRate, Parity parity, int dataBits, StopBits stopBits) {
 			this.portName = portName;
 			this.baudRate = baudRate;
 			this.parity = parity;
@@ -82,169 +179,198 @@ namespace System.IO.Ports
 			this.stopBits = stopBits;
 		}
 
-		public Stream BaseStream {
+		public Stream BaseStream
+		{
 			get {
 				if (!isOpen)
 					throw new InvalidOperationException ();
 
-				return stream;
+				if (baseStream == null)
+					baseStream = new SerialPortStream (this);
+
+				return baseStream;
 			}
 		}
 
-		public int BaudRate {
+		[DllImport("MonoPosixHelper")]
+		private static extern bool set_attributes (int unix_fd, int baud_rate, Parity parity, int dataBits, StopBits stopBits, Handshake handshake);
+	  
+		public int BaudRate
+		{
 			get {
 				return baudRate;
 			}
 			set {
-				if (value <= 0)
-					throw new ArgumentOutOfRangeException ("value");
-				
-				baudRate = value;
-				if (isOpen)
-					stream.BaudRate = value;
+				this.baudRate = value;
+				set_attributes (unixFd, baudRate, parity, dataBits, stopBits, handshake);
 			}
 		}
 
-		public bool BreakState {
+		public bool BreakState
+		{
 			get {
 				return breakState;
 			}
 			set {
-				CheckOpen ();
-				if (value == breakState)
-					return; // Do nothing.
+				if (!isOpen)
+					throw new InvalidOperationException ();
 
-				breakState = value;
-				// Update the state
+				throw new NotImplementedException ();
 			}
 		}
 
-		public int BytesToRead {
+		public int BytesToRead
+		{
 			get {
-				CheckOpen ();
-				return readBufferLength + stream.BytesToRead;
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
+				throw new NotImplementedException ();
 			}
 		}
 
-		public int BytesToWrite {
+		public int BytesToWrite
+		{
 			get {
-				CheckOpen ();
-				return writeBufferLength + stream.BytesToWrite;
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
+				throw new NotImplementedException ();
 			}
 		}
 
-		public bool CDHolding {
+		public bool CDHolding
+		{
 			get {
-				CheckOpen ();
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				throw new NotImplementedException ();
 			}
 		}
 
-		public bool CtsHolding {
+		public bool CtsHolding
+		{
 			get {
-				CheckOpen ();
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				throw new NotImplementedException ();
 			}
 		}
 
-		public int DataBits {
+		public int DataBits
+		{
 			get {
-				return dataBits;
+				throw new NotImplementedException ();
 			}
 			set {
 				if (value < 5 || value > 8)
-					throw new ArgumentOutOfRangeException ("value");
+					throw new ArgumentOutOfRangeException ();
 
 				dataBits = value;
-				if (isOpen)
-					stream.DataBits = value;
+				set_attributes (unixFd, baudRate, parity, dataBits, stopBits, handshake);
 			}
 		}
 
-		public bool DiscardNull {
+		public bool DiscardNull
+		{
 			get {
-				CheckOpen ();
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				throw new NotImplementedException ();
 			}
 			set {
-				CheckOpen ();
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				throw new NotImplementedException ();
 			}
 		}
 
-		public bool DsrHolding {
+		public bool DsrHolding
+		{
 			get {
-				CheckOpen ();
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				throw new NotImplementedException ();
 			}
 		}
 
-		public bool DtrEnable {
+		public bool DtrEnable
+		{
 			get {
-				CheckOpen ();
 				throw new NotImplementedException ();
 			}
 		}
 
-		public Encoding Encoding {
+		public Encoding Encoding
+		{
 			get {
-				return encoding;
+				throw new NotImplementedException ();
 			}
 			set {
-				if (value == null)
-					throw new ArgumentNullException ("value");
-
-				encoding = value;
+				throw new NotImplementedException ();
 			}
 		}
 
-		public Handshake Handshake {
+		public Handshake Handshake
+		{
 			get {
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				return handshake;
 			}
 			set {
-				if (value < Handshake.None || value > Handshake.RequestToSendXOnXOff)
-					throw new ArgumentOutOfRangeException ("value");
+				if (!isOpen)
+					throw new InvalidOperationException ();
 
 				handshake = value;
-				if (isOpen)
-					stream.Handshake = value;
+
+				set_attributes (unixFd, baudRate, parity, dataBits, stopBits, handshake);
 			}
 		}
 
-		public bool IsOpen {
+		public bool IsOpen
+		{
 			get {
 				return isOpen;
 			}
 		}
 
-		public string NewLine {
+		public string NewLine
+		{
 			get {
 				return newLine;
 			}
 			set {
-				if (value == null)
-					throw new ArgumentNullException ("value");
-				
 				newLine = value;
 			}
 		}
 
-		public Parity Parity {
+		public Parity Parity
+		{
 			get {
+				if (!isOpen)
+					throw new InvalidOperationException ();
+
 				return parity;
 			}
 			set {
-				if (value < Parity.None || value > Parity.Space)
-					throw new ArgumentOutOfRangeException ("value");
+				if (!isOpen)
+					throw new InvalidOperationException ();
 
-				parity = value;
-				if (isOpen)
-					stream.Parity = value;
+				this.parity = value;
+
+				set_attributes (unixFd, baudRate, parity, dataBits, stopBits, handshake);
 			}
 		}
 
-		public byte ParityReplace {
+		public byte ParityReplace
+		{
 			get {
 				throw new NotImplementedException ();
 			}
@@ -253,213 +379,173 @@ namespace System.IO.Ports
 			}
 		}
 
-		public string PortName {
+		public string PortName
+		{
 			get {
 				return portName;
 			}
 			set {
-				if (isOpen)
-					throw new InvalidOperationException ("Port name cannot be set while port is open.");
-				if (value == null)
-					throw new ArgumentNullException ("value");
-				if (value.Length == 0 || value.StartsWith ("\\\\"))
-					throw new ArgumentException ("value");
-
-				portName = value;
+				throw new NotImplementedException ();
 			}
 		}
 
-		public int ReadBufferSize {
+		public int ReadBufferSize
+		{
 			get {
-				return readBufferSize;
+				throw new NotImplementedException ();
 			}
 			set {
-				if (isOpen)
-					throw new InvalidOperationException ();
 				if (value <= 0)
-					throw new ArgumentOutOfRangeException ("value");
-				if (value <= DefaultReadBufferSize)
-					return;
+					throw new ArgumentOutOfRangeException ();
 
-				readBufferSize = value;
+				throw new NotImplementedException ();
 			}
 		}
 
-		public int ReadTimeout {
+		public int ReadTimeout
+		{
 			get {
 				return readTimeout;
 			}
 			set {
 				if (value <= 0 && value != InfiniteTimeout)
-					throw new ArgumentOutOfRangeException ("value");
+					throw new ArgumentOutOfRangeException ();
 
 				readTimeout = value;
-				/*if (isOpen)
-					stream.ReadTimeout = value;*/
 			}
 		}
 
-		public int ReceivedBytesThreshold {
+		public int ReceivedBytesThreshold
+		{
 			get {
 				throw new NotImplementedException ();
 			}
 			set {
 				if (value <= 0)
-					throw new ArgumentOutOfRangeException ("value");
+					throw new ArgumentOutOfRangeException ();
 
 				throw new NotImplementedException ();
 			}
 		}
 
-		public bool RtsEnable {
+		public bool RtsEnable
+		{
 			get {
-				CheckOpen ();
 				throw new NotImplementedException ();
 			}
 			set {
-				CheckOpen ();
 				throw new NotImplementedException ();
 			}
 		}
 
-		public StopBits StopBits {
+		public StopBits StopBits
+		{
 			get {
 				return stopBits;
 			}
 			set {
-				if (value < StopBits.One || value > StopBits.OnePointFive)
-					throw new ArgumentOutOfRangeException ("value");
-				
-				stopBits = value;
-				if (isOpen)
-					stream.StopBits = value;
+				this.stopBits = value;
+				set_attributes (unixFd, baudRate, parity, dataBits, stopBits, handshake);
 			}
 		}
 
-		public int WriteBufferSize {
+		public int WriteBufferSize
+		{
 			get {
-				return writeBufferSize;
+				throw new NotImplementedException ();
 			}
 			set {
-				if (isOpen)
-					throw new InvalidOperationException ();
 				if (value <= 0)
-					throw new ArgumentOutOfRangeException ("value");
-				if (value <= DefaultWriteBufferSize)
-					return;
+					throw new ArgumentOutOfRangeException ();
 
-				writeBufferSize = value;
+				throw new NotImplementedException ();
 			}
 		}
 
-		public int WriteTimeout {
+		public int WriteTimeout
+		{
 			get {
 				return writeTimeout;
 			}
 			set {
 				if (value <= 0 && value != InfiniteTimeout)
-					throw new ArgumentOutOfRangeException ("value");
+					throw new ArgumentOutOfRangeException ();
 
 				writeTimeout = value;
-				/*if (isOpen)
-					stream.WriteTimeout = value;*/
 			}
 		}
 
 		// methods
 
+		[DllImport("MonoPosixHelper")]
+		private static extern void close_serial (int unixFd);
 		public void Close ()
 		{
 			isOpen = false;
 
-			if (stream != null)
-				stream.Close ();
-			
-			stream = null;
-			readBuffer = null;
-			writeBuffer = null;
+			close_serial (unixFd);
 		}
 
+		[DllImport("MonoPosixHelper")]
+		private static extern void discard_buffer (int unixFd, bool input_buffer);
 		public void DiscardInBuffer ()
 		{
-			CheckOpen ();
-			stream.DiscardInputBuffer ();
+			if (!isOpen)
+				throw new InvalidOperationException ();
+			discard_buffer (unixFd, true);
 		}
 
 		public void DiscardOutBuffer ()
 		{
-			CheckOpen ();
-			stream.DiscardOutputBuffer ();
+			if (!isOpen)
+				throw new InvalidOperationException ();
+			discard_buffer (unixFd, false);
 		}
 
-		public static string [] GetPortNames ()
+		[DllImport("MonoPosixHelper")]
+		private static extern string[] list_serial_devices ();
+		public static string[] GetPortNames()
 		{
-			return new string [0]; // Return empty by now
+			return list_serial_devices ();
 		}
 
+		[DllImport("MonoPosixHelper")]
+		private static extern int open_serial (string portName);
+
 		public void Open ()
 		{
-			if (isOpen)
-				throw new InvalidOperationException ("Port is already open");
-			
+			if (portName == null || portName.StartsWith ("\\\\"))
+				throw new ArgumentException ();
+
+			unixFd = open_serial (portName);
+			if (unixFd == -1)
+				throw new IOException();
+
+			set_attributes (unixFd, baudRate, parity, dataBits, stopBits, handshake);
+
 			isOpen = true;
-			stream = new SerialPortStream (this);
-			readBuffer = new byte [readBufferSize];
-			writeBuffer = new byte [writeBufferSize];
 		}
 
+		[DllImport("MonoPosixHelper")]
+		private static extern int read_serial (int unixFd, byte[] buffer, int offset, int count, int timeout);
+
 		public int Read (byte[] buffer, int offset, int count)
 		{
-			CheckOpen ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset >= buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (count < 0 || count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("count");
-			if (count > buffer.Length - offset)
-				throw new ArgumentException ("count > buffer.Length - offset");
-			
-			if (readBufferLength <= 0) {
-				readBufferOffset = 0;
-				readBufferLength = stream.Read (readBuffer, 0, readBuffer.Length);
-			}
-			
-			if (readBufferLength == 0)
-				return 0; // No bytes left
-			
-			if (count > readBufferLength)
-				count = readBufferLength; // Update count if needed
-
-			Buffer.BlockCopy (readBuffer, readBufferOffset, buffer, offset, count);
-			readBufferOffset += count;
-			readBufferLength -= count;
-
-			return count;
+			return read_serial (unixFd, buffer, offset, count, readTimeout);
 		}
 
 		public int Read (char[] buffer, int offset, int count)
 		{
-			CheckOpen ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset >= buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (count < 0 || count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("count");
-			if (count > buffer.Length - offset)
-				throw new ArgumentException ("count > buffer.Length - offset");
-
-			byte [] bytes = encoding.GetBytes (buffer, offset, count);
-			return Read (bytes, 0, bytes.Length);
+			throw new NotImplementedException ();
 		}
 
+		byte[] read_buffer = new byte[4096];
+
 		public int ReadByte ()
 		{
-			byte [] buff = new byte [1];
-			if (Read (buff, 0, 1) > 0)
-				return buff [0];
-
+			if (Read (read_buffer, 0, 1) == 1)
+				return read_buffer [0];
+			
 			return -1;
 		}
 
@@ -480,54 +566,25 @@ namespace System.IO.Ports
 
 		public string ReadTo (string value)
 		{
-			CheckOpen ();
-			if (value == null)
-				throw new ArgumentNullException ("value");
-			if (value.Length == 0)
-				throw new ArgumentException ("value");
-
 			throw new NotImplementedException ();
 		}
 
+		[DllImport("MonoPosixHelper")]
+		private static extern void write_serial (int unixFd, byte[] buffer, int offset, int count, int timeout);
+
 		public void Write (string str)
 		{
-			CheckOpen ();
-			if (str == null)
-				throw new ArgumentNullException ("str");
-			
-			byte [] buffer = encoding.GetBytes (str);
-			Write (buffer, 0, buffer.Length);
+			throw new NotImplementedException ();
 		}
 
-		public void Write (byte [] buffer, int offset, int count)
+		public void Write (byte[] buffer, int offset, int count)
 		{
-			CheckOpen ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset >= buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (count < 0 || count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("count");
-			if (count > buffer.Length - offset)
-				throw new ArgumentException ("count > buffer.Length - offset");
-
-			stream.Write (buffer, offset, count);
+			write_serial (unixFd, buffer, offset, count, writeTimeout);
 		}
 
-		public void Write (char [] buffer, int offset, int count)
+		public void Write (char[] buffer, int offset, int count)
 		{
-			CheckOpen ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset >= buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (count < 0 || count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("count");
-			if (count > buffer.Length - offset)
-				throw new ArgumentException ("count > buffer.Length - offset");
-
-			byte [] bytes = encoding.GetBytes (buffer, offset, count);
-			stream.Write (bytes, 0, bytes.Length);
+			throw new NotImplementedException ();
 		}
 
 		public void WriteLine (string str)
@@ -535,12 +592,6 @@ namespace System.IO.Ports
 			Write (str + newLine);
 		}
 
-		void CheckOpen ()
-		{
-			if (!isOpen)
-				throw new InvalidOperationException ("Specified port is not open.");
-		}
-
 		// events
 
 		public delegate void SerialReceivedEventHandler (object sender, SerialReceivedEventArgs e);
diff --git a/mcs/class/System/System.IO.Ports/SerialPortStream.cs b/mcs/class/System/System.IO.Ports/SerialPortStream.cs
deleted file mode 100644
index eb8fe896391..00000000000
--- a/mcs/class/System/System.IO.Ports/SerialPortStream.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-//
-// System.IO.Ports.SerialPortStream.cs
-//
-// Authors:
-//	Chris Toshok (toshok@ximian.com)
-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)
-//
-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)
-//
-
-
-#if NET_2_0
-
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-
-namespace System.IO.Ports
-{
-	class SerialPortStream : Stream, IDisposable
-	{
-		int fd;
-		int baudRate;
-		int dataBits;
-		Parity parity;
-		StopBits stopBits;
-		Handshake handshake;
-		int readTimeout;
-		int writeTimeout;
-		bool disposed;
-
-		[DllImport ("MonoPosixHelper")]
-		static extern int open_serial (string portName);
-
-		public SerialPortStream (SerialPort port)
-		{
-			fd = open_serial (port.PortName);
-			if (fd == -1)
-				throw new IOException ();
-
-			readTimeout = port.ReadTimeout;
-			writeTimeout = port.WriteTimeout;
-			baudRate = port.BaudRate;
-			parity = port.Parity;
-			dataBits = port.DataBits;
-			stopBits = port.StopBits;
-			handshake = port.Handshake;
-			
-			if (!set_attributes (fd, port.BaudRate, port.Parity, port.DataBits, port.StopBits, port.Handshake))
-				throw new IOException ();
-		}
-
-		public override bool CanRead {
-			get {
-				return true;
-			}
-		}
-
-		public override bool CanSeek {
-			get {
-				return false;
-			}
-		}
-
-		public override bool CanWrite {
-			get {
-				return true;
-			}
-		}
-
-		// Remove this comments as soon as these properties
-		// are added to System.IO.Stream
-		/*
-		public override bool CanTimeout {
-			get {
-				return true;
-			}
-		}
-
-		public override int ReadTimeout {
-			get {
-				return readTimeout;
-			}
-			set {
-				if (value < 0 && value != SerialPort.InfiniteTimeout)
-					throw new ArgumentOutOfRangeException ("value");
-
-				readTimeout = value;
-			}
-		}
-
-		public override int WriteTimeout {
-			get {
-				return writeTimeout;
-			}
-			set {
-				if (value < 0 && value != SerialPort.InfiniteTimeout)
-					throw new ArgumentOutOfRangeException ("value");
-
-				writeTimeout = value;
-			}
-		}*/
-
-		public override long Length {
-			get {
-				throw new NotSupportedException ();
-			}
-		}
-
-		public override long Position {
-			get {
-				throw new NotSupportedException ();
-			}
-			set {
-				throw new NotSupportedException ();
-			}
-		}
-
-		public override void Flush ()
-		{
-			// If used, this _could_ flush the serial port
-			// buffer (not the SerialPort class buffer)
-		}
-
-		[DllImport ("MonoPosixHelper")]
-		static extern int read_serial (int fd, byte [] buffer, int offset, int count, int timeout);
-
-		public override int Read ([In,Out] byte[] buffer, int offset, int count)
-		{
-			CheckDisposed ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset >= buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (count < 0 || count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("count");
-			if (count > buffer.Length - offset)
-				throw new ArgumentException ("count > buffer.Length - offset");
-			
-			return read_serial (fd, buffer, offset, count, readTimeout);
-		}
-
-		public override long Seek (long offset, SeekOrigin origin)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public override void SetLength (long value)
-		{
-			throw new NotSupportedException ();
-		}
-
-		[DllImport ("MonoPosixHelper")]
-		static extern void write_serial (int fd, byte [] buffer, int offset, int count, int timeout);
-
-		public override void Write (byte[] buffer, int offset, int count)
-		{
-			CheckDisposed ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset >= buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (count < 0 || count > buffer.Length)
-				throw new ArgumentOutOfRangeException ("count");
-			if (count > buffer.Length - offset)
-				throw new ArgumentException ("offset+count > buffer.Length");
-
-			write_serial (fd, buffer, offset, count, writeTimeout);
-		}
-
-		protected void Dispose (bool disposing)
-		{
-			if (disposed)
-				return;
-			
-			disposed = true;
-			close_serial (fd);
-		}
-
-		[DllImport ("MonoPosixHelper")]
-		static extern void close_serial (int fd);
-
-		public override void Close ()
-		{
-			((IDisposable) this).Dispose ();
-		}
-
-		void IDisposable.Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-
-		~SerialPortStream ()
-		{
-			Dispose (false);
-		}
-
-		void CheckDisposed ()
-		{
-			if (disposed)
-				throw new ObjectDisposedException (GetType ().FullName);
-		}
-
-		[DllImport ("MonoPosixHelper")]
-		static extern bool set_attributes (int fd, int baudRate, Parity parity, int dataBits, StopBits stopBits, Handshake handshake);
-
-		// FIXME - Separate baud rate from the other values,
-		// since it can be set individually
-		internal int BaudRate {
-			get {
-				return baudRate;
-			}
-			set {
-				baudRate = value;
-				set_attributes (fd, baudRate, parity, dataBits, stopBits, handshake);
-			}
-		}
-
-		internal Parity Parity {
-			get {
-				return parity;
-			}
-			set {
-				parity = value;
-				set_attributes (fd, baudRate, parity, dataBits, stopBits, handshake);
-			}
-		}
-
-		internal int DataBits {
-			get {
-				return dataBits;
-			}
-			set {
-				dataBits = value;
-				set_attributes (fd, baudRate, parity, dataBits, stopBits, handshake);
-			}
-		}
-
-		internal StopBits StopBits {
-			get {
-				return stopBits;
-			}
-			set {
-				stopBits = stopBits;
-				set_attributes (fd, baudRate, parity, dataBits, stopBits, handshake);
-			}
-		}
-
-		internal Handshake Handshake {
-			get {
-				return handshake;
-			}
-			set {
-				handshake = value;
-				set_attributes (fd, baudRate, parity, dataBits, stopBits, handshake);
-			}
-		}
-
-		internal int BytesToRead {
-			get {
-				return 0; // Not implemented yet
-			}
-		}
-
-		internal int BytesToWrite {
-			get {
-				return 0; // Not implemented yet
-			}
-		}
-
-		[DllImport ("MonoPosixHelper")]
-		static extern void discard_buffer (int fd, bool inputBuffer);
-		
-		internal void DiscardInputBuffer ()
-		{
-			discard_buffer (fd, true);
-		}
-
-		internal void DiscardOutputBuffer ()
-		{
-			discard_buffer (fd, false);
-		}
-
-	}
-}
-
-#endif
-
-
diff --git a/mcs/class/System/System.IO.Ports/StopBits.cs b/mcs/class/System/System.IO.Ports/StopBits.cs
deleted file mode 100644
index 66fef341896..00000000000
--- a/mcs/class/System/System.IO.Ports/StopBits.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//

-// System.IO.Ports.StopBits.cs

-//

-// Authors:

-//	Chris Toshok (toshok@ximian.com)

-//

-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)

-//

-

-#if NET_2_0

-

-namespace System.IO.Ports 

-{

-	public enum StopBits 

-	{

-		None,

-		One,

-		Two,

-		OnePointFive

-	} 

-}

-

-#endif

-

diff --git a/mcs/class/System/System.Net.Mail/ChangeLog b/mcs/class/System/System.Net.Mail/ChangeLog
index 73bd5699ca0..2ac0e791d39 100644
--- a/mcs/class/System/System.Net.Mail/ChangeLog
+++ b/mcs/class/System/System.Net.Mail/ChangeLog
@@ -1,19 +1,3 @@
-2006-1-13  John Luke  <john.luke@gmail.com>
-
-	* MailMessage.cs: add [MonoTODO] for FormatException in ctor,
-	throw ArugmentNullException's from the ctors,
-	add internal BodyContentType property,
-	change BodyEncoding to use BodyContentType,
-	change IsBodyHtml to use BodyContentType,
-	* SmtpClient.cs: set timeout initially to 100000,
-	don't throw ArgumentOutOfRangeException when Timeout = 0,
-	add [MonoTODO] for set_host, and throw Exceptions for it,
-	add [MonoTODO] for UseDefaultCredentials,
-	get messageContentType from the message,
-	use "127.0.0.1" for Host and 25 for Port
-	if host or port is not specified until reading
-	them from the configuration files is done
-
 2006-1-02  John Luke  <john.luke@gmail.com>
 
 	* DeliveryNotificationOptions: fix value of Delay
diff --git a/mcs/class/System/System.Net.Mail/MailMessage.cs b/mcs/class/System/System.Net.Mail/MailMessage.cs
index c45ac4e9283..702940250c3 100644
--- a/mcs/class/System/System.Net.Mail/MailMessage.cs
+++ b/mcs/class/System/System.Net.Mail/MailMessage.cs
@@ -31,7 +31,6 @@
 #if NET_2_0
 
 using System.Collections.Specialized;
-using System.Globalization;
 using System.Net.Mime;
 using System.Text;
 
@@ -45,16 +44,17 @@ namespace System.Net.Mail {
 		AttachmentCollection attachments;
 		MailAddressCollection bcc;
 		string body;
+		bool isBodyHtml;
 		MailPriority priority;
 		MailAddress replyTo, sender;
 		DeliveryNotificationOptions deliveryNotificationOptions;
+		Encoding bodyEncoding;
 		MailAddressCollection cc;
 		MailAddress from;
 		NameValueCollection headers;
 		MailAddressCollection to;
 		string subject;
 		Encoding subjectEncoding;
-		ContentType bodyContentType;
 
 		#endregion // Fields
 
@@ -64,12 +64,8 @@ namespace System.Net.Mail {
 		{
 		}
 
-		[MonoTODO ("FormatException")]
 		public MailMessage (MailAddress from, MailAddress to)
 		{
-			if (from == null || to == null)
-				throw new ArgumentNullException ();
-			
 			From = from;
 
 			this.to = new MailAddressCollection ();
@@ -87,15 +83,11 @@ namespace System.Net.Mail {
 		public MailMessage (string from, string to)
 			: this (new MailAddress (from), new MailAddress (to))
 		{
-			if (from == null || to == null)
-				throw new ArgumentNullException ();
 		}
 
 		public MailMessage (string from, string to, string subject, string body)
 			: this (new MailAddress (from), new MailAddress (to))
 		{
-			if (from == null || to == null)
-				throw new ArgumentNullException ();
 			Body = body;
 			Subject = subject;
 		}
@@ -121,17 +113,12 @@ namespace System.Net.Mail {
 			set { body = value; }
 		}
 
-		internal ContentType BodyContentType {
-			get {
-				if (bodyContentType == null)
-					bodyContentType = new ContentType ("text/plain; charset=us-ascii");
-				return bodyContentType;
-			}
-		}
-
 		public Encoding BodyEncoding {
-			get { return Encoding.GetEncoding (BodyContentType.CharSet); }
-			set { BodyContentType.CharSet = value.WebName; }
+			get { return bodyEncoding; }
+			set { 
+				bodyEncoding = value;
+				//bodyContentType.CharSet = value.WebName; 
+			}
 		}
 
 		public MailAddressCollection CC {
@@ -153,13 +140,8 @@ namespace System.Net.Mail {
 		}
 
 		public bool IsBodyHtml {
-			get { return String.Compare (BodyContentType.MediaType, "text/html", true, CultureInfo.InvariantCulture) == 0; }
-			set {
-				if (value)
-					BodyContentType.MediaType = "text/html";
-				else
-					BodyContentType.MediaType = "text/plain";
-			}
+			get { return isBodyHtml; }
+			set { isBodyHtml = value; }
 		}
 
 		public MailPriority Priority {
diff --git a/mcs/class/System/System.Net.Mail/SmtpClient.cs b/mcs/class/System/System.Net.Mail/SmtpClient.cs
index 3ff00f46ed7..ca261171a62 100644
--- a/mcs/class/System/System.Net.Mail/SmtpClient.cs
+++ b/mcs/class/System/System.Net.Mail/SmtpClient.cs
@@ -48,7 +48,7 @@ namespace System.Net.Mail {
 
 		string host;
 		int port;
-		int timeout = 100000;
+		int timeout;
 		ICredentialsByHost credentials;
 		bool useDefaultCredentials;
 		string pickupDirectoryLocation;
@@ -83,19 +83,8 @@ namespace System.Net.Mail {
 		[MonoTODO ("Load default settings from configuration.")]
 		public SmtpClient (string host, int port)
 		{
-			// FIXME: load from configuration
-			if (String.IsNullOrEmpty (host))
-				Host = "127.0.0.1";
-			else
-				Host = host;
-			
-			// FIXME: load from configuration
-			if (port == 0)
-				Port = 25;
-			else
-				Port = port;
-
-			// FIXME: load credentials from configuration
+			Host = host;
+			Port = port;
 		}
 
 		#endregion // Constructors
@@ -124,14 +113,7 @@ namespace System.Net.Mail {
 
 		public string Host {
 			get { return host; }
-			[MonoTODO ("Check to make sure an email is not being sent.")]
-			set {
-				if (value == null)
-					throw new ArgumentNullException ();
-				if (value.Length == 0)
-					throw new ArgumentException ();
-				host = value;
-			}
+			set { host = value; }
 		}
 
 		public string PickupDirectoryLocation {
@@ -158,13 +140,12 @@ namespace System.Net.Mail {
 			get { return timeout; }
 			[MonoTODO ("Check to make sure an email is not being sent.")]
 			set { 
-				if (value < 0)
+				if (value <= 0)
 					throw new ArgumentOutOfRangeException ();
 				timeout = value; 
 			}
 		}
 
-		[MonoTODO]
 		public bool UseDefaultCredentials {
 			get { return useDefaultCredentials; }
 			set { useDefaultCredentials = value; }
@@ -282,8 +263,9 @@ namespace System.Net.Mail {
 				throw new SmtpException (status.StatusCode);
 
 			// Figure out the message content type
-			ContentType messageContentType = message.BodyContentType;
+			ContentType messageContentType = new ContentType ("text/plain");
 			if (hasAttachments || hasAlternateViews) {
+				//messageContentType = new ContentType ();
 				messageContentType.Boundary = boundary;
 
 				if (hasAttachments)
diff --git a/mcs/class/System/System.Net.Mime/ChangeLog b/mcs/class/System/System.Net.Mime/ChangeLog
index 733cac06eda..1ee783a9a28 100644
--- a/mcs/class/System/System.Net.Mime/ChangeLog
+++ b/mcs/class/System/System.Net.Mime/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-13  John Luke  <john.luke@gmail.com>
-
-	* ContentDisposition.cs: use String.Compare instead
-	of comparing .ToLower's
-	
 2006-01-02  John Luke  <john.luke@gmail.com>
 
 	* ContentDisposition.cs: remove [MonoTODO]'s
diff --git a/mcs/class/System/System.Net.Mime/ContentDisposition.cs b/mcs/class/System/System.Net.Mime/ContentDisposition.cs
index a68fa9780bc..385deb27488 100644
--- a/mcs/class/System/System.Net.Mime/ContentDisposition.cs
+++ b/mcs/class/System/System.Net.Mime/ContentDisposition.cs
@@ -35,7 +35,6 @@
 using System.Text;
 using System.Collections;
 using System.Collections.Specialized;
-using System.Globalization;
 
 namespace System.Net.Mime {
 	public class ContentDisposition
@@ -130,7 +129,7 @@ namespace System.Net.Mime {
 		}
 
 		public bool Inline {
-			get { return String.Compare (dispositionType, DispositionTypeNames.Inline, true, CultureInfo.InvariantCulture) == 0; }
+			get { return dispositionType.ToLower () == DispositionTypeNames.Inline.ToLower (); }
 			set {
 				if (value)
 					dispositionType = DispositionTypeNames.Inline;
diff --git a/mcs/class/System/System.Net.NetworkInformation/ChangeLog b/mcs/class/System/System.Net.NetworkInformation/ChangeLog
deleted file mode 100644
index c74893946a9..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/ChangeLog
+++ /dev/null
@@ -1,52 +0,0 @@
-2006-02-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* UnicastIPAddressInformation.cs:
-	* PingException.cs:
-	* TcpConnectionInformation.cs:
-	* IPv4InterfaceStatistics.cs:
-	* NetworkInformationException.cs:
-	* IPAddressInformation.cs:
-	* MulticastIPAddressInformationCollection.cs:
-	* TcpStatistics.cs:
-	* IPGlobalStatistics.cs:
-	* NetworkInformationPermission.cs:
-	* MulticastIPAddressInformation.cs:
-	* IcmpV4Statistics.cs:
-	* IcmpV6Statistics.cs:
-	* IPv4InterfaceProperties.cs:
-	* PhysicalAddress.cs:
-	* IPv6InterfaceProperties.cs:
-	* GatewayIPAddressInformationCollection.cs:
-	* ChangeLog: Modified file.
-	* UnicastIPAddressInformationCollection.cs:
-	* IPAddressCollection.cs:
-	* NetworkInformationPermissionAttribute.cs:
-	* Ping.cs:
-	* NetworkChange.cs:
-	* IPAddressInformationCollection.cs:
-	* UdpStatistics.cs:
-	* GatewayIPAddressInformation.cs:
-	* IPGlobalProperties.cs:
-	* IPInterfaceProperties.cs:
-	* NetworkInterface.cs: implemented or stubbed out.
-
-2006-02-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* NetBiosNodeType.cs:
-	* IPStatus.cs:
-	* NetworkInterfaceType.cs:
-	* SuffixOrigin.cs:
-	* DuplicateAddressDetectionState.cs:
-	* NetworkInformationAccess.cs:
-	* OperationalStatus.cs:
-	* TcpState.cs:
-	* PingCompletedEventHandler.cs:
-	* NetworkInterfaceComponent.cs:
-	* NetworkAvailabilityChangedEventHandler.cs:
-	* NetworkAvailabilityEventArgs.cs:
-	* PrefixOrigin.cs:
-	* NetworkAddressChangedEventHandler.cs:
-	* PingCompletedEventArgs.cs:
-	* PingOptions.cs:
-	* PingReply.cs: all enums, all event handlers/args + 2 classes.
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/DuplicateAddressDetectionState.cs b/mcs/class/System/System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
deleted file mode 100644
index 3562a906f57..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.NetworkInformation.DuplicateAddressDetectionState
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum DuplicateAddressDetectionState {
-		Invalid,
-		Tentative,
-		Duplicate,
-		Deprecated,
-		Preferred
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformation.cs
deleted file mode 100644
index c6e9c07e0ba..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformation.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.NetworkInformation.GatewayIPAddressInformation
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class GatewayIPAddressInformation {
-		protected GatewayIPAddressInformation ()
-		{
-		}
-		
-		public abstract IPAddress Address { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
deleted file mode 100644
index d259e4bff11..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// System.Net.NetworkInformation.GatewayIPAddressInformationCollection
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System.Collections;
-using System.Collections.Generic;
-
-namespace System.Net.NetworkInformation {
-	public class GatewayIPAddressInformationCollection : ICollection<GatewayIPAddressInformation>, IEnumerable<GatewayIPAddressInformation>, IEnumerable {
-		List<GatewayIPAddressInformation> list;
-		
-		protected GatewayIPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (GatewayIPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual void Clear ()
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual bool Contains (GatewayIPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (GatewayIPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<GatewayIPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<GatewayIPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (GatewayIPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual GatewayIPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
deleted file mode 100644
index b714220e0a0..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// System.Net.NetworkInformation.IPAddressCollection
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace System.Net.NetworkInformation {
-	public class IPAddressCollection : ICollection<IPAddress>, IEnumerable<IPAddress>, IEnumerable {
-		List<IPAddress> list;
-
-		protected internal IPAddressCollection ()
-		{
-		}
-
-		public virtual void Add (IPAddress address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual void Clear ()
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual bool Contains (IPAddress address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (IPAddress [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<IPAddress> GetEnumerator ()
-		{
-			return ((IEnumerable<IPAddress>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (IPAddress address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual IPAddress this [int index] {
-			get { return list [index]; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressInformation.cs
deleted file mode 100644
index 93e74eda2e9..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformation.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Net.NetworkInformation.IPAddressInformation
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-
-namespace System.Net.NetworkInformation {
-	public abstract class IPAddressInformation {
-		protected IPAddressInformation ()
-		{
-		}
-		
-		public abstract IPAddress Address { get; }
-		public abstract bool IsDnsEligible { get; }
-		public abstract bool IsTransient { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressInformationCollection.cs
deleted file mode 100644
index 33b5da3a52e..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressInformationCollection.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// System.Net.NetworkInformation.IPAddressInformationCollection
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace System.Net.NetworkInformation {
-	public class IPAddressInformationCollection : ICollection<IPAddressInformation>, IEnumerable<IPAddressInformation>, IEnumerable {
-		List <IPAddressInformation> list;
-
-		internal IPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (IPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual void Clear ()
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual bool Contains (IPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (IPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<IPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<IPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (IPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual IPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
deleted file mode 100644
index 94410bff94d..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// System.Net.NetworkInformation.IPGlobalProperties
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IPGlobalProperties {
-		protected IPGlobalProperties ()
-		{
-		}
-
-		[MonoTODO]
-		public static IPGlobalProperties GetIPGlobalProperties ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public abstract TcpConnectionInformation [] GetActiveTcpConnections ();
-		public abstract IPEndPoint [] GetActiveTcpListeners ();
-		public abstract IPEndPoint [] GetActiveUdpListeners ();
-		public abstract IcmpV4Statistics GetIcmpV4Statistics ();
-		public abstract IcmpV6Statistics GetIcmpV6Statistics ();
-		public abstract IPGlobalStatistics GetIPv4GlobalStatistics ();
-		public abstract IPGlobalStatistics GetIPv6GlobalStatistics ();
-		public abstract TcpStatistics GetTcpIPv4Statistics ();
-		public abstract TcpStatistics GetTcpIPv6Statistics ();
-		public abstract UdpStatistics GetUdpIPv4Statistics ();
-		public abstract UdpStatistics GetUdpIPv6Statistics ();
-
-		public abstract string DhcpScopeName { get; }
-		public abstract string DomainName { get; }
-		public abstract string HostName { get; }
-		public abstract bool IsWinsProxy { get; }
-		public abstract NetBiosNodeType NodeType { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs
deleted file mode 100644
index 03b8388d034..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPGlobalStatistics.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// System.Net.NetworkInformation.IPGlobalProperties
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IPGlobalStatistics {
-		protected IPGlobalStatistics ()
-		{
-		}
-
-		public abstract int DefaultTtl { get; }
-		public abstract bool ForwardingEnabled { get; }
-		public abstract int NumberOfInterfaces { get; }
-		public abstract int NumberOfIPAddresses { get; }
-		public abstract int NumberOfRoutes { get; }
-		public abstract long OutputPacketRequests { get; }
-		public abstract long OutputPacketRoutingDiscards { get; }
-		public abstract long OutputPacketsDiscarded { get; }
-		public abstract long OutputPacketsWithNoRoute { get; }
-		public abstract long PacketFragmentFailures { get; }
-		public abstract long PacketReassembliesRequired { get; }
-		public abstract long PacketReassemblyFailures { get; }
-		public abstract long PacketReassemblyTimeout { get; }
-		public abstract long PacketsFragmented { get; }
-		public abstract long PacketsReassembled { get; }
-		public abstract long ReceivedPackets { get; }
-		public abstract long ReceivedPacketsDelivered { get; }
-		public abstract long ReceivedPacketsDiscarded { get; }
-		public abstract long ReceivedPacketsForwarded { get; }
-		public abstract long ReceivedPacketsWithAddressErrors { get; }
-		public abstract long ReceivedPacketsWithHeadersErrors { get; }
-		public abstract long ReceivedPacketsWithUnknownProtocol { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs
deleted file mode 100644
index 09f544a754e..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPInterfaceProperties.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// System.Net.NetworkInformation.IPInterfaceProperties
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IPInterfaceProperties {
-		protected IPInterfaceProperties ()
-		{
-		}
-
-		public abstract IPv4InterfaceProperties GetIPv4Properties ();
-		public abstract IPv6InterfaceProperties GetIPv6Properties ();
-
-		public abstract IPAddressInformationCollection AnycastAddresses { get; }
-		public abstract IPAddressCollection DhcpServerAddresses { get; }
-		public abstract IPAddressCollection DnsAddresses { get; }
-		public abstract string DnsSuffix { get; }
-		public abstract GatewayIPAddressInformationCollection GatewayAddresses { get; }
-		public abstract bool IsDnsEnabled { get; }
-		public abstract bool IsDynamicDnsEnabled { get; }
-		public abstract MulticastIPAddressInformationCollection MulticastAddresses { get; }
-		public abstract UnicastIPAddressInformationCollection UnicastAddresses { get; }
-		public abstract IPAddressCollection WinsServersAddresses { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPStatus.cs b/mcs/class/System/System.Net.NetworkInformation/IPStatus.cs
deleted file mode 100644
index 6dae95a78e4..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPStatus.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// System.Net.NetworkInformation.IPStatus
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum IPStatus {
-		Unknown = -1,
-		Success = 0,
-		DestinationNetworkUnreachable = 11002,
-		DestinationHostUnreachable = 11003,
-		DestinationProhibited = 11004,
-		DestinationProtocolUnreachable = 11004,
-		DestinationPortUnreachable = 11005,
-		NoResources = 11006,
-		BadOption = 11007,
-		HardwareError = 11008,
-		PacketTooBig = 11009,
-		TimedOut = 11010,
-		BadRoute = 11012,
-		TtlExpired = 11013,
-		TtlReassemblyTimeExceeded = 11014,
-		ParameterProblem = 11015,
-		SourceQuench = 11016,
-		BadDestination = 11018,
-		DestinationUnreachable = 11040,
-		TimeExceeded = 11041,
-		BadHeader = 11042,
-		UnrecognizedNextHeader = 11043,
-		IcmpError = 11044,
-		DestinationScopeMismatch = 11045
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs
deleted file mode 100644
index b3d3817e951..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceProperties.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.NetworkInformation.IPv4InterfaceProperties
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IPv4InterfaceProperties {
-		protected IPv4InterfaceProperties ()
-		{
-		}
-
-		public abstract int Index { get; }
-		public abstract bool IsAutomaticPrivateAddressingActive { get; }
-		public abstract bool IsAutomaticPrivateAddressingEnabled { get; }
-		public abstract bool IsDhcpEnabled { get; }
-		public abstract bool IsForwardingEnabled { get; }
-		public abstract int Mtu { get; }
-		public abstract bool UsesWins { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceStatistics.cs
deleted file mode 100644
index 921334af21e..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPv4InterfaceStatistics.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// System.Net.NetworkInformation.IPv4InterfaceStatistics
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IPv4InterfaceStatistics {
-		protected IPv4InterfaceStatistics ()
-		{
-		}
-		
-		public abstract long BytesReceived { get; }
-		public abstract long BytesSent { get; }
-		public abstract long IncomingPacketsDiscarded { get; }
-		public abstract long IncomingPacketsWithErrors { get; }
-		public abstract long IncomingUnknownProtocolPackets { get; }
-		public abstract long NonUnicastPacketsReceived { get; }
-		public abstract long NonUnicastPacketsSent { get; }
-		public abstract long OutgoingPacketsDiscarded { get; }
-		public abstract long OutgoingPacketsWithErrors { get; }
-		public abstract long OutputQueueLength { get; }
-		public abstract long UnicastPacketsReceived { get; }
-		public abstract long UnicastPacketsSent { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs b/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs
deleted file mode 100644
index a3c728c62b8..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IPv6InterfaceProperties.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Net.NetworkInformation.IPv6InterfaceProperties
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IPv6InterfaceProperties {
-		protected IPv6InterfaceProperties ()
-		{
-		}
-
-		public abstract int Index { get; }
-		public abstract int Mtu { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs b/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs
deleted file mode 100644
index eebe240fa7d..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IcmpV4Statistics.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// System.Net.NetworkInformation.IcmpV4Statistics
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IcmpV4Statistics {
-		protected IcmpV4Statistics ()
-		{
-		}
-
-		public abstract long AddressMaskRepliesReceived { get; }
-		public abstract long AddressMaskRepliesSent { get; }
-		public abstract long AddressMaskRequestsReceived { get; }
-		public abstract long AddressMaskRequestsSent { get; }
-		public abstract long DestinationUnreachableMessagesReceived { get; }
-		public abstract long DestinationUnreachableMessagesSent { get; }
-		public abstract long EchoRepliesReceived { get; }
-		public abstract long EchoRepliesSent { get; }
-		public abstract long EchoRequestsReceived { get; }
-		public abstract long EchoRequestsSent { get; }
-		public abstract long ErrorsReceived { get; }
-		public abstract long ErrorsSent { get; }
-		public abstract long MessagesReceived { get; }
-		public abstract long MessagesSent { get; }
-		public abstract long ParameterProblemsReceived { get; }
-		public abstract long ParameterProblemsSent { get; }
-		public abstract long RedirectsReceived { get; }
-		public abstract long RedirectsSent { get; }
-		public abstract long SourceQuenchesReceived { get; }
-		public abstract long SourceQuenchesSent { get; }
-		public abstract long TimeExceededMessagesReceived { get; }
-		public abstract long TimeExceededMessagesSent { get; }
-		public abstract long TimestampRepliesReceived { get; }
-		public abstract long TimestampRepliesSent { get; }
-		public abstract long TimestampRequestsReceived { get; }
-		public abstract long TimestampRequestsSent { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs b/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs
deleted file mode 100644
index f925876fff6..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/IcmpV6Statistics.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// System.Net.NetworkInformation.IcmpV6Statistics
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class IcmpV6Statistics {
-		protected IcmpV6Statistics ()
-		{
-		}
-
-		public abstract long DestinationUnreachableMessagesReceived { get; }
-		public abstract long DestinationUnreachableMessagesSent { get; }
-		public abstract long EchoRepliesReceived { get; }
-		public abstract long EchoRepliesSent { get; }
-		public abstract long EchoRequestsReceived { get; }
-		public abstract long EchoRequestsSent { get; }
-		public abstract long ErrorsReceived { get; }
-		public abstract long ErrorsSent { get; }
-		public abstract long MembershipQueriesReceived { get; }
-		public abstract long MembershipQueriesSent { get; }
-		public abstract long MembershipReductionsReceived { get; }
-		public abstract long MembershipReductionsSent { get; }
-		public abstract long MembershipReportsReceived { get; }
-		public abstract long MembershipReportsSent { get; }
-		public abstract long MessagesReceived { get; }
-		public abstract long MessagesSent { get; }
-		public abstract long NeighborAdvertisementsReceived { get; }
-		public abstract long NeighborAdvertisementsSent { get; }
-		public abstract long NeighborSolicitsReceived { get; }
-		public abstract long NeighborSolicitsSent { get; }
-		public abstract long PacketTooBigMessagesReceived { get; }
-		public abstract long PacketTooBigMessagesSent { get; }
-		public abstract long ParameterProblemsReceived { get; }
-		public abstract long ParameterProblemsSent { get; }
-		public abstract long RedirectsReceived { get; }
-		public abstract long RedirectsSent { get; }
-		public abstract long RouterAdvertisementsReceived { get; }
-		public abstract long RouterAdvertisementsSent { get; }
-		public abstract long RouterSolicitsReceived { get; }
-		public abstract long RouterSolicitsSent { get; }
-		public abstract long TimeExceededMessagesReceived { get; }
-		public abstract long TimeExceededMessagesSent { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
deleted file mode 100644
index 1ea36ee9dfb..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Net.NetworkInformation.MulticastIPAddressInformation
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class MulticastIPAddressInformation : IPAddressInformation {
-		protected MulticastIPAddressInformation ()
-		{
-		}
-
-		public abstract long AddressPreferredLifetime { get; }
-		public abstract long AddressValidLifetime { get; }
-		public abstract long DhcpLeaseLifetime { get; }
-		public abstract DuplicateAddressDetectionState DuplicateAddressDetectionState { get; }
-		public abstract PrefixOrigin PrefixOrigin { get; }
-		public abstract SuffixOrigin SuffixOrigin { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
deleted file mode 100644
index 087997b437e..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// System.Net.NetworkInformation.MulticastIPAddressInformationCollection
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System.Collections;
-using System.Collections.Generic;
-
-namespace System.Net.NetworkInformation {
-	public class MulticastIPAddressInformationCollection : ICollection<MulticastIPAddressInformation>, IEnumerable<MulticastIPAddressInformation>, IEnumerable {
-		List<MulticastIPAddressInformation> list; // We want an internal ctor that fills this list up.
-		
-		protected internal MulticastIPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (MulticastIPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual void Clear ()
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual bool Contains (MulticastIPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (MulticastIPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<MulticastIPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<MulticastIPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (MulticastIPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual MulticastIPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs b/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
deleted file mode 100644
index 61585e05df1..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.NetworkInformation.NetBiosNodeType
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum NetBiosNodeType {
-		Unknown = 0,
-		Broadcast = 1,
-		Peer2Peer = 1 << 1,
-		Mixed = 1 << 2,
-		Hybrid = 1 << 3,
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
deleted file mode 100644
index ad92e5a1492..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkAddressChangeEventHandler
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public delegate void NetworkAddressChangedEventHandler (object sender, EventArgs e);
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
deleted file mode 100644
index c3609e4e4ad..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkAvailabilityChangedEventHandler
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public delegate void NetworkAvailabilityChangedEventHandler (object sender, NetworkAvailabilityEventArgs e);
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
deleted file mode 100644
index 35773b935d1..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkAvailabilityEventArgs
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-
-namespace System.Net.NetworkInformation {
-	public class NetworkAvailabilityEventArgs : EventArgs {
-		bool available;
-
-		internal NetworkAvailabilityEventArgs ()
-		{
-		}
-
-		public bool IsAvailable {
-			get { return available; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
deleted file mode 100644
index 72485911684..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkChange
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public sealed class NetworkChange {
-		private NetworkChange ()
-		{
-		}
-
-		public static event NetworkAddressChangedEventHandler NetworkAddressChanged;
-		public static event NetworkAvailabilityChangedEventHandler NetworkAvailabilityChanged;
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationAccess.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationAccess.cs
deleted file mode 100644
index 13c11633c41..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationAccess.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationAccess
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-namespace System.Net.NetworkInformation {
-	[Flags]
-	public enum NetworkInformationAccess {
-		None,
-		Read,
-		Ping = 4
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs
deleted file mode 100644
index a8c0f8bbbd1..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationException
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System.ComponentModel;
-using System.Runtime.Serialization;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	public class NetworkInformationException : Win32Exception {
-		int error_code;
-		
-		public NetworkInformationException ()
-		{
-		}
-
-		public NetworkInformationException (int errorCode) : base (errorCode)
-		{
-		}
-
-		protected NetworkInformationException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-			error_code = info.GetInt32 ("ErrorCode");
-		}
-
-		public override int ErrorCode {
-			get { return NativeErrorCode; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermission.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermission.cs
deleted file mode 100644
index c84cc7f409b..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermission.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationPermission
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Security;
-using System.Security.Permissions;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	public sealed class NetworkInformationPermission : CodeAccessPermission, IUnrestrictedPermission {
-		[MonoTODO]
-		public NetworkInformationPermission (PermissionState state)
-		{
-		}
-
-		[MonoTODO]
-		public NetworkInformationPermission (NetworkInformationAccess access)
-		{
-		}
-
-		[MonoTODO]
-		public void AddPermission (NetworkInformationAccess access)
-		{
-		}
-
-		[MonoTODO]
-		public override IPermission Copy ()
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public override void FromXml (SecurityElement securityElement)
-		{
-		}
-
-		[MonoTODO]
-		public override IPermission Intersect (System.Security.IPermission target)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public override bool IsSubsetOf (IPermission target)
-		{
-			return false;
-		}
-
-		[MonoTODO]
-		public bool IsUnrestricted ()
-		{
-			return false;
-		}
-
-		[MonoTODO]
-		public override SecurityElement ToXml ()
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public override IPermission Union (IPermission target)
-		{
-			return null;
-		}
-		
-		[MonoTODO]
-		public NetworkInformationAccess Access {
-			get { return 0; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
deleted file mode 100644
index 1da8272c079..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInformationPermissionAttribute
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Security;
-using System.Security.Permissions;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Struct | AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
-	public sealed class NetworkInformationPermissionAttribute : System.Security.Permissions.CodeAccessSecurityAttribute {
-		string access;
-
-		public NetworkInformationPermissionAttribute (SecurityAction action)
-			: base (action)
-		{
-		}
-
-		[MonoTODO]
-		public override IPermission CreatePermission ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public string Access {
-			get { return access; }
-			set { access = value; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
deleted file mode 100644
index 3e370cb5eb0..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInterface
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Net;
-
-namespace System.Net.NetworkInformation {
-	public abstract class NetworkInterface {
-		protected NetworkInterface ()
-		{
-		}
-
-		[MonoTODO]
-		public static NetworkInterface [] GetAllNetworkInterfaces ()
-		{
-			return new NetworkInterface [0];
-		}
-
-		[MonoTODO]
-		public static bool GetIsNetworkAvailable ()
-		{
-			return true;
-		}
-
-		[MonoTODO]
-		public static int LoopbackInterfaceIndex {
-			get { return 0; }
-		}
-
-		public abstract IPInterfaceProperties GetIPProperties ();
-		public abstract IPv4InterfaceStatistics GetIPv4Statistics ();
-		public abstract PhysicalAddress GetPhysicalAddress ();
-		public abstract bool Supports (NetworkInterfaceComponent networkInterfaceComponent);
-
-		public abstract string Description { get; }
-		public abstract string Id { get; }
-		public abstract bool IsReceiveOnly { get; }
-		public abstract string Name { get; }
-		public abstract NetworkInterfaceType NetworkInterfaceType { get; }
-		public abstract OperationalStatus OperationalStatus { get; }
-		public abstract long Speed { get; }
-		public abstract bool SupportsMulticast { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceComponent.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceComponent.cs
deleted file mode 100644
index 9eafe650657..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceComponent.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInterfaceComponent
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-namespace System.Net.NetworkInformation {
-	public enum NetworkInterfaceComponent {
-		IPv4,
-		IPv6
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceType.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceType.cs
deleted file mode 100644
index 002c21a8f08..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterfaceType.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// System.Net.NetworkInformation.NetworkInterfaceType
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-namespace System.Net.NetworkInformation {
-	public enum NetworkInterfaceType {
-		Unknown = 1,
-		Ethernet = 6,
-		TokenRing = 9,
-		Fddi = 15,
-		BasicIsdn = 20,
-		PrimaryIsdn = 21,
-		Ppp = 23,
-		Loopback = 24,
-		Ethernet3Megabit = 26,
-		Slip = 28,
-		Atm = 37,
-		GenericModem = 48,
-		FastEthernetT = 62,
-		Isdn = 63,
-		FastEthernetFx = 69,
-		Wireless80211 = 71,
-		AsymmetricDsl = 94,
-		RateAdaptDsl = 95,
-		SymmetricDsl = 96,
-		VeryHighSpeedDsl = 97,
-		IPOverAtm = 114,
-		GigabitEthernet = 117,
-		Tunnel = 131,
-		MultiRateSymmetricDsl = 143,
-		HighPerformanceSerialBus = 144
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/OperationalStatus.cs b/mcs/class/System/System.Net.NetworkInformation/OperationalStatus.cs
deleted file mode 100644
index abc0c667938..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/OperationalStatus.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Net.NetworkInformation.OperationalStatus
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum OperationalStatus {
-		Up = 1,
-		Down = 2,
-		Testing = 3,
-		Unknown = 4,
-		Dormant = 5,
-		NotPresent = 6,
-		LowerLayerDown = 7
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PhysicalAddress.cs b/mcs/class/System/System.Net.NetworkInformation/PhysicalAddress.cs
deleted file mode 100644
index d20b801a41d..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PhysicalAddress.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// System.Net.NetworkInformation.PhysicalAddress
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Text;
-
-namespace System.Net.NetworkInformation {
-	public class PhysicalAddress {
-		public static readonly PhysicalAddress None = new PhysicalAddress (new byte [0]);
-		byte [] bytes;
-		
-		public PhysicalAddress (byte [] address)
-		{
-			this.bytes = address;
-		}
-
-		public static PhysicalAddress Parse (string address)
-		{
-			if (address == null)
-				return None;
-
-			if (address == "")
-				throw new FormatException ("Invalid physical address.");
-
-			// MS fails with IndexOutOfRange for something like: "00-0"
-			int ndashes = 0;
-			foreach (char c in address) {
-				if (c == '-')
-					ndashes++;
-			}
-
-			int len = address.Length;
-			if (((len - 2) / 3) != ndashes)
-				throw new FormatException ("Invalid physical address.");
-
-			byte [] data = new byte [ndashes + 1];
-			int idx = 0;
-			for (int i = 0; i < len; i++) {
-				byte b = (byte) (GetValue (address [i++]) << 8);
-				b += GetValue (address [i++]);
-				if (address [i] != '-')
-					throw new FormatException ("Invalid physical address.");
-				data [idx++] = b;
-			}
-
-			return new PhysicalAddress (data);
-		}
-
-		static byte GetValue (char c)
-		{
-			if (c >= 0 && c <= 9)
-				return (byte) (c - '0');
-
-			if (c >= 'a' && c <= 'f')
-				return (byte) (c - 'a' + 10);
-
-			if (c >= 'A' && c <= 'F')
-				return (byte) (c - 'A' + 10);
-
-			throw new FormatException ("Invalid physical address.");
-		}
-
-		public override bool Equals (object comparand)
-		{
-			PhysicalAddress other = comparand as PhysicalAddress;
-			if (other == null)
-				return false;
-
-			// new byte [0] != new byte [0]
-			return (bytes == other.bytes);
-		}
-
-		public override int GetHashCode ()
-		{
-			if (bytes == null)
-				return 0;
-
-			int a = 5;
-			foreach (byte b in bytes)
-				a  = (a << 3)  + b;
-
-			return a;
-		}
-
-		public byte [] GetAddressBytes ()
-		{
-			return bytes;
-		}
-
-		public override string ToString ()
-		{
-			if (bytes == null)
-				return "";
-
-			StringBuilder sb = new StringBuilder ();
-			foreach (byte b in bytes)
-				sb.AppendFormat ("{0:2X}", (uint) b);
-			return sb.ToString ();
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/Ping.cs b/mcs/class/System/System.Net.NetworkInformation/Ping.cs
deleted file mode 100644
index 418b59396ff..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/Ping.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// System.Net.NetworkInformation.Ping
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.ComponentModel;
-
-namespace System.Net.NetworkInformation {
-	public class Ping : Component, IDisposable {
-
-		public event PingCompletedEventHandler PingCompleted;
-
-		public Ping ()
-		{
-		}
-
-		protected void OnPingCompleted (PingCompletedEventArgs e)
-		{
-			if (PingCompleted != null)
-				PingCompleted (this, e);
-		}
-
-		[MonoTODO]
-		public PingReply Send (IPAddress address)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (IPAddress address, int timeout)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (IPAddress address, int timeout, byte [] buffer)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (IPAddress address, int timeout, byte [] buffer, PingOptions options)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (string hostNameOrAddress)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (string hostNameOrAddress, int timeout)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (string hostNameOrAddress, int timeout, byte [] buffer)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public PingReply Send (string hostNameOrAddress, int timeout, byte [] buffer, PingOptions options)
-		{
-			return null;
-		}
-
-		[MonoTODO]
-		public void SendAsync (IPAddress address, int timeout, byte [] buffer, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (IPAddress address, int timeout, byte [] buffer, PingOptions options, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (IPAddress address, int timeout, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (IPAddress address, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (string hostNameOrAddress, int timeout, byte [] buffer, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (string hostNameOrAddress, int timeout, byte [] buffer, PingOptions options, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (string hostNameOrAddress, int timeout, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsync (string hostNameOrAddress, object userToken)
-		{
-		}
-
-		[MonoTODO]
-		public void SendAsyncCancel ()
-		{
-		}
-
-		void IDisposable.Dispose ()
-		{
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs b/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs
deleted file mode 100644
index cb421782981..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Net.NetworkInformation.PingCompletedEventArgs
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.ComponentModel;
-
-namespace System.Net.NetworkInformation {
-	public class PingCompletedEventArgs : AsyncCompletedEventArgs {
-		PingReply reply;
-
-		internal PingCompletedEventArgs ()
-			: base (null, false, null)
-		{
-		}
-
-		public PingReply Reply {
-			get { return reply; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventHandler.cs
deleted file mode 100644
index 4911ac27743..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventHandler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Net.NetworkInformation.PingCompletedEventHandler
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public delegate void PingCompletedEventHandler (object sender, PingCompletedEventArgs e);
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingException.cs b/mcs/class/System/System.Net.NetworkInformation/PingException.cs
deleted file mode 100644
index 65c5f7460a1..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingException.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// System.Net.NetworkInformation.PingException
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.Runtime.Serialization;
-
-namespace System.Net.NetworkInformation {
-	[Serializable]
-	public class PingException : InvalidOperationException {
-		public PingException (string message)
-			: base (message)
-		{
-		}
-
-		public PingException (string message, Exception innerException)
-			: base (message, innerException)
-		{
-		}
-
-		protected PingException (SerializationInfo serializationInfo, StreamingContext streamingContext)
-			: base (serializationInfo, streamingContext)
-		{
-		}
-
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingOptions.cs b/mcs/class/System/System.Net.NetworkInformation/PingOptions.cs
deleted file mode 100644
index 6b6b37e0a71..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingOptions.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// System.Net.NetworkInformation.PingOptions
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public class PingOptions {
-		int ttl = 128;
-		bool dont_fragment;
-
-		public PingOptions ()
-		{
-		}
-
-		public PingOptions (int ttl, bool dontFragment)
-		{
-			if (ttl <= 0)
-				throw new ArgumentOutOfRangeException ("Must be greater than zero.", "ttl");
-			this.ttl = ttl;
-			this.dont_fragment = dontFragment;
-		}
-
-		public bool DontFragment {
-			get { return dont_fragment; }
-			set { dont_fragment = value; }
-		}
-
-		public int Ttl {
-			get { return ttl; }
-			set { ttl = value; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PingReply.cs b/mcs/class/System/System.Net.NetworkInformation/PingReply.cs
deleted file mode 100644
index c3b6851f909..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PingReply.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// System.Net.NetworkInformation.PingReply
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public class PingReply {
-		IPAddress address;
-		byte [] buffer;
-		PingOptions options;
-		long rtt;
-		IPStatus status;
-
-		internal PingReply ()
-		{
-		}
-
-		public IPAddress Address {
-			get { return address; }
-		}
-
-		public byte [] Buffer {
-			get { return buffer; }
-		}
-
-		public PingOptions Options {
-			get { return options; }
-		}
-
-		public long RoundtripTime {
-			get { return rtt; }
-		}
-
-		public IPStatus Status {
-			get { return status; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/PrefixOrigin.cs b/mcs/class/System/System.Net.NetworkInformation/PrefixOrigin.cs
deleted file mode 100644
index 8a470a96176..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/PrefixOrigin.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Net.NetworkInformation.PrefixOrigin
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum PrefixOrigin {
-		Other = 0,
-		Manual = 1,
-		WellKnown = 2,
-		Dhcp = 3,
-		RouterAdvertisement = 4
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/SuffixOrigin.cs b/mcs/class/System/System.Net.NetworkInformation/SuffixOrigin.cs
deleted file mode 100644
index a0c30cbcf07..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/SuffixOrigin.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Net.NetworkInformation.SuffixOrigin
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum SuffixOrigin {
-		Other = 0,
-		Manual = 1,
-		WellKnown = 2,
-		OriginDhcp = 3,
-		LinkLayerAddress = 4,
-		Random = 5
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/TcpConnectionInformation.cs b/mcs/class/System/System.Net.NetworkInformation/TcpConnectionInformation.cs
deleted file mode 100644
index 272d5d837e3..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/TcpConnectionInformation.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Net.NetworkInformation.TcpConnectionInformation
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System.Net;
-
-namespace System.Net.NetworkInformation {
-	public abstract class TcpConnectionInformation {
-		protected TcpConnectionInformation ()
-		{
-		}
-		
-		public abstract IPEndPoint LocalEndPoint { get; }
-		public abstract IPEndPoint RemoteEndPoint { get; }
-		public abstract TcpState State { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/TcpState.cs b/mcs/class/System/System.Net.NetworkInformation/TcpState.cs
deleted file mode 100644
index b4b1113c0b2..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/TcpState.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Net.NetworkInformation.TcpState
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public enum TcpState {
-		Unknown = 0,
-		Closed = 1,
-		Listen = 2,
-		SynSent = 3,
-		SynReceived = 4,
-		Established = 5,
-		FinWait1 = 6,
-		FinWait2 = 7,
-		CloseWait = 8,
-		Closing = 9,
-		LastAck = 10,
-		TimeWait = 11,
-		DeleteTcb = 12
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs
deleted file mode 100644
index 5f8bb3cc879..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/TcpStatistics.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Net.NetworkInformation.TcpStatistics
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class TcpStatistics {
-		protected TcpStatistics ()
-		{
-		}
-		
-		public abstract long ConnectionsAccepted { get; }
-		public abstract long ConnectionsInitiated { get; }
-		public abstract long CumulativeConnections { get; }
-		public abstract long CurrentConnections { get; }
-		public abstract long ErrorsReceived { get; }
-		public abstract long FailedConnectionAttempts { get; }
-		public abstract long MaximumConnections { get; }
-		public abstract long MaximumTransmissionTimeout { get; }
-		public abstract long MinimumTransmissionTimeout { get; }
-		public abstract long ResetConnections { get; }
-		public abstract long ResetsSent { get; }
-		public abstract long SegmentsReceived { get; }
-		public abstract long SegmentsResent { get; }
-		public abstract long SegmentsSent { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs b/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs
deleted file mode 100644
index 8055046095b..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/UdpStatistics.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Net.NetworkInformation.UdpStatistics
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-namespace System.Net.NetworkInformation {
-	public abstract class UdpStatistics {
-		protected UdpStatistics ()
-		{
-		}
-
-		public abstract long DatagramsReceived { get; }
-		public abstract long DatagramsSent { get; }
-		public abstract long IncomingDatagramsDiscarded { get; }
-		public abstract long IncomingDatagramsWithErrors { get; }
-		public abstract int UdpListeners { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs
deleted file mode 100644
index 87238c9aeff..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformation.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Net.NetworkInformation.UnicastIPAddressInformation
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-
-namespace System.Net.NetworkInformation {
-	public abstract class UnicastIPAddressInformation : IPAddressInformation {
-		protected UnicastIPAddressInformation ()
-		{
-		}
-		
-		public abstract long AddressPreferredLifetime { get; }
-		public abstract long AddressValidLifetime { get; }
-		public abstract long DhcpLeaseLifetime { get; }
-		public abstract DuplicateAddressDetectionState DuplicateAddressDetectionState { get; }
-		public abstract IPAddress IPv4Mask { get; }
-		public abstract PrefixOrigin PrefixOrigin { get; }
-		public abstract SuffixOrigin SuffixOrigin { get; }
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
deleted file mode 100644
index 282ad04b149..00000000000
--- a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// System.Net.NetworkInformation.UnicastIPAddressInformationCollection
-//
-// Author:
-//	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-#if NET_2_0
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace System.Net.NetworkInformation {
-	public class UnicastIPAddressInformationCollection : ICollection<UnicastIPAddressInformation>,
-						IEnumerable<UnicastIPAddressInformation> {
-
-		List<UnicastIPAddressInformation> list;
-
-		protected internal UnicastIPAddressInformationCollection ()
-		{
-		}
-
-		public virtual void Add (UnicastIPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual void Clear ()
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		public virtual bool Contains (UnicastIPAddressInformation address)
-		{
-			return list.Contains (address);
-		}
-
-		public virtual void CopyTo (UnicastIPAddressInformation [] array, int offset)
-		{
-			list.CopyTo (array, offset);
-		}
-
-		public virtual IEnumerator<UnicastIPAddressInformation> GetEnumerator ()
-		{
-			return ((IEnumerable<UnicastIPAddressInformation>)list).GetEnumerator ();
-		}
-
-		public virtual bool Remove (UnicastIPAddressInformation address)
-		{
-			throw new NotSupportedException ("The collection is read-only.");
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-
-		public virtual int Count {
-			get { return list.Count; }
-		}
-
-		public virtual bool IsReadOnly {
-			get { return true; }
-		}
-
-		public virtual UnicastIPAddressInformation this [int index] {
-			get { return list [index]; }
-		}
-	}
-}
-#endif
-
diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 0de4bdd37ac..6b187e8e0f9 100644
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -8,23 +8,6 @@
 	GetHostByAddr_internal returns fewer items in the array than it
 	intended to (maybe due to conversion errors.)
 
-2006-02-09  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebResponse.cs: Add UpdateStatus method, to update both
-	statusCode and statusDescription at the same time. 
-
-2006-02-08  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebRequest.cs: Remove WebExceptionStatus argument
-	from CreateExceptionFromResponse, since exceptions gotten
-	from server response always have a WebExceptionStatus.ProtocolError
-	value.
-	
-2006-02-08  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebRequest.cs: Add renaming support when using 
-	WebRequestMethods.Ftp.Rename method.
-	
 2006-02-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* ChunkedInputStream.cs:
@@ -42,32 +25,11 @@
 
 	Patch by Horst Reiterer.
 
-2006-02-01  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebRequest.cs: Add supportedCommands array with the sorted
-	methods, to search using Array.BinarySearch. Remove CheckMethod.
-
-2006-02-01  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebRequest.cs: Fixed some typos and small issues.
-	
 2006-02-02 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpWebRequest.cs: dummy implementation of UnsafeAuthenticationBlah
 	property.
 
-2006-02-01  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpRequestCreator.cs: 
-	* FtpAsyncResult.cs:
-	* FtpDataStream.cs:
-	* FtpWebRequest.cs:
-	* FtpWebResponse.cs: Initial implementation of FtpWebRequest (2.0)
-	
-2006-02-01  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpStatusCode.cs: Fix a typo.
-	
 2006-01-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* WebClient.cs: (2.0) UploadString() returns string, not void.
diff --git a/mcs/class/System/System.Net/FtpAsyncResult.cs b/mcs/class/System/System.Net/FtpAsyncResult.cs
deleted file mode 100644
index c8aac452e05..00000000000
--- a/mcs/class/System/System.Net/FtpAsyncResult.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// System.Net.FtpAsyncResult.cs
-//
-// Authors:
-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)
-//
-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)
-//
-
-using System;
-using System.IO;
-using System.Threading;
-
-#if NET_2_0
-
-namespace System.Net 
-{
-	class FtpAsyncResult : IAsyncResult
-	{
-		FtpWebResponse response;
-		ManualResetEvent waitHandle;
-		Exception exception;
-		AsyncCallback callback;
-		Stream stream;
-		object state;
-		bool completed;
-		bool synch;
-		object locker = new object ();
-
-		public FtpAsyncResult (AsyncCallback callback, object state)
-		{
-			this.callback = callback;
-			this.state = state;
-		}
-		
-		public object AsyncState {
-			get {
-				return state;
-			}
-		}
-
-		public WaitHandle AsyncWaitHandle {
-			get {
-				lock (locker) {
-					if (waitHandle == null)
-						waitHandle = new ManualResetEvent (false);
-				}
-				
-				return waitHandle;
-			}
-		}
-
-		public bool CompletedSynchronously {
-			get {
-				return synch;
-			}
-		}
-
-		public bool IsCompleted {
-			get {
-				lock (locker) {
-					return completed;
-				}
-			}
-		}
-
-		internal bool GotException {
-			get {
-				return exception != null;
-			}
-		}
-
-		internal Exception Exception {
-			get {
-				return exception;
-			}
-		}
-
-		internal FtpWebResponse Response {
-			get {
-				return response;
-			}
-			set {
-				response = value;
-			}
-		}
-
-		internal Stream Stream {
-			get {
-				return stream;
-			}
-		}
-
-		internal void WaitUntilComplete ()
-		{
-			if (IsCompleted)
-				return;
-
-			AsyncWaitHandle.WaitOne ();
-		}
-
-		internal bool WaitUntilComplete (int timeout, bool exitContext)
-		{
-			if (IsCompleted)
-				return true;
-			
-			return AsyncWaitHandle.WaitOne (timeout, exitContext);
-		}
-
-		internal void SetCompleted (bool synch, Exception exc, FtpWebResponse response)
-		{
-			this.synch = synch;
-			this.exception = exc;
-			this.response = response;
-			lock (locker) {
-				completed = true;
-				if (waitHandle != null)
-					waitHandle.Set ();
-			}
-		}
-
-		internal void SetCompleted (bool synch)
-		{
-			SetCompleted (synch, null, null);
-		}
-
-		internal void SetCompleted (bool synch, FtpWebResponse response)
-		{
-			SetCompleted (synch, null, response);
-		}
-
-		internal void SetCompleted (bool synch, Exception exc)
-		{
-			SetCompleted (synch, exc, null);
-		}
-
-		internal void SetCompleted (bool synch, Stream stream)
-		{
-			this.synch = synch;
-			this.stream = stream;
-			lock (locker) {
-				completed = true;
-				if (waitHandle != null)
-					waitHandle.Set ();
-			}
-		}
-
-		internal void DoCallback ()
-		{
-			callback (this);
-		}
-
-		// Cleanup resources
-		internal void Reset () 
-		{
-			exception = null;
-			synch = false;
-			response = null;
-			state = null;
-			
-			lock (locker) {
-				completed = false;
-				if (waitHandle != null)
-					waitHandle.Reset ();
-			}
-		}
-		
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs
deleted file mode 100644
index f9f5daf5f3b..00000000000
--- a/mcs/class/System/System.Net/FtpDataStream.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-//
-// System.Net.FtpDataStream.cs
-//
-// Authors:
-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)
-//
-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)
-//
-
-using System;
-using System.IO;
-using System.Net.Sockets;
-using System.Runtime.Remoting.Messaging;
-using System.Threading;
-
-#if NET_2_0
-
-namespace System.Net
-{
-	class FtpDataStream : Stream, IDisposable
-	{
-		FtpWebRequest request;
-		NetworkStream networkStream;
-		bool disposed;
-		bool isRead;
-		int totalRead;
-		int contentLength;
-
-		ManualResetEvent closewh;
-
-		internal FtpDataStream (FtpWebRequest request, Socket socket, bool isRead)
-		{
-			if (request == null)
-				throw new ArgumentNullException ("request");
-			if (socket == null)
-				throw new ArgumentNullException ("socket");
-			if (!socket.Connected)
-				throw new ArgumentException ("socket");
-
-			this.request = request;
-			this.contentLength = socket.Available;
-			this.networkStream = new NetworkStream (socket, true);
-			this.isRead = isRead;
-
-			closewh = new ManualResetEvent (false);
-		}
-
-		public override bool CanRead {
-			get {
-				return isRead;
-			}
-		}
-
-		public override bool CanWrite {
-			get {
-				return !isRead;
-			}
-		}
-
-		public override bool CanSeek {
-			get {
-				return false;
-			}
-		}
-
-		public override long Length {
-			get {
-				throw new NotSupportedException ();
-			}
-		}
-
-		public override long Position {
-			get {
-				throw new NotSupportedException ();
-			}
-			set {
-				throw new NotSupportedException ();
-			}
-		}
-
-		internal NetworkStream NetworkStream {
-			get {
-				CheckDisposed ();
-				return networkStream;
-			}
-		}
-
-		public override void Close ()
-		{
-			((IDisposable) this).Dispose ();
-		}
-
-		public override void Flush ()
-		{
-			// Do nothing.
-		}
-
-		public override long Seek (long offset, SeekOrigin origin)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public override void SetLength (long value)
-		{
-			throw new NotSupportedException ();
-		}
-
-		int ReadInternal (byte [] buffer, int offset, int size)
-		{
-			int nbytes;
-			try {
-				// Probably it would be better to have the socket here
-				nbytes = networkStream.Read (buffer, offset, size);
-			} catch (IOException exc) {
-				throw new ProtocolViolationException ("Server commited a protocol violation");
-			}
-
-			totalRead += nbytes;
-			if (nbytes == 0)
-				contentLength = totalRead;
-			if (totalRead >= contentLength)
-				request.SetTransferCompleted ();
-			
-			return nbytes;
-		}
-
-		public override IAsyncResult BeginRead (byte [] buffer, int offset, int size, AsyncCallback cb, object state)
-		{
-			CheckDisposed ();
-
-			if (!isRead)
-				throw new NotSupportedException ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset > buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (size < 0 || size > buffer.Length - offset)
-				throw new ArgumentOutOfRangeException ("offset+size");
-
-			ReadDelegate del = ReadInternal;
-			return del.BeginInvoke (buffer, offset, size, cb, state);
-		}
-
-		public override int EndRead (IAsyncResult asyncResult)
-		{
-			if (asyncResult == null)
-				throw new ArgumentNullException ("asyncResult");
-
-			AsyncResult ar = asyncResult as AsyncResult;
-			if (ar == null)
-				throw new ArgumentException ("Invalid asyncResult", "asyncResult");
-			
-			ReadDelegate del = ar.AsyncDelegate as ReadDelegate;
-			if (del == null)
-				throw new ArgumentException ("Invalid asyncResult", "asyncResult");
-
-			return del.EndInvoke (asyncResult);
-		}
-
-		public override int Read (byte [] buffer, int offset, int size)
-		{
-			IAsyncResult ar = BeginRead (buffer, offset, size, null, null);
-			if (!ar.IsCompleted && !ar.AsyncWaitHandle.WaitOne (request.ReadWriteTimeout, false))
-				throw new WebException ("Read timed out.", WebExceptionStatus.Timeout);
-
-			return EndRead (ar);
-		}
-
-
-		delegate void WriteDelegate (byte [] buffer, int offset, int size);
-		
-		void WriteInternal (byte [] buffer, int offset, int size)
-		{
-			try {
-				networkStream.Write (buffer, offset, size);
-			} catch (IOException exc) {
-				throw new ProtocolViolationException ();
-			}
-		}
-
-		public override IAsyncResult BeginWrite (byte [] buffer, int offset, int size, AsyncCallback cb, object state)
-		{
-			CheckDisposed ();
-			if (isRead)
-				throw new NotSupportedException ();
-			if (buffer == null)
-				throw new ArgumentNullException ("buffer");
-			if (offset < 0 || offset > buffer.Length)
-				throw new ArgumentOutOfRangeException ("offset");
-			if (size < 0 || size > buffer.Length - offset)
-				throw new ArgumentOutOfRangeException ("offset+size");
-
-			WriteDelegate del = WriteInternal;
-			return del.BeginInvoke (buffer, offset, size, cb, state);
-		}
-
-		public override void EndWrite (IAsyncResult asyncResult)
-		{
-			if (asyncResult == null)
-				throw new ArgumentNullException ("asyncResult");
-
-			AsyncResult ar = asyncResult as AsyncResult;
-			if (ar == null)
-				throw new ArgumentException ("Invalid asyncResult.", "asyncResult");
-
-			WriteDelegate del = ar.AsyncDelegate as WriteDelegate;
-			if (del == null)
-				throw new ArgumentException ("Invalid asyncResult.", "asyncResult");
-
-			del.EndInvoke (asyncResult);
-		}
-
-		public override void Write (byte [] buffer, int offset, int size)
-		{
-			IAsyncResult ar = BeginWrite (buffer, offset, size, null, null);
-			if (!ar.IsCompleted && !ar.AsyncWaitHandle.WaitOne (request.ReadWriteTimeout, false))
-				throw new WebException ("Read timed out.", WebExceptionStatus.Timeout);
-
-			EndWrite (ar);
-		}
-
-		~FtpDataStream ()
-		{
-			Dispose (false);
-		}
-
-		void IDisposable.Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-
-		void Dispose (bool disposing)
-		{
-			if (disposed)
-				return;
-
-			disposed = true;
-
-			networkStream.Close ();
-			networkStream = null;
-
-			closewh.Set ();
-		}
-
-		void CheckDisposed ()
-		{
-			if (disposed)
-				throw new ObjectDisposedException (GetType ().FullName);
-		}
-
-		delegate int ReadDelegate (byte [] buffer, int offset, int size);
-
-		// We need to know whether the stream has been closed
-		internal ManualResetEvent CloseWaitHandle {
-			get {
-				return closewh;
-			}
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System/System.Net/FtpRequestCreator.cs b/mcs/class/System/System.Net/FtpRequestCreator.cs
deleted file mode 100644
index b1f0590dd52..00000000000
--- a/mcs/class/System/System.Net/FtpRequestCreator.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.FtpbRequestCreator.cs
-//
-// Authors:
-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)
-//
-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-namespace System.Net
-{
-	class FtpRequestCreator : IWebRequestCreate
-	{
-		public WebRequest Create (Uri uri)
-		{
-			return new FtpWebRequest (uri);
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System/System.Net/FtpStatusCode.cs b/mcs/class/System/System.Net/FtpStatusCode.cs
index c8d2508b4c0..601378b4e15 100644
--- a/mcs/class/System/System.Net/FtpStatusCode.cs
+++ b/mcs/class/System/System.Net/FtpStatusCode.cs
@@ -49,7 +49,7 @@ namespace System.Net
 		ClosingData = 226,
 		EnteringPassive = 227,
 		LoggedInProceed = 230,
-		ServerWantsSecureSession = 234,
+		ServerWantSecureSession = 234,
 		FileActionOK = 250,
 		PathnameCreated = 257,
 		SendPasswordCommand = 331,
diff --git a/mcs/class/System/System.Net/FtpWebRequest.cs b/mcs/class/System/System.Net/FtpWebRequest.cs
deleted file mode 100644
index 276e0c31b3a..00000000000
--- a/mcs/class/System/System.Net/FtpWebRequest.cs
+++ /dev/null
@@ -1,871 +0,0 @@
-//
-// System.Net.FtpWebRequest.cs
-//
-// Authors:
-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)
-//
-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)
-//
-
-using System;
-using System.IO;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-#if NET_2_0
-using System.Net.Cache;
-#endif
-
-#if NET_2_0
-
-namespace System.Net
-{
-	[Serializable]
-	public class FtpWebRequest : WebRequest
-	{
-		Uri requestUri;
-		ServicePoint servicePoint;
-		Socket dataSocket;
-		NetworkStream controlStream;
-		StreamReader controlReader;
-		NetworkCredential credentials;
-		IPHostEntry hostEntry;
-		IPEndPoint localEndPoint;
-		IWebProxy proxy;
-		int timeout = 100000;
-		int rwTimeout = 300000;
-		long offset;
-		bool binary = true;
-		bool enableSsl;
-		bool requestInProgress;
-		bool usePassive = true;
-		bool keepAlive = true;
-		bool aborted;
-		bool transferCompleted;
-		bool gotRequestStream;
-		string method = WebRequestMethods.Ftp.DownloadFile;
-		string renameTo;
-		object locker = new object ();
-
-		FtpStatusCode statusCode;
-		string statusDescription = String.Empty;
-
-		FtpAsyncResult asyncRead;
-		FtpAsyncResult asyncWrite;
-
-		FtpWebResponse ftpResponse;
-		Stream requestStream = Stream.Null;
-
-		const string UserCommand = "USER";
-		const string PasswordCommand = "PASS";
-		const string TypeCommand = "TYPE";
-		const string PassiveCommand = "PASV";
-		const string PortCommand = "PORT";
-		const string AbortCommand = "ABOR";
-		const string AuthCommand = "AUTH";
-		const string RestCommand = "REST";
-		const string RenameFromCommand = "RNFR";
-		const string RenameToCommand = "RNTO";
-		const string EOL = "\r\n"; // Special end of line
-
-		// sorted commands
-		static readonly string [] supportedCommands = new string [] {
-			WebRequestMethods.Ftp.AppendFile, // APPE
-			WebRequestMethods.Ftp.DeleteFile, // DELE
-			WebRequestMethods.Ftp.ListDirectoryDetails, // LIST
-			WebRequestMethods.Ftp.GetDateTimestamps, // MDTM
-			WebRequestMethods.Ftp.MakeDirectory, // MKD
-			WebRequestMethods.Ftp.ListDirectory, // NLST
-			WebRequestMethods.Ftp.PrintWorkingDirectory, // PWD
-			WebRequestMethods.Ftp.Rename, // RENAME
-			WebRequestMethods.Ftp.DownloadFile, // RETR
-			WebRequestMethods.Ftp.RemoveDirectory, // RMD
-			WebRequestMethods.Ftp.GetFileSize, // SIZE
-			WebRequestMethods.Ftp.UploadFile, // STOR
-			WebRequestMethods.Ftp.UploadFileWithUniqueName // STUR
-			};
-
-		internal FtpWebRequest (Uri uri) 
-		{
-			this.requestUri = uri;
-			this.proxy = GlobalProxySelection.Select;
-		}
-
-		public override string ContentType {
-			get {
-				throw new NotSupportedException ();
-			}
-			set {
-				throw new NotSupportedException ();
-			}
-		}
-
-		public override long ContentLength {
-			get {
-				return 0;
-			} 
-			set {
-				// DO nothing
-			}
-		}
-
-		public long ContentOffset {
-			get {
-				return offset;
-			}
-			set {
-				CheckRequestStarted ();
-				if (value < 0)
-					throw new ArgumentOutOfRangeException ();
-
-				offset = value;
-			}
-		}
-
-		public override ICredentials Credentials {
-			get {
-				return credentials;
-			}
-			set {
-				CheckRequestStarted ();
-				if (value == null)
-					throw new ArgumentNullException ();
-				if (!(value is NetworkCredential))
-					throw new ArgumentException ();
-
-				credentials = value as NetworkCredential;
-			}
-		}
-
-		public bool EnableSsl {
-			get {
-				return enableSsl;
-			}
-			set {
-				CheckRequestStarted ();
-				enableSsl = value;
-			}
-		}
-
-		public bool KeepAlive {
-			get {
-				return keepAlive;
-			}
-			set {
-				CheckRequestStarted ();
-				keepAlive = value;
-			}
-		}
-
-		public override string Method {
-			get {
-				return method;
-			}
-			set {
-				CheckRequestStarted ();
-				if (value == null)
-					throw new ArgumentNullException ("method");
-
-				if (value.Length == 0 || Array.BinarySearch (supportedCommands, value) < 0)
-					throw new ArgumentException ("Method not supported", "value");
-				
-				method = value;
-			}
-		}
-
-		public override bool PreAuthenticate {
-			get {
-				throw new NotSupportedException ();
-			}
-			set {
-				throw new NotSupportedException ();
-			}
-		}
-
-		public override IWebProxy Proxy {
-			get {
-				return proxy;
-			}
-			set {
-				CheckRequestStarted ();
-				if (value == null)
-					throw new ArgumentNullException ();
-
-				proxy = value;
-			}
-		}
-
-		public int ReadWriteTimeout {
-			get {
-				return rwTimeout;
-			}
-			set {
-				CheckRequestStarted ();
-
-				if (value < - 1)
-					throw new ArgumentOutOfRangeException ();
-				else
-					rwTimeout = value;
-			}
-		}
-
-		public string RenameTo {
-			get {
-				return renameTo;
-			}
-			set {
-				CheckRequestStarted ();
-				if (value == null || value.Length == 0)
-					throw new ArgumentException ("RenameTo value can't be null or empty", "RenameTo");
-
-				renameTo = value;
-			}
-		}
-
-		public override Uri RequestUri {
-			get {
-				return requestUri;
-			}
-		}
-
-		public ServicePoint ServicePoint {
-			get {
-				return GetServicePoint ();
-			}
-		}
-
-		public bool UsePassive {
-			get {
-				return usePassive;
-			}
-			set {
-				CheckRequestStarted ();
-				usePassive = value;
-			}
-		}
-		
-		public bool UseBinary {
-			get {
-				return binary;
-			} set {
-				CheckRequestStarted ();
-				binary = value;
-			}
-		}
-
-		public override int Timeout {
-			get {
-				return timeout;
-			}
-			set {
-				CheckRequestStarted ();
-
-				if (value < -1)
-					throw new ArgumentOutOfRangeException ();
-				else
-					timeout = value;
-			}
-		}
-
-		string DataType {
-			get {
-				return binary ? "I" : "A";
-			}
-		}
-
-		ServicePoint GetServicePoint ()
-		{
-			if (servicePoint == null)
-				servicePoint = ServicePointManager.FindServicePoint (requestUri, proxy);
-
-			return servicePoint;
-		}
-
-		// Probably move some code of command connection here
-		bool ResolveHost ()
-		{
-			hostEntry = GetServicePoint ().HostEntry;
-			if (hostEntry == null)
-				return false;
-			
-			return true;
-		}
-
-		public override void Abort ()
-		{
-			FtpStatusCode status = SendCommand (AbortCommand);
-			if (status != FtpStatusCode.ClosingData)
-				throw CreateExceptionFromResponse (); // Probably ignore it by now
-
-			aborted = true;
-			if (asyncRead != null) {
-				FtpAsyncResult r = asyncRead;
-				WebException wexc = new WebException ("Request aborted", WebExceptionStatus.RequestCanceled);
-				r.SetCompleted (false, wexc);
-				r.DoCallback ();
-				asyncRead = null;
-			}
-			if (asyncWrite != null) {
-				FtpAsyncResult r = asyncWrite;
-				WebException wexc = new WebException ("Request aborted", WebExceptionStatus.RequestCanceled);
-				r.SetCompleted (false, wexc);
-				r.DoCallback ();
-				asyncWrite = null;
-			}
-		}
-
-		void ProcessRequest ()
-		{
-			ftpResponse = new FtpWebResponse (requestUri, method, keepAlive);
-
-			if (!ResolveHost ()) {
-				SetResponseError (new WebException ("The remote server name could not be resolved: " + requestUri,
-						null, WebExceptionStatus.NameResolutionFailure, ftpResponse));
-				return;
-			}
-			
-			if (!OpenControlConnection ())
-				return;
-
-			switch (method) {
-				// Open data connection and receive data
-				case WebRequestMethods.Ftp.DownloadFile:
-				case WebRequestMethods.Ftp.ListDirectory:
-				case WebRequestMethods.Ftp.ListDirectoryDetails:
-					DownloadData ();
-					break;
-				// Open data connection and send data
-				case WebRequestMethods.Ftp.AppendFile:
-				case WebRequestMethods.Ftp.UploadFile:
-				case WebRequestMethods.Ftp.UploadFileWithUniqueName:
-					UploadData ();
-					break;
-				// Get info from control connection
-				case WebRequestMethods.Ftp.GetFileSize:
-				case WebRequestMethods.Ftp.GetDateTimestamps:
-					GetInfoFromControl ();
-					break;
-				case WebRequestMethods.Ftp.Rename:
-					RenameFile ();
-					break;
-				case WebRequestMethods.Ftp.MakeDirectory:
-					ProcessSimpleRequest ();
-					break;
-				default: // What to do here?
-					throw new Exception ("Support for command not implemented yet");
-			}
-		}
-
-		// Currently I use this only for MKD 
-		// (Commands that don't need any parsing in command connection
-		// for open data connection)
-		void ProcessSimpleRequest ()
-		{
-			if (SendCommand (method, requestUri.LocalPath) != FtpStatusCode.PathnameCreated) {
-				asyncRead.SetCompleted (true, CreateExceptionFromResponse ());
-				return;
-			}
-
-			asyncRead.SetCompleted (true, ftpResponse);
-		}
-
-		// It would be good to have a SetCompleted method for
-		// settting asyncRead as completed (some code is here and there, repeated)
-		void GetInfoFromControl ()
-		{
-			FtpStatusCode status = SendCommand (method, requestUri.LocalPath);
-			if (status != FtpStatusCode.FileStatus) {
-				asyncRead.SetCompleted (true, CreateExceptionFromResponse ());
-				return;
-			}
-
-			string desc = statusDescription;
-			Console.WriteLine ("Desc = " + desc);
-			if (method == WebRequestMethods.Ftp.GetFileSize) {
-				int i, len;
-				long size;
-				for (i = 4, len = 0; i < desc.Length && Char.IsDigit (desc [i]); i++, len++)
-					;
-
-				if (len == 0) {
-					asyncRead.SetCompleted (true, new WebException ("Bad format for server response in " + method));
-					return;
-				}
-
-				if (!Int64.TryParse (desc.Substring (4, len), out size)) {
-					asyncRead.SetCompleted (true, new WebException ("Bad format for server response in " + method));
-					return;
-				}
-
-				ftpResponse.contentLength = size;
-				asyncRead.SetCompleted (true, ftpResponse);
-				return;
-			}
-			
-			if (method == WebRequestMethods.Ftp.GetDateTimestamps) {
-				// Here parse the format the date time (different formats)
-				asyncRead.SetCompleted (true, ftpResponse);
-				return;
-			}
-
-			throw new Exception ("You shouldn't reach this point");
-		}
-
-		void RenameFile ()
-		{
-			FtpStatusCode status = SendCommand (RenameFromCommand, requestUri.LocalPath);
-			if (status == FtpStatusCode.FileCommandPending) {
-				// Pass an empty string if RenameTo wasn't specified
-				status = SendCommand (RenameToCommand, renameTo != null ? renameTo : String.Empty);
-				
-				if (status == FtpStatusCode.FileActionOK) {
-					ftpResponse.UpdateStatus (statusCode, statusDescription);
-					asyncRead.SetCompleted (true, ftpResponse);
-					return;
-				}
-			}
-
-			ftpResponse.UpdateStatus (statusCode, statusDescription);
-			asyncRead.SetCompleted (true, CreateExceptionFromResponse ());
-		}
-
-		void UploadData ()
-		{
-			if (gotRequestStream) {
-				if (GetResponseCode () != FtpStatusCode.ClosingData)
-					asyncRead.SetCompleted (true, CreateExceptionFromResponse ());
-				
-				return;
-			}
-			
-			if (!OpenDataConnection ())
-				return;
-
-			gotRequestStream = true;
-			requestStream = new FtpDataStream (this, dataSocket, false);
-			asyncWrite.SetCompleted (true, requestStream);
-		}
-
-		void DownloadData ()
-		{
-			FtpStatusCode status;
-
-			// Handle content offset
-			if (offset > 0) {
-				status = SendCommand (RestCommand, offset.ToString ());
-				if (status != FtpStatusCode.FileCommandPending) {
-					asyncRead.SetCompleted (true, CreateExceptionFromResponse ());
-					return;
-				}
-			}
-
-			if (!OpenDataConnection ())
-				return;
-
-			ftpResponse.Stream = new FtpDataStream (this, dataSocket, true);
-			ftpResponse.StatusDescription = statusDescription;
-			ftpResponse.StatusCode = statusCode;
-			asyncRead.SetCompleted (true, ftpResponse);
-		}
-
-		public override IAsyncResult BeginGetResponse (AsyncCallback callback, object state)
-		{
-			if (aborted)
-				throw new WebException ("Request was previously aborted.");
-			
-			Monitor.Enter (this);
-			if (asyncRead != null) {
-				Monitor.Exit (this);
-				throw new InvalidOperationException ();
-			}
-
-			requestInProgress = true;
-			asyncRead = new FtpAsyncResult (callback, state);
-			Thread thread = new Thread (ProcessRequest);
-			thread.Start ();
-
-			Monitor.Exit (this);
-			return asyncRead;
-		}
-
-		public override WebResponse EndGetResponse (IAsyncResult asyncResult)
-		{
-			if (asyncResult == null)
-				throw new ArgumentNullException ("asyncResult");
-
-			if (!(asyncResult is FtpAsyncResult) || asyncResult != asyncRead)
-				throw new ArgumentException ("asyncResult");
-
-			FtpAsyncResult asyncFtpResult = (FtpAsyncResult) asyncResult;
-			if (!asyncFtpResult.WaitUntilComplete (timeout, false)) {
-				Abort ();
-				throw new WebException ("Transfer timed out.", WebExceptionStatus.Timeout);
-			}
-
-			if (asyncFtpResult.GotException)
-				throw asyncFtpResult.Exception;
-
-			return asyncFtpResult.Response;
-		}
-
-		public override WebResponse GetResponse ()
-		{
-			IAsyncResult asyncResult = BeginGetResponse (null, null);
-			return EndGetResponse (asyncResult);
-		}
-
-		public override IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state)
-		{
-			if (aborted)
-				throw new WebException ("Request was previously aborted.");
-			
-			if (method != WebRequestMethods.Ftp.UploadFile && method != WebRequestMethods.Ftp.UploadFileWithUniqueName &&
-					method != WebRequestMethods.Ftp.AppendFile)
-				throw new ProtocolViolationException ();
-
-			lock (locker) {
-				if (asyncWrite != null || asyncRead != null)
-					throw new InvalidOperationException ();
-				
-				requestInProgress = true;
-				asyncWrite = new FtpAsyncResult (callback, state);
-				Thread thread = new Thread (ProcessRequest);
-				thread.Start ();
-
-				return asyncWrite;
-			}
-		}
-
-		public override Stream EndGetRequestStream (IAsyncResult asyncResult)
-		{
-			if (asyncResult == null)
-				throw new ArgumentNullException ("asyncResult");
-
-			if (!(asyncResult is FtpAsyncResult))
-				throw new ArgumentException ("asyncResult");
-
-			FtpAsyncResult res = (FtpAsyncResult) asyncResult;
-			if (!res.WaitUntilComplete (timeout, false)) {
-				Abort ();
-				throw new WebException ("Request timeod out");
-			}
-
-			if (res.GotException)
-				throw res.Exception;
-
-			return res.Stream;
-		}
-
-		public override Stream GetRequestStream ()
-		{
-			IAsyncResult asyncResult = BeginGetRequestStream (null, null);
-			return EndGetRequestStream (asyncResult);
-		}
-
-		void CheckRequestStarted ()
-		{
-			if (requestInProgress)
-				throw new InvalidOperationException ("request in progress");
-		}
-
-		bool OpenControlConnection ()
-		{
-			Socket sock = null;
-			foreach (IPAddress address in hostEntry.AddressList) {
-				sock = new Socket (address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-				try {
-					sock.Connect (new IPEndPoint (address, requestUri.Port));
-					localEndPoint = (IPEndPoint) sock.LocalEndPoint;
-					break;
-				} catch (SocketException e) {
-					sock.Close ();
-					sock = null;
-				}
-			}
-
-			// Couldn't connect to any address
-			if (sock == null) {
-				SetResponseError (new WebException ("Unable to connect to remote server", null, 
-						WebExceptionStatus.UnknownError, ftpResponse));
-				return false;
-			}
-
-			controlStream = new NetworkStream (sock);
-			controlReader = new StreamReader (controlStream, Encoding.ASCII);
-
-			if (!Authenticate ()) {
-				SetResponseError (CreateExceptionFromResponse ());
-				return false;
-			}
-
-			return true;
-		}
-
-		// Probably we could do better having here a regex
-		Socket SetupPassiveConnection ()
-		{
-			// Current response string
-			string response = statusDescription;
-			if (response.Length < 4)
-				return null;
-			
-			// Look for first digit after code
-			int i;
-			for (i = 3; i < response.Length && !Char.IsDigit (response [i]); i++)
-				;
-			if (i >= response.Length)
-				return null;
-
-			// Get six elements
-			string [] digits = response.Substring (i).Split (new char [] {','}, 6);
-			if (digits.Length != 6)
-				return null;
-
-			// Clean non-digits at the end of last element
-			int j;
-			for (j = digits [5].Length - 1; j >= 0 && !Char.IsDigit (digits [5][j]); j--)
-				;
-			if (j < 0)
-				return null;
-			
-			digits [5] = digits [5].Substring (0, j + 1);
-
-			IPAddress ip;
-			try {
-				ip = IPAddress.Parse (String.Join (".", digits, 0, 4));
-			} catch (FormatException) {
-				return null;
-			}
-
-			// Get the port
-			int p1, p2, port;
-			if (!Int32.TryParse (digits [4], out p1) || !Int32.TryParse (digits [5], out p2))
-				return null;
-
-			port = (p1 << 8) + p2; // p1 * 256 + p2
-			//port = p1 * 256 + p2;
-			if (port < IPEndPoint.MinPort || port > IPEndPoint.MaxPort)
-				return null;
-
-			IPEndPoint ep = new IPEndPoint (ip, port);
-			Socket sock = new Socket (ep.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-			try {
-				sock.Connect (ep);
-			} catch (SocketException exc) {
-				sock.Close ();
-				return null;
-			}
-
-			return sock;
-		}
-
-		Exception CreateExceptionFromResponse ()
-		{
-			WebException exc = new WebException ("Server returned an error: " + statusDescription, null, 
-					WebExceptionStatus.ProtocolError, ftpResponse);
-			return exc;
-		}
-		
-		// Here we could also get a server error, so be cautious
-		internal void SetTransferCompleted ()
-		{
-			if (transferCompleted)
-				return;
-			
-			transferCompleted = true;
-			
-			FtpStatusCode status = GetResponseCode ();
-			ftpResponse.StatusCode = status;
-			ftpResponse.StatusDescription = statusDescription;
-		}
-
-		internal void SetResponseError (Exception exc)
-		{
-			FtpAsyncResult ar = asyncRead;
-			if (ar == null)
-				ar = asyncWrite;
-
-			ar.SetCompleted (true, exc);
-			ar.DoCallback ();
-		}
-
-		Socket InitDataConnection ()
-		{
-			FtpStatusCode status;
-			
-			if (usePassive) {
-				status = SendCommand (PassiveCommand);
-				if (status != FtpStatusCode.EnteringPassive) {
-					SetResponseError (CreateExceptionFromResponse ());
-					return null;
-				}
-				
-				Socket retval = SetupPassiveConnection ();
-				if (retval == null)
-					SetResponseError (new WebException ("Couldn't setup passive connection"));
-					
-				return retval;
-			}
-
-			// Open a socket to listen the server's connection
-			Socket sock = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-			try {
-				sock.Bind (new IPEndPoint (localEndPoint.Address, 0));
-				sock.Listen (1); // We only expect a connection from server
-
-			} catch (SocketException e) {
-				sock.Close ();
-
-				SetResponseError (new WebException ("Couldn't open listening socket on client", e));
-				return null;
-			}
-
-			IPEndPoint ep = (IPEndPoint) sock.LocalEndPoint;
-			string ipString = ep.Address.ToString ().Replace (".", ",");
-			int h1 = ep.Port >> 8; // ep.Port / 256
-			int h2 = ep.Port % 256;
-
-			string portParam = ipString + "," + h1 + "," + h2;
-			status = SendCommand (PortCommand, portParam);
-			if (status != FtpStatusCode.CommandOK) {
-				sock.Close ();
-				
-				SetResponseError (CreateExceptionFromResponse ());
-				return null;
-			}
-
-			return sock;
-		}
-
-		bool OpenDataConnection ()
-		{
-			FtpStatusCode status;
-			Socket s = InitDataConnection ();
-			if (s == null)
-				return false;
-
-			// TODO - Check that this command is only used for data connection based commands
-			if (method != WebRequestMethods.Ftp.ListDirectory && method != WebRequestMethods.Ftp.ListDirectoryDetails) {
-				status = SendCommand (TypeCommand, DataType);
-				
-				if (status != FtpStatusCode.CommandOK) {
-					SetResponseError (CreateExceptionFromResponse ());
-					return false;
-				}
-			}
-
-			status = SendCommand (method, requestUri.LocalPath);
-			if (status != FtpStatusCode.OpeningData) {
-				SetResponseError (CreateExceptionFromResponse ());
-				return false;
-			}
-			
-			if (usePassive) {
-				dataSocket = s;
-				return true;
-			}
-
-			// Active connection (use Socket.Blocking to true)
-			Socket incoming = null;
-			try {
-				incoming = s.Accept ();
-			} catch (SocketException e) {
-				s.Close ();
-				if (incoming != null)
-					incoming.Close ();
-				
-				SetResponseError (new ProtocolViolationException ("Server commited a protocol violation."));
-				return false;
-			} 
-
-			s.Close ();
-			dataSocket = incoming;
-			return true;
-		}
-
-		// Take in count 'account' case
-		bool Authenticate ()
-		{
-			string username = null;
-			string password = null;
-			
-			if (credentials != null) {
-				username = credentials.UserName;
-				password = credentials.Password;
-				// account = credentials.Domain;
-			}
-
-			if (username == null)
-				username = "anonymous";
-			if (password == null)
-				password = "@anonymous";
-
-			// Connect to server and get banner message
-			FtpStatusCode status = GetResponseCode ();
-			ftpResponse.BannerMessage = statusDescription;
-			if (status != FtpStatusCode.SendUserCommand)
-				return false;
-
-			status = SendCommand (UserCommand, username);
-			if (status == FtpStatusCode.LoggedInProceed) {
-				ftpResponse.WelcomeMessage = statusDescription;
-				return true;
-			}
-			if (status == FtpStatusCode.SendPasswordCommand) {
-				status = SendCommand (PasswordCommand, password);
-				if (status == FtpStatusCode.LoggedInProceed) {
-					ftpResponse.WelcomeMessage = statusDescription;
-					return true;
-				}
-
-				return false;
-			}
-
-			return false;
-		}
-
-		FtpStatusCode SendCommand (string command, params string [] parameters)
-		{
-			byte [] cmd;
-			string commandString = command;
-			if (parameters.Length > 0)
-				commandString += " " + String.Join (" ", parameters);
-
-			commandString += EOL;
-			cmd = Encoding.ASCII.GetBytes (commandString);
-			try {
-				controlStream.Write (cmd, 0, cmd.Length);
-			} catch (IOException) {
-				//controlStream.Close ();
-				return FtpStatusCode.ServiceNotAvalaible;
-			}
-
-			return GetResponseCode ();
-		}
-
-		internal FtpStatusCode GetResponseCode ()
-		{
-			string responseString = null;
-			try {
-				responseString = controlReader.ReadLine ();
-			} catch (IOException exc) {
-				// controlReader.Close ();
-			}
-
-			if (responseString == null || responseString.Length < 3)
-				return FtpStatusCode.ServiceNotAvalaible;
-
-			string codeString = responseString.Substring (0, 3);
-			int code;
-			if (!Int32.TryParse (codeString, out code))
-				return FtpStatusCode.ServiceNotAvalaible;
-
-			statusDescription = responseString;
-			return statusCode = (FtpStatusCode) code;
-		}
-
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System/System.Net/FtpWebResponse.cs b/mcs/class/System/System.Net/FtpWebResponse.cs
deleted file mode 100644
index 0770d1c7467..00000000000
--- a/mcs/class/System/System.Net/FtpWebResponse.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// System.Net.FtpWebResponse.cs
-//
-// Authors:
-//	Carlos Alberto Cortez (calberto.cortez@gmail.com)
-//
-// (c) Copyright 2006 Novell, Inc. (http://www.novell.com)
-//
-
-using System;
-using System.IO;
-using System.Runtime.Serialization;
-
-#if NET_2_0
-
-namespace System.Net
-{
-	public class FtpWebResponse : WebResponse
-	{
-		Stream stream = Stream.Null;
-		Uri uri;
-		FtpStatusCode statusCode;
-		DateTime lastModified = DateTime.MinValue;
-		string bannerMessage = String.Empty;
-		string welcomeMessage = String.Empty;
-		string exitMessage = String.Empty;
-		string statusDescription;
-		string method;
-		bool keepAlive;
-		bool disposed;
-		internal long contentLength = -1;
-		
-		internal FtpWebResponse (Uri uri, string method, bool keepAlive)
-		{
-			this.uri = uri;
-			this.method = method;
-			this.keepAlive = keepAlive;
-		}
-		
-		public override long ContentLength {
-			get {
-				return contentLength;
-			}
-		}
-
-		public override WebHeaderCollection Headers {
-			get {
-				return new WebHeaderCollection (true);
-			}
-		}
-
-		public override Uri ResponseUri {
-			get {
-				return uri;
-			}
-		}
-
-		public DateTime LastModified {
-			get {
-				return lastModified;
-			}
-			internal set {
-				lastModified = value;
-			}
-		}
-
-		public string BannerMessage {
-			get {
-				return bannerMessage;
-			}
-			internal set {
-				bannerMessage = value;
-			}
-		}
-		
-		public string WelcomeMessage {
-			get {
-				return welcomeMessage;
-			}
-			internal set {
-				welcomeMessage = value;
-			}
-		}
-
-		public string ExitMessage {
-			get {
-				return exitMessage;
-			}
-			internal set {
-				exitMessage = value;
-			}
-		}
-
-		public FtpStatusCode StatusCode {
-			get {
-				return statusCode;
-			}
-			internal set {
-				statusCode = value;
-			}
-		}
-
-		public string StatusDescription {
-			get {
-				return statusDescription;
-			}
-			internal set {
-				statusDescription = value;
-			}
-		}
-		
-		public override void Close ()
-		{
-			if (disposed)
-				return;
-			
-			disposed = true;
-			stream.Close ();
-			stream = null;
-		}
-
-		public override Stream GetResponseStream ()
-		{
-			if (method != WebRequestMethods.Ftp.DownloadFile &&
-					method != WebRequestMethods.Ftp.ListDirectory)
-				CheckDisposed ();
-			
-			return stream;
-		}
-
-		internal Stream Stream {
-			set {
-				stream = value;
-			}
-		}
-
-		internal void UpdateStatus (FtpStatusCode code, string desc)
-		{
-			statusCode = code;
-			statusDescription = desc;
-		}
-
-		~FtpWebResponse ()
-		{
-			((IDisposable) this).Dispose ();
-		}
-
-		void CheckDisposed ()
-		{
-			if (disposed)
-				throw new ObjectDisposedException (GetType ().FullName);
-		}
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System/System.Net/ListenerPrefix.cs b/mcs/class/System/System.Net/ListenerPrefix.cs
index 6d336a9fe85..18ebe4d0a20 100644
--- a/mcs/class/System/System.Net/ListenerPrefix.cs
+++ b/mcs/class/System/System.Net/ListenerPrefix.cs
@@ -3,7 +3,6 @@
 //
 // Author:
 //	Gonzalo Paniagua Javier (gonzalo@novell.com)
-//	Oleg Mihailik (mihailik gmail co_m)
 //
 // Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
 //
diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources
index 9190a0f48a6..7c79d217e1d 100644
--- a/mcs/class/System/System.dll.sources
+++ b/mcs/class/System/System.dll.sources
@@ -54,8 +54,8 @@ System.CodeDom/CodeDefaultValueExpression.cs
 System.CodeDom/CodeDelegateCreateExpression.cs
 System.CodeDom/CodeDelegateInvokeExpression.cs
 System.CodeDom/CodeDirectionExpression.cs
-System.CodeDom/CodeDirectiveCollection.cs
 System.CodeDom/CodeDirective.cs
+System.CodeDom/CodeDirectiveCollection.cs
 System.CodeDom/CodeEntryPointMethod.cs
 System.CodeDom/CodeEventReferenceExpression.cs
 System.CodeDom/CodeExpressionCollection.cs
@@ -104,8 +104,8 @@ System.CodeDom/CodeTypeDelegate.cs
 System.CodeDom/CodeTypeMemberCollection.cs
 System.CodeDom/CodeTypeMember.cs
 System.CodeDom/CodeTypeOfExpression.cs
-System.CodeDom/CodeTypeParameterCollection.cs
 System.CodeDom/CodeTypeParameter.cs
+System.CodeDom/CodeTypeParameterCollection.cs
 System.CodeDom/CodeTypeReferenceCollection.cs
 System.CodeDom/CodeTypeReference.cs
 System.CodeDom/CodeTypeReferenceExpression.cs
@@ -134,11 +134,11 @@ System.CodeDom.Compiler/LanguageOptions.cs
 System.CodeDom.Compiler/TempFileCollection.cs
 System.CodeDom/FieldDirection.cs
 System.CodeDom/MemberAttributes.cs
+System.Collections.Generic/Queue.cs
+System.Collections.Generic/Stack.cs
 System.Collections.Generic/LinkedList.cs
 System.Collections.Generic/LinkedListNode.cs
-System.Collections.Generic/Queue.cs
 System.Collections.Generic/SortedList.cs
-System.Collections.Generic/Stack.cs
 System.Collections.Specialized/BitVector32.cs
 System.Collections.Specialized/CollectionsUtil.cs
 System.Collections.Specialized/HybridDictionary.cs
@@ -151,8 +151,6 @@ System.Collections.Specialized/ProcessStringDictionary.cs
 System.Collections.Specialized/StringCollection.cs
 System.Collections.Specialized/StringDictionary.cs
 System.Collections.Specialized/StringEnumerator.cs
-System.ComponentModel/AmbientValueAttribute.cs
-System.ComponentModel/ArrayConverter.cs
 System.ComponentModel/AsyncCompletedEventArgs.cs
 System.ComponentModel/AsyncCompletedEventHandler.cs
 System.ComponentModel/AttributeCollection.cs
@@ -160,103 +158,28 @@ System.ComponentModel/BaseNumberConverter.cs
 System.ComponentModel/BindableAttribute.cs
 System.ComponentModel/BindableSupport.cs
 System.ComponentModel/BindingDirection.cs
-System.ComponentModel/BooleanConverter.cs
 System.ComponentModel/BrowsableAttribute.cs
-System.ComponentModel/ByteConverter.cs
 System.ComponentModel/CancelEventArgs.cs
 System.ComponentModel/CancelEventHandler.cs
 System.ComponentModel/CategoryAttribute.cs
-System.ComponentModel/CharConverter.cs
 System.ComponentModel/CollectionChangeAction.cs
 System.ComponentModel/CollectionChangeEventArgs.cs
 System.ComponentModel/CollectionChangeEventHandler.cs
-System.ComponentModel/CollectionConverter.cs
 System.ComponentModel/ComponentCollection.cs
-System.ComponentModel/ComponentConverter.cs
-System.ComponentModel/Component.cs
-System.ComponentModel/ComponentEditor.cs
 System.ComponentModel/ComponentResourceManager.cs
+System.ComponentModel/Component.cs
 System.ComponentModel/Container.cs
-System.ComponentModel/CultureInfoConverter.cs
-System.ComponentModel/DateTimeConverter.cs
-System.ComponentModel/DecimalConverter.cs
 System.ComponentModel/DefaultEventAttribute.cs
 System.ComponentModel/DefaultPropertyAttribute.cs
 System.ComponentModel/DefaultValueAttribute.cs
 System.ComponentModel/DerivedPropertyDescriptor.cs
 System.ComponentModel/DescriptionAttribute.cs
-System.ComponentModel.Design/ActiveDesignerEventArgs.cs
-System.ComponentModel.Design/ActiveDesignerEventHandler.cs
-System.ComponentModel.Design/CheckoutException.cs
-System.ComponentModel.Design/CommandID.cs
-System.ComponentModel.Design/ComponentChangedEventArgs.cs
-System.ComponentModel.Design/ComponentChangedEventHandler.cs
-System.ComponentModel.Design/ComponentChangingEventArgs.cs
-System.ComponentModel.Design/ComponentChangingEventHandler.cs
-System.ComponentModel.Design/ComponentEventArgs.cs
-System.ComponentModel.Design/ComponentEventHandler.cs
-System.ComponentModel.Design/ComponentRenameEventArgs.cs
-System.ComponentModel.Design/ComponentRenameEventHandler.cs
-System.ComponentModel.Design/DesignerCollection.cs
-System.ComponentModel.Design/DesignerEventArgs.cs
-System.ComponentModel.Design/DesignerEventHandler.cs
-System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs
-System.ComponentModel.Design/DesignerTransactionCloseEventHandler.cs
-System.ComponentModel.Design/DesignerTransaction.cs
-System.ComponentModel.Design/DesignerVerbCollection.cs
-System.ComponentModel.Design/DesignerVerb.cs
-System.ComponentModel.Design/DesigntimeLicenseContext.cs
-System.ComponentModel.Design/DesigntimeLicenseContextSerializer.cs
 System.ComponentModel/DesignerAttribute.cs
 System.ComponentModel/DesignerCategoryAttribute.cs
 System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
 System.ComponentModel/DesignerSerializationVisibility.cs
-System.ComponentModel.Design/HelpContextType.cs
-System.ComponentModel.Design/HelpKeywordType.cs
-System.ComponentModel.Design/IComponentChangeService.cs
-System.ComponentModel.Design/IDesigner.cs
-System.ComponentModel.Design/IDesignerEventService.cs
-System.ComponentModel.Design/IDesignerFilter.cs
-System.ComponentModel.Design/IDesignerHost.cs
-System.ComponentModel.Design/IDesignerOptionService.cs
-System.ComponentModel.Design/IDictionaryService.cs
-System.ComponentModel.Design/IEventBindingService.cs
-System.ComponentModel.Design/IExtenderListService.cs
-System.ComponentModel.Design/IExtenderProviderService.cs
-System.ComponentModel.Design/IHelpService.cs
-System.ComponentModel.Design/IInheritanceService.cs
-System.ComponentModel.Design/IMenuCommandService.cs
-System.ComponentModel.Design/IReferenceService.cs
-System.ComponentModel.Design/IResourceService.cs
-System.ComponentModel.Design/IRootDesigner.cs
-System.ComponentModel.Design/ISelectionService.cs
-System.ComponentModel.Design/IServiceContainer.cs
-System.ComponentModel.Design/ITypeDescriptorFilterService.cs
-System.ComponentModel.Design/ITypeResolutionService.cs
-System.ComponentModel.Design/MenuCommand.cs
 System.ComponentModel/DesignOnlyAttribute.cs
-System.ComponentModel.Design/RuntimeLicenseContext.cs
-System.ComponentModel.Design/SelectionTypes.cs
-System.ComponentModel.Design.Serialization/ContextStack.cs
-System.ComponentModel.Design.Serialization/DesignerLoader.cs
-System.ComponentModel.Design.Serialization/DesignerSerializerAttribute.cs
-System.ComponentModel.Design.Serialization/IDesignerLoaderHost.cs
-System.ComponentModel.Design.Serialization/IDesignerLoaderService.cs
-System.ComponentModel.Design.Serialization/IDesignerSerializationManager.cs   
-System.ComponentModel.Design.Serialization/IDesignerSerializationProvider.cs
-System.ComponentModel.Design.Serialization/IDesignerSerializationService.cs
-System.ComponentModel.Design.Serialization/INameCreationService.cs
-System.ComponentModel.Design.Serialization/InstanceDescriptor.cs
-System.ComponentModel.Design.Serialization/ResolveNameEventArgs.cs
-System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs
-System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs
-System.ComponentModel.Design/ServiceContainer.cs
-System.ComponentModel.Design/ServiceCreatorCallback.cs
-System.ComponentModel.Design/StandardCommands.cs
-System.ComponentModel.Design/StandardToolWindows.cs
 System.ComponentModel/DesignTimeVisibleAttribute.cs
-System.ComponentModel.Design/ViewTechnology.cs
-System.ComponentModel/DoubleConverter.cs
 System.ComponentModel/EditorAttribute.cs
 System.ComponentModel/EditorBrowsableAttribute.cs
 System.ComponentModel/EditorBrowsableState.cs
@@ -266,28 +189,21 @@ System.ComponentModel/EventDescriptor.cs
 System.ComponentModel/EventHandlerList.cs
 System.ComponentModel/ExpandableObjectConverter.cs
 System.ComponentModel/ExtenderProvidedPropertyAttribute.cs
-System.ComponentModel/GuidConverter.cs
-System.ComponentModel/HandledEventArgs.cs
-System.ComponentModel/HandledEventHandler.cs
 System.ComponentModel/IBindingList.cs
 System.ComponentModel/IBindingListView.cs
+System.ComponentModel/HandledEventArgs.cs
+System.ComponentModel/HandledEventHandler.cs
 System.ComponentModel/IChangeTracking.cs
-System.ComponentModel/IComNativeDescriptorHandler.cs
 System.ComponentModel/IComponent.cs
+System.ComponentModel/IComNativeDescriptorHandler.cs
 System.ComponentModel/IContainer.cs
 System.ComponentModel/ICustomTypeDescriptor.cs
 System.ComponentModel/IDataErrorInfo.cs
 System.ComponentModel/IEditableObject.cs
 System.ComponentModel/IExtenderProvider.cs
 System.ComponentModel/IListSource.cs
-System.ComponentModel/ImmutableObjectAttribute.cs
-System.ComponentModel/InheritanceAttribute.cs
-System.ComponentModel/InheritanceLevel.cs
 System.ComponentModel/INotifyPropertyChanged.cs
-System.ComponentModel/InstallerTypeAttribute.cs
-System.ComponentModel/Int16Converter.cs
 System.ComponentModel/Int32Converter.cs
-System.ComponentModel/Int64Converter.cs
 System.ComponentModel/InvalidEnumArgumentException.cs
 System.ComponentModel/IRevertibleChangeTracking.cs
 System.ComponentModel/ISite.cs
@@ -296,109 +212,191 @@ System.ComponentModel/ISynchronizeInvoke.cs
 System.ComponentModel/ITypeDescriptorContext.cs
 System.ComponentModel/ITypedList.cs
 System.ComponentModel/LicenseContext.cs
-System.ComponentModel/License.cs
-System.ComponentModel/LicenseException.cs
-System.ComponentModel/LicenseManager.cs
-System.ComponentModel/LicenseProviderAttribute.cs
-System.ComponentModel/LicenseProvider.cs
 System.ComponentModel/LicenseUsageMode.cs
-System.ComponentModel/LicFileLicenseProvider.cs
 System.ComponentModel/ListBindableAttribute.cs
 System.ComponentModel/ListChangedEventArgs.cs
 System.ComponentModel/ListChangedEventHandler.cs
 System.ComponentModel/ListChangedType.cs
-System.ComponentModel/ListSortDescriptionCollection.cs
-System.ComponentModel/ListSortDescription.cs
 System.ComponentModel/ListSortDirection.cs
+System.ComponentModel/ListSortDescription.cs
+System.ComponentModel/ListSortDescriptionCollection.cs
 System.ComponentModel/LocalizableAttribute.cs
 System.ComponentModel/MarshalByValueComponent.cs
 System.ComponentModel/MemberDescriptor.cs
-System.ComponentModel/MergablePropertyAttribute.cs
 System.ComponentModel/NotifyParentPropertyAttribute.cs
-System.ComponentModel/ParenthesizePropertyNameAttribute.cs
 System.ComponentModel/PropertyChangedEventArgs.cs
 System.ComponentModel/PropertyChangedEventHandler.cs
 System.ComponentModel/PropertyDescriptorCollection.cs
 System.ComponentModel/PropertyDescriptor.cs
-System.ComponentModel/PropertyTabAttribute.cs
 System.ComponentModel/PropertyTabScope.cs
-System.ComponentModel/ProvidePropertyAttribute.cs
 System.ComponentModel/ReadOnlyAttribute.cs
 System.ComponentModel/RecommendedAsConfigurableAttribute.cs
-System.ComponentModel/ReferenceConverter.cs
-System.ComponentModel/ReflectionEventDescriptor.cs
-System.ComponentModel/ReflectionPropertyDescriptor.cs
 System.ComponentModel/RefreshEventArgs.cs
 System.ComponentModel/RefreshEventHandler.cs
 System.ComponentModel/RefreshPropertiesAttribute.cs
 System.ComponentModel/RefreshProperties.cs
 System.ComponentModel/RunInstallerAttribute.cs
-System.ComponentModel/SByteConverter.cs
-System.ComponentModel/SingleConverter.cs
 System.ComponentModel/StringConverter.cs
 System.ComponentModel/SyntaxCheck.cs
-System.ComponentModel/TimeSpanConverter.cs
 System.ComponentModel/ToolboxItemAttribute.cs
-System.ComponentModel/ToolboxItemFilterAttribute.cs
-System.ComponentModel/ToolboxItemFilterType.cs
 System.ComponentModel/TypeConverterAttribute.cs
 System.ComponentModel/TypeConverter.cs
 System.ComponentModel/TypeDescriptor.cs
+System.ComponentModel/WarningException.cs
+System.ComponentModel/Win32Exception.cs
+System.ComponentModel/InheritanceAttribute.cs
+System.ComponentModel/InheritanceLevel.cs
+System.ComponentModel/AmbientValueAttribute.cs
+System.ComponentModel/ArrayConverter.cs
+System.ComponentModel/BooleanConverter.cs
+System.ComponentModel/ByteConverter.cs
+System.ComponentModel/CharConverter.cs
+System.ComponentModel/CollectionConverter.cs
+System.ComponentModel/ComponentConverter.cs
+System.ComponentModel/ComponentEditor.cs
+System.ComponentModel/CultureInfoConverter.cs
+System.ComponentModel/DateTimeConverter.cs
+System.ComponentModel/DecimalConverter.cs
+System.ComponentModel/DoubleConverter.cs
+System.ComponentModel/GuidConverter.cs
+System.ComponentModel/ImmutableObjectAttribute.cs
+System.ComponentModel/InstallerTypeAttribute.cs
+System.ComponentModel/Int16Converter.cs
+System.ComponentModel/Int64Converter.cs
+System.ComponentModel/License.cs
+System.ComponentModel/LicenseException.cs
+System.ComponentModel/LicenseManager.cs
+System.ComponentModel/LicenseProviderAttribute.cs
+System.ComponentModel/LicenseProvider.cs
+System.ComponentModel/LicFileLicenseProvider.cs
+System.ComponentModel/MergablePropertyAttribute.cs
+System.ComponentModel/ParenthesizePropertyNameAttribute.cs
+System.ComponentModel/PropertyTabAttribute.cs
+System.ComponentModel/ProvidePropertyAttribute.cs
+System.ComponentModel/ReferenceConverter.cs
+System.ComponentModel/ReflectionEventDescriptor.cs
+System.ComponentModel/ReflectionPropertyDescriptor.cs
+System.ComponentModel/SByteConverter.cs
+System.ComponentModel/SingleConverter.cs
+System.ComponentModel/TimeSpanConverter.cs
+System.ComponentModel/ToolboxItemFilterAttribute.cs
+System.ComponentModel/ToolboxItemFilterType.cs
 System.ComponentModel/TypeListConverter.cs
 System.ComponentModel/UInt16Converter.cs
 System.ComponentModel/UInt32Converter.cs
 System.ComponentModel/UInt64Converter.cs
-System.ComponentModel/WarningException.cs
-System.ComponentModel/Win32Exception.cs
+System.ComponentModel.Design/ActiveDesignerEventArgs.cs
+System.ComponentModel.Design/ActiveDesignerEventHandler.cs
+System.ComponentModel.Design/CheckoutException.cs
+System.ComponentModel.Design/CommandID.cs
+System.ComponentModel.Design/ComponentChangedEventArgs.cs
+System.ComponentModel.Design/ComponentChangedEventHandler.cs
+System.ComponentModel.Design/ComponentChangingEventArgs.cs
+System.ComponentModel.Design/ComponentChangingEventHandler.cs
+System.ComponentModel.Design/ComponentEventArgs.cs
+System.ComponentModel.Design/ComponentEventHandler.cs
+System.ComponentModel.Design/ComponentRenameEventArgs.cs
+System.ComponentModel.Design/ComponentRenameEventHandler.cs
+System.ComponentModel.Design/DesignerCollection.cs
+System.ComponentModel.Design/DesignerEventArgs.cs
+System.ComponentModel.Design/DesignerEventHandler.cs
+System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs
+System.ComponentModel.Design/DesignerTransactionCloseEventHandler.cs
+System.ComponentModel.Design/DesignerTransaction.cs
+System.ComponentModel.Design/DesignerVerbCollection.cs
+System.ComponentModel.Design/DesignerVerb.cs
+System.ComponentModel.Design/DesigntimeLicenseContext.cs
+System.ComponentModel.Design/DesigntimeLicenseContextSerializer.cs
+System.ComponentModel.Design/HelpContextType.cs
+System.ComponentModel.Design/HelpKeywordType.cs
+System.ComponentModel.Design/IComponentChangeService.cs
+System.ComponentModel.Design/IDesigner.cs
+System.ComponentModel.Design/IDesignerEventService.cs
+System.ComponentModel.Design/IDesignerFilter.cs
+System.ComponentModel.Design/IDesignerHost.cs
+System.ComponentModel.Design/IDesignerOptionService.cs
+System.ComponentModel.Design/IDictionaryService.cs
+System.ComponentModel.Design/IEventBindingService.cs
+System.ComponentModel.Design/IExtenderListService.cs
+System.ComponentModel.Design/IExtenderProviderService.cs
+System.ComponentModel.Design/IHelpService.cs
+System.ComponentModel.Design/IInheritanceService.cs
+System.ComponentModel.Design/IMenuCommandService.cs
+System.ComponentModel.Design/IReferenceService.cs
+System.ComponentModel.Design/IResourceService.cs
+System.ComponentModel.Design/IRootDesigner.cs
+System.ComponentModel.Design/ISelectionService.cs
+System.ComponentModel.Design/IServiceContainer.cs
+System.ComponentModel.Design/ITypeDescriptorFilterService.cs
+System.ComponentModel.Design/ITypeResolutionService.cs
+System.ComponentModel.Design/MenuCommand.cs
+System.ComponentModel.Design/RuntimeLicenseContext.cs
+System.ComponentModel.Design/SelectionTypes.cs
+System.ComponentModel.Design/ServiceContainer.cs
+System.ComponentModel.Design/ServiceCreatorCallback.cs
+System.ComponentModel.Design/StandardCommands.cs
+System.ComponentModel.Design/StandardToolWindows.cs
+System.ComponentModel.Design/ViewTechnology.cs
+System.ComponentModel.Design.Serialization/ContextStack.cs
+System.ComponentModel.Design.Serialization/IDesignerSerializationManager.cs   
+System.ComponentModel.Design.Serialization/ResolveNameEventArgs.cs
+System.ComponentModel.Design.Serialization/DesignerLoader.cs
+System.ComponentModel.Design.Serialization/IDesignerSerializationProvider.cs
+System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs
+System.ComponentModel.Design.Serialization/DesignerSerializerAttribute.cs
+System.ComponentModel.Design.Serialization/IDesignerSerializationService.cs
+System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs
+System.ComponentModel.Design.Serialization/IDesignerLoaderHost.cs
+System.ComponentModel.Design.Serialization/INameCreationService.cs
+System.ComponentModel.Design.Serialization/IDesignerLoaderService.cs
+System.ComponentModel.Design.Serialization/InstanceDescriptor.cs
+System.Configuration/AppSettingsReader.cs
 System.Configuration/ApplicationScopedSettingAttribute.cs
 System.Configuration/ApplicationSettingsBase.cs
-System.Configuration/AppSettingsReader.cs
 System.Configuration/ConfigHelper.cs
+System.Configuration/ConfigXmlDocument.cs
 System.Configuration/ConfigurationException.cs
 System.Configuration/ConfigurationSettings.cs
-System.Configuration/ConfigXmlDocument.cs
 System.Configuration/DefaultSettingValueAttribute.cs
 System.Configuration/DictionarySectionHandler.cs
 System.Configuration/IApplicationSettingsProvider.cs
+System.Configuration/IConfigXmlNode.cs
 System.Configuration/IConfigurationSectionHandler.cs
 System.Configuration/IConfigurationSystem.cs
-System.Configuration/IConfigXmlNode.cs
 System.Configuration/IgnoreSectionHandler.cs
 System.Configuration/IPersistComponentSettings.cs
 System.Configuration/ISettingsProviderService.cs
 System.Configuration/LocalFileSettingsProvider.cs
 System.Configuration/NameValueFileSectionHandler.cs
 System.Configuration/NameValueSectionHandler.cs
+System.Configuration/SingleTagSectionHandler.cs
 System.Configuration/SettingAttribute.cs
-System.Configuration/SettingChangingEventArgs.cs
-System.Configuration/SettingChangingEventHandler.cs
-System.Configuration/SettingElementCollection.cs
 System.Configuration/SettingElement.cs
+System.Configuration/SettingElementCollection.cs
 System.Configuration/SettingsAttributeDictionary.cs
 System.Configuration/SettingsBase.cs
+System.Configuration/SettingChangingEventArgs.cs
+System.Configuration/SettingChangingEventHandler.cs
 System.Configuration/SettingsContext.cs
 System.Configuration/SettingsLoadedEventArgs.cs
 System.Configuration/SettingsLoadedEventHandler.cs
-System.Configuration/SettingsPropertyCollection.cs
 System.Configuration/SettingsProperty.cs
+System.Configuration/SettingsPropertyCollection.cs
 System.Configuration/SettingsPropertyIsReadOnlyException.cs
 System.Configuration/SettingsPropertyNotFoundException.cs
-System.Configuration/SettingsPropertyValueCollection.cs
 System.Configuration/SettingsPropertyValue.cs
+System.Configuration/SettingsPropertyValueCollection.cs
 System.Configuration/SettingsPropertyWrongTypeException.cs
+System.Configuration/SettingsProvider.cs
 System.Configuration/SettingsProviderAttribute.cs
 System.Configuration/SettingsProviderCollection.cs
-System.Configuration/SettingsProvider.cs
 System.Configuration/SettingsSavingEventHandler.cs
-System.Configuration/SettingsSerializeAsAttribute.cs
 System.Configuration/SettingsSerializeAs.cs
+System.Configuration/SettingsSerializeAsAttribute.cs
 System.Configuration/SettingValueElement.cs
-System.Configuration/SingleTagSectionHandler.cs
 System.Configuration/UserScopedSettingAttribute.cs
-System/DefaultUriParser.cs
 System.Diagnostics/AlphabeticalEnumConverter.cs
 System.Diagnostics/BooleanSwitch.cs
-System.Diagnostics/ConsoleTraceListener.cs
 System.Diagnostics/CounterCreationDataCollection.cs
 System.Diagnostics/CounterCreationData.cs
 System.Diagnostics/CounterSampleCalculator.cs
@@ -455,15 +453,6 @@ System.Diagnostics/TraceLevel.cs
 System.Diagnostics/TraceListenerCollection.cs
 System.Diagnostics/TraceListener.cs
 System.Diagnostics/TraceSwitch.cs
-System/FileStyleUriParser.cs
-System/FtpStyleUriParser.cs
-System/GenericUriParser.cs
-System/GenericUriParserOptions.cs
-System/GopherStyleUriParser.cs
-System/HttpStyleUriParser.cs
-System.IO.Compression/CompressionMode.cs
-System.IO.Compression/DeflateStream.cs
-System.IO.Compression/GzipStream.cs
 System.IO/DefaultWatcher.cs
 System.IO/ErrorEventArgs.cs
 System.IO/ErrorEventHandler.cs
@@ -480,37 +469,33 @@ System.IO/KeventWatcher.cs
 System.IO/MonoIO.cs
 System.IO/MonoIOError.cs
 System.IO/NotifyFilters.cs
-System.IO.Ports/Handshake.cs
-System.IO.Ports/Parity.cs
-System.IO.Ports/SerialData.cs
-System.IO.Ports/SerialError.cs
-System.IO.Ports/SerialErrorEventArgs.cs
-System.IO.Ports/SerialPinChange.cs
-System.IO.Ports/SerialPinChangedEventArgs.cs
-System.IO.Ports/SerialPort.cs
-System.IO.Ports/SerialPortStream.cs
-System.IO.Ports/SerialReceivedEventArgs.cs
-System.IO.Ports/StopBits.cs
 System.IO/RenamedEventArgs.cs
 System.IO/RenamedEventHandler.cs
 System.IO/SearchPattern.cs
 System.IO/WaitForChangedResult.cs
 System.IO/WatcherChangeTypes.cs
 System.IO/WindowsWatcher.cs
-System/LdapStyleUriParser.cs
+System.IO.Compression/CompressionMode.cs
+System.IO.Compression/DeflateStream.cs
+System.IO.Compression/GzipStream.cs
+System.IO.Ports/SerialErrorEventArgs.cs
+System.IO.Ports/SerialPinChangedEventArgs.cs
+System.IO.Ports/SerialPort.cs
+System.IO.Ports/SerialReceivedEventArgs.cs
 System.Net/AuthenticationManager.cs
 System.Net/AuthenticationSchemes.cs
 System.Net/AuthenticationSchemeSelector.cs
 System.Net/Authorization.cs
 System.Net/BasicClient.cs
 System.Net/BindIPEndPoint.cs
+System.Net/ChunkStream.cs
+System.Net/ChunkedInputStream.cs
+System.Net/ConnectionModes.cs
 System.Net.Cache/HttpCacheAgeControl.cs
 System.Net.Cache/HttpRequestCacheLevel.cs
 System.Net.Cache/HttpRequestCachePolicy.cs
 System.Net.Cache/RequestCacheLevel.cs
 System.Net.Cache/RequestCachePolicy.cs
-System.Net/ChunkedInputStream.cs
-System.Net/ChunkStream.cs
 System.Net.Configuration/AuthenticationModuleElementCollection.cs
 System.Net.Configuration/AuthenticationModuleElement.cs
 System.Net.Configuration/AuthenticationModulesSection.cs
@@ -536,8 +521,8 @@ System.Net.Configuration/ProxyElement.cs
 System.Net.Configuration/RequestCachingSection.cs
 System.Net.Configuration/ServicePointManagerElement.cs
 System.Net.Configuration/SettingsSection.cs
-System.Net.Configuration/SmtpNetworkElement.cs
 System.Net.Configuration/SmtpSection.cs
+System.Net.Configuration/SmtpNetworkElement.cs
 System.Net.Configuration/SmtpSpecifiedPickupDirectoryElement.cs
 System.Net.Configuration/SocketElement.cs
 System.Net.Configuration/WebProxyScriptElement.cs
@@ -545,7 +530,6 @@ System.Net.Configuration/WebRequestModuleElementCollection.cs
 System.Net.Configuration/WebRequestModuleElement.cs
 System.Net.Configuration/WebRequestModuleHandler.cs
 System.Net.Configuration/WebRequestModulesSection.cs
-System.Net/ConnectionModes.cs
 System.Net/CookieCollection.cs
 System.Net/CookieContainer.cs
 System.Net/Cookie.cs
@@ -560,21 +544,15 @@ System.Net/EndPoint.cs
 System.Net/EndPointListener.cs
 System.Net/EndPointManager.cs
 System.Net/EndpointPermission.cs
-System.Net/FileWebRequestCreator.cs
 System.Net/FileWebRequest.cs
+System.Net/FileWebRequestCreator.cs
 System.Net/FileWebResponse.cs
-System.Net/FtpAsyncResult.cs
-System.Net/FtpDataStream.cs
-System.Net/FtpRequestCreator.cs
-System.Net/FtpStatusCode.cs
-System.Net/FtpWebRequest.cs
-System.Net/FtpWebResponse.cs
 System.Net/GlobalProxySelection.cs
 System.Net/HttpConnection.cs
 System.Net/HttpContinueDelegate.cs
+System.Net/HttpListener.cs
 System.Net/HttpListenerBasicIdentity.cs
 System.Net/HttpListenerContext.cs
-System.Net/HttpListener.cs
 System.Net/HttpListenerException.cs
 System.Net/HttpListenerPrefixCollection.cs
 System.Net/HttpListenerRequest.cs
@@ -601,82 +579,11 @@ System.Net/IWebProxy.cs
 System.Net/IWebRequestCreate.cs
 System.Net/ListenerAsyncResult.cs
 System.Net/ListenerPrefix.cs
-System.Net.Mail/AlternateViewCollection.cs
-System.Net.Mail/AlternateView.cs
-System.Net.Mail/AttachmentBase.cs
-System.Net.Mail/AttachmentCollection.cs
-System.Net.Mail/Attachment.cs
-System.Net.Mail/DeliveryNotificationOptions.cs
-System.Net.Mail/LinkedResourceCollection.cs
-System.Net.Mail/LinkedResource.cs
-System.Net.Mail/MailAddressCollection.cs
-System.Net.Mail/MailAddress.cs
-System.Net.Mail/MailMessage.cs
-System.Net.Mail/MailPriority.cs
-System.Net.Mail/SendCompletedEventHandler.cs
-System.Net.Mail/SmtpAccess.cs
-System.Net.Mail/SmtpClient.cs
-System.Net.Mail/SmtpDeliveryMethod.cs
-System.Net.Mail/SmtpException.cs
-System.Net.Mail/SmtpFailedRecipientException.cs
-System.Net.Mail/SmtpFailedRecipientsException.cs
-System.Net.Mail/SmtpStatusCode.cs
-System.Net.Mime/ContentDisposition.cs
-System.Net.Mime/ContentType.cs
-System.Net.Mime/DispositionTypeNames.cs
-System.Net.Mime/MediaTypeNames.cs
-System.Net.Mime/TransferEncoding.cs
 System.Net/MonoHttpDate.cs
 System.Net/NetConfig.cs
 System.Net/NetworkAccess.cs
 System.Net/NetworkCredential.cs
-System.Net.NetworkInformation/DuplicateAddressDetectionState.cs
-System.Net.NetworkInformation/GatewayIPAddressInformationCollection.cs
-System.Net.NetworkInformation/GatewayIPAddressInformation.cs
-System.Net.NetworkInformation/IcmpV4Statistics.cs
-System.Net.NetworkInformation/IcmpV6Statistics.cs
-System.Net.NetworkInformation/IPAddressCollection.cs
-System.Net.NetworkInformation/IPAddressInformationCollection.cs
-System.Net.NetworkInformation/IPAddressInformation.cs
-System.Net.NetworkInformation/IPGlobalProperties.cs
-System.Net.NetworkInformation/IPGlobalStatistics.cs
-System.Net.NetworkInformation/IPInterfaceProperties.cs
-System.Net.NetworkInformation/IPStatus.cs
-System.Net.NetworkInformation/IPv4InterfaceProperties.cs
-System.Net.NetworkInformation/IPv4InterfaceStatistics.cs
-System.Net.NetworkInformation/IPv6InterfaceProperties.cs
-System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
-System.Net.NetworkInformation/MulticastIPAddressInformation.cs
-System.Net.NetworkInformation/NetBiosNodeType.cs
-System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
-System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
-System.Net.NetworkInformation/NetworkAvailabilityEventArgs.cs
-System.Net.NetworkInformation/NetworkChange.cs
-System.Net.NetworkInformation/NetworkInformationAccess.cs
-System.Net.NetworkInformation/NetworkInformationException.cs
-System.Net.NetworkInformation/NetworkInformationPermissionAttribute.cs
-System.Net.NetworkInformation/NetworkInformationPermission.cs
-System.Net.NetworkInformation/NetworkInterfaceComponent.cs
-System.Net.NetworkInformation/NetworkInterface.cs
-System.Net.NetworkInformation/NetworkInterfaceType.cs
-System.Net.NetworkInformation/OperationalStatus.cs
-System.Net.NetworkInformation/PhysicalAddress.cs
-System.Net.NetworkInformation/PingCompletedEventArgs.cs
-System.Net.NetworkInformation/PingCompletedEventHandler.cs
-System.Net.NetworkInformation/Ping.cs
-System.Net.NetworkInformation/PingException.cs
-System.Net.NetworkInformation/PingOptions.cs
-System.Net.NetworkInformation/PingReply.cs
-System.Net.NetworkInformation/PrefixOrigin.cs
-System.Net.NetworkInformation/SuffixOrigin.cs
-System.Net.NetworkInformation/TcpConnectionInformation.cs
-System.Net.NetworkInformation/TcpState.cs
-System.Net.NetworkInformation/TcpStatistics.cs
-System.Net.NetworkInformation/UdpStatistics.cs
-System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
-System.Net.NetworkInformation/UnicastIPAddressInformation.cs
 System.Net/NtlmClient.cs
-System/NetPipeStyleUriParser.cs
 System.Net/ProtocolViolationException.cs
 System.Net/RequestStream.cs
 System.Net/ResponseStream.cs
@@ -685,9 +592,9 @@ System.Net.Security/AuthenticationLevel.cs
 System.Net.Security/LocalCertSelectionCallback.cs
 System.Net.Security/NegotiateStream.cs
 System.Net.Security/ProtectionLevel.cs
-System.Net/SecurityProtocolType.cs
 System.Net.Security/RemoteCertValidationCallback.cs
 System.Net.Security/SslStream.cs
+System.Net/SecurityProtocolType.cs
 System.Net/ServicePoint.cs
 System.Net/ServicePointManager.cs
 System.Net/SocketAddress.cs
@@ -712,10 +619,9 @@ System.Net.Sockets/SocketType.cs
 System.Net.Sockets/TcpClient.cs
 System.Net.Sockets/TcpListener.cs
 System.Net.Sockets/UdpClient.cs
-System/NetTcpStyleUriParser.cs
 System.Net/TransportType.cs
-System.Net/WebAsyncResult.cs
 System.Net/WebClient.cs
+System.Net/WebAsyncResult.cs
 System.Net/WebConnection.cs
 System.Net/WebConnectionData.cs
 System.Net/WebConnectionGroup.cs
@@ -723,24 +629,47 @@ System.Net/WebConnectionStream.cs
 System.Net/WebException.cs
 System.Net/WebExceptionStatus.cs
 System.Net/WebHeaderCollection.cs
-System.Net/WebPermissionAttribute.cs
 System.Net/WebPermission.cs
+System.Net/WebPermissionAttribute.cs
 System.Net/WebProxy.cs
 System.Net/WebRequest.cs
-System.Net/WebRequestMethods.cs
 System.Net/WebResponse.cs
-System/NewsStyleUriParser.cs
-System.Security.AccessControl/SemaphoreRights.cs
+System.Net.Mail/AlternateView.cs
+System.Net.Mail/AlternateViewCollection.cs
+System.Net.Mail/Attachment.cs
+System.Net.Mail/AttachmentBase.cs
+System.Net.Mail/AttachmentCollection.cs
+System.Net.Mail/DeliveryNotificationOptions.cs
+System.Net.Mail/LinkedResource.cs
+System.Net.Mail/LinkedResourceCollection.cs
+System.Net.Mail/MailAddress.cs
+System.Net.Mail/MailAddressCollection.cs
+System.Net.Mail/MailMessage.cs
+System.Net.Mail/MailPriority.cs
+System.Net.Mail/SendCompletedEventHandler.cs
+System.Net.Mail/SmtpAccess.cs
+System.Net.Mail/SmtpClient.cs
+System.Net.Mail/SmtpDeliveryMethod.cs
+System.Net.Mail/SmtpException.cs
+System.Net.Mail/SmtpFailedRecipientException.cs
+System.Net.Mail/SmtpFailedRecipientsException.cs
+System.Net.Mail/SmtpStatusCode.cs
+System.Net.Mime/ContentDisposition.cs
+System.Net.Mime/ContentType.cs
+System.Net.Mime/DispositionTypeNames.cs
+System.Net.Mime/MediaTypeNames.cs
+System.Net.Mime/TransferEncoding.cs
 System.Security.AccessControl/SemaphoreSecurity.cs
+System.Security.AccessControl/SemaphoreRights.cs
 System.Security.Authentication/CipherAlgorithmType.cs
 System.Security.Authentication/ExchangeAlgorithmType.cs
 System.Security.Authentication/HashAlgorithmType.cs
 System.Security.Authentication/SslProtocolType.cs
-System.Security.Cryptography/AsnEncodedDataCollection.cs
 System.Security.Cryptography/AsnEncodedData.cs
+System.Security.Cryptography/AsnEncodedDataCollection.cs
 System.Security.Cryptography/AsnEncodedDataEnumerator.cs
-System.Security.Cryptography/OidCollection.cs
 System.Security.Cryptography/Oid.cs
+System.Security.Cryptography/OidCollection.cs
 System.Security.Cryptography/OidEnumerator.cs
 System.Security.Cryptography.X509Certificates/OpenFlags.cs
 System.Security.Cryptography.X509Certificates/PublicKey.cs
@@ -749,25 +678,25 @@ System.Security.Cryptography.X509Certificates/StoreName.cs
 System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs
 System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs
 System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs
-System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
+System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs
 System.Security.Cryptography.X509Certificates/X509Certificate2.cs
+System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
 System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs
-System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs
 System.Security.Cryptography.X509Certificates/X509Chain.cs
-System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs
 System.Security.Cryptography.X509Certificates/X509ChainElement.cs
+System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs
 System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs
 System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
 System.Security.Cryptography.X509Certificates/X509ChainStatus.cs
 System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs
 System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs
-System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs
 System.Security.Cryptography.X509Certificates/X509Extension.cs
+System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs
 System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs
 System.Security.Cryptography.X509Certificates/X509FindType.cs
 System.Security.Cryptography.X509Certificates/X509IncludeOption.cs
-System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
 System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs
+System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
 System.Security.Cryptography.X509Certificates/X509NameType.cs
 System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs
 System.Security.Cryptography.X509Certificates/X509RevocationMode.cs
@@ -778,28 +707,27 @@ System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs
 System.Security.Permissions/PermissionHelper.cs
 System.Security.Permissions/ResourcePermissionBase.cs
 System.Security.Permissions/ResourcePermissionBaseEntry.cs
-System.Security.Permissions/StorePermissionAttribute.cs
 System.Security.Permissions/StorePermission.cs
+System.Security.Permissions/StorePermissionAttribute.cs
 System.Security.Permissions/StorePermissionFlags.cs
-System/SRDescriptionAttribute.cs
 System.Text.RegularExpressions/arch.cs
 System.Text.RegularExpressions/cache.cs
-System.Text.RegularExpressions/CaptureCollection.cs
 System.Text.RegularExpressions/Capture.cs
+System.Text.RegularExpressions/CaptureCollection.cs
 System.Text.RegularExpressions/category.cs
 System.Text.RegularExpressions/compiler.cs
 System.Text.RegularExpressions/debug.cs
-System.Text.RegularExpressions/GroupCollection.cs
 System.Text.RegularExpressions/Group.cs
+System.Text.RegularExpressions/GroupCollection.cs
 System.Text.RegularExpressions/interpreter.cs
 System.Text.RegularExpressions/interval.cs
-System.Text.RegularExpressions/MatchCollection.cs
 System.Text.RegularExpressions/Match.cs
+System.Text.RegularExpressions/MatchCollection.cs
 System.Text.RegularExpressions/MatchEvaluator.cs
 System.Text.RegularExpressions/parser.cs
 System.Text.RegularExpressions/quicksearch.cs
-System.Text.RegularExpressions/RegexCompilationInfo.cs
 System.Text.RegularExpressions/Regex.cs
+System.Text.RegularExpressions/RegexCompilationInfo.cs
 System.Text.RegularExpressions/RegexOptions.cs
 System.Text.RegularExpressions/RegexRunner.cs
 System.Text.RegularExpressions/RegexRunnerFactory.cs
@@ -813,16 +741,28 @@ System.Timers/ElapsedEventArgs.cs
 System.Timers/ElapsedEventHandler.cs
 System.Timers/Timer.cs
 System.Timers/TimersDescriptionAttribute.cs
+System.Web/AspNetHostingPermission.cs
+System.Web/AspNetHostingPermissionAttribute.cs
+System.Web/AspNetHostingPermissionLevel.cs
+System/DefaultUriParser.cs
+System/FileStyleUriParser.cs
+System/FtpStyleUriParser.cs
+System/GenericUriParser.cs
+System/GenericUriParserOptions.cs
+System/GopherStyleUriParser.cs
+System/HttpStyleUriParser.cs
+System/LdapStyleUriParser.cs
+System/NetPipeStyleUriParser.cs
+System/NetTcpStyleUriParser.cs
+System/NewsStyleUriParser.cs
+System/SRDescriptionAttribute.cs
 System/UriBuilder.cs
-System/UriComponents.cs
 System/Uri.cs
+System/UriComponents.cs
 System/UriFormat.cs
 System/UriFormatException.cs
+System/UriParser.cs
 System/UriHostNameType.cs
 System/UriKind.cs
-System/UriParser.cs
 System/UriPartial.cs
 System/UriTypeConverter.cs
-System.Web/AspNetHostingPermissionAttribute.cs
-System.Web/AspNetHostingPermission.cs
-System.Web/AspNetHostingPermissionLevel.cs
diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog
index ee7f645b193..8bc336481e0 100644
--- a/mcs/class/System/System/ChangeLog
+++ b/mcs/class/System/System/ChangeLog
@@ -1,25 +1,3 @@
-2006-02-21  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Uri.cs : seems like Uri opreator == and != are case sensitive.
-
-2006-02-19  Raja R Harinath  <harinath@gmail.com>
-
-	* Uri.cs (InternalEquals): New helper.
-	(Equals, operator ==): Use it.
-	(operator !=): Likewise.  Fix to actually compare operands.
-
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Uri.cs : implemented op_Equality and op_Inequality.
-
-2006-02-14  Ankit Jain  <jankit@novell.com>
-
-	* Uri.cs (Uri.EnsureAbsoluteUri): New. Throws exception if its not an
-	absolute uri.
-	(Uri.Parse): Set isAbsoluteUri to false, if the address is not absolute.
-	All properties other than OriginalString, IsAbsoluteUri & UserEscaped
-	throw exception for relative address.
-
 2005-11-25  Sebastien Pouliot  <sebastien@ximian.com> 
 
 	* DefaultUriParser.cs: Added an internal default parser because (a)
diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs
index caaafa5619e..02bdd1fd368 100644
--- a/mcs/class/System/System/Uri.cs
+++ b/mcs/class/System/System/Uri.cs
@@ -77,7 +77,6 @@ namespace System {
 		private string userinfo = String.Empty;
 		private bool isUnc;
 		private bool isOpaquePart;
-		private bool isAbsoluteUri = true;
 
 		private string [] segments;
 		
@@ -126,15 +125,11 @@ namespace System {
 			switch (uriKind) {
 			case UriKind.Absolute:
 				if (!IsAbsoluteUri)
-					throw new UriFormatException("Invalid URI: The format of the URI could not be "
-						+ "determined.");
+					throw new InvalidOperationException (Locale.GetText ("This isn't an absolute URI."));
 				break;
 			case UriKind.Relative:
 				if (IsAbsoluteUri)
-					throw new UriFormatException("Invalid URI: The format of the URI could not be "
-						+ "determined because the parameter 'uriString' represents an absolute URI.");
-				break;
-			case UriKind.RelativeOrAbsolute:
+					throw new InvalidOperationException (Locale.GetText ("This isn't an relative URI."));
 				break;
 			default:
 				string msg = Locale.GetText ("Invalid UriKind value '{0}'.", uriKind);
@@ -155,9 +150,6 @@ namespace System {
 			userEscaped = dontEscape;
 			source = uriString;
 			ParseUri ();
-			if (!isAbsoluteUri)
-				throw new UriFormatException("Invalid URI: The format of the URI could not be "
-					+ "determined.");
 		}
 #else
 		public Uri (string uriString, bool dontEscape) 
@@ -165,9 +157,6 @@ namespace System {
 			userEscaped = dontEscape;
 			source = uriString;
 			Parse ();
-			if (!isAbsoluteUri)
-				throw new UriFormatException("Invalid URI: The format of the URI could not be "
-					+ "determined.");
 		}
 #endif
 
@@ -372,7 +361,6 @@ namespace System {
 
 		public string AbsoluteUri { 
 			get { 
-				EnsureAbsoluteUri ();
 				if (cachedAbsoluteUri == null) {
 					cachedAbsoluteUri = GetLeftPart (UriPartial.Path);
 					if (query.Length > 0)
@@ -386,28 +374,22 @@ namespace System {
 
 		public string Authority { 
 			get { 
-				return (GetDefaultPort (Scheme) == port)
+				return (GetDefaultPort (scheme) == port)
 				     ? host : host + ":" + port;
 			} 
 		}
 
 		public string Fragment { 
-			get { 
-				EnsureAbsoluteUri ();
-				return fragment; 
-			} 
+			get { return fragment; } 
 		}
 
 		public string Host { 
-			get { 
-				EnsureAbsoluteUri ();
-				return host; 
-			} 
+			get { return host; } 
 		}
 
 		public UriHostNameType HostNameType { 
 			get {
-				UriHostNameType ret = CheckHostName (Host);
+				UriHostNameType ret = CheckHostName (host);
 				if (ret != UriHostNameType.Unknown)
 					return ret;
 #if NET_2_0
@@ -425,16 +407,16 @@ namespace System {
 		}
 
 		public bool IsDefaultPort { 
-			get { return GetDefaultPort (Scheme) == port; }
+			get { return GetDefaultPort (scheme) == port; } 
 		}
 
 		public bool IsFile { 
-			get { return (Scheme == UriSchemeFile); }
+			get { return (scheme == UriSchemeFile); }
 		}
 
 		public bool IsLoopback { 
 			get {
-				if (Host.Length == 0) {
+				if (host.Length == 0) {
 #if NET_2_0
 					return IsFile;
 #else
@@ -462,15 +444,11 @@ namespace System {
 			// rule: This should be true only if
 			//   - uri string starts from "\\", or
 			//   - uri string starts from "//" (Samba way)
-			get { 
-				EnsureAbsoluteUri ();
-				return isUnc; 
-			} 
+			get { return isUnc; } 
 		}
 
 		public string LocalPath { 
 			get {
-				EnsureAbsoluteUri ();
 				if (cachedLocalPath != null)
 					return cachedLocalPath;
 				if (!IsFile)
@@ -520,33 +498,23 @@ namespace System {
 		}
 
 		public string PathAndQuery { 
-			get { return path + Query; } 
+			get { return path + query; } 
 		}
 
 		public int Port { 
-			get { 
-				EnsureAbsoluteUri ();
-				return port; 
-			} 
+			get { return port; } 
 		}
 
 		public string Query { 
-			get { 
-				EnsureAbsoluteUri ();
-				return query; 
-			}
+			get { return query; } 
 		}
 
 		public string Scheme { 
-			get { 
-				EnsureAbsoluteUri ();
-				return scheme; 
-			} 
+			get { return scheme; } 
 		}
 
 		public string [] Segments { 
 			get { 
-				EnsureAbsoluteUri ();
 				if (segments != null)
 					return segments;
 
@@ -589,36 +557,34 @@ namespace System {
 		}
 
 		public string UserInfo { 
-			get { 
-				EnsureAbsoluteUri ();
-				return userinfo; 
-			}
+			get { return userinfo; }
 		}
 		
 #if NET_2_0
 		[MonoTODO ("add support for IPv6 address")]
 		public string DnsSafeHost {
-			get { return Unescape (Host); }
+			get {
+				if (!IsAbsoluteUri)
+					throw new InvalidOperationException (Locale.GetText ("This isn't an absolute URI."));
+				return Unescape (host);
+			}
 		}
 
+		[MonoTODO]
 		public bool IsAbsoluteUri {
-			get { return isAbsoluteUri; }
+			get { return true; }
 		}
 
 		public string OriginalString {
-			get { return source; }
+			get {
+				if (!IsAbsoluteUri)
+					throw new InvalidOperationException (Locale.GetText ("This isn't an absolute URI."));
+				return source;
+			}
 		}
 #endif
 
 		// Methods		
-
-		private void EnsureAbsoluteUri ()
-		{
-#if NET_2_0
-			if (!IsAbsoluteUri)
-				throw new InvalidOperationException ("This operation is not supported for a relative URI.");
-#endif
-		}
 		
 		public static UriHostNameType CheckHostName (string name) 
 		{
@@ -730,22 +696,15 @@ namespace System {
 		{
 			if (comparant == null) 
 				return false;
-
+				
 			Uri uri = comparant as Uri;
-			if ((object) uri == null) {
+			if (uri == null) {
 				string s = comparant as String;
 				if (s == null)
 					return false;
 				uri = new Uri (s);
 			}
 
-			return InternalEquals (uri);
-		}
-
-		// Assumes: uri != null
-		// FIXME: Should we have a different implementation for NET_2_0?
-		bool InternalEquals (Uri uri)
-		{
 			CultureInfo inv = CultureInfo.InvariantCulture;
 			return ((this.scheme.ToLower (inv) == uri.scheme.ToLower (inv)) &&
 				(this.userinfo.ToLower (inv) == uri.userinfo.ToLower (inv)) &&
@@ -754,29 +713,7 @@ namespace System {
 				(this.path == uri.path) &&
 				(this.query.ToLower (inv) == uri.query.ToLower (inv)));
 		}		
-
-#if NET_2_0
-		public static bool operator == (Uri u1, Uri u2)
-		{
-			if ((object) u1 == null)
-				return (object) u2 == null;
-			else if ((object) u2 == null)
-				return false;
-
-			return u1.scheme == u2.scheme &&
-				u1.userinfo == u2.userinfo &&
-				u1.host == u2.host &&
-				u1.port == u2.port &&
-				u1.path == u2.path &&
-				u1.query == u2.query;
-		}
-
-		public static bool operator != (Uri u1, Uri u2)
-		{
-			return !(u1 == u2);
-		}
-#endif
-
+		
 		public override int GetHashCode () 
 		{
 			if (cachedHashCode == 0)			
@@ -1192,8 +1129,7 @@ namespace System {
 				else if (uriString.StartsWith ("\\\\"))
 					ParseAsWindowsUNC (uriString);
 				else
-					/* Relative path */
-					isAbsoluteUri = false;
+					throw new UriFormatException ("URI scheme was not recognized, and input string was not recognized as an absolute file path.");
 				return;
 			} 
 			else if (pos == 1) {
diff --git a/mcs/class/System/System_test.dll.sources b/mcs/class/System/System_test.dll.sources
index 636a3fbf03d..0fd750c9236 100644
--- a/mcs/class/System/System_test.dll.sources
+++ b/mcs/class/System/System_test.dll.sources
@@ -171,7 +171,6 @@ System.Net.Mail/MailAddressTest.cs
 System.Net.Mail/AttachmentTest.cs
 System.Net.Mail/AlternateViewTest.cs
 System.Net.Mail/LinkedResourceCollectionTest.cs
-System.Net.Mail/SmtpClientTest.cs
 System.Net.Mime/ContentDispositionTest.cs
 System.Net.Mime/ContentTypeTest.cs
 System.Security.Cryptography/AsnEncodedDataTest.cs
diff --git a/mcs/class/System/Test/ChangeLog b/mcs/class/System/Test/ChangeLog
index 0bb5ba1eeca..dfaaa36356e 100644
--- a/mcs/class/System/Test/ChangeLog
+++ b/mcs/class/System/Test/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-13  John Luke  <john.luke@gmail.com>
-
-	* System.Net.Mail/*Test.cs: update tests
-
 2006-01-06  Raja R Harinath  <rharinath@novell.com>
 
 	* System.Net.Mime/ContentDispositionTest.cs: Use Assert.AreEqual
diff --git a/mcs/class/System/Test/System.ComponentModel/ChangeLog b/mcs/class/System/Test/System.ComponentModel/ChangeLog
index 79bb70f2b7c..04feb2a9824 100644
--- a/mcs/class/System/Test/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/Test/System.ComponentModel/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-23 Andrew Skiba <andrews@mainsoft.com>
-
-	* standalone_tests: TypeDescriptor performance test
-
 2006-01-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* ContainerTest.cs: new test.
diff --git a/mcs/class/System/Test/System.ComponentModel/standalone_tests/Makefile b/mcs/class/System/Test/System.ComponentModel/standalone_tests/Makefile
deleted file mode 100644
index 527277bf82e..00000000000
--- a/mcs/class/System/Test/System.ComponentModel/standalone_tests/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-.SUFFIXES: .cs .exe

-

-RUNTIME = mono

-CSCOMPILE = mcs

-

-MONO="mono"

-

-test: TypeDescriptorTest.exe

-

-run-test: test

-	$(MONO) TypeDescriptorTest.exe

-

-clean:

-	rm -f TypeDescriptorTest.exe

-

-TypeDescriptorTest.exe: TypeDescriptorTest.cs

-	$(CSCOMPILE) TypeDescriptorTest.cs -r:System.Web

diff --git a/mcs/class/System/Test/System.ComponentModel/standalone_tests/TypeDescriptorTest.cs b/mcs/class/System/Test/System.ComponentModel/standalone_tests/TypeDescriptorTest.cs
deleted file mode 100644
index 7154e186e73..00000000000
--- a/mcs/class/System/Test/System.ComponentModel/standalone_tests/TypeDescriptorTest.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;

-using System.ComponentModel;

-using System.Web.UI.WebControls;

-

-

-class Test {

-	static void DoTest () {

-		for (int i=0; i<100000; i++) {

-			TextBox tb = new TextBox ();

-			TypeDescriptor.GetProperties (tb);

-			tb.Dispose ();

-		}

-	}

-

-	static void Main(string[] args) {

-		Console.WriteLine ("This test should normally take less than a second");

-		DateTime start = DateTime.Now;

-		DoTest ();

-		TimeSpan ts = DateTime.Now - start;

-		Console.Write ("Time spent: ");

-		Console.WriteLine (ts.ToString());

-	}

-}
\ No newline at end of file
diff --git a/mcs/class/System/Test/System.Net.Mail/MailMessageTest.cs b/mcs/class/System/Test/System.Net.Mail/MailMessageTest.cs
index 5d896053b4d..30d72633a75 100644
--- a/mcs/class/System/Test/System.Net.Mail/MailMessageTest.cs
+++ b/mcs/class/System/Test/System.Net.Mail/MailMessageTest.cs
@@ -4,7 +4,7 @@
 // Authors:
 //   John Luke (john.luke@gmail.com)
 //
-// (C) 2005, 2006 John Luke
+// (C) 2005 John Luke
 //
 #if NET_2_0
 using NUnit.Framework;
@@ -30,39 +30,11 @@ namespace MonoTests.System.Net.Mail
 			//Attachment a = Attachment.CreateAttachmentFromString ("blah blah", "text/plain");
 			//msg.Attachments.Add (a);
 		}
-		
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void ArgumentNullCtor1 ()
-		{
-			new MailMessage (null, "to@example.com");
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void ArgumentNullCtor2 ()
-		{
-			new MailMessage (null, new MailAddress ("to@example.com"));
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void ArgumentNullCtor3 ()
-		{
-			new MailMessage ("from@example.com", null);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void ArgumentNullCtor4 ()
-		{
-			new MailMessage (new MailAddress ("from@example.com"), null);
-		}
 
 		/*[Test]
 		public void AlternateView ()
 		{
-			Assert.AreEqual (msg.AlternateViews.Count, 1);
+			Assert.IsTrue (msg.AlternateViews.Count == 1);
 			AlternateView av = msg.AlternateViews[0];
 			// test that the type is ok, etc.
 		}*/
@@ -70,27 +42,21 @@ namespace MonoTests.System.Net.Mail
 		/*[Test]
 		public void Attachment ()
 		{
-			Assert.AreEqual (msg.Attachments.Count, 1);
+			Assert.IsTrue (msg.Attachments.Count == 1);
 			Attachment at = msg.Attachments[0];
-			Assert.AreEqual (at.ContentType.MediaType, "text/plain");
+			Assert.IsTrue (at.ContentType.MediaType == "text/plain");
 		}*/
 
 		[Test]
 		public void Body ()
 		{
-			Assert.AreEqual (msg.Body, "hello");
-		}
-		
-		[Test]
-		public void BodyEncoding ()
-		{
-			Assert.AreEqual (msg.BodyEncoding, Encoding.ASCII);
+			Assert.IsTrue (msg.Body == "hello");
 		}
 
 		[Test]
 		public void From ()
 		{
-			Assert.AreEqual (msg.From.Address, "from@example.com");
+			Assert.IsTrue (msg.From.Address == "from@example.com");
 		}
 
 		[Test]
@@ -102,20 +68,20 @@ namespace MonoTests.System.Net.Mail
 		[Test]
 		public void Priority ()
 		{
-			Assert.AreEqual (msg.Priority, MailPriority.Normal);
+			Assert.IsTrue (msg.Priority == MailPriority.Normal);
 		}
 
 		[Test]
 		public void Subject ()
 		{
-			Assert.AreEqual (msg.Subject, "the subject");
+			Assert.IsTrue (msg.Subject == "the subject");
 		}
 
 		[Test]
 		public void To ()
 		{
-			Assert.AreEqual (msg.To.Count, 1);
-			Assert.AreEqual (msg.To[0].Address, "to@example.com");
+			Assert.IsTrue (msg.To.Count == 1);
+			Assert.IsTrue (msg.To[0].Address == "to@example.com");
 		}
 	}
 }
diff --git a/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs b/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
deleted file mode 100644
index cc6b965b5bf..00000000000
--- a/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// SmtpClientTest.cs - NUnit Test Cases for System.Net.Mail.SmtpClient
-//
-// Authors:
-//   John Luke (john.luke@gmail.com)
-//
-// (C) 2006 John Luke
-//
-#if NET_2_0
-using NUnit.Framework;
-using System;
-using System.IO;
-using System.Net.Mail;
-using System.Net.Mime;
-
-namespace MonoTests.System.Net.Mail
-{
-	[TestFixture]
-	public class SmtpClientTest
-	{
-		SmtpClient smtp;
-		
-		[SetUp]
-		public void GetReady ()
-		{
-			smtp = new SmtpClient ();
-		}
-
-		[Test]
-		public void InitialTimeout ()
-		{
-			Assert.AreEqual (smtp.Timeout, 100000);
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-		public void NegativePortValue ()
-		{
-			smtp.Port = -1;
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-		public void NegativeTimeoutValue ()
-		{
-			smtp.Timeout = -1;
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void NullHost ()
-		{
-			smtp.Host = null;
-		}
-
-		[Test]
-		[ExpectedException (typeof (ArgumentException))]
-		public void EmptyHost ()
-		{
-			smtp.Host = String.Empty;
-		}
-	}
-}
-#endif
diff --git a/mcs/class/System/Test/System.Net/ChangeLog b/mcs/class/System/Test/System.Net/ChangeLog
index 2c2ad1dea50..b74bc205f96 100644
--- a/mcs/class/System/Test/System.Net/ChangeLog
+++ b/mcs/class/System/Test/System.Net/ChangeLog
@@ -1,21 +1,3 @@
-2006-02-03  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebRequestTest.cs: Add a small check for Method.
-	
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* WebRequestTest.cs : FtpWebRequest is only NET_2_0.
-
-2006-02-03  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* FtpWebRequestTest.cs: New file to test properties/methods
-	that don't need any connection to work.
-	
-2005-02-03  Carlos Alberto Cortez <calberto.cortez@gmail.com>
-
-	* WebRequestTest.cs: Add ftp to the Create () method (to return
-	a FtpWebRequest instance).
-	
 2005-11-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpListenerTest.cs: disable 2 tests. We're throwing the wrong
diff --git a/mcs/class/System/Test/System.Net/FtpWebRequestTest.cs b/mcs/class/System/Test/System.Net/FtpWebRequestTest.cs
deleted file mode 100644
index fbad074c214..00000000000
--- a/mcs/class/System/Test/System.Net/FtpWebRequestTest.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-//
-// FtpWebRequestTest.cs - NUnit Test Cases for System.Net.FtpWebRequest
-//
-// Author: Carlos Alberto Cortez <calberto.cortez@gmail.com>
-//
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
-//
-
-using NUnit.Framework;
-using System;
-using System.Net;
-
-#if NET_2_0
-
-namespace MonoTests.System.Net 
-{
-	[TestFixture]
-	public class FtpWebRequestTest
-	{
-		FtpWebRequest defaultRequest;
-		
-		[TestFixtureSetUp]
-		public void Init ()
-		{
-			defaultRequest = (FtpWebRequest) WebRequest.Create ("ftp://www.contoso.com");
-		}
-		
-		[Test]
-		public void ContentLength ()
-		{
-			try {
-				long l = defaultRequest.ContentLength;
-			} catch (NotSupportedException) {
-				Assert.Fail ("#1"); // Not overriden
-			}
-
-			try {
-				defaultRequest.ContentLength = 2;
-			} catch (NotSupportedException) {
-				Assert.Fail ("#2"); // Not overriden
-			}
-		}
-
-		[Test]
-		public void ContentType ()
-		{
-			try {
-				string t = defaultRequest.ContentType;
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-			}
-
-			try {
-				defaultRequest.ContentType = String.Empty;
-				Assert.Fail ("#2");
-			} catch (NotSupportedException) {
-			}
-		}
-
-		[Test]
-		public void ContentOffset ()
-		{
-			try {
-				defaultRequest.ContentOffset = -2;
-				Assert.Fail ("#1");
-			} catch (ArgumentOutOfRangeException) {
-			}
-		}
-
-		[Test]
-		public void Credentials ()
-		{
-			try {
-				defaultRequest.Credentials = null;
-				Assert.Fail ("#1");
-			} catch (ArgumentNullException) {
-			}
-
-		}
-
-		[Test]
-		public void Method ()
-		{
-			try {
-				defaultRequest.Method = null;
-				Assert.Fail ("#1");
-			} catch (ArgumentNullException) {
-			}
-
-			try {
-				defaultRequest.Method = String.Empty;
-				Assert.Fail ("#2");
-			} catch (ArgumentException) {
-			}
-
-			try {
-				defaultRequest.Method = "WrongValue";
-				Assert.Fail ("#3");
-			} catch (ArgumentException) {
-			}
-		}
-
-		[Test]
-		public void PreAuthenticate ()
-		{
-			try {
-				bool p = defaultRequest.PreAuthenticate;
-				Assert.Fail ("#1");
-			} catch (NotSupportedException) {
-			}
-
-			try {
-				defaultRequest.PreAuthenticate = true;
-			} catch (NotSupportedException) {
-			}
-		}
-
-		[Test]
-		public void ReadWriteTimeout ()
-		{
-			try {
-				defaultRequest.ReadWriteTimeout = -2;
-				Assert.Fail ("#2");
-			} catch (ArgumentOutOfRangeException) {
-			}
-		}
-
-		[Test]
-		public void Timeout ()
-		{
-			try {
-				defaultRequest.Timeout = -2;
-				Assert.Fail ("#2");
-			} catch (ArgumentOutOfRangeException) {
-			}
-		}
-		
-		[Test]
-		public void DefaultValues ()
-		{
-			FtpWebRequest request = (FtpWebRequest) WebRequest.Create ("ftp://www.contoso.com");
-			
-			Assert.AreEqual (0, request.ContentOffset, "ContentOffset");
-			Assert.AreEqual (false, request.EnableSsl, "EnableSsl");
-			Assert.AreEqual (true, request.KeepAlive, "KeepAlive");
-			Assert.AreEqual (WebRequestMethods.Ftp.DownloadFile, request.Method, "#1");
-			Assert.AreEqual (300000, request.ReadWriteTimeout, "ReadWriteTimeout");
-			Assert.IsNull (request.RenameTo, "RenameTo");
-			Assert.AreEqual (true, request.UseBinary, "UseBinary");
-			Assert.AreEqual (100000, request.Timeout, "Timeout");
-			Assert.AreEqual (true, request.UsePassive, "UsePassive");
-		}
-
-		[Test]
-		public void RenameTo ()
-		{
-			try {
-				defaultRequest.RenameTo = null;
-				Assert.Fail ("#1");
-			} catch (ArgumentException) {
-			}
-
-			try {
-				defaultRequest.RenameTo = String.Empty;
-				Assert.Fail ("#2");
-			} catch (ArgumentException) {
-			}
-		}
-
-	}
-}
-
-#endif
-
diff --git a/mcs/class/System/Test/System.Net/WebRequestTest.cs b/mcs/class/System/Test/System.Net/WebRequestTest.cs
index e20c80cfb84..33e8be27bf7 100644
--- a/mcs/class/System/Test/System.Net/WebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/WebRequestTest.cs
@@ -197,36 +197,33 @@ namespace MonoTests.System.Net {
 		Assertion.Assert ("#2", req is HttpWebRequest);

 		req = WebRequest.Create ("file://www.contoso.com");

 		Assertion.Assert ("#3", req is FileWebRequest);

-#if NET_2_0

-		req = WebRequest.Create ("ftp://www.contoso.com");

-		Assertion.Assert ("#4", req is FtpWebRequest);

-#endif

+		

 		WebRequest.RegisterPrefix ("http://www.contoso.com", new TestWebRequestCreator ());

 		bool ret = WebRequest.RegisterPrefix ("http://WWW.contoso.com", new TestWebRequestCreator ());

-		Assertion.AssertEquals ("#5a", false, ret);

+		Assertion.AssertEquals ("#4a", false, ret);

 		ret = WebRequest.RegisterPrefix ("http://www.contoso.com/foo/bar", new TestWebRequestCreator2 ());

-		Assertion.AssertEquals ("#5b", true, ret);

+		Assertion.AssertEquals ("#4b", true, ret);

 		ret = WebRequest.RegisterPrefix ("http://www", new TestWebRequestCreator3 ());

-		Assertion.AssertEquals ("#5c", true, ret);

+		Assertion.AssertEquals ("#4c", true, ret);

 

 		req = WebRequest.Create ("http://WWW.contoso.com");

-		Assertion.Assert ("#6", req is TestWebRequest); 

+		Assertion.Assert ("#5", req is TestWebRequest); 

 

 		req = WebRequest.Create ("http://WWW.contoso.com/foo/bar/index.html");

-		Assertion.Assert ("#7", req is TestWebRequest2); 

+		Assertion.Assert ("#6", req is TestWebRequest2); 

 		

 		req = WebRequest.Create ("http://WWW.x.com");

-		Assertion.Assert ("#8", req is TestWebRequest3); 

+		Assertion.Assert ("#7", req is TestWebRequest3); 

 

 		req = WebRequest.Create ("http://WWW.c");

-		Assertion.Assert ("#9", req is TestWebRequest3); 

+		Assertion.Assert ("#8", req is TestWebRequest3); 

 

 		req = WebRequest.CreateDefault (new Uri("http://WWW.contoso.com"));

-		Assertion.Assert ("#10", req is HttpWebRequest);

+		Assertion.Assert ("#9", req is HttpWebRequest);

 

 		try {

 			req = WebRequest.Create ("tcp://www.contoso.com");

-			Assertion.Fail ("#11 should have failed with NotSupportedException");			

+			Assertion.Fail ("#10 should have failed with NotSupportedException");			

 		} catch (NotSupportedException) {			

 		}		

 	}

diff --git a/mcs/class/System/Test/System/UriTest.cs b/mcs/class/System/Test/System/UriTest.cs
index cbc5e7d4644..f8666dc74cc 100644
--- a/mcs/class/System/Test/System/UriTest.cs
+++ b/mcs/class/System/Test/System/UriTest.cs
@@ -164,15 +164,6 @@ namespace MonoTests.System
 			AssertEquals ("#rel31", "http://www.xxx.com/?x=0", uri.ToString());
 			uri = new Uri (new Uri("http://www.xxx.com/index.htm"), "#here");
 			AssertEquals ("#rel32", "http://www.xxx.com/index.htm#here", uri.ToString());
-#if NET_2_0
-			uri = new Uri ("relative", UriKind.Relative);
-			uri = new Uri ("relative/abc", UriKind.Relative);
-			uri = new Uri ("relative", UriKind.RelativeOrAbsolute);
-
-			Assert ("#rel33", !uri.IsAbsoluteUri);
-			AssertEquals ("#rel34", uri.OriginalString, "relative");
-			Assert ("#rel35", !uri.UserEscaped);
-#endif
 		}

 

 		[Test]

diff --git a/mcs/class/System/Test/System/UriTest3.cs b/mcs/class/System/Test/System/UriTest3.cs
index 4d328d78c76..267730525da 100644
--- a/mcs/class/System/Test/System/UriTest3.cs
+++ b/mcs/class/System/Test/System/UriTest3.cs
@@ -50,6 +50,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
+		[Category ("NotWorking")]
 		public void Relative_UriKind_Relative ()
 		{
 			Uri uri = new Uri (relative, UriKind.Relative);
@@ -68,6 +69,7 @@ namespace MonoTests.System {
 
 		[Test]
 		[ExpectedException (typeof (UriFormatException))]
+		[Category ("NotWorking")]
 		public void Absolute_UriKind_Relative ()
 		{
 			new Uri (absolute, UriKind.Relative);
diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index aacff607c2c..ace805a2ebe 100644
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,30 +1,9 @@
-2006-02-26  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* corlib.dll.sources: Removed DecimalFormatter.cs.
-
-2006-02-14  Ankit Jain  <jankit@novell.com>
-
-	* corlib_test.dll.sources: Add ArraySegmentTest.cs
-
 2006-01-26  Zoltan Varga  <vargaz@gmail.com>
 
 	* corlib.dll.sources: Add DebuggerNonUserCodeAttribute.cs and 
 	SuppressMessageAttribute.cs.
 
-2006-01-19  Raja R Harinath  <rharinath@novell.com>
-
-	* Makefile: Simplify.  Remove support for corlib_plattest and reslib.
-	* corlib_plattest.dll.excludes, corlib_res.dll.excludes: remove.
-
-2006-01-18  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : corlib_plattest dll is now profile-aware.
-
-2006-01-13  Robert Jordan  <robertj@gmx.net>
-
-	* corlib.dll.sources: Added System.Resources/ResourceManagerTest.cs
-
-2006-01-05  Kornel Pal  <kornelpal@hotmail.com>
+2006-01-05  Kornél Pál  <kornelpal@hotmail.com>
 
 	* corlib.dll.sources: Added DriveNotFoundException.cs in System.IO.
 
@@ -938,7 +917,7 @@
 	* corlib.dll.sources: Added 
 		System.Runtime.Serialization.Formatter.Binary.CodeGenerator.cs
 
-2004-02-10 Carlos Guzman Alvarez  <carlosga@telefonica.net>
+2004-02-10 Carlos Guzmán Álvarez  <carlosga@telefonica.net>
 
     * Mono.Security.Cryptography/PKCS1.cs:
 
@@ -1015,7 +994,7 @@
 	* corlib_test.dll.sources: Added unit tests PaddingMode and X509 
 	using CryptoAPI.
 
-2003-12-14  Pedro Martinez Julia <yoros@wanadoo.es>
+2003-12-14  Pedro Martínez Juliá <yoros@wanadoo.es>
 
 	* DateTime.cs: Be sure that the array access is not out of range
 	when looking for ArgumentOutOfRangeException in the year value.
@@ -1106,7 +1085,7 @@
 	* corlib.dll.sources: Added classes for Authenticode support.
 	* corlib_test.dll.sources: Added unit test for SPC certificates.
 
-2003-09-26  Pedro Martinez Julia <yoros@wanadoo.es>
+2003-09-26  Pedro Martínez Juliá <yoros@wanadoo.es>
 
 	* corlib_test.dll.sources: Remove tests that generate compile
 	errors. The tests are still there but its name is rmoved here.
@@ -1264,7 +1243,7 @@
 
 	* unix.args: Added System.Runtime.Remoting.Activation/AppDomainLevelActivator.cs
 
-2003-03-16  Pedro Martinez Julia <yoros@wanadoo.es>
+2003-03-16  Pedro Martínez Juliá <yoros@wanadoo.es>
 
 	* unix.args: Added "System.FloatingPointFormatter.cs".
 
@@ -1276,7 +1255,7 @@
 	* unix.args: Added
 		System.Runtime.InteropServices/HandleRef.cs
 
-2003-03-04  Pedro Martinez Julia <yoros@wanadoo.es>
+2003-03-04  Pedro Martínez Juliá <yoros@wanadoo.es>
 
 	* unix.args: Added "DoubleFormatter.cs" and "SingleFormatter.cs"
 
diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 49a2391c576..69772f5f704 100644
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -3,14 +3,6 @@ SUBDIRS =
 include ../../build/rules.make
 export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
 
-LIBRARY = corlib.dll
-LIBRARY_NAME = mscorlib.dll
-LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=-resource:%)
-LIBRARY_USE_INTERMEDIATE_FILE = yes
-
-LIBRARY_COMPILE = $(BOOT_COMPILE)
-LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-
 RESOURCE_FILES = \
 	resources/collation.core.bin \
 	resources/collation.tailoring.bin \
@@ -27,19 +19,67 @@ ifneq ($(FRAMEWORK_VERSION),1.0)
 LOCAL_MCS_FLAGS += -nowarn:414
 endif
 
-TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe
+LIBRARY = corlib.dll
+LIBRARY_NAME = mscorlib.dll
+LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=/resource:%)
+LIBRARY_USE_INTERMEDIATE_FILE = yes
+
+LIBRARY_COMPILE = $(BOOT_COMPILE)
+LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
 EXTRA_DISTFILES = \
-	corlib.dll.win32-excludes		\
+	corlib.dll.win32-excludes corlib_cmp.dll.excludes corlib_res.dll.excludes \
+	$(plattestlib).excludes 		\
 	Test/ms_run_test.sh			\
 	Test/resources/MyResources.resources	\
 	Test/resources/Empty.resources		\
-	Test/resources/AFile.txt		\
+	Test/resources/AFile.txt			\
 	$(RESOURCE_FILES)
 
-include $(topdir)/build/library.make
+CLEAN_FILES = $(cmplib) $(reslib) $(plattestlib) $(plattestlib).sources \
+	       $(cmp_response) $(cmp_makefrag) \
+	       $(res_response) $(res_makefrag) \
+	       $(cmppdb) $(respdb) $(plattestpdb)
+
+# If building on a non mono-native platform, default
+# to running the unit tests on its corlib, to see if
+# our tests are complaint with their (hopefully bug-free)
+# corlib. If on a mono-native platform, test our actual
+# corlib.
+#
+# You can access either one on demand with either 'make
+# run-monotest' or 'make run-plattest'.
+
+plattestlib = corlib_plattest.dll
+plattestpdb = $(patsubst %.dll,%.pdb,$(plattestlib))
+$(plattestlib).sources: corlib_test.dll.sources $(plattestlib).excludes
+	sort corlib_test.dll.sources $(plattestlib).excludes | uniq -u >$@
+
+TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe
+
+ifndef PLATFORM_MONO_NATIVE
+test_lib = $(plattestlib)
+test_against = $(PLATFORM_CORLIB)
+HAVE_CS_TESTS = $(plattestlib).sources
+
+## for now, compiling the testsuite with CSC causes CS0583.  So compile with internal MCS
+TEST_COMPILE = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS) $(USE_MCS_FLAGS)
+endif
+
+include ../../build/library.make
+
+ifndef PLATFORM_MONO_NATIVE
+run-monotest:
+	$(MAKE) $(reslib)
+	$(MAKE) test_lib=corlib_test.dll test_against=$(reslib) run-test
+
+run-plattest:
+	$(MAKE) test_lib=$(plattestlib) test_against='$(PLATFORM_CORLIB)' run-test
+
+else
+run-monotest: run-test
+endif
 
-ifdef FIXME_CORLIB_CMP
 # corlib_cmp
 cmplib = $(topdir)/class/lib/$(PROFILE)/corlib_cmp.dll
 cmppdb = $(cmplib:.dll=.pdb)
@@ -47,9 +87,6 @@ cmp_response = $(depsdir)/$(PROFILE)_corlib_cmp.dll.response
 cmp_makefrag = $(depsdir)/$(PROFILE)_corlib_cmp.dll.makefrag
 cmp_flags = -r:$(PLATFORM_CORLIB) $(corlib_flags)
 
-EXTRA_DISTFILES += corlib_cmp.dll.excludes
-CLEAN_FILES += $(cmplib) $(cmp_response) $(cmp_makefrag) $(cmppdb)
-
 $(cmplib): $(cmp_makefrag) $(cmp_response)
 	$(BOOT_COMPILE) $(LIBRARY_FLAGS) $(cmp_flags) -target:library -out:$@ @$(cmp_response)
 
@@ -67,4 +104,24 @@ $(cmp_makefrag): $(cmp_response)
 # leading to a broken build.
 #
 # -include $(cmp_makefrag)
-endif
+
+# corlib_res
+reslib = $(topdir)/class/lib/$(PROFILE)/corlib_res.dll
+respdb = $(reslib:.dll=.pdb)
+res_response = $(depsdir)/$(PROFILE)_corlib_res.dll.response
+res_makefrag = $(depsdir)/$(PROFILE)_corlib_res.dll.makefrag
+res_flags = -r:$(PLATFORM_CORLIB) $(corlib_flags)
+
+$(reslib): $(res_makefrag) $(res_response)
+	$(BOOT_COMPILE) $(LIBRARY_FLAGS) $(res_flags) -target:library -out:$@ @$(res_response)
+
+$(res_response): $(sourcefile) corlib_res.dll.excludes
+	@echo Creating $@ ...
+	@sort $(sourcefile) corlib_res.dll.excludes | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
+
+# warning: embedded tab in the 'echo touch' line
+$(res_makefrag): $(res_response)
+	@echo Creating $@ ...
+	@sed 's,^,$(reslib): ,' $< >$@
+
+-include $(res_makefrag)
diff --git a/mcs/class/corlib/Microsoft.Win32.SafeHandles/ChangeLog b/mcs/class/corlib/Microsoft.Win32.SafeHandles/ChangeLog
index 1b5b481604f..e0a53eda021 100644
--- a/mcs/class/corlib/Microsoft.Win32.SafeHandles/ChangeLog
+++ b/mcs/class/corlib/Microsoft.Win32.SafeHandles/ChangeLog
@@ -1,9 +1,3 @@
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* SafeHandleZeroOrMinusOneIsInvalid.cs: Update to RTM api
-
-	* SafeFileHandle.cs: Update to RTM api
-
 2005-08-10  Zoltan Varga  <vargaz@freemail.hu>
 
 	* SafeFileHandle.cs: Make this inherit from SafeHandleZeroOrMinusOneIsInvalid.
diff --git a/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeFileHandle.cs b/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeFileHandle.cs
index 5457ba1ca34..001b3d984b1 100644
--- a/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeFileHandle.cs
+++ b/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeFileHandle.cs
@@ -35,24 +35,16 @@ namespace Microsoft.Win32.SafeHandles {
 	[MonoTODO]
 	public sealed class SafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid {
 
-		public SafeFileHandle (IntPtr preexistingHandle, bool ownsHandle) : base (ownsHandle)
+		public SafeFileHandle (IntPtr preexistingHandle, bool ownsHandle)
 		{
-			SetHandle (preexistingHandle);
 		}
 
-		[MonoTODO]
 		public override bool IsInvalid {
 			get {
 				throw new NotImplementedException ();
 			}
 		}
 
-		[MonoTODO]
-		protected override bool ReleaseHandle ()
-		{
-			throw new NotImplementedException ();
-		}
-
 	}
 }
 
diff --git a/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs b/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
index 4f6dc86c0b0..58bcd82884c 100644
--- a/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
+++ b/mcs/class/corlib/Microsoft.Win32.SafeHandles/SafeHandleZeroOrMinusOneIsInvalid.cs
@@ -35,14 +35,6 @@ namespace Microsoft.Win32.SafeHandles {
 
 	[MonoTODO]
 	public abstract class SafeHandleZeroOrMinusOneIsInvalid : SafeHandle, IDisposable {
-		protected SafeHandleZeroOrMinusOneIsInvalid (bool ownsHandle) : base ((IntPtr) 0, ownsHandle) {
-		}
-
-		public override bool IsInvalid {
-			get {
-				return handle == (IntPtr)(-1) || handle == (IntPtr) 0;
-			}
-		}
 	}
 }
 
diff --git a/mcs/class/corlib/System.Collections.Generic/ChangeLog b/mcs/class/corlib/System.Collections.Generic/ChangeLog
index 8aebc6f5886..289d903df48 100644
--- a/mcs/class/corlib/System.Collections.Generic/ChangeLog
+++ b/mcs/class/corlib/System.Collections.Generic/ChangeLog
@@ -1,47 +1,3 @@
-2006-02-10  Martin Baulig  <martin@ximian.com>
-
-	* Comparer.cs
-	(IComparableOfTComparer): `T' must implement `IComparable<T>' and
-	not `IComparable'.
-
-Tue Jan 24 18:22:54 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* Dictionary.cs: avoid long reminder operations.
-
-2006-01-23  Raja R Harinath  <rharinath@novell.com>
-
-	Speed up remove.  Use 'dict[k]=v' as a self-tuning hint.
-	* Dictionary.cs (GetSlot): Move data-structure traversal to ...
-	(GetPrev): ... this.  Returns the slot prior to the place we're
-	looking for, or null if that place is the head of the chain.
-	(Remove): Use it.
-	(this.set): Use it.  Implement move-to-front on set.
-
-	* Dictionary.cs (ToTKey, ToTValue): New helpers to convert from
-	type 'object'.
-	(IDictionary.this, IDictionary.Add): Use them.
-	(IDictionary.Contains, IDictionary.Remove): If the types don't
-	match, do nothing.
-
-2006-01-19  Raja R Harinath  <rharinath@novell.com>
-
-	Fix to pass new nunit tests.
-	* Dictionary.cs (ShimEnumerator): New class.  Implement the
-	requirement that ((IDictionary) foo).GetEnumerator ().Current has
-	type DictionaryEntry.
-	(IDictionary.GetEnumerator): Use ShimEnumerator.
-	(Enumerator.Current): Now has type KeyValuePair<TKey, TValue>.
-	(Enumerator.MoveNext): Use VerifyState.
-	(Enumerator.VerifyState): Move validation of 'current' field to ...
-	(Enumerator.CurrentSlot): ... this.
-	(Enumerator.Current, Enumerator.IDictionaryEnumerator.Entry):
-	Use CurrentSlot.
-	(CopyTo, ICollection.CopyTo): Use subtle reasoning to replace a
-	'>=' with a '>'.  Don't throw an ArgumentException when
-	index==array.Length && Count==0.
-	(KeyCollection.CopyTo, ValueCollection.CopyTo): Likewise, and thus
-	obviate the need to check (dictionary.Count == 0).
-
 2005-12-20  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* List.cs: Applied Atsushi's patch for Sort (bug 76361) now that the
diff --git a/mcs/class/corlib/System.Collections.Generic/Comparer.cs b/mcs/class/corlib/System.Collections.Generic/Comparer.cs
index 8604443a45d..925698eaaf5 100644
--- a/mcs/class/corlib/System.Collections.Generic/Comparer.cs
+++ b/mcs/class/corlib/System.Collections.Generic/Comparer.cs
@@ -87,7 +87,7 @@ namespace System.Collections.Generic {
 		}
 	}
 	
-	class IComparableOfTComparer <T> : Comparer <T> where T : IComparable<T> {
+	class IComparableOfTComparer <T> : Comparer <T> where T : IComparable {
 		public override int Compare (T x, T y)
 		{
 			// `null' is less than any other ref type
diff --git a/mcs/class/corlib/System.Collections.Generic/Dictionary.cs b/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
index 4832ec79ba4..bddc8b9458f 100644
--- a/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
+++ b/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
@@ -95,20 +95,13 @@ namespace System.Collections.Generic {
 
 			set {
 				int index;
-				Slot prev = GetPrev (key, out index);
-				Slot slot = prev == null ? table [index] : prev.Next;
+				Slot slot = GetSlot (key, out index);
 				if (slot == null) {
 					DoAdd (index, key, value);
-					return;
+				} else {
+					++generation;
+					slot.Data = new KeyValuePair<TKey, TValue> (key, value);
 				}
-				++generation;
-				if (prev != null) {
-					// move-to-front on update
-					prev.Next = slot.Next;
-					slot.Next = table [index];
-					table [index] = slot;
-				}
-				slot.Data = new KeyValuePair<TKey, TValue> (key, value);
 			}
 		}
 
@@ -178,8 +171,7 @@ namespace System.Collections.Generic {
 				throw new ArgumentNullException ("array");
 			if (index < 0)
 				throw new ArgumentOutOfRangeException ("index");
-			// we want no exception for index==array.Length && Count == 0
-			if (index > array.Length)
+			if (index >= array.Length)
 				throw new ArgumentException ("index larger than largest valid index of array");
 			if (array.Length - index < Count)
 				throw new ArgumentException ("Destination array cannot hold the requested elements!");
@@ -236,9 +228,9 @@ namespace System.Collections.Generic {
 
 		private int DoHash (TKey key)
 		{
-			uint size = (uint)this.table.Length;
-			uint h = (uint)hcp.GetHashCode (key) & Int32.MaxValue;
-			int spot = (int) (h % size);
+			int size = this.table.Length;
+			int h = hcp.GetHashCode (key) & Int32.MaxValue;
+			int spot = (int) ((uint) h % size);
 			return spot;
 		}
 
@@ -316,36 +308,35 @@ namespace System.Collections.Generic {
 		public bool Remove (TKey key)
 		{
 			int index;
-			Slot prev = GetPrev (key, out index);
-			Slot slot = prev == null ? table [index] : prev.Next;
+			Slot slot = GetSlot (key, out index);
 			if (slot == null)
 				return false;
+
 			--Count;
-			if (prev == null)
-				table [index] = slot.Next;
-			else
+			if (slot == table [index]) {
+				table [index] = table [index].Next;
+			} else {
+				Slot prev = table [index];
+				while (prev.Next != slot)
+					prev = prev.Next;
 				prev.Next = slot.Next;
+			}
 			return true;
 		}
 
-		private Slot GetPrev (TKey key, out int index)
+		//
+		// Return the slot containing key, and set 'index' to the chain the key was found in.
+		// If the key is not found, return null and set 'index' to the chain that would've contained the key.
+		//
+		private Slot GetSlot (TKey key, out int index)
 		{
 			if (key == null)
 				throw new ArgumentNullException ("key");
 			index = DoHash (key);
-			Slot prev = null;
-			for (Slot slot = table [index]; slot != null; slot = slot.Next) {
-				if (hcp.Equals (key, slot.Data.Key))
-					break;
-				prev = slot;
-			}
-			return prev;
-		}
-
-		private Slot GetSlot (TKey key, out int index)
-		{
-			Slot prev = GetPrev (key, out index);
-			return prev == null ? table [index] : prev.Next;
+			Slot slot = table [index];
+			while (slot != null && !hcp.Equals (key, slot.Data.Key))
+				slot = slot.Next;
+			return slot;
 		}
 
 		public bool TryGetValue (TKey key, out TValue value)
@@ -389,47 +380,32 @@ namespace System.Collections.Generic {
 			get { return false; }
 		}
 
-		TKey ToTKey (object key)
-		{
-			if (key == null)
-				throw new ArgumentNullException ("key");
-			if (!(key is TKey))
-				throw new ArgumentException ("not of type: " + typeof (TKey).ToString (), "key");
-			return (TKey) key;
-		}
-
-		TValue ToTValue (object value)
-		{
-			if (!(value is TValue))
-				throw new ArgumentException ("not of type: " + typeof (TValue).ToString (), "value");
-			return (TValue) value;
-		}
-
 		object IDictionary.this [object key] {
-			get { return this [ToTKey (key)]; }
-			set { this [ToTKey (key)] = ToTValue (value); }
+			get {
+				if (!(key is TKey))
+					throw new ArgumentException ("key is of not '" + typeof (TKey).ToString () + "'!");
+				return this [(TKey) key];
+			}
+			set { this [(TKey) key] = (TValue) value; }
 		}
 
 		void IDictionary.Add (object key, object value)
 		{
-			this.Add (ToTKey (key), ToTValue (value));
+			if (!(key is TKey))
+				throw new ArgumentException ("key is of not '" + typeof (TKey).ToString () + "'!");
+			if (!(value is TValue))
+				throw new ArgumentException ("value is of not '" + typeof (TValue).ToString () + "'!");
+			this.Add ((TKey) key, (TValue) value);
 		}
 
 		bool IDictionary.Contains (object key)
 		{
-			if (key == null)
-				throw new ArgumentNullException ("key");
-			if (key is TKey)
-				return ContainsKey ((TKey) key);
-			return false;
+			return ContainsKey ((TKey) key);
 		}
 
 		void IDictionary.Remove (object key)
 		{
-			if (key == null)
-				throw new ArgumentNullException ("key");
-			if (key is TKey)
-				Remove ((TKey) key);
+			Remove ((TKey) key);
 		}
 
 		bool ICollection.IsSynchronized {
@@ -470,8 +446,7 @@ namespace System.Collections.Generic {
 				throw new ArgumentNullException ("array");
 			if (index < 0)
 				throw new ArgumentOutOfRangeException ("index");
-			// we want no exception for index==array.Length && Count == 0
-			if (index > array.Length)
+			if (index >= array.Length)
 				throw new ArgumentException ("index larger than largest valid index of array");
 			if (array.Length - index < Count)
 				throw new ArgumentException ("Destination array cannot hold the requested elements!");
@@ -494,7 +469,7 @@ namespace System.Collections.Generic {
 
 		IDictionaryEnumerator IDictionary.GetEnumerator ()
 		{
-			return new ShimEnumerator (this);
+			return new Enumerator (this);
 		}
 
 		public Enumerator GetEnumerator ()
@@ -503,49 +478,6 @@ namespace System.Collections.Generic {
 		}
 
 		[Serializable]
-		private class ShimEnumerator : IDictionaryEnumerator, IEnumerator
-		{
-			Enumerator host_enumerator;
-			public ShimEnumerator (Dictionary<TKey, TValue> host)
-			{
-				host_enumerator = host.GetEnumerator ();
-			}
-
-			public void Dispose ()
-			{
-				host_enumerator.Dispose ();
-			}
-
-			public bool MoveNext ()
-			{
-				return host_enumerator.MoveNext ();
-			}
-
-			public DictionaryEntry Entry {
-				get { return ((IDictionaryEnumerator) host_enumerator).Entry; }
-			}
-
-			public object Key {
-				get { return host_enumerator.Current.Key; }
-			}
-
-			public object Value {
-				get { return host_enumerator.Current.Value; }
-			}
-
-			// This is the raison d' etre of this $%!@$%@^@ class.
-			// We want: IDictionary.GetEnumerator ().Current is DictionaryEntry
-			public object Current {
-				get { return Entry; }
-			}
-
-			public void Reset ()
-			{
-				((IEnumerator)host_enumerator).Reset ();
-			}
-		}
-
-		[Serializable]
 		public struct Enumerator : IEnumerator<KeyValuePair<TKey,TValue>>,
 			IDisposable, IDictionaryEnumerator, IEnumerator
 		{
@@ -568,25 +500,33 @@ namespace System.Collections.Generic {
 
 			public bool MoveNext ()
 			{
-				VerifyState ();
+				if (dictionary == null)
+					throw new ObjectDisposedException (null);
+				if (dictionary.generation != stamp)
+					throw new InvalidOperationException ("out of sync");
 
-				// Pre-condition: current == null => this is the first call to MoveNext ()
+				// Pre-condition: current == null => this is the first call
+				// to MoveNext ()
 				if (current != null)
 					current = current.Next;
 
 				while (current == null && next_index < dictionary.table.Length)
 					current = dictionary.table [next_index++];
 
-				// Post-condition: current == null => this is the last call to MoveNext()
+				// Post-condition: current == null => this is the last call
+				// to MoveNext()
 				return current != null;
 			}
 
 			public KeyValuePair<TKey, TValue> Current {
-				get { return CurrentSlot ().Data; }
+				get {
+					VerifyState ();
+					return current.Data;
+				}
 			}
 
 			object IEnumerator.Current {
-				get { return Current; }
+				get { return ((IDictionaryEnumerator) this).Entry; }
 			}
 
 			void IEnumerator.Reset ()
@@ -597,8 +537,8 @@ namespace System.Collections.Generic {
 
 			DictionaryEntry IDictionaryEnumerator.Entry {
 				get {
-					Slot s = CurrentSlot ();
-					return new DictionaryEntry (s.Data.Key, s.Data.Value);
+					VerifyState ();
+					return new DictionaryEntry (current.Data.Key, current.Data.Value);
 				}
 			}
 
@@ -616,16 +556,9 @@ namespace System.Collections.Generic {
 					throw new ObjectDisposedException (null);
 				if (dictionary.generation != stamp)
 					throw new InvalidOperationException ("out of sync");
-			}
-
-			Slot CurrentSlot ()
-			{
-				VerifyState ();
 				if (current == null)
-					throw new InvalidOperationException ("Current is not valid");
-				return current;
+					throw new InvalidOperationException ();
 			}
-
 			public void Dispose ()
 			{
 				current = null;
@@ -651,8 +584,10 @@ namespace System.Collections.Generic {
 					throw new ArgumentNullException ("array");
 				if (index < 0)
 					throw new ArgumentOutOfRangeException ("index");
-				// we want no exception for index==array.Length && dictionary.Count == 0
-				if (index > array.Length)
+				// no exception for index==array.Length in this case
+				if (dictionary.Count == 0)
+					return;
+				if (index >= array.Length)
 					throw new ArgumentException ("index larger than largest valid index of array");
 				if (array.Length - index < dictionary.Count)
 					throw new ArgumentException ("Destination array cannot hold the requested elements!");
@@ -769,8 +704,10 @@ namespace System.Collections.Generic {
 					throw new ArgumentNullException ("array");
 				if (index < 0)
 					throw new ArgumentOutOfRangeException ("index");
-				// we want no exception for index==array.Length && dictionary.Count == 0
-				if (index > array.Length)
+				// no exception for index==array.Length in this case
+				if (dictionary.Count == 0)
+					return;
+				if (index >= array.Length)
 					throw new ArgumentException ("index larger than largest valid index of array");
 				if (array.Length - index < dictionary.Count)
 					throw new ArgumentException ("Destination array cannot hold the requested elements!");
diff --git a/mcs/class/corlib/System.Collections.ObjectModel/ChangeLog b/mcs/class/corlib/System.Collections.ObjectModel/ChangeLog
index de30b685218..2dc12a22eff 100644
--- a/mcs/class/corlib/System.Collections.ObjectModel/ChangeLog
+++ b/mcs/class/corlib/System.Collections.ObjectModel/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-24  Raja R Harinath  <rharinath@novell.com>
-
-	* ReadOnlyCollection.cs (Items): Return underlying list.
-
 2005-12-19  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* Collection.cs: IsReadOnly property isn't public in 2.0 final.
diff --git a/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyCollection.cs b/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyCollection.cs
index 1334716d683..318d25c60f5 100644
--- a/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyCollection.cs
+++ b/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyCollection.cs
@@ -106,10 +106,6 @@ namespace System.Collections.ObjectModel
 			get { return list.Count; }
 		}
 
-		protected IList<T> Items {
-			get { return list; }
-		}
-
 		public T this [int index] {
 			get { return list [index]; }
 		}
diff --git a/mcs/class/corlib/System.Collections/BitArray.cs b/mcs/class/corlib/System.Collections/BitArray.cs
index 1ecb765c932..3093b07bde5 100644
--- a/mcs/class/corlib/System.Collections/BitArray.cs
+++ b/mcs/class/corlib/System.Collections/BitArray.cs
@@ -39,8 +39,8 @@ namespace System.Collections {
 #endif
 	[Serializable]
 	public sealed class BitArray : ICollection, ICloneable {
-		int [] m_array;
-		int m_length;
+		int [] _array;
+		int _length;
 		int _version = 0;
 
 #region Constructors
@@ -49,10 +49,10 @@ namespace System.Collections {
 			if (bits == null)
 				throw new ArgumentNullException ("bits");
 
-			m_length = bits.m_length;
-			m_array = new int [(m_length + 31) / 32];
+			_length = bits._length;
+			_array = new int [(_length + 31) / 32];
 
-			Array.Copy(bits.m_array, m_array, m_array.Length);
+			Array.Copy(bits._array, _array, _array.Length);
 		}
 
 		public BitArray (bool [] values)
@@ -60,8 +60,8 @@ namespace System.Collections {
 			if (values == null)
 				throw new ArgumentNullException ("values");
 	    
-			m_length = values.Length;
-			m_array = new int [(m_length + 31) / 32];
+			_length = values.Length;
+			_array = new int [(_length + 31) / 32];
 			
 			for (int i = 0; i < values.Length; i++)
 				this [i] = values [i];
@@ -72,8 +72,8 @@ namespace System.Collections {
 			if (bytes == null)
 				throw new ArgumentNullException ("bytes");
 
-			m_length = bytes.Length * 8;
-			m_array = new int [(m_length + 31) / 32];
+			_length = bytes.Length * 8;
+			_array = new int [(_length + 31) / 32];
 
 			for (int i = 0; i < bytes.Length; i++)
 				setByte (i, bytes [i]);
@@ -85,9 +85,9 @@ namespace System.Collections {
 				throw new ArgumentNullException ("values");
 						
 			int arrlen = values.Length;
-			m_length = arrlen*32;
-			m_array = new int [arrlen];
-			Array.Copy (values, m_array, arrlen);
+			_length = arrlen*32;
+			_array = new int [arrlen];
+			Array.Copy (values, _array, arrlen);
 		}
 		
 		public BitArray (int length)
@@ -95,22 +95,22 @@ namespace System.Collections {
 			if (length < 0)
 				throw new ArgumentOutOfRangeException ("length");
 			
-			m_length = length;
-			m_array = new int [(m_length + 31) / 32];
+			_length = length;
+			_array = new int [(_length + 31) / 32];
 		}
 
 		public BitArray (int length, bool defaultValue) : this (length)
 		{
 			if (defaultValue) {
-				for (int i = 0; i < m_array.Length; i++)
-				m_array[i] = ~0;
+				for (int i = 0; i < _array.Length; i++)
+				_array[i] = ~0;
 			}
 		}
 		
 		private BitArray (int [] array, int length)
 		{
-			m_array = array;
-			m_length = length;
+			_array = array;
+			_length = length;
 		}
 #endregion
 #region Utility Methods
@@ -120,7 +120,7 @@ namespace System.Collections {
 			int index = byteIndex / 4;
 			int shift = (byteIndex % 4) * 8;
 			
-			int theByte = m_array [index] & (0xff << shift);
+			int theByte = _array [index] & (0xff << shift);
 			
 			return (byte)((theByte >> shift) & 0xff);
 		}
@@ -131,9 +131,9 @@ namespace System.Collections {
 			int shift = (byteIndex % 4) * 8;
 			
 			// clear the byte
-			m_array [index] &= ~(0xff << shift);
+			_array [index] &= ~(0xff << shift);
 			// or in the new byte
-			m_array [index] |= value << shift;
+			_array [index] |= value << shift;
 			
 			_version++;
 		}
@@ -142,13 +142,13 @@ namespace System.Collections {
 		{
 			if (operand == null)
 				throw new ArgumentNullException ();
-			if (operand.m_length != m_length)
+			if (operand._length != _length)
 				throw new ArgumentException ();
 		}
 #endregion
 
 		public int Count {
-			get { return m_length; }
+			get { return _length; }
 		}
 		
 		public bool IsReadOnly {
@@ -165,21 +165,21 @@ namespace System.Collections {
 		}
 		
 		public int Length {
-			get { return m_length; }
+			get { return _length; }
 			set {
 				if (value < 0)
 					throw new ArgumentOutOfRangeException ();
 				
 				int newLen = value;
-				if (m_length != newLen) {
+				if (_length != newLen) {
 					int numints = (newLen + 31) / 32;
 					int [] newArr = new int [numints];
-					int copylen = (numints > m_array.Length) ? m_array.Length : numints;
-					Array.Copy (m_array, newArr, copylen);
+					int copylen = (numints > _array.Length) ? _array.Length : numints;
+					Array.Copy (_array, newArr, copylen);
 					
 					// set the internal state
-					m_array = newArr;
-					m_length = newLen;
+					_array = newArr;
+					_length = newLen;
 					_version++;
 				}
 			}
@@ -211,17 +211,17 @@ namespace System.Collections {
 			// in each case, check to make sure enough space in array
 			
 			if (array is bool []) {
-				if (array.Length - index < m_length)
+				if (array.Length - index < _length)
 					 throw new ArgumentException ();
 				
 				bool [] barray = (bool []) array;
 				
 				// Copy the bits into the array
-				for (int i = 0; i < m_length; i++)
+				for (int i = 0; i < _length; i++)
 					barray[index + i] = this [i];
 				
 			} else if (array is byte []) {
-				int numbytes = (m_length + 7) / 8;
+				int numbytes = (_length + 7) / 8;
 				
 				if ((array.Length - index) < numbytes)
 					 throw new ArgumentException ();
@@ -233,7 +233,7 @@ namespace System.Collections {
 				
 			} else if (array is int []) {
 				
-				Array.Copy (m_array, 0, array, index, (m_length + 31) / 32);
+				Array.Copy (_array, 0, array, index, (_length + 31) / 32);
 				
 			} else {
 				throw new ArgumentException ("array", "Unsupported type");
@@ -242,9 +242,9 @@ namespace System.Collections {
 
 		public BitArray Not ()
 		{
-			int ints = (m_length + 31) / 32;
+			int ints = (_length + 31) / 32;
 			for (int i = 0; i < ints; i++)
-				m_array [i] = ~m_array [i];
+				_array [i] = ~_array [i];
 			
 			_version++;
 			return this;
@@ -254,9 +254,9 @@ namespace System.Collections {
 		{
 			checkOperand (value);
 			
-			int ints = (m_length + 31) / 32;
+			int ints = (_length + 31) / 32;
 			for (int i = 0; i < ints; i++)
-				m_array [i] &= value.m_array [i];
+				_array [i] &= value._array [i];
 			
 			_version++;
 			return this;
@@ -266,9 +266,9 @@ namespace System.Collections {
 		{
 			checkOperand (value);
 
-			int ints = (m_length + 31) / 32;
+			int ints = (_length + 31) / 32;
 			for (int i = 0; i < ints; i++)
-				m_array [i] |= value.m_array [i];
+				_array [i] |= value._array [i];
 			
 			_version++;
 			return this;
@@ -278,9 +278,9 @@ namespace System.Collections {
 		{
 			checkOperand (value);
 
-			int ints = (m_length + 31) / 32;
+			int ints = (_length + 31) / 32;
 			for (int i = 0; i < ints; i++)
-				m_array [i] ^= value.m_array [i];
+				_array [i] ^= value._array [i];
 
 			_version++;
 			return this;
@@ -288,21 +288,21 @@ namespace System.Collections {
 		
 		public bool Get (int index)
 		{
-			if (index < 0 || index >= m_length)
+			if (index < 0 || index >= _length)
 				throw new ArgumentOutOfRangeException ();
 			
-			return (m_array [index >> 5] & (1 << (index & 31))) != 0;
+			return (_array [index / 32] & (1 << (index % 32))) != 0;
 		}
 		
 		public void Set (int index, bool value)
 		{
-			if (index < 0 || index >= m_length)
+			if (index < 0 || index >= _length)
 				throw new ArgumentOutOfRangeException ();
 			
 			if (value)
-				m_array [index >> 5] |=  (1 << (index & 31));
+				_array [index / 32] |=  (1 << (index % 32));
 			else
-				m_array [index >> 5] &= ~(1 << (index & 31));
+				_array [index / 32] &= ~(1 << (index % 32));
 		
 			_version++;
 		}
@@ -310,11 +310,11 @@ namespace System.Collections {
 		public void SetAll (bool value)
 		{
 			if (value) {
-				for (int i = 0; i < m_array.Length; i++)
-					m_array[i] = ~0;
+				for (int i = 0; i < _array.Length; i++)
+					_array[i] = ~0;
 			}
 			else
-				Array.Clear (m_array, 0, m_array.Length);
+				Array.Clear (_array, 0, _array.Length);
 
 			_version++;
 		}
@@ -338,7 +338,7 @@ namespace System.Collections {
 			{
 				_index = -1;
 				_bitArray = ba;
-				_max = ba.m_length;
+				_max = ba._length;
 				_version = ba._version;
 			}
 
diff --git a/mcs/class/corlib/System.Collections/ChangeLog b/mcs/class/corlib/System.Collections/ChangeLog
index a4f41200ed2..4d711458ae8 100644
--- a/mcs/class/corlib/System.Collections/ChangeLog
+++ b/mcs/class/corlib/System.Collections/ChangeLog
@@ -1,18 +1,3 @@
-
-Tue Feb 28 14:16:25 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* BitArray.cs: reintroduce optimization carelessly removed by
-	Robitaille.
-
-2006-02-03  Sebastien Robitaille <sebastien.robitaille@croesus.com>
-
-	* BitArray.cs: Renamed members for interoperability with MS. 
-
-Tue Jan 24 18:24:00 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* BitArray.cs: optimize bit access by removing expensive
-	div/rem ops.
-
 2006-01-04  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* Hashtable.cs: Mark all inner classes as [Serializable] to match MS
diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index 3c61f2ed7d5..cae1b69efee 100644
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,19 +1,3 @@
-2006-02-27  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* File.cs: In 2.0 profile, File.Get****Time(Utc) should not throw
-	IOException if specified path does not exist. Fixes bug #77641.
-
-2006-02-26  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* FileStream.cs: To match MSFT, ignore FileShare.Inheritable on 2.0
-	profile. This fixes bug #77644. Improved usefulness of some existing
-	exception messages.
-
-2006-02-22  Joerg Rosenkranz <joergr@voelcker.com>
-
-	* MonoIO.cs, MonoIOError.cs: Verbose exception for error 39 
-	  (disk full).
-	  
 2006-02-03  Zoltan Varga  <vargaz@gmail.com>
 
 	* Stream.cs FileStream.cs: Add new 2.0 Dispose () method and protected
@@ -41,21 +25,12 @@
 
 	* DirectoryInfo.cs : on Windows top directory is something like c:\.
 
-2006-01-17  Joshua Tauberer  <tauberer@for.net>
-
-	* StreamReader.cs: Avoid two totally unnecessary string creations.
-	  (kind of pedantic)
-
 2006-01-13  Ben Maurer  <bmaurer@andrew.cmu.edu>
 
 	* TextWriter.cs: Call char[],int,int from the Write(char[]) method
 	both for msft compat and for performance. Thanks to "Mike Glenn" 
 	<mglenn@zoominternet.net> for pointing.
-
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* File.cs: Support for Read/WriteAllText
-
+	
 2006-01-11  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* Path.cs: Previous fix caused regression of bug #76191. Fixed (again)
diff --git a/mcs/class/corlib/System.IO/File.cs b/mcs/class/corlib/System.IO/File.cs
index 3054a7c0909..ab5f506b6a8 100644
--- a/mcs/class/corlib/System.IO/File.cs
+++ b/mcs/class/corlib/System.IO/File.cs
@@ -36,7 +36,6 @@
 //
 
 using System;
-using System.Text;
 
 namespace System.IO
 {
@@ -216,17 +215,9 @@ namespace System.IO
 			MonoIOStat stat;
 			MonoIOError error;
 			CheckPathExceptions (path);
-
-			if (!MonoIO.GetFileStat (path, out stat, out error)) {
-#if NET_2_0
-				if (error == MonoIOError.ERROR_PATH_NOT_FOUND || error == MonoIOError.ERROR_FILE_NOT_FOUND)
-					return _defaultLocalFileTime;
-				else
-					throw new IOException (path);
-#else
+			
+			if (!MonoIO.GetFileStat (path, out stat, out error))
 				throw new IOException (path);
-#endif
-			}
 			return DateTime.FromFileTime (stat.CreationTime);
 		}
 
@@ -241,16 +232,8 @@ namespace System.IO
 			MonoIOError error;
 			CheckPathExceptions (path);
 
-			if (!MonoIO.GetFileStat (path, out stat, out error)) {
-#if NET_2_0
-				if (error == MonoIOError.ERROR_PATH_NOT_FOUND || error == MonoIOError.ERROR_FILE_NOT_FOUND)
-					return _defaultLocalFileTime;
-				else
-					throw new IOException (path);
-#else
+			if (!MonoIO.GetFileStat (path, out stat, out error))
 				throw new IOException (path);
-#endif
-			}
 			return DateTime.FromFileTime (stat.LastAccessTime);
 		}
 
@@ -265,16 +248,8 @@ namespace System.IO
 			MonoIOError error;
 			CheckPathExceptions (path);
 
-			if (!MonoIO.GetFileStat (path, out stat, out error)) {
-#if NET_2_0
-				if (error == MonoIOError.ERROR_PATH_NOT_FOUND || error == MonoIOError.ERROR_FILE_NOT_FOUND)
-					return _defaultLocalFileTime;
-				else
-					throw new IOException (path);
-#else
+			if (!MonoIO.GetFileStat (path, out stat, out error))
 				throw new IOException (path);
-#endif
-			}
 			return DateTime.FromFileTime (stat.LastWriteTime);
 		}
 
@@ -435,11 +410,6 @@ namespace System.IO
 		#endregion
 
 #if NET_2_0
-		static File() {
-			_defaultLocalFileTime = new DateTime (1601, 1, 1);
-			_defaultLocalFileTime = _defaultLocalFileTime.ToLocalTime ();
-		}
-
 		//
 		// The documentation for this method is most likely wrong, it
 		// talks about doing a "binary read", but the remarks say
@@ -466,32 +436,6 @@ namespace System.IO
 				return result;
 			}
 		}
-
-		public static string ReadAllText (string path)
-		{
-			return ReadAllText (path, Encoding.UTF8Unmarked);
-		}
-
-		public static string ReadAllText (string path, Encoding enc)
-		{
-			using (StreamReader sr = new StreamReader (path, enc)) {
-				return sr.ReadToEnd ();
-			}
-		}
-
-		public static void WriteAllText (string path, string contents)
-		{
-			WriteAllText (path, contents, Encoding.UTF8Unmarked);
-		}
-
-		public static void WriteAllText (string path, string contents, Encoding enc)
-		{
-			using (StreamWriter sw = new StreamWriter (path, false, enc)) {
-				sw.Write (contents);
-			}
-		}
-
-		private static readonly DateTime _defaultLocalFileTime;
 #endif
 	}
 }
diff --git a/mcs/class/corlib/System.IO/FileStream.cs b/mcs/class/corlib/System.IO/FileStream.cs
index 738dc0e859d..2181a3d7f48 100644
--- a/mcs/class/corlib/System.IO/FileStream.cs
+++ b/mcs/class/corlib/System.IO/FileStream.cs
@@ -142,22 +142,17 @@ namespace System.IO
 				throw new ArgumentException ("Name is empty");
 			}
 
-#if NET_2_0
-			// ignore the Inheritable flag
-			share &= ~FileShare.Inheritable;
-#endif
-
 			if (bufferSize <= 0)
 				throw new ArgumentOutOfRangeException ("Positive number required.");
 
 			if (mode < FileMode.CreateNew || mode > FileMode.Append)
-				throw new ArgumentOutOfRangeException ("mode", "Enum value was out of legal range.");
+				throw new ArgumentOutOfRangeException ("mode");
 
 			if (access < FileAccess.Read || access > FileAccess.ReadWrite)
-				throw new ArgumentOutOfRangeException ("access", "Enum value was out of legal range.");
+				throw new ArgumentOutOfRangeException ("access");
 
 			if (share < FileShare.None || share > FileShare.ReadWrite)
-				throw new ArgumentOutOfRangeException ("share", "Enum value was out of legal range.");
+				throw new ArgumentOutOfRangeException ("share");
 
 			if (name.IndexOfAny (Path.InvalidPathChars) != -1) {
 				throw new ArgumentException ("Name has invalid chars");
@@ -174,16 +169,13 @@ namespace System.IO
 			 * docs)
 			 */
 			if (mode==FileMode.Append &&
-				(access&FileAccess.Read)==FileAccess.Read) {
-				throw new ArgumentException("Append access can be requested only in write-only mode.");
+			    (access&FileAccess.Read)==FileAccess.Read) {
+				throw new ArgumentException("Append streams can not be read");
 			}
 
 			if ((access & FileAccess.Write) == 0 &&
-				(mode != FileMode.Open && mode != FileMode.OpenOrCreate)) {
-				string msg = Locale.GetText ("Combining FileMode: {0} with " +
-					"FileAccess: {1} is invalid.");
-				throw new ArgumentException (string.Format (msg, access, mode));
-			}
+			    (mode != FileMode.Open && mode != FileMode.OpenOrCreate))
+				throw new ArgumentException ("access and mode not compatible");
 
 			string dname = Path.GetDirectoryName (name);
 			if (dname.Length > 0) {
diff --git a/mcs/class/corlib/System.IO/MonoIO.cs b/mcs/class/corlib/System.IO/MonoIO.cs
index 51d634a5df6..cc62d6957e6 100644
--- a/mcs/class/corlib/System.IO/MonoIO.cs
+++ b/mcs/class/corlib/System.IO/MonoIO.cs
@@ -106,11 +106,7 @@ namespace System.IO
 			case MonoIOError.ERROR_LOCK_VIOLATION:
 				message = String.Format ("Lock violation on path {0}", path);
 				return new IOException (message, unchecked((int)0x80070000) | (int)error);
-			
-			case MonoIOError.ERROR_HANDLE_DISK_FULL:
-				message = String.Format ("Disk full. Path {0}", path);
-				return new IOException (message, unchecked((int)0x80070000) | (int)error);
-			
+
 			case MonoIOError.ERROR_DIR_NOT_EMPTY:
 				message = String.Format ("Directory {0} is not empty", path);
 				return new IOException (message, unchecked((int)0x80070000) | (int)error);
diff --git a/mcs/class/corlib/System.IO/MonoIOError.cs b/mcs/class/corlib/System.IO/MonoIOError.cs
index a45926d5117..a3213d31b16 100644
--- a/mcs/class/corlib/System.IO/MonoIOError.cs
+++ b/mcs/class/corlib/System.IO/MonoIOError.cs
@@ -72,8 +72,8 @@ namespace System.IO
 	/*	ERROR_WRONG_DISK = 34,

 		ERROR_SHARING_BUFFER_EXCEEDED = 36,

 		ERROR_HANDLE_EOF = 38,

-	*/	ERROR_HANDLE_DISK_FULL = 39,

-	/*	ERROR_NOT_SUPPORTED = 50,

+		ERROR_HANDLE_DISK_FULL = 39,

+		ERROR_NOT_SUPPORTED = 50,

 		ERROR_REM_NOT_LIST = 51,

 		ERROR_DUP_NAME = 52,

 		ERROR_BAD_NETPATH = 53,

diff --git a/mcs/class/corlib/System.IO/StreamReader.cs b/mcs/class/corlib/System.IO/StreamReader.cs
index 0c4f4e1a4a9..ee3c854d652 100644
--- a/mcs/class/corlib/System.IO/StreamReader.cs
+++ b/mcs/class/corlib/System.IO/StreamReader.cs
@@ -420,7 +420,7 @@ namespace System.IO {
 				if (foundCR) // don't include the trailing CR if present
 					decoded_count--;
 
-				line_builder.Append (decoded_buffer, begin, decoded_count - begin);
+				line_builder.Append (new string (decoded_buffer, begin, decoded_count - begin));
 				if (ReadBuffer () == 0) {
 					if (line_builder.Capacity > 32768) {
 						StringBuilder sb = line_builder;
@@ -433,7 +433,7 @@ namespace System.IO {
 				begin = pos;
 				end = FindNextEOL ();
 				if (end < decoded_count && end >= begin) {
-					line_builder.Append (decoded_buffer, begin, end - begin);
+					line_builder.Append (new string (decoded_buffer, begin, end - begin));
 					if (line_builder.Capacity > 32768) {
 						StringBuilder sb = line_builder;
 						line_builder = null;
diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 7f6207c5dcf..433ac41babd 100644
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,16 +1,3 @@
-2006-02-27  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* ConstructorBuilder.cs: In AddDeclarativeSecurity, throw an
-	ArgumentOutOfRangeException instead of an ArgumentException if action 
-	is a Request* action. Fixes bug #77640.
-	* MethodBuilder.cs: Same.
-	* TypeBuilder.cs: Same.
-
-Mon Feb 27 17:12:40 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* ModuleBuilder.cs: unlink the file before saving
-	otherwise we might overwrite a file mmapped by the runtime.
-
 2006-02-17  Zoltan Varga  <vargaz@gmail.com>
 
 	* DynamicMethod.cs: Implement DefineParameter ().
@@ -34,23 +21,6 @@ Mon Feb 27 17:12:40 CET 2006 Paolo Molaro <lupus@ximian.com>
 	(MethodBuilder.IsGenericMethod): Implement this.
 	(MethodBuilder.IsGenericMethodDefinition): Likewise.
 
-2006-02-03  Zoltan Varga  <vargaz@gmail.com>
-
-	* TypeBuilder.cs (CreateType): Add a check for Sealed parents.
-
-2006-02-01  Zoltan Varga  <vargaz@gmail.com>
-
-	* OpCodes.cs: Readonly is a net 2.0 only field.
-
-Tue Jan 31 13:37:02 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* OpCodes.cs: Added Readonly field.
-
-2006-01-29  Raja R Harinath  <harinath@gmail.com>
-
-	* GenericTypeParameterBuilder.cs (DeclaringType): Return the
-	declaring type of a generic method.
-
 2005-12-15  Raja R Harinath  <rharinath@novell.com>
 
 	* TypeBuilder.cs (IsGenericType): Implement override.
diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
index ed7e96527a1..bd35c08908c 100644
--- a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
@@ -143,7 +143,7 @@ namespace System.Reflection.Emit {
 			if ((action == SecurityAction.RequestMinimum) ||
 				(action == SecurityAction.RequestOptional) ||
 				(action == SecurityAction.RequestRefuse))
-				throw new ArgumentOutOfRangeException ("Request* values are not permitted", "action");
+				throw new ArgumentException ("Request* values are not permitted", "action");
 
 			RejectIfCreated ();
 
diff --git a/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs
index b668caa3b37..7df715b59ce 100644
--- a/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs
@@ -289,11 +289,13 @@ namespace System.Reflection.Emit
 		}
 
 		public override Type DeclaringType {
-			get { return mbuilder != null ? mbuilder.DeclaringType : tbuilder; }
+			get { return mbuilder != null ? null : tbuilder; }
 		}
 
 		public override Type ReflectedType {
-			get { return DeclaringType; }
+			get {
+				return DeclaringType;
+			}
 		}
 
 		public override RuntimeTypeHandle TypeHandle {
@@ -352,7 +354,9 @@ namespace System.Reflection.Emit
 		}
 
 		public override MethodBase DeclaringMethod {
-			get { return mbuilder; }
+			get { 
+				return mbuilder;
+			}
 		}
 
 		public void SetCustomAttribute (CustomAttributeBuilder customBuilder)
diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
index 00352b9be11..ba9574b5d2e 100644
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -408,7 +408,7 @@ namespace System.Reflection.Emit {
 			if ((action == SecurityAction.RequestMinimum) ||
 				(action == SecurityAction.RequestOptional) ||
 				(action == SecurityAction.RequestRefuse))
-				throw new ArgumentOutOfRangeException ("Request* values are not permitted", "action");
+				throw new ArgumentException ("Request* values are not permitted", "action");
 
 			RejectIfCreated ();
 
diff --git a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
index c752a68e3b2..36820b23c9f 100644
--- a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
@@ -667,13 +667,7 @@ namespace System.Reflection.Emit {
 			string fileName = fqname;
 			if (assemblyb.AssemblyDir != null)
 				fileName = Path.Combine (assemblyb.AssemblyDir, fileName);
-
-			try {
-				// We mmap the file, so unlink the previous version since it may be in use
-				File.Delete (fileName);
-			} catch {
-				// We can safely ignore
-			}
+			
 			using (FileStream file = new FileStream (fileName, FileMode.Create, FileAccess.Write))
 				WriteToFile (file.Handle);
 			
diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
index ea891a0d058..a0c78a94ec4 100644
--- a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
@@ -925,12 +925,6 @@ namespace System.Reflection.Emit {
 			0xFE << 0 | 0x1D << 8 | (byte) StackBehaviour.Pushi << 16 | (byte) StackBehaviour.Pop1 << 24,
 			2 << 0 | (byte) OpCodeType.Primitive << 8 | (byte) OperandType.InlineNone << 16 | (byte) FlowControl.Next << 24);
 
-#if NET_2_0 || BOOTSTRAP_NET_2_0
-		public static readonly OpCode Readonly = new OpCode (
-			0xFE << 0 | 0x1E << 8 | (byte) StackBehaviour.Push0 << 16 | (byte) StackBehaviour.Pop0 << 24,
-			2 << 0 | (byte) OpCodeType.Primitive << 8 | (byte) OperandType.InlineNone << 16 | (byte) FlowControl.Next << 24);
-#endif
-
                 public static bool TakesSingleByteArgument (OpCode inst)
                 {
                        OperandType t = inst.OperandType;
diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index d46282cf1ef..da197cfda36 100644
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -239,7 +239,7 @@ namespace System.Reflection.Emit {
 			if ((action == SecurityAction.RequestMinimum) ||
 				(action == SecurityAction.RequestOptional) ||
 				(action == SecurityAction.RequestRefuse))
-				throw new ArgumentOutOfRangeException ("Request* values are not permitted", "action");
+				throw new ArgumentException ("Request* values are not permitted", "action");
 
 			check_not_created ();
 
@@ -704,9 +704,6 @@ namespace System.Reflection.Emit {
 				}
 			}
 
-			if ((parent != null) && parent.IsSealed)
-				throw new TypeLoadException ("Could not load type '" + FullName + "' from assembly '" + Assembly + "' because the parent type is sealed.");
-
 			if (methods != null) {
 				for (int i = 0; i < num_methods; ++i)
 					((MethodBuilder)(methods[i])).fixup ();
diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs
index f80b92d6b22..0328f15e7f9 100644
--- a/mcs/class/corlib/System.Reflection/MonoMethod.cs
+++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs
@@ -56,7 +56,7 @@ namespace System.Reflection {
 	 * the .NET reflection class hierarchy is so broken.
 	 */
 	[Serializable()]
-	internal class MonoMethod : MethodInfo, ISerializable
+	internal class MonoMethod : MethodInfo, ISerializable

 	{
 		internal IntPtr mhandle;
 		string name;
@@ -246,12 +246,12 @@ namespace System.Reflection {
 			return ReturnType.Name + " " + Name + generic + "(" + parms + ")";
 		}
 
-	
-		// ISerializable
-		public void GetObjectData(SerializationInfo info, StreamingContext context) 
-		{
-			ReflectionSerializationHolder.Serialize ( info, Name, ReflectedType, ToString(), MemberTypes.Method);
-		}
+	

+		// ISerializable

+		public void GetObjectData(SerializationInfo info, StreamingContext context) 

+		{

+			ReflectionSerializationHolder.Serialize ( info, Name, ReflectedType, ToString(), MemberTypes.Method);

+		}

 
 #if NET_2_0 || BOOTSTRAP_NET_2_0
 		public override MethodInfo MakeGenericMethod (Type [] types)
@@ -300,7 +300,7 @@ namespace System.Reflection {
 #endif
 	}
 	
-	internal class MonoCMethod : ConstructorInfo, ISerializable
+	internal class MonoCMethod : ConstructorInfo, ISerializable

 	{
 		internal IntPtr mhandle;
 		string name;
@@ -432,11 +432,11 @@ namespace System.Reflection {
 			}
 			return "Void "+Name+"("+parms+")";
 		}
-
-		// ISerializable
-		public void GetObjectData(SerializationInfo info, StreamingContext context) 
-		{
-			ReflectionSerializationHolder.Serialize ( info, Name, ReflectedType, ToString(), MemberTypes.Constructor);
-		}
+

+		// ISerializable

+		public void GetObjectData(SerializationInfo info, StreamingContext context) 

+		{

+			ReflectionSerializationHolder.Serialize ( info, Name, ReflectedType, ToString(), MemberTypes.Constructor);

+		}

 	}
 }
diff --git a/mcs/class/corlib/System.Reflection/ReflectionSerializationHolder.cs b/mcs/class/corlib/System.Reflection/ReflectionSerializationHolder.cs
index 821e12b4e69..1cc06009eae 100644
--- a/mcs/class/corlib/System.Reflection/ReflectionSerializationHolder.cs
+++ b/mcs/class/corlib/System.Reflection/ReflectionSerializationHolder.cs
@@ -1,32 +1,32 @@
-// ReflectionSerializationHolder.cs.cs

-//

-// Author:

-//  Patrik Torstensson

-//

-// (C) 2003 Patrik Torstensson

-

-//

-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

+// ReflectionSerializationHolder.cs.cs
+//
+// Author:
+//  Patrik Torstensson
+//
+// (C) 2003 Patrik Torstensson
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 

 using System;

 using System.Runtime.Serialization;

diff --git a/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs b/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs
index eff73aecbb4..f2f4f5b8f1c 100644
--- a/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs
+++ b/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs
@@ -145,24 +145,24 @@ public class StrongNameKeyPair
 
 				byte[] blob = CryptoConvert.ToCapiKeyBlob (rsa, false);
 				_publicKey = new byte [blob.Length + 12];
-				// The first 12 bytes are documented at:
-				// http://msdn.microsoft.com/library/en-us/cprefadd/html/grfungethashfromfile.asp
-				// ALG_ID - Signature
-				_publicKey[0] = 0x00;
-				_publicKey[1] = 0x24;	
-				_publicKey[2] = 0x00;	
-				_publicKey[3] = 0x00;	
-				// ALG_ID - Hash
-				_publicKey[4] = 0x04;
-				_publicKey[5] = 0x80;
-				_publicKey[6] = 0x00;
-				_publicKey[7] = 0x00;
-				// Length of Public Key (in bytes)
-				int lastPart = blob.Length;
-				_publicKey[8] = (byte)(lastPart % 256);
-				_publicKey[9] = (byte)(lastPart / 256); // just in case
-				_publicKey[10] = 0x00;
-				_publicKey[11] = 0x00;
+				// The first 12 bytes are documented at:

+				// http://msdn.microsoft.com/library/en-us/cprefadd/html/grfungethashfromfile.asp

+				// ALG_ID - Signature

+				_publicKey[0] = 0x00;

+				_publicKey[1] = 0x24;	

+				_publicKey[2] = 0x00;	

+				_publicKey[3] = 0x00;	

+				// ALG_ID - Hash

+				_publicKey[4] = 0x04;

+				_publicKey[5] = 0x80;

+				_publicKey[6] = 0x00;

+				_publicKey[7] = 0x00;

+				// Length of Public Key (in bytes)

+				int lastPart = blob.Length;

+				_publicKey[8] = (byte)(lastPart % 256);

+				_publicKey[9] = (byte)(lastPart / 256); // just in case

+				_publicKey[10] = 0x00;

+				_publicKey[11] = 0x00;

 
 				Buffer.BlockCopy (blob, 0, _publicKey, 12, blob.Length);
 			}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
index 98577ac569c..724ab538b20 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* SafeHandle.cs: Update to RTM api
-
 2005-11-17  Zoltan Varga  <vargaz@gmail.com>
 
 	* DefaultParameterValueAttribute.cs: New file.
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs b/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
index 62ebf95ea4c..e31ce310a00 100644
--- a/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
@@ -32,14 +32,7 @@ namespace System.Runtime.InteropServices
 {
 	[MonoTODO]
 	public abstract class SafeHandle : CriticalFinalizerObject, IDisposable {
-		protected IntPtr handle;
-
-		[MonoTODO]
-		protected SafeHandle (IntPtr invalidHandleValue, bool ownsHandle)
-		{
-			throw new NotImplementedException ();
-		}
-
+	
 		[MonoTODO]
 		public void Close () {
 			throw new NotImplementedException ();
@@ -69,19 +62,7 @@ namespace System.Runtime.InteropServices
 		public void SetHandleAsInvalid () {
 			throw new NotImplementedException ();
 		}
-		
-		[MonoTODO]
-		protected virtual void Dispose (bool disposing) {
-			throw new NotImplementedException ();
-		}
-
-		protected abstract bool ReleaseHandle ();
-
-		[MonoTODO]
-		protected void SetHandle (IntPtr handle) {
-			throw new NotImplementedException ();
-		}
-
+	
 		[MonoTODO]
 		public bool IsClosed {
 			get {
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog
index 262b22082e2..98c1c4fe497 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Context.cs: Fixed double check lock.
-
 2005-12-08  Sebastien Pouliot  <sebastien@ximian.com> 
 
 	* Context.cs: ContextProperties property is virtual.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
index 4c7c2fa7d32..40dd572d254 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
@@ -369,10 +369,10 @@ namespace System.Runtime.Remoting.Contexts {
 		public static object GetData (LocalDataStoreSlot slot)
 		{
 			Context ctx = Thread.CurrentContext;
+			if (ctx.datastore == null) return null;
 			
-			lock (ctx)
+			lock (ctx.datastore.SyncRoot)
 			{
-				if (ctx.datastore == null) return null;
 				return ctx.datastore [slot];
 			}
 		}
@@ -390,10 +390,17 @@ namespace System.Runtime.Remoting.Contexts {
 		public static void SetData (LocalDataStoreSlot slot, object data)
 		{
 			Context ctx = Thread.CurrentContext;
-			lock (ctx)
+			if (ctx.datastore == null)
+			{
+				lock (ctx)
+				{
+					if (ctx.datastore == null)
+						ctx.datastore = new Hashtable ();
+				}
+			}
+			
+			lock (ctx.datastore.SyncRoot)
 			{
-				if (ctx.datastore == null)
-					ctx.datastore = new Hashtable ();
 				ctx.datastore [slot] = data;
 			}
 		}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog
index 507a86641d3..f5d43dc65ad 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Lease.cs: Fixed double check lock.
-
 2004-06-07  Lluis Sanchez Gual  <lluis@ximian.com>
 
 	* LeaseManager.cs: In StopManager, nullify the timer variable before
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs
index 48a2f721072..bc6be38f12d 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/Lease.cs
@@ -118,9 +118,15 @@ namespace System.Runtime.Remoting.Lifetime
 
 		public void Register (ISponsor obj, TimeSpan renewalTime)
 		{
-			lock (this) {
-				if (_sponsors == null)
-					_sponsors = new ArrayList();
+			if (_sponsors == null) 

+			{
+				lock (this) {
+					if (_sponsors == null)
+						_sponsors = new ArrayList();
+				}
+			}
+
+			lock (_sponsors.SyncRoot) {
 				_sponsors.Add (obj);
 			}
 
@@ -137,8 +143,9 @@ namespace System.Runtime.Remoting.Lifetime
 
 		public void Unregister (ISponsor obj)
 		{
-			lock (this) {
-				if (_sponsors == null) return;
+			if (_sponsors == null) return;
+			
+			lock (_sponsors.SyncRoot) {
 				_sponsors.Remove (obj);
 			}
 		}
@@ -156,7 +163,7 @@ namespace System.Runtime.Remoting.Lifetime
 			if (_sponsors != null)
 			{
 				_currentState = LeaseState.Renewing;
-				lock (this) {
+				lock (_sponsors.SyncRoot) {
 					_renewingSponsors = new Queue (_sponsors);
 				}
 				CheckNextSponsor ();
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
index 9a7764cd3cc..e6c1d31db47 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
@@ -1,19 +1,3 @@
-2006-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* LogicalCallContext.cs, MethodCall.cs, ReturnMessage.cs,
-	  MethodResponse.cs: Create a new LogicalCallContext for
-	  every message. Fixes #77364 again.
-
-2006-01-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* LogicalCallContext.cs: Added shared empty call context.
-	* MethodCall.cs: Added better error checking and reporting in
-	the code that resolves methods.
-	
-	* ReturnMessage.cs, MethodResponse.cs, MethodCall.cs: Never return null in 
-	LogicalCallContext. If it's null, return an empty context. Based
-	on a patch by Dominic Ullmann that fixes bug #77364.
-
 2005-06-22  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MethodReturnMessageWrapper.cs: ArgCount now returns the count
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
index d0cb74a13cb..f7570e24a82 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
@@ -41,7 +41,7 @@ namespace System.Runtime.Remoting.Messaging
 	{
 		Hashtable _data;
 		CallContextRemotingData _remotingData = new CallContextRemotingData();
-		
+
 		internal LogicalCallContext ()
 		{
 		}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
index d43e25a0519..8359c7214ff 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
@@ -192,11 +192,7 @@ namespace System.Runtime.Remoting.Messaging {
 		}
 		
 		public LogicalCallContext LogicalCallContext {
-			get {
-				if (_callContext == null)
-					_callContext = new LogicalCallContext ();
-				return _callContext;
-			}
+			get { return _callContext; }
 		}
 		
 		public MethodBase MethodBase {
@@ -297,35 +293,30 @@ namespace System.Runtime.Remoting.Messaging {
 			if (_uri != null)
 			{
 				Type type = RemotingServices.GetServerTypeForUri (_uri);
-				if (type == null) {
-					string sname = _typeName != null ? " (" + _typeName + ")" : "";
-					throw new RemotingException ("Requested service not found" + sname + ". No receiver for uri " + _uri);
-				}
+				if (type == null) throw new RemotingException ("Requested service not found. No receiver for uri " + _uri);
 
-				if (CastTo (_typeName, type) != null) {
+				if (CanCastTo (_typeName, type)) {
 					_methodBase = RemotingServices.GetMethodBaseFromName (type, _methodName, _methodSignature);
-					if (_methodBase == null) throw new RemotingException ("Method " + _methodName + " not found in " + type);
 					return;
 				}
 				else
 					throw new RemotingException ("Cannot cast from client type '" + _typeName + "' to server type '" + type.FullName + "'");
 			}
 			_methodBase = RemotingServices.GetMethodBaseFromMethodMessage (this);
-			if (_methodBase == null) throw new RemotingException ("Method " + _methodName + " not found in " + TypeName);
 		}
 
-		Type CastTo (string clientType, Type serverType)
+		bool CanCastTo (string clientType, Type serverType)
 		{
 			int i = clientType.IndexOf(',');
 			if (i != -1) clientType = clientType.Substring (0,i).Trim();
 
-			if (clientType == serverType.FullName) return serverType;
+			if (clientType == serverType.FullName) return true;
 
  			// base class hierarchy
 
  			Type baseType = serverType.BaseType;
  			while (baseType != null) {
-    			if (clientType == baseType.FullName) return baseType;
+    			if (clientType == baseType.FullName) return true;
        			baseType = baseType.BaseType;
     		}
 
@@ -333,9 +324,9 @@ namespace System.Runtime.Remoting.Messaging {
 
  			Type[] interfaces = serverType.GetInterfaces();
  			foreach (Type itype in interfaces)
- 				if (clientType == itype.FullName) return itype;
+ 				if (clientType == itype.FullName) return true;
      
-     		return null;
+     		return false;
 		}
 		
 		[MonoTODO]
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
index ddcfbe21481..36390441e47 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
@@ -174,9 +174,7 @@ namespace System.Runtime.Remoting.Messaging {
 		}
 		
 		public LogicalCallContext LogicalCallContext {
-			get {
-				if (_callContext == null)
-					_callContext = new LogicalCallContext ();
+			get { 
 				return _callContext;
 			}
 		}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
index c3cda345465..8044bd32f5e 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
@@ -101,8 +101,6 @@ namespace System.Runtime.Remoting.Messaging
 
 		public LogicalCallContext LogicalCallContext {
 			get {
-				if (_callCtx == null)
-					_callCtx = new LogicalCallContext ();
 				return _callCtx;
 			}
 		}
diff --git a/mcs/class/corlib/System.Security.Cryptography/ChangeLog b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
index 85e4e960b09..de22f2c40f4 100644
--- a/mcs/class/corlib/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
@@ -1,7 +1,3 @@
-2006-02-03  Zoltan Varga  <vargaz@gmail.com>
-
-	* CryptoStream.cs: Add 'override' keyword to Dispose (bool) method in 2.0.
-
 2005-12-15  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* SymmetricAlgorithm.cs: Changing (not setting) BlockSize must 
diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
index 28511eec1b1..4c0ab0561a8 100644
--- a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
@@ -345,11 +345,7 @@ namespace System.Security.Cryptography {
 			throw new NotSupportedException ("SetLength");
 		}
 
-#if NET_2_0
-		protected override void Dispose (bool disposing) 
-#else
 		protected virtual void Dispose (bool disposing) 
-#endif
 		{
 			if (!_disposed) {
 				_disposed = true;
diff --git a/mcs/class/corlib/System.Text/ASCIIEncoding.cs b/mcs/class/corlib/System.Text/ASCIIEncoding.cs
index 282933c976e..d795c7937a8 100644
--- a/mcs/class/corlib/System.Text/ASCIIEncoding.cs
+++ b/mcs/class/corlib/System.Text/ASCIIEncoding.cs
@@ -239,11 +239,10 @@ public class ASCIIEncoding : Encoding
 
 		int count = byteCount;
 		while (count-- > 0) {
-			char c = (char) bytes [byteIndex++];
-			if (c < '\x80')
-				chars [charIndex++] = c;
-			else
-				chars [charIndex++] = '?';
+			char c = (char)(bytes [byteIndex++]);
+			if (c > 127)
+				c = '?';
+			chars [charIndex++] = c;
 		}
 		return byteCount;
 	}
diff --git a/mcs/class/corlib/System.Text/ChangeLog b/mcs/class/corlib/System.Text/ChangeLog
index 2912d6e4e54..75560d5ff58 100644
--- a/mcs/class/corlib/System.Text/ChangeLog
+++ b/mcs/class/corlib/System.Text/ChangeLog
@@ -1,81 +1,3 @@
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : Fallback was indicating incorrect index.
-	  Fixed bug #77550.
-
-2006-02-10  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ASCIIEncoding.cs : (GetChars) reduced either one store or one jump
-	  in IL. 10% performance improvement.
-
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : avoid possible overflow.
-
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : In zero-charbuffer case, byte buffer count should
-	  be checked. Also it should not ignore leftOver characters even if
-	  byte buffer length is 0.
-
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : Fast path optimization for InternalGetByteCount()
-	  and InternalGetBytes().
-
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs :
-	  actually leftover bits needs more careful handleding. So it's
-	  better to be rather close to the original GetBytes().
-	  Also changed leftOver handling so that it will be able to support
-	  fallback.
-
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs :
-	  GetBytes(string, ...) could reuse InternalGetBytes() using fixed
-	  pointers. However, InternalGetBytes() was slower than
-	  GetBytes(string, ...), so first replaced existing InternalGetBytes()
-	  with GetBytes() internals, and GetBytes(string, ...) switched to 
-	  InternalGetBytes(). Now GetBytes() implementation code is reduced
-	  to one method.
-
-2006-02-02  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : fast path optimization was pretty insufficient.
-	  Now it handles the entire bytes, not just half of them.
-
-2006-02-02  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : zero-length check was wrong. Check it by
-	  "charIndex == chars.Length" instead of "charCount == 0".
-
-2006-02-02  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : switched GetBytes() to pointer-based code.
-	  Implemented 2.0 pointer-based GetBytes(). 10% perf. improvement.
-
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : InternalGetCharCount() optimization again, and
-	  this time InternalGetChars() as well.
-
-2006-01-24  Mike Glenn <mglenn@zoominternet.net>
-
-	* StringBuilder.cs: Avoid computing computation for the string
-	length twice.
-
-2006-01-24  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : reverted the previous change. Looks like it broke
-	  the build.
-
-2006-01-24  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8Encoding.cs : InternalGetCharCount() optimization: fast path
-	  for ASCII range.
-
 2006-01-24  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* UTF7Encoding.cs UTF8Encoding.cs :
@@ -84,14 +6,14 @@
 
 2006-01-23  Atsushi Enomoto  <atsushi@ximian.com>
 
-	* EncoderFallbackException.cs EncoderExceptionFallback.cs
-	  DecoderFallbackBuffer.cs EncoderReplacementFallback.cs
-	  EncoderFallbackBuffer.cs DecoderExceptionFallbackBuffer.cs
-	  EncoderFallback.cs DecoderReplacementFallbackBuffer.cs
-	  DecoderFallbackException.cs DecoderExceptionFallback.cs
-	  DecoderReplacementFallback.cs EncoderExceptionFallbackBuffer.cs
-	  EncoderReplacementFallbackBuffer.cs :
-	  include them in net_2_0bootstrap build.
+        * EncoderFallbackException.cs EncoderExceptionFallback.cs
+          DecoderFallbackBuffer.cs EncoderReplacementFallback.cs
+          EncoderFallbackBuffer.cs DecoderExceptionFallbackBuffer.cs
+          EncoderFallback.cs DecoderReplacementFallbackBuffer.cs
+          DecoderFallbackException.cs DecoderExceptionFallback.cs
+          DecoderReplacementFallback.cs EncoderExceptionFallbackBuffer.cs
+          EncoderReplacementFallbackBuffer.cs :
+          include them in net_2_0bootstrap build.
 
 2006-01-20  Atsushi Enomoto  <atsushi@ximian.com>
 
diff --git a/mcs/class/corlib/System.Text/DecoderFallback.cs b/mcs/class/corlib/System.Text/DecoderFallback.cs
index 7cf071c8353..4a15618b1f4 100644
--- a/mcs/class/corlib/System.Text/DecoderFallback.cs
+++ b/mcs/class/corlib/System.Text/DecoderFallback.cs
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 || NET_2_0_BOOTSTRAP
 
 namespace System.Text
 {
diff --git a/mcs/class/corlib/System.Text/StringBuilder.cs b/mcs/class/corlib/System.Text/StringBuilder.cs
index d2e04436614..7fca9b248b0 100644
--- a/mcs/class/corlib/System.Text/StringBuilder.cs
+++ b/mcs/class/corlib/System.Text/StringBuilder.cs
@@ -322,7 +322,7 @@ namespace System.Text {
 				InternalEnsureCapacity (needed_cap);
 			
 			String.InternalStrcpy (_str, _length, value);
-			_length = needed_cap;
+			_length += value.Length;
 
 			return this;
 		} 
@@ -343,7 +343,7 @@ namespace System.Text {
 				InternalEnsureCapacity (needed_cap);
 
 			String.InternalStrcpy (_str, _length, value);
-			_length = needed_cap;
+			_length += value.Length;
 			return this;
 		}
 
@@ -413,7 +413,7 @@ namespace System.Text {
 				InternalEnsureCapacity (needed_cap);
 
 			_str.InternalSetChar(_length, value);
-			_length = needed_cap;
+			_length++;
 
 			return this;
 		}
@@ -443,11 +443,11 @@ namespace System.Text {
 			if ((charCount < 0 || startIndex < 0) || (startIndex > value.Length - charCount)) 
 				throw new ArgumentOutOfRangeException();
 			
-			int needed_cap = _length + charCount;
-			InternalEnsureCapacity (needed_cap);
+			
+			InternalEnsureCapacity (_length + charCount);
 
 			String.InternalStrcpy (_str, _length, value, startIndex, charCount);
-			_length = needed_cap;
+			_length += charCount;
 
 			return this;
 		}
@@ -470,7 +470,7 @@ namespace System.Text {
 
 			String.InternalStrcpy (_str, _length, value, startIndex, count);
 			
-			_length = needed_cap;
+			_length += count;
 
 			return this;
 		}
diff --git a/mcs/class/corlib/System.Text/UTF8Encoding.cs b/mcs/class/corlib/System.Text/UTF8Encoding.cs
index ecc3998979a..9faa7cac64f 100644
--- a/mcs/class/corlib/System.Text/UTF8Encoding.cs
+++ b/mcs/class/corlib/System.Text/UTF8Encoding.cs
@@ -70,11 +70,9 @@ public class UTF8Encoding : Encoding
 		windows_code_page = UnicodeEncoding.UNICODE_CODE_PAGE;
 	}
 
-	#region GetByteCount()
-
 	// Internal version of "GetByteCount" which can handle a rolling
 	// state between multiple calls to this method.
-	private static int InternalGetByteCount (char[] chars, int index, int count, ref char leftOver, bool flush)
+	private static int InternalGetByteCount (char[] chars, int index, int count, uint leftOver, bool flush)
 	{
 		// Validate the parameters.
 		if (chars == null) {
@@ -87,66 +85,27 @@ public class UTF8Encoding : Encoding
 			throw new ArgumentOutOfRangeException ("count", _("ArgRange_Array"));
 		}
 
-		if (index == chars.Length) {
-			if (flush && leftOver != '\0') {
-				// Flush the left-over surrogate pair start.
-				leftOver = '\0';
-				return 3;
-			}
-			return 0;
-		}
-
-		unsafe {
-			fixed (char* cptr = chars) {
-				return InternalGetByteCount (cptr + index, count, ref leftOver, flush);
-			}
-		}
-	}
-
-
-	private unsafe static int InternalGetByteCount (char* chars, int count, ref char leftOver, bool flush)
-	{
-		int index = 0;
-
 		// Determine the lengths of all characters.
 		char ch;
 		int length = 0;
-		char pair = leftOver;
+		uint pair = leftOver;
 		while (count > 0) {
 			ch = chars[index];
 			if (pair == 0) {
 				if (ch < '\u0080') {
-					// fast path optimization
-					int end = index + count;
-					for (; index < end; index++, count--) {
-						if (chars [index] < '\x80')
-							++length;
-						else
-							break;
-					}
-					continue;
-					//length++;
+					++length;
 				} else if (ch < '\u0800') {
 					length += 2;
 				} else if (ch >= '\uD800' && ch <= '\uDBFF') {
 					// This is the start of a surrogate pair.
-					pair = ch;
+					pair = (uint)ch;
 				} else {
 					length += 3;
 				}
 			} else if (ch >= '\uDC00' && ch <= '\uDFFF') {
-				if (pair != 0) {
-					// We have a surrogate pair.
-					length += 4;
-					pair = '\0';
-				} else {
-					// We have a surrogate tail without 
-					// leading surrogate. In NET_2_0 it
-					// uses fallback. In NET_1_1 we output
-					// wrong surrogate.
-					length += 3;
-					pair = '\0';
-				}
+				// We have a surrogate pair.
+				length += 4;
+				pair = 0;
 			} else {
 				// We have a surrogate start followed by a
 				// regular character.  Technically, this is
@@ -154,20 +113,16 @@ public class UTF8Encoding : Encoding
 				// We write out the surrogate start and then
 				// re-visit the current character again.
 				length += 3;
-				pair = '\0';
+				pair = 0;
 				continue;
 			}
 			++index;
 			--count;
 		}
-		if (flush) {
-			if (pair != '\0')
-				// Flush the left-over surrogate pair start.
-				length += 3;
-			leftOver = '\0';
+		if (flush && pair != 0) {
+			// Flush the left-over surrogate pair start.
+			length += 3;
 		}
-		else
-			leftOver = pair;
 
 		// Return the final length to the caller.
 		return length;
@@ -176,8 +131,7 @@ public class UTF8Encoding : Encoding
 	// Get the number of bytes needed to encode a character buffer.
 	public override int GetByteCount (char[] chars, int index, int count)
 	{
-		char dummy = '\0';
-		return InternalGetByteCount (chars, index, count, ref dummy, true);
+		return InternalGetByteCount (chars, index, count, 0, true);
 	}
 
 	// Convenience wrappers for "GetByteCount".
@@ -188,23 +142,43 @@ public class UTF8Encoding : Encoding
 			throw new ArgumentNullException ("s");
 		}
 
-		unsafe {
-			fixed (char* cptr = s) {
-				char dummy = '\0';
-				return InternalGetByteCount (cptr, s.Length, ref dummy, true);
+		// Determine the lengths of all characters.
+		char ch;
+		int index = 0;
+		int count = s.Length;
+		int length = 0;
+		uint pair;
+		while (count > 0) {
+			ch = s[index++];
+			if (ch < '\u0080') {
+				++length;
+			} else if (ch < '\u0800') {
+				length += 2;
+			} else if (ch >= '\uD800' && ch <= '\uDBFF' && count > 1) {
+				// This may be the start of a surrogate pair.
+				pair = (uint)(s[index]);
+				if (pair >= (uint)0xDC00 && pair <= (uint)0xDFFF) {
+					length += 4;
+					++index;
+					--count;
+				} else {
+					length += 3;
+				}
+			} else {
+				length += 3;
 			}
+			--count;
 		}
-	}
-
-	#endregion
 
-	#region GetBytes()
+		// Return the final length to the caller.
+		return length;
+	}
 
 	// Internal version of "GetBytes" which can handle a rolling
 	// state between multiple calls to this method.
 	private static int InternalGetBytes (char[] chars, int charIndex,
 					     int charCount, byte[] bytes,
-					     int byteIndex, ref char leftOver,
+					     int byteIndex, ref uint leftOver,
 					     bool flush)
 	{
 		// Validate the parameters.
@@ -224,175 +198,93 @@ public class UTF8Encoding : Encoding
 			throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
 		}
 
-		if (charIndex == chars.Length) {
-			if (flush && leftOver != '\0') {
-#if NET_2_0
-				// FIXME: use EncoderFallback.
-				//
-				// By default it is empty, so I do nothing for now.
-				leftOver = '\0';
-#else
-				// Flush the left-over surrogate pair start.
-				if (byteIndex >= bytes.Length - 3)
-					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-				bytes [byteIndex++] = 0xEF;
-				bytes [byteIndex++] = 0xBB;
-				bytes [byteIndex++] = 0xBF;
-				leftOver = '\0';
-				return 3;
-#endif
-			}
-			return 0;
-		}
-
-		unsafe {
-			fixed (char* cptr = chars) {
-				if (bytes.Length == byteIndex)
-					return InternalGetBytes (
-						cptr + charIndex, charCount, 
-						null, 0, ref leftOver, flush);
-				fixed (byte *bptr = bytes) {
-					return InternalGetBytes (
-						cptr + charIndex, charCount,
-						bptr + byteIndex, bytes.Length - byteIndex,
-						ref leftOver, flush);
-				}
-			}
-		}
-	}
-
-	private unsafe static int InternalGetBytes (char* chars, int charCount,
-					     byte* bytes, int byteCount,
-					     ref char leftOver, bool flush)
-	{
-		int charIndex = 0;
-		int byteIndex = 0;
-
-		// Convert the characters into bytes.
 		// Convert the characters into bytes.
 		char ch;
-		int length = byteCount;
-		char pair = leftOver;
+		int length = bytes.Length;
+		uint pair;
+		uint left = leftOver;
 		int posn = byteIndex;
-		int code = 0;
-
 		while (charCount > 0) {
 			// Fetch the next UTF-16 character pair value.
-			ch = chars [charIndex];
-			if (pair == '\0') {
-				if (ch < '\uD800' || ch >= '\uE000') {
-					if (ch < '\x80') { // fast path optimization
-						int end = charIndex + charCount;
-						for (; charIndex < end; posn++, charIndex++, charCount--) {
-							if (chars [charIndex] < '\x80')
-								bytes [posn] = (byte) chars [charIndex];
-							else
-								break;
-						}
-						continue;
-					}
-					code = ch;
-				}
-				else if (ch < '\uDC00') {
-					// surrogate start
-					pair = ch;
-					++charIndex;
-					--charCount;
-					continue;
-				} else { // ch <= '\uDFFF'
-					// We have a surrogate tail without leading 
-					// surrogate. In NET_2_0 it uses fallback.
-					// In NET_1_1 we output wrong surrogate.
-					if (posn > length - 3) {
-						throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-					}
-					bytes [posn++] = (byte) (0xE0 | (ch >> 12));
-					bytes [posn++] = (byte) (0x80 | ((ch >> 6) & 0x3F));
-					bytes [posn++] = (byte) (0x80 | (ch & 0x3F));
-					++charIndex;
-					--charCount;
+			ch = chars[charIndex++];
+			--charCount;
+			if (left == 0) {
+				if (ch >= '\uD800' && ch <= '\uDBFF') {
+					// This is the start of a surrogate pair.
+					left = (uint)ch;
 					continue;
+				} else {
+					// This is a regular character.
+					pair = (uint)ch;
 				}
+			} else if (ch >= '\uDC00' && ch <= '\uDFFF') {
+				// We have a surrogate pair.
+				pair = ((left - (uint)0xD800) << 10) +
+					   (((uint)ch) - (uint)0xDC00) +
+					   (uint)0x10000;
+				left = 0;
 			} else {
-				if ('\uDC00' <= ch && ch <= '\uDFFF')
-					code =  0x10000 + (int) ch - 0xDC00 +
-						(((int) pair - 0xD800) << 10);
-				else {
-					// We have a surrogate start followed by a
-					// regular character.  Technically, this is
-					// invalid, but we have to do something.
-					// We write out the surrogate start and then
-					// re-visit the current character again.
-					if (posn > length - 3) {
-						throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-					}
-					bytes [posn++] = (byte) (0xE0 | (pair >> 12));
-					bytes [posn++] = (byte) (0x80 | ((pair >> 6) & 0x3F));
-					bytes [posn++] = (byte) (0x80 | (pair & 0x3F));
-					pair = '\0';
-					continue;
-				}
-				pair = '\0';
+				// We have a surrogate start followed by a
+				// regular character.  Technically, this is
+				// invalid, but we have to do something.
+				// We write out the surrogate start and then
+				// re-visit the current character again.
+				pair = (uint)left;
+				left = 0;
+				--charIndex;
+				++charCount;
 			}
-			++charIndex;
-			--charCount;
 
 			// Encode the character pair value.
-			if (code < 0x0080) {
-				if (posn >= length)
+			if (pair < (uint)0x0080) {
+				if (posn >= length) {
 					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-				bytes [posn++] = (byte)code;
-			} else if (code < 0x0800) {
-				if ((posn + 2) > length)
+				}
+				bytes[posn++] = (byte)pair;
+			} else if (pair < (uint)0x0800) {
+				if ((posn + 2) > length) {
 					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-				bytes [posn++] = (byte) (0xC0 | (code >> 6));
-				bytes [posn++] = (byte) (0x80 | (code & 0x3F));
-			} else if (code < 0x10000) {
-				if (posn > length - 3)
+				}
+				bytes[posn++] = (byte)(0xC0 | (pair >> 6));
+				bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+			} else if (pair < (uint)0x10000) {
+				if ((posn + 3) > length) {
 					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-				bytes [posn++] = (byte) (0xE0 | (code >> 12));
-				bytes [posn++] = (byte) (0x80 | ((code >> 6) & 0x3F));
-				bytes [posn++] = (byte) (0x80 | (code & 0x3F));
+				}
+				bytes[posn++] = (byte)(0xE0 | (pair >> 12));
+				bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+				bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
 			} else {
-				if (posn > length - 4)
+				if ((posn + 4) > length) {
 					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-				bytes [posn++] = (byte) (0xF0 | (code >> 18));
-				bytes [posn++] = (byte) (0x80 | ((code >> 12) & 0x3F));
-				bytes [posn++] = (byte) (0x80 | ((code >> 6) & 0x3F));
-				bytes [posn++] = (byte) (0x80 | (code & 0x3F));
+				}
+				bytes[posn++] = (byte)(0xF0 | (pair >> 18));
+				bytes[posn++] = (byte)(0x80 | ((pair >> 12) & 0x3F));
+				bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+				bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
 			}
 		}
-
-		if (flush) {
-			if (pair != '\0') {
-				// Flush the left-over incomplete surrogate.
-				if (posn > length - 3) {
-					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
-				}
-				bytes [posn++] = (byte) (0xE0 | (pair >> 12));
-				bytes [posn++] = (byte) (0x80 | ((pair >> 6) & 0x3F));
-				bytes [posn++] = (byte) (0x80 | (pair & 0x3F));
+		if (flush && left != 0) {
+			// Flush the left-over surrogate pair start.
+			if ((posn + 3) > length) {
+				throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
 			}
-			leftOver = '\0';
+			bytes[posn++] = (byte)(0xE0 | (left >> 12));
+			bytes[posn++] = (byte)(0x80 | ((left >> 6) & 0x3F));
+			bytes[posn++] = (byte)(0x80 | (left & 0x3F));
+			left = 0;
 		}
-		else
-			leftOver = pair;
-Char.IsLetterOrDigit (pair);
+		leftOver = left;
 
 		// Return the final count to the caller.
 		return posn - byteIndex;
 	}
 
-	private unsafe int Fallback (byte* bytes, int byteCount, char lead, char tail)
-	{
-		throw new NotImplementedException ();
-	}
-
 	// Get the bytes that result from encoding a character buffer.
 	public override int GetBytes (char[] chars, int charIndex, int charCount,
 								 byte[] bytes, int byteIndex)
 	{
-		char leftOver = '\0';
+		uint leftOver = 0;
 		return InternalGetBytes (chars, charIndex, charCount, bytes, byteIndex, ref leftOver, true);
 	}
 
@@ -417,31 +309,70 @@ Char.IsLetterOrDigit (pair);
 			throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
 		}
 
-		if (charIndex == s.Length)
-			return 0;
+		// Convert the characters into bytes.
+		char ch;
+		int length = bytes.Length;
+		uint pair;
+		int posn = byteIndex;
+		while (charCount > 0) {
+			// Fetch the next UTF-16 character pair value.
+			ch = s[charIndex++];
+			if (ch >= '\uD800' && ch <= '\uDBFF' && charCount > 1) {
+				// This may be the start of a surrogate pair.
+				pair = (uint)(s[charIndex]);
+				if (pair >= (uint)0xDC00 && pair <= (uint)0xDFFF) {
+					pair = (pair - (uint)0xDC00) +
+						   ((((uint)ch) - (uint)0xD800) << 10) +
+						   (uint)0x10000;
+					++charIndex;
+					--charCount;
+				} else {
+					pair = (uint)ch;
+				}
+			} else {
+				pair = (uint)ch;
+			}
+			--charCount;
 
-		unsafe {
-			fixed (char* cptr = s) {
-				char dummy = '\0';
-				if (bytes.Length == byteIndex)
-					return InternalGetBytes (
-						cptr + charIndex, charCount,
-						null, 0, ref dummy, true);
-				fixed (byte *bptr = bytes) {
-					return InternalGetBytes (
-						cptr + charIndex, charCount,
-						bptr + byteIndex, bytes.Length - byteIndex,
-						ref dummy, true);
+			// Encode the character pair value.
+			if (pair < (uint)0x0080) {
+				if (posn >= length) {
+					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
 				}
+				bytes[posn++] = (byte)pair;
+			} else if (pair < (uint)0x0800) {
+				if ((posn + 2) > length) {
+					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+				}
+				bytes[posn++] = (byte)(0xC0 | (pair >> 6));
+				bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+			} else if (pair < (uint)0x10000) {
+				if ((posn + 3) > length) {
+					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+				}
+				bytes[posn++] = (byte)(0xE0 | (pair >> 12));
+				bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+				bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+			} else {
+				if ((posn + 4) > length) {
+					throw new ArgumentException (_("Arg_InsufficientSpace"), "bytes");
+				}
+				bytes[posn++] = (byte)(0xF0 | (pair >> 18));
+				bytes[posn++] = (byte)(0x80 | ((pair >> 12) & 0x3F));
+				bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+				bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
 			}
 		}
-	}
 
-	#endregion
+		// Return the final count to the caller.
+		return posn - byteIndex;
+	}
 
 	// Internal version of "GetCharCount" which can handle a rolling
 	// state between multiple calls to this method.
 #if NET_2_0
+	// Internal version of "GetCharCount" which can handle a rolling
+	// state between multiple calls to this method.
 	private static int InternalGetCharCount (
 		byte[] bytes, int index, int count, uint leftOverBits,
 		uint leftOverCount, object provider,
@@ -463,20 +394,9 @@ Char.IsLetterOrDigit (pair);
 			throw new ArgumentOutOfRangeException ("count", _("ArgRange_Array"));
 		}
 
-		int length = 0;
-
-		if (leftOverCount == 0) {
-			int end = index + count;
-			for (; index < end; index++, count--) {
-				if (bytes [index] < 0x80)
-					length++;
-				else
-					break;
-			}
-		}
-
 		// Determine the number of characters that we have.
 		uint ch;
+		int length = 0;
 		uint leftBits = leftOverBits;
 		uint leftSoFar = (leftOverCount & (uint)0x0F);
 		uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
@@ -588,7 +508,7 @@ Char.IsLetterOrDigit (pair);
 			// We had left-over bytes that didn't make up
 			// a complete UTF-8 character sequence.
 #if NET_2_0
-			length += Fallback (provider, ref fallbackBuffer, bytes, index);
+			length += Fallback (provider, ref fallbackBuffer, bytes, index - 1);
 #else
 			if (throwOnInvalid)
 				throw new ArgumentException (_("Arg_InvalidUTF8"), "bytes");
@@ -610,7 +530,7 @@ Char.IsLetterOrDigit (pair);
 			else
 				buffer = ((Decoder) provider).FallbackBuffer;
 		}
-		buffer.Fallback (bytes, index);
+		buffer.Fallback (bytes, index - 1);
 		return buffer.Remaining;
 	}
 
@@ -625,7 +545,7 @@ Char.IsLetterOrDigit (pair);
 			else
 				buffer = ((Decoder) provider).FallbackBuffer;
 		}
-		buffer.Fallback (bytes, byteIndex);
+		buffer.Fallback (bytes, byteIndex - 1);
 		while (buffer.Remaining > 0)
 			chars [charIndex++] = buffer.GetNextChar ();
 	}
@@ -676,21 +596,10 @@ Char.IsLetterOrDigit (pair);
 		if (charIndex == chars.Length)
 			return 0;
 
-		int posn = charIndex;
-
-		if (leftOverCount == 0) {
-			int end = byteIndex + byteCount;
-			for (; byteIndex < end; posn++, byteIndex++, byteCount--) {
-				if (bytes [byteIndex] < 0x80)
-					chars [posn] = (char) bytes [byteIndex];
-				else
-					break;
-			}
-		}
-
 		// Convert the bytes into the output buffer.
 		uint ch;
 		int length = chars.Length;
+		int posn = charIndex;
 		uint leftBits = leftOverBits;
 		uint leftSoFar = (leftOverCount & (uint)0x0F);
 		uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
@@ -1005,48 +914,30 @@ Char.IsLetterOrDigit (pair);
 	private class UTF8Encoder : Encoder
 	{
 		private bool emitIdentifier;
-		private char leftOverForCount;
-		private char leftOverForConv;
+		private uint leftOver;
 
 		// Constructor.
 		public UTF8Encoder (bool emitIdentifier)
 		{
 			this.emitIdentifier = emitIdentifier;
-			leftOverForCount = '\0';
-			leftOverForConv = '\0';
+			leftOver = 0;
 		}
 
 		// Override inherited methods.
 		public override int GetByteCount (char[] chars, int index,
 					 int count, bool flush)
 		{
-			return InternalGetByteCount (chars, index, count, ref leftOverForCount, flush);
+			return InternalGetByteCount (chars, index, count, leftOver, flush);
 		}
 		public override int GetBytes (char[] chars, int charIndex,
-					 int charCount, byte[] bytes, int byteIndex, bool flush)
+					 int charCount, byte[] bytes, int byteCount, bool flush)
 		{
 			int result;
-			result = InternalGetBytes (chars, charIndex, charCount, bytes, byteIndex, ref leftOverForConv, flush);
+			result = InternalGetBytes (chars, charIndex, charCount, bytes, byteCount, ref leftOver, flush);
 			emitIdentifier = false;
 			return result;
 		}
 
-#if NET_2_0
-		public unsafe override int GetByteCount (char* chars, int count, bool flush)
-		{
-			return InternalGetByteCount (chars, count, ref leftOverForCount, flush);
-		}
-
-		public unsafe override int GetBytes (char* chars, int charCount,
-			byte* bytes, int byteCount, bool flush)
-		{
-			int result;
-			result = InternalGetBytes (chars, charCount, bytes, byteCount, ref leftOverForConv, flush);
-			emitIdentifier = false;
-			return result;
-		}
-#endif
-
 	} // class UTF8Encoder
 
 }; // class UTF8Encoding
diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index bc27eee15eb..8d662cd2ef7 100644
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,12 +1,9 @@
 2006-02-09  Miguel de Icaza  <miguel@novell.com>
 
-	* Monitor.cs: Patch from Thong Nguyen, Wait (.., Timeout) method
-	should allow a -1 (Timeout.Infinite) to mean indefinite wait (the
-	code already supported this.
+	* Monitor.cs: Patch from Thong Nguyen, Wait methods should allow a
+	-1 (Timeout.Infinite) to mean indefinite wait (the code already
+	supported this. 
 
-	Removed also a LAMESPEC for missing argument checking in Wait with
-	the int argument.
-	
 	Fixed the use of exceptions.
 
 2005-12-23  Dick Porter  <dick@ximian.com>
diff --git a/mcs/class/corlib/System/ArraySegment.cs b/mcs/class/corlib/System/ArraySegment.cs
index d0a7603a43e..f1fab2f2696 100644
--- a/mcs/class/corlib/System/ArraySegment.cs
+++ b/mcs/class/corlib/System/ArraySegment.cs
@@ -30,30 +30,19 @@ namespace System {
 	[Serializable]
 	public struct ArraySegment <T> {
 		T [] array;
-		int offset, count;
+		int offset, length;
 		
-		public ArraySegment (T [] array, int offset, int count)
+		public ArraySegment (T [] array, int offset, int length)
 		{
 			if (array == null)
 				throw new ArgumentNullException ("array");
 			
-			if (offset < 0)
-				throw new ArgumentOutOfRangeException ("offset", "Non-negative number required.");
-
-			if (count < 0)
-				throw new ArgumentOutOfRangeException ("count", "Non-negative number required.");
-
-			if (offset > array.Length)
+			if (offset >= array.Length || (offset + length) >= array.Length)
 				throw new ArgumentException ("out of bounds");
-
-			// now offset is valid, or just beyond the end.
-			// Check count -- do it this way to avoid overflow on 'offset + count'
-			if (array.Length - offset < count)
-				throw new ArgumentException ("out of bounds", "offset");
 			
 			this.array = array;
 			this.offset = offset;
-			this.count = count;
+			this.length = length;
 		}
 		
 		public ArraySegment (T [] array)
@@ -63,7 +52,7 @@ namespace System {
 			
 			this.array = array;
 			this.offset = 0;
-			this.count = array.Length;
+			this.length = array.Length;
 		}
 		
 		public T [] Array {
@@ -75,8 +64,8 @@ namespace System {
 		}
 		
 		public int Count {
-			get { return count; }
+			get { return length; }
 		}
 	}
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index a725b277a6e..9160a4323ff 100644
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,61 +1,13 @@
-2006-02-26  Gert Driesen  <drieseng@users.souceforge.net>
-
-	* DecimalFormatter.cs: Removed obsolete class, as it has been replaced
-	by NumberFormatter.
-	* DoubleFormatter.cs: Same.
-	* SingleFormatter.cs: Same.
-
-2006-02-21  Marek Safar  <marek.safar@seznam.cz>
-
-	* String.cs (Equals): Optimized for speed.
-
-2006-02-21 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* TermInfoDriver.cs: patch by Mike Hull that fixes bug #77518.
-
-Mon Feb 20 11:19:54 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* MonoType.cs: patch from Joachim Ante <joe@otee.dk> to
-	improve error messages.
-
 2006-02-15  Martin Baulig  <martin@ximian.com>
 
 	* Type.cs (Type.IsGenericInstance): Removed.
 
-2006-02-14  Ankit Jain  <jankit@novell.com>
-	    Raja R Harinath  <rharinath@novell.com>
- 
-	* ArraySegment.cs (.ctor): Fix bounds check. Rename param 'length' to
-	'count'.
-
-2006-02-11  Zoltan Varga  <vargaz@gmail.com>
-
-	* TermInfoDriver.cs (CreateKeyInfoFromInt): Fix handling of tab and its
-	friends.
-	
-	* TermInfoDriver.cs (GetWindowDimensions): Obtain the exact terminal
-	size using an icall.
-	(GetCursorPosition): Convert the row and column to 0 based indexing. 
-	Also fix reading of large values.
-	(CreateKeyInfoFromInt): Convert LF to ConsoleKey.Enter.
-
-	* ConsoleDriver.cs (GetTtySize): New icall.
-
 2006-02-10  Zoltan Varga  <vargaz@gmail.com>
 
 	* Array.cs: Fix some methods which previously returned Nullable<T>.
 
 	* Nullable.cs: Add T: struct constraint and fix constructor.
 
-Fri Feb 3 11:01:46 CET 2006 Paolo Molaro <lupus@ximian.com>
-
-	* String.cs: changed StartsWith/EndsWith to faster versions.
-
-2006-02-02 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* String.cs: implement 2.0 StartsWith and EndsWith new overloads. Based
-	on a patch by Thong Nguyen.
-
 2006-01-31  Zoltan Varga  <vargaz@gmail.com>
 
 	* String.cs: Implement one of the new net 2.0 Split methods.
@@ -74,15 +26,6 @@ Fri Feb 3 11:01:46 CET 2006 Paolo Molaro <lupus@ximian.com>
 	* Console.cs: if InternalCodePage returns -1, use the default encoding.
 	Also match the UTF8 one properly. Patch by wall_john@sohu.com.
 
-2006-01-19  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ModuleHandle.cs : GetPEKind() is not public in 2.0 RTM.
-
-2006-01-16  Alp Toker  <alp@atoker.com>
-
-	* TimeSpan.cs: Simple implementation of NET 2.0 TryParse() using
-	try/catch
-
 2006-01-05  Raja R Harinath  <rharinath@novell.com>
 
 	Fix regressions introduced by the fix to #71300.
diff --git a/mcs/class/corlib/System/ConsoleDriver.cs b/mcs/class/corlib/System/ConsoleDriver.cs
index 44b21638d6f..039ae8926cf 100644
--- a/mcs/class/corlib/System/ConsoleDriver.cs
+++ b/mcs/class/corlib/System/ConsoleDriver.cs
@@ -222,9 +222,6 @@ namespace System {
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		internal static extern bool SetBreak (bool wantBreak);
-
-		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		internal static extern bool GetTtySize (IntPtr handle, out int width, out int height);
 	}
 }
 #endif
diff --git a/mcs/class/corlib/System/DecimalFormatter.cs b/mcs/class/corlib/System/DecimalFormatter.cs
new file mode 100644
index 00000000000..959b86745e0
--- /dev/null
+++ b/mcs/class/corlib/System/DecimalFormatter.cs
@@ -0,0 +1,408 @@
+//
+// System.DecimalFormatter.cs
+//
+// Author:
+//   Martin Weindel (martin.weindel@t-online.de)
+//
+// (C) Martin Weindel, Derek Holden  dholden@draper.com
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+//
+// Internal class for formatting decimal numbers. 
+
+using System.Globalization;
+using System.Text;
+using System;
+
+namespace System 
+{
+
+    internal sealed class DecimalFormatter 
+    {
+
+        private static bool ParseFormat (string format, out char specifier,  out int precision)
+        {		 		 
+            precision = -1;
+            specifier = '\0';
+		    
+            int length = format.Length;
+            if (length < 1 || length > 3)
+                return false;
+		    
+            char[] chars = format.ToCharArray ();
+            specifier = Char.ToUpperInvariant(chars[0]);
+
+            if (length == 1) 
+                return true;
+		    
+            if (length == 2) 
+            {
+                if (chars[1] < '0' || chars[1] > '9')
+                    return false;
+			    
+                precision = chars[1] - '0';
+            } 
+            else 
+            {
+                if (chars[1] < '0' || chars[2] < '0' || chars[1] > '9' || chars[2] > '9')
+                    return false;
+			    
+                precision = (chars[1] - '0') * 10 + (chars[2] - '0');
+            }
+		    
+            return true;
+        }	 
+
+        public static string NumberToString(string format, NumberFormatInfo nfi, Decimal value)
+        {
+            char specifier;
+            int precision;
+	    format = format.Trim ();
+            if (!DecimalFormatter.ParseFormat(format, out specifier, out precision)) 
+            {
+                throw new FormatException (Locale.GetText ("The specified format is invalid"));
+            }
+
+            int digits = -1;
+            int decimals = 0;
+            // first calculate number of digits or decimals needed for format
+            switch (specifier)
+            {
+                case 'C':
+                    decimals = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;
+                    break;
+                case 'F': goto case 'N'; 
+                case 'N':
+                    decimals = (precision >= 0) ? precision : nfi.NumberDecimalDigits;
+                    break;
+                case 'G':
+                    digits = (precision >= 0) ? precision : 0;
+                    break;
+                case 'E': 
+                    digits = (precision >= 0) ? precision+1 : 7;
+                    break;
+                case 'P': 
+                    decimals = (precision >= 0) ? precision+2 : nfi.PercentDecimalDigits+2;
+                    break;
+                case 'Z':
+                    digits = 0;
+                    break;
+            }
+
+            // get digit string
+            const int bufSize = 40;
+            int decPos = 0, sign = 0;
+            char[] buf = new char[bufSize];
+            if (Decimal.decimal2string(ref value, digits, decimals, buf, bufSize, out decPos, out sign) != 0) 
+            {
+                throw new FormatException(); // should never happen 
+            }
+
+		string TempString = new String(buf);
+		TempString = TempString.Trim(new char[] {(char)0x0});
+		StringBuilder sb = new StringBuilder(TempString, TempString.Length);
+
+	    if (sb.ToString () == String.Empty && decPos > 0 && sign == 0)
+		    sb.Append ('0');
+
+            // now build the format
+            switch (specifier)
+            {
+                case 'C': return FormatCurrency(nfi, sb, decimals, decPos, sign);
+                case 'N': return FormatNumber(nfi, sb, decimals, decPos, sign);
+                case 'F': return FormatFixedPoint(nfi, sb, decimals, decPos, sign);
+                case 'G': return FormatGeneral(nfi, sb, digits, decPos, sign, format[0]);
+                case 'E': return FormatExponential(nfi, sb, digits, decPos, sign, format[0], true);
+                case 'P': return FormatPercent(nfi, sb, decimals, decPos, sign);
+                case 'Z': return FormatNormalized(nfi, sb, digits, decPos, sign);
+                default: 
+                    throw new FormatException (Locale.GetText ("The specified format is invalid"));
+            }
+        }
+
+        private static string FormatFixedPoint(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            if (decimals > 0)
+            {
+                sb.Insert((decPos <= 0) ? 1 : decPos, nfi.NumberDecimalSeparator);
+            }
+
+            if (sign != 0) 
+            {
+                sb.Insert(0, nfi.NegativeSign);
+            }
+
+            return sb.ToString();
+        }
+
+        private static string FormatExponential(NumberFormatInfo nfi, StringBuilder sb, 
+            int digits, int decPos, int sign, char echar, bool exp3flag)
+        {
+            // insert decimal separator
+            if (digits > 1 || (digits == 0 && sb.Length > 1)) 
+            {
+                sb.Insert(1, nfi.NumberDecimalSeparator);
+            }
+
+            // insert sign
+            if (sign != 0)
+            {
+                sb.Insert(0, nfi.NegativeSign);
+            }
+
+            // append exponent
+            sb.Append(echar);
+            decPos--;
+            sb.Append((decPos >= 0) ? nfi.PositiveSign : nfi.NegativeSign);
+            if (decPos < 0) decPos *= -1;
+            if (exp3flag) sb.Append('0');
+            sb.Append((char)('0' + decPos/10));
+            sb.Append((char)('0' + decPos%10));
+
+            return sb.ToString();
+        }
+
+        private static string FormatGeneral(NumberFormatInfo nfi, StringBuilder sb, 
+            int digits, int decPos, int sign, char gchar)
+        {
+		int dig = digits;
+#if NET_1_0
+		bool bFix = (digits == 0 && decPos >= -3) || (digits >= decPos && decPos >= -3 && digits != 0);
+#else
+		bool bFix = ((digits == 0) || ((digits >= decPos) && (digits != 0)));
+#endif
+		if (digits > 0) {
+			// remove trailing digits
+			while (sb.Length > 1 && (sb.Length > decPos || !bFix) && sb [sb.Length-1] == '0') {
+				sb.Remove (sb.Length-1, 1);
+				if (dig != 0)
+					dig--;
+			}
+		}
+
+		if (bFix) {
+			while (decPos <= 0) {
+				sb.Insert (0, '0');
+				if (dig != 0 && decPos != 0)
+					dig++;
+				decPos++;
+			}
+			return FormatFixedPoint(nfi, sb, sb.Length - decPos, decPos, sign);
+		}
+		else {
+			return FormatExponential(nfi, sb, dig, decPos, sign, (char)(gchar-2), false);
+		}
+        }
+
+        private static string FormatGroupAndDec(StringBuilder sb, int decimals, int decPos, 
+            int[] groupSizes, string groupSeparator, string decSeparator)
+        {
+            int offset = 0;
+
+            // Groups
+            if (decPos > 0) 
+            {
+                if (groupSizes != null) 
+                {
+                    int lastSize = 0;
+                    int digitCount = 0;
+                    for (int i = 0; i < groupSizes.GetLength(0); i++) 
+                    {
+                        int size = groupSizes[i];
+                        if (size > 0) 
+                        {
+                            digitCount += size;
+                            if (digitCount < decPos) 
+                            {
+                                sb.Insert(decPos - digitCount, groupSeparator);
+                                offset += groupSeparator.Length;
+                            }
+                        }
+                        lastSize = size;
+                    }
+
+                    if (lastSize > 0) 
+                    {
+                        while (true) 
+                        {
+                            digitCount +=lastSize;
+                            if (digitCount >= decPos) break;
+                            sb.Insert(decPos - digitCount, groupSeparator);
+                            offset += groupSeparator.Length;
+                        }
+                    }
+                }
+            }
+
+            if ((decimals > 0) && (decPos+offset < sb.Length))
+            {
+                sb.Insert(offset + ((decPos <= 0) ? 1 : decPos), decSeparator);
+            }
+
+            return sb.ToString();
+        }
+
+        private static string FormatNumber(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            string s = FormatGroupAndDec(sb, decimals, decPos,
+                nfi.NumberGroupSizes, nfi.NumberGroupSeparator, nfi.NumberDecimalSeparator);
+
+            // sign
+            if (sign != 0) 
+            {
+                switch (nfi.NumberNegativePattern)
+                {
+                    case 0:
+                        return "(" + s + ")";
+                    case 1:
+                        return nfi.NegativeSign + s;
+                    case 2:
+                        return nfi.NegativeSign + " " + s;
+                    case 3:
+                        return s + nfi.NegativeSign;
+                    case 4:
+                        return s + " " + nfi.NegativeSign;
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid NumberNegativePattern"));
+                }
+            } 
+            else 
+            {
+                return s;
+            }
+        }
+
+        private static string FormatCurrency(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            string s = FormatGroupAndDec(sb, decimals, decPos,
+                nfi.CurrencyGroupSizes, nfi.CurrencyGroupSeparator, nfi.CurrencyDecimalSeparator);
+
+            if (sign != 0) 
+            { // negative
+                switch (nfi.CurrencyNegativePattern) 
+                {
+                    case 0:
+                        return "(" + nfi.CurrencySymbol + s + ")";
+                    case 1:
+                        return nfi.NegativeSign + nfi.CurrencySymbol + s;
+                    case 2:
+                        return nfi.CurrencySymbol + nfi.NegativeSign + s;
+                    case 3:
+                        return nfi.CurrencySymbol + s + nfi.NegativeSign;
+                    case 4:
+                        return "(" + s + nfi.CurrencySymbol + ")";
+                    case 5:
+                        return nfi.NegativeSign + s + nfi.CurrencySymbol;
+                    case 6:
+                        return s + nfi.NegativeSign + nfi.CurrencySymbol;
+                    case 7:
+                        return s + nfi.CurrencySymbol + nfi.NegativeSign;
+                    case 8:
+                        return nfi.NegativeSign + s + " " + nfi.CurrencySymbol;
+                    case 9:
+                        return nfi.NegativeSign + nfi.CurrencySymbol + " " + s;
+                    case 10:
+                        return s + " " + nfi.CurrencySymbol + nfi.NegativeSign;
+                    case 11:
+                        return nfi.CurrencySymbol + " " + s + nfi.NegativeSign;
+                    case 12:
+                        return nfi.CurrencySymbol + " " + nfi.NegativeSign + s;
+                    case 13:
+                        return s + nfi.NegativeSign + " " + nfi.CurrencySymbol;
+                    case 14:
+                        return "(" + nfi.CurrencySymbol + " " + s + ")";
+                    case 15:
+                        return "(" + s + " " + nfi.CurrencySymbol + ")";
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid CurrencyNegativePattern"));
+                }
+            }
+            else 
+            {
+                switch (nfi.CurrencyPositivePattern) 
+                {
+                    case 0:
+                        return nfi.CurrencySymbol + s;
+                    case 1:
+                        return s + nfi.CurrencySymbol;
+                    case 2:
+                        return nfi.CurrencySymbol + " " + s;
+                    case 3:
+                        return s + " " + nfi.CurrencySymbol;
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid CurrencyPositivePattern"));
+                }
+            }
+        }
+
+        private static string FormatPercent(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            string s = FormatGroupAndDec(sb, decimals, decPos+2, 
+                nfi.PercentGroupSizes, nfi.PercentGroupSeparator, nfi.PercentDecimalSeparator);
+
+            if (sign != 0) 
+            { // negative
+                switch (nfi.PercentNegativePattern) 
+                {
+                    case 0:
+                        return nfi.NegativeSign + s + " " + nfi.PercentSymbol;
+                    case 1:
+                        return nfi.NegativeSign + s + nfi.PercentSymbol;
+                    case 2:
+                        return nfi.NegativeSign + nfi.PercentSymbol + s;
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid PercentNegativePattern"));
+                }
+            }
+            else 
+            {
+                switch (nfi.PercentPositivePattern) 
+                {
+                    case 0:
+                        return s + " " + nfi.PercentSymbol;
+                    case 1:
+                        return s + nfi.PercentSymbol;
+                    case 2:
+                        return nfi.PercentSymbol + s;
+                    default:
+                        throw new ArgumentException("Invalid PercentPositivePattern");
+                }
+            }
+        }
+
+	[MonoTODO]
+        private static string FormatNormalized(NumberFormatInfo nfi, StringBuilder sb, 
+            int digits, int decPos, int sign)
+        {
+            //LAMESPEC: how should this format look like ? Is this a fixed point format ?
+	    throw new NotImplementedException ();
+        }
+    }
+}
diff --git a/mcs/class/corlib/System/DoubleFormatter.cs b/mcs/class/corlib/System/DoubleFormatter.cs
new file mode 100644
index 00000000000..25e35798b97
--- /dev/null
+++ b/mcs/class/corlib/System/DoubleFormatter.cs
@@ -0,0 +1,57 @@
+//
+// System.DoubleFormatter.cs
+//
+// Author:
+//   Pedro Martinez Juli�  <yoros@wanadoo.es>
+//
+// Copyright (C) 2003 Pedro Mart�nez Juli� <yoros@wanadoo.es>
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Text;
+using System.Collections;
+using System.Globalization;
+
+namespace System
+{
+	internal class DoubleFormatter
+	{
+		private static FloatingPointFormatter fpf;
+
+		const double p = 100000000000000.0d;
+		const double p10 = 1000000000000000.0;
+		const int dec_len = 14;
+		const int dec_len_min = -30;
+		const double p2 = 10000000000000000.0d;
+		const double p102 = 100000000000000000.0;
+		const int dec_len2 = 16;
+		const int dec_len_min2 = -34;
+
+		internal static string NumberToString (string format, NumberFormatInfo nfi, double value)
+		{
+			if (fpf == null) {
+				fpf = new FloatingPointFormatter (p, p10, dec_len, dec_len_min, p2, p102, dec_len2, dec_len_min2);
+			}
+			return fpf.GetStringFrom (format, nfi, value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ModuleHandle.cs b/mcs/class/corlib/System/ModuleHandle.cs
index d45d385fa13..98bc38156e1 100644
--- a/mcs/class/corlib/System/ModuleHandle.cs
+++ b/mcs/class/corlib/System/ModuleHandle.cs
@@ -59,7 +59,7 @@ namespace System
 			}
 		}
 
-		internal void GetPEKind (out PortableExecutableKinds peKind, out ImageFileMachine machine)
+		public void GetPEKind (out PortableExecutableKinds peKind, out ImageFileMachine machine)
 		{
 			if (value == IntPtr.Zero)
 				throw new ArgumentNullException (String.Empty, "Invalid handle");
diff --git a/mcs/class/corlib/System/MonoType.cs b/mcs/class/corlib/System/MonoType.cs
index f79ab1ba418..d1fec3eb774 100644
--- a/mcs/class/corlib/System/MonoType.cs
+++ b/mcs/class/corlib/System/MonoType.cs
@@ -362,18 +362,14 @@ namespace System
 				name = attr.MemberName;
 			}
 			bool ignoreCase = (invokeAttr & BindingFlags.IgnoreCase) != 0;
-			string throwMissingMethodDescription = null;
+			bool throwMissingMethodException = false;
 			bool throwMissingFieldException = false;
-			
 			if ((invokeAttr & BindingFlags.InvokeMethod) != 0) {
 				MethodInfo[] methods = GetMethodsByName (name, invokeAttr, ignoreCase, this);
 				object state = null;
 				MethodBase m = binder.BindToMethod (invokeAttr, methods, ref args, modifiers, culture, namedParameters, out state);
 				if (m == null) {
-					if (methods.Length > 0)
-						throwMissingMethodDescription = "The best match for method " + name + " has some invalid parameter.";
-					else
-						throwMissingMethodDescription = "Cannot find method " + name + ".";
+					throwMissingMethodException = true;
 				} else {
 					object result = m.Invoke (target, invokeAttr, binder, args, culture);
 					binder.ReorderArgumentArray (ref args, state);
@@ -445,10 +441,10 @@ namespace System
 					return result;
 				}
 			}
-			if (throwMissingMethodDescription != null)
-				throw new MissingMethodException(throwMissingMethodDescription);
+			if (throwMissingMethodException)
+				throw new MissingMethodException();
 			if (throwMissingFieldException)
-				throw new MissingFieldException("Cannot find variable " + name + ".");
+				throw new MissingFieldException();
 
 			return null;
 		}
diff --git a/mcs/class/corlib/System/SingleFormatter.cs b/mcs/class/corlib/System/SingleFormatter.cs
new file mode 100644
index 00000000000..a2e071d1ad6
--- /dev/null
+++ b/mcs/class/corlib/System/SingleFormatter.cs
@@ -0,0 +1,56 @@
+//
+// System.SingleFormatter.cs
+//
+// Author:
+//   Pedro Martinez Juli� (yoros@wanadoo.es)
+//
+// Copyright (C) 2003 Pedro Mart�nez Juli� <yoros@wanadoo.es>
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Globalization;
+
+namespace System {
+
+	internal class SingleFormatter {
+
+		private static FloatingPointFormatter fpf;
+
+		const double p = 1000000.0d;
+		const double p10 = 10000000.0;
+		const int dec_len = 6;
+		const int dec_len_min = -14;
+
+		const double p2 = 10000000.0d;
+		const double p102 = 100000000.0;
+		const int dec_len2 = 7;
+		const int dec_len_min2 = -16;
+
+		public static string NumberToString (string format, NumberFormatInfo nfi, float value)
+		{
+			if (fpf == null) {
+				fpf = new FloatingPointFormatter (p, p10, dec_len, dec_len_min, p2, p102, dec_len2, dec_len_min2);
+			}
+			return fpf.GetStringFrom (format, nfi, value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/String.cs b/mcs/class/corlib/System/String.cs
index c29798450ee..822a6803a6a 100644
--- a/mcs/class/corlib/System/String.cs
+++ b/mcs/class/corlib/System/String.cs
@@ -72,42 +72,28 @@ namespace System
 			if (len != b.length)
 				return false;
 
-			fixed (char* s1 = &a.start_char, s2 = &b.start_char) {
-				char* s1_ptr = s1;
-				char* s2_ptr = s2;
-
-				while (len >= 8) {
-					if (((int*)s1_ptr)[0] != ((int*)s2_ptr)[0] ||
-						((int*)s1_ptr)[1] != ((int*)s2_ptr)[1] ||
-						((int*)s1_ptr)[2] != ((int*)s2_ptr)[2] ||
-						((int*)s1_ptr)[3] != ((int*)s2_ptr)[3])
-						return false;
-
-					s1_ptr += 8;
-					s2_ptr += 8;
-					len -= 8;
-				}
-
-				if (len >= 4) {
-					if (((int*)s1_ptr)[0] != ((int*)s2_ptr)[0] ||
-						((int*)s1_ptr)[1] != ((int*)s2_ptr)[1])
-						return false;
+			if (len == 0)
+				return true;
 
-					s1_ptr += 4;
-					s2_ptr += 4;
-					len -= 4;
-				}
+			fixed (char * s1 = &a.start_char, s2 = &b.start_char) {
+				// it must be one char, because 0 len is done above
+				if (len < 2)
+					return *s1 == *s2;
 
-				if (len > 1) {
-					if (((int*)s1_ptr)[0] != ((int*)s2_ptr)[0])
+				// check by twos
+				int * sint1 = (int *) s1, sint2 = (int *) s2;
+				int n2 = len >> 1;
+				do {
+					if (*sint1++ != *sint2++)
 						return false;
+				} while (--n2 != 0);
 
-					s1_ptr += 2;
-					s2_ptr += 2;
-					len -= 2;
-				}
+				// nothing left
+				if ((len & 1) == 0)
+					return true;
 
-				return len == 0 || *s1_ptr == *s2_ptr;
+				// check the last one
+				return *(char *) sint1 == *(char *) sint2;
 			}
 		}
 
@@ -939,49 +925,6 @@ namespace System
 		}
 
 #if NET_2_0
-		public bool StartsWith (string value, StringComparison comparisonType)
-		{
-			switch (comparisonType) {
-			case StringComparison.CurrentCulture:
-				return CultureInfo.CurrentCulture.CompareInfo.IsPrefix (this, value, CompareOptions.None);
-			case StringComparison.CurrentCultureIgnoreCase:
-				return CultureInfo.CurrentCulture.CompareInfo.IsPrefix (this, value, CompareOptions.IgnoreCase);
-			case StringComparison.InvariantCulture:
-				return CultureInfo.InvariantCulture.CompareInfo.IsPrefix (this, value, CompareOptions.None);
-			case StringComparison.InvariantCultureIgnoreCase:
-				return CultureInfo.InvariantCulture.CompareInfo.IsPrefix (this, value, CompareOptions.IgnoreCase);
-			case StringComparison.Ordinal:
-				return CultureInfo.CurrentCulture.CompareInfo.IsPrefix (this, value, CompareOptions.Ordinal);
-			case StringComparison.OrdinalIgnoreCase:
-				return CultureInfo.CurrentCulture.CompareInfo.IsPrefix (this, value, CompareOptions.OrdinalIgnoreCase);
-			default:
-				return false;
-			}
-		}
-
-		public bool EndsWith (string value, StringComparison comparisonType)
-		{
-			switch (comparisonType) {
-			case StringComparison.CurrentCulture:
-				return CultureInfo.CurrentCulture.CompareInfo.IsSuffix (this, value, CompareOptions.None);
-			case StringComparison.CurrentCultureIgnoreCase:
-				return CultureInfo.CurrentCulture.CompareInfo.IsSuffix (this, value, CompareOptions.IgnoreCase);
-			case StringComparison.InvariantCulture:
-				return CultureInfo.InvariantCulture.CompareInfo.IsSuffix (this, value, CompareOptions.None);
-			case StringComparison.InvariantCultureIgnoreCase:
-				return CultureInfo.InvariantCulture.CompareInfo.IsSuffix (this, value, CompareOptions.IgnoreCase);
-			case StringComparison.Ordinal:
-				return CultureInfo.CurrentCulture.CompareInfo.IsSuffix (this, value, CompareOptions.Ordinal);
-			case StringComparison.OrdinalIgnoreCase:
-				return CultureInfo.CurrentCulture.CompareInfo.IsSuffix (this, value, CompareOptions.OrdinalIgnoreCase);
-			default:
-				return false;
-			}
-		}
-
-#endif
-
-#if NET_2_0
 		public
 #else
 		internal
diff --git a/mcs/class/corlib/System/TermInfoDriver.cs b/mcs/class/corlib/System/TermInfoDriver.cs
index 99c3379aca7..67cb1a069c1 100644
--- a/mcs/class/corlib/System/TermInfoDriver.cs
+++ b/mcs/class/corlib/System/TermInfoDriver.cs
@@ -283,11 +283,9 @@ namespace System {
 				}
 
 				int b = stdin.ReadByte ();
-				while (b != '\x1b') {
+				if (b != '\x1b') {
 					AddToBuffer (b);
-					if (ConsoleDriver.InternalKeyAvailable (100) <= 0)
-						return;
-					b = stdin.ReadByte ();
+					return;
 				}
 
 				b = stdin.ReadByte ();
@@ -301,24 +299,18 @@ namespace System {
 				if (b != ';') {
 					row = b - '0';
 					b = stdin.ReadByte ();
-					while ((b >= '0') && (b <= '9')) {
+					if (b != ';')
 						row = row * 10 + b - '0';
-						b = stdin.ReadByte ();
-					}
-					// Row/col is 0 based
-					row --;
 				}
 
 				b = stdin.ReadByte ();
 				if (b != 'R') {
 					col = b - '0';
 					b = stdin.ReadByte ();
-					while ((b >= '0') && (b <= '9')) {
+					if (b != 'R') {
 						col = col * 10 + b - '0';
-						b = stdin.ReadByte ();
+						stdin.ReadByte (); // This should be the 'R'
 					}
-					// Row/col is 0 based
-					col --;
 				}
 			} finally {
 				Echo = prevEcho;
@@ -453,25 +445,21 @@ namespace System {
 		void GetWindowDimensions ()
 		{
 			//TODO: Handle SIGWINCH
-
-			/* Try the ioctl first */
-			if (!ConsoleDriver.GetTtySize (MonoIO.ConsoleOutput, out windowWidth, out windowHeight)) {
-				windowWidth = reader.Get (TermInfoNumbers.Columns);
-				string env = Environment.GetEnvironmentVariable ("COLUMNS");
-				if (env != null) {
-					try {
-						windowWidth = (int) UInt32.Parse (env);
-					} catch {
-					}
+			windowWidth = reader.Get (TermInfoNumbers.Columns);
+			string env = Environment.GetEnvironmentVariable ("COLUMNS");
+			if (env != null) {
+				try {
+					windowWidth = (int) UInt32.Parse (env);
+				} catch {
 				}
+			}
 
-				windowHeight = reader.Get (TermInfoNumbers.Lines);
-				env = Environment.GetEnvironmentVariable ("LINES");
-				if (env != null) {
-					try {
-						windowHeight = (int) UInt32.Parse (env);
-					} catch {
-					}
+			windowHeight = reader.Get (TermInfoNumbers.Lines);
+			env = Environment.GetEnvironmentVariable ("LINES");
+			if (env != null) {
+				try {
+					windowHeight = (int) UInt32.Parse (env);
+				} catch {
 				}
 			}
 
@@ -551,17 +539,12 @@ namespace System {
 		ConsoleKeyInfo CreateKeyInfoFromInt (int n)
 		{
 			char c = (char) n;
-			ConsoleKey key = (ConsoleKey)n;
+			ConsoleKey key = (ConsoleKey) n;
 			bool shift = false;
 			bool ctrl = false;
 			bool alt = false;
-
-			if (n == 10) {
-				key = ConsoleKey.Enter;
-			} else if (n == 8 || n == 9 || n == 12 || n == 13 || n == 19) {
-				/* Values in ConsoleKey */
-			} else if (n >= 1 && n <= 26) {
-				// For Ctrl-a to Ctrl-z.
+			// For Ctrl-a to Ctrl-z. Exception: those values in ConsoleKey
+			if (n >= 1 && n <= 26 && !(n == 8 || n == 9 || n == 12 || n == 13 || n == 19)) {
 				ctrl = true;
 				key = ConsoleKey.A + n - 1;
 			} else if (n == 27) {
diff --git a/mcs/class/corlib/System/TimeSpan.cs b/mcs/class/corlib/System/TimeSpan.cs
index dd7c230d845..adc326f1605 100644
--- a/mcs/class/corlib/System/TimeSpan.cs
+++ b/mcs/class/corlib/System/TimeSpan.cs
@@ -331,19 +331,6 @@ namespace System
 			return p.Execute ();
 		}
 
-#if NET_2_0
-		public static bool TryParse (string s, out TimeSpan result)
-		{
-			try {
-				result = Parse (s);
-				return true;
-			} catch {
-				result = TimeSpan.Zero;
-				return false;
-			}
-		}
-#endif
-
 		public TimeSpan Subtract (TimeSpan ts)
 		{
 			try {
diff --git a/mcs/class/corlib/Test/System.Collections.Generic/ChangeLog b/mcs/class/corlib/Test/System.Collections.Generic/ChangeLog
index 0b05f3c3989..0d2074f5d50 100644
--- a/mcs/class/corlib/Test/System.Collections.Generic/ChangeLog
+++ b/mcs/class/corlib/Test/System.Collections.Generic/ChangeLog
@@ -1,21 +1,3 @@
-2006-01-23  Raja R Harinath  <rharinath@novell.com>
-
-	* DictionaryTest.cs (IDictionary_*): Add a few tests for the
-	IDictionary explicit implementation.
-
-2006-01-19  Raja R Harinath  <rharinath@novell.com>
-
-	* DictionaryTest.cs: Remove NotWorking annotations.
-	(Empty_CopyTo, Empty_Values_CopyTo): Fix tests to check that
-	CopyTo from an empty dictionary does not throw an exception when
-	'index==array.Length'.
-	(PlainEnumeratorReturnTest): Check the type of 'Entry' property too.
-
-2006-01-19  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* DictionaryTest.cs : fixed several tests to not fail under .NET 2.0
-	  and thus marked some as NotWorking. Numbered some assertions.
-
 2005-12-21  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* ListTest.cs: Added test cases for #77039 for sorting a list with
diff --git a/mcs/class/corlib/Test/System.Collections.Generic/DictionaryTest.cs b/mcs/class/corlib/Test/System.Collections.Generic/DictionaryTest.cs
index 3192530e0ee..b4ad8323e7b 100644
--- a/mcs/class/corlib/Test/System.Collections.Generic/DictionaryTest.cs
+++ b/mcs/class/corlib/Test/System.Collections.Generic/DictionaryTest.cs
@@ -341,8 +341,10 @@ namespace MonoTests.System.Collections.Generic {
 			IEnumerator itr = ((IEnumerable)_dictionary).GetEnumerator ();
 			while (itr.MoveNext ())	{
 				object o = itr.Current;
-				Assert.AreEqual (typeof (KeyValuePair<string,object>), o.GetType (), "Current should return a type of KeyValuePair");
-				KeyValuePair<string,object> entry = (KeyValuePair<string,object>) itr.Current;
+				Assert.AreEqual (typeof (DictionaryEntry), o.GetType (), "Current should return a type of DictionaryEntry");
+				DictionaryEntry entry = (DictionaryEntry)itr.Current;
+				if (entry.Key.ToString () == "key4")
+					entry.Value = "value33";
 			}
 			Assert.AreEqual ("value4", _dictionary ["key4"].ToString (), "");
 		}
@@ -358,7 +360,7 @@ namespace MonoTests.System.Collections.Generic {
 			IEnumerator <KeyValuePair <string, object>> itr = ((IEnumerable <KeyValuePair <string, object>>)_dictionary).GetEnumerator ();
 			while (itr.MoveNext ())	{
 				object o = itr.Current;
-				Assert.AreEqual (typeof (KeyValuePair <string, object>), o.GetType (), "Current should return a type of KeyValuePair<object,string>");
+				Assert.AreEqual (typeof (KeyValuePair <string, object>), o.GetType (), "Current should return a type of DictionaryEntry");
 				KeyValuePair <string, object> entry = (KeyValuePair <string, object>)itr.Current;
 			}
 			Assert.AreEqual ("value4", _dictionary ["key4"].ToString (), "");
@@ -376,7 +378,9 @@ namespace MonoTests.System.Collections.Generic {
 			while (itr.MoveNext ()) {
 				object o = itr.Current;
 				Assert.AreEqual (typeof (DictionaryEntry), o.GetType (), "Current should return a type of DictionaryEntry");
-				DictionaryEntry entry = (DictionaryEntry) itr.Current;
+				DictionaryEntry entry = (DictionaryEntry)itr.Current;
+				if (entry.Key.ToString () == "key4")
+					entry.Value = "value33";
 			}
 			Assert.AreEqual ("value4", _dictionary ["key4"].ToString (), "");
 	
@@ -392,17 +396,23 @@ namespace MonoTests.System.Collections.Generic {
 	
 			int i = 0;
 			foreach (KeyValuePair <string, object> entry in _dictionary)
+			{
 				i++;
+			}
 			Assert.AreEqual(4, i, "fail1: foreach entry failed!");
 	
 			i = 0;
-			foreach (KeyValuePair <string, object> entry in ((IEnumerable)_dictionary))
+			foreach (DictionaryEntry entry in ((IEnumerable)_dictionary))
+			{
 				i++;
+			}
 			Assert.AreEqual(4, i, "fail2: foreach entry failed!");
 	
 			i = 0;
 			foreach (DictionaryEntry entry in ((IDictionary)_dictionary))
+			{
 				i++;
+			}
 			Assert.AreEqual (4, i, "fail3: foreach entry failed!");
 		}
 	
@@ -490,14 +500,13 @@ namespace MonoTests.System.Collections.Generic {
 		[Test]
 		public void PlainEnumeratorReturnTest ()
 		{
-			// Test that we return a KeyValuePair even for non-generic dictionary iteration
+			// Test that we return a DictionaryEntry for non-generic dictionary iteration
 			_dictionary["foo"] = "bar";
 			IEnumerator<KeyValuePair<string, object>> enumerator = _dictionary.GetEnumerator();
-			Assert.IsTrue(enumerator.MoveNext(), "#1");
-			Assert.AreEqual (typeof (KeyValuePair<string,object>), ((IEnumerator)enumerator).Current.GetType (), "#2");
-			Assert.AreEqual (typeof (DictionaryEntry), ((IDictionaryEnumerator)enumerator).Entry.GetType (), "#3");
-			Assert.AreEqual (typeof (KeyValuePair<string,object>), ((IDictionaryEnumerator)enumerator).Current.GetType (), "#4");
-			Assert.AreEqual (typeof (KeyValuePair<string,object>), ((object) enumerator.Current).GetType (), "#5");
+			Assert.IsTrue(enumerator.MoveNext());
+			Assert.IsTrue(((IEnumerator)enumerator).Current is DictionaryEntry);
+			Assert.IsTrue(((IDictionaryEnumerator)enumerator).Current is DictionaryEntry);
+			Assert.IsFalse(((object) enumerator.Current) is DictionaryEntry);
 		}
 
 		[Test, ExpectedException (typeof (InvalidOperationException))]
@@ -606,12 +615,11 @@ namespace MonoTests.System.Collections.Generic {
 		}
 
 		[Test]
-		public void Empty_KeysValues_CopyTo ()
+		public void Empty_Values_CopyTo ()
 		{
 			Dictionary<int, int> d = new Dictionary<int, int> ();
-			int[] array = new int[1];
-			d.Keys.CopyTo (array, array.Length);
-			d.Values.CopyTo (array, array.Length);
+			int[] array = new int[10];
+			d.Values.CopyTo (array, 0);
 		}
 
 		[Test]
@@ -619,67 +627,8 @@ namespace MonoTests.System.Collections.Generic {
 		{
 			Dictionary<int, int> d = new Dictionary<int, int> ();
 			ICollection c = (ICollection) d;
-			DictionaryEntry [] array = new DictionaryEntry [1];
-			c.CopyTo (array, array.Length);
-
-			ICollection<KeyValuePair<int,int>> c2 = d;
-			KeyValuePair<int,int> [] array2 = new KeyValuePair<int,int> [1];
-			c2.CopyTo (array2, array2.Length);
-		}
-
-		[Test]
-		public void IDictionary_Contains ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Add (1, 2);
-			Assert.IsTrue (d.Contains (1));
-			Assert.IsFalse (d.Contains (2));
-			Assert.IsFalse (d.Contains ("x"));
-		}
-
-		[Test, ExpectedException (typeof (ArgumentNullException))]
-		public void IDictionary_Contains2 ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Contains (null);
-		}
-
-		[Test, ExpectedException (typeof (ArgumentNullException))]
-		public void IDictionary_Add1 ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Add (null, 1);
-		}
-
-		[Test, ExpectedException (typeof (ArgumentException))]
-		public void IDictionary_Add2 ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Add ("bar", 1);
-		}
-
-		[Test, ExpectedException (typeof (ArgumentException))]
-		public void IDictionary_Add3 ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Add (1, "bar");
-		}
-
-		[Test]
-		public void IDictionary_Remove1 ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Add (1, 2);
-			d.Remove (1);
-			d.Remove (5);
-			d.Remove ("foo");
-		}
-
-		[Test, ExpectedException (typeof (ArgumentNullException))]
-		public void IDictionary_Remove2 ()
-		{
-			IDictionary d = new Dictionary<int, int> ();
-			d.Remove (null);
+			DictionaryEntry[] array = new DictionaryEntry[1];
+			c.CopyTo (array, 0);
 		}
 	}
 }
diff --git a/mcs/class/corlib/Test/System.IO/ChangeLog b/mcs/class/corlib/Test/System.IO/ChangeLog
index 7802da848dd..154c31cff56 100644
--- a/mcs/class/corlib/Test/System.IO/ChangeLog
+++ b/mcs/class/corlib/Test/System.IO/ChangeLog
@@ -1,25 +1,3 @@
-2006-02-27  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* FileTest.cs: In 2.0 profile, no longer expect IOException when path to
-	non-existing directory or file is specified in Get***Time(Utc) methods
-	(bug #77641). Renamed tests and removed trailing tabs. Removed
-	duplicate test. Fixed GetLastWriteTime(Utc) tests that used
-	GetLastAccessTime(Utc) instead of GetLastWriteTime(Utc).
-	* DirectoryTest.cs: No longer expect IOException when path to 
-	non-existing directory or file is specified in Get***Time(Utc) methods
-	(bug #77641).	
-
-2006-02-26  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* FileStreamTest.cs: Fixed tests for invalid share value to pass on
-	MS.NET 2.0, and all Mono profiles. Added test that verifies the 
-	correct behavior of all possible FileMode and FileAccess combinations.
-	Fixed compiler warning.
-
-2006-02-25  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* FileStreamTest.cs: Spaces to tabs, (re)numbered tests.
-
 2006-01-18  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* DirectoryInfoTest.cs : don't expect "/" as a top directory on
@@ -29,11 +7,7 @@
 
 	* TextWriterTest.cs: Make sure TextWriter calls the char[],int,int
 	overload when calling the char[].
-
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* FileTest.cs: Tests tests for read/writealltext.
-
+	
 2006-01-02  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* StreamReaderTest.cs: Added test case when reading a new line (see 
diff --git a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
index 88b0d26e499..c2d3ce6e4b9 100644
--- a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs
@@ -214,25 +214,13 @@ public class DirectoryTest : Assertion {
 	}

 	

 	[Test]

-#if !NET_2_0

 	[ExpectedException(typeof(IOException))]

-#endif

-	public void GetCreationTimeException_NonExistingPath ()

+	public void GetCreationTimeException3 ()

 	{

 		string path = TempFolder + DSC + "DirectoryTest.GetCreationTime.1";

 		DeleteDirectory (path);

 		try {

-			DateTime time = Directory.GetCreationTime (path);

-

-#if NET_2_0

-			DateTime expectedTime = (new DateTime (1601, 1, 1)).ToLocalTime ();

-			Assertion.AssertEquals ("#1", expectedTime.Year, time.Year);

-			Assertion.AssertEquals ("#2", expectedTime.Month, time.Month);

-			Assertion.AssertEquals ("#3", expectedTime.Day, time.Day);

-			Assertion.AssertEquals ("#4", expectedTime.Hour, time.Hour);

-			Assertion.AssertEquals ("#5", expectedTime.Second, time.Second);

-			Assertion.AssertEquals ("#6", expectedTime.Millisecond, time.Millisecond);

-#endif

+			Directory.GetCreationTime (path);

 		} finally {

 			DeleteDirectory (path);

 		}

@@ -267,25 +255,14 @@ public class DirectoryTest : Assertion {
 	}

 	

 	[Test]

-#if !NET_2_0

-	[ExpectedException (typeof (IOException))]

-#endif

-	public void GetCreationTimeUtc_NonExistingPath ()

+	[ExpectedException(typeof(IOException))]

+	public void GetCreationTimeUtcException3 ()

 	{

 		string path = TempFolder + DSC + "DirectoryTest.GetCreationTimeUtc.1";

 		DeleteDirectory (path);

 		

 		try {

-			DateTime time = Directory.GetCreationTimeUtc (path);

-

-#if NET_2_0

-			Assertion.AssertEquals ("#1", 1601, time.Year);

-			Assertion.AssertEquals ("#2", 1, time.Month);

-			Assertion.AssertEquals ("#3", 1, time.Day);

-			Assertion.AssertEquals ("#4", 0, time.Hour);

-			Assertion.AssertEquals ("#5", 0, time.Second);

-			Assertion.AssertEquals ("#6", 0, time.Millisecond);

-#endif

+			Directory.GetCreationTimeUtc (path);

 		} finally {

 			DeleteDirectory (path);

 		}

@@ -320,26 +297,14 @@ public class DirectoryTest : Assertion {
 	}

 	

 	[Test]

-#if !NET_2_0

-	[ExpectedException (typeof (IOException))]

-#endif

-	public void GetLastAccessTime_NonExistingPath ()

+	[ExpectedException(typeof(IOException))]

+	public void GetLastAccessTimeException3 ()

 	{

 		string path = TempFolder + DSC + "DirectoryTest.GetLastAccessTime.1";

 		DeleteDirectory (path);

 		

 		try {

-			DateTime time = Directory.GetLastAccessTime (path);

-

-#if NET_2_0

-			DateTime expectedTime = (new DateTime (1601, 1, 1)).ToLocalTime ();

-			Assertion.AssertEquals ("#1", expectedTime.Year, time.Year);

-			Assertion.AssertEquals ("#2", expectedTime.Month, time.Month);

-			Assertion.AssertEquals ("#3", expectedTime.Day, time.Day);

-			Assertion.AssertEquals ("#4", expectedTime.Hour, time.Hour);

-			Assertion.AssertEquals ("#5", expectedTime.Second, time.Second);

-			Assertion.AssertEquals ("#6", expectedTime.Millisecond, time.Millisecond);

-#endif

+			Directory.GetLastAccessTime (path);

 		} finally {

 			DeleteDirectory (path);

 		}

@@ -374,24 +339,13 @@ public class DirectoryTest : Assertion {
 	}

 	

 	[Test]

-#if !NET_2_0

-	[ExpectedException (typeof (IOException))]

-#endif

-	public void GetLastAccessTimeUtc_NonExistingPath ()

+	[ExpectedException(typeof(IOException))]

+	public void GetLastAccessTimeUtcException3 ()

 	{

 		string path = TempFolder + DSC + "DirectoryTest.GetLastAccessTimeUtc.1";

 		DeleteDirectory (path);

 		try {

-			DateTime time = Directory.GetLastAccessTimeUtc (path);

-

-#if NET_2_0

-			Assertion.AssertEquals ("#1", 1601, time.Year);

-			Assertion.AssertEquals ("#2", 1, time.Month);

-			Assertion.AssertEquals ("#3", 1, time.Day);

-			Assertion.AssertEquals ("#4", 0, time.Hour);

-			Assertion.AssertEquals ("#5", 0, time.Second);

-			Assertion.AssertEquals ("#6", 0, time.Millisecond);

-#endif

+			Directory.GetLastAccessTimeUtc (path);

 		} finally {

 			DeleteDirectory (path);

 		}

@@ -426,25 +380,13 @@ public class DirectoryTest : Assertion {
 	}

 	

 	[Test]

-#if !NET_2_0

-	[ExpectedException (typeof (IOException))]

-#endif

-	public void GetLastWriteTime_NonExistingPath ()

+	[ExpectedException(typeof(IOException))]

+	public void GetLastWriteTimeException3 ()

 	{

 		string path = TempFolder + DSC + "DirectoryTest.GetLastWriteTime.1";

 		DeleteDirectory (path);

 		try {

-			DateTime time = Directory.GetLastWriteTime (path);

-

-#if NET_2_0

-			DateTime expectedTime = (new DateTime (1601, 1, 1)).ToLocalTime ();

-			Assertion.AssertEquals ("#1", expectedTime.Year, time.Year);

-			Assertion.AssertEquals ("#2", expectedTime.Month, time.Month);

-			Assertion.AssertEquals ("#3", expectedTime.Day, time.Day);

-			Assertion.AssertEquals ("#4", expectedTime.Hour, time.Hour);

-			Assertion.AssertEquals ("#5", expectedTime.Second, time.Second);

-			Assertion.AssertEquals ("#6", expectedTime.Millisecond, time.Millisecond);

-#endif

+			Directory.GetLastWriteTime (path);

 		} finally {

 			DeleteDirectory (path);

 		}

@@ -475,28 +417,17 @@ public class DirectoryTest : Assertion {
 	[ExpectedException(typeof(ArgumentException))]	

 	public void GetLastWriteTimeUtcException2 ()

 	{

-		Directory.GetLastWriteTimeUtc ("");

+		Directory.GetLastAccessTimeUtc ("");

 	}

 	

 	[Test]

-#if !NET_2_0

-	[ExpectedException (typeof (IOException))]

-#endif

-	public void GetLastWriteTimeUtc_NonExistingPath ()

+	[ExpectedException(typeof(IOException))]

+	public void GetLastWriteTimeUtcException3 ()

 	{

 		string path = TempFolder + DSC + "DirectoryTest.GetLastWriteTimeUtc.1";

 		DeleteDirectory (path);

 		try {

-			DateTime time = Directory.GetLastWriteTimeUtc (path);

-

-#if NET_2_0

-			Assertion.AssertEquals ("#1", 1601, time.Year);

-			Assertion.AssertEquals ("#2", 1, time.Month);

-			Assertion.AssertEquals ("#3", 1, time.Day);

-			Assertion.AssertEquals ("#4", 0, time.Hour);

-			Assertion.AssertEquals ("#5", 0, time.Second);

-			Assertion.AssertEquals ("#6", 0, time.Millisecond);

-#endif

+			Directory.GetLastAccessTimeUtc (path);

 		} finally {

 			DeleteDirectory (path);

 		}

@@ -507,14 +438,14 @@ public class DirectoryTest : Assertion {
 	[ExpectedException(typeof(ArgumentException))]	

 	public void GetLastWriteTimeUtcException4 ()

 	{

-		Directory.GetLastWriteTimeUtc ("    ");

+		Directory.GetLastAccessTimeUtc ("    ");

 	}

 

 	[Test]

 	[ExpectedException(typeof(ArgumentException))]	

 	public void GetLastWriteTimeUtcException5 ()

 	{

-		Directory.GetLastWriteTimeUtc (Path.InvalidPathChars[0].ToString ());

+		Directory.GetLastAccessTimeUtc (Path.InvalidPathChars [0].ToString ());

 	}

 

 	[Test]

@@ -1038,7 +969,7 @@ public class DirectoryTest : Assertion {
 //			DeleteDirectory (path);

 //		}

 //	}

-

+
 	[Test]

 	[ExpectedException(typeof(ArgumentNullException))]

 	public void SetCreationTimeException1 ()

diff --git a/mcs/class/corlib/Test/System.IO/FileStreamTest.cs b/mcs/class/corlib/Test/System.IO/FileStreamTest.cs
index 0851359f694..5453579f0b8 100644
--- a/mcs/class/corlib/Test/System.IO/FileStreamTest.cs
+++ b/mcs/class/corlib/Test/System.IO/FileStreamTest.cs
@@ -9,6 +9,7 @@
 // (c) 2003 Ximian, Inc. (http://www.ximian.com)
 // 
 
+
 using NUnit.Framework;
 using System;
 using System.IO;
@@ -17,29 +18,29 @@ using System.Text;
 namespace MonoTests.System.IO
 {
 	[TestFixture]
-	public class FileStreamTest
-	{
+        public class FileStreamTest : Assertion
+        {
 		string TempFolder = Path.Combine (Path.GetTempPath (), "MonoTests.System.IO.Tests");
 		static readonly char DSC = Path.DirectorySeparatorChar;
 
 		[TearDown]
-		public void TearDown ()
+		public void TearDown()
 		{
 			if (Directory.Exists (TempFolder))
 				Directory.Delete (TempFolder, true);
 		}
 
 		[SetUp]
-		public void SetUp ()
+                public void SetUp ()
 		{
 			if (Directory.Exists (TempFolder))
 				Directory.Delete (TempFolder, true);
 
 			Directory.CreateDirectory (TempFolder);
-		}
+                }
 
-		public void TestCtr ()
-		{
+                public void TestCtr ()
+                {
 			string path = TempFolder + DSC + "testfilestream.tmp.1";
 			DeleteFile (path);
 			FileStream stream = null;
@@ -49,18 +50,18 @@ namespace MonoTests.System.IO
 
 				if (stream != null)
 					stream.Close ();
-				DeleteFile (path);
+				DeleteFile (path);                	
 			}
-		}
+                }
 
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
-		public void CtorArgumentException1 ()
+                public void CtorArgumentException1 ()
 		{
 			FileStream stream;
-			stream = new FileStream ("", FileMode.Create);
+                	stream = new FileStream ("", FileMode.Create);
 			stream.Close ();
-		}
+		}			
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
@@ -77,14 +78,14 @@ namespace MonoTests.System.IO
 			string path = TempFolder + DSC + "thisfileshouldnotexists.test";
 			DeleteFile (path);
 			FileStream stream = null;
-			try {
-				stream = new FileStream (TempFolder + DSC + "thisfileshouldnotexists.test", FileMode.Open);
-			} finally {
+                	try {                		
+                		stream = new FileStream (TempFolder + DSC + "thisfileshouldnotexists.test", FileMode.Open);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
 				DeleteFile (path);
-			}
-		}
+                	}
+		}			
 
 		[Test]
 		[ExpectedException (typeof (FileNotFoundException))]
@@ -94,15 +95,15 @@ namespace MonoTests.System.IO
 			DeleteFile (path);
 			FileStream stream = null;
 
-			try {
-				stream = new FileStream (TempFolder + DSC + "thisfileshouldNOTexists.test", FileMode.Truncate);
-			} finally {
+                	try {
+                		stream = new FileStream (TempFolder + DSC + "thisfileshouldNOTexists.test", FileMode.Truncate);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
 
 				DeleteFile (path);
-			}
-		}
+                	}
+		} 
 
 		[Test]
 		[ExpectedException (typeof (IOException))]
@@ -111,17 +112,17 @@ namespace MonoTests.System.IO
 			string path = TempFolder + DSC + "thisfileshouldexists.test";
 			FileStream stream = null;
 			DeleteFile (path);
-			try {
-				stream = new FileStream (path, FileMode.CreateNew);
-				stream.Close ();
-				stream = null;
-				stream = new FileStream (path, FileMode.CreateNew);
-			} finally {
-
+                	try {
+                		stream = new FileStream (path, FileMode.CreateNew);
+                		stream.Close ();
+                		stream = null;
+                		stream = new FileStream (path, FileMode.CreateNew);
+                	} finally {
+                		
 				if (stream != null)
 					stream.Close ();
 				DeleteFile (path);
-			}
+                	} 
 
 		}
 
@@ -132,14 +133,14 @@ namespace MonoTests.System.IO
 			FileStream stream = null;
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
-			try {
-				stream = new FileStream (path, FileMode.Append | FileMode.CreateNew);
-			} finally {
+                	try {
+                		stream = new FileStream (path, FileMode.Append | FileMode.CreateNew);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
 				DeleteFile (path);
-			}
-		}
+                	}                	
+		}			
 
 		[Test]
 		[ExpectedException (typeof (ArgumentOutOfRangeException))]
@@ -148,13 +149,13 @@ namespace MonoTests.System.IO
 			FileStream stream = null;
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
-			try {
-				stream = new FileStream ("test.test.test", FileMode.Append | FileMode.Open);
-			} finally {
+                	try {
+                		stream = new FileStream ("test.test.test", FileMode.Append | FileMode.Open);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
 				DeleteFile (path);
-			}
+                	}                	
 		}
 
 		private void CtorDirectoryNotFoundException (FileMode mode)
@@ -163,17 +164,17 @@ namespace MonoTests.System.IO
 			if (Directory.Exists (path))
 				Directory.Delete (path, true);
 
-			FileStream stream = null;
-			try {
-				stream = new FileStream (path + DSC + "eitherthisfile.test", mode);
-			} finally {
+			FileStream stream = null;				
+                	try {
+                		stream = new FileStream (path + DSC + "eitherthisfile.test", mode);
+                	} finally {
 
 				if (stream != null)
 					stream.Close ();
 
 				if (Directory.Exists (path))
 					Directory.Delete (path, true);
-			}
+                	}                		
 		}
 
 		[Test]
@@ -219,22 +220,15 @@ namespace MonoTests.System.IO
 		}
 
 		[Test]
-#if NET_2_0
-		// FileShare.Inheritable is ignored, but file does not exist
-		[ExpectedException (typeof (FileNotFoundException))]
-#else
-		// share: Enum value was out of legal range.
-		// (FileShare.Inheritable is not valid)
 		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-#endif
 		public void CtorArgumentOutOfRangeException3 ()
 		{
 			string path = TempFolder + DSC + "CtorArgumentOutOfRangeException1";
 			DeleteFile (path);
-
+			
 			FileStream stream = null;
 			try {
-				stream = new FileStream (path, FileMode.Open, FileAccess.Read, FileShare.Inheritable);
+				stream = new FileStream (path, FileMode.CreateNew, FileAccess.Read, FileShare.None | FileShare.Inheritable);
 			} finally {
 				if (stream != null)
 					stream.Close ();
@@ -257,7 +251,7 @@ namespace MonoTests.System.IO
 					stream.Close ();
 				DeleteFile (path);
 			}
-		}
+		}			
 
 		[Test]
 		[ExpectedException (typeof (ArgumentOutOfRangeException))]
@@ -277,317 +271,81 @@ namespace MonoTests.System.IO
 				DeleteFile (path);
 			}
 		}
-
+				
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void CtorArgumentException2 ()
 		{
-			// FileMode.CreateNew && FileAccess.Read
+               		// FileMode.CreateNew && FileAccess.Read
 
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
-			FileStream stream = null;
+                	FileStream stream = null;
 
 			DeleteFile (path);
 
-			try {
-				stream = new FileStream (".test.test.test.2", FileMode.CreateNew, FileAccess.Read, FileShare.None | FileShare.Write);
-			} finally {
+                	try {
+                		stream = new FileStream (".test.test.test.2", FileMode.CreateNew, FileAccess.Read, FileShare.None | FileShare.Write);
+                	} finally {                		
 
 				if (stream != null)
 					stream.Close ();
 				DeleteFile (path);
-			}
+                	}
 		}
 
 
 		[Test]
-#if NET_2_0
-		// FileShare.Inheritable is ignored, but file does not exist
-		[ExpectedException (typeof (FileNotFoundException))]
-#else
-		// share: Enum value was out of legal range.
-		// (FileShare.Inheritable is not valid)
 		[ExpectedException (typeof (ArgumentOutOfRangeException))]
-#endif
 		public void CtorArgumentOutOfRangeException5 ()
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
 
 			FileStream stream = null;
-			try {
-				stream = new FileStream (path, FileMode.Open, FileAccess.Read, FileShare.Inheritable | FileShare.ReadWrite);
-			} finally {
+                	try {
+                		stream = new FileStream (path, FileMode.CreateNew, FileAccess.Read, FileShare.Inheritable | FileShare.ReadWrite);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
 				DeleteFile (path);
-			}
-		}
-
+                	}
+		}		
 
+		
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void CtorArgumentException3 ()
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
-			FileStream stream = null;
+                	FileStream stream = null;
 
 			DeleteFile (path);
-
-			try {
-				stream = new FileStream (".test.test.test.2", FileMode.Truncate, FileAccess.Read);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-		}
-
-		[Test]
-		public void ModeAndAccessCombinations ()
-		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
-			DeleteFile (path);
-			FileStream stream = null;
-
-			// Append / Read
-			try {
-				// Append access can be requested only in write-only mode
-				stream = new FileStream (path, FileMode.Append, FileAccess.Read);
-				Assert.Fail ("#A1");
-			} catch (ArgumentException ex) {
-				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Append / ReadWrite
-			try {
-				// Append access can be requested only in write-only mode
-				stream = new FileStream (path, FileMode.Append, FileAccess.ReadWrite);
-				Assert.Fail ("#B1");
-			} catch (ArgumentException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Append / Write
-			try {
-				stream = new FileStream (path, FileMode.Append, FileAccess.Write);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Create / Read
-			try {
-				stream = new FileStream (path, FileMode.Create, FileAccess.Read);
-				Assert.Fail ("#C1");
-			} catch (ArgumentException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#C2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Create / ReadWrite
-			try {
-				stream = new FileStream (path, FileMode.Create, FileAccess.ReadWrite);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Create / Write
-			try {
-				stream = new FileStream (path, FileMode.Create, FileAccess.Write);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// CreateNew / Read
-			try {
-				stream = new FileStream (path, FileMode.CreateNew, FileAccess.Read);
-				Assert.Fail ("#D1");
-			} catch (ArgumentException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#D2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// CreateNew / ReadWrite
-			try {
-				stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// CreateNew / Write
-			try {
-				stream = new FileStream (path, FileMode.CreateNew, FileAccess.Write);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Open / Read
-			try {
-				stream = new FileStream (path, FileMode.Open, FileAccess.Read);
-				Assert.Fail ("#E1");
-			} catch (FileNotFoundException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (FileNotFoundException), ex.GetType (), "#E2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Open / ReadWrite
-			try {
-				stream = new FileStream (path, FileMode.Open, FileAccess.ReadWrite);
-				Assert.Fail ("#F1");
-			} catch (FileNotFoundException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (FileNotFoundException), ex.GetType (), "#F2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Open / Write
-			try {
-				stream = new FileStream (path, FileMode.Open, FileAccess.Write);
-				Assert.Fail ("#G1");
-			} catch (FileNotFoundException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (FileNotFoundException), ex.GetType (), "#G2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// OpenOrCreate / Read
-			try {
-				stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Read);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// OpenOrCreate / ReadWrite
-			try {
-				stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-			} finally {
+                	
+                	try {
+                		stream = new FileStream (".test.test.test.2", FileMode.Truncate, FileAccess.Read);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
-
+				
 				DeleteFile (path);
-			}
-
-			// OpenOrCreate / Write
-			try {
-				stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Write);
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Truncate / Read
-			try {
-				stream = new FileStream (path, FileMode.Truncate, FileAccess.Read);
-				Assert.Fail ("#H1");
-			} catch (ArgumentException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#H2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Truncate / ReadWrite
-			try {
-				stream = new FileStream (path, FileMode.Truncate, FileAccess.ReadWrite);
-				Assert.Fail ("#I1");
-			} catch (FileNotFoundException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (FileNotFoundException), ex.GetType (), "#I2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
-
-			// Truncate / Write
-			try {
-				stream = new FileStream (path, FileMode.Truncate, FileAccess.Write);
-				Assert.Fail ("#J1");
-			} catch (FileNotFoundException ex) {
-				// make sure it is exact this exception, and not a derived type
-				Assert.AreEqual (typeof (FileNotFoundException), ex.GetType (), "#J2");
-			} finally {
-				if (stream != null)
-					stream.Close ();
-
-				DeleteFile (path);
-			}
+                	}                	
 		}
 
 		[Test, ExpectedException (typeof (IOException))]
 		public void CtorIOException2 ()
 		{
 			FileStream stream = null;
-			try {
-				stream = new FileStream (new IntPtr (Int32.MaxValue), FileAccess.Read);
-			} finally {
+                	try {
+                		stream = new FileStream (new IntPtr (Int32.MaxValue), FileAccess.Read);
+                	} finally {
 				if (stream != null)
 					stream.Close ();
-			}
+                	}
 		}
 
-		[Test, ExpectedException (typeof (IOException))]
+		[Test, ExpectedException(typeof(IOException))]
 		public void CtorIOException ()
-		{
+		{			
 			string path = TempFolder + DSC + "CTorIOException.Test";
 			FileStream stream = null;
 			FileStream stream2 = null;
@@ -595,7 +353,7 @@ namespace MonoTests.System.IO
 
 			try {
 				stream = new FileStream (path, FileMode.CreateNew);
-
+			
 				// used by an another process
 				stream2 = new FileStream (path, FileMode.OpenOrCreate);
 			} finally {
@@ -679,10 +437,10 @@ namespace MonoTests.System.IO
 			FileStream stream = null;
 			try {
 				stream = new FileStream (TempFolder, FileMode.Open, FileAccess.Read);
-			} finally {
+                	} finally {
 				if (stream != null)
 					stream.Close ();
-			}
+                	}
 		}
 
 		[Test]
@@ -694,8 +452,8 @@ namespace MonoTests.System.IO
 
 			FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite, 8);
 
-			byte[] outbytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-			byte[] bytes = new byte[15];
+			byte[] outbytes = new byte [] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+			byte[] bytes = new byte [15];
 
 			// Check that the data is flushed when we overflow the buffer
 			// with a large amount of data
@@ -705,7 +463,7 @@ namespace MonoTests.System.IO
 
 			stream.Read (bytes, 0, 15);
 			for (int i = 0; i < 15; ++i)
-				Assert.AreEqual (i + 1, bytes[i], "#1");
+				AssertEquals (i + 1, bytes [i]);
 
 			// Check that the data is flushed when we overflow the buffer
 			// with a small amount of data
@@ -716,7 +474,7 @@ namespace MonoTests.System.IO
 			stream.Read (bytes, 0, 15);
 			stream.Seek (15, SeekOrigin.Begin);
 			for (int i = 0; i < 15; ++i)
-				Assert.AreEqual (i + 1, bytes[i], "#2");
+				AssertEquals (i + 1, bytes [i]);
 			stream.Close ();
 		}
 
@@ -731,13 +489,13 @@ namespace MonoTests.System.IO
 
 			FileStream stream = new FileStream (path, FileMode.CreateNew);
 
-			byte[] outbytes = new byte[] { 1, 2, 3, 4 };
+			byte[] outbytes = new byte [] {1, 2, 3, 4};
 
 			stream.Write (outbytes, 0, 4);
-			Assert.AreEqual (4, stream.Length);
+			AssertEquals (stream.Length, 4);
 			stream.Close ();
 		}
-
+		
 		[Test]
 		public void Flush ()
 		{
@@ -746,295 +504,301 @@ namespace MonoTests.System.IO
 			FileStream stream2 = null;
 
 			DeleteFile (path);
-
+			
 			try {
 				stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
 				stream2 = new FileStream (path, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
 
-				stream.Write (new byte[] { 1, 2, 3, 4, 5 }, 0, 5);
-
-				byte[] bytes = new byte[5];
+				stream.Write (new byte [] {1, 2, 3, 4, 5}, 0, 5);
+						
+				byte [] bytes = new byte [5];
 				stream2.Read (bytes, 0, 5);
-				Assert.AreEqual (0, bytes[0], "#A1");
-				Assert.AreEqual (0, bytes[1], "#A2");
-				Assert.AreEqual (0, bytes[2], "#A3");
-				Assert.AreEqual (0, bytes[3], "#A4");
-
+				
+				AssertEquals ("test#01", 0, bytes [0]);
+				AssertEquals ("test#02", 0, bytes [1]);
+				AssertEquals ("test#03", 0, bytes [2]);
+				AssertEquals ("test#04", 0, bytes [3]);
+				
 				stream.Flush ();
-				stream2.Read (bytes, 0, 5);
-				Assert.AreEqual (1, bytes[0], "#B1");
-				Assert.AreEqual (2, bytes[1], "#B2");
-				Assert.AreEqual (3, bytes[2], "#B3");
-				Assert.AreEqual (4, bytes[3], "#B4");
+				stream2.Read (bytes, 0, 5);			
+				AssertEquals ("test#05", 1, bytes [0]);
+				AssertEquals ("test#06", 2, bytes [1]);
+				AssertEquals ("test#07", 3, bytes [2]);
+				AssertEquals ("test#08", 4, bytes [3]);
 			} finally {
 				if (stream != null)
 					stream.Close ();
 				if (stream2 != null)
 					stream2.Close ();
-
+				
 				DeleteFile (path);
 			}
 		}
-
-		public void TestDefaultProperties ()
-		{
+                
+                public void TestDefaultProperties ()
+                {
 			string path = TempFolder + Path.DirectorySeparatorChar + "testfilestream.tmp.2";
 			DeleteFile (path);
 
-			FileStream stream = new FileStream (path, FileMode.Create);
-
-			Assert.IsTrue (stream.CanRead, "#A1");
-			Assert.IsTrue (stream.CanSeek, "#A2");
-			Assert.IsTrue (stream.CanWrite, "#A3");
-			Assert.IsFalse (stream.IsAsync, "#A4");
-			Assert.IsTrue (stream.Name.EndsWith (path), "#A5");
-			Assert.AreEqual (0, stream.Position, "#A6");
-			Assert.AreEqual ("System.IO.FileStream", stream.ToString (), "#A7");
-			stream.Close ();
+                	FileStream stream = new FileStream (path, FileMode.Create);
+                	
+                	AssertEquals ("test#01", true, stream.CanRead);
+                	AssertEquals ("test#02", true, stream.CanSeek);
+                	AssertEquals ("test#03", true, stream.CanWrite);
+                	AssertEquals ("test#04", false, stream.IsAsync);
+                	AssertEquals ("test#05", true, stream.Name.EndsWith (path));
+                	AssertEquals ("test#06", 0, stream.Position);
+                	AssertEquals ("test#07", "System.IO.FileStream", stream.ToString());                	
+                	stream.Close ();
+                	DeleteFile (path);
+
+                	stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Read);
+                	AssertEquals ("test#08", true, stream.CanRead);
+                	AssertEquals ("test#09", true, stream.CanSeek);
+                	AssertEquals ("test#10", false, stream.CanWrite);
+                	AssertEquals ("test#11", false, stream.IsAsync);
+                	AssertEquals ("test#12", true, stream.Name.EndsWith (path));
+                	AssertEquals ("test#13", 0, stream.Position);
+                	AssertEquals ("test#14", "System.IO.FileStream", stream.ToString());                	
+                	stream.Close ();
+                	
+               		stream = new FileStream (path, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite);
+                	AssertEquals ("test#15", false, stream.CanRead);
+                	AssertEquals ("test#16", true, stream.CanSeek);
+                	AssertEquals ("test#17", true, stream.CanWrite);
+                	AssertEquals ("test#18", false, stream.IsAsync);
+                	AssertEquals ("test#19", true, stream.Name.EndsWith ("testfilestream.tmp.2"));
+                	AssertEquals ("test#20", 0, stream.Position);
+                	AssertEquals ("test#21", "System.IO.FileStream", stream.ToString());                	
+                	stream.Close ();
 			DeleteFile (path);
+                }
 
-			stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Read);
-			Assert.IsTrue (stream.CanRead, "#B1");
-			Assert.IsTrue (stream.CanSeek, "#B2");
-			Assert.IsFalse (stream.CanWrite, "#B3");
-			Assert.IsFalse (stream.IsAsync, "#B4");
-			Assert.IsTrue (stream.Name.EndsWith (path), "#B5");
-			Assert.AreEqual (0, stream.Position, "#B6");
-			Assert.AreEqual ("System.IO.FileStream", stream.ToString (), "#B7");
-			stream.Close ();
-
-			stream = new FileStream (path, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite);
-			Assert.IsFalse (stream.CanRead, "#C1");
-			Assert.IsTrue (stream.CanSeek, "#C2");
-			Assert.IsTrue (stream.CanWrite, "#C3");
-			Assert.IsFalse (stream.IsAsync, "#C4");
-			Assert.IsTrue (stream.Name.EndsWith ("testfilestream.tmp.2"), "#C5");
-			Assert.AreEqual (0, stream.Position, "#C6");
-			Assert.AreEqual ("System.IO.FileStream", stream.ToString (), "#C7");
-			stream.Close ();
-			DeleteFile (path);
-		}
-
-		[Category ("NotWorking")]
+		[Category("NotWorking")]
 		// Bug: 71371 -> duplicate and WONTFIX.
 		public void TestLock_FailsOnMono ()
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "TestLock";
-			DeleteFile (path);
-
-			FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
-
-			stream.Write (new Byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }, 0, 10);
-			stream.Close ();
-
-			stream = new FileStream (path, FileMode.Open, FileAccess.ReadWrite);
-
-			stream.Lock (0, 5);
-
-			FileStream stream2 = new FileStream (path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                	DeleteFile (path);
+
+                	FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
+                	                	
+	               	stream.Write (new Byte [] {0,1,2,3,4,5,6,7,8,9,10}, 0, 10);                              	
+                	stream.Close ();
+
+                	stream = new FileStream (path, FileMode.Open, FileAccess.ReadWrite);
+                	
+                	stream.Lock (0, 5);
+                	
+                	FileStream stream2 = new FileStream (path , FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                	
+                	byte [] bytes = new byte [5];
+                	try {                		
+                		stream2.Read (bytes, 0, 5);
+                		Fail ();
+                	} catch (Exception e) {
+                		
+                		// locked
+                		AssertEquals ("test#01", typeof (IOException), e.GetType ());
+                	}
 
-			byte[] bytes = new byte[5];
-			try {
-				stream2.Read (bytes, 0, 5);
-				Assert.Fail ("#1");
-			} catch (Exception e) {
-				Assert.AreEqual (typeof (IOException), e.GetType (), "#2");
-			}
-
-			stream.Close ();
-			stream2.Close ();
-
-			DeleteFile (path);
+					stream.Close ();
+                	stream2.Close ();
+                	
+                	DeleteFile (path);                		
 		}
-
-		public void TestLock ()
-		{
+		    
+                public void TestLock()
+                {
 			string path = TempFolder + Path.DirectorySeparatorChar + "TestLock";
+                	DeleteFile (path);
+
+                	FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
+                	                	
+	               	stream.Write (new Byte [] {0,1,2,3,4,5,6,7,8,9,10}, 0, 10);                              	
+                	stream.Close ();
+
+                	stream = new FileStream (path, FileMode.Open, FileAccess.ReadWrite);
+                	
+                	stream.Lock (0, 5);
+                	
+                	FileStream stream2 = new FileStream (path , FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                	
+                	byte [] bytes = new byte [5];
+                	try {                		
+                		stream2.Read (bytes, 0, 5);
+                		Fail ();
+                	} catch (Exception e) {
+                		
+                		// locked
+                		// AssertEquals ("test#01", typeof (IOException), e.GetType ());
+				//
+				// Moved into the previous test case.
+                	}
+               		                
+                	stream2.Seek (5, SeekOrigin.Begin);
+               		stream2.Read (bytes, 0, 5);
+                	
+                	AssertEquals ("test#02", 5, bytes [0]);
+                	AssertEquals ("test#03", 6, bytes [1]);                	
+                	AssertEquals ("test#04", 7, bytes [2]); 
+                	AssertEquals ("test#05", 8, bytes [3]);
+                	AssertEquals ("test#06", 9, bytes [4]);
+                	
+                	stream.Unlock (0,5);
+                	stream2.Seek (0, SeekOrigin.Begin);	
+               		stream2.Read (bytes, 0, 5);
+                	
+                	AssertEquals ("test#02", 0, bytes [0]);
+                	AssertEquals ("test#03", 1, bytes [1]);                	
+                	AssertEquals ("test#04", 2, bytes [2]); 
+                	AssertEquals ("test#05", 3, bytes [3]);
+                	AssertEquals ("test#06", 4, bytes [4]);
+                	                	
+                	stream.Close ();
+                	stream2.Close ();
+                	
+                	DeleteFile (path);                		
+                }
+
+                [Test]
+                public void Seek ()
+                {
+                	string path = TempFolder + DSC + "FST.Seek.Test";
+                	DeleteFile (path);			
+
+                	FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
+                	FileStream stream2 = new FileStream (path, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
+                	
+                	stream.Write (new byte [] {1, 2, 3, 4, 5, 6, 7, 8, 10}, 0, 9);
+                	AssertEquals ("test#01", 5, stream2.Seek (5, SeekOrigin.Begin));
+                	AssertEquals ("test#02", -1, stream2.ReadByte ());
+                	
+                	AssertEquals ("test#03", 2, stream2.Seek (-3, SeekOrigin.Current));
+                	AssertEquals ("test#04", -1, stream2.ReadByte ());
+                	
+                	AssertEquals ("test#05", 12, stream.Seek (3, SeekOrigin.Current));
+                	AssertEquals ("test#06", -1, stream.ReadByte ());
+
+                	AssertEquals ("test#07", 5, stream.Seek (-7, SeekOrigin.Current));
+                	AssertEquals ("test#08", 6, stream.ReadByte ());
+
+                	AssertEquals ("test#09", 5, stream2.Seek (5, SeekOrigin.Begin));
+                	AssertEquals ("test#10", 6, stream2.ReadByte ());
+                	                	
+                	stream.Close ();
+                	stream2.Close ();
+			
 			DeleteFile (path);
+                }
+
+                public void TestSeek ()
+                {
+					string path = TempFolder + Path.DirectorySeparatorChar + "TestSeek";
+					DeleteFile (path);
+
+					FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
+                	stream.Write (new byte[] {1, 2, 3, 4, 5, 6, 7, 8 , 9, 10}, 0, 10);
+                	
+                	stream.Seek (5, SeekOrigin.End);
+                	AssertEquals ("test#01", -1, stream.ReadByte ());
+
+                	stream.Seek (-5, SeekOrigin.End);
+                	AssertEquals ("test#02", 6, stream.ReadByte ());
+                	
+                	try {
+                		stream.Seek (-11, SeekOrigin.End);
+                		Fail ();
+                	} catch (Exception e) {
+                		AssertEquals ("test#03", typeof (IOException), e.GetType ());
+                	}
+                	
+					stream.Seek (19, SeekOrigin.Begin);
+					AssertEquals ("test#04", -1, stream.ReadByte ());
+
+					stream.Seek (1, SeekOrigin.Begin);
+					AssertEquals ("test#05", 2, stream.ReadByte ());
+                	
+					stream.Seek (3, SeekOrigin.Current);
+					AssertEquals ("test#06", 6, stream.ReadByte ());
+
+					stream.Seek (-2, SeekOrigin.Current);
+					AssertEquals ("test#07", 5, stream.ReadByte ());
+
+					stream.Flush ();
+
+					// Test that seeks work correctly when seeking inside the buffer
+					stream.Seek (0, SeekOrigin.Begin);
+					stream.WriteByte (0);
+					stream.WriteByte (1);
+					stream.Seek (0, SeekOrigin.Begin);
+					byte[] buf = new byte [1];
+					buf [0] = 2;
+					stream.Write (buf, 0, 1);
+					stream.Write (buf, 0, 1);
+					stream.Flush ();
+					stream.Seek (0, SeekOrigin.Begin);
+					AssertEquals ("test#08", 2, stream.ReadByte ());
+					AssertEquals ("test#09", 2, stream.ReadByte ());
 
-			FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
-
-			stream.Write (new Byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }, 0, 10);
-			stream.Close ();
-
-			stream = new FileStream (path, FileMode.Open, FileAccess.ReadWrite);
-
-			stream.Lock (0, 5);
-
-			FileStream stream2 = new FileStream (path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-
-			byte[] bytes = new byte[5];
-			try {
-				stream2.Read (bytes, 0, 5);
-				Assert.Fail ("#A1");
-			} catch (Exception) {
-				// Bug #71371: on MS.NET you get an IOException detailing a lock
-				// Assert.AreEqual (typeof (IOException), e.GetType (), "#A2");
-			}
-
-			stream2.Seek (5, SeekOrigin.Begin);
-			stream2.Read (bytes, 0, 5);
-
-			Assert.AreEqual (5, bytes[0], "#B1");
-			Assert.AreEqual (6, bytes[1], "#B2");
-			Assert.AreEqual (7, bytes[2], "#B3");
-			Assert.AreEqual (8, bytes[3], "#B4");
-			Assert.AreEqual (9, bytes[4], "#B5");
-
-			stream.Unlock (0, 5);
-			stream2.Seek (0, SeekOrigin.Begin);
-			stream2.Read (bytes, 0, 5);
-
-			Assert.AreEqual (0, bytes[0], "#C1");
-			Assert.AreEqual (1, bytes[1], "#C2");
-			Assert.AreEqual (2, bytes[2], "#C3");
-			Assert.AreEqual (3, bytes[3], "#C4");
-			Assert.AreEqual (4, bytes[4], "#C5");
-
-			stream.Close ();
-			stream2.Close ();
-
-			DeleteFile (path);
-		}
-
-		[Test]
-		public void Seek ()
-		{
-			string path = TempFolder + DSC + "FST.Seek.Test";
-			DeleteFile (path);
-
-			FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
-			FileStream stream2 = new FileStream (path, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
-
-			stream.Write (new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 10 }, 0, 9);
-			Assert.AreEqual (5, stream2.Seek (5, SeekOrigin.Begin), "#1");
-			Assert.AreEqual (-1, stream2.ReadByte (), "#2");
-
-			Assert.AreEqual (2, stream2.Seek (-3, SeekOrigin.Current), "#3");
-			Assert.AreEqual (-1, stream2.ReadByte (), "#4");
-
-			Assert.AreEqual (12, stream.Seek (3, SeekOrigin.Current), "#5");
-			Assert.AreEqual (-1, stream.ReadByte (), "#6");
-
-			Assert.AreEqual (5, stream.Seek (-7, SeekOrigin.Current), "#7");
-			Assert.AreEqual (6, stream.ReadByte (), "#8");
-
-			Assert.AreEqual (5, stream2.Seek (5, SeekOrigin.Begin), "#9");
-			Assert.AreEqual (6, stream2.ReadByte (), "#10");
-
-			stream.Close ();
-			stream2.Close ();
-
-			DeleteFile (path);
-		}
-
-		public void TestSeek ()
-		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "TestSeek";
-			DeleteFile (path);
-
-			FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
-			stream.Write (new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }, 0, 10);
-
-			stream.Seek (5, SeekOrigin.End);
-			Assert.AreEqual (-1, stream.ReadByte (), "#1");
-
-			stream.Seek (-5, SeekOrigin.End);
-			Assert.AreEqual (6, stream.ReadByte (), "#2");
-
-			try {
-				stream.Seek (-11, SeekOrigin.End);
-				Assert.Fail ("#3");
-			} catch (Exception e) {
-				Assert.AreEqual (typeof (IOException), e.GetType (), "#4");
-			}
-
-			stream.Seek (19, SeekOrigin.Begin);
-			Assert.AreEqual (-1, stream.ReadByte (), "#5");
-
-			stream.Seek (1, SeekOrigin.Begin);
-			Assert.AreEqual (2, stream.ReadByte (), "#6");
-
-			stream.Seek (3, SeekOrigin.Current);
-			Assert.AreEqual (6, stream.ReadByte (), "#7");
-
-			stream.Seek (-2, SeekOrigin.Current);
-			Assert.AreEqual (5, stream.ReadByte (), "#8");
-
-			stream.Flush ();
-
-			// Test that seeks work correctly when seeking inside the buffer
-			stream.Seek (0, SeekOrigin.Begin);
-			stream.WriteByte (0);
-			stream.WriteByte (1);
-			stream.Seek (0, SeekOrigin.Begin);
-			byte[] buf = new byte[1];
-			buf[0] = 2;
-			stream.Write (buf, 0, 1);
-			stream.Write (buf, 0, 1);
-			stream.Flush ();
-			stream.Seek (0, SeekOrigin.Begin);
-			Assert.AreEqual (2, stream.ReadByte (), "#9");
-			Assert.AreEqual (2, stream.ReadByte (), "#10");
-
-			stream.Close ();
-
-			DeleteFile (path);
-		}
+					stream.Close ();
 
-		public void TestClose ()
-		{
+					DeleteFile (path);
+                }
+                
+                public void TestClose ()
+                {
 			string path = TempFolder + Path.DirectorySeparatorChar + "TestClose";
 			DeleteFile (path);
-
-			FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
-
-			stream.Write (new byte[] { 1, 2, 3, 4 }, 0, 4);
-			stream.ReadByte ();
-			stream.Close ();
-
-			try {
-				stream.ReadByte ();
-				Assert.Fail ("#A1");
+                	
+                	FileStream stream = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite);
+
+                	stream.Write (new byte [] {1, 2, 3, 4}, 0, 4);
+                	stream.ReadByte ();                	
+                	stream.Close ();
+			
+			try {                	
+                		stream.ReadByte ();
+				Fail ();
 			} catch (Exception e) {
-				Assert.AreEqual (typeof (ObjectDisposedException), e.GetType (), "#A2");
+				AssertEquals ("test#01", typeof (ObjectDisposedException), e.GetType ());
 			}
-
-			try {
-				stream.WriteByte (64);
-				Assert.Fail ("#B1");
+			
+			try {                	
+                		stream.WriteByte (64);
+				Fail ();
 			} catch (Exception e) {
-				Assert.AreEqual (typeof (ObjectDisposedException), e.GetType (), "#B2");
+				AssertEquals ("test#02", typeof (ObjectDisposedException), e.GetType ());
 			}
-
-			try {
-				stream.Flush ();
-				Assert.Fail ("#C1");
+			
+			try {                	
+                		stream.Flush ();
+				Fail ();
 			} catch (Exception e) {
-				Assert.AreEqual (typeof (ObjectDisposedException), e.GetType (), "#C2");
+				AssertEquals ("test#03", typeof (ObjectDisposedException), e.GetType ());
 			}
-
-			try {
+			
+			try { 
 				long l = stream.Length;
-				Assert.Fail ("#D1");
+				Fail ();
 			} catch (Exception e) {
-				Assert.AreEqual (typeof (ObjectDisposedException), e.GetType (), "#D2");
+				AssertEquals ("test#04", typeof (ObjectDisposedException), e.GetType ());
 			}
-
-			try {
+			
+			try { 
 				long l = stream.Position;
-				Assert.Fail ("#E1");
+				Fail ();
 			} catch (Exception e) {
-				Assert.AreEqual (typeof (ObjectDisposedException), e.GetType (), "#E2");
+				AssertEquals ("test#05", typeof (ObjectDisposedException), e.GetType ());
 			}
 
-			Assert.IsFalse (stream.CanRead, "#F1");
-			Assert.IsFalse (stream.CanSeek, "#F2");
-			Assert.IsFalse (stream.CanWrite, "#F3");
-			Assert.IsTrue (stream.Name.EndsWith (path), "#F4");
+			AssertEquals ("test#06", false, stream.CanRead);
+                	AssertEquals ("test#07", false, stream.CanSeek);
+                	AssertEquals ("test#08", false, stream.CanWrite);                	
+                	AssertEquals ("test#09", true, stream.Name.EndsWith (path));
 
-			DeleteFile (path);
-		}
+			DeleteFile (path);                	
+                }
 
 
 		/// <summary>
@@ -1043,7 +807,7 @@ namespace MonoTests.System.IO
 		/// <see cref="FileStream.Write(byte[], int, int)" /> method is called.
 		/// </summary>
 		[Test]
-		[ExpectedException (typeof (NotSupportedException))]
+		[ExpectedException (typeof(NotSupportedException))]
 		public void TestWriteVerifyAccessMode ()
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
@@ -1058,7 +822,7 @@ namespace MonoTests.System.IO
 				stream.Write (buffer, 0, buffer.Length);
 			} finally {
 				if (stream != null)
-					stream.Close ();
+					stream.Close();
 				DeleteFile (path);
 			}
 		}
@@ -1100,7 +864,7 @@ namespace MonoTests.System.IO
 			DeleteFile (path);
 
 			FileStream stream = null;
-			byte[] buffer = new byte[100];
+			byte[] buffer = new byte [100];
 
 			try {
 				stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Write);
@@ -1130,7 +894,7 @@ namespace MonoTests.System.IO
 				int readByte = stream.ReadByte ();
 			} finally {
 				if (stream != null)
-					stream.Close ();
+					stream.Close();
 				DeleteFile (path);
 			}
 		}
@@ -1145,17 +909,17 @@ namespace MonoTests.System.IO
 
 			FileStream s = new FileStream (path, FileMode.Create);
 			using (FileStream s2 = new FileStream (s.Handle, FileAccess.Write, false)) {
-				byte[] buf = new byte[2];
-				buf[0] = (int) '1';
+				byte[] buf = new byte [2];
+				buf [0] = (int)'1';
 				s2.Write (buf, 0, 1);
 			}
 
 			s.Position = 0;
-			Assert.AreEqual ((int) '1', s.ReadByte ());
+			AssertEquals ((int)'1', s.ReadByte ());
 			s.Close ();
 		}
 
-		private void DeleteFile (string path)
+		private void DeleteFile (string path) 
 		{
 			if (File.Exists (path))
 				File.Delete (path);
@@ -1172,7 +936,7 @@ namespace MonoTests.System.IO
 				stream.Read (new byte[0], -1, 1);
 			}
 		}
-
+			
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void Read_OffsetOverflow ()
@@ -1259,7 +1023,7 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
-		public void Seek_InvalidSeekOrigin ()
+		public void Seek_InvalidSeekOrigin () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
@@ -1271,13 +1035,13 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
-		public void Constructor_InvalidFileHandle ()
+		public void Constructor_InvalidFileHandle () 
 		{
-			new FileStream ((IntPtr) (-1L), FileAccess.Read);
+			new FileStream ((IntPtr)(-1L), FileAccess.Read);
 		}
 
 		[Test]
-		public void PositionAfterSetLength ()
+		public void PositionAfterSetLength () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
@@ -1286,13 +1050,13 @@ namespace MonoTests.System.IO
 				stream.SetLength (32);
 				stream.Position = 32;
 				stream.SetLength (16);
-				Assert.AreEqual (16, stream.Position);
+				AssertEquals ("Position==16", 16, stream.Position);
 			}
 		}
 
 		[Test]
 		[ExpectedException (typeof (ObjectDisposedException))]
-		public void SetLength_Disposed ()
+		public void SetLength_Disposed () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
@@ -1303,7 +1067,7 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[ExpectedException (typeof (ObjectDisposedException))]
-		public void Position_Disposed ()
+		public void Position_Disposed () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
@@ -1314,7 +1078,7 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[ExpectedException (typeof (ObjectDisposedException))]
-		public void BeginRead_Disposed ()
+		public void BeginRead_Disposed () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
@@ -1325,7 +1089,7 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[ExpectedException (typeof (ObjectDisposedException))]
-		public void BeginWrite_Disposed ()
+		public void BeginWrite_Disposed () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
@@ -1336,34 +1100,34 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[ExpectedException (typeof (ObjectDisposedException))]
-		public void Lock_Disposed ()
+		public void Lock_Disposed () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
 			FileStream stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Write);
 			stream.Close ();
-			stream.Lock (0, 1);
+			stream.Lock (0,1);
 		}
 
 		[Test]
 		[ExpectedException (typeof (ObjectDisposedException))]
-		public void Unlock_Disposed ()
+		public void Unlock_Disposed () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
 			FileStream stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Write);
 			stream.Close ();
-			stream.Unlock (0, 1);
+			stream.Unlock (0,1);
 		}
 
 		[Test]
-		public void ReadBytePastEndOfStream ()
+		public void ReadBytePastEndOfStream () 
 		{
 			string path = TempFolder + Path.DirectorySeparatorChar + "temp";
 			DeleteFile (path);
 			using (FileStream stream = new FileStream (path, FileMode.OpenOrCreate, FileAccess.Read)) {
 				stream.Seek (0, SeekOrigin.End);
-				Assert.AreEqual (-1, stream.ReadByte ());
+				AssertEquals ("ReadByte", -1, stream.ReadByte ());
 				stream.Close ();
 			}
 		}
@@ -1377,11 +1141,12 @@ namespace MonoTests.System.IO
 				FileStream fs = new FileStream (fn, FileMode.Create);
 				BufferedStream bs = new BufferedStream (fs);
 				fs.Close ();
-
+				
 				bs.SetLength (1000);
 			} finally {
 				File.Delete (fn);
 			}
 		}
-	}
+        }
 }
+
diff --git a/mcs/class/corlib/Test/System.IO/FileTest.cs b/mcs/class/corlib/Test/System.IO/FileTest.cs
index eb3c29ce913..3c2635d892a 100644
--- a/mcs/class/corlib/Test/System.IO/FileTest.cs
+++ b/mcs/class/corlib/Test/System.IO/FileTest.cs
@@ -601,6 +601,19 @@ namespace MonoTests.System.IO
                 	}
 		}
 
+                [Test]
+                [ExpectedException(typeof(IOException))]
+                public void TestGetCreationTimeException ()
+                {
+                        // Test nonexistent files
+                        string path2 = TempFolder + Path.DirectorySeparatorChar + "filedoesnotexist";
+			DeleteFile (path2);
+                        // should throw an exception
+                        File.GetCreationTime (path2);
+                }
+                
+
+
 		// Setting the creation time on Unix is not possible
                 [Test]
                 public void CreationTime ()
@@ -755,280 +768,211 @@ namespace MonoTests.System.IO
 		}
 	
 		[Test]
-#if !NET_2_0
 		[ExpectedException(typeof(IOException))]
-#endif
-		public void GetCreationTime_NonExistingPath ()
+		public void GetCreationTimeException3 ()
 		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "GetCreationTimeException3";
-			DeleteFile (path);
-			DateTime time = File.GetCreationTime (path);
-
-#if NET_2_0
-			DateTime expectedTime = (new DateTime (1601, 1, 1)).ToLocalTime ();
-			Assertion.AssertEquals ("#1", expectedTime.Year, time.Year);
-			Assertion.AssertEquals ("#2", expectedTime.Month, time.Month);
-			Assertion.AssertEquals ("#3", expectedTime.Day, time.Day);
-			Assertion.AssertEquals ("#4", expectedTime.Hour, time.Hour);
-			Assertion.AssertEquals ("#5", expectedTime.Second, time.Second);
-			Assertion.AssertEquals ("#6", expectedTime.Millisecond, time.Millisecond);
-#endif
+                        string path = TempFolder + Path.DirectorySeparatorChar + "GetCreationTimeException3";                	
+			DeleteFile (path);		
+			File.GetCreationTime (path);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetCreationTimeException4 ()
 		{
 			File.GetCreationTime ("    ");
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetCreationTimeException5 ()
 		{
 			File.GetCreationTime (Path.InvalidPathChars [0].ToString ());
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentNullException))]
+		[ExpectedException(typeof(ArgumentNullException))]	
 		public void GetCreationTimeUtcException1 ()
 		{
 			File.GetCreationTimeUtc (null as string);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetCreationTimeUtcException2 ()
 		{
 			File.GetCreationTimeUtc ("");
 		}
 	
 		[Test]
-#if !NET_2_0
-		[ExpectedException (typeof (IOException))]
-#endif
-		public void GetCreationTimeUtc_NonExistingPath ()
+		[ExpectedException(typeof(IOException))]
+		public void GetCreationTimeUtcException3 ()
 		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "GetCreationTimeUtcException3";
-			DeleteFile (path);
-			DateTime time = File.GetCreationTimeUtc (path);
-
-#if NET_2_0
-			Assertion.AssertEquals ("#1", 1601, time.Year);
-			Assertion.AssertEquals ("#2", 1, time.Month);
-			Assertion.AssertEquals ("#3", 1, time.Day);
-			Assertion.AssertEquals ("#4", 0, time.Hour);
-			Assertion.AssertEquals ("#5", 0, time.Second);
-			Assertion.AssertEquals ("#6", 0, time.Millisecond);
-#endif
+                        string path = TempFolder + Path.DirectorySeparatorChar + "GetCreationTimeUtcException3";                	
+			DeleteFile (path);		
+			File.GetCreationTimeUtc (path);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetCreationTimeUtcException4 ()
 		{
 			File.GetCreationTimeUtc ("    ");
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetCreationTimeUtcException5 ()
 		{
 			File.GetCreationTime (Path.InvalidPathChars [0].ToString ());
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentNullException))]
+		[ExpectedException(typeof(ArgumentNullException))]	
 		public void GetLastAccessTimeException1 ()
 		{
 			File.GetLastAccessTime (null as string);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastAccessTimeException2 ()
 		{
 			File.GetLastAccessTime ("");
 		}
 	
 		[Test]
-#if !NET_2_0
-		[ExpectedException (typeof (IOException))]
-#endif
-		public void GetLastAccessTime_NonExistingPath ()
+		[ExpectedException(typeof(IOException))]
+		public void GetLastAccessTimeException3 ()
 		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeException3";
-			DeleteFile (path);
-			DateTime time = File.GetLastAccessTime (path);
-
-#if NET_2_0
-			DateTime expectedTime = (new DateTime (1601, 1, 1)).ToLocalTime ();
-			Assertion.AssertEquals ("#1", expectedTime.Year, time.Year);
-			Assertion.AssertEquals ("#2", expectedTime.Month, time.Month);
-			Assertion.AssertEquals ("#3", expectedTime.Day, time.Day);
-			Assertion.AssertEquals ("#4", expectedTime.Hour, time.Hour);
-			Assertion.AssertEquals ("#5", expectedTime.Second, time.Second);
-			Assertion.AssertEquals ("#6", expectedTime.Millisecond, time.Millisecond);
-#endif
+                        string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeException3";                	
+			DeleteFile (path);		
+			File.GetLastAccessTime (path);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastAccessTimeException4 ()
 		{
 			File.GetLastAccessTime ("    ");
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastAccessTimeException5 ()
 		{
 			File.GetLastAccessTime (Path.InvalidPathChars [0].ToString ());
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentNullException))]
+		[ExpectedException(typeof(ArgumentNullException))]	
 		public void GetLastAccessTimeUtcException1 ()
 		{
 			File.GetLastAccessTimeUtc (null as string);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastAccessTimeUtcException2 ()
 		{
 			File.GetLastAccessTimeUtc ("");
 		}
 	
 		[Test]
-#if !NET_2_0
-		[ExpectedException (typeof (IOException))]
-#endif
-		public void GetLastAccessTimeUtc_NonExistingPath ()
+		[ExpectedException(typeof(IOException))]
+		public void GetLastAccessTimeUtcException3 ()
 		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeUtcException3";
-			DeleteFile (path);
-			DateTime time = File.GetLastAccessTimeUtc (path);
-
-#if NET_2_0
-			Assertion.AssertEquals ("#1", 1601, time.Year);
-			Assertion.AssertEquals ("#2", 1, time.Month);
-			Assertion.AssertEquals ("#3", 1, time.Day);
-			Assertion.AssertEquals ("#4", 0, time.Hour);
-			Assertion.AssertEquals ("#5", 0, time.Second);
-			Assertion.AssertEquals ("#6", 0, time.Millisecond);
-#endif
+                        string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeUtcException3";                	
+			DeleteFile (path);			
+			File.GetLastAccessTimeUtc (path);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastAccessTimeUtcException4 ()
 		{
 			File.GetLastAccessTimeUtc ("    ");
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastAccessTimeUtcException5 ()
 		{
 			File.GetLastAccessTimeUtc (Path.InvalidPathChars [0].ToString ());
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentNullException))]
+		[ExpectedException(typeof(ArgumentNullException))]	
 		public void GetLastWriteTimeException1 ()
 		{
 			File.GetLastWriteTime (null as string);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastWriteTimeException2 ()
 		{
 			File.GetLastWriteTime ("");
 		}
 	
 		[Test]
-#if !NET_2_0
-		[ExpectedException (typeof (IOException))]
-#endif
-		public void GetLastWriteTime_NonExistingPath ()
+		[ExpectedException(typeof(IOException))]
+		public void GetLastWriteTimeException3 ()
 		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeUtcException3";
-			DeleteFile (path);
-			DateTime time = File.GetLastWriteTime (path);
-
-#if NET_2_0
-			DateTime expectedTime = (new DateTime (1601, 1, 1)).ToLocalTime ();
-			Assertion.AssertEquals ("#1", expectedTime.Year, time.Year);
-			Assertion.AssertEquals ("#2", expectedTime.Month, time.Month);
-			Assertion.AssertEquals ("#3", expectedTime.Day, time.Day);
-			Assertion.AssertEquals ("#4", expectedTime.Hour, time.Hour);
-			Assertion.AssertEquals ("#5", expectedTime.Second, time.Second);
-			Assertion.AssertEquals ("#6", expectedTime.Millisecond, time.Millisecond);
-#endif
+                        string path = TempFolder + Path.DirectorySeparatorChar + "GetLastAccessTimeUtcException3";                	
+			DeleteFile (path);			
+			File.GetLastWriteTime (path);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastWriteTimeException4 ()
 		{
 			File.GetLastWriteTime ("    ");
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastWriteTimeException5 ()
 		{
 			File.GetLastWriteTime (Path.InvalidPathChars [0].ToString ());
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentNullException))]
+		[ExpectedException(typeof(ArgumentNullException))]	
 		public void GetLastWriteTimeUtcException1 ()
 		{
 			File.GetLastWriteTimeUtc (null as string);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastWriteTimeUtcException2 ()
 		{
-			File.GetLastWriteTimeUtc ("");
+			File.GetLastAccessTimeUtc ("");
 		}
 	
 		[Test]
-#if !NET_2_0
-		[ExpectedException (typeof (IOException))]
-#endif
-		public void GetLastWriteTimeUtc_NonExistingPath ()
+		[ExpectedException(typeof(IOException))]
+		public void GetLastWriteTimeUtcException3 ()
 		{
-			string path = TempFolder + Path.DirectorySeparatorChar + "GetLastWriteTimeUtcException3";
+                        string path = TempFolder + Path.DirectorySeparatorChar + "GetLastWriteTimeUtcException3";
 			DeleteFile (path);
-			DateTime time = File.GetLastWriteTimeUtc (path);
-
-#if NET_2_0
-			Assertion.AssertEquals ("#1", 1601, time.Year);
-			Assertion.AssertEquals ("#2", 1, time.Month);
-			Assertion.AssertEquals ("#3", 1, time.Day);
-			Assertion.AssertEquals ("#4", 0, time.Hour);
-			Assertion.AssertEquals ("#5", 0, time.Second);
-			Assertion.AssertEquals ("#6", 0, time.Millisecond);
-#endif
+			File.GetLastAccessTimeUtc (path);
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastWriteTimeUtcException4 ()
 		{
-			File.GetLastWriteTimeUtc ("    ");
+			File.GetLastAccessTimeUtc ("    ");
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
+		[ExpectedException(typeof(ArgumentException))]	
 		public void GetLastWriteTimeUtcException5 ()
 		{
-			File.GetLastWriteTimeUtc (Path.InvalidPathChars [0].ToString ());
+			File.GetLastAccessTimeUtc (Path.InvalidPathChars [0].ToString ());
 		}		
 
 		[Test]
@@ -1555,42 +1499,6 @@ namespace MonoTests.System.IO
 			DeleteFile (fn);
 		}
 
-#if NET_2_0
-		void TestRWAT (string s)
-		{
-			string f = Path.GetTempFileName ();
-			try {
-				File.WriteAllText (f, s);
-				string r = File.ReadAllText (f);
-				AssertEquals (r, s);
-			} finally {
-				DeleteFile (f);
-			}
-		}
-		[Test]
-		public void ReadWriteAllText ()
-		{
-			// The MSDN docs said something about
-			// not including a final new line. it looks
-			// like that was not true. I'm not sure what
-			// that was talking about
-			TestRWAT ("");
-			TestRWAT ("\r");
-			TestRWAT ("\n");
-			TestRWAT ("\r\n");
-			TestRWAT ("a\r");
-			TestRWAT ("a\n");
-			TestRWAT ("a\r\n");	
-			TestRWAT ("a\ra");
-			TestRWAT ("a\na");
-			TestRWAT ("a\r\na");
-			TestRWAT ("a");
-			TestRWAT ("\r\r");
-			TestRWAT ("\n\n");
-			TestRWAT ("\r\n\r\n");
-		}
-#endif
-
 		private void DeleteFile (string path)
 		{
 			if (File.Exists (path))
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog
index 244eb36992c..1f37448aded 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog
@@ -1,11 +1,3 @@
-2006-02-27  Gert Driesen  <drieseng@users.sourceforge.net>
-
-	* ConstructorBuilderTest.cs: Expect ArgumentOutOfRangeException
-	instead of ArgumentException when passing Request action to
-	AddDeclarativeSecurity (bug #77640).
-	* MethodBuilderTest.cs: Same.
-	* TypeBuilderTest.cs: Same.
-
 2005-12-15  Raja R Harinath  <rharinath@novell.com>
 
 	* TypeBuilderTest.cs (GenericType): Add a minimal testcase for
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/ConstructorBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/ConstructorBuilderTest.cs
index e75dd955727..d5cadbd45a5 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/ConstructorBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/ConstructorBuilderTest.cs
@@ -385,7 +385,8 @@ public class ConstructorBuilderTest : Assertion
 			try {
 				cb.AddDeclarativeSecurity (action, set);
 				Fail ();
-			} catch (ArgumentOutOfRangeException) {
+			}
+			catch (ArgumentException) {
 			}
 		}
 	}
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
index 3f1b82fc38e..e56395c75a5 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
@@ -621,7 +621,8 @@ public class MethodBuilderTest : Assertion
 			try {
 				mb.AddDeclarativeSecurity (action, set);
 				Fail ();
-			} catch (ArgumentOutOfRangeException) {
+			}
+			catch (ArgumentException) {
 			}
 		}
 	}
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs
index 0e542fdc807..80b9f82fd20 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs
@@ -1647,7 +1647,8 @@ public class TypeBuilderTest : Assertion
 			try {
 				tb.AddDeclarativeSecurity (action, set);
 				Fail ();
-			} catch (ArgumentOutOfRangeException) {
+			}
+			catch (ArgumentException) {
 			}
 		}
 	}
diff --git a/mcs/class/corlib/Test/System.Reflection/ChangeLog b/mcs/class/corlib/Test/System.Reflection/ChangeLog
index 25ebdfcd138..55443a23e01 100644
--- a/mcs/class/corlib/Test/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/Test/System.Reflection/ChangeLog
@@ -1,11 +1,3 @@
-2006-02-11  Zoltan Varga  <vargaz@gmail.com>
-
-	* FieldInfoTest.cs: Revert nullable reftype tests.
-
-2006-02-09  Zoltan Varga  <vargaz@gmail.com>
-
-	* FieldInfoTest.cs: Add tests for nullable reference types.
-
 2006-02-07  Martin Baulig  <martin@ximian.com>
 
 	* MethodInfoTest.cs: Added test where IsGenericMethod must return false.
@@ -18,10 +10,6 @@
 
 	* MethodInfoTest.cs: Add test for Invoke and byref valuetypes.
 
-2006-01-19  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ModuleTest.cs : ResolveString() does not work under .NET 2.0 either.
-
 2006-01-06  Raja R Harinath  <rharinath@novell.com>
 
 	* PropertyInfoTest.cs: Use newer nunit API.
diff --git a/mcs/class/corlib/Test/System.Reflection/ModuleTest.cs b/mcs/class/corlib/Test/System.Reflection/ModuleTest.cs
index a1d3e242e04..00d4155b4dd 100644
--- a/mcs/class/corlib/Test/System.Reflection/ModuleTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/ModuleTest.cs
@@ -211,7 +211,7 @@ public class ModuleTest : Assertion
 		}

 	}

 
-	[Ignore ("it breaks nunit-console.exe execution under .NET 2.0")]

+	[Category ("NotWorking")]

 	[Test]

 	public void ResolveString () {

 		Type t = typeof (ModuleTest);

diff --git a/mcs/class/corlib/Test/System.Resources/ChangeLog b/mcs/class/corlib/Test/System.Resources/ChangeLog
index 86822fcbecc..964cfec9c2f 100644
--- a/mcs/class/corlib/Test/System.Resources/ChangeLog
+++ b/mcs/class/corlib/Test/System.Resources/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-13  Robert Jordan  <robertj@gmx.net>
-
-	* ResourceManagerTest.cs: New. Unit tests for ResourceManager.
-	See bug #77242.
-
 2005-03-31  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* ResourceReaderCas.cs: New. CAS unit tests for ResourceReader.
diff --git a/mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs b/mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs
deleted file mode 100644
index c4fd1acec91..00000000000
--- a/mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// ResourceManager.cs:
-//     NUnit Test Cases for System.Resources.ResourceManager
-//
-// Authors:
-//     Robert Jordan (robertj@gmx.net)
-//
-// Copyright (C) 2005 Novell, Inc. (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Globalization;
-using System.Resources;
-using System.Threading;
-
-using NUnit.Framework;
-
-namespace MonoTests.System.Resources
-{
-	[TestFixture]
-	public class ResourceManagerTest
-	{
-		[Test]
-		[Category ("NotWorking")]
-		public void TestInvariantCulture ()
-		{
-			Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-			ResourceManager rm = ResourceManager.
-				CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
-			Assert.AreEqual ("Hello World", rm.GetString ("HelloWorld"), "#01");
-			Assert.AreEqual ("Hello World", rm.GetObject ("HelloWorld"), "#02");
-		}
-
-		[Test]
-		[Category ("NotWorking")]
-		public void TestGermanCulture ()
-		{
-			Thread.CurrentThread.CurrentUICulture = new CultureInfo ("de-DE");
-			ResourceManager rm = ResourceManager.
-				CreateFileBasedResourceManager ("MyResources", "Test/resources", null);
-			Assert.AreEqual ("Hello World", rm.GetString ("HelloWorld"), "#01");
-			Assert.AreEqual ("Hello World", rm.GetObject ("HelloWorld"), "#02");
-			Assert.AreEqual ("Hallo Welt", rm.GetString ("deHelloWorld"), "#03");
-			Assert.AreEqual ("Hallo Welt", rm.GetObject ("deHelloWorld"), "#04");
-		}
-	}
-}
diff --git a/mcs/class/corlib/Test/System.Text/ChangeLog b/mcs/class/corlib/Test/System.Text/ChangeLog
index a9bde24b0b2..014725f1482 100644
--- a/mcs/class/corlib/Test/System.Text/ChangeLog
+++ b/mcs/class/corlib/Test/System.Text/ChangeLog
@@ -1,12 +1,3 @@
-2006-02-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8EncodingTest.cs : test for bug #77550.
-
-2006-02-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* UTF8EncodingTest.cs : added test for insufficient bytes for
-	  flush=true and leftOver!='\0' case.
-
 2006-01-24  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* UTF7EncodingTest.cs : added test for bug #77315.
diff --git a/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs b/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs
index f5a2e452fc0..faa2053c27f 100644
--- a/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs
+++ b/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs
@@ -19,8 +19,6 @@ using DecoderException = System.Text.DecoderFallbackException;
 using DecoderException = System.ArgumentException;
 #endif
 
-using AssertType = NUnit.Framework.Assert;
-
 namespace MonoTests.System.Text {
 
 	[TestFixture]
@@ -1018,52 +1016,5 @@ namespace MonoTests.System.Text {
 			new UTF8Encoding (false, true).GetString (
 				new byte [] {0xED, 0xA2, 0x8C});
 		}
-
-		[Test]
-		public void SufficientByteArray ()
-		{
-			Encoder e = Encoding.UTF8.GetEncoder ();
-			byte [] bytes = new byte [0];
-
-			char [] chars = new char [] {'\uD800'};
-			e.GetBytes (chars, 0, 1, bytes, 0, false);
-			try {
-				int ret = e.GetBytes (chars, 1, 0, bytes, 0, true);
-#if NET_2_0
-				AssertEquals ("drop insufficient char in 2.0: char[]", 0, ret);
-#else
-				Fail ("ArgumentException is expected: char[]");
-#endif
-			} catch (ArgumentException) {
-			}
-
-			string s = "\uD800";
-			try {
-				int ret = Encoding.UTF8.GetBytes (s, 0, 1, bytes, 0);
-#if NET_2_0
-				AssertEquals ("drop insufficient char in 2.0: string", 0, ret);
-#else
-				Fail ("ArgumentException is expected: string");
-#endif
-			} catch (ArgumentException) {
-			}
-		}
-
-#if NET_2_0
-		[Test] // bug #77550
-		public void DecoderFallbackSimple ()
-		{
-			UTF8Encoding e = new UTF8Encoding (false, false);
-			AssertType.AreEqual (0, e.GetDecoder ().GetCharCount (
-					new byte [] {(byte) 183}, 0, 1),
-					"#1");
-			AssertType.AreEqual (0, e.GetDecoder().GetChars (
-					new byte [] {(byte) 183}, 0, 1,
-					new char [100], 0),
-					"#2");
-			AssertType.AreEqual (0, e.GetString (new byte [] {(byte) 183}).Length,
-					"#3");
-		}
-#endif
 	}
 }
diff --git a/mcs/class/corlib/Test/System.Text/UnicodeEncodingTest.cs b/mcs/class/corlib/Test/System.Text/UnicodeEncodingTest.cs
index c8b5ad4d0ae..848d025eb4b 100644
--- a/mcs/class/corlib/Test/System.Text/UnicodeEncodingTest.cs
+++ b/mcs/class/corlib/Test/System.Text/UnicodeEncodingTest.cs
@@ -1,171 +1,171 @@
-//

-// UnicodeEncodingTest.cs - NUnit Test Cases for System.Text.UnicodeEncoding

-//

-// Author:

-//     Patrick Kalkman  kalkman@cistron.nl

-//

-// (C) 2003 Patrick Kalkman

-// 

-using NUnit.Framework;

-using System;

-using System.Text;

-

-namespace MonoTests.System.Text

-{

-        [TestFixture]

-        public class UnicodeEncodingTest 

-        {

-                [Test]

-                public void TestEncodingGetBytes1()

-                {

-                        //pi and sigma in unicode

-                        string Unicode = "\u03a0\u03a3";

-                        byte[] UniBytes;

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (); //little-endian

-                        UniBytes = UnicodeEnc.GetBytes (Unicode);

-                        

-                        Assertion.AssertEquals ("Uni #1", 0xA0, UniBytes [0]);

-                        Assertion.AssertEquals ("Uni #2", 0x03, UniBytes [1]);

-                        Assertion.AssertEquals ("Uni #3", 0xA3, UniBytes [2]);

-                        Assertion.AssertEquals ("Uni #4", 0x03, UniBytes [3]);

-                }

-        

-                [Test]

-                public void TestEncodingGetBytes2()

-                {

-                        //pi and sigma in unicode

-                        string Unicode = "\u03a0\u03a3";

-                        byte[] UniBytes;

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (true, true); //big-endian

-                        UniBytes = UnicodeEnc.GetBytes (Unicode);

-                        

-                        Assertion.AssertEquals ("Uni #1", 0x03, UniBytes [0]);

-                        Assertion.AssertEquals ("Uni #2", 0xA0, UniBytes [1]);

-                        Assertion.AssertEquals ("Uni #3", 0x03, UniBytes [2]);

-                        Assertion.AssertEquals ("Uni #4", 0xA3, UniBytes [3]);

-                }

-

-                [Test]

-                public void TestEncodingGetBytes3()

-                {

-                        //pi and sigma in unicode

-                        string Unicode = "\u03a0\u03a3";

-                        byte[] UniBytes = new byte [4];

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (); //little-endian 

-                        int Cnt = UnicodeEnc.GetBytes (Unicode.ToCharArray(), 0, Unicode.Length, UniBytes, 0);

-                        

-                        Assertion.AssertEquals ("Uni #1", 4, Cnt);

-                        Assertion.AssertEquals ("Uni #2", 0xA0, UniBytes [0]);

-                        Assertion.AssertEquals ("Uni #3", 0x03, UniBytes [1]);

-                        Assertion.AssertEquals ("Uni #4", 0xA3, UniBytes [2]);

-                        Assertion.AssertEquals ("Uni #5", 0x03, UniBytes [3]);

-                }

-        

-                [Test]

-                public void TestEncodingDecodingGetBytes1()

-                {

-                        //pi and sigma in unicode

-                        string Unicode = "\u03a0\u03a3";

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (); //little-endian 

-                        //Encode the unicode string.

-                        byte[] UniBytes = UnicodeEnc.GetBytes (Unicode);

-                        //Decode the bytes to a unicode char array.

-                        char[] UniChars = UnicodeEnc.GetChars (UniBytes);

-                        string Result = new string(UniChars);

-                        

-                        Assertion.AssertEquals ("Uni #1", Unicode, Result);

-                }

-

-                [Test]

-                public void TestEncodingDecodingGetBytes2()

-                {

-                        //pi and sigma in unicode

-                        string Unicode = "\u03a0\u03a3";

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (true, true); //big-endian 

-                        //Encode the unicode string.

-                        byte[] UniBytes = UnicodeEnc.GetBytes (Unicode);

-                        //Decode the bytes to a unicode char array.

-                        char[] UniChars = UnicodeEnc.GetChars (UniBytes);

-                        string Result = new string(UniChars);

-                        

-                        Assertion.AssertEquals ("Uni #1", Unicode, Result);

-                }

-

-		[Test]

-		public void TestEncodingGetCharCount ()

-		{

-			byte[] b = new byte[] {255, 254, 115, 0, 104, 0, 105, 0};

-			UnicodeEncoding encoding = new UnicodeEncoding ();

-

-			Assertion.AssertEquals ("GetCharCount #1", 3,

-				encoding.GetCharCount (b, 2, b.Length - 2));

-		}

-

-	

-                

-                [Test]

-                public void TestPreamble1()

-                {

-                        //litle-endian with byte order mark.

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (false, true); 

-                        byte[] PreAmble = UnicodeEnc.GetPreamble();

-

-                        Assertion.AssertEquals ("Uni #1", 0xFF, PreAmble [0]);

-                        Assertion.AssertEquals ("Uni #2", 0xFE, PreAmble [1]);

-                }

-

-                [Test]

-                public void TestPreamble2()

-                {

-                        //big-endian with byte order mark.

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (true, true); 

-                        byte[] PreAmble = UnicodeEnc.GetPreamble();

-

-                        Assertion.AssertEquals ("Uni #1", 0xFE, PreAmble [0]);

-                        Assertion.AssertEquals ("Uni #2", 0xFF, PreAmble [1]);

-                }

-

-                [Test]

-                public void TestPreamble3()

-                {

-                        //little-endian without byte order mark.

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (false, false); 

-                        byte[] PreAmble = UnicodeEnc.GetPreamble();

-

-                        Assertion.AssertEquals ("Uni #1", 0, PreAmble.Length);

-                }

-                

-                [Test]

-#if NET_2_0

-		[Category ("NotWorking")]

-#endif

-                public void TestMaxCharCount()

-                {

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding ();

-#if NET_2_0

-                        // where is this extra 1 coming from?

-                        Assertion.AssertEquals ("UTF #1", 25, UnicodeEnc.GetMaxCharCount(51));

-#else

-                        Assertion.AssertEquals ("UTF #1", 25, UnicodeEnc.GetMaxCharCount(50));

-#endif

-                }

-        

-                [Test]

-#if NET_2_0

-		[Category ("NotWorking")]

-#endif

-                public void TestMaxByteCount()

-                {

-                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding ();

-#if NET_2_0

-                        // is this extra 2 BOM?

-                        Assertion.AssertEquals ("UTF #1", 102, UnicodeEnc.GetMaxByteCount(50));

-#else

-                        Assertion.AssertEquals ("UTF #1", 100, UnicodeEnc.GetMaxByteCount(50));

-#endif

-                }

-        }

-}

-

-

-

+//
+// UnicodeEncodingTest.cs - NUnit Test Cases for System.Text.UnicodeEncoding
+//
+// Author:
+//     Patrick Kalkman  kalkman@cistron.nl
+//
+// (C) 2003 Patrick Kalkman
+// 
+using NUnit.Framework;
+using System;
+using System.Text;
+
+namespace MonoTests.System.Text
+{
+        [TestFixture]
+        public class UnicodeEncodingTest 
+        {
+                [Test]
+                public void TestEncodingGetBytes1()
+                {
+                        //pi and sigma in unicode
+                        string Unicode = "\u03a0\u03a3";
+                        byte[] UniBytes;
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (); //little-endian
+                        UniBytes = UnicodeEnc.GetBytes (Unicode);
+                        
+                        Assertion.AssertEquals ("Uni #1", 0xA0, UniBytes [0]);
+                        Assertion.AssertEquals ("Uni #2", 0x03, UniBytes [1]);
+                        Assertion.AssertEquals ("Uni #3", 0xA3, UniBytes [2]);
+                        Assertion.AssertEquals ("Uni #4", 0x03, UniBytes [3]);
+                }
+        
+                [Test]
+                public void TestEncodingGetBytes2()
+                {
+                        //pi and sigma in unicode
+                        string Unicode = "\u03a0\u03a3";
+                        byte[] UniBytes;
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (true, true); //big-endian
+                        UniBytes = UnicodeEnc.GetBytes (Unicode);
+                        
+                        Assertion.AssertEquals ("Uni #1", 0x03, UniBytes [0]);
+                        Assertion.AssertEquals ("Uni #2", 0xA0, UniBytes [1]);
+                        Assertion.AssertEquals ("Uni #3", 0x03, UniBytes [2]);
+                        Assertion.AssertEquals ("Uni #4", 0xA3, UniBytes [3]);
+                }
+
+                [Test]
+                public void TestEncodingGetBytes3()
+                {
+                        //pi and sigma in unicode
+                        string Unicode = "\u03a0\u03a3";
+                        byte[] UniBytes = new byte [4];
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (); //little-endian 
+                        int Cnt = UnicodeEnc.GetBytes (Unicode.ToCharArray(), 0, Unicode.Length, UniBytes, 0);
+                        
+                        Assertion.AssertEquals ("Uni #1", 4, Cnt);
+                        Assertion.AssertEquals ("Uni #2", 0xA0, UniBytes [0]);
+                        Assertion.AssertEquals ("Uni #3", 0x03, UniBytes [1]);
+                        Assertion.AssertEquals ("Uni #4", 0xA3, UniBytes [2]);
+                        Assertion.AssertEquals ("Uni #5", 0x03, UniBytes [3]);
+                }
+        
+                [Test]
+                public void TestEncodingDecodingGetBytes1()
+                {
+                        //pi and sigma in unicode
+                        string Unicode = "\u03a0\u03a3";
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (); //little-endian 
+                        //Encode the unicode string.
+                        byte[] UniBytes = UnicodeEnc.GetBytes (Unicode);
+                        //Decode the bytes to a unicode char array.
+                        char[] UniChars = UnicodeEnc.GetChars (UniBytes);
+                        string Result = new string(UniChars);
+                        
+                        Assertion.AssertEquals ("Uni #1", Unicode, Result);
+                }
+
+                [Test]
+                public void TestEncodingDecodingGetBytes2()
+                {
+                        //pi and sigma in unicode
+                        string Unicode = "\u03a0\u03a3";
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (true, true); //big-endian 
+                        //Encode the unicode string.
+                        byte[] UniBytes = UnicodeEnc.GetBytes (Unicode);
+                        //Decode the bytes to a unicode char array.
+                        char[] UniChars = UnicodeEnc.GetChars (UniBytes);
+                        string Result = new string(UniChars);
+                        
+                        Assertion.AssertEquals ("Uni #1", Unicode, Result);
+                }
+
+		[Test]
+		public void TestEncodingGetCharCount ()
+		{
+			byte[] b = new byte[] {255, 254, 115, 0, 104, 0, 105, 0};
+			UnicodeEncoding encoding = new UnicodeEncoding ();
+
+			Assertion.AssertEquals ("GetCharCount #1", 3,
+				encoding.GetCharCount (b, 2, b.Length - 2));
+		}
+
+	
+                
+                [Test]
+                public void TestPreamble1()
+                {
+                        //litle-endian with byte order mark.
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (false, true); 
+                        byte[] PreAmble = UnicodeEnc.GetPreamble();
+
+                        Assertion.AssertEquals ("Uni #1", 0xFF, PreAmble [0]);
+                        Assertion.AssertEquals ("Uni #2", 0xFE, PreAmble [1]);
+                }
+
+                [Test]
+                public void TestPreamble2()
+                {
+                        //big-endian with byte order mark.
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (true, true); 
+                        byte[] PreAmble = UnicodeEnc.GetPreamble();
+
+                        Assertion.AssertEquals ("Uni #1", 0xFE, PreAmble [0]);
+                        Assertion.AssertEquals ("Uni #2", 0xFF, PreAmble [1]);
+                }
+
+                [Test]
+                public void TestPreamble3()
+                {
+                        //little-endian without byte order mark.
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding (false, false); 
+                        byte[] PreAmble = UnicodeEnc.GetPreamble();
+
+                        Assertion.AssertEquals ("Uni #1", 0, PreAmble.Length);
+                }
+                
+                [Test]
+#if NET_2_0
+		[Category ("NotWorking")]
+#endif
+                public void TestMaxCharCount()
+                {
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding ();
+#if NET_2_0
+                        // where is this extra 1 coming from?
+                        Assertion.AssertEquals ("UTF #1", 25, UnicodeEnc.GetMaxCharCount(51));
+#else
+                        Assertion.AssertEquals ("UTF #1", 25, UnicodeEnc.GetMaxCharCount(50));
+#endif
+                }
+        
+                [Test]
+#if NET_2_0
+		[Category ("NotWorking")]
+#endif
+                public void TestMaxByteCount()
+                {
+                        UnicodeEncoding UnicodeEnc = new UnicodeEncoding ();
+#if NET_2_0
+                        // is this extra 2 BOM?
+                        Assertion.AssertEquals ("UTF #1", 102, UnicodeEnc.GetMaxByteCount(50));
+#else
+                        Assertion.AssertEquals ("UTF #1", 100, UnicodeEnc.GetMaxByteCount(50));
+#endif
+                }
+        }
+}
+
+
+
diff --git a/mcs/class/corlib/Test/System/ArraySegmentTest.cs b/mcs/class/corlib/Test/System/ArraySegmentTest.cs
deleted file mode 100644
index d556baae3b3..00000000000
--- a/mcs/class/corlib/Test/System/ArraySegmentTest.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// ArraySegmentTest.cs - NUnit Test Cases for the System.ArraySegment class
-//
-// Ankit Jain  <jankit@novell.com>
-// Raja R Harinath  <rharinath@novell.com>
-// 
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-// 
-
-#if NET_2_0
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-
-namespace MonoTests.System
-{
-
-[TestFixture]
-public class ArraySegmentTest
-{
-	public ArraySegmentTest() {}
-
-	[Test]
-	public void CtorTest1 () 
-	{
-		byte [] b_arr = new byte [4096];
-		Array arr;
-
-		ArraySegment<byte> seg = new ArraySegment<byte> (b_arr, 0, b_arr.Length);
-		Assert.AreEqual (seg.Count, b_arr.Length, "#1");
-		Assert.AreEqual (seg.Offset, 0, "#2");
-		
-		arr = seg.Array;
-		Assert.AreEqual (arr.Length, 4096, "#5");
-		
-		seg = new ArraySegment<byte> (b_arr, 100, b_arr.Length - 100);
-		Assert.AreEqual (seg.Count, b_arr.Length - 100, "#3");
-		Assert.AreEqual (seg.Offset, 100, "#4");
-		
-		arr = seg.Array;
-		Assert.AreEqual (arr.Length, 4096, "#5");
-	}
-
-	[Test]
-	public void CtorTest2 ()
-	{
-		byte [] b_arr = new byte [4096];
-		ArraySegment<byte> seg = new ArraySegment<byte> (b_arr);
-		Assert.AreEqual (seg.Count, b_arr.Length, "#6");
-		Assert.AreEqual (seg.Offset, 0, "#7");
-		
-		Array arr = seg.Array;
-		Assert.AreEqual (arr.Length, 4096, "#8");
-	}
-
-	[Test]
-	public void CtorTest3 ()
-	{
-		EmptyArraySegTest (0);
-		EmptyArraySegTest (10);
-	}
-
-	private void EmptyArraySegTest (int len)
-	{
-		byte [] b_arr = new byte [len];
-
-		ArraySegment<byte> seg = new ArraySegment<byte> (b_arr, 0, b_arr.Length);
-
-		Assert.AreEqual (seg.Count, b_arr.Length, "#1 [array len {0}] ", len);
-		Assert.AreEqual (seg.Offset, 0, "#2 [array len {0}] ", len);
-		Array arr = seg.Array;
-		Assert.AreEqual (arr.Length, len, "#3 [array len {0}] ", len);
-		
-		seg = new ArraySegment<byte> (b_arr, b_arr.Length, 0);
-		Assert.AreEqual (seg.Count, 0, "#4 [array len {0}] ", len);
-		Assert.AreEqual (seg.Offset, b_arr.Length, "#5 [array len {0}] ", len);
-		arr = seg.Array;
-		Assert.AreEqual (arr.Length, len, "#6 [array len {0}] ", len);
-
-		seg = new ArraySegment<byte> (b_arr);
-		Assert.AreEqual (seg.Count, b_arr.Length, "#7 [array len {0}] ", len);
-		Assert.AreEqual (seg.Offset, 0, "#8 [array len {0}] ", len);
-		arr = seg.Array;
-		Assert.AreEqual (arr.Length, len, "#9 [array len {0}] ", len);
-	}
-
-	[Test]
-	[ExpectedException (typeof (ArgumentException))]
-	public void CtorErrorTest ()
-	{
-		byte [] arr = new byte [4096];	
-		ArraySegment<byte> seg = new ArraySegment<byte> (arr, 1, arr.Length);
-	}
-	
-	[Test]
-	[ExpectedException (typeof (ArgumentException))]
-	public void CtorErrorTest2 ()
-	{
-		byte [] arr = new byte [4096];	
-		ArraySegment<byte> seg = new ArraySegment<byte> (arr, 0, arr.Length + 2);
-	}
-
-	[Test]
-	[ExpectedException (typeof (ArgumentOutOfRangeException))]
-	public void CtorErrorTest3 ()
-	{
-		byte [] arr = new byte [4096];	
-		ArraySegment<byte> seg = new ArraySegment<byte> (arr, -1, arr.Length);
-	}
-
-	[Test]
-	[ExpectedException (typeof (ArgumentOutOfRangeException))]
-	public void CtorErrorTest4 ()
-	{
-		byte [] arr = new byte [4096];	
-		ArraySegment<byte> seg = new ArraySegment<byte> (arr, 2, -1);
-	}
-
-	[Test]
-	[ExpectedException (typeof (ArgumentException))]
-	public void CtorErrorTest5 ()
-	{
-		byte [] arr = new byte [4096];
-		ArraySegment<byte> seg = new ArraySegment<byte> (arr, 0, arr.Length + 2);
-	}
-
-	[Test]
-	[ExpectedException (typeof (ArgumentNullException))]
-	public void CtorNullTest1 ()
-	{
-		ArraySegment<byte> seg = new ArraySegment<byte> (null, 0 , 1);
-	}
-
-	[Test]
-	[ExpectedException (typeof (ArgumentNullException))]
-	public void CtorNullTest2 ()
-	{
-		ArraySegment<byte> seg = new ArraySegment<byte> (null);
-	}
-
-
-}
-
-}
-#endif
diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
index 5f1f3cf910f..558675e394b 100644
--- a/mcs/class/corlib/Test/System/ChangeLog
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -1,37 +1,7 @@
-2006-02-18  Raja R Harinath  <harinath@gmail.com>
-
-	* TypeTest.cs (ByrefType): New.
-
-2006-02-17  Raja R Harinath  <rharinath@novell.com>
-
-	* TypeTest.cs: Rename one of the instances of Foo<T> to ComFoo<T>.
-
-2006-02-14  Ankit Jain  <jankit@novell.com>
-
-	* ArraySegmentTest.cs: Fix a misplaced #endif.
-
-2006-02-14  Ankit Jain  <jankit@novell.com>
-	    Raja R Harinath  <rharinath@novell.com>
-
-	* ArraySegmentTest.cs: New.
-
-2006-02-02  Zoltan Varga  <vargaz@gmail.com>
-
-	* TypeTest.cs: Add test for getting custom attributes of generic
-	instances.
-
 2006-01-31  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* StringTest.cs : Added test for bug #77412.
 
-2006-01-19  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* StringTest.cs : numbered some assertions.
-
-2006-01-19  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* ModuleHandleTest.cs : GetPEKind() is not public in 2.0 RTM.
-
 2006-01-03  Zoltan Varga  <vargaz@gmail.com>
 
 	* ActivatorTest.cs: Add Nullable tests.
diff --git a/mcs/class/corlib/Test/System/ModuleHandleTest.cs b/mcs/class/corlib/Test/System/ModuleHandleTest.cs
index b966c5aa797..976de22253a 100644
--- a/mcs/class/corlib/Test/System/ModuleHandleTest.cs
+++ b/mcs/class/corlib/Test/System/ModuleHandleTest.cs
@@ -159,7 +159,6 @@ public class ModuleHandleTest : Assertion
 		module.ResolveMethodHandle (0x60f0001);
 	}
 
-/* it is not public in 2.0 RTM.
 	[Test]
 	public void GetPEKind () {
 		PortableExecutableKinds pe_kind;
@@ -178,7 +177,6 @@ public class ModuleHandleTest : Assertion
 
 		ModuleHandle.EmptyHandle.GetPEKind (out pe_kind, out machine);
 	}
-*/
 }
 }
 
diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
index ae24120b12a..abf240bcada 100644
--- a/mcs/class/corlib/Test/System/StringTest.cs
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -544,20 +544,20 @@ public class StringTest : Assertion
 		Assert("null string error", errorThrown);
 
 		AssertEquals("basic char index", 1, s1.IndexOf('r'));
-		AssertEquals("basic char index 2", 2, s1.IndexOf('i'));
+		AssertEquals("basic char index", 2, s1.IndexOf('i'));
 		AssertEquals("basic char index - no", -1, s1.IndexOf('q'));
 		
 		AssertEquals("basic string index", 1, s1.IndexOf("rig"));
-		AssertEquals("basic string index 2", 2, s1.IndexOf("i"));
-		AssertEquals("basic string index 3", 0, "".IndexOf(""));
-		AssertEquals("basic string index 4", 0, "ABC".IndexOf(""));
+		AssertEquals("basic string index", 2, s1.IndexOf("i"));
+		AssertEquals("basic string index", 0, "".IndexOf(""));
+		AssertEquals("basic string index", 0, "ABC".IndexOf(""));
 		AssertEquals("basic string index - no", -1, s1.IndexOf("rag"));
 
 		AssertEquals("stepped char index", 1, s1.IndexOf('r', 1));
-		AssertEquals("stepped char index 2", 2, s1.IndexOf('i', 1));
-		AssertEquals("stepped char index 3", 4, s1.IndexOf('i', 3));
-		AssertEquals("stepped char index 4", -1, s1.IndexOf('i', 5));
-		AssertEquals("stepped char index 5", -1, s1.IndexOf('l', s1.Length));
+		AssertEquals("stepped char index", 2, s1.IndexOf('i', 1));
+		AssertEquals("stepped char index", 4, s1.IndexOf('i', 3));
+		AssertEquals("stepped char index", -1, s1.IndexOf('i', 5));
+		AssertEquals("stepped char index", -1, s1.IndexOf('l', s1.Length));
 
 		AssertEquals("stepped limited char index", 
 			     1, s1.IndexOf('r', 1, 1));
diff --git a/mcs/class/corlib/Test/System/TypeTest.cs b/mcs/class/corlib/Test/System/TypeTest.cs
index 10eb03d4ab9..5ea56dc1c01 100644
--- a/mcs/class/corlib/Test/System/TypeTest.cs
+++ b/mcs/class/corlib/Test/System/TypeTest.cs
@@ -516,16 +516,12 @@ PublicKeyToken=b77a5c561934e089"));
 		public void FullNameGenerics ()
 		{
 			Type fooType = typeof (Foo<>);
-			FieldInfo [] fields = fooType.GetFields ();
-
-			Assert.AreEqual (1, fields.Length, "#0");
 
 			Assert.IsNotNull (fooType.FullName, "#1");
 			Assert.IsNotNull (fooType.AssemblyQualifiedName, "#1a");
 
 			FieldInfo field = fooType.GetField ("Whatever");
 			Assert.IsNotNull (field, "#2");
-			Assert.AreEqual (field, fields [0], "#2a");
 			Assert.IsNull (field.FieldType.FullName, "#3");
 			Assert.IsNull (field.FieldType.AssemblyQualifiedName, "#3a");
 			Assert.IsNotNull (field.FieldType.ToString (), "#4");
@@ -577,10 +573,10 @@ PublicKeyToken=b77a5c561934e089"));
 			Type baz_int_type = typeof (Baz<int>);
 
 			Assert.IsTrue (ibar_int_type.IsAssignableFrom (baz_int_type), "Baz<int> -> IBar<int>");
-			Assert.IsTrue (ibar_short_type.IsAssignableFrom (baz_short_type), "Baz<short> -> IBar<short>");
+			Assert.IsTrue (ibar_short_type.IsAssignableFrom (baz_short_type), "Baz<short> -> IBaz<short>");
 
-			Assert.IsFalse (ibar_int_type.IsAssignableFrom (baz_short_type), "Baz<short> -!-> IBar<int>");
-			Assert.IsFalse (ibar_short_type.IsAssignableFrom (baz_int_type), "Baz<int> -!-> IBar<short>");
+			Assert.IsFalse (ibar_int_type.IsAssignableFrom (baz_short_type), "Baz<int> -!-> IBaz<short>");
+			Assert.IsFalse (ibar_short_type.IsAssignableFrom (baz_int_type), "Baz<short> -!-> IBaz<int>");
 
 			// Nullable tests
 			Assert.IsTrue (typeof (Nullable<int>).IsAssignableFrom (typeof (int)));
@@ -593,26 +589,6 @@ PublicKeyToken=b77a5c561934e089"));
 		{
 			Assert.IsTrue (typeof (Nullable<int>).IsInstanceOfType (5));
 		}
-
-		[Test]
-		public void ByrefType ()
-		{
-			Type foo_type = typeof (Foo<>);
-			Type type_param = foo_type.GetGenericArguments () [0];
-			Type byref_type_param = type_param.MakeByRefType ();
-			Assert.IsFalse (byref_type_param.IsGenericParameter);
-			Assert.IsNull (byref_type_param.DeclaringType);
-		}
-
-		[ComVisible (true)]
-		public class ComFoo<T> {
-		}
-
-		[Test]
-		public void GetCustomAttributesGenericInstance ()
-		{
-			Assert.AreEqual (1, typeof (ComFoo<int>).GetCustomAttributes (typeof (ComVisibleAttribute), true).Length);
-		}
 #endif
 
 		public class NemerleAttribute : Attribute
diff --git a/mcs/class/corlib/Test/resources/MyResources.de.resources b/mcs/class/corlib/Test/resources/MyResources.de.resources
deleted file mode 100644
index acc57a03ef9..00000000000
--- a/mcs/class/corlib/Test/resources/MyResources.de.resources
+++ /dev/null
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index a44fe4b4378..f72deb5c990 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -114,6 +114,7 @@ System/DateTimeKind.cs
 System/DayOfWeek.cs
 System/DBNull.cs
 System/Decimal.cs
+System/DecimalFormatter.cs
 System/Delegate.cs
 System/DelegateSerializationHolder.cs
 System/DivideByZeroException.cs
diff --git a/mcs/class/corlib/corlib_plattest.dll.excludes b/mcs/class/corlib/corlib_plattest.dll.excludes
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/class/corlib/corlib_plattest.dll.excludes
diff --git a/mcs/class/corlib/corlib_res.dll.excludes b/mcs/class/corlib/corlib_res.dll.excludes
new file mode 100644
index 00000000000..688550ea906
--- /dev/null
+++ b/mcs/class/corlib/corlib_res.dll.excludes
@@ -0,0 +1,22 @@
+System/Object.cs
+System/ValueType.cs
+System/Enum.cs
+System/Delegate.cs
+System/MulticastDelegate.cs
+System.Runtime.CompilerServices/RuntimeHelpers.cs
+System/Decimal.cs
+System/DecimalFormatter.cs
+System/MonoType.cs
+System/Array.cs
+System/String.cs
+System/Console.cs
+System/RuntimeTypeHandle.cs
+System/ArgIterator.cs
+System/ICloneable.cs
+System.Collections/Queue.cs
+System.Collections/ICollection.cs
+System.Collections/IEnumerator.cs
+System.Collections/IEnumerable.cs
+System.Collections/IList.cs
+System.Reflection/TargetInvocationException.cs
+System.Security.Permissions/SecurityPermissionAttribute.cs
diff --git a/mcs/class/corlib/corlib_test.dll.sources b/mcs/class/corlib/corlib_test.dll.sources
index 339f95d5b85..3ea294e0f20 100644
--- a/mcs/class/corlib/corlib_test.dll.sources
+++ b/mcs/class/corlib/corlib_test.dll.sources
@@ -5,7 +5,6 @@ System/AppDomainTest.cs
 System/ApplicationIdentityTest.cs
 System/ApplicationIdTest.cs
 System/ArrayTest.cs
-System/ArraySegmentTest.cs
 System/AttributeTest.cs
 System/BitConverterTest.cs
 System/BooleanTest.cs
@@ -121,7 +120,6 @@ System.Reflection/ModuleTest.cs
 System.Reflection/StrongNameKeyPairTest.cs
 System/ResolveEventArgsTest.cs
 System.Resources/ResourceReaderTest.cs
-System.Resources/ResourceManagerTest.cs
 System.Runtime.CompilerServices/RuntimeHelpersTest.cs
 System.Runtime.InteropServices/GCHandleTest.cs
 System.Runtime.InteropServices/MarshalTest.cs
diff --git a/mcs/errors/CS0144-3-lib.cs b/mcs/errors/CS0144-3-lib.cs
deleted file mode 100644
index 354391d1c56..00000000000
--- a/mcs/errors/CS0144-3-lib.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-public interface ITest {}
-
diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
index 8b3388cb23d..e8e9461b28f 100644
--- a/mcs/errors/ChangeLog
+++ b/mcs/errors/ChangeLog
@@ -1,28 +1,3 @@
-2006-02-07  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* cs1570-3.cs cs1570-5.cs cs1570-11.cs cs1570-9.cs cs1570-2.cs
-	  cs1570-4.cs cs1570-6.cs cs1570.cs cs1570-10.cs cs1570-8.cs :
-
-	  It reports XmlTextReader error message changes as build breakage.
-
-	  That's why I opposed to compare error messages blindly.
-
-2006-01-18  Raja R Harinath  <rharinath@novell.com>
-
-	* cs1026-2.cs: New test from #76656.
-
-2006-01-17  Raja R Harinath  <rharinath@novell.com>
-
-	* cs0201-2.cs, cs0201-3.cs: New tests from #76824.
-
-2006-01-16  Raja R Harinath  <rharinath@novell.com>
-
-	* cs1654.cs, cs1654-2, cs1656-4: New tests from #76874.
-
-2006-01-11  Raja R Harinath  <rharinath@novell.com>
-
-	* cs0023-3.cs: New test from #77204.
-
 2006-01-06  Ankit Jain  <jankit@novell.com>
 
 	* known-issues-gmcs: Removed cs0619-18.cs and cs0619-24.cs (working now).
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index d17fd00c31c..b1d80b5dc0d 100644
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -32,7 +32,7 @@ DISTFILES = \
 	$(wildcard known-issues-*)
 
 TEST_SUPPORT_FILES = \
-	CS0118-2-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0144-3-lib.dll CS0433-lib.dll CS0433-2-lib.dll \
+	CS0118-2-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0433-lib.dll CS0433-2-lib.dll \
 	CS0534-3-lib.dll CS0534-4-lib.dll CS0571-3-lib.dll \
 	CS0612-2-lib.dll CS0618-2-lib.dll CS0619-8-lib.dll CS0619-17-lib.dll CS0619-32-lib.dll CS0619-33-lib.dll CS0619-36-lib.dll CS0619-42-lib.dll \
 	CS0619-43-lib.dll CS1546-lib.dll CS2015-lib.dll CS3005-16-lib.dll CS3013-module.dll CSExternAlias-lib.dll \
diff --git a/mcs/errors/cs0023-3.cs b/mcs/errors/cs0023-3.cs
deleted file mode 100644
index 5ce866d779c..00000000000
--- a/mcs/errors/cs0023-3.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// cs0023-3.cs: The `.' operator can not be applied to operands of type 'void'
-// Line: 12
-
-using System; 
- 
-public class Testing 
-{ 
-	public static void DoNothing() {} 
-	 
-	public static void Main() 
-	{ 
-	 	Console.WriteLine(DoNothing().ToString()); 
-	} 
-} 
diff --git a/mcs/errors/cs0023-4.cs b/mcs/errors/cs0023-4.cs
deleted file mode 100644
index f1575b44f50..00000000000
--- a/mcs/errors/cs0023-4.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// cs0023-4.cs: The `.' operator can not be applied to anonymous methods
-// Line: 8
-
-using System;
-class Test {
-	public static void Main(string[] argv) {
-		Console.WriteLine("Type of anonymous block: {0}",
-			(delegate() {}).GetType());
-	}
-}
diff --git a/mcs/errors/cs0029-2.cs b/mcs/errors/cs0029-2.cs
deleted file mode 100644
index 118d7818bd1..00000000000
--- a/mcs/errors/cs0029-2.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// cs0029-2.cs: Cannot implicitly convert type `string' to `double'
-// Line: 11
-
-using System;

-

-public sealed class BoundAttribute : System.Attribute

-{

-	public double D;

-}

-

-class C

-{

-	[Bound (D = "Dude!")]

-	double d2;

-}
\ No newline at end of file
diff --git a/mcs/errors/cs0037-6.cs b/mcs/errors/cs0037-6.cs
deleted file mode 100644
index 4563ed13adf..00000000000
--- a/mcs/errors/cs0037-6.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// cs0037.cs: Cannot convert null to `bool' because it is a value type
-// Line: 13

-
-using System;

-

-public sealed class BoundAttribute : System.Attribute

-{

-	public bool Dec { set { } get { return false; } }

-}

-

-class C

-{

-	[Bound (Dec = null)]

-	double d2;

-}
\ No newline at end of file
diff --git a/mcs/errors/cs0102-16.cs b/mcs/errors/cs0102-16.cs
deleted file mode 100644
index d8ec60652c1..00000000000
--- a/mcs/errors/cs0102-16.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// cs0102-16.cs: The type `SampleClass' already contains a definition for `A'
-// Line: 7
-
-public class SampleClass {
-		partial class A {}
-        
-        public void A () {}
-}
\ No newline at end of file
diff --git a/mcs/errors/cs0111-16.cs b/mcs/errors/cs0111-16.cs
deleted file mode 100644
index 3ae4203e6df..00000000000
--- a/mcs/errors/cs0111-16.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// cs0111-16.cs: `T.T()' is already defined. Rename this member or use different parameter types

-// Line : 9

-

-partial class T {

-	T () {}

-}

-

-partial class T {

-	T () {}

-}

diff --git a/mcs/errors/cs0111-17.cs b/mcs/errors/cs0111-17.cs
deleted file mode 100644
index 57b1d2a1e49..00000000000
--- a/mcs/errors/cs0111-17.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// cs0111-17.cs: `Test.get_Value()' is already defined. Rename this member or use different parameter types

-// Line: 7

-

-public partial class Test

-{

-	public string get_Value () { return null; }

-}

-

-public partial class Test

-{

-	public string Value {

-		get { }

-	}

-}

diff --git a/mcs/errors/cs0118-8.cs b/mcs/errors/cs0118-8.cs
deleted file mode 100644
index 782b77093c2..00000000000
--- a/mcs/errors/cs0118-8.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-class D {
-	static int a = 1;
-	static int b = 2;
-	static int Main ()
-	{
-	return (a << 1) ~ (b);	
-	}
-}
diff --git a/mcs/errors/cs0144-3.cs b/mcs/errors/cs0144-3.cs
deleted file mode 100644
index 0f1adba2844..00000000000
--- a/mcs/errors/cs0144-3.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// cs0144-3.cs: Cannot create an instance of the abstract class or interface `ITest'
-// Line: 9

-// Compiler options: -r:CS0144-3-lib.dll

-

-public class SampleClass {

-		public void Main ()

-		{

-			ITest modelo;

-			modelo= new ITest ();

-		}
-}
\ No newline at end of file
diff --git a/mcs/errors/cs0165-11.cs b/mcs/errors/cs0165-11.cs
index ad5c1ee3015..ad5c1ee3015 100644..100755
--- a/mcs/errors/cs0165-11.cs
+++ b/mcs/errors/cs0165-11.cs
diff --git a/mcs/errors/cs0165-8.cs b/mcs/errors/cs0165-8.cs
index b6f8ddd5dc3..b6f8ddd5dc3 100644..100755
--- a/mcs/errors/cs0165-8.cs
+++ b/mcs/errors/cs0165-8.cs
diff --git a/mcs/errors/cs0201-2.cs b/mcs/errors/cs0201-2.cs
deleted file mode 100644
index 260186d2df6..00000000000
--- a/mcs/errors/cs0201-2.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// cs0201-2.cs: Only assignment, call, increment, decrement, and new object expressions can be used as a statement
-// Line: 7
-
-class T {
-        static string XX;
-        static void Main () {
-                T.XX;
-        }
-}
diff --git a/mcs/errors/cs0201-3.cs b/mcs/errors/cs0201-3.cs
deleted file mode 100644
index 623fd7fea4f..00000000000
--- a/mcs/errors/cs0201-3.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// cs0201-3.cs: Only assignment, call, increment, decrement, and new object expressions can be used as a statement
-// Line: 7
-
-class T {
-        static string XX {
-                get {return "";}
-        }
-        static void Main () {
-                T.XX;
-        }
-}
diff --git a/mcs/errors/cs0221-5.cs b/mcs/errors/cs0221-5.cs
deleted file mode 100644
index d30b25fa82e..00000000000
--- a/mcs/errors/cs0221-5.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// cs0221.cs: Constant value `-1' cannot be converted to a `byte' (use `unchecked' syntax to override)
-// Line: 11
-

-using System;

-
-public class My3Attribute : Attribute

-{

-	public My3Attribute (byte b) {}

-}

-

-[My3((byte)-1)]

-public class Test { }
\ No newline at end of file
diff --git a/mcs/errors/cs0246-14.cs b/mcs/errors/cs0246-14.cs
index 7b1e04cb1b6..829eef9fad2 100644
--- a/mcs/errors/cs0246-14.cs
+++ b/mcs/errors/cs0246-14.cs
@@ -1,4 +1,4 @@
-// cs0246-14.cs: The type or namespace name `Uri' could not be found. Are you missing a using directive or an assembly reference?
+// bug76419.cs: The type or namespace name `Uri' could not be found. Are you missing a using directive or an assembly reference?
 // Line: 7
 
 // This bug actual checks that the compiler doesn't crash
diff --git a/mcs/errors/cs0246-15.cs b/mcs/errors/cs0246-15.cs
deleted file mode 100644
index e8738932087..00000000000
--- a/mcs/errors/cs0246-15.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// cs0246-15.cs: The type or namespace name `InvalidTypeBlah' could not be found. Are you missing a using directive or an assembly reference?
-// Line: 17
-
-//
-// This test is here to test that the compiler does not crash after it
-// reports the error due to an invalid type being referenced in the 
-// delegate
-//
-using System;
-
-public class AnonDelegateTest 
-{
-        public delegate void TestDelegate(AnonDelegateTest something, string b);
-
-        public static void Main()
-        {
-                AnonDelegateTest test = new AnonDelegateTest();
-                
-                // Incorrect; mcs throws unhandled exception here
-                test.Call(delegate(InvalidTypeBlah something, string b) {
-                        Console.WriteLine(b);
-                });
-        }
-
-        public void Call(TestDelegate d)
-        {
-                d(this, "Hello");
-        }
-}
-
-
diff --git a/mcs/errors/cs0573-2.cs b/mcs/errors/cs0573-2.cs
deleted file mode 100644
index 89458be2ef6..00000000000
--- a/mcs/errors/cs0573-2.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-// cs0573.cs: `A.a': Structs cannot have instance field initializers

-// Line: 5

-

-partial struct A {

-	int a = 1;

-}

diff --git a/mcs/errors/cs0579-10.cs b/mcs/errors/cs0579-10.cs
deleted file mode 100644
index 242640762bd..00000000000
--- a/mcs/errors/cs0579-10.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// cs0579-10.cs: The attribute `SimpleAttribute' cannot be applied multiple times

-// Line : 18

-

-using System;

-

-[AttributeUsage (AttributeTargets.All, AllowMultiple = false)]

-public class SimpleAttribute : Attribute {

-

-	public SimpleAttribute ()

-	{

-	}

-	

-}

-

-[Simple]

-public partial class Blah { }

-

-[Simple]

-public partial class Blah { }

-

diff --git a/mcs/errors/cs0579-2.cs b/mcs/errors/cs0579-2.cs
index 18708cef7d5..31168607b58 100644
--- a/mcs/errors/cs0579-2.cs
+++ b/mcs/errors/cs0579-2.cs
@@ -1,4 +1,4 @@
-// cs0579-2.cs: The attribute `System.Diagnostics.DebuggableAttribute' cannot be applied multiple times
+// cs0579-2.cs: Duplicate `DebuggableAttribute' attribute
 // Line: 7
 
 using System.Diagnostics;
diff --git a/mcs/errors/cs0579-3.cs b/mcs/errors/cs0579-3.cs
index 0a1ffe1b876..324c206838f 100644
--- a/mcs/errors/cs0579-3.cs
+++ b/mcs/errors/cs0579-3.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `System.ObsoleteAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `Obsolete' attribute
 // Line : 8
 
 using System;
diff --git a/mcs/errors/cs0579-4.cs b/mcs/errors/cs0579-4.cs
index a2233dd78d8..11517ee7a96 100644
--- a/mcs/errors/cs0579-4.cs
+++ b/mcs/errors/cs0579-4.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `System.Reflection.AssemblyKeyNameAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `AssemblyKeyName' attribute
 // Line : 7
 // Compiler options: CS0579-4-1.cs
 
diff --git a/mcs/errors/cs0579-5.cs b/mcs/errors/cs0579-5.cs
index a0d28132d21..233635171da 100644
--- a/mcs/errors/cs0579-5.cs
+++ b/mcs/errors/cs0579-5.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `ReturnAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `Return' attribute
 // Line : 17
 
 using System;
diff --git a/mcs/errors/cs0579-6.cs b/mcs/errors/cs0579-6.cs
index fb142f569dc..f568c9ef046 100644
--- a/mcs/errors/cs0579-6.cs
+++ b/mcs/errors/cs0579-6.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `System.CLSCompliantAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `CLSCompliant' attribute
 // Line : 10
 
 using System;
diff --git a/mcs/errors/cs0579-7.cs b/mcs/errors/cs0579-7.cs
index db508eacbc1..82ff675d813 100644
--- a/mcs/errors/cs0579-7.cs
+++ b/mcs/errors/cs0579-7.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `System.CLSCompliantAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `CLSCompliant' attribute
 // Line : 10
 
 using System;
diff --git a/mcs/errors/cs0579-8.cs b/mcs/errors/cs0579-8.cs
index f0cd0faf6b6..6198643d6fa 100644
--- a/mcs/errors/cs0579-8.cs
+++ b/mcs/errors/cs0579-8.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `System.ObsoleteAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `Obsolete' attribute
 // Line : 17
 
 using System;
diff --git a/mcs/errors/cs0579.cs b/mcs/errors/cs0579.cs
index 5b4de129a38..880c16c1e84 100644
--- a/mcs/errors/cs0579.cs
+++ b/mcs/errors/cs0579.cs
@@ -1,4 +1,4 @@
-// cs0579.cs: The attribute `System.Reflection.AssemblyKeyNameAttribute' cannot be applied multiple times
+// cs0579.cs : Duplicate `AssemblyKeyName' attribute
 // Line : 
 
 using System.Reflection;
diff --git a/mcs/errors/cs0592-2.cs b/mcs/errors/cs0592-2.cs
index 35b78df1682..a7d8514baba 100644
--- a/mcs/errors/cs0592-2.cs
+++ b/mcs/errors/cs0592-2.cs
@@ -1,4 +1,4 @@
-// cs0592-2.cs: The attribute `MyAttributeAttribute' is not valid on this declaration type. It is valid on `interface' declarations only
+// cs0592-2.cs: Attribute `MyAttribute' is not valid on this declaration type. It is valid on `interface' declarations only
 // Line : 8
 
 using System;
diff --git a/mcs/errors/cs0592-3.cs b/mcs/errors/cs0592-3.cs
index 211e55f04c0..63a1f6bfc41 100644
--- a/mcs/errors/cs0592-3.cs
+++ b/mcs/errors/cs0592-3.cs
@@ -1,4 +1,4 @@
-// cs0592-3.cs: The attribute `System.Runtime.CompilerServices.IndexerNameAttribute' is not valid on this declaration type. It is valid on `property, indexer' declarations only
+// cs0592-3.cs: Attribute `IndexerName' is not valid on this declaration type. It is valid on `property, indexer' declarations only
 // Line : 6
 
 using System.Runtime.CompilerServices;
diff --git a/mcs/errors/cs0592-4.cs b/mcs/errors/cs0592-4.cs
index d4a73a2a122..ba2e8c5af30 100644
--- a/mcs/errors/cs0592-4.cs
+++ b/mcs/errors/cs0592-4.cs
@@ -1,4 +1,4 @@
-// cs0592-4.cs: The attribute `TestAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
+// cs0592-4.cs: Attribute `TestAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
 // Line: 5
 
 using System;
diff --git a/mcs/errors/cs0592-5.cs b/mcs/errors/cs0592-5.cs
index f0f99103cf0..05c17e4e3ae 100644
--- a/mcs/errors/cs0592-5.cs
+++ b/mcs/errors/cs0592-5.cs
@@ -1,4 +1,4 @@
-// cs0592-5.cs: The attribute `TestAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
+// cs0592-5.cs: Attribute `TestAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
 // Line: 6
 
 using System;
diff --git a/mcs/errors/cs0592-6.cs b/mcs/errors/cs0592-6.cs
index 851d2f1010e..8b362401228 100644
--- a/mcs/errors/cs0592-6.cs
+++ b/mcs/errors/cs0592-6.cs
@@ -1,4 +1,4 @@
-// cs0592-6.cs: The attribute `TestAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
+// cs0592-6.cs: Attribute `TestAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
 // Line: 6
 
 using System;
diff --git a/mcs/errors/cs0592-7.cs b/mcs/errors/cs0592-7.cs
index d9bd7b102c6..c618bc29afd 100644
--- a/mcs/errors/cs0592-7.cs
+++ b/mcs/errors/cs0592-7.cs
@@ -1,4 +1,4 @@
-// cs0592-7.cs: The attribute `EnumAttribute' is not valid on this declaration type. It is valid on `method' declarations only
+// cs0592-7.cs: Attribute `EnumAttribute' is not valid on this declaration type. It is valid on `method' declarations only
 // Line: 13
 
 using System;
diff --git a/mcs/errors/cs0592-8.cs b/mcs/errors/cs0592-8.cs
index 077647fb6ec..78a0428689f 100644
--- a/mcs/errors/cs0592-8.cs
+++ b/mcs/errors/cs0592-8.cs
@@ -1,4 +1,4 @@
-// cs0592-8.cs: The attribute `System.ObsoleteAttribute' is not valid on this declaration type. It is valid on `class, struct, enum, constructor, method, property, indexer, field, event, interface, delegate' declarations only
+// cs0592-8.cs: Attribute `Obsolete' is not valid on this declaration type. It is valid on `class, struct, enum, constructor, method, property, indexer, field, event, interface, delegate' declarations only
 // Line : 8
 
 using System;
diff --git a/mcs/errors/cs0592-9.cs b/mcs/errors/cs0592-9.cs
index 0e8e1d4aa81..49879722909 100644
--- a/mcs/errors/cs0592-9.cs
+++ b/mcs/errors/cs0592-9.cs
@@ -1,4 +1,4 @@
-// cs0592-9.cs: The attribute `SAttribute' is not valid on this declaration type. It is valid on `return' declarations only
+// cs0592-9.cs: Attribute `S' is not valid on this declaration type. It is valid on `return' declarations only
 // Line : 12
 
 using System;
diff --git a/mcs/errors/cs0592.cs b/mcs/errors/cs0592.cs
index e4833e0f611..8bcfeb5dd1b 100644
--- a/mcs/errors/cs0592.cs
+++ b/mcs/errors/cs0592.cs
@@ -1,4 +1,4 @@
-// cs0592.cs: The attribute `SimpleAttribute' is not valid on this declaration type. It is valid on `constructor' declarations only
+// cs0592.cs: Attribute `Simple' is not valid on this declaration type. It is valid on `constructor' declarations only
 // Line : 22
 
 using System;
diff --git a/mcs/errors/cs0619-18.cs b/mcs/errors/cs0619-18.cs
index b2bab0440f7..0db343122d7 100644
--- a/mcs/errors/cs0619-18.cs
+++ b/mcs/errors/cs0619-18.cs
@@ -1,4 +1,4 @@
-// cs0619-18.cs: `Obsolete' is obsolete: `!!!'
+// cs0619-18.cs: `Obsolete[]' is obsolete: `!!!'
 // Line: 9
 
 [System.Obsolete("!!!", true)]
diff --git a/mcs/errors/cs0619-24.cs b/mcs/errors/cs0619-24.cs
index e25f25de399..05a293baccf 100644
--- a/mcs/errors/cs0619-24.cs
+++ b/mcs/errors/cs0619-24.cs
@@ -1,4 +1,4 @@
-// cs0619-24.cs: `Obsolete' is obsolete: `'
+// cs0619-24.cs: `Obsolete*' is obsolete: `'
 // Line: 19
 // Compiler options: -unsafe
 
diff --git a/mcs/errors/cs0619-47.cs b/mcs/errors/cs0619-47.cs
deleted file mode 100644
index 32c6fc9a875..00000000000
--- a/mcs/errors/cs0619-47.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// cs0619-47.cs: `A.Field' is obsolete: `!!!'
-// Line: 11
-
-class A: System.Attribute
-{

-	[System.Obsolete("!!!", true)]

-	public int Field;
-}
-

-class Obsolete {

-	[A(Field=2)]

-	public int Foo;
-}
diff --git a/mcs/errors/cs0619-48.cs b/mcs/errors/cs0619-48.cs
deleted file mode 100644
index 3c0f15168bb..00000000000
--- a/mcs/errors/cs0619-48.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// cs0619-48.cs: `A.Prop' is obsolete: `!!!'
-// Line: 13

-
-class A: System.Attribute
-{

-	[System.Obsolete("!!!", true)]

-	public string Prop {

-		set { }

-		get { return ""; }

-	}
-}
-

-[A(Prop="System.String.Empty")]

-class Obsolete {

-}
diff --git a/mcs/errors/cs0619-49.cs b/mcs/errors/cs0619-49.cs
deleted file mode 100644
index d719f512c5c..00000000000
--- a/mcs/errors/cs0619-49.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// cs0619-49.cs: `A.A(string[])' is obsolete: `!!!'
-// Line: 12

-
-class A: System.Attribute
-{

-	[System.Obsolete("!!!", true)]

-	public A (string[] s)

-	{

-	}

-}
-

-[A(new string[0])]

-class Obsolete {

-}
diff --git a/mcs/errors/cs0625-2.cs b/mcs/errors/cs0625-2.cs
deleted file mode 100644
index db7f26a8781..00000000000
--- a/mcs/errors/cs0625-2.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// cs0625-2.cs: `cs0625.GValue.foo': Instance field types marked with StructLayout(LayoutKind.Explicit) must have a FieldOffset attribute

-// Line: 10

-

-using System;

-using System.Runtime.InteropServices;

-

-namespace cs0625 {

-	[StructLayout(LayoutKind.Explicit)]

-	partial class GValue {

-		public int foo;

-	}

-	

-	class Tests {

-		public static void Main () {

-		}

-	}

-}

diff --git a/mcs/errors/cs0641.cs b/mcs/errors/cs0641.cs
index cbf7536e71c..21d426bfa45 100644
--- a/mcs/errors/cs0641.cs
+++ b/mcs/errors/cs0641.cs
@@ -1,4 +1,4 @@
-// cs0641.cs: Attribute `System.AttributeUsageAttribute' is only valid on classes derived from System.Attribute
+// cs0641.cs: Attribute `AttributeUsage' is only valid on classes derived from System.Attribute
 // Line: 6
 
 using System;
diff --git a/mcs/errors/cs0653.cs b/mcs/errors/cs0653.cs
index 97a84c58203..8efce4c7cbf 100644
--- a/mcs/errors/cs0653.cs
+++ b/mcs/errors/cs0653.cs
@@ -1,4 +1,4 @@
-// cs0653.cs: Cannot apply attribute class `AbstractAttribute' because it is abstract
+// cs0653.cs: Cannot apply attribute class `Abstract' because it is abstract
 // Line: 10
 
 using System;
diff --git a/mcs/errors/cs0713-2.cs b/mcs/errors/cs0713-2.cs
deleted file mode 100644
index 1f7cfdda0a4..00000000000
--- a/mcs/errors/cs0713-2.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// cs0713.cs: Static class `StaticClass' cannot derive from type `System.ArgumentNullException'. Static classes must derive from object

-// Line: 4

-

-static partial class StaticClass {

-}

-

-static partial class StaticClass : System.ArgumentNullException {

-}

diff --git a/mcs/errors/cs0714-2.cs b/mcs/errors/cs0714-2.cs
deleted file mode 100644
index a700c181860..00000000000
--- a/mcs/errors/cs0714-2.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// cs0714.cs: `StaticClass': static classes cannot implement interfaces

-// Line: 8

-

-static partial class StaticClass

-{

-}

-

-static partial class StaticClass: System.ICloneable

-{

-}

diff --git a/mcs/errors/cs1026-2.cs b/mcs/errors/cs1026-2.cs
deleted file mode 100644
index 2ef8ebfba3f..00000000000
--- a/mcs/errors/cs1026-2.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// cs1026-2.cs: Expecting `)'
-// Line: 10
-
-using System;
-
-class Test {
-        static void Main ()
-        {
-                string uri = "http://localhost/";
-                int default_port = (uri.StartsWith ("http://") ? 80 : -1;
-        }
-}
diff --git a/mcs/errors/cs1570-10.cs b/mcs/errors/cs1570-10.cs
index 6b7cde604b1..5923c2f9a8d 100644
--- a/mcs/errors/cs1570-10.cs
+++ b/mcs/errors/cs1570-10.cs
@@ -1,4 +1,4 @@
-// cs1570-10.cs: XML comment on `F:Testing.Test.PrivateField2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-10.cs: XML comment on `F:Testing.Test.PrivateField2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 23
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-11.cs b/mcs/errors/cs1570-11.cs
index 27b48420221..f2f7cedba65 100644
--- a/mcs/errors/cs1570-11.cs
+++ b/mcs/errors/cs1570-11.cs
@@ -1,4 +1,4 @@
-// cs1570-11.cs: XML comment on `P:Testing.Test.PublicProperty2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-11.cs: XML comment on `P:Testing.Test.PublicProperty2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 32
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-2.cs b/mcs/errors/cs1570-2.cs
index df438c5d557..cddb5528538 100644
--- a/mcs/errors/cs1570-2.cs
+++ b/mcs/errors/cs1570-2.cs
@@ -1,4 +1,4 @@
-// cs1570-2.cs: XML comment on `T:Testing.Test2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-2.cs: XML comment on `T:Testing.Test2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 22
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-3.cs b/mcs/errors/cs1570-3.cs
index 442801a6dcf..7a914bdb657 100644
--- a/mcs/errors/cs1570-3.cs
+++ b/mcs/errors/cs1570-3.cs
@@ -1,4 +1,4 @@
-// cs1570-3.cs: XML comment on `T:Testing.StructTest2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-3.cs: XML comment on `T:Testing.StructTest2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 19
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-4.cs b/mcs/errors/cs1570-4.cs
index 54fa63d4706..69d72c96bed 100644
--- a/mcs/errors/cs1570-4.cs
+++ b/mcs/errors/cs1570-4.cs
@@ -1,4 +1,4 @@
-// cs1570-4.cs: XML comment on `T:Testing.InterfaceTest2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-4.cs: XML comment on `T:Testing.InterfaceTest2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 19
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-5.cs b/mcs/errors/cs1570-5.cs
index ff087828dbf..fa1aa7ab6a6 100644
--- a/mcs/errors/cs1570-5.cs
+++ b/mcs/errors/cs1570-5.cs
@@ -1,4 +1,4 @@
-// cs1570-5.cs: XML comment on `T:Testing.EnumTest2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-5.cs: XML comment on `T:Testing.EnumTest2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 17
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-6.cs b/mcs/errors/cs1570-6.cs
index face0f59783..87ebabf94df 100644
--- a/mcs/errors/cs1570-6.cs
+++ b/mcs/errors/cs1570-6.cs
@@ -1,4 +1,4 @@
-// cs1570-6.cs: XML comment on `T:Testing.MyDelegate2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-6.cs: XML comment on `T:Testing.MyDelegate2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 17
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-8.cs b/mcs/errors/cs1570-8.cs
index c2e6205abe7..8467480ab2d 100644
--- a/mcs/errors/cs1570-8.cs
+++ b/mcs/errors/cs1570-8.cs
@@ -1,4 +1,4 @@
-// cs1570-8.cs: XML comment on `F:Testing.Test.Constant2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-8.cs: XML comment on `F:Testing.Test.Constant2' has non-well-formed XML (unmatched closing element: expected summary but found invalid  Line 3, position 10.)
 // Line: 19
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570-9.cs b/mcs/errors/cs1570-9.cs
index 46570d3a9b8..57e9ebeec7f 100644
--- a/mcs/errors/cs1570-9.cs
+++ b/mcs/errors/cs1570-9.cs
@@ -1,4 +1,4 @@
-// cs1570-9.cs: XML comment on `F:Testing.Test.PublicField2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570-9.cs: XML comment on `F:Testing.Test.PublicField2' has non-well-formed XML (unmatched closing element: expected summary but found invalid  Line 3, position 10.)
 // Line: 19
 // Compiler options: -doc:dummy.xml -warn:1 -warnaserror
 
diff --git a/mcs/errors/cs1570.cs b/mcs/errors/cs1570.cs
index 7ff211e1c3a..b234e422f81 100644
--- a/mcs/errors/cs1570.cs
+++ b/mcs/errors/cs1570.cs
@@ -1,4 +1,4 @@
-// cs1570.cs: XML comment on `T:Testing.Test2' has non-well-formed XML ('summary' is expected  Line 3, position 4.)
+// cs1570.cs: XML comment on `T:Testing.Test2' has non-well-formed XML (unmatched closing element: expected summary but found incorrect  Line 3, position 12.)
 // Line: 22
 // Compiler options: -doc:dummy.xml -warnaserror -warn:1
 
diff --git a/mcs/errors/cs1612-3.cs b/mcs/errors/cs1612-3.cs
deleted file mode 100644
index dc80a2f88a0..00000000000
--- a/mcs/errors/cs1612-3.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// cs1612-3.cs: Cannot modify the return value of `bar.this[...]' because it is not a variable
-// Line: 19
-
-struct foo {
-	public int x;
-}
-
-class bar {
-	public foo this [int x] {
-		get { return new foo (); }
-		set { }
-	}
-}
-
-class main {
-	static void Main ()
-	{
-		bar b = new bar ();
-		b [0].x = 5;
-	}
-}
diff --git a/mcs/errors/cs1654-2.cs b/mcs/errors/cs1654-2.cs
deleted file mode 100644
index 1305053eb43..00000000000
--- a/mcs/errors/cs1654-2.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// cs1654-2.cs: Cannot assign to members of `q' because it is a `foreach iteration variable'
-// Line: 22
-
-using System.Collections;
-
-struct P {
-	public int x;
-}
-
-struct Q {
-	public P p;
-}
-
-class Test {
-	static IEnumerable foo () { return null; }
-
-	static void Main ()
-	{
-		IEnumerable f = foo ();
-		if (f != null)
-			foreach (Q q in f)
-				q.p.x = 0;
-	}
-}
diff --git a/mcs/errors/cs1654.cs b/mcs/errors/cs1654.cs
deleted file mode 100644
index b9b316ea09a..00000000000
--- a/mcs/errors/cs1654.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// cs1654.cs: Cannot assign to members of `p' because it is a `foreach iteration variable'
-// Line: 18
-
-using System.Collections;
-
-struct P {
-	public int x;
-}
-
-class Test {
-	static IEnumerable foo () { return null; }
-
-	static void Main ()
-	{
-		IEnumerable f = foo ();
-		if (f != null)
-			foreach (P p in f)
-				p.x = 0;
-	}
-}
diff --git a/mcs/errors/cs1656-4.cs b/mcs/errors/cs1656-4.cs
deleted file mode 100644
index 491fd7f3f1e..00000000000
--- a/mcs/errors/cs1656-4.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// cs1656-4.cs: Cannot assign to `i' because it is a `foreach iteration variable'
-// Line: 14
-
-using System.Collections;
-
-class Test {
-	static IEnumerable foo () { return null; }
-
-	static void Main ()
-	{
-		IEnumerable f = foo ();
-		if (f != null)
-			foreach (int i in f)
-				i = 0;
-	}
-}
diff --git a/mcs/errors/cs3005-24.cs b/mcs/errors/cs3005-24.cs
deleted file mode 100644
index 09c39954cbd..00000000000
--- a/mcs/errors/cs3005-24.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// cs3005-24.cs: Identifier `ClsClass' differing only in case is not CLS-compliant

-// Line: 9

-// Compiler options: -warnaserror

-

-[assembly:System.CLSCompliant(true)]

-

-public partial class CLSClass {}

-

-public partial struct ClsClass {}

diff --git a/mcs/errors/cs3011.cs b/mcs/errors/cs3011.cs
index 49114c24414..6ae1ed5f8d4 100644
--- a/mcs/errors/cs3011.cs
+++ b/mcs/errors/cs3011.cs
@@ -6,6 +6,9 @@ using System;
 
 public abstract class CLSClass {
         [CLSCompliant (false)]
+        internal abstract int Valid ();
+    
+        [CLSCompliant (false)]
         protected abstract void Error (IComparable arg);
 }
 
diff --git a/mcs/errors/cs3016-4.cs b/mcs/errors/cs3016-4.cs
deleted file mode 100644
index 3b98475d9ae..00000000000
--- a/mcs/errors/cs3016-4.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// cs3016.cs: Arrays as attribute arguments are not CLS-compliant
-// Line: 7
-
-using System;
-[assembly: System.CLSCompliant (true)]
-
-[CLSAttribute (new bool [] {true, false})]
-public enum E {
-}
-
-public partial class CLSAttribute: System.Attribute {
-        public CLSAttribute () {
-        }
-        
-        public CLSAttribute(bool[] array) {
-        }
-}
\ No newline at end of file
diff --git a/mcs/errors/cs3018-3.cs b/mcs/errors/cs3018-3.cs
deleted file mode 100644
index 146eb55ea4b..00000000000
--- a/mcs/errors/cs3018-3.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// cs3018-2.cs: `C1.I2' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `C1'

-// Line: 10

-

-using System;

-[assembly: CLSCompliant (true)]

-

-public partial class C1

-{

-    [CLSCompliant (true)]

-    public interface I2 {}

-}

-

-[CLSCompliant (false)]

-public partial class C1

-{

-}
\ No newline at end of file
diff --git a/mcs/errors/cs3021-2.cs b/mcs/errors/cs3021-2.cs
deleted file mode 100644
index db891eac0b2..00000000000
--- a/mcs/errors/cs3021-2.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// cs3021-2.cs: `I' does not need a CLSCompliant attribute because the assembly is not marked as CLS-compliant

-// Line: 9

-// Compiler options: -warn:2 -warnaserror

-

-using System;

-

-[CLSCompliant (false)]

-public partial interface I

-{

-}

diff --git a/mcs/errors/gcs0021.cs b/mcs/errors/gcs0021.cs
index 0c2ff6b1921..0c2ff6b1921 100644..100755
--- a/mcs/errors/gcs0021.cs
+++ b/mcs/errors/gcs0021.cs
diff --git a/mcs/errors/gcs0121.cs b/mcs/errors/gcs0121.cs
deleted file mode 100755
index 8fd087d6812..00000000000
--- a/mcs/errors/gcs0121.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// CS0121: The call is ambiguous between the following methods or properties: `Foo<int,int>.Test(in int)' and `Foo<int,int>.Test(in int)'
-// Line: 23
-using System;
-
-public class Foo<T,U>
-{
-	public void Test (T index)
-	{
-		Console.WriteLine ("Test 1: {0}", index);
-	}
-
-	public void Test (U index)
-	{
-		Console.WriteLine ("Test 2: {0}", index);
-	}
-}
-
-class X
-{
-	static void Main ()
-	{
-		Foo<int,int> foo = new Foo<int,int> ();
-		foo.Test (3);
-	}
-}
diff --git a/mcs/errors/known-issues-gmcs b/mcs/errors/known-issues-gmcs
index 6800a3986e9..1ca11dcd02a 100644
--- a/mcs/errors/known-issues-gmcs
+++ b/mcs/errors/known-issues-gmcs
@@ -13,6 +13,7 @@
 
 cs0229-2.cs
 cs0229.cs NO ERROR
+cs0231-2.cs
 cs0525.cs
 cs0526.cs
 cs0531.cs
@@ -24,6 +25,7 @@ cs0560.cs
 cs0567.cs
 cs0612-2.cs NO ERROR
 cs0619-42.cs
+cs0628-3.cs NO ERROR
 cs0631-2.cs
 cs0647-3.cs
 cs1035.cs
@@ -53,24 +55,3 @@ gcs0308.cs
 
 cs0619-18.cs
 cs0619-24.cs
-cs0144-3.cs NO ERROR
-cs0579-2.cs
-cs0579-3.cs
-cs0579-4.cs
-cs0579-5.cs
-cs0579-6.cs
-cs0579-7.cs
-cs0579-8.cs
-cs0579.cs
-cs0592-2.cs
-cs0592-3.cs
-cs0592-4.cs
-cs0592-5.cs
-cs0592-6.cs
-cs0592-7.cs
-cs0592-8.cs
-cs0592-9.cs
-cs0592.cs
-cs0641.cs
-cs0653.cs
-
diff --git a/mcs/errors/known-issues-mcs b/mcs/errors/known-issues-mcs
index 59b82912c51..5b7227669b7 100644
--- a/mcs/errors/known-issues-mcs
+++ b/mcs/errors/known-issues-mcs
@@ -13,6 +13,7 @@
 
 cs0229-2.cs
 cs0229.cs NO ERROR
+cs0231-2.cs
 cs0525.cs
 cs0526.cs
 cs0547.cs
@@ -31,4 +32,4 @@ cs1525.cs
 cs1528.cs
 cs1586.cs
 cs1641.cs
-cs1670-2.cs
+cs1670-2.cs
\ No newline at end of file
diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index baf574015f3..f96ca5f0b38 100644
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -29,37 +29,6 @@
 	(TypeManager.ExpandInterfaces): Use TypeManager.GetInterfaces()
 	rather than calling it directly; fixes #77488.	
 
-2006-02-08  Martin Baulig  <martin@ximian.com>
-
-	* generic.cs (ConstraintChecker.CheckConstraints): Move the error
-	reporting into CheckConstraint() so we can use the correctly
-	instantiated type.
-
-2006-02-08  Martin Baulig  <martin@ximian.com>
-
-	* expression.cs (BaseAccess): Add support for generic methods.
-
-	* ecore.cs (MethodGroupExpr.ResolveGeneric): Propagate `IsBase' to
-	the new MethodGroupExpr.
-
-2006-02-07  Martin Baulig  <martin@ximian.com>
-
-	* generic.cs (ConstraintChecker.CheckConstraints): Interfaces are
-	also reference types; fixes #77483.
-
-2006-02-07  Martin Baulig  <martin@ximian.com>
-
-	* generic.cs
-	(TypeManager.IsGenericMethod): We now return whether something is
-	an instantiated generic method (and not a generic method def).
-	(TypeManager.IsGenericMethodDefinition): New public method.
-
-	* typemanager.cs
-	(TypeManager.CSharpSignature): Only include type arguments for
-	"real" generic methods, not for any instantiated method.
-	(TypeManager.GetMethodName): Likewise, but also allow generic
-	method definitions here.
-
 2006-02-06  Miguel de Icaza  <miguel@novell.com>
 
 	* codegen.cs (EmitScopeInitFromBlock): check here the
@@ -84,6 +53,19 @@
 
        * ecore.cs (PropertyExpr.FindAccessors): Just made flags const.
 	
+2006-02-07  Martin Baulig  <martin@ximian.com>
+
+	* generic.cs
+	(TypeManager.IsGenericMethod): We now return whether something is
+	an instantiated generic method (and not a generic method def).
+	(TypeManager.IsGenericMethodDefinition): New public method.
+
+	* typemanager.cs
+	(TypeManager.CSharpSignature): Only include type arguments for
+	"real" generic methods, not for any instantiated method.
+	(TypeManager.GetMethodName): Likewise, but also allow generic
+	method definitions here.
+
 2006-02-06  Martin Baulig  <martin@ximian.com>
 
 	* class.cs (TypeContainer.DefineType): If we're a struct, pass
diff --git a/mcs/gmcs/cs-parser.jay b/mcs/gmcs/cs-parser.jay
index 1e5297fda46..05c5aa97654 100644
--- a/mcs/gmcs/cs-parser.jay
+++ b/mcs/gmcs/cs-parser.jay
@@ -3164,10 +3164,10 @@ this_access
 	;
 
 base_access
-	: BASE DOT IDENTIFIER opt_type_argument_list
+	: BASE DOT IDENTIFIER
 	  {
 		LocatedToken lt = (LocatedToken) $3;
-		$$ = new BaseAccess (lt.Value, (TypeArguments) $4, lt.Location);
+		$$ = new BaseAccess (lt.Value, lt.Location);
 	  }
 	| BASE OPEN_BRACKET expression_list CLOSE_BRACKET
 	  {
diff --git a/mcs/gmcs/ecore.cs b/mcs/gmcs/ecore.cs
index 14a25c98137..fa7452cbe25 100644
--- a/mcs/gmcs/ecore.cs
+++ b/mcs/gmcs/ecore.cs
@@ -2913,7 +2913,6 @@ namespace Mono.CSharp {
 				MethodGroupExpr new_mg = new MethodGroupExpr (list, Location);
 				new_mg.InstanceExpression = InstanceExpression;
 				new_mg.HasTypeArguments = true;
-				new_mg.IsBase = IsBase;
 				return new_mg;
 			}
 
diff --git a/mcs/gmcs/expression.cs b/mcs/gmcs/expression.cs
index b4f33caf4df..0719ae4d85c 100644
--- a/mcs/gmcs/expression.cs
+++ b/mcs/gmcs/expression.cs
@@ -8497,13 +8497,11 @@ namespace Mono.CSharp {
 	///   The base operator for method names
 	/// </summary>
 	public class BaseAccess : Expression {
-		public readonly string Identifier;
-		TypeArguments args;
+		string member;
 		
-		public BaseAccess (string member, TypeArguments args, Location l)
+		public BaseAccess (string member, Location l)
 		{
-			this.Identifier = member;
-			this.args = args;
+			this.member = member;
 			loc = l;
 		}
 
@@ -8555,10 +8553,10 @@ namespace Mono.CSharp {
 			}
 			
 			member_lookup = MemberLookup (ec, ec.ContainerType, null, base_type,
-						      Identifier, AllMemberTypes, AllBindingFlags,
+						      member, AllMemberTypes, AllBindingFlags,
 						      loc);
 			if (member_lookup == null) {
-				MemberLookupFailed (ec, base_type, base_type, Identifier, null, true, loc);
+				MemberLookupFailed (ec, base_type, base_type, member, null, true, loc);
 				return null;
 			}
 
@@ -8579,18 +8577,8 @@ namespace Mono.CSharp {
 				pe.IsBase = true;
 			}
 
-			MethodGroupExpr mg = e as MethodGroupExpr;
-			if (mg != null)
-				mg.IsBase = true;
-
-			if (args != null) {
-				if (mg != null)
-					return mg.ResolveGeneric (ec, args);
-
-				Report.Error (307, loc, "`{0}' cannot be used with type arguments",
-					      Identifier);
-				return null;
-			}
+			if (e is MethodGroupExpr)
+				((MethodGroupExpr) e).IsBase = true;
 
 			return e;
 		}
diff --git a/mcs/gmcs/generic.cs b/mcs/gmcs/generic.cs
index b40828e742a..58a967e1029 100644
--- a/mcs/gmcs/generic.cs
+++ b/mcs/gmcs/generic.cs
@@ -1495,7 +1495,7 @@ namespace Mono.CSharp {
 					is_class = is_struct = false;
 				}
 			} else {
-				is_class = atype.IsClass || atype.IsInterface;
+				is_class = atype.IsClass;
 				is_struct = atype.IsValueType && !TypeManager.IsNullableType (atype);
 			}
 
@@ -1526,16 +1526,26 @@ namespace Mono.CSharp {
 			// The class constraint comes next.
 			//
 			if (gc.HasClassConstraint) {
-				if (!CheckConstraint (ec, ptype, aexpr, gc.ClassConstraint))
+				if (!CheckConstraint (ec, ptype, aexpr, gc.ClassConstraint)) {
+					Error_TypeMustBeConvertible (atype, gc.ClassConstraint, ptype);
 					return false;
+				}
 			}
 
 			//
 			// Now, check the interface constraints.
 			//
 			foreach (Type it in gc.InterfaceConstraints) {
-				if (!CheckConstraint (ec, ptype, aexpr, it))
+				Type itype;
+				if (it.IsGenericParameter)
+					itype = atypes [it.GenericParameterPosition];
+				else
+					itype = it;
+
+				if (!CheckConstraint (ec, ptype, aexpr, itype)) {
+					Error_TypeMustBeConvertible (atype, itype, ptype);
 					return false;
+				}
 			}
 
 			//
@@ -1590,11 +1600,7 @@ namespace Mono.CSharp {
 				ctype = atypes [pos];
 			}
 
-			if (Convert.ImplicitStandardConversionExists (ec, expr, ctype))
-				return true;
-
-			Error_TypeMustBeConvertible (expr.Type, ctype, ptype);
-			return false;
+			return Convert.ImplicitStandardConversionExists (ec, expr, ctype);
 		}
 
 		bool HasDefaultConstructor (EmitContext ec, Type atype)
diff --git a/mcs/mbas/ChangeLog b/mcs/mbas/ChangeLog
index db23178216d..67f23c98e95 100644
--- a/mcs/mbas/ChangeLog
+++ b/mcs/mbas/ChangeLog
@@ -1,13 +1,3 @@
-2006-02-21 Jelmer Vernooij <jelmer@samba.org>
-	* Test/tests/statements/AssignmentStatementsJ.vb: Add test that 
-	demonstrates bug in incremental property assignment.
-
-2006-01-23 Jelmer Vernooij <jelmer@samba.org>
-	* Test/tests/typemembers/EventP.vb: Add tests that check for 
-	more complex constructions in AddHandler / RemoveHandler.
-	* Test/tests/typemembers/EventO.vb: Test for parsing a WITHEVENTS 
-	variable declaration after it is being used in a 'Handles ...' clause.
-
 2005-12-21 Maverson Eduardo Schulze Rosa <maverson@gmail.com>
  	* ecore.cs, cfold.cs: Changed for reflecting correct Error Number/Message with
 	Implict Convertions when Option Strict is On.
diff --git a/mcs/mbas/Test/tests/statements/AssignmentStatementsJ.vb b/mcs/mbas/Test/tests/statements/AssignmentStatementsJ.vb
deleted file mode 100644
index 8881da22e91..00000000000
--- a/mcs/mbas/Test/tests/statements/AssignmentStatementsJ.vb
+++ /dev/null
@@ -1,26 +0,0 @@
-Imports System
-Imports Microsoft.VisualBasic
-
-Module AssignmentStatementsC
-	Class Obj
-		Dim _prop as String
-		Public Property prop() As String
-			Set
-				_prop = Value
-			End Set
-			Get
-				Return _prop
-			End Get
-		End Property
-	End Class
-
-	Sub Main()
-		Dim foo As New Obj
-		foo.prop = "Hello"
-		foo.prop += "World"
-
-        	If foo.prop <> "HelloWorld" Then
-            		Throw New Exception("#ASC5 - Assignment Statement failed")
-        	End If
-	End Sub
-End Module
diff --git a/mcs/mbas/Test/tests/typemembers/EventO.vb b/mcs/mbas/Test/tests/typemembers/EventO.vb
deleted file mode 100644
index ffd38781fcf..00000000000
--- a/mcs/mbas/Test/tests/typemembers/EventO.vb
+++ /dev/null
@@ -1,22 +0,0 @@
-'To Check if WithEvents members can appear after they are used by 
-'Handles clauses
-
-Imports System
-
-Class Raiser
-    Public Event Fun(ByVal i as Integer)
-    Public Sub New(i as Integer)
-        RaiseEvent Fun(23)
-    End Sub
-End Class
-
-Module Test
-    Private Sub Fun(ByVal i as integer) Handles x.Fun
-    End Sub
-
-    Private WithEvents x As Raiser
-    
-    Public Sub Main()
-        x = New Raiser(10)
-    End Sub
-End Module
diff --git a/mcs/mbas/Test/tests/typemembers/EventP.vb b/mcs/mbas/Test/tests/typemembers/EventP.vb
deleted file mode 100644
index 3513fca136c..00000000000
--- a/mcs/mbas/Test/tests/typemembers/EventP.vb
+++ /dev/null
@@ -1,42 +0,0 @@
-'To see if AddHandler supports non-AddressOf arguments
-
-Imports System
-
-Class C
-    Public Event E As EventHandler
-
-    Public Sub S()
-        RaiseEvent E(Me, EventArgs.Empty)
-    End Sub
-End Class
-
-Class C1
-    Dim x As C = New C
-
-    Sub setHandler()
-        AddHandler x.E, New EventHandler(AddressOf xh)
-    End Sub
-
-    Sub unsetHandler()
-        RemoveHandler x.E, New EventHandler(AddressOf xh)
-    End Sub
-
-    Sub call_S()
-        x.S()
-    End Sub
-
-    Sub xh(ByVal sender As Object, ByVal e As EventArgs)
-        Console.WriteLine("event called")
-    End Sub
-End Class
-
-Module M
-    Sub Main()
-        Dim y As New C1
-        y.setHandler()
-        y.call_S()
-        y.unsetHandler()
-        y.call_S()
-    End Sub
-
-End Module
diff --git a/mcs/mbas/class.cs b/mcs/mbas/class.cs
index 535d3d5ac67..3036537ba5b 100644
--- a/mcs/mbas/class.cs
+++ b/mcs/mbas/class.cs
@@ -83,7 +83,7 @@ namespace Mono.MonoBASIC {
 		// Holds the events
 		ArrayList events;
 
-		// Holds AddHandlers statements for events
+		// Holds AddHandlers stements for events
 		ArrayList handlers;
 
 		// The emit context for toplevel objects.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 315b25dad1c..5ff058d8204 100644
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,136 +1,3 @@
-2006-02-27  Marek Safar  <marek.safar@seznam.cz>
-
-	* attribute.cs (Attribute.PosArguments, Attribute.NamedArguments): Use
-	these two separated members to simplify the code.
-	(Attribute.Resolve): Refactored to use new fields and methods.
-	(Attribute.ResolveConstructor): Extracted from ResolveArguments and
-	implemented obsolete attribute checking.
-	(Attribute.ResolveNamedArguments): Extracted from ResolveArguments and
-	implemented obsolete checking again. It look line never ending quest ;-)
-	(GlobalAttribute.ResolveConstructor): Need to override as the rest.
-
-	* cfold.cs (BinaryFold): TryReduce throws an exception to indicate error.
-
-	* constanct.cs (TryReduce): Throws OverflowException to indicate error.
-
-	*class.cs (Property.Define): Add RegisterProperty call.
-
-	* cs-parser.jay: Replaced ArrayList with fixed array for attribute
-	argument groups (only 2).
-
-	* ecore.cs (Expression.GetAttributableValue): New virtual method used for
-	encoding expression to arguments.
-	(Expression.ExprClassToResolveFlags): Just turned to property.
-
-	* expression.cs (ArrayCreation.ValidateInitializers): Slightly optimized.
-	(ArrayCreation.GetAttributableValue): Renamed from EncodeAsAttribute and
-	optimized as well as implemented support for zero-length attributes.
-
-	* typemanager.cs (TypeManager.RegisterProperty, TypeManager.GetProperty):
-	Add caching of PropertyInfo's.
-
-2006-02-25  Marek Safar  <marek.safar@seznam.cz>
-
-	* delegate.cs (DelegateCreation.ResolveMethodGroupExpr): Don't report
-	error multiple times.
-
-2006-02-25  Marek Safar  <marek.safar@seznam.cz>
-
-	New partial class implementation.
-	A fix for #77027, #77029, #77403
-
-	* attribute.cs (Attributable): Made attributes protected.
-
-	* class.cs (TypeContainer): Add PartialContainer and partial_parts as
-	the replacements of ClassPart and PartialContainer.
-	(TypeContainer.AddClassOrStruct): Call RecordDecl here.
-	(TypeContainer.AddInterface): Ditto.
-	(TypeContainer.AddPartial): The main method for partial classes. It checks
-	for errors and merges ModFlags and attributes. At the end class is added to
-	partial_parts list.
-	(TYpeContainer.DefineDefaultConstructor): Checks whether default ctor is
-	required here.
-	(TypeContainer.GetClsCompliantAttributeValue): Cope with partial class too.
-	(TypeContainer.GetNormalPartialBases): Resolves base classes and interfaces
-	from the rest of partial classes.
-	(TypeContainer.GetClassBases): Simplified.
-	(TypeContainer.DefineTypeBuilder): New method, mostly extracted from
-	DefineType.
-	(TypeContainer.DefineDefaultConstructor): Is used by derived classes.
-	(TypeContainer.HasExplicitLayout): Uses Flags now.
-	(PartialContainer): Removed.
-	(ClassOrStruct.AddToContainer): Moved enclosing member name check here.
-	(StaticClass): Was merged with Class.
-	(Class.GetClassBases): class and static class bases are verified here.
-	(Class.TypeAttr): Added static attributes when class is static.
-	(Struct.RegisterFieldForInitialization): Moved from TypeContainer.
-	(MemberBase): In some cases we need to call parent container for partial
-	class. It should be eliminated but it's not easy now.
-
-	* cs-parser.jay: Replaced all PartialContainer with AddPartial.
-
-	* decls.cs (MemberCore.DocComment): Introduced new property as is used by
-	partial classed to accumulate class comments.
-	(MemberCore.GetClsCompliantAttributeValue): Moved from TypeContainer.
-
-	* doc.cs (GenerateTypeDocComment): Partial classes clean up.
-
-	* driver.cs (MainDriver): Tree.GetDecl was removed.
-
-	* modifiers.cs (Modifiers): Add partial modifier.
-
-	* tree.cs (Tree.decl): Removed.
-	(RootTypes): Started to use this class more often for root types
-	specializations.
-
-2006-02-22  Marek Safar  <marek.safar@seznam.cz>
-
-	A fix for #77615
-
-	* attribute.cs (AttributeTester.GetCoClassAttribute): Don't crash when
-	external interface does not have an attribute.
-
-2006-02-22  Marek Safar  <marek.safar@seznam.cz>
-
-	Another prerequisites for new partial classs implementation.
-	
-	* attribute.cs (Attribute.Equal): Implemented.
-	(Attribute.Emit): Changed as attributes can be applied more than twice.
-	(Attributes.Emit): Check for duplicate attributes here.
-
-	* class.cs, decl.cs, delegate.cs, doc.cs, enum.cs: Don't pass DeclSpace
-	as a parameter, clean-up.
-
-2006-02-11  Marek Safar  <marek.safar@seznam.cz>
-
-	A fix for #77485
-
-	* class.cs (TypeContainer.DefineType): Cannot use ResolveType because it
-	contains obsolete attribute check which can in some cases look for base
-	type of current class which is not initialized yet.
-	(TypeContainer.BaseType): Replacement of ptype.
-
-	* decl.cs (MemberCore.CheckObsoleteType): Reuse existing code.
-
-2006-02-11  Marek Safar  <marek.safar@seznam.cz>
-
-	First of prerequisites for new partial classs implemention.
-	
-	* attribute.cs (Attributable): Extended by ResolveContext;
-	Attributes finally have correct context for resolving in all cases.
-	(AttachTo): Attribute owner is assigned here.
-
-	* codegen.cs (IResolveContext): Introduce new interface to hold
-	all information needed in resolving phase.
-	(EmitContext): Implements IResolveContext; more clean-up needed here.
-	
-	* decl.cs (MemberCore): Implemented IResolveContext.
-
-	* anonymous.cs, attribute.cs, class.cs, codegen.cs, const.cs,
-	decl.cs, ecore.cs, enum.cs, expression.cs, iterators.cs, namespace.cs,
-	parameter.cs, statement.cs, tree.cs, typemanager.cs:
-	Refactored to use new IResolveContext instead of EmitContext; cleanup
-
 2006-02-06  Miguel de Icaza  <miguel@novell.com>
 
 	* codegen.cs (EmitScopeInitFromBlock): check here the
diff --git a/mcs/mcs/anonymous.cs b/mcs/mcs/anonymous.cs
index 420dc40ce91..259241de649 100644
--- a/mcs/mcs/anonymous.cs
+++ b/mcs/mcs/anonymous.cs
@@ -358,8 +358,8 @@ namespace Mono.CSharp {
 			//ILGenerator ig = builder.GetILGenerator ();
 
 			
-			aec = new EmitContext (ec.ResolveContext,
-				ec.TypeContainer, ec.DeclContainer, loc, null,
+			aec = new EmitContext (
+				ec.TypeContainer, ec.DeclSpace, loc, null,
 				invoke_mb.ReturnType,
 				/* REVIEW */ (ec.InIterator ? Modifiers.METHOD_YIELDS : 0) |
 				(ec.InUnsafe ? Modifiers.UNSAFE : 0) |
@@ -402,7 +402,7 @@ namespace Mono.CSharp {
 			ILGenerator ig = builder.GetILGenerator ();
 			aec.ig = ig;
 			
-			Parameters.ApplyAttributes (builder);
+			Parameters.ApplyAttributes (aec, builder);
 
 			//
 			// Adjust based on the computed state of the
diff --git a/mcs/mcs/assign.cs b/mcs/mcs/assign.cs
index 2accb759911..c692474c096 100644
--- a/mcs/mcs/assign.cs
+++ b/mcs/mcs/assign.cs
@@ -378,7 +378,7 @@ namespace Mono.CSharp {
 				EventInfo ei = ((EventExpr) target).EventInfo;
 
 				Expression ml = MemberLookup (
-					ec.ContainerType, ec.ContainerType, ei.Name,
+					ec, ec.ContainerType, ei.Name,
 					MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);
 
 				if (ml == null) {
@@ -408,7 +408,7 @@ namespace Mono.CSharp {
 			}
 
 			if ((source.eclass == ExprClass.Type) && (source is TypeExpr)) {
-				source.Error_UnexpectedKind (ec.DeclContainer, "variable or value", loc);
+				source.Error_UnexpectedKind (ec, "variable or value", loc);
 				return null;
 			} else if ((RootContext.Version == LanguageVersion.ISO_1) &&
 				   (source is MethodGroupExpr)){
diff --git a/mcs/mcs/attribute.cs b/mcs/mcs/attribute.cs
index 2b8c8031ea4..d208f089f3a 100644
--- a/mcs/mcs/attribute.cs
+++ b/mcs/mcs/attribute.cs
@@ -32,11 +32,11 @@ namespace Mono.CSharp {
 		/// <summary>
 		///   Attributes for this type
 		/// </summary>
- 		protected Attributes attributes;
+ 		Attributes attributes;
 
 		public Attributable (Attributes attrs)
 		{
-			OptAttributes = attrs;
+			attributes = attrs;
 		}
 
 		public Attributes OptAttributes 
@@ -46,10 +46,6 @@ namespace Mono.CSharp {
 			}
 			set {
 				attributes = value;
-
-				if (attributes != null) {
-					attributes.AttachTo (this);
-				}
 			}
 		}
 
@@ -63,9 +59,7 @@ namespace Mono.CSharp {
 		/// </summary>
 		public abstract AttributeTargets AttributeTargets { get; }
 
-		public abstract IResolveContext ResolveContext { get; }
-
-		public abstract bool IsClsComplianceRequired ();
+		public abstract bool IsClsComplianceRequired (DeclSpace ds);
 
 		/// <summary>
 		/// Gets list of valid attribute targets for explicit target declaration.
@@ -83,20 +77,18 @@ namespace Mono.CSharp {
 		public readonly Expression LeftExpr;
 		public readonly string Identifier;
 
-		readonly ArrayList PosArguments;
-		readonly ArrayList NamedArguments;
+		public readonly ArrayList Arguments;
 
 		public readonly Location Location;
 
 		public Type Type;
 
 		bool resolve_error;
+
 		readonly bool nameEscaped;
-		Attributable owner;
 
-		static readonly AttributeUsageAttribute DefaultUsageAttribute = new AttributeUsageAttribute (AttributeTargets.All);
+		static AttributeUsageAttribute DefaultUsageAttribute = new AttributeUsageAttribute (AttributeTargets.All);
 		static Assembly orig_sec_assembly;
-		public static readonly object[] EmptyObject = new object [0];
 
 		// non-null if named args present after Resolve () is called
 		PropertyInfo [] prop_info_arr;
@@ -106,29 +98,18 @@ namespace Mono.CSharp {
 		object [] pos_values;
 
 		static PtrHashtable usage_attr_cache = new PtrHashtable ();
-
-		// Cache for parameter-less attributes
-		static PtrHashtable att_cache = new PtrHashtable ();
 		
-		public Attribute (string target, Expression left_expr, string identifier, object[] args, Location loc, bool nameEscaped)
+		public Attribute (string target, Expression left_expr, string identifier, ArrayList args, Location loc, bool nameEscaped)
 		{
 			LeftExpr = left_expr;
 			Identifier = identifier;
 			Name = LeftExpr == null ? identifier : LeftExpr + "." + identifier;
-			if (args != null) {
-				PosArguments = (ArrayList)args [0];
-				NamedArguments = (ArrayList)args [1];				
-			}
+			Arguments = args;
 			Location = loc;
 			ExplicitTarget = target;
 			this.nameEscaped = nameEscaped;
 		}
 
-		public void AttachTo (Attributable owner)
-		{
-			this.owner = owner;
-		}
-
 		void Error_InvalidNamedArgument (string name)
 		{
 			Report.Error (617, Location, "`{0}' is not a valid named attribute argument. Named attribute arguments " +
@@ -143,12 +124,18 @@ namespace Mono.CSharp {
 				      "attribute parameter type", name);
 		}
 
-		public static void Error_AttributeArgumentNotValid (Location loc)
+		static void Error_AttributeArgumentNotValid (string extra, Location loc)
 		{
 			Report.Error (182, loc,
 				      "An attribute argument must be a constant expression, typeof " +
-				      "expression or array creation expression");
-		}		
+				      "expression or array creation expression" + extra);
+		}
+
+		static void Error_AttributeArgumentNotValid (Location loc)
+		{
+			Error_AttributeArgumentNotValid ("", loc);
+		}
+		
 
 		/// <summary>
 		/// This is rather hack. We report many emit attribute error with same error to be compatible with
@@ -165,28 +152,26 @@ namespace Mono.CSharp {
 			Error_AttributeEmitError ("it is attached to invalid parent");
 		}
 
-		protected virtual FullNamedExpression ResolveAsTypeTerminal (Expression expr, IResolveContext ec, bool silent)
+		protected virtual FullNamedExpression ResolveAsTypeTerminal (Expression expr, EmitContext ec, bool silent)
 		{
 			return expr.ResolveAsTypeTerminal (ec, silent);
 		}
 
-		protected virtual FullNamedExpression ResolveAsTypeStep (Expression expr, IResolveContext ec, bool silent)
+		protected virtual FullNamedExpression ResolveAsTypeStep (Expression expr, EmitContext ec, bool silent)
 		{
 			return expr.ResolveAsTypeStep (ec, silent);
 		}
 
-		Type ResolvePossibleAttributeType (string name, bool silent, ref bool is_attr)
+		Type ResolvePossibleAttributeType (EmitContext ec, string name, bool silent, ref bool is_attr)
 		{
-			IResolveContext rc = owner.ResolveContext;
-
 			FullNamedExpression fn;
 			if (LeftExpr == null) {
-				fn = ResolveAsTypeTerminal (new SimpleName (name, Location), rc, silent);
+				fn = ResolveAsTypeTerminal (new SimpleName (name, Location), ec, silent);
 			} else {
-				fn = ResolveAsTypeStep (LeftExpr, rc, silent);
+				fn = ResolveAsTypeStep (LeftExpr, ec, silent);
 				if (fn == null)
 					return null;
-				fn = new MemberAccess (fn, name, Location).ResolveAsTypeTerminal (rc, silent);
+				fn = new MemberAccess (fn, name, Location).ResolveAsTypeTerminal (ec, silent);
 			}
 
 			TypeExpr te = fn as TypeExpr;
@@ -194,7 +179,7 @@ namespace Mono.CSharp {
 				return null;
 
 			Type t = te.Type;
-			if (TypeManager.IsSubclassOf (t, TypeManager.attribute_type)) {
+			if (t.IsSubclassOf (TypeManager.attribute_type)) {
 				is_attr = true;
 			} else if (!silent) {
 				Report.SymbolRelatedToPreviousError (t);
@@ -206,14 +191,14 @@ namespace Mono.CSharp {
 		/// <summary>
 		///   Tries to resolve the type of the attribute. Flags an error if it can't, and complain is true.
 		/// </summary>
-		void ResolveAttributeType ()
+		void ResolveAttributeType (EmitContext ec)
 		{
 			bool t1_is_attr = false;
-			Type t1 = ResolvePossibleAttributeType (Identifier, true, ref t1_is_attr);
+			Type t1 = ResolvePossibleAttributeType (ec, Identifier, true, ref t1_is_attr);
 
 			bool t2_is_attr = false;
 			Type t2 = nameEscaped ? null :
-				ResolvePossibleAttributeType (Identifier + "Attribute", true, ref t2_is_attr);
+				ResolvePossibleAttributeType (ec, Identifier + "Attribute", true, ref t2_is_attr);
 
 			if (t1_is_attr && t2_is_attr) {
 				Report.Error (1614, Location, "`{0}' is ambiguous between `{0}' and `{0}Attribute'. " +
@@ -233,30 +218,62 @@ namespace Mono.CSharp {
 			}
 
 			if (t1 == null && t2 == null)
-				ResolvePossibleAttributeType (Identifier, false, ref t1_is_attr);
+				ResolvePossibleAttributeType (ec, Identifier, false, ref t1_is_attr);
 			if (t1 != null)
-				ResolvePossibleAttributeType (Identifier, false, ref t1_is_attr);
+				ResolvePossibleAttributeType (ec, Identifier, false, ref t1_is_attr);
 			if (t2 != null)
-				ResolvePossibleAttributeType (Identifier + "Attribute", false, ref t2_is_attr);
+				ResolvePossibleAttributeType (ec, Identifier + "Attribute", false, ref t2_is_attr);
 
 			resolve_error = true;
 		}
 
-		public virtual Type ResolveType ()
+		public virtual Type ResolveType (EmitContext ec)
 		{
 			if (Type == null && !resolve_error)
-				ResolveAttributeType ();
+				ResolveAttributeType (ec);
 			return Type;
 		}
 
 		public string GetSignatureForError ()
 		{
-			if (Type != null)
-				return TypeManager.CSharpName (Type);
-
 			return LeftExpr == null ? Identifier : LeftExpr.GetSignatureForError () + "." + Identifier;
 		}
 
+		//
+		// Given an expression, if the expression is a valid attribute-argument-expression
+		// returns an object that can be used to encode it, or null on failure.
+		//
+		public static bool GetAttributeArgumentExpression (Expression e, Location loc, Type arg_type, out object result)
+		{
+			Constant constant = e as Constant;
+			if (constant != null) {
+				constant = constant.ToType (arg_type, loc);
+				if (constant == null) {
+					result = null;
+					return false;
+				}
+				result = constant.GetTypedValue ();
+				return true;
+			} else if (e is TypeOf) {
+				result = ((TypeOf) e).TypeArg;
+				return true;
+			} else if (e is ArrayCreation){
+				result =  ((ArrayCreation) e).EncodeAsAttribute ();
+				if (result != null)
+					return true;
+			} else if (e is EmptyCast) {
+				Expression child = ((EmptyCast)e).Child;
+				return GetAttributeArgumentExpression (child, loc, child.Type, out result);
+			} else if (e is As) {
+				As as_e = (As) e;
+				return GetAttributeArgumentExpression (as_e.Expr, loc, as_e.ProbeType.Type, out result);
+			}
+
+			result = null;
+			Error_AttributeArgumentNotValid (loc);
+			return false;
+		}
+
 		bool IsValidArgumentType (Type t)
 		{
 			if (t.IsArray)
@@ -269,7 +286,10 @@ namespace Mono.CSharp {
 				t == TypeManager.type_type;
 		}
 
-		public CustomAttributeBuilder Resolve ()
+		// Cache for parameter-less attributes
+		static PtrHashtable att_cache = new PtrHashtable ();
+
+		public CustomAttributeBuilder Resolve (EmitContext ec)
 		{
 			if (resolve_error)
 				return null;
@@ -277,7 +297,7 @@ namespace Mono.CSharp {
 			resolve_error = true;
 
 			if (Type == null) {
-				ResolveAttributeType ();
+				ResolveAttributeType (ec);
 				if (Type == null)
 					return null;
 			}
@@ -292,7 +312,7 @@ namespace Mono.CSharp {
 				AttributeTester.Report_ObsoleteMessage (obsolete_attr, TypeManager.CSharpName (Type), Location);
 			}
 
-			if (PosArguments == null && NamedArguments == null) {
+			if (Arguments == null) {
 				object o = att_cache [Type];
 				if (o != null) {
 					resolve_error = false;
@@ -300,288 +320,298 @@ namespace Mono.CSharp {
 				}
 			}
 
-			EmitContext ec = new EmitContext (owner.ResolveContext, owner.ResolveContext.DeclContainer, owner.ResolveContext.DeclContainer,
-				Location, null, null, owner.ResolveContext.DeclContainer.ModFlags, false);
-
-			ConstructorInfo ctor = ResolveConstructor (ec);
+			ConstructorInfo ctor = ResolveArguments (ec);
 			if (ctor == null)
 				return null;
 
 			CustomAttributeBuilder cb;
 
 			try {
-				if (NamedArguments == null) {
-					cb = new CustomAttributeBuilder (ctor, pos_values);
+				if (prop_info_arr != null || field_info_arr != null) {
+					cb = new CustomAttributeBuilder (
+						ctor, pos_values,
+						prop_info_arr, prop_values_arr,
+						field_info_arr, field_values_arr);
+				} else {
+					cb = new CustomAttributeBuilder (
+						ctor, pos_values);
 
 					if (pos_values.Length == 0)
 						att_cache.Add (Type, cb);
-
-					resolve_error = false;
-					return cb;
 				}
-
-				if (!ResolveNamedArguments (ec)) {
-					return null;
-				}
-
-				cb = new CustomAttributeBuilder (ctor, pos_values,
-						prop_info_arr, prop_values_arr,
-						field_info_arr, field_values_arr);
-
-				resolve_error = false;
-				return cb;
 			}
 			catch (Exception) {
 				Error_AttributeArgumentNotValid (Location);
 				return null;
 			}
+
+			resolve_error = false;
+			return cb;
 		}
 
-		protected virtual ConstructorInfo ResolveConstructor (EmitContext ec)
+		protected virtual ConstructorInfo ResolveArguments (EmitContext ec)
 		{
-			if (PosArguments != null) {
-				for (int i = 0; i < PosArguments.Count; i++) {
-					Argument a = (Argument) PosArguments [i];
-
-					if (!a.Resolve (ec, Location))
-						return null;
+			// Now we extract the positional and named arguments
+			
+			ArrayList pos_args = null;
+			ArrayList named_args = null;
+			int pos_arg_count = 0;
+			int named_arg_count = 0;
+			
+			if (Arguments != null) {
+				pos_args = (ArrayList) Arguments [0];
+				if (pos_args != null)
+					pos_arg_count = pos_args.Count;
+				if (Arguments.Count > 1) {
+					named_args = (ArrayList) Arguments [1];
+					named_arg_count = named_args.Count;
 				}
 			}
 
-			Expression mg = Expression.MemberLookup (ec.ContainerType,
-				Type, ".ctor", MemberTypes.Constructor,
-				BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
-				Location);
-
-			MethodBase constructor = Invocation.OverloadResolve (
-				ec, (MethodGroupExpr) mg, PosArguments, false, Location);
-
-			if (constructor == null)
-				return null;
-
-			ObsoleteAttribute oa = AttributeTester.GetMethodObsoleteAttribute (constructor);
-			if (oa != null && !owner.ResolveContext.IsInObsoleteScope) {
-				AttributeTester.Report_ObsoleteMessage (oa, mg.GetSignatureForError (), mg.Location);
-			}
-
-			if (PosArguments == null) {
-				pos_values = EmptyObject;
-				return (ConstructorInfo)constructor;
-			}
-
-			ParameterData pd = TypeManager.GetParameterData (constructor);
-
-			int pos_arg_count = PosArguments.Count;
-			int last_real_param = pd.Count;
-
 			pos_values = new object [pos_arg_count];
 
-			if (pd.HasParams) {
-				// When the params is not filled we need to put one
-				if (last_real_param > pos_arg_count) {
-					object [] new_pos_values = new object [pos_arg_count + 1];
-					pos_values.CopyTo (new_pos_values, 0);
-					new_pos_values [pos_arg_count] = new object [] {} ;
-					pos_values = new_pos_values;
-				}
-				last_real_param--;
-			}
+			//
+			// First process positional arguments 
+			//
 
-			for (int j = 0; j < pos_arg_count; ++j) {
-				Argument a = (Argument) PosArguments [j];
+			int i;
+			for (i = 0; i < pos_arg_count; i++) {
+				Argument a = (Argument) pos_args [i];
+				Expression e;
 
-				if (!a.Expr.GetAttributableValue (out pos_values [j]))
+				if (!a.Resolve (ec, Location))
 					return null;
-				
-				if (TypeManager.IsPrimitiveType (a.Type) && a.Type != pos_values [j].GetType ()) {
-					bool fail;
-					// This can happen only for constants in same range
-					pos_values [j] = TypeManager.ChangeType (pos_values [j], a.Type, out fail);
-				}
 
-				if (j < last_real_param)
-					continue;
-				
-				if (j == last_real_param) {
-					object [] array = new object [pos_arg_count - last_real_param];
-					array [0] = pos_values [j];
-					pos_values [j] = array;
-					continue;
-				}
+				e = a.Expr;
 
-				object [] params_array = (object []) pos_values [last_real_param];
-				params_array [j - last_real_param] = pos_values [j];
-			}
+				object val;
+				if (!GetAttributeArgumentExpression (e, Location, a.Type, out val))
+					return null;
 
-			// Adjust the size of the pos_values if it had params
-			if (last_real_param != pos_arg_count) {
-				object [] new_pos_values = new object [last_real_param + 1];
-				Array.Copy (pos_values, new_pos_values, last_real_param + 1);
-				pos_values = new_pos_values;
-			}
+				pos_values [i] = val;
 
-			// Here we do the checks which should be done by corlib or by runtime.
-			// However Zoltan doesn't like it and every Mono compiler has to do it again.
-			
-			if (Type == TypeManager.guid_attr_type) {
-				try {
-					new Guid ((string)pos_values [0]);
-				}
-				catch (Exception e) {
-					Error_AttributeEmitError (e.Message);
+				if (i == 0 && Type == TypeManager.attribute_usage_type && (int)val == 0) {
+					Report.Error (591, Location, "Invalid value for argument to 'System.AttributeUsage' attribute");
 					return null;
 				}
 			}
 
-			if (Type == TypeManager.attribute_usage_type && (int)pos_values [0] == 0) {
-				Report.Error (591, Location, "Invalid value for argument to 'System.AttributeUsage' attribute");
-				return null;
-			}
-
-			if (Type == TypeManager.methodimpl_attr_type && pos_values.Length == 1 &&
-				pd.ParameterType (0) == TypeManager.short_type &&
-				!System.Enum.IsDefined (typeof (MethodImplOptions), pos_values [0].ToString ())) {
-				Error_AttributeEmitError ("Incorrect argument value.");
-				return null;
-			}
-
-			return (ConstructorInfo)constructor;
-		}
+			//
+			// Now process named arguments
+			//
 
-		protected virtual bool ResolveNamedArguments (EmitContext ec)
-		{
-			int named_arg_count = NamedArguments.Count;
+			ArrayList field_infos = null;
+			ArrayList prop_infos  = null;
+			ArrayList field_values = null;
+			ArrayList prop_values = null;
+			Hashtable seen_names = null;
 
-			ArrayList field_infos = new ArrayList (named_arg_count);
-			ArrayList prop_infos  = new ArrayList (named_arg_count);
-			ArrayList field_values = new ArrayList (named_arg_count);
-			ArrayList prop_values = new ArrayList (named_arg_count);
+			if (named_arg_count > 0) {
+				field_infos = new ArrayList ();
+				prop_infos  = new ArrayList ();
+				field_values = new ArrayList ();
+				prop_values = new ArrayList ();
 
-			ArrayList seen_names = new ArrayList(named_arg_count);
+				seen_names = new Hashtable();
+			}
 			
-			foreach (DictionaryEntry de in NamedArguments) {
+			for (i = 0; i < named_arg_count; i++) {
+				DictionaryEntry de = (DictionaryEntry) named_args [i];
 				string member_name = (string) de.Key;
+				Argument a  = (Argument) de.Value;
+				Expression e;
 
 				if (seen_names.Contains(member_name)) {
 					Report.Error(643, Location, "'" + member_name + "' duplicate named attribute argument");
-					return false;
+					return null;
 				}				
-				seen_names.Add(member_name);
-
-				Argument a = (Argument) de.Value;
+				seen_names.Add(member_name, 1);
+				
 				if (!a.Resolve (ec, Location))
-					return false;
+					return null;
 
 				Expression member = Expression.MemberLookup (
-					ec.ContainerType, Type, member_name,
+					ec, Type, member_name,
 					MemberTypes.Field | MemberTypes.Property,
 					BindingFlags.Public | BindingFlags.Instance,
 					Location);
 
 				if (member == null) {
-					member = Expression.MemberLookup (ec.ContainerType, Type, member_name,
+					member = Expression.MemberLookup (ec, Type, member_name,
 						MemberTypes.Field | MemberTypes.Property, BindingFlags.NonPublic | BindingFlags.Instance,
 						Location);
 
 					if (member != null) {
 						Expression.ErrorIsInaccesible (Location, member.GetSignatureForError ());
-						return false;
+						return null;
 					}
 				}
 
 				if (member == null){
 					Report.Error (117, Location, "`{0}' does not contain a definition for `{1}'",
 						      TypeManager.CSharpName (Type), member_name);
-					return false;
+					return null;
 				}
 				
 				if (!(member is PropertyExpr || member is FieldExpr)) {
 					Error_InvalidNamedArgument (member_name);
-					return false;
+					return null;
 				}
 
-				ObsoleteAttribute obsolete_attr;
-
+				e = a.Expr;
 				if (member is PropertyExpr) {
-					PropertyInfo pi = ((PropertyExpr) member).PropertyInfo;
+					PropertyExpr pe = (PropertyExpr) member;
+					PropertyInfo pi = pe.PropertyInfo;
 
 					if (!pi.CanWrite || !pi.CanRead) {
 						Report.SymbolRelatedToPreviousError (pi);
 						Error_InvalidNamedArgument (member_name);
-						return false;
+						return null;
 					}
 
 					if (!IsValidArgumentType (pi.PropertyType)) {
 						Report.SymbolRelatedToPreviousError (pi);
 						Error_InvalidNamedAgrumentType (member_name);
-						return false;
+						return null;
 					}
 
-					Expression e = Convert.ImplicitConversionRequired (ec, a.Expr, pi.PropertyType, a.Expr.Location);
-					if (e == null)
-						return false;
-
 					object value;
-					if (!e.GetAttributableValue (out value))
-						return false;
-
-					PropertyBase pb = TypeManager.GetProperty (pi);
-					if (pb != null)
-						obsolete_attr = pb.GetObsoleteAttribute ();
-					else
-						obsolete_attr = AttributeTester.GetMemberObsoleteAttribute (pi);
+					if (!GetAttributeArgumentExpression (e, Location, pi.PropertyType, out value))
+						return null;
 
 					prop_values.Add (value);
 					prop_infos.Add (pi);
 					
-				} else {
-					FieldInfo fi = ((FieldExpr) member).FieldInfo;
+				} else if (member is FieldExpr) {
+					FieldExpr fe = (FieldExpr) member;
+					FieldInfo fi = fe.FieldInfo;
 
 					if (fi.IsInitOnly) {
 						Error_InvalidNamedArgument (member_name);
-						return false;
+						return null;
 					}
 
 					if (!IsValidArgumentType (fi.FieldType)) {
 						Report.SymbolRelatedToPreviousError (fi);
 						Error_InvalidNamedAgrumentType (member_name);
-						return false;
+						return null;
 					}
 
-					Expression e = Convert.ImplicitConversionRequired (ec, a.Expr, fi.FieldType, a.Expr.Location);
-					if (e == null)
-						return false;
-
  					object value;
-					if (!e.GetAttributableValue (out value))
-						return false;
-
-					FieldBase fb = TypeManager.GetField (fi);
-					if (fb != null)
-						obsolete_attr = fb.GetObsoleteAttribute ();
-					else
-						obsolete_attr = AttributeTester.GetMemberObsoleteAttribute (fi);
+ 					if (!GetAttributeArgumentExpression (e, Location, fi.FieldType, out value))
+  						return null;
 
  					field_values.Add (value);  					
 					field_infos.Add (fi);
 				}
+			}
+
+			Expression mg = Expression.MemberLookup (
+				ec, Type, ".ctor", MemberTypes.Constructor,
+				BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                                Location);
 
-				if (obsolete_attr != null && !owner.ResolveContext.IsInObsoleteScope)
-					AttributeTester.Report_ObsoleteMessage (obsolete_attr, member.GetSignatureForError (), member.Location);
+			MethodBase constructor = Invocation.OverloadResolve (
+				ec, (MethodGroupExpr) mg, pos_args, false, Location);
+
+			if (constructor == null) {
+				return null;
 			}
 
-			prop_info_arr = new PropertyInfo [prop_infos.Count];
-			field_info_arr = new FieldInfo [field_infos.Count];
-			field_values_arr = new object [field_values.Count];
-			prop_values_arr = new object [prop_values.Count];
 
-			field_infos.CopyTo  (field_info_arr, 0);
-			field_values.CopyTo (field_values_arr, 0);
+			// Here we do the checks which should be done by corlib or by runtime.
+			// However Zoltan doesn't like it and every Mono compiler has to do it again.
+			
+			if (Type == TypeManager.guid_attr_type) {
+				try {
+					new Guid ((string)pos_values [0]);
+				}
+				catch (Exception e) {
+					Error_AttributeEmitError (e.Message);
+					return null;
+				}
+			}
+
+			if (Type == TypeManager.methodimpl_attr_type &&
+				pos_values.Length == 1 && ((Argument)pos_args [0]).Type == TypeManager.short_type &&
+				!System.Enum.IsDefined (typeof (MethodImplOptions), pos_values [0])) {
+					Error_AttributeEmitError ("Incorrect argument value.");
+				return null;
+			}
 
-			prop_values.CopyTo  (prop_values_arr, 0);
-			prop_infos.CopyTo   (prop_info_arr, 0);
+			//
+			// Now we perform some checks on the positional args as they
+			// cannot be null for a constructor which expects a parameter
+			// of type object
+			//
 
-			return true;
+			ParameterData pd = TypeManager.GetParameterData (constructor);
+
+			int last_real_param = pd.Count;
+			if (pd.HasParams) {
+				// When the params is not filled we need to put one
+				if (last_real_param > pos_arg_count) {
+					object [] new_pos_values = new object [pos_arg_count + 1];
+					pos_values.CopyTo (new_pos_values, 0);
+					new_pos_values [pos_arg_count] = new object [] {} ;
+					pos_values = new_pos_values;
+				}
+				last_real_param--;
+			}
+
+			for (int j = 0; j < pos_arg_count; ++j) {
+				Argument a = (Argument) pos_args [j];
+				
+				if (a.Expr is NullLiteral && pd.ParameterType (j) == TypeManager.object_type) {
+					Error_AttributeArgumentNotValid (Location);
+					return null;
+				}
+
+				object value = pos_values [j];
+				if (value != null && a.Type != value.GetType () && TypeManager.IsPrimitiveType (a.Type)) {
+					bool fail;
+					pos_values [j] = TypeManager.ChangeType (value, a.Type, out fail);
+					if (fail) {
+						// TODO: Can failed ?
+						throw new NotImplementedException ();
+					}
+				}
+
+				if (j < last_real_param)
+					continue;
+				
+				if (j == last_real_param) {
+					object [] array = new object [pos_arg_count - last_real_param];
+					array [0] = pos_values [j];
+					pos_values [j] = array;
+					continue;
+				}
+
+				object [] params_array = (object []) pos_values [last_real_param];
+				params_array [j - last_real_param] = pos_values [j];
+			}
+
+			// Adjust the size of the pos_values if it had params
+			if (last_real_param != pos_arg_count) {
+				object [] new_pos_values = new object [last_real_param + 1];
+				Array.Copy (pos_values, new_pos_values, last_real_param + 1);
+				pos_values = new_pos_values;
+			}
+
+			if (named_arg_count > 0) {
+				prop_info_arr = new PropertyInfo [prop_infos.Count];
+				field_info_arr = new FieldInfo [field_infos.Count];
+				field_values_arr = new object [field_values.Count];
+				prop_values_arr = new object [prop_values.Count];
+
+				field_infos.CopyTo  (field_info_arr, 0);
+				field_values.CopyTo (field_values_arr, 0);
+
+				prop_values.CopyTo  (prop_values_arr, 0);
+				prop_infos.CopyTo   (prop_info_arr, 0);
+			}
+
+			return (ConstructorInfo) constructor;
 		}
 
 		/// <summary>
@@ -590,7 +620,7 @@ namespace Mono.CSharp {
 		public string GetValidTargets ()
 		{
 			StringBuilder sb = new StringBuilder ();
-			AttributeTargets targets = GetAttributeUsage ().ValidOn;
+			AttributeTargets targets = GetAttributeUsage (null).ValidOn;
 
 			if ((targets & AttributeTargets.Assembly) != 0)
 				sb.Append ("assembly, ");
@@ -644,7 +674,7 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Returns AttributeUsage attribute for this type
 		/// </summary>
-		AttributeUsageAttribute GetAttributeUsage ()
+		AttributeUsageAttribute GetAttributeUsage (EmitContext ec)
 		{
 			AttributeUsageAttribute ua = usage_attr_cache [Type] as AttributeUsageAttribute;
 			if (ua != null)
@@ -661,22 +691,22 @@ namespace Mono.CSharp {
 
 			Attribute a = attr_class.OptAttributes == null
 				? null
-				: attr_class.OptAttributes.Search (TypeManager.attribute_usage_type);
+				: attr_class.OptAttributes.Search (TypeManager.attribute_usage_type, attr_class.EmitContext);
 
 			ua = a == null
 				? DefaultUsageAttribute 
-				: a.GetAttributeUsageAttribute ();
+				: a.GetAttributeUsageAttribute (attr_class.EmitContext);
 
 			usage_attr_cache.Add (Type, ua);
 			return ua;
 		}
 
-		AttributeUsageAttribute GetAttributeUsageAttribute ()
+		AttributeUsageAttribute GetAttributeUsageAttribute (EmitContext ec)
 		{
 			if (pos_values == null)
 				// TODO: It is not neccessary to call whole Resolve (ApplyAttribute does it now) we need only ctor args.
 				// But because a lot of attribute class code must be rewritten will be better to wait...
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return DefaultUsageAttribute;
@@ -697,12 +727,12 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Returns custom name of indexer
 		/// </summary>
-		public string GetIndexerAttributeValue ()
+		public string GetIndexerAttributeValue (EmitContext ec)
 		{
 			if (pos_values == null)
 				// TODO: It is not neccessary to call whole Resolve (ApplyAttribute does it now) we need only ctor args.
 				// But because a lot of attribute class code must be rewritten will be better to wait...
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return null;
@@ -713,12 +743,12 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Returns condition of ConditionalAttribute
 		/// </summary>
-		public string GetConditionalAttributeValue ()
+		public string GetConditionalAttributeValue (EmitContext ec)
 		{
 			if (pos_values == null)
 				// TODO: It is not neccessary to call whole Resolve (ApplyAttribute does it now) we need only ctor args.
 				// But because a lot of attribute class code must be rewritten will be better to wait...
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return null;
@@ -729,12 +759,12 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Creates the instance of ObsoleteAttribute from this attribute instance
 		/// </summary>
-		public ObsoleteAttribute GetObsoleteAttribute ()
+		public ObsoleteAttribute GetObsoleteAttribute (EmitContext ec)
 		{
 			if (pos_values == null)
 				// TODO: It is not neccessary to call whole Resolve (ApplyAttribute does it now) we need only ctor args.
 				// But because a lot of attribute class code must be rewritten will be better to wait...
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return null;
@@ -753,12 +783,12 @@ namespace Mono.CSharp {
 		/// before ApplyAttribute. We need to resolve the arguments.
 		/// This situation occurs when class deps is differs from Emit order.  
 		/// </summary>
-		public bool GetClsCompliantAttributeValue ()
+		public bool GetClsCompliantAttributeValue (EmitContext ec)
 		{
 			if (pos_values == null)
 				// TODO: It is not neccessary to call whole Resolve (ApplyAttribute does it now) we need only ctor args.
 				// But because a lot of attribute class code must be rewritten will be better to wait...
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return false;
@@ -766,10 +796,10 @@ namespace Mono.CSharp {
 			return (bool)pos_values [0];
 		}
 
-		public Type GetCoClassAttributeValue ()
+		public Type GetCoClassAttributeValue (EmitContext ec)
 		{
 			if (pos_values == null)
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return null;
@@ -777,37 +807,6 @@ namespace Mono.CSharp {
 			return (Type)pos_values [0];
 		}
 
-		public bool CheckTarget ()
-		{
-			string[] valid_targets = owner.ValidAttributeTargets;
-			if (ExplicitTarget == null || ExplicitTarget == valid_targets [0]) {
-				Target = owner.AttributeTargets;
-				return true;
-			}
-
-			// TODO: we can skip the first item
-			if (((IList) valid_targets).Contains (ExplicitTarget)) {
-				switch (ExplicitTarget) {
-					case "return": Target = AttributeTargets.ReturnValue; return true;
-					case "param": Target = AttributeTargets.Parameter; return true;
-					case "field": Target = AttributeTargets.Field; return true;
-					case "method": Target = AttributeTargets.Method; return true;
-					case "property": Target = AttributeTargets.Property; return true;
-				}
-				throw new InternalErrorException ("Unknown explicit target: " + ExplicitTarget);
-			}
-				
-			StringBuilder sb = new StringBuilder ();
-			foreach (string s in valid_targets) {
-				sb.Append (s);
-				sb.Append (", ");
-			}
-			sb.Remove (sb.Length - 2, 2);
-			Report.Error (657, Location, "`{0}' is not a valid attribute location for this declaration. " +
-				"Valid attribute locations for this declaration are `{1}'", ExplicitTarget, sb.ToString ());
-			return false;
-		}
-
 		/// <summary>
 		/// Tests permitted SecurityAction for assembly or other types
 		/// </summary>
@@ -1068,65 +1067,54 @@ namespace Mono.CSharp {
 			return (LayoutKind)pos_values [0];
 		}
 
-		public override bool Equals (object obj)
-		{
-			Attribute a = obj as Attribute;
-			if (a == null)
-				return false;
-
-			return Type == a.Type && Target == a.Target;
-		}
-
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode ();
-		}
-
 		/// <summary>
 		/// Emit attribute for Attributable symbol
 		/// </summary>
-		public void Emit (ListDictionary allEmitted)
+		public void Emit (EmitContext ec, Attributable ias, ListDictionary emitted_attr)
 		{
-			CustomAttributeBuilder cb = Resolve ();
+			CustomAttributeBuilder cb = Resolve (ec);
 			if (cb == null)
 				return;
 
-			AttributeUsageAttribute usage_attr = GetAttributeUsage ();
+			AttributeUsageAttribute usage_attr = GetAttributeUsage (ec);
 			if ((usage_attr.ValidOn & Target) == 0) {
-				Report.Error (592, Location, "The attribute `{0}' is not valid on this declaration type. " +
+				Report.Error (592, Location, "Attribute `{0}' is not valid on this declaration type. " +
 					      "It is valid on `{1}' declarations only",
 					GetSignatureForError (), GetValidTargets ());
 				return;
 			}
 
 			try {
-				owner.ApplyAttributeBuilder (this, cb);
+				ias.ApplyAttributeBuilder (this, cb);
 			}
 			catch (Exception e) {
 				Error_AttributeEmitError (e.Message);
 				return;
 			}
 
-			if (!usage_attr.AllowMultiple && allEmitted != null) {
-				if (allEmitted.Contains (this)) {
-					ArrayList a = allEmitted [this] as ArrayList;
-					if (a == null) {
-						a = new ArrayList (2);
-						allEmitted [this] = a;
-					}
-					a.Add (this);
-				} else {
-					allEmitted.Add (this, null);
+			if (!usage_attr.AllowMultiple) {
+				ArrayList emitted_targets = (ArrayList)emitted_attr [Type];
+				if (emitted_targets == null) {
+					emitted_targets = new ArrayList ();
+					emitted_attr.Add (Type, emitted_targets);
+				} else if (emitted_targets.Contains (Target)) {
+					Report.Error (579, Location, "Duplicate `{0}' attribute", GetSignatureForError ());
+					return;
 				}
+				emitted_targets.Add (Target);
 			}
 
 			if (!RootContext.VerifyClsCompliance)
 				return;
 
 			// Here we are testing attribute arguments for array usage (error 3016)
-			if (owner.IsClsComplianceRequired ()) {
-				if (PosArguments != null) {
-					foreach (Argument arg in PosArguments) { 
+			if (ias.IsClsComplianceRequired (ec.DeclSpace)) {
+				if (Arguments == null)
+					return;
+
+				ArrayList pos_args = (ArrayList) Arguments [0];
+				if (pos_args != null) {
+					foreach (Argument arg in pos_args) { 
 						// Type is undefined (was error 246)
 						if (arg.Type == null)
 							return;
@@ -1138,10 +1126,11 @@ namespace Mono.CSharp {
 					}
 				}
 			
-				if (NamedArguments == null)
+				if (Arguments.Count < 2)
 					return;
 			
-				foreach (DictionaryEntry de in NamedArguments) {
+				ArrayList named_args = (ArrayList) Arguments [1];
+				foreach (DictionaryEntry de in named_args) {
 					Argument arg  = (Argument) de.Value;
 
 					// Type is undefined (was error 246)
@@ -1156,13 +1145,13 @@ namespace Mono.CSharp {
 			}
 		}
 		
-		public MethodBuilder DefinePInvokeMethod (TypeBuilder builder, string name,
+		public MethodBuilder DefinePInvokeMethod (EmitContext ec, TypeBuilder builder, string name,
 							  MethodAttributes flags, Type ret_type, Type [] param_types)
 		{
 			if (pos_values == null)
 				// TODO: It is not neccessary to call whole Resolve (ApplyAttribute does it now) we need only ctor args.
 				// But because a lot of attribute class code must be rewritten will be better to wait...
-				Resolve ();
+				Resolve (ec);
 
 			if (resolve_error)
 				return null;
@@ -1273,10 +1262,15 @@ namespace Mono.CSharp {
 
 		private Expression GetValue () 
 		{
-			if (PosArguments == null || PosArguments.Count < 1)
+			if ((Arguments == null) || (Arguments.Count < 1))
 				return null;
-
-			return ((Argument) PosArguments [0]).Expr;
+			ArrayList al = (ArrayList) Arguments [0];
+			if ((al == null) || (al.Count < 1))
+				return null;
+			Argument arg = (Argument) al [0];
+			if ((arg == null) || (arg.Expr == null))
+				return null;
+			return arg.Expr;
 		}
 
 		public string GetString () 
@@ -1306,7 +1300,7 @@ namespace Mono.CSharp {
 		public readonly NamespaceEntry ns;
 
 		public GlobalAttribute (NamespaceEntry ns, string target, 
-					Expression left_expr, string identifier, object[] args, Location loc, bool nameEscaped):
+					Expression left_expr, string identifier, ArrayList args, Location loc, bool nameEscaped):
 			base (target, left_expr, identifier, args, loc, nameEscaped)
 		{
 			this.ns = ns;
@@ -1332,7 +1326,7 @@ namespace Mono.CSharp {
 			RootContext.Tree.Types.NamespaceEntry = null;
 		}
 
-		protected override FullNamedExpression ResolveAsTypeStep (Expression expr, IResolveContext ec, bool silent)
+		protected override FullNamedExpression ResolveAsTypeStep (Expression expr, EmitContext ec, bool silent)
 		{
 			try {
 				Enter ();
@@ -1344,7 +1338,7 @@ namespace Mono.CSharp {
 		}
 
 
-		protected override FullNamedExpression ResolveAsTypeTerminal (Expression expr, IResolveContext ec, bool silent)
+		protected override FullNamedExpression ResolveAsTypeTerminal (Expression expr, EmitContext ec, bool silent)
 		{
 			try {
 				Enter ();
@@ -1355,22 +1349,11 @@ namespace Mono.CSharp {
 			}
 		}
 
-		protected override ConstructorInfo ResolveConstructor (EmitContext ec)
-		{
-			try {
-				Enter ();
-				return base.ResolveConstructor (ec);
-			}
-			finally {
-				Leave ();
-			}
-		}
-
-		protected override bool ResolveNamedArguments (EmitContext ec)
+		protected override ConstructorInfo ResolveArguments (EmitContext ec)
 		{
 			try {
 				Enter ();
-				return base.ResolveNamedArguments (ec);
+				return base.ResolveArguments (ec);
 			}
 			finally {
 				Leave ();
@@ -1379,7 +1362,7 @@ namespace Mono.CSharp {
 	}
 
 	public class Attributes {
-		public readonly ArrayList Attrs;
+		public ArrayList Attrs;
 
 		public Attributes (Attribute a)
 		{
@@ -1397,28 +1380,47 @@ namespace Mono.CSharp {
 			Attrs.AddRange (attrs);
 		}
 
-		public void AttachTo (Attributable attributable)
-		{
-			foreach (Attribute a in Attrs)
-				a.AttachTo (attributable);
-		}
-
 		/// <summary>
 		/// Checks whether attribute target is valid for the current element
 		/// </summary>
-		public bool CheckTargets ()
+		public bool CheckTargets (Attributable member)
 		{
+			string[] valid_targets = member.ValidAttributeTargets;
 			foreach (Attribute a in Attrs) {
-				if (!a.CheckTarget ())
-					return false;
+				if (a.ExplicitTarget == null || a.ExplicitTarget == valid_targets [0]) {
+					a.Target = member.AttributeTargets;
+					continue;
+				}
+
+				// TODO: we can skip the first item
+				if (((IList) valid_targets).Contains (a.ExplicitTarget)) {
+					switch (a.ExplicitTarget) {
+					case "return": a.Target = AttributeTargets.ReturnValue; continue;
+					case "param": a.Target = AttributeTargets.Parameter; continue;
+					case "field": a.Target = AttributeTargets.Field; continue;
+					case "method": a.Target = AttributeTargets.Method; continue;
+					case "property": a.Target = AttributeTargets.Property; continue;
+					}
+					throw new InternalErrorException ("Unknown explicit target: " + a.ExplicitTarget);
+				}
+				
+				StringBuilder sb = new StringBuilder ();
+				foreach (string s in valid_targets) {
+					sb.Append (s);
+					sb.Append (", ");
+				}
+				sb.Remove (sb.Length - 2, 2);
+				Report.Error (657, a.Location, "`{0}' is not a valid attribute location for this declaration. " +
+					      "Valid attribute locations for this declaration are `{1}'", a.ExplicitTarget, sb.ToString ());
+				return false;
 			}
 			return true;
 		}
 
-		public Attribute Search (Type t)
+		public Attribute Search (Type t, EmitContext ec)
 		{
 			foreach (Attribute a in Attrs) {
-				if (a.ResolveType () == t)
+				if (a.ResolveType (ec) == t)
 					return a;
 			}
 			return null;
@@ -1427,12 +1429,12 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Returns all attributes of type 't'. Use it when attribute is AllowMultiple = true
 		/// </summary>
-		public Attribute[] SearchMulti (Type t)
+		public Attribute[] SearchMulti (Type t, EmitContext ec)
 		{
 			ArrayList ar = null;
 
 			foreach (Attribute a in Attrs) {
-				if (a.ResolveType () == t) {
+				if (a.ResolveType (ec) == t) {
 					if (ar == null)
 						ar = new ArrayList ();
 					ar.Add (a);
@@ -1442,33 +1444,19 @@ namespace Mono.CSharp {
 			return ar == null ? null : ar.ToArray (typeof (Attribute)) as Attribute[];
 		}
 
-		public void Emit ()
+		public void Emit (EmitContext ec, Attributable ias)
 		{
-			CheckTargets ();
+			CheckTargets (ias);
 
-			ListDictionary ld = Attrs.Count > 1 ? new ListDictionary () : null;
+			ListDictionary ld = new ListDictionary ();
 
 			foreach (Attribute a in Attrs)
-				a.Emit (ld);
-
-			if (ld == null || ld.Count == 0)
-				return;
-
-			foreach (DictionaryEntry d in ld) {
-				if (d.Value == null)
-					continue;
-
-				foreach (Attribute collision in (ArrayList)d.Value)
-					Report.SymbolRelatedToPreviousError (collision.Location, "");
-
-				Attribute a = (Attribute)d.Key;
-				Report.Error (579, a.Location, "The attribute `{0}' cannot be applied multiple times", a.GetSignatureForError ());
-			}
+				a.Emit (ec, ias, ld);
 		}
 
-		public bool Contains (Type t)
+		public bool Contains (Type t, EmitContext ec)
 		{
-			return Search (t) != null;
+                        return Search (t, ec) != null;
 		}
 	}
 
@@ -1656,7 +1644,7 @@ namespace Mono.CSharp {
 		{
 			DeclSpace ds = TypeManager.LookupDeclSpace (type);
 			if (ds != null) {
-				return ds.IsClsComplianceRequired ();
+				return ds.IsClsComplianceRequired (ds.Parent);
 			}
 
 			object[] CompliantAttribute = type.GetCustomAttributes (TypeManager.cls_compliant_attribute_type, false);
@@ -1690,9 +1678,7 @@ namespace Mono.CSharp {
 					if (attribute.Length == 1)
 						result = (ObsoleteAttribute)attribute [0];
 				} else {
-					// Is null during corlib bootstrap
-					if (TypeManager.obsolete_attribute_type != null)
-						result = type_ds.GetObsoleteAttribute ();
+					result = type_ds.GetObsoleteAttribute ();
 				}
 			}
 
@@ -1814,19 +1800,17 @@ namespace Mono.CSharp {
 			TypeContainer tc = TypeManager.LookupInterface (type);
 			if (tc == null) {
 				object[] o = type.GetCustomAttributes (TypeManager.coclass_attr_type, false);
-				if (o.Length < 1)
-					return null;
 				return ((System.Runtime.InteropServices.CoClassAttribute)o[0]).CoClass;
 			}
 
 			if (tc.OptAttributes == null)
 				return null;
 
-			Attribute a = tc.OptAttributes.Search (TypeManager.coclass_attr_type);
+			Attribute a = tc.OptAttributes.Search (TypeManager.coclass_attr_type, tc.EmitContext);
 			if (a == null)
 				return null;
 
-			return a.GetCoClassAttributeValue ();
+			return a.GetCoClassAttributeValue (tc.EmitContext);
 		}
 	}
 }
diff --git a/mcs/mcs/cfold.cs b/mcs/mcs/cfold.cs
index aba3ad37c48..303002901a6 100644
--- a/mcs/mcs/cfold.cs
+++ b/mcs/mcs/cfold.cs
@@ -550,14 +550,8 @@ namespace Mono.CSharp {
 					Error_CompileTimeOverflow (loc);
 				}
 
-				if (wrap_as != null) {
-					try {
-						return result.TryReduce (ec, wrap_as, loc);
-					}
-					catch (OverflowException) {
-						return null;
-					}
-				}
+				if (wrap_as != null)
+					return result.TryReduce (ec, wrap_as, loc);
 				else
 					return result;
 
@@ -688,14 +682,8 @@ namespace Mono.CSharp {
 					Error_CompileTimeOverflow (loc);
 				}
 
-				if (wrap_as != null) {
-					try {
-						return result.TryReduce (ec, wrap_as, loc);
-					}
-					catch (OverflowException) {
-						return null;
-					}
-				}
+				if (wrap_as != null)
+					return result.TryReduce (ec, wrap_as, loc);
 
 				return result;
 				
diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
index d98381da6c6..113b6f3440d 100644
--- a/mcs/mcs/class.cs
+++ b/mcs/mcs/class.cs
@@ -388,7 +388,7 @@ namespace Mono.CSharp {
 		public readonly Kind Kind;
 
 		// Holds a list of classes and structures
-		protected ArrayList types;
+		ArrayList types;
 
 		// Holds the list of properties
 		MemberCoreArrayList properties;
@@ -432,11 +432,14 @@ namespace Mono.CSharp {
 		// Holds the iterators
 		ArrayList iterators;
 
+		// Holds the parts of a partial class;
+		ArrayList parts;
+
 		//
 		// Pointers to the default constructor and the default static constructor
 		//
-		Constructor default_constructor;
-		Constructor default_static_constructor;
+		protected Constructor default_constructor;
+		protected Constructor default_static_constructor;
 
 		//
 		// Points to the first non-static field added to the container.
@@ -450,6 +453,7 @@ namespace Mono.CSharp {
 		// This one is computed after we can distinguish interfaces
 		// from classes from the arraylist `type_bases' 
 		//
+		string base_class_name;
 		TypeExpr base_type;
 		TypeExpr[] iface_exprs;
 
@@ -460,6 +464,7 @@ namespace Mono.CSharp {
 
 		// The interfaces we implement.
 		protected Type[] ifaces;
+		protected Type ptype;
 
 		// The base member cache and our member cache
 		MemberCache base_cache;
@@ -467,15 +472,6 @@ namespace Mono.CSharp {
 
 		public const string DefaultIndexerName = "Item";
 
-		public TypeContainer PartialContainer;
-		ArrayList partial_parts;
-
-		/// <remarks>
-		///  The pending methods that need to be implemented
-		//   (interfaces or abstract methods)
-		/// </remarks>
-		PendingImplementation pending;
-
 		public TypeContainer (NamespaceEntry ns, TypeContainer parent, MemberName name,
 				      Attributes attrs, Kind kind)
 			: base (ns, parent, name, attrs)
@@ -484,6 +480,10 @@ namespace Mono.CSharp {
 				throw new InternalErrorException ("A nested type should be in the same NamespaceEntry as its enclosing class");
 
 			this.Kind = kind;
+
+			types = new ArrayList ();
+
+			base_class_name = null;
 		}
 
 		public bool AddToMemberContainer (MemberCore symbol)
@@ -523,70 +523,10 @@ namespace Mono.CSharp {
 			if (!AddToTypeContainer (c))
 				return false;
 
-			if (types == null)
-				types = new ArrayList (2);
-
-			RootContext.Tree.RecordDecl (c.NamespaceEntry.NS, c.MemberName, c);
 			types.Add (c);
 			return true;
 		}
 
-		public virtual TypeContainer AddPartial (TypeContainer nextPart)
-		{
-			return AddPartial (nextPart, nextPart.Basename);
-		}
-
-		protected TypeContainer AddPartial (TypeContainer nextPart, string name)
-		{
-			nextPart.ModFlags |= Modifiers.PARTIAL;
-			TypeContainer tc = defined_names [name] as TypeContainer;
-
-			if (tc == null) {
-				if (nextPart is Interface)
-					AddInterface (nextPart);
-				else
-					AddClassOrStruct (nextPart);
-				return nextPart;
-			}
-
-			if ((tc.ModFlags & Modifiers.PARTIAL) == 0) {
-				Report.SymbolRelatedToPreviousError (tc);
-				Error_MissingPartialModifier (nextPart);
-				return tc;
-			}
-
-			if (tc.Kind != nextPart.Kind) {
-				Report.SymbolRelatedToPreviousError (tc);
-				Report.Error (261, nextPart.Location,
-					"Partial declarations of `{0}' must be all classes, all structs or all interfaces",
-					nextPart.GetSignatureForError ());
-				return tc;
-			}
-
-			if ((tc.ModFlags & Modifiers.Accessibility) != (nextPart.ModFlags & Modifiers.Accessibility)) {
-				Report.SymbolRelatedToPreviousError (tc);
-				Report.Error (262, nextPart.Location,
-					"Partial declarations of `{0}' have conflicting accessibility modifiers",
-					nextPart.GetSignatureForError ());
-				return tc;
-			}
-
-			if (tc.partial_parts == null)
-				tc.partial_parts = new ArrayList (1);
-
-			tc.ModFlags |= nextPart.ModFlags;
-			if (nextPart.attributes != null) {
-				if (tc.attributes == null)
-					tc.attributes = nextPart.attributes;
-				else
-					tc.attributes.AddAttributes (nextPart.attributes.Attrs);
-			}
-
-			nextPart.PartialContainer = tc;
-			tc.partial_parts.Add (nextPart);
-			return tc;
-		}
-
 		public void AddDelegate (Delegate d)
 		{
 			if (!AddToTypeContainer (d))
@@ -676,7 +616,6 @@ namespace Mono.CSharp {
 				interfaces = new MemberCoreArrayList ();
 			}
 
-			RootContext.Tree.RecordDecl (iface.NamespaceEntry.NS, iface.MemberName, iface);
 			interfaces.Add (iface);
 			return true;
 		}
@@ -777,6 +716,19 @@ namespace Mono.CSharp {
 			iterators.Add (i);
 		}
 
+		public void AddType (TypeContainer tc)
+		{
+			types.Add (tc);
+		}
+
+		public void AddPart (ClassPart part)
+		{
+			if (parts == null)
+				parts = new ArrayList ();
+
+			parts.Add (part);
+		}
+
 		public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
 		{
 			if (a.Type == TypeManager.default_member_type) {
@@ -791,7 +743,16 @@ namespace Mono.CSharp {
 
 		public override AttributeTargets AttributeTargets {
 			get {
-				throw new NotSupportedException ();
+				switch (Kind) {
+				case Kind.Class:
+					return AttributeTargets.Class;
+				case Kind.Struct:
+					return AttributeTargets.Struct;
+				case Kind.Interface:
+					return AttributeTargets.Interface;
+				default:
+					throw new NotSupportedException ();
+				}
 			}
 		}
 
@@ -824,10 +785,10 @@ namespace Mono.CSharp {
 				return iterators;
 			}
 		}
-
-		protected Type BaseType {
+		
+		public string Base {
 			get {
-				return TypeBuilder.BaseType;
+				return base_class_name;
 			}
 		}
 		
@@ -889,6 +850,12 @@ namespace Mono.CSharp {
 			}
 		}
 
+		public ArrayList Parts {
+			get {
+				return parts;
+			}
+		}
+
 		protected override TypeAttributes TypeAttr {
 			get {
 				return Modifiers.TypeAttr (ModFlags, this) | base.TypeAttr;
@@ -906,7 +873,7 @@ namespace Mono.CSharp {
 				if (OptAttributes == null)
 					return false;
 
-				return OptAttributes.Contains (TypeManager.comimport_attr_type);
+				return OptAttributes.Contains (TypeManager.comimport_attr_type, EmitContext);
 			}
 		}
 
@@ -928,7 +895,7 @@ namespace Mono.CSharp {
 		//
 		// Emits the instance field initializers
 		//
-		public bool EmitFieldInitializers (EmitContext ec)
+		public virtual bool EmitFieldInitializers (EmitContext ec)
 		{
 			ArrayList fields;
 			
@@ -952,73 +919,102 @@ namespace Mono.CSharp {
 		//
 		protected void DefineDefaultConstructor (bool is_static)
 		{
-			// The default instance constructor is public
+			Constructor c;
+
+			// The default constructor is public
 			// If the class is abstract, the default constructor is protected
 			// The default static constructor is private
 
-			int mods;
-			if (is_static) {
-				if (initialized_static_fields == null || default_static_constructor != null)
-					return;
+			int mods = Modifiers.PUBLIC;
+			if (is_static)
 				mods = Modifiers.STATIC | Modifiers.PRIVATE;
-			} else {
-				if (instance_constructors != null)
-					return;
+			else if ((ModFlags & Modifiers.ABSTRACT) != 0)
+				mods = Modifiers.PROTECTED;
 
-				mods = ((ModFlags & Modifiers.ABSTRACT) != 0) ? Modifiers.PROTECTED : Modifiers.PUBLIC;
-			}
+			TypeContainer constructor_parent = this;
+			if (Parts != null)
+				constructor_parent = (TypeContainer) Parts [0];
 
-			Constructor c = new Constructor (this, Basename, mods,
+			c = new Constructor (constructor_parent, Basename, mods,
 					     Parameters.EmptyReadOnlyParameters,
 					     new GeneratedBaseInitializer (Location),
 					     Location);
 			
 			AddConstructor (c);
+			
 			c.Block = new ToplevelBlock (null, Location);
+			
 		}
 
-		public override string DocComment {
-			get {
-				return comment;
-			}
-			set {
-				if (value == null)
-					return;
+		/// <remarks>
+		///  The pending methods that need to be implemented
+		//   (interfaces or abstract methods)
+		/// </remarks>
+		public PendingImplementation Pending;
 
-				comment += value;
-			}
-		}
+		public abstract PendingImplementation GetPendingImplementations ();
 
-		public PendingImplementation PendingImplementations
+		TypeExpr[] GetPartialBases (out TypeExpr base_class)
 		{
-			get {
-				return pending;
-			}
-		}
+			ArrayList ifaces = new ArrayList ();
 
-		public override bool GetClsCompliantAttributeValue ()
-		{
-			if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
-				return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+			base_class = null;
+
+			foreach (ClassPart part in parts) {
+				TypeExpr new_base_class;
+				TypeExpr[] new_ifaces;
+
+				new_ifaces = part.GetClassBases (out new_base_class);
+				if (new_ifaces == null && new_base_class != null)
+					return null;
+
+				if ((base_class != null) && (new_base_class != null) &&
+				    !base_class.Equals (new_base_class)) {
+					Report.SymbolRelatedToPreviousError (base_class.Location, "");
+					Report.Error (263, part.Location,
+						      "Partial declarations of `{0}' must " +
+						      "not specify different base classes",
+						      Name);
+
+					return null;
+				}
+
+				if ((base_class == null) && (new_base_class != null)) {
+					base_class = new_base_class;
+				}
+
+				if (new_ifaces == null)
+					continue;
+
+				foreach (TypeExpr iface in new_ifaces) {
+					bool found = false;
+					foreach (TypeExpr old_iface in ifaces) {
+						if (old_iface.Equals (iface)) {
+							found = true;
+							break;
+						}
+					}
 
-			if (IsPartial)
-				return PartialContainer.GetClsCompliantAttributeValue ();
+					if (!found)
+						ifaces.Add (iface);
+				}
+			}
 
-			return base.GetClsCompliantAttributeValue ();
+			TypeExpr[] retval = new TypeExpr [ifaces.Count];
+			ifaces.CopyTo (retval, 0);
+			return retval;
 		}
 
 		TypeExpr[] GetNormalBases (out TypeExpr base_class)
 		{
 			base_class = null;
-			if (Bases == null)
-				return null;
 
 			int count = Bases.Count;
 			int start = 0, i, j;
 
 			if (Kind == Kind.Class){
 				TypeExpr name = ResolveBaseTypeExpr (
-					(Expression) Bases [0]);
+					(Expression) Bases [0], false, Location);
 
 				if (name == null){
 					return null;
@@ -1035,7 +1031,7 @@ namespace Mono.CSharp {
 			TypeExpr [] ifaces = new TypeExpr [count-start];
 			
 			for (i = start, j = 0; i < count; i++, j++){
-				TypeExpr resolved = ResolveBaseTypeExpr ((Expression) Bases [i]);
+				TypeExpr resolved = ResolveBaseTypeExpr ((Expression) Bases [i], false, Location);
 				if (resolved == null) {
 					return null;
 				}
@@ -1043,49 +1039,7 @@ namespace Mono.CSharp {
 				ifaces [j] = resolved;
 			}
 
-			return ifaces.Length == 0 ? null : ifaces;
-		}
-
-
-		TypeExpr[] GetNormalPartialBases (ref TypeExpr base_class)
-		{
-			ArrayList ifaces = new ArrayList (0);
-			if (iface_exprs != null)
-				ifaces.AddRange (iface_exprs);
-
-			foreach (TypeContainer part in partial_parts) {
-				TypeExpr new_base_class;
-				TypeExpr[] new_ifaces = part.GetClassBases (out new_base_class);
-				if (new_base_class != TypeManager.system_object_expr) {
-					if (base_class == TypeManager.system_object_expr)
-						base_class = new_base_class;
-					else {
-						if (new_base_class != null && !new_base_class.Equals (base_class)) {
-							Report.SymbolRelatedToPreviousError (base_class.Location, "");
-							Report.Error (263, part.Location,
-								"Partial declarations of `{0}' must not specify different base classes",
-								part.GetSignatureForError ());
-
-							return null;
-						}
-					}
-				}
-
-				if (new_ifaces == null)
-					continue;
-
-				foreach (TypeExpr iface in new_ifaces) {
-					if (ifaces.Contains (iface))
-						continue;
-
-					ifaces.Add (iface);
-				}
-			}
-
-			if (ifaces.Count == 0)
-				return null;
-
-			return (TypeExpr[])ifaces.ToArray (typeof (TypeExpr));
+			return ifaces;
 		}
 
 		/// <summary>
@@ -1098,16 +1052,64 @@ namespace Mono.CSharp {
 		///   The @base_class argument is set to the base object or null
 		///   if this is `System.Object'. 
 		/// </summary>
-		public virtual TypeExpr [] GetClassBases (out TypeExpr base_class)
+		TypeExpr [] GetClassBases (out TypeExpr base_class)
 		{
-			TypeExpr[] ifaces = GetNormalBases (out base_class);
+			int i;
+
+			TypeExpr[] ifaces;
+
+			if (parts != null)
+				ifaces = GetPartialBases (out base_class);
+			else if (Bases == null){
+				base_class = null;
+				return null;
+			} else
+				ifaces = GetNormalBases (out base_class);
 
 			if (ifaces == null)
 				return null;
 
-			int count = ifaces.Length;
+			if ((base_class != null) && (Kind == Kind.Class)){
 
-			for (int i = 0; i < count; i++) {
+				if (base_class.Type.IsArray || base_class.Type.IsPointer) {
+					Report.Error (1521, base_class.Location, "Invalid base type");
+					return null;
+				}
+
+				if (base_class.IsSealed){
+					Report.SymbolRelatedToPreviousError (base_class.Type);
+					if (base_class.Type.IsAbstract) {
+						Report.Error (709, Location, "`{0}': Cannot derive from static class `{1}'",
+							GetSignatureForError (), TypeManager.CSharpName (base_class.Type));
+					} else {
+						Report.Error (509, Location, "`{0}': cannot derive from sealed class `{1}'",
+							GetSignatureForError (), TypeManager.CSharpName (base_class.Type));
+					}
+					return null;
+				}
+
+				if (!base_class.CanInheritFrom ()){
+					Report.Error (644, Location, "`{0}' cannot derive from special class `{1}'",
+						      GetSignatureForError (), base_class.GetSignatureForError ());
+					return null;
+				}
+
+				if (!base_class.AsAccessible (this, ModFlags)) {
+					Report.SymbolRelatedToPreviousError (base_class.Type);
+					Report.Error (60, Location, "Inconsistent accessibility: base class `{0}' is less accessible than class `{1}'", 
+						TypeManager.CSharpName (base_class.Type), GetSignatureForError ());
+				}
+			}
+
+			if (base_class != null)
+				base_class_name = base_class.Name;
+
+			if (ifaces == null)
+				return null;
+
+			int count = ifaces != null ? ifaces.Length : 0;
+
+			for (i = 0; i < count; i++) {
 				TypeExpr iface = (TypeExpr) ifaces [i];
 
 				if (!iface.IsInterface) {
@@ -1129,7 +1131,7 @@ namespace Mono.CSharp {
 					if (iface.Equals (ifaces [x])) {
 						Report.Error (528, Location,
 							      "`{0}' is already listed in " +
-							      "interface list", iface.GetSignatureForError ());
+							      "interface list", iface.Name);
 						return null;
 					}
 				}
@@ -1154,33 +1156,69 @@ namespace Mono.CSharp {
 			Report.Error (527, loc, "Type `{0}' in interface list is not an interface", type);
 		}
 
-		bool DefineTypeBuilder ()
+		//
+		// Defines the type in the appropriate ModuleBuilder or TypeBuilder.
+		//
+		public override TypeBuilder DefineType ()
 		{
+			if (error)
+				return null;
+
+			if (TypeBuilder != null)
+				return TypeBuilder;
+			
+			TypeAttributes type_attributes = TypeAttr;
+
 			try {
 				if (IsTopLevel){
 					if (TypeManager.NamespaceClash (Name, Location)) {
-						return false;
+						error = true;
+						return null;
 					}
 
 					ModuleBuilder builder = CodeGen.Module.Builder;
 					TypeBuilder = builder.DefineType (
-						Name, TypeAttr, null, null);
+						Name, type_attributes, null, null);
 				} else {
 					TypeBuilder builder = Parent.TypeBuilder;
+					if (builder == null) {
+						error = true;
+						return null;
+					}
 
 					TypeBuilder = builder.DefineNestedType (
-						Basename, TypeAttr, null, null);
+						Basename, type_attributes, ptype, null);
 				}
 			} catch (ArgumentException) {
 				Report.RuntimeMissingSupport (Location, "static classes");
-				return false;
+				error = true;
+				return null;
 			}
 
 			TypeManager.AddUserType (this);
 
+			if (Parts != null) {
+				ec = null;
+				foreach (ClassPart part in Parts) {
+					part.TypeBuilder = TypeBuilder;
+					part.ec = new EmitContext (part, Mono.CSharp.Location.Null, null, null, ModFlags);
+					part.ec.ContainerType = TypeBuilder;
+				}
+			} else {
+				//
+				// Normally, we create the EmitContext here.
+				// The only exception is if we're an Iterator - in this case,
+				// we already have the `ec', so we don't want to create a new one.
+				//
+				if (ec == null)
+					ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
+				ec.ContainerType = TypeBuilder;
+			}
+
 			iface_exprs = GetClassBases (out base_type);
-			if (partial_parts != null) {
-				iface_exprs = GetNormalPartialBases (ref base_type);
+			if (iface_exprs == null && base_type != null) {
+				error = true;
+				return null;
 			}
 
 			//
@@ -1196,25 +1234,67 @@ namespace Mono.CSharp {
 			if (!(this is Iterator))
 				RootContext.RegisterOrder (this); 
 
+			if (base_type == null) {
+				if (Kind == Kind.Class){
+					if (RootContext.StdLib)
+						base_type = TypeManager.system_object_expr;
+					else if (Name != "System.Object")
+						base_type = TypeManager.system_object_expr;
+				} else if (Kind == Kind.Struct) {
+					//
+					// If we are compiling our runtime,
+					// and we are defining ValueType, then our
+					// base is `System.Object'.
+					//
+					if (!RootContext.StdLib && Name == "System.ValueType")
+						base_type = TypeManager.system_object_expr;
+					else
+						base_type = TypeManager.system_valuetype_expr;
+				}
+			}
 
-			if (base_type != null) {
-				base_type = base_type.ResolveAsTypeTerminal (this, false);
-				if (base_type == null)
-					return false;
+			if ((Kind == Kind.Struct) && TypeManager.value_type == null)
+				throw new Exception ();
+
+			// Avoid attributes check when parent is not set
+			TypeResolveEmitContext.TestObsoleteMethodUsage = false;
 
-				TypeBuilder.SetParent (base_type.Type);
-				CheckObsoleteType (base_type);
+			if (base_type != null) {
+				// FIXME: I think this should be ...ResolveType (Parent.EmitContext).
+				//        However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
+				ptype = base_type.ResolveType (TypeResolveEmitContext);
+				if (ptype == null) {
+					error = true;
+					return null;
+				}
 			}
 
 			if (!CheckRecursiveDefinition (this)) {
-				return false;
+				error = true;
+				return null;
+			}
+
+			if (ptype != null) {
+				TypeBuilder.SetParent (ptype);
+			}
+
+			// Attribute is undefined at the begining of corlib compilation
+			if (TypeManager.obsolete_attribute_type != null) {
+				TypeResolveEmitContext.TestObsoleteMethodUsage = GetObsoleteAttribute () == null;
+				if (ptype != null && TypeResolveEmitContext.TestObsoleteMethodUsage) {
+					CheckObsoleteType (base_type);
+				}
 			}
 
 			// add interfaces that were not added at type creation
 			if (iface_exprs != null) {
-				ifaces = TypeManager.ExpandInterfaces (this, iface_exprs);
+				// FIXME: I think this should be ...ExpandInterfaces (Parent.EmitContext, ...).
+				//        However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
+				TypeResolveEmitContext.ContainerType = TypeBuilder;
+				ifaces = TypeManager.ExpandInterfaces (TypeResolveEmitContext, iface_exprs);
 				if (ifaces == null) {
-					return false;
+					error = true;
+					return null;
 				}
 
 				foreach (Type itype in ifaces)
@@ -1223,32 +1303,11 @@ namespace Mono.CSharp {
 				TypeManager.RegisterBuilder (TypeBuilder, ifaces);
 			}
 
-			return true;
-		}
-
-		//
-		// Defines the type in the appropriate ModuleBuilder or TypeBuilder.
-		//
-		public override TypeBuilder DefineType ()
-		{
-			if (TypeBuilder != null)
-				return TypeBuilder;
-
-			if (error)
-				return null;
-			
-			if (!DefineTypeBuilder ()) {
+			if (!DefineNestedTypes ()) {
 				error = true;
 				return null;
 			}
 
-			if (partial_parts != null) {
-				foreach (TypeContainer part in partial_parts)
-					part.TypeBuilder = TypeBuilder;
-			}
-
-			DefineNestedTypes ();
-
 			return TypeBuilder;
 		}
 
@@ -1302,8 +1361,9 @@ namespace Mono.CSharp {
 
 			InTransit = tc;
 
-			if (BaseType != null) {
-				TypeContainer ptc = TypeManager.LookupTypeContainer (BaseType);
+			Type parent = ptype;
+			if (parent != null) {
+				TypeContainer ptc = TypeManager.LookupTypeContainer (parent);
 				if ((ptc != null) && !ptc.CheckRecursiveDefinition (this))
 					return false;
 			}
@@ -1344,16 +1404,6 @@ namespace Mono.CSharp {
 			return members_defined_ok;
 		}
 
-		public override bool IsPartial {
-			get {
-				return PartialContainer != null;
-			}
-		}
-
-		public virtual void DefineDefaultConstructor ()
-		{
-		}
-
 		protected virtual bool DoDefineMembers ()
 		{
 			if (!IsTopLevel) {
@@ -1373,10 +1423,38 @@ namespace Mono.CSharp {
 			DefineContainerMembers (constants);
 			DefineContainerMembers (fields);
 
-			DefineDefaultConstructor ();
+			if ((Kind == Kind.Class) && !(this is ClassPart)){
+				if ((instance_constructors == null) &&
+				    !(this is StaticClass)) {
+					if (default_constructor == null)
+						DefineDefaultConstructor (false);
+				}
 
-			if (Kind == Kind.Struct || Kind == Kind.Class) {
-				pending = PendingImplementation.GetPendingImplementations (this);
+				if (initialized_static_fields != null &&
+				    default_static_constructor == null)
+					DefineDefaultConstructor (true);
+			}
+
+			if (Kind == Kind.Struct){
+				//
+				// Structs can not have initialized instance
+				// fields
+				//
+				if (initialized_static_fields != null &&
+				    default_static_constructor == null)
+					DefineDefaultConstructor (true);
+
+				if (initialized_fields != null)
+					ReportStructInitializedInstanceError ();
+			}
+
+			Pending = GetPendingImplementations ();
+
+			if (parts != null) {
+				foreach (ClassPart part in parts) {
+					if (!part.DefineMembers ())
+						return false;
+				}
 			}
 		
 			//
@@ -1396,12 +1474,15 @@ namespace Mono.CSharp {
 			DefineContainerMembers (delegates);			
 
 #if CACHE
-			member_cache = new MemberCache (this);
-			if (partial_parts != null) {
-				foreach (TypeContainer part in partial_parts)
+			if (!(this is ClassPart))
+				member_cache = new MemberCache (this);
+#endif
+
+			if (parts != null) {
+				foreach (ClassPart part in parts)
 					part.member_cache = member_cache;
 			}
-#endif
+
 			if (iterators != null) {
 				foreach (Iterator iterator in iterators) {
 					if (iterator.DefineType () == null)
@@ -1417,6 +1498,15 @@ namespace Mono.CSharp {
 			return true;
 		}
 
+		void ReportStructInitializedInstanceError ()
+		{
+			foreach (Field f in initialized_fields){
+				Report.Error (573, Location,
+					"`{0}': Structs cannot have instance field initializers",
+					f.GetSignatureForError ());
+			}
+		}
+
 		protected virtual void DefineContainerMembers (MemberCoreArrayList mcal)
 		{
 			if (mcal != null)
@@ -1425,6 +1515,13 @@ namespace Mono.CSharp {
 
 		public override bool Define ()
 		{
+			if (parts != null) {
+				foreach (ClassPart part in parts) {
+					if (!part.Define ())
+						return false;
+				}
+			}
+
 			if (iterators != null) {
 				foreach (Iterator iterator in iterators) {
 					if (!iterator.Define ())
@@ -1526,20 +1623,14 @@ namespace Mono.CSharp {
 		}
 		
 		// Indicated whether container has StructLayout attribute set Explicit
-		public bool HasExplicitLayout {
+		public virtual bool HasExplicitLayout {
 			get {
-				return (caching_flags & Flags.HasExplicitLayout) != 0;
-			}
-			set {
-				caching_flags |= Flags.HasExplicitLayout;
+				return false;
 			}
 		}
 
 		public override Type FindNestedType (string name)
 		{
-			if (IsPartial) {
-				return PartialContainer.FindNestedType (name);
-			}
 			ArrayList [] lists = { types, enums, delegates, interfaces };
 
 			for (int j = 0; j < lists.Length; ++j) {
@@ -1551,7 +1642,8 @@ namespace Mono.CSharp {
 				for (int i = 0; i < len; ++i) {
 					DeclSpace ds = (DeclSpace) list [i];
 					if (ds.Basename == name) {
-						return ds.DefineType ();
+						ds.DefineType ();
+						return ds.TypeBuilder;
 					}
 				}
 			}
@@ -2024,31 +2116,6 @@ namespace Mono.CSharp {
 			}
 		}
 
-		// TODO: move to ClassOrStruct
-		void EmitConstructors ()
-		{
-			if (instance_constructors == null)
-				return;
-
-			if (TypeBuilder.IsSubclassOf (TypeManager.attribute_type) && RootContext.VerifyClsCompliance && IsClsComplianceRequired ()) {
-				bool has_compliant_args = false;
-
-				foreach (Constructor c in instance_constructors) {
-					c.Emit ();
-
-					if (has_compliant_args)
-						continue;
-
-					has_compliant_args = c.HasCompliantArgs;
-				}
-				if (!has_compliant_args)
-					Report.Error (3015, Location, "`{0}' has no accessible constructors which use only CLS-compliant types", GetSignatureForError ());
-			} else {
-				foreach (Constructor c in instance_constructors)
-					c.Emit ();
-			}
-		}
-
 		/// <summary>
 		///   Emits the code, this step is performed after all
 		///   the types, enumerations, constructors
@@ -2056,7 +2123,7 @@ namespace Mono.CSharp {
 		public virtual void EmitType ()
 		{
 			if (OptAttributes != null)
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, this);
 				
 			//
 			// Structs with no fields need to have at least one byte.
@@ -2081,7 +2148,25 @@ namespace Mono.CSharp {
 
 			Emit ();
 
-			EmitConstructors ();
+			if (instance_constructors != null) {
+				if (TypeBuilder.IsSubclassOf (TypeManager.attribute_type) && RootContext.VerifyClsCompliance && IsClsComplianceRequired (this)) {
+					bool has_compliant_args = false;
+
+					foreach (Constructor c in instance_constructors) {
+						c.Emit ();
+
+						if (has_compliant_args)
+							continue;
+
+						has_compliant_args = c.HasCompliantArgs;
+					}
+					if (!has_compliant_args)
+						Report.Error (3015, Location, "`{0}' has no accessible constructors which use only CLS-compliant types", GetSignatureForError ());
+				} else {
+					foreach (Constructor c in instance_constructors)
+						c.Emit ();
+				}
+			}
 
 			// Can not continue if constants are broken
 			EmitConstants ();
@@ -2129,13 +2214,22 @@ namespace Mono.CSharp {
 				}
 			}
 
-			if (pending != null)
-				if (pending.VerifyPendingMethods ())
+			if (parts != null) {
+				foreach (ClassPart part in parts)
+					part.EmitType ();
+			}
+
+			if ((Pending != null) && !(this is ClassPart))
+				if (Pending.VerifyPendingMethods ())
 					return;
 
 			if (iterators != null)
 				foreach (Iterator iterator in iterators)
 					iterator.EmitType ();
+			
+//			if (types != null)
+//				foreach (TypeContainer tc in types)
+//					tc.Emit ();
 		}
 
 		public override void CloseType ()
@@ -2193,6 +2287,7 @@ namespace Mono.CSharp {
 			indexers = null;
 			operators = null;
 			iterators = null;
+			ec = null;
 			default_constructor = null;
 			default_static_constructor = null;
 			type_bases = null;
@@ -2292,9 +2387,9 @@ namespace Mono.CSharp {
 			get { return default_static_constructor; }
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ())
+			if (!base.VerifyClsCompliance (ds))
 				return false;
 
 			VerifyClsName ();
@@ -2304,7 +2399,7 @@ namespace Mono.CSharp {
 				Report.Error (3009, Location, "`{0}': base type `{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (base_type));
 			}
 
-			if (!Parent.IsClsComplianceRequired ()) {
+			if (!Parent.IsClsComplianceRequired (ds)) {
 				Report.Error (3018, Location, "`{0}' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `{1}'", 
 					GetSignatureForError (), Parent.GetSignatureForError ());
 			}
@@ -2324,7 +2419,7 @@ namespace Mono.CSharp {
 
 			foreach (DictionaryEntry entry in defined_names) {
 				MemberCore mc = (MemberCore)entry.Value;
-				if (!mc.IsClsComplianceRequired ())
+				if (!mc.IsClsComplianceRequired (mc.Parent))
 					continue;
 
 				string name = (string) entry.Key;
@@ -2369,18 +2464,17 @@ namespace Mono.CSharp {
 				}
 			}
 			
-			Report.SymbolRelatedToPreviousError (mb.InterfaceType);
 			Report.Error (540, mb.Location, "`{0}': containing type does not implement interface `{1}'",
 				mb.GetSignatureForError (), TypeManager.CSharpName (mb.InterfaceType));
 			return false;
 		}
 
-		public void Mark_HasEquals ()
+		public virtual void Mark_HasEquals ()
 		{
 			Methods.HasEquals = true;
 		}
 
-		public void Mark_HasGetHashCode ()
+		public virtual void Mark_HasGetHashCode ()
 		{
 			Methods.HasGetHashCode = true;
 		}
@@ -2444,31 +2538,273 @@ namespace Mono.CSharp {
 		}
 	}
 
-	public abstract class ClassOrStruct : TypeContainer {
-		ListDictionary declarative_security;
+	public class PartialContainer : TypeContainer {
 
-		public ClassOrStruct (NamespaceEntry ns, TypeContainer parent,
-				      MemberName name, Attributes attrs, Kind kind)
-			: base (ns, parent, name, attrs, kind)
+		public readonly Namespace Namespace;
+		public readonly int OriginalModFlags;
+		public readonly int AllowedModifiers;
+		public readonly TypeAttributes DefaultTypeAttributes;
+		public ListDictionary DeclarativeSecurity;
+
+		static PartialContainer Create (NamespaceEntry ns, TypeContainer parent,
+						MemberName member_name, int mod_flags, Kind kind)
 		{
+
+			if (!CheckModFlags (0, mod_flags, member_name))
+				return null;
+
+			PartialContainer pc = RootContext.Tree.GetDecl (member_name) as PartialContainer;
+			if (pc != null) {
+				if (pc.Kind != kind) {
+					Report.Error (
+						261, member_name.Location, "Partial declarations of `{0}' " +
+						"must be all classes, all structs or " +
+						"all interfaces", member_name.GetPartialName ());
+					return null;
+				}
+
+				if (!CheckModFlags (pc.OriginalModFlags, mod_flags, member_name))
+					return null;
+				pc.ModFlags |= (mod_flags & pc.AllowedModifiers);
+
+				return pc;
+			}
+
+			if (parent is ClassPart)
+				parent = ((ClassPart) parent).PartialContainer;
+
+			pc = new PartialContainer (ns.NS, parent, member_name, mod_flags, kind);
+
+			if (kind == Kind.Interface) {
+				if (!parent.AddInterface (pc))
+					return null;
+			} else if (kind == Kind.Class || kind == Kind.Struct) {
+				if (!parent.AddClassOrStruct (pc))
+					return null;
+			} else {
+				throw new InvalidOperationException ();
+			}
+			RootContext.Tree.RecordDecl (ns.NS, member_name, pc);
+			return pc;
 		}
 
-		protected override bool AddToContainer (MemberCore symbol, string name)
+		static bool CheckModFlags (int flags_org, int flags, MemberName member_name)
 		{
-			if (name == Basename) {
-				Report.SymbolRelatedToPreviousError (this);
-				Report.Error (542, symbol.Location, "`{0}': member names cannot be the same as their enclosing type",
-					symbol.GetSignatureForError ());
+			// Check (abstract|static|sealed) sanity.
+			int tmp = (flags_org | flags) & (Modifiers.ABSTRACT | Modifiers.SEALED | Modifiers.STATIC);
+			if ((tmp & Modifiers.ABSTRACT) != 0) {
+				if ((tmp & (Modifiers.STATIC | Modifiers.SEALED)) != 0) {
+					Report.Error (
+						418, member_name.Location, 
+						"`{0}': an abstract class cannot be sealed or static", member_name.ToString ());
+					return false;
+				}
+			} else if (tmp == (Modifiers.SEALED | Modifiers.STATIC)) {
+				Report.Error (441, member_name.Location, "`{0}': a class cannot be both static and sealed", member_name.ToString ());
+				return false;
+			}
+
+			if (flags_org == 0)
+				return true;
+
+			// Check conflicts.
+			if (0 != ((flags_org ^ flags) & (0xFFFFFFFF ^ (Modifiers.SEALED | Modifiers.ABSTRACT)))) {
+				Report.Error (
+					262, member_name.Location, "Partial declarations of `{0}' " +
+					"have conflicting accessibility modifiers",
+					member_name.GetPartialName ());
 				return false;
 			}
+			return true;
+		}
+
+		public static ClassPart CreatePart (NamespaceEntry ns, TypeContainer parent,
+						    MemberName name, int mod, Attributes attrs,
+						    Kind kind, Location loc)
+		{
+			PartialContainer pc = Create (ns, parent, name, mod, kind);
+			if (pc == null) {
+				// An error occured; create a dummy container, but don't
+				// register it.
+				pc = new PartialContainer (ns.NS, parent, name, mod, kind);
+			}
+
+			ClassPart part = new ClassPart (ns, pc, parent, mod, attrs, kind);
+			pc.AddPart (part);
+			return part;
+		}
+
+		protected PartialContainer (Namespace ns, TypeContainer parent,
+					    MemberName name, int mod, Kind kind)
+			: base (null, parent, name, null, kind)
+		{
+			this.Namespace = ns;
+
+			switch (kind) {
+			case Kind.Class:
+				AllowedModifiers = Class.AllowedModifiers;
+				DefaultTypeAttributes = Class.DefaultTypeAttributes;
+				break;
+
+			case Kind.Struct:
+				AllowedModifiers = Struct.AllowedModifiers;
+				DefaultTypeAttributes = Struct.DefaultTypeAttributes;
+				break;
+
+			case Kind.Interface:
+				AllowedModifiers = Interface.AllowedModifiers;
+				DefaultTypeAttributes = Interface.DefaultTypeAttributes;
+				break;
+
+			default:
+				throw new InvalidOperationException ();
+			}
+
+			int accmods;
+			if (parent.Parent == null)
+				accmods = Modifiers.INTERNAL;
+			else
+				accmods = Modifiers.PRIVATE;
+
+			// FIXME: remove this nasty fix for bug #77370 when
+			// we get good AllowModifiersProp implementation.
+			if ((mod & Modifiers.STATIC) != 0) {
+				AllowedModifiers |= Modifiers.STATIC;
+				AllowedModifiers &= ~ (Modifiers.ABSTRACT | Modifiers.SEALED);
+			}
+
+			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, Location);
+			this.OriginalModFlags = mod;
+		}
+
+		public override void EmitType ()
+		{
+			base.EmitType ();
+
+			if (DeclarativeSecurity != null) {
+				foreach (DictionaryEntry de in DeclarativeSecurity) {
+					TypeBuilder.AddDeclarativeSecurity ((SecurityAction)de.Key, (PermissionSet)de.Value);
+				}
+			}
+		}
+
+		public override PendingImplementation GetPendingImplementations ()
+		{
+			return PendingImplementation.GetPendingImplementations (this);
+		}
+
+		public override bool MarkForDuplicationCheck ()
+		{
+			return true;
+		}
+
+		protected override TypeAttributes TypeAttr {
+			get {
+				return base.TypeAttr | DefaultTypeAttributes;
+			}
+		}
+	}
+
+	public class ClassPart : TypeContainer, IMemberContainer {
+		public readonly PartialContainer PartialContainer;
+		public readonly bool IsPartial;
+
+		public ClassPart (NamespaceEntry ns, PartialContainer pc, TypeContainer parent,
+				  int mod, Attributes attrs, Kind kind)
+			: base (ns, parent, pc.MemberName, attrs, kind)
+		{
+			this.PartialContainer = pc;
+			this.IsPartial = true;
+
+			int accmods;
+			if (parent == null || parent == RootContext.Tree.Types)
+				accmods = Modifiers.INTERNAL;
+			else
+				accmods = Modifiers.PRIVATE;
+
+			this.ModFlags = Modifiers.Check (pc.AllowedModifiers, mod, accmods, pc.MemberName.Location);
+		}
+
+		public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
+		{
+			if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (false)) {
+				if (PartialContainer.DeclarativeSecurity == null)
+					PartialContainer.DeclarativeSecurity = new ListDictionary ();
+
+				a.ExtractSecurityPermissionSet (PartialContainer.DeclarativeSecurity);
+				return;
+			}
+
+			base.ApplyAttributeBuilder (a, cb);
+		}
+
+		public override PendingImplementation GetPendingImplementations ()
+		{
+			return PartialContainer.Pending;
+		}
+
+		public override bool VerifyImplements (MemberBase mb)
+		{
+			return PartialContainer.VerifyImplements (mb);
+		}
+
+
+		public override void RegisterFieldForInitialization (FieldBase field)
+		{
+			PartialContainer.RegisterFieldForInitialization (field);
+		}
+
+		public override bool EmitFieldInitializers (EmitContext ec)
+		{
+			return PartialContainer.EmitFieldInitializers (ec);
+		}
+
+		public override Type FindNestedType (string name)
+		{
+			return PartialContainer.FindNestedType (name);
+		}
+
+		public override MemberCache BaseCache {
+			get {
+				return PartialContainer.BaseCache;
+			}
+		}
 
-			return base.AddToContainer (symbol, name);
+		public override TypeBuilder DefineType ()
+		{
+			throw new InternalErrorException ("Should not get here");
 		}
 
+		public override void Mark_HasEquals ()
+		{
+			PartialContainer.Mark_HasEquals ();
+		}
 
-		public override void DefineDefaultConstructor ()
+		public override void Mark_HasGetHashCode ()
 		{
-			DefineDefaultConstructor (true);
+			PartialContainer.Mark_HasGetHashCode ();
+		}
+	}
+
+	public abstract class ClassOrStruct : TypeContainer {
+		bool has_explicit_layout = false;
+		ListDictionary declarative_security;
+
+		public ClassOrStruct (NamespaceEntry ns, TypeContainer parent,
+				      MemberName name, Attributes attrs, Kind kind)
+			: base (ns, parent, name, attrs, kind)
+		{
+		}
+
+		public override PendingImplementation GetPendingImplementations ()
+		{
+			return PendingImplementation.GetPendingImplementations (this);
+		}
+
+		public override bool HasExplicitLayout {
+			get {
+				return has_explicit_layout;
+			}
 		}
 
 		public override void VerifyMembers ()
@@ -2493,9 +2829,8 @@ namespace Mono.CSharp {
 				return;
 			}
 
-			if (a.Type == TypeManager.struct_layout_attribute_type && a.GetLayoutKindValue () == LayoutKind.Explicit) {
-				HasExplicitLayout = true;
-			}
+			if (a.Type == TypeManager.struct_layout_attribute_type && a.GetLayoutKindValue () == LayoutKind.Explicit)
+				has_explicit_layout = true;
 
 			base.ApplyAttributeBuilder (a, cb);
 		}
@@ -2512,56 +2847,23 @@ namespace Mono.CSharp {
 		}
 	}
 
-
-	// TODO: should be sealed
-	public class Class : ClassOrStruct {
-		const int AllowedModifiers =
-			Modifiers.NEW |
-			Modifiers.PUBLIC |
-			Modifiers.PROTECTED |
-			Modifiers.INTERNAL |
-			Modifiers.PRIVATE |
-			Modifiers.ABSTRACT |
-			Modifiers.SEALED |
-			Modifiers.STATIC |
-			Modifiers.UNSAFE;
-
-		public Class (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
-			      Attributes attrs)
-			: base (ns, parent, name, attrs, Kind.Class)
+	/// <summary>
+	/// Class handles static classes declaration
+	/// </summary>
+	public sealed class StaticClass: Class {
+		public StaticClass (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
+			Attributes attrs)
+			: base (ns, parent, name, mod, attrs)
 		{
-			int accmods = Parent.Parent == null ? Modifiers.INTERNAL : Modifiers.PRIVATE;
-			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, Location);
-
-			if (IsStatic && RootContext.Version == LanguageVersion.ISO_1) {
+			if (RootContext.Version == LanguageVersion.ISO_1) {
 				Report.FeatureIsNotStandardized (Location, "static classes");
 			}
 		}
 
-		public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
-		{
-			if (a.Type == TypeManager.attribute_usage_type) {
-				if (BaseType != TypeManager.attribute_type && !BaseType.IsSubclassOf (TypeManager.attribute_type) &&
-					TypeBuilder.FullName != "System.Attribute") {
-					Report.Error (641, a.Location, "Attribute `{0}' is only valid on classes derived from System.Attribute", a.GetSignatureForError ());
-				}
-			}
-
-			if (a.Type == TypeManager.conditional_attribute_type &&
-				!(BaseType == TypeManager.attribute_type || BaseType.IsSubclassOf (TypeManager.attribute_type))) {
-				Report.Error (1689, a.Location, "Attribute `System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes");
-				return;
-			}
-
-			if (AttributeTester.IsAttributeExcluded (a.Type))
-				return;
-
-			base.ApplyAttributeBuilder (a, cb);
-		}
-
-		public override AttributeTargets AttributeTargets {
+		protected override int AllowedModifiersProp {
 			get {
-				return AttributeTargets.Class;
+				return Modifiers.NEW | Modifiers.PUBLIC | Modifiers.PROTECTED | Modifiers.INTERNAL | Modifiers.PRIVATE |
+					Modifiers.STATIC | Modifiers.UNSAFE;
 			}
 		}
 
@@ -2570,11 +2872,6 @@ namespace Mono.CSharp {
 			if (list == null)
 				return;
 
-			if (!IsStatic) {
-				base.DefineContainerMembers (list);
-				return;
-			}
-
 			foreach (MemberCore m in list) {
 				if (m is Operator) {
 					Report.Error (715, m.Location, "`{0}': Static classes cannot contain user-defined operators", m.GetSignatureForError ());
@@ -2610,84 +2907,97 @@ namespace Mono.CSharp {
 			base.DefineContainerMembers (list);
 		}
 
-		public override void DefineDefaultConstructor ()
+		public override TypeBuilder DefineType()
 		{
-			if (!IsStatic)
-				DefineDefaultConstructor (false);
+			if ((ModFlags & (Modifiers.SEALED | Modifiers.STATIC)) == (Modifiers.SEALED | Modifiers.STATIC)) {
+				Report.Error (441, Location, "`{0}': a class cannot be both static and sealed", GetSignatureForError ());
+				return null;
+			}
 
-			base.DefineDefaultConstructor ();
-		}
+			TypeBuilder tb = base.DefineType ();
+			if (tb == null)
+				return null;
 
-		public override TypeBuilder DefineType ()
-		{
-			if ((ModFlags & Modifiers.ABSTRACT) == Modifiers.ABSTRACT && (ModFlags & (Modifiers.SEALED | Modifiers.STATIC)) != 0) {
-				Report.Error (418, Location, "`{0}': an abstract class cannot be sealed or static", GetSignatureForError ());
+			if (ptype != TypeManager.object_type) {
+				Report.Error (713, Location, "Static class `{0}' cannot derive from type `{1}'. Static classes must derive from object", GetSignatureForError (), TypeManager.CSharpName (ptype));
 				return null;
 			}
 
-			if ((ModFlags & (Modifiers.SEALED | Modifiers.STATIC)) == (Modifiers.SEALED | Modifiers.STATIC)) {
-				Report.Error (441, Location, "`{0}': a class cannot be both static and sealed", GetSignatureForError ());
-				return null;
+			if (ifaces != null) {
+				foreach (Type t in ifaces)
+					Report.SymbolRelatedToPreviousError (t);
+				Report.Error (714, Location, "`{0}': static classes cannot implement interfaces", GetSignatureForError ());
 			}
+			return tb;
+		}
 
-			return base.DefineType ();
+		protected override TypeAttributes TypeAttr {
+			get {
+				return base.TypeAttr | TypeAttributes.Abstract | TypeAttributes.Sealed;
+			}
 		}
+	}
 
-		public override TypeExpr[] GetClassBases (out TypeExpr base_class)
-		{
-			TypeExpr[] ifaces = base.GetClassBases (out base_class);
+	public class Class : ClassOrStruct {
+		// TODO: remove this and use only AllowedModifiersProp to fix partial classes bugs
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.ABSTRACT |
+			Modifiers.SEALED |
+			Modifiers.UNSAFE;
 
-			if (base_class == null) {
-				if (RootContext.StdLib)
-					base_class = TypeManager.system_object_expr;
-				else if (Name != "System.Object")
-					base_class = TypeManager.system_object_expr;
-			} else {
-				if (base_class.Type.IsArray || base_class.Type.IsPointer) {
-					Report.Error (1521, base_class.Location, "Invalid base type");
-					return ifaces;
-				}
+		public Class (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
+			      Attributes attrs)
+			: base (ns, parent, name, attrs, Kind.Class)
+		{
+			this.ModFlags = mod;
+		}
 
-				if (base_class.IsSealed){
-					Report.SymbolRelatedToPreviousError (base_class.Type);
-					if (base_class.Type.IsAbstract) {
-						Report.Error (709, Location, "`{0}': Cannot derive from static class `{1}'",
-							GetSignatureForError (), TypeManager.CSharpName (base_class.Type));
-					} else {
-						Report.Error (509, Location, "`{0}': cannot derive from sealed class `{1}'",
-							GetSignatureForError (), TypeManager.CSharpName (base_class.Type));
-					}
-					return ifaces;
-				}
+		virtual protected int AllowedModifiersProp {
+			get {
+				return AllowedModifiers;
+			}
+		}
 
-				if (!base_class.CanInheritFrom ()){
-					Report.Error (644, Location, "`{0}' cannot derive from special class `{1}'",
-						GetSignatureForError (), base_class.GetSignatureForError ());
-					return ifaces;
+		public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
+		{
+			if (a.Type == TypeManager.attribute_usage_type) {
+				if (ptype != TypeManager.attribute_type && !ptype.IsSubclassOf (TypeManager.attribute_type) &&
+					TypeBuilder.FullName != "System.Attribute") {
+					Report.Error (641, a.Location, "Attribute `{0}' is only valid on classes derived from System.Attribute", a.GetSignatureForError ());
 				}
+			}
 
-				if (!base_class.AsAccessible (this, ModFlags)) {
-					Report.SymbolRelatedToPreviousError (base_class.Type);
-					Report.Error (60, Location, "Inconsistent accessibility: base class `{0}' is less accessible than class `{1}'", 
-						TypeManager.CSharpName (base_class.Type), GetSignatureForError ());
-				}
+			if (a.Type == TypeManager.conditional_attribute_type &&
+				!(ptype == TypeManager.attribute_type || ptype.IsSubclassOf (TypeManager.attribute_type))) {
+				Report.Error (1689, a.Location, "Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes");
+				return;
 			}
 
-			if (IsStatic) {
-				if (base_class != TypeManager.system_object_expr) {
-					Report.Error (713, Location, "Static class `{0}' cannot derive from type `{1}'. Static classes must derive from object",
-						GetSignatureForError (), base_class.GetSignatureForError ());
-					return ifaces;
-				}
+			if (AttributeTester.IsAttributeExcluded (a.Type))
+				return;
 
-				if (ifaces != null) {
-					foreach (TypeExpr t in ifaces)
-						Report.SymbolRelatedToPreviousError (t.Type);
-					Report.Error (714, Location, "`{0}': static classes cannot implement interfaces", GetSignatureForError ());
-				}
+			base.ApplyAttributeBuilder (a, cb);
+		}
+
+		public const TypeAttributes DefaultTypeAttributes =
+			TypeAttributes.AutoLayout | TypeAttributes.Class;
+
+		public override TypeBuilder DefineType()
+		{
+			if ((ModFlags & Modifiers.ABSTRACT) == Modifiers.ABSTRACT && (ModFlags & (Modifiers.SEALED | Modifiers.STATIC)) != 0) {
+				Report.Error (418, Location, "`{0}': an abstract class cannot be sealed or static", GetSignatureForError ());
+				return null;
 			}
 
-			return ifaces;
+			int accmods = Parent.Parent == null ? Modifiers.INTERNAL : Modifiers.PRIVATE;
+			ModFlags = Modifiers.Check (AllowedModifiersProp, ModFlags, accmods, Location);
+
+			return base.DefineType ();
 		}
 
 		/// Search for at least one defined condition in ConditionalAttribute of attribute class
@@ -2702,13 +3012,13 @@ namespace Mono.CSharp {
 			if (OptAttributes == null)
 				return false;
 
-			Attribute[] attrs = OptAttributes.SearchMulti (TypeManager.conditional_attribute_type);
+			Attribute[] attrs = OptAttributes.SearchMulti (TypeManager.conditional_attribute_type, ec);
 
 			if (attrs == null)
 				return false;
 
 			foreach (Attribute a in attrs) {
-				string condition = a.GetConditionalAttributeValue ();
+				string condition = a.GetConditionalAttributeValue (Parent.EmitContext);
 				if (RootContext.AllDefines.Contains (condition))
 					return false;
 			}
@@ -2717,31 +3027,22 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		bool IsStatic {
-			get {
-				return (ModFlags & Modifiers.STATIC) != 0;
-			}
-		}
-
 		//
 		// FIXME: How do we deal with the user specifying a different
 		// layout?
 		//
 		protected override TypeAttributes TypeAttr {
 			get {
-				TypeAttributes ta = base.TypeAttr | TypeAttributes.AutoLayout | TypeAttributes.Class;
-				if (IsStatic)
-					ta |= TypeAttributes.Abstract | TypeAttributes.Sealed;
-				return ta;
+				return base.TypeAttr | DefaultTypeAttributes;
 			}
 		}
 	}
 
-	public sealed class Struct : ClassOrStruct {
+	public class Struct : ClassOrStruct {
 		// <summary>
 		//   Modifiers allowed in a struct declaration
 		// </summary>
-		const int AllowedModifiers =
+		public const int AllowedModifiers =
 			Modifiers.NEW       |
 			Modifiers.PUBLIC    |
 			Modifiers.PROTECTED |
@@ -2765,36 +3066,11 @@ namespace Mono.CSharp {
 			this.ModFlags |= Modifiers.SEALED;
 		}
 
-		public override AttributeTargets AttributeTargets {
-			get {
-				return AttributeTargets.Struct;
-			}
-		}
-
-		const TypeAttributes DefaultTypeAttributes =
+		public const TypeAttributes DefaultTypeAttributes =
 			TypeAttributes.SequentialLayout |
 			TypeAttributes.Sealed |
 			TypeAttributes.BeforeFieldInit;
 
-
-		public override TypeExpr[] GetClassBases (out TypeExpr base_class)
-		{
-			TypeExpr[] ifaces = base.GetClassBases (out base_class);
-			//
-			// If we are compiling our runtime,
-			// and we are defining ValueType, then our
-			// base is `System.Object'.
-			//
-			if (base_class == null) {
-				if (!RootContext.StdLib && Name == "System.ValueType")
-					base_class = TypeManager.system_object_expr;
-				else
-					base_class = TypeManager.system_valuetype_expr;
-			}
-
-			return ifaces;
-		}
-
 		//
 		// FIXME: Allow the user to specify a different set of attributes
 		// in some cases (Sealed for example is mandatory for a class,
@@ -2805,23 +3081,12 @@ namespace Mono.CSharp {
 				return base.TypeAttr | DefaultTypeAttributes;
 			}
 		}
-
-		public override void RegisterFieldForInitialization (FieldBase field)
-		{
-			if ((field.ModFlags & Modifiers.STATIC) == 0) {
-				Report.Error (573, field.Location, "`{0}': Structs cannot have instance field initializers",
-					field.GetSignatureForError ());
-				return;
-			}
-			base.RegisterFieldForInitialization (field);
-		}
-
 	}
 
 	/// <summary>
 	///   Interfaces
 	/// </summary>
-	public sealed class Interface : TypeContainer, IMemberContainer {
+	public class Interface : TypeContainer, IMemberContainer {
 
 		/// <summary>
 		///   Modifiers allowed in a class declaration
@@ -2848,13 +3113,12 @@ namespace Mono.CSharp {
 			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, name.Location);
 		}
 
-		public override AttributeTargets AttributeTargets {
-			get {
-				return AttributeTargets.Interface;
-			}
+		public override PendingImplementation GetPendingImplementations ()
+		{
+			return null;
 		}
 
-		const TypeAttributes DefaultTypeAttributes =
+		public const TypeAttributes DefaultTypeAttributes =
 			TypeAttributes.AutoLayout |
 			TypeAttributes.Abstract |
 			TypeAttributes.Interface;
@@ -2865,9 +3129,9 @@ namespace Mono.CSharp {
 			}
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ())
+			if (!base.VerifyClsCompliance (ds))
 				return false;
 
 			if (ifaces != null) {
@@ -2964,7 +3228,7 @@ namespace Mono.CSharp {
 			}
 
 			Type base_ret_type = null;
-			base_method = FindOutBaseMethod (ref base_ret_type);
+			base_method = FindOutBaseMethod (Parent, ref base_ret_type);
 
 			// method is override
 			if (base_method != null) {
@@ -3007,7 +3271,8 @@ namespace Mono.CSharp {
 				if ((ModFlags & Modifiers.OVERRIDE) != 0) {
 					ObsoleteAttribute oa = AttributeTester.GetMethodObsoleteAttribute (base_method);
 					if (oa != null) {
-						if (OptAttributes == null || !OptAttributes.Contains (TypeManager.obsolete_attribute_type)) {
+						EmitContext ec = new EmitContext (this.Parent, this.Parent, Location, null, null, ModFlags, false);
+						if (OptAttributes == null || !OptAttributes.Contains (TypeManager.obsolete_attribute_type, ec)) {
 							Report.SymbolRelatedToPreviousError (base_method);
 							Report.Warning (672, 1, Location, "Member `{0}' overrides obsolete member `{1}'. Add the Obsolete attribute to `{0}'",
 								GetSignatureForError (), TypeManager.CSharpSignature (base_method) );
@@ -3205,14 +3470,28 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Gets base method and its return type
 		/// </summary>
-		protected abstract MethodInfo FindOutBaseMethod (ref Type base_ret_type);
+		protected abstract MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type);
 
 		protected bool DoDefineParameters ()
 		{
+			EmitContext ec = Parent.EmitContext;
+			if (ec == null)
+				throw new InternalErrorException ("DoDefineParameters invoked too early");
+
+			bool old_unsafe = ec.InUnsafe;
+			ec.InUnsafe = InUnsafe;
+
+			bool old_obsolete = ec.TestObsoleteMethodUsage;
+			if (GetObsoleteAttribute () != null || Parent.GetObsoleteAttribute () != null)
+				ec.TestObsoleteMethodUsage = false;
+
 			// Check if arguments were correct
-			if (!Parameters.Resolve (this))
+			if (!Parameters.Resolve (ec))
 				return false;
 
+			ec.InUnsafe = old_unsafe;
+			ec.TestObsoleteMethodUsage = old_obsolete;
+
 			return CheckParameters (ParameterTypes);
 		}
 
@@ -3230,6 +3509,8 @@ namespace Mono.CSharp {
 				}
 
 				if (partype.IsPointer){
+					if (!UnsafeOK (ds))
+						error = true;
 					if (!TypeManager.VerifyUnManaged (TypeManager.GetElementType (partype), Location))
 						error = true;
 				}
@@ -3264,10 +3545,10 @@ namespace Mono.CSharp {
 			}
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ()) {
-				if ((ModFlags & Modifiers.ABSTRACT) != 0 && IsExposedFromAssembly () && Parent.IsClsComplianceRequired ()) {
+			if (!base.VerifyClsCompliance (ds)) {
+				if ((ModFlags & Modifiers.ABSTRACT) != 0 && IsExposedFromAssembly (ds) && ds.IsClsComplianceRequired (ds)) {
 					Report.Error (3011, Location, "`{0}': only CLS-compliant members can be abstract", GetSignatureForError ());
 				}
 				return false;
@@ -3660,7 +3941,7 @@ namespace Mono.CSharp {
 
 			MethodData = new MethodData (this, ModFlags, flags, this);
 
-			if (!MethodData.Define (ParentContainer))
+			if (!MethodData.Define (Parent))
 				return false;
 
 			if (ReturnType == TypeManager.void_type && ParameterTypes.Length == 0 && 
@@ -3719,7 +4000,7 @@ namespace Mono.CSharp {
 		// 
 		public override void Emit ()
 		{
-			MethodData.Emit (Parent);
+			MethodData.Emit (Parent, this);
 			base.Emit ();
 
 			if (declarative_security != null) {
@@ -3737,10 +4018,10 @@ namespace Mono.CSharp {
 			Report.Error (1599, loc, "Method or delegate cannot return type `{0}'", TypeManager.CSharpName (t));
 		}
 
-		protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+		protected override MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type)
 		{
-			MethodInfo mi = (MethodInfo) Parent.BaseCache.FindMemberToOverride (
-				Parent.TypeBuilder, Name, ParameterTypes, false);
+			MethodInfo mi = (MethodInfo) container.BaseCache.FindMemberToOverride (
+				container.TypeBuilder, Name, ParameterTypes, false);
 
 			if (mi == null)
 				return null;
@@ -3755,15 +4036,15 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance(DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ())
+			if (!base.VerifyClsCompliance (ds))
 				return false;
 
 			if (ParameterInfo.Count > 0) {
-				ArrayList al = (ArrayList)ParentContainer.MemberCache.Members [Name];
+				ArrayList al = (ArrayList)ds.MemberCache.Members [Name];
 				if (al.Count > 1)
-					ParentContainer.MemberCache.VerifyClsParameterConflict (al, this, MethodBuilder);
+					ds.MemberCache.VerifyClsParameterConflict (al, this, MethodBuilder);
 			}
 
 			return true;
@@ -3821,7 +4102,7 @@ namespace Mono.CSharp {
 
 		public EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig)
 		{
-			EmitContext ec = new EmitContext (this,
+			EmitContext ec = new EmitContext (
 				tc, Parent, Location, ig, ReturnType, ModFlags, false);
 
 			ec.CurrentIterator = tc as Iterator;
@@ -3834,7 +4115,7 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Returns true if method has conditional attribute and the conditions is not defined (method is excluded).
 		/// </summary>
-		public bool IsExcluded ()
+		public bool IsExcluded (EmitContext ec)
 		{
 			if ((caching_flags & Flags.Excluded_Undetected) == 0)
 				return (caching_flags & Flags.Excluded) != 0;
@@ -3845,13 +4126,13 @@ namespace Mono.CSharp {
 				if (OptAttributes == null)
 					return false;
 
-				Attribute[] attrs = OptAttributes.SearchMulti (TypeManager.conditional_attribute_type);
+				Attribute[] attrs = OptAttributes.SearchMulti (TypeManager.conditional_attribute_type, ec);
 
 				if (attrs == null)
 					return false;
 
 				foreach (Attribute a in attrs) {
-					string condition = a.GetConditionalAttributeValue ();
+					string condition = a.GetConditionalAttributeValue (Parent.EmitContext);
 					if (RootContext.AllDefines.Contains (condition))
 						return false;
 				}
@@ -3869,7 +4150,7 @@ namespace Mono.CSharp {
 				return false;
 			}
 
-			if (md.IsExcluded ()) {
+			if (md.IsExcluded (ec)) {
 				caching_flags |= Flags.Excluded;
 				return true;
 			}
@@ -3926,14 +4207,14 @@ namespace Mono.CSharp {
 				t = ec.ContainerType;
 
 			base_constructor_group = Expression.MemberLookup (
-				ec.ContainerType, t, ".ctor", MemberTypes.Constructor,
+				ec, t, ".ctor", MemberTypes.Constructor,
 				BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
 				loc);
 			
 			if (base_constructor_group == null){
 				error = true;
 				base_constructor_group = Expression.MemberLookup (
-					t, null, t, ".ctor", MemberTypes.Constructor,
+					ec, t, null, t, ".ctor", MemberTypes.Constructor,
 					BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly,
 					loc);
 			}
@@ -3947,7 +4228,7 @@ namespace Mono.CSharp {
 			if (base_constructor == null) {
 				if (errors == Report.Errors)
 					Invocation.Error_WrongNumArguments (loc, TypeManager.CSharpSignature (caller_builder),
-						argument_list == null ? 0 : argument_list.Count);
+						argument_list.Count);
 				return false;
 			}
 
@@ -4218,7 +4499,7 @@ namespace Mono.CSharp {
 				ec.IsStatic = false;
 			}
 
-			Parameters.ApplyAttributes (ConstructorBuilder);
+			Parameters.ApplyAttributes (ec, ConstructorBuilder);
 			
 			SourceMethod source = SourceMethod.Create (
 				Parent, ConstructorBuilder, block);
@@ -4234,7 +4515,7 @@ namespace Mono.CSharp {
 					// do not emit field initializers, they are initialized in the other constructor
 					//
 					if (!(Initializer != null && Initializer is ConstructorThisInitializer))
-						ParentContainer.EmitFieldInitializers (ec);
+						Parent.EmitFieldInitializers (ec);
 				}
 			}
 			if (Initializer != null) {
@@ -4242,10 +4523,10 @@ namespace Mono.CSharp {
 			}
 			
 			if ((ModFlags & Modifiers.STATIC) != 0)
-				ParentContainer.EmitFieldInitializers (ec);
+				Parent.EmitFieldInitializers (ec);
 
 			if (OptAttributes != null) 
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, this);
 
 			ec.EmitTopBlock (this, block);
 
@@ -4264,7 +4545,7 @@ namespace Mono.CSharp {
 		}
 
 		// Is never override
-		protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+		protected override MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type)
 		{
 			return null;
 		}
@@ -4274,18 +4555,18 @@ namespace Mono.CSharp {
 			return base.GetSignatureForError () + Parameters.GetSignatureForError ();
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance () || !IsExposedFromAssembly ()) {
+			if (!base.VerifyClsCompliance (ds) || !IsExposedFromAssembly (ds)) {
 				return false;
 			}
 			
  			if (ParameterInfo.Count > 0) {
- 				ArrayList al = (ArrayList)Parent.MemberCache.Members [".ctor"];
+ 				ArrayList al = (ArrayList)ds.MemberCache.Members [".ctor"];
  				if (al.Count > 3)
- 					Parent.MemberCache.VerifyClsParameterConflict (al, this, ConstructorBuilder);
+ 					ds.MemberCache.VerifyClsParameterConflict (al, this, ConstructorBuilder);
  
-				if (Parent.TypeBuilder.IsSubclassOf (TypeManager.attribute_type)) {
+				if (ds.TypeBuilder.IsSubclassOf (TypeManager.attribute_type)) {
 					foreach (Type param in ParameterTypes) {
 						if (param.IsArray) {
 							return true;
@@ -4334,10 +4615,10 @@ namespace Mono.CSharp {
 		public EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig)
 		{
 			ILGenerator ig_ = ConstructorBuilder.GetILGenerator ();
-			return new EmitContext (this, Parent, Location, ig_, null, ModFlags, true);
+			return new EmitContext (Parent, Location, ig_, null, ModFlags, true);
 		}
 
-		public bool IsExcluded()
+		public bool IsExcluded(EmitContext ec)
 		{
 			return false;
 		}
@@ -4362,8 +4643,8 @@ namespace Mono.CSharp {
 		EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig);
 		ObsoleteAttribute GetObsoleteAttribute ();
 		string GetSignatureForError ();
-		bool IsExcluded ();
-		bool IsClsComplianceRequired ();
+		bool IsExcluded (EmitContext ec);
+		bool IsClsComplianceRequired (DeclSpace ds);
 		void SetMemberIsUsed ();
 	}
 
@@ -4408,13 +4689,12 @@ namespace Mono.CSharp {
 			string name = method.MethodName.Name;
 			string method_name = name;
 
-			PendingImplementation pending = container.PendingImplementations;
-			if (pending != null){
+			if (container.Pending != null){
 				if (member is Indexer) // TODO: test it, but it should work without this IF
-					implementing = pending.IsInterfaceIndexer (
+					implementing = container.Pending.IsInterfaceIndexer (
 						member.InterfaceType, method.ReturnType, method.ParameterInfo);
 				else
-					implementing = pending.IsInterfaceMethod (
+					implementing = container.Pending.IsInterfaceMethod (
 						member.InterfaceType, name, method.ReturnType, method.ParameterInfo);
 
 				if (member.InterfaceType != null){
@@ -4524,7 +4804,11 @@ namespace Mono.CSharp {
 					flags |= MethodAttributes.Final;
 			}
 
-			DefineMethodBuilder (container, method_name, method.ParameterInfo.Types);
+			EmitContext ec = method.CreateEmitContext (container, null);
+			if (method.GetObsoleteAttribute () != null || container.GetObsoleteAttribute () != null)
+				ec.TestObsoleteMethodUsage = false;
+
+			DefineMethodBuilder (ec, container, method_name, method.ParameterInfo.Types);
 
 			if (builder == null)
 				return false;
@@ -4537,11 +4821,11 @@ namespace Mono.CSharp {
 				// clear the pending implemntation flag
 				//
 				if (member is Indexer) {
-					pending.ImplementIndexer (
+					container.Pending.ImplementIndexer (
 						member.InterfaceType, builder, method.ReturnType,
 						method.ParameterInfo, member.IsExplicitImpl);
 				} else
-					pending.ImplementMethod (
+					container.Pending.ImplementMethod (
 						member.InterfaceType, name, method.ReturnType,
 						method.ParameterInfo, member.IsExplicitImpl);
 
@@ -4560,18 +4844,18 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Create the MethodBuilder for the method 
 		/// </summary>
-		void DefineMethodBuilder (TypeContainer container, string method_name, Type[] ParameterTypes)
+		void DefineMethodBuilder (EmitContext ec, TypeContainer container, string method_name, Type[] ParameterTypes)
 		{
 			const int extern_static = Modifiers.EXTERN | Modifiers.STATIC;
 
 			if ((modifiers & extern_static) == extern_static) {
 
 				if (method.OptAttributes != null) {
-					Attribute dllimport_attribute = method.OptAttributes.Search (TypeManager.dllimport_type);
+					Attribute dllimport_attribute = method.OptAttributes.Search (TypeManager.dllimport_type, ec);
 					if (dllimport_attribute != null) {
 						flags |= MethodAttributes.PinvokeImpl;
 						builder = dllimport_attribute.DefinePInvokeMethod (
-							container.TypeBuilder, method_name, flags,
+							ec, container.TypeBuilder, method_name, flags,
 							method.ReturnType, ParameterTypes);
 
 						return;
@@ -4581,7 +4865,7 @@ namespace Mono.CSharp {
 				// for extern static method must be specified either DllImport attribute or MethodImplAttribute.
 				// We are more strict than Microsoft and report CS0626 like error
 				if (method.OptAttributes == null ||
-					!method.OptAttributes.Contains (TypeManager.methodimpl_attr_type)) {
+					!method.OptAttributes.Contains (TypeManager.methodimpl_attr_type, ec)) {
 					Report.Error (626, method.Location, "Method, operator, or accessor `{0}' is marked external and has no attributes on it. Consider adding a DllImport attribute to specify the external implementation",
 						method.GetSignatureForError ());
 					return;
@@ -4596,7 +4880,7 @@ namespace Mono.CSharp {
 		//
 		// Emits the code
 		// 
-		public void Emit (TypeContainer container)
+		public void Emit (TypeContainer container, Attributable kind)
 		{
 			EmitContext ec;
 			if ((flags & MethodAttributes.PinvokeImpl) == 0)
@@ -4607,12 +4891,12 @@ namespace Mono.CSharp {
 			if (method.GetObsoleteAttribute () != null || container.GetObsoleteAttribute () != null)
 				ec.TestObsoleteMethodUsage = false;
 
-			method.ParameterInfo.ApplyAttributes (MethodBuilder);
+			method.ParameterInfo.ApplyAttributes (ec, MethodBuilder);
 
 			Attributes OptAttributes = method.OptAttributes;
 
 			if (OptAttributes != null)
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, kind);
 
 			ToplevelBlock block = method.Block;
 			
@@ -4651,7 +4935,7 @@ namespace Mono.CSharp {
 			
 			if (ec.ContainerType.BaseType != null) {
 				Expression member_lookup = Expression.MemberLookup (
-					ec.ContainerType.BaseType, null, ec.ContainerType.BaseType,
+					ec, ec.ContainerType.BaseType, null, ec.ContainerType.BaseType,
 					"Finalize", MemberTypes.Method, Expression.AllBindingFlags, method.Location);
 
 				if (member_lookup != null){
@@ -4716,18 +5000,6 @@ namespace Mono.CSharp {
 			get { return (TypeContainer) base.Parent; }
 		}
 
-		/// <summary>
-		/// Use this for access to parent container from partial classes (not master partial).
-		/// This should be used rarely as all members are hosted in master partial class.
-		/// Also with some effort this should be eliminated (not easy now).
-		/// </summary>
-		public TypeContainer ParentContainer {
-			get {
-				return base.Parent.IsPartial ?
-					Parent.PartialContainer : Parent;
-			}
-		}
-
 		//
 		// The type of this property / indexer / event
 		//
@@ -4735,7 +5007,11 @@ namespace Mono.CSharp {
 		public Type MemberType {
 			get {
 				if (member_type == null && Type != null) {
-					Type = Type.ResolveAsTypeTerminal (ResolveContext, false);
+					EmitContext ec = Parent.EmitContext;
+					bool old_unsafe = ec.InUnsafe;
+					ec.InUnsafe = InUnsafe;
+					Type = Type.ResolveAsTypeTerminal (ec, false);
+					ec.InUnsafe = old_unsafe;
 					if (Type != null) {
 						member_type = Type.Type;
 					}
@@ -4792,6 +5068,10 @@ namespace Mono.CSharp {
 
 		protected virtual bool DoDefine ()
 		{
+			EmitContext ec = Parent.EmitContext;
+			if (ec == null)
+				throw new InternalErrorException ("MemberBase.DoDefine called too early");
+
 			if (Name == null)
 				throw new InternalErrorException ();
 
@@ -4857,20 +5137,23 @@ namespace Mono.CSharp {
 				return false;
 			}
 
+			if (MemberType.IsPointer && !UnsafeOK (Parent))
+				return false;
+
 			if (IsExplicitImpl) {
 				Expression expr = MemberName.Left.GetTypeExpression ();
-				TypeExpr texpr = expr.ResolveAsTypeTerminal (ResolveContext, false);
+				TypeExpr texpr = expr.ResolveAsTypeTerminal (ec, false);
 				if (texpr == null)
 					return false;
 
-				InterfaceType = texpr.ResolveType (this);
+				InterfaceType = texpr.ResolveType (ec);
 
 				if (!InterfaceType.IsInterface) {
 					Report.Error (538, Location, "`{0}' in explicit interface declaration is not an interface", TypeManager.CSharpName (InterfaceType));
 					return false;
 				}
 				
-				if (!ParentContainer.VerifyImplements (this))
+				if (!Parent.VerifyImplements (this))
 					return false;
 				
 				Modifiers.Check (Modifiers.AllowedExplicitImplFlags, explicit_mod_flags, 0, Location);
@@ -4888,13 +5171,13 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		protected override bool VerifyClsCompliance()
+		protected override bool VerifyClsCompliance(DeclSpace ds)
 		{
-			if (base.VerifyClsCompliance ()) {
+			if (base.VerifyClsCompliance (ds)) {
 				return true;
 			}
 
-			if (IsInterface && HasClsCompliantAttribute && Parent.IsClsComplianceRequired ()) {
+			if (IsInterface && HasClsCompliantAttribute && ds.IsClsComplianceRequired (ds)) {
 				Report.Error (3010, Location, "`{0}': CLS-compliant interfaces must have only CLS-compliant members", GetSignatureForError ());
 			}
 			return false;
@@ -4957,7 +5240,7 @@ namespace Mono.CSharp {
 		public void EmitInitializer (EmitContext ec)
 		{
 			// Replace DeclSpace because of partial classes
-			ec.DeclContainer = DeclContainer;
+			ec.DeclSpace = EmitContext.DeclSpace;
 
 			ec.IsFieldInitializer = true;
 			initializer = initializer.Resolve (ec);
@@ -5023,7 +5306,7 @@ namespace Mono.CSharp {
 			set {
 				if (value != null) {
 					this.initializer = value;
-					ParentContainer.RegisterFieldForInitialization (this);
+					Parent.RegisterFieldForInitialization (this);
 				}
 			}
 		}
@@ -5043,9 +5326,9 @@ namespace Mono.CSharp {
 			}
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ())
+			if (!base.VerifyClsCompliance (ds))
 				return false;
 
 			if (!IsFieldClsCompliant) {
@@ -5098,8 +5381,13 @@ namespace Mono.CSharp {
 			base.ApplyAttributeBuilder (a, cb);
 		}
 
+
 		public override bool Define()
 		{
+			EmitContext ec = Parent.EmitContext;
+			if (ec == null)
+				throw new InternalErrorException ("FieldMember.Define called too early");
+
 			if (MemberType == null || Type == null)
 				return false;
 
@@ -5124,13 +5412,17 @@ namespace Mono.CSharp {
 			if (!IsTypePermitted ())
 				return false;
 
+			if (MemberType.IsPointer && !UnsafeOK (Parent))
+				return false;
+
 			return true;
 		}
 
 		public override void Emit ()
 		{
 			if (OptAttributes != null) {
-				OptAttributes.Emit ();
+				EmitContext ec = new EmitContext (Parent, Location, null, FieldBuilder.FieldType, ModFlags);
+				OptAttributes.Emit (ec, this);
 			}
 
 			if (Parent.HasExplicitLayout && ((status & Status.HAS_OFFSET) == 0) && (ModFlags & Modifiers.STATIC) == 0) {
@@ -5234,8 +5526,7 @@ namespace Mono.CSharp {
 				return false;
 			}
 
-			EmitContext ec = new EmitContext (this, Parent, Location, null, null, ModFlags);
-			Constant c = size_expr.ResolveAsConstant (ec, this);
+			Constant c = size_expr.ResolveAsConstant (Parent.EmitContext, this);
 			if (c == null)
 				return false;
 
@@ -5414,9 +5705,9 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ())
+			if (!base.VerifyClsCompliance (ds))
 				return false;
 
 			if ((ModFlags & Modifiers.VOLATILE) != 0) {
@@ -5520,7 +5811,7 @@ namespace Mono.CSharp {
 			}
 		}
 
-		public bool IsExcluded ()
+		public bool IsExcluded (EmitContext ec)
 		{
 			return false;
 		}
@@ -5601,10 +5892,10 @@ namespace Mono.CSharp {
 
 		protected virtual void EmitMethod (TypeContainer container)
 		{
-			method_data.Emit (container);
+			method_data.Emit (container, this);
 		}
 
-		public override bool IsClsComplianceRequired()
+		public override bool IsClsComplianceRequired(DeclSpace ds)
 		{
 			return false;
 		}
@@ -5724,7 +6015,7 @@ namespace Mono.CSharp {
 			{
 				if (a.Target == AttributeTargets.Parameter) {
 					if (param_attr == null)
-						param_attr = new ImplicitParameter (method_data.MethodBuilder);
+						param_attr = new ImplicitParameter (method_data.MethodBuilder, method.Location);
 
 					param_attr.ApplyAttributeBuilder (a, cb);
 					return;
@@ -5749,6 +6040,9 @@ namespace Mono.CSharp {
 
 			public override MethodBuilder Define (TypeContainer container)
 			{
+				if (container.EmitContext == null)
+					throw new InternalErrorException ("SetMethod.Define called too early");
+
 				DefineParameters ();
 				if (IsDummy)
 					return null;
@@ -5809,9 +6103,9 @@ namespace Mono.CSharp {
 				}
 			}
 
-			public override bool IsClsComplianceRequired()
+			public override bool IsClsComplianceRequired(DeclSpace ds)
 			{
-				return method.IsClsComplianceRequired ();
+				return method.IsClsComplianceRequired (ds);
 			}
 
 			public virtual MethodBuilder Define (TypeContainer container)
@@ -5864,7 +6158,7 @@ namespace Mono.CSharp {
 			public override EmitContext CreateEmitContext (TypeContainer tc,
 								       ILGenerator ig)
 			{
-				return new EmitContext (method,
+				return new EmitContext (
 					tc, method.Parent, method.Location, ig, ReturnType,
 					method.ModFlags, false);
 			}
@@ -5979,6 +6273,7 @@ namespace Mono.CSharp {
 				return false;
 			}
 
+			ec = new EmitContext (Parent, Location, null, MemberType, ModFlags);
 			return true;
 		}
 
@@ -6010,10 +6305,10 @@ namespace Mono.CSharp {
 		}
 
 		// TODO: rename to Resolve......
- 		protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+ 		protected override MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type)
  		{
- 			PropertyInfo base_property = Parent.BaseCache.FindMemberToOverride (
- 				Parent.TypeBuilder, Name, ParameterTypes, true) as PropertyInfo;
+ 			PropertyInfo base_property = container.BaseCache.FindMemberToOverride (
+ 				container.TypeBuilder, Name, ParameterTypes, true) as PropertyInfo;
   
  			if (base_property == null)
  				return null;
@@ -6073,7 +6368,7 @@ namespace Mono.CSharp {
 			// put the attribute
 			//
 			if (PropertyBuilder != null && OptAttributes != null)
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, this);
 
 			if (!Get.IsDummy)
 				Get.Emit (Parent);
@@ -6194,7 +6489,6 @@ namespace Mono.CSharp {
 			if (!Set.IsDummy)
 				PropertyBuilder.SetSetMethod (SetBuilder);
 			
-			TypeManager.RegisterProperty (PropertyBuilder, this);
 			return true;
 		}
 	}
@@ -6494,7 +6788,7 @@ namespace Mono.CSharp {
 			{
 				if (a.Target == AttributeTargets.Parameter) {
 					if (param_attr == null)
-						param_attr = new ImplicitParameter (method_data.MethodBuilder);
+						param_attr = new ImplicitParameter (method_data.MethodBuilder, method.Location);
 
 					param_attr.ApplyAttributeBuilder (a, cb);
 					return;
@@ -6509,9 +6803,9 @@ namespace Mono.CSharp {
 				}
 			}
 
-			public override bool IsClsComplianceRequired()
+			public override bool IsClsComplianceRequired(DeclSpace ds)
 			{
-				return method.IsClsComplianceRequired ();
+				return method.IsClsComplianceRequired (ds);
 			}
 
 			public MethodBuilder Define (TypeContainer container)
@@ -6523,7 +6817,7 @@ namespace Mono.CSharp {
 					return null;
 
 				MethodBuilder mb = method_data.MethodBuilder;
-				ParameterInfo.ApplyAttributes (mb);
+				ParameterInfo.ApplyAttributes (Parent.EmitContext, mb);
 				return mb;
 			}
 
@@ -6571,7 +6865,7 @@ namespace Mono.CSharp {
 			public override EmitContext CreateEmitContext (TypeContainer tc,
 								       ILGenerator ig)
 			{
-				return new EmitContext (method,
+				return new EmitContext (
 					tc, method.Parent, Location, ig, ReturnType,
 					method.ModFlags, false);
 			}
@@ -6660,10 +6954,18 @@ namespace Mono.CSharp {
 				return false;
 			}
 
+			EmitContext ec = Parent.EmitContext;
+			if (ec == null)
+				throw new InternalErrorException ("Event.Define called too early?");
+			bool old_unsafe = ec.InUnsafe;
+			ec.InUnsafe = InUnsafe;
+
 			Parameter [] parms = new Parameter [1];
 			parms [0] = new Parameter (MemberType, "value", Parameter.Modifier.NONE, null, Location);
 			parameters = new Parameters (parms);
-			parameters.Resolve (this);
+			parameters.Resolve (null);
+
+			ec.InUnsafe = old_unsafe;
 
 			if (!CheckBase ())
 				return false;
@@ -6717,7 +7019,9 @@ namespace Mono.CSharp {
 		public override void Emit ()
 		{
 			if (OptAttributes != null) {
-				OptAttributes.Emit ();
+				EmitContext ec = new EmitContext (
+					Parent, Location, null, MemberType, ModFlags);
+				OptAttributes.Emit (ec, this);
 			}
 
 			Add.Emit (Parent);
@@ -6833,12 +7137,12 @@ namespace Mono.CSharp {
 			}
 
 			if (OptAttributes != null) {
-				Attribute indexer_attr = OptAttributes.Search (TypeManager.indexer_name_type);
+				Attribute indexer_attr = OptAttributes.Search (TypeManager.indexer_name_type, ec);
 				if (indexer_attr != null) {
 					// Remove the attribute from the list because it is not emitted
 					OptAttributes.Attrs.Remove (indexer_attr);
 
-					ShortName = indexer_attr.GetIndexerAttributeValue ();
+					ShortName = indexer_attr.GetIndexerAttributeValue (ec);
 
 					if (IsExplicitImpl) {
 						Report.Error (415, indexer_attr.Location,
@@ -7186,7 +7490,7 @@ namespace Mono.CSharp {
 		}
 
 		// Operator cannot be override
-		protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+		protected override MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type)
 		{
 			return null;
 		}
diff --git a/mcs/mcs/codegen.cs b/mcs/mcs/codegen.cs
index 4c679cf6a5e..32a92ec79ad 100644
--- a/mcs/mcs/codegen.cs
+++ b/mcs/mcs/codegen.cs
@@ -187,21 +187,12 @@ namespace Mono.CSharp {
 		}
 	}
 
-
-	public interface IResolveContext
-	{
-		DeclSpace DeclContainer { get; }
-		bool IsInObsoleteScope { get; }
-		bool IsInUnsafeScope { get; }
-	}
-
 	/// <summary>
 	///   An Emit Context is created for each body of code (from methods,
 	///   properties bodies, indexer bodies or constructor bodies)
 	/// </summary>
-	public class EmitContext : IResolveContext {
-
-		DeclSpace declSpace;
+	public class EmitContext {
+		public DeclSpace DeclSpace;
 		public DeclSpace TypeContainer;
 		public ILGenerator   ig;
 
@@ -354,8 +345,6 @@ namespace Mono.CSharp {
 		/// </summary>
 		public bool TestObsoleteMethodUsage = true;
 
-		public readonly IResolveContext ResolveContext;
-
 		/// <summary>
 		///    The current iterator
 		/// </summary>
@@ -382,14 +371,13 @@ namespace Mono.CSharp {
 					      CurrentIterator, capture_context, loc);
 		}
 		
-		public EmitContext (IResolveContext rc, DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
+		public EmitContext (DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
 				    Type return_type, int code_flags, bool is_constructor)
 		{
-			this.ResolveContext = rc;
 			this.ig = ig;
 
 			TypeContainer = parent;
-			this.declSpace = ds;
+			DeclSpace = ds;
 			CheckState = RootContext.Checked;
 			ConstantCheckState = true;
 
@@ -405,7 +393,10 @@ namespace Mono.CSharp {
 			if (parent != null){
 				// Can only be null for the ResolveType contexts.
 				ContainerType = parent.TypeBuilder;
-				InUnsafe = rc.IsInUnsafeScope;
+				if (parent.UnsafeContext)
+					InUnsafe = true;
+				else
+					InUnsafe = (code_flags & Modifiers.UNSAFE) != 0;
 			}
 			loc = l;
 
@@ -413,43 +404,18 @@ namespace Mono.CSharp {
 				ReturnType = null;
 		}
 
-		public EmitContext (IResolveContext rc, TypeContainer tc, Location l, ILGenerator ig,
+		public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
 				    Type return_type, int code_flags, bool is_constructor)
-			: this (rc, tc, tc, l, ig, return_type, code_flags, is_constructor)
+			: this (tc, tc, l, ig, return_type, code_flags, is_constructor)
 		{
 		}
 
-		public EmitContext (IResolveContext rc, TypeContainer tc, Location l, ILGenerator ig,
+		public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
 				    Type return_type, int code_flags)
-			: this (rc, tc, tc, l, ig, return_type, code_flags, false)
+			: this (tc, tc, l, ig, return_type, code_flags, false)
 		{
 		}
 
-		public DeclSpace DeclContainer { 
-			get { 
-				return this.declSpace;
-			}
-			set {
-				declSpace = value;
-			}
-		}
-
-		public bool IsInObsoleteScope {
-			get {
-				return ResolveContext.IsInObsoleteScope;
-			}
-		}
-
-		public bool IsInUnsafeScope {
-			get {
-				if (InUnsafe)
-					return true;
-
-				return ResolveContext.IsInUnsafeScope;
-			}
-		}
-
-
 		public FlowBranching CurrentBranching {
 			get {
 				return current_flow_branching;
@@ -989,8 +955,7 @@ namespace Mono.CSharp {
 	}
 
 
-	public abstract class CommonAssemblyModulClass : Attributable, IResolveContext {
-
+	public abstract class CommonAssemblyModulClass : Attributable {
 		protected CommonAssemblyModulClass ():
 			base (null)
 		{
@@ -1010,7 +975,8 @@ namespace Mono.CSharp {
 			if (OptAttributes == null)
 				return;
 
-			OptAttributes.Emit ();
+			EmitContext ec = new EmitContext (tc, Mono.CSharp.Location.Null, null, null, 0, false);
+			OptAttributes.Emit (ec, this);
 		}
                 
 		protected Attribute ResolveAttribute (Type a_type)
@@ -1019,43 +985,16 @@ namespace Mono.CSharp {
 				return null;
 
 			// Ensure that we only have GlobalAttributes, since the Search below isn't safe with other types.
-			if (!OptAttributes.CheckTargets ())
+			if (!OptAttributes.CheckTargets (this))
 				return null;
 
-			Attribute a = OptAttributes.Search (a_type);
+			EmitContext temp_ec = new EmitContext (RootContext.Tree.Types, Mono.CSharp.Location.Null, null, null, 0, false);
+			Attribute a = OptAttributes.Search (a_type, temp_ec);
 			if (a != null) {
-				a.Resolve ();
+				a.Resolve (temp_ec);
 			}
 			return a;
 		}
-
-		public override IResolveContext ResolveContext {
-			get {
-				return this;
-			}
-		}
-
-		#region IResolveContext Members
-
-		public DeclSpace DeclContainer {
-			get {
-				return RootContext.Tree.Types;
-			}
-		}
-
-		public bool IsInObsoleteScope {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInUnsafeScope {
-			get {
-				return false;
-			}
-		}
-
-		#endregion
 	}
                 
 	public class AssemblyClass : CommonAssemblyModulClass {
@@ -1094,19 +1033,16 @@ namespace Mono.CSharp {
 			}
 		}
 
-		public override bool IsClsComplianceRequired()
+		public override bool IsClsComplianceRequired(DeclSpace ds)
 		{
 			return is_cls_compliant;
 		}
 
 		public void Resolve ()
 		{
-			if (OptAttributes != null)
-				OptAttributes.AttachTo (this);
-
 			ClsCompliantAttribute = ResolveAttribute (TypeManager.cls_compliant_attribute_type);
 			if (ClsCompliantAttribute != null) {
-				is_cls_compliant = ClsCompliantAttribute.GetClsCompliantAttributeValue ();
+				is_cls_compliant = ClsCompliantAttribute.GetClsCompliantAttributeValue (null);
 			}
 
 #if NET_2_0
@@ -1360,16 +1296,13 @@ namespace Mono.CSharp {
  			}
 		}
 
-		public override bool IsClsComplianceRequired()
+		public override bool IsClsComplianceRequired(DeclSpace ds)
 		{
 			return CodeGen.Assembly.IsClsCompliant;
 		}
 
 		public override void Emit (TypeContainer tc) 
 		{
-			if (OptAttributes != null)
-				OptAttributes.AttachTo (this);
-
 			base.Emit (tc);
 
 			if (!m_module_is_unsafe)
diff --git a/mcs/mcs/const.cs b/mcs/mcs/const.cs
index 5f90e75170d..2e562ff2fe5 100644
--- a/mcs/mcs/const.cs
+++ b/mcs/mcs/const.cs
@@ -135,8 +135,7 @@ namespace Mono.CSharp {
 			}
 
 			in_transit = true;
-			// TODO: IResolveContext here
-			EmitContext ec = new EmitContext (this, Parent, Location, null, MemberType, ModFlags);
+			EmitContext ec = new EmitContext (Parent, Location, null, MemberType, ModFlags);
 			value = initializer.ResolveAsConstant (ec, this);
 			in_transit = false;
 
diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
index 0ccf630311d..76c2c5667a8 100644
--- a/mcs/mcs/constant.cs
+++ b/mcs/mcs/constant.cs
@@ -39,12 +39,6 @@ namespace Mono.CSharp {
 			return this.GetType ().Name + " (" + AsString () + ")";
 		}
 
-		public override bool GetAttributableValue (out object value)
-		{
-			value = GetTypedValue ();
-			return true;
-		}
-
 		/// <summary>
 		///  This is used to obtain the actual value of the literal
 		///  cast into an object.
@@ -239,10 +233,6 @@ namespace Mono.CSharp {
 				throw new OverflowException ();
 		}
 
-		/// <summary>
-		/// Maybe ConvertTo name is better. It tries to convert `this' constant to target_type.
-		/// It throws OverflowException 
-		/// </summary>
 		public abstract Constant Reduce (EmitContext ec, Type target_type);
 
 		/// <summary>
@@ -254,9 +244,11 @@ namespace Mono.CSharp {
 				return  TryReduce (ec, target_type);
 			}
 			catch (OverflowException) {
-				Report.Error (221, loc, "Constant value `{0}' cannot be converted to a `{1}' (use `unchecked' syntax to override)",
-					GetValue ().ToString (), TypeManager.CSharpName (target_type));
-				throw;
+				if (ec.ConstantCheckState) {
+					Report.Error (221, loc, "Constant value `{0}' cannot be converted to a `{1}' (use `unchecked' syntax to override)",
+						GetValue ().ToString (), TypeManager.CSharpName (target_type));
+				}
+				return null;
 			}
 		}
 
diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 3b1c82ec761..3c043b2e0c6 100644
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -620,7 +620,7 @@ attribute
 	: attribute_name opt_attribute_arguments
 	  {
 		MemberName mname = (MemberName) $1;
-		object[] arguments = (object[]) $2;
+		ArrayList arguments = (ArrayList) $2;
 		MemberName left = mname.Left;
 		string identifier = mname.Name;
 
@@ -654,18 +654,29 @@ attribute_arguments
 		if ($1 == null)
 			$$ = null;
 		else {
-			$$ = new object [] { $1, null };
+			ArrayList args = new ArrayList (4);
+			args.Add ($1);
+		
+			$$ = args;
 		}
 	  }
-    | positional_argument_list COMMA named_argument_list
+        | positional_argument_list COMMA named_argument_list
 	  {
-		$$ = new object[] { $1, $3 };
+		ArrayList args = new ArrayList (4);
+		args.Add ($1);
+		args.Add ($3);
+
+		$$ = args;
 	  }
-    | named_argument_list
+        | named_argument_list
 	  {
-		$$ = new object [] { null, $1 };
+		ArrayList args = new ArrayList (4);
+		args.Add (null);
+		args.Add ($1);
+		
+		$$ = args;
 	  }
-    ;
+        ;
 
 
 opt_positional_argument_list
@@ -758,15 +769,21 @@ struct_declaration
 	  STRUCT member_name
 	  { 
 		MemberName name = MakeName ((MemberName) $5);
-		current_class = new Struct (
-			current_namespace, current_class, name, (int) $2,
-			(Attributes) $1);
-
 		if ($3 != null) {
-			current_container = current_container.AddPartial (current_class);
+			ClassPart part = PartialContainer.CreatePart (
+				current_namespace, current_class, name, (int) $2,
+				(Attributes) $1, Kind.Struct, (Location) $3);
+
+			current_container = part.PartialContainer;
+			current_class = part;
 		} else {
+			current_class = new Struct (
+				current_namespace, current_class, name, (int) $2,
+				(Attributes) $1);
+
 			current_container.AddClassOrStruct (current_class);
 			current_container = current_class;
+			RootContext.Tree.RecordDecl (current_namespace.NS, name, current_class);
 		}
 	  }
 	  opt_class_base
@@ -775,7 +792,7 @@ struct_declaration
 			current_class.Bases = (ArrayList) $7;
 
 		if (RootContext.Documentation != null)
-			current_container.DocComment = Lexer.consume_doc_comment ();
+			current_class.DocComment = Lexer.consume_doc_comment ();
 	  }
 	  struct_body
 	  {
@@ -1452,15 +1469,21 @@ interface_declaration
 	  {
 		MemberName name = MakeName ((MemberName) $5);
 
-		current_class = new Interface (
-			current_namespace, current_class, name, (int) $2,
-			(Attributes) $1);
-
 		if ($3 != null) {
-			current_container = current_container.AddPartial (current_class);
+			ClassPart part = PartialContainer.CreatePart (
+				current_namespace, current_class, name, (int) $2,
+				(Attributes) $1, Kind.Interface, (Location) $3);
+
+			current_container = part.PartialContainer;
+			current_class = part;
 		} else {
+			current_class = new Interface (
+				current_namespace, current_class, name, (int) $2,
+				(Attributes) $1);
+
 			current_container.AddInterface (current_class);
 			current_container = current_class;
+			RootContext.Tree.RecordDecl (current_namespace.NS, name, current_class);
 		}
 	  }
 	  opt_class_base
@@ -1468,7 +1491,7 @@ interface_declaration
 		current_class.Bases = (ArrayList) $7;
 
 		if (RootContext.Documentation != null) {
-			current_container.DocComment = Lexer.consume_doc_comment ();
+			current_class.DocComment = Lexer.consume_doc_comment ();
 			Lexer.doc_state = XmlCommentState.Allowed;
 		}
 	  }
@@ -3491,15 +3514,27 @@ class_declaration
 		MemberName name = MakeName ((MemberName) $5);
 		int mod_flags = (int) $2;
 
-		current_class = new Class (
-			current_namespace, current_class, name,
-			mod_flags, (Attributes) $1);
-
 		if ($3 != null) {
-			current_container = current_container.AddPartial (current_class);
+			ClassPart part = PartialContainer.CreatePart (
+				current_namespace, current_class, name, mod_flags,
+				(Attributes) $1, Kind.Class, (Location) $3);
+
+			current_container = part.PartialContainer;
+			current_class = part;
 		} else {
+			if ((mod_flags & Modifiers.STATIC) != 0) {
+				current_class = new StaticClass (
+					current_namespace, current_class, name,
+					mod_flags, (Attributes) $1);
+			} else {
+				current_class = new Class (
+					current_namespace, current_class, name,
+					mod_flags, (Attributes) $1);
+			}
+
 			current_container.AddClassOrStruct (current_class);
 			current_container = current_class;
+			RootContext.Tree.RecordDecl (current_namespace.NS, name, current_class);
 		}
 	  }
 	  opt_class_base
@@ -3514,7 +3549,7 @@ class_declaration
 		}
 
 		if (RootContext.Documentation != null) {
-			current_container.DocComment = Lexer.consume_doc_comment ();
+			current_class.DocComment = Lexer.consume_doc_comment ();
 			Lexer.doc_state = XmlCommentState.Allowed;
 		}
 	  }
@@ -4659,12 +4694,13 @@ TypeContainer pop_current_class ()
 	TypeContainer retval = current_class;
 
 	current_class = (TypeContainer) current_class.Parent;
-	current_container = current_class.IsPartial ? current_class.PartialContainer : current_class;
+	current_container = (TypeContainer) current_container.Parent;
 
 	if (current_class != current_container) {
-		if (current_class.PartialContainer != current_container)
+		if (((ClassPart) current_class).PartialContainer != current_container)
 			throw new InternalErrorException ("current_container and current_class are out of sync");
-	}
+	} else if (current_container is ClassPart)
+		current_container = ((ClassPart) current_class).PartialContainer;
 
 	return retval;
 }
diff --git a/mcs/mcs/decl.cs b/mcs/mcs/decl.cs
index 716dc15159b..9a2479db565 100644
--- a/mcs/mcs/decl.cs
+++ b/mcs/mcs/decl.cs
@@ -210,7 +210,7 @@ namespace Mono.CSharp {
 	///   Base representation for members.  This is used to keep track
 	///   of Name, Location and Modifier flags, and handling Attributes.
 	/// </summary>
-	public abstract class MemberCore : Attributable, IResolveContext {
+	public abstract class MemberCore : Attributable {
 		/// <summary>
 		///   Public name
 		/// </summary>
@@ -235,7 +235,7 @@ namespace Mono.CSharp {
 		/// </summary>
 		public int ModFlags;
 
-		public readonly DeclSpace Parent;
+		public /*readonly*/ DeclSpace Parent;
 
 		/// <summary>
 		///   Location where this declaration happens
@@ -247,7 +247,7 @@ namespace Mono.CSharp {
 		/// <summary>
 		///   XML documentation comment
 		/// </summary>
-		protected string comment;
+		public string DocComment;
 
 		/// <summary>
 		///   Represents header string for documentation comment 
@@ -269,8 +269,7 @@ namespace Mono.CSharp {
 			Excluded = 1 << 9,					// Method is conditional
 			TestMethodDuplication = 1 << 10,		// Test for duplication must be performed
 			IsUsed = 1 << 11,
-			IsAssigned = 1 << 12,				// Field is assigned
-			HasExplicitLayout	= 1 << 13
+			IsAssigned = 1 << 12				// Field is assigned
 		}
 
 		/// <summary>
@@ -281,7 +280,10 @@ namespace Mono.CSharp {
 		public MemberCore (DeclSpace parent, MemberName name, Attributes attrs)
 			: base (attrs)
 		{
-			this.Parent = parent;
+			if (parent is PartialContainer && !(this is PartialContainer))
+				throw new InternalErrorException ("A PartialContainer cannot be the direct parent of a member");
+
+			Parent = parent;
 			member_name = name;
 			caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
 		}
@@ -294,15 +296,6 @@ namespace Mono.CSharp {
 
 		public abstract bool Define ();
 
-		public virtual string DocComment {
-			get {
-				return comment;
-			}
-			set {
-				comment = value;
-			}
-		}
-
 		// 
 		// Returns full member name for error message
 		//
@@ -322,7 +315,15 @@ namespace Mono.CSharp {
 			if (!RootContext.VerifyClsCompliance)
 				return;
 
-			VerifyClsCompliance ();
+			VerifyClsCompliance (Parent);
+		}
+
+		public virtual EmitContext EmitContext {
+			get { return Parent.EmitContext; }
+		}
+
+		public bool InUnsafe {
+			get { return ((ModFlags & Modifiers.UNSAFE) != 0) || Parent.UnsafeContext; }
 		}
 
 		public virtual bool IsUsed {
@@ -334,6 +335,24 @@ namespace Mono.CSharp {
 			caching_flags |= Flags.IsUsed;
 		}
 
+		// 
+		// Whehter is it ok to use an unsafe pointer in this type container
+		//
+		public bool UnsafeOK (DeclSpace parent)
+		{
+			//
+			// First check if this MemberCore modifier flags has unsafe set
+			//
+			if ((ModFlags & Modifiers.UNSAFE) != 0)
+				return true;
+
+			if (parent.UnsafeContext)
+				return true;
+
+			Expression.UnsafeError (Location);
+			return false;
+		}
+
 		/// <summary>
 		/// Returns instance of ObsoleteAttribute for this MemberCore
 		/// </summary>
@@ -350,11 +369,11 @@ namespace Mono.CSharp {
 				return null;
 
 			Attribute obsolete_attr = OptAttributes.Search (
-				TypeManager.obsolete_attribute_type);
+				TypeManager.obsolete_attribute_type, EmitContext);
 			if (obsolete_attr == null)
 				return null;
 
-			ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute ();
+			ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (EmitContext);
 			if (obsolete == null)
 				return null;
 
@@ -384,7 +403,7 @@ namespace Mono.CSharp {
 			if (obsolete_attr == null)
 				return;
 
-			if (IsInObsoleteScope)
+			if (GetObsoleteAttribute () != null || Parent.GetObsoleteAttribute () != null)
 				return;
 
 			AttributeTester.Report_ObsoleteMessage (obsolete_attr, TypeManager.CSharpName (type.Type), type.Location);
@@ -393,12 +412,12 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
 		/// </summary>
-		public override bool IsClsComplianceRequired ()
+		public override bool IsClsComplianceRequired (DeclSpace container)
 		{
 			if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
 				return (caching_flags & Flags.ClsCompliant) != 0;
 
-			if (GetClsCompliantAttributeValue () && IsExposedFromAssembly ()) {
+			if (GetClsCompliantAttributeValue (container) && IsExposedFromAssembly (container)) {
 				caching_flags &= ~Flags.ClsCompliance_Undetected;
 				caching_flags |= Flags.ClsCompliant;
 				return true;
@@ -411,12 +430,12 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// Returns true when MemberCore is exposed from assembly.
 		/// </summary>
-		public bool IsExposedFromAssembly ()
+		public bool IsExposedFromAssembly (DeclSpace ds)
 		{
 			if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
 				return false;
 			
-			DeclSpace parentContainer = Parent;
+			DeclSpace parentContainer = ds;
 			while (parentContainer != null && parentContainer.ModFlags != 0) {
 				if ((parentContainer.ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
 					return false;
@@ -426,30 +445,19 @@ namespace Mono.CSharp {
 		}
 
 		/// <summary>
-		/// Goes through class hierarchy and gets value of first found CLSCompliantAttribute.
-		/// If no is attribute exists then assembly CLSCompliantAttribute is returned.
+		/// Resolve CLSCompliantAttribute value or gets cached value.
 		/// </summary>
-		public virtual bool GetClsCompliantAttributeValue ()
+		bool GetClsCompliantAttributeValue (DeclSpace ds)
 		{
-			if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
-				return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
-
-			caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
-
 			if (OptAttributes != null) {
 				Attribute cls_attribute = OptAttributes.Search (
-					TypeManager.cls_compliant_attribute_type);
+					TypeManager.cls_compliant_attribute_type, ds.EmitContext);
 				if (cls_attribute != null) {
 					caching_flags |= Flags.HasClsCompliantAttribute;
-					return cls_attribute.GetClsCompliantAttributeValue ();
+					return cls_attribute.GetClsCompliantAttributeValue (ds.EmitContext);
 				}
 			}
-
-			if (Parent.GetClsCompliantAttributeValue ()) {
-				caching_flags |= Flags.ClsCompliantAttributeTrue;
-				return true;
-			}
-			return false;
+			return ds.GetClsCompliantAttributeValue ();
 		}
 
 		/// <summary>
@@ -475,11 +483,11 @@ namespace Mono.CSharp {
 		/// CLS-Compliant which means that CLS-Compliant tests are not necessary. A descendants override it
 		/// and add their extra verifications.
 		/// </summary>
-		protected virtual bool VerifyClsCompliance ()
+		protected virtual bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!IsClsComplianceRequired ()) {
+			if (!IsClsComplianceRequired (ds)) {
 				if (HasClsCompliantAttribute && RootContext.WarningLevel >= 2) {
-					if (!IsExposedFromAssembly ())
+					if (!IsExposedFromAssembly (ds))
 						Report.Warning (3019, 2, Location, "CLS compliance checking will not be performed on `{0}' because it is not visible from outside this assembly", GetSignatureForError ());
 					if (!CodeGen.Assembly.IsClsCompliant)
 						Report.Warning (3021, 2, Location, "`{0}' does not need a CLSCompliant attribute because the assembly is not marked as CLS-compliant", GetSignatureForError ());
@@ -530,40 +538,6 @@ namespace Mono.CSharp {
 		{
 			DocUtil.GenerateDocComment (this, ds);
 		}
-
-		public override IResolveContext ResolveContext {
-			get {
-				return this;
-			}
-		}
-
-		#region IResolveContext Members
-
-		public virtual DeclSpace DeclContainer {
-			get {
-				return Parent;
-			}
-		}
-
-		public bool IsInObsoleteScope {
-			get {
-				if (GetObsoleteAttribute () != null)
-					return true;
-
-				return Parent == null ? false : Parent.IsInObsoleteScope;
-			}
-		}
-
-		public bool IsInUnsafeScope {
-			get {
-				if ((ModFlags & Modifiers.UNSAFE) != 0)
-					return true;
-
-				return Parent == null ? false : Parent.IsInUnsafeScope;
-			}
-		}
-
-		#endregion
 	}
 
 	/// <summary>
@@ -575,7 +549,6 @@ namespace Mono.CSharp {
 	///   spaces.
 	/// </remarks>
 	public abstract class DeclSpace : MemberCore {
-
 		/// <summary>
 		///   This points to the actual definition that is being
 		///   created with System.Reflection.Emit
@@ -594,6 +567,13 @@ namespace Mono.CSharp {
 		
 		protected Hashtable defined_names;
 
+		// The emit context for toplevel objects.
+		protected EmitContext ec;
+		
+		public override EmitContext EmitContext {
+			get { return ec; }
+		}
+
 		static string[] attribute_targets = new string [] { "type" };
 
 		public DeclSpace (NamespaceEntry ns, DeclSpace parent, MemberName name,
@@ -605,17 +585,17 @@ namespace Mono.CSharp {
 			defined_names = new Hashtable ();
 		}
 
-		public override DeclSpace DeclContainer {
-			get {
-				return this;
-			}
-		}
-
 		/// <summary>
 		/// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
 		/// </summary>
-		protected virtual bool AddToContainer (MemberCore symbol, string name)
+		protected bool AddToContainer (MemberCore symbol, string name)
 		{
+			if (name == Basename && !(this is Interface) && !(this is Enum)) {
+				Report.SymbolRelatedToPreviousError (this);
+				Report.Error (542,  symbol.Location, "`{0}': member names cannot be the same as their enclosing type", symbol.GetSignatureForError ());
+				return false;
+			}
+
 			MemberCore mc = (MemberCore) defined_names [name];
 
 			if (mc == null) {
@@ -627,8 +607,10 @@ namespace Mono.CSharp {
 				return true;
 
 			Report.SymbolRelatedToPreviousError (mc);
-			if ((mc.ModFlags & Modifiers.PARTIAL) != 0 && (symbol is ClassOrStruct || symbol is Interface)) {
-				Error_MissingPartialModifier (symbol);
+			if (symbol is PartialContainer || mc is PartialContainer) {
+				Report.Error (260, symbol.Location,
+					"Missing partial modifier on declaration of type `{0}'. Another partial declaration of this type exists",
+					name);
 				return false;
 			}
 
@@ -705,26 +687,50 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		protected void Error_MissingPartialModifier (MemberCore type)
-		{
-			Report.Error (260, type.Location,
-				"Missing partial modifier on declaration of type `{0}'. Another partial declaration of this type exists",
-				type.GetSignatureForError ());
-		}
-
 		public override string GetSignatureForError ()
 		{	
 			// Parent.GetSignatureForError
 			return Name;
 		}
 
+		//
+		// Whether this is an `unsafe context'
+		//
+		public bool UnsafeContext {
+			get {
+				if ((ModFlags & Modifiers.UNSAFE) != 0)
+					return true;
+				if (Parent != null)
+					return Parent.UnsafeContext;
+				return false;
+			}
+		}
+
+		EmitContext type_resolve_ec;
+		protected EmitContext TypeResolveEmitContext {
+			get {
+				if (type_resolve_ec == null) {
+					// FIXME: I think this should really be one of:
+					//
+					// a. type_resolve_ec = Parent.EmitContext;
+					// b. type_resolve_ec = new EmitContext (Parent, Parent, loc, null, null, ModFlags, false);
+					//
+					// However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
+					//
+					type_resolve_ec = new EmitContext (Parent, this, Location.Null, null, null, ModFlags, false);
+				}
+				return type_resolve_ec;
+			}
+		}
+
 		// <summary>
 		//    Resolves the expression `e' for a type, and will recursively define
 		//    types.  This should only be used for resolving base types.
 		// </summary>
-		public TypeExpr ResolveBaseTypeExpr (Expression e)
+		public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
 		{
-			return e.ResolveAsTypeTerminal (this, false);
+			TypeResolveEmitContext.loc = loc;
+			return e.ResolveAsTypeTerminal (TypeResolveEmitContext, silent);
 		}
 		
 		public bool CheckAccessLevel (Type check_type)
@@ -944,6 +950,9 @@ namespace Mono.CSharp {
 		//
 		public FullNamedExpression LookupType (string name, Location loc, bool ignore_cs0104)
 		{
+			if (this is PartialContainer)
+				throw new InternalErrorException ("Should not get here");
+
 			if (Cache.Contains (name))
 				return (FullNamedExpression) Cache [name];
 
@@ -985,19 +994,51 @@ namespace Mono.CSharp {
 			TypeBuilder.SetCustomAttribute (cb);
 		}
 
-		public virtual bool IsPartial {
-			get {
+		/// <summary>
+		/// Goes through class hierarchy and get value of first CLSCompliantAttribute that found.
+		/// If no is attribute exists then return assembly CLSCompliantAttribute.
+		/// </summary>
+		public bool GetClsCompliantAttributeValue ()
+		{
+			if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
+				return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+
+			caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
+
+			if (OptAttributes != null) {
+				Attribute cls_attribute = OptAttributes.Search (TypeManager.cls_compliant_attribute_type, ec);
+				if (cls_attribute != null) {
+					caching_flags |= Flags.HasClsCompliantAttribute;
+					if (cls_attribute.GetClsCompliantAttributeValue (ec)) {
+						caching_flags |= Flags.ClsCompliantAttributeTrue;
+						return true;
+					}
+					return false;
+				}
+			}
+
+			if (Parent == null) {
+				if (CodeGen.Assembly.IsClsCompliant) {
+					caching_flags |= Flags.ClsCompliantAttributeTrue;
+					return true;
+				}
 				return false;
 			}
+
+			if (Parent.GetClsCompliantAttributeValue ()) {
+				caching_flags |= Flags.ClsCompliantAttributeTrue;
+				return true;
+			}
+			return false;
 		}
 
 		public override string[] ValidAttributeTargets {
 			get { return attribute_targets; }
 		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ()) {
+			if (!base.VerifyClsCompliance (ds)) {
 				return false;
 			}
 
@@ -1016,6 +1057,9 @@ namespace Mono.CSharp {
 				Report.SymbolRelatedToPreviousError (t);
 			}
 			else {
+				if (val is PartialContainer)
+					return true;
+
 				Report.SymbolRelatedToPreviousError ((DeclSpace)val);
 			}
 			Report.Error (3005, Location, "Identifier `{0}' differing only in case is not CLS-compliant", GetSignatureForError ());
@@ -1986,7 +2030,7 @@ namespace Mono.CSharp {
 
 				// TODO: now we are ignoring CLSCompliance(false) on method from other assembly which is buggy.
 				// However it is exactly what csc does.
-				if (md != null && !md.IsClsComplianceRequired ())
+				if (md != null && !md.IsClsComplianceRequired (method.Parent))
 					continue;
  		
  				Report.SymbolRelatedToPreviousError (entry.Member);
diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
index 9c4cacdb403..2fb7adb02c6 100644
--- a/mcs/mcs/delegate.cs
+++ b/mcs/mcs/delegate.cs
@@ -78,10 +78,12 @@ namespace Mono.CSharp {
 			if (TypeBuilder != null)
 				return TypeBuilder;
 
+			ec = new EmitContext (this, this, Location, null, null, ModFlags, false);
+
 			if (TypeManager.multicast_delegate_type == null && !RootContext.StdLib) {
 				Namespace system = RootNamespace.Global.GetNamespace ("System", true);
 				TypeExpr expr = system.Lookup (this, "MulticastDelegate", Location) as TypeExpr;
-				TypeManager.multicast_delegate_type = expr.ResolveType (this);
+				TypeManager.multicast_delegate_type = expr.ResolveType (ec);
 			}
 
 			if (TypeManager.multicast_delegate_type == null)
@@ -113,6 +115,9 @@ namespace Mono.CSharp {
 			MethodAttributes mattr;
 			int i;
 
+			if (ec == null)
+				throw new InternalErrorException ("Define called before DefineType?");
+
 			// FIXME: POSSIBLY make this static, as it is always constant
 			//
 			Type [] const_arg_types = new Type [2];
@@ -150,7 +155,7 @@ namespace Mono.CSharp {
 			// First, call the `out of band' special method for
 			// defining recursively any types we need:
 			
-			if (!Parameters.Resolve (this))
+			if (!Parameters.Resolve (ec))
 				return false;
 
 			//
@@ -166,9 +171,11 @@ namespace Mono.CSharp {
 						      "accessible than delegate `" + Name + "'");
 					return false;
 				}
+				if (partype.IsPointer && !UnsafeOK (Parent))
+					return false;
 			}
 			
-			ReturnType = ReturnType.ResolveAsTypeTerminal (this, false);
+			ReturnType = ReturnType.ResolveAsTypeTerminal (ec, false);
 			if (ReturnType == null)
 				return false;
                         
@@ -186,6 +193,9 @@ namespace Mono.CSharp {
 				return false;
 			}
 
+			if (ret_type.IsPointer && !UnsafeOK (Parent))
+				return false;
+
 			if (RootContext.StdLib && (ret_type == TypeManager.arg_iterator_type || ret_type == TypeManager.typed_reference_type)) {
 				Method.Error1599 (Location, ret_type);
 				return false;
@@ -240,7 +250,7 @@ namespace Mono.CSharp {
 								       async_param_types);
 
 			i = Parameters.Count;
-			Parameters.ApplyAttributes (BeginInvokeBuilder);
+			Parameters.ApplyAttributes (ec, BeginInvokeBuilder);
 			BeginInvokeBuilder.DefineParameter (i + 1, ParameterAttributes.None, "callback");
 			BeginInvokeBuilder.DefineParameter (i + 2, ParameterAttributes.None, "object");
 			
@@ -257,8 +267,8 @@ namespace Mono.CSharp {
 								   Parameter.Modifier.NONE, null, Location);
 
 			Parameters async_parameters = new Parameters (async_params);
-			async_parameters.Resolve (this);
-			async_parameters.ApplyAttributes (BeginInvokeBuilder);
+			async_parameters.Resolve (ec);
+			async_parameters.ApplyAttributes (ec, BeginInvokeBuilder);
 
 			TypeManager.RegisterMethod (BeginInvokeBuilder, async_parameters);
 
@@ -300,7 +310,7 @@ namespace Mono.CSharp {
 			}
 
 			Parameters end_parameters = new Parameters (end_params);
-			end_parameters.Resolve (this);
+			end_parameters.Resolve (ec);
 
 			TypeManager.RegisterMethod (EndInvokeBuilder, end_parameters);
 
@@ -309,10 +319,10 @@ namespace Mono.CSharp {
 
 		public override void Emit ()
 		{
-			Parameters.ApplyAttributes (InvokeBuilder);
+			Parameters.ApplyAttributes (ec, InvokeBuilder);
 
 			if (OptAttributes != null) {
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, this);
 			}
 
 			base.Emit ();
@@ -333,9 +343,9 @@ namespace Mono.CSharp {
 		}
 
 		//TODO: duplicate
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ()) {
+			if (!base.VerifyClsCompliance (ds)) {
 				return false;
 			}
 
@@ -620,7 +630,7 @@ namespace Mono.CSharp {
 				method_desc = Invocation.FullMethodDesc (found_method);
 
 			Expression invoke_method = Expression.MemberLookup (
-				ec.ContainerType, type, "Invoke", MemberTypes.Method,
+				ec, type, "Invoke", MemberTypes.Method,
 				Expression.AllBindingFlags, loc);
 			MethodInfo method = ((MethodGroupExpr) invoke_method).Methods [0] as MethodInfo;
 
@@ -698,16 +708,12 @@ namespace Mono.CSharp {
 			IMethodData md = TypeManager.GetMethod (delegate_method);
 			if (md == null) {
 				if (System.Attribute.GetCustomAttribute (delegate_method, TypeManager.conditional_attribute_type) != null) {
-					Report.SymbolRelatedToPreviousError (delegate_method);
 					Report.Error (1618, loc, "Cannot create delegate with `{0}' because it has a Conditional attribute", TypeManager.CSharpSignature (delegate_method));
-					return null;
 				}
 			} else {
 				md.SetMemberIsUsed ();
-				if (md.OptAttributes != null && md.OptAttributes.Search (TypeManager.conditional_attribute_type) != null) {
-					Report.SymbolRelatedToPreviousError (delegate_method);
+				if (md.OptAttributes != null && md.OptAttributes.Search (TypeManager.conditional_attribute_type, ec) != null) {
 					Report.Error (1618, loc, "Cannot create delegate with `{0}' because it has a Conditional attribute", TypeManager.CSharpSignature (delegate_method));
-					return null;
 				}
 			}
 			
@@ -809,7 +815,7 @@ namespace Mono.CSharp {
 			}
 
 			method_group = Expression.MemberLookup (
-				ec.ContainerType, type, "Invoke", MemberTypes.Method,
+				ec, type, "Invoke", MemberTypes.Method,
 				Expression.AllBindingFlags, loc) as MethodGroupExpr;
 
 			if (method_group == null) {
@@ -854,7 +860,7 @@ namespace Mono.CSharp {
 				EventInfo ei = ((EventExpr) InstanceExpr).EventInfo;
 				
 				Expression ml = MemberLookup (
-					ec.ContainerType, ec.ContainerType, ei.Name,
+					ec, ec.ContainerType, ei.Name,
 					MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);
 
 				if (ml == null) {
diff --git a/mcs/mcs/doc.cs b/mcs/mcs/doc.cs
index 1c12168aef0..3aa4590ead2 100644
--- a/mcs/mcs/doc.cs
+++ b/mcs/mcs/doc.cs
@@ -62,6 +62,15 @@ namespace Mono.CSharp {
 				foreach (TypeContainer tc in t.Types)
 					tc.GenerateDocComment (t);
 
+			if (t.Parts != null) {
+				IDictionary comments = RootContext.Documentation.PartialComments;
+				foreach (ClassPart cp in t.Parts) {
+					if (cp.DocComment == null)
+						continue;
+					comments [cp] = cp;
+				}
+			}
+
 			if (t.Enums != null)
 				foreach (Enum en in t.Enums)
 					en.GenerateDocComment (t);
@@ -178,7 +187,7 @@ namespace Mono.CSharp {
 
 				n.WriteTo (RootContext.Documentation.XmlCommentOutput);
 			}
-			else if (mc.IsExposedFromAssembly ()) {
+			else if (mc.IsExposedFromAssembly (ds)) {
 				Constructor c = mc as Constructor;
 				if (c == null || !c.IsDefault ())
 					Report.Warning (1591, 4, mc.Location,
@@ -987,6 +996,13 @@ namespace Mono.CSharp {
 		public Hashtable StoredDocuments = new Hashtable ();
 
 		//
+		// Stores comments on partial types (should handle uniquely).
+		// Keys are PartialContainers, values are comment strings
+		// (didn't use StringBuilder; usually we have just 2 or more).
+		//
+		public IDictionary PartialComments = new ListDictionary ();
+
+		//
 		// Outputs XML documentation comment from tokenized comments.
 		//
 		public bool OutputDocComment (string asmfilename)
@@ -1034,6 +1050,15 @@ namespace Mono.CSharp {
 				foreach (TypeContainer tc in root.Types)
 					DocUtil.GenerateTypeDocComment (tc, null);
 
+			if (root.Parts != null) {
+				IDictionary comments = PartialComments;
+				foreach (ClassPart cp in root.Parts) {
+					if (cp.DocComment == null)
+						continue;
+					comments [cp] = cp;
+				}
+			}
+
 			if (root.Delegates != null)
 				foreach (Delegate d in root.Delegates) 
 					DocUtil.GenerateDocComment (d, null);
@@ -1042,6 +1067,16 @@ namespace Mono.CSharp {
 				foreach (Enum e in root.Enums)
 					e.GenerateDocComment (null);
 
+			IDictionary table = new ListDictionary ();
+			foreach (ClassPart cp in PartialComments.Keys) {
+				// FIXME: IDictionary does not guarantee that the keys will be
+				//        accessed in the order they were added.
+				table [cp.PartialContainer] += cp.DocComment;
+			}
+			foreach (PartialContainer pc in table.Keys) {
+				pc.DocComment = table [pc] as string;
+				DocUtil.GenerateDocComment (pc, null);
+			}
 		}
 	}
 }
diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index b35e3e6155e..d1b27404e8f 100644
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -1738,7 +1738,7 @@ namespace Mono.CSharp
 
 				if (ep == null) {
 					if (RootContext.MainClass != null) {
-						DeclSpace main_cont = RootContext.Tree.Types.GetDefinition (RootContext.MainClass) as DeclSpace;
+						DeclSpace main_cont = RootContext.Tree.GetDecl (MemberName.FromDotted (RootContext.MainClass));
 						if (main_cont == null) {
 							Report.Error (1555, "Could not find `{0}' specified for Main method", RootContext.MainClass); 
 							return false;
diff --git a/mcs/mcs/ecore.cs b/mcs/mcs/ecore.cs
index 8b3e61aa012..fdd44d0501c 100644
--- a/mcs/mcs/ecore.cs
+++ b/mcs/mcs/ecore.cs
@@ -137,13 +137,6 @@ namespace Mono.CSharp {
 		// Not nice but we have broken hierarchy
 		public virtual void CheckMarshallByRefAccess (Type container) {}
 
-		public virtual bool GetAttributableValue (out object value)
-		{
-			Attribute.Error_AttributeArgumentNotValid (loc);
-			value = null;
-			return false;
-		}
-
 		public virtual string GetSignatureForError ()
 		{
 			return TypeManager.CSharpName (type);
@@ -225,7 +218,7 @@ namespace Mono.CSharp {
 		// This is used if the expression should be resolved as a type or namespace name.
 		// the default implementation fails.   
 		//
-		public virtual FullNamedExpression ResolveAsTypeStep (IResolveContext ec,  bool silent)
+		public virtual FullNamedExpression ResolveAsTypeStep (EmitContext ec,  bool silent)
 		{
 			return null;
 		}
@@ -235,7 +228,7 @@ namespace Mono.CSharp {
 		// value will be returned if the expression is not a type
 		// reference
 		//
-		public TypeExpr ResolveAsTypeTerminal (IResolveContext ec, bool silent)
+		public TypeExpr ResolveAsTypeTerminal (EmitContext ec, bool silent)
 		{
 			int errors = Report.Errors;
 
@@ -255,7 +248,7 @@ namespace Mono.CSharp {
 
 			TypeExpr te = fne as TypeExpr;
 
-			if (!te.CheckAccessLevel (ec.DeclContainer)) {
+			if (!te.CheckAccessLevel (ec.DeclSpace)) {
 				ErrorIsInaccesible (loc, TypeManager.CSharpName (te.Type));
 				return null;
 			}
@@ -322,29 +315,28 @@ namespace Mono.CSharp {
 				TypeManager.CSharpName (type), name);
 		}
 
-		ResolveFlags ExprClassToResolveFlags
+		ResolveFlags ExprClassToResolveFlags ()
 		{
-			get {
-				switch (eclass) {
-					case ExprClass.Type:
-					case ExprClass.Namespace:
-						return ResolveFlags.Type;
+			switch (eclass) {
+			case ExprClass.Type:
+			case ExprClass.Namespace:
+				return ResolveFlags.Type;
 
-					case ExprClass.MethodGroup:
-						return ResolveFlags.MethodGroup;
+			case ExprClass.MethodGroup:
+				return ResolveFlags.MethodGroup;
 
-					case ExprClass.Value:
-					case ExprClass.Variable:
-					case ExprClass.PropertyAccess:
-					case ExprClass.EventAccess:
-					case ExprClass.IndexerAccess:
-						return ResolveFlags.VariableOrValue;
+			case ExprClass.Value:
+			case ExprClass.Variable:
+			case ExprClass.PropertyAccess:
+			case ExprClass.EventAccess:
+			case ExprClass.IndexerAccess:
+				return ResolveFlags.VariableOrValue;
 
-					default:
-						throw new Exception ("Expression " + GetType () +
-							" ExprClass is Invalid after resolve");
-				}
+			default:
+				throw new Exception ("Expression " + GetType () +
+						     " ExprClass is Invalid after resolve");
 			}
+
 		}
 	       
 		/// <summary>
@@ -368,10 +360,10 @@ namespace Mono.CSharp {
 				ec.OmitStructFlowAnalysis = true;
 
 			Expression e;
-			if (this is SimpleName) {
-				bool intermediate = (flags & ResolveFlags.Intermediate) == ResolveFlags.Intermediate;
+			bool intermediate = (flags & ResolveFlags.Intermediate) == ResolveFlags.Intermediate;
+			if (this is SimpleName)
 				e = ((SimpleName) this).DoResolve (ec, intermediate);
-			}
+
 			else 
 				e = DoResolve (ec);
 
@@ -381,7 +373,7 @@ namespace Mono.CSharp {
 			if (e == null)
 				return null;
 
-			if ((flags & e.ExprClassToResolveFlags) == 0) {
+			if ((flags & e.ExprClassToResolveFlags ()) == 0) {
 				e.Error_UnexpectedKind (flags, loc);
 				return null;
 			}
@@ -561,14 +553,14 @@ namespace Mono.CSharp {
 		///   Returns a fully formed expression after a MemberLookup
 		/// </summary>
 		/// 
-		public static Expression ExprClassFromMemberInfo (Type containerType, MemberInfo mi, Location loc)
+		public static Expression ExprClassFromMemberInfo (EmitContext ec, MemberInfo mi, Location loc)
 		{
 			if (mi is EventInfo)
 				return new EventExpr ((EventInfo) mi, loc);
 			else if (mi is FieldInfo)
 				return new FieldExpr ((FieldInfo) mi, loc);
 			else if (mi is PropertyInfo)
-				return new PropertyExpr (containerType, (PropertyInfo) mi, loc);
+				return new PropertyExpr (ec, (PropertyInfo) mi, loc);
 		        else if (mi is Type){
 				return new TypeExpression ((System.Type) mi, loc);
 			}
@@ -606,10 +598,10 @@ namespace Mono.CSharp {
 		// FIXME: Potential optimization, have a static ArrayList
 		//
 
-		public static Expression MemberLookup (Type container_type, Type queried_type, string name,
+		public static Expression MemberLookup (EmitContext ec, Type queried_type, string name,
 						       MemberTypes mt, BindingFlags bf, Location loc)
 		{
-			return MemberLookup (container_type, null, queried_type, name, mt, bf, loc);
+			return MemberLookup (ec, ec.ContainerType, null, queried_type, name, mt, bf, loc);
 		}
 
 		//
@@ -617,7 +609,7 @@ namespace Mono.CSharp {
 		// `qualifier_type' or null to lookup members in the current class.
 		//
 
-		public static Expression MemberLookup (Type container_type,
+		public static Expression MemberLookup (EmitContext ec, Type container_type,
 						       Type qualifier_type, Type queried_type,
 						       string name, MemberTypes mt,
 						       BindingFlags bf, Location loc)
@@ -638,7 +630,7 @@ namespace Mono.CSharp {
 			if (count > 1)
 				return null;
 
-			return ExprClassFromMemberInfo (container_type, mi [0], loc);
+			return ExprClassFromMemberInfo (ec, mi [0], loc);
 		}
 
 		public const MemberTypes AllMemberTypes =
@@ -657,21 +649,21 @@ namespace Mono.CSharp {
 		public static Expression MemberLookup (EmitContext ec, Type queried_type,
 						       string name, Location loc)
 		{
-			return MemberLookup (ec.ContainerType, null, queried_type, name,
+			return MemberLookup (ec, ec.ContainerType, null, queried_type, name,
 					     AllMemberTypes, AllBindingFlags, loc);
 		}
 
-		public static Expression MemberLookup (Type container_type, Type qualifier_type,
+		public static Expression MemberLookup (EmitContext ec, Type qualifier_type,
 						       Type queried_type, string name, Location loc)
 		{
-			return MemberLookup (container_type, qualifier_type, queried_type,
+			return MemberLookup (ec, ec.ContainerType, qualifier_type, queried_type,
 					     name, AllMemberTypes, AllBindingFlags, loc);
 		}
 
 		public static Expression MethodLookup (EmitContext ec, Type queried_type,
 						       string name, Location loc)
 		{
-			return MemberLookup (ec.ContainerType, null, queried_type, name,
+			return MemberLookup (ec, ec.ContainerType, null, queried_type, name,
 					     MemberTypes.Method, AllBindingFlags, loc);
 		}
 
@@ -697,16 +689,16 @@ namespace Mono.CSharp {
 
 			int errors = Report.Errors;
 
-			e = MemberLookup (ec.ContainerType, qualifier_type, queried_type, name, mt, bf, loc);
+			e = MemberLookup (ec, ec.ContainerType, qualifier_type, queried_type, name, mt, bf, loc);
 
 			if (e == null && errors == Report.Errors)
 				// No errors were reported by MemberLookup, but there was an error.
-				MemberLookupFailed (ec.ContainerType, qualifier_type, queried_type, name, null, true, loc);
+				MemberLookupFailed (ec, qualifier_type, queried_type, name, null, true, loc);
 
 			return e;
 		}
 
-		public static void MemberLookupFailed (Type container_type, Type qualifier_type,
+		public static void MemberLookupFailed (EmitContext ec, Type qualifier_type,
 						       Type queried_type, string name,
 						       string class_name, bool complain_if_none_found, 
 						       Location loc)
@@ -729,16 +721,16 @@ namespace Mono.CSharp {
 					if (qualifier_type == null) {
 						Report.Error (38, loc, "Cannot access a nonstatic member of outer type `{0}' via nested type `{1}'",
 							      TypeManager.CSharpName (m.DeclaringType),
-							      TypeManager.CSharpName (container_type));
+							      TypeManager.CSharpName (ec.ContainerType));
 						
-					} else if (qualifier_type != container_type &&
-						   TypeManager.IsNestedFamilyAccessible (container_type, declaring_type)) {
+					} else if (qualifier_type != ec.ContainerType &&
+						   TypeManager.IsNestedFamilyAccessible (ec.ContainerType, declaring_type)) {
 						// Although a derived class can access protected members of
 						// its base class it cannot do so through an instance of the
 						// base class (CS1540).  If the qualifier_type is a base of the
 						// ec.ContainerType and the lookup succeeds with the latter one,
 						// then we are in this situation.
-						Error_CannotAccessProtected (loc, m, qualifier_type, container_type);
+						Error_CannotAccessProtected (loc, m, qualifier_type, ec.ContainerType);
 					} else {
 						ErrorIsInaccesible (loc, TypeManager.GetFullNameSignature (m));
 					}
@@ -873,16 +865,16 @@ namespace Mono.CSharp {
 		/// <summary>
 		///   Reports that we were expecting `expr' to be of class `expected'
 		/// </summary>
-		public void Error_UnexpectedKind (DeclSpace ds, string expected, Location loc)
+		public void Error_UnexpectedKind (EmitContext ec, string expected, Location loc)
 		{
-			Error_UnexpectedKind (ds, expected, ExprClassName, loc);
+			Error_UnexpectedKind (ec, expected, ExprClassName, loc);
 		}
 
-		public void Error_UnexpectedKind (DeclSpace ds, string expected, string was, Location loc)
+		public void Error_UnexpectedKind (EmitContext ec, string expected, string was, Location loc)
 		{
 			string name = GetSignatureForError ();
-			if (ds != null)
-				name = ds.GetSignatureForError () + '.' + name;
+			if (ec != null)
+				name = ec.DeclSpace.GetSignatureForError () + '.' + name;
 
 			Report.Error (118, loc, "`{0}' is a `{1}' but a `{2}' was expected",
 			      name, was, expected);
@@ -1131,7 +1123,7 @@ namespace Mono.CSharp {
 	///
 	/// </summary>
 	public class EmptyCast : Expression {
-		protected readonly Expression child;
+		protected Expression child;
 
 		public Expression Child {
 			get {
@@ -1159,12 +1151,6 @@ namespace Mono.CSharp {
 		{
 			child.Emit (ec);
 		}
-
-		public override bool GetAttributableValue (out object value)
-		{
-			return child.GetAttributableValue (out value);
-		}
-
 	}
 	/// <summary>
 	/// 	This is a numeric cast to a Decimal
@@ -1836,7 +1822,7 @@ namespace Mono.CSharp {
 		{
 			return resolved_to != null && resolved_to.Type != null && 
 				resolved_to.Type.Name == Name &&
-				(ec.DeclContainer.LookupType (Name, loc, /* ignore_cs0104 = */ true) != null);
+				(ec.DeclSpace.LookupType (Name, loc, /* ignore_cs0104 = */ true) != null);
 		}
 
 		public override Expression DoResolve (EmitContext ec)
@@ -1855,19 +1841,19 @@ namespace Mono.CSharp {
 			return SimpleNameResolve (ec, null, intermediate);
 		}
 
-		public override FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
+		public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
 		{
 			int errors = Report.Errors;
-			FullNamedExpression fne = ec.DeclContainer.LookupType (Name, loc, /*ignore_cs0104=*/ false);
+			FullNamedExpression fne = ec.DeclSpace.LookupType (Name, loc, /*ignore_cs0104=*/ false);
 			if (fne != null)
 				return fne;
 
 			if (silent || errors != Report.Errors)
 				return null;
 
-			MemberCore mc = ec.DeclContainer.GetDefinition (Name);
+			MemberCore mc = ec.DeclSpace.GetDefinition (Name);
 			if (mc != null) {
-				Error_UnexpectedKind (ec.DeclContainer, "type", GetMemberType (mc), loc);
+				Error_UnexpectedKind (ec, "type", GetMemberType (mc), loc);
 			} else {
 				NamespaceEntry.Error_NamespaceNotFound (loc, Name);
 			}
@@ -1961,7 +1947,7 @@ namespace Mono.CSharp {
 			// Stage 2: Lookup members 
 			//
 
-			DeclSpace lookup_ds = ec.DeclContainer;
+			DeclSpace lookup_ds = ec.DeclSpace;
 			Type almost_matched_type = null;
 			ArrayList almost_matched = null;
 			do {
@@ -1996,7 +1982,7 @@ namespace Mono.CSharp {
 					almostMatchedMembers = almost_matched;
 				if (almost_matched_type == null)
 					almost_matched_type = ec.ContainerType;
-				MemberLookupFailed (ec.ContainerType, null, almost_matched_type, ((SimpleName) this).Name, ec.DeclContainer.Name, true, loc);
+				MemberLookupFailed (ec, null, almost_matched_type, ((SimpleName) this).Name, ec.DeclSpace.Name, true, loc);
 				return null;
 			}
 
@@ -2068,7 +2054,7 @@ namespace Mono.CSharp {
 
 			Error (103, "The name `" + Name +
 			       "' does not exist in the class `" +
-			       ec.DeclContainer.Name + "'");
+			       ec.DeclSpace.Name + "'");
 		}
 
 		public override string ToString ()
@@ -2087,7 +2073,7 @@ namespace Mono.CSharp {
 	///   section 10.8.1 (Fully Qualified Names).
 	/// </summary>
 	public abstract class FullNamedExpression : Expression {
-		public override FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
+		public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
 		{
 			return this;
 		}
@@ -2101,7 +2087,7 @@ namespace Mono.CSharp {
 	///   Expression that evaluates to a type
 	/// </summary>
 	public abstract class TypeExpr : FullNamedExpression {
-		override public FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
+		override public FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
 		{
 			TypeExpr t = DoResolveAsTypeStep (ec);
 			if (t == null)
@@ -2159,17 +2145,19 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		public abstract TypeExpr DoResolveAsTypeStep (IResolveContext ec);
+		public abstract TypeExpr DoResolveAsTypeStep (EmitContext ec);
 
-		public Type ResolveType (IResolveContext ec)
+		public Type ResolveType (EmitContext ec)
 		{
 			TypeExpr t = ResolveAsTypeTerminal (ec, false);
 			if (t == null)
 				return null;
 
-			ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (t.Type);
-			if (obsolete_attr != null && !ec.IsInObsoleteScope) {
-				AttributeTester.Report_ObsoleteMessage (obsolete_attr, Name, Location);
+			if (ec.TestObsoleteMethodUsage) {
+				ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (t.Type);
+				if (obsolete_attr != null) {
+					AttributeTester.Report_ObsoleteMessage (obsolete_attr, Name, Location);
+				}
 			}
 
 			return t.Type;
@@ -2210,7 +2198,7 @@ namespace Mono.CSharp {
 			loc = l;
 		}
 
-		public override TypeExpr DoResolveAsTypeStep (IResolveContext ec)
+		public override TypeExpr DoResolveAsTypeStep (EmitContext ec)
 		{
 			return this;
 		}
@@ -2238,7 +2226,7 @@ namespace Mono.CSharp {
 		}
 
 		static readonly char [] dot_array = { '.' };
-		public override TypeExpr DoResolveAsTypeStep (IResolveContext ec)
+		public override TypeExpr DoResolveAsTypeStep (EmitContext ec)
 		{
 			if (type != null)
 				return this;
@@ -2252,7 +2240,7 @@ namespace Mono.CSharp {
 				lookup_name = name.Substring (0, pos);
 			}
 
-			FullNamedExpression resolved = RootNamespace.Global.Lookup (ec.DeclContainer, lookup_name, Location.Null);
+			FullNamedExpression resolved = RootNamespace.Global.Lookup (ec.DeclSpace, lookup_name, Location.Null);
 
 			if (resolved != null && rest != null) {
 				// Now handle the rest of the the name.
@@ -2264,13 +2252,13 @@ namespace Mono.CSharp {
 					Namespace ns = resolved as Namespace;
 					element = elements [i++];
 					lookup_name += "." + element;
-					resolved = ns.Lookup (ec.DeclContainer, element, Location.Null);
+					resolved = ns.Lookup (ec.DeclSpace, element, Location.Null);
 				}
 
 				if (resolved != null && resolved is TypeExpr) {
 					Type t = ((TypeExpr) resolved).Type;
 					while (t != null) {
-						if (!ec.DeclContainer.CheckAccessLevel (t)) {
+						if (!ec.DeclSpace.CheckAccessLevel (t)) {
 							resolved = null;
 							lookup_name = t.FullName;
 							break;
@@ -2290,7 +2278,7 @@ namespace Mono.CSharp {
 			}
 
 			if (!(resolved is TypeExpr)) {
-				resolved.Error_UnexpectedKind (ec.DeclContainer, "type", loc);
+				resolved.Error_UnexpectedKind (ec, "type", loc);
 				return null;
 			}
 
@@ -2326,7 +2314,7 @@ namespace Mono.CSharp {
 			get { return texpr.FullName; }
 		}
 
-		public override TypeExpr DoResolveAsTypeStep (IResolveContext ec)
+		public override TypeExpr DoResolveAsTypeStep (EmitContext ec)
 		{
 			Type type = texpr.ResolveType (ec);
 			if (type == null)
@@ -2726,7 +2714,7 @@ namespace Mono.CSharp {
 				}
 
 				if (ic.ResolveValue ()) {
-					if (!ec.IsInObsoleteScope)
+					if (ec.TestObsoleteMethodUsage)
 						ic.CheckObsoleteness (loc);
 				}
 
@@ -2799,7 +2787,7 @@ namespace Mono.CSharp {
 				ObsoleteAttribute oa;
 				FieldBase f = TypeManager.GetField (FieldInfo);
 				if (f != null) {
-					if (!ec.IsInObsoleteScope)
+					if (ec.TestObsoleteMethodUsage)
 						f.CheckObsoleteness (loc);
                                 
 					// To be sure that type is external because we do not register generated fields
@@ -3129,7 +3117,7 @@ namespace Mono.CSharp {
 
 		internal static PtrHashtable AccessorTable = new PtrHashtable (); 
 
-		public PropertyExpr (Type containerType, PropertyInfo pi, Location l)
+		public PropertyExpr (EmitContext ec, PropertyInfo pi, Location l)
 		{
 			PropertyInfo = pi;
 			eclass = ExprClass.PropertyAccess;
@@ -3138,7 +3126,7 @@ namespace Mono.CSharp {
 
 			type = TypeManager.TypeToCoreType (pi.PropertyType);
 
-			ResolveAccessors (containerType);
+			ResolveAccessors (ec);
 		}
 
 		public override string Name {
@@ -3208,10 +3196,9 @@ namespace Mono.CSharp {
 		// We also perform the permission checking here, as the PropertyInfo does not
 		// hold the information for the accessibility of its setter/getter
 		//
-		// TODO: can use TypeManager.GetProperty to boost performance
-		void ResolveAccessors (Type containerType)
+		void ResolveAccessors (EmitContext ec)
 		{
-			FindAccessors (containerType);
+			FindAccessors (ec.ContainerType);
 
 			if (getter != null) {
 				IMethodData md = TypeManager.GetMethod (getter);
@@ -3548,7 +3535,7 @@ namespace Mono.CSharp {
 				MemberInfo mi = TypeManager.GetPrivateFieldOfEvent (EventInfo);
 
 				if (mi != null) {
-					MemberExpr ml = (MemberExpr) ExprClassFromMemberInfo (ec.ContainerType, mi, loc);
+					MemberExpr ml = (MemberExpr) ExprClassFromMemberInfo (ec, mi, loc);
 
 					if (ml == null) {
 						Report.Error (-200, loc, "Internal error!!");
diff --git a/mcs/mcs/enum.cs b/mcs/mcs/enum.cs
index c5bc35f8b16..d26a3fb763d 100644
--- a/mcs/mcs/enum.cs
+++ b/mcs/mcs/enum.cs
@@ -31,9 +31,6 @@ namespace Mono.CSharp {
 		Constant value;
 		bool in_transit;
 
-		// TODO: remove or simplify
-		EmitContext ec;
-
 		public EnumMember (Enum parent_enum, EnumMember prev_member, Expression expr,
 				MemberName name, Attributes attrs):
 			base (parent_enum, name, attrs)
@@ -42,9 +39,6 @@ namespace Mono.CSharp {
 			this.ModFlags = parent_enum.ModFlags;
 			this.ValueExpr = expr;
 			this.prev_member = prev_member;
-
-			ec = new EmitContext (this, parent_enum, parent_enum, Location, null, null, ModFlags, false);
-			ec.InEnumContext = true;
 		}
 
 		public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
@@ -84,7 +78,6 @@ namespace Mono.CSharp {
 			const FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal;
 			TypeBuilder tb = parent_enum.TypeBuilder;
 			builder = tb.DefineField (Name, tb, attr);
-			ec.ContainerType = tb;
 
 			TypeManager.RegisterConstant (builder, this);
 			return true;
@@ -117,7 +110,7 @@ namespace Mono.CSharp {
 
 			if (ValueExpr != null) {
 				in_transit = true;
-				Constant c = ValueExpr.ResolveAsConstant (ec, this);
+				Constant c = ValueExpr.ResolveAsConstant (parent_enum.EmitContext, this);
 				in_transit = false;
 
 				if (c == null)
@@ -163,16 +156,17 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		public override void Emit ()
+		public bool Emit (EmitContext ec)
 		{
 			if (OptAttributes != null)
-				OptAttributes.Emit (); 
+				OptAttributes.Emit (ec, this); 
 
 			if (!ResolveValue ())
-				return;
+				return false;
 
 			builder.SetConstant (value.GetValue ());
-			base.Emit ();
+			Emit ();
+			return true;
 		}
 
 		public override string GetSignatureForError()
@@ -186,6 +180,13 @@ namespace Mono.CSharp {
 			}
 		}
 
+		protected override bool VerifyClsCompliance(DeclSpace ds)
+		{
+			// Because parent is TypeContainer and we have only DeclSpace parent.
+			// Parameter replacing is required
+			return base.VerifyClsCompliance (parent_enum);
+		}
+
 		public override string DocCommentHeader {
 			get { return "F:"; }
 		}
@@ -242,13 +243,16 @@ namespace Mono.CSharp {
 			if (TypeBuilder != null)
 				return TypeBuilder;
 
+			ec = new EmitContext (this, this, Location, null, null, ModFlags, false);
+			ec.InEnumContext = true;
+
 			if (!(BaseType is TypeLookupExpression)) {
 				Report.Error (1008, Location,
 					"Type byte, sbyte, short, ushort, int, uint, long or ulong expected");
 				return null;
 			}
 
-			TypeExpr ute = ResolveBaseTypeExpr (BaseType);
+			TypeExpr ute = ResolveBaseTypeExpr (BaseType, false, Location);
 			UnderlyingType = ute.Type;
 
 			if (UnderlyingType != TypeManager.int32_type &&
@@ -278,6 +282,8 @@ namespace Mono.CSharp {
 					Basename, TypeAttr, TypeManager.enum_type);
 			}
 
+			ec.ContainerType = TypeBuilder;
+
 			//
 			// Call MapToInternalType for corlib
 			//
@@ -297,17 +303,21 @@ namespace Mono.CSharp {
 		
 		public override bool Define ()
 		{
+			if (GetObsoleteAttribute () != null || Parent.GetObsoleteAttribute () != null)
+				ec.TestObsoleteMethodUsage = false;
+
 			return true;
 		}
 
 		public override void Emit ()
 		{
 			if (OptAttributes != null) {
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, this);
 			}
 
 			foreach (EnumMember em in defined_names.Values) {
-				em.Emit ();
+				if (!em.Emit (ec))
+					return;
 			}
 
 			base.Emit ();
@@ -334,7 +344,7 @@ namespace Mono.CSharp {
   		{
 			HybridDictionary dict = new HybridDictionary (defined_names.Count, true);
 			foreach (EnumMember em in defined_names.Values) {
-				if (!em.IsClsComplianceRequired ())
+				if (!em.IsClsComplianceRequired (this))
 					continue;
 
 				try {
@@ -348,9 +358,9 @@ namespace Mono.CSharp {
 			}
   		}
 
-		protected override bool VerifyClsCompliance ()
+		protected override bool VerifyClsCompliance (DeclSpace ds)
 		{
-			if (!base.VerifyClsCompliance ())
+			if (!base.VerifyClsCompliance (ds))
 				return false;
 
 			VerifyClsName ();
diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 9005f6641e6..7a1cf3b5b6a 100644
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -359,7 +359,7 @@ namespace Mono.CSharp {
 			
 			op_name = oper_names [(int) Oper];
 
-			mg = MemberLookup (ec.ContainerType, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+			mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
 			
 			if (mg != null) {
 				Expression e = StaticCallExpr.MakeSimpleCall (
@@ -850,7 +850,7 @@ namespace Mono.CSharp {
 			else 
 				op_name = "op_Decrement";
 
-			mg = MemberLookup (ec.ContainerType, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+			mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
 
 			if (mg != null) {
 				method = StaticCallExpr.MakeSimpleCall (
@@ -880,7 +880,7 @@ namespace Mono.CSharp {
 				if (expr == null)
 					return null;
 			} else {
-				expr.Error_UnexpectedKind (ec.DeclContainer, "variable, indexer or property access", loc);
+				expr.Error_UnexpectedKind (ec, "variable, indexer or property access", loc);
 				return null;
 			}
 
@@ -1252,12 +1252,7 @@ namespace Mono.CSharp {
 
 			Error_CannotConvertType (etype, probe_type, loc);
 			return null;
-		}
-	
-		public override bool GetAttributableValue (out object value)
-		{
-			return expr.GetAttributableValue (out value);
-		}
+		}				
 	}
 	
 	/// <summary>
@@ -1332,14 +1327,9 @@ namespace Mono.CSharp {
 
 			Constant c = expr as Constant;
 			if (c != null) {
-				try {
-					c = c.TryReduce (ec, type, loc);
-					if (c != null)
-						return c;
-				}
-				catch (OverflowException) {
-					return null;
-				}
+				c = c.TryReduce (ec, type, loc);
+				if (c != null)
+					return c;
 			}
 
 			if (type.IsPointer && !ec.InUnsafe) {
@@ -1842,10 +1832,10 @@ namespace Mono.CSharp {
 				string op = oper_names [(int) oper];
 				
 				MethodGroupExpr union;
-				left_operators = MemberLookup (ec.ContainerType, l, op, MemberTypes.Method, AllBindingFlags, loc);
+				left_operators = MemberLookup (ec, l, op, MemberTypes.Method, AllBindingFlags, loc);
 				if (r != l){
 					right_operators = MemberLookup (
-						ec.ContainerType, r, op, MemberTypes.Method, AllBindingFlags, loc);
+						ec, r, op, MemberTypes.Method, AllBindingFlags, loc);
 					union = Invocation.MakeUnionSet (left_operators, right_operators, loc);
 				} else
 					union = (MethodGroupExpr) left_operators;
@@ -5175,14 +5165,14 @@ namespace Mono.CSharp {
 		/// <summary>
 		/// This checks the ConditionalAttribute on the method 
 		/// </summary>
-		static bool IsMethodExcluded (MethodBase method)
+		static bool IsMethodExcluded (MethodBase method, EmitContext ec)
 		{
 			if (method.IsConstructor)
 				return false;
 
 			IMethodData md = TypeManager.GetMethod (method);
 			if (md != null)
-				return md.IsExcluded ();
+				return md.IsExcluded (ec);
 
 			// For some methods (generated by delegate class) GetMethod returns null
 			// because they are not included in builder_to_method table
@@ -5251,7 +5241,7 @@ namespace Mono.CSharp {
 					method = TypeManager.void_array_copyto_array_int;
 			}
 
-			if (!ec.IsInObsoleteScope) {
+			if (ec.TestObsoleteMethodUsage) {
 				//
 				// This checks ObsoleteAttribute on the method and on the declaring type
 				//
@@ -5266,7 +5256,7 @@ namespace Mono.CSharp {
 				}
 			}
 
-			if (IsMethodExcluded (method))
+			if (IsMethodExcluded (method, ec))
 				return; 
 			
 			if (!is_static){
@@ -5693,7 +5683,7 @@ namespace Mono.CSharp {
 			MethodGroupExpr mg = ml as MethodGroupExpr;
 
 			if (mg == null) {
-				ml.Error_UnexpectedKind (ec.DeclContainer, "method group", loc);
+				ml.Error_UnexpectedKind (ec, "method group", loc);
 				return null;
 			}
 
@@ -5707,7 +5697,7 @@ namespace Mono.CSharp {
 			method = Invocation.OverloadResolve (ec, mg, Arguments, false, loc);
 			if (method == null) {
 				if (almostMatchedMembers.Count != 0)
-					MemberLookupFailed (ec.ContainerType, type, type, ".ctor", null, true, loc);
+					MemberLookupFailed (ec, type, type, ".ctor", null, true, loc);
 				return null;
 			}
 
@@ -6024,7 +6014,10 @@ namespace Mono.CSharp {
 		public bool ValidateInitializers (EmitContext ec, Type array_type)
 		{
 			if (initializers == null) {
-				return !expect_initializers;
+				if (expect_initializers)
+					return false;
+				else
+					return true;
 			}
 			
 			if (underlying_type == null)
@@ -6037,12 +6030,17 @@ namespace Mono.CSharp {
 			array_data = new ArrayList ();
 			bounds = new Hashtable ();
 			
+			bool ret;
+
 			if (arguments != null) {
-				return CheckIndices (ec, initializers, 0, true);
+				ret = CheckIndices (ec, initializers, 0, true);
+				return ret;
 			} else {
 				arguments = new ArrayList ();
 
-				if (!CheckIndices (ec, initializers, 0, false))
+				ret = CheckIndices (ec, initializers, 0, false);
+				
+				if (!ret)
 					return false;
 				
 				UpdateIndices (ec);
@@ -6052,7 +6050,7 @@ namespace Mono.CSharp {
 					return false;
 				}
 
-				return true;
+				return ret;
 			}
 		}
 
@@ -6138,11 +6136,11 @@ namespace Mono.CSharp {
 			if (is_builtin_type) {
 				Expression ml;
 				
-				ml = MemberLookup (ec.ContainerType, type, ".ctor", MemberTypes.Constructor,
+				ml = MemberLookup (ec, type, ".ctor", MemberTypes.Constructor,
 						   AllBindingFlags, loc);
 				
 				if (!(ml is MethodGroupExpr)) {
-					ml.Error_UnexpectedKind (ec.DeclContainer, "method group", loc);
+					ml.Error_UnexpectedKind (ec, "method group", loc);
 					return null;
 				}
 				
@@ -6510,33 +6508,32 @@ namespace Mono.CSharp {
 			}
 		}
 
-		public override bool GetAttributableValue (out object value)
+		public object EncodeAsAttribute ()
 		{
 			if (!is_one_dimensional){
-//				Report.Error (-211, Location, "attribute can not encode multi-dimensional arrays");
-				return base.GetAttributableValue (out value);
+				Report.Error (-211, Location, "attribute can not encode multi-dimensional arrays");
+				return null;
 			}
 
-			if (array_data == null) {
-				Constant c = (Constant)((Argument)arguments [0]).Expr;
-				if (c.IsDefaultValue) {
-					value = new object [0];
-					return true;
-				}
-//				Report.Error (-212, Location, "array should be initialized when passing it to an attribute");
-				return base.GetAttributableValue (out value);
+			if (array_data == null){
+				Report.Error (-212, Location, "array should be initialized when passing it to an attribute");
+				return null;
 			}
 			
 			object [] ret = new object [array_data.Count];
-			for (int i = 0; i < ret.Length; ++i)
-			{
-				if (!((Expression)array_data [i]).GetAttributableValue (out ret [i])) {
-					value = null;
-					return false;
+			int i = 0;
+			foreach (Expression e in array_data){
+				object v;
+				
+				if (e is NullLiteral)
+					v = null;
+				else {
+					if (!Attribute.GetAttributeArgumentExpression (e, Location, array_element_type, out v))
+						return null;
 				}
+				ret [i++] = v;
 			}
-			value = ret;
-			return true;
+			return ret;
 		}
 	}
 	
@@ -6797,7 +6794,7 @@ namespace Mono.CSharp {
 	///   Implements the typeof operator
 	/// </summary>
 	public class TypeOf : Expression {
-		readonly Expression QueriedType;
+		public Expression QueriedType;
 		protected Type typearg;
 		
 		public TypeOf (Expression queried_type, Location l)
@@ -6837,10 +6834,8 @@ namespace Mono.CSharp {
 			ec.ig.Emit (OpCodes.Call, TypeManager.system_type_get_type_from_handle);
 		}
 
-		public override bool GetAttributableValue (out object value)
-		{
-			value = typearg;
-			return true;
+		public Type TypeArg { 
+			get { return typearg; }
 		}
 	}
 
@@ -6929,13 +6924,13 @@ namespace Mono.CSharp {
 			loc = l;
 		}
 
-		public override FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
+		public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
 		{
 			if (alias == "global")
 				return new MemberAccess (RootNamespace.Global, identifier, loc).ResolveAsTypeStep (ec, silent);
 
 			int errors = Report.Errors;
-			FullNamedExpression fne = ec.DeclContainer.NamespaceEntry.LookupAlias (alias);
+			FullNamedExpression fne = ec.DeclSpace.NamespaceEntry.LookupAlias (alias);
 			if (fne == null) {
 				if (errors == Report.Errors)
 					Report.Error (432, loc, "Alias `{0}' not found", alias);
@@ -6956,7 +6951,7 @@ namespace Mono.CSharp {
 				fne = RootNamespace.Global;
 			} else {
 				int errors = Report.Errors;
-				fne = ec.DeclContainer.NamespaceEntry.LookupAlias (alias);
+				fne = ec.DeclSpace.NamespaceEntry.LookupAlias (alias);
 				if (fne == null) {
 					if (errors == Report.Errors)
 						Report.Error (432, loc, "Alias `{0}' not found", alias);
@@ -7041,7 +7036,7 @@ namespace Mono.CSharp {
 
 			if (new_expr is Namespace) {
 				Namespace ns = (Namespace) new_expr;
-				FullNamedExpression retval = ns.Lookup (ec.DeclContainer, Identifier, loc);
+				FullNamedExpression retval = ns.Lookup (ec.DeclSpace, Identifier, loc);
 				if (retval == null)
 					Report.Error (234, loc, "The type or namespace name `{0}' does not exist in the namespace `{1}'. Are you missing an assembly reference?",
 						Identifier, ns.FullName);
@@ -7110,21 +7105,21 @@ namespace Mono.CSharp {
 			return DoResolve (ec, right_side);
 		}
 
-		public override FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
+		public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
 		{
 			return ResolveNamespaceOrType (ec, silent);
 		}
 
-		public FullNamedExpression ResolveNamespaceOrType (IResolveContext rc, bool silent)
+		public FullNamedExpression ResolveNamespaceOrType (EmitContext ec, bool silent)
 		{
-			FullNamedExpression new_expr = expr.ResolveAsTypeStep (rc, silent);
+			FullNamedExpression new_expr = expr.ResolveAsTypeStep (ec, silent);
 
 			if (new_expr == null)
 				return null;
 
 			if (new_expr is Namespace) {
 				Namespace ns = (Namespace) new_expr;
-				FullNamedExpression retval = ns.Lookup (rc.DeclContainer, Identifier, loc);
+				FullNamedExpression retval = ns.Lookup (ec.DeclSpace, Identifier, loc);
 				if (!silent && retval == null)
 					Report.Error (234, loc, "The type or namespace name `{0}' does not exist in the namespace `{1}'. Are you missing an assembly reference?",
 						Identifier, ns.FullName);
@@ -7139,10 +7134,10 @@ namespace Mono.CSharp {
 				return null;
 			}
 			
-			Expression member_lookup = MemberLookup (rc.DeclContainer.TypeBuilder, expr_type, expr_type, Identifier, loc);
+			Expression member_lookup = MemberLookup (ec, expr_type, expr_type, Identifier, loc);
 			if (member_lookup == null) {
 				int errors = Report.Errors;
-				MemberLookupFailed (rc.DeclContainer.TypeBuilder, expr_type, expr_type, Identifier, null, false, loc);
+				MemberLookupFailed (ec, expr_type, expr_type, Identifier, null, false, loc);
 
 				if (!silent && errors == Report.Errors) {
 					Report.Error (426, loc, "The nested type `{0}' does not exist in the type `{1}'",
@@ -7152,11 +7147,11 @@ namespace Mono.CSharp {
 			}
 
 			if (!(member_lookup is TypeExpr)) {
-				new_expr.Error_UnexpectedKind (rc.DeclContainer, "type", loc);
+				new_expr.Error_UnexpectedKind (ec, "type", loc);
 				return null;
 			} 
 
-			member_lookup = member_lookup.ResolveAsTypeTerminal (rc, silent);
+			member_lookup = member_lookup.Resolve (ec, ResolveFlags.Type);
 			return (member_lookup as TypeExpr);
 		}
 
@@ -8156,10 +8151,10 @@ namespace Mono.CSharp {
 				return null;
 			}
 			
-			member_lookup = MemberLookup (ec.ContainerType, null, base_type, member,
+			member_lookup = MemberLookup (ec, ec.ContainerType, null, base_type, member,
 						      AllMemberTypes, AllBindingFlags, loc);
 			if (member_lookup == null) {
-				MemberLookupFailed (ec.ContainerType, base_type, base_type, member, null, true, loc);
+				MemberLookupFailed (ec, base_type, base_type, member, null, true, loc);
 				return null;
 			}
 
@@ -8352,13 +8347,17 @@ namespace Mono.CSharp {
 			loc = l;
 		}
 
-		public override TypeExpr DoResolveAsTypeStep (IResolveContext ec)
+		public override TypeExpr DoResolveAsTypeStep (EmitContext ec)
 		{
 			TypeExpr lexpr = left.ResolveAsTypeTerminal (ec, false);
 			if (lexpr == null)
 				return null;
 
+			bool old = ec.TestObsoleteMethodUsage;
+			ec.TestObsoleteMethodUsage = false;
 			Type ltype = lexpr.ResolveType (ec);
+			ec.TestObsoleteMethodUsage = old;
+
 			if ((ltype == TypeManager.void_type) && (dim != "*")) {
 				Report.Error (1547, Location,
 					      "Keyword 'void' cannot be used in this context");
@@ -8374,7 +8373,7 @@ namespace Mono.CSharp {
 				throw new InternalErrorException ("Couldn't create computed type " + ltype + dim);
 			}
 
-			if (type.IsPointer && !ec.IsInUnsafeScope){
+			if (!ec.InUnsafe && type.IsPointer){
 				UnsafeError (loc);
 				return null;
 			}
diff --git a/mcs/mcs/iterators.cs b/mcs/mcs/iterators.cs
index 00f8fec3c38..37f771c5074 100644
--- a/mcs/mcs/iterators.cs
+++ b/mcs/mcs/iterators.cs
@@ -147,7 +147,6 @@ namespace Mono.CSharp {
 		MoveNextMethod move_next_method;
 		Constructor ctor;
 		CaptureContext cc;
-		EmitContext ec;
 
 		protected enum State {
 			Uninitialized	= -2,
@@ -360,7 +359,7 @@ namespace Mono.CSharp {
 
 		public bool DefineIterator ()
 		{
-			ec = new EmitContext (this, this, Mono.CSharp.Location.Null, null, null, ModFlags);
+			ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
 			ec.CurrentAnonymousMethod = move_next_method;
 			ec.CurrentIterator = this;
 			ec.InIterator = true;
diff --git a/mcs/mcs/modifiers.cs b/mcs/mcs/modifiers.cs
index 441e6ff83d3..a430171adb3 100644
--- a/mcs/mcs/modifiers.cs
+++ b/mcs/mcs/modifiers.cs
@@ -28,7 +28,6 @@ namespace Mono.CSharp {
 		public const int TOP       = 0x2000;
 
 		public const int PROPERTY_CUSTOM = 0x4000; // Custom property modifier
-		public const int PARTIAL   = 0x20000;
 
 		//
 		// We use this internally to flag that the method contains an iterator
diff --git a/mcs/mcs/namespace.cs b/mcs/mcs/namespace.cs
index c30b4cab73e..d6d9f9db92a 100644
--- a/mcs/mcs/namespace.cs
+++ b/mcs/mcs/namespace.cs
@@ -455,7 +455,7 @@ namespace Mono.CSharp {
 
 				DeclSpace root = RootContext.Tree.Types;
 				root.NamespaceEntry = NamespaceEntry;
-				FullNamedExpression fne = Expr.ResolveAsTypeStep (root, false);
+				FullNamedExpression fne = Expr.ResolveAsTypeStep (root.EmitContext, false);
 				root.NamespaceEntry = null;
 
 				if (fne == null) {
@@ -514,7 +514,7 @@ namespace Mono.CSharp {
 			{
 				DeclSpace root = RootContext.Tree.Types;
 				root.NamespaceEntry = NamespaceEntry;
-				resolved = Alias.ResolveAsTypeStep (root, false);
+				resolved = Alias.ResolveAsTypeStep (root.EmitContext, false);
 				root.NamespaceEntry = null;
 
 				if (resolved == null)
diff --git a/mcs/mcs/parameter.cs b/mcs/mcs/parameter.cs
index 481fd8b7f4a..9d782796cb2 100644
--- a/mcs/mcs/parameter.cs
+++ b/mcs/mcs/parameter.cs
@@ -24,10 +24,12 @@ namespace Mono.CSharp {
 	public abstract class ParameterBase : Attributable {
 
 		protected ParameterBuilder builder;
+		public readonly Location Location;
 
-		protected ParameterBase (Attributes attrs)
+		protected ParameterBase (Attributes attrs, Location loc)
 			: base (attrs)
 		{
+			Location = loc;
 		}
 
 		public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
@@ -48,7 +50,7 @@ namespace Mono.CSharp {
 			builder.SetCustomAttribute (cb);
 		}
 
-		public override bool IsClsComplianceRequired()
+		public override bool IsClsComplianceRequired(DeclSpace ds)
 		{
 			return false;
 		}
@@ -59,13 +61,13 @@ namespace Mono.CSharp {
 	/// </summary>
 	public class ReturnParameter : ParameterBase {
 		public ReturnParameter (MethodBuilder mb, Location location):
-			base (null)
+			base (null, location)
 		{
 			try {
 				builder = mb.DefineParameter (0, ParameterAttributes.None, "");			
 			}
 			catch (ArgumentOutOfRangeException) {
-				Report.RuntimeMissingSupport (location, "custom attributes on the return type");
+				Report.RuntimeMissingSupport (Location, "custom attributes on the return type");
 			}
 		}
 
@@ -88,12 +90,6 @@ namespace Mono.CSharp {
 			}
 		}
 
-		public override IResolveContext ResolveContext {
-			get {
-				throw new NotSupportedException ();
-			}
-		}
-
 		/// <summary>
 		/// Is never called
 		/// </summary>
@@ -111,8 +107,8 @@ namespace Mono.CSharp {
 	/// 
 	// TODO: should use more code from Parameter.ApplyAttributeBuilder
 	public class ImplicitParameter : ParameterBase {
-		public ImplicitParameter (MethodBuilder mb):
-			base (null)
+		public ImplicitParameter (MethodBuilder mb, Location loc):
+			base (null, loc)
 		{
 			builder = mb.DefineParameter (1, ParameterAttributes.None, "");			
 		}
@@ -123,12 +119,6 @@ namespace Mono.CSharp {
 			}
 		}
 
-		public override IResolveContext ResolveContext {
-			get {
-				throw new NotSupportedException ();
-			}
-		}
-
 		/// <summary>
 		/// Is never called
 		/// </summary>
@@ -145,7 +135,7 @@ namespace Mono.CSharp {
 		{
 		}
 
-		public override bool Resolve (IResolveContext ec)
+		public override bool Resolve (EmitContext ec)
 		{
 			if (!base.Resolve (ec))
 				return false;
@@ -157,9 +147,9 @@ namespace Mono.CSharp {
 			return true;
 		}
 
-		public override void ApplyAttributes (MethodBuilder mb, ConstructorBuilder cb, int index)
+		public override void ApplyAttributes (EmitContext ec, MethodBuilder mb, ConstructorBuilder cb, int index)
 		{
-			base.ApplyAttributes (mb, cb, index);
+			base.ApplyAttributes (ec, mb, cb, index);
 
 			CustomAttributeBuilder a = new CustomAttributeBuilder (
 				TypeManager.ConsParamArrayAttribute, new object [0]);
@@ -175,7 +165,7 @@ namespace Mono.CSharp {
 		{
 		}
 
-		public override bool Resolve (IResolveContext ec)
+		public override bool Resolve (EmitContext ec)
 		{
 			return true;
 		}
@@ -209,26 +199,23 @@ namespace Mono.CSharp {
 		public readonly Modifier ModFlags;
 		public readonly string Name;
 		protected Type parameter_type;
-		public readonly Location Location;
 
-		IResolveContext resolve_context;
+		EmitContext ec;  // because ApplyAtrribute doesn't have ec
 		
 		public Parameter (Expression type, string name, Modifier mod, Attributes attrs, Location loc)
-			: base (attrs)
+			: base (attrs, loc)
 		{
 			Name = name;
 			ModFlags = mod;
 			TypeName = type;
-			Location = loc;
 		}
 
 		public Parameter (Type type, string name, Modifier mod, Attributes attrs, Location loc)
-			: base (attrs)
+			: base (attrs, loc)
 		{
 			Name = name;
 			ModFlags = mod;
 			parameter_type = type;
-			Location = loc;
 		}
 
 		public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
@@ -244,7 +231,7 @@ namespace Mono.CSharp {
 			}
 
 			if (a.Type == TypeManager.out_attribute_type && (ModFlags & Modifier.REF) == Modifier.REF &&
-			    !OptAttributes.Contains (TypeManager.in_attribute_type)) {
+			    !OptAttributes.Contains (TypeManager.in_attribute_type, ec)) {
 				Report.Error (662, a.Location,
 					"Cannot specify only `Out' attribute on a ref parameter. Use both `In' and `Out' attributes or neither");
 				return;
@@ -257,21 +244,15 @@ namespace Mono.CSharp {
 			base.ApplyAttributeBuilder (a, cb);
 		}
 
-		public override IResolveContext ResolveContext {
-			get {
-				return resolve_context;
-			}
-		}
-
 		// <summary>
 		//   Resolve is used in method definitions
 		// </summary>
-		public virtual bool Resolve (IResolveContext ec)
+		public virtual bool Resolve (EmitContext ec)
 		{
 			if (parameter_type != null)
 				return true;
 
-			this.resolve_context = ec;
+			this.ec = ec;
 
 			TypeExpr texpr = TypeName.ResolveAsTypeTerminal (ec, false);
 			if (texpr == null)
@@ -377,7 +358,7 @@ namespace Mono.CSharp {
 			Report.Error (3001, Location, "Argument type `{0}' is not CLS-compliant", GetSignatureForError ());
 		}
 
-		public virtual void ApplyAttributes (MethodBuilder mb, ConstructorBuilder cb, int index)
+		public virtual void ApplyAttributes (EmitContext ec, MethodBuilder mb, ConstructorBuilder cb, int index)
 		{
 			if (mb == null)
 				builder = cb.DefineParameter (index, Attributes, Name);
@@ -385,7 +366,7 @@ namespace Mono.CSharp {
 				builder = mb.DefineParameter (index, Attributes, Name);
 		
 			if (OptAttributes != null)
-				OptAttributes.Emit ();
+				OptAttributes.Emit (ec, this);
 		}
 
 		public override string[] ValidAttributeTargets {
@@ -490,7 +471,7 @@ namespace Mono.CSharp {
 			return GetParameterByName (name, out idx);
 		}
 		
-		public bool Resolve (IResolveContext ec)
+		public bool Resolve (EmitContext ec)
 		{
 			if (types != null)
 				return true;
@@ -527,7 +508,7 @@ namespace Mono.CSharp {
 
 		// Define each type attribute (in/out/ref) and
 		// the argument names.
-		public void ApplyAttributes (MethodBase builder)
+		public void ApplyAttributes (EmitContext ec, MethodBase builder)
 		{
 			if (count == 0)
 				return;
@@ -536,7 +517,7 @@ namespace Mono.CSharp {
 			ConstructorBuilder cb = builder as ConstructorBuilder;
 
 			for (int i = 0; i < FixedParameters.Length; i++) {
-				FixedParameters [i].ApplyAttributes (mb, cb, i + 1);
+				FixedParameters [i].ApplyAttributes (ec, mb, cb, i + 1);
 			}
 		}
 
diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index 897b3ab1a14..2baa1717521 100644
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -844,7 +844,7 @@ namespace Mono.CSharp {
 
 				if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
 					eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) {
-					expr.Error_UnexpectedKind (ec.DeclContainer, "value, variable, property or indexer access ", loc);
+					expr.Error_UnexpectedKind (ec, "value, variable, property or indexer access ", loc);
 					return false;
 				}
 
@@ -3939,7 +3939,7 @@ namespace Mono.CSharp {
 					converted_vars [i].Emit (ec);
 					ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
 				} else {
-					Expression ml = Expression.MemberLookup(ec.ContainerType, TypeManager.idisposable_type, var.Type, "Dispose", Mono.CSharp.Location.Null);
+					Expression ml = Expression.MemberLookup(ec, TypeManager.idisposable_type, var.Type, "Dispose", Mono.CSharp.Location.Null);
 
 					if (!(ml is MethodGroupExpr)) {
 						var.Emit (ec);
@@ -4009,7 +4009,7 @@ namespace Mono.CSharp {
 				ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
 				ig.MarkLabel (skip);
 			} else {
-				Expression ml = Expression.MemberLookup(ec.ContainerType, TypeManager.idisposable_type, local_copy.LocalType, "Dispose", Mono.CSharp.Location.Null);
+				Expression ml = Expression.MemberLookup(ec, TypeManager.idisposable_type, local_copy.LocalType, "Dispose", Mono.CSharp.Location.Null);
 
 				if (!(ml is MethodGroupExpr)) {
 					ig.Emit (OpCodes.Ldloc, local_copy);
@@ -4390,7 +4390,7 @@ namespace Mono.CSharp {
 					    !FetchGetCurrent (ec, return_type)) {
 						move_next = TypeManager.bool_movenext_void;
 						get_current = new PropertyExpr (
-							ec.ContainerType, TypeManager.ienumerator_getcurrent, loc);
+							ec, TypeManager.ienumerator_getcurrent, loc);
 						return true;
 					}
 				} else {
@@ -4447,7 +4447,7 @@ namespace Mono.CSharp {
 			bool FetchGetCurrent (EmitContext ec, Type t)
 			{
 				PropertyExpr pe = Expression.MemberLookup (
-					ec.ContainerType, t, "Current", MemberTypes.Property,
+					ec, t, "Current", MemberTypes.Property,
 					Expression.AllBindingFlags, loc) as PropertyExpr;
 				if (pe == null)
 					return false;
@@ -4495,7 +4495,7 @@ namespace Mono.CSharp {
 			bool TryType (EmitContext ec, Type t)
 			{
 				MethodGroupExpr mg = Expression.MemberLookup (
-					ec.ContainerType, t, "GetEnumerator", MemberTypes.Method,
+					ec, t, "GetEnumerator", MemberTypes.Method,
 					Expression.AllBindingFlags, loc) as MethodGroupExpr;
 				if (mg == null)
 					return false;
diff --git a/mcs/mcs/tree.cs b/mcs/mcs/tree.cs
index d6a822811d0..da1045ad250 100644
--- a/mcs/mcs/tree.cs
+++ b/mcs/mcs/tree.cs
@@ -33,13 +33,23 @@ namespace Mono.CSharp
 	public class Tree {
 		TypeContainer root_types;
 
+		// <summary>
+		//   Keeps track of all the types definied (classes, structs, ifaces, enums)
+		// </summary>
+		Hashtable decls;
+		
 		public Tree ()
 		{
 			root_types = new RootTypes ();
+
+			decls = new Hashtable ();
 		}
 
 		public void RecordDecl (Namespace ns, MemberName name, DeclSpace ds)
 		{
+			// This is recorded for tracking inner partial classes only
+			decls [name] = ds;
+
 			if (ds.Parent == root_types)
 				ns.AddDeclSpace (name.Basename, ds);
 		}
@@ -50,6 +60,15 @@ namespace Mono.CSharp
                 public TypeContainer Types {
                         get { return root_types; }
                 }
+
+		public DeclSpace GetDecl (MemberName name)
+		{
+			return (DeclSpace) decls [name];
+		}
+
+		public Hashtable AllDecls {
+			get { return decls; }
+		}
 	}
 
 	public sealed class RootTypes : TypeContainer
@@ -57,17 +76,17 @@ namespace Mono.CSharp
 		public RootTypes ()
 			: base (null, null, MemberName.Null, null, Kind.Root)
 		{
-			types = new ArrayList ();
+			ec = new EmitContext (null, this, Location.Null, null, null, 0, false);
 		}
 
-		public override bool IsClsComplianceRequired ()
+		public override PendingImplementation GetPendingImplementations ()
 		{
-			return true;
+			throw new InvalidOperationException ();
 		}
 
-		public override bool GetClsCompliantAttributeValue ()
+		public override bool IsClsComplianceRequired (DeclSpace ds)
 		{
-			return CodeGen.Assembly.IsClsCompliant;
+			return true;
 		}
 
 		public override string GetSignatureForError ()
@@ -79,11 +98,5 @@ namespace Mono.CSharp
 		{
 			return AddToContainer (ds, ds.Name);
 		}
-
-		public override TypeContainer AddPartial (TypeContainer nextPart)
-		{
-			return AddPartial (nextPart, nextPart.Name);
-		}
-
 	}
 }
diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
index e797fd0c0e2..200a4581f6f 100644
--- a/mcs/mcs/typemanager.cs
+++ b/mcs/mcs/typemanager.cs
@@ -244,9 +244,7 @@ public class TypeManager {
 	public static Hashtable AllClsTopLevelTypes;
 
 	static Hashtable fieldbuilders_to_fields;
-	static Hashtable propertybuilder_to_property;
 	static Hashtable fields;
-	static Hashtable events;
 
 	struct Signature {
 		public string name;
@@ -268,7 +266,6 @@ public class TypeManager {
 		events = null;
 		priv_fields_events = null;
 		type_hash = null;
-		propertybuilder_to_property = null;
 		
 		TypeHandle.CleanUp ();
 	}
@@ -363,7 +360,6 @@ public class TypeManager {
 		builder_to_ifaces = new PtrHashtable ();
 		
 		fieldbuilders_to_fields = new Hashtable ();
-		propertybuilder_to_property = new Hashtable ();
 		fields = new Hashtable ();
 		type_hash = new DoubleHash ();
 
@@ -1557,16 +1553,6 @@ public class TypeManager {
 		return (IConstant)fields [fb];
 	}
 
-	public static void RegisterProperty (PropertyInfo pi, PropertyBase pb)
-	{
-		propertybuilder_to_property.Add (pi, pb);
-	}
-
-	public static PropertyBase GetProperty (PropertyInfo pi)
-	{
-		return (PropertyBase)propertybuilder_to_property [pi];
-	}
-
 	static public bool RegisterFieldBase (FieldBuilder fb, FieldBase f)
 	{
 		if (fieldbuilders_to_fields.Contains (fb))
@@ -1586,6 +1572,8 @@ public class TypeManager {
 		return (FieldBase) fieldbuilders_to_fields [fb];
 	}
 	
+	static Hashtable events;
+
 	static public void RegisterEvent (MyEventBuilder eb, MethodBase add, MethodBase remove)
 	{
 		if (events == null)
@@ -1714,7 +1702,7 @@ public class TypeManager {
 	///   This expands in context like: IA; IB : IA; IC : IA, IB; the interface "IC" to
 	///   be IA, IB, IC.
 	/// </remarks>
-	public static Type[] ExpandInterfaces (IResolveContext ec, TypeExpr [] base_interfaces)
+	public static Type[] ExpandInterfaces (EmitContext ec, TypeExpr [] base_interfaces)
 	{
 		ArrayList new_ifaces = new ArrayList ();
 
diff --git a/mcs/nunit20/ChangeLog b/mcs/nunit20/ChangeLog
index 3687be6343b..ef28a576698 100755
--- a/mcs/nunit20/ChangeLog
+++ b/mcs/nunit20/ChangeLog
@@ -1,5 +1,3 @@
-2006-01-25 Boris Kirzner <borisl@mainsoft.com>
-	* nunit.java.sln: added solution file for TARGET_JVM.
 
 Wed Apr 20 18:05:41 CEST 2005 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mcs/nunit20/core/AssemblyInfo.cs b/mcs/nunit20/core/AssemblyInfo.cs
index f87088a88df..d8381544bf9 100644
--- a/mcs/nunit20/core/AssemblyInfo.cs
+++ b/mcs/nunit20/core/AssemblyInfo.cs
@@ -2,9 +2,7 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-#if !TARGET_JVM
 [assembly: CLSCompliant(true)]
-#endif
 //
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
diff --git a/mcs/nunit20/core/ChangeLog b/mcs/nunit20/core/ChangeLog
index e459b9f46d8..8494a6bfbc6 100755
--- a/mcs/nunit20/core/ChangeLog
+++ b/mcs/nunit20/core/ChangeLog
@@ -1,8 +1,3 @@
-2006-01-25 Boris Kirzner <borisk@mainsoft.com>
-	* AssemblyInfo.cs, TestSuiteBuilder.cs : added #ifdef for features
-	not supported in TARGET_JVM.
-	* nunit.core.dll.J2EE.vmwcsproj: added project file for TARGET_JVM.
-
 2005-01-13  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* ConsoleWriter.cs : Flush() should call that of input writer.
diff --git a/mcs/nunit20/core/RemoteTestRunner.cs b/mcs/nunit20/core/RemoteTestRunner.cs
index 1e6f375497a..e023565ddce 100644
--- a/mcs/nunit20/core/RemoteTestRunner.cs
+++ b/mcs/nunit20/core/RemoteTestRunner.cs
@@ -373,12 +373,12 @@ namespace NUnit.Core
 			// This is exactly what happens when we are testing NUnit itself.
 			saveOut = Console.Out;
 			saveError = Console.Error;
-#if !TARGET_JVM
+
 			// Set Console to go to our buffers. Note that any changes made by
 			// the user in the test code or the code it calls will defeat this.
 			Console.SetOut( outBuffer );
 			Console.SetError( errorBuffer ); 
-#endif
+
 			// Save the current directory so we can run each test in
 			// the same directory as its assembly
 			currentDirectory = Environment.CurrentDirectory;
diff --git a/mcs/nunit20/core/TestSuiteBuilder.cs b/mcs/nunit20/core/TestSuiteBuilder.cs
index 014c275cbb6..665b6c62849 100644
--- a/mcs/nunit20/core/TestSuiteBuilder.cs
+++ b/mcs/nunit20/core/TestSuiteBuilder.cs
@@ -84,11 +84,7 @@ namespace NUnit.Core
 				if ( swap )
 					Environment.CurrentDirectory = assemblyDirectory;
 
-#if !TARGET_JVM
 				Assembly assembly = AppDomain.CurrentDomain.Load(Path.GetFileNameWithoutExtension(assemblyName));
-#else
-				Assembly assembly = Assembly.Load(Path.GetFileNameWithoutExtension(assemblyName));
-#endif
 
 				foreach( AssemblyName refAssembly in assembly.GetReferencedAssemblies() )
 				{
@@ -139,11 +135,7 @@ namespace NUnit.Core
 				// Assume that testName is a namespace
 				string prefix = testName + '.';
 
-#if !TARGET_JVM
 				Type[] testTypes = assembly.GetExportedTypes();
-#else
-				Type[] testTypes = GetAssemblyExportedTypes(assembly);
-#endif
 				int testFixtureCount = 0;
 
 				foreach(Type type in testTypes)
@@ -266,11 +258,7 @@ namespace NUnit.Core
 
 			builder.rootSuite = new AssemblyTestSuite( assemblyName, assemblyKey );
 			int testFixtureCount = 0;
-#if !TARGET_JVM
 			Type[] testTypes = assembly.GetExportedTypes();
-#else
-			Type[] testTypes = GetAssemblyExportedTypes(assembly);
-#endif
 			foreach(Type testType in testTypes)
 			{
 				if( CanMakeSuite( testType ) )
@@ -293,29 +281,6 @@ namespace NUnit.Core
 			return builder.rootSuite;
 		}
 
-#if TARGET_JVM
-		private Type[] GetAssemblyExportedTypes(Assembly assembly)
-		{
-			Type[] allTypes = null;
-			try
-			{
-				allTypes = assembly.GetTypes();
-			}
-			catch (Exception e) 
-			{
-			    System.Console.WriteLine("ReflectionTypeLoadException error");
-			}
-			ArrayList tmpTestTypes = new ArrayList(allTypes.Length);
-			foreach(Type current in allTypes)
-			{
-				if (current.IsPublic || current.IsNestedPublic)
-				{
-					tmpTestTypes.Add(current);
-				}
-			}
-			return (Type[])tmpTestTypes.ToArray(typeof(Type));
-		}
-#endif
 		/// <summary>
 		/// Helper routine that makes a suite from either a TestFixture or
 		/// a legacy Suite property.
diff --git a/mcs/nunit20/core/nunit.core.dll.J2EE.vmwcsproj b/mcs/nunit20/core/nunit.core.dll.J2EE.vmwcsproj
deleted file mode 100644
index c2968158912..00000000000
--- a/mcs/nunit20/core/nunit.core.dll.J2EE.vmwcsproj
+++ /dev/null
@@ -1,66 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="nunit.core" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="NUnit.Core" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="CategoryFilter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="CategoryManager.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="EmptyFilter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="EventListener.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ExpectedExceptionTestCase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Filter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="InvalidSuiteException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="InvalidTestFixtureException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ITest.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ITestEvents.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="LegacySuite.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="LongLivingMarshalByRefObject.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NameFilter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NamespaceSuite.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NormalTestCase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NoTestFixturesException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NotRunnableTestCase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NullListener.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NunitException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Reflect.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="RemoteTestRunner.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Results.xsd" BuildAction="Content"/>

-				<File RelPath="Results.xsx" DependentUpon="Results.xsd" BuildAction="None"/>

-				<File RelPath="ResultVisitor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="RootTestSuite.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="StringTextWriter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Summary.xslt" BuildAction="Content"/>

-				<File RelPath="TemplateTestCase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Test.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestAssembly.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestCase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestCaseBuilder.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestCaseResult.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestEventDispatcher.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestFixture.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestResult.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestRunner.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestRunnerThread.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestSuite.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestSuiteBuilder.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestSuiteResult.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" REFS.JarPath.system="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" />

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/nunit20/framework/AssemblyInfo.cs b/mcs/nunit20/framework/AssemblyInfo.cs
index c4d4d85d98d..290ecc80195 100644
--- a/mcs/nunit20/framework/AssemblyInfo.cs
+++ b/mcs/nunit20/framework/AssemblyInfo.cs
@@ -2,9 +2,7 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-#if !TARGET_JVM
 [assembly: CLSCompliant(true)]
-#endif
 //
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
diff --git a/mcs/nunit20/framework/ChangeLog b/mcs/nunit20/framework/ChangeLog
index 8c726802a34..8d7944ec444 100755
--- a/mcs/nunit20/framework/ChangeLog
+++ b/mcs/nunit20/framework/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-25 Boris Kirzner <borisk@mainsoft.com>
-	* AssemblyInfo.cs: added #ifdef for features not supported in TARGET_JVM.
-	* nunit.framework.dll.J2EE.vmwcsproj: added project file for TARGET_JVM.
-
 2004-11-23  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (NO_INSTALL) [PROFILE=net_2_0]: Don't install dll.
diff --git a/mcs/nunit20/framework/nunit.framework.dll.J2EE.vmwcsproj b/mcs/nunit20/framework/nunit.framework.dll.J2EE.vmwcsproj
deleted file mode 100644
index f37ab24d17b..00000000000
--- a/mcs/nunit20/framework/nunit.framework.dll.J2EE.vmwcsproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="nunit.framework" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="NUnit.Framework" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="bin\Debug\nunit.framework.xml" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1573, 1572" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="bin\Release\nunit.framework.xml" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assert.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Assertion.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="AssertionException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="AssertionFailureMessage.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="CategoryAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ExpectedExceptionAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ExplicitAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="IgnoreAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="IgnoreException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="OldTestCase.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="SetUpAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="SuiteAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TearDownAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestFixtureAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestFixtureSetUpAttribute.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestFixtureTearDownAttribute.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties REFS.JarPath.system.xml="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.rt="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" project.JDKType="1.5.0_05"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/nunit20/nunit-console/ChangeLog b/mcs/nunit20/nunit-console/ChangeLog
index 776688a656f..a4da4e4d6a1 100644
--- a/mcs/nunit20/nunit-console/ChangeLog
+++ b/mcs/nunit20/nunit-console/ChangeLog
@@ -1,30 +1,3 @@
-2006-01-25 Boris Kirzner <borisk@mainsoft.com>
-	* ConsoleUi.cs: added #ifdef for features not supported in TARGET_JVM.
-	* nunit-console.J2EE.vmwcsproj: added project file for TARGET_JVM.
-
-2006-01-12  Raja R Harinath  <rharinath@novell.com>
-
-	* Makefile: Revert my '2006-01-10' commit.  Prefer the more
-	generic fix to build/executable.make.
-	(DISTFILES): Distribute nunit-console.exe.config.net_2_0.
-	* nunit-console.exe.net_2_0.config: Delete.
-
-2006-01-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-	* nunit-console.exe.config.net_2_0: configuration for
-	nunit-console in the 2.0 profile.
-
-2006-01-10  Raja R Harinath  <rharinath@novell.com>
-
-	This should fix #76928.  This fix incorporates ideas from a patch
-	posted on that bugreport.
-	* Makefile [net_2_0 profile]: Don't build nunit-console.exe.  Copy
-	the executable from the 'default' profile, and use a slightly
-	customized nunit-console.exe.config.
-	* nunit-console.exe.net_2_0.config: New config file for the
-	net_2_0 profile.  Alter the list of 'supportedRuntime's to prefer
-	the 2.0 runtime.
-
 2005-11-05  Kornél Pál  <kornelpal@hotmail.com>
 
 	* nunit-console.exe.config: Updated runtime version to v2.0.50727 (2.0 RTM).
diff --git a/mcs/nunit20/nunit-console/ConsoleUi.cs b/mcs/nunit20/nunit-console/ConsoleUi.cs
index 91add9aff10..9c56d655546 100644
--- a/mcs/nunit20/nunit-console/ConsoleUi.cs
+++ b/mcs/nunit20/nunit-console/ConsoleUi.cs
@@ -151,10 +151,8 @@ namespace NUnit.Console
 			Console.WriteLine();
 
 			string clrPlatform = Type.GetType("Mono.Runtime", false) == null ? ".NET" : "Mono";
-#if !TARGET_JVM			
 			Console.WriteLine( string.Format("OS Version: {0}    {1} Version: {2}",
 				Environment.OSVersion, clrPlatform, Environment.Version ) );
-#endif
 			Console.WriteLine();
 		}
 
diff --git a/mcs/nunit20/nunit-console/Makefile b/mcs/nunit20/nunit-console/Makefile
index 59c2ea7e8a3..0a33bca390a 100644
--- a/mcs/nunit20/nunit-console/Makefile
+++ b/mcs/nunit20/nunit-console/Makefile
@@ -4,6 +4,6 @@ include ../../build/rules.make
 
 PROGRAM = $(topdir)/class/lib/$(PROFILE)/nunit-console.exe
 LOCAL_MCS_FLAGS = /r:nunit.framework.dll /r:nunit.util.dll /r:nunit.core.dll
-DISTFILES = app.config App.ico nunit-console.csproj nunit-console.exe.config.net_2_0
+DISTFILES = app.config App.ico nunit-console.csproj
 
 include ../../build/executable.make
diff --git a/mcs/nunit20/nunit-console/nunit-console.J2EE.vmwcsproj b/mcs/nunit20/nunit-console/nunit-console.J2EE.vmwcsproj
deleted file mode 100644
index f9302195a15..00000000000
--- a/mcs/nunit20/nunit-console/nunit-console.J2EE.vmwcsproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{EE901CF2-A263-471C-AEE2-2400A7105ABE}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="nunit-console" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Exe" PreBuildEvent="" PostBuildEvent="" RootNamespace="nunit_console" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM;GHT_MARSHAL_BY_REF_OBJECT;GHT_THREAD_ABORT;GHT_ENVIRONMENT_OSVERSION;GHT_ASSEMBLYNAME_VERSION;ASSEMBLY_GETASSEMBLY" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="618" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA;GHT_ENVIRONMENT_OSVERSION" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="618" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM;GHT_MARSHAL_BY_REF_OBJECT;GHT_THREAD_ABORT;GHT_ENVIRONMENT_OSVERSION;GHT_ASSEMBLYNAME_VERSION;ASSEMBLY_GETASSEMBLY" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="618" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-				<Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-				<Reference Name="nunit.util.dll.J2EE" Project="{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ConsoleUi.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="nunit-console.exe.config" BuildAction="None"/>

-			</Include>

-		</Files>

-		<UserProperties REFS.JarPath.system.xml="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.rt="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" project.JDKType="1.5.0_05"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="C:\cygwin\monobuild\mcs\class\System.Drawing.1.7\Test\DrawingTest\Test\bin\Debug_Java\Test.jar" Prop2010="C:\cygwin\monobuild\mcs\class\System.Drawing.1.7\Test\DrawingTest\Test\bin\Debug" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="C:\cygwin\monobuild\mcs\class\System.Drawing.1.7\Test\DrawingTest\Test\bin\Debug_Java\Test.jar" Prop2010="C:\cygwin\monobuild\mcs\class\System.Drawing.1.7\Test\DrawingTest\Test\bin\Debug" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/nunit20/nunit-console/nunit-console.exe.config b/mcs/nunit20/nunit-console/nunit-console.exe.config
index 777966b1f69..777966b1f69 100644..100755
--- a/mcs/nunit20/nunit-console/nunit-console.exe.config
+++ b/mcs/nunit20/nunit-console/nunit-console.exe.config
diff --git a/mcs/nunit20/nunit-console/nunit-console.exe.config.net_2_0 b/mcs/nunit20/nunit-console/nunit-console.exe.config.net_2_0
deleted file mode 100644
index d5d1e397d45..00000000000
--- a/mcs/nunit20/nunit-console/nunit-console.exe.config.net_2_0
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<configuration>
-    <!--
-     Application settings for NUnit-console.exe. Do NOT put settings
-	 for use by your tests here.
-	-->
-  <appSettings>
-
-	<!--	Specify the location to be used by .NET for the cache -->
-    <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
-  
-  </appSettings>
-  
-    <!-- 
-     These statements specify the runtime versions supported
-     in the order that they will be used if more than one
-     is present. You can change the order of these if you like
-     or remove any that do not apply.
-	 
-	 Since .NET 1.0 does not recognize the <supportedRuntime> elements,
-	 a <requiredRuntime> element is used in case it is the only version
-	 of the framework that is installed.
-    -->
-  <startup>
-	  <supportedRuntime version="v2.0.50727" />
-  </startup>
-
-   <!--
-    The following <runtime> section allows running nunit under 
-    .NET 1.0 by redirecting assemblies. The appliesTo attribute
-    causes the section to be ignored except under .NET 1.0version 1
-    on a machine with only the .NET version 1.0 runtime installed.
-    If application and its tests were built for .NET 1.1 you will
-    also need to redirect system assemblies in the test config file.
-   -->
-  
- <runtime>
-    
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
-			appliesTo="v1.0.3705">
-
-      <dependentAssembly> 
-        <assemblyIdentity name="System" 
-                          publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
-        <bindingRedirect  oldVersion="1.0.5000.0" 
-                          newVersion="1.0.3300.0"/>
-      </dependentAssembly>
-
-      <dependentAssembly> 
-        <assemblyIdentity name="System.Data" 
-                          publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
-        <bindingRedirect  oldVersion="1.0.5000.0" 
-                          newVersion="1.0.3300.0"/>
-      </dependentAssembly>
-
-      <dependentAssembly> 
-        <assemblyIdentity name="System.Drawing" 
-                          publicKeyToken="b03f5f7f11d50a3a" 
-                          culture=""/>
-        <bindingRedirect  oldVersion="1.0.5000.0" 
-                          newVersion="1.0.3300.0"/>
-      </dependentAssembly>
-
-      <dependentAssembly> 
-        <assemblyIdentity name="System.Windows.Forms" 
-                          publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
-        <bindingRedirect  oldVersion="1.0.5000.0" 
-                          newVersion="1.0.3300.0"/>
-      </dependentAssembly>
-
-      <dependentAssembly> 
-        <assemblyIdentity name="System.Xml" 
-                          publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
-        <bindingRedirect  oldVersion="1.0.5000.0" 
-                          newVersion="1.0.3300.0"/>
-      </dependentAssembly>
-
-    </assemblyBinding>
-
-  </runtime>
-  
-</configuration>
diff --git a/mcs/nunit20/nunit.java.sln b/mcs/nunit20/nunit.java.sln
deleted file mode 100644
index dee362c1544..00000000000
--- a/mcs/nunit20/nunit.java.sln
+++ /dev/null
@@ -1,81 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.util.dll.J2EE", "util\nunit.util.dll.J2EE.vmwcsproj", "{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit-console.J2EE", "nunit-console\nunit-console.J2EE.vmwcsproj", "{EE901CF2-A263-471C-AEE2-2400A7105ABE}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Debug_Java = Debug_Java

-		Debug_Net = Debug_Net

-		Debug_NetRef = Debug_NetRef

-		Debug-Strong = Debug-Strong

-		Release = Release

-		Release_Java = Release_Java

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Net.ActiveCfg = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_NetRef.ActiveCfg = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.ActiveCfg = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.Build.0 = Debug_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET

-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Net.ActiveCfg = Release_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_NetRef.ActiveCfg = Debug_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.ActiveCfg = Debug_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.Build.0 = Debug_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.ActiveCfg = Release_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET

-		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.ActiveCfg = Debug|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug.Build.0 = Debug|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Java.Build.0 = Debug_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_Net.ActiveCfg = Release_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug_NetRef.ActiveCfg = Debug_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug-Strong.ActiveCfg = Debug_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Debug-Strong.Build.0 = Debug_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release.ActiveCfg = Release_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.ActiveCfg = Release_Java|.NET

-		{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}.Release_Java.Build.0 = Release_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.ActiveCfg = Debug|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug.Build.0 = Debug|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Java.Build.0 = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Net.ActiveCfg = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_Net.Build.0 = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_NetRef.ActiveCfg = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug_NetRef.Build.0 = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug-Strong.ActiveCfg = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Debug-Strong.Build.0 = Debug_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release.ActiveCfg = Release_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release.Build.0 = Release_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.ActiveCfg = Release_Java|.NET

-		{EE901CF2-A263-471C-AEE2-2400A7105ABE}.Release_Java.Build.0 = Release_Java|.NET

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/mcs/nunit20/util/AssemblyInfo.cs b/mcs/nunit20/util/AssemblyInfo.cs
index 1a2c1e46045..f18319daad9 100644
--- a/mcs/nunit20/util/AssemblyInfo.cs
+++ b/mcs/nunit20/util/AssemblyInfo.cs
@@ -83,9 +83,5 @@ using System.Runtime.CompilerServices;
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
 //
-#if TARGET_JVM
-[assembly: AssemblyDelaySign(false)]
-#else
 [assembly: AssemblyKeyFile("../../../nunit.key")]
 [assembly: AssemblyKeyName("")]
-#endif
diff --git a/mcs/nunit20/util/ChangeLog b/mcs/nunit20/util/ChangeLog
index c68e1497984..ef7ef6b1e0d 100644
--- a/mcs/nunit20/util/ChangeLog
+++ b/mcs/nunit20/util/ChangeLog
@@ -1,9 +1,3 @@
-2006-01-25 Boris Kirzner <borisk@mainsoft.com>
-	* AssemblyInfo.cs, ProjectPath.cs, TestDomain.cs, TestExceptionHandler.cs:
-	added #ifdef and alternative implementation for features 
-	not supported in TARGET_JVM.
-	* nunit.util.dll.J2EE.vmwcsproj : added project file for TARGET_JVM.
-
 2005-07-03  Ben Maurer  <bmaurer@ximian.com>
 
 	* Makefile: Fix so it really doesn't install for 2.0.
diff --git a/mcs/nunit20/util/ProjectPath.cs b/mcs/nunit20/util/ProjectPath.cs
index 93d951a5bb5..29e42e738c6 100644
--- a/mcs/nunit20/util/ProjectPath.cs
+++ b/mcs/nunit20/util/ProjectPath.cs
@@ -31,9 +31,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Runtime.InteropServices;
-#if TARGET_JVM
-using System.Collections;
-#endif
+
 namespace NUnit.Util
 {
 	/// <summary>
@@ -54,7 +52,6 @@ namespace NUnit.Util
 			return extension == ".dll" || extension == ".exe";
 		}
 
-#if !TARGET_JVM
 		/// <summary>
 		/// Returns the relative path from a base directory to another
 		/// directory or file.
@@ -83,68 +80,16 @@ namespace NUnit.Util
 
 			return sb.ToString();
 		}
-#else
-		/// <summary>
-		/// Returns the relative path from a base directory to another
-		/// directory or file.
-		/// </summary>
-		public static string RelativePath( string from, string to )
-		{
-			char dirSeperator = System.IO.Path.DirectorySeparatorChar;
-			string upDirStr = @"..\";
-
-			//Start by normalizing paths
-			NormalizePath (ref from);
-			NormalizePath (ref to);
 
-			if ( !IsPathValid (from) || !IsPathValid (to) )
-				return string.Empty;
-
-			if (!System.IO.Path.IsPathRooted (to))
-				return to;
-
-			//First check if FullPath begins with the BasePath
-			if ( to.StartsWith (from)) 
-				return  to.Replace (from,".");
-
-			//Now parse backwards
-			StringBuilder backDirs = new StringBuilder ();
-			string partialPath = from;
-			int index = partialPath.LastIndexOf (dirSeperator);
-			while (index > 0) {
-				//Strip path step string to last backslash and add another step backwards to our pass replacement
-				partialPath = partialPath.Substring(0,index);
-				backDirs.Append(upDirStr);
-
-				//check if FullPath begins with the current partialPath
-				if ( to.StartsWith(partialPath) )
-					if ( to == partialPath ) {
-						//Full Directory match and need to replace it all
-						backDirs.Remove (backDirs.Length-1, 1);
-						return backDirs.ToString ();
-					}
-					else //We're dealing with a file or a start path
-						return to.Replace (partialPath + dirSeperator, backDirs.ToString ());
-
-				index = partialPath.LastIndexOf (dirSeperator, partialPath.Length-1);
-			}			
-			//No common root found, return null.
-			return null;
-		}
-#endif
 		/// <summary>
 		/// Return the canonical form of a path.
 		public static string Canonicalize( string path )
 		{
-#if !TARGET_JVM
 			StringBuilder sb = new StringBuilder( MAX_PATH );
 			if ( !PathCanonicalize( sb, path ) )
 				throw new ArgumentException( string.Format( "Invalid path passed to PathCanonicalize: {0}", path ) );
 
 			return sb.ToString();
-#else
-			return Path.GetFullPath( path );
-#endif
 		}
 
 		/// <summary>
@@ -191,7 +136,6 @@ namespace NUnit.Util
 
 		#endregion
 
-#if !TARGET_JVM
 		#region Shlwapi functions used internally
 
 		[DllImport("shlwapi.dll")]
@@ -214,21 +158,5 @@ namespace NUnit.Util
 			StringBuilder result );
 			
 		#endregion
-#else
-		private static bool IsPathValid(string path)
-		{
-			return (path!=string.Empty) && (path[0] != System.IO.Path.DirectorySeparatorChar);
-		}
-
-		private static void NormalizePath (ref string path)
-		{
-			string dirSeperator = new string (new char [] {System.IO.Path.DirectorySeparatorChar});
-
-			path = path.ToLower ();
-			if (path.EndsWith (dirSeperator))
-				path = path.Substring (0, path.Length - 1);
-		}
-
-#endif
 	}
 }
diff --git a/mcs/nunit20/util/TestDomain.cs b/mcs/nunit20/util/TestDomain.cs
index e6d4530813d..9afaac45f89 100644
--- a/mcs/nunit20/util/TestDomain.cs
+++ b/mcs/nunit20/util/TestDomain.cs
@@ -120,16 +120,12 @@ namespace NUnit.Util
 
 		private TestRunner MakeRemoteTestRunner( AppDomain runnerDomain )
 		{
-#if !TARGET_JVM
 			object obj = runnerDomain.CreateInstanceAndUnwrap(
 				typeof(RemoteTestRunner).Assembly.FullName, 
 				typeof(RemoteTestRunner).FullName,
 				false, BindingFlags.Default,null,null,null,null,null);
 			
 			RemoteTestRunner runner = (RemoteTestRunner) obj;
-#else
-			RemoteTestRunner runner = new RemoteTestRunner();
-#endif
 
 			runner.Out = this.outWriter;
 			runner.Error = this.errorWriter;
@@ -254,7 +250,7 @@ namespace NUnit.Util
 		public void Unload()
 		{
 			testRunner = null;
-#if !TARGET_JVM
+
 			if(domain != null) 
 			{
 				try
@@ -274,7 +270,6 @@ namespace NUnit.Util
 					domain = null;
 				}
 			}
-#endif
 		}
 
 		public static string GetBinPath( string[] assemblies )
@@ -440,7 +435,7 @@ namespace NUnit.Util
 			string domainName = string.Format( "domain-{0}", Path.GetFileName( testFileName ) );
 			domain = MakeAppDomain( testFileName, appBase, configFile, binPath );
 		}
-#if !TARGET_JVM
+
 		/// <summary>
 		/// This method creates appDomains for the framework.
 		/// </summary>
@@ -482,12 +477,6 @@ namespace NUnit.Util
 
 			return runnerDomain;
 		}
-#else
-		private AppDomain MakeAppDomain( string domainName, string appBase, string configFile, string binPath )
-		{
-			return AppDomain.CurrentDomain;
-		}
-#endif
 
 		/// <summary>
 		/// Set the location for caching and delete any old cache info
diff --git a/mcs/nunit20/util/TestExceptionHandler.cs b/mcs/nunit20/util/TestExceptionHandler.cs
index 5787ec8170a..2e370c22564 100644
--- a/mcs/nunit20/util/TestExceptionHandler.cs
+++ b/mcs/nunit20/util/TestExceptionHandler.cs
@@ -11,28 +11,23 @@ namespace NUnit.Util
 
 		public TestExceptionHandler( UnhandledExceptionEventHandler handler )
 		{
-#if !TARGET_JVM
 			this.handler = handler;
 			AppDomain.CurrentDomain.UnhandledException += handler;
-#endif
 		}
 
 		~TestExceptionHandler()
 		{
-#if  !TARGET_JVM
 			if ( handler != null )
 			{
 				AppDomain.CurrentDomain.UnhandledException -= handler;
 				handler = null;
 			}
-#endif
 		}
 
 
 
 		public void Dispose()
 		{
-#if !TARGET_JVM
 			if ( handler != null )
 			{
 				AppDomain.CurrentDomain.UnhandledException -= handler;
@@ -40,7 +35,6 @@ namespace NUnit.Util
 			}
 
 			System.GC.SuppressFinalize( this );
-#endif
 		}
 	}
 }
diff --git a/mcs/nunit20/util/nunit.util.dll.J2EE.vmwcsproj b/mcs/nunit20/util/nunit.util.dll.J2EE.vmwcsproj
deleted file mode 100644
index d0c27c07fc1..00000000000
--- a/mcs/nunit20/util/nunit.util.dll.J2EE.vmwcsproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{36BE0465-4DE4-44CE-AF8D-6E50D0C40BC6}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="nunit.util" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="NUnit.Util" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>

-				<Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="AssemblyList.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="AssemblyListItem.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="CommandLineOptions.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ConsoleOptions.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ConsoleWriter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="GuiOptions.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ITestEvents.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ITestLoader.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="NUnitProject.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ProjectConfig.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ProjectConfigCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ProjectFormatException.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ProjectPath.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="ResultSummarizer.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="SettingsGroup.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="SettingsStorage.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="StackTraceFilter.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="SummaryVisitor.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestDomain.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestEventArgs.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestEventDispatcher.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestExceptionHandler.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="TestResultItem.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="Transform.resx" BuildAction="EmbeddedResource"/>

-				<File RelPath="UIHelper.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="UITestNode.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="VSProject.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="VSProjectConfig.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="VSProjectConfigCollection.cs" SubType="Code" BuildAction="Compile"/>

-				<File RelPath="XmlResultVisitor.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" REFS.JarPath.system="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.drawing="" />

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/tests/ChangeLog b/mcs/tests/ChangeLog
index edfa77218f2..0c32363ab9a 100644
--- a/mcs/tests/ChangeLog
+++ b/mcs/tests/ChangeLog
@@ -1,63 +1,13 @@
-2006-02-27  Marek Safar <marek.safar@seznam.cz>
-
-	* test-492.cs: Another attribute tests.
-
 2006-02-14  Martin Baulig  <martin@ximian.com>
 
 	* known-issues-gmcs: Add test-473.cs.
 
 	* gtest-130.cs, gtest-136.cs: Make these tests actually work.
 
-2006-02-11  Marek Safar <marek.safar@seznam.cz>
-
-	* test-491.cs: Test for bug #77485.
-
-2006-02-01  Raja R Harinath  <rharinath@novell.com>
-
-	* support-*.cs: Rename from test-*-p2.cs.
-
 2006-01-30  Raja R Harinath  <rharinath@novell.com>
 
 	* test-490.cs: New test from #77401.
 
-2006-01-29  Raja R Harinath  <harinath@gmail.com>
-
-	* gtest-241.cs: New test from #77397.
-
-2006-01-21  Raja R Harinath  <harinath@gmail.com>
-
-	* test-489.cs: New test based on #76995.
-
-2006-01-16  Raja R Harinath  <rharinath@novell.com>
-
-	* test-488.cs: New test based on #76874.
-
-2006-01-16  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* gtest-xml-1-ref.xml, gtest-xml-1.cs : test for bug #77183.
-
-2006-01-12  Ben Maurer  <bmaurer@andrew.cmu.edu>
-
-	* test-437.cs: New test for Console.WriteLine ((this = x).foo)
-
-2006-01-12  Raja R Harinath  <rharinath@novell.com>
-
-	* test-486.cs: New test from #77221.
-
-2006-01-11  Raja R Harinath  <rharinath@novell.com>
-
-	* test-485.cs: New test from #77180.
-
-	* test-484.cs: New test based on #77200.
-
-	* test-xml-050.cs: Set output to xml-050.xml, not xml-050.cs.
-	* gtest-233.cs: Rename from gtest-233-exe.cs.
-
-2006-01-09  Raja R Harinath  <rharinath@novell.com>
-
-	* Makefile (TEST_ILS): New list of CIL test libraries.
-	* test-483-lib.il, test-483.cs: New test from #75636.
-
 2005-12-21  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
 	* gtest-friend-00-lib.cs: Include the public key in 
diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 43dac1baa97..fd283e2ee4b 100644
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -61,9 +61,7 @@ COMPILER = $(topdir)/class/lib/$(PROFILE)/mcs.exe
 TEST_PATTERN = 'test-*.cs'
 endif
 
-TEST_ILS := $(wildcard *-lib.il)
-
-run-test-local: $(TEST_ILS:.il=.dll)
+run-test-local: test-377-lib.dll test-443-lib.dll
 	MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe positive $(TEST_PATTERN) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
 
 # do nothing for this target
diff --git a/mcs/tests/gtest-233-exe.cs b/mcs/tests/gtest-233-exe.cs
new file mode 100644
index 00000000000..ea331614261
--- /dev/null
+++ b/mcs/tests/gtest-233-exe.cs
@@ -0,0 +1,18 @@
+// Compiler options: /r:gtest-233-lib.dll
+// Dependencies: gtest-233-lib.cs
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+class Program
+{
+	static void Main (string[] args)
+	{
+		MyClass<int> list = new MyClass<int>();
+
+		list.ListChanged += new ListChangedEventHandler (list_ListChanged);
+	}
+
+	static void list_ListChanged (object sender, ListChangedEventArgs e) { }
+}
diff --git a/mcs/tests/gtest-233.cs b/mcs/tests/gtest-233.cs
deleted file mode 100644
index 8a52828d070..00000000000
--- a/mcs/tests/gtest-233.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Compiler options: /r:gtest-233-lib.dll
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-
-class Program
-{
-	static void Main (string[] args)
-	{
-		MyClass<int> list = new MyClass<int>();
-
-		list.ListChanged += new ListChangedEventHandler (list_ListChanged);
-	}
-
-	static void list_ListChanged (object sender, ListChangedEventArgs e) { }
-}
diff --git a/mcs/tests/gtest-235-exe.cs b/mcs/tests/gtest-235-exe.cs
new file mode 100755
index 00000000000..7af72fa9325
--- /dev/null
+++ b/mcs/tests/gtest-235-exe.cs
@@ -0,0 +1,12 @@
+// Compiler options: /r:gtest-235-lib.dll
+// Dependencies: gtest-235-lib.cs
+using System;
+
+class GettingStarted
+{
+	public static void Main ()
+	{
+		MyList<string> names = new MyList<string> ();
+		names.AddAll<string> ();
+	}
+}
diff --git a/mcs/tests/gtest-235.cs b/mcs/tests/gtest-235.cs
deleted file mode 100755
index 9a3ea01098a..00000000000
--- a/mcs/tests/gtest-235.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Compiler options: /r:gtest-235-lib.dll
-using System;
-
-class GettingStarted
-{
-	public static void Main ()
-	{
-		MyList<string> names = new MyList<string> ();
-		names.AddAll<string> ();
-	}
-}
diff --git a/mcs/tests/gtest-xml-1-ref.xml b/mcs/tests/gtest-xml-1-ref.xml
deleted file mode 100644
index a90f1e3b8ac..00000000000
--- a/mcs/tests/gtest-xml-1-ref.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>gtest-xml-1</name>
-    </assembly>
-    <members>
-        <member name="T:GenericClass`1">
-            <summary>This file throws an error when compiled with XML documentation</summary>
-        </member>
-        <member name="M:GenericClass`1.#ctor(`0)">
-            <summary>This line caused bug #77183</summary>
-        </member>
-    </members>
-</doc>
diff --git a/mcs/tests/gtest-xml-1.cs b/mcs/tests/gtest-xml-1.cs
deleted file mode 100644
index d2a2dc460b4..00000000000
--- a/mcs/tests/gtest-xml-1.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Compiler options: -doc:gxml-1.xml
-using System; 
-
-///<summary>This file throws an error when compiled with XML documentation</summary>
-public class GenericClass <gT>
-{
-    gT m_data; 
-
-    ///<summary>This line caused bug #77183</summary>
-    public GenericClass (gT Data)
-    {
-        m_data = Data; 
-    }
-}
-
-class Foo
-{
-    public static void Main () {}
-}
diff --git a/mcs/tests/known-issues-gmcs b/mcs/tests/known-issues-gmcs
index 91ac1488ade..12ee344f680 100644
--- a/mcs/tests/known-issues-gmcs
+++ b/mcs/tests/known-issues-gmcs
@@ -4,18 +4,13 @@
 # csXXXX.cs		: test case causes error
 # csXXXX.cs IGNORE 	: adds test to ignore list
 
+test-442.cs IGNORE		# Causes runtime to crash
 test-50.cs IGNORE	# Windows-only test
 test-67.cs IGNORE	# Windows-only test
 test-anon-27.cs
 test-xml-027.cs
 test-465.cs IGNORE	# need to fix the path separator to work both on Unix and Windows
 test-476.cs
-test-491.cs
-test-cls-01.cs
-test-partial-07.cs
-test-partial-11.cs
-test-partial-12.cs
-test-492.cs
 
 test-473.cs
 
diff --git a/mcs/tests/test-19.cs b/mcs/tests/test-19.cs
index b04589cdc95..f63dff52958 100644
--- a/mcs/tests/test-19.cs
+++ b/mcs/tests/test-19.cs
@@ -111,12 +111,4 @@ namespace NameSpace {
 	public delegate int TestDelegate (int a);
 
 }
-
-
-namespace TestNamespace
-{
-	public class TestClass
-	{
-		public delegate float NotWorkingDelegate(float point, params object [] hiddenParams);
-	}
-}
+	
diff --git a/mcs/tests/support-353.cs b/mcs/tests/test-353-p2.cs
index 6bc4004f797..6bc4004f797 100644
--- a/mcs/tests/support-353.cs
+++ b/mcs/tests/test-353-p2.cs
diff --git a/mcs/tests/test-353.cs b/mcs/tests/test-353.cs
index 5aa753fdc2d..b24bca1e48c 100644
--- a/mcs/tests/test-353.cs
+++ b/mcs/tests/test-353.cs
@@ -1,4 +1,4 @@
-// Compiler options: support-353.cs -out:test-353.exe
+// Compiler options: test-353-p2.cs /out:test-353.exe
 
 using System;
  
diff --git a/mcs/tests/support-361.cs b/mcs/tests/test-361-p2.cs
index 99ea411a791..99ea411a791 100644
--- a/mcs/tests/support-361.cs
+++ b/mcs/tests/test-361-p2.cs
diff --git a/mcs/tests/test-361.cs b/mcs/tests/test-361.cs
index c3b712e5c7d..c2e9da671b3 100644
--- a/mcs/tests/test-361.cs
+++ b/mcs/tests/test-361.cs
@@ -1,4 +1,4 @@
-// Compiler options: support-361.cs -out:test-361.exe
+// Compiler options: test-361-p2.cs /out:test-361.exe
 
 [X]
 class Test {
diff --git a/mcs/tests/support-388.cs b/mcs/tests/test-388-p2.cs
index 282ec3cc86d..282ec3cc86d 100644
--- a/mcs/tests/support-388.cs
+++ b/mcs/tests/test-388-p2.cs
diff --git a/mcs/tests/test-388.cs b/mcs/tests/test-388.cs
index 7110eb4ab34..1f2e8822799 100644
--- a/mcs/tests/test-388.cs
+++ b/mcs/tests/test-388.cs
@@ -1,6 +1,6 @@
 // This is used to debug an ordering dependent bug.
 //
-// Compiler options: support-388.cs -out:test-388.exe
+// Compiler options: test-388-p2.cs /out:test-388.exe
 
 namespace Schemas {
     [System.Xml.Serialization.XmlType("base-field-type"),
diff --git a/mcs/tests/support-389.cs b/mcs/tests/test-389-p2.cs
index a4e89a1c7a7..a4e89a1c7a7 100644
--- a/mcs/tests/support-389.cs
+++ b/mcs/tests/test-389-p2.cs
diff --git a/mcs/tests/test-389.cs b/mcs/tests/test-389.cs
index 22a13cffa82..ef8bef1ca25 100644
--- a/mcs/tests/test-389.cs
+++ b/mcs/tests/test-389.cs
@@ -1,6 +1,6 @@
 // This is used to debug an ordering dependent bug.
 //
-// Compiler options: support-389.cs -out:test-389.exe
+// Compiler options: test-389-p2.cs /out:test-389.exe
 
 using System;
 using System.Collections;
diff --git a/mcs/tests/test-473.cs b/mcs/tests/test-473.cs
index f809787d8a9..ea349737ef8 100644
--- a/mcs/tests/test-473.cs
+++ b/mcs/tests/test-473.cs
@@ -7,14 +7,6 @@ public enum Error {
 	ERANGE = TestConst.C,

 	EANOTHER = ERANGE,

 }
-
-public enum Error_2 {
-	[Obsolete ("Use A", true)]

-	ERANGE,

-	[Obsolete ("Use B", true)]

-	EANOTHER = ERANGE,

-}
-

 

 [Obsolete ("Use Native.SignalHandler", true)]

 public delegate void SignalHandler (int signal);

@@ -79,19 +71,6 @@ public class Syscall : XX {
 	}

 }

 

-

-[Obsolete ("test me", true)]

-partial struct PS

-{

-}

-

-partial struct PS

-{

-	[Obsolete ("Use Errno", true)]
-	public static void GetDescription (Error e) {}
-}

-

-

 class Test {
 	public static void Main () {
 	}
diff --git a/mcs/tests/test-483-lib.il b/mcs/tests/test-483-lib.il
deleted file mode 100644
index adc80ca3296..00000000000
--- a/mcs/tests/test-483-lib.il
+++ /dev/null
@@ -1,24 +0,0 @@
-.assembly 'test-483-lib' {}
-.assembly extern mscorlib {}
-
-.class public auto ansi beforefieldinit Foo {
-
-    .method famorassem virtual  newslot 
-           instance default object clone ()  cil managed
-	{
-		.maxstack 8
-		ldarg.0
-		ret
-	}
-}
-
-.class public auto ansi Bar extends Foo {
-
-    .method public virtual 
-           instance default object clone ()  cil managed
-	{
-		.maxstack 8
-		ldarg.0
-		ret
-	}
-}
diff --git a/mcs/tests/test-483.cs b/mcs/tests/test-483.cs
deleted file mode 100644
index 666ae5d83d3..00000000000
--- a/mcs/tests/test-483.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Compiler options: -r:test-483-lib.dll
-
-using System;
-
-public class Tests {
-
-	public static void Main () {
-		Bar bar = null;
-		try { bar.clone (); } catch (NullReferenceException) {}
-	}
-}
diff --git a/mcs/tests/test-484.cs b/mcs/tests/test-484.cs
deleted file mode 100644
index ea6e1914ac7..00000000000
--- a/mcs/tests/test-484.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-namespace Test
-{
-        public class TestBit {
-		const bool a00 = false & false;
-		const bool a01 = false & true;
-		const bool a10 = true  & false;
-		const bool a11 = true  & true;
-
-		const bool o00 = false | false;
-		const bool o01 = false | true;
-		const bool o10 = true  | false;
-		const bool o11 = true  | true;
-
-		const bool x00 = false ^ false;
-		const bool x01 = false ^ true;
-		const bool x10 = true  ^ false;
-		const bool x11 = true  ^ true;
-
-		const bool correct = !a00 & !a01 & !a10 & a11 & !o00 & o01 & o10 & o11 & !x00 & x01 & x10 & !x11;
-
-                public static void Main()
-                {
-			if (!correct)
-				throw new Exception ();
-                }
-        }
-}
diff --git a/mcs/tests/test-485.cs b/mcs/tests/test-485.cs
deleted file mode 100644
index 909fc5f8f6e..00000000000
--- a/mcs/tests/test-485.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Compiler options: /checked+
-
-using System;
-
-
-public class MonoBUG
-{
-	public static void Main (string[] args)
-	{
-		double B = 4.0;
-		double K = 2.0;
-		double A = - B / (K * K);
-
-		Console.WriteLine ("{0}", A);
-	}
-}
diff --git a/mcs/tests/test-486.cs b/mcs/tests/test-486.cs
deleted file mode 100644
index 91dd76b4aa0..00000000000
--- a/mcs/tests/test-486.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-public class Test
-{
-	public static void Main ()
-	{
-		string[] aPath = {"a","b"};
-		char c = '.';
-		if (c.ToString () != ".")
-			throw new Exception ("c.ToString () is not \".\"");
-		string erg = "";
-		erg += String.Join (c.ToString (), aPath);
-		if (erg != "a.b")
-			throw new Exception ("erg is " + erg);
-	}
-}
diff --git a/mcs/tests/test-487.cs b/mcs/tests/test-487.cs
deleted file mode 100644
index d692ea9b942..00000000000
--- a/mcs/tests/test-487.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-struct X {
-	int i;
-	static bool pass = false;
-	
-	X (object dummy)
-	{
-		X x = new X ();
-		x.i = 1;
-		int n = 0;
-
-		if ((this = x).i == 1)
-			n ++;
-		
-		if (this.i == 1)
-			n ++;
-		
-		pass = (n == 2);
-	}
-	static int Main ()
-	{
-		new X (null);
-		return pass ? 0 : 1;
-	}
-}
\ No newline at end of file
diff --git a/mcs/tests/test-488.cs b/mcs/tests/test-488.cs
deleted file mode 100644
index 62794ff50b8..00000000000
--- a/mcs/tests/test-488.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Collections;
-
-class P {
-	public int x;
-}
-
-struct Q {
-	public P p;
-	public Q (P p) { this.p = p; }
-}
-
-class Test {
-	static IEnumerable foo () { return null; }
-
-	static void Main ()
-	{
-		IEnumerable f = foo ();
-		if (f != null)
-			foreach (P p in f)
-				p.x = 0;
-		if (f != null)
-			foreach (Q q in f)
-				q.p.x = 0;
-	}
-}
diff --git a/mcs/tests/test-489.cs b/mcs/tests/test-489.cs
deleted file mode 100644
index 1f36b80aec3..00000000000
--- a/mcs/tests/test-489.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Compiler options: -r:FULL=System.dll
-
-extern alias FULL;
-using System;
-using NameValueCollection =
-FULL::System.Collections.Specialized.NameValueCollection;
-
-public class test
-{
-	static void Main () { }
-}
diff --git a/mcs/tests/test-491.cs b/mcs/tests/test-491.cs
deleted file mode 100644
index f64e6264509..00000000000
--- a/mcs/tests/test-491.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[AttrB]
-public class M {
-	public static void Main()
-	{
-	}
-}
-
-[AttrB]
-public class AttrA : System.Attribute {}
-
-public class AttrB : AttrA {}
diff --git a/mcs/tests/test-492.cs b/mcs/tests/test-492.cs
deleted file mode 100644
index 45ed1bdbfde..00000000000
--- a/mcs/tests/test-492.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;

-using System.Reflection;

-

-namespace Test {

-	[AttributeUsage (AttributeTargets.All, AllowMultiple = true)]

-	public class My1Attribute : Attribute

-	{

-		public My1Attribute (object o)

-		{

-			if (o != null)

-				throw new ApplicationException ();

-		}

-	}

-

-	public class My2Attribute : Attribute

-	{

-		public My2Attribute (string[] s)

-		{

-			if (s.Length != 0)

-				throw new ApplicationException ();

-		}

-	}

-

-	public class My3Attribute : Attribute

-	{

-		public My3Attribute (byte b)

-		{

-			if (b != 0xFF)

-				throw new ApplicationException ();

-		}

-	}

-

-	

-	[My3(unchecked((byte)-1))]

-	[My1((object)null)]

-	[My1(null)]

-	[My2(new string[0])]

-	public class Test {

-		static public int Main() {

-			System.Reflection.MemberInfo info = typeof (Test);

-			object[] attributes = info.GetCustomAttributes (false);

-			

-			if (attributes.Length != 4)

-				return 1;

-

-			for (int i = 0; i < attributes.Length; i ++) {

-				Console.WriteLine (attributes [i]);

-			}

-			

-			return 0;

-		}

-	}

-}

diff --git a/mcs/tests/test-anon-33.cs b/mcs/tests/test-anon-33.cs
deleted file mode 100644
index 6537567f5a0..00000000000
--- a/mcs/tests/test-anon-33.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// This test showed that there were cases where there was no
-// shared "ScopeInfo", and that we could not root and keep a "topmost"
-// variable in the compiler for a CaptureContext.
-//
-// This illustrates two roots of captured scopes, independent of
-// each other
-//
-
-using System;
-
-delegate void Do ();
-
-class T {
-        static void doit (int v) {
-                Console.WriteLine (v);
-        }
-        static void Main () {
-                Do[] arr = new Do [5];
-                for (int i = 0; i < 5; ++i) {
-                        arr [i] = delegate {doit (i);};
-                }
-                for (int i = 0; i < 5; ++i) {
-                        arr [i] ();
-                }
-{
-                for (int j = 0; j < 5; ++j) {
-                        arr [j] = delegate {doit (j);};
-                }
-}
-        }
-
-}
-
-
diff --git a/mcs/tests/test-anon-34.cs b/mcs/tests/test-anon-34.cs
deleted file mode 100644
index 3e75f7af74a..00000000000
--- a/mcs/tests/test-anon-34.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// This test is from Nigel Perry, Bugzilla #77060
-//
-// The issue here was that in the past we used to emit the
-// Scope initialization on first use, which is wrong as illustrated
-// in this test (the shared scope is not initialized for differnt
-// code paths).
-//
-// This test is a running test, ensuring that it runs
-//
-#region Using directives
-
-using System;
-using System.Collections;
-using System.Text;
-using System.Timers;
-
-#endregion
-
-namespace Delegates
-{ class Space
-  { public int Value;
-
-    public delegate void DoCopy();
-
-    public DoCopy CopyIt;
-
-    public void Leak(bool useArray, int max)
-    { DoCopy one = null;
-
-      if(useArray)
-      { 
-        int[] work;
-        
-        one = delegate 
-              { work = new int[max];
-              };
-      }
-      else
-      { 
-        one = delegate { int xans = (max + 1) * max / 2; };
-      }
-
-       Console.WriteLine("Here goes...");
-	one();
-	Console.WriteLine("... made it");
-    }
-  }
-
-  class Program
-  { static void SpaceLeak()
-    { Space s = new Space();
-
-      Console.WriteLine(s.Value);
-
-      s.Leak(false, 1);
-
-      Console.WriteLine(s.Value);
-    }
-
-    static void Main(string[] args)
-    { SpaceLeak();
-    }
-  }
-}
diff --git a/mcs/tests/test-anon-35.cs b/mcs/tests/test-anon-35.cs
deleted file mode 100644
index 42b6783c7ef..00000000000
--- a/mcs/tests/test-anon-35.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// This was a bug which was triggered because I removed a routine
-// inadvertently.   The routine was restored, and now the scopes
-// are initialized
-//
-using System;
-using System.Collections;
-using System.Reflection;
-
-public class CustomDict {
-	ArrayList data;
-
-	public CustomDict() { 
-		foreach (object o in this)
-			Console.WriteLine (o);
-	}
-
-	public IEnumerator GetEnumerator() {
-		if (data != null)
-			yield return 1;
-	}
-}
-
-public class Tests
-{
-
-	public static void Main () {
-		new CustomDict ();
-	}
-}
diff --git a/mcs/tests/test-cls-01.cs b/mcs/tests/test-cls-01.cs
index 977d7de0146..a3bda41a260 100644
--- a/mcs/tests/test-cls-01.cs
+++ b/mcs/tests/test-cls-01.cs
@@ -1,25 +1,10 @@
 using System;
 
-[assembly: CLSCompliant (true)]
-
-public class CLSClass
-{
+public class CLSClass {
+    
         public byte XX {
             get { return 5; }
         }
 
         public static void Main() {}
-}
-
-[CLSCompliant (false)]
-public partial class C1
-{
-}
-
-public partial class C1
-{
-	public void method (uint u)
-	{
-	}
-}
-
+}
\ No newline at end of file
diff --git a/mcs/tests/test-cls-11.cs b/mcs/tests/test-cls-11.cs
index d52f2cfec4c..e7e47e743e1 100644
--- a/mcs/tests/test-cls-11.cs
+++ b/mcs/tests/test-cls-11.cs
@@ -11,10 +11,6 @@ public abstract class CLSCLass_2 {
         public abstract void Test ();
 }
 
-public abstract class CLSClass_3 {
-        internal abstract void Test ();
-}
-
 public class MainClass {
         public static void Main () {
         }
diff --git a/mcs/tests/test-partial-05.cs b/mcs/tests/test-partial-05.cs
index e097bfc7864..9d7ee2dcd0d 100644
--- a/mcs/tests/test-partial-05.cs
+++ b/mcs/tests/test-partial-05.cs
@@ -12,11 +12,4 @@ partial class A : B {
 partial class A : iface {
 }
 
-
-partial class A2 : System.Object {
-}
-
-partial class A2 {
-}
-
 class D { static void Main () {} }
diff --git a/mcs/tests/test-partial-07.cs b/mcs/tests/test-partial-07.cs
index d3cb8f612d8..afb741f4fbf 100644
--- a/mcs/tests/test-partial-07.cs
+++ b/mcs/tests/test-partial-07.cs
@@ -1,37 +1,12 @@
 using System;
-using System.Reflection;
 using System.Runtime.InteropServices;
 
-[Test2]
+[Obsolete]
 public partial class Test
 { }
 
-
-[AttributeUsage(AttributeTargets.Struct)]
-public partial class TestAttribute: Attribute
-{
-}
-
-[AttributeUsage(AttributeTargets.All)]
-public partial class Test2Attribute: Attribute
-{
-}
-
-[TestAttribute]
-public struct Test_2 {
-}
-
 class X
 {
-	static int Main ()
-	{
-		if (Attribute.GetCustomAttributes (typeof (Test)).Length != 1)
-			return 1;
-
-		if (Attribute.GetCustomAttributes (typeof (Test_2)).Length != 1)
-			return 1;
-	
-		Console.WriteLine ("OK");
-		return 0;
-	}
+	static void Main ()
+	{ }
 }
diff --git a/mcs/tests/test-partial-08.cs b/mcs/tests/test-partial-08.cs
index 0d1bfca143a..34bcdadfa5f 100644
--- a/mcs/tests/test-partial-08.cs
+++ b/mcs/tests/test-partial-08.cs
@@ -11,13 +11,10 @@ public sealed partial class Foo
 
 public class PartialAbstractCompilationError
 {
-	public static int Main ()
+	public static void Main ()
 	{
 		if (typeof (Foo).IsAbstract || !typeof (Foo).IsSealed)
-			return 1;
-		
-		System.Console.WriteLine ("OK");
-		return 0;
+			throw new System.ApplicationException ();
 	}
 }
 
diff --git a/mcs/tests/test-partial-10.cs b/mcs/tests/test-partial-10.cs
deleted file mode 100644
index 3f7ce96c894..00000000000
--- a/mcs/tests/test-partial-10.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Compiler options: -langversion:default

-

-using System;

-

-namespace Test2

-{

-	public interface Base

-	{ }

-

-	public partial class Foo : Base

-	{

-		public static int f = 10;

-	}

-

-	public partial class Foo : Base

-	{

-		public static int f2 = 9;		

-	}

-}

-

-namespace Test3

-{

-	public interface Base

-	{ }

-

-	public partial struct Foo : Base

-	{

-		public static int f = 10;

-	}

-

-	public partial struct Foo : Base

-	{

-		public static int f2 = 9;

-	}

-}

-

-class X

-{

-	static int Main ()

-	{

-		if (Test2.Foo.f != 10)

-			return 1;

-		

-		if (Test2.Foo.f2 != 9)

-			return 1;

-		

-		if (Test3.Foo.f != 10)

-			return 1;

-

-		if (Test3.Foo.f2 != 9)

-			return 1;

-		

-		Console.WriteLine ("OK");

-		return 0;

-	}

-}

diff --git a/mcs/tests/test-partial-11.cs b/mcs/tests/test-partial-11.cs
deleted file mode 100644
index ee369cbaf70..00000000000
--- a/mcs/tests/test-partial-11.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;

-using System.Reflection;

-

-static partial class StaticClass

-{

-    public static string Name ()

-    {

-        return "OK";

-    }

-}

-

-partial class StaticClass2 {}

-static partial class StaticClass2 {}

-

-	

-public class MainClass

-{

-	static bool IsStatic (Type t)

-	{

-		Type type = typeof (StaticClass);

-		if (!type.IsAbstract || !type.IsSealed) {

-			Console.WriteLine ("Is not abstract sealed");

-			return false;

-		}

-        

-		if (type.GetConstructors ().Length > 0) {

-			Console.WriteLine ("Has constructor");

-			return false;

-		}

-		return true;

-	}

-

-    public static int Main ()

-    {

-        if (!IsStatic (typeof (StaticClass)))

-            return 1;

-

-		if (!IsStatic (typeof (StaticClass2)))

-			return 2;

-        

-        Console.WriteLine ("OK");

-        return 0;

-    }

-}
\ No newline at end of file
diff --git a/mcs/tests/test-partial-12.cs b/mcs/tests/test-partial-12.cs
deleted file mode 100644
index d7e547a2aaf..00000000000
--- a/mcs/tests/test-partial-12.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Compiler options: -langversion:default

-

-using System;

-

-namespace Test1

-{

-	public partial class Foo

-	{

-	   internal static System.Collections.IEnumerable E ()

-	   {

-		   yield return "a";

-	   }

-	}

-}

-

-class X

-{

-	static int Main ()

-	{

-		foreach (string s in Test1.Foo.E())

-		{

-			Console.WriteLine (s);

-			if (s != "a")

-				return 1;

-			

-			return 0;

-		}

-		return 2;

-	}

-}

diff --git a/mcs/tests/test-xml-050.cs b/mcs/tests/test-xml-050.cs
index 5be57b7f10f..d1edc58f2b8 100644
--- a/mcs/tests/test-xml-050.cs
+++ b/mcs/tests/test-xml-050.cs
@@ -1,4 +1,4 @@
-// Compiler options: -doc:xml-050.xml -warnaserror
+// Compiler options: -doc:xml-050.cs -warnaserror
 // see bug #76954.
 // NOTE: It might got broken after some /doc related merge.
 /// <summary>
diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index ab9d582f771..038f2c94196 100644
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,7 +1,3 @@
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : added mono-xmltool.
-
 2005-12-12  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (DIST_ONLY_SUBDIRS): Add 'xbuild'.
diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index c84fa184b90..53b10332543 100644
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -2,8 +2,8 @@ thisdir = tools
 SUBDIRS = \
 	al cilc corcompare ictool mono-xsd security wsdl genxs sqlsharp		\
 	disco soapsuds browsercaps-updater monop gacutil	\
-	resgen macpack mkbundle dtd2rng dtd2xsd mjs prj2make mono-service \
-	mono-shlib-cop compiler-tester mono-xmltool
+	resgen macpack mkbundle dtd2xsd mjs prj2make mono-service \
+	mono-shlib-cop compiler-tester
 
 net_1_1_bootstrap_SUBDIRS = gacutil security
 
diff --git a/mcs/tools/corcompare/ChangeLog b/mcs/tools/corcompare/ChangeLog
index aef2092f410..91439a71e26 100644
--- a/mcs/tools/corcompare/ChangeLog
+++ b/mcs/tools/corcompare/ChangeLog
@@ -1,9 +1,3 @@
-2006-01-26  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* mono-api-info.cs
-	  mono-api-diff.cs : show MethodAttributes difference (as long as
-	  they make sense).
-
 2005-12-13  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* mono-api.xsl : tiny checked="checked" sanitization.
diff --git a/mcs/tools/corcompare/mono-api-diff.cs b/mcs/tools/corcompare/mono-api-diff.cs
index b4983c0590e..d4843aba1bd 100644
--- a/mcs/tools/corcompare/mono-api-diff.cs
+++ b/mcs/tools/corcompare/mono-api-diff.cs
@@ -1280,6 +1280,9 @@ namespace Mono.AssemblyCompare
 				}
 			}
 
+			if (!CheckAttributes)
+				return;
+
 			XMLMember member = (XMLMember) other;
 			string acc = access [name] as string;
 			if (acc == null)
@@ -1302,6 +1305,12 @@ namespace Mono.AssemblyCompare
 		{
 			return null;
 		}
+
+		protected virtual bool CheckAttributes {
+			get {
+				return true;
+			}
+		}
 	}
 	
 	class XMLFields : XMLMember
@@ -1360,6 +1369,14 @@ namespace Mono.AssemblyCompare
 			return fa.ToString ();
 		}
 
+		protected override bool CheckAttributes {
+			get {
+				// FIXME: set this to true once bugs #60086 and 
+				// #60090 are fixed
+				return false;
+			}
+		}
+
 		public override string GroupName {
 			get { return "fields"; }
 		}
@@ -1698,12 +1715,6 @@ namespace Mono.AssemblyCompare
 		protected override string ConvertToString (int att)
 		{
 			MethodAttributes ma = (MethodAttributes) att;
-			// ignore ReservedMasks
-			ma &= ~ MethodAttributes.ReservedMask;
-			ma &= ~ MethodAttributes.VtableLayoutMask;
-			if ((ma & MethodAttributes.FamORAssem) != 0)
-				ma = (ma & ~ MethodAttributes.FamORAssem) | MethodAttributes.Family;
-
 			// ignore the HasSecurity attribute for now
 			if ((ma & MethodAttributes.HasSecurity) != 0)
 				ma = (MethodAttributes) (att - (int) MethodAttributes.HasSecurity);
@@ -1719,6 +1730,14 @@ namespace Mono.AssemblyCompare
 			return ma.ToString ();
 		}
 
+		protected override  bool CheckAttributes {
+			get {
+				// FIXME: set this to true once bugs #60086 and 
+				// #60090 are fixed
+				return false;
+			}
+		}
+
 		public override string GroupName {
 			get { return "methods"; }
 		}
diff --git a/mcs/tools/corcompare/mono-api-info.cs b/mcs/tools/corcompare/mono-api-info.cs
index 37b3a63da1b..5e182dc5235 100644
--- a/mcs/tools/corcompare/mono-api-info.cs
+++ b/mcs/tools/corcompare/mono-api-info.cs
@@ -633,7 +633,7 @@ namespace Mono.AssemblyInfo
 			AddAttribute (p, "params", parms);
 
 			MethodData data = new MethodData (document, p, methods);
-			//data.NoMemberAttributes = true;
+			data.NoMemberAttributes = true;
 			data.DoOutput ();
 		}
 
diff --git a/mcs/tools/mjs/ChangeLog b/mcs/tools/mjs/ChangeLog
index 2795d359efb..6707afb0e2a 100644
--- a/mcs/tools/mjs/ChangeLog
+++ b/mcs/tools/mjs/ChangeLog
@@ -1,11 +1,3 @@
-2006-01-11 Evan Briones <evan@evanbriones.com>
-	
-	* mjs.cs: Fixed out by adding SetOption to the compiler engine.
-
-2006-01-08  Cesar Lopez Nataren  <cnataren@novell.com>
-
-	* mjs.cs: Add support for nostdlib, out, pkg and reference.
-
 2005-09-13  Cesar Lopez Nataren  <cnataren@novell.com>
 
 	* mjs.cs: Add support for flags parsing.
diff --git a/mcs/tools/mjs/mjs.cs b/mcs/tools/mjs/mjs.cs
index 48afccbe150..dafc67fac00 100644
--- a/mcs/tools/mjs/mjs.cs
+++ b/mcs/tools/mjs/mjs.cs
@@ -5,7 +5,7 @@
 //	Cesar Lopez Nataren (cesar@ciencias.unam.mx)
 //
 // (C) 2003, Cesar Lopez Nataren
-// (C) Copyright 2005, 2006, Novell Inc. (http://www.novell.com)
+// (C) Copyright 2005, Novell Inc. (http://www.novell.com)
 //
 
 //
@@ -36,7 +36,6 @@ using Microsoft.Vsa;
 using Microsoft.JScript;
 using System.Reflection;
 using System.Collections;
-using System.Diagnostics;
 using Microsoft.JScript.Vsa;
 using System.Reflection.Emit;
 using Mono.CSharp;
@@ -64,33 +63,25 @@ namespace Mono.JScript {
 
 		private static Assembly [] assemblies = new Assembly [0];
 
-		private static bool StdLib = true;
+		private static bool StdLib;
 
 		private static void Usage ()
 		{
 			Console.WriteLine ("Mono JScript compiler\n" +
-					   "Copyright (C) 2003 - 2004 Cesar Lopez Nataren\n" +
-					   "Copyright (C) 2004 - 2006 Novell Inc (http://novell.com)\n\n" +
+					   "(C) 2003 - 2004 Cesar Lopez Nataren\n" +
+					   "(C) 2004 - 2005 Novell Inc (http://novell.com)\n\n" +
 					   "mjs [options] source-file\n" +
 					   "   /about              About the Mono JScript compiler\n" +
 					   "   /lib:PATH1,PATH2    Adds the paths to the assembly link path\n" +
-					   "   /nostdlib[+|-]      Does not load core libraries\n" +
-					   "   /out:<file>         Specify name of binary output file\n" +
-					   "   /pkg:P1[,Pn]        References packages P1..Pn\n" +
-					   "   /r[eference]:ASS    Reference the specified assembly\n" +
-
-					   "\n" +
-					   "Resources:\n" +
-					   "   @file               Read response file for more options\n\n" +
-					   "Options can be of the form -option or /option");
+					   "   /r[eference]:ASS    Reference the specified assembly\n");
 		}
 
 		private static void About ()
 		{
 			Console.WriteLine (
 					   "The Mono JScript compiler is:\n" +
-					   "Copyright (C) 2003 - 2004 Cesar Lopez Nataren\n" +
-					   "Copyright (C) 2004 - 2006 Novell Inc.\n\n" +
+					   "(C) 2003 - 2004 Cesar Lopez Nataren\n" +
+					   "(C) 2004 - 2005 Novell Inc.\n\n" +
 					   "The compiler source code is released under the terms of both the MIT X11 and MPL\n" +
 					   "The compiler was written by Cesar Lopez Nataren");
 			Environment.Exit (0);
@@ -103,6 +94,7 @@ namespace Mono.JScript {
 		{
 			foreach (string r in references)
 				LoadAssembly (r, false);
+			return;
 		}
 
 		private static void LoadAssembly (string assembly, bool soft)
@@ -163,10 +155,10 @@ namespace Mono.JScript {
 			Assembly [] n = new Assembly [top + 1];
 
 			assemblies.CopyTo (n, 0);
-
+		
 			n [top] = a;
 			assemblies = n;
-		}
+ 		}
 
 		static string [] LoadArgs (string file)
 		{
@@ -263,7 +255,7 @@ namespace Mono.JScript {
 					Usage ();
 					Environment.Exit (1);
 				}
-
+				
 				references.Add (args [++i]);
 				return true;
 				
@@ -311,47 +303,6 @@ namespace Mono.JScript {
 				SetOutputFile (value);
 				return true;
 
-			case "/pkg":
-				string packages;
-
-				if (value == String.Empty) {
-					Usage ();
-					Environment.Exit (1);
-				}
-				packages = String.Join (" ", value.Split (new Char [] { ';', ',', '\n', '\r'}));
-
-				ProcessStartInfo pi = new ProcessStartInfo ();
-				pi.FileName = "pkg-config";
-				pi.RedirectStandardOutput = true;
-				pi.UseShellExecute = false;
-				pi.Arguments = "--libs " + packages;
-				Process p = null;
-				try {
-					p = Process.Start (pi);
-				} catch (Exception e) {
-					Console.Error.WriteLine ("Couldn't run pkg-config: " + e.Message);
-					Environment.Exit (1);
-				}
-
-				if (p.StandardOutput == null){
-					Console.Error.WriteLine ("Specified package did not return any information");
-					return true;
-				}
-				string pkgout = p.StandardOutput.ReadToEnd ();
-				p.WaitForExit ();
-				if (p.ExitCode != 0) {
-					Console.Error.WriteLine ("Error running pkg-config. Check the above output.");
-					Environment.Exit (1);
-				}
-
-				if (pkgout != null){
-					string [] xargs = pkgout.Trim (new Char [] {' ', '\n', '\r', '\t'}).
-						Split (new Char [] { ' ', '\t'});
-					args = AddArgs (args, xargs);
-				}
-				p.Close ();
-				return true;
-
 			case "/r":
 			case "/reference": {
 				if (value == ""){
@@ -360,8 +311,9 @@ namespace Mono.JScript {
 				}
 
 				string [] refs = value.Split (new char [] { ';', ',' });
-				foreach (string r in refs)
+				foreach (string r in refs){
 					references.Add (r);
+				}
 				return true;
 			}
 
@@ -382,16 +334,6 @@ namespace Mono.JScript {
 			case "/about":
 				About ();
 				return true;
-
-
-			case "/nostdlib":
-			case "/nostdlib+":
-				StdLib = false;
-				return true;
-
-			case "/nostdlib-":
-				StdLib = true;
-				return true;
 			}
 			return false;
 		}
@@ -405,14 +347,18 @@ namespace Mono.JScript {
 			// split args into first half and second half based on '--'
 			// and add the extra_args before --
 			int split_position = Array.IndexOf (args, "--");
-			if (split_position != -1) {
-				Array.Copy (args, new_args, split_position);
-				extra_args.CopyTo (new_args, split_position);
-				Array.Copy (args, split_position, new_args, split_position + extra_args.Length, args.Length - split_position);
-			} else {
-				args.CopyTo (new_args, 0);
-				extra_args.CopyTo (new_args, args.Length);
-			}
+			if (split_position != -1)
+				{
+					Array.Copy (args, new_args, split_position);
+					extra_args.CopyTo (new_args, split_position);
+					Array.Copy (args, split_position, new_args, split_position + extra_args.Length, args.Length - split_position);
+				}
+			else
+				{
+					args.CopyTo (new_args, 0);
+					extra_args.CopyTo (new_args, args.Length);
+				}
+
 			return new_args;
 		}
 
@@ -589,6 +535,7 @@ namespace Mono.JScript {
 		// Entry point
 		//
 		private static void Main (string [] args) {
+	
 			if (args.Length < 1) {
 				Usage ();
 				Environment.Exit (0);
@@ -618,7 +565,6 @@ namespace Mono.JScript {
 			engine.SetOption ("link_path", link_paths);
 			engine.SetOption ("first_source", first_source);
 			engine.SetOption ("assemblies", assemblies);
-			engine.SetOption ("out", output_file);
 			engine.Compile ();
 		}
 
diff --git a/mcs/tools/mkbundle/ChangeLog b/mcs/tools/mkbundle/ChangeLog
index 874559c3c00..7d0fcc7cefc 100644
--- a/mcs/tools/mkbundle/ChangeLog
+++ b/mcs/tools/mkbundle/ChangeLog
@@ -1,7 +1,3 @@
-2005-12-29  Robert Jordan  <robertj@gmx.net>
-
-	* mkbundle.cs, template.c, template_z.c: Added support for Windows.
-
 2005-12-18 Alexandre Rocha Lima e Marcondes
 <alexandre@psl-pr.softwarelivre.org>
 
diff --git a/mcs/tools/mkbundle/TODO b/mcs/tools/mkbundle/TODO
index 58eb944c9a0..36397b20a94 100644
--- a/mcs/tools/mkbundle/TODO
+++ b/mcs/tools/mkbundle/TODO
@@ -8,25 +8,3 @@ Files:
 	* Need to trace a typical execution and locate the files that this
 	  will require at runtime, provide hooks of some form.
 
-Windows Issues:
-
---static doesn't work because libmono.a is not distributed with the
-Windows package.
-
-Not a big deal, because the needed dlls can be simply distributed with
-the mkbundle-generated executable.
-
-For example, a bundled XSP needs:
-
-mono-1.dll
-libglib*.dll
-libgmodule*.dll
-libgthread*.dll
-iconv.dll
-intl.dll
-
-(roundabout 10MB). This seems to be the minimal working set of dlls
-that have to be distributed with a bundled application.
-
--z doesn't work due to some weird cygwin zlib problems.
-
diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index 7fbda6bc581..959e0d6e146 100644
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -9,7 +9,6 @@
 // (C) Novell, Inc 2004
 //
 using System;
-using System.Diagnostics;
 using System.Xml;
 using System.Collections;
 using System.Reflection;
@@ -36,8 +35,6 @@ class MakeBundle {
 		ArrayList sources = new ArrayList ();
 		int top = args.Length;
 		link_paths.Add (".");
-
-		DetectOS ();
 		
 		for (int i = 0; i < top; i++){
 			switch (args [i]){
@@ -85,10 +82,6 @@ class MakeBundle {
 				keeptemp = true;
 				break;
 			case "--static":
-				if (style == "windows") {
-					Console.Error.WriteLine ("The option `{0}' is not supported on this platform.", args [i]);
-					return 1;
-				}
 				static_link = true;
 				Console.WriteLine ("Note that statically linking the LGPL Mono runtime has more licensing restrictions than dynamically linking.");
 				Console.WriteLine ("See http://www.mono-project.com/Licensing for details on licensing.");
@@ -110,10 +103,6 @@ class MakeBundle {
 				config_dir = args [++i];
 				break;
 			case "-z":
-				if (style == "windows") {
-					Console.Error.WriteLine ("The option `{0}' is not supported on this platform.", args [i]);
-					return 1;
-				}
 				compress = true;
 				break;
 			default:
@@ -122,6 +111,8 @@ class MakeBundle {
 			}
 		}
 
+		DetectOS ();
+
 		Console.WriteLine ("Sources: {0} Auto-dependencies: {1}", sources.Count, autodeps);
 		if (sources.Count == 0 || output == null) {
 			Help ();
@@ -162,14 +153,6 @@ class MakeBundle {
 				"_{0}:\n",
 				name, size);
 			break;
-		case "windows":
-			sw.WriteLine (
-				".globl _{0}\n" +
-				"\t.section .rdata,\"dr\"\n" +
-				"\t.align 32\n" +
-				"_{0}:\n",
-				name, size);
-			break;
 		}
 	}
 	
@@ -177,7 +160,7 @@ class MakeBundle {
 	{
 		string temp_s = "temp.s"; // Path.GetTempFileName ();
 		string temp_c = "temp.c";
-		string temp_o = "temp.o";
+		string temp_o = Path.GetTempFileName () + ".o";
 
 		if (compile_only)
 			temp_c = output;
@@ -204,8 +187,8 @@ class MakeBundle {
 			}
 
 			foreach (string url in files){
-				string fname = new Uri (url).LocalPath;
-				string aname = Path.GetFileName (fname);
+				string fname = url.Substring (7);
+				string aname = fname.Substring (fname.LastIndexOf ("/") + 1);
 				string encoded = aname.Replace ("-", "_").Replace (".", "_");
 
 				if (prog == null)
@@ -296,8 +279,9 @@ class MakeBundle {
 			ts.Close ();
 			
 			Console.WriteLine ("Compiling:");
-			string cmd = String.Format ("{0} -o {1} {2} ", GetEnv ("AS", "as"), temp_o, temp_s);
-			int ret = Execute (cmd);
+			string cmd = String.Format ("as -o {0} {1} ", temp_o, temp_s);
+			Console.WriteLine (cmd);
+			int ret = system (cmd);
 			if (ret != 0){
 				Error ("[Fail]");
 				return;
@@ -344,7 +328,6 @@ class MakeBundle {
 
 			string zlib = (compress ? "-lz" : "");
 			string debugging = "-g";
-			string cc = GetEnv ("CC", IsUnix ? "cc" : "gcc -mno-cygwin");
 
 			if (style == "linux")
 				debugging = "-ggdb";
@@ -354,17 +337,18 @@ class MakeBundle {
 					smonolib = "`pkg-config --variable=libdir mono`/libmono.a ";
 				else
 					smonolib = "-Wl,-Bstatic -lmono -Wl,-Bdynamic ";
-				cmd = String.Format ("{4} -o {2} -Wall `pkg-config --cflags mono` {0} {3} " +
+				cmd = String.Format ("cc -o {2} -Wall `pkg-config --cflags mono` {0} {3}" +
 						     "`pkg-config --libs-only-L mono` " + smonolib +
 						     "`pkg-config --libs-only-l mono | sed -e \"s/\\-lmono //\"` {1}",
-						     temp_c, temp_o, output, zlib, cc);
+						     temp_c, temp_o, output, zlib);
 			} else {
 				
-				cmd = String.Format ("{4} " + debugging + " -o {2} -Wall {0} `pkg-config --cflags --libs mono` {3} {1}",
-						     temp_c, temp_o, output, zlib, cc);
+				cmd = String.Format ("cc " + debugging + " -o {2} -Wall {0} `pkg-config --cflags --libs mono` {3} {1}",
+						     temp_c, temp_o, output, zlib);
 			}
                             
-			ret = Execute (cmd);
+			Console.WriteLine (cmd);
+			ret = system (cmd);
 			if (ret != 0){
 				Error ("[Fail]");
 				return;
@@ -411,7 +395,7 @@ class MakeBundle {
 			return;
 
 		files.Add (codebase);
-		Assembly a = Assembly.LoadFrom (new Uri(codebase).LocalPath);
+		Assembly a = Assembly.LoadFrom (codebase);
 
 		if (!autodeps)
 			return;
@@ -486,7 +470,7 @@ class MakeBundle {
 				   "    --config F      Bundle system config file `F'\n" +
 				   "    --config-dir D  Set MONO_CFG_DIR to `D'\n" +
 				   "    --static        Statically link to mono libs\n" +
-				   "    -z              Compress the assemblies before embedding.\n");
+				   "    -z		Compress the assemblies before embedding.\n");
 	}
 
 	[DllImport ("libc")]
@@ -496,12 +480,6 @@ class MakeBundle {
 		
 	static void DetectOS ()
 	{
-		if (!IsUnix) {
-			Console.WriteLine ("OS is: Windows");
-			style = "windows";
-			return;
-		}
-
 		IntPtr buf = UnixMarshal.AllocHeap(8192);
 		if (uname (buf) != 0){
 			Console.WriteLine ("Warning: Unable to detect OS");
@@ -514,29 +492,6 @@ class MakeBundle {
 		
 		UnixMarshal.FreeHeap(buf);
 	}
-
-	static bool IsUnix {
-		get {
-			int p = (int) Environment.OSVersion.Platform;
-			return ((p == 4) || (p == 128));
-		}
-	}
-
-	static int Execute (string cmdLine)
-	{
-		Console.WriteLine (cmdLine);
-		if (IsUnix) {
-			return system (cmdLine);
-		} else {
-			Process p = Process.Start ("sh", String.Format ("-c \"{0}\"", cmdLine));
-			p.WaitForExit ();
-			return p.ExitCode;
-		}
-	}
-
-	static string GetEnv (string name, string defaultValue) 
-	{
-		string s = Environment.GetEnvironmentVariable (name);
-		return s != null ? s : defaultValue;
-	}
+	
 }
+
diff --git a/mcs/tools/mkbundle/template.c b/mcs/tools/mkbundle/template.c
index 86fa34c704c..74f2d6a6fd4 100644
--- a/mcs/tools/mkbundle/template.c
+++ b/mcs/tools/mkbundle/template.c
@@ -14,7 +14,7 @@ int main (int argc, char* argv[])
 	newargs [++i] = NULL;
 
 	if (config_dir != NULL && getenv ("MONO_CFG_DIR") == NULL)
-		mono_set_dirs (getenv ("MONO_PATH"), config_dir);
+		setenv ("MONO_CFG_DIR", config_dir, 1);
 	
 	install_dll_config_files ();
 	mono_register_bundled_assemblies(bundled);
diff --git a/mcs/tools/mkbundle/template_z.c b/mcs/tools/mkbundle/template_z.c
index 053cdba5683..a0bdecd616f 100644
--- a/mcs/tools/mkbundle/template_z.c
+++ b/mcs/tools/mkbundle/template_z.c
@@ -55,7 +55,7 @@ int main (int argc, char* argv[])
 	newargs [++i] = NULL;
 
 	if (config_dir != NULL && getenv ("MONO_CFG_DIR") == NULL)
-		mono_set_dirs (getenv ("MONO_PATH"), config_dir);
+		setenv ("MONO_CFG_DIR", config_dir, 1);
 
 	install_dll_config_files ();
 
diff --git a/mcs/tools/mono-xmltool/ChangeLog b/mcs/tools/mono-xmltool/ChangeLog
deleted file mode 100644
index c5405bab106..00000000000
--- a/mcs/tools/mono-xmltool/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-2006-02-02  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* xmltool.cs : Optional 3rd. argument to --transform is now output
-	  filename.
-
-2006-02-02  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* xmltool.cs : handle multiple input files. Thanks to Alp for the hint.
-
-2006-01-31  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* xmltool.cs :
-	  Added --prettyprint support.
-	  All warning/error messages are now written on stderr.
-
-2006-01-30 Boris Kirzner <borisk@mainsoft.com>
-	* xmltool.cs: added #ifdef for features not supported in TARGET_JVM.
-	* XmlTool.sln, XmlTool.vmwcsproj: added project and solution files 
-	for TARGET_JVM. 
-	* nunit_transform.xslt: added xsl transformation for nunit tests.
-
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* xmltool.cs : actually environment variable was not handled.
-
-2006-01-30  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* xmltool.cs, Makefile, mono-xmltool.exe.sources : new files.
diff --git a/mcs/tools/mono-xmltool/Makefile b/mcs/tools/mono-xmltool/Makefile
deleted file mode 100644
index fc39f8298ab..00000000000
--- a/mcs/tools/mono-xmltool/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-thisdir = tools/mono-xmltool
-SUBDIRS = 
-include ../../build/rules.make
-
-LOCAL_MCS_FLAGS = -r:System.Xml.dll -r:Commons.Xml.Relaxng.dll
-PROGRAM = mono-xmltool.exe
-
-include ../../build/executable.make
diff --git a/mcs/tools/mono-xmltool/XmlTool.sln b/mcs/tools/mono-xmltool/XmlTool.sln
deleted file mode 100644
index bd604fc850b..00000000000
--- a/mcs/tools/mono-xmltool/XmlTool.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "XmlTool", "XmlTool.vmwcsproj", "{087B262E-5E5C-4A82-BDF0-224557BE6696}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug_Java = Debug_Java

-		Release_Java = Release_Java

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Debug_Java.ActiveCfg = Debug_Java|.NET

-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Debug_Java.Build.0 = Debug_Java|.NET

-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Release_Java.ActiveCfg = Release_Java|.NET

-		{087B262E-5E5C-4A82-BDF0-224557BE6696}.Release_Java.Build.0 = Release_Java|.NET

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/mcs/tools/mono-xmltool/XmlTool.vmwcsproj b/mcs/tools/mono-xmltool/XmlTool.vmwcsproj
deleted file mode 100644
index 9be7abec4bf..00000000000
--- a/mcs/tools/mono-xmltool/XmlTool.vmwcsproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<VisualStudioProject>

-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{087B262E-5E5C-4A82-BDF0-224557BE6696}">

-		<Build>

-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="xmltool" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Exe" PreBuildEvent="" PostBuildEvent="" RootNamespace="XslTransformer" RunPostBuildEvent="OnBuildSuccess" StartupObject="">

-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>

-			</Settings>

-			<References>

-				<Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>

-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>

-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>

-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>

-			</References>

-		</Build>

-		<Files>

-			<Include>

-				<File RelPath="xmltool.cs" SubType="Code" BuildAction="Compile"/>

-			</Include>

-		</Files>

-		<UserProperties REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" project.JDKType="1.5.0_05"/>

-	</CSHARP>

-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>

diff --git a/mcs/tools/mono-xmltool/mono-xmltool.exe.sources b/mcs/tools/mono-xmltool/mono-xmltool.exe.sources
deleted file mode 100644
index 08df107aa1c..00000000000
--- a/mcs/tools/mono-xmltool/mono-xmltool.exe.sources
+++ /dev/null
@@ -1,2 +0,0 @@
-xmltool.cs
-
diff --git a/mcs/tools/mono-xmltool/nunit_transform.xslt b/mcs/tools/mono-xmltool/nunit_transform.xslt
deleted file mode 100644
index 52c09e72ddd..00000000000
--- a/mcs/tools/mono-xmltool/nunit_transform.xslt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-

-<xsl:output method="text" indent="no"/>

-<xsl:strip-space elements="*" />

-

-<xsl:template match="/">

-            <xsl:apply-templates/>

-</xsl:template>

-

-<xsl:template match="//test-case[@success='False']">

-		<xsl:text>		

-		</xsl:text>	

-		<xsl:value-of select="@name" />	

-</xsl:template>

-

-<xsl:template match="test-results">

-	<xsl:if test="@failures!='0'">

-		<xsl:text>Failures number :</xsl:text>

-		<xsl:value-of select="@failures"/>

-				<xsl:text>

-		Failed tests:</xsl:text>

-		<xsl:apply-templates select="//test-case"/>

-	</xsl:if>

-</xsl:template>

-

-</xsl:stylesheet>

diff --git a/mcs/tools/mono-xmltool/xmltool.cs b/mcs/tools/mono-xmltool/xmltool.cs
deleted file mode 100644
index bdbfdaf3f6b..00000000000
--- a/mcs/tools/mono-xmltool/xmltool.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Xsl;
-using System.Xml.XPath;
-#if !TARGET_JVM
-using Commons.Xml.Nvdl;
-using Commons.Xml.Relaxng;
-using Commons.Xml.Relaxng.Rnc;
-#endif
-using XSchema = System.Xml.Schema.XmlSchema;
-
-namespace Commons.Xml.Relaxng
-{
-	public class Driver
-	{
-		public static void Main (string [] args)
-		{
-			try {
-				Run (args);
-				Console.Error.WriteLine ("done.");
-			} catch (Exception ex) {
-				if (Environment.GetEnvironmentVariable ("MONO_XMLTOOL_ERROR_DETAILS") == "yes")
-					Console.Error.WriteLine (ex);
-				else
-					Console.Error.WriteLine (ex.Message);
-			}
-		}
-
-		static void Usage ()
-		{
-			Console.Error.WriteLine (@"
-Usage: mono-xmltool [options]
-
-options:
-
-	--validate [*.rng | *.rnc | *.nvdl | *.xsd] [instances]
-	--validate-rng relax-ng-grammar-xml [instances]
-	--validate-rnc relax-ng-compact-grammar-file [instances]
-	--validate-nvdl nvdl-script-xml [instances]
-	--validate-xsd xml-schema [instances]
-	--transform stylesheet instance-xml [output-xml]
-	--prettyprint [source] [result]
-
-environment variable that affects on the behavior:
-
-	MONO_XMLTOOL_ERROR_DETAILS = yes : to get exception details.
-");
-		}
-
-		static void Run (string [] args)
-		{
-			if (args.Length == 0) {
-				Usage ();
-				return;
-			}
-
-			switch (args [0]) {
-			default:
-			case "--help":
-				Usage ();
-				return;
-#if !TARGET_JVM
-			case "--validate":
-				ValidateAuto (args);
-				return;
-			case "--validate-rnc":
-				ValidateRelaxngCompact (args);
-				return;
-			case "--validate-rng":
-				ValidateRelaxngXml (args);
-				return;
-			case "--validate-nvdl":
-				ValidateNvdl (args);
-				return;
-#endif
-			case "--validate-xsd":
-				ValidateXsd (args);
-				return;
-			case "--transform":
-				Transform (args);
-				return;
-			case "--prettyprint":
-				PrettyPrint (args);
-				return;
-			}
-		}
-
-#if !TARGET_JVM
-		static void ValidateAuto (string [] args)
-		{
-			if (args.Length < 1) {
-				Usage ();
-				return;
-			}
-
-			if (args [1].EndsWith ("rng"))
-				ValidateRelaxngXml (args);
-			else if (args [1].EndsWith ("rnc"))
-				ValidateRelaxngCompact (args);
-			else if (args [1].EndsWith ("nvdl"))
-				ValidateNvdl (args);
-			else if (args [1].EndsWith ("xsd"))
-				ValidateXsd (args);
-		}
-
-		static void ValidateRelaxngXml (string [] args)
-		{
-			XmlReader xr = new XmlTextReader (args [1]);
-			RelaxngPattern p = RelaxngPattern.Read (xr);
-			xr.Close ();
-			ValidateRelaxng (p, args);
-		}
-
-		static void ValidateRelaxngCompact (string [] args)
-		{
-			StreamReader sr = new StreamReader (args [1]);
-			RelaxngPattern p = RncParser.ParseRnc (sr);
-			sr.Close ();
-			ValidateRelaxng (p, args);
-		}
-
-		static void ValidateRelaxng (RelaxngPattern p, string [] args)
-		{
-			if (args.Length < 2)
-				return;
-
-			for (int i = 2; i < args.Length; i++) {
-				XmlTextReader xtr = new XmlTextReader (args [i]);
-				RelaxngValidatingReader vr = 
-					new RelaxngValidatingReader (xtr, p);
-				if (Environment.GetEnvironmentVariable ("MONO_XMLTOOL_ERROR_DETAILS") == "yes")
-					vr.ReportDetails = true;
-
-				while (!vr.EOF)
-					vr.Read ();
-			}
-		}
-
-		static void ValidateNvdl (string [] args)
-		{
-			XmlTextReader nvdlxtr = new XmlTextReader (args [1]);
-			NvdlRules nvdl = NvdlReader.Read (nvdlxtr);
-			nvdlxtr.Close ();
-			for (int i = 2; i < args.Length; i++) {
-				XmlTextReader xtr = new XmlTextReader (args [i]);
-				NvdlValidatingReader nvr = new NvdlValidatingReader (xtr, nvdl);
-				while (!nvr.EOF)
-					nvr.Read ();
-				xtr.Close ();
-			}
-		}
-#endif
-
-		static void ValidateXsd (string [] args)
-		{
-			XmlTextReader schemaxml = new XmlTextReader (args [1]);
-			XSchema xsd = XSchema.Read (schemaxml, null);
-			schemaxml.Close ();
-			for (int i = 2; i < args.Length; i++) {
-				XmlTextReader xtr = new XmlTextReader (args [i]);
-				XmlValidatingReader xvr = new XmlValidatingReader (xtr);
-				xvr.Schemas.Add (xsd);
-				while (!xvr.EOF)
-					xvr.Read ();
-				xvr.Close ();
-			}
-		}
-
-		static void Transform (string [] args)
-		{
-			XslTransform t = new XslTransform ();
-			t.Load (args [1]);
-			TextWriter output = args.Length > 3 ?
-				File.CreateText (args [3]) : Console.Out;
-			XmlTextWriter xw = new XmlTextWriter (output);
-			t.Transform (new XPathDocument (args [2], XmlSpace.Preserve), null, xw, null);
-			xw.Close ();
-		}
-
-		static void PrettyPrint (string [] args)
-		{
-			XmlTextReader r = null;
-			if (args.Length > 0)
-				r = new XmlTextReader (args [1]);
-			else
-				r = new XmlTextReader (Console.In);
-			r.WhitespaceHandling = WhitespaceHandling.Significant;
-			XmlTextWriter w = null;
-			if (args.Length > 1)
-				w = new XmlTextWriter (args [2], Encoding.UTF8);
-			else
-				w = new XmlTextWriter (Console.Out);
-			w.Formatting = Formatting.Indented;
-
-			r.Read ();
-			while (!r.EOF)
-				w.WriteNode (r, false);
-			r.Close ();
-			w.Close ();
-		}
-	}
-}
-
diff --git a/mcs/tools/prj2make/MsPrjHelper.cs b/mcs/tools/prj2make/MsPrjHelper.cs
index 5bda2c9a72f..c021d939f84 100644
--- a/mcs/tools/prj2make/MsPrjHelper.cs
+++ b/mcs/tools/prj2make/MsPrjHelper.cs
@@ -168,18 +168,6 @@ namespace Mfconsulting.General.Prj2Make
 				}
 			}
 		}
-
-		private bool CheckReference(string referenceFilename)
-		{
-			foreach (CsprojInfo pi in projNameInfo.Values)
-			{
-				if (referenceFilename.ToLower() == pi.name.ToLower())
-				{
-					return true;
-				}
-			}
-			return false;
-		}
     
 		public string MsSlnHelper(bool isUnixMode, bool isMcsMode, bool isSln, string slnFile)
 		{
@@ -368,19 +356,7 @@ namespace Mfconsulting.General.Prj2Make
 							{
 								assemblyName = "System.Xml";
 							}
-
-							// Check if this assembly is actually one compiled earlier in the project.
-							// If so we must add the TARGET path to this line.
-							string thisref;
-							if (CheckReference(rf.AssemblyName) == true)
-							{
-								thisref = "-r:$(TARGET)" + Path.DirectorySeparatorChar + assemblyName;
-							}
-							else
-							{
-								thisref = "-r:" + assemblyName;
-							}
-							
+							string thisref = "-r:" + assemblyName;
 							if (!thisref.EndsWith(".dll"))
 								thisref += ".dll";
 							refs += thisref;